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

package/package.json

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

package/src/App/AppProxy.ts

@@ -241,6 +241,11 @@ export class AppProxy implements PageRemoveService {
     }
 
     public async onReconnected() {
+        const isExist = Boolean(this.manager.attributes.apps[this.id]);
+        if (!isExist) {
+            await this.destroy(true, false, true);
+            return;
+        }
         this.appEmitter.emit("reconnected", undefined);
         const currentAppState = this.getAppInitState(this.id);
         await this.destroy(true, false, true);

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/constants.ts

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