@raydiant/playlist-window-manager 0.0.0-test-2 → 0.0.0-test-4

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);
@@ -109,7 +110,7 @@ var BrowserViewRenderer = /** @class */ (function () {
                 if (!parentWindowId) {
                     window.view.setAutoResize({
                         width: true,
-                        height: false,
+                        height: true,
                     });
                 }
                 return [2 /*return*/];

package/build/BrowserWindowRenderer.js

@@ -93,8 +93,14 @@ 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);
+        opts.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts constructor2 ".concat(JSON.stringify({
+            bounds: this.offscreenWindow.getBounds(),
+            normalBounds: this.offscreenWindow.getNormalBounds(),
+            contentBounds: this.offscreenWindow.getContentBounds(),
+        })));
+        this.offscreenWindow.maximize(); // TODO zlv added
         if (opts.proxySettings) {
             this.proxySettings = opts.proxySettings;
         }
@@ -166,6 +172,11 @@ var BrowserWindowRenderer = /** @class */ (function () {
                         window.view.webContents.on('unresponsive', window.unresponsiveCallback);
                         if (window.view instanceof electron_1.BrowserView) {
                             this.moveWindowOffscreen(window);
+                            this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts createWindow2: ".concat(JSON.stringify({
+                                bounds: this.offscreenWindow.getBounds(),
+                                normalBounds: this.offscreenWindow.getNormalBounds(),
+                                contentBounds: this.offscreenWindow.getContentBounds(),
+                            })));
                         }
                         this.windows[windowId] = window;
                         // Listen for messages from window.
@@ -175,8 +186,9 @@ var BrowserWindowRenderer = /** @class */ (function () {
                             // Electron issue: https://github.com/electron/electron/issues/20357
                             window.view.setBackgroundColor(backgroundColor === 'transparent' ? '#00000000' : backgroundColor);
                         }
-                        this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts createWindow2: ".concat(JSON.stringify(window.bounds)));
+                        this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts createWindow3: ".concat(JSON.stringify(window.bounds)));
                         window.view.setBounds(window.bounds);
+                        this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts createWindow4: ".concat(JSON.stringify(window.view.getBounds())));
                         if (!this.proxySettings) return [3 /*break*/, 2];
                         return [4 /*yield*/, window.view.webContents.session.setProxy(this.proxySettings)];
                     case 1:

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,

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-2",
+  "version": "0.0.0-test-4",
   "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) {
@@ -72,7 +82,7 @@ export default class BrowserViewRenderer implements PresentationWindowRenderer {
     if (!parentWindowId) {
       window.view.setAutoResize({
         width: true,
-        height: false,
+        height: true,
       });
     }
   }

package/src/BrowserWindowRenderer.ts

@@ -72,8 +72,23 @@ 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);
+    opts.logger.info(
+      `playlist-window-manager/src/BrowserWindowRenderer.ts constructor2 ${JSON.stringify(
+        {
+          bounds: this.offscreenWindow.getBounds(),
+          normalBounds: this.offscreenWindow.getNormalBounds(),
+          contentBounds: this.offscreenWindow.getContentBounds(),
+        }
+      )}`
+    );
+
+    this.offscreenWindow.maximize(); // TODO zlv added
     if (opts.proxySettings) {
       this.proxySettings = opts.proxySettings;
     }
@@ -189,6 +204,15 @@ export default class BrowserWindowRenderer
 
     if (window.view instanceof BrowserView) {
       this.moveWindowOffscreen(window);
+      this.logger.info(
+        `playlist-window-manager/src/BrowserWindowRenderer.ts createWindow2: ${JSON.stringify(
+          {
+            bounds: this.offscreenWindow.getBounds(),
+            normalBounds: this.offscreenWindow.getNormalBounds(),
+            contentBounds: this.offscreenWindow.getContentBounds(),
+          }
+        )}`
+      );
     }
 
     this.windows[windowId] = window;
@@ -204,11 +228,16 @@ export default class BrowserWindowRenderer
     }
 
     this.logger.info(
-      `playlist-window-manager/src/BrowserWindowRenderer.ts createWindow2: ${JSON.stringify(
+      `playlist-window-manager/src/BrowserWindowRenderer.ts createWindow3: ${JSON.stringify(
         window.bounds
       )}`
     );
     window.view.setBounds(window.bounds);
+    this.logger.info(
+      `playlist-window-manager/src/BrowserWindowRenderer.ts createWindow4: ${JSON.stringify(
+        window.view.getBounds()
+      )}`
+    );
 
     if (this.proxySettings) {
       await window.view.webContents.session.setProxy(this.proxySettings);

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,

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.