@netless/window-manager 0.3.7 → 0.3.8-canary.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "0.3.7",
+  "version": "0.3.8-canary.3",
   "description": "",
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",
@@ -56,6 +56,6 @@
     "typescript": "^4.3.5",
     "video.js": "^7.14.3",
     "vite": "^2.5.3",
-    "white-web-sdk": "2.15.6"
+    "white-web-sdk": "^2.15.8"
   }
 }

package/src/AppContext.ts

@@ -32,6 +32,7 @@ export class AppContext<TAttrs extends Record<string, any>, AppOptions = any> {
     private boxManager: BoxManager;
     private store = this.manager.store;
     public readonly isAddApp: boolean;
+    public readonly isReplay = this.manager.isReplay;
 
     constructor(
         private manager: AppManager,

package/src/AppListener.ts

@@ -3,6 +3,7 @@ import { Events, MagixEventName } from './constants';
 import type { Event } from "white-web-sdk";
 import type { AppManager } from "./AppManager";
 import type { TeleBoxState } from "@netless/telebox-insider";
+import { setViewFocusScenePath } from './Utils/Common';
 
 export class AppListeners {
     private displayer = this.manager.displayer;
@@ -38,6 +39,10 @@ export class AppListeners {
                     this.boxStateChangeHandler(data.payload);
                     break;
                 }
+                case Events.SetMainViewScenePath: {
+                    this.setMainViewScenePathHandler(data.payload);
+                    break;
+                }
                 default:
                     break;
             }
@@ -60,4 +65,8 @@ export class AppListeners {
     private boxStateChangeHandler = (state: TeleBoxState) => {
         callbacks.emit("boxStateChange", state);
     }
+
+    private setMainViewScenePathHandler = ({ nextScenePath }: { nextScenePath: string }) => {
+        setViewFocusScenePath(this.manager.mainView, nextScenePath);
+    }
 }

package/src/AppManager.ts

@@ -1,15 +1,27 @@
-import { AppAttributes, AppStatus, Events, MagixEventName } from "./constants";
+import pRetry from "p-retry";
+import {
+    AppAttributes,
+    AppStatus,
+    Events,
+    MagixEventName
+    } from "./constants";
 import { AppListeners } from "./AppListener";
 import { AppProxy } from "./AppProxy";
 import { AttributesDelegate } from "./AttributesDelegate";
+import {
+    autorun,
+    isPlayer,
+    isRoom,
+    ScenePathType,
+    ViewVisionMode
+    } from "white-web-sdk";
 import { BoxManager } from "./BoxManager";
 import { callbacks, emitter } from "./index";
 import { CameraStore } from "./Utils/CameraStore";
 import { genAppId, makeValidScenePath, setScenePath } from "./Utils/Common";
-import { autorun, isPlayer, isRoom, ScenePathType, ViewVisionMode } from "white-web-sdk";
 import { log } from "./Utils/log";
 import { MainViewProxy } from "./MainView";
-import { onObjectInserted, onObjectRemoved } from "./Utils/Reactive";
+import { onObjectRemoved, safeListenPropsUpdated } from "./Utils/Reactive";
 import { ReconnectRefresher } from "./ReconnectRefresher";
 import { ViewManager } from "./ViewManager";
 import type { Displayer, DisplayerState, Room } from "white-web-sdk";
@@ -31,6 +43,7 @@ export class AppManager {
     public store = new AttributesDelegate(this);
     public mainViewProxy: MainViewProxy;
     public refresher?: ReconnectRefresher;
+    public isReplay = this.windowManger.isReplay;
 
     private appListeners: AppListeners;
 
@@ -54,15 +67,17 @@ export class AppManager {
                     appProxy.onSeek(time);
                 });
                 this.attributesUpdateCallback(this.attributes.apps);
+                this.onAppDelete(this.attributes.apps);
             });
         }
     }
 
     private async onCreated() {
         await this.attributesUpdateCallback(this.attributes.apps);
+        this.boxManager.updateManagerRect();
         emitter.onAny(this.boxEventListener);
         this.refresher?.add("apps", () => {
-            return onObjectInserted(this.attributes.apps, () => {
+            return safeListenPropsUpdated(() => this.attributes.apps, () => {
                 this.attributesUpdateCallback(this.attributes.apps);
             });
         });
@@ -114,16 +129,28 @@ export class AppManager {
             for (const id in apps) {
                 if (!this.appProxies.has(id) && !this.appStatus.has(id)) {
                     const app = apps[id];
-                    await this.baseInsertApp(
-                        {
-                            kind: app.kind,
-                            options: app.options,
-                            isDynamicPPT: app.isDynamicPPT,
-                        },
-                        id,
-                        false
-                    );
-                    this.focusByAttributes(apps);
+
+                    pRetry(async () => {
+                        this.appStatus.set(id, AppStatus.StartCreate);
+                        // 防御 appAttributes 有可能为 undefined 的情况，这里做一个重试
+                        const appAttributes = this.attributes[id];
+                        if (!appAttributes) {
+                            throw new Error("appAttributes is undefined");
+                        }
+                        await this.baseInsertApp(
+                            {
+                                kind: app.kind,
+                                options: app.options,
+                                isDynamicPPT: app.isDynamicPPT,
+                            },
+                            id,
+                            false
+                        );
+                        this.focusByAttributes(apps);
+                    }, { retries: 3 }).catch(err => {
+                        console.warn(`[WindowManager]: Insert App Error`, err);
+                        this.appStatus.delete(id);
+                    });
                 }
             }
         }
@@ -166,9 +193,6 @@ export class AppManager {
         const attrs = params.attributes ?? {};
         this.safeUpdateAttributes([appId], attrs);
         this.store.setupAppAttributes(params, appId, isDynamicPPT);
-        if (this.boxManager.minimized) {
-            this.boxManager.setMinimized(false);
-        }
         const needFocus = !this.boxManager.minimized;
         if (needFocus) {
             this.store.setAppFocus(appId, true);
@@ -184,6 +208,9 @@ export class AppManager {
                 y: appProxy.box?.y,
             });
         }
+        if (this.boxManager.minimized) {
+            this.boxManager.setMinimized(false, false);
+        }
     }
 
     public async closeApp(appId: string) {
@@ -199,7 +226,6 @@ export class AppManager {
         isAddApp: boolean,
         focus?: boolean
     ) {
-        this.appStatus.set(appId, AppStatus.StartCreate);
         if (this.appProxies.has(appId)) {
             console.warn("[WindowManager]: app duplicate exists and cannot be created again");
             return;
@@ -311,6 +337,7 @@ export class AppManager {
         await this.viewManager.switchMainViewToWriter();
         setScenePath(this.room, scenePath);
         this.store.setMainViewFocusPath();
+        this.dispatchInternalEvent(Events.SetMainViewScenePath, { nextScenePath: scenePath });
     }
 
     public async setMainViewSceneIndex(index: number) {
@@ -318,8 +345,10 @@ export class AppManager {
             this.safeSetAttributes({ _mainSceneIndex: index });
             await this.viewManager.switchMainViewToWriter();
             this.room.setSceneIndex(index);
-            this.store.setMainViewScenePath(this.room.state.sceneState.scenePath);
+            const nextScenePath = this.room.state.sceneState.scenePath;
+            this.store.setMainViewScenePath(nextScenePath);
             this.store.setMainViewFocusPath();
+            this.dispatchInternalEvent(Events.SetMainViewScenePath, { nextScenePath });
         }
     }
 

package/src/BoxManager.ts

@@ -290,8 +290,8 @@ export class BoxManager {
         this.teleBoxManager.setMaximized(maximized, true);
     }
 
-    public setMinimized(minimized: boolean) {
-        this.teleBoxManager.setMinimized(minimized, true);
+    public setMinimized(minimized: boolean, skipUpdate = true) {
+        this.teleBoxManager.setMinimized(minimized, skipUpdate);
     }
 
     public setReadonly(readonly: boolean) {

package/src/Utils/Common.ts

@@ -29,7 +29,7 @@ export const setScenePath = (room: Room | undefined, scenePath: string) => {
 }
 
 export const setViewMode = (view: View, mode: ViewVisionMode) => {
-    if (view.mode !== mode) {
+    if (!(view as any).didRelease && view.mode !== mode) {
         view.mode = mode;
     }
 };

package/src/Utils/Reactive.ts

@@ -1,5 +1,5 @@
 import { listenUpdated, unlistenUpdated, reaction, UpdateEventKind } from "white-web-sdk";
-import type { AkkoObjectUpdatedProperty } from "white-web-sdk";
+import type { AkkoObjectUpdatedProperty , AkkoObjectUpdatedListener } from "white-web-sdk";
 
 // 兼容 13 和 14 版本 SDK
 export const onObjectByEvent = (event: UpdateEventKind) => {
@@ -28,5 +28,30 @@ export const onObjectByEvent = (event: UpdateEventKind) => {
     }
 }
 
+export const safeListenPropsUpdated = <T>(
+    getProps: () => T,
+    callback: AkkoObjectUpdatedListener<T>
+  ) => {
+    let disposeListenUpdated: (() => void) | null = null;
+    const disposeReaction = reaction(
+      getProps,
+      () => {
+        if (disposeListenUpdated) {
+          disposeListenUpdated();
+          disposeListenUpdated = null;
+        }
+        const props = getProps();
+        disposeListenUpdated = () => unlistenUpdated(props, callback);
+        listenUpdated(props, callback);
+      },
+      { fireImmediately: true }
+    );
+
+    return () => {
+      disposeListenUpdated?.();
+      disposeReaction();
+    };
+}
+
 export const onObjectRemoved = onObjectByEvent(UpdateEventKind.Removed);
 export const onObjectInserted = onObjectByEvent(UpdateEventKind.Inserted);

package/src/index.ts

@@ -33,6 +33,7 @@ import {
 import type { Apps } from "./AttributesDelegate";
 import {
     InvisiblePlugin,
+    isPlayer,
     isRoom,
     RoomPhase,
     ViewMode,
@@ -168,7 +169,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
     public static containerSizeRatio = DEFAULT_CONTAINER_RATIO;
     private static isCreated = false;
 
-    public version = "0.3.7";
+    public version = "0.3.8-canary.3";
 
     public appListeners?: AppListeners;
 
@@ -177,7 +178,8 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
     public appManager?: AppManager;
     public cursorManager?: CursorManager;
     public viewMode = ViewMode.Broadcaster;
-    
+    public isReplay = isPlayer(this.displayer);
+
     constructor(context: InvisiblePluginContext) {
         super(context);
     }

package/src/viewManager.ts

@@ -2,11 +2,7 @@ import { Base } from "./Base";
 import { callbacks, WindowManager } from "./index";
 import { reaction, ViewVisionMode } from "white-web-sdk";
 import { SET_SCENEPATH_DELAY } from "./constants";
-import {
-    notifyMainViewModeChange,
-    setScenePath,
-    setViewMode,
-} from "./Utils/Common";
+import { notifyMainViewModeChange, setScenePath, setViewMode } from "./Utils/Common";
 import type { View } from "white-web-sdk";
 import type { AppManager } from "./AppManager";