@netless/window-manager 0.4.0-canary.15 → 0.4.0-canary.16

package/src/AppContext.ts

@@ -59,10 +59,7 @@ export class AppContext<TAttributes = any, TMagixEventPayloads = any, TAppOption
     public getScenes = (): SceneDefinition[] | undefined => {
         const appAttr = this.store.getAppAttributes(this.appId);
         if (appAttr?.isDynamicPPT) {
-            const appProxy = this.manager.appProxies.get(this.appId);
-            if (appProxy) {
-                return appProxy.scenes;
-            }
+            return this.appProxy.scenes;
         } else {
             return appAttr?.options["scenes"];
         }

package/src/AppProxy.ts

@@ -7,7 +7,7 @@ import { emitter } from "./index";
 import { Fields } from "./AttributesDelegate";
 import { debounce, get } from "lodash";
 import { log } from "./Utils/log";
-import { setScenePath, setViewFocusScenePath, getScenePath } from "./Utils/Common";
+import { setScenePath, setViewFocusScenePath, getScenePath, removeScenes } from "./Utils/Common";
 import type {
     AppEmitterEvent,
     AppInitState,
@@ -377,6 +377,9 @@ export class AppProxy extends Base {
         }
         if (cleanAttrs) {
             this.store.cleanAppAttributes(this.id);
+            if (this.scenePath) {
+                removeScenes(this.manager.room, this.scenePath);
+            }
         }
         this.appProxies.delete(this.id);
 

package/src/BoxManager.ts

@@ -5,6 +5,7 @@ import {
     TELE_BOX_STATE,
     TeleBoxCollector,
     TeleBoxManager,
+    TeleBoxConfig,
 } from "@netless/telebox-insider";
 import { emitter, WindowManager } from "./index";
 import type { AddAppOptions, AppInitState, EmitterType, CallbacksType } from "./index";
@@ -379,6 +380,10 @@ export class BoxManager {
         }
     }
 
+    public updateBox(id: string, payload: TeleBoxConfig, skipUpdate = true): void {
+        this.teleBoxManager.update(id, payload, skipUpdate);
+    }
+
     public setReadonly(readonly: boolean) {
         this.teleBoxManager.setReadonly(readonly);
     }

package/src/Register/index.ts

@@ -10,34 +10,39 @@ class AppRegister {
 
     public async register(params: RegisterParams): Promise<void> {
         this.registered.set(params.kind, params);
-        
-        const srcOrAppOrFunction = params.src
-        let downloadApp: () => Promise<NetlessApp>
-        
+
+        const srcOrAppOrFunction = params.src;
+        let downloadApp: () => Promise<NetlessApp>;
+
         if (typeof srcOrAppOrFunction === "string") {
             downloadApp = async () => {
-                const appClass = await loadApp(srcOrAppOrFunction, params.kind);
+                let appClass = (await loadApp(srcOrAppOrFunction, params.kind)) as any;
                 if (appClass) {
-                    return appClass
+                    if (appClass.__esModule) {
+                        appClass = appClass.default;
+                    }
+                    return appClass;
                 } else {
-                    throw new Error(`[WindowManager]: load remote script failed, ${srcOrAppOrFunction}`);
+                    throw new Error(
+                        `[WindowManager]: load remote script failed, ${srcOrAppOrFunction}`
+                    );
                 }
-            }
+            };
         } else if (typeof srcOrAppOrFunction === "function") {
-            downloadApp = srcOrAppOrFunction
+            downloadApp = srcOrAppOrFunction;
         } else {
-            downloadApp = async () => srcOrAppOrFunction
+            downloadApp = async () => srcOrAppOrFunction;
         }
 
         this.appClasses.set(params.kind, async () => {
-            let app = this.appClassesCache.get(params.kind)
+            let app = this.appClassesCache.get(params.kind);
             if (!app) {
-                app = downloadApp()
-                this.appClassesCache.set(params.kind, app)
+                app = downloadApp();
+                this.appClassesCache.set(params.kind, app);
             }
-            return app
+            return app;
         });
-        
+
         if (params.addHooks) {
             const emitter = this.createKindEmitter(params.kind);
             if (emitter) {
@@ -46,7 +51,11 @@ class AppRegister {
         }
     }
 
-    public async notifyApp<T extends keyof RegisterEvents>(kind: string, event: T, payload: RegisterEvents[T]) {
+    public async notifyApp<T extends keyof RegisterEvents>(
+        kind: string,
+        event: T,
+        payload: RegisterEvents[T]
+    ) {
         const emitter = this.kindEmitters.get(kind);
         await emitter?.emit(event, payload);
     }

package/src/Register/loader.ts

@@ -8,7 +8,7 @@ const TIMEOUT = 10000; // 10 秒超时
 export const getScript = async (url: string): Promise<string> => {
     const item = await getItem(url);
     if (item) {
-        return item;
+        return item.sourceCode;
     } else {
         const result = await fetchWithTimeout(url, { timeout: TIMEOUT });
         const text = await result.text();

package/src/Register/storage.ts

@@ -3,6 +3,11 @@ const DatabaseName = "__WindowManagerAppCache";
 let db: IDBDatabase;
 let store: IDBObjectStore;
 
+export type Item = {
+    kind: string;
+    sourceCode: string;
+}
+
 export const initDb = async () => {
     db = await createDb();
 }
@@ -12,7 +17,7 @@ export const setItem = (key: string, val: any) => {
     return addRecord(db, { kind: key, sourceCode: val })
 };
 
-export const getItem = async (key: string): Promise<string | null> => {
+export const getItem = async (key: string): Promise<Item | null> => {
     if (!db) return null;
     return await query(db, key);
 };

package/src/Utils/Common.ts

@@ -1,6 +1,7 @@
 import { appRegister } from "../Register";
 import { debounce } from "lodash";
 import { emitter } from "../index";
+import { ScenePathType } from "white-web-sdk";
 import { v4 } from "uuid";
 import type { PublicEvent } from "../index";
 import type { Displayer, ViewVisionMode, Room, View } from "white-web-sdk";
@@ -26,7 +27,7 @@ export const setViewSceneIndex = (view: View, index: number) => {
         view.focusSceneIndex = index;
         return view;
     }
-}
+};
 
 export const setScenePath = (room: Room | undefined, scenePath: string) => {
     if (room && room.isWritable) {
@@ -50,6 +51,15 @@ export const getScenePath = (
     }
 };
 
+export const removeScenes = (room: Room | undefined, scenePath: string) => {
+    if (room) {
+        const type = room.scenePathType(scenePath);
+        if (type !== ScenePathType.None) {
+            room.removeScenes(scenePath);
+        }
+    }
+};
+
 export const setViewMode = (view: View, mode: ViewVisionMode) => {
     if (!(view as any).didRelease && view.mode !== mode) {
         view.mode = mode;
@@ -105,7 +115,7 @@ export const parseSceneDir = (scenePath: string) => {
         sceneDir = "/";
     }
     return sceneDir;
-} 
+};
 
 export const ensureValidScenePath = (scenePath: string) => {
     if (scenePath.endsWith("/")) {

package/src/index.ts

@@ -428,6 +428,12 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
                     const appScenePath = appManager.store.getAppScenePath(appId);
                     if (appScenePath && appScenePath === scenePath) {
                         console.warn(`[WindowManager]: ScenePath ${scenePath} Already opened`);
+                        if (this.boxManager) {
+                            const topBox = this.boxManager.getTopBox();
+                            if (topBox) {
+                                this.boxManager.setZIndex(appId, topBox.zIndex + 1, false);
+                            }
+                        }
                         return;
                     }
                 }