@netless/window-manager 0.2.2 → 0.2.3-canary.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "0.2.2",
+  "version": "0.2.3-canary.0",
   "description": "",
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",
@@ -55,6 +55,6 @@
     "typescript": "^4.3.5",
     "video.js": "^7.14.3",
     "vite": "^2.5.3",
-    "white-web-sdk": "^2.14.3"
+    "white-web-sdk": "2.14.3"
   }
 }

package/src/AppContext.ts

@@ -36,7 +36,6 @@ export class AppContext<TAttrs extends Record<string, any>, AppOptions = any> {
         private manager: AppManager,
         public appId: string,
         private appProxy: AppProxy,
-        public setScenes: (scenes: SceneDefinition[]) => void,
         private appOptions?: AppOptions | (() => AppOptions),
     ) {
         this.emitter = appProxy.appEmitter;

package/src/AppManager.ts

@@ -167,9 +167,7 @@ export class AppManager {
             this.appProxies.forEach(appProxy => {
                 if (appProxy.scenePath && scenePath.startsWith(appProxy.scenePath)) {
                     appProxy.emitAppSceneStateChange(sceneState);
-                    if (sceneState.index !== appProxy.sceneIndex) {
-                        appProxy.setSceneIndex(sceneState.index);
-                    }
+                    appProxy.setFullPath(scenePath);
                 }
             });
             this.viewManager.refreshViews();

package/src/AppProxy.ts

@@ -1,16 +1,17 @@
-import Emittery from "emittery";
-import { AppAttributes, AppEvents, Events } from "./constants";
-import { AppContext } from "./AppContext";
-import { appRegister } from "./Register";
-import { autorun, ViewVisionMode } from "white-web-sdk";
-import { log } from "./Utils/log";
+import Emittery from 'emittery';
+import { AppAttributes, AppEvents, Events } from './constants';
+import { AppContext } from './AppContext';
+import { appRegister } from './Register';
+import { autorun, ViewVisionMode } from 'white-web-sdk';
+import { callbacks, emitter } from './index';
+import { Fields } from './AttributesDelegate';
+import { log } from './Utils/log';
 import {
     notifyMainViewModeChange,
     setScenePath,
     setViewFocusScenePath,
     setViewMode,
 } from "./Utils/Common";
-import { callbacks, emitter } from "./index";
 import type {
     AppEmitterEvent,
     AppInitState,
@@ -18,7 +19,7 @@ import type {
     setAppOptions,
     AppListenerKeys,
 } from "./index";
-import type { Camera, SceneDefinition, SceneState, View } from "white-web-sdk";
+import type { Camera, SceneState, View, SceneDefinition } from "white-web-sdk";
 import type { AppManager } from "./AppManager";
 import type { NetlessApp } from "./typings";
 import type { ReadonlyTeleBox } from "@netless/telebox-insider";
@@ -59,6 +60,7 @@ export class AppProxy {
                 this.scenes = options.scenes;
             }
         }
+
         if (this.params.options?.scenePath) {
             // 只有传入了 scenePath 的 App 才会创建 View
             this.createView();
@@ -67,14 +69,6 @@ export class AppProxy {
         this.isAddApp = isAddApp;
     }
 
-    public get sceneIndex(): number {
-        return this.manager.delegate.getAppSceneIndex(this.id);
-    }
-
-    public setSceneIndex(index: number): void {
-        return this.manager.delegate.updateAppState(this.id, AppAttributes.SceneIndex, index);
-    }
-
     public get view(): View | undefined {
         return this.manager.viewManager.getView(this.id);
     }
@@ -87,20 +81,14 @@ export class AppProxy {
         return this.manager.attributes[this.id];
     }
 
-    public getSceneName(): string | undefined {
-        if (this.sceneIndex !== undefined) {
-            return this.scenes?.[this.sceneIndex]?.name;
-        }
-    }
-
     public getFullScenePath(): string | undefined {
-        if (this.scenePath && this.getSceneName()) {
-            return `${this.scenePath}/${this.getSceneName()}`;
+        if (this.scenePath) {
+            return this.manager.delegate.getAppAttributes(this.id)[Fields.FullPath] || this.scenePath;
         }
     }
 
-    public setScenes(scenes: SceneDefinition[]): void {
-        this.scenes = scenes;
+    public setFullPath(path: string) {
+        this.manager.safeUpdateAttributes(["apps", this.id, Fields.FullPath], path);
     }
 
     public async baseInsertApp(focus?: boolean): Promise<{ appId: string; app: NetlessApp }> {
@@ -138,7 +126,7 @@ export class AppProxy {
 
     private async setupApp(appId: string, app: NetlessApp, options?: setAppOptions, appOptions?: any) {
         log("setupApp", appId, app, options);
-        const context = new AppContext(this.manager, appId, this, this.setScenes, appOptions);
+        const context = new AppContext(this.manager, appId, this, appOptions);
         try {
             emitter.once(`${appId}${Events.WindowCreated}`).then(async () => {
                 const boxInitState = this.getAppInitState(appId);

package/src/AttributesDelegate.ts

@@ -16,6 +16,7 @@ export enum Fields {
     Cursors = "cursors",
     Position = "position",
     CursorState = "cursorState",
+    FullPath = "fullPath"
 }
 
 export type Apps = {

package/src/Utils/Common.ts

@@ -59,6 +59,18 @@ export const makeValidScenePath = (displayer: Displayer, scenePath: string) => {
     }
 };
 
+export const isValidScenePath = (scenePath: string) => {
+    return scenePath.startsWith("/");
+}
+
+export const ensureValidScenePath = (scenePath: string) => {
+    if (scenePath.endsWith("/")) {
+        return scenePath.slice(0, -1);
+    } else {
+        return scenePath;
+    }
+}
+
 export const getVersionNumber = (version: string) => {
     const versionString = version.split(".").map(s => s.padStart(2, "0")).join("");
     return parseInt(versionString);

package/src/Utils/error.ts

@@ -25,3 +25,7 @@ export class ParamsInvalidError extends Error {
 export class BoxNotCreatedError extends Error {
     override message = "[WindowManager]: box need created";
 }
+
+export class InvalidScenePath extends Error {
+    override message = `[WindowManager]: ScenePath should start with "/"`;
+}

package/src/index.ts

@@ -5,6 +5,7 @@ import { isNull, isObject } from "lodash";
 import {
     AppCreateError,
     AppManagerNotInitError,
+    InvalidScenePath,
     ParamsInvalidError,
     WhiteWebSDKInvalidError,
 } from "./Utils/error";
@@ -13,7 +14,7 @@ import { appRegister } from "./Register";
 import { CursorManager } from "./Cursor";
 import type { Apps } from "./AttributesDelegate";
 import { Fields } from "./AttributesDelegate";
-import { getVersionNumber, wait } from "./Utils/Common";
+import { ensureValidScenePath, getVersionNumber, isValidScenePath, wait } from "./Utils/Common";
 import {
     InvisiblePlugin,
     isRoom,
@@ -89,6 +90,7 @@ export type AppSyncAttributes = {
     options: any;
     state?: any;
     isDynamicPPT?: boolean;
+    fullPath?: string;
 };
 
 export type AppInitState = {
@@ -213,8 +215,10 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
         }
 
         this.checkVersion();
-        if (room.phase !== RoomPhase.Connected) {
-            throw new Error("[WindowManager]: Room only Connected can be mount");
+        if (isRoom(room)) {
+            if (room.phase !== RoomPhase.Connected) {
+                throw new Error("[WindowManager]: Room only Connected can be mount");
+            }
         }
         if (!container) {
             throw new Error("[WindowManager]: Container must provide");
@@ -227,7 +231,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
         if (this.debug) {
             setOptions({ verbose: true });
         }
-        log("[WindowManager]: Already insert room", manager);
+        log("Already insert room", manager);
         if (containerSizeRatio) {
             WindowManager.containerSizeRatio = containerSizeRatio;
         }
@@ -322,6 +326,9 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
             if (isDynamicPPT === undefined) {
                 return;
             }
+            if (params?.options?.scenePath) {
+                params.options.scenePath = ensureValidScenePath(params.options.scenePath);
+            }
             const appId = await this.appManager.addApp(params, Boolean(isDynamicPPT));
             return appId;
         } else {
@@ -334,10 +341,13 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
         if (params.options) {
             const { scenePath, scenes } = params.options;
             if (scenePath) {
+                if (!isValidScenePath(scenePath)) {
+                    throw new InvalidScenePath();
+                }
                 for (const appId in this.apps) {
                     const appScenePath = appManager.delegate.getAppScenePath(appId);
                     if (appScenePath && appScenePath === scenePath) {
-                        console.warn(`ScenePath ${scenePath} Already opened`);
+                        console.warn(`[WindowManager]: ScenePath ${scenePath} Already opened`);
                         return;
                     }
                 }
@@ -354,6 +364,9 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
                     }
                 }
             }
+            if (scenePath && scenes === undefined) {
+                this.room?.putScenes(scenePath, [{}])
+            }
         }
         return isDynamicPPT;
     }