@netless/window-manager 1.0.17 → 1.0.18

package/package.json

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

package/src/AppManager.ts

@@ -745,8 +745,19 @@ export class AppManager {
     public setMainViewFocusPath(scenePath?: string) {
         const focusScenePath = scenePath || this.store.getMainViewScenePath();
         if (focusScenePath) {
-            setViewFocusScenePath(this.mainView, focusScenePath);
-            return this.mainView?.focusScenePath === focusScenePath;
+            try {
+                setViewFocusScenePath(this.mainView, focusScenePath);
+                return this.mainView?.focusScenePath === focusScenePath;
+            } catch (error) {
+                const cause = error instanceof Error ? error : new Error(String(error));
+                this.Logger?.error(
+                    `[WindowManager]: set main view focus scene path failed, ` +
+                        `focusScenePath: ${focusScenePath}, ` +
+                        `didRelease: ${Boolean((this.mainView as any).didRelease)}, ` +
+                        `error: ${cause.message}, stack: ${cause.stack || ""}`
+                );
+                return false;
+            }
         }
     }
 

package/src/Register/storage.ts

@@ -8,8 +8,8 @@ export type Item = {
     sourceCode: string;
 };
 
-export const initDb = async () => {
-    db = await createDb();
+export const initDb = async (onBlocked?: () => void) => {
+    db = await createDb(onBlocked);
 };
 
 export const setItem = (key: string, val: any) => {
@@ -27,12 +27,15 @@ export const removeItem = (key: string) => {
     return deleteRecord(db, key);
 };
 
-function createDb(): Promise<IDBDatabase> {
+function createDb(onBlocked?: () => void): Promise<IDBDatabase> {
     return new Promise((resolve, reject) => {
         const request = indexedDB.open(DatabaseName, 2);
         request.onerror = e => {
             reject(e);
         };
+        request.onblocked = () => {
+            onBlocked?.();
+        };
 
         request.onupgradeneeded = (event: any) => {
             const db = event.target.result as IDBDatabase;

package/src/index.ts

@@ -357,8 +357,14 @@ export class WindowManager
             }
         }
         if (WindowManager.isCreated) {
+            manager?._roomLogger?.error(
+                "[WindowManager] mount duplicate check failed: isCreated=true"
+            );
             throw new Error("[WindowManager]: Already created cannot be created again");
         }
+        manager?._roomLogger?.info(
+            `[WindowManager] mount duplicate check passed: isCreated=${WindowManager.isCreated}`
+        );
 
         this.debug = Boolean(debug);
         if (manager?._roomLogger) {
@@ -440,7 +446,11 @@ export class WindowManager
             );
         }
         try {
-            await initDb();
+            manager._roomLogger?.info("[WindowManager] indexedDB open start");
+            await initDb(() => {
+                manager?._roomLogger?.warn("[WindowManager] indexedDB open blocked");
+            });
+            manager._roomLogger?.info("[WindowManager] indexedDB open success");
         } catch (error) {
             manager._roomLogger?.warn(`[WindowManager] indexedDB open failed: ${error.message}`);
             console.warn("[WindowManager]: indexedDB open failed");