@raydiant/playlist-window-manager 0.22.1 → 0.23.1

package/build/BrowserViewRenderer.js

@@ -87,6 +87,7 @@ var BrowserViewRenderer = /** @class */ (function () {
                     view: new electron_1.BrowserView({
                         webPreferences: {
                             preload: path.join(__dirname, 'preload.js'),
+                            contextIsolation: false,
                         },
                     }),
                     bounds: bounds || __assign(__assign({}, this.mainWindow.getBounds()), { x: 0, y: 0 }),

package/build/BrowserWindowRenderer.js

@@ -90,6 +90,7 @@ var BrowserWindowRenderer = /** @class */ (function () {
             hasShadow: this.opts.hasShadow,
             webPreferences: {
                 preload: path.join(__dirname, 'preload.js'),
+                contextIsolation: false,
             },
         });
         this.proxySettings = null;
@@ -118,6 +119,7 @@ var BrowserWindowRenderer = /** @class */ (function () {
                                 ? this.createOrGetPooledBrowserView(windowId, {
                                     webPreferences: {
                                         preload: path.join(__dirname, 'preload.js'),
+                                        contextIsolation: false,
                                     },
                                 })
                                 : this.createOrGetPooledBrowserWindow(windowId, {
@@ -132,6 +134,7 @@ var BrowserWindowRenderer = /** @class */ (function () {
                                     hasShadow: this.opts.hasShadow,
                                     webPreferences: {
                                         preload: path.join(__dirname, 'preload.js'),
+                                        contextIsolation: false,
                                     },
                                 }),
                             // If we are creating a child window and renderChildWindowsAsBrowserViews is false that means

package/build/PlaylistWindowManager.js

@@ -894,7 +894,7 @@ var PlaylistWindowManager = /** @class */ (function (_super) {
     };
     PlaylistWindowManager.prototype.swapWindows = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var nextPreviewPresentationId, preview, result, shouldPreload;
+            var nextPreviewPresentationId, preview, result, nextPresentation, shouldPreload;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -910,6 +910,7 @@ var PlaylistWindowManager = /** @class */ (function (_super) {
                             preview = result.preview;
                             nextPreviewPresentationId = preview.presentationId;
                         }
+                        nextPresentation = this.nextPresentation;
                         // Set this.currentPresentationId before removing the current window to avoid timing issues with previewCheck
                         // triggering during removeCurrentWindow. Current presentation id needs to be set to the next
                         // presentation before calling shouldPreload().
@@ -939,6 +940,11 @@ var PlaylistWindowManager = /** @class */ (function (_super) {
                         // Swap windows.
                         this.currentWindow = this.nextWindow;
                         if (this.currentWindow) {
+                            // Restore this.currentPresentation value since if this.removeCurrentWindow()
+                            // was called then this.currentPresentation was set to null.
+                            // This fixes an issue where publishing a playlist with single presentation results
+                            // in two iFrames created. See CX-2602 for more details.
+                            this.currentPresentation = nextPresentation;
                             this.currentWindow.onComplete(this.handleCurrentPresentationComplete);
                             this.currentWindow.onError(this.handleCurrentPresentationError);
                             this.currentWindow.onEnableInterruptLock(this.handleEnableInterruptLock);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raydiant/playlist-window-manager",
-  "version": "0.22.1",
+  "version": "0.23.1",
   "description": "Window manager for playlist playback.",
   "main": "build/index.js",
   "scripts": {
@@ -22,7 +22,7 @@
     "@types/jschannel": "^1.0.1",
     "@types/jest": "^24.0.15",
     "@types/uuid": "8.3.0",
-    "electron": "10.1.5",
+    "electron": "28.1.2",
     "jest": "^24.8.0",
     "ts-jest": "^24.0.2",
     "typescript": "^4.1.2"

package/src/BrowserViewRenderer.ts

@@ -37,6 +37,7 @@ export default class BrowserViewRenderer implements PresentationWindowRenderer {
       view: new BrowserView({
         webPreferences: {
           preload: path.join(__dirname, 'preload.js'),
+          contextIsolation: false,
         },
       }),
 

package/src/BrowserWindowRenderer.ts

@@ -5,9 +5,9 @@ import {
   ipcMain,
   IpcMainEvent,
   Event,
-  Details,
   BrowserWindowConstructorOptions,
   BrowserViewConstructorOptions,
+  RenderProcessGoneDetails,
 } from 'electron';
 import {
   PresentationWindowRenderer,
@@ -32,7 +32,10 @@ interface BrowserWindowRendererWindow {
     payload?: any
   ) => void;
   unresponsiveCallback: () => void;
-  renderProcessGoneCallback: (event: Event, details: Details) => void;
+  renderProcessGoneCallback: (
+    event: Event,
+    details: RenderProcessGoneDetails
+  ) => void;
 }
 
 interface BrowserWindowRendererOptions {
@@ -64,6 +67,7 @@ export default class BrowserWindowRenderer
     hasShadow: this.opts.hasShadow,
     webPreferences: {
       preload: path.join(__dirname, 'preload.js'),
+      contextIsolation: false,
     },
   });
 
@@ -101,6 +105,7 @@ export default class BrowserWindowRenderer
           ? this.createOrGetPooledBrowserView(windowId, {
               webPreferences: {
                 preload: path.join(__dirname, 'preload.js'),
+                contextIsolation: false,
               },
             })
           : this.createOrGetPooledBrowserWindow(windowId, {
@@ -115,6 +120,7 @@ export default class BrowserWindowRenderer
               hasShadow: this.opts.hasShadow,
               webPreferences: {
                 preload: path.join(__dirname, 'preload.js'),
+                contextIsolation: false,
               },
             }),
       // If we are creating a child window and renderChildWindowsAsBrowserViews is false that means
@@ -148,7 +154,10 @@ export default class BrowserWindowRenderer
         );
       },
 
-      renderProcessGoneCallback: (_: Event, details: Details) => {
+      renderProcessGoneCallback: (
+        _: Event,
+        details: RenderProcessGoneDetails
+      ) => {
         this.logger.error(
           `Window received 'render-process-gone' event. Reason: ${details.reason}`,
           { windowId }

package/src/PlaylistWindowManager.ts

@@ -698,6 +698,9 @@ export default class PlaylistWindowManager extends EventEmitter {
       nextPreviewPresentationId = preview.presentationId;
     }
 
+    // Save reference to next presentation since later call to
+    // this.removeCurrentWindow() will set this.currentPresentation to null.
+    const nextPresentation = this.nextPresentation;
     // Set this.currentPresentationId before removing the current window to avoid timing issues with previewCheck
     // triggering during removeCurrentWindow. Current presentation id needs to be set to the next
     // presentation before calling shouldPreload().
@@ -734,6 +737,11 @@ export default class PlaylistWindowManager extends EventEmitter {
     // Swap windows.
     this.currentWindow = this.nextWindow;
     if (this.currentWindow) {
+      // Restore this.currentPresentation value since if this.removeCurrentWindow()
+      // was called then this.currentPresentation was set to null.
+      // This fixes an issue where publishing a playlist with single presentation results
+      // in two iFrames created. See CX-2602 for more details.
+      this.currentPresentation = nextPresentation;
       this.currentWindow.onComplete(this.handleCurrentPresentationComplete);
       this.currentWindow.onError(this.handleCurrentPresentationError);
       this.currentWindow.onEnableInterruptLock(this.handleEnableInterruptLock);

package/tasks/npm-publish.sh

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