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

package/dist/index.d.ts

@@ -144,7 +144,12 @@ export declare class WindowManager extends InvisiblePlugin<WindowMangerAttribute
     nextPage(): Promise<boolean>;
     prevPage(): Promise<boolean>;
     addPage(params?: AddPageParams): Promise<void>;
-    removePage(index: number): Promise<boolean>;
+    /**
+     * 删除一页
+     * 默认删除当前页, 可以删除指定 index 页
+     * 最低保留一页
+     */
+    removePage(index?: number): Promise<boolean>;
     /**
      * 返回 mainView 的 ScenePath
      */

package/dist/index.es.js

@@ -47,6 +47,7 @@ var Events = /* @__PURE__ */ ((Events2) => {
   return Events2;
 })(Events || {});
 const MagixEventName = "__WindowManger";
+const EnsureReconnectEvent = "__WindowMangerEnsureReconnected__";
 var AppAttributes = /* @__PURE__ */ ((AppAttributes2) => {
   AppAttributes2["Size"] = "size";
   AppAttributes2["Position"] = "position";
@@ -1021,12 +1022,16 @@ class AppContext {
       }
     };
     this.removePage = async (index) => {
-      if (index < 0 || index >= this.pageState.length) {
+      const needRemoveIndex = index === void 0 ? 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);
     };
     this.emitter = appProxy.appEmitter;
     this.isAddApp = appProxy.isAddApp;
@@ -1502,6 +1507,11 @@ class AppProxy {
   }
   async onReconnected() {
     var _a;
+    const isExist = Boolean(this.manager.attributes.apps[this.id]);
+    if (!isExist) {
+      await this.destroy(true, false, true);
+      return;
+    }
     this.appEmitter.emit("reconnected", void 0);
     const currentAppState = this.getAppInitState(this.id);
     await this.destroy(true, false, true);
@@ -1603,9 +1613,6 @@ class AppProxy {
   async removeSceneByIndex(index) {
     const scenePath = this._pageState.getFullPath(index);
     if (scenePath) {
-      if (this.pageState.length <= 1) {
-        return false;
-      }
       const nextIndex = calculateNextIndex(index, this.pageState);
       this.setSceneIndexWithoutSync(nextIndex);
       this.manager.dispatchInternalEvent(Events.SetAppFocusIndex, {
@@ -2063,7 +2070,10 @@ 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);
@@ -2074,17 +2084,26 @@ class AppManager {
       }
     };
     this.removeSceneByIndex = async (index) => {
+      var _a;
       const nextIndex = calculateNextIndex(index, this.windowManger.pageState);
       this.setSceneIndexWithoutSync(nextIndex);
       this.dispatchInternalEvent(Events.SetAppFocusIndex, { type: "main", index: nextIndex });
+      const scene = (_a = this.callbacksNode) == null ? void 0 : _a.scenes[index];
       setTimeout(() => {
-        var _a;
-        const scene = (_a = this.callbacksNode) == null ? void 0 : _a.scenes[index];
         if (scene) {
           removeScenes(this.room, `${ROOT_DIR}${scene}`, index);
         }
       }, 100);
-      return true;
+      return new Promise((resolve, reject) => {
+        emitter.once("rootDirSceneRemoved").then((name) => {
+          if (name === scene) {
+            resolve(true);
+          }
+        }).catch((e2) => {
+          console.log(`[WindowManager]: removePage error: ${e2}`);
+          reject(false);
+        });
+      });
     };
     this.setSceneIndexWithoutSync = (index) => {
       var _a;
@@ -2096,11 +2115,13 @@ class AppManager {
     this.onSceneChange = (node) => {
       this.mainViewScenesLength = node.scenes.length;
       this.updateSceneState(node);
-      this.emitMainViewScenesChange(this.mainViewScenesLength);
+      return this.emitMainViewScenesChange(this.mainViewScenesLength);
     };
     this.emitMainViewScenesChange = (length) => {
-      callbacks$1.emit("mainViewScenesLengthChange", length);
-      emitter.emit("changePageState");
+      return Promise.all([
+        callbacks$1.emit("mainViewScenesLengthChange", length),
+        emitter.emit("changePageState")
+      ]);
     };
     this.updateSceneState = (node) => {
       const currentIndex = this.store.getMainViewSceneIndex() || 0;
@@ -5733,11 +5754,12 @@ class ReconnectRefresher {
     this.reactors = /* @__PURE__ */ new Map();
     this.disposers = /* @__PURE__ */ new Map();
     this.onPhaseChanged = (phase) => {
+      var _a;
       if (phase === RoomPhase.Reconnecting) {
         this.ctx.emitter.emit("startReconnect");
       }
       if (phase === RoomPhase.Connected && this.phase === RoomPhase.Reconnecting) {
-        this.onReconnected();
+        (_a = this.room) == null ? void 0 : _a.dispatchMagixEvent(EnsureReconnectEvent, {});
       }
       this.phase = phase;
     };
@@ -5758,8 +5780,15 @@ class ReconnectRefresher {
   setRoom(room) {
     this.room = room;
     this.phase = room == null ? void 0 : room.phase;
-    room == null ? void 0 : room.callbacks.off("onPhaseChanged", this.onPhaseChanged);
-    room == null ? void 0 : 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 });
+    }
   }
   setContext(ctx) {
     this.ctx = ctx;
@@ -5801,8 +5830,9 @@ class ReconnectRefresher {
     return this.reactors.has(id2);
   }
   destroy() {
-    var _a;
+    var _a, _b;
     (_a = this.room) == null ? void 0 : _a.callbacks.off("onPhaseChanged", this.onPhaseChanged);
+    (_b = this.room) == null ? void 0 : _b.removeMagixEventListener(EnsureReconnectEvent, this.onReconnected);
     this.releaseDisposers();
   }
 }
@@ -15047,7 +15077,7 @@ const reconnectRefresher = new ReconnectRefresher({ emitter });
 const _WindowManager = class extends InvisiblePlugin {
   constructor(context) {
     super(context);
-    this.version = "0.4.28";
+    this.version = "0.4.30-canary.1";
     this.dependencies = { "dependencies": { "@juggle/resize-observer": "^3.3.1", "@netless/telebox-insider": "0.2.26", "emittery": "^0.9.2", "lodash": "^4.17.21", "p-retry": "^4.6.1", "side-effect-manager": "^0.1.5", "uuid": "^7.0.3", "video.js": ">=7" }, "peerDependencies": { "white-web-sdk": "^2.16.0" }, "devDependencies": { "@netless/app-docs-viewer": "^0.2.9", "@netless/app-media-player": "0.1.0-beta.5", "@rollup/plugin-commonjs": "^20.0.0", "@rollup/plugin-node-resolve": "^13.0.4", "@rollup/plugin-url": "^6.1.0", "@sveltejs/vite-plugin-svelte": "^1.0.0-next.22", "@tsconfig/svelte": "^2.0.1", "@types/debug": "^4.1.7", "@types/lodash": "^4.14.182", "@types/lodash-es": "^4.17.4", "@types/uuid": "^8.3.1", "@typescript-eslint/eslint-plugin": "^4.30.0", "@typescript-eslint/parser": "^4.30.0", "cypress": "^8.7.0", "dotenv": "^10.0.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-svelte3": "^3.2.0", "jsdom": "^19.0.0", "less": "^4.1.1", "prettier": "^2.3.2", "prettier-plugin-svelte": "^2.4.0", "rollup-plugin-analyzer": "^4.0.0", "rollup-plugin-styles": "^3.14.1", "svelte": "^3.42.4", "typescript": "^4.5.5", "vite": "^2.5.3", "vitest": "^0.12.4", "white-web-sdk": "2.16.10" } };
     this.emitter = callbacks$1;
     this.viewMode = ViewMode.Broadcaster;
@@ -15349,15 +15379,16 @@ const _WindowManager = class extends InvisiblePlugin {
   }
   async removePage(index) {
     if (this.appManager) {
+      const needRemoveIndex = index === void 0 ? 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;
     }