@netless/window-manager 1.0.13-beta.0 → 1.0.13-test.1

package/package.json

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

package/src/App/AppProxy.ts

@@ -216,7 +216,7 @@ export class AppProxy implements PageRemoveService {
                 }
                 setTimeout(async () => {
                     // 延迟执行 setup, 防止初始化的属性没有更新成功
-                    console.log("setup app", app);
+                    this.Logger?.info(`[WindowManager]: setup app ${this.kind}, appId: ${appId}`);
                     const result = await app.setup(context);
                     this.appResult = result;
                     appRegister.notifyApp(this.kind, "created", { appId, result });
@@ -538,6 +538,7 @@ export class AppProxy implements PageRemoveService {
             await appRegister.notifyApp(this.kind, "destroy", { appId: this.id });
             await this.appEmitter.emit("destroy", { error });
         } catch (error) {
+            this.Logger?.error(`[WindowManager]: notifyApp error: ${error.message}`);
             console.error("[WindowManager]: notifyApp error", error.message, error.stack);
         }
         this.appEmitter.clearListeners();
@@ -560,6 +561,7 @@ export class AppProxy implements PageRemoveService {
         this.manager.refresher.remove(this.stateKey);
         this.manager.refresher.remove(`${this.id}-fullPath`);
         this._prevFullPath = undefined;
+        this.Logger?.info(`[WindowManager]: destroy app ${this.kind} appId: ${this.id}`);
     }
 
     public close(): Promise<void> {

package/src/AppListener.ts

@@ -47,6 +47,7 @@ export class AppListeners {
                     break;
                 }
                 case Events.SetMainViewScenePath: {
+                    console.log("[window-manager] mainMagixEventListener====>", data.payload);
                     this.setMainViewScenePathHandler(data.payload);
                     break;
                 }

package/src/AppManager.ts

@@ -51,6 +51,7 @@ 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";
@@ -133,6 +134,7 @@ export class AppManager {
         this.createRootDirScenesCallback();
 
         appRegister.setSyncRegisterApp(payload => {
+            this.Logger?.info(`[WindowManager] syncRegisterApp ${JSON.stringify(payload)}`);
             this.safeUpdateAttributes([Fields.Registered, payload.kind], payload);
         });
     }
@@ -602,7 +604,9 @@ export class AppManager {
                     try {
                         const appAttributes = this.attributes[id];
                         if (!appAttributes) {
-                            this.Logger?.error(`[WindowManager]: appAttributes is undefined, appId: ${id}`);
+                            this.Logger?.error(
+                                `[WindowManager]: appAttributes is undefined, appId: ${id}`
+                            );
                             throw new Error("appAttributes is undefined");
                         }
 
@@ -725,7 +729,9 @@ export class AppManager {
 
     public async addApp(params: AddAppParams, isDynamicPPT: boolean): Promise<string | undefined> {
         log("addApp", params);
-        this.windowManger.Logger?.info(`[WindowManager]: addApp ${params.kind}, isDynamicPPT: ${isDynamicPPT}`);
+        this.windowManger.Logger?.info(
+            `[WindowManager]: addApp ${params.kind}, isDynamicPPT: ${isDynamicPPT}`
+        );
         const { appId, needFocus } = await this.beforeAddApp(params, isDynamicPPT);
         const appProxy = await this.baseInsertApp(params, appId, true, needFocus);
         this.afterAddApp(appProxy);
@@ -774,7 +780,9 @@ export class AppManager {
         focus?: boolean
     ) {
         if (this.appProxies.has(appId)) {
-            this.windowManger.Logger?.warn(`[WindowManager]: app duplicate exists and cannot be created again, appId: ${appId}`);
+            this.windowManger.Logger?.warn(
+                `[WindowManager]: app duplicate exists and cannot be created again, appId: ${appId}`
+            );
             return;
         }
         const AppProxyClass = getExtendClass(AppProxy, WindowManager.extendClass);
@@ -833,6 +841,7 @@ export class AppManager {
                 throw new Error(`[WindowManager]: ${scenePath} not valid scene`);
             } else if (scenePathType === ScenePathType.Page) {
                 await this._setMainViewScenePath(scenePath);
+
             } else if (scenePathType === ScenePathType.Dir) {
                 const validScenePath = makeValidScenePath(this.displayer, scenePath);
                 if (validScenePath) {
@@ -845,6 +854,7 @@ export class AppManager {
     private async _setMainViewScenePath(scenePath: string) {
         const success = this.setMainViewFocusPath(scenePath);
         if (success) {
+            console.log("[window-manager] _setMainViewScenePath====>", scenePath);
             this.safeSetAttributes({ _mainScenePath: scenePath });
             this.store.setMainViewFocusPath(this.mainView);
             this.updateSceneIndex();
@@ -861,6 +871,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);
                 this.safeSetAttributes({ _mainSceneIndex: index });
             }
         }
@@ -886,6 +897,7 @@ export class AppManager {
     }
 
     private dispatchSetMainViewScenePath(scenePath: string): void {
+        console.log("[window-manager] dispatchSetMainViewScenePath====>", scenePath);
         this.dispatchInternalEvent(Events.SetMainViewScenePath, { nextScenePath: scenePath });
         callbacks.emit("mainViewScenePathChange", scenePath);
         // 兼容 15 的 SDK, 需要 room 的当前 ScenePath
@@ -966,3 +978,4 @@ export class AppManager {
         this._resolveTimer = undefined;
     }
 }
+

package/src/AttributesDelegate.ts

@@ -194,10 +194,12 @@ export class AttributesDelegate {
     }
 
     public setMainViewScenePath(scenePath: string) {
+        console.log("[window-manager] setMainViewScenePath====>", scenePath);
         this.context.safeSetAttributes({ _mainScenePath: scenePath });
     }
 
     public setMainViewSceneIndex(index: number) {
+        console.log("[window-manager] setMainViewSceneIndex====>", index);
         this.context.safeSetAttributes({ _mainSceneIndex: index });
     }
 
@@ -210,16 +212,19 @@ export class AttributesDelegate {
     }
 
     public setMainViewCamera(camera: ICamera) {
+        console.log("[window-manager] setMainViewCamera", camera);
         this.context.safeSetAttributes({ [Fields.MainViewCamera]: { ...camera } });
     }
 
     public setMainViewSize(size: ISize) {
         if (size.width === 0 || size.height === 0) return;
+        console.log("[window-manager] setMainViewSize", 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", camera, size);
         this.context.safeSetAttributes({
             [Fields.MainViewCamera]: { ...camera },
             [Fields.MainViewSize]: { ...size },

package/src/Utils/Common.ts

@@ -34,6 +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);
             room.setScenePath(nextScenePath);
         }
     }

package/src/View/MainView.ts

@@ -33,6 +33,7 @@ export class MainViewProxy {
             this.startListenWritableChange();
         });
         const playgroundSizeChangeListener = () => {
+            console.log("[window-manager] playgroundSizeChangeListener====>", this.mainViewSize);
             this.sizeChangeHandler(this.mainViewSize);
         };
         this.sideEffectManager.add(() => {
@@ -97,6 +98,7 @@ export class MainViewProxy {
     }
 
     public start() {
+        console.log("[window-manager] start====>", this.mainViewSize);
         this.sizeChangeHandler(this.mainViewSize);
         if (this.started) return;
         this.addCameraListener();
@@ -120,6 +122,7 @@ export class MainViewProxy {
             () => this.mainViewCamera,
             camera => {
                 if (camera && camera.id !== this.manager.uid) {
+                    console.log("[window-manager] cameraReaction====>", camera, this.mainViewSize);
                     this.moveCameraToContian(this.mainViewSize);
                     this.moveCamera(camera);
                 }
@@ -130,6 +133,7 @@ export class MainViewProxy {
 
     public sizeChangeHandler = debounce((size: Size) => {
         if (size) {
+            console.log("[window-manager] sizeChangeHandler====>", size, this.mainViewCamera);
             this.moveCameraToContian(size);
             this.moveCamera(this.mainViewCamera);
         }
@@ -138,6 +142,7 @@ export class MainViewProxy {
 
     public onUpdateContainerSizeRatio = () => {
         const size = this.store.getMainViewSize();
+        console.log("[window-manager] onUpdateContainerSizeRatio====>", size);
         this.sizeChangeHandler(size);
     };
 

package/src/index.ts

@@ -286,8 +286,14 @@ export class WindowManager
             manager = await this.initManager(room);
             if (manager) {
                 manager._roomLogger = (room as unknown as { logger: Logger }).logger;
+                if (WindowManager.registered.size > 0) {
+                    manager._roomLogger.info(
+                        `[WindowManager] registered apps: ${JSON.stringify(
+                            Array.from(WindowManager.registered.keys())
+                        )}`
+                    );
+                }
             }
-
         }
         if (WindowManager.isCreated) {
             throw new Error("[WindowManager]: Already created cannot be created again");
@@ -297,7 +303,13 @@ export class WindowManager
         if (this.debug) {
             setOptions({ verbose: true });
         }
-        log("Already insert room", manager);
+        if (manager?._roomLogger) {
+            manager._roomLogger.info(
+                `[WindowManager] Already insert room version: ${manager.version}`
+            );
+        } else {
+            log("Already insert room", manager);
+        }
 
         if (isRoom(this.displayer)) {
             if (!manager) {
@@ -356,12 +368,25 @@ export class WindowManager
         replaceRoomFunction(room, manager);
         internalEmitter.emit("onCreated");
         WindowManager.isCreated = true;
+        if (
+            manager._roomLogger &&
+            manager.attributes.registered &&
+            Object.keys(manager.attributes.registered).length > 0
+        ) {
+            manager._roomLogger.info(
+                `[WindowManager] attributes registered apps: ${JSON.stringify(
+                    Array.from(Object.keys(manager.attributes.registered))
+                )}`
+            );
+        }
         try {
             await initDb();
         } catch (error) {
+            manager._roomLogger?.warn(`[WindowManager] indexedDB open failed: ${error.message}`);
             console.warn("[WindowManager]: indexedDB open failed");
             console.log(error);
         }
+
         return manager;
     }