@raydiant/playlist-window-manager 0.0.0-test-1 → 0.0.0-test-3

package/build/BrowserViewRenderer.d.ts

@@ -5,7 +5,7 @@ export default class BrowserViewRenderer implements PresentationWindowRenderer {
     private offscreenWindow;
     private windows;
     constructor(mainWindow: BrowserWindow, offscreenWindow: BrowserWindow);
-    createWindow({ windowId, parentWindowId, bounds, backgroundColor, receiveMessageCallback, }: CreateWindowOptions): Promise<void>;
+    createWindow({ windowId, parentWindowId, bounds, logger, backgroundColor, receiveMessageCallback, }: CreateWindowOptions): Promise<void>;
     loadWindow(windowId: string, url: string): Promise<void>;
     updateWindowBounds(windowId: string, bounds: WindowBounds): void;
     showWindow(windowId: string, isFocused: boolean): void;

package/build/BrowserViewRenderer.js

@@ -79,10 +79,11 @@ var BrowserViewRenderer = /** @class */ (function () {
         this.windows = {};
     }
     BrowserViewRenderer.prototype.createWindow = function (_a) {
-        var windowId = _a.windowId, parentWindowId = _a.parentWindowId, bounds = _a.bounds, backgroundColor = _a.backgroundColor, receiveMessageCallback = _a.receiveMessageCallback;
+        var windowId = _a.windowId, parentWindowId = _a.parentWindowId, bounds = _a.bounds, logger = _a.logger, backgroundColor = _a.backgroundColor, receiveMessageCallback = _a.receiveMessageCallback;
         return __awaiter(this, void 0, void 0, function () {
             var window;
             return __generator(this, function (_b) {
+                logger.info("playlist-window-manager/src/BrowserViewRenderer.ts createWindow1 ".concat(JSON.stringify(bounds || __assign(__assign({}, this.mainWindow.getBounds()), { x: 0, y: 0 }))));
                 window = {
                     view: new electron_1.BrowserView({
                         webPreferences: {
@@ -99,7 +100,7 @@ var BrowserViewRenderer = /** @class */ (function () {
                 this.windows[windowId] = window;
                 electron_1.ipcMain.on(windowId, window.receiveMessageCallback);
                 this.offscreenWindow.addBrowserView(window.view);
-                // TODO log bounds
+                logger.info("playlist-window-manager/src/BrowserViewRenderer.ts createWindow2 ".concat(JSON.stringify(window.bounds)));
                 window.view.setBounds(window.bounds);
                 if (backgroundColor) {
                     window.view.setBackgroundColor(backgroundColor);

package/build/BrowserWindowRenderer.js

@@ -93,7 +93,7 @@ var BrowserWindowRenderer = /** @class */ (function () {
             },
         });
         this.proxySettings = null;
-        // TODO log bounds
+        opts.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts constructor1 ".concat(JSON.stringify(opts.bounds)));
         this.offscreenWindow.setBounds(opts.bounds);
         if (opts.proxySettings) {
             this.proxySettings = opts.proxySettings;

package/build/PlaylistWindowManager.js

@@ -659,6 +659,7 @@ var PlaylistWindowManager = /** @class */ (function (_super) {
         var presentation = this.state.getPresentation(presentationId);
         var applicationVersion = this.state.getApplicationVersion(presentation.applicationDeploymentId);
         var windowId = (0, uuid_1.v4)();
+        logger.info("playlist-window-manager/src/PlaylistWindowManager.ts createWindow1 ".concat(JSON.stringify(this.bounds)));
         return new PresentationWindow_1.default({
             windowManager: this,
             renderer: this.renderer,
@@ -683,7 +684,7 @@ var PlaylistWindowManager = /** @class */ (function (_super) {
             ruleEngineState: this.ruleEngine.state,
             globalRule: this.ruleEngine.globalRule,
             isPreview: isPreview,
-            workerState: this.workerState
+            workerState: this.workerState,
         });
     };
     PlaylistWindowManager.prototype.loadCurrentWindow = function () {
@@ -998,12 +999,12 @@ var PlaylistWindowManager = /** @class */ (function (_super) {
     };
     PlaylistWindowManager.prototype.emitCurrentWindowErrorEvent = function (event, error) {
         return this.emitCurrentWindowEvent(event, {
-            errorMessage: this.getErrorMessage(error)
+            errorMessage: this.getErrorMessage(error),
         });
     };
     PlaylistWindowManager.prototype.emitNextWindowErrorEvent = function (event, error) {
         return this.emitNextWindowEvent(event, {
-            errorMessage: this.getErrorMessage(error)
+            errorMessage: this.getErrorMessage(error),
         });
     };
     PlaylistWindowManager.prototype.getErrorMessage = function (error) {

package/build/PresentationWindow.js

@@ -657,15 +657,17 @@ var PresentationWindow = /** @class */ (function () {
     };
     PresentationWindow.prototype.createAndLoadWindow = function (url, backgroundColor, receiveMessageCallback) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, windowId, parentWindowId, renderer, bounds;
+            var _a, windowId, parentWindowId, renderer, bounds, logger;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.options, windowId = _a.windowId, parentWindowId = _a.parentWindowId, renderer = _a.renderer, bounds = _a.bounds;
+                        _a = this.options, windowId = _a.windowId, parentWindowId = _a.parentWindowId, renderer = _a.renderer, bounds = _a.bounds, logger = _a.logger;
+                        logger.info("playlist-window-manager/src/PresentationWindow.ts createAndLoadWindow1: ".concat(JSON.stringify(bounds)));
                         renderer.createWindow({
                             windowId: windowId,
                             parentWindowId: parentWindowId,
                             bounds: bounds,
+                            logger: logger,
                             backgroundColor: backgroundColor,
                             receiveMessageCallback: receiveMessageCallback,
                             errorCallback: this.handleError,
@@ -818,8 +820,9 @@ var PresentationWindow = /** @class */ (function () {
                         didBoundsChange = prevBounds
                             ? !(0, fast_deep_equal_1.default)(bounds, prevBounds)
                             : true;
+                        this.logInfo("playlist-window-manager/src/PresentationWindow.ts openChildWindow1: ".concat(JSON.stringify(prevBounds)));
                         if (didBoundsChange) {
-                            this.logInfo("playlist-window-manager/src/PresentationWindow.ts openChildWindow1: ".concat(JSON.stringify(bounds)));
+                            this.logInfo("playlist-window-manager/src/PresentationWindow.ts openChildWindow2: ".concat(JSON.stringify(bounds)));
                             windowManager.updateBounds(bounds);
                         }
                         didForceMuteChange = forceMute !== prevForceMute;
@@ -839,7 +842,7 @@ var PresentationWindow = /** @class */ (function () {
                         }
                         return [3 /*break*/, 3];
                     case 1:
-                        this.logInfo("playlist-window-manager/src/PresentationWindow.ts openChildWindow2: ".concat(JSON.stringify(bounds)));
+                        this.logInfo("playlist-window-manager/src/PresentationWindow.ts openChildWindow3: ".concat(JSON.stringify(bounds)));
                         windowManager = new PlaylistWindowManager_1.default({
                             parentWindowId: windowId,
                             windowName: windowName,

package/build/types.d.ts

@@ -82,6 +82,7 @@ export interface CreateWindowOptions {
     windowId: string;
     parentWindowId?: string;
     bounds?: WindowBounds;
+    logger: Logger;
     backgroundColor?: string;
     receiveMessageCallback?: (type: string, payload?: any) => void;
     errorCallback: (err: any) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raydiant/playlist-window-manager",
-  "version": "0.0.0-test-1",
+  "version": "0.0.0-test-3",
   "description": "Window manager for playlist playback.",
   "main": "build/index.js",
   "scripts": {

package/src/BrowserViewRenderer.ts

@@ -30,10 +30,15 @@ export default class BrowserViewRenderer implements PresentationWindowRenderer {
     windowId,
     parentWindowId,
     bounds,
+    logger,
     backgroundColor,
     receiveMessageCallback,
   }: CreateWindowOptions) {
-    // TODO log bounds
+    logger.info(
+      `playlist-window-manager/src/BrowserViewRenderer.ts createWindow1 ${JSON.stringify(
+        bounds || { ...this.mainWindow.getBounds(), x: 0, y: 0 }
+      )}`
+    );
 
     const window = {
       view: new BrowserView({
@@ -60,7 +65,12 @@ export default class BrowserViewRenderer implements PresentationWindowRenderer {
     ipcMain.on(windowId, window.receiveMessageCallback);
 
     this.offscreenWindow.addBrowserView(window.view);
-    // TODO log bounds
+    logger.info(
+      `playlist-window-manager/src/BrowserViewRenderer.ts createWindow2 ${JSON.stringify(
+        window.bounds
+      )}`
+    );
+
     window.view.setBounds(window.bounds);
 
     if (backgroundColor) {

package/src/BrowserWindowRenderer.ts

@@ -72,7 +72,11 @@ export default class BrowserWindowRenderer
   private logger: Logger;
 
   constructor(private opts: BrowserWindowRendererOptions) {
-    // TODO log bounds
+    opts.logger.info(
+      `playlist-window-manager/src/BrowserWindowRenderer.ts constructor1 ${JSON.stringify(
+        opts.bounds
+      )}`
+    );
     this.offscreenWindow.setBounds(opts.bounds);
     if (opts.proxySettings) {
       this.proxySettings = opts.proxySettings;

package/src/PlaylistWindowManager.ts

@@ -8,7 +8,7 @@ import {
   Theme,
   Logger,
   WorkerState,
-  AnalyticsEvent
+  AnalyticsEvent,
 } from './types';
 import PresentationWindow from './PresentationWindow';
 import PlaylistWindowManagerState from './PlaylistWindowManagerState';
@@ -84,12 +84,12 @@ export default class PlaylistWindowManager extends EventEmitter {
   private overrideNextPresentation: RE.NextPresentationID | null = null;
   private currentWindow: PresentationWindow | null = null;
   private nextWindow: PresentationWindow | null = null;
-  private hasPendingInterrupt: boolean = false;
+  private hasPendingInterrupt = false;
   private ruleEngine: RE.RuleEngine | null = null;
   private state: PlaylistWindowManagerState | null = null;
   private renderer: PresentationWindowRenderer | null = null;
-  private restartCurrentWindowOnEnd: boolean = false;
-  private shouldHardRestart: boolean = false;
+  private restartCurrentWindowOnEnd = false;
+  private shouldHardRestart = false;
   private currentWindowError: null | Error = null;
   private interruptCheckTimeout: ReturnType<typeof setTimeout> | null = null;
   private currentPresentationCompleteTimeout: ReturnType<
@@ -98,8 +98,8 @@ export default class PlaylistWindowManager extends EventEmitter {
   private lastCompleteAt: Date | null = null;
   private bounds?: WindowBounds;
   private themeOverride?: Theme;
-  private forceMute: boolean = false;
-  private isFocused: boolean = false;
+  private forceMute = false;
+  private isFocused = false;
 
   private workerState: WorkerState = {};
 
@@ -397,7 +397,7 @@ export default class PlaylistWindowManager extends EventEmitter {
     }
   }
 
-  public async show(isFocused: boolean = true) {
+  public async show(isFocused = true) {
     if (this.currentWindow) {
       // Save the focused state so we know if preloaded windows should be
       // focused when swapped for the current.
@@ -450,7 +450,7 @@ export default class PlaylistWindowManager extends EventEmitter {
       logger,
       windowName,
       parentWindowId,
-      isPreview
+      isPreview,
     } = this.options;
 
     if (!this.ruleEngine) {
@@ -480,6 +480,12 @@ export default class PlaylistWindowManager extends EventEmitter {
 
     const windowId = uuidv4();
 
+    logger.info(
+      `playlist-window-manager/src/PlaylistWindowManager.ts createWindow1 ${JSON.stringify(
+        this.bounds
+      )}`
+    );
+
     return new PresentationWindow({
       windowManager: this,
       renderer: this.renderer,
@@ -504,7 +510,7 @@ export default class PlaylistWindowManager extends EventEmitter {
       ruleEngineState: this.ruleEngine.state,
       globalRule: this.ruleEngine.globalRule,
       isPreview,
-      workerState: this.workerState
+      workerState: this.workerState,
     });
   }
 
@@ -1006,7 +1012,7 @@ export default class PlaylistWindowManager extends EventEmitter {
     if (window) {
       this.emit(event, {
         ...window.metadata(),
-        data
+        data,
       });
     } else {
       logger.warn(`Attempted to emit ${label} window event but window not set`);
@@ -1023,13 +1029,13 @@ export default class PlaylistWindowManager extends EventEmitter {
 
   private emitCurrentWindowErrorEvent(event: string, error: any) {
     return this.emitCurrentWindowEvent(event, {
-      errorMessage: this.getErrorMessage(error)
+      errorMessage: this.getErrorMessage(error),
     });
   }
 
   private emitNextWindowErrorEvent(event: string, error: any) {
     return this.emitNextWindowEvent(event, {
-      errorMessage: this.getErrorMessage(error)
+      errorMessage: this.getErrorMessage(error),
     });
   }
 

package/src/PresentationWindow.ts

@@ -490,12 +490,19 @@ export default class PresentationWindow {
     backgroundColor?: string,
     receiveMessageCallback?: (type: string, payload?: any) => void
   ) {
-    const { windowId, parentWindowId, renderer, bounds } = this.options;
+    const { windowId, parentWindowId, renderer, bounds, logger } = this.options;
+
+    logger.info(
+      `playlist-window-manager/src/PresentationWindow.ts createAndLoadWindow1: ${JSON.stringify(
+        bounds
+      )}`
+    );
 
     renderer.createWindow({
       windowId,
       parentWindowId,
       bounds,
+      logger,
       backgroundColor,
       receiveMessageCallback,
       errorCallback: this.handleError,
@@ -666,9 +673,15 @@ export default class PresentationWindow {
         ? !deepEqual(bounds, prevBounds)
         : true;
 
+      this.logInfo(
+        `playlist-window-manager/src/PresentationWindow.ts openChildWindow1: ${JSON.stringify(
+          prevBounds
+        )}`
+      );
+
       if (didBoundsChange) {
         this.logInfo(
-          `playlist-window-manager/src/PresentationWindow.ts openChildWindow1: ${JSON.stringify(
+          `playlist-window-manager/src/PresentationWindow.ts openChildWindow2: ${JSON.stringify(
             bounds
           )}`
         );
@@ -699,7 +712,7 @@ export default class PresentationWindow {
       }
     } else {
       this.logInfo(
-        `playlist-window-manager/src/PresentationWindow.ts openChildWindow2: ${JSON.stringify(
+        `playlist-window-manager/src/PresentationWindow.ts openChildWindow3: ${JSON.stringify(
           bounds
         )}`
       );

package/src/types.ts

@@ -86,6 +86,7 @@ export interface CreateWindowOptions {
   windowId: string;
   parentWindowId?: string;
   bounds?: WindowBounds;
+  logger: Logger;
   backgroundColor?: string;
 
   // Called when attaching a message listener to the inner window.