fcr-core 3.7.6 → 3.7.7-rc.1

package/lib/room-control/sharing-control/index.js

@@ -65,6 +65,7 @@ class FcrSharingControlImpl {
     (0, _defineProperty2.default)(this, "_sceneObserver", {
       onScenePropertiesUpdated: this._handleOnScenePropertiesUpdated.bind(this)
     });
+    // TODO: 这里不应该再维护一套白板的状态和事件了， ui-scene 应该直接用 board control 的
     (0, _defineProperty2.default)(this, "_whiteboardObserver", {
       onActive: this._handleOnWhiteboardActive.bind(this),
       onInactive: this._handleOnWhiteboardInActive.bind(this)
@@ -79,6 +80,7 @@ class FcrSharingControlImpl {
     this._addLogObserver();
     this._whiteboardControl = this.getBoardControl();
     this._annotationControl = this.getAnnotationControl();
+    this._isActive = this._whiteboardControl.getActivity();
     this._streamControl.addObserver(this._streamObserver);
     this._whiteboardControl.addObserver(this._whiteboardObserver);
     this._scene.addObserver(this._sceneObserver);

package/lib/room-router/index.js

@@ -49,16 +49,16 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _setFunctionName(e, t, n) { "symbol" == typeof t && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? typeof e : "null")); return e; }
-_ref = (_initDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _joinRoomDecs = [_imports.trace, (0, _validateParams.default)(_schema.fcrRoomJoinOptionsSchema)], "logger");
 /**
  * @internal
  */
-
+_ref = (_initDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _joinRoomDecs = [_imports.trace, (0, _validateParams.default)(_schema.fcrRoomJoinOptionsSchema)], "logger");
 class FcrRoomRouterImpl {
   constructor(_rteEngine, _apiService, _config, _chatConnection, _sharedCache, roomId) {
     (0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'FcrRoomRouterImpl'
     })));
+    (0, _defineProperty2.default)(this, "_abortController", null);
     (0, _defineProperty2.default)(this, "_observable", new _imports.AgoraObservable());
     (0, _defineProperty2.default)(this, "_roomControlObservable", {
       onRoomRouteSwitched: async event => {
@@ -98,13 +98,22 @@ class FcrRoomRouterImpl {
     this._bypass = undefined;
   }
   async joinRoom(options) {
+    this._abortController = new AbortController();
     this._validateRoomJoinState();
     const [error] = await (0, _imports.to)(this._executeJoinRoomWithRetry(options));
+    this._abortController = null;
     if (error) {
       this._handleJoinRoomError(error);
       throw error;
     }
   }
+  async leaveRoom() {
+    var _this$_abortControlle, _this$_roomControl;
+    (_this$_abortControlle = this._abortController) === null || _this$_abortControlle === void 0 || _this$_abortControlle.abort();
+    this._abortController = null;
+    (_this$_roomControl = this._roomControl) === null || _this$_roomControl === void 0 || _this$_roomControl.leave();
+    this._roomControl = null;
+  }
 
   /**
    * 验证房间加入状态
@@ -121,6 +130,7 @@ class FcrRoomRouterImpl {
    * @private
    */
   async _executeJoinRoomWithRetry(options) {
+    const abortController = this._abortController;
     return (0, _imports.retryAttempt)(() => this._performSingleJoinAttempt(options), [], {
       retriesMax: _type2.ROOM_ROUTER_CONSTANTS.MAX_JOIN_ATTEMPTS
     }).fail(async _ref2 => {
@@ -129,7 +139,9 @@ class FcrRoomRouterImpl {
         timeFn: waitBeforeRetry,
         currentRetry: attemptCount
       } = _ref2;
-      return (0, _joinHelper.handleJoinRetryFailure)(error, waitBeforeRetry, attemptCount, _retryHelpers.canRetryJoinError, undefined, 'join room via router');
+      return (0, _joinHelper.handleJoinRetryFailure)(error, waitBeforeRetry, attemptCount, _retryHelpers.canRetryJoinError, () => {
+        this._throwIfAborted(abortController);
+      }, 'join room via router');
     }).exec();
   }
 
@@ -138,8 +150,11 @@ class FcrRoomRouterImpl {
    * @private
    */
   async _performSingleJoinAttempt(options) {
+    const abortController = this._abortController;
     const roomResponse = await this._performCheckIn(options);
+    this._throwIfAborted(abortController);
     const roomControl = await this._joinRoomControl(options, roomResponse);
+    this._throwIfAborted(abortController);
     this._updateRoomState(roomResponse, roomControl);
   }
 
@@ -174,7 +189,11 @@ class FcrRoomRouterImpl {
       data,
       ts
     } = roomResponse;
+    const abortController = this._abortController;
     const roomControl = this._createRoomControl(data);
+    abortController === null || abortController === void 0 || abortController.signal.addEventListener('abort', () => {
+      roomControl.leave();
+    });
     await roomControl.join(_objectSpread(_objectSpread({}, options), {}, {
       snapshot: data,
       timestamp: ts,
@@ -232,6 +251,11 @@ class FcrRoomRouterImpl {
       roomResponse
     });
   }
+  _throwIfAborted(abortController) {
+    if (abortController !== null && abortController !== void 0 && abortController.signal.aborted) {
+      throw new Error('Join room attempt aborted');
+    }
+  }
   addObserver(observer) {
     this._observable.addObserver(observer);
   }
@@ -241,4 +265,4 @@ class FcrRoomRouterImpl {
 }
 exports.FcrRoomRouterImpl = FcrRoomRouterImpl;
 _FcrRoomRouterImpl = FcrRoomRouterImpl;
-[_initProto] = _applyDecs(_FcrRoomRouterImpl, [[_initDecs, 2, "_init"], [_joinRoomDecs, 2, "joinRoom"]], []).e;
+[_initProto] = _applyDecs(_FcrRoomRouterImpl, [[_initDecs, 2, "_init"], [_joinRoomDecs, 2, "joinRoom"], [_imports.trace, 2, "leaveRoom"]], []).e;

package/lib/room-router/type.d.ts

@@ -35,6 +35,10 @@ export interface FcrRoomRouter {
      * 加入会议
      */
     joinRoom(options: FcrRoomJoinOptions): Promise<void>;
+    /**
+     * 离开会议
+     */
+    leaveRoom(): Promise<void>;
     addObserver(observer: FcrRoomRouterObserver): void;
     removeObserver(observer: FcrRoomRouterObserver): void;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fcr-core",
   "description": "Core APIs for building online scenes",
-  "version": "3.7.6",
+  "version": "3.7.7-rc.1",
   "module": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -40,7 +40,7 @@
     "@types/lodash": "^4.14.168",
     "@types/sinon": "^17.0.2",
     "@types/uuid": "^8.3.0",
-    "agora-toolchain": "~3.7.6",
+    "agora-toolchain": "~3.7.7-rc.1",
     "core-js": "^3.33.3",
     "decomment": "^0.9.5",
     "husky": "^9.0.11",
@@ -55,8 +55,8 @@
     "@netless/forge-room": "1.0.6",
     "@netless/forge-rtm": "1.0.6",
     "@netless/forge-whiteboard": "1.0.6",
-    "agora-foundation": "~3.7.6",
-    "agora-rte-sdk": "~3.7.6",
+    "agora-foundation": "~3.7.7-rc.1",
+    "agora-rte-sdk": "~3.7.7-rc.1",
     "await-to-js": "^3.0.0",
     "dayjs": "^1.10.4",
     "easemob-websdk": "4.13.0",