@netless/window-manager 0.4.30-canary.0 → 0.4.31

package/src/ReconnectRefresher.ts

@@ -3,6 +3,7 @@ import { log } from "./Utils/log";
 import { RoomPhase } from "white-web-sdk";
 import type { Room } from "white-web-sdk";
 import type { EmitterType } from "./InternalEmitter";
+import { EnsureReconnectEvent } from "./constants";
 
 export type ReconnectRefresherContext = {
     emitter: EmitterType;
@@ -20,8 +21,20 @@ export class ReconnectRefresher {
     public setRoom(room: Room | undefined) {
         this.room = room;
         this.phase = room?.phase;
-        room?.callbacks.off("onPhaseChanged", this.onPhaseChanged);
-        room?.callbacks.on("onPhaseChanged", this.onPhaseChanged);
+        if (room) {
+            room.callbacks.off("onPhaseChanged", this.onPhaseChanged);
+            room.callbacks.on("onPhaseChanged", this.onPhaseChanged);
+            // 重连成功之后向服务发送一次消息, 确认当前的状态是最新的
+            room.addMagixEventListener(
+                EnsureReconnectEvent,
+                payload => {
+                    if (payload.authorId === room.observerId) {
+                        this.onReconnected();
+                    }
+                },
+                { fireSelfEventAfterCommit: true }
+            );
+        }
     }
 
     public setContext(ctx: ReconnectRefresherContext) {
@@ -33,7 +46,7 @@ export class ReconnectRefresher {
             this.ctx.emitter.emit("startReconnect");
         }
         if (phase === RoomPhase.Connected && this.phase === RoomPhase.Reconnecting) {
-            this.onReconnected();
+            this.room?.dispatchMagixEvent(EnsureReconnectEvent, {});
         }
         this.phase = phase;
     };
@@ -51,7 +64,7 @@ export class ReconnectRefresher {
             }
         });
         this.ctx.emitter.emit("onReconnected");
-    }
+    };
 
     private releaseDisposers() {
         this.disposers.forEach(disposer => {
@@ -96,6 +109,7 @@ export class ReconnectRefresher {
 
     public destroy() {
         this.room?.callbacks.off("onPhaseChanged", this.onPhaseChanged);
+        this.room?.removeMagixEventListener(EnsureReconnectEvent, this.onReconnected);
         this.releaseDisposers();
     }
 }

package/src/Utils/AppCreateQueue.ts

@@ -1,8 +1,7 @@
 import { callbacks } from "../callback";
 import { SETUP_APP_DELAY } from "../constants";
-import type { AppProxy } from "../App";
 
-export type Invoker = () => Promise<AppProxy | undefined>;
+export type Invoker<T = any> = () => Promise<T | undefined>;
 
 export class AppCreateQueue {
     private list: Invoker[] = [];
@@ -16,7 +15,7 @@ export class AppCreateQueue {
         }, 50);
     }
 
-    public push(item: Invoker) {
+    public push<T>(item: Invoker<T>) {
         this.list.push(item);
         this.invoke();
         if (this.timer === undefined && this.list.length > 0) {

package/src/constants.ts

@@ -20,6 +20,7 @@ export enum Events {
 }
 
 export const MagixEventName = "__WindowManger";
+export const EnsureReconnectEvent = "__WindowMangerEnsureReconnected__";
 
 export enum AppAttributes {
     Size = "size",

package/src/index.ts

@@ -60,6 +60,7 @@ import type { AppProxy } from "./App";
 import type { PublicEvent } from "./callback";
 import type Emittery from "emittery";
 import type { PageController, AddPageParams, PageState } from "./Page";
+import { boxEmitter } from "./BoxEmitter";
 
 export type WindowMangerAttributes = {
     modelValue?: string;
@@ -320,7 +321,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> imple
     }
 
     public bindContainer(container: HTMLElement) {
-        if (this.room.phase !== RoomPhase.Connected) {
+        if (isRoom(this.displayer) && this.room.phase !== RoomPhase.Connected) {
             throw new BindContainerRoomPhaseInvalidError();
         }
         if (WindowManager.isCreated && WindowManager.container) {
@@ -339,7 +340,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> imple
                 if (this.boxManager) {
                     this.boxManager.destroy();
                 }
-                const boxManager = createBoxManager(this, callbacks, emitter, {
+                const boxManager = createBoxManager(this, callbacks, emitter, boxEmitter, {
                     collectorContainer: params.collectorContainer,
                     collectorStyles: params.collectorStyles,
                     prefersColorScheme: params.prefersColorScheme,

package/dist/ScenePath/index.d.ts

@@ -1,12 +0,0 @@
-import type { ScenesCallbacks, ScenesCallbacksNode } from "white-web-sdk";
-import type { AppManager } from "../AppManager";
-export declare class ScenesCallbackManager {
-    private manager;
-    private nodes;
-    constructor(manager: AppManager);
-    createNode(path: string, callbacks?: Partial<ScenesCallbacks>): ScenesCallbacksNode | null;
-    getScenes(path: string): readonly string[] | undefined;
-    getScenesOnce(path: string): readonly string[] | undefined;
-    removeNode(path: string): void;
-    destroy(): void;
-}

package/src/ScenePath/index.ts

@@ -1,47 +0,0 @@
-import type { ScenesCallbacks, ScenesCallbacksNode } from "white-web-sdk";
-import type { AppManager } from "../AppManager";
-
-export class ScenesCallbackManager {
-    
-    private nodes: Map<string, ScenesCallbacksNode> = new Map();
-
-    constructor(private manager: AppManager) {}
-
-    public createNode(path: string, callbacks?: Partial<ScenesCallbacks>): ScenesCallbacksNode | null {
-        const node = this.manager.displayer.createScenesCallback(path, callbacks);
-        if (node) {
-            this.nodes.set(path, node);
-        }
-        return node;
-    }
-
-    public getScenes(path: string) {
-        const node = this.nodes.get(path);
-        return node?.scenes;
-    }
-
-    public getScenesOnce(path: string) {
-        let node = this.nodes.get(path);
-        if (!node) {
-            const created = this.createNode(path);
-            if (created) {
-                node = created;
-            }
-        }
-        const scenes = node?.scenes;
-        this.removeNode(path);
-        return scenes;
-    }
-
-    public removeNode(path: string) {
-        const node = this.nodes.get(path);
-        if (node) {
-            node.dispose();
-            this.nodes.delete(path);
-        }
-    }
-
-    public destroy(): void {
-        this.nodes.forEach(node => node.dispose());
-    }
-}