@netless/window-manager 0.4.37 → 0.4.40

package/dist/index.d.ts

@@ -90,7 +90,7 @@ export declare type MountParams = {
     applianceIcons?: ApplianceIcons;
 };
 export declare const reconnectRefresher: ReconnectRefresher;
-export declare class WindowManager extends InvisiblePlugin<WindowMangerAttributes> implements PageController {
+export declare class WindowManager extends InvisiblePlugin<WindowMangerAttributes, any> implements PageController {
     static kind: string;
     static displayer: Displayer;
     static wrapper?: HTMLElement;

package/dist/index.es.js

@@ -223,30 +223,36 @@ const executeScript = (text2, appName) => {
 const loadApp = async (url, key, name) => {
   const appName = name || Prefix + key;
   callbacks$1.emit("loadApp", { kind: key, status: "start" });
+  let text2;
   try {
-    const text2 = await getScript(url);
+    text2 = await getScript(url);
     if (!text2 || text2.length === 0) {
       callbacks$1.emit("loadApp", { kind: key, status: "failed", reason: "script is empty." });
-      return;
+      throw new Error("[WindowManager]: script is empty.");
     }
-    try {
+  } catch (error) {
+    callbacks$1.emit("loadApp", { kind: key, status: "failed", reason: error.message });
+    throw error;
+  }
+  return getResult(text2, appName, key);
+};
+const getResult = (text2, appName, key) => {
+  try {
+    const result = executeScript(text2, appName);
+    callbacks$1.emit("loadApp", { kind: key, status: "success" });
+    return result;
+  } catch (error) {
+    if (error.message.includes("Can only have one anonymous define call per script file")) {
+      const define = window.define;
+      if (typeof define == "function" && define.amd) {
+        delete define.amd;
+      }
       const result = executeScript(text2, appName);
       callbacks$1.emit("loadApp", { kind: key, status: "success" });
       return result;
-    } catch (error) {
-      if (error.message.includes("Can only have one anonymous define call per script file")) {
-        const define = window.define;
-        if (typeof define == "function" && define.amd) {
-          delete define.amd;
-        }
-        const result = executeScript(text2, appName);
-        callbacks$1.emit("loadApp", { kind: key, status: "success" });
-        return result;
-      }
-      callbacks$1.emit("loadApp", { kind: key, status: "failed", reason: error.message });
     }
-  } catch (error) {
     callbacks$1.emit("loadApp", { kind: key, status: "failed", reason: error.message });
+    throw error;
   }
 };
 async function fetchWithTimeout(resource, options) {
@@ -279,27 +285,35 @@ class AppRegister {
   async register(params) {
     this.appClassesCache.delete(params.kind);
     this.registered.set(params.kind, params);
-    const srcOrAppOrFunction = params.src;
+    const paramSrc = params.src;
     let downloadApp;
-    if (typeof srcOrAppOrFunction === "string") {
+    if (typeof paramSrc === "string") {
+      downloadApp = async () => {
+        const result = await loadApp(paramSrc, params.kind, params.name);
+        if (result.__esModule) {
+          return result.default;
+        }
+        return result;
+      };
+      if (this.syncRegisterApp) {
+        this.syncRegisterApp({ kind: params.kind, src: paramSrc, name: params.name });
+      }
+    }
+    if (typeof paramSrc === "function") {
       downloadApp = async () => {
-        let appClass = await loadApp(srcOrAppOrFunction, params.kind, params.name);
+        let appClass = await paramSrc();
         if (appClass) {
           if (appClass.__esModule) {
             appClass = appClass.default;
           }
           return appClass;
         } else {
-          throw new Error(`[WindowManager]: load remote script failed, ${srcOrAppOrFunction}`);
+          throw new Error(`[WindowManager]: load remote script failed, ${paramSrc}`);
         }
       };
-      if (this.syncRegisterApp) {
-        this.syncRegisterApp({ kind: params.kind, src: srcOrAppOrFunction, name: params.name });
-      }
-    } else if (typeof srcOrAppOrFunction === "function") {
-      downloadApp = srcOrAppOrFunction;
-    } else {
-      downloadApp = async () => srcOrAppOrFunction;
+    }
+    if (typeof paramSrc === "object") {
+      downloadApp = async () => paramSrc;
     }
     this.appClasses.set(params.kind, async () => {
       let app = this.appClassesCache.get(params.kind);
@@ -1455,6 +1469,7 @@ class AppProxy {
         this.appAttributesUpdateListener(appId);
         this.setViewFocusScenePath();
         setTimeout(async () => {
+          console.log("setup app", app);
           const result = await app.setup(context);
           this.appResult = result;
           appRegister.notifyApp(this.kind, "created", { appId, result });
@@ -1769,9 +1784,6 @@ class MainViewProxy {
     this.onUpdateContainerSizeRatio = () => {
       const size2 = this.store.getMainViewSize();
       this.sizeChangeHandler(size2);
-      if (size2.id === this.manager.uid) {
-        this.setCameraAndSize();
-      }
     };
     this.onCameraUpdatedByDevice = (camera) => {
       this.store.setMainViewCamera(__spreadProps(__spreadValues({}, camera), { id: this.manager.uid }));
@@ -1807,7 +1819,9 @@ class MainViewProxy {
     });
     this.sideEffectManager.add(() => {
       return emitter.on("startReconnect", () => {
-        this.mainView.release();
+        if (!this.didRelease) {
+          this.mainView.release();
+        }
       });
     });
   }
@@ -15104,14 +15118,14 @@ const reconnectRefresher = new ReconnectRefresher({ emitter });
 const _WindowManager = class extends InvisiblePlugin {
   constructor(context) {
     super(context);
-    this.version = "0.4.37";
-    this.dependencies = { "dependencies": { "@juggle/resize-observer": "^3.3.1", "@netless/telebox-insider": "0.2.26", "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" }, "peerDependencies": { "white-web-sdk": "^2.16.0" }, "devDependencies": { "@netless/app-docs-viewer": "^0.2.9", "@netless/app-media-player": "0.1.0-beta.5", "@rollup/plugin-commonjs": "^20.0.0", "@rollup/plugin-node-resolve": "^13.0.4", "@rollup/plugin-url": "^6.1.0", "@sveltejs/vite-plugin-svelte": "^1.0.0-next.22", "@tsconfig/svelte": "^2.0.1", "@types/debug": "^4.1.7", "@types/lodash": "^4.14.182", "@types/lodash-es": "^4.17.4", "@types/uuid": "^8.3.1", "@typescript-eslint/eslint-plugin": "^4.30.0", "@typescript-eslint/parser": "^4.30.0", "@vitest/ui": "^0.14.1", "cypress": "^8.7.0", "dotenv": "^10.0.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-svelte3": "^3.2.0", "jsdom": "^19.0.0", "less": "^4.1.1", "prettier": "^2.3.2", "prettier-plugin-svelte": "^2.4.0", "rollup-plugin-analyzer": "^4.0.0", "rollup-plugin-styles": "^3.14.1", "svelte": "^3.42.4", "typescript": "^4.5.5", "vite": "^2.5.3", "vitest": "^0.14.1", "white-web-sdk": "2.16.10" } };
+    this.version = "0.4.40";
+    this.dependencies = { "dependencies": { "@juggle/resize-observer": "^3.3.1", "@netless/telebox-insider": "0.2.26", "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" }, "peerDependencies": { "white-web-sdk": "^2.16.0" }, "devDependencies": { "@netless/app-docs-viewer": "^0.2.9", "@netless/app-media-player": "0.1.0-beta.5", "@rollup/plugin-commonjs": "^20.0.0", "@rollup/plugin-node-resolve": "^13.0.4", "@rollup/plugin-url": "^6.1.0", "@sveltejs/vite-plugin-svelte": "^1.0.0-next.22", "@tsconfig/svelte": "^2.0.1", "@types/debug": "^4.1.7", "@types/lodash": "^4.14.182", "@types/lodash-es": "^4.17.4", "@types/uuid": "^8.3.1", "@typescript-eslint/eslint-plugin": "^4.30.0", "@typescript-eslint/parser": "^4.30.0", "@vitest/ui": "^0.14.1", "cypress": "^8.7.0", "dotenv": "^10.0.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-svelte3": "^3.2.0", "jsdom": "^19.0.0", "less": "^4.1.1", "prettier": "^2.3.2", "prettier-plugin-svelte": "^2.4.0", "rollup-plugin-analyzer": "^4.0.0", "rollup-plugin-styles": "^3.14.1", "svelte": "^3.42.4", "typescript": "^4.5.5", "vite": "^2.5.3", "vitest": "^0.14.1", "white-web-sdk": "2.16.33" } };
     this.emitter = callbacks$1;
     this.viewMode = ViewMode.Broadcaster;
     this.isReplay = isPlayer(this.displayer);
     this.containerSizeRatio = _WindowManager.containerSizeRatio;
     _WindowManager.displayer = context.displayer;
-    window.NETLESS_DEPS = { "dependencies": { "@juggle/resize-observer": "^3.3.1", "@netless/telebox-insider": "0.2.26", "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" }, "peerDependencies": { "white-web-sdk": "^2.16.0" }, "devDependencies": { "@netless/app-docs-viewer": "^0.2.9", "@netless/app-media-player": "0.1.0-beta.5", "@rollup/plugin-commonjs": "^20.0.0", "@rollup/plugin-node-resolve": "^13.0.4", "@rollup/plugin-url": "^6.1.0", "@sveltejs/vite-plugin-svelte": "^1.0.0-next.22", "@tsconfig/svelte": "^2.0.1", "@types/debug": "^4.1.7", "@types/lodash": "^4.14.182", "@types/lodash-es": "^4.17.4", "@types/uuid": "^8.3.1", "@typescript-eslint/eslint-plugin": "^4.30.0", "@typescript-eslint/parser": "^4.30.0", "@vitest/ui": "^0.14.1", "cypress": "^8.7.0", "dotenv": "^10.0.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-svelte3": "^3.2.0", "jsdom": "^19.0.0", "less": "^4.1.1", "prettier": "^2.3.2", "prettier-plugin-svelte": "^2.4.0", "rollup-plugin-analyzer": "^4.0.0", "rollup-plugin-styles": "^3.14.1", "svelte": "^3.42.4", "typescript": "^4.5.5", "vite": "^2.5.3", "vitest": "^0.14.1", "white-web-sdk": "2.16.10" } };
+    window.NETLESS_DEPS = { "dependencies": { "@juggle/resize-observer": "^3.3.1", "@netless/telebox-insider": "0.2.26", "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" }, "peerDependencies": { "white-web-sdk": "^2.16.0" }, "devDependencies": { "@netless/app-docs-viewer": "^0.2.9", "@netless/app-media-player": "0.1.0-beta.5", "@rollup/plugin-commonjs": "^20.0.0", "@rollup/plugin-node-resolve": "^13.0.4", "@rollup/plugin-url": "^6.1.0", "@sveltejs/vite-plugin-svelte": "^1.0.0-next.22", "@tsconfig/svelte": "^2.0.1", "@types/debug": "^4.1.7", "@types/lodash": "^4.14.182", "@types/lodash-es": "^4.17.4", "@types/uuid": "^8.3.1", "@typescript-eslint/eslint-plugin": "^4.30.0", "@typescript-eslint/parser": "^4.30.0", "@vitest/ui": "^0.14.1", "cypress": "^8.7.0", "dotenv": "^10.0.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-svelte3": "^3.2.0", "jsdom": "^19.0.0", "less": "^4.1.1", "prettier": "^2.3.2", "prettier-plugin-svelte": "^2.4.0", "rollup-plugin-analyzer": "^4.0.0", "rollup-plugin-styles": "^3.14.1", "svelte": "^3.42.4", "typescript": "^4.5.5", "vite": "^2.5.3", "vitest": "^0.14.1", "white-web-sdk": "2.16.33" } };
   }
   static async mount(params) {
     const room = params.room;