@netless/window-manager 0.3.8-canary.2 → 0.3.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "0.3.8-canary.2",
+  "version": "0.3.9",
   "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.8"
+    "white-web-sdk": "^2.15.11"
   }
 }

package/src/AppManager.ts

@@ -1,12 +1,24 @@
-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 { onObjectRemoved, safeListenPropsUpdated } from "./Utils/Reactive";
@@ -117,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);
+                    });
                 }
             }
         }
@@ -178,10 +202,11 @@ export class AppManager {
 
     private afterAddApp(appProxy: AppProxy | undefined) {
         if (appProxy && appProxy.box) {
+            const box = appProxy.box;
             emitter.emit("move", {
                 appId: appProxy.id,
-                x: appProxy.box?.x,
-                y: appProxy.box?.y,
+                x: box?.intrinsicX,
+                y: box?.intrinsicY,
             });
         }
         if (this.boxManager.minimized) {
@@ -202,7 +227,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;

package/src/MainView.ts

@@ -1,9 +1,10 @@
-import { AnimationMode, reaction, ViewVisionMode } from 'white-web-sdk';
-import { Base } from './Base';
-import { callbacks, emitter } from './index';
-import { debounce, isEmpty, isEqual } from 'lodash';
-import { Fields } from './AttributesDelegate';
-import { notifyMainViewModeChange, setViewFocusScenePath, setViewMode } from './Utils/Common';
+import { AnimationMode, reaction, ViewVisionMode } from "white-web-sdk";
+import { Base } from "./Base";
+import { callbacks, emitter } from "./index";
+import { createView } from "./ViewManager";
+import { debounce, isEmpty, isEqual } from "lodash";
+import { Fields } from "./AttributesDelegate";
+import { notifyMainViewModeChange, setViewFocusScenePath, setViewMode } from "./Utils/Common";
 import type { Camera, Size, View } from "white-web-sdk";
 import type { AppManager } from "./AppManager";
 
@@ -24,7 +25,7 @@ export class MainViewProxy extends Base {
             setTimeout(() => {
                 this.start();
             }, 200); // 等待 mainView 挂载完毕再进行监听，否则会触发不必要的 onSizeUpdated
-        })
+        });
     }
 
     private get mainViewCamera() {
@@ -50,7 +51,7 @@ export class MainViewProxy extends Base {
     }
 
     public setCameraAndSize(): void {
-        this.store.setMainViewCamera({ ...this.mainView.camera, id: this.context.uid  });
+        this.store.setMainViewCamera({ ...this.mainView.camera, id: this.context.uid });
         this.store.setMainViewSize({ ...this.mainView.size, id: this.context.uid });
     }
 
@@ -65,8 +66,8 @@ export class MainViewProxy extends Base {
             {
                 fireImmediately: true,
             }
-        )
-    }
+        );
+    };
 
     private sizeReaction = () => {
         return reaction(
@@ -80,15 +81,15 @@ export class MainViewProxy extends Base {
             {
                 fireImmediately: true,
             }
-        )
-    }
+        );
+    };
 
     public get view(): View {
         return this.mainView;
     }
 
     public createMainView(): View {
-        const mainView = this.manager.displayer.views.createView();
+        const mainView = createView(this.manager.displayer);
         mainView.callbacks.on("onSizeUpdated", () => {
             this.context.updateManagerRect();
         });
@@ -103,11 +104,11 @@ export class MainViewProxy extends Base {
     }
 
     private cameraListener = (camera: Camera) => {
-        this.store.setMainViewCamera({ ...camera, id: this.context.uid});
+        this.store.setMainViewCamera({ ...camera, id: this.context.uid });
         if (this.store.getMainViewSize()?.id !== this.context.uid) {
             this.setMainViewSize(this.view.size);
         }
-    }
+    };
 
     public addMainViewListener(): void {
         if (this.mainViewIsAddListener) return;
@@ -138,7 +139,7 @@ export class MainViewProxy extends Base {
 
     private sizeListener = (size: Size) => {
         this.setMainViewSize(size);
-    }
+    };
 
     public setMainViewSize = debounce(size => {
         this.store.setMainViewSize({ ...size, id: this.context.uid });

package/src/index.ts

@@ -169,7 +169,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
     public static containerSizeRatio = DEFAULT_CONTAINER_RATIO;
     private static isCreated = false;
 
-    public version = "0.3.8-canary.2";
+    public version = "0.3.9";
 
     public appListeners?: AppListeners;
 

package/src/viewManager.ts

@@ -3,7 +3,7 @@ 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 type { View } from "white-web-sdk";
+import type { View, Displayer } from "white-web-sdk";
 import type { AppManager } from "./AppManager";
 
 export class ViewManager extends Base {
@@ -44,7 +44,7 @@ export class ViewManager extends Base {
     }
 
     public createView(appId: string): View {
-        const view = this.displayer.views.createView();
+        const view = createView(this.displayer);
         setViewMode(view, ViewVisionMode.Freedom);
         this.views.set(appId, view);
         return view;
@@ -134,6 +134,19 @@ export class ViewManager extends Base {
     }
 }
 
+export const createView = (displayer: Displayer): View => {
+    const view = displayer.views.createView();
+    setDefaultCameraBound(view);
+    return view;
+};
+
+export const setDefaultCameraBound = (view: View) => {
+    view.setCameraBound({
+        maxContentMode: () => 10,
+        minContentMode: () => 0.1,
+    });
+};
+
 export const setupWrapper = (
     root: HTMLElement
 ): {