@netless/window-manager 1.0.0-canary.45 → 1.0.0-canary.48

package/dist/src/App/AppContext.d.ts

@@ -51,7 +51,7 @@ export declare class AppContext<TAttributes = any, TMagixEventPayloads = any, TA
     get box(): ReadonlyTeleBox;
     get room(): Room | undefined;
     get members(): Member[];
-    get currentMember(): Member;
+    get currentMember(): Member | undefined;
     /** @deprecated Use context.storage.setState instead. */
     setAttributes: (attributes: TAttributes) => void;
     /** @deprecated Use context.storage.setState instead. */

package/dist/src/Page/PageController.d.ts

@@ -1,7 +1,7 @@
 import type { SceneDefinition } from "white-web-sdk";
 export declare type AddPageParams = {
     after?: boolean;
-    scene?: SceneDefinition;
+    scene?: SceneDefinition | SceneDefinition[];
 };
 export declare type PageState = {
     index: number;

package/dist/src/View/ViewSync.d.ts

@@ -18,6 +18,11 @@ export declare class ViewSync {
     private sem;
     private synchronizer;
     constructor(context: ViewSyncContext);
+    private createSynchronizer;
+    private subscribeView;
+    private subscribeCamera;
+    private subscribeSize;
+    private subscribeStageRect;
     bindView: (view?: View | undefined) => void;
     private onCameraUpdatedByDevice;
     destroy(): void;

package/dist/src/typings.d.ts

@@ -86,3 +86,4 @@ export type { Storage, StorageStateChangedEvent, StorageStateChangedListener } f
 export * from "./Page";
 export * from "./Utils/error";
 export type { Member } from "./Helper";
+export type { TeleBoxManager, TeleBoxManagerQueryConfig } from "@netless/telebox-insider";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "1.0.0-canary.45",
+  "version": "1.0.0-canary.48",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.es.js",
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@juggle/resize-observer": "^3.3.1",
-    "@netless/telebox-insider": "1.0.0-alpha.35",
+    "@netless/telebox-insider": "1.0.0-alpha.36",
     "emittery": "^0.11.0",
     "lodash": "^4.17.21",
     "p-retry": "^4.6.2",
@@ -34,8 +34,8 @@
     "value-enhancer": "^1.3.2"
   },
   "devDependencies": {
-    "@netless/app-docs-viewer": "^0.3.2",
-    "@netless/app-plyr": "0.2.0",
+    "@netless/app-docs-viewer": "^0.3.3",
+    "@netless/app-plyr": "0.2.2",
     "@playwright/test": "^1.23.2",
     "@rollup/plugin-commonjs": "^20.0.0",
     "@rollup/plugin-node-resolve": "^13.0.4",

package/pnpm-lock.yaml

@@ -2,9 +2,9 @@ lockfileVersion: 5.4
 
 specifiers:
   '@juggle/resize-observer': ^3.3.1
-  '@netless/app-docs-viewer': ^0.3.2
-  '@netless/app-plyr': 0.2.0
-  '@netless/telebox-insider': 1.0.0-alpha.35
+  '@netless/app-docs-viewer': ^0.3.3
+  '@netless/app-plyr': 0.2.2
+  '@netless/telebox-insider': 1.0.0-alpha.36
   '@playwright/test': ^1.23.2
   '@rollup/plugin-commonjs': ^20.0.0
   '@rollup/plugin-node-resolve': ^13.0.4
@@ -45,7 +45,7 @@ specifiers:
 
 dependencies:
   '@juggle/resize-observer': 3.3.1
-  '@netless/telebox-insider': 1.0.0-alpha.35
+  '@netless/telebox-insider': 1.0.0-alpha.36
   emittery: 0.11.0
   lodash: 4.17.21
   p-retry: 4.6.2
@@ -54,8 +54,8 @@ dependencies:
   value-enhancer: 1.3.2
 
 devDependencies:
-  '@netless/app-docs-viewer': 0.3.2
-  '@netless/app-plyr': 0.2.0
+  '@netless/app-docs-viewer': 0.3.3
+  '@netless/app-plyr': 0.2.2
   '@playwright/test': 1.23.2
   '@rollup/plugin-commonjs': 20.0.0
   '@rollup/plugin-node-resolve': 13.1.3
@@ -231,24 +231,24 @@ packages:
     resolution: {integrity: sha512-6Wci+Tp3CgPt/B9B0a3J4s3yMgLNSku6w5TV6mN+61C71UqsRBv2FUibBf3tPGlNxebgPHMEUzKpb1ggE8KCKw==}
     dev: true
 
-  /@netless/app-docs-viewer/0.3.2:
-    resolution: {integrity: sha512-3gO8/AblCYQlu5kEnvI6+qJBu0VycSnIyVXfP6xu5obHHfF5aa+JGnDJ1/wZ+8DpvaydhWTuKvv+oVtuXDG0gg==}
+  /@netless/app-docs-viewer/0.3.3:
+    resolution: {integrity: sha512-yrc79e4oPKSNRackRjupkNp3Qvhrk9rETCf03FL1GlnrSE+GKtoZStRF4D7L6/214Gh930qjaEAOSF9BvkabLg==}
     dependencies:
       remitter: 0.2.6
       value-enhancer: 1.3.2
       vanilla-lazyload: 17.8.2
     dev: true
 
-  /@netless/app-plyr/0.2.0:
-    resolution: {integrity: sha512-noeWWwcI1Qlkw9Zf/MJispYsH+WsTjETO8tUx/o6qJLHkf2wH+B0AZeL+/wy+bqzSOITg6yDnxWvNdxFuhDNUQ==}
+  /@netless/app-plyr/0.2.2:
+    resolution: {integrity: sha512-bB/xQMMb7bUcr3SH7Sb7/orYyzoeWgADX8vQWNskvQuiX7uIvFHZSZSG2ld+Idmjiqjo7zU6L1bUMAMshLu5/g==}
     dev: true
 
   /@netless/canvas-polyfill/0.0.4:
     resolution: {integrity: sha512-7NzsJrba0R/mq/l10SkIZQwbrNVJyPxZYrjK6xL3Ts732iWAVuS2UB0u3s6iGeUVcqV39A679yva8APWRl4M0A==}
     dev: true
 
-  /@netless/telebox-insider/1.0.0-alpha.35:
-    resolution: {integrity: sha512-uX/PUEoG/+CoaigeoWH+U07io93n+T89VjJDl5FRnd3gc/QfYf3ASSDQ9+7GjbOBUDUFwYHqVIxEhU67mGXCbw==}
+  /@netless/telebox-insider/1.0.0-alpha.36:
+    resolution: {integrity: sha512-wW0/pmagLt1pzV7PfCWJAAsOm4+RED6GEh2mOSTGS/q6lIOV8Qjoe0MizaR3ild7d6rg/kIFj2II3IYF0d+OiA==}
     dependencies:
       '@juggle/resize-observer': 3.3.1
       '@types/shallowequal': 1.1.1

package/src/App/AppContext.ts

@@ -180,10 +180,11 @@ export class AppContext<TAttributes = any, TMagixEventPayloads = any, TAppOption
         return this.manager.members$.value;
     }
 
-    public get currentMember(): Member {
+    //** currentMember is undefined in read-only and replay mode. */
+    public get currentMember(): Member | undefined {
         const self = findMemberByUid(this.room, this.manager.uid);
         if (!self) {
-            throw new Error(`Member ${this.manager.uid} not found.`);
+            return undefined;
         }
         return {
             uid: this.manager.uid,

package/src/AppManager.ts

@@ -473,7 +473,8 @@ export class AppManager {
                 this.appCreateQueue.emitReady();
             }
             let appsWithCreatedAt = appIds.map(appId => {
-                if (apps[appId].setup) {
+                // 兼容 1.0 之前创建的应用
+                if (apps[appId].setup === true || apps[appId].setup === undefined) {
                     return {
                         id: appId,
                         createdAt: apps[appId].createdAt,

package/src/Page/PageController.ts

@@ -2,7 +2,7 @@ import type { SceneDefinition } from "white-web-sdk";
 
 export type AddPageParams = {
     after?: boolean;
-    scene?: SceneDefinition;
+    scene?: SceneDefinition | SceneDefinition[];
 };
 
 export type PageState = {

package/src/View/ViewSync.ts

@@ -30,7 +30,25 @@ export class ViewSync {
     private synchronizer: CameraSynchronizer;
 
     constructor(private context: ViewSyncContext) {
-        this.synchronizer = new CameraSynchronizer((camera: ICamera) => {
+        this.synchronizer = this.createSynchronizer();
+        this.bindView(this.context.view$.value);
+        this.sem.add(() => [
+            this.subscribeView(),
+            this.subscribeCamera(),
+            this.subscribeSize(),
+            this.subscribeStageRect(),
+        ]);
+        const camera$size$ = combine([this.context.camera$, this.context.size$]);
+        camera$size$.reaction(([camera, size]) => {
+            if (camera && size) {
+                this.synchronizer.onRemoteUpdate(camera, size);
+                camera$size$.destroy();
+            }
+        });
+    }
+
+    private createSynchronizer = () => {
+        return new CameraSynchronizer((camera: ICamera) => {
             this.context.camera$.setValue(camera, true);
             const notStoreCamera =
                 this.context.viewMode$ && this.context.viewMode$.value === ViewMode.Freedom;
@@ -40,42 +58,44 @@ export class ViewSync {
                 this.context.storeCamera(camera);
             }
         });
-        this.bindView(this.context.view$.value);
-        this.sem.add(() => [
-            this.context.view$.subscribe(view => {
-                const currentCamera = this.context.camera$.value;
-                if (currentCamera && this.context.size$.value) {
-                    view?.moveCamera({
-                        scale: 1,
-                        animationMode: AnimationMode.Immediately,
-                    });
-                    this.synchronizer.onRemoteUpdate(currentCamera, this.context.size$.value);
-                }
-
-                this.bindView(view);
-            }),
-            this.context.camera$.subscribe((camera, skipUpdate) => {
-                const size = this.context.size$.value;
-                if (camera && size && !skipUpdate) {
-                    this.synchronizer.onRemoteUpdate(camera, size);
-                }
-            }),
-            this.context.size$.subscribe(size => {
-                if (size) {
-                    this.synchronizer.onRemoteSizeUpdate(size);
-                }
-            }),
-            this.context.stageRect$.subscribe(rect => {
-                if (rect) {
-                    this.synchronizer.setRect(rect);
-                }
-            })
-        ]);
-        const camera$size$ = combine([this.context.camera$, this.context.size$]);
-        camera$size$.reaction(([camera, size]) => {
+    }
+
+    private subscribeView = () => {
+        return this.context.view$.subscribe(view => {
+            const currentCamera = this.context.camera$.value;
+            if (currentCamera && this.context.size$.value) {
+                view?.moveCamera({
+                    scale: 1,
+                    animationMode: AnimationMode.Immediately,
+                });
+                this.synchronizer.onRemoteUpdate(currentCamera, this.context.size$.value);
+            }
+            this.bindView(view);
+        });
+    }
+
+    private subscribeCamera = () => {
+        return this.context.camera$.subscribe((camera, skipUpdate) => {
+            if (skipUpdate) return;
+            const size = this.context.size$.value;
             if (camera && size) {
                 this.synchronizer.onRemoteUpdate(camera, size);
-                camera$size$.destroy();
+            }
+        });
+    }
+
+    private subscribeSize = () => {
+        return this.context.size$.subscribe(size => {
+            if (size) {
+                this.synchronizer.onRemoteSizeUpdate(size);
+            }
+        });
+    }
+
+    private subscribeStageRect = () => {
+        return this.context.stageRect$.subscribe(rect => {
+            if (rect) {
+                this.synchronizer.setRect(rect);
             }
         });
     }

package/src/index.ts

@@ -539,12 +539,13 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> imple
     public async addPage(params?: AddPageParams): Promise<void> {
         if (this.appManager) {
             const after = params?.after;
-            const scene = params?.scene;
+            const scene = params?.scene || {};
+            const scenes = Array.isArray(scene) ? scene : [scene];
             if (after) {
                 const nextIndex = this.mainViewSceneIndex + 1;
-                this.room.putScenes(ROOT_DIR, [scene || {}], nextIndex);
+                this.room.putScenes(ROOT_DIR, scenes, nextIndex);
             } else {
-                this.room.putScenes(ROOT_DIR, [scene || {}]);
+                this.room.putScenes(ROOT_DIR, scenes);
             }
         }
     }
@@ -839,7 +840,9 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> imple
             clearTimeout(this.cameraUpdating);
             this.cameraUpdating = 0;
             this.mainView.callbacks.on("onCameraUpdated", this.onCameraUpdated);
-            this.nextCamera = nextCamera;
+            if (nextScale) {
+                this.nextCamera = { ...nextCamera, scale: nextScale };
+            }
         }
     };
 

package/src/typings.ts

@@ -94,3 +94,4 @@ export type { Storage, StorageStateChangedEvent, StorageStateChangedListener } f
 export * from "./Page";
 export * from "./Utils/error";
 export type { Member } from "./Helper";
+export type { TeleBoxManager, TeleBoxManagerQueryConfig } from "@netless/telebox-insider";