fcr-core 3.8.2 → 3.9.0-alpha

package/lib-es/{chat-connection/index.js → plugins/chat/connector.js}

@@ -22,116 +22,188 @@ 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; }
-import { AgoraObservable, EasemobChatSDK, retryAttempt, to, AgoraRestfulClientError, trace } from '../imports';
-import { FcrChatConnectionState } from './type';
+import { AgoraObservable, AgoraScheduler, EasemobChatSDK, trace } from '../../imports';
+import { FcrReturnCode } from '../../type';
+import { abortableRetry } from '../../utilities/abortable-retry';
+import { createLogger, generateLogObserver } from '../../utilities/logger';
+import { getDependenciesInfo } from '../../utilities/package-info';
 import { agoraChatConfig } from './config';
-import { createLogger } from '../utilities/logger';
-import { getDependenciesInfo } from '../utilities/package-info';
-export class FcrChatConnectionImpl {
+import { FcrChatConnectionState } from '../../chat-connector/type';
+export class FcrChatConnectorImpl {
   static {
     [_initProto] = _applyDecs(this, [[trace, 2, "login"], [trace, 2, "logout"]], []).e;
   }
   logger = (_initProto(this), createLogger({
-    prefix: 'FcrChatConnectionImpl'
+    prefix: 'FcrChatConnectorImpl'
   }));
   _observable = new AgoraObservable();
+  _loginPromise = null;
+  _logoutPromise = null;
+  _isLogoutRequested = false;
+  _abortLogin = null;
+  _conn = null;
   _connectionState = FcrChatConnectionState.DISCONNECTED;
+  _reconnectionTimer = null;
+  _reconnectPromise = null;
   constructor(_userId, _api, _chatIpList, _restIpList) {
     this._userId = _userId;
     this._api = _api;
     this._chatIpList = _chatIpList;
     this._restIpList = _restIpList;
     this.logger.info(`Chat Version: easemob-websdk@${getDependenciesInfo('easemob-websdk')}`);
+    this._addLogObserver();
   }
   async login() {
+    if (this._logoutPromise) {
+      await this._logoutPromise;
+    }
+    if (this._connectionState === FcrChatConnectionState.CONNECTED) {
+      return;
+    }
+    if (this._loginPromise) {
+      return this._loginPromise;
+    }
+    this._isLogoutRequested = false;
+    this._setConnectionState(FcrChatConnectionState.CONNECTING);
+    this._loginPromise = this._performLogin();
+    try {
+      await this._loginPromise;
+    } finally {
+      this._loginPromise = null;
+    }
+  }
+  logout() {
+    if (this._logoutPromise) {
+      return FcrReturnCode.SUCCESS;
+    }
+    this._isLogoutRequested = true;
+    this._logoutPromise = this._performLogout();
+    return FcrReturnCode.SUCCESS;
+  }
+  getConnectionState() {
+    return this._connectionState;
+  }
+  getConnectionInstance() {
+    return this._conn;
+  }
+  addObserver(observer) {
+    this._observable.addObserver(observer);
+  }
+  removeObserver(observer) {
+    this._observable.removeObserver(observer);
+  }
+  async _performLogin() {
     const privateConfig = this._getPrivateConfig();
     if (privateConfig) {
       this.logger.info('use private config:', JSON.stringify(privateConfig));
     }
-    await to(retryAttempt(async () => {
+    const [abort, promise] = abortableRetry(async signal => {
       const tokenResult = await this._api.getUserToken(this._userId);
+      signal.throwIfAborted();
       this._initConfig = tokenResult;
+      const appKey = tokenResult.appKey;
       const connParams = {
         ...agoraChatConfig,
         ...privateConfig,
-        appKey: tokenResult.appKey,
-        autoReconnectNumMax: 99999,
-        isFixedDeviceId: false
+        appKey
       };
       EasemobChatSDK.logger.setConsoleLogVisibility(false);
       this._conn = new EasemobChatSDK.connection(connParams);
-      this._addEventListeners();
+      this._addEventListeners(this._conn);
       await this._conn.open({
         accessToken: this._initConfig.token,
         user: this._userId
       });
-      this.logger.info(`onConnectionLoginSuccess, token: ${this._initConfig.token}, userId: ${this._userId}`);
-      this._observable.notifyObservers('onConnectionLoginSuccess');
-    }, [], {
-      retriesMax: 3
-    }).fail(async ({
-      error,
-      timeFn,
-      currentRetry
-    }) => {
-      if (error instanceof AgoraRestfulClientError) {
-        throw error;
+      this.logger.info(`login success, token: ${this._initConfig.token}, userId: ${this._userId}`);
+    }, {
+      retriesMax: Infinity
+    });
+    this._abortLogin = abort;
+    const [error] = await promise;
+    this._abortLogin = null;
+    if (error) {
+      await this._closeConnection();
+      if (error.name === 'AbortError' && this._isLogoutRequested) {
+        return;
       }
-      this.logger.error(`retry to login ChatConnection, ${error.message},retry ${currentRetry} times`);
-      await timeFn();
-      return true;
-    }).exec());
+      throw error;
+    }
+    if (this._isLogoutRequested) {
+      await this._closeConnection();
+    }
   }
-  _addEventListeners() {
-    this._conn?.addEventHandler('connectionListener', {
+  _addEventListeners(conn) {
+    conn.addEventHandler('connectionListener', {
       onError: e => {
         this.logger.error('onError', e.message);
       },
       onConnected: () => {
         this.logger.info('onConnected');
-        if (this._connectionState !== FcrChatConnectionState.CONNECTED) {
-          this._setConnectionState(FcrChatConnectionState.CONNECTED);
-        }
-      },
-      onDisconnected: () => {
-        if (this._connectionState !== FcrChatConnectionState.DISCONNECTED) {
-          this.logger.info('onDisconnected');
-          this._setConnectionState(FcrChatConnectionState.DISCONNECTED);
-        }
+        this._handleConnected();
       },
       onOnline: () => {
         this.logger.info('onOnline');
-        if (this._connectionState !== FcrChatConnectionState.CONNECTED) {
-          this._setConnectionState(FcrChatConnectionState.CONNECTED);
-        }
+        this._handleConnected();
       },
       onOffline: () => {
-        if (this._connectionState !== FcrChatConnectionState.DISCONNECTED) {
-          this.logger.info('onOffline');
-          this._setConnectionState(FcrChatConnectionState.DISCONNECTED);
-        }
+        this.logger.info('onOffline');
+        this._handleDisconnected();
+      },
+      onDisconnected: () => {
+        this.logger.info('onDisconnected');
+        this._handleDisconnected();
       }
     });
   }
-  logout() {
-    this._conn?.close();
+  async _performLogout() {
+    try {
+      if (this._reconnectionTimer) {
+        clearTimeout(this._reconnectionTimer);
+        this._reconnectionTimer = null;
+      }
+      if (this._abortLogin) {
+        this._abortLogin();
+        this._abortLogin = null;
+      }
+      await this._waitForLoginComplete();
+      await this._closeConnection();
+    } catch (error) {
+      this.logger.error('logout error', error.message);
+    } finally {
+      this._logoutPromise = null;
+      this._isLogoutRequested = false;
+    }
+  }
+  async _waitForLoginComplete() {
+    if (!this._loginPromise) {
+      return;
+    }
+    try {
+      await this._loginPromise;
+    } catch (error) {
+      this.logger.error('login error during logout', error.message);
+    }
+  }
+  async _closeConnection() {
+    const conn = this._conn;
+    this._conn = null;
+    if (conn) {
+      try {
+        conn.removeEventHandler('connectionListener');
+        await Promise.resolve(conn.close?.());
+      } catch (error) {
+        this.logger.error('close connection error', error.message);
+      }
+    }
+    this._setConnectionState(FcrChatConnectionState.DISCONNECTED);
   }
   _setConnectionState(state) {
+    if (this._connectionState === state) {
+      return;
+    }
     this._connectionState = state;
     this._observable.notifyObservers('onConnectionStateUpdated', state);
   }
-  getConnectionState() {
-    return this._connectionState;
-  }
-  getConnectionInstance() {
-    return this._conn;
-  }
-  addObserver(observer) {
-    this._observable.addObserver(observer);
-  }
-  removeObserver(observer) {
-    this._observable.removeObserver(observer);
-  }
   _getPrivateConfig() {
     if (this._chatIpList?.length || this._restIpList?.length) {
       const privateConfig = {
@@ -146,4 +218,52 @@ export class FcrChatConnectionImpl {
       return privateConfig;
     }
   }
+  _handleConnected() {
+    if (this._isLogoutRequested) {
+      return;
+    }
+    if (this._connectionState !== FcrChatConnectionState.CONNECTED) {
+      this._setConnectionState(FcrChatConnectionState.CONNECTED);
+    } else {
+      // notify again in case of reconnection
+      this._observable.notifyObservers('onConnectionStateUpdated', FcrChatConnectionState.CONNECTED);
+    }
+  }
+  _handleDisconnected() {
+    if (this._connectionState !== FcrChatConnectionState.DISCONNECTED) {
+      this._setConnectionState(FcrChatConnectionState.DISCONNECTED);
+    }
+    if (this._isLogoutRequested) {
+      return;
+    }
+    this._reconnect();
+  }
+  async _reconnect() {
+    if (this._loginPromise || this._reconnectPromise) {
+      return;
+    }
+    const doReconnect = async () => {
+      await this._closeConnection();
+
+      // add a short delay to avoid tight reconnect loops
+      await new Promise(resolve => {
+        this._reconnectionTimer = setTimeout(resolve, AgoraScheduler.Duration.second(1));
+      });
+      this._reconnectionTimer = null;
+      if (this._isLogoutRequested) {
+        return;
+      }
+      try {
+        await this.login();
+      } catch (error) {
+        this.logger.error('reconnect error', error.message);
+      }
+    };
+    this._reconnectPromise = doReconnect().finally(() => {
+      this._reconnectPromise = null;
+    });
+  }
+  _addLogObserver() {
+    this.addObserver(generateLogObserver(this.logger, [['onConnectionStateUpdated', ['state']]]));
+  }
 }

package/lib-es/room-control/ability-control/index.js

@@ -15,13 +15,14 @@ import "core-js/modules/esnext.map.reduce.js";
 import "core-js/modules/esnext.map.some.js";
 import "core-js/modules/esnext.map.update.js";
 import "core-js/modules/esnext.symbol.metadata.js";
-let _initProto;
+let _initProto, _isPlatformAbilitySupportedDecs;
 function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function (e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O.static = l, O.private = f, f ? 2 === o ? k = function (e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function (e) { return e[n]; }, (o < 2 || 4 === o) && (F = function (e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == typeof P && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol.for("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol.for("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function (t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 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; }
 import { getPlatform, trace } from '../../imports';
+import { FcrPlatform } from '../../type';
 import { createLogger } from '../../utilities/logger';
 /**
  * 平台能力控制的实现类
@@ -29,10 +30,10 @@ import { createLogger } from '../../utilities/logger';
  */
 export class FcrAbilityControlImpl {
   static {
-    [_initProto] = _applyDecs(this, [[trace, 2, "isPlatformAbilitySupported"]], []).e;
+    [_initProto] = _applyDecs(this, [[_isPlatformAbilitySupportedDecs, 2, "isPlatformAbilitySupported"]], []).e;
   }
   //@internal
-  logger = (_initProto(this), createLogger({
+  [(_isPlatformAbilitySupportedDecs = trace(['platform', 'ability']), "logger")] = (_initProto(this), createLogger({
     prefix: 'FcrAbilityControlImpl'
   }));
   constructor(_scene) {
@@ -41,7 +42,7 @@ export class FcrAbilityControlImpl {
   getPlatformAbility(ability) {
     const platforms = this._scene.getScenePropertiesByKeyPath(`setting.ability.${ability}`);
     if (!Array.isArray(platforms)) {
-      return [];
+      return [FcrPlatform.WEB_DESKTOP, FcrPlatform.MACOS, FcrPlatform.WINDOWS, FcrPlatform.IOS, FcrPlatform.ANDROID, FcrPlatform.WEB_MOBILE, FcrPlatform.HARMONY, FcrPlatform.CONNECTOR_PSTN, FcrPlatform.CONNECTOR_SIP, FcrPlatform.CONNECTOR_H323];
     }
     return platforms;
   }

package/lib-es/room-control/ability-control/type.js

@@ -7,5 +7,9 @@ export let FcrAbility = /*#__PURE__*/function (FcrAbility) {
   FcrAbility["Caption"] = "caption";
   FcrAbility["Transcribe"] = "transcribe";
   FcrAbility["Recording"] = "recording";
+  FcrAbility["Board"] = "board";
+  FcrAbility["SettingVirtualBackground"] = "setting:virtualBackground";
+  FcrAbility["SettingBeautyMode"] = "setting:beautyMode";
+  FcrAbility["PstnCallOut"] = "pstn:callOut";
   return FcrAbility;
 }({});

package/lib-es/room-control/group-control/index.js

@@ -28,15 +28,16 @@ import { trace } from '../../imports';
 import { AgoraObservable } from '../../imports';
 import { convertRteUserToFcrUser } from '../../utilities/user';
 import { createLogger, generateLogObserver } from '../../utilities/logger';
-import { FcrErrorModuleCode, handleRequestError } from '../../utilities/error';
+import { handleRequestError } from '../../utilities/error';
 import validateParams from '../../utilities/validate-params';
 import { fcrGroupUpdateOptionsArraySchema, fcrGroupCreateConfigArraySchema, stringArraySchema, stringSchema } from '../../schema';
+import { ErrorModuleCode } from '../../imports';
 export class FcrGroupControl {
   static {
     [_initProto] = _applyDecs(this, [[trace, 2, "getGroupList"], [_getGroupUserListDecs, 2, "getGroupUserList"], [_addGroupsDecs, 2, "addGroups"], [_updateGroupsDecs, 2, "updateGroups"], [_deleteGroupsDecs, 2, "deleteGroups"], [trace, 2, "deleteAllGroups"], [_addUsersDecs, 2, "addUsers"], [_removeUsersDecs, 2, "removeUsers"], [_moveUsersDecs, 2, "moveUsers"]], []).e;
   }
   //@internal
-  [(_getGroupUserListDecs = [trace, validateParams(stringSchema)], _addGroupsDecs = [trace, validateParams(fcrGroupCreateConfigArraySchema)], _updateGroupsDecs = [trace, validateParams(fcrGroupUpdateOptionsArraySchema)], _deleteGroupsDecs = [trace, validateParams(stringArraySchema)], _addUsersDecs = [trace, validateParams(stringArraySchema, stringSchema)], _removeUsersDecs = [trace, validateParams(stringArraySchema, stringSchema)], _moveUsersDecs = [trace, validateParams(stringArraySchema, stringSchema, stringSchema)], "logger")] = (_initProto(this), createLogger({
+  [(_getGroupUserListDecs = [trace(['groupId']), validateParams(stringSchema)], _addGroupsDecs = [trace(['groups']), validateParams(fcrGroupCreateConfigArraySchema)], _updateGroupsDecs = [trace(['groups']), validateParams(fcrGroupUpdateOptionsArraySchema)], _deleteGroupsDecs = [trace(['groupIds']), validateParams(stringArraySchema)], _addUsersDecs = [trace(['userList', 'groupId']), validateParams(stringArraySchema, stringSchema)], _removeUsersDecs = [trace(['userList', 'groupId']), validateParams(stringArraySchema, stringSchema)], _moveUsersDecs = [trace(['userList', 'fromGroupId', 'toGroupId']), validateParams(stringArraySchema, stringSchema, stringSchema)], "logger")] = (_initProto(this), createLogger({
     prefix: 'FcrGroupControl'
   }));
   //@internal
@@ -202,37 +203,37 @@ export class FcrGroupControl {
     return handleRequestError(() => this._api.addGroups(groups, {
       roomId: this._scene.sceneId,
       startTime: Date.now()
-    }), FcrErrorModuleCode.ROOM_GROUP, 'add groups failed');
+    }), ErrorModuleCode.FCR_ROOM_GROUP, 'add groups failed');
   }
   updateGroups(groups) {
     return handleRequestError(() => this._api.updateGroups(groups, {
       roomId: this._scene.sceneId
-    }), FcrErrorModuleCode.ROOM_GROUP, 'update groups failed');
+    }), ErrorModuleCode.FCR_ROOM_GROUP, 'update groups failed');
   }
   deleteGroups(groupIds) {
     return handleRequestError(() => this._api.deleteGroups(groupIds, {
       roomId: this._scene.sceneId
-    }), FcrErrorModuleCode.ROOM_GROUP, 'delete groups failed');
+    }), ErrorModuleCode.FCR_ROOM_GROUP, 'delete groups failed');
   }
   deleteAllGroups() {
     return handleRequestError(() => this._api.deleteAllGroups({
       roomId: this._scene.sceneId
-    }), FcrErrorModuleCode.ROOM_GROUP, 'delete all groups failed');
+    }), ErrorModuleCode.FCR_ROOM_GROUP, 'delete all groups failed');
   }
   addUsers(userList, groupId) {
     return handleRequestError(() => this._api.addUsers(userList, groupId, {
       roomId: this._scene.sceneId
-    }), FcrErrorModuleCode.ROOM_GROUP, 'add users failed');
+    }), ErrorModuleCode.FCR_ROOM_GROUP, 'add users failed');
   }
   removeUsers(userList, groupId) {
     return handleRequestError(() => this._api.removeUsers(userList, groupId, {
       roomId: this._scene.sceneId
-    }), FcrErrorModuleCode.ROOM_GROUP, 'remove users failed');
+    }), ErrorModuleCode.FCR_ROOM_GROUP, 'remove users failed');
   }
   moveUsers(userList, fromGroupId, toGroupId) {
     return handleRequestError(() => this._api.moveUsers(userList, fromGroupId, toGroupId, {
       roomId: this._scene.sceneId
-    }), FcrErrorModuleCode.ROOM_GROUP, 'move users failed');
+    }), ErrorModuleCode.FCR_ROOM_GROUP, 'move users failed');
   }
   // createSubRoomControl(groupId: string) {
   //   return new FcrSubRoomControlImpl(
@@ -250,6 +251,6 @@ export class FcrGroupControl {
     this._observable.removeObserver(observer);
   }
   _addLogObserver() {
-    this.addObserver(generateLogObserver(this.logger, ['onGroupsAdded', 'onGroupsUpdated', 'onGroupsRemoved', 'onUserListAddedToGroup', 'onUserListRemovedFromGroup', 'onUserListMoveToGroup']));
+    this.addObserver(generateLogObserver(this.logger, [['onGroupsAdded', ['events']], ['onGroupsUpdated', ['events']], ['onGroupsRemoved', ['events']], ['onUserListAddedToGroup', ['events']], ['onUserListRemovedFromGroup', ['events']], ['onUserListMoveToGroup', ['events']]]));
   }
 }

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

@@ -15,45 +15,44 @@ import "core-js/modules/esnext.map.reduce.js";
 import "core-js/modules/esnext.map.some.js";
 import "core-js/modules/esnext.map.update.js";
 import "core-js/modules/esnext.symbol.metadata.js";
-let _initProto;
+let _initProto, _joinDecs, _updateRoomPropertiesDecs, _updateIncrementRoomPropertiesDecs, _deleteRoomPropertiesDecs, _startCloudRecordingDecs, _startLiveStreamingDecs, _updateLiveStreamingLayoutDecs, _sendRoomMessageDecs;
 function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function (e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O.static = l, O.private = f, f ? 2 === o ? k = function (e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function (e) { return e[n]; }, (o < 2 || 4 === o) && (F = function (e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == typeof P && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol.for("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol.for("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function (t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 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; }
 // Core SDK imports
-import { AgoraObservable, jsonstring, trace, to } from '../imports';
+import { AgoraObservable, jsonstring, to, trace } from '../imports';
 
 // Service and API imports
 
 // Type definitions
-import { FcrLiveStreamingLayoutType, FcrLiveStreamingState, FcrRecordingState, FcrUserRole, FcrUserRoleToStringMap } from '../type';
+import { FcrLiveStreamingLayoutType, FcrLiveStreamingState, FcrRecordingState, FcrReturnCode, FcrUserRole, FcrUserRoleToStringMap } from '../type';
 
 // Room control types and interfaces
 import { FcrRoomType } from './type';
 
 // Control implementations
-
+import { FcrAbilityControlImpl } from './ability-control';
+import { FcrPrivilegeControlImpl } from './privilege-control';
 import { FcrRoomConnectorControlImpl } from './room-connector-control';
 import { FcrRoomSessionControlImpl } from './room-session';
-import { FcrPrivilegeControlImpl } from './privilege-control';
-import { FcrUserControlImpl } from './user-control';
-import { FcrStreamControlImpl } from './stream-control';
-import { FcrAbilityControlImpl } from './ability-control';
 import { FcrSharingControlImpl } from './sharing-control';
+import { FcrStreamControlImpl } from './stream-control';
+import { FcrUserControlImpl } from './user-control';
 // Error handling and utilities
-import { FcrErrorModuleCode, handleRequestError } from '../utilities/error';
+import { ErrorModuleCode } from '../imports';
 import { convertToStructure } from '../utilities/collection';
+import { handleRequestError } from '../utilities/error';
 import { createLogger } from '../utilities/logger';
 
 // Core state
 import { FcrConnectionState } from '..';
 
 // Helpers and utilities
-import { ROOM_CONTROL_CONSTANTS, ROOM_MESSAGE_COMMANDS, RECORDING_STATE_VALUES, LIVE_STREAMING_STATE_VALUES, ROOM_STATE_VALUES, RESPONSE_CODES, roomControlErrorHelper, liveStreamingErrorHelper, validateControllerInitialized, validateRoomJoined, validateJoinRoomPreconditions, FcrJoinHelper } from './helpers';
 import { ControllerType } from '../utilities/error-helpers';
+import { FcrJoinHelper, LIVE_STREAMING_STATE_VALUES, liveStreamingErrorHelper, RECORDING_STATE_VALUES, RESPONSE_CODES, ROOM_CONTROL_CONSTANTS, ROOM_MESSAGE_COMMANDS, ROOM_STATE_VALUES, roomControlErrorHelper, validateControllerInitialized, validateJoinRoomPreconditions, validateRoomJoined } from './helpers';
 import { FcrSttControlImpl } from './stt-control';
-
 /**
  * 房间控制基础实现类
  *
@@ -64,10 +63,10 @@ import { FcrSttControlImpl } from './stt-control';
  */
 export class FcrBaseRoomControlImpl {
   static {
-    [_initProto] = _applyDecs(this, [[trace, 2, "getSyncTimestamp"], [trace, 2, "getRoomInfo"], [trace, 2, "getRoomSchedule"], [trace, 2, "join"], [trace, 2, "leave"], [trace, 2, "start"], [trace, 2, "end"], [trace, 2, "close"], [trace, 2, "getRoomState"], [trace, 2, "getRoomProperties"], [trace, 2, "getRoomPropertiesByKeyPath"], [trace, 2, "updateRoomProperties"], [trace, 2, "updateIncrementRoomProperties"], [trace, 2, "deleteRoomProperties"], [trace, 2, "startCloudRecording"], [trace, 2, "pauseCloudRecording"], [trace, 2, "resumeCloudRecording"], [trace, 2, "stopCloudRecording"], [trace, 2, "getLiveStreamingState"], [trace, 2, "getLiveStreamingConfig"], [trace, 2, "startLiveStreaming"], [trace, 2, "updateLiveStreamingLayout"], [trace, 2, "stopLiveStreaming"], [trace, 2, "getCloudRecordingState"], [trace, 2, "sendRoomMessage"]], []).e;
+    [_initProto] = _applyDecs(this, [[trace, 2, "getSyncTimestamp"], [trace, 2, "getRoomInfo"], [trace, 2, "getRoomSchedule"], [_joinDecs, 2, "join"], [trace, 2, "leave"], [trace, 2, "start"], [trace, 2, "end"], [trace, 2, "close"], [trace, 2, "getRoomState"], [trace, 2, "getRoomProperties"], [trace, 2, "getRoomPropertiesByKeyPath"], [_updateRoomPropertiesDecs, 2, "updateRoomProperties"], [_updateIncrementRoomPropertiesDecs, 2, "updateIncrementRoomProperties"], [_deleteRoomPropertiesDecs, 2, "deleteRoomProperties"], [_startCloudRecordingDecs, 2, "startCloudRecording"], [trace, 2, "pauseCloudRecording"], [trace, 2, "resumeCloudRecording"], [trace, 2, "stopCloudRecording"], [trace, 2, "getLiveStreamingState"], [trace, 2, "getLiveStreamingConfig"], [_startLiveStreamingDecs, 2, "startLiveStreaming"], [_updateLiveStreamingLayoutDecs, 2, "updateLiveStreamingLayout"], [trace, 2, "stopLiveStreaming"], [trace, 2, "getCloudRecordingState"], [_sendRoomMessageDecs, 2, "sendRoomMessage"]], []).e;
   }
   //@internal
-  logger = (_initProto(this), createLogger({
+  [(_joinDecs = trace(['options']), _updateRoomPropertiesDecs = trace(['properties', 'cause']), _updateIncrementRoomPropertiesDecs = trace(['increments', 'cause']), _deleteRoomPropertiesDecs = trace(['properties', 'cause']), _startCloudRecordingDecs = trace(['config']), _startLiveStreamingDecs = trace(['data']), _updateLiveStreamingLayoutDecs = trace(['layoutType']), _sendRoomMessageDecs = trace(['payload', 'guaranteedDelivery']), "logger")] = (_initProto(this), createLogger({
     prefix: 'FcrBaseRoomControlImpl'
   }));
   _observable = new AgoraObservable();
@@ -109,7 +108,7 @@ export class FcrBaseRoomControlImpl {
         if (this._streamControl && !this.sharingControl &&
         // TODO: 确认是否需要限制在主房间
         this._roomType === FcrRoomType.Mainroom) {
-          this.logger.info('[whiteboard]: join scene success, start create sharing control');
+          this.logger.info('join scene success, start create sharing control');
           this.sharingControl = new FcrSharingControlImpl(this._scene, this._api, this._engine, this._privilegeControl, this._streamControl, this._sharedCache, this._userControl);
         }
         this._sttControl = new FcrSttControlImpl(this._scene, this._api, this._sharedCache);
@@ -120,7 +119,7 @@ export class FcrBaseRoomControlImpl {
       //     'onJoinRoomFailure',
       //     sceneId,
       //     generateFcrCoreClientError(
-      //       FcrErrorModuleCode.ROOM,
+      //       ErrorModuleCode.ROOM,
       //       FcrErrorCode.NOT_JOINED_ROOM,
       //       'join room failed',
       //       error,
@@ -355,7 +354,9 @@ export class FcrBaseRoomControlImpl {
 
       // 处理机器人用户的特殊逻辑
       await this._handleRobotUserSetup(options);
+      return FcrReturnCode.SUCCESS;
     } catch (error) {
+      this._cleanup();
       // 处理加入失败
       this._handleJoinFailure(error);
       throw error;
@@ -418,7 +419,7 @@ export class FcrBaseRoomControlImpl {
    */
   async _handleRobotUserSetup(options) {
     if (options.userRole === FcrUserRole.ROBOT) {
-      const res = handleRequestError(() => this._api.setCloudRecordingReady(this._scene.sceneId), FcrErrorModuleCode.ROOM, 'set cloud recording ready failed');
+      const res = handleRequestError(() => this._api.setCloudRecordingReady(this._scene.sceneId), ErrorModuleCode.FCR_ROOM, 'set cloud recording ready failed');
       this.logger.info(`set cloud recording ready, response: ${jsonstring(res)}`);
     }
   }
@@ -440,6 +441,7 @@ export class FcrBaseRoomControlImpl {
   async leave() {
     this._joinState = ROOM_CONTROL_CONSTANTS.JOIN_STATE.CANCELED;
     await this._cleanup();
+    return FcrReturnCode.SUCCESS;
   }
 
   /**
@@ -449,6 +451,7 @@ export class FcrBaseRoomControlImpl {
    */
   async start() {
     await this._api.startRoom(this._scene.sceneId);
+    return FcrReturnCode.SUCCESS;
   }
 
   /**
@@ -458,9 +461,11 @@ export class FcrBaseRoomControlImpl {
    */
   async end() {
     await this._api.endRoom(this._scene.sceneId);
+    return FcrReturnCode.SUCCESS;
   }
   async close() {
     await this._api.closeRoom(this._scene.sceneId);
+    return FcrReturnCode.SUCCESS;
   }
   getRoomState() {
     return this._scene.getScenePropertiesByKeyPath('schedule.state');
@@ -476,33 +481,40 @@ export class FcrBaseRoomControlImpl {
       roomId: this._scene.sceneId,
       properties,
       cause
-    }), FcrErrorModuleCode.ROOM, 'update room properties failed');
+    }), ErrorModuleCode.FCR_ROOM, 'update room properties failed');
+    return FcrReturnCode.SUCCESS;
   }
   async updateIncrementRoomProperties(increments, cause) {
     await handleRequestError(() => this._api.updateRoomProperties({
       roomId: this._scene.sceneId,
       increments,
       cause
-    }), FcrErrorModuleCode.ROOM, 'update room properties failed');
+    }), ErrorModuleCode.FCR_ROOM, 'update room properties failed');
+    return FcrReturnCode.SUCCESS;
   }
   async deleteRoomProperties(properties, cause) {
     await handleRequestError(() => this._api.deleteRoomProperties({
       roomId: this._scene.sceneId,
       properties,
       cause
-    }), FcrErrorModuleCode.ROOM, 'delete room rroperties failed');
+    }), ErrorModuleCode.FCR_ROOM, 'delete room rroperties failed');
+    return FcrReturnCode.SUCCESS;
   }
   async startCloudRecording(config) {
-    await handleRequestError(() => this._api.startCloudRecording(config, this._scene.sceneId), FcrErrorModuleCode.ROOM, 'start cloud recording failed');
+    await handleRequestError(() => this._api.startCloudRecording(config, this._scene.sceneId), ErrorModuleCode.FCR_ROOM, 'start cloud recording failed');
+    return FcrReturnCode.SUCCESS;
   }
   async pauseCloudRecording() {
-    await handleRequestError(() => this._api.pauseCloudRecording(this._scene.sceneId), FcrErrorModuleCode.ROOM, 'pause cloud recording failed');
+    await handleRequestError(() => this._api.pauseCloudRecording(this._scene.sceneId), ErrorModuleCode.FCR_ROOM, 'pause cloud recording failed');
+    return FcrReturnCode.SUCCESS;
   }
   async resumeCloudRecording() {
-    await handleRequestError(() => this._api.resumeCloudRecording(this._scene.sceneId), FcrErrorModuleCode.ROOM, 'resume cloud recording failed');
+    await handleRequestError(() => this._api.resumeCloudRecording(this._scene.sceneId), ErrorModuleCode.FCR_ROOM, 'resume cloud recording failed');
+    return FcrReturnCode.SUCCESS;
   }
   async stopCloudRecording() {
-    await handleRequestError(() => this._api.stopCloudRecording(this._scene.sceneId), FcrErrorModuleCode.ROOM, 'stop cloud recording failed');
+    await handleRequestError(() => this._api.stopCloudRecording(this._scene.sceneId), ErrorModuleCode.FCR_ROOM, 'stop cloud recording failed');
+    return FcrReturnCode.SUCCESS;
   }
   getLiveStreamingState() {
     let liveStreamingState = this._scene.getScenePropertiesByKeyPath('live.state');
@@ -533,12 +545,15 @@ export class FcrBaseRoomControlImpl {
   }
   async startLiveStreaming(data) {
     await this._liveStreamingAction(() => this._api.startLiveStreaming(this._scene.sceneId, data), 'start live streaming failed');
+    return FcrReturnCode.SUCCESS;
   }
   async updateLiveStreamingLayout(layoutType) {
     await this._liveStreamingAction(() => this._api.updateLiveStreamingLayout(this._scene.sceneId, layoutType), 'update live streaming layout failed');
+    return FcrReturnCode.SUCCESS;
   }
   async stopLiveStreaming() {
     await this._liveStreamingAction(() => this._api.stopLiveStreaming(this._scene.sceneId), 'stop live streaming failed');
+    return FcrReturnCode.SUCCESS;
   }
   getCloudRecordingState() {
     const {
@@ -551,6 +566,7 @@ export class FcrBaseRoomControlImpl {
   async sendRoomMessage(payload, guaranteedDelivery) {
     try {
       await this._scene.localUser.sendSceneMessage(payload, '101', guaranteedDelivery);
+      return FcrReturnCode.SUCCESS;
     } catch (e) {
       throw roomControlErrorHelper.createSendMessageError(e);
     }
@@ -568,9 +584,7 @@ export class FcrBaseRoomControlImpl {
     this._scene.removeObserver(this._sceneObserver);
     this._engine.removeObserver(this._engineObserver);
     try {
-      return await Promise.all([
-      // @ts-ignore
-      this._chatRoomControl?.leave(), this.sharingControl?.getBoardControl().close(), this.sharingControl?.getAnnotationControl().close(), this._scene.leave()]);
+      return await Promise.all([this._chatRoomControl?.leave(), this.sharingControl?.getBoardControl().close(), this.sharingControl?.getAnnotationControl().close(), this._scene.leave()]);
     } finally {
       this._joinRoomSuccess = false;
     }