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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "1.0.13-beta.0",
+  "version": "1.0.13-beta.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/AppManager.ts

@@ -133,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);
         });
     }
@@ -602,7 +603,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 +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}`);
+        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 +779,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);

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;
     }