@netless/window-manager 0.4.73-beta.0 → 0.4.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "0.4.73-beta.0",
+  "version": "0.4.73",
   "description": "Multi-window mode for Netless Whiteboard",
   "author": "l1shen <lishen1635@gmail.com> (https://github.com/l1shen)",
   "license": "MIT",
@@ -13,6 +13,14 @@
     "docs",
     "src"
   ],
+  "scripts": {
+    "build": "vite build && npm run type-gen",
+    "lint": "eslint --ext .ts,.tsx,.svelte . && prettier --check .",
+    "predev": "npm run type-gen",
+    "prettier": "prettier --write .",
+    "test": "vitest",
+    "type-gen": "dts src/index.ts -o dist/index.d.ts"
+  },
   "peerDependencies": {
     "jspdf": "2.5.1",
     "white-web-sdk": "^2.16.0"
@@ -28,11 +36,11 @@
     "emittery": "^0.9.2",
     "lodash": "^4.17.21",
     "p-retry": "^4.6.1",
-    "side-effect-manager": "0.1.5",
     "uuid": "^7.0.3",
     "video.js": ">=7"
   },
   "devDependencies": {
+    "@hyrious/dts": "^0.2.2",
     "@netless/app-docs-viewer": "^0.2.17",
     "@netless/app-media-player": "0.1.0-beta.6",
     "@rollup/plugin-commonjs": "^20.0.0",
@@ -59,19 +67,11 @@
     "prettier-plugin-svelte": "^2.4.0",
     "rollup-plugin-analyzer": "^4.0.0",
     "rollup-plugin-styles": "^3.14.1",
+    "side-effect-manager": "0.1.5",
     "svelte": "^3.42.4",
     "typescript": "^4.5.5",
-    "vite": "^2.5.3",
+    "vite": "^2.9.9",
     "vitest": "^0.14.1",
     "white-web-sdk": "2.16.43"
-  },
-  "scripts": {
-    "build": "vite build && yarn type-gen",
-    "build:lib:types": "tsc --emitDeclarationOnly",
-    "lint": "eslint --ext .ts,.tsx,.svelte . && prettier --check .",
-    "predev": "yarn type-gen",
-    "prettier": "prettier --write .",
-    "test": "vitest",
-    "type-gen": "tsc --emitDeclarationOnly"
   }
-}
+}

package/src/App/AppContext.ts

@@ -29,7 +29,6 @@ import type {
 } from "./MagixEvent";
 import type { AddPageParams, PageController, PageState } from "../Page";
 import { internalEmitter } from "../InternalEmitter";
-import { WindowManager } from "../index";
 import { callbacks } from "../callback";
 
 export class AppContext<TAttributes extends {} = any, TMagixEventPayloads = any, TAppOptions = any>
@@ -92,9 +91,7 @@ export class AppContext<TAttributes extends {} = any, TMagixEventPayloads = any,
             setTimeout(() => {
                 // 渲染需要时间，延迟 refresh
                 this.getRoom()?.refreshViewSize();
-                if (WindowManager.supportTeachingAidsPlugin) {
-                    callbacks.emit("onAppViewMounted", {appId: this.appId, view});
-                }
+                callbacks.emit("onAppViewMounted", { appId: this.appId, view });
             }, 1000);
         }
     };
@@ -164,7 +161,10 @@ export class AppContext<TAttributes extends {} = any, TMagixEventPayloads = any,
      * @param defaultState Default state for initial storage creation.
      * @returns
      */
-    public createStorage = <TState extends {}>(storeId: string, defaultState?: TState): Storage<TState> => {
+    public createStorage = <TState extends {}>(
+        storeId: string,
+        defaultState?: TState
+    ): Storage<TState> => {
         const storage = new Storage(this, storeId, defaultState);
         this.emitter.on("destroy", () => {
             storage.destroy();
@@ -256,8 +256,8 @@ export class AppContext<TAttributes extends {} = any, TMagixEventPayloads = any,
             console.warn(`[WindowManager]: page index ${index} out of range`);
             return false;
         }
-        return this.appProxy.removeSceneByIndex(needRemoveIndex);;
-    }
+        return this.appProxy.removeSceneByIndex(needRemoveIndex);
+    };
 
     public get pageState(): PageState {
         return this.appProxy.pageState;
@@ -269,6 +269,11 @@ export class AppContext<TAttributes extends {} = any, TMagixEventPayloads = any,
 
     /** Dispatch a local event to `manager.onAppEvent()`. */
     public dispatchAppEvent(type: string, value?: any): void {
-        internalEmitter.emit(`custom-${this.kind}` as any, { kind: this.kind, appId: this.appId, type, value });
+        internalEmitter.emit(`custom-${this.kind}` as any, {
+            kind: this.kind,
+            appId: this.appId,
+            type,
+            value,
+        });
     }
 }

package/src/App/AppProxy.ts

@@ -30,7 +30,6 @@ import type { ReadonlyTeleBox } from "@netless/telebox-insider";
 import type { PageRemoveService, PageState } from "../Page";
 import { calculateNextIndex } from "../Page";
 import { boxEmitter } from "../BoxEmitter";
-import { WindowManager } from "../index";
 import { callbacks } from "../callback";
 
 export type AppEmitter = Emittery<AppEmitterEvent>;
@@ -196,9 +195,7 @@ export class AppProxy implements PageRemoveService {
                     appRegister.notifyApp(this.kind, "created", { appId, result });
                     this.afterSetupApp(boxInitState);
                     this.fixMobileSize();
-                    if (WindowManager.supportTeachingAidsPlugin) {
-                        callbacks.emit("onAppSetup", appId);
-                    }
+                    callbacks.emit("onAppSetup", appId);
                 }, SETUP_APP_DELAY);
             });
             this.boxManager?.createBox({
@@ -212,7 +209,7 @@ export class AppProxy implements PageRemoveService {
                 this.store.updateAppState(appId, AppAttributes.ZIndex, this.box.zIndex);
                 this.store.updateAppState(appId, AppAttributes.Size, {
                     width: this.box.intrinsicWidth,
-                    height: this.box.intrinsicHeight
+                    height: this.box.intrinsicHeight,
                 });
                 this.boxManager.focusBox({ appId }, false);
             }
@@ -396,9 +393,7 @@ export class AppProxy implements PageRemoveService {
     private setFocusScenePathHandler = debounce((fullPath: string | undefined) => {
         if (this.view && fullPath && fullPath !== this.view?.focusScenePath) {
             setViewFocusScenePath(this.view, fullPath);
-            if (WindowManager.supportTeachingAidsPlugin) {
-                callbacks.emit("onAppScenePathChange", {appId: this.id, view:this.view});
-            }
+            callbacks.emit("onAppScenePathChange", { appId: this.id, view: this.view });
         }
     }, 50);
 

package/src/App/MagixEvent/index.ts

@@ -1,68 +1,68 @@
 import type {
-  MagixEventListenerOptions as WhiteMagixListenerOptions,
-  Event as WhiteEvent,
-  EventPhase as WhiteEventPhase,
-  Scope as WhiteScope,
+    MagixEventListenerOptions as WhiteMagixListenerOptions,
+    Event as WhiteEvent,
+    EventPhase as WhiteEventPhase,
+    Scope as WhiteScope,
 } from "white-web-sdk";
 
 export interface MagixEventListenerOptions extends WhiteMagixListenerOptions {
-  /**
-   * Rapid emitted callbacks will be slowed down to this interval (in ms).
-   */
-  fireInterval?: number;
-  /**
-   * If `true`, sent events will reach self-listeners after committed to server.
-   * Otherwise the events will reach self-listeners immediately.
-   */
-  fireSelfEventAfterCommit?: boolean;
+    /**
+     * Rapid emitted callbacks will be slowed down to this interval (in ms).
+     */
+    fireInterval?: number;
+    /**
+     * If `true`, sent events will reach self-listeners after committed to server.
+     * Otherwise the events will reach self-listeners immediately.
+     */
+    fireSelfEventAfterCommit?: boolean;
 }
 
 export interface MagixEventMessage<
-  TPayloads = any,
-  TEvent extends MagixEventTypes<TPayloads> = MagixEventTypes<TPayloads>
+    TPayloads = any,
+    TEvent extends MagixEventTypes<TPayloads> = MagixEventTypes<TPayloads>
 > extends Omit<WhiteEvent, "scope" | "phase"> {
-  /** Event name */
-  event: TEvent;
-  /** Event Payload */
-  payload: TPayloads[TEvent];
-  /** Whiteboard ID of the client who dispatched the event. It will be AdminObserverId for system events. */
-  authorId: number;
-  scope: `${WhiteScope}`;
-  phase: `${WhiteEventPhase}`;
+    /** Event name */
+    event: TEvent;
+    /** Event Payload */
+    payload: TPayloads[TEvent];
+    /** Whiteboard ID of the client who dispatched the event. It will be AdminObserverId for system events. */
+    authorId: number;
+    scope: `${WhiteScope}`;
+    phase: `${WhiteEventPhase}`;
 }
 
 export type MagixEventTypes<TPayloads = any> = Extract<keyof TPayloads, string>;
 
 export type MagixEventPayload<
-  TPayloads = any,
-  TEvent extends MagixEventTypes<TPayloads> = MagixEventTypes<TPayloads>
+    TPayloads = any,
+    TEvent extends MagixEventTypes<TPayloads> = MagixEventTypes<TPayloads>
 > = TPayloads[TEvent];
 
 export type MagixEventDispatcher<TPayloads = any> = <
-  TEvent extends MagixEventTypes<TPayloads> = MagixEventTypes<TPayloads>
+    TEvent extends MagixEventTypes<TPayloads> = MagixEventTypes<TPayloads>
 >(
-  event: TEvent,
-  payload: TPayloads[TEvent]
+    event: TEvent,
+    payload: TPayloads[TEvent]
 ) => void;
 
 export type MagixEventHandler<
-  TPayloads = any,
-  TEvent extends MagixEventTypes<TPayloads> = MagixEventTypes<TPayloads>
+    TPayloads = any,
+    TEvent extends MagixEventTypes<TPayloads> = MagixEventTypes<TPayloads>
 > = (message: MagixEventMessage<TPayloads, TEvent>) => void;
 
-export type MagixEventListenerDisposer = () => void
+export type MagixEventListenerDisposer = () => void;
 
 export type MagixEventAddListener<TPayloads = any> = <
-  TEvent extends MagixEventTypes<TPayloads> = MagixEventTypes<TPayloads>
+    TEvent extends MagixEventTypes<TPayloads> = MagixEventTypes<TPayloads>
 >(
-  event: TEvent,
-  handler: MagixEventHandler<TPayloads, TEvent>,
-  options?: MagixEventListenerOptions | undefined
+    event: TEvent,
+    handler: MagixEventHandler<TPayloads, TEvent>,
+    options?: MagixEventListenerOptions | undefined
 ) => MagixEventListenerDisposer;
 
 export type MagixEventRemoveListener<TPayloads = any> = <
-  TEvent extends MagixEventTypes<TPayloads> = MagixEventTypes<TPayloads>
+    TEvent extends MagixEventTypes<TPayloads> = MagixEventTypes<TPayloads>
 >(
-  event: TEvent,
-  handler?: MagixEventHandler<TPayloads, TEvent>
+    event: TEvent,
+    handler?: MagixEventHandler<TPayloads, TEvent>
 ) => void;

package/src/App/Storage/StorageEvent.ts

@@ -1,21 +1,21 @@
 export type StorageEventListener<T> = (event: T) => void;
 
 export class StorageEvent<TMessage> {
-  listeners = new Set<StorageEventListener<TMessage>>();
+    listeners = new Set<StorageEventListener<TMessage>>();
 
-  get length(): number {
-    return this.listeners.size;
-  }
+    get length(): number {
+        return this.listeners.size;
+    }
 
-  dispatch(message: TMessage): void {
-    this.listeners.forEach(callback => callback(message));
-  }
+    dispatch(message: TMessage): void {
+        this.listeners.forEach(callback => callback(message));
+    }
 
-  addListener(listener: StorageEventListener<TMessage>): void {
-    this.listeners.add(listener);
-  }
+    addListener(listener: StorageEventListener<TMessage>): void {
+        this.listeners.add(listener);
+    }
 
-  removeListener(listener: StorageEventListener<TMessage>): void {
-    this.listeners.delete(listener);
-  }
+    removeListener(listener: StorageEventListener<TMessage>): void {
+        this.listeners.delete(listener);
+    }
 }