@netless/window-manager 1.0.13-bate.0 → 1.0.13-bate.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "1.0.13-bate.0",
+  "version": "1.0.13-bate.1",
   "description": "Multi-window mode for Netless Whiteboard",
   "author": "l1shen <lishen1635@gmail.com> (https://github.com/l1shen)",
   "license": "MIT",
@@ -23,7 +23,7 @@
   },
   "peerDependencies": {
     "jspdf": "2.5.1",
-    "white-web-sdk": "^2.16.53"
+    "white-web-sdk": "^2.16.54"
   },
   "peerDependenciesMeta": {
     "jspdf": {
@@ -72,6 +72,6 @@
     "typescript": "^4.5.5",
     "vite": "^2.9.9",
     "vitest": "^0.14.1",
-    "white-web-sdk": "^2.16.53"
+    "white-web-sdk": "^2.16.54"
   }
 }

package/src/AttributesDelegate.ts

@@ -7,7 +7,6 @@ import type { Cursor } from "./Cursor/Cursor";
 import { getExtendClass } from "./Utils/extendClass";
 import type { ExtendClass } from "./Utils/extendClass";
 import type { NotMinimizedBoxState, TeleBoxState } from "@netless/telebox-insider";
-import { LocalConsole } from "./Utils/log";
 
 export enum Fields {
     Apps = "apps",
@@ -55,7 +54,6 @@ export type ISize = Size & { id: string };
 
 export class AttributesDelegate {
     static readonly kind = "AttributesDelegate";
-    private setMainViewCameraConsole = new LocalConsole("setMainViewCamera", 30);
     constructor(private context: StoreContext) {}
 
     public setContext(context: StoreContext) {
@@ -212,7 +210,6 @@ export class AttributesDelegate {
     }
 
     public setMainViewCamera(camera: ICamera) {
-        this.setMainViewCameraConsole.log(JSON.stringify(camera));
         this.context.safeSetAttributes({ [Fields.MainViewCamera]: { ...camera } });
     }
 

package/src/ContainerResizeObserver.ts

@@ -1,5 +1,4 @@
 import { ResizeObserver as ResizeObserverPolyfill } from "@juggle/resize-observer";
-import { isFunction } from "lodash";
 import { WindowManager } from "./index";
 import type { EmitterType } from "./InternalEmitter";
 import type { UnsubscribeFn } from "emittery";
@@ -11,7 +10,7 @@ export class ContainerResizeObserver {
     private containerResizeObserver?: ResizeObserver;
     private disposer?: UnsubscribeFn;
     
-    private updateSizerLocalConsole = new LocalConsole("updateSizer", 30);
+    private updateSizerLocalConsole = new LocalConsole("updateSizer", 100);
 
     constructor(private emitter: EmitterType) {}
 
@@ -77,10 +76,9 @@ export class ContainerResizeObserver {
     }
 
     public disconnect() {
+        this.updateSizerLocalConsole.destroy();
         this.containerResizeObserver?.disconnect();
-        if (isFunction(this.disposer)) {
-            this.disposer();
-            this.disposer = undefined;
-        }
+        this.disposer?.();
+        this.disposer = undefined;
     }
 }

package/src/Utils/Reactive.ts

@@ -30,8 +30,8 @@ export const onObjectByEvent = (event: UpdateEventKind) => {
     };
 };
 
-export const safeListenPropsUpdated = <T>(
-    getProps: () => T,
+export const safeListenPropsUpdated = <T extends Record<string, unknown>>(
+    getProps: () => T | null | undefined,
     callback: AkkoObjectUpdatedListener<T>,
     onDestroyed?: (props: unknown) => void
 ) => {

package/src/Utils/attributesLogStringify.ts

@@ -0,0 +1,78 @@
+/** 合法标识符形式的 key 省略引号，形如 `{aaa:undefined}` */
+function formatAttributesLogObjectKey(key: string): string {
+    return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(key) ? key : JSON.stringify(key);
+}
+
+/**
+ * attributes 调试日志：对象/数组会写成近似 JS 字面量（保留 `undefined`、数组空洞），避免 `[object Object]`；
+ * 并处理 BigInt、循环引用等。
+ */
+export function stringifyForAttributesLog(value: unknown, seen?: WeakSet<object>): string {
+    if (value === undefined) {
+        return "undefined";
+    }
+    if (value === null) {
+        return "null";
+    }
+    const t = typeof value;
+    if (t === "bigint") {
+        return `${value}n`;
+    }
+    if (t === "symbol") {
+        return String(value);
+    }
+    if (t === "function") {
+        const fn = value as (...args: unknown[]) => unknown;
+        return `[Function ${fn.name || "anonymous"}]`;
+    }
+    if (t !== "object") {
+        return t === "string" ? JSON.stringify(value as string) : String(value);
+    }
+
+    const obj = value as object;
+    if (seen?.has(obj)) {
+        return "[Circular]";
+    }
+
+    const nextSeen = seen ?? new WeakSet<object>();
+    nextSeen.add(obj);
+    try {
+        if (Array.isArray(value)) {
+            return `[${Array.from(value as unknown[], (item) =>
+                stringifyForAttributesLog(item, nextSeen),
+            ).join(",")}]`;
+        }
+        if (value instanceof Date) {
+            return JSON.stringify(value.toISOString());
+        }
+        if (value instanceof RegExp) {
+            return String(value);
+        }
+        const keys = Object.keys(value as object);
+        const pairs = keys.map((k) => {
+            let v: unknown;
+            try {
+                v = (value as Record<string, unknown>)[k];
+            } catch {
+                return `${formatAttributesLogObjectKey(k)}:[Threw]`;
+            }
+            return `${formatAttributesLogObjectKey(k)}:${stringifyForAttributesLog(v, nextSeen)}`;
+        });
+        return `{${pairs.join(",")}}`;
+    } catch {
+        return "[Unserializable]";
+    } finally {
+        nextSeen.delete(obj);
+    }
+}
+
+/** 仅一层 key 合并：可作为 attributes 片段的「普通对象」（非数组、Date 等） */
+export function isShallowMergeAttributesRecord(value: unknown): value is Record<string, unknown> {
+    return (
+        value !== null &&
+        typeof value === "object" &&
+        !Array.isArray(value) &&
+        !(value instanceof Date) &&
+        !(value instanceof RegExp)
+    );
+}

package/src/Utils/log.ts

@@ -1,5 +1,30 @@
+import type { Logger } from "white-web-sdk";
+import { isShallowMergeAttributesRecord, stringifyForAttributesLog } from "./attributesLogStringify";
 import { WindowManager } from "../index";
 
+/** ArgusLog 经 `logger.info` 上报的单条字符串上限（含前缀） */
+const ARGUS_LOG_INFO_MAX_LENGTH = 1500;
+
+function truncateArgusLogInfoMessage(message: string): string {
+    if (message.length <= ARGUS_LOG_INFO_MAX_LENGTH) {
+        return message;
+    }
+    const ellipsis = "…";
+    return message.slice(0, ARGUS_LOG_INFO_MAX_LENGTH - ellipsis.length) + ellipsis;
+}
+
+function keysPathEqual(a: string[], b: string[]): boolean {
+    if (a.length !== b.length) {
+        return false;
+    }
+    for (let i = 0; i < a.length; i++) {
+        if (a[i] !== b[i]) {
+            return false;
+        }
+    }
+    return true;
+}
+
 export const log = (...args: any[]): void => {
     if (WindowManager.debug) {
         console.log(`[WindowManager]:`, ...args);
@@ -41,4 +66,207 @@ export class LocalConsole {
         }
         console.log(`[window-manager][${this.name}]: ${args.join(", ")}`);
     }
+
+    /**
+     * 销毁：清除 debounce 定时器与未输出的暂存参数。
+     * 持有 LocalConsole 的类在销毁时应调用。
+     */
+    destroy(): void {
+        if (this.flushTimer != null) {
+            clearTimeout(this.flushTimer);
+            this.flushTimer = null;
+        }
+        this.pendingArgs = null;
+    }
+}
+
+/**
+ * 按 `[WindowManager][tagName]` 前缀输出。
+ * 若传入 `debounceTime`（毫秒）：窗口内多次 `log` 不立即输出，只在连续停止调用满 `debounceTime` 后输出**最后一次**的参数（尾部 debounce）。
+ */
+export class ArgusLog {
+    private pendingArgs: unknown[] | null = null;
+    private flushTimer: ReturnType<typeof setTimeout> | null = null;
+
+    /** debounce 窗口内按一层 key 合并；同 key 后者覆盖；非普通对象则整段待输出被本次值替换 */
+    private pendingShallowMerge:
+        | { kind: "record"; label: string; data: Record<string, unknown> }
+        | { kind: "atom"; label: string; value: unknown }
+        | null = null;
+    private shallowMergeTimer: ReturnType<typeof setTimeout> | null = null;
+
+    /** debounce 窗口内 safeUpdateAttributes：同 keys 数组则只更新 value，否则追加一段，flush 时拼成一条 */
+    private pendingUpdateSegments: { keys: string[]; value: unknown }[] | null = null;
+    private updateMergeTimer: ReturnType<typeof setTimeout> | null = null;
+
+    constructor(
+        private readonly logger: Logger,
+        private readonly name: string,
+        private readonly debounceTime?: number,
+    ) {}
+
+    private emitInfo(message: string): void {
+        this.logger.info(truncateArgusLogInfoMessage(message));
+    }
+
+    private flush(): void {
+        this.flushTimer = null;
+        const args = this.pendingArgs;
+        this.pendingArgs = null;
+        if (args === null) {
+            return;
+        }
+        this.emitInfo(`[WindowManager][${this.name}]: ${args.join(", ")}`);
+    }
+
+    private flushShallowMerge(): void {
+        this.shallowMergeTimer = null;
+        const p = this.pendingShallowMerge;
+        this.pendingShallowMerge = null;
+        if (p === null) {
+            return;
+        }
+        const body =
+            p.kind === "record" ? stringifyForAttributesLog(p.data) : stringifyForAttributesLog(p.value);
+        this.emitInfo(`[WindowManager][${this.name}]: ${p.label} ${body}`);
+        // 输出后释放合并对象引用，避免长时间持有 attributes 快照
+        if (p.kind === "record") {
+            for (const k of Object.keys(p.data)) {
+                delete p.data[k];
+            }
+        }
+    }
+
+    log(...args: unknown[]): void {
+        const ms = this.debounceTime;
+        if (ms != null && ms > 0) {
+            this.pendingArgs = args;
+            if (this.flushTimer != null) {
+                clearTimeout(this.flushTimer);
+            }
+            this.flushTimer = setTimeout(() => this.flush(), ms);
+            return;
+        }
+        this.emitInfo(`[WindowManager][${this.name}]: ${args.join(", ")}`);
+    }
+
+    /**
+     * 带 debounce 时：窗口内多次调用会把「一层 key」合并进同一条日志（不同 key 并存，同 key 取最后一次）。
+     * `payload` 为普通对象时做浅合并；否则视为原子值，覆盖当前待合并状态（丢弃此前累积的对象 key）。
+     * 无 debounce 或时间为 0 时立即输出。
+     */
+    logDebouncedShallowMerge(label: string, payload: unknown): void {
+        const ms = this.debounceTime;
+        const debounced = ms != null && ms > 0;
+
+        const emit = (text: string): void => {
+            this.emitInfo(`[WindowManager][${this.name}]: ${label} ${text}`);
+        };
+
+        if (!debounced) {
+            emit(stringifyForAttributesLog(payload));
+            return;
+        }
+
+        if (this.shallowMergeTimer != null) {
+            clearTimeout(this.shallowMergeTimer);
+            this.shallowMergeTimer = null;
+        }
+
+        if (isShallowMergeAttributesRecord(payload)) {
+            if (this.pendingShallowMerge?.kind === "record") {
+                this.pendingShallowMerge = {
+                    kind: "record",
+                    label,
+                    data: { ...this.pendingShallowMerge.data, ...payload },
+                };
+            } else {
+                this.pendingShallowMerge = { kind: "record", label, data: { ...payload } };
+            }
+        } else {
+            this.pendingShallowMerge = { kind: "atom", label, value: payload };
+        }
+
+        this.shallowMergeTimer = setTimeout(() => this.flushShallowMerge(), ms);
+    }
+
+    private flushUpdateAttributesMerge(): void {
+        this.updateMergeTimer = null;
+        const segments = this.pendingUpdateSegments;
+        this.pendingUpdateSegments = null;
+        if (segments === null || segments.length === 0) {
+            return;
+        }
+        const parts = segments.map(
+            (s) => `${s.keys.join(", ")} ${stringifyForAttributesLog(s.value)}`,
+        );
+        this.emitInfo(`[WindowManager][${this.name}]: safeUpdateAttributes ${parts.join(" | ")}`);
+        for (const s of segments) {
+            s.keys.length = 0;
+            s.value = undefined;
+        }
+        segments.length = 0;
+    }
+
+    /**
+     * 带 debounce 时：连续调用若 `keys` 与上一段完全相同则覆盖该段的 `value`；否则追加一段。
+     * flush 时输出一条日志，多段用 ` | ` 连接。
+     */
+    logDebouncedUpdateAttributes(keys: string[], value: unknown): void {
+        const ms = this.debounceTime;
+        const debounced = ms != null && ms > 0;
+        const keysCopy = [...keys];
+
+        if (!debounced) {
+            this.emitInfo(
+                `[WindowManager][${this.name}]: safeUpdateAttributes ${keysCopy.join(", ")} ${stringifyForAttributesLog(value)}`,
+            );
+            return;
+        }
+
+        if (this.updateMergeTimer != null) {
+            clearTimeout(this.updateMergeTimer);
+            this.updateMergeTimer = null;
+        }
+
+        if (this.pendingUpdateSegments === null || this.pendingUpdateSegments.length === 0) {
+            this.pendingUpdateSegments = [{ keys: keysCopy, value }];
+        } else {
+            const last = this.pendingUpdateSegments[this.pendingUpdateSegments.length - 1];
+            if (keysPathEqual(last.keys, keysCopy)) {
+                last.value = value;
+            } else {
+                this.pendingUpdateSegments.push({ keys: keysCopy, value });
+            }
+        }
+
+        this.updateMergeTimer = setTimeout(() => this.flushUpdateAttributesMerge(), ms);
+    }
+
+    /**
+     * 销毁：清除所有 `setTimeout` debounce 定时器，并丢弃尚未输出的暂存日志（不补打日志）。
+     * WindowManager 销毁时应调用，避免泄漏与销毁后仍触发 `logger.info`。
+     */
+    destroy(): void {
+        if (this.flushTimer != null) {
+            clearTimeout(this.flushTimer);
+            this.flushTimer = null;
+        }
+        if (this.shallowMergeTimer != null) {
+            clearTimeout(this.shallowMergeTimer);
+            this.shallowMergeTimer = null;
+        }
+        if (this.updateMergeTimer != null) {
+            clearTimeout(this.updateMergeTimer);
+            this.updateMergeTimer = null;
+        }
+        this.pendingArgs = null;
+        this.pendingShallowMerge = null;
+        this.pendingUpdateSegments = null;
+    }
+
+    /** 与 `destroy()` 相同，保留旧名以兼容 */
+    dispose(): void {
+        this.destroy();
+    }
 }

package/src/View/MainView.ts

@@ -3,7 +3,7 @@ import { callbacks } from "../callback";
 import { createView } from "./ViewManager";
 import { debounce, get, isEmpty, isEqual } from "lodash";
 import { internalEmitter } from "../InternalEmitter";
-import { Fields } from "../AttributesDelegate";
+import { Fields, type MainViewCamera } from "../AttributesDelegate";
 import { setViewFocusScenePath } from "../Utils/Common";
 import { SideEffectManager } from "side-effect-manager";
 import type { Camera, Room, Size, View } from "white-web-sdk";
@@ -11,6 +11,14 @@ import type { AppManager } from "../AppManager";
 import { Events } from "../constants";
 import { LocalConsole } from "../Utils/log";
 
+type MainViewScreenLike = {
+    refreshSize?: (width: number, height: number) => void;
+    resizeObserver?: {
+        disconnect?: () => void;
+        observe?: (target: Element) => void;
+    };
+};
+
 export class MainViewProxy {
     /** Refresh the view's camera in an interval of 1.5s. */
     public polling = false;
@@ -27,9 +35,10 @@ export class MainViewProxy {
 
     private sideEffectManager = new SideEffectManager();
 
-    private playgroundSizeChangeListenerLocalConsole = new LocalConsole("playgroundSizeChangeListener", 30);
-    private sizeUpdatedLocalConsole = new LocalConsole("sizeUpdated", 30);
-    private cameraUpdatedLocalConsole = new LocalConsole("cameraUpdated", 30);
+    private playgroundSizeChangeListenerLocalConsole = new LocalConsole("playgroundSizeChangeListener", 100);
+    private sizeUpdatedLocalConsole = new LocalConsole("sizeUpdated", 100);
+    private cameraUpdatedLocalConsole = new LocalConsole("cameraUpdated", 100);
+    private cameraReactionLocalConsole = new LocalConsole("cameraReaction", 100);
 
     constructor(private manager: AppManager) {
         this.mainView = this.createMainView();
@@ -155,6 +164,7 @@ export class MainViewProxy {
         element: HTMLDivElement
     ) {
         const { width: viewWidth, height: viewHeight } = this.mainView.size;
+        let targetElement = element;
         if (
             Math.abs(viewWidth - observedSize.width) <= 0.5 &&
             Math.abs(viewHeight - observedSize.height) <= 0.5
@@ -170,17 +180,36 @@ export class MainViewProxy {
             return;
         }
         this.isForcingMainViewDivElement = true;
-        this.mainView.divElement = null;
-        this.mainView.divElement = element;
-        queueMicrotask(() => {
-            const rect = element.getBoundingClientRect();
-            console.log("[window-manager] forceSyncMainViewDivElementResult " + JSON.stringify({
-                reason,
-                viewSize: this.mainView.size,
-                rect: { width: rect.width, height: rect.height },
-            }));
-            this.isForcingMainViewDivElement = false;
-        });
+        try {
+            const mainView = this.mainView as View & { screen?: MainViewScreenLike };
+            const screen = mainView.screen;
+            const resizeObserver = screen?.resizeObserver;
+            if (typeof screen?.refreshSize === "function") {
+                console.log(
+                    "[window-manager] forceSyncMainViewDivElement observerReset " +
+                        JSON.stringify({
+                            reason,
+                            viewSize: this.mainView.size,
+                            observedSize,
+                        })
+                );
+                // Reset the observer queue so we sync against the current DOM box,
+                // not a stale ResizeObserver entry from a rapid resize burst.
+                resizeObserver?.disconnect?.();
+                screen.refreshSize(observedSize.width, observedSize.height);
+                resizeObserver?.observe?.(element);
+            }
+        } finally {
+            queueMicrotask(() => {
+                const rect = targetElement.getBoundingClientRect();
+                console.log("[window-manager] forceSyncMainViewDivElementResult " + JSON.stringify({
+                    reason,
+                    viewSize: this.mainView.size,
+                    rect: { width: rect.width, height: rect.height },
+                }));
+                this.isForcingMainViewDivElement = false;
+            });
+        }
     }
 
     public start() {
@@ -210,11 +239,11 @@ export class MainViewProxy {
     private cameraReaction = () => {
         return reaction(
             () => this.mainViewCamera,
-            camera => {
+            (camera: MainViewCamera | undefined) => {
                 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);
+                    this.cameraReactionLocalConsole.log(`camera: ${JSON.stringify(camera)}, current size: ${JSON.stringify(this.mainViewSize)}`);
                 }
             },
             { fireImmediately: true }
@@ -420,6 +449,10 @@ export class MainViewProxy {
             cancelAnimationFrame(this.wrapperRectWorkaroundFrame);
             this.wrapperRectWorkaroundFrame = 0;
         }
+        this.playgroundSizeChangeListenerLocalConsole.destroy();
+        this.sizeUpdatedLocalConsole.destroy();
+        this.cameraUpdatedLocalConsole.destroy();
+        this.cameraReactionLocalConsole.destroy();
         this.removeMainViewListener();
         this.stop();
         this.sideEffectManager.flushAll();

package/src/index.ts

@@ -12,7 +12,7 @@ import { Fields } from "./AttributesDelegate";
 import { initDb } from "./Register/storage";
 import { InvisiblePlugin, isPlayer, isRoom, RoomPhase, ViewMode } from "white-web-sdk";
 import { isEqual, isNull, isObject, omit, isNumber } from "lodash";
-import { log } from "./Utils/log";
+import { ArgusLog, log } from "./Utils/log";
 import { PageStateImpl } from "./PageState";
 import { ReconnectRefresher } from "./ReconnectRefresher";
 import { replaceRoomFunction } from "./Utils/RoomHacker";
@@ -245,6 +245,8 @@ export class WindowManager
 
     private _roomLogger?: Logger;
 
+    public attributesDeboundceLog?: ArgusLog;
+
     get Logger(): Logger | undefined {
         return this._roomLogger;
     }
@@ -287,6 +289,7 @@ export class WindowManager
             manager = await this.initManager(room);
             if (manager) {
                 manager._roomLogger = (room as unknown as { logger: Logger }).logger;
+                manager.attributesDeboundceLog = new ArgusLog(manager._roomLogger, "attributes", 300);
                 if (WindowManager.registered.size > 0) {
                     manager._roomLogger.info(
                         `[WindowManager] registered apps: ${JSON.stringify(
@@ -1064,6 +1067,8 @@ export class WindowManager
     }
 
     private _destroy() {
+        this.attributesDeboundceLog?.destroy();
+        this.attributesDeboundceLog = undefined;
         this.containerResizeObserver?.disconnect();
         this.appManager?.destroy();
         this.cursorManager?.destroy();
@@ -1106,15 +1111,19 @@ export class WindowManager
 
     public safeSetAttributes(attributes: any): void {
         if (this.canOperate) {
-            this.Logger && this.Logger.info(`[WindowManager]: safeSetAttributes ${JSON.stringify(attributes)}`);
             this.setAttributes(attributes);
+            if (this.attributesDeboundceLog) {
+                this.attributesDeboundceLog.logDebouncedShallowMerge("safeSetAttributes", attributes);
+            }
         }
     }
 
     public safeUpdateAttributes(keys: string[], value: any): void {
         if (this.canOperate) {
-            this.Logger && this.Logger.info(`[WindowManager]: safeUpdateAttributes ${keys.join(", ")} ${value}`);
             this.updateAttributes(keys, value);
+            if (this.attributesDeboundceLog) {
+                this.attributesDeboundceLog.logDebouncedUpdateAttributes(keys, value);
+            }
         }
     }
 
@@ -1124,8 +1133,8 @@ export class WindowManager
 
     public cleanCurrentScene(): void {
         log("clean current scene");
-        this.Logger && this.Logger.info(`[WindowManager]: cleanCurrentScene ${this.focusedView?.focusScenePath}`);
         this.focusedView?.cleanCurrentScene();
+        this.Logger && this.Logger.info(`[WindowManager]: cleanCurrentScene ${this.focusedView?.focusScenePath}`);
     }
 
     public redo(): number {
@@ -1137,8 +1146,8 @@ export class WindowManager
     }
 
     public delete(): void {
-        this.Logger && this.Logger.info(`[WindowManager]: delete ${this.focusedView?.focusScenePath}`);
         this.focusedView?.delete();
+        this.Logger && this.Logger.info(`[WindowManager]: delete ${this.focusedView?.focusScenePath}`);
     }
 
     public copy(): void {