@raydiant/playlist-window-manager 0.28.0 → 0.28.2

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raydiant/playlist-window-manager",
-  "version": "0.28.0",
+  "version": "0.28.2",
   "description": "Window manager for playlist playback.",
   "main": "build/index.js",
   "scripts": {
@@ -11,16 +11,16 @@
     "deploy": "sh tasks/npm-publish.sh"
   },
   "dependencies": {
-    "fast-deep-equal": "^3.1.3",
     "@raydiant/playlist-rule-engine": "3.3.0",
+    "eventemitter3": "^4.0.7",
+    "fast-deep-equal": "^3.1.3",
     "raydiant-kit": "4.7.3",
-    "uuid": "^8.3.0",
-    "eventemitter3": "^4.0.7"
+    "uuid": "^8.3.0"
   },
   "devDependencies": {
     "@babel/core": "^7.5.5",
-    "@types/jschannel": "^1.0.1",
     "@types/jest": "^24.0.15",
+    "@types/jschannel": "^1.0.1",
     "@types/uuid": "8.3.0",
     "electron": "28.1.2",
     "jest": "^24.8.0",

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/tasks/npm-publish.sh

@@ -10,4 +10,4 @@ mkdir build
 yarn build
 
 # Publish
-yarn publish --non-interactive --access public
+yarn publish --access public