@netless/window-manager 1.0.0-canary.9 → 1.0.1

package/src/Register/loader.ts

@@ -28,39 +28,43 @@ export const executeScript = (text: string, appName: string): NetlessApp => {
     return result;
 };
 
-export const loadApp = async (
-    url: string,
-    key: string,
-    name?: string
-): Promise<NetlessApp | undefined> => {
+export const loadApp = async (url: string, key: string, name?: string): Promise<NetlessApp> => {
     const appName = name || Prefix + key;
     callbacks.emit("loadApp", { kind: key, status: "start" });
+
+    let text: string;
     try {
-        const text = await getScript(url);
+        text = await getScript(url);
         if (!text || text.length === 0) {
             callbacks.emit("loadApp", { kind: key, status: "failed", reason: "script is empty." });
-            return;
+            throw new Error("[WindowManager]: script is empty.");
         }
-        try {
+    } catch (error) {
+        callbacks.emit("loadApp", { kind: key, status: "failed", reason: error.message });
+        throw error;
+    }
+    return getResult(text, appName, key);
+};
+
+const getResult = (text: string, appName: string, key: string): NetlessApp => {
+    try {
+        const result = executeScript(text, appName);
+        callbacks.emit("loadApp", { kind: key, status: "success" });
+        return result;
+    } catch (error: any) {
+        if (error.message.includes("Can only have one anonymous define call per script file")) {
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            const define = window.define;
+            if ("function" == typeof define && define.amd) {
+                delete define.amd;
+            }
             const result = executeScript(text, appName);
             callbacks.emit("loadApp", { kind: key, status: "success" });
             return result;
-        } catch (error: any) {
-            if (error.message.includes("Can only have one anonymous define call per script file")) {
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-ignore
-                const define = window.define;
-                if ("function" == typeof define && define.amd) {
-                    delete define.amd;
-                }
-                const result = executeScript(text, appName);
-                callbacks.emit("loadApp", { kind: key, status: "success" });
-                return result;
-            }
-            callbacks.emit("loadApp", { kind: key, status: "failed", reason: error.message });
         }
-    } catch (error: any) {
         callbacks.emit("loadApp", { kind: key, status: "failed", reason: error.message });
+        throw error;
     }
 };
 

package/src/Register/storage.ts

@@ -6,15 +6,15 @@ let store: IDBObjectStore;
 export type Item = {
     kind: string;
     sourceCode: string;
-}
+};
 
 export const initDb = async () => {
     db = await createDb();
-}
+};
 
 export const setItem = (key: string, val: any) => {
     if (!db) return;
-    return addRecord(db, { kind: key, sourceCode: val })
+    return addRecord(db, { kind: key, sourceCode: val });
 };
 
 export const getItem = async (key: string): Promise<Item | null> => {
@@ -30,9 +30,9 @@ export const removeItem = (key: string) => {
 function createDb(): Promise<IDBDatabase> {
     return new Promise((resolve, reject) => {
         const request = indexedDB.open(DatabaseName, 2);
-        request.onerror = (e) => {
+        request.onerror = e => {
             reject(e);
-        }
+        };
 
         request.onupgradeneeded = (event: any) => {
             const db = event.target.result as IDBDatabase;
@@ -40,28 +40,28 @@ function createDb(): Promise<IDBDatabase> {
                 store = db.createObjectStore("apps", { keyPath: "kind" });
                 store.createIndex("kind", "kind", { unique: true });
             }
-        }
+        };
 
         request.onsuccess = () => {
             const db = request.result;
             resolve(db);
-        }
-    })
+        };
+    });
 }
 
 function query<T>(db: IDBDatabase, val: string): Promise<T | null> {
     return new Promise((resolve, reject) => {
         const index = db.transaction(["apps"]).objectStore("apps").index("kind");
         const request = index.get(val);
-        request.onerror = (e) => reject(e);
+        request.onerror = e => reject(e);
         request.onsuccess = () => {
             if (request.result) {
                 resolve(request.result);
             } else {
                 resolve(null);
             }
-        }
-    })
+        };
+    });
 }
 
 function addRecord(db: IDBDatabase, payload: any): Promise<void> {
@@ -69,7 +69,7 @@ function addRecord(db: IDBDatabase, payload: any): Promise<void> {
         const request = db.transaction(["apps"], "readwrite").objectStore("apps").add(payload);
         request.onsuccess = () => resolve();
         request.onerror = () => reject();
-    })
+    });
 }
 
 function deleteRecord(db: IDBDatabase, key: string): Promise<void> {
@@ -77,5 +77,5 @@ function deleteRecord(db: IDBDatabase, key: string): Promise<void> {
         const request = db.transaction(["apps"], "readwrite").objectStore("apps").delete(key);
         request.onsuccess = () => resolve();
         request.onerror = () => reject();
-    })
+    });
 }

package/src/Utils/Common.ts

@@ -1,11 +1,11 @@
 import { appRegister } from "../Register";
 import { debounce } from "lodash";
-import { emitter } from "../InternalEmitter";
+import { internalEmitter } 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 , SceneDefinition} from "white-web-sdk";
+import type { Displayer, ViewVisionMode, Room, View, SceneDefinition } from "white-web-sdk";
 import type Emittery from "emittery";
 
 export const genAppId = async (kind: string) => {
@@ -30,12 +30,6 @@ export const setViewSceneIndex = (view: View, index: number) => {
     }
 };
 
-export const releaseView = (view: View) => {
-    if (!(view as any).didRelease) {
-        view.release();
-    }
-}
-
 export const setScenePath = (room: Room | undefined, scenePath: string) => {
     if (room && room.isWritable) {
         if (room.state.sceneState.scenePath !== scenePath) {
@@ -75,15 +69,15 @@ export const setViewMode = (view: View, mode: ViewVisionMode) => {
 };
 
 export const emitError = (error: Error) => {
-    if (emitter.listenerCount("error") > 0) {
-        emitter.emit("error", error);
+    if (internalEmitter.listenerCount("error") > 0) {
+        internalEmitter.emit("error", error);
     } else {
         console.log("[WindowManager]:", error);
     }
 };
 
 export const addEmitterOnceListener = (event: any, listener: any) => {
-    emitter.once(event).then(listener);
+    internalEmitter.once(event).then(listener);
 };
 
 export const notifyMainViewModeChange = debounce(
@@ -110,9 +104,19 @@ export const entireScenes = (displayer: Displayer) => {
     return displayer.entireScenes();
 };
 
-export const putScenes = (room: Room | undefined, path: string, scenes: SceneDefinition[], index?: number) => {
+export const putScenes = (
+    room: Room | undefined,
+    path: string,
+    scenes: SceneDefinition[],
+    index?: number
+) => {
+    for (let i = 0; i < scenes.length; ++i) {
+        if (scenes[i].name?.includes("/")) {
+            throw new Error("scenes name can not have '/'");
+        }
+    }
     return room?.putScenes(path, scenes, index);
-}
+};
 
 export const isValidScenePath = (scenePath: string) => {
     return scenePath.startsWith("/");
@@ -157,4 +161,4 @@ export const isRootDirPage = (scenePath: string) => {
         return prev;
     }, 0);
     return delimiterCount === 1;
-}
+};

package/src/Utils/Reactive.ts

@@ -1,5 +1,5 @@
 import { listenUpdated, unlistenUpdated, reaction, UpdateEventKind } from "white-web-sdk";
-import type { AkkoObjectUpdatedProperty , AkkoObjectUpdatedListener } from "white-web-sdk";
+import type { AkkoObjectUpdatedProperty, AkkoObjectUpdatedListener } from "white-web-sdk";
 import { isObject } from "lodash";
 
 // 兼容 13 和 14 版本 SDK
@@ -12,7 +12,7 @@ export const onObjectByEvent = (event: UpdateEventKind) => {
                 if (kinds.includes(event)) {
                     func();
                 }
-            }
+            };
             listenUpdated(object, listener);
             func();
             return () => unlistenUpdated(object, listener);
@@ -21,43 +21,44 @@ export const onObjectByEvent = (event: UpdateEventKind) => {
                 () => object,
                 () => {
                     func();
-                }, {
+                },
+                {
                     fireImmediately: true,
                 }
-            )
+            );
         }
-    }
-}
+    };
+};
 
 export const safeListenPropsUpdated = <T>(
     getProps: () => T,
     callback: AkkoObjectUpdatedListener<T>,
     onDestroyed?: (props: unknown) => void
-  ) => {
+) => {
     let disposeListenUpdated: (() => void) | null = null;
     const disposeReaction = reaction(
-      getProps,
-      () => {
-        if (disposeListenUpdated) {
-          disposeListenUpdated();
-          disposeListenUpdated = null;
-        }
-        const props = getProps();
-        if (isObject(props)) {
-          disposeListenUpdated = () => unlistenUpdated(props, callback);
-          listenUpdated(props, callback);
-        } else {
-          onDestroyed?.(props);
-        }
-      },
-      { fireImmediately: true }
+        getProps,
+        () => {
+            if (disposeListenUpdated) {
+                disposeListenUpdated();
+                disposeListenUpdated = null;
+            }
+            const props = getProps();
+            if (isObject(props)) {
+                disposeListenUpdated = () => unlistenUpdated(props, callback);
+                listenUpdated(props, callback);
+            } else {
+                onDestroyed?.(props);
+            }
+        },
+        { fireImmediately: true }
     );
 
     return () => {
-      disposeListenUpdated?.();
-      disposeReaction();
+        disposeListenUpdated?.();
+        disposeReaction();
     };
-}
+};
 
 export const onObjectRemoved = onObjectByEvent(UpdateEventKind.Removed);
 export const onObjectInserted = onObjectByEvent(UpdateEventKind.Inserted);

package/src/Utils/RoomHacker.ts

@@ -1,4 +1,4 @@
-import { emitter } from "../InternalEmitter";
+import { internalEmitter } from "../InternalEmitter";
 import { isPlayer } from "white-web-sdk";
 import type { WindowManager } from "../index";
 import type { Camera, Room, Player, PlayerSeekingResult } from "white-web-sdk";
@@ -66,7 +66,7 @@ const delegateRemoveScenes = (room: Room, manager: WindowManager) => {
             manager.appManager?.updateRootDirRemoving(true);
         }
         const result = originRemoveScenes.call(room, scenePath);
-        emitter.emit("removeScenes", { scenePath, index });
+        internalEmitter.emit("removeScenes", { scenePath, index });
         return result;
     };
 };
@@ -76,9 +76,9 @@ const delegateSeekToProgressTime = (player: Player) => {
     // eslint-disable-next-line no-inner-declarations
     async function newSeek(time: number): Promise<PlayerSeekingResult> {
         // seek 时需要先关闭所有的 app 防止内部使用的 mobx 出现错误
-        await emitter.emit("seekStart");
+        await internalEmitter.emit("seekStart");
         const seekResult = await originSeek.call(player, time);
-        emitter.emit("seek", time); 
+        internalEmitter.emit("seek", time);
         return seekResult;
     }
     player.seekToProgressTime = newSeek;

package/src/Utils/error.ts

@@ -1,4 +1,3 @@
-
 export class AppCreateError extends Error {
     override message = "[WindowManager]: app duplicate exists and cannot be created again";
 }