@raydiant/playlist-window-manager 0.27.3-rc.2 → 0.28.1

package/build/BrowserViewRenderer.d.ts

@@ -13,6 +13,7 @@ export default class BrowserViewRenderer implements PresentationWindowRenderer {
     removeWindow(windowId: string): Promise<void>;
     sendMessageString(windowId: string, message: string): void;
     sendMessageObject(windowId: string, type: string, payload?: any): void;
+    sendOnlineStatus(windowId: string, isOnline: boolean): void;
     muteWindow(windowId: string): void;
     unMuteWindow(windowId: string): void;
     private getWindow;

package/build/BrowserViewRenderer.js

@@ -191,6 +191,13 @@ var BrowserViewRenderer = /** @class */ (function () {
         }
         window.view.webContents.send('electron-main', { type: type, payload: payload });
     };
+    BrowserViewRenderer.prototype.sendOnlineStatus = function (windowId, isOnline) {
+        var window = this.getWindow(windowId);
+        if (!window) {
+            throw new Error("Failed to send isOnline status to window, missing window id '".concat(windowId, "'"));
+        }
+        window.view.webContents.send('online-status', isOnline);
+    };
     BrowserViewRenderer.prototype.muteWindow = function (windowId) {
         var window = this.getWindow(windowId);
         if (!window) {

package/build/BrowserWindowRenderer.js

@@ -90,7 +90,7 @@ var BrowserWindowRenderer = /** @class */ (function () {
              * This option fixes window not being able to take fullscreen leaving
              * 1px gap at the right and bottom of the screen.
              */
-            // resizable: false,
+            resizable: false,
             frame: this.opts.frame,
             hasShadow: this.opts.hasShadow,
             webPreferences: {
@@ -133,7 +133,7 @@ var BrowserWindowRenderer = /** @class */ (function () {
                                      * This option fixes window not being able to take fullscreen leaving
                                      * 1px gap at the right and bottom of the screen.
                                      */
-                                    // resizable: false,
+                                    resizable: false,
                                     frame: this.opts.frame,
                                     // NOTE: useWindowPool: true does not work with renderChildWindowsAsBrowserViews: false
                                     // because the parent can't be changed after creating the BrowserWindow.

package/build/IFrameRenderer.d.ts

@@ -4,6 +4,7 @@ export default class IFrameRenderer implements PresentationWindowRenderer {
     private windows;
     constructor(container: HTMLElement);
     createWindow({ windowId, bounds, backgroundColor, receiveMessageCallback, }: CreateWindowOptions): Promise<void>;
+    private loadWindowResolvers;
     loadWindow(windowId: string, url: string): Promise<void>;
     updateWindowBounds(windowId: string, bounds: WindowBounds): void;
     showWindow(windowId: string, isFocused: boolean): void;

package/build/IFrameRenderer.js

@@ -42,6 +42,7 @@ var IFrameRenderer = /** @class */ (function () {
         var _this = this;
         this.container = container;
         this.windows = {};
+        this.loadWindowResolvers = [];
         this.globalMessageHandler = function (event) {
             // Ignore messages that don't start with the message prefix.
             if (typeof event.data === 'string' && event.data.startsWith(namespace)) {
@@ -106,18 +107,35 @@ var IFrameRenderer = /** @class */ (function () {
         });
     };
     IFrameRenderer.prototype.loadWindow = function (windowId, url) {
+        var _this = this;
         var window = this.getWindow(windowId);
         if (!window) {
             throw new Error("Failed to update window bounds, missing window id '".concat(windowId, "'"));
         }
         // Return a promise that resolves then the window has successfully loaded.
         return new Promise(function (resolve, reject) {
-            window.frame.onload = function () {
-                resolve();
-            };
-            window.frame.onerror = function () {
-                reject(new Error("Error loading window for '".concat(url, "'")));
-            };
+            _this.loadWindowResolvers.push([resolve, reject]);
+            // If we reassign onload, we may lost any pending promise called previously.
+            // Basically, if this function is called a first time, then it's called a
+            // second time without the first one completes load, the resolve callback
+            // will never be called, and the code that is awaiting for the promise will
+            // never be fulfilled.
+            if (!window.frame.onload) {
+                window.frame.onload = function () {
+                    while (_this.loadWindowResolvers.length) {
+                        var resolve_1 = (_this.loadWindowResolvers.shift() || [])[0];
+                        resolve_1 === null || resolve_1 === void 0 ? void 0 : resolve_1();
+                    }
+                };
+            }
+            if (!window.frame.onerror) {
+                window.frame.onerror = function () {
+                    while (_this.loadWindowResolvers.length) {
+                        var _a = _this.loadWindowResolvers.shift() || [], _ = _a[0], reject_1 = _a[1];
+                        reject_1 === null || reject_1 === void 0 ? void 0 : reject_1(new Error("Error loading window for '".concat(url, "'")));
+                    }
+                };
+            }
             window.frame.src = url;
         });
     };

package/build/PresentationWindow.js

@@ -757,11 +757,13 @@ var PresentationWindow = /** @class */ (function () {
     };
     PresentationWindow.prototype.sendOnlineStatus = function (isOnline) {
         var _a = this.options, windowId = _a.windowId, renderer = _a.renderer;
-        // Send online-status event. This Separate from sendMessageObject since we
-        // are bypassing Raydiant SDK message receivers.
+        // Send online-status event. We are not using sendMessageObject since we
+        // are bypassing Raydiant SDK's message receivers and communicating directly
+        // with the preload script.
         if (renderer.sendOnlineStatus) {
             renderer.sendOnlineStatus(windowId, isOnline);
         }
+        // Forward the event to the child window managers.
         Object.values(this.windowManagers).forEach(function (wm) {
             wm.sendOnlineStatus(isOnline);
         });

package/build/preload.js

@@ -59,6 +59,7 @@ Object.defineProperty(navigator, 'onLine', {
 });
 var offlineListeners = new Set();
 var onlineListeners = new Set();
+// Intercept online/offline add event listeners so we can call them when online status changes.
 var originalAddEventListener = window.addEventListener.bind(window);
 Object.defineProperty(window, 'addEventListener', {
     value: function (type, listener) {
@@ -73,6 +74,7 @@ Object.defineProperty(window, 'addEventListener', {
         }
     },
 });
+// Intercept online/offline remove event listeners so we can remove our custom listeners.
 var originalRemoveEventListener = window.removeEventListener.bind(window);
 Object.defineProperty(window, 'removeEventListener', {
     value: function (type, listener) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raydiant/playlist-window-manager",
-  "version": "0.27.3-rc.2",
+  "version": "0.28.1",
   "description": "Window manager for playlist playback.",
   "main": "build/index.js",
   "scripts": {

package/src/BrowserViewRenderer.ts

@@ -154,6 +154,17 @@ export default class BrowserViewRenderer implements PresentationWindowRenderer {
     window.view.webContents.send('electron-main', { type, payload });
   }
 
+  public sendOnlineStatus(windowId: string, isOnline: boolean) {
+    const window = this.getWindow(windowId);
+    if (!window) {
+      throw new Error(
+        `Failed to send isOnline status to window, missing window id '${windowId}'`
+      );
+    }
+
+    window.view.webContents.send('online-status', isOnline);
+  }
+
   public muteWindow(windowId: string) {
     const window = this.getWindow(windowId);
     if (!window) {

package/src/BrowserWindowRenderer.ts

@@ -67,7 +67,7 @@ export default class BrowserWindowRenderer
      * This option fixes window not being able to take fullscreen leaving
      * 1px gap at the right and bottom of the screen.
      */
-    // resizable: false,
+    resizable: false,
     frame: this.opts.frame,
     hasShadow: this.opts.hasShadow,
     webPreferences: {
@@ -119,7 +119,7 @@ export default class BrowserWindowRenderer
                * This option fixes window not being able to take fullscreen leaving
                * 1px gap at the right and bottom of the screen.
                */
-              // resizable: false,
+              resizable: false,
               frame: this.opts.frame,
               // NOTE: useWindowPool: true does not work with renderChildWindowsAsBrowserViews: false
               // because the parent can't be changed after creating the BrowserWindow.

package/src/IFrameRenderer.ts

@@ -69,6 +69,8 @@ export default class IFrameRenderer implements PresentationWindowRenderer {
     this.container.appendChild(frame);
   }
 
+  private loadWindowResolvers: Array<[() => void, (err: Error) => void]> = [];
+
   public loadWindow(windowId: string, url: string) {
     const window = this.getWindow(windowId);
     if (!window) {
@@ -79,13 +81,30 @@ export default class IFrameRenderer implements PresentationWindowRenderer {
 
     // Return a promise that resolves then the window has successfully loaded.
     return new Promise<void>((resolve, reject) => {
-      window.frame.onload = () => {
-        resolve();
-      };
+      this.loadWindowResolvers.push([resolve, reject]);
+
+      // If we reassign onload, we may lost any pending promise called previously.
+      // Basically, if this function is called a first time, then it's called a
+      // second time without the first one completes load, the resolve callback
+      // will never be called, and the code that is awaiting for the promise will
+      // never be fulfilled.
+      if (!window.frame.onload) {
+        window.frame.onload = () => {
+          while (this.loadWindowResolvers.length) {
+            const [resolve] = this.loadWindowResolvers.shift() || [];
+            resolve?.();
+          }
+        };
+      }
 
-      window.frame.onerror = () => {
-        reject(new Error(`Error loading window for '${url}'`));
-      };
+      if (!window.frame.onerror) {
+        window.frame.onerror = () => {
+          while (this.loadWindowResolvers.length) {
+            const [_, reject] = this.loadWindowResolvers.shift() || [];
+            reject?.(new Error(`Error loading window for '${url}'`));
+          }
+        };
+      }
 
       window.frame.src = url;
     });

package/src/PresentationWindow.ts

@@ -528,13 +528,15 @@ export default class PresentationWindow {
 
   public sendOnlineStatus(isOnline: boolean) {
     const { windowId, renderer } = this.options;
-    // Send online-status event. This Separate from sendMessageObject since we
-    // are bypassing Raydiant SDK message receivers.
 
+    // Send online-status event. We are not using sendMessageObject since we
+    // are bypassing Raydiant SDK's message receivers and communicating directly
+    // with the preload script.
     if (renderer.sendOnlineStatus) {
       renderer.sendOnlineStatus(windowId, isOnline);
     }
 
+    // Forward the event to the child window managers.
     Object.values(this.windowManagers).forEach((wm) => {
       wm.sendOnlineStatus(isOnline);
     });

package/src/preload.ts

@@ -79,6 +79,7 @@ Object.defineProperty(navigator, 'onLine', {
 const offlineListeners = new Set<EventListenerOrEventListenerObject>();
 const onlineListeners = new Set<EventListenerOrEventListenerObject>();
 
+// Intercept online/offline add event listeners so we can call them when online status changes.
 const originalAddEventListener = window.addEventListener.bind(window);
 Object.defineProperty(window, 'addEventListener', {
   value: (type: string, listener: EventListenerOrEventListenerObject) => {
@@ -92,6 +93,7 @@ Object.defineProperty(window, 'addEventListener', {
   },
 });
 
+// Intercept online/offline remove event listeners so we can remove our custom listeners.
 const originalRemoveEventListener = window.removeEventListener.bind(window);
 Object.defineProperty(window, 'removeEventListener', {
   value: (type: string, listener: EventListenerOrEventListenerObject) => {