fcr-core 3.10.5 → 3.10.6

package/lib/plugins/chat/chatroom.js

@@ -1,11 +1,7 @@
 "use strict";
 
-require("core-js/modules/es.symbol.description.js");
-require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/esnext.function.metadata.js");
-require("core-js/modules/esnext.iterator.filter.js");
-require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.map.delete-all.js");
 require("core-js/modules/esnext.map.emplace.js");
 require("core-js/modules/esnext.map.every.js");
@@ -21,7 +17,6 @@ require("core-js/modules/esnext.map.reduce.js");
 require("core-js/modules/esnext.map.some.js");
 require("core-js/modules/esnext.map.update.js");
 require("core-js/modules/esnext.symbol.metadata.js");
-require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -29,8 +24,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.FcrChatRoomControlImpl = void 0;
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _decorator = require("agora-foundation/lib/decorator");
 var _raceCondition = require("agora-foundation/lib/utilities/race-condition");
 var _observable = require("agora-foundation/lib/utilities/observable");
@@ -41,15 +34,12 @@ var _imports = require("../../imports");
 var _type2 = require("../../room-control/chatroom-control/type");
 var _schema = require("../../schema");
 var _type3 = require("../../type");
-var _abortableRetry3 = require("../../utilities/abortable-retry");
+var _abortableRetry = require("../../utilities/abortable-retry");
 var _error = require("../../utilities/error");
 var _logger = require("../../utilities/logger");
 var _user = require("../../utilities/user");
 var _validateParams = _interopRequireDefault(require("../../utilities/validate-params"));
-var _FcrChatRoomControlImpl;
-let _initProto, _sendMessageDecs, _addObserverDecs, _removeObserverDecs, _ref;
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+let _initProto, _sendMessageDecs, _addObserverDecs, _removeObserverDecs;
 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); }
@@ -60,8 +50,47 @@ const CHATROOM_ID_KEY_PATH = 'widgets.easemobIM.extra.chatRoomId';
 /**
  * @internal
  */
-_ref = (_sendMessageDecs = [(0, _decorator.trace)(['message', 'progress']), (0, _validateParams.default)(_schema.messageSchema, _schema.progressSchema.optional())], _addObserverDecs = (0, _decorator.trace)(['observer']), _removeObserverDecs = (0, _decorator.trace)(['observer']), "logger");
 class FcrChatRoomControlImpl {
+  static {
+    [_initProto] = _applyDecs(this, [[_decorator.trace, 2, "getConnectionState"], [_sendMessageDecs, 2, "sendMessage"], [_addObserverDecs, 2, "addObserver"], [_removeObserverDecs, 2, "removeObserver"], [_decorator.bound, 2, "_handleJoinSceneSuccess"], [_decorator.bound, 2, "_handleJoinSceneFailure"], [_decorator.trace, 2, "leave"], [_decorator.trace, 2, "release"], [_decorator.trace, 2, "join"], [_decorator.bound, 2, "_handleScenePropertiesUpdated"]], []).e;
+  }
+  [(_sendMessageDecs = [(0, _decorator.trace)(['message', 'progress']), (0, _validateParams.default)(_schema.messageSchema, _schema.progressSchema.optional())], _addObserverDecs = (0, _decorator.trace)(['observer']), _removeObserverDecs = (0, _decorator.trace)(['observer']), "logger")] = (_initProto(this), (0, _logger.createLogger)({
+    prefix: 'FcrChatRoomControlImpl'
+  }));
+  _observable = new _observable.AgoraObservable();
+  _connectionState = _type2.FcrChatRoomConnectionState.Disconnected;
+  _joinPromise = null;
+  _joinTimeoutMs = 30000;
+  _joinAttemptId = 0;
+  _abortJoinChatRoom = null;
+  _sceneObserver = {
+    onJoinSceneSuccess: this._handleJoinSceneSuccess,
+    onJoinSceneFailure: this._handleJoinSceneFailure,
+    onScenePropertiesUpdated: this._handleScenePropertiesUpdated
+  };
+  chatRoomConnectionHandler = {
+    onTextMessage: msg => {
+      if (msg.to !== this.chatRoomId) {
+        return;
+      }
+      const message = this._convertAgoraChatMessageToFcrChatRoomReceiveMessage(msg);
+      this._observable.notifyObservers('onTextMessageReceived', this._scene.sceneId, message);
+    }
+  };
+  _chatConnectionObserver = {
+    onConnectionStateUpdated: async connectorState => {
+      const chatRoomConnectionState = this.getConnectionState();
+      if (connectorState === _type.FcrChatConnectionState.DISCONNECTED) {
+        this._setConnectionState(_type2.FcrChatRoomConnectionState.Disconnected);
+      } else if (connectorState === _type.FcrChatConnectionState.CONNECTED && chatRoomConnectionState !== _type2.FcrChatRoomConnectionState.Connected) {
+        this.logger.info('chat connector connected, try to join chat room');
+        this._tryJoinChatRoom();
+      } else if (connectorState === _type.FcrChatConnectionState.CONNECTED) {
+        this.logger.info('chat connector reconnected, try to rejoin chat room');
+        this._tryJoinChatRoom(true);
+      }
+    }
+  };
   get conn() {
     if (!this._chatConnection.getConnectionInstance()) {
       throw (0, _error.generateFcrCoreClientError)(_imports.ErrorModuleCode.FCR_ROOM_CHATROOM, _imports.DetailErrorCode.UNDEFINED_ERROR, 'chat room connection not initialized, please get chat room token first');
@@ -75,65 +104,9 @@ class FcrChatRoomControlImpl {
     return this._scene.getScenePropertiesByKeyPath(CHATROOM_ID_KEY_PATH);
   }
   get connectionEventHandlerKey() {
-    return "chatroom".concat(this._scene.sceneId);
+    return `chatroom${this._scene.sceneId}`;
   }
   constructor(_scene, _chatConnection, sharedCache, joinSceneSuccess) {
-    (0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrChatRoomControlImpl'
-    })));
-    (0, _defineProperty2.default)(this, "_observable", new _observable.AgoraObservable());
-    (0, _defineProperty2.default)(this, "_connectionState", _type2.FcrChatRoomConnectionState.Disconnected);
-    (0, _defineProperty2.default)(this, "_joinPromise", null);
-    (0, _defineProperty2.default)(this, "_joinTimeoutMs", 30000);
-    (0, _defineProperty2.default)(this, "_joinAttemptId", 0);
-    (0, _defineProperty2.default)(this, "_abortJoinChatRoom", null);
-    (0, _defineProperty2.default)(this, "_sceneObserver", {
-      onJoinSceneSuccess: this._handleJoinSceneSuccess,
-      onJoinSceneFailure: this._handleJoinSceneFailure,
-      onScenePropertiesUpdated: this._handleScenePropertiesUpdated
-    });
-    (0, _defineProperty2.default)(this, "chatRoomConnectionHandler", {
-      onTextMessage: msg => {
-        if (msg.to !== this.chatRoomId) {
-          return;
-        }
-        const message = this._convertAgoraChatMessageToFcrChatRoomReceiveMessage(msg);
-        this._observable.notifyObservers('onTextMessageReceived', this._scene.sceneId, message);
-      }
-    });
-    (0, _defineProperty2.default)(this, "_chatConnectionObserver", {
-      onConnectionStateUpdated: async connectorState => {
-        const chatRoomConnectionState = this.getConnectionState();
-        if (connectorState === _type.FcrChatConnectionState.DISCONNECTED) {
-          this._setConnectionState(_type2.FcrChatRoomConnectionState.Disconnected);
-        } else if (connectorState === _type.FcrChatConnectionState.CONNECTED && chatRoomConnectionState !== _type2.FcrChatRoomConnectionState.Connected) {
-          this.logger.info('chat connector connected, try to join chat room');
-          this._tryJoinChatRoom();
-        } else if (connectorState === _type.FcrChatConnectionState.CONNECTED) {
-          this.logger.info('chat connector reconnected, try to rejoin chat room');
-          this._tryJoinChatRoom(true);
-        }
-      }
-    });
-    (0, _defineProperty2.default)(this, "_convertAgoraChatMessageToFcrChatRoomReceiveMessage", msg => {
-      switch (msg.type) {
-        case 'txt':
-          {
-            var _msg$ext, _msg$ext2, _msg$ext3;
-            const message = {
-              id: msg.id,
-              from: (_msg$ext = msg.ext) === null || _msg$ext === void 0 ? void 0 : _msg$ext.sender,
-              type: _type2.FcrChatRoomMessageType.Text,
-              timestamp: parseInt("".concat(msg.time)),
-              content: msg.msg,
-              isPrivate: (_msg$ext2 = msg.ext) === null || _msg$ext2 === void 0 ? void 0 : _msg$ext2.isPrivate,
-              properties: (_msg$ext3 = msg.ext) === null || _msg$ext3 === void 0 ? void 0 : _msg$ext3.properties
-            };
-            return message;
-          }
-      }
-      throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.FCR_ROOM_CHATROOM, _error.FcrErrorCode.UNDEFINED_ERROR, 'unknown remote message type');
-    });
     this._scene = _scene;
     this._chatConnection = _chatConnection;
     this._roomCache = sharedCache.getRoomCache(_scene.sceneId);
@@ -149,24 +122,24 @@ class FcrChatRoomControlImpl {
     return this._connectionState;
   }
   async sendMessage(message, progress) {
-    var _message$to;
     const msg = this._convertFcrChatRoomSendBaseMessageToAgoraChatMessage(message, progress);
     const sendMsgRes = await this.conn.send(msg);
     const localUserInfo = this._scene.getUser(this._scene.getLocalUser().getLocalUserId());
-    const res = _objectSpread(_objectSpread({}, message.type === _type2.FcrChatRoomMessageType.Text ? {
-      content: message.content
-    } :
-    // @ts-ignore
-    {
-      url: sendMsgRes.message.url
-    }), {}, {
+    const res = {
+      ...(message.type === _type2.FcrChatRoomMessageType.Text ? {
+        content: message.content
+      } :
+      // @ts-ignore
+      {
+        url: sendMsgRes.message.url
+      }),
       from: (0, _user.convertRteUserToFcrUser)(localUserInfo, this._roomCache),
       id: sendMsgRes.serverMsgId,
       type: message.type,
       properties: message.properties,
       timestamp: Date.now(),
-      isPrivate: !!((_message$to = message.to) !== null && _message$to !== void 0 && _message$to.length)
-    });
+      isPrivate: !!message.to?.length
+    };
     return res;
   }
   addObserver(observer) {
@@ -184,8 +157,7 @@ class FcrChatRoomControlImpl {
     this._connectionState = state;
     this._observable.notifyObservers('onConnectionStateUpdated', this._scene.sceneId, state);
   }
-  _tryJoinChatRoom() {
-    let force = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+  _tryJoinChatRoom(force = false) {
     if (this._chatConnection.getConnectionState() !== _type.FcrChatConnectionState.CONNECTED) {
       return;
     }
@@ -247,7 +219,7 @@ class FcrChatRoomControlImpl {
       this.conn.leaveChatRoom({
         roomId: this.chatRoomId,
         success: () => {
-          this.logger.info("leave chat room success, room id: ".concat(this.chatRoomId, ", scene id: ").concat(this._scene.sceneId));
+          this.logger.info(`leave chat room success, room id: ${this.chatRoomId}, scene id: ${this._scene.sceneId}`);
         },
         error: e => {
           this.logger.error('leave chat room failed', e.message);
@@ -260,19 +232,18 @@ class FcrChatRoomControlImpl {
     this._observable.removeAllObservers();
     return this.leave();
   }
-  async join() {
-    let force = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+  async join(force = false) {
     this._chatConnection.addObserver(this._chatConnectionObserver);
     const connectorState = this._chatConnection.getConnectionState();
     if (connectorState !== _type.FcrChatConnectionState.CONNECTED) {
       return _type3.FcrReturnCode.SUCCESS;
     }
     if (!this.chatRoomId) {
-      this.logger.warn("chat room id is empty, scene id: ".concat(this._scene.sceneId));
+      this.logger.warn(`chat room id is empty, scene id: ${this._scene.sceneId}`);
       return _type3.FcrReturnCode.SUCCESS;
     }
     if (!this._chatConnection.getConnectionInstance()) {
-      this.logger.warn("chat connection instance is null, scene id: ".concat(this._scene.sceneId));
+      this.logger.warn(`chat connection instance is null, scene id: ${this._scene.sceneId}`);
       return _type3.FcrReturnCode.SUCCESS;
     }
     const chatRoomId = this.chatRoomId;
@@ -287,7 +258,7 @@ class FcrChatRoomControlImpl {
       if (chatRoomConnectionState !== _type2.FcrChatRoomConnectionState.Connecting) {
         this._setConnectionState(_type2.FcrChatRoomConnectionState.Connecting);
       }
-      this.logger.info("start join chat room, room id: ".concat(chatRoomId, ", scene id: ").concat(this._scene.sceneId));
+      this.logger.info(`start join chat room, room id: ${chatRoomId}, scene id: ${this._scene.sceneId}`);
       this._addEventListener();
       const attemptId = ++this._joinAttemptId;
       this._joinPromise = (async () => {
@@ -295,22 +266,17 @@ class FcrChatRoomControlImpl {
         if (force && chatRoomConnectionState === _type2.FcrChatRoomConnectionState.Connected) {
           await this._leaveChatRoomForRejoin(chatRoomId);
         }
-        const _abortableRetry = (0, _abortableRetry3.abortableRetry)(async () => {
-            await this.conn.joinChatRoom({
-              roomId: chatRoomId
-            });
-            this.logger.info("join chat room success, room id: ".concat(chatRoomId, ", scene id: ").concat(this._scene.sceneId));
-          }, {
-            retriesMax: Infinity
-          }),
-          _abortableRetry2 = (0, _slicedToArray2.default)(_abortableRetry, 2),
-          abort = _abortableRetry2[0],
-          promise = _abortableRetry2[1];
+        const [abort, promise] = (0, _abortableRetry.abortableRetry)(async () => {
+          await this.conn.joinChatRoom({
+            roomId: chatRoomId
+          });
+          this.logger.info(`join chat room success, room id: ${chatRoomId}, scene id: ${this._scene.sceneId}`);
+        }, {
+          retriesMax: Infinity
+        });
         this._abortJoinChatRoom = abort;
         try {
-          var _await$timeout = await (0, _raceCondition.timeout)(promise, this._joinTimeoutMs);
-          var _await$timeout2 = (0, _slicedToArray2.default)(_await$timeout, 1);
-          error = _await$timeout2[0];
+          [error] = await (0, _raceCondition.timeout)(promise, this._joinTimeoutMs);
         } catch (joinError) {
           if (attemptId !== this._joinAttemptId) {
             return _type3.FcrReturnCode.SUCCESS;
@@ -328,7 +294,7 @@ class FcrChatRoomControlImpl {
             this.conn.leaveChatRoom({
               roomId: chatRoomId,
               success: () => {
-                this.logger.info("leave stale chat room success, room id: ".concat(chatRoomId, ", scene id: ").concat(this._scene.sceneId));
+                this.logger.info(`leave stale chat room success, room id: ${chatRoomId}, scene id: ${this._scene.sceneId}`);
               },
               error: leaveError => {
                 this.logger.error('leave stale chat room failed', leaveError.message);
@@ -338,9 +304,9 @@ class FcrChatRoomControlImpl {
           return _type3.FcrReturnCode.SUCCESS;
         }
         if (error) {
-          this.logger.error("join chat room failed, room id: ".concat(chatRoomId, ", scene id: ").concat(this._scene.sceneId), error.message);
+          this.logger.error(`join chat room failed, room id: ${chatRoomId}, scene id: ${this._scene.sceneId}`, error.message);
           this._setConnectionState(_type2.FcrChatRoomConnectionState.Disconnected);
-          throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.FCR_ROOM_CHATROOM, _error.FcrErrorCode.UNDEFINED_ERROR, "join chat room failed: ".concat(error.message));
+          throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.FCR_ROOM_CHATROOM, _error.FcrErrorCode.UNDEFINED_ERROR, `join chat room failed: ${error.message}`);
         } else {
           this._setConnectionState(_type2.FcrChatRoomConnectionState.Connected);
         }
@@ -377,25 +343,42 @@ class FcrChatRoomControlImpl {
     this._removeEventListener();
     this.conn.addEventHandler(this.connectionEventHandlerKey, this.chatRoomConnectionHandler);
   }
+  _convertAgoraChatMessageToFcrChatRoomReceiveMessage = msg => {
+    switch (msg.type) {
+      case 'txt':
+        {
+          const message = {
+            id: msg.id,
+            from: msg.ext?.sender,
+            type: _type2.FcrChatRoomMessageType.Text,
+            timestamp: parseInt(`${msg.time}`),
+            content: msg.msg,
+            isPrivate: msg.ext?.isPrivate,
+            properties: msg.ext?.properties
+          };
+          return message;
+        }
+    }
+    throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.FCR_ROOM_CHATROOM, _error.FcrErrorCode.UNDEFINED_ERROR, 'unknown remote message type');
+  };
   _convertAgoraChatHistoryMessageToFcrChatRoomReceiveMessage(msg) {
     //@ts-ignore
     switch (msg.contentsType) {
       case 'TEXT':
         {
-          var _msg$ext4, _msg$ext5, _msg$ext6;
           const message = {
             id: msg.id,
             //@ts-ignore
-            from: (_msg$ext4 = msg.ext) === null || _msg$ext4 === void 0 ? void 0 : _msg$ext4.sender,
+            from: msg.ext?.sender,
             type: _type2.FcrChatRoomMessageType.Text,
             //@ts-ignore
-            timestamp: parseInt("".concat(msg.time)),
+            timestamp: parseInt(`${msg.time}`),
             //@ts-ignore
             content: msg.data,
             //@ts-ignore
-            isPrivate: (_msg$ext5 = msg.ext) === null || _msg$ext5 === void 0 ? void 0 : _msg$ext5.isPrivate,
+            isPrivate: msg.ext?.isPrivate,
             //@ts-ignore
-            properties: (_msg$ext6 = msg.ext) === null || _msg$ext6 === void 0 ? void 0 : _msg$ext6.properties
+            properties: msg.ext?.properties
           };
           return message;
         }
@@ -406,9 +389,8 @@ class FcrChatRoomControlImpl {
     switch (msg.type) {
       case _type2.FcrChatRoomMessageType.Text:
         {
-          var _message$to2;
           const message = msg;
-          const isPrivate = !!((_message$to2 = message.to) !== null && _message$to2 !== void 0 && _message$to2.length);
+          const isPrivate = !!message.to?.length;
           const localUserId = this._scene.getLocalUser().getLocalUserId();
           const localUserInfo = this._scene.getUser(localUserId);
           return _easemobWebsdk.default.message.create({
@@ -431,14 +413,9 @@ class FcrChatRoomControlImpl {
   _handleScenePropertiesUpdated(sceneId, properties) {
     const chatRoomId = (0, _get.default)(properties.changedProperties, CHATROOM_ID_KEY_PATH);
     if (chatRoomId) {
-      this.logger.info("received chat room id change, chat room id: ".concat(chatRoomId, ", scene id: ").concat(sceneId));
+      this.logger.info(`received chat room id change, chat room id: ${chatRoomId}, scene id: ${sceneId}`);
       this.join();
     }
   }
 }
-exports.FcrChatRoomControlImpl = FcrChatRoomControlImpl;
-_FcrChatRoomControlImpl = FcrChatRoomControlImpl;
-var _applyDecs$e = _applyDecs(_FcrChatRoomControlImpl, [[_decorator.trace, 2, "getConnectionState"], [_sendMessageDecs, 2, "sendMessage"], [_addObserverDecs, 2, "addObserver"], [_removeObserverDecs, 2, "removeObserver"], [_decorator.bound, 2, "_handleJoinSceneSuccess"], [_decorator.bound, 2, "_handleJoinSceneFailure"], [_decorator.trace, 2, "leave"], [_decorator.trace, 2, "release"], [_decorator.trace, 2, "join"], [_decorator.bound, 2, "_handleScenePropertiesUpdated"]], []).e;
-var _applyDecs$e2 = (0, _slicedToArray2.default)(_applyDecs$e, 1);
-_initProto = _applyDecs$e2[0];
-_applyDecs$e;
+exports.FcrChatRoomControlImpl = FcrChatRoomControlImpl;

package/lib/plugins/chat/connector.js

@@ -1,12 +1,7 @@
 "use strict";
 
-require("core-js/modules/es.symbol.description.js");
-require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/esnext.function.metadata.js");
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.filter.js");
-require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.map.delete-all.js");
 require("core-js/modules/esnext.map.emplace.js");
 require("core-js/modules/esnext.map.every.js");
@@ -22,51 +17,46 @@ require("core-js/modules/esnext.map.reduce.js");
 require("core-js/modules/esnext.map.some.js");
 require("core-js/modules/esnext.map.update.js");
 require("core-js/modules/esnext.symbol.metadata.js");
-require("core-js/modules/web.dom-collections.iterator.js");
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrChatConnectorImpl = void 0;
 require("core-js/modules/es.json.stringify.js");
-require("core-js/modules/es.promise.finally.js");
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _imports = require("../../imports");
 var _type = require("../../type");
-var _abortableRetry3 = require("../../utilities/abortable-retry");
+var _abortableRetry = require("../../utilities/abortable-retry");
 var _logger = require("../../utilities/logger");
 var _packageInfo = require("../../utilities/package-info");
 var _config = require("./config");
 var _type2 = require("../../chat-connector/type");
-var _FcrChatConnectorImpl;
 let _initProto;
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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; }
 class FcrChatConnectorImpl {
+  static {
+    [_initProto] = _applyDecs(this, [[_imports.trace, 2, "login"], [_imports.trace, 2, "logout"]], []).e;
+  }
+  logger = (_initProto(this), (0, _logger.createLogger)({
+    prefix: 'FcrChatConnectorImpl'
+  }));
+  _observable = new _imports.AgoraObservable();
+  _loginPromise = null;
+  _logoutPromise = null;
+  _isLogoutRequested = false;
+  _abortLogin = null;
+  _conn = null;
+  _connectionState = _type2.FcrChatConnectionState.DISCONNECTED;
+  _reconnectionTimer = null;
+  _reconnectPromise = null;
   constructor(_userId, _api, _chatIpList, _restIpList) {
-    (0, _defineProperty2.default)(this, "logger", (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrChatConnectorImpl'
-    })));
-    (0, _defineProperty2.default)(this, "_observable", new _imports.AgoraObservable());
-    (0, _defineProperty2.default)(this, "_loginPromise", null);
-    (0, _defineProperty2.default)(this, "_logoutPromise", null);
-    (0, _defineProperty2.default)(this, "_isLogoutRequested", false);
-    (0, _defineProperty2.default)(this, "_abortLogin", null);
-    (0, _defineProperty2.default)(this, "_conn", null);
-    (0, _defineProperty2.default)(this, "_connectionState", _type2.FcrChatConnectionState.DISCONNECTED);
-    (0, _defineProperty2.default)(this, "_reconnectionTimer", null);
-    (0, _defineProperty2.default)(this, "_reconnectPromise", null);
     this._userId = _userId;
     this._api = _api;
     this._chatIpList = _chatIpList;
     this._restIpList = _restIpList;
-    this.logger.info("Chat Version: easemob-websdk@".concat((0, _packageInfo.getDependenciesInfo)('easemob-websdk')));
+    this.logger.info(`Chat Version: easemob-websdk@${(0, _packageInfo.getDependenciesInfo)('easemob-websdk')}`);
     this._addLogObserver();
   }
   async login() {
@@ -113,37 +103,34 @@ class FcrChatConnectorImpl {
     if (privateConfig) {
       this.logger.info('use private config:', JSON.stringify(privateConfig));
     }
-    const _abortableRetry = (0, _abortableRetry3.abortableRetry)(async signal => {
-        const tokenResult = await this._api.getUserToken(this._userId);
-        signal.throwIfAborted();
-        this._initConfig = tokenResult;
-        const appKey = tokenResult.appKey;
-        const connParams = _objectSpread(_objectSpread(_objectSpread({}, _config.agoraChatConfig), privateConfig), {}, {
-          appKey
+    const [abort, promise] = (0, _abortableRetry.abortableRetry)(async signal => {
+      const tokenResult = await this._api.getUserToken(this._userId);
+      signal.throwIfAborted();
+      this._initConfig = tokenResult;
+      const appKey = tokenResult.appKey;
+      const connParams = {
+        ..._config.agoraChatConfig,
+        ...privateConfig,
+        appKey
+      };
+      _imports.EasemobChatSDK.logger.setConsoleLogVisibility(false);
+      this._conn = new _imports.EasemobChatSDK.connection(connParams);
+      this._addEventListeners(this._conn);
+      try {
+        await this._conn.open({
+          accessToken: this._initConfig.token,
+          user: this._userId
         });
-        _imports.EasemobChatSDK.logger.setConsoleLogVisibility(false);
-        this._conn = new _imports.EasemobChatSDK.connection(connParams);
-        this._addEventListeners(this._conn);
-        try {
-          await this._conn.open({
-            accessToken: this._initConfig.token,
-            user: this._userId
-          });
-        } catch (error) {
-          this.logger.error('connection open error', error.message);
-          throw error;
-        }
-        this.logger.info("login success, token: ".concat(this._initConfig.token, ", userId: ").concat(this._userId));
-      }, {
-        retriesMax: Infinity
-      }),
-      _abortableRetry2 = (0, _slicedToArray2.default)(_abortableRetry, 2),
-      abort = _abortableRetry2[0],
-      promise = _abortableRetry2[1];
+      } catch (error) {
+        this.logger.error('connection open error', error.message);
+        throw error;
+      }
+      this.logger.info(`login success, token: ${this._initConfig.token}, userId: ${this._userId}`);
+    }, {
+      retriesMax: Infinity
+    });
     this._abortLogin = abort;
-    const _await$promise = await promise,
-      _await$promise2 = (0, _slicedToArray2.default)(_await$promise, 1),
-      error = _await$promise2[0];
+    const [error] = await promise;
     this._abortLogin = null;
     if (error) {
       await this._closeConnection();
@@ -213,9 +200,8 @@ class FcrChatConnectorImpl {
     this._conn = null;
     if (conn) {
       try {
-        var _conn$close;
         conn.removeEventHandler('connectionListener');
-        await Promise.resolve((_conn$close = conn.close) === null || _conn$close === void 0 ? void 0 : _conn$close.call(conn));
+        await Promise.resolve(conn.close?.());
       } catch (error) {
         this.logger.error('close connection error', error.message);
       }
@@ -230,17 +216,15 @@ class FcrChatConnectorImpl {
     this._observable.notifyObservers('onConnectionStateUpdated', state);
   }
   _getPrivateConfig() {
-    var _this$_chatIpList, _this$_restIpList;
-    if ((_this$_chatIpList = this._chatIpList) !== null && _this$_chatIpList !== void 0 && _this$_chatIpList.length || (_this$_restIpList = this._restIpList) !== null && _this$_restIpList !== void 0 && _this$_restIpList.length) {
-      var _this$_chatIpList2, _this$_restIpList2;
+    if (this._chatIpList?.length || this._restIpList?.length) {
       const privateConfig = {
         isHttpDNS: false
         // https: true,
       };
-      if ((_this$_chatIpList2 = this._chatIpList) !== null && _this$_chatIpList2 !== void 0 && _this$_chatIpList2.length) {
+      if (this._chatIpList?.length) {
         privateConfig.url = this._chatIpList[0];
       }
-      if ((_this$_restIpList2 = this._restIpList) !== null && _this$_restIpList2 !== void 0 && _this$_restIpList2.length) {
+      if (this._restIpList?.length) {
         privateConfig.apiUrl = this._restIpList[0];
       }
       privateConfig.url = 'wss://apaas-private-im.agoralab.co:13003/websocket';
@@ -296,9 +280,4 @@ class FcrChatConnectorImpl {
     this.addObserver((0, _logger.generateLogObserver)(this.logger, [['onConnectionStateUpdated', ['state']]]));
   }
 }
-exports.FcrChatConnectorImpl = FcrChatConnectorImpl;
-_FcrChatConnectorImpl = FcrChatConnectorImpl;
-var _applyDecs$e = _applyDecs(_FcrChatConnectorImpl, [[_imports.trace, 2, "login"], [_imports.trace, 2, "logout"]], []).e;
-var _applyDecs$e2 = (0, _slicedToArray2.default)(_applyDecs$e, 1);
-_initProto = _applyDecs$e2[0];
-_applyDecs$e;
+exports.FcrChatConnectorImpl = FcrChatConnectorImpl;