@netless/window-manager 1.0.0-canary.51 → 1.0.0-canary.53

package/dist/index.cjs.js

@@ -525,9 +525,9 @@ const isRootDirPage = (scenePath) => {
 class CameraSynchronizer {
   constructor(saveCamera) {
     this.saveCamera = saveCamera;
-    this.setRect = (rect) => {
+    this.setRect = (rect, updateCamera = true) => {
       this.rect = rect;
-      if (this.remoteCamera && this.remoteSize) {
+      if (this.remoteCamera && this.remoteSize && updateCamera) {
         this.onRemoteUpdate(this.remoteCamera, this.remoteSize);
       }
     };
@@ -545,6 +545,7 @@ class CameraSynchronizer {
         if (camera.centerY !== null) {
           config.centerY = camera.centerY;
         }
+        console.trace("moveCamera");
         this.moveCamera(config);
       }
     }, 10);
@@ -1441,7 +1442,7 @@ class ViewSync {
     };
     this.subscribeSize = () => {
       return this.context.size$.subscribe((size) => {
-        if (size) {
+        if (size && this.isBroadcastMode) {
           this.synchronizer.onRemoteSizeUpdate(size);
         }
       });
@@ -1449,7 +1450,7 @@ class ViewSync {
     this.subscribeStageRect = () => {
       return this.context.stageRect$.subscribe((rect) => {
         if (rect) {
-          this.synchronizer.setRect(rect);
+          this.synchronizer.setRect(rect, this.isBroadcastMode);
         }
       });
     };
@@ -1466,6 +1467,8 @@ class ViewSync {
     this.onCameraUpdatedByDevice = (camera) => {
       if (!camera)
         return;
+      if (!this.isBroadcastMode)
+        return;
       if (this.context.size$.value && this.context.stageRect$.value) {
         const diffScale = computedMinScale(this.context.size$.value, this.context.stageRect$.value);
         const remoteScale = camera.scale / diffScale;
@@ -1488,6 +1491,10 @@ class ViewSync {
       }
     });
   }
+  get isBroadcastMode() {
+    var _a;
+    return ((_a = this.context.viewMode$) == null ? void 0 : _a.value) === whiteWebSdk.ViewMode.Broadcaster;
+  }
   destroy() {
     this.sem.flushAll();
   }
@@ -2756,8 +2763,8 @@ class AppManager {
     this.onBoxMove = (payload) => {
       this.dispatchInternalEvent(Events.AppMove, payload);
       this.store.updateAppState(payload.appId, AppAttributes.Position, {
-        x: payload.x,
-        y: payload.y
+        x: isNaN(payload.x) ? 0 : payload.x,
+        y: isNaN(payload.y) ? 0 : payload.y
       });
     };
     this.onBoxResize = (payload) => {
@@ -11688,7 +11695,7 @@ const reconnectRefresher = new ReconnectRefresher({ emitter });
 const _WindowManager = class extends whiteWebSdk.InvisiblePlugin {
   constructor(context) {
     super(context);
-    this.version = "1.0.0-canary.51";
+    this.version = "1.0.0-canary.53";
     this.dependencies = { "dependencies": { "@juggle/resize-observer": "^3.3.1", "@netless/telebox-insider": "1.0.0-alpha.37", "emittery": "^0.11.0", "lodash": "^4.17.21", "p-retry": "^4.6.2", "side-effect-manager": "^1.1.1", "uuid": "^7.0.3", "value-enhancer": "^1.3.2" }, "peerDependencies": { "white-web-sdk": "^2.16.0" }, "devDependencies": { "@netless/app-docs-viewer": "^0.3.3", "@netless/app-plyr": "0.2.2", "@playwright/test": "^1.23.2", "@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.49", "@tsconfig/svelte": "^2.0.1", "@types/debug": "^4.1.7", "@types/lodash": "^4.14.182", "@types/lodash-es": "^4.17.6", "@types/node": "^18.0.3", "@types/uuid": "^8.3.4", "@typescript-eslint/eslint-plugin": "^4.30.0", "@typescript-eslint/parser": "^4.30.0", "@vitest/ui": "^0.14.2", "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.3", "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", "vite-plugin-dts": "^1.2.1", "vitest": "^0.18.0", "white-web-sdk": "2.16.26" } };
     this.emitter = callbacks;
     this.viewMode = whiteWebSdk.ViewMode.Broadcaster;

package/dist/index.es.js

@@ -518,9 +518,9 @@ const isRootDirPage = (scenePath) => {
 class CameraSynchronizer {
   constructor(saveCamera) {
     this.saveCamera = saveCamera;
-    this.setRect = (rect) => {
+    this.setRect = (rect, updateCamera = true) => {
       this.rect = rect;
-      if (this.remoteCamera && this.remoteSize) {
+      if (this.remoteCamera && this.remoteSize && updateCamera) {
         this.onRemoteUpdate(this.remoteCamera, this.remoteSize);
       }
     };
@@ -538,6 +538,7 @@ class CameraSynchronizer {
         if (camera.centerY !== null) {
           config.centerY = camera.centerY;
         }
+        console.trace("moveCamera");
         this.moveCamera(config);
       }
     }, 10);
@@ -1434,7 +1435,7 @@ class ViewSync {
     };
     this.subscribeSize = () => {
       return this.context.size$.subscribe((size2) => {
-        if (size2) {
+        if (size2 && this.isBroadcastMode) {
           this.synchronizer.onRemoteSizeUpdate(size2);
         }
       });
@@ -1442,7 +1443,7 @@ class ViewSync {
     this.subscribeStageRect = () => {
       return this.context.stageRect$.subscribe((rect) => {
         if (rect) {
-          this.synchronizer.setRect(rect);
+          this.synchronizer.setRect(rect, this.isBroadcastMode);
         }
       });
     };
@@ -1459,6 +1460,8 @@ class ViewSync {
     this.onCameraUpdatedByDevice = (camera) => {
       if (!camera)
         return;
+      if (!this.isBroadcastMode)
+        return;
       if (this.context.size$.value && this.context.stageRect$.value) {
         const diffScale = computedMinScale(this.context.size$.value, this.context.stageRect$.value);
         const remoteScale = camera.scale / diffScale;
@@ -1481,6 +1484,10 @@ class ViewSync {
       }
     });
   }
+  get isBroadcastMode() {
+    var _a;
+    return ((_a = this.context.viewMode$) == null ? void 0 : _a.value) === ViewMode.Broadcaster;
+  }
   destroy() {
     this.sem.flushAll();
   }
@@ -2749,8 +2756,8 @@ class AppManager {
     this.onBoxMove = (payload) => {
       this.dispatchInternalEvent(Events.AppMove, payload);
       this.store.updateAppState(payload.appId, AppAttributes.Position, {
-        x: payload.x,
-        y: payload.y
+        x: isNaN(payload.x) ? 0 : payload.x,
+        y: isNaN(payload.y) ? 0 : payload.y
       });
     };
     this.onBoxResize = (payload) => {
@@ -11681,7 +11688,7 @@ const reconnectRefresher = new ReconnectRefresher({ emitter });
 const _WindowManager = class extends InvisiblePlugin {
   constructor(context) {
     super(context);
-    this.version = "1.0.0-canary.51";
+    this.version = "1.0.0-canary.53";
     this.dependencies = { "dependencies": { "@juggle/resize-observer": "^3.3.1", "@netless/telebox-insider": "1.0.0-alpha.37", "emittery": "^0.11.0", "lodash": "^4.17.21", "p-retry": "^4.6.2", "side-effect-manager": "^1.1.1", "uuid": "^7.0.3", "value-enhancer": "^1.3.2" }, "peerDependencies": { "white-web-sdk": "^2.16.0" }, "devDependencies": { "@netless/app-docs-viewer": "^0.3.3", "@netless/app-plyr": "0.2.2", "@playwright/test": "^1.23.2", "@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.49", "@tsconfig/svelte": "^2.0.1", "@types/debug": "^4.1.7", "@types/lodash": "^4.14.182", "@types/lodash-es": "^4.17.6", "@types/node": "^18.0.3", "@types/uuid": "^8.3.4", "@typescript-eslint/eslint-plugin": "^4.30.0", "@typescript-eslint/parser": "^4.30.0", "@vitest/ui": "^0.14.2", "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.3", "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", "vite-plugin-dts": "^1.2.1", "vitest": "^0.18.0", "white-web-sdk": "2.16.26" } };
     this.emitter = callbacks;
     this.viewMode = ViewMode.Broadcaster;

package/dist/index.umd.js

@@ -519,9 +519,9 @@ var __objRest = (source, exclude) => {
   class CameraSynchronizer {
     constructor(saveCamera) {
       this.saveCamera = saveCamera;
-      this.setRect = (rect) => {
+      this.setRect = (rect, updateCamera = true) => {
         this.rect = rect;
-        if (this.remoteCamera && this.remoteSize) {
+        if (this.remoteCamera && this.remoteSize && updateCamera) {
           this.onRemoteUpdate(this.remoteCamera, this.remoteSize);
         }
       };
@@ -539,6 +539,7 @@ var __objRest = (source, exclude) => {
           if (camera.centerY !== null) {
             config.centerY = camera.centerY;
           }
+          console.trace("moveCamera");
           this.moveCamera(config);
         }
       }, 10);
@@ -1435,7 +1436,7 @@ var __objRest = (source, exclude) => {
       };
       this.subscribeSize = () => {
         return this.context.size$.subscribe((size) => {
-          if (size) {
+          if (size && this.isBroadcastMode) {
             this.synchronizer.onRemoteSizeUpdate(size);
           }
         });
@@ -1443,7 +1444,7 @@ var __objRest = (source, exclude) => {
       this.subscribeStageRect = () => {
         return this.context.stageRect$.subscribe((rect) => {
           if (rect) {
-            this.synchronizer.setRect(rect);
+            this.synchronizer.setRect(rect, this.isBroadcastMode);
           }
         });
       };
@@ -1460,6 +1461,8 @@ var __objRest = (source, exclude) => {
       this.onCameraUpdatedByDevice = (camera) => {
         if (!camera)
           return;
+        if (!this.isBroadcastMode)
+          return;
         if (this.context.size$.value && this.context.stageRect$.value) {
           const diffScale = computedMinScale(this.context.size$.value, this.context.stageRect$.value);
           const remoteScale = camera.scale / diffScale;
@@ -1482,6 +1485,10 @@ var __objRest = (source, exclude) => {
         }
       });
     }
+    get isBroadcastMode() {
+      var _a;
+      return ((_a = this.context.viewMode$) == null ? void 0 : _a.value) === whiteWebSdk.ViewMode.Broadcaster;
+    }
     destroy() {
       this.sem.flushAll();
     }
@@ -2750,8 +2757,8 @@ var __objRest = (source, exclude) => {
       this.onBoxMove = (payload) => {
         this.dispatchInternalEvent(Events.AppMove, payload);
         this.store.updateAppState(payload.appId, AppAttributes.Position, {
-          x: payload.x,
-          y: payload.y
+          x: isNaN(payload.x) ? 0 : payload.x,
+          y: isNaN(payload.y) ? 0 : payload.y
         });
       };
       this.onBoxResize = (payload) => {
@@ -11682,7 +11689,7 @@ var __objRest = (source, exclude) => {
   const _WindowManager = class extends whiteWebSdk.InvisiblePlugin {
     constructor(context) {
       super(context);
-      this.version = "1.0.0-canary.51";
+      this.version = "1.0.0-canary.53";
       this.dependencies = { "dependencies": { "@juggle/resize-observer": "^3.3.1", "@netless/telebox-insider": "1.0.0-alpha.37", "emittery": "^0.11.0", "lodash": "^4.17.21", "p-retry": "^4.6.2", "side-effect-manager": "^1.1.1", "uuid": "^7.0.3", "value-enhancer": "^1.3.2" }, "peerDependencies": { "white-web-sdk": "^2.16.0" }, "devDependencies": { "@netless/app-docs-viewer": "^0.3.3", "@netless/app-plyr": "0.2.2", "@playwright/test": "^1.23.2", "@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.49", "@tsconfig/svelte": "^2.0.1", "@types/debug": "^4.1.7", "@types/lodash": "^4.14.182", "@types/lodash-es": "^4.17.6", "@types/node": "^18.0.3", "@types/uuid": "^8.3.4", "@typescript-eslint/eslint-plugin": "^4.30.0", "@typescript-eslint/parser": "^4.30.0", "@vitest/ui": "^0.14.2", "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.3", "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", "vite-plugin-dts": "^1.2.1", "vitest": "^0.18.0", "white-web-sdk": "2.16.26" } };
       this.emitter = callbacks;
       this.viewMode = whiteWebSdk.ViewMode.Broadcaster;

package/dist/src/View/CameraSynchronizer.d.ts

@@ -9,7 +9,7 @@ export declare class CameraSynchronizer {
     protected rect?: TeleBoxRect;
     protected view?: View;
     constructor(saveCamera: SaveCamera);
-    setRect: (rect: TeleBoxRect) => void;
+    setRect: (rect: TeleBoxRect, updateCamera?: boolean) => void;
     setView(view: View): void;
     onRemoteUpdate: import("lodash").DebouncedFunc<(camera: ICamera, size: ISize) => void>;
     onRemoteSizeUpdate(size: ISize): void;

package/dist/src/View/ViewSync.d.ts

@@ -18,6 +18,7 @@ export declare class ViewSync {
     private sem;
     private synchronizer;
     constructor(context: ViewSyncContext);
+    private get isBroadcastMode();
     private createSynchronizer;
     private subscribeView;
     private subscribeCamera;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "1.0.0-canary.51",
+  "version": "1.0.0-canary.53",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.es.js",

package/src/AppManager.ts

@@ -376,8 +376,8 @@ export class AppManager {
     private onBoxMove = (payload: BoxMovePayload) => {
         this.dispatchInternalEvent(Events.AppMove, payload);
         this.store.updateAppState(payload.appId, AppAttributes.Position, {
-            x: payload.x,
-            y: payload.y,
+            x: isNaN(payload.x) ? 0 : payload.x,
+            y: isNaN(payload.y) ? 0 : payload.y,
         });
     };
 

package/src/BoxManager.ts

@@ -355,7 +355,7 @@ export class BoxManager {
     public moveBox({ appId, x, y }: MoveBoxParams): void {
         const box = this.getBox(appId);
         if (box) {
-            box._intrinsicCoord$.setValue({ x, y}, true);
+            box._intrinsicCoord$.setValue({ x, y }, true);
         }
     }
 

package/src/View/CameraSynchronizer.ts

@@ -14,9 +14,9 @@ export class CameraSynchronizer {
 
     constructor(protected saveCamera: SaveCamera) {}
 
-    public setRect = (rect: TeleBoxRect) => {
+    public setRect = (rect: TeleBoxRect, updateCamera = true) => {
         this.rect = rect;
-        if (this.remoteCamera && this.remoteSize) {
+        if (this.remoteCamera && this.remoteSize && updateCamera) {
             this.onRemoteUpdate(this.remoteCamera, this.remoteSize);
         }
     }
@@ -40,6 +40,7 @@ export class CameraSynchronizer {
             if (camera.centerY !== null) {
                 config.centerY = camera.centerY;
             }
+            console.trace("moveCamera");
             this.moveCamera(config);
         }
     }, 10);

package/src/View/ViewSync.ts

@@ -47,6 +47,10 @@ export class ViewSync {
         });
     }
 
+    private get isBroadcastMode() {
+        return this.context.viewMode$?.value === ViewMode.Broadcaster;
+    }
+
     private createSynchronizer = () => {
         return new CameraSynchronizer((camera: ICamera) => {
             this.context.camera$.setValue(camera, true);
@@ -86,7 +90,7 @@ export class ViewSync {
 
     private subscribeSize = () => {
         return this.context.size$.subscribe(size => {
-            if (size) {
+            if (size && this.isBroadcastMode) {
                 this.synchronizer.onRemoteSizeUpdate(size);
             }
         });
@@ -95,7 +99,7 @@ export class ViewSync {
     private subscribeStageRect = () => {
         return this.context.stageRect$.subscribe(rect => {
             if (rect) {
-                this.synchronizer.setRect(rect);
+                this.synchronizer.setRect(rect, this.isBroadcastMode);
             }
         });
     }
@@ -113,6 +117,7 @@ export class ViewSync {
 
     private onCameraUpdatedByDevice = (camera: Camera) => {
         if (!camera) return;
+        if (!this.isBroadcastMode) return;
         if (this.context.size$.value && this.context.stageRect$.value) {
             // 始终以远端的 size 为标准, 设置到 attributes 时根据尺寸的大小还原回去
             const diffScale = computedMinScale(this.context.size$.value, this.context.stageRect$.value);