From 6f0f5615bae7e54433b815c607ba993d241835d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Tue, 16 Jan 2024 12:13:31 +0100
Subject: [PATCH] fix(screen-sharing) fix depredcated ss hook

We may fail to access the iframe's contentWindow, but we can ignore that
since the new hook doesn't require it.

Fixes: https://github.com/jitsi/jitsi-meet-electron-sdk/issues/368
Fixes: https://github.com/jitsi/jitsi-meet-electron-sdk/issues/325
---
 screensharing/render.js | 55 ++++++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/screensharing/render.js b/screensharing/render.js
index f9856778..96fd4bf2 100644
--- a/screensharing/render.js
+++ b/screensharing/render.js
@@ -57,28 +57,32 @@ class ScreenShareRenderHook {
      */
     async _onIframeApiLoad() {
         // TODO: delete this after 2 releases
-        this._iframe.contentWindow.JitsiMeetElectron = {
-            /**
-             * Get sources available for screensharing. The callback is invoked
-             * with an array of DesktopCapturerSources.
-             *
-             * @param {Function} callback - The success callback.
-             * @param {Function} errorCallback - The callback for errors.
-             * @param {Object} options - Configuration for getting sources.
-             * @param {Array} options.types - Specify the desktop source types
-             * to get, with valid sources being "window" and "screen".
-             * @param {Object} options.thumbnailSize - Specify how big the
-             * preview images for the sources should be. The valid keys are
-             * height and width, e.g. { height: number, width: number}. By
-             * default electron will return images with height and width of
-             * 150px.
-             */
-            obtainDesktopStreams(callback, errorCallback, options = {}) {
-                ipcRenderer.invoke(SCREEN_SHARE_GET_SOURCES, options)
-                    .then((sources) => callback(sources))
-                    .catch((error) => errorCallback(error));
-            }
-        };
+        try {
+            this._iframe.contentWindow.JitsiMeetElectron = {
+                /**
+                 * Get sources available for screensharing. The callback is invoked
+                 * with an array of DesktopCapturerSources.
+                 *
+                 * @param {Function} callback - The success callback.
+                 * @param {Function} errorCallback - The callback for errors.
+                 * @param {Object} options - Configuration for getting sources.
+                 * @param {Array} options.types - Specify the desktop source types
+                 * to get, with valid sources being "window" and "screen".
+                 * @param {Object} options.thumbnailSize - Specify how big the
+                 * preview images for the sources should be. The valid keys are
+                 * height and width, e.g. { height: number, width: number}. By
+                 * default electron will return images with height and width of
+                 * 150px.
+                 */
+                obtainDesktopStreams(callback, errorCallback, options = {}) {
+                    ipcRenderer.invoke(SCREEN_SHARE_GET_SOURCES, options)
+                        .then((sources) => callback(sources))
+                        .catch((error) => errorCallback(error));
+                }
+            };
+        } catch(_) {
+            logWarning('Failed to setup deprecated screen-sharing hook');
+        }
 
         ipcRenderer.on(SCREEN_SHARE_EVENTS_CHANNEL, this._onScreenSharingEvent);
         this._api.on('screenSharingStatusChanged', this._onScreenSharingStatusChanged);
@@ -87,7 +91,12 @@ class ScreenShareRenderHook {
         const isNewElectronScreensharingSupported = await this._isNewElectronScreensharingSupported();
 
         if (isNewElectronScreensharingSupported) {
-            this._iframe.contentWindow.JitsiMeetElectron = undefined;
+            try {
+                this._iframe.contentWindow.JitsiMeetElectron = undefined;
+            } catch(_) {
+                // Ignore.
+            }
+
             this._api.on('_requestDesktopSources', async (request, callback) => {
                 const { options } = request;