@netless/window-manager 1.0.9 → 1.0.10-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "1.0.9",
+  "version": "1.0.10-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

@@ -282,13 +282,16 @@ export class AppProxy implements PageRemoveService {
             await this.destroy(true, false, true);
             return;
         }
+        console.log('onReconnected====>', this.id);
         this.appEmitter.emit("reconnected", undefined);
         const currentAppState = this.getAppInitState(this.id);
+        console.log('onReconnected====>0000', currentAppState?.boxStatus);
         await this.destroy(true, false, true);
         const params = this.params;
         const AppProxyClass = getExtendClass(AppProxy, WindowManager.extendClass);
         const appProxy = new AppProxyClass(params, this.manager, this.id, this.isAddApp);
         await appProxy.baseInsertApp(true);
+        console.log('onReconnected====>', currentAppState?.boxStatus);
         this.boxManager?.updateBoxState(currentAppState);
     }
 

package/src/AppManager.ts

@@ -202,7 +202,7 @@ export class AppManager {
     };
 
     private onPlayerSeekDone = async (time: number) => {
-        await this.attributesUpdateCallback(this.attributes.apps);
+        await this._attributesUpdateCallback(this.attributes.apps);
         this.appProxies.forEach(appProxy => {
             appProxy.onSeek(time);
         });
@@ -351,11 +351,12 @@ export class AppManager {
                     resolve(this.appProxies.get(this._focusAppId || ""));
                 }, 500);
             }).then(() => {
+                this._resolveTimer = undefined;
+                this._focusAppCreatedResolve = undefined;
                 this.focusByAttributes(this.attributes.apps);
             });
         }
-        await this.attributesUpdateCallback(this.attributes.apps);
-        this.focusByAttributes(this.attributes.apps);
+        await this._attributesUpdateCallback(this.attributes.apps);
         internalEmitter.emit("updateManagerRect");
         boxEmitter.on("move", this.onBoxMove);
         boxEmitter.on("resize", this.onBoxResize);
@@ -404,6 +405,7 @@ export class AppManager {
         }
         this.displayerWritableListener(!this.room?.isWritable);
         this.displayer.callbacks.on("onEnableWriteNowChanged", this.displayerWritableListener);
+        this.focusByAttributes(this.attributes.apps);
         this._prevFocused = this.attributes.focus;
 
         if (!WindowManager.supportAppliancePlugin) {
@@ -465,6 +467,8 @@ export class AppManager {
     };
 
     private notifyBoxesStatusChange = debounce(() => {
+        console.log('setBoxesStatus====>', this.attributes.boxesStatus);
+        this.boxManager?.setBoxesStatus(this.attributes.boxesStatus);
         const entries = Object.entries(this.attributes.boxesStatus);
         if (entries.length > 0) {
             entries.forEach(([appId, status]) => {
@@ -474,14 +478,14 @@ export class AppManager {
                 }
             });
         }
-    }, 50);
+    }, 100);
 
     public addBoxesStatusChangeListener = () => {
         this.refresher.add("boxesStatus", () => {
             return safeListenPropsUpdated(
                 () => this.attributes.boxesStatus,
                 () => {
-                    this.boxManager?.setBoxesStatus(this.attributes.boxesStatus);
+                    console.log('setBoxesStatus====>000', this.attributes.boxesStatus);
                     this.notifyBoxesStatusChange();
                 }
             );
@@ -908,7 +912,7 @@ export class AppManager {
     }
 
     public async onReconnected() {
-        this.attributesUpdateCallback(this.attributes.apps);
+        await this._attributesUpdateCallback(this.attributes.apps);
         const appProxies = Array.from(this.appProxies.values());
         const reconnected = appProxies.map(appProxy => {
             return appProxy.onReconnected();

package/src/BoxManager.ts

@@ -410,7 +410,9 @@ export class BoxManager {
                     this.teleBoxManager.setMinimized(Boolean(state.minimized), true);
                 }
             }, 50);
-            this.context.callbacks.emit("boxStateChange", this.teleBoxManager.state);
+            if (!state.boxStatus) {
+                this.context.callbacks.emit("boxStateChange", this.teleBoxManager.state);
+            }
         }
     }