@netless/window-manager 1.0.13-beta.1 → 1.0.13-test.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "1.0.13-beta.1",
+  "version": "1.0.13-test.2",
   "description": "Multi-window mode for Netless Whiteboard",
   "author": "l1shen <lishen1635@gmail.com> (https://github.com/l1shen)",
   "license": "MIT",

package/src/AppListener.ts

@@ -47,6 +47,7 @@ export class AppListeners {
                     break;
                 }
                 case Events.SetMainViewScenePath: {
+                    console.log("[window-manager] mainMagixEventListener====>", JSON.stringify(data.payload));
                     this.setMainViewScenePathHandler(data.payload);
                     break;
                 }

package/src/AppManager.ts

@@ -51,6 +51,7 @@ import type {
 } from "./BoxEmitter";
 import { getExtendClass } from "./Utils/extendClass";
 import type { TeleBoxState } from "@netless/telebox-insider";
+import { getAttribute } from "video.js/dist/types/utils/dom";
 
 export class AppManager {
     static readonly kind = "AppManager";
@@ -840,6 +841,7 @@ export class AppManager {
                 throw new Error(`[WindowManager]: ${scenePath} not valid scene`);
             } else if (scenePathType === ScenePathType.Page) {
                 await this._setMainViewScenePath(scenePath);
+
             } else if (scenePathType === ScenePathType.Dir) {
                 const validScenePath = makeValidScenePath(this.displayer, scenePath);
                 if (validScenePath) {
@@ -852,6 +854,7 @@ export class AppManager {
     private async _setMainViewScenePath(scenePath: string) {
         const success = this.setMainViewFocusPath(scenePath);
         if (success) {
+            console.log("[window-manager] _setMainViewScenePath====>", scenePath);
             this.safeSetAttributes({ _mainScenePath: scenePath });
             this.store.setMainViewFocusPath(this.mainView);
             this.updateSceneIndex();
@@ -868,6 +871,7 @@ export class AppManager {
             const pageName = scenePath.replace(sceneDir, "").replace("/", "");
             const index = scenes.findIndex(scene => scene.name === pageName);
             if (isInteger(index) && index >= 0) {
+                console.log("[window-manager] updateSceneIndex====>", index);
                 this.safeSetAttributes({ _mainSceneIndex: index });
             }
         }
@@ -893,6 +897,7 @@ export class AppManager {
     }
 
     private dispatchSetMainViewScenePath(scenePath: string): void {
+        console.log("[window-manager] dispatchSetMainViewScenePath====>", JSON.stringify(scenePath));
         this.dispatchInternalEvent(Events.SetMainViewScenePath, { nextScenePath: scenePath });
         callbacks.emit("mainViewScenePathChange", scenePath);
         // 兼容 15 的 SDK, 需要 room 的当前 ScenePath
@@ -973,3 +978,4 @@ export class AppManager {
         this._resolveTimer = undefined;
     }
 }
+

package/src/AttributesDelegate.ts

@@ -194,10 +194,12 @@ export class AttributesDelegate {
     }
 
     public setMainViewScenePath(scenePath: string) {
+        console.log("[window-manager] setMainViewScenePath====>", scenePath);
         this.context.safeSetAttributes({ _mainScenePath: scenePath });
     }
 
     public setMainViewSceneIndex(index: number) {
+        console.log("[window-manager] setMainViewSceneIndex====>", index);
         this.context.safeSetAttributes({ _mainSceneIndex: index });
     }
 
@@ -210,16 +212,19 @@ export class AttributesDelegate {
     }
 
     public setMainViewCamera(camera: ICamera) {
+        console.log("[window-manager] setMainViewCamera====>", JSON.stringify(camera));
         this.context.safeSetAttributes({ [Fields.MainViewCamera]: { ...camera } });
     }
 
     public setMainViewSize(size: ISize) {
         if (size.width === 0 || size.height === 0) return;
+        console.log("[window-manager] setMainViewSize====>", JSON.stringify(size));
         this.context.safeSetAttributes({ [Fields.MainViewSize]: { ...size } });
     }
 
     public setMainViewCameraAndSize(camera: ICamera, size: ISize) {
         if (size.width === 0 || size.height === 0) return;
+        console.log("[window-manager] setMainViewCameraAndSize====>", JSON.stringify(camera), JSON.stringify(size));
         this.context.safeSetAttributes({
             [Fields.MainViewCamera]: { ...camera },
             [Fields.MainViewSize]: { ...size },

package/src/Utils/Common.ts

@@ -34,6 +34,7 @@ export const setScenePath = (room: Room | undefined, scenePath: string) => {
     if (room && room.isWritable) {
         if (room.state.sceneState.scenePath !== scenePath) {
             const nextScenePath = scenePath === "/" ? "" : scenePath;
+            console.log("[window-manager] real setScenePath for current room====>", nextScenePath);
             room.setScenePath(nextScenePath);
         }
     }

package/src/Utils/RoomHacker.ts

@@ -33,7 +33,11 @@ export const replaceRoomFunction = (room: Room | Player, manager: WindowManager)
                 return manager.canRedoSteps;
             },
         });
-
+        const _scalePptToFit = room.scalePptToFit;
+        room.scalePptToFit = (...args) => {
+            console.log("[window-manager] scalePptToFit====>", JSON.stringify(args));
+            _scalePptToFit.call(room, ...args);
+        };
         room.moveCamera = (camera: Camera) => manager.moveCamera(camera);
         room.moveCameraToContain = (...args) => manager.moveCameraToContain(...args);
         room.convertToPointInWorld = (...args) => manager.mainView.convertToPointInWorld(...args);

package/src/View/MainView.ts

@@ -33,6 +33,7 @@ export class MainViewProxy {
             this.startListenWritableChange();
         });
         const playgroundSizeChangeListener = () => {
+            console.log("[window-manager] playgroundSizeChangeListener====>", JSON.stringify(this.mainViewSize));
             this.sizeChangeHandler(this.mainViewSize);
         };
         this.sideEffectManager.add(() => {
@@ -97,6 +98,7 @@ export class MainViewProxy {
     }
 
     public start() {
+        console.log("[window-manager] start====>", JSON.stringify(this.mainViewSize));
         this.sizeChangeHandler(this.mainViewSize);
         if (this.started) return;
         this.addCameraListener();
@@ -120,6 +122,7 @@ export class MainViewProxy {
             () => this.mainViewCamera,
             camera => {
                 if (camera && camera.id !== this.manager.uid) {
+                    console.log("[window-manager] cameraReaction====>", JSON.stringify(camera), JSON.stringify(this.mainViewSize));
                     this.moveCameraToContian(this.mainViewSize);
                     this.moveCamera(camera);
                 }
@@ -132,12 +135,14 @@ export class MainViewProxy {
         if (size) {
             this.moveCameraToContian(size);
             this.moveCamera(this.mainViewCamera);
+            console.log("[window-manager] sizeChangeHandler====> current size and camera", JSON.stringify(size), JSON.stringify(this.mainViewCamera));
         }
         this.ensureMainViewSize();
     }, 30);
 
     public onUpdateContainerSizeRatio = () => {
         const size = this.store.getMainViewSize();
+        console.log("[window-manager] onUpdateContainerSizeRatio====>", JSON.stringify(size));
         this.sizeChangeHandler(size);
     };
 
@@ -249,6 +254,7 @@ export class MainViewProxy {
             clearTimeout(this._syncMainViewTimer);
             this._syncMainViewTimer = setTimeout(this.syncMainView, 100, this.manager.room);
         }
+        console.log("[window-manager] onCameraOrSizeUpdated====>", JSON.stringify(this.cameraState));
         this.ensureMainViewSize();
     };
 
@@ -266,6 +272,7 @@ export class MainViewProxy {
 
     private syncMainView = (room: Room) => {
         if (room.isWritable) {
+            console.log("[window-manager] syncMainView====>");
             room.syncMainView(this.mainView);
         }
     };