@netless/window-manager 1.0.13-test.2 → 1.0.13-test.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "1.0.13-test.2",
+  "version": "1.0.13-test.3",
   "description": "Multi-window mode for Netless Whiteboard",
   "author": "l1shen <lishen1635@gmail.com> (https://github.com/l1shen)",
   "license": "MIT",

package/src/AppListener.ts

@@ -47,18 +47,10 @@ export class AppListeners {
                     break;
                 }
                 case Events.SetMainViewScenePath: {
-                    console.log("[window-manager] mainMagixEventListener====>", JSON.stringify(data.payload));
+                    console.log("[window-manager] mainMagixEventListener  ", JSON.stringify(data.payload));
                     this.setMainViewScenePathHandler(data.payload);
                     break;
                 }
-                // case Events.MoveCamera: {
-                //     this.moveCameraHandler(data.payload);
-                //     break;
-                // }
-                // case Events.MoveCameraToContain: {
-                //     this.moveCameraToContainHandler(data.payload);
-                //     break;
-                // }
                 case Events.CursorMove: {
                     this.cursorMoveHandler(data.payload);
                     break;
@@ -103,17 +95,6 @@ export class AppListeners {
         callbacks.emit("mainViewScenePathChange", nextScenePath);
     };
 
-    // private moveCameraHandler = (
-    //     payload: Camera & { animationMode?: AnimationMode | undefined }
-    // ) => {
-    //     if (isEqual(omit(payload, ["animationMode"]), { ...this.manager.mainView.camera })) return;
-    //     this.manager.mainView.moveCamera(payload);
-    // };
-
-    // private moveCameraToContainHandler = (payload: any) => {
-    //     this.manager.mainView.moveCameraToContain(payload);
-    // };
-
     private cursorMoveHandler = (payload: any) => {
         internalEmitter.emit("cursorMove", payload);
     };

package/src/AppManager.ts

@@ -51,7 +51,6 @@ import type {
 } from "./BoxEmitter";
 import { getExtendClass } from "./Utils/extendClass";
 import type { TeleBoxState } from "@netless/telebox-insider";
-import { getAttribute } from "video.js/dist/types/utils/dom";
 
 export class AppManager {
     static readonly kind = "AppManager";
@@ -147,6 +146,7 @@ export class AppManager {
         const { scenePath } = params;
         // 如果移除根目录就把 scenePath 设置为初始值
         if (scenePath === ROOT_DIR) {
+            console.log("[window-manager] onRemoveScenes   ROOT_DIR");
             await this.onRootDirRemoved();
             this.dispatchInternalEvent(Events.RootDirRemoved);
             return;
@@ -159,6 +159,7 @@ export class AppManager {
                 sceneName = this.callbacksNode?.scenes[nextIndex];
             }
             if (sceneName) {
+                console.log("[window-manager] onRemoveScenes   setMainViewScenePath", `${ROOT_DIR}${sceneName}`);
                 this.setMainViewScenePath(`${ROOT_DIR}${sceneName}`);
             }
             await this.setMainViewSceneIndex(nextIndex);
@@ -710,6 +711,26 @@ export class AppManager {
         }
         internalEmitter.emit("mainViewMounted");
         callbacks.emit("onMainViewMounted", mainView);
+        const hasRoot = this.hasRoot(mainView.divElement);
+        const rect = this.getRectByDivElement(mainView.divElement);
+        console.log("[window-manager] bindMainView hasRoot", hasRoot, JSON.stringify(rect), window.outerHeight, window.outerWidth);
+    }
+
+    private hasRoot(divElement: HTMLDivElement){
+        let current = divElement;
+        while (current) {
+            if (current.parentElement === document.body) {
+                return true;
+            }
+            current = current.parentElement as HTMLDivElement;
+        }
+        return false;
+    }
+
+    private getRectByDivElement(divElement: HTMLDivElement){
+        // 获取当前divElement的矩形区域
+        const rect = divElement.getBoundingClientRect();
+        return rect;
     }
 
     public setMainViewFocusPath(scenePath?: string) {
@@ -854,7 +875,7 @@ export class AppManager {
     private async _setMainViewScenePath(scenePath: string) {
         const success = this.setMainViewFocusPath(scenePath);
         if (success) {
-            console.log("[window-manager] _setMainViewScenePath====>", scenePath);
+            console.log("[window-manager] _setMainViewScenePath  ", scenePath);
             this.safeSetAttributes({ _mainScenePath: scenePath });
             this.store.setMainViewFocusPath(this.mainView);
             this.updateSceneIndex();
@@ -871,7 +892,7 @@ export class AppManager {
             const pageName = scenePath.replace(sceneDir, "").replace("/", "");
             const index = scenes.findIndex(scene => scene.name === pageName);
             if (isInteger(index) && index >= 0) {
-                console.log("[window-manager] updateSceneIndex====>", index);
+                console.log("[window-manager] updateSceneIndex  ", index);
                 this.safeSetAttributes({ _mainSceneIndex: index });
             }
         }
@@ -897,7 +918,7 @@ export class AppManager {
     }
 
     private dispatchSetMainViewScenePath(scenePath: string): void {
-        console.log("[window-manager] dispatchSetMainViewScenePath====>", JSON.stringify(scenePath));
+        console.log("[window-manager] dispatchSetMainViewScenePath  ", JSON.stringify(scenePath));
         this.dispatchInternalEvent(Events.SetMainViewScenePath, { nextScenePath: scenePath });
         callbacks.emit("mainViewScenePathChange", scenePath);
         // 兼容 15 的 SDK, 需要 room 的当前 ScenePath

package/src/AttributesDelegate.ts

@@ -7,6 +7,7 @@ import type { Cursor } from "./Cursor/Cursor";
 import { getExtendClass } from "./Utils/extendClass";
 import type { ExtendClass } from "./Utils/extendClass";
 import type { NotMinimizedBoxState, TeleBoxState } from "@netless/telebox-insider";
+import { LocalConsole } from "./Utils/log";
 
 export enum Fields {
     Apps = "apps",
@@ -54,6 +55,7 @@ export type ISize = Size & { id: string };
 
 export class AttributesDelegate {
     static readonly kind = "AttributesDelegate";
+    private setMainViewCameraConsole = new LocalConsole("setMainViewCamera", 50);
     constructor(private context: StoreContext) {}
 
     public setContext(context: StoreContext) {
@@ -194,12 +196,12 @@ export class AttributesDelegate {
     }
 
     public setMainViewScenePath(scenePath: string) {
-        console.log("[window-manager] setMainViewScenePath====>", scenePath);
+        console.log("[window-manager] setMainViewScenePath  ", scenePath);
         this.context.safeSetAttributes({ _mainScenePath: scenePath });
     }
 
     public setMainViewSceneIndex(index: number) {
-        console.log("[window-manager] setMainViewSceneIndex====>", index);
+        console.log("[window-manager] setMainViewSceneIndex  ", index);
         this.context.safeSetAttributes({ _mainSceneIndex: index });
     }
 
@@ -212,19 +214,19 @@ export class AttributesDelegate {
     }
 
     public setMainViewCamera(camera: ICamera) {
-        console.log("[window-manager] setMainViewCamera====>", JSON.stringify(camera));
+        this.setMainViewCameraConsole.log(JSON.stringify(camera));
         this.context.safeSetAttributes({ [Fields.MainViewCamera]: { ...camera } });
     }
 
     public setMainViewSize(size: ISize) {
         if (size.width === 0 || size.height === 0) return;
-        console.log("[window-manager] setMainViewSize====>", JSON.stringify(size));
+        console.log("[window-manager] setMainViewSize  ", JSON.stringify(size));
         this.context.safeSetAttributes({ [Fields.MainViewSize]: { ...size } });
     }
 
     public setMainViewCameraAndSize(camera: ICamera, size: ISize) {
         if (size.width === 0 || size.height === 0) return;
-        console.log("[window-manager] setMainViewCameraAndSize====>", JSON.stringify(camera), JSON.stringify(size));
+        console.log("[window-manager] setMainViewCameraAndSize  ", JSON.stringify(camera), JSON.stringify(size));
         this.context.safeSetAttributes({
             [Fields.MainViewCamera]: { ...camera },
             [Fields.MainViewSize]: { ...size },

package/src/Utils/Common.ts

@@ -34,7 +34,7 @@ export const setScenePath = (room: Room | undefined, scenePath: string) => {
     if (room && room.isWritable) {
         if (room.state.sceneState.scenePath !== scenePath) {
             const nextScenePath = scenePath === "/" ? "" : scenePath;
-            console.log("[window-manager] real setScenePath for current room====>", nextScenePath);
+            console.log("[window-manager] real setScenePath for current room  ", nextScenePath);
             room.setScenePath(nextScenePath);
         }
     }

package/src/Utils/RoomHacker.ts

@@ -35,8 +35,11 @@ export const replaceRoomFunction = (room: Room | Player, manager: WindowManager)
         });
         const _scalePptToFit = room.scalePptToFit;
         room.scalePptToFit = (...args) => {
-            console.log("[window-manager] scalePptToFit====>", JSON.stringify(args));
             _scalePptToFit.call(room, ...args);
+            if (manager.appManager?.mainViewProxy) {
+                console.log("[window-manager] scalePptToFit  ", JSON.stringify(args));
+                manager.appManager.mainViewProxy.setCameraAndSize();
+            }
         };
         room.moveCamera = (camera: Camera) => manager.moveCamera(camera);
         room.moveCameraToContain = (...args) => manager.moveCameraToContain(...args);

package/src/Utils/log.ts

@@ -5,3 +5,40 @@ export const log = (...args: any[]): void => {
         console.log(`[WindowManager]:`, ...args);
     }
 };
+
+/**
+ * 按 `[window-manager][tagName]` 前缀输出。
+ * 若传入 `debounceTime`（毫秒）：窗口内多次 `log` 不立即输出，只在连续停止调用满 `debounceTime` 后输出**最后一次**的参数（尾部 debounce）。
+ */
+export class LocalConsole {
+    private pendingArgs: unknown[] | null = null;
+    private flushTimer: ReturnType<typeof setTimeout> | null = null;
+
+    constructor(
+        private readonly name: string,
+        private readonly debounceTime?: number,
+    ) {}
+
+    private flush(): void {
+        this.flushTimer = null;
+        const args = this.pendingArgs;
+        this.pendingArgs = null;
+        if (args === null) {
+            return;
+        }
+        console.log(`[window-manager][${this.name}]:`, ...args);
+    }
+
+    log(...args: unknown[]): void {
+        const ms = this.debounceTime;
+        if (ms != null && ms > 0) {
+            this.pendingArgs = args;
+            if (this.flushTimer != null) {
+                clearTimeout(this.flushTimer);
+            }
+            this.flushTimer = setTimeout(() => this.flush(), ms);
+            return;
+        }
+        console.log(`[window-manager][${this.name}]:`, ...args);
+    }
+}

package/src/View/MainView.ts

@@ -9,6 +9,7 @@ import { SideEffectManager } from "side-effect-manager";
 import type { Camera, Room, Size, View } from "white-web-sdk";
 import type { AppManager } from "../AppManager";
 import { Events } from "../constants";
+import { LocalConsole } from "../Utils/log";
 
 export class MainViewProxy {
     /** Refresh the view's camera in an interval of 1.5s. */
@@ -23,6 +24,8 @@ export class MainViewProxy {
 
     private sideEffectManager = new SideEffectManager();
 
+    private playgroundSizeChangeListenerLocalConsole = new LocalConsole("playgroundSizeChangeListener", 30);
+
     constructor(private manager: AppManager) {
         this.mainView = this.createMainView();
         this.moveCameraSizeByAttributes();
@@ -33,7 +36,8 @@ export class MainViewProxy {
             this.startListenWritableChange();
         });
         const playgroundSizeChangeListener = () => {
-            console.log("[window-manager] playgroundSizeChangeListener====>", JSON.stringify(this.mainViewSize));
+            // console.log("[window-manager] playgroundSizeChangeListener  ", JSON.stringify(this.mainViewSize), JSON.stringify(this.mainViewCamera));
+            this.playgroundSizeChangeListenerLocalConsole.log(JSON.stringify(this.mainViewSize), JSON.stringify(this.mainViewCamera));
             this.sizeChangeHandler(this.mainViewSize);
         };
         this.sideEffectManager.add(() => {
@@ -98,7 +102,7 @@ export class MainViewProxy {
     }
 
     public start() {
-        console.log("[window-manager] start====>", JSON.stringify(this.mainViewSize));
+        console.log("[window-manager] start  ", JSON.stringify(this.mainViewSize));
         this.sizeChangeHandler(this.mainViewSize);
         if (this.started) return;
         this.addCameraListener();
@@ -122,7 +126,7 @@ export class MainViewProxy {
             () => this.mainViewCamera,
             camera => {
                 if (camera && camera.id !== this.manager.uid) {
-                    console.log("[window-manager] cameraReaction====>", JSON.stringify(camera), JSON.stringify(this.mainViewSize));
+                    console.log("[window-manager] cameraReaction  ", JSON.stringify(camera), JSON.stringify(this.mainViewSize));
                     this.moveCameraToContian(this.mainViewSize);
                     this.moveCamera(camera);
                 }
@@ -133,16 +137,16 @@ export class MainViewProxy {
 
     public sizeChangeHandler = debounce((size: Size) => {
         if (size) {
+            console.log("[window-manager] sizeChangeHandler  current size and camera", JSON.stringify(size), JSON.stringify(this.mainViewCamera));
             this.moveCameraToContian(size);
             this.moveCamera(this.mainViewCamera);
-            console.log("[window-manager] sizeChangeHandler====> current size and camera", JSON.stringify(size), JSON.stringify(this.mainViewCamera));
         }
         this.ensureMainViewSize();
     }, 30);
 
     public onUpdateContainerSizeRatio = () => {
         const size = this.store.getMainViewSize();
-        console.log("[window-manager] onUpdateContainerSizeRatio====>", JSON.stringify(size));
+        console.log("[window-manager] onUpdateContainerSizeRatio  ", JSON.stringify(size));
         this.sizeChangeHandler(size);
     };
 
@@ -254,7 +258,6 @@ export class MainViewProxy {
             clearTimeout(this._syncMainViewTimer);
             this._syncMainViewTimer = setTimeout(this.syncMainView, 100, this.manager.room);
         }
-        console.log("[window-manager] onCameraOrSizeUpdated====>", JSON.stringify(this.cameraState));
         this.ensureMainViewSize();
     };
 
@@ -272,7 +275,7 @@ export class MainViewProxy {
 
     private syncMainView = (room: Room) => {
         if (room.isWritable) {
-            console.log("[window-manager] syncMainView====>");
+            console.log("[window-manager] syncMainView  ");
             room.syncMainView(this.mainView);
         }
     };

package/src/index.ts

@@ -253,6 +253,12 @@ export class WindowManager
         super(context);
         WindowManager.displayer = context.displayer;
         (window as any).NETLESS_DEPS = __APP_DEPENDENCIES__;
+        this.visibleStateListener();
+        document.addEventListener("visibilitychange", this.visibleStateListener);
+    }
+
+    private visibleStateListener = () => {
+        console.log("[window-manager] visibleStateListener  isVisible:", !document.hidden);
     }
 
     public static onCreate(manager: WindowManager) {
@@ -386,10 +392,11 @@ export class WindowManager
             console.warn("[WindowManager]: indexedDB open failed");
             console.log(error);
         }
-
         return manager;
     }
 
+    
+
     private static initManager(room: Room): Promise<WindowManager | undefined> {
         return createInvisiblePlugin(room);
     }
@@ -1011,7 +1018,6 @@ export class WindowManager
         const mainViewCamera = { ...this.mainView.camera };
         if (isEqual({ ...mainViewCamera, ...pureCamera }, mainViewCamera)) return;
         this.mainView.moveCamera(camera);
-        // this.appManager?.dispatchInternalEvent(Events.MoveCamera, camera);
         setTimeout(() => {
             this.appManager?.mainViewProxy.setCameraAndSize();
         }, 500);
@@ -1024,7 +1030,6 @@ export class WindowManager
             }>
     ): void {
         this.mainView.moveCameraToContain(rectangle);
-        // this.appManager?.dispatchInternalEvent(Events.MoveCameraToContain, rectangle);
         setTimeout(() => {
             this.appManager?.mainViewProxy.setCameraAndSize();
         }, 500);
@@ -1059,6 +1064,7 @@ export class WindowManager
             WindowManager.playground.parentNode?.removeChild(WindowManager.playground);
         }
         WindowManager.params = undefined;
+        document.removeEventListener("visibilitychange", this.visibleStateListener);
         this._iframeBridge?.destroy();
         this._iframeBridge = undefined;
         log("Destroyed");