Merge pull request #29 from damencho/ds-error-handle

Improves desktop sharing error handling.

JitsiTrackErrors.js

@@ -22,9 +22,15 @@ module.exports = {
         }
     },
     UNSUPPORTED_RESOLUTION: "gum.unsupported_resolution",
+    /**
+     * An event which indicates that the jidesha extension for Firefox is
+     * needed to proceed with screen sharing, and that it is not installed.
+     */
     FIREFOX_EXTENSION_NEEDED: "gum.firefox_extension_needed",
     CHROME_EXTENSION_INSTALLATION_ERROR:
         "gum.chrome_extension_installation_error",
+    CHROME_EXTENSION_USER_CANCELED:
+        "gum.chrome_extension_user_canceled",
     GENERAL: "gum.general",
     TRACK_IS_DISPOSED: "track.track_is_disposed"
 };

modules/RTC/ScreenObtainer.js

@@ -3,8 +3,6 @@
 var logger = require("jitsi-meet-logger").getLogger(__filename);
 var RTCBrowserType = require("./RTCBrowserType");
 var AdapterJS = require("./adapter.screenshare");
-var DesktopSharingEventTypes
-    = require("../../service/desktopsharing/DesktopSharingEventTypes");
 var JitsiTrackErrors = require("../../JitsiTrackErrors");
 
 /**
@@ -206,11 +204,18 @@ var ScreenObtainer = {
                         }, 500);
                     },
                     function (arg) {
-                        logger.log("Failed to install the extension", arg);
-                        failCallback(arg);
+                        logger.log("Failed to install the extension from:"
+                            + getWebStoreInstallUrl(self.options), arg);
+                        failCallback({
+                            type: "jitsiError",
+                            errorObject: JitsiTrackErrors
+                                .CHROME_EXTENSION_INSTALLATION_ERROR
+                        });
                     }
                 );
             } catch(e) {
+                logger.log("Failed to install the extension from:"
+                    + self.getWebStoreInstallUrl(this.options), arg);
                 failCallback({
                     type: "jitsiError",
                     errorObject:
@@ -350,6 +355,19 @@ function doGetStreamFromExtension(options, streamCallback, failCallback) {
                     failCallback,
                     {desktopStream: response.streamId});
             } else {
+                // As noted in Chrome Desktop Capture API:
+                // If user didn't select any source (i.e. canceled the prompt)
+                // then the callback is called with an empty streamId.
+                if(response.streamId === "")
+                {
+                    failCallback({
+                        type: "jitsiError",
+                        errorObject:
+                            JitsiTrackErrors.CHROME_EXTENSION_USER_CANCELED
+                    });
+                    return;
+                }
+
                 failCallback("Extension failed to get the stream");
             }
         }

service/desktopsharing/DesktopSharingEventTypes.js

@@ -1,9 +0,0 @@
-var DesktopSharingEventTypes = {
-    /**
-     * An event which indicates that the jidesha extension for Firefox is
-     * needed to proceed with screen sharing, and that it is not installed.
-     */
-    FIREFOX_EXTENSION_NEEDED: "ds.firefox_extension_needed"
-};
-
-module.exports = DesktopSharingEventTypes;