@netless/window-manager 1.0.12 → 1.0.13-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "1.0.12",
+  "version": "1.0.13-beta.1",
   "description": "Multi-window mode for Netless Whiteboard",
   "author": "l1shen <lishen1635@gmail.com> (https://github.com/l1shen)",
   "license": "MIT",
@@ -23,7 +23,7 @@
   },
   "peerDependencies": {
     "jspdf": "2.5.1",
-    "white-web-sdk": "^2.16.52"
+    "white-web-sdk": "^2.16.53"
   },
   "peerDependenciesMeta": {
     "jspdf": {
@@ -72,6 +72,6 @@
     "typescript": "^4.5.5",
     "vite": "^2.9.9",
     "vitest": "^0.14.1",
-    "white-web-sdk": "^2.16.52"
+    "white-web-sdk": "^2.16.53"
   }
 }

package/src/App/AppProxy.ts

@@ -120,6 +120,10 @@ export class AppProxy implements PageRemoveService {
         return this.store.getAppAttributes(this.id);
     }
 
+    public get Logger() {
+        return this.manager.windowManger.Logger;
+    }
+
     public getFullScenePath(): string | undefined {
         if (this.scenePath) {
             return get(this.appAttributes, [Fields.FullPath]) || this.getFullScenePathFromScenes();
@@ -145,6 +149,7 @@ export class AppProxy implements PageRemoveService {
     ): Promise<{ appId: string; app: NetlessApp }> {
         const params = this.params;
         if (!params.kind) {
+            this.Logger?.error(`[WindowManager]: kind require`);
             throw new Error("[WindowManager]: kind require");
         }
         const appImpl = await appRegister.appClasses.get(params.kind)?.();
@@ -162,6 +167,7 @@ export class AppProxy implements PageRemoveService {
                 params.isDragContent
             );
         } else {
+            this.Logger?.error(`[WindowManager]: app load failed ${params.kind} ${params.src}`);
             throw new Error(`[WindowManager]: app load failed ${params.kind} ${params.src}`);
         }
         internalEmitter.emit("updateManagerRect");
@@ -210,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 });
@@ -245,7 +251,7 @@ export class AppProxy implements PageRemoveService {
                 this.boxManager.focusBox({ appId }, false);
             }
         } catch (error: any) {
-            console.error(error);
+            this.Logger?.error(`[WindowManager]: app setup error: ${error.message}`);
             throw new Error(`[WindowManager]: app setup error: ${error.message}`);
         }
     }
@@ -532,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();
@@ -554,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/AppManager.ts

@@ -94,11 +94,6 @@ export class AppManager {
 
     constructor(public windowManger: WindowManager) {
         this.displayer = windowManger.displayer;
-        // this.store.setContext({
-        //     getAttributes: () => this.attributes,
-        //     safeSetAttributes: attributes => this.safeSetAttributes(attributes),
-        //     safeUpdateAttributes: (keys, val) => this.safeUpdateAttributes(keys, val),
-        // });
         this.store = createAttributesDelegate(WindowManager.extendClass, {
             getAttributes: () => this.attributes,
             safeSetAttributes: attributes => this.safeSetAttributes(attributes),
@@ -138,6 +133,7 @@ export class AppManager {
         this.createRootDirScenesCallback();
 
         appRegister.setSyncRegisterApp(payload => {
+            this.Logger?.info(`[WindowManager] syncRegisterApp ${JSON.stringify(payload)}`);
             this.safeUpdateAttributes([Fields.Registered, payload.kind], payload);
         });
     }
@@ -333,6 +329,10 @@ export class AppManager {
         return this.room?.uid || "";
     }
 
+    public get Logger() {
+        return this.windowManger.Logger;
+    }
+
     public getMainViewSceneDir() {
         const scenePath = this.store.getMainViewScenePath();
         if (scenePath) {
@@ -603,6 +603,9 @@ export class AppManager {
                     try {
                         const appAttributes = this.attributes[id];
                         if (!appAttributes) {
+                            this.Logger?.error(
+                                `[WindowManager]: appAttributes is undefined, appId: ${id}`
+                            );
                             throw new Error("appAttributes is undefined");
                         }
 
@@ -725,6 +728,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}`
+        );
         const { appId, needFocus } = await this.beforeAddApp(params, isDynamicPPT);
         const appProxy = await this.baseInsertApp(params, appId, true, needFocus);
         this.afterAddApp(appProxy);
@@ -773,7 +779,9 @@ export class AppManager {
         focus?: boolean
     ) {
         if (this.appProxies.has(appId)) {
-            console.warn("[WindowManager]: app duplicate exists and cannot be created again");
+            this.windowManger.Logger?.warn(
+                `[WindowManager]: app duplicate exists and cannot be created again, appId: ${appId}`
+            );
             return;
         }
         const AppProxyClass = getExtendClass(AppProxy, WindowManager.extendClass);
@@ -784,6 +792,7 @@ export class AppManager {
             return appProxy;
         } else {
             this.appStatus.delete(appId);
+            this.Logger?.error(`[WindowManager]: initialize AppProxy failed, appId: ${appId}`);
             throw new Error("[WindowManger]: initialize AppProxy failed");
         }
     }
@@ -823,9 +832,11 @@ export class AppManager {
             const scenePathType = this.displayer.scenePathType(scenePath);
             const sceneDir = parseSceneDir(scenePath);
             if (sceneDir !== ROOT_DIR) {
+                this.Logger?.error(`[WindowManager]: main view scenePath must in root dir "/"`);
                 throw new Error(`[WindowManager]: main view scenePath must in root dir "/"`);
             }
             if (scenePathType === ScenePathType.None) {
+                this.Logger?.error(`[WindowManager]: ${scenePath} not valid scene`);
                 throw new Error(`[WindowManager]: ${scenePath} not valid scene`);
             } else if (scenePathType === ScenePathType.Page) {
                 await this._setMainViewScenePath(scenePath);
@@ -875,6 +886,7 @@ export class AppManager {
                     this.dispatchSetMainViewScenePath(scenePath);
                 }
             } else {
+                this.Logger?.error(`[WindowManager]: ${index} not valid index`);
                 throw new Error(`[WindowManager]: ${index} not valid index`);
             }
         }

package/src/index.ts

@@ -47,6 +47,7 @@ import type {
     Player,
     ImageInformation,
     SceneState,
+    Logger,
 } from "white-web-sdk";
 import type { AppListeners } from "./AppListener";
 import type { ApplianceIcons, NetlessApp, RegisterParams } from "./typings";
@@ -242,6 +243,12 @@ export class WindowManager
 
     private extendPluginManager?: ExtendPluginManager;
 
+    private _roomLogger?: Logger;
+
+    get Logger(): Logger | undefined {
+        return this._roomLogger;
+    }
+
     constructor(context: InvisiblePluginContext) {
         super(context);
         WindowManager.displayer = context.displayer;
@@ -277,6 +284,16 @@ export class WindowManager
                 room.disableSerialization = false;
             }
             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");
@@ -286,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) {
@@ -345,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;
     }