@netless/window-manager 1.0.0-canary.20 → 1.0.0-canary.23

package/src/View/CameraSynchronizer.ts

@@ -1,5 +1,5 @@
 import { AnimationMode } from "white-web-sdk";
-import { debounce, delay, isEqual, pick, throttle } from "lodash";
+import { isEqual, pick, throttle } from "lodash";
 import type { TeleBoxRect } from "@netless/telebox-insider";
 import type { Camera, View } from "white-web-sdk";
 import type { ICamera, ISize } from "../AttributesDelegate";
@@ -14,12 +14,12 @@ export class CameraSynchronizer {
 
     constructor(protected saveCamera: SaveCamera) {}
 
-    public setRect = debounce((rect: TeleBoxRect) => {
+    public setRect = (rect: TeleBoxRect) => {
         this.rect = rect;
         if (this.remoteCamera && this.remoteSize) {
             this.onRemoteUpdate(this.remoteCamera, this.remoteSize);
         }
-    }, 10);
+    }
 
     public setView(view: View) {
         this.view = view;
@@ -37,22 +37,17 @@ export class CameraSynchronizer {
                 scale = this.rect.height / size.height;
             }
             const nextScale = camera.scale * scale;
-            const moveCamera = () => {
-                const config: Partial<Camera> & { animationMode: AnimationMode } = {
-                    scale: nextScale,
-                    animationMode: AnimationMode.Immediately,
-                }
-                if (camera.centerX !== null) {
-                    config.centerX = camera.centerX;
-                }
-                if (camera.centerY !== null) {
-                    config.centerY = camera.centerY;
-                }
-                this.view?.moveCamera(config);
+            const config: Partial<Camera> & { animationMode: AnimationMode } = {
+                scale: nextScale,
+                animationMode: AnimationMode.Immediately,
+            }
+            if (camera.centerX !== null) {
+                config.centerX = camera.centerX;
+            }
+            if (camera.centerY !== null) {
+                config.centerY = camera.centerY;
             }
-            moveCamera(); 
-            // TODO 直接调用 moveCamera 依然会出现 camera 错误的情况,这里暂时加一个 delay 保证 camera 是对的, 后续需要 SDK 进行修改
-            delay(moveCamera, 50);
+            this.view?.moveCamera(config);
         }
     }, 10);
 
@@ -62,14 +57,10 @@ export class CameraSynchronizer {
         if (this.rect && this.remoteCamera && needMoveCamera) {
             const scale = this.rect.width / size.width;
             const nextScale = this.remoteCamera.scale * scale;
-            const moveCamera = () => {
-                this.view?.moveCamera({
-                    scale: nextScale,
-                    animationMode: AnimationMode.Immediately,
-                })
-            };
-            moveCamera();
-            delay(moveCamera, 50);
+            this.view?.moveCamera({
+                scale: nextScale,
+                animationMode: AnimationMode.Immediately,
+            })
         }
     }
 

package/src/View/ViewSync.ts

@@ -42,7 +42,7 @@ export class ViewSync {
             }
         });
         this.bindView(this.context.view$.value);
-        this.sem.add(() =>
+        this.sem.add(() => [
             this.context.view$.subscribe(view => {
                 const currentCamera = this.context.camera$.value;
                 if (currentCamera && this.context.size$.value) {
@@ -54,30 +54,24 @@ export class ViewSync {
                 }
 
                 this.bindView(view);
-            })
-        );
-        this.sem.add(() =>
+            }),
             this.context.camera$.subscribe((camera, skipUpdate) => {
                 const size = this.context.size$.value;
                 if (camera && size && !skipUpdate) {
                     this.synchronizer.onRemoteUpdate(camera, size);
                 }
-            })
-        );
-        this.sem.add(() =>
+            }),
             this.context.size$.subscribe(size => {
                 if (size) {
                     this.synchronizer.onRemoteSizeUpdate(size);
                 }
-            })
-        );
-        this.sem.add(() =>
+            }),
             this.context.stageRect$.reaction(rect => {
                 if (rect) {
                     this.synchronizer.setRect(rect);
                 }
             })
-        );
+        ]);
         const camera$size$ = combine([this.context.camera$, this.context.size$]);
         camera$size$.reaction(([camera, size]) => {
             if (camera && size) {
@@ -100,7 +94,7 @@ export class ViewSync {
 
     private onCameraUpdatedByDevice = (camera: Camera) => {
         if (!camera) return;
-        this.synchronizer.onLocalCameraUpdate(Object.assign(camera, { id: this.context.uid }));
+        this.synchronizer.onLocalCameraUpdate({ ...camera, id: this.context.uid });
         const stage = this.context.stageRect$.value;
         if (stage) {
             const size = { width: stage.width, height: stage.height, id: this.context.uid };

package/src/constants.ts

@@ -5,7 +5,6 @@ export enum Events {
     AppBoxStateChange = "AppBoxStateChange",
     GetAttributes = "GetAttributes",
     UpdateWindowManagerWrapper = "UpdateWindowManagerWrapper",
-    InitReplay = "InitReplay",
     WindowCreated = "WindowCreated",
     SetMainViewScenePath = "SetMainViewScenePath",
     SetMainViewSceneIndex = "SetMainViewSceneIndex",