@netless/window-manager 0.4.23 → 0.4.26

package/dist/index.d.ts

@@ -232,6 +232,7 @@ export declare class WindowManager extends InvisiblePlugin<WindowMangerAttribute
     refresh(): void;
     /** @inner */
     _refresh(): void;
+    setContainerSizeRatio(ratio: number): void;
     private isDynamicPPT;
     private ensureAttributes;
 }

package/dist/index.es.js

@@ -19,7 +19,7 @@ var __spreadValues = (a2, b2) => {
 var __spreadProps = (a2, b2) => __defProps(a2, __getOwnPropDescs(b2));
 import pRetry from "p-retry";
 import Emittery from "emittery";
-import { debounce, isEqual, omit, isObject, has, get, size as size$1, mapValues, noop as noop$1, pick, isEmpty, isInteger, orderBy, throttle, isFunction, isNull } from "lodash";
+import { debounce, isEqual, omit, isObject, has, get, size as size$1, mapValues, noop as noop$1, pick, isEmpty, isInteger, orderBy, isFunction, throttle, isNumber, isNull } from "lodash";
 import { ScenePathType, UpdateEventKind, listenUpdated, unlistenUpdated, reaction, autorun, toJS, listenDisposed, unlistenDisposed, AnimationMode, isPlayer, isRoom, WhiteVersion, ApplianceNames, RoomPhase, InvisiblePlugin, ViewMode } from "white-web-sdk";
 import { v4 } from "uuid";
 import { genUID, SideEffectManager } from "side-effect-manager";
@@ -1264,7 +1264,10 @@ class AppProxy {
           var _a3;
           const fullPath = (_a3 = this.appAttributes) == null ? void 0 : _a3.fullPath;
           this.setFocusScenePathHandler(fullPath);
-          this.notifyPageStateChange();
+          if (this._prevFullPath !== fullPath) {
+            this.notifyPageStateChange();
+            this._prevFullPath = fullPath;
+          }
         });
       });
     };
@@ -1555,6 +1558,7 @@ class AppProxy {
     (_b = this.manager.refresher) == null ? void 0 : _b.remove(this.id);
     (_c = this.manager.refresher) == null ? void 0 : _c.remove(this.stateKey);
     (_d = this.manager.refresher) == null ? void 0 : _d.remove(`${this.id}-fullPath`);
+    this._prevFullPath = void 0;
   }
   close() {
     return this.destroy(true, true, false);
@@ -1644,6 +1648,13 @@ class MainViewProxy {
         this.moveCamera(this.mainViewCamera);
       }
     }, 30);
+    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 }));
       if (!isEqual(this.mainViewSize, __spreadProps(__spreadValues({}, this.mainView.size), { id: this.manager.uid }))) {
@@ -1671,8 +1682,15 @@ class MainViewProxy {
       this.sizeChangeHandler(this.mainViewSize);
     };
     this.sideEffectManager.add(() => {
-      emitter.on("playgroundSizeChange", playgroundSizeChangeListener);
-      return () => emitter.off("playgroundSizeChange", playgroundSizeChangeListener);
+      return emitter.on("playgroundSizeChange", playgroundSizeChangeListener);
+    });
+    this.sideEffectManager.add(() => {
+      return emitter.on("containerSizeRatioUpdate", this.onUpdateContainerSizeRatio);
+    });
+    this.sideEffectManager.add(() => {
+      return emitter.on("startReconnect", () => {
+        this.mainView.release();
+      });
     });
   }
   ensureCameraAndSize() {
@@ -1687,6 +1705,9 @@ class MainViewProxy {
   get mainViewSize() {
     return this.store.getMainViewSize();
   }
+  get didRelease() {
+    return get(this.view, ["didRelease"]);
+  }
   moveCameraSizeByAttributes() {
     this.moveCameraToContian(this.mainViewSize);
     this.moveCamera(this.mainViewCamera);
@@ -1719,16 +1740,22 @@ class MainViewProxy {
     return mainView;
   }
   onReconnect() {
-    const mainViewScenePath = this.store.getMainViewScenePath();
-    if (mainViewScenePath) {
-      setViewFocusScenePath(this.view, mainViewScenePath);
+    if (this.didRelease) {
+      this.rebind();
+    } else {
+      const mainViewScenePath = this.store.getMainViewScenePath();
+      if (mainViewScenePath) {
+        setViewFocusScenePath(this.view, mainViewScenePath);
+      }
     }
   }
   rebind() {
     const divElement = this.mainView.divElement;
     const disableCameraTransform = this.mainView.disableCameraTransform;
     this.stop();
-    this.mainView.release();
+    if (!this.didRelease) {
+      this.mainView.release();
+    }
     this.removeMainViewListener();
     this.mainView = this.createMainView();
     this.mainView.disableCameraTransform = disableCameraTransform;
@@ -2555,6 +2582,9 @@ class ContainerResizeObserver {
         this.emitter.emit("playgroundSizeChange", containerRect);
       }
     });
+    this.disposer = this.emitter.on("containerSizeRatioUpdate", () => {
+      this.updateSizer(container.getBoundingClientRect(), sizer, wrapper);
+    });
     this.containerResizeObserver.observe(container);
   }
   updateSizer({ width, height }, sizer, wrapper) {
@@ -2573,6 +2603,10 @@ class ContainerResizeObserver {
   disconnect() {
     var _a;
     (_a = this.containerResizeObserver) == null ? void 0 : _a.disconnect();
+    if (isFunction(this.disposer)) {
+      this.disposer();
+      this.disposer = void 0;
+    }
   }
 }
 var react = { exports: {} };
@@ -5557,6 +5591,9 @@ class ReconnectRefresher {
     this.reactors = /* @__PURE__ */ new Map();
     this.disposers = /* @__PURE__ */ new Map();
     this.onPhaseChanged = (phase) => {
+      if (phase === RoomPhase.Reconnecting) {
+        this.ctx.emitter.emit("startReconnect");
+      }
       if (phase === RoomPhase.Connected && this.phase === RoomPhase.Reconnecting) {
         this.onReconnected();
       }
@@ -5573,7 +5610,7 @@ class ReconnectRefresher {
           this.disposers.set(id2, func());
         }
       });
-      this.ctx.emitter.emit("onReconnected", void 0);
+      this.ctx.emitter.emit("onReconnected");
     };
   }
   setRoom(room) {
@@ -14868,14 +14905,14 @@ const reconnectRefresher = new ReconnectRefresher({ emitter });
 const _WindowManager = class extends InvisiblePlugin {
   constructor(context) {
     super(context);
-    this.version = "0.4.23";
-    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/jest": "^27.4.1", "@types/lodash-es": "^4.17.4", "@types/uuid": "^8.3.1", "@typescript-eslint/eslint-plugin": "^4.30.0", "@typescript-eslint/parser": "^4.30.0", "cypress": "^8.7.0", "dotenv": "^10.0.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-svelte3": "^3.2.0", "jest": "^27.5.1", "jest-canvas-mock": "^2.3.1", "jest-fetch-mock": "^3.0.3", "jest-transform-stub": "^2.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", "svelte-jester": "^2.3.2", "ts-jest": "^27.1.4", "typescript": "^4.5.5", "vite": "^2.5.3", "white-web-sdk": "2.16.10" } };
+    this.version = "0.4.26";
+    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", "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.12.4", "white-web-sdk": "2.16.10" } };
     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/jest": "^27.4.1", "@types/lodash-es": "^4.17.4", "@types/uuid": "^8.3.1", "@typescript-eslint/eslint-plugin": "^4.30.0", "@typescript-eslint/parser": "^4.30.0", "cypress": "^8.7.0", "dotenv": "^10.0.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-svelte3": "^3.2.0", "jest": "^27.5.1", "jest-canvas-mock": "^2.3.1", "jest-fetch-mock": "^3.0.3", "jest-transform-stub": "^2.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", "svelte-jester": "^2.3.2", "ts-jest": "^27.1.4", "typescript": "^4.5.5", "vite": "^2.5.3", "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", "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.12.4", "white-web-sdk": "2.16.10" } };
   }
   static async mount(params) {
     const room = params.room;
@@ -15474,6 +15511,14 @@ const _WindowManager = class extends InvisiblePlugin {
     }
     (_c = (_b = this.appManager) == null ? void 0 : _b.refresher) == null ? void 0 : _c.refresh();
   }
+  setContainerSizeRatio(ratio) {
+    if (!isNumber(ratio)) {
+      throw new Error(`[WindowManager]: updateContainerSizeRatio error, ratio must be a number. but got ${ratio}`);
+    }
+    _WindowManager.containerSizeRatio = ratio;
+    this.containerSizeRatio = ratio;
+    emitter.emit("containerSizeRatioUpdate", ratio);
+  }
   isDynamicPPT(scenes) {
     var _a, _b;
     const sceneSrc = (_b = (_a = scenes[0]) == null ? void 0 : _a.ppt) == null ? void 0 : _b.src;