@netless/window-manager 0.4.15 → 0.4.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "0.4.15",
+  "version": "0.4.16",
   "description": "",
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",

package/src/AppListener.ts

@@ -99,6 +99,8 @@ export class AppListeners {
     };
 
     private rootDirRemovedHandler = () => {
-        this.manager.onRootDirRemoved();
-    };
+        this.manager.createRootDirScenesCallback();
+        this.manager.mainViewProxy.rebind();
+        emitter.emit("rootDirRemoved");
+    }
 }

package/src/AppManager.ts

@@ -59,6 +59,8 @@ export class AppManager {
 
     public sceneState: SceneState | null = null;
 
+    public rootDirRemoving = false;
+
     constructor(public windowManger: WindowManager) {
         this.displayer = windowManger.displayer;
         this.store.setContext({
@@ -106,10 +108,10 @@ export class AppManager {
         });
     }
 
-    private onRemoveScenes = (scenePath: string) => {
+    private onRemoveScenes = async (scenePath: string) => {
         // 如果移除根目录就把 scenePath 设置为初始值
         if (scenePath === ROOT_DIR) {
-            this.onRootDirRemoved();
+            await this.onRootDirRemoved();
             this.dispatchInternalEvent(Events.RootDirRemoved);
             return;
         }
@@ -127,19 +129,22 @@ export class AppManager {
      * 根目录被删除时所有的 scene 都会被删除.
      * 所以需要关掉所有开启了 view 的 app
      */
-    public onRootDirRemoved() {
+    public async onRootDirRemoved(needClose = true) {
+        this.rootDirRemoving =  true;
         this.setMainViewScenePath(INIT_DIR);
-        this.createRootDirScenesCallback();
 
-        this.appProxies.forEach(appProxy => {
+        this.createRootDirScenesCallback();
+        
+        for (const [id, appProxy] of this.appProxies.entries()) {
             if (appProxy.view) {
-                this.closeApp(appProxy.id);
+                await this.closeApp(id, needClose);
             }
-        });
+        }
         // 删除了根目录的 scenes 之后 mainview 需要重新绑定, 否则主白板会不能渲染
         this.mainViewProxy.rebind();
 
         emitter.emit("rootDirRemoved");
+        this.rootDirRemoving = false;
     }
 
     private onReadonlyChanged = () => {
@@ -159,7 +164,7 @@ export class AppManager {
         });
     };
 
-    private createRootDirScenesCallback = () => {
+    public createRootDirScenesCallback = () => {
         let isRecreate = false;
         if (this.callbacksNode) {
             this.callbacksNode.dispose();
@@ -361,14 +366,13 @@ export class AppManager {
             for (const { id } of orderBy(appsWithCreatedAt, "createdAt", "asc")) {
                 if (!this.appProxies.has(id) && !this.appStatus.has(id)) {
                     const app = apps[id];
-
-                    this.appStatus.set(id, AppStatus.StartCreate);
                     try {
                         const appAttributes = this.attributes[id];
                         if (!appAttributes) {
                             throw new Error("appAttributes is undefined");
                         }
                         this.appCreateQueue.push(() => {
+                            this.appStatus.set(id, AppStatus.StartCreate);
                             return this.baseInsertApp(
                                 {
                                     kind: app.kind,
@@ -505,10 +509,10 @@ export class AppManager {
         }
     }
 
-    public async closeApp(appId: string) {
+    public async closeApp(appId: string, needClose = true) {
         const appProxy = this.appProxies.get(appId);
         if (appProxy) {
-            appProxy.destroy(true, true, false);
+            appProxy.destroy(true, needClose, false);
         }
     }
 

package/src/AppProxy.ts

@@ -1,5 +1,5 @@
 import Emittery from "emittery";
-import { AppAttributes, AppEvents, Events } from "./constants";
+import { AppAttributes, AppEvents, Events, SETUP_APP_DELAY } from "./constants";
 import { AppContext } from "./AppContext";
 import { appRegister } from "./Register";
 import { autorun } from "white-web-sdk";
@@ -168,7 +168,7 @@ export class AppProxy {
                     appRegister.notifyApp(this.kind, "created", { appId, result });
                     this.afterSetupApp(boxInitState);
                     this.fixMobileSize();
-                }, 50);
+                }, SETUP_APP_DELAY);
             });
             this.boxManager?.createBox({
                 appId: appId,
@@ -346,6 +346,7 @@ export class AppProxy {
 
     public setViewFocusScenePath() {
         const fullPath = this.getFullScenePath();
+        console.log("setViewFocusScenePath", this.kind, this.id, fullPath)
         if (fullPath && this.view) {
             setViewFocusScenePath(this.view, fullPath);
         }
@@ -380,6 +381,7 @@ export class AppProxy {
         if (cleanAttrs) {
             this.store.cleanAppAttributes(this.id);
             if (this.scenePath) {
+                console.log("put closeApp", this.scenePath);
                 removeScenes(this.manager.room, this.scenePath);
             }
         }

package/src/Utils/AppCreateQueue.ts

@@ -1,5 +1,6 @@
 import { callbacks } from "../callback";
 import type { AppProxy } from "../AppProxy";
+import { SETUP_APP_DELAY } from "../constants";
 
 export type Invoker = () => Promise<AppProxy | undefined>;
 
@@ -60,11 +61,18 @@ export class AppCreateQueue {
 
     public emitReady() {
         if (!this.isEmit) {
-            callbacks.emit("ready");
+            setTimeout(() => {
+                callbacks.emit("ready");
+            }, SETUP_APP_DELAY);
         }
         this.isEmit = true;
     }
 
+    public empty() {
+        this.list = [];
+        this.clear();
+    }
+
     public destroy() {
         if (this.timer) {
             this.clear();

package/src/Utils/Common.ts

@@ -1,12 +1,12 @@
 import { appRegister } from "../Register";
 import { debounce } from "lodash";
 import { emitter } from "../InternalEmitter";
+import { ROOT_DIR } from "../constants";
 import { ScenePathType } from "white-web-sdk";
 import { v4 } from "uuid";
 import type { PublicEvent } from "../callback";
-import type { Displayer, ViewVisionMode, Room, View } from "white-web-sdk";
+import type { Displayer, ViewVisionMode, Room, View , SceneDefinition} from "white-web-sdk";
 import type Emittery from "emittery";
-import { ROOT_DIR } from "../constants";
 
 export const genAppId = async (kind: string) => {
     const impl = await appRegister.appClasses.get(kind)?.();
@@ -104,6 +104,9 @@ export const entireScenes = (displayer: Displayer) => {
     return displayer.entireScenes();
 };
 
+export const putScenes = (room: Room | undefined, path: string, scenes: SceneDefinition[]) => {
+    return room?.putScenes(path, scenes);
+}
 
 export const isValidScenePath = (scenePath: string) => {
     return scenePath.startsWith("/");

package/src/constants.ts

@@ -51,3 +51,5 @@ export const DEFAULT_CONTAINER_RATIO = 9 / 16;
 
 export const ROOT_DIR = "/";
 export const INIT_DIR = "/init";
+
+export const SETUP_APP_DELAY = 50;

package/src/index.ts

@@ -25,6 +25,7 @@ import {
     ensureValidScenePath,
     entireScenes,
     isValidScenePath,
+    putScenes,
     wait,
 } from "./Utils/Common";
 import type { TELE_BOX_STATE, BoxManager } from "./BoxManager";
@@ -387,6 +388,28 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
      * 创建一个 app 至白板
      */
     public async addApp<T = any>(params: AddAppParams<T>): Promise<string | undefined> {
+        if (this.appManager) {
+            // 移除根目录时需要做一些异步的释放操作 addApp 需要等待释放完成才可以继续添加
+            if (this.appManager.rootDirRemoving) {
+                return new Promise((resolve, reject) => {
+                    emitter.once("rootDirRemoved").then(async () => {
+                        try {
+                            const appId = await this._addApp(params);
+                            resolve(appId);
+                        } catch (error) {
+                            reject(error.message);
+                        }
+                    });
+                });
+            } else {
+                return this._addApp(params);
+            }
+        } else {
+            throw new AppManagerNotInitError();
+        }
+    }
+
+    private async _addApp<T = any>(params: AddAppParams<T>): Promise<string | undefined> {
         if (this.appManager) {
             if (!params.kind || typeof params.kind !== "string") {
                 throw new ParamsInvalidError();
@@ -438,16 +461,16 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
                 if (this.isDynamicPPT(scenes)) {
                     isDynamicPPT = true;
                     if (!entireScenes(this.displayer)[scenePath]) {
-                        this.room?.putScenes(scenePath, scenes);
+                        putScenes(this.room, scenePath, scenes);
                     }
                 } else {
                     if (!entireScenes(this.displayer)[scenePath]) {
-                        this.room?.putScenes(scenePath, [{ name: scenes[0].name }]);
+                        putScenes(this.room, scenePath, [{ name: scenes[0].name }]);
                     }
                 }
             }
             if (scenePath && scenes === undefined) {
-                this.room?.putScenes(scenePath, [{}]);
+                putScenes(this.room, scenePath, [{}]);
             }
         }
         return isDynamicPPT;