@netless/window-manager 0.4.0-canary.3 → 0.4.0-canary.30

package/src/index.ts

@@ -1,25 +1,26 @@
-import AppDocsViewer from "@netless/app-docs-viewer";
-import AppMediaPlayer, { setOptions } from "@netless/app-media-player";
 import Emittery from "emittery";
 import pRetry from "p-retry";
 import { AppManager } from "./AppManager";
 import { appRegister } from "./Register";
+import { checkVersion, setupWrapper } from "./Helper";
+import { ContainerResizeObserver } from "./ContainerResizeObserver";
 import { createBoxManager } from "./BoxManager";
 import { CursorManager } from "./Cursor";
-import { DEFAULT_CONTAINER_RATIO, Events, REQUIRE_VERSION } from "./constants";
+import { DEFAULT_CONTAINER_RATIO, Events } from "./constants";
 import { Fields } from "./AttributesDelegate";
 import { initDb } from "./Register/storage";
+import { InvisiblePlugin, isPlayer, isRoom, RoomPhase, ViewMode } from "white-web-sdk";
 import { isNull, isObject } from "lodash";
 import { log } from "./Utils/log";
+import { ReconnectRefresher } from "./ReconnectRefresher";
 import { replaceRoomFunction } from "./Utils/RoomHacker";
-import { ResizeObserver as ResizeObserverPolyfill } from "@juggle/resize-observer";
-import { setupWrapper } from "./ViewManager";
+import { setupBuiltin } from "./BuiltinApps";
 import "./style.css";
 import "@netless/telebox-insider/dist/style.css";
 import {
     addEmitterOnceListener,
     ensureValidScenePath,
-    getVersionNumber,
+    entireScenes,
     isValidScenePath,
     wait,
 } from "./Utils/Common";
@@ -29,17 +30,8 @@ import {
     AppManagerNotInitError,
     InvalidScenePath,
     ParamsInvalidError,
-    WhiteWebSDKInvalidError,
 } from "./Utils/error";
-import type { Apps } from "./AttributesDelegate";
-import {
-    InvisiblePlugin,
-    isPlayer,
-    isRoom,
-    RoomPhase,
-    ViewMode,
-    WhiteVersion,
-} from "white-web-sdk";
+import type { Apps, Position } from "./AttributesDelegate";
 import type {
     Displayer,
     SceneDefinition,
@@ -53,14 +45,13 @@ import type {
     Rectangle,
     ViewVisionMode,
     CameraState,
+    Player,
 } from "white-web-sdk";
 import type { AppListeners } from "./AppListener";
 import type { NetlessApp, RegisterParams } from "./typings";
 import type { TeleBoxColorScheme, TeleBoxState } from "@netless/telebox-insider";
 import type { AppProxy } from "./AppProxy";
 
-const ResizeObserver = window.ResizeObserver || ResizeObserverPolyfill;
-
 export type WindowMangerAttributes = {
     modelValue?: string;
     boxState: TELE_BOX_STATE;
@@ -126,6 +117,8 @@ export type AppInitState = {
     zIndex?: number;
 };
 
+export type CursorMovePayload = { uid: string; state?: "leave"; position: Position };
+
 export type EmitterEvent = {
     onCreated: undefined;
     InitReplay: AppInitState;
@@ -140,6 +133,8 @@ export type EmitterEvent = {
     boxStateChange: string;
     playgroundSizeChange: DOMRect;
     onReconnected: void;
+    removeScenes: string;
+    cursorMove: CursorMovePayload;
 };
 
 export type EmitterType = Emittery<EmitterEvent>;
@@ -151,10 +146,16 @@ export type PublicEvent = {
     darkModeChange: boolean;
     prefersColorSchemeChange: TeleBoxColorScheme;
     cameraStateChange: CameraState;
+    mainViewScenePathChange: string;
+    mainViewSceneIndexChange: number;
+    focusedChange: string | undefined;
+    mainViewScenesLengthChange: number;
+    canRedoStepsChange: number;
+    canUndoStepsChange: number;
 };
 
 export type MountParams = {
-    room: Room;
+    room: Room | Player;
     container?: HTMLElement;
     /** 白板高宽比例, 默认为 9 / 16 */
     containerSizeRatio?: number;
@@ -172,6 +173,8 @@ export type MountParams = {
 export type CallbacksType = Emittery<PublicEvent>;
 export const callbacks: CallbacksType = new Emittery();
 
+export const reconnectRefresher = new ReconnectRefresher({ emitter });
+
 export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
     public static kind = "WindowManager";
     public static displayer: Displayer;
@@ -182,7 +185,8 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
     public static containerSizeRatio = DEFAULT_CONTAINER_RATIO;
     private static isCreated = false;
 
-    public version = "0.4.0-canary.3";
+    public version = __APP_VERSION__;
+    public dependencies = __APP_DEPENDENCIES__;
 
     public appListeners?: AppListeners;
 
@@ -196,9 +200,12 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
     private boxManager?: BoxManager;
     private static params?: MountParams;
 
+    private containerResizeObserver?: ContainerResizeObserver;
+
     constructor(context: InvisiblePluginContext) {
         super(context);
         WindowManager.displayer = context.displayer;
+        (window as any).NETLESS_DEPS = __APP_DEPENDENCIES__;
     }
 
     public static async mount(params: MountParams): Promise<WindowManager> {
@@ -210,20 +217,23 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
         const cursor = params.cursor;
         WindowManager.params = params;
 
-        this.checkVersion();
+        checkVersion();
+        let manager: WindowManager | undefined = undefined;
         if (isRoom(room)) {
             if (room.phase !== RoomPhase.Connected) {
                 throw new Error("[WindowManager]: Room only Connected can be mount");
             }
+            if (room.phase === RoomPhase.Connected && room.isWritable) {
+                // redo undo 需要设置这个属性
+                room.disableSerialization = false;
+            }
+            manager = await this.initManager(room);
         }
         if (WindowManager.isCreated) {
             throw new Error("[WindowManager]: Already created cannot be created again");
         }
-        let manager = await this.initManager(room);
+
         this.debug = Boolean(debug);
-        if (this.debug) {
-            setOptions({ verbose: true });
-        }
         log("Already insert room", manager);
 
         if (isRoom(this.displayer)) {
@@ -233,7 +243,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
         } else {
             await pRetry(
                 async count => {
-                    manager = await this.initManager(room);
+                    manager = (await room.getInvisiblePlugin(WindowManager.kind)) as WindowManager;
                     if (!manager) {
                         log(`manager is empty. retrying ${count}`);
                         throw new Error();
@@ -243,16 +253,17 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
             );
         }
 
+        if (!manager) {
+            throw new Error("[WindowManager]: create manager failed");
+        }
+
         if (containerSizeRatio) {
             WindowManager.containerSizeRatio = containerSizeRatio;
         }
         await manager.ensureAttributes();
 
         manager.appManager = new AppManager(manager);
-
-        if (cursor) {
-            manager.cursorManager = new CursorManager(manager.appManager);
-        }
+        manager.cursorManager = new CursorManager(manager.appManager, Boolean(cursor));
 
         if (params.container) {
             manager.bindContainer(params.container);
@@ -317,7 +328,12 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
             style.textContent = overwriteStyles;
             playground.appendChild(style);
         }
-        manager.observePlaygroundSize(playground, sizer, wrapper);
+        manager.containerResizeObserver = ContainerResizeObserver.create(
+            playground,
+            sizer,
+            wrapper,
+            emitter
+        );
         WindowManager.wrapper = wrapper;
         return mainViewElement;
     }
@@ -416,6 +432,12 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
                     const appScenePath = appManager.store.getAppScenePath(appId);
                     if (appScenePath && appScenePath === scenePath) {
                         console.warn(`[WindowManager]: ScenePath ${scenePath} Already opened`);
+                        if (this.boxManager) {
+                            const topBox = this.boxManager.getTopBox();
+                            if (topBox) {
+                                this.boxManager.setZIndex(appId, topBox.zIndex + 1, false);
+                            }
+                        }
                         return;
                     }
                 }
@@ -423,11 +445,11 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
             if (scenePath && scenes && scenes.length > 0) {
                 if (this.isDynamicPPT(scenes)) {
                     isDynamicPPT = true;
-                    if (!this.displayer.entireScenes()[scenePath]) {
+                    if (!entireScenes(this.displayer)[scenePath]) {
                         this.room?.putScenes(scenePath, scenes);
                     }
                 } else {
-                    if (!this.displayer.entireScenes()[scenePath]) {
+                    if (!entireScenes(this.displayer)[scenePath]) {
                         this.room?.putScenes(scenePath, [{ name: scenes[0].name }]);
                     }
                 }
@@ -460,7 +482,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
     /**
      * 返回 mainView 的 ScenePath
      */
-    public getMainViewScenePath(): string {
+    public getMainViewScenePath(): string | undefined {
         return this.appManager?.store.getMainViewScenePath();
     }
 
@@ -475,10 +497,8 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
      * 设置所有 app 的 readonly 模式
      */
     public setReadonly(readonly: boolean): void {
-        if (this.room?.isWritable) {
-            this.readonly = readonly;
-            this.appManager?.boxManager?.setReadonly(readonly);
-        }
+        this.readonly = readonly;
+        this.boxManager?.setReadonly(readonly);
     }
 
     /**
@@ -510,6 +530,35 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
         this.viewMode = mode;
     }
 
+    public setBoxState(boxState: TeleBoxState): void {
+        if (!this.canOperate) return;
+        switch (boxState) {
+            case "normal":
+                this.setMaximized(false);
+                this.setMinimized(false);
+                break;
+            case "maximized":
+                this.setMaximized(true);
+                this.setMinimized(false);
+                break;
+            case "minimized":
+                this.setMinimized(true);
+                break;
+            default:
+                break;
+        }
+    }
+
+    public setMaximized(maximized: boolean): void {
+        if (!this.canOperate) return;
+        this.boxManager?.setMaximized(maximized, false);
+    }
+
+    public setMinimized(minimized: boolean): void {
+        if (!this.canOperate) return;
+        this.boxManager?.setMinimized(minimized, false);
+    }
+
     public get mainView(): View {
         if (this.appManager) {
             return this.appManager.mainViewProxy.view;
@@ -558,6 +607,48 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
         }
     }
 
+    public get focused(): string | undefined {
+        return this.attributes.focus;
+    }
+
+    public get mainViewSceneIndex(): number {
+        return this.appManager?.store.getMainViewSceneIndex();
+    }
+
+    public get mainViewSceneDir(): string {
+        if (this.appManager) {
+            return this.appManager?.getMainViewSceneDir();
+        } else {
+            throw new AppManagerNotInitError();
+        }
+    }
+
+    public get topApp(): string | undefined {
+        return this.boxManager?.getTopBox()?.id;
+    }
+
+    public get mainViewScenesLength(): number {
+        return this.appManager?.mainViewScenesLength || 0;
+    }
+
+    public get canRedoSteps(): number {
+        const focused = this.focused;
+        if (focused) {
+            return this.appManager?.focusApp?.view?.canRedoSteps || 0;
+        } else {
+            return this.mainView.canRedoSteps;
+        }
+    }
+
+    public get canUndoSteps(): number {
+        const focused = this.focused;
+        if (focused) {
+            return this.appManager?.focusApp?.view?.canUndoSteps || 0;
+        } else {
+            return this.mainView.canUndoSteps;
+        }
+    }
+
     /**
      * 查询所有的 App
      */
@@ -666,18 +757,38 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
         this.appManager?.boxManager?.setPrefersColorScheme(scheme);
     }
 
-    private isDynamicPPT(scenes: SceneDefinition[]) {
-        const sceneSrc = scenes[0]?.ppt?.src;
-        return sceneSrc?.startsWith("pptx://");
+    public cleanCurrentScene(): void {
+        const focused = this.focused;
+        if (focused) {
+            this.appManager?.focusApp?.view?.cleanCurrentScene();
+        } else {
+            this.mainView.cleanCurrentScene();
+        }
     }
 
-    private static checkVersion() {
-        const version = getVersionNumber(WhiteVersion);
-        if (version < getVersionNumber(REQUIRE_VERSION)) {
-            throw new WhiteWebSDKInvalidError(REQUIRE_VERSION);
+    public redo(): void {
+        const focused = this.focused;
+        if (focused) {
+            this.appManager?.focusApp?.view?.redo();
+        } else {
+            this.mainView.redo();
+        }
+    }
+
+    public undo(): void {
+        const focused = this.focused;
+        if (focused) {
+            this.appManager?.focusApp?.view?.undo();
+        } else {
+            this.mainView.undo();
         }
     }
 
+    private isDynamicPPT(scenes: SceneDefinition[]) {
+        const sceneSrc = scenes[0]?.ppt?.src;
+        return sceneSrc?.startsWith("pptx://");
+    }
+
     private async ensureAttributes() {
         if (isNull(this.attributes)) {
             await wait(50);
@@ -698,62 +809,10 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
             }
         }
     }
-
-    private containerResizeObserver?: ResizeObserver;
-
-    private observePlaygroundSize(
-        container: HTMLElement,
-        sizer: HTMLElement,
-        wrapper: HTMLDivElement
-    ) {
-        this.updateSizer(container.getBoundingClientRect(), sizer, wrapper);
-
-        this.containerResizeObserver = new ResizeObserver(entries => {
-            const containerRect = entries[0]?.contentRect;
-            if (containerRect) {
-                this.updateSizer(containerRect, sizer, wrapper);
-                this.cursorManager?.updateContainerRect();
-                this.boxManager?.updateManagerRect();
-                emitter.emit("playgroundSizeChange", containerRect);
-            }
-        });
-
-        this.containerResizeObserver.observe(container);
-    }
-
-    private updateSizer(
-        { width, height }: DOMRectReadOnly,
-        sizer: HTMLElement,
-        wrapper: HTMLDivElement
-    ) {
-        if (width && height) {
-            if (height / width > WindowManager.containerSizeRatio) {
-                height = width * WindowManager.containerSizeRatio;
-                sizer.classList.toggle("netless-window-manager-sizer-horizontal", true);
-            } else {
-                width = height / WindowManager.containerSizeRatio;
-                sizer.classList.toggle("netless-window-manager-sizer-horizontal", false);
-            }
-            wrapper.style.width = `${width}px`;
-            wrapper.style.height = `${height}px`;
-        }
-    }
 }
 
-WindowManager.register({
-    kind: AppDocsViewer.kind,
-    src: AppDocsViewer,
-});
-WindowManager.register({
-    kind: AppMediaPlayer.kind,
-    src: AppMediaPlayer,
-});
-
-export const BuiltinApps = {
-    DocsViewer: AppDocsViewer.kind as string,
-    MediaPlayer: AppMediaPlayer.kind as string,
-};
+setupBuiltin();
 
 export * from "./typings";
 
-export { WhiteWindowSDK } from "./sdk";
+export { BuiltinApps } from "./BuiltinApps";

package/src/shim.d.ts

@@ -4,3 +4,8 @@ declare module "*.svelte" {
     const app: SvelteComponent;
     export default app;
 }
+
+declare global {
+    const __APP_VERSION__: string;
+    const __APP_DEPENDENCIES__: Record<string, string>;
+}

package/src/style.css

@@ -122,7 +122,7 @@
     left: 0;
     top: 0;
     will-change: transform;
-    transition: transform 0.05s;
+    transition: transform 0.1s;
     transform-origin: 0 0;
     user-select: none;
 }
@@ -167,3 +167,9 @@
     display: flex;
     justify-content: center;
 }
+
+.telebox-collector {
+    position: absolute;
+    right: 10px;
+    bottom: 15px;
+}

package/src/typings.ts

@@ -12,7 +12,7 @@ import type {
 import type { AppContext } from "./AppContext";
 import type { ReadonlyTeleBox, TeleBoxRect } from "@netless/telebox-insider";
 
-export interface NetlessApp<Attributes = any, SetupResult = any, AppOptions = any> {
+export interface NetlessApp<Attributes = any, MagixEventPayloads = any, AppOptions = any, SetupResult = any> {
     kind: string;
     config?: {
         /** Box width relative to whiteboard. 0~1. Default 0.5. */
@@ -28,7 +28,7 @@ export interface NetlessApp<Attributes = any, SetupResult = any, AppOptions = an
         /** App only single instance. */
         singleton?: boolean;
     };
-    setup: (context: AppContext<Attributes, AppOptions>) => SetupResult;
+    setup: (context: AppContext<Attributes, MagixEventPayloads, AppOptions>) => SetupResult;
 }
 
 export type AppEmitterEvent<T = any> = {
@@ -76,3 +76,4 @@ export type AppListenerKeys = keyof AppEmitterEvent;
 export type { AppContext } from "./AppContext";
 export type { ReadonlyTeleBox, TeleBoxRect };
 export type { SceneState, SceneDefinition, View, AnimationMode, Displayer, Room, Player };
+export type { Storage, StorageStateChangedEvent, StorageStateChangedListener } from "./App/Storage";

package/vite.config.js

@@ -1,13 +1,19 @@
 import path from "path";
 import { defineConfig } from "vite";
 import { svelte } from "@sveltejs/vite-plugin-svelte";
-import { dependencies ,peerDependencies } from "./package.json"
+import { dependencies, peerDependencies, version, devDependencies } from "./package.json"
 
 
 export default defineConfig(({ mode }) => {
     const isProd = mode === "production";
 
     return {
+        define: {
+            __APP_VERSION__: JSON.stringify(version),
+            __APP_DEPENDENCIES__: JSON.stringify({
+                dependencies, peerDependencies, devDependencies
+            }),
+        },
         plugins: [
             svelte({
                 emitCss: false,
@@ -20,7 +26,7 @@ export default defineConfig(({ mode }) => {
             lib: {
                 // eslint-disable-next-line no-undef
                 entry: path.resolve(__dirname, "src/index.ts"),
-                formats: ["es","umd"], // TODO cjs 版本待修复
+                formats: ["es", "umd"], // TODO cjs 版本待修复
                 name: "WindowManager",
                 fileName: "index"
             },

package/dist/Base/Context.d.ts

@@ -1,13 +0,0 @@
-import type { AppManager } from "../AppManager";
-export declare class Context {
-    private manager;
-    observerId: number;
-    constructor(manager: AppManager);
-    get uid(): string;
-    findMember: (memberId: number) => import("white-web-sdk").RoomMember | undefined;
-    findMemberByUid: (uid: string) => import("white-web-sdk").RoomMember | undefined;
-    updateManagerRect(): void;
-    blurFocusBox(): void;
-    switchAppToWriter(id: string): void;
-}
-export declare const createContext: (manager: AppManager) => Context;

package/dist/Base/index.d.ts

@@ -1,7 +0,0 @@
-import type { AppManager } from "../AppManager";
-export declare class Base {
-    manager: AppManager;
-    store: import("../AttributesDelegate").AttributesDelegate;
-    context: import("./Context").Context;
-    constructor(manager: AppManager);
-}

package/dist/Utils/CameraStore.d.ts

@@ -1,15 +0,0 @@
-import type { Camera, View } from "white-web-sdk";
-export declare class CameraStore {
-    private cameras;
-    private listeners;
-    setCamera(id: string, camera: Camera): void;
-    getCamera(id: string): Camera | undefined;
-    deleteCamera(id: string): void;
-    recoverCamera(id: string, view?: View): void;
-    register(id: string, view: View): void;
-    unregister(id: string, view?: View): void;
-    private onListener;
-    private offListener;
-    switchView(id: string, view: View | undefined, callback: () => void): Promise<void>;
-    private getOrCreateListener;
-}

package/dist/ViewManager.d.ts

@@ -1,29 +0,0 @@
-import { Base } from "./Base";
-import type { View, Displayer } from "white-web-sdk";
-import type { AppManager } from "./AppManager";
-export declare class ViewManager extends Base {
-    private views;
-    private timer?;
-    private appTimer?;
-    private mainViewProxy;
-    private displayer;
-    constructor(manager: AppManager);
-    get currentScenePath(): string;
-    get mainView(): View;
-    createView(appId: string): View;
-    destroyView(appId: string): void;
-    private releaseView;
-    getView(appId: string): View | undefined;
-    switchMainViewToWriter(): Promise<boolean> | undefined;
-    freedomAllViews(): void;
-    switchAppToWriter(id: string): void;
-    destroy(): void;
-}
-export declare const createView: (displayer: Displayer) => View;
-export declare const setDefaultCameraBound: (view: View) => void;
-export declare const setupWrapper: (root: HTMLElement) => {
-    playground: HTMLDivElement;
-    wrapper: HTMLDivElement;
-    sizer: HTMLDivElement;
-    mainViewElement: HTMLDivElement;
-};

package/dist/sdk.d.ts

@@ -1,14 +0,0 @@
-import { WindowManager } from './index';
-import type { MountParams } from "./index";
-import type { WhiteWebSdkConfiguration, JoinRoomParams } from "white-web-sdk";
-declare type WhiteWindowSDKConfiguration = Omit<WhiteWebSdkConfiguration, "useMobXState">;
-declare type WindowJoinRoomParams = {
-    joinRoomParams: Omit<JoinRoomParams, "useMultiViews" | "disableMagixEventDispatchLimit">;
-    mountParams: Omit<MountParams, "room">;
-};
-export declare class WhiteWindowSDK {
-    private sdk;
-    constructor(params: WhiteWindowSDKConfiguration);
-    mount(params: WindowJoinRoomParams): Promise<WindowManager>;
-}
-export {};

package/src/Base/Context.ts

@@ -1,49 +0,0 @@
-import { emitter } from "../index";
-import type { AppManager } from "../AppManager";
-
-export class Context {
-    public observerId: number;
-
-    constructor(private manager: AppManager) {
-        this.observerId = manager.displayer.observerId;
-
-        emitter.on("observerIdChange", id => {
-            this.observerId = id;
-        });
-    };
-
-    public get uid() {
-        return this.manager.room?.uid || "";
-    }
-
-    public findMember = (memberId: number) => {
-        const roomMembers = this.manager.room?.state.roomMembers;
-        return roomMembers?.find(member => member.memberId === memberId);
-    }
-
-    public findMemberByUid = (uid: string) => {
-        const roomMembers = this.manager.room?.state.roomMembers;
-        return roomMembers?.find(member => member.payload?.uid === uid);
-    }
-
-    public updateManagerRect() {
-        this.manager.boxManager?.updateManagerRect();
-    }
-
-    public blurFocusBox() {
-        this.manager.boxManager?.blurAllBox();
-    }
-
-    public switchAppToWriter(id: string) {
-        this.manager.viewManager.switchAppToWriter(id);
-    }
-}
-
-let context: Context;
-
-export const createContext = (manager: AppManager) => {
-    if (!context) {
-        context = new Context(manager);
-    }
-    return context;
-};

package/src/Base/index.ts

@@ -1,10 +0,0 @@
-import type { AppManager } from "../AppManager";
-import { store } from "../AttributesDelegate";
-import { createContext } from "./Context";
-
-export class Base {
-    public store = store;
-    public context = createContext(this.manager);
-
-    constructor(public manager: AppManager) {}
-}