fcr-core 3.10.5 → 3.10.6

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

@@ -1,9 +1,6 @@
 "use strict";
 
-require("core-js/modules/es.symbol.description.js");
-require("core-js/modules/es.error.cause.js");
 require("core-js/modules/esnext.function.metadata.js");
-require("core-js/modules/esnext.iterator.filter.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");
@@ -25,14 +22,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FcrUserControlImpl = void 0;
 require("core-js/modules/es.array.push.js");
-require("core-js/modules/es.object.from-entries.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.iterator.map.js");
-require("core-js/modules/web.dom-collections.iterator.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 _user = require("../../utilities/user");
@@ -42,10 +35,7 @@ var _logger = require("../../utilities/logger");
 var _error = require("../../utilities/error");
 var _validateParams = _interopRequireDefault(require("../../utilities/validate-params"));
 var _schema = require("../../schema");
-var _FcrUserControlImpl;
-let _initProto, _getUserDecs, _fetchUserListDecs, _updateUserNameDecs, _updateUserPropertiesDecs, _updateIncrementUserPropertiesDecs, _deleteUserPropertiesDecs, _getUserPropertiesByUserIdDecs, _getUserPropertiesByKeyPathDecs, _updateRemoteUserRoleDecs, _claimHostDecs, _kickOutDecs, _kickOutByUserIdsDecs, _kickOutByUserRolesDecs, _mergeAudioStreamDecs, _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, _getUserDecs, _fetchUserListDecs, _updateUserNameDecs, _updateUserPropertiesDecs, _updateIncrementUserPropertiesDecs, _deleteUserPropertiesDecs, _getUserPropertiesByUserIdDecs, _getUserPropertiesByKeyPathDecs, _updateRemoteUserRoleDecs, _claimHostDecs, _kickOutDecs, _kickOutByUserIdsDecs, _kickOutByUserRolesDecs, _mergeAudioStreamDecs;
 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); }
@@ -54,157 +44,165 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 /**
  * @internal
  */
-_ref = (_getUserDecs = [_imports.bound, (0, _validateParams.default)(_schema.stringSchema)], _fetchUserListDecs = [_imports.bound, (0, _imports.trace)(['params'])], _updateUserNameDecs = [_imports.bound, (0, _imports.trace)(['userId', 'userName']), (0, _validateParams.default)(_schema.stringSchema, _schema.stringSchema)], _updateUserPropertiesDecs = [_imports.bound, (0, _imports.trace)(['properties', 'cause', 'userId']), (0, _validateParams.default)(_schema.stringKeyUnknownValueSchema, _schema.stringKeyUnknownValueSchema, _schema.stringSchema)], _updateIncrementUserPropertiesDecs = [_imports.bound, (0, _imports.trace)(['increments', 'cause', 'userId']), (0, _validateParams.default)(_schema.stringKeyNumberValueSchema, _schema.stringKeyUnknownValueSchema, _schema.stringSchema)], _deleteUserPropertiesDecs = [_imports.bound, (0, _imports.trace)(['keyPath', 'cause', 'userId']), (0, _validateParams.default)(_schema.stringArraySchema, _schema.stringKeyUnknownValueSchema, _schema.stringSchema)], _getUserPropertiesByUserIdDecs = [_imports.bound, (0, _imports.trace)(['userId']), (0, _validateParams.default)(_schema.stringSchema)], _getUserPropertiesByKeyPathDecs = [_imports.bound, (0, _imports.trace)(['keyPath', 'userId']), (0, _validateParams.default)(_schema.stringSchema, _schema.stringSchema)], _updateRemoteUserRoleDecs = [_imports.bound, (0, _imports.trace)(['userId', 'userRole']), (0, _validateParams.default)(_schema.stringSchema, _schema.fcrUserRoleSchema)], _claimHostDecs = [_imports.bound, (0, _imports.trace)(['hostKey']), (0, _validateParams.default)(_schema.stringSchema)], _kickOutDecs = [_imports.bound, (0, _imports.trace)(['userId', 'type']), (0, _validateParams.default)(_schema.stringSchema, _schema.fcrUserKickedOutTypeSchema)], _kickOutByUserIdsDecs = [(0, _imports.trace)(['userIds', 'type']), (0, _validateParams.default)(_schema.stringArraySchema, _schema.fcrUserKickedOutTypeSchema)], _kickOutByUserRolesDecs = [(0, _imports.trace)(['userRoles', 'type']), (0, _validateParams.default)(_schema.fcrUserRolesSchema, _schema.fcrUserKickedOutTypeSchema)], _mergeAudioStreamDecs = [(0, _imports.trace)(['userId']), (0, _validateParams.default)(_schema.stringSchema)], "logger");
 class FcrUserControlImpl {
-  constructor(_scene, _api, _sharedCache) {
-    //@internal
-    (0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrUserControlImpl'
-    })));
-    //@internal
-    (0, _defineProperty2.default)(this, "_observable", new _imports.AgoraObservable());
-    //@internal
-    (0, _defineProperty2.default)(this, "_enableUserCount", true);
-    //@internal
-    (0, _defineProperty2.default)(this, "_sceneObserver", {
-      onRemoteUsersJoined: (roomId, events) => {
-        events.forEach(event => {
-          const userProperties = this._scene.getUserPropertiesByUserId(event.userInfo.userId);
-          this._roomCache.setUserPlatform(event.userInfo.userId, userProperties === null || userProperties === void 0 ? void 0 : userProperties.platform);
-          this._roomCache.setUserAvatar(event.userInfo.userId, userProperties === null || userProperties === void 0 ? void 0 : userProperties.avatar);
-        });
-        const fcrUserEvents = events.map(e => {
-          return {
-            userInfo: e.userInfo && (0, _user.convertRteUserToFcrUser)(e.userInfo, this._roomCache)
-            // operatorUser: e.operatorUser && convertRteUserToFcrUser(e.operatorUser, this._roomCache),
-          };
-        });
-        fcrUserEvents.forEach(event => {
-          const user = event.userInfo;
-          const exists = user.userId in this._roomCache.userMapByUserId;
-          if (exists) {
-            this.logger.warn("[FcrUserControl] user joined when the user already exists, userId: ".concat(user.userId));
-          } else {
-            this._roomCache.setUserMapByUserId(user.userId, user);
-            this._roomCache.addUserToList(user);
-          }
-        });
-        this._observable.notifyObservers('onRemoteUsersJoined', roomId, fcrUserEvents);
-      },
-      onRemoteUsersLeft: (roomId, events) => {
-        const fcrUserEvents = events.map(e => {
-          var _e$cause;
-          return {
-            userInfo: e.userInfo && (0, _user.convertRteUserToFcrUser)(e.userInfo, this._roomCache),
-            userProperties: e.userProperties,
-            operatorUser: e.operatorUser && (0, _user.convertRteUserToFcrUser)(e.operatorUser, this._roomCache),
-            reason: ((_e$cause = e.cause) === null || _e$cause === void 0 ? void 0 : _e$cause.cmd) === 5 ? _type2.FcrUserLeftReason.kickOut : _type2.FcrUserLeftReason.LeaveRoom
-          };
-        });
-        fcrUserEvents.forEach(event => {
-          const user = event.userInfo;
-          const exists = this._roomCache.userMapByUserId.has(user.userId);
-          if (!exists) {
-            this.logger.warn("[FcrUserControl] user left when the user does not exist, userId: ".concat(user.userId));
-          } else {
-            this._roomCache.deleteUserMapByUserId(user.userId);
-            const index = this._roomCache.userList.findIndex(u => user.userId === u.userId);
-            if (index !== -1) {
-              this._roomCache.deleteUserList(index);
-            }
-          }
-        });
-        events.forEach(event => {
-          this._roomCache.deleteUserPlatform(event.userInfo.userId);
-          this._roomCache.deleteUserAvatar(event.userInfo.userId);
-        });
-        this._observable.notifyObservers('onRemoteUsersLeft', roomId, fcrUserEvents);
-      },
-      onUserUpdated: (sceneId, event) => {
-        const fcrUserUpdatedEvent = {
-          modifiedUser: event.modifiedUser && (0, _user.convertRteUserToFcrUser)(event.modifiedUser, this._roomCache),
-          operatorUser: event.operatorUser && (0, _user.convertRteUserToFcrUser)(event.operatorUser, this._roomCache),
-          reason: event.reason
+  static {
+    [_initProto] = _applyDecs(this, [[_imports.bound, 2, "getLocalUser"], [_imports.bound, 2, "getUsers"], [_imports.bound, 2, "getUserList"], [_imports.bound, 2, "getUserListByRole"], [_imports.bound, 2, "getUserCountByRole"], [_getUserDecs, 2, "getUser"], [[_imports.bound, _imports.trace], 2, "getAllUserCount"], [_imports.bound, 2, "getWaterMarkContent"], [_fetchUserListDecs, 2, "fetchUserList"], [_updateUserNameDecs, 2, "updateUserName"], [_updateUserPropertiesDecs, 2, "updateUserProperties"], [_updateIncrementUserPropertiesDecs, 2, "updateIncrementUserProperties"], [_deleteUserPropertiesDecs, 2, "deleteUserProperties"], [[_imports.bound, _imports.trace], 2, "getUserProperties"], [_getUserPropertiesByUserIdDecs, 2, "getUserPropertiesByUserId"], [_getUserPropertiesByKeyPathDecs, 2, "getUserPropertiesByKeyPath"], [_updateRemoteUserRoleDecs, 2, "updateRemoteUserRole"], [[_imports.bound, _imports.trace], 2, "revokeHost"], [_claimHostDecs, 2, "claimHost"], [_kickOutDecs, 2, "kickOut"], [_kickOutByUserIdsDecs, 2, "kickOutByUserIds"], [_kickOutByUserRolesDecs, 2, "kickOutByUserRoles"], [_mergeAudioStreamDecs, 2, "mergeAudioStream"], [_imports.trace, 2, "release"]], []).e;
+  }
+  //@internal
+  [(_getUserDecs = [_imports.bound, (0, _validateParams.default)(_schema.stringSchema)], _fetchUserListDecs = [_imports.bound, (0, _imports.trace)(['params'])], _updateUserNameDecs = [_imports.bound, (0, _imports.trace)(['userId', 'userName']), (0, _validateParams.default)(_schema.stringSchema, _schema.stringSchema)], _updateUserPropertiesDecs = [_imports.bound, (0, _imports.trace)(['properties', 'cause', 'userId']), (0, _validateParams.default)(_schema.stringKeyUnknownValueSchema, _schema.stringKeyUnknownValueSchema, _schema.stringSchema)], _updateIncrementUserPropertiesDecs = [_imports.bound, (0, _imports.trace)(['increments', 'cause', 'userId']), (0, _validateParams.default)(_schema.stringKeyNumberValueSchema, _schema.stringKeyUnknownValueSchema, _schema.stringSchema)], _deleteUserPropertiesDecs = [_imports.bound, (0, _imports.trace)(['keyPath', 'cause', 'userId']), (0, _validateParams.default)(_schema.stringArraySchema, _schema.stringKeyUnknownValueSchema, _schema.stringSchema)], _getUserPropertiesByUserIdDecs = [_imports.bound, (0, _imports.trace)(['userId']), (0, _validateParams.default)(_schema.stringSchema)], _getUserPropertiesByKeyPathDecs = [_imports.bound, (0, _imports.trace)(['keyPath', 'userId']), (0, _validateParams.default)(_schema.stringSchema, _schema.stringSchema)], _updateRemoteUserRoleDecs = [_imports.bound, (0, _imports.trace)(['userId', 'userRole']), (0, _validateParams.default)(_schema.stringSchema, _schema.fcrUserRoleSchema)], _claimHostDecs = [_imports.bound, (0, _imports.trace)(['hostKey']), (0, _validateParams.default)(_schema.stringSchema)], _kickOutDecs = [_imports.bound, (0, _imports.trace)(['userId', 'type']), (0, _validateParams.default)(_schema.stringSchema, _schema.fcrUserKickedOutTypeSchema)], _kickOutByUserIdsDecs = [(0, _imports.trace)(['userIds', 'type']), (0, _validateParams.default)(_schema.stringArraySchema, _schema.fcrUserKickedOutTypeSchema)], _kickOutByUserRolesDecs = [(0, _imports.trace)(['userRoles', 'type']), (0, _validateParams.default)(_schema.fcrUserRolesSchema, _schema.fcrUserKickedOutTypeSchema)], _mergeAudioStreamDecs = [(0, _imports.trace)(['userId']), (0, _validateParams.default)(_schema.stringSchema)], "logger")] = (_initProto(this), (0, _logger.createLogger)({
+    prefix: 'FcrUserControlImpl'
+  }));
+  //@internal
+  _observable = new _imports.AgoraObservable();
+  //@internal
+
+  //@internal
+
+  //@internal
+  _enableUserCount = true;
+
+  //@internal
+  _sceneObserver = {
+    onRemoteUsersJoined: (roomId, events) => {
+      events.forEach(event => {
+        const userProperties = this._scene.getUserPropertiesByUserId(event.userInfo.userId);
+        this._roomCache.setUserPlatform(event.userInfo.userId, userProperties?.platform);
+        this._roomCache.setUserAvatar(event.userInfo.userId, userProperties?.avatar);
+      });
+      const fcrUserEvents = events.map(e => {
+        return {
+          userInfo: e.userInfo && (0, _user.convertRteUserToFcrUser)(e.userInfo, this._roomCache)
+          // operatorUser: e.operatorUser && convertRteUserToFcrUser(e.operatorUser, this._roomCache),
         };
-        const user = fcrUserUpdatedEvent.modifiedUser;
+      });
+      fcrUserEvents.forEach(event => {
+        const user = event.userInfo;
+        const exists = user.userId in this._roomCache.userMapByUserId;
+        if (exists) {
+          this.logger.warn(`[FcrUserControl] user joined when the user already exists, userId: ${user.userId}`);
+        } else {
+          this._roomCache.setUserMapByUserId(user.userId, user);
+          this._roomCache.addUserToList(user);
+        }
+      });
+      this._observable.notifyObservers('onRemoteUsersJoined', roomId, fcrUserEvents);
+    },
+    onRemoteUsersLeft: (roomId, events) => {
+      const fcrUserEvents = events.map(e => {
+        return {
+          userInfo: e.userInfo && (0, _user.convertRteUserToFcrUser)(e.userInfo, this._roomCache),
+          userProperties: e.userProperties,
+          operatorUser: e.operatorUser && (0, _user.convertRteUserToFcrUser)(e.operatorUser, this._roomCache),
+          reason: e.cause?.cmd === 5 ? _type2.FcrUserLeftReason.kickOut : _type2.FcrUserLeftReason.LeaveRoom
+        };
+      });
+      fcrUserEvents.forEach(event => {
+        const user = event.userInfo;
         const exists = this._roomCache.userMapByUserId.has(user.userId);
         if (!exists) {
-          this.logger.warn("[FcrUserControl] user updated when the user does not exist, userId: ".concat(user.userId));
+          this.logger.warn(`[FcrUserControl] user left when the user does not exist, userId: ${user.userId}`);
         } else {
-          this._roomCache.setUserMapByUserId(user.userId, user);
+          this._roomCache.deleteUserMapByUserId(user.userId);
           const index = this._roomCache.userList.findIndex(u => user.userId === u.userId);
           if (index !== -1) {
             this._roomCache.deleteUserList(index);
-            this._roomCache.insertUserToList(index, user);
           }
         }
-        this._observable.notifyObservers('onUserInfoUpdated', sceneId, fcrUserUpdatedEvent);
-      },
-      onAllUserCountUpdated: (sceneId, count) => {
-        if (!this._enableUserCount) {
-          return;
+      });
+      events.forEach(event => {
+        this._roomCache.deleteUserPlatform(event.userInfo.userId);
+        this._roomCache.deleteUserAvatar(event.userInfo.userId);
+      });
+      this._observable.notifyObservers('onRemoteUsersLeft', roomId, fcrUserEvents);
+    },
+    onUserUpdated: (sceneId, event) => {
+      const fcrUserUpdatedEvent = {
+        modifiedUser: event.modifiedUser && (0, _user.convertRteUserToFcrUser)(event.modifiedUser, this._roomCache),
+        operatorUser: event.operatorUser && (0, _user.convertRteUserToFcrUser)(event.operatorUser, this._roomCache),
+        reason: event.reason
+      };
+      const user = fcrUserUpdatedEvent.modifiedUser;
+      const exists = this._roomCache.userMapByUserId.has(user.userId);
+      if (!exists) {
+        this.logger.warn(`[FcrUserControl] user updated when the user does not exist, userId: ${user.userId}`);
+      } else {
+        this._roomCache.setUserMapByUserId(user.userId, user);
+        const index = this._roomCache.userList.findIndex(u => user.userId === u.userId);
+        if (index !== -1) {
+          this._roomCache.deleteUserList(index);
+          this._roomCache.insertUserToList(index, user);
         }
-        this._observable.notifyObservers('onAllUserCountUpdated', sceneId, count);
-      },
-      onUserPropertiesUpdated: (roomId, event) => {
-        var _event$cause, _event$cause2;
-        if (((_event$cause = event.cause) === null || _event$cause === void 0 ? void 0 : _event$cause.cmd) === 5 && event.modifiedUser.userId === this._localUserId) {
-          const changedProperties = event.changedProperties;
-          const dirtyStateMap = {
-            '0': _type2.FcrUserKickedOutType.Once,
-            '1': _type2.FcrUserKickedOutType.Forever,
-            '2': 2
-          };
-          const key = (0, _imports.get)(changedProperties, 'dirty.state');
-          const type = dirtyStateMap[key];
-          this._observable.notifyObservers('onLocalUserKickedOut', roomId, {
-            type
-          });
-        }
-        if (((_event$cause2 = event.cause) === null || _event$cause2 === void 0 ? void 0 : _event$cause2.cmd) === 8) {
-          const changedProperties = {};
-          for (const key in event.changedProperties) {
-            if (key.startsWith('flexProps')) {
-              changedProperties[key] = event.changedProperties[key];
-            }
-          }
-          if (Object.keys(changedProperties).length > 0) {
-            const structure = (0, _collection.convertToStructure)(changedProperties);
-            this._observable.notifyObservers('onUserPropertiesUpdated', roomId, _objectSpread(_objectSpread({}, event), {}, {
-              changedProperties: structure['flexProps']
-            }));
+      }
+      this._observable.notifyObservers('onUserInfoUpdated', sceneId, fcrUserUpdatedEvent);
+    },
+    onAllUserCountUpdated: (sceneId, count) => {
+      if (!this._enableUserCount) {
+        return;
+      }
+      this._observable.notifyObservers('onAllUserCountUpdated', sceneId, count);
+    },
+    onUserPropertiesUpdated: (roomId, event) => {
+      if (event.cause?.cmd === 5 && event.modifiedUser.userId === this._localUserId) {
+        const {
+          changedProperties
+        } = event;
+        const dirtyStateMap = {
+          '0': _type2.FcrUserKickedOutType.Once,
+          '1': _type2.FcrUserKickedOutType.Forever,
+          '2': 2
+        };
+        const key = (0, _imports.get)(changedProperties, 'dirty.state');
+        const type = dirtyStateMap[key];
+        this._observable.notifyObservers('onLocalUserKickedOut', roomId, {
+          type
+        });
+      }
+      if (event.cause?.cmd === 8) {
+        const changedProperties = {};
+        for (const key in event.changedProperties) {
+          if (key.startsWith('flexProps')) {
+            changedProperties[key] = event.changedProperties[key];
           }
         }
-      },
-      onUserPropertiesDeleted: (roomId, event) => {
-        var _event$cause3;
-        if (((_event$cause3 = event.cause) === null || _event$cause3 === void 0 ? void 0 : _event$cause3.cmd) === 8) {
-          const changedKeyPaths = [];
-          for (const keyPath of event.changedKeyPaths) {
-            if (keyPath.startsWith('flexProps')) {
-              changedKeyPaths.push(keyPath);
-            }
-          }
-          if (changedKeyPaths.length > 0) {
-            this._observable.notifyObservers('onUserPropertiesDeleted', roomId, _objectSpread(_objectSpread({}, event), {}, {
-              changedKeyPaths
-            }));
+        if (Object.keys(changedProperties).length > 0) {
+          const structure = (0, _collection.convertToStructure)(changedProperties);
+          this._observable.notifyObservers('onUserPropertiesUpdated', roomId, {
+            ...event,
+            changedProperties: structure['flexProps']
+          });
+        }
+      }
+    },
+    onUserPropertiesDeleted: (roomId, event) => {
+      if (event.cause?.cmd === 8) {
+        const changedKeyPaths = [];
+        for (const keyPath of event.changedKeyPaths) {
+          if (keyPath.startsWith('flexProps')) {
+            changedKeyPaths.push(keyPath);
           }
         }
-      },
-      onRemoteUsersSynced: (roomId, events) => {
-        this._observable.notifyObservers('onRemoteUsersSynced', roomId, events);
-      },
-      onRemoteUsersDesynced: (roomId, events) => {
-        this._observable.notifyObservers('onRemoteUsersDesynced', roomId, events);
-      },
-      onUserCountUpdatedByRole: (roomId, userRole, count) => {
-        if (!this._enableUserCount) {
-          return;
+        if (changedKeyPaths.length > 0) {
+          this._observable.notifyObservers('onUserPropertiesDeleted', roomId, {
+            ...event,
+            changedKeyPaths
+          });
         }
-        this._observable.notifyObservers('onUserCountUpdatedByRole', roomId, userRole, count);
       }
-    });
+    },
+    onRemoteUsersSynced: (roomId, events) => {
+      this._observable.notifyObservers('onRemoteUsersSynced', roomId, events);
+    },
+    onRemoteUsersDesynced: (roomId, events) => {
+      this._observable.notifyObservers('onRemoteUsersDesynced', roomId, events);
+    },
+    onUserCountUpdatedByRole: (roomId, userRole, count) => {
+      if (!this._enableUserCount) {
+        return;
+      }
+      this._observable.notifyObservers('onUserCountUpdatedByRole', roomId, userRole, count);
+    }
+  };
+  constructor(_scene, _api, _sharedCache) {
     this._scene = _scene;
     this._api = _api;
     this._sharedCache = _sharedCache;
@@ -212,8 +210,8 @@ class FcrUserControlImpl {
     const users = this._scene.getUsers();
     Object.keys(users).forEach(userId => {
       const userProperties = this._scene.getUserPropertiesByUserId(userId);
-      this._roomCache.setUserAvatar(userId, userProperties === null || userProperties === void 0 ? void 0 : userProperties.avatar);
-      this._roomCache.setUserPlatform(userId, userProperties === null || userProperties === void 0 ? void 0 : userProperties.platform);
+      this._roomCache.setUserAvatar(userId, userProperties?.avatar);
+      this._roomCache.setUserPlatform(userId, userProperties?.platform);
     });
     Object.keys(users).forEach(userId => {
       this._roomCache.setUserMapByUserId(userId, (0, _user.convertRteUserToFcrUser)(users[userId], this._roomCache));
@@ -241,7 +239,7 @@ class FcrUserControlImpl {
   }
   getUserListByRole(role) {
     const userList = this._scene.getUserListByRole(_type.FcrUserRoleToStringMap[role]);
-    return userList === null || userList === void 0 ? void 0 : userList.map(user => (0, _user.convertRteUserToFcrUser)(user, this._roomCache));
+    return userList?.map(user => (0, _user.convertRteUserToFcrUser)(user, this._roomCache));
   }
   getUserCountByRole(role) {
     if (!this._enableUserCount) {
@@ -259,8 +257,9 @@ class FcrUserControlImpl {
     return this._scene.getUserCount();
   }
   getWaterMarkContent() {
-    const _this$getLocalUser = this.getLocalUser(),
-      userId = _this$getLocalUser.userId;
+    const {
+      userId
+    } = this.getLocalUser();
     return (0, _imports.get)(this._scene.getUserPropertiesByUserId(userId), 'security.watermark.content');
   }
   async fetchUserList(params) {
@@ -301,14 +300,12 @@ class FcrUserControlImpl {
     const userProperties = this._scene.getUserProperties();
     const res = {};
     for (const userId in userProperties) {
-      var _userProperties$userI;
-      res[userId] = (_userProperties$userI = userProperties[userId]) === null || _userProperties$userI === void 0 ? void 0 : _userProperties$userI['flexProps'];
+      res[userId] = userProperties[userId]?.['flexProps'];
     }
     return res;
   }
   getUserPropertiesByUserId(userId) {
-    var _this$_scene$getUserP;
-    return (_this$_scene$getUserP = this._scene.getUserPropertiesByUserId(userId)) === null || _this$_scene$getUserP === void 0 ? void 0 : _this$_scene$getUserP['flexProps'];
+    return this._scene.getUserPropertiesByUserId(userId)?.['flexProps'];
   }
   getUserPropertiesByKeyPath(keyPath, userId) {
     return this._scene.getUserPropertiesByKeyPath('flexProps.' + keyPath, userId);
@@ -332,8 +329,9 @@ class FcrUserControlImpl {
     }
   }
   async claimHost(hostKey) {
-    const _this$getLocalUser2 = this.getLocalUser(),
-      userId = _this$getLocalUser2.userId;
+    const {
+      userId
+    } = this.getLocalUser();
     return await (0, _error.handleRequestError)(() => this._api.claimHost({
       roomId: this._scene.sceneId,
       hostKey,
@@ -374,9 +372,4 @@ class FcrUserControlImpl {
     this.addObserver((0, _logger.generateLogObserver)(this.logger, [['onRemoteUsersJoined', ['roomId', 'events']], ['onRemoteUsersLeft', ['roomId', 'events']], ['onUserInfoUpdated', ['roomId', 'event']], ['onAllUserCountUpdated', ['roomId', 'count']], ['onLocalUserKickedOut', ['roomId', 'event']], ['onUserPropertiesUpdated', ['roomId', 'event']], ['onUserPropertiesDeleted', ['roomId', 'event']]]));
   }
 }
-exports.FcrUserControlImpl = FcrUserControlImpl;
-_FcrUserControlImpl = FcrUserControlImpl;
-var _applyDecs$e = _applyDecs(_FcrUserControlImpl, [[_imports.bound, 2, "getLocalUser"], [_imports.bound, 2, "getUsers"], [_imports.bound, 2, "getUserList"], [_imports.bound, 2, "getUserListByRole"], [_imports.bound, 2, "getUserCountByRole"], [_getUserDecs, 2, "getUser"], [[_imports.bound, _imports.trace], 2, "getAllUserCount"], [_imports.bound, 2, "getWaterMarkContent"], [_fetchUserListDecs, 2, "fetchUserList"], [_updateUserNameDecs, 2, "updateUserName"], [_updateUserPropertiesDecs, 2, "updateUserProperties"], [_updateIncrementUserPropertiesDecs, 2, "updateIncrementUserProperties"], [_deleteUserPropertiesDecs, 2, "deleteUserProperties"], [[_imports.bound, _imports.trace], 2, "getUserProperties"], [_getUserPropertiesByUserIdDecs, 2, "getUserPropertiesByUserId"], [_getUserPropertiesByKeyPathDecs, 2, "getUserPropertiesByKeyPath"], [_updateRemoteUserRoleDecs, 2, "updateRemoteUserRole"], [[_imports.bound, _imports.trace], 2, "revokeHost"], [_claimHostDecs, 2, "claimHost"], [_kickOutDecs, 2, "kickOut"], [_kickOutByUserIdsDecs, 2, "kickOutByUserIds"], [_kickOutByUserRolesDecs, 2, "kickOutByUserRoles"], [_mergeAudioStreamDecs, 2, "mergeAudioStream"], [_imports.trace, 2, "release"]], []).e;
-var _applyDecs$e2 = (0, _slicedToArray2.default)(_applyDecs$e, 1);
-_initProto = _applyDecs$e2[0];
-_applyDecs$e;
+exports.FcrUserControlImpl = FcrUserControlImpl;

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

@@ -1,7 +1,5 @@
 "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.map.delete-all.js");
@@ -19,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
@@ -27,8 +24,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.FcrWaitingRoomControlImpl = 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 _ = require("..");
 var _imports = require("../../imports");
 var _schema = require("../../schema");
@@ -37,8 +32,7 @@ var _error = require("../../utilities/error");
 var _logger = require("../../utilities/logger");
 var _validateParams = _interopRequireDefault(require("../../utilities/validate-params"));
 var _type2 = require("../type");
-var _FcrWaitingRoomControlImpl;
-let _initProto, _moveToMainRoomByUserIdsDecs, _moveToMainRoomByUserRolesDecs, _ref;
+let _initProto, _moveToMainRoomByUserIdsDecs, _moveToMainRoomByUserRolesDecs;
 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); }
@@ -47,14 +41,16 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 /**
  * @internal
  */
-_ref = (_moveToMainRoomByUserIdsDecs = [(0, _imports.trace)(['userIds']), (0, _validateParams.default)(_schema.stringArraySchema)], _moveToMainRoomByUserRolesDecs = [(0, _imports.trace)(['userRoles']), (0, _validateParams.default)(_schema.fcrUserRolesSchema)], "logger");
 class FcrWaitingRoomControlImpl extends _.FcrBaseRoomControlImpl {
+  static {
+    [_initProto] = _applyDecs(this, [[_moveToMainRoomByUserIdsDecs, 2, "moveToMainRoomByUserIds"], [_moveToMainRoomByUserRolesDecs, 2, "moveToMainRoomByUserRoles"]], [], 0, void 0, _.FcrBaseRoomControlImpl).e;
+  }
+  //@internal
+  [(_moveToMainRoomByUserIdsDecs = [(0, _imports.trace)(['userIds']), (0, _validateParams.default)(_schema.stringArraySchema)], _moveToMainRoomByUserRolesDecs = [(0, _imports.trace)(['userRoles']), (0, _validateParams.default)(_schema.fcrUserRolesSchema)], "logger")] = (_initProto(this), (0, _logger.createLogger)({
+    prefix: 'FcrWaitingRoomControlImpl'
+  }));
   constructor(engine, scene, api, config, sharedCache, chatConnection, chatRoomControl) {
     super(engine, scene, api, config, _type2.FcrRoomType.Waitingroom, chatConnection, sharedCache, chatRoomControl);
-    //@internal
-    (0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrWaitingRoomControlImpl'
-    })));
     this._addLogObserver();
   }
   addObserver(observer) {
@@ -76,9 +72,4 @@ class FcrWaitingRoomControlImpl extends _.FcrBaseRoomControlImpl {
     ['onRoomMessageReceived', ['roomId', 'message']], ['onRoomPropertiesDeleted', ['roomId', 'event']], ['onRoomPropertiesUpdated', ['roomId', 'event']], ['onRoomStateUpdated', ['roomId', 'state']]]));
   }
 }
-exports.FcrWaitingRoomControlImpl = FcrWaitingRoomControlImpl;
-_FcrWaitingRoomControlImpl = FcrWaitingRoomControlImpl;
-var _applyDecs$e = _applyDecs(_FcrWaitingRoomControlImpl, [[_moveToMainRoomByUserIdsDecs, 2, "moveToMainRoomByUserIds"], [_moveToMainRoomByUserRolesDecs, 2, "moveToMainRoomByUserRoles"]], [], 0, void 0, _.FcrBaseRoomControlImpl).e;
-var _applyDecs$e2 = (0, _slicedToArray2.default)(_applyDecs$e, 1);
-_initProto = _applyDecs$e2[0];
-_applyDecs$e;
+exports.FcrWaitingRoomControlImpl = FcrWaitingRoomControlImpl;

package/lib/room-control/whiteboard-control/utils.js

@@ -9,15 +9,13 @@ require("core-js/modules/esnext.iterator.some.js");
 var _type = require("../privilege-control/type");
 const hasBoardWritePermission = permissions => {
   return permissions.some(permission => {
-    var _permission$info;
-    return ((_permission$info = permission.info) === null || _permission$info === void 0 ? void 0 : _permission$info.action) === _type.FcrPermissionAction.BoardWrite;
+    return permission.info?.action === _type.FcrPermissionAction.BoardWrite;
   });
 };
 exports.hasBoardWritePermission = hasBoardWritePermission;
 const hasAnnotationWritePermission = permissions => {
   return permissions.some(permission => {
-    var _permission$info2;
-    return ((_permission$info2 = permission.info) === null || _permission$info2 === void 0 ? void 0 : _permission$info2.action) === _type.FcrPermissionAction.AnnotationWrite;
+    return permission.info?.action === _type.FcrPermissionAction.AnnotationWrite;
   });
 };
 exports.hasAnnotationWritePermission = hasAnnotationWritePermission;

package/lib/room-control/whiteboard-control-v1/board-subwindow.js

@@ -16,8 +16,7 @@ class FcrBoardSubWindowImpl {
     return new Promise((resolve, reject) => {
       window.addEventListener('message', event => {
         if (event.data.type === '@netless/_result_save_pdf_') {
-          var _event$data$result;
-          event.data.progress === 100 && resolve((_event$data$result = event.data.result) === null || _event$data$result === void 0 ? void 0 : _event$data$result.pdf);
+          event.data.progress === 100 && resolve(event.data.result?.pdf);
         }
       });
     });