@raydiant/playlist-window-manager 0.0.0-test-20 → 0.0.0-test-22

package/build/BrowserWindowRenderer.d.ts

@@ -16,6 +16,7 @@ interface BrowserWindowRendererOptions {
 export default class BrowserWindowRenderer implements PresentationWindowRenderer {
     private opts;
     private windows;
+    private windowsBounds;
     private windowCrashHandler;
     private browserWindowPool;
     private browserViewPool;
@@ -41,6 +42,7 @@ export default class BrowserWindowRenderer implements PresentationWindowRenderer
      */
     private setWindowOrViewBounds;
     private getWindow;
+    private getWindowBounds;
     private moveWindowOffscreen;
     private addWindowToParent;
     private removeWindowFromParent;

package/build/BrowserWindowRenderer.js

@@ -75,12 +75,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var path = __importStar(require("path"));
 var electron_1 = require("electron");
+var lodash_1 = __importDefault(require("lodash"));
 var WindowUnresponsiveError_1 = __importDefault(require("./WindowUnresponsiveError"));
 var boundUtils_1 = require("./boundUtils");
 var BrowserWindowRenderer = /** @class */ (function () {
     function BrowserWindowRenderer(opts) {
         this.opts = opts;
         this.windows = {};
+        this.windowsBounds = {};
         this.windowCrashHandler = function (_) { };
         this.browserWindowPool = new WindowPool();
         this.browserViewPool = new WindowPool();
@@ -108,13 +110,14 @@ var BrowserWindowRenderer = /** @class */ (function () {
     BrowserWindowRenderer.prototype.createWindow = function (_a) {
         var windowId = _a.windowId, parentWindowId = _a.parentWindowId, _b = _a.bounds, bounds = _b === void 0 ? this.opts.bounds : _b, backgroundColor = _a.backgroundColor, receiveMessageCallback = _a.receiveMessageCallback, errorCallback = _a.errorCallback;
         return __awaiter(this, void 0, void 0, function () {
-            var window;
+            var windowBounds, window;
             var _this = this;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts createWindow1: ".concat(JSON.stringify(parentWindowId && !this.opts.renderChildWindowsAsBrowserViews
-                            ? __assign(__assign({}, bounds), { x: bounds.x + this.opts.bounds.x, y: bounds.y + this.opts.bounds.y }) : bounds)));
+                        windowBounds = parentWindowId && !this.opts.renderChildWindowsAsBrowserViews
+                            ? __assign(__assign({}, bounds), { x: bounds.x + this.opts.bounds.x, y: bounds.y + this.opts.bounds.y }) : bounds;
+                        this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts createWindow1: ".concat(JSON.stringify(windowBounds)));
                         window = {
                             parentWindowId: parentWindowId,
                             // If we are creating a child window and renderChildWindowsAsBrowserViews is true,
@@ -144,8 +147,7 @@ var BrowserWindowRenderer = /** @class */ (function () {
                             // we are rendering child windows with BrowserWindow. BrowserWindows are positioned absolutely so
                             // to place them in the correct spot relative to their parent we need to add the main window's x / y.
                             // BrowserViews are relatively positioned so we don't need to do that.
-                            bounds: parentWindowId && !this.opts.renderChildWindowsAsBrowserViews
-                                ? __assign(__assign({}, bounds), { x: bounds.x + this.opts.bounds.x, y: bounds.y + this.opts.bounds.y }) : bounds,
+                            bounds: windowBounds,
                             receiveMessageCallback: function (_, type, payload) {
                                 if (receiveMessageCallback) {
                                     receiveMessageCallback(type, payload);
@@ -177,6 +179,7 @@ var BrowserWindowRenderer = /** @class */ (function () {
                             })));
                         }
                         this.windows[windowId] = window;
+                        this.windowsBounds[windowId] = lodash_1.default.cloneDeep(windowBounds);
                         // Listen for messages from window.
                         electron_1.ipcMain.on(windowId, window.receiveMessageCallback);
                         if (backgroundColor) {
@@ -274,19 +277,21 @@ var BrowserWindowRenderer = /** @class */ (function () {
     BrowserWindowRenderer.prototype.showWindow = function (windowId, isFocused) {
         this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts showWindow1");
         var window = this.getWindow(windowId);
-        if (!window) {
+        var windowBounds = this.getWindowBounds(windowId);
+        if (!window || !windowBounds) {
             throw new Error("Failed to show window, missing window id '".concat(windowId, "'"));
         }
         if (window.view instanceof electron_1.BrowserWindow) {
             this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts showWindow2: ".concat(JSON.stringify({
                 fullscreen: window.view.isFullScreen(),
                 bounds: window.view.getBounds(),
+                windowBounds: windowBounds,
                 normalBounds: window.view.getNormalBounds(),
                 contentBounds: window.view.getContentBounds(),
             })));
-            if (window.view.isFullScreen()) {
-                this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts showWindow3: setFullScreen(true)");
-                window.view.setFullScreen(true);
+            if (!(0, boundUtils_1.areBoundsEqual)(window.view.getBounds(), windowBounds)) {
+                this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts showWindow3: setWindowOrViewBounds");
+                this.setWindowOrViewBounds(window.view, windowBounds);
             }
             this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts showWindow4: ".concat(JSON.stringify({
                 fullscreen: window.view.isFullScreen(),
@@ -353,6 +358,7 @@ var BrowserWindowRenderer = /** @class */ (function () {
                         _a.label = 4;
                     case 4:
                         delete this.windows[windowId];
+                        delete this.windowsBounds[windowId];
                         if (this.opts.useWindowPool) {
                             this.logPoolStats();
                         }
@@ -413,30 +419,49 @@ var BrowserWindowRenderer = /** @class */ (function () {
         })));
         // calling setBounds or setFullscreen may introduce -1px resolution error
         // so we try to avoid unnecessary calls
-        if ((0, boundUtils_1.areBoundsEqual)(window.getBounds(), bounds) ||
-            ((0, boundUtils_1.isFullscreen)(bounds) && window.isFullScreen())) {
+        if ((0, boundUtils_1.areBoundsEqual)(window.getBounds(), bounds)) {
             this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds3: bounds are equal");
             return;
         }
-        if ((0, boundUtils_1.isFullscreen)(bounds)) {
-            this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds4: full screen");
-            window.setFullScreen(true);
-        }
-        else {
-            // setBounds will be ignored if window was in fullscreen mode
-            window.setFullScreen(false);
-            window.setBounds(bounds);
+        if ((0, boundUtils_1.isFullscreen)(bounds) !== window.isFullScreen()) {
+            this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds4: setFullScreen");
+            window.setFullScreen((0, boundUtils_1.isFullscreen)(bounds));
         }
+        this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds5: before: ".concat(JSON.stringify({
+            fullscreen: window.isFullScreen(),
+            bounds: window.getBounds(),
+            contentBounds: window.getContentBounds(),
+            normalBounds: window.getNormalBounds(),
+        })));
+        window.setBounds(bounds);
         this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds6: before: ".concat(JSON.stringify({
             fullscreen: window.isFullScreen(),
             bounds: window.getBounds(),
             contentBounds: window.getContentBounds(),
             normalBounds: window.getNormalBounds(),
         })));
+        if (window.isFullScreen() && !(0, boundUtils_1.isFullscreen)(window.getBounds())) {
+            this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds7: window not fullscreen: ".concat(JSON.stringify({
+                fullscreen: window.isFullScreen(),
+                bounds: window.getBounds(),
+                contentBounds: window.getContentBounds(),
+                normalBounds: window.getNormalBounds(),
+            })));
+            window.maximize();
+        }
+        this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds8: last: ".concat(JSON.stringify({
+            fullscreen: window.isFullScreen(),
+            bounds: window.getBounds(),
+            contentBounds: window.getContentBounds(),
+            normalBounds: window.getNormalBounds(),
+        })));
     };
     BrowserWindowRenderer.prototype.getWindow = function (windowId) {
         return this.windows[windowId];
     };
+    BrowserWindowRenderer.prototype.getWindowBounds = function (windowId) {
+        return this.windowsBounds[windowId];
+    };
     BrowserWindowRenderer.prototype.moveWindowOffscreen = function (window) {
         if (!(window.view instanceof electron_1.BrowserView)) {
             throw new Error("Failed move window offscreen, window is not a BrowserView");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raydiant/playlist-window-manager",
-  "version": "0.0.0-test-20",
+  "version": "0.0.0-test-22",
   "description": "Window manager for playlist playback.",
   "main": "build/index.js",
   "scripts": {
@@ -11,16 +11,18 @@
     "deploy": "sh tasks/npm-publish.sh"
   },
   "dependencies": {
-    "fast-deep-equal": "^3.1.3",
     "@raydiant/playlist-rule-engine": "3.2.2",
+    "eventemitter3": "^4.0.7",
+    "fast-deep-equal": "^3.1.3",
+    "lodash": "^4.17.21",
     "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/lodash": "^4.14.200",
     "@types/uuid": "8.3.0",
     "electron": "10.1.5",
     "jest": "^24.8.0",

package/src/BrowserWindowRenderer.ts

@@ -16,6 +16,7 @@ import {
   WindowBounds,
   Logger,
 } from './types';
+import lodash from 'lodash';
 import WindowUnresponsiveError from './WindowUnresponsiveError';
 import { areBoundsEqual, isFullscreen } from './boundUtils';
 
@@ -54,6 +55,9 @@ export default class BrowserWindowRenderer
   private windows: {
     [windowId: string]: BrowserWindowRendererWindow;
   } = {};
+  private windowsBounds: {
+    [windowId: string]: WindowBounds;
+  } = {};
   private windowCrashHandler: (reason: string) => void = (_: string) => {};
 
   private browserWindowPool = new WindowPool<BrowserWindow>();
@@ -112,15 +116,18 @@ export default class BrowserWindowRenderer
     receiveMessageCallback,
     errorCallback,
   }: CreateWindowOptions): Promise<void> {
+    const windowBounds =
+      parentWindowId && !this.opts.renderChildWindowsAsBrowserViews
+        ? {
+            ...bounds,
+            x: bounds.x + this.opts.bounds.x,
+            y: bounds.y + this.opts.bounds.y,
+          }
+        : bounds;
+
     this.logger.info(
       `playlist-window-manager/src/BrowserWindowRenderer.ts createWindow1: ${JSON.stringify(
-        parentWindowId && !this.opts.renderChildWindowsAsBrowserViews
-          ? {
-              ...bounds,
-              x: bounds.x + this.opts.bounds.x,
-              y: bounds.y + this.opts.bounds.y,
-            }
-          : bounds
+        windowBounds
       )}`
     );
     const window: BrowserWindowRendererWindow = {
@@ -153,14 +160,7 @@ export default class BrowserWindowRenderer
       // we are rendering child windows with BrowserWindow. BrowserWindows are positioned absolutely so
       // to place them in the correct spot relative to their parent we need to add the main window's x / y.
       // BrowserViews are relatively positioned so we don't need to do that.
-      bounds:
-        parentWindowId && !this.opts.renderChildWindowsAsBrowserViews
-          ? {
-              ...bounds,
-              x: bounds.x + this.opts.bounds.x,
-              y: bounds.y + this.opts.bounds.y,
-            }
-          : bounds,
+      bounds: windowBounds,
 
       receiveMessageCallback: (
         _: IpcMainEvent,
@@ -222,6 +222,7 @@ export default class BrowserWindowRenderer
     }
 
     this.windows[windowId] = window;
+    this.windowsBounds[windowId] = lodash.cloneDeep(windowBounds);
     // Listen for messages from window.
     ipcMain.on(windowId, window.receiveMessageCallback);
 
@@ -356,7 +357,8 @@ export default class BrowserWindowRenderer
       `playlist-window-manager/src/BrowserWindowRenderer.ts showWindow1`
     );
     const window = this.getWindow(windowId);
-    if (!window) {
+    const windowBounds = this.getWindowBounds(windowId);
+    if (!window || !windowBounds) {
       throw new Error(`Failed to show window, missing window id '${windowId}'`);
     }
 
@@ -366,17 +368,19 @@ export default class BrowserWindowRenderer
           {
             fullscreen: window.view.isFullScreen(),
             bounds: window.view.getBounds(),
+            windowBounds: windowBounds,
             normalBounds: window.view.getNormalBounds(),
             contentBounds: window.view.getContentBounds(),
           }
         )}`
       );
-      if (window.view.isFullScreen()) {
+      if (!areBoundsEqual(window.view.getBounds(), windowBounds)) {
         this.logger.info(
-          `playlist-window-manager/src/BrowserWindowRenderer.ts showWindow3: setFullScreen(true)`
+          `playlist-window-manager/src/BrowserWindowRenderer.ts showWindow3: setWindowOrViewBounds`
         );
-        window.view.setFullScreen(true);
+        this.setWindowOrViewBounds(window.view, windowBounds);
       }
+
       this.logger.info(
         `playlist-window-manager/src/BrowserWindowRenderer.ts showWindow4: ${JSON.stringify(
           {
@@ -447,6 +451,7 @@ export default class BrowserWindowRenderer
     }
 
     delete this.windows[windowId];
+    delete this.windowsBounds[windowId];
 
     if (this.opts.useWindowPool) {
       this.logPoolStats();
@@ -532,27 +537,33 @@ export default class BrowserWindowRenderer
 
     // calling setBounds or setFullscreen may introduce -1px resolution error
     // so we try to avoid unnecessary calls
-    if (
-      areBoundsEqual(window.getBounds(), bounds) ||
-      (isFullscreen(bounds) && window.isFullScreen())
-    ) {
+    if (areBoundsEqual(window.getBounds(), bounds)) {
       this.logger.info(
         `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds3: bounds are equal`
       );
       return;
     }
 
-    if (isFullscreen(bounds)) {
+    if (isFullscreen(bounds) !== window.isFullScreen()) {
       this.logger.info(
-        `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds4: full screen`
+        `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds4: setFullScreen`
       );
-      window.setFullScreen(true);
-    } else {
-      // setBounds will be ignored if window was in fullscreen mode
-      window.setFullScreen(false);
-      window.setBounds(bounds);
+      window.setFullScreen(isFullscreen(bounds));
     }
 
+    this.logger.info(
+      `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds5: before: ${JSON.stringify(
+        {
+          fullscreen: window.isFullScreen(),
+          bounds: window.getBounds(),
+          contentBounds: window.getContentBounds(),
+          normalBounds: window.getNormalBounds(),
+        }
+      )}`
+    );
+
+    window.setBounds(bounds);
+
     this.logger.info(
       `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds6: before: ${JSON.stringify(
         {
@@ -563,12 +574,41 @@ export default class BrowserWindowRenderer
         }
       )}`
     );
+
+    if (window.isFullScreen() && !isFullscreen(window.getBounds())) {
+      this.logger.info(
+        `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds7: window not fullscreen: ${JSON.stringify(
+          {
+            fullscreen: window.isFullScreen(),
+            bounds: window.getBounds(),
+            contentBounds: window.getContentBounds(),
+            normalBounds: window.getNormalBounds(),
+          }
+        )}`
+      );
+      window.maximize();
+    }
+
+    this.logger.info(
+      `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds8: last: ${JSON.stringify(
+        {
+          fullscreen: window.isFullScreen(),
+          bounds: window.getBounds(),
+          contentBounds: window.getContentBounds(),
+          normalBounds: window.getNormalBounds(),
+        }
+      )}`
+    );
   }
 
   private getWindow(windowId: string): BrowserWindowRendererWindow | null {
     return this.windows[windowId];
   }
 
+  private getWindowBounds(windowId: string): WindowBounds | null {
+    return this.windowsBounds[windowId];
+  }
+
   private moveWindowOffscreen(window: BrowserWindowRendererWindow) {
     if (!(window.view instanceof BrowserView)) {
       throw new Error(