@netless/window-manager 1.0.0-canary.1 → 1.0.0-canary.4

package/src/App/AppContext.ts

@@ -1,5 +1,4 @@
 import { BoxNotCreatedError } from "../Utils/error";
-import { putScenes } from "../Utils/Common";
 import { Storage } from "./Storage";
 import {
     autorun,
@@ -19,7 +18,7 @@ import type {
 import type { ReadonlyTeleBox } from "@netless/telebox-insider";
 import type Emittery from "emittery";
 import type { BoxManager } from "../BoxManager";
-import type { AppEmitterEvent } from "../index";
+import type { AppEmitterEvent, Member } from "../index";
 import type { AppManager } from "../AppManager";
 import type { AppProxy } from "./AppProxy";
 import type {
@@ -27,11 +26,13 @@ import type {
     MagixEventDispatcher,
     MagixEventRemoveListener,
 } from "./MagixEvent";
-import type { AddPageParams, PageController, PageState } from "../Page";
+import { WhiteBoardView } from "./WhiteboardView";
+import { findMemberByUid } from "../Helper";
+import { MAX_PAGE_SIZE } from "../constants";
+import { putScenes } from "../Utils/Common";
+import { isNumber } from "lodash";
 
-export class AppContext<TAttributes = any, TMagixEventPayloads = any, TAppOptions = any>
-    implements PageController
-{
+export class AppContext<TAttributes = any, TMagixEventPayloads = any, TAppOptions = any> {
     public readonly emitter: Emittery<AppEmitterEvent<TAttributes>>;
     public readonly mobxUtils = {
         autorun,
@@ -48,6 +49,7 @@ export class AppContext<TAttributes = any, TMagixEventPayloads = any, TAppOption
     private store = this.manager.store;
     public readonly isAddApp: boolean;
     public readonly isReplay = this.manager.isReplay;
+    private whiteBoardView?: WhiteBoardView;
 
     constructor(
         private manager: AppManager,
@@ -60,7 +62,7 @@ export class AppContext<TAttributes = any, TMagixEventPayloads = any, TAppOption
         this.isAddApp = appProxy.isAddApp;
     }
 
-    public getDisplayer = () => {
+    public get displayer(){
         return this.manager.displayer;
     };
 
@@ -78,32 +80,58 @@ export class AppContext<TAttributes = any, TMagixEventPayloads = any, TAppOption
         }
     };
 
-    public getView = (): View | undefined => {
+    public get view(): View | undefined {
         return this.appProxy.view;
     };
 
-    public mountView = (dom: HTMLElement): void => {
-        const view = this.getView();
-        if (view) {
-            view.divElement = dom as HTMLDivElement;
-            setTimeout(() => {
-                // 渲染需要时间，延迟 refresh
-                this.getRoom()?.refreshViewSize();
-            }, 1000);
+    public createWhiteBoardView = (size?: number): WhiteBoardView => {
+        if (this.whiteBoardView) {
+            return this.whiteBoardView;
         }
-    };
+        let view = this.view;
+        if (!view) {
+            view = this.appProxy.createAppDir();
+        }
+        const viewWrapper = document.createElement("div");
+        viewWrapper.className = "window-manager-view-wrapper";
+        this.box.$content.parentElement?.appendChild(viewWrapper);
+        const removeViewWrapper = () => {
+            this.box.$content.parentElement?.removeChild(viewWrapper);
+        }
+        view.divElement = viewWrapper;
+        if (this.isAddApp) {
+            this.initPageSize(size);
+        }
+        this.whiteBoardView = new WhiteBoardView(this, this.appProxy, removeViewWrapper);
+        return this.whiteBoardView;
+    }
+
+    private initPageSize = (size?: number) => {
+        if (!isNumber(size)) return;
+        if (!this.appProxy.scenePath) return;
+        if (this.appProxy.pageState.length >= size) return;
+        if (size <= 0 || size >= MAX_PAGE_SIZE) {
+            throw Error(`[WindowManager]: size ${size} muse be in range [1, ${MAX_PAGE_SIZE}]`);
+        }
+        const needInsert = size - this.appProxy.pageState.length;
+        const startPageNumber = this.appProxy.pageState.length;
+        const scenes = new Array(needInsert).fill({}).map((_, index) => {
+            return { name: `${startPageNumber + index + 1}` };
+        });
+        putScenes(this.room, this.appProxy.scenePath, scenes);
+    }
 
     public getInitScenePath = () => {
         return this.manager.getAppInitPath(this.appId);
     };
 
     /** Get App writable status. */
-    public getIsWritable = (): boolean => {
+    public get isWritable(): boolean {
         return this.manager.canOperate;
     };
 
     /** Get the App Window UI box. */
-    public getBox = (): ReadonlyTeleBox => {
+    public get box(): ReadonlyTeleBox {
         const box = this.boxManager.getBox(this.appId);
         if (box) {
             return box;
@@ -112,10 +140,25 @@ export class AppContext<TAttributes = any, TMagixEventPayloads = any, TAppOption
         }
     };
 
-    public getRoom = (): Room | undefined => {
+    public get room(): Room | undefined {
         return this.manager.room;
     };
 
+    public get members() {
+        return this.manager.members;
+    }
+
+    public get memberState(): Member {
+        const self = findMemberByUid(this.room, this.manager.uid);
+        if (!self) {
+            throw new Error(`Member ${this.manager.uid} not found.`);
+        }
+        return {
+            uid: this.manager.uid,
+            ...self,
+        }
+    }
+
     /** @deprecated Use context.storage.setState instead. */
     public setAttributes = (attributes: TAttributes) => {
         this.manager.safeSetAttributes({ [this.appId]: attributes });
@@ -128,11 +171,12 @@ export class AppContext<TAttributes = any, TMagixEventPayloads = any, TAppOption
         }
     };
 
+    /** @deprecated Use Pages api instead. */
     public setScenePath = async (scenePath: string): Promise<void> => {
         if (!this.appProxy.box) return;
         this.appProxy.setFullPath(scenePath);
         // 兼容 15 版本 SDK 的切页
-        this.getRoom()?.setScenePath(scenePath);
+        this.room?.setScenePath(scenePath);
     };
 
     /** Get the local App options. */
@@ -196,55 +240,4 @@ export class AppContext<TAttributes = any, TMagixEventPayloads = any, TAppOption
     public removeMagixEventListener = this.manager.displayer.removeMagixEventListener.bind(
         this.manager.displayer
     ) as MagixEventRemoveListener<TMagixEventPayloads>;
-
-    /** PageController  */
-    public nextPage = async (): Promise<boolean> => {
-        const nextIndex = this.pageState.index + 1;
-        if (nextIndex > this.pageState.length - 1) {
-            console.warn("[WindowManager] nextPage: index out of range");
-            return false;
-        }
-        this.appProxy.setSceneIndex(nextIndex);
-        return true;
-    };
-
-    public prevPage = async (): Promise<boolean> => {
-        const nextIndex = this.pageState.index - 1;
-        if (nextIndex < 0) {
-            console.warn("[WindowManager] prevPage: index out of range");
-            return false;
-        }
-        this.appProxy.setSceneIndex(nextIndex);
-        return true;
-    };
-
-    public addPage = async (params?: AddPageParams) => {
-        const after = params?.after;
-        const scene = params?.scene;
-        const scenePath = this.appProxy.scenePath;
-        if (!scenePath) return;
-        if (after) {
-            const nextIndex = this.pageState.index + 1;
-            putScenes(this.manager.room, scenePath, [scene || {}], nextIndex);
-        } else {
-            putScenes(this.manager.room, scenePath, [scene || {}]);
-        }
-    };
-
-    public removePage = async (index?: number): Promise<boolean> => {
-        const needRemoveIndex = index === undefined ? this.pageState.index : index;
-        if (this.pageState.length === 1) {
-            console.warn(`[WindowManager]: can not remove the last page`);
-            return false;
-        }
-        if (needRemoveIndex < 0 || needRemoveIndex >= this.pageState.length) {
-            console.warn(`[WindowManager]: page index ${index} out of range`);
-            return false;
-        }
-        return this.appProxy.removeSceneByIndex(needRemoveIndex);;
-    }
-
-    public get pageState(): PageState {
-        return this.appProxy.pageState;
-    }
 }

package/src/App/AppPageStateImpl.ts

@@ -9,11 +9,15 @@ export type AppPageStateParams = {
 };
 
 export class AppPageStateImpl {
-    private sceneNode: ScenesCallbacksNode | null = null;
+    public sceneNode: ScenesCallbacksNode | null = null;
+    private scenePath?: string;
+    private view?: View;
 
     constructor(private params: AppPageStateParams) {
         const { displayer, scenePath } = this.params;
+        this.view = this.params.view;
         if (scenePath) {
+            this.scenePath = scenePath;
             this.sceneNode = displayer.createScenesCallback(scenePath, {
                 onAddScene: this.onSceneChange,
                 onRemoveScene: this.onSceneChange,
@@ -21,24 +25,39 @@ export class AppPageStateImpl {
         }
     }
 
-    private onSceneChange = (node: ScenesCallbacksNode) => {
-        this.sceneNode = node;
+    public createSceneNode = (scenePath: string) => {
+        this.scenePath = scenePath;
+        if (this.sceneNode) {
+            this.sceneNode.dispose();
+        }
+        this.sceneNode = this.params.displayer.createScenesCallback(scenePath, {
+            onAddScene: this.onSceneChange,
+            onRemoveScene: this.onSceneChange,
+        });
+        return this.sceneNode;
+    }
+
+    public setView(view: View) {
+        this.view = view;
+    }
+
+    private onSceneChange = () => {
         this.params.notifyPageStateChange();
     };
 
     public getFullPath(index: number) {
         const scenes = this.sceneNode?.scenes;
-        if (this.params.scenePath && scenes) {
+        if (this.scenePath && scenes) {
             const name = scenes[index];
             if (name) {
-                return `${this.params.scenePath}/${name}`;
+                return `${this.scenePath}/${name}`;
             }
         }
     }
 
     public toObject(): PageState {
         return {
-            index: this.params.view?.focusSceneIndex || 0,
+            index: this.view?.focusSceneIndex || 0,
             length: this.sceneNode?.scenes.length || 0,
         };
     }

package/src/App/AppProxy.ts

@@ -3,15 +3,22 @@ import { AppAttributes, AppEvents, Events, SETUP_APP_DELAY } from "../constants"
 import { AppContext } from "./AppContext";
 import { AppPageStateImpl } from "./AppPageStateImpl";
 import { appRegister } from "../Register";
-import { autorun } from "white-web-sdk";
+import { AppViewSync } from "./AppViewSync";
+import { autorun, reaction, toJS } from "white-web-sdk";
+import { boxEmitter } from "../BoxEmitter";
 import { BoxManagerNotFoundError } from "../Utils/error";
+import { calculateNextIndex } from "../Page";
+import { combine, Val } from "value-enhancer";
 import { debounce, get } from "lodash";
 import { emitter } from "../InternalEmitter";
 import { Fields } from "../AttributesDelegate";
 import { log } from "../Utils/log";
+import { SideEffectManager } from "side-effect-manager";
+import type { ICamera, ISize } from "../AttributesDelegate";
 import {
     entireScenes,
     getScenePath,
+    putScenes,
     removeScenes,
     setScenePath,
     setViewFocusScenePath,
@@ -23,13 +30,11 @@ import type {
     setAppOptions,
     AppListenerKeys,
 } from "../index";
-import type { SceneState, View, SceneDefinition } from "white-web-sdk";
+import type { SceneState, View, SceneDefinition, Camera } from "white-web-sdk";
 import type { AppManager } from "../AppManager";
 import type { NetlessApp } from "../typings";
 import type { ReadonlyTeleBox } from "@netless/telebox-insider";
 import type { PageRemoveService, PageState } from "../Page";
-import { calculateNextIndex } from "../Page";
-import { boxEmitter } from "../BoxEmitter";
 
 export type AppEmitter = Emittery<AppEmitterEvent>;
 
@@ -37,6 +42,7 @@ export class AppProxy implements PageRemoveService {
     public kind: string;
     public id: string;
     public scenePath?: string;
+    private appScenePath: string;
     public appEmitter: AppEmitter;
     public scenes?: SceneDefinition[];
 
@@ -45,16 +51,27 @@ export class AppProxy implements PageRemoveService {
     private appProxies = this.manager.appProxies;
     private viewManager = this.manager.viewManager;
     private store = this.manager.store;
+    public uid = this.manager.uid;
 
     public isAddApp: boolean;
     private status: "normal" | "destroyed" = "normal";
     private stateKey: string;
-    private _pageState: AppPageStateImpl;
+    public _pageState: AppPageStateImpl;
     private _prevFullPath: string | undefined;
 
     public appResult?: NetlessApp<any>;
     public appContext?: AppContext<any, any>;
 
+    private sideEffectManager = new SideEffectManager();
+
+    public camera$ = new Val<ICamera | undefined>(undefined);
+    public size$ = new Val<ISize | undefined>(undefined);
+
+    private appViewSync?: AppViewSync;
+
+    public box$ = new Val<ReadonlyTeleBox | undefined>(undefined);
+    public view$ = new Val<View | undefined>(undefined);
+
     constructor(
         private params: BaseInsertParams,
         private manager: AppManager,
@@ -63,6 +80,7 @@ export class AppProxy implements PageRemoveService {
     ) {
         this.kind = params.kind;
         this.id = appId;
+        this.appScenePath = `/${this.id}-app-dir`;
         this.stateKey = `${this.id}_state`;
         this.appProxies.set(this.id, this);
         this.appEmitter = new Emittery();
@@ -75,12 +93,68 @@ export class AppProxy implements PageRemoveService {
             // 只有传入了 scenePath 的 App 才会创建 View
             this.createView();
         }
+        if (!this.scenePath) {
+            this.scenePath = this.appScenePath;
+        }
         this._pageState = new AppPageStateImpl({
             displayer: this.manager.displayer,
             scenePath: this.scenePath,
             view: this.view,
             notifyPageStateChange: this.notifyPageStateChange,
         });
+        this.sideEffectManager.add(() => () => this._pageState.destroy());
+        this.sideEffectManager.add(() =>
+            emitter.on("roomMembersChange", members => {
+                this.appEmitter.emit("roomMembersChange", members);
+            })
+        );
+        this.camera$.setValue(toJS(this.appAttributes.camera));
+        this.size$.setValue(toJS(this.appAttributes.size));
+        this.sideEffectManager.add(() => {
+            return this.manager.refresher.add(`${this.id}-camera`, () => {
+                return reaction(
+                    () => this.appAttributes?.camera,
+                    camera => {
+                        if (camera && camera.id !== this.uid) {
+                            this.camera$.setValue(toJS(camera));
+                        }
+                    }
+                );
+            });
+        });
+        this.sideEffectManager.add(() => {
+            return this.manager.refresher.add(`${this.id}-size`, () => {
+                return reaction(
+                    () => this.appAttributes?.size,
+                    size => {
+                        if (size && size.id !== this.uid) {
+                            this.size$.setValue(toJS(size));
+                        }
+                    }
+                );
+            });
+        });
+        combine([this.box$, this.view$]).subscribe(([box, view]) => {
+            if (box && view) {
+                const appViewSync = new AppViewSync(this);
+                this.appViewSync = appViewSync;
+                this.sideEffectManager.add(() => () => appViewSync.destroy());
+            }
+        });
+    }
+
+    public createAppDir() {
+        const scenePath = this.scenePath || this.appScenePath;
+        const sceneNode = this._pageState.createSceneNode(scenePath);
+        if (!sceneNode) {
+            putScenes(this.manager.room, scenePath, [{ name: "1" }]);
+            this._pageState.createSceneNode(scenePath);
+            this.setSceneIndex(0);
+        }
+        this.scenes = entireScenes(this.manager.displayer)[scenePath];
+        const view = this.createView();
+        this._pageState.setView(view);
+        return view;
     }
 
     private initScenes() {
@@ -131,7 +205,7 @@ export class AppProxy implements PageRemoveService {
     }
 
     public setFullPath(path: string) {
-        this.manager.safeUpdateAttributes(["apps", this.id, Fields.FullPath], path);
+        this.store.updateAppAttributes(this.id, Fields.FullPath, path);
     }
 
     public async baseInsertApp(skipUpdate = false): Promise<{ appId: string; app: NetlessApp }> {
@@ -160,7 +234,7 @@ export class AppProxy implements PageRemoveService {
     }
 
     public get box(): ReadonlyTeleBox | undefined {
-        return this.boxManager?.getBox(this.id);
+        return this.box$.value;
     }
 
     private async setupApp(
@@ -194,13 +268,14 @@ export class AppProxy implements PageRemoveService {
                     this.fixMobileSize();
                 }, SETUP_APP_DELAY);
             });
-            this.boxManager?.createBox({
+            const box = this.boxManager?.createBox({
                 appId: appId,
                 app,
                 options,
                 canOperate: this.manager.canOperate,
                 smartPosition: this.isAddApp,
             });
+            this.box$.setValue(box);
             if (this.isAddApp && this.box) {
                 this.store.updateAppState(appId, AppAttributes.ZIndex, this.box.zIndex);
                 this.boxManager.focusBox({ appId }, false);
@@ -395,14 +470,17 @@ export class AppProxy implements PageRemoveService {
         return fullPath;
     }
 
-    private async createView(): Promise<View> {
-        const view = await this.viewManager.createView(this.id);
+    private createView(): View {
+        const view = this.viewManager.createView(this.id);
+        this.view$.setValue(view);
         this.setViewFocusScenePath();
         return view;
     }
 
     public notifyPageStateChange = debounce(() => {
-        this.appEmitter.emit("pageStateChange", this.pageState);
+        if (this.pageState) {
+            this.appEmitter.emit("pageStateChange", this.pageState);
+        }
     }, 50);
 
     public get pageState(): PageState {
@@ -412,7 +490,7 @@ export class AppProxy implements PageRemoveService {
     // PageRemoveService
     public async removeSceneByIndex(index: number) {
         const scenePath = this._pageState.getFullPath(index);
-        if (scenePath) {
+        if (scenePath && this.pageState) {
             const nextIndex = calculateNextIndex(index, this.pageState);
             // 只修改 focus path 不修改 FullPath
             this.setSceneIndexWithoutSync(nextIndex);
@@ -448,6 +526,22 @@ export class AppProxy implements PageRemoveService {
         }
     }
 
+    public storeCamera = (camera: ICamera) => {
+        this.store.updateAppAttributes(this.id, Fields.Camera, camera);
+    };
+
+    public storeSize = (size: ISize) => {
+        this.store.updateAppAttributes(this.id, Fields.Size, size);
+    };
+
+    public moveCamera = (camera: Camera) => {
+        if (!this.camera$.value) {
+            return;
+        }
+        const nextCamera = { ...this.camera$.value, ...camera };
+        this.storeCamera(nextCamera);
+    };
+
     public async destroy(
         needCloseBox: boolean,
         cleanAttrs: boolean,
@@ -463,6 +557,7 @@ export class AppProxy implements PageRemoveService {
             console.error("[WindowManager]: notifyApp error", error.message, error.stack);
         }
         this.appEmitter.clearListeners();
+        this.sideEffectManager.flushAll();
         emitter.emit(`destroy-${this.id}` as any, { error });
         if (needCloseBox) {
             this.boxManager?.closeBox(this.id, skipUpdate);
@@ -474,7 +569,6 @@ export class AppProxy implements PageRemoveService {
             }
         }
         this.appProxies.delete(this.id);
-        this._pageState.destroy();
 
         this.viewManager.destroyView(this.id);
         this.manager.appStatus.delete(this.id);
@@ -482,6 +576,9 @@ export class AppProxy implements PageRemoveService {
         this.manager.refresher?.remove(this.stateKey);
         this.manager.refresher?.remove(`${this.id}-fullPath`);
         this._prevFullPath = undefined;
+        this.camera$.destroy();
+        this.size$.destroy();
+        this.box$.destroy();
     }
 
     public close(): Promise<void> {

package/src/App/AppViewSync.ts

@@ -0,0 +1,69 @@
+import { CameraSynchronizer } from "../View/CameraSynchronizer";
+import { SideEffectManager } from "side-effect-manager";
+import type { Camera, View } from "white-web-sdk";
+import type { AppProxy } from "./AppProxy";
+import { isEqual } from "lodash";
+
+export class AppViewSync {
+    private sem = new SideEffectManager();
+    private synchronizer: CameraSynchronizer;
+
+    constructor(private appProxy: AppProxy) {
+        this.synchronizer = new CameraSynchronizer((camera: Camera) => {
+            this.appProxy.storeCamera({
+                id: this.appProxy.uid,
+                ...camera,
+            });
+        });
+        this.bindView(appProxy.view);
+        this.sem.add(() => this.appProxy.camera$.subscribe(camera => {
+            const size = this.appProxy.size$.value;
+            if (camera && size) {
+                this.synchronizer.onRemoteUpdate(camera, size);
+            }
+        }));
+        const box = this.appProxy.box;
+        if (box && box.contentStageRect) {
+            this.synchronizer.setRect(box.contentStageRect);
+            this.sem.add(() =>
+                box._contentStageRect$.subscribe(rect => {
+                    if (rect) {
+                        this.synchronizer.setRect(rect);
+                    }
+                }),
+            );
+            if (!this.appProxy.size$.value) {
+                this.appProxy.storeSize({
+                    id: this.appProxy.uid,
+                    width: box.contentStageRect.width,
+                    height: box.contentStageRect.height,
+                });
+            }
+        }
+    }
+
+    public bindView = (view?: View) => {
+        if (!view) return;
+        this.synchronizer.setView(view);
+        this.sem.add(() => {
+            view.callbacks.on("onCameraUpdatedByDevice", this.onCameraUpdatedByDevice);
+            return () =>
+                view.callbacks.off("onCameraUpdatedByDevice", this.onCameraUpdatedByDevice);
+        });
+    };
+
+    private onCameraUpdatedByDevice = (camera: Camera) => {
+        this.synchronizer.onLocalCameraUpdate(camera);
+        const stage = this.appProxy.box?.contentStageRect;
+        if (stage) {
+            const size = { width: stage.width, height: stage.height, id: this.appProxy.uid };
+            if (!isEqual(size, this.appProxy.size$.value)) {
+                this.appProxy.storeSize(size);
+            }
+        }
+    };
+
+    public destroy() {
+        this.sem.flushAll();
+    }
+}

package/src/App/Storage/index.ts

@@ -37,7 +37,7 @@ export class Storage<TState extends Record<string, any> = any> implements Storag
     this._state = {} as TState;
     const rawState = this._getRawState(this._state);
 
-    if (this._context.getIsWritable()) {
+    if (this._context.isWritable) {
       if (this.id === null) {
         if (context.isAddApp && defaultState) {
             this.setState(defaultState);
@@ -115,7 +115,7 @@ export class Storage<TState extends Record<string, any> = any> implements Storag
       return;
     }
 
-    if (!this._context.getIsWritable()) {
+    if (!this._context.isWritable) {
       console.error(new Error(`Cannot setState on Storage "${this.id}" without writable access`), state);
       return;
     }
@@ -165,7 +165,7 @@ export class Storage<TState extends Record<string, any> = any> implements Storag
       return;
     }
 
-    if (!this._context.getIsWritable()) {
+    if (!this._context.isWritable) {
       console.error(new Error(`Cannot empty Storage "${this.id}" without writable access.`));
       return;
     }
@@ -181,7 +181,7 @@ export class Storage<TState extends Record<string, any> = any> implements Storag
       throw new Error(`Cannot delete main Storage`);
     }
 
-    if (!this._context.getIsWritable()) {
+    if (!this._context.isWritable) {
       console.error(new Error(`Cannot delete Storage "${this.id}" without writable access.`));
       return;
     }