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

package/docs/api.md

@@ -218,9 +218,11 @@ manager.addPage({ scene: { name: "page2" } }) // 传入 page 信息
 <h3 id="removePage">removePage</h3>
 
 > 移除一页
+> 当只剩一页时, 最后一页不允许被删除
 
 ```ts
-const success = await manager.removePage(1)
+const success = await manager.removePage() // 默认删除当前页
+const success = await manager.removePage(1) // 可以删除指定 index
 ```
 
 <h3 id="refresh">refresh</h3>

package/package.json

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

package/src/App/AppContext.ts

@@ -231,13 +231,17 @@ export class AppContext<TAttributes = any, TMagixEventPayloads = any, TAppOption
         }
     };
 
-    public removePage = async (index: number): Promise<boolean> => {
-        if (index < 0 || index >= this.pageState.length) {
+    public removePage = async (index?: number): Promise<boolean> => {
+        const needRemoveIndex = index === undefined ? this.pageState.index : index;
+        if (this.pageState.length === 1) {
+            console.warn(`[WindowManager]: can not remove the last page`);
+            return false;
+        }
+        if (needRemoveIndex < 0 || needRemoveIndex >= this.pageState.length) {
             console.warn(`[WindowManager]: page index ${index} out of range`);
             return false;
         }
-        this.appProxy.removeSceneByIndex(index);
-        return true;
+        return this.appProxy.removeSceneByIndex(needRemoveIndex);;
     }
 
     public get pageState(): PageState {

package/src/App/AppProxy.ts

@@ -27,7 +27,8 @@ import type { SceneState, View, SceneDefinition } from "white-web-sdk";
 import type { AppManager } from "../AppManager";
 import type { NetlessApp } from "../typings";
 import type { ReadonlyTeleBox } from "@netless/telebox-insider";
-import { calculateNextIndex, PageRemoveService, PageState } from "../Page";
+import type { PageRemoveService, PageState } from "../Page";
+import { calculateNextIndex } from "../Page";
 
 export type AppEmitter = Emittery<AppEmitterEvent>;
 
@@ -240,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);
@@ -415,10 +421,6 @@ export class AppProxy implements PageRemoveService {
     public async removeSceneByIndex(index: number) {
         const scenePath = this._pageState.getFullPath(index);
         if (scenePath) {
-            // 不能删除所有场景
-            if (this.pageState.length <= 1) {
-                return false;
-            }
             const nextIndex = calculateNextIndex(index, this.pageState);
             // 只修改 focus path 不修改 FullPath
             this.setSceneIndexWithoutSync(nextIndex);

package/src/AppManager.ts

@@ -181,7 +181,10 @@ export class AppManager {
         }
         this.callbacksNode = this.displayer.createScenesCallback(ROOT_DIR, {
             onAddScene: this.onSceneChange,
-            onRemoveScene: this.onSceneChange,
+            onRemoveScene: async (node, name) => {
+                await this.onSceneChange(node);
+                emitter.emit("rootDirSceneRemoved", name);
+            },
         });
         if (this.callbacksNode) {
             this.updateSceneState(this.callbacksNode);
@@ -196,13 +199,22 @@ export class AppManager {
         const nextIndex = calculateNextIndex(index, this.windowManger.pageState);
         this.setSceneIndexWithoutSync(nextIndex);
         this.dispatchInternalEvent(Events.SetAppFocusIndex, { type: "main", index: nextIndex });
+        const scene = this.callbacksNode?.scenes[index];
         setTimeout(() => {
-            const scene = this.callbacksNode?.scenes[index];
             if (scene) {
                 removeScenes(this.room, `${ROOT_DIR}${scene}`, index)
             }
         }, 100);
-        return true;
+        return new Promise<boolean>((resolve, reject) => {
+            emitter.once("rootDirSceneRemoved").then(name => {
+                if (name === scene) {
+                    resolve(true);
+                }
+            }).catch(e => {
+                console.log(`[WindowManager]: removePage error: ${e}`);
+                reject(false);
+            });
+        });
     }
 
     public setSceneIndexWithoutSync = (index: number) => {
@@ -215,12 +227,14 @@ export class AppManager {
     private onSceneChange = (node: ScenesCallbacksNode) => {
         this.mainViewScenesLength = node.scenes.length;
         this.updateSceneState(node);
-        this.emitMainViewScenesChange(this.mainViewScenesLength);
+        return this.emitMainViewScenesChange(this.mainViewScenesLength);
     };
 
     private emitMainViewScenesChange = (length: number) => {
-        callbacks.emit("mainViewScenesLengthChange", length);
-        emitter.emit("changePageState");
+        return Promise.all([
+            callbacks.emit("mainViewScenesLengthChange", length),
+            emitter.emit("changePageState"),
+        ]);
     };
 
     private updateSceneState = (node: ScenesCallbacksNode) => {

package/src/InternalEmitter.ts

@@ -25,7 +25,8 @@ export type EmitterEvent = {
     cursorMove: CursorMovePayload;
     updateManagerRect: undefined;
     focusedChange: { focused: string | undefined; prev: string | undefined };
-    rootDirRemoved: undefined;
+    rootDirRemoved: undefined;  // 根目录整个被删除
+    rootDirSceneRemoved: string; // 根目录下的场景被删除
     setReadonly: boolean;
     changePageState: undefined;
     writableChange: boolean;

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",

package/src/index.ts

@@ -537,17 +537,23 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> imple
         }
     }
 
-    public async removePage(index: number): Promise<boolean> {
+    /**
+     * 删除一页
+     * 默认删除当前页, 可以删除指定 index 页
+     * 最低保留一页
+     */
+    public async removePage(index?: number): Promise<boolean> {
         if (this.appManager) {
+            const needRemoveIndex = index === undefined ? this.pageState.index : index;
             if (this.pageState.length === 1) {
                 console.warn(`[WindowManager]: can not remove the last page`);
                 return false;
             }
-            if (index < 0 || index >= this.pageState.length) {
+            if (needRemoveIndex < 0 || needRemoveIndex >= this.pageState.length) {
                 console.warn(`[WindowManager]: index ${index} out of range`);
                 return false;
             }
-            return this.appManager.removeSceneByIndex(index);;
+            return this.appManager.removeSceneByIndex(needRemoveIndex);;
         } else {
             return false;
         }