@netless/window-manager 1.0.0-canary.3 → 1.0.0-canary.6

package/src/App/{WhiteBoardView.ts → WhiteboardView.ts}

@@ -5,14 +5,15 @@ import type { ReadonlyVal } from "value-enhancer";
 import type { AddPageParams, PageController, PageState } from "../Page";
 import type { AppProxy } from "./AppProxy";
 import type { AppContext } from "./AppContext";
+import type { Camera } from "white-web-sdk";
 
 export class WhiteBoardView implements PageController {
     public readonly pageState$: ReadonlyVal<PageState>;
 
     constructor(
-        protected appContext: AppContext, 
+        protected appContext: AppContext,
         protected appProxy: AppProxy,
-        private removeViewWrapper: () => void,
+        private removeViewWrapper: () => void
     ) {
         const pageState$ = new Val<PageState>(appProxy.pageState);
         this.pageState$ = pageState$;
@@ -21,10 +22,18 @@ export class WhiteBoardView implements PageController {
         });
     }
 
+    public get view() {
+        return this.appContext.view;
+    }
+
     public get pageState() {
         return this.pageState$.value;
     }
 
+    public moveCamera(camera: Camera) {
+        this.appProxy.moveCamera(camera);
+    }
+
     public nextPage = async (): Promise<boolean> => {
         const nextIndex = this.pageState.index + 1;
         return this.jumpPage(nextIndex);

package/src/App/index.ts

@@ -1,3 +1,3 @@
 export * from "./AppProxy";
 export * from "./AppContext";
-export * from "./WhiteBoardView";
+export * from "./WhiteboardView";

package/src/AppManager.ts

@@ -3,7 +3,7 @@ import { AppCreateQueue } from "./Utils/AppCreateQueue";
 import { AppListeners } from "./AppListener";
 import { AppProxy } from "./App";
 import { appRegister } from "./Register";
-import { autorun, isPlayer, isRoom, ScenePathType } from "white-web-sdk";
+import { autorun, isPlayer, isRoom, ScenePathType, toJS } from "white-web-sdk";
 import { boxEmitter } from "./BoxEmitter";
 import { calculateNextIndex } from "./Page";
 import { callbacks } from "./callback";
@@ -34,10 +34,10 @@ import type { ReconnectRefresher } from "./ReconnectRefresher";
 import type { BoxManager } from "./BoxManager";
 import type {
     Displayer,
-    DisplayerState,
     Room,
     ScenesCallbacksNode,
     SceneState,
+    RoomState,
 } from "white-web-sdk";
 import type { AddAppParams, BaseInsertParams, TeleBoxRect } from "./index";
 import type {
@@ -56,7 +56,7 @@ export class AppManager {
     public appStatus: Map<string, AppStatus> = new Map();
     public store = store;
     public mainViewProxy: MainViewProxy;
-    public refresher?: ReconnectRefresher;
+    public refresher: ReconnectRefresher;
     public isReplay = this.windowManger.isReplay;
     public mainViewScenesLength = 0;
 
@@ -651,7 +651,7 @@ export class AppManager {
         }
     }
 
-    private displayerStateListener = (state: Partial<DisplayerState>) => {
+    private displayerStateListener = (state: Partial<RoomState>) => {
         const sceneState = state.sceneState;
         if (sceneState) {
             const scenePath = sceneState.scenePath;
@@ -669,6 +669,9 @@ export class AppManager {
             emitter.emit("roomMembersChange", this.members);
         }
         emitter.emit("observerIdChange", this.displayer.observerId);
+        if (state.memberState) {
+            emitter.emit("memberStateChange", toJS(state.memberState));
+        }
     };
 
     public displayerWritableListener = (isReadonly: boolean) => {

package/src/AttributesDelegate.ts

@@ -18,6 +18,8 @@ export enum Fields {
     CursorState = "cursorState",
     FullPath = "fullPath",
     Registered = "registered",
+    Camera = "camera",
+    Size = "size",
 }
 
 export type Apps = {
@@ -39,9 +41,13 @@ export type StoreContext = {
     safeSetAttributes: (attributes: any) => void;
 }
 
-export type ICamera = Camera & { id: string };
+export type ICamera = Camera & { 
+    id: string; // room uid
+};
 
-export type ISize = Size & { id: string };
+export type ISize = Size & {
+    id: string; // room uid
+};
 
 export class AttributesDelegate {
 
@@ -108,6 +114,10 @@ export class AttributesDelegate {
         }
     }
 
+    public updateAppAttributes(appId: string, key: string, value: any) {
+        this.context.safeUpdateAttributes([Fields.Apps, appId, key], value);
+    }
+
     public cleanAppAttributes(id: string) {
         this.context.safeUpdateAttributes([Fields.Apps, id], undefined);
         this.context.safeSetAttributes({ [id]: undefined });
@@ -149,11 +159,11 @@ export class AttributesDelegate {
         this.context.safeSetAttributes({ _mainSceneIndex: index });
     }
 
-    public getMainViewCamera(): MainViewCamera {
+    public getMainViewCamera(): ICamera {
         return get(this.attributes, [Fields.MainViewCamera]);
     }
 
-    public getMainViewSize(): MainViewSize {
+    public getMainViewSize(): ISize {
         return get(this.attributes, [Fields.MainViewSize]);
     }
 
@@ -214,19 +224,6 @@ export class AttributesDelegate {
     }
 }
 
-export type MainViewSize = {
-    id: string;
-    width: number;
-    height: number;
-};
-
-export type MainViewCamera = {
-    id: string;
-    centerX: number;
-    centerY: number;
-    scale: number;
-};
-
 export type Cursors = {
     [key: string]: Cursor;
 };

package/src/BoxManager.ts

@@ -214,7 +214,7 @@ export class BoxManager {
         return this.teleBoxManager.stageRect;
     }
 
-    public createBox(params: CreateBoxParams): void {
+    public createBox(params: CreateBoxParams): ReadonlyTeleBox | undefined {
         if (!this.teleBoxManager) return;
         let { minwidth = MIN_WIDTH, minheight = MIN_HEIGHT } = params.app.config ?? {};
         const { width, height } = params.app.config ?? {};
@@ -237,8 +237,9 @@ export class BoxManager {
             height,
             id: params.appId,
         };
-        this.teleBoxManager.create(createBoxConfig, params.smartPosition);
+        const box = this.teleBoxManager.create(createBoxConfig, params.smartPosition);
         this.context.emitter.emit(`${params.appId}${Events.WindowCreated}` as any);
+        return box;
     }
 
     public setupBoxManager(

package/src/InternalEmitter.ts

@@ -2,6 +2,7 @@ import Emittery from "emittery";
 import type { TeleBoxRect } from "@netless/telebox-insider";
 import type { AppInitState, CursorMovePayload } from "./index";
 import type { Member } from "./Helper";
+import type { MemberState } from "white-web-sdk";
 
 export type RemoveSceneParams = {
     scenePath: string;
@@ -31,6 +32,7 @@ export type EmitterEvent = {
     writableChange: boolean;
     containerSizeRatioUpdate: number;
     roomMembersChange: Member[];
+    memberStateChange: MemberState;
 };
 
 export type EmitterType = Emittery<EmitterEvent>;

package/src/ReconnectRefresher.ts

@@ -88,6 +88,7 @@ export class ReconnectRefresher {
             this.reactors.set(id, func);
             this.disposers.set(id, func());
         }
+        return () => this.remove(id);
     }
 
     public remove(id: string) {

package/src/Utils/Common.ts

@@ -30,6 +30,12 @@ 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) {

package/src/View/CameraSynchronizer.ts

@@ -2,13 +2,13 @@ import { AnimationMode } from "white-web-sdk";
 import { delay, throttle } from "lodash";
 import type { TeleBoxRect } from "@netless/telebox-insider";
 import type { Camera, View, Size } from "white-web-sdk";
-import type { MainViewSize } from "../AttributesDelegate";
+import type { ISize } from "../AttributesDelegate";
 
 export type SaveCamera = (camera: Camera) => void;
 
 export class CameraSynchronizer {
     protected remoteCamera?: Camera;
-    protected remoteSize?: MainViewSize;
+    protected remoteSize?: ISize;
     protected rect?: TeleBoxRect;
     protected view?: View;
 
@@ -26,7 +26,7 @@ export class CameraSynchronizer {
     }
 
     // 远端 Camera 或者 size 更新
-    public onRemoteUpdate = throttle((camera: Camera, size: MainViewSize) => {
+    public onRemoteUpdate = throttle((camera: Camera, size: ISize) => {
         this.remoteCamera = camera;
         this.remoteSize = size;
         if (this.remoteSize && this.rect) {
@@ -37,27 +37,33 @@ export class CameraSynchronizer {
                 scale = this.rect.height / size.height;
             }
             const nextScale = camera.scale * scale;
-            const moveCamera = () =>  this.view?.moveCamera({
+            const moveCamera = () => this.view?.moveCamera({
                 centerX: camera.centerX,
                 centerY: camera.centerY,
                 scale: nextScale,
                 animationMode: AnimationMode.Immediately,
             });
             // TODO 直接调用 moveCamera 依然会出现 camera 错误的情况,这里暂时加一个 delay 保证 camera 是对的, 后续需要 SDK 进行修改
-            delay(moveCamera, 10);
+            delay(moveCamera, 50);
         }
     }, 50);
 
 
     public onLocalCameraUpdate(camera: Camera) {
         this.saveCamera(camera);
+        this.remoteCamera = camera;
     }
 
     // 本地 Size 更新, 先匹配 camera 到新的 size 然后再发送 camera 数据到远端
-    public onLocalSizeUpdate(size: Size) {
+    public onLocalSizeUpdate = (size: Size) => {
         if (this.rect && this.view) {
-            const scale = this.rect.width / size.width;
-            const nextScale = this.view.camera.scale * scale;
+            let scale: number;
+            if (size.width < size.height) {
+                scale = this.rect.width / size.width;
+            } else {
+                scale = this.rect.height / size.height;
+            }
+            const nextScale = this.view.camera.scale / scale;
             this.view.moveCamera({
                 scale: nextScale,
                 animationMode: AnimationMode.Immediately

package/src/View/MainView.ts

@@ -1,15 +1,15 @@
-import { reaction } from "white-web-sdk";
 import { callbacks } from "../callback";
+import { CameraSynchronizer } from "./CameraSynchronizer";
 import { createView } from "./ViewManager";
 import { debounce, get, isEqual } from "lodash";
 import { emitter } from "../InternalEmitter";
 import { Events } from "../constants";
 import { Fields } from "../AttributesDelegate";
-import { setViewFocusScenePath } from "../Utils/Common";
+import { reaction } from "white-web-sdk";
+import { releaseView, setViewFocusScenePath } from "../Utils/Common";
 import { SideEffectManager } from "side-effect-manager";
 import type { Camera, Size, View } from "white-web-sdk";
 import type { AppManager } from "../AppManager";
-import { CameraSynchronizer } from "./CameraSynchronizer";
 
 export class MainViewProxy {
     private started = false;
@@ -21,8 +21,8 @@ export class MainViewProxy {
     private sideEffectManager = new SideEffectManager();
 
     constructor(private manager: AppManager) {
-        this.synchronizer = new CameraSynchronizer(
-            camera => this.store.setMainViewCamera({ ...camera, id: this.manager.uid })
+        this.synchronizer = new CameraSynchronizer(camera =>
+            this.store.setMainViewCamera({ ...camera, id: this.manager.uid })
         );
         this.mainView = this.createMainView();
         this.moveCameraSizeByAttributes();
@@ -37,9 +37,7 @@ export class MainViewProxy {
         });
         this.sideEffectManager.add(() => {
             return emitter.on("startReconnect", () => {
-                if (!(this.mainView as any).didRelease) {
-                    this.mainView.release();
-                }
+                releaseView(this.mainView);
             });
         });
         const rect = this.manager.boxManager?.stageRect;
@@ -49,7 +47,7 @@ export class MainViewProxy {
         this.sideEffectManager.add(() => {
             return emitter.on("playgroundSizeChange", rect => {
                 this.synchronizer.setRect(rect);
-                this.synchronizer.onLocalSizeUpdate(rect);
+                // this.synchronizer.onLocalSizeUpdate(rect);
             });
         });
     }
@@ -122,7 +120,7 @@ export class MainViewProxy {
 
     public sizeChangeHandler = debounce((size: Size) => {
         if (size) {
-            this.synchronizer.onLocalSizeUpdate(size);
+            // this.synchronizer.onLocalSizeUpdate(size);
         }
     }, 30);
 
@@ -171,9 +169,7 @@ export class MainViewProxy {
         const divElement = this.mainView.divElement;
         const disableCameraTransform = this.mainView.disableCameraTransform;
         this.stop();
-        if (!this.didRelease) {
-            this.mainView.release();
-        }
+        releaseView(this.mainView);
         this.removeMainViewListener();
         this.mainView = this.createMainView();
         this.mainView.disableCameraTransform = disableCameraTransform;

package/src/View/ViewSync.ts

@@ -0,0 +1,10 @@
+import type { Camera, Size } from "white-web-sdk";
+
+
+export interface ViewSync {
+    readonly camera: Camera;
+    readonly size: Size;
+
+    setCamera: (camera: Camera) => void;
+    setSize: (size: Size) => void;      
+}

package/src/index.ts

@@ -29,7 +29,7 @@ import {
 } from "./Utils/Common";
 import type { TELE_BOX_STATE, BoxManager } from "./BoxManager";
 import * as Errors from "./Utils/error";
-import type { Apps, Position } from "./AttributesDelegate";
+import type { Apps, Position , ICamera, ISize } from "./AttributesDelegate";
 import type {
     Displayer,
     SceneDefinition,
@@ -104,6 +104,8 @@ export type AppSyncAttributes = {
     isDynamicPPT?: boolean;
     fullPath?: string;
     createdAt?: number;
+    camera?: ICamera;
+    size?: ISize;
 };
 
 export type AppInitState = {