@netless/window-manager 0.3.17 → 0.4.0-canary.2

package/src/ReconnectRefresher.ts

@@ -1,8 +1,13 @@
-import { isFunction } from 'lodash';
-import { RoomPhase } from 'white-web-sdk';
+import { debounce, isFunction } from "lodash";
+import { emitter } from "./index";
+import { log } from "./Utils/log";
+import { RoomPhase } from "white-web-sdk";
 import type { Room } from "white-web-sdk";
-import type { AppManager } from './AppManager';
-import { log } from './Utils/log';
+import type { EmitterType } from "./index";
+
+export type ReconnectRefresherContext = {
+    emitter: EmitterType;
+};
 
 // 白板重连之后会刷新所有的对象，导致 listener 失效, 所以这里在重连之后重新对所有对象进行监听
 export class ReconnectRefresher {
@@ -11,20 +16,27 @@ export class ReconnectRefresher {
     private reactors: Map<string, any> = new Map();
     private disposers: Map<string, any> = new Map();
 
-    constructor(room: Room | undefined, private manager: AppManager) {
+    constructor(private ctx: ReconnectRefresherContext) {}
+
+    public setRoom(room: Room | undefined) {
         this.room = room;
         this.phase = room?.phase;
+        room?.callbacks.off("onPhaseChanged", this.onPhaseChanged);
         room?.callbacks.on("onPhaseChanged", this.onPhaseChanged);
     }
 
+    public setContext(ctx: ReconnectRefresherContext) {
+        this.ctx = ctx;
+    }
+
     private onPhaseChanged = (phase: RoomPhase) => {
         if (phase === RoomPhase.Connected && this.phase === RoomPhase.Reconnecting) {
             this.onReconnected();
         }
         this.phase = phase;
-    }
+    };
 
-    private onReconnected = () => {
+    private onReconnected = debounce(() => {
         log("onReconnected refresh reactors");
         this.releaseDisposers();
         this.reactors.forEach((func, id) => {
@@ -32,15 +44,15 @@ export class ReconnectRefresher {
                 this.disposers.set(id, func());
             }
         });
-        this.manager.notifyReconnected();
-    }
+        this.ctx.emitter.emit("onReconnected", undefined);
+    }, 3000);
 
     private releaseDisposers() {
         this.disposers.forEach(disposer => {
             if (isFunction(disposer)) {
                 disposer();
             }
-        })
+        });
         this.disposers.clear();
     }
 
@@ -64,8 +76,16 @@ export class ReconnectRefresher {
         }
     }
 
+    public hasReactor(id: string) {
+        return this.reactors.has(id);
+    }
+
     public destroy() {
         this.room?.callbacks.off("onPhaseChanged", this.onPhaseChanged);
         this.releaseDisposers();
     }
 }
+
+export const reconnectRefresher = new ReconnectRefresher({
+    emitter: emitter,
+});

package/src/Utils/RoomHacker.ts

@@ -1,10 +1,10 @@
-import { emitter } from '../index';
-import { isPlayer } from 'white-web-sdk';
+import { emitter } from "../index";
+import { isPlayer } from "white-web-sdk";
+import type { WindowManager } from '../index';
 import type { Camera, Room , Player , PlayerSeekingResult } from "white-web-sdk";
-import type { AppManager } from "../AppManager";
 
 // 修改多窗口状态下一些失效的方法实现到 manager 的 mainview 上, 降低迁移成本
-export const replaceRoomFunction = (room: Room, manager: AppManager) => {
+export const replaceRoomFunction = (room: Room, manager: WindowManager) => {
     if (isPlayer(room)) {
         const player = room as unknown as Player;
         const originSeek = player.seekToProgressTime;
@@ -30,7 +30,7 @@ export const replaceRoomFunction = (room: Room, manager: AppManager) => {
         });
 
         room.moveCamera = (camera: Camera) => manager.mainView.moveCamera(camera);
-        room.moveCameraToContain = (...args) => manager.mainView.moveCameraToContain(...args);
+        room.moveCameraToContain = (...args) => manager.moveCameraToContain(...args);
         room.convertToPointInWorld = (...args) => manager.mainView.convertToPointInWorld(...args);
         room.setCameraBound = (...args) => manager.mainView.setCameraBound(...args);
         room.scenePreview = (...args) => manager.mainView.scenePreview(...args);

package/src/Utils/error.ts

@@ -1,3 +1,4 @@
+
 export class AppCreateError extends Error {
     override message = "[WindowManager]: app duplicate exists and cannot be created again";
 }
@@ -28,4 +29,8 @@ export class BoxNotCreatedError extends Error {
 
 export class InvalidScenePath extends Error {
     override message = `[WindowManager]: ScenePath should start with "/"`;
-}
+}
+
+export class BoxManagerNotFoundError extends Error {
+    override message = "[WindowManager]: boxManager not found";
+}

package/src/constants.ts

@@ -10,6 +10,7 @@ export enum Events {
     SetMainViewScenePath = "SetMainViewScenePath",
     SetMainViewSceneIndex = "SetMainViewSceneIndex",
     SwitchViewsToFreedom = "SwitchViewsToFreedom",
+    MoveCameraToContain = "MoveCameraToContain"
 }
 
 export const MagixEventName = "__WindowManger";

package/src/index.ts

@@ -4,8 +4,9 @@ import Emittery from "emittery";
 import pRetry from "p-retry";
 import { AppManager } from "./AppManager";
 import { appRegister } from "./Register";
+import { createBoxManager } from "./BoxManager";
 import { CursorManager } from "./Cursor";
-import { DEFAULT_CONTAINER_RATIO, REQUIRE_VERSION } from "./constants";
+import { DEFAULT_CONTAINER_RATIO, Events, REQUIRE_VERSION } from "./constants";
 import { Fields } from "./AttributesDelegate";
 import { initDb } from "./Register/storage";
 import { isNull, isObject } from "lodash";
@@ -22,7 +23,7 @@ import {
     isValidScenePath,
     wait,
 } from "./Utils/Common";
-import type { TELE_BOX_STATE } from "./BoxManager";
+import type { TELE_BOX_STATE, BoxManager } from "./BoxManager";
 import {
     AppCreateError,
     AppManagerNotInitError,
@@ -80,14 +81,14 @@ export type AddAppOptions = {
 
 export type setAppOptions = AddAppOptions & { appOptions?: any };
 
-export type AddAppParams = {
+export type AddAppParams<TAttributes = any> = {
     kind: string;
     // app 地址(本地 app 不需要传)
     src?: string;
     // 窗口配置
     options?: AddAppOptions;
     // 初始化 attributes
-    attributes?: any;
+    attributes?: TAttributes;
 };
 
 export type BaseInsertParams = {
@@ -108,6 +109,7 @@ export type AppSyncAttributes = {
     state?: any;
     isDynamicPPT?: boolean;
     fullPath?: string;
+    createdAt?: number;
 };
 
 export type AppInitState = {
@@ -137,9 +139,11 @@ export type EmitterEvent = {
     observerIdChange: number;
     boxStateChange: string;
     playgroundSizeChange: DOMRect;
+    onReconnected: void;
 };
 
-export const emitter: Emittery<EmitterEvent> = new Emittery();
+export type EmitterType = Emittery<EmitterEvent>;
+export const emitter: EmitterType = new Emittery();
 
 export type PublicEvent = {
     mainViewModeChange: ViewVisionMode;
@@ -151,7 +155,7 @@ export type PublicEvent = {
 
 export type MountParams = {
     room: Room;
-    container: HTMLElement;
+    container?: HTMLElement;
     /** 白板高宽比例, 默认为 9 / 16 */
     containerSizeRatio?: number;
     /** 显示 PS 透明背景，默认 true */
@@ -165,7 +169,8 @@ export type MountParams = {
     prefersColorScheme?: TeleBoxColorScheme;
 };
 
-export const callbacks: Emittery<PublicEvent> = new Emittery();
+export type CallbacksType = Emittery<PublicEvent>;
+export const callbacks: CallbacksType = new Emittery();
 
 export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
     public static kind = "WindowManager";
@@ -177,7 +182,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
     public static containerSizeRatio = DEFAULT_CONTAINER_RATIO;
     private static isCreated = false;
 
-    public version = "0.3.17";
+    public version = "0.4.0-canary.2";
 
     public appListeners?: AppListeners;
 
@@ -188,75 +193,22 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
     public viewMode = ViewMode.Broadcaster;
     public isReplay = isPlayer(this.displayer);
 
+    private boxManager?: BoxManager;
+    private static params?: MountParams;
+
     constructor(context: InvisiblePluginContext) {
         super(context);
+        WindowManager.displayer = context.displayer;
     }
 
-    /**
-     * 挂载 WindowManager
-     * @deprecated
-     */
-    public static async mount(
-        room: Room,
-        container: HTMLElement,
-        collectorContainer?: HTMLElement,
-        options?: {
-            chessboard: boolean;
-            containerSizeRatio: number;
-            collectorStyles?: Partial<CSSStyleDeclaration>;
-            debug?: boolean;
-            overwriteStyles?: string;
-        }
-    ): Promise<WindowManager>;
-
-    public static async mount(params: MountParams): Promise<WindowManager>;
-
-    public static async mount(
-        params: MountParams | Room,
-        container?: HTMLElement,
-        collectorContainer?: HTMLElement,
-        options?: {
-            chessboard?: boolean;
-            containerSizeRatio: number;
-            collectorStyles?: Partial<CSSStyleDeclaration>;
-            debug?: boolean;
-            overwriteStyles?: string;
-            disableCameraTransform?: boolean;
-        }
-    ): Promise<WindowManager> {
-        let room: Room;
-        let containerSizeRatio: number | undefined;
-        let collectorStyles: Partial<CSSStyleDeclaration> | undefined;
-        let debug: boolean | undefined;
-        let chessboard = true;
-        let overwriteStyles: string | undefined;
-        let cursor: boolean | undefined;
-        let disableCameraTransform = false;
-        let prefersColorScheme: TeleBoxColorScheme | undefined = "light";
-        if ("room" in params) {
-            room = params.room;
-            container = params.container;
-            collectorContainer = params.collectorContainer;
-            containerSizeRatio = params.containerSizeRatio;
-            collectorStyles = params.collectorStyles;
-            debug = params.debug;
-            if (params.chessboard != null) {
-                chessboard = params.chessboard;
-            }
-            overwriteStyles = params.overwriteStyles;
-            cursor = params.cursor;
-            disableCameraTransform = Boolean(params?.disableCameraTransform);
-            prefersColorScheme = params.prefersColorScheme;
-        } else {
-            room = params;
-            containerSizeRatio = options?.containerSizeRatio;
-            collectorStyles = options?.collectorStyles;
-            debug = options?.debug;
-            if (options?.chessboard != null) {
-                chessboard = options.chessboard;
-            }
-            overwriteStyles = options?.overwriteStyles;
-        }
+    public static async mount(params: MountParams): Promise<WindowManager> {
+        const room = params.room;
+        WindowManager.container = params.container;
+        const containerSizeRatio = params.containerSizeRatio;
+        const debug = params.debug;
+
+        const cursor = params.cursor;
+        WindowManager.params = params;
 
         this.checkVersion();
         if (isRoom(room)) {
@@ -264,9 +216,6 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
                 throw new Error("[WindowManager]: Room only Connected can be mount");
             }
         }
-        if (!container) {
-            throw new Error("[WindowManager]: Container must provide");
-        }
         if (WindowManager.isCreated) {
             throw new Error("[WindowManager]: Already created cannot be created again");
         }
@@ -297,29 +246,19 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
         if (containerSizeRatio) {
             WindowManager.containerSizeRatio = containerSizeRatio;
         }
-        WindowManager.container = container;
-        const { playground, wrapper, sizer, mainViewElement } = setupWrapper(container);
-        WindowManager.playground = playground;
-        if (chessboard) {
-            sizer.classList.add("netless-window-manager-chess-sizer");
-        }
-        if (overwriteStyles) {
-            const style = document.createElement("style");
-            style.textContent = overwriteStyles;
-            playground.appendChild(style);
-        }
         await manager.ensureAttributes();
-        manager.appManager = new AppManager(manager, {
-            collectorContainer: collectorContainer,
-            collectorStyles: collectorStyles,
-            prefersColorScheme: prefersColorScheme,
-        });
-        manager.observePlaygroundSize(playground, sizer, wrapper);
+
+        manager.appManager = new AppManager(manager);
+
         if (cursor) {
             manager.cursorManager = new CursorManager(manager.appManager);
         }
-        manager.bindMainView(mainViewElement, disableCameraTransform);
-        replaceRoomFunction(room, manager.appManager);
+
+        if (params.container) {
+            manager.bindContainer(params.container);
+        }
+
+        replaceRoomFunction(room, manager);
         emitter.emit("onCreated");
         WindowManager.isCreated = true;
         try {
@@ -359,6 +298,74 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
         return manager;
     }
 
+    private static initContainer(
+        manager: WindowManager,
+        container: HTMLElement,
+        chessboard: boolean | undefined,
+        overwriteStyles: string | undefined
+    ) {
+        if (!WindowManager.container) {
+            WindowManager.container = container;
+        }
+        const { playground, wrapper, sizer, mainViewElement } = setupWrapper(container);
+        WindowManager.playground = playground;
+        if (chessboard) {
+            sizer.classList.add("netless-window-manager-chess-sizer");
+        }
+        if (overwriteStyles) {
+            const style = document.createElement("style");
+            style.textContent = overwriteStyles;
+            playground.appendChild(style);
+        }
+        manager.observePlaygroundSize(playground, sizer, wrapper);
+        WindowManager.wrapper = wrapper;
+        return mainViewElement;
+    }
+
+    public bindContainer(container: HTMLElement) {
+        if (WindowManager.isCreated && WindowManager.container) {
+            if (WindowManager.container.firstChild) {
+                container.appendChild(WindowManager.container.firstChild);
+            }
+        } else {
+            if (WindowManager.params) {
+                const params = WindowManager.params;
+                const mainViewElement = WindowManager.initContainer(
+                    this,
+                    container,
+                    params.chessboard,
+                    params.overwriteStyles
+                );
+                const boxManager = createBoxManager(this, callbacks, emitter, {
+                    collectorContainer: params.collectorContainer,
+                    collectorStyles: params.collectorStyles,
+                    prefersColorScheme: params.prefersColorScheme,
+                });
+                this.boxManager = boxManager;
+                this.appManager?.setBoxManager(boxManager);
+                this.bindMainView(mainViewElement, params.disableCameraTransform);
+                if (WindowManager.wrapper) {
+                    this.cursorManager?.setupWrapper(WindowManager.wrapper);
+                }
+            }
+        }
+        this.boxManager?.updateManagerRect();
+        this.appManager?.refresh();
+        this.appManager?.resetMaximized();
+        this.appManager?.resetMinimized();
+        WindowManager.container = container;
+    }
+
+    public bindCollectorContainer(container: HTMLElement) {
+        if (WindowManager.isCreated) {
+            this.boxManager?.setCollectorContainer(container);
+        } else {
+            if (WindowManager.params) {
+                WindowManager.params.collectorContainer = container;
+            }
+        }
+    }
+
     /**
      * 注册插件
      */
@@ -371,7 +378,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
     /**
      * 创建一个 app 至白板
      */
-    public async addApp(params: AddAppParams): Promise<string | undefined> {
+    public async addApp<T = any>(params: AddAppParams<T>): Promise<string | undefined> {
         if (this.appManager) {
             if (!params.kind || typeof params.kind !== "string") {
                 throw new ParamsInvalidError();
@@ -470,7 +477,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
     public setReadonly(readonly: boolean): void {
         if (this.room?.isWritable) {
             this.readonly = readonly;
-            this.appManager?.boxManager.setReadonly(readonly);
+            this.appManager?.boxManager?.setReadonly(readonly);
         }
     }
 
@@ -531,21 +538,21 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
         return this.appManager?.store.apps();
     }
 
-    public get boxState(): TeleBoxState {
+    public get boxState(): TeleBoxState | undefined {
         if (this.appManager) {
-            return this.appManager.boxManager.boxState;
+            return this.appManager.boxManager?.boxState;
         } else {
             throw new AppManagerNotInitError();
         }
     }
 
     public get darkMode(): boolean {
-        return Boolean(this.appManager?.boxManager.darkMode);
+        return Boolean(this.appManager?.boxManager?.darkMode);
     }
 
-    public get prefersColorScheme(): TeleBoxColorScheme {
+    public get prefersColorScheme(): TeleBoxColorScheme | undefined {
         if (this.appManager) {
-            return this.appManager.boxManager.prefersColorScheme;
+            return this.appManager.boxManager?.prefersColorScheme;
         } else {
             throw new AppManagerNotInitError();
         }
@@ -585,6 +592,10 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
             }>
     ): void {
         this.mainView.moveCameraToContain(rectangle);
+        this.appManager?.dispatchInternalEvent(Events.MoveCameraToContain, rectangle);
+        setTimeout(() => {
+            this.appManager?.mainViewProxy.setCameraAndSize();
+        }, 1000);
     }
 
     public convertToPointInWorld(point: Point): Point {
@@ -613,12 +624,13 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
         if (WindowManager.playground) {
             WindowManager.playground.parentNode?.removeChild(WindowManager.playground);
         }
+        WindowManager.params = undefined;
         log("Destroyed");
     }
 
-    private bindMainView(divElement: HTMLDivElement, disableCameraTransform: boolean) {
+    private bindMainView(divElement: HTMLDivElement, disableCameraTransform: boolean | undefined) {
         if (this.appManager) {
-            this.appManager.bindMainView(divElement, disableCameraTransform);
+            this.appManager.bindMainView(divElement, Boolean(disableCameraTransform));
             this.cursorManager?.setMainViewDivElement(divElement);
         }
     }
@@ -651,7 +663,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
     }
 
     public setPrefersColorScheme(scheme: TeleBoxColorScheme): void {
-        this.appManager?.boxManager.setPrefersColorScheme(scheme);
+        this.appManager?.boxManager?.setPrefersColorScheme(scheme);
     }
 
     private isDynamicPPT(scenes: SceneDefinition[]) {
@@ -701,7 +713,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
             if (containerRect) {
                 this.updateSizer(containerRect, sizer, wrapper);
                 this.cursorManager?.updateContainerRect();
-                this.appManager?.boxManager.updateManagerRect();
+                this.boxManager?.updateManagerRect();
                 emitter.emit("playgroundSizeChange", containerRect);
             }
         });

package/src/style.css

@@ -115,7 +115,7 @@
     flex-direction: column;
     align-items: center;
     justify-content: center;
-    position: fixed;
+    position: absolute;
     width: 26px;
     height: 26px;
     z-index: 2147483647;

package/src/viewManager.ts

@@ -103,7 +103,7 @@ export class ViewManager extends Base {
             setViewMode(this.mainView, ViewVisionMode.Freedom);
         }
         if (!this.mainView.focusScenePath) {
-            this.store.setMainViewFocusPath();
+            this.store.setMainViewFocusPath(this.mainView);
         }
     }
 
@@ -116,7 +116,7 @@ export class ViewManager extends Base {
         this.appTimer = setTimeout(() => {
             const appProxy = this.manager.appProxies.get(id);
             if (appProxy) {
-                if (this.manager.boxManager.minimized) return;
+                if (this.manager.boxManager?.minimized) return;
                 appProxy.setScenePath();
                 appProxy.switchToWritable();
                 appProxy.focusBox();