fix: electron 7

jitsi · Jan 15, 2020 · cfa14d0 · cfa14d0
1 parent 74dd71a
commit cfa14d0
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 132 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jitsi-meet-electron-utils",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Utilities for jitsi-meet-electron project",
   "main": "index.js",
   "scripts": {
@@ -29,7 +29,8 @@
     "nan": "^2.14.0",
     "postis": "^2.2.0",
     "prebuild-install": "^5.3.0",
-    "robotjs": "jitsi/robotjs#jitsi-electron6"
+    "robotjs": "0.6.0",
+    "semver": "7.1.1"
   },
   "devDependencies": {
     "eslint": ">=3",

diff --git a/screensharing/index.js b/screensharing/index.js
@@ -1,4 +1,8 @@
+/* global process */
+
 const electron = require("electron");
+const semver = require('semver');
+
 module.exports = function setupScreenSharingForWindow(iframe) {
     // make sure that even after reload/redirect the screensharing will be
     // available
@@ -20,15 +24,21 @@ module.exports = function setupScreenSharingForWindow(iframe) {
              * 150px.
              */
             obtainDesktopStreams(callback, errorCallback, options = {}) {
-                electron.desktopCapturer.getSources(options,
-                    (error, sources) => {
-                        if (error) {
-                            errorCallback(error);
-                            return;
-                        }
+                if (semver.lt(process.versions.electron, '5.0.0')) {
+                    electron.desktopCapturer.getSources(options,
+                        (error, sources) => {
+                            if (error) {
+                                errorCallback(error);
+                                return;
+                            }
 
-                        callback(sources);
-                    });
+                            callback(sources);
+                        });
+                } else {
+                    electron.desktopCapturer.getSources(options)
+                        .then(sources => callback(sources))
+                        .catch(error => errorCallback(error));
+                }
             }
         };
     });