fcr-core 3.7.9-alpha → 3.8.0-alpha

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

@@ -1,5 +1,7 @@
 "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.map.delete-all.js");
 require("core-js/modules/esnext.map.emplace.js");
@@ -25,13 +27,16 @@ require("core-js/modules/es.array.push.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/esnext.iterator.reduce.js");
+require("core-js/modules/web.dom-collections.iterator.js");
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _type = require("./type");
 var _imports = require("../../imports");
 var _logger = require("../../utilities/logger");
 var _error = require("../../utilities/error");
 var _validateParams = _interopRequireDefault(require("../../utilities/validate-params"));
 var _schema = require("../../schema");
-let _initProto, _startSessionByPhoneDecs, _startSessionByIPDecs, _stopSessionDecs;
+var _FcrRoomConnectorControlImpl;
+let _initProto, _startSessionByPhoneDecs, _startSessionByIPDecs, _stopSessionDecs, _ref;
 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); }
@@ -40,16 +45,14 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 /**
  * @internal
  */
+_ref = (_startSessionByPhoneDecs = [_imports.trace, (0, _validateParams.default)(_schema.fcrPhoneConnectorSessionParamsSchema)], _startSessionByIPDecs = [_imports.trace, (0, _validateParams.default)(_schema.fcrIPConnectorSessionParamsSchema)], _stopSessionDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], "logger");
 class FcrRoomConnectorControlImpl {
-  static {
-    [_initProto] = _applyDecs(this, [[_imports.trace, 2, "getRoomConnectorPhoneInfo"], [_imports.trace, 2, "getRoomConnectorIpInfo"], [_startSessionByPhoneDecs, 2, "startSessionByPhone"], [_startSessionByIPDecs, 2, "startSessionByIP"], [_stopSessionDecs, 2, "stopSession"]], []).e;
-  }
-  //@internal
-  [(_startSessionByPhoneDecs = [_imports.trace, (0, _validateParams.default)(_schema.fcrPhoneConnectorSessionParamsSchema)], _startSessionByIPDecs = [_imports.trace, (0, _validateParams.default)(_schema.fcrIPConnectorSessionParamsSchema)], _stopSessionDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], "logger")] = (_initProto(this), (0, _logger.createLogger)({
-    prefix: 'FcrRoomConnectorControlImpl'
-  }));
-  _observable = new _imports.AgoraObservable();
   constructor(_scene, _engine, _api) {
+    //@internal
+    (0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
+      prefix: 'FcrRoomConnectorControlImpl'
+    })));
+    (0, _defineProperty2.default)(this, "_observable", new _imports.AgoraObservable());
     this._scene = _scene;
     this._engine = _engine;
     this._api = _api;
@@ -59,16 +62,18 @@ class FcrRoomConnectorControlImpl {
     });
   }
   getRoomConnectorPhoneInfo() {
+    var _ref2;
     const mid = this._scene.getScenePropertiesByKeyPath('call.mid');
-    const callIn = this._scene.getScenePropertiesByKeyPath('call.callIn') ?? [];
+    const callIn = (_ref2 = this._scene.getScenePropertiesByKeyPath('call.callIn')) !== null && _ref2 !== void 0 ? _ref2 : [];
     const uid = this._scene.getUserPropertiesByKeyPath('call.uid', this._scene.getLocalUser().getLocalUserId());
     const regionMap = {
       cn: _type.FcrRoomConnectorPhoneRegion.CN
     };
-    return Promise.resolve(callIn.map(({
-      callNumbers,
-      region
-    }) => {
+    return Promise.resolve(callIn.map(_ref3 => {
+      let {
+        callNumbers,
+        region
+      } = _ref3;
       return {
         region: regionMap[region],
         phoneNumberList: callNumbers,
@@ -78,12 +83,14 @@ class FcrRoomConnectorControlImpl {
     }));
   }
   getRoomConnectorIpInfo() {
+    var _ref4;
     const mid = this._scene.getScenePropertiesByKeyPath('call.mid');
-    const callIn = this._scene.getScenePropertiesByKeyPath('call.callIn') ?? [];
+    const callIn = (_ref4 = this._scene.getScenePropertiesByKeyPath('call.callIn')) !== null && _ref4 !== void 0 ? _ref4 : [];
     return Promise.resolve({
-      addressList: callIn.reduce((prev, {
-        ipAddresses
-      }) => {
+      addressList: callIn.reduce((prev, _ref5) => {
+        let {
+          ipAddresses
+        } = _ref5;
         if (Array.isArray(ipAddresses)) {
           prev.push(...ipAddresses);
         }
@@ -183,4 +190,6 @@ class FcrRoomConnectorControlImpl {
     this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onIPConnectorSessionStateUpdated', 'onPhoneConnectorSessionStateUpdated']));
   }
 }
-exports.FcrRoomConnectorControlImpl = FcrRoomConnectorControlImpl;
+exports.FcrRoomConnectorControlImpl = FcrRoomConnectorControlImpl;
+_FcrRoomConnectorControlImpl = FcrRoomConnectorControlImpl;
+[_initProto] = _applyDecs(_FcrRoomConnectorControlImpl, [[_imports.trace, 2, "getRoomConnectorPhoneInfo"], [_imports.trace, 2, "getRoomConnectorIpInfo"], [_startSessionByPhoneDecs, 2, "startSessionByPhone"], [_startSessionByIPDecs, 2, "startSessionByIP"], [_stopSessionDecs, 2, "stopSession"]], []).e;

package/lib/room-control/room-control-factory.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RoomControlFactory = void 0;
+require("core-js/modules/es.error.cause.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _type = require("./type");
@@ -53,11 +54,11 @@ class RoomControlFactory {
     const roomType = roomResponse.room.roomProperties.roomType;
     const RoomControlImpl = ROOM_CONTROL_IMPLEMENTATIONS[roomType];
     if (!RoomControlImpl) {
-      throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM, _error.FcrErrorCode.UNDEFINED_ERROR, `Unsupported room types: ${roomType}`, new Error(`Unsupported room type: ${roomType}`));
+      throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM, _error.FcrErrorCode.UNDEFINED_ERROR, "Unsupported room types: ".concat(roomType), new Error("Unsupported room type: ".concat(roomType)));
     }
 
     // 创建聊天室控制
-    const chatRoomControl = new _chatroom.FcrChatRoomControlImpl(scene, chatConnection, sharedCache);
+    const chatRoomControl = new _chatroom.FcrChatRoomControlImpl(scene, chatConnection, sharedCache, false);
 
     // 创建房间控制实例
     return new RoomControlImpl(engine, scene, apiService, config, sharedCache, chatConnection, chatRoomControl);

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

@@ -1,13 +1,20 @@
 "use strict";
 
+require("core-js/modules/es.symbol.description.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.symbol.metadata.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrRoomSessionControlImpl = void 0;
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.json.stringify.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.map.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,12 +29,19 @@ require("core-js/modules/esnext.map.merge.js");
 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/web.dom-collections.iterator.js");
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _imports = require("../../imports");
+var _type = require("../../type");
 var _error = require("../../utilities/error");
 var _logger = require("../../utilities/logger");
 var _validateParams = _interopRequireDefault(require("../../utilities/validate-params"));
 var _schema = require("../../schema");
-let _initProto, _startRoomSessionDecs, _stopRoomSessionDecs, _acceptRoomSessionDecs, _rejectRoomSessionDecs;
+var _helpers = require("../helpers");
+var _FcrRoomSessionControlImpl;
+let _initProto, _startRoomSessionDecs, _stopRoomSessionDecs, _acceptRoomSessionDecs, _rejectRoomSessionDecs, _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; }
 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); }
@@ -36,25 +50,21 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 /**
  * @internal
  */
+_ref = (_startRoomSessionDecs = [_imports.trace, (0, _validateParams.default)(_schema.fcrRoomSessionParamsSchema, _schema.fcrPrivilegeUserRoleArraySchema.optional())], _stopRoomSessionDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _acceptRoomSessionDecs = [_imports.trace, (0, _validateParams.default)(_schema.fcrSessionBaseSchema, _schema.stringKeyUnknownValueSchema.optional())], _rejectRoomSessionDecs = [_imports.trace, (0, _validateParams.default)(_schema.fcrSessionBaseSchema, _schema.stringKeyUnknownValueSchema.optional())], "logger");
 class FcrRoomSessionControlImpl {
-  static {
-    [_initProto] = _applyDecs(this, [[_startRoomSessionDecs, 2, "startRoomSession"], [_stopRoomSessionDecs, 2, "stopRoomSession"], [_acceptRoomSessionDecs, 2, "acceptRoomSession"], [_rejectRoomSessionDecs, 2, "rejectRoomSession"]], []).e;
-  }
-  //@internal
-  [(_startRoomSessionDecs = [_imports.trace, (0, _validateParams.default)(_schema.fcrRoomSessionParamsSchema)], _stopRoomSessionDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _acceptRoomSessionDecs = [_imports.trace, (0, _validateParams.default)(_schema.fcrSessionBaseSchema, _schema.stringKeyUnknownValueSchema.optional())], _rejectRoomSessionDecs = [_imports.trace, (0, _validateParams.default)(_schema.fcrSessionBaseSchema, _schema.stringKeyUnknownValueSchema.optional())], "logger")] = (_initProto(this), (0, _logger.createLogger)({
-    prefix: 'FcrRoomSessionControlImpl'
-  }));
-  //@internal
-  _observable = new _imports.AgoraObservable();
-  //@internal
-  _taskInterval = _imports.Duration.second(1);
-  //@internal
-
-  //@internal
-  _scheduleMap = new Map();
-  //@internal
-  _receivedMap = new Map();
   constructor(_roomControl, _api, _userId) {
+    //@internal
+    (0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
+      prefix: 'FcrRoomSessionControlImpl'
+    })));
+    //@internal
+    (0, _defineProperty2.default)(this, "_observable", new _imports.AgoraObservable());
+    //@internal
+    (0, _defineProperty2.default)(this, "_taskInterval", _imports.Duration.second(1));
+    //@internal
+    (0, _defineProperty2.default)(this, "_scheduleMap", new Map());
+    //@internal
+    (0, _defineProperty2.default)(this, "_receivedMap", new Map());
     this._roomControl = _roomControl;
     this._api = _api;
     this._userId = _userId;
@@ -65,14 +75,15 @@ class FcrRoomSessionControlImpl {
     });
     this._task = _imports.AgoraScheduler.shared.addPollingTask(this._executeTask, this._taskInterval, true, () => _imports.ActionWhenTaskFail.CONTINUE);
   }
-  async startRoomSession(params) {
+  async startRoomSession(params, targetRoles) {
     try {
       const session = {
-        sessionId: (0, _imports.md5)(`${Date.now()}`),
+        sessionId: (0, _imports.md5)("".concat(this._userId).concat(Date.now())),
         sessionKey: params.sessionKey,
         payload: params.payload,
         duration: params.duration,
-        sender: this._userId
+        sender: this._userId,
+        targetRoles: targetRoles ? targetRoles.map(role => _type.FcrPrivilegeUserRoleToStringMap[role]) : undefined
       };
       const {
         data: {
@@ -84,15 +95,16 @@ class FcrRoomSessionControlImpl {
         sessionKey: session.sessionKey,
         duration: session.duration,
         payload: session.payload,
-        targetId: this._roomControl.getRoomInfo().roomId
+        targetId: this._roomControl.getRoomInfo().roomId,
+        targetRoles: session.targetRoles
       });
       const nextTs = Date.now() + interval;
-      this._scheduleMap.set(session.sessionId, {
-        ...params,
+      this._scheduleMap.set(session.sessionId, _objectSpread(_objectSpread({}, params), {}, {
+        targetRoles: session.targetRoles,
         nextTs,
         startTs: Date.now()
-      });
-      this.logger.info(`[RoomSession] put into session schedule: ${session.sessionId}, next ts: ${nextTs}, remain: ${nextTs - Date.now()}ms`);
+      }));
+      this.logger.info("[RoomSession] put into session schedule: ".concat(session.sessionId, ", next ts: ").concat(nextTs, ", remain: ").concat(nextTs - Date.now(), "ms"));
       return session.sessionId;
     } catch (e) {
       throw (0, _error.generateFcrCoreServerError)(_error.FcrErrorCode.LOCAL_HTTP_REQUEST_FAILED, 'start room session failed', e);
@@ -111,6 +123,7 @@ class FcrRoomSessionControlImpl {
         sessionId: session.sessionId,
         sessionKey: session.sessionKey,
         receiverIds: [session.senderId],
+        target: 2,
         action: 1,
         payload: {
           cause
@@ -130,6 +143,7 @@ class FcrRoomSessionControlImpl {
         sessionId: session.sessionId,
         sessionKey: session.sessionKey,
         receiverIds: [session.senderId],
+        target: 2,
         action: 2,
         payload: {
           cause
@@ -158,16 +172,17 @@ class FcrRoomSessionControlImpl {
         duration: params.duration,
         senderId: this._userId,
         timestamp: params.startTs,
+        targetRoles: params.targetRoles,
         interval: 0
       };
       if (this._isSessionExpired(session)) {
-        this.logger.info(`[RoomSession] room session expired, removed: ${session.sessionId}`);
+        this.logger.info("[RoomSession] room session expired, removed: ".concat(session.sessionId));
         this._scheduleMap.delete(session.sessionId);
         continue;
       }
       // check timeout
       if (params.nextTs < Date.now()) {
-        this.logger.info(`[RoomSession] ping session: ${session.sessionId}`);
+        this.logger.info("[RoomSession] ping session: ".concat(session.sessionId));
         try {
           const {
             data: {
@@ -179,18 +194,18 @@ class FcrRoomSessionControlImpl {
             sessionKey: session.sessionKey,
             duration: params.duration,
             payload: session.payload,
+            targetRoles: session.targetRoles,
             targetId: this._roomControl.getRoomInfo().roomId
           });
           const nextTs = Date.now() + interval;
           if (this._scheduleMap.has(session.sessionId)) {
-            this._scheduleMap.set(session.sessionId, {
-              ...params,
+            this._scheduleMap.set(session.sessionId, _objectSpread(_objectSpread({}, params), {}, {
               nextTs
-            });
-            this.logger.info(`[RoomSession] refresh session schedule: ${session.sessionId}, next ts: ${nextTs}`);
+            }));
+            this.logger.info("[RoomSession] refresh session schedule: ".concat(session.sessionId, ", next ts: ").concat(nextTs));
           }
         } catch (e) {
-          this.logger.error(`[RoomSession] ping session failed: ${e}`);
+          this.logger.error("[RoomSession] ping session failed: ".concat(e));
         }
       }
     }
@@ -199,7 +214,7 @@ class FcrRoomSessionControlImpl {
       const session = this._receivedMap.get(key);
       if (this._isSessionExpired(session)) {
         this._receivedMap.delete(key);
-        this.logger.info(`[RoomSession] delete session callback: ${key}`);
+        this.logger.info("[RoomSession] delete session callback: ".concat(key));
       }
     }
   }
@@ -208,13 +223,11 @@ class FcrRoomSessionControlImpl {
   async _handleRoomMessage(roomId, message) {
     const {
       senderId,
-      payload
-    } = message;
-    const {
-      data,
+      payload,
       cmd
-    } = payload;
-    if (cmd === '1001') {
+    } = message;
+    const data = payload;
+    if (cmd === _helpers.ROOM_MESSAGE_COMMANDS.ROOM_SESSION_REQUEST) {
       const session = {
         sessionId: data.sessionUuid,
         sessionKey: data.sessionKey,
@@ -230,14 +243,17 @@ class FcrRoomSessionControlImpl {
       }
       if (!this._isSessionExpired(session)) {
         if (!this._receivedMap.has(session.sessionId)) {
-          this.logger.info(`[RoomSession] received room session request ${JSON.stringify(session)}`);
+          this.logger.info("[RoomSession] received room session request ".concat(JSON.stringify(session)));
           this._observable.notifyObservers('onRoomSessionReceived', roomId, session);
         }
         this._receivedMap.set(session.sessionId, session);
       }
-    } else if (cmd === '1002') {
+    } else if (cmd === _helpers.ROOM_MESSAGE_COMMANDS.ROOM_SESSION_ACCEPT) {
+      // TODO: BUG FIXSME: onRoomSessionAccepted 和 onRoomSessionRejected 两个事件, apaas private doc 描述的是监听 AgoraRteEngine.onSceneMessageReceived
+      // 但是点对点消息实际上触发的是 AgoraRteEngine.onPeerMessageReceived 事件. 所以这里并不会收到 cmd === ROOM_SESSION_ACCEPT 和 ROOM_SESSION_REJECT 的消息.
       if (data.action === 1) {
         if (this._scheduleMap.has(data.sessionUuid)) {
+          var _session$payload, _ref2, _data$payload;
           const session = this._scheduleMap.get(data.sessionUuid);
           const sessionResponse = {
             sessionId: data.sessionUuid,
@@ -245,15 +261,16 @@ class FcrRoomSessionControlImpl {
             responderId: senderId,
             // FIXME: session may be lost when the client refreshes
             // get payload from original session
-            payload: session.payload ?? {},
-            cause: data.payload?.cause ?? {}
+            payload: (_session$payload = session.payload) !== null && _session$payload !== void 0 ? _session$payload : {},
+            cause: (_ref2 = (_data$payload = data.payload) === null || _data$payload === void 0 ? void 0 : _data$payload.cause) !== null && _ref2 !== void 0 ? _ref2 : {}
           };
-          this.logger.info(`[RoomSession] received room session accepted ${JSON.stringify(sessionResponse)}`);
+          this.logger.info("[RoomSession] received room session accepted ".concat(JSON.stringify(sessionResponse)));
           this._scheduleMap.delete(data.sessionUuid);
           this._observable.notifyObservers('onRoomSessionAccepted', roomId, sessionResponse);
         }
       } else if (data.action === 2) {
         if (this._scheduleMap.has(data.sessionUuid)) {
+          var _session$payload2, _ref3, _data$payload2;
           const session = this._scheduleMap.get(data.sessionUuid);
           const sessionResponse = {
             sessionId: data.sessionUuid,
@@ -261,10 +278,10 @@ class FcrRoomSessionControlImpl {
             responderId: senderId,
             // FIXME: session may be lost when the client refreshes
             // get payload from original session
-            payload: session.payload ?? {},
-            cause: data.payload?.cause ?? {}
+            payload: (_session$payload2 = session.payload) !== null && _session$payload2 !== void 0 ? _session$payload2 : {},
+            cause: (_ref3 = (_data$payload2 = data.payload) === null || _data$payload2 === void 0 ? void 0 : _data$payload2.cause) !== null && _ref3 !== void 0 ? _ref3 : {}
           };
-          this.logger.info(`[RoomSession] received room session rejected ${JSON.stringify(sessionResponse)}`);
+          this.logger.info("[RoomSession] received room session rejected ".concat(JSON.stringify(sessionResponse)));
           if (this._scheduleMap.has(data.sessionUuid)) {
             this._scheduleMap.delete(data.sessionUuid);
             this._observable.notifyObservers('onRoomSessionRejected', roomId, sessionResponse);
@@ -282,4 +299,6 @@ class FcrRoomSessionControlImpl {
     this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onRoomSessionAccepted', 'onRoomSessionRejected', 'onRoomSessionReceived']));
   }
 }
-exports.FcrRoomSessionControlImpl = FcrRoomSessionControlImpl;
+exports.FcrRoomSessionControlImpl = FcrRoomSessionControlImpl;
+_FcrRoomSessionControlImpl = FcrRoomSessionControlImpl;
+[_initProto] = _applyDecs(_FcrRoomSessionControlImpl, [[_startRoomSessionDecs, 2, "startRoomSession"], [_stopRoomSessionDecs, 2, "stopRoomSession"], [_acceptRoomSessionDecs, 2, "acceptRoomSession"], [_rejectRoomSessionDecs, 2, "rejectRoomSession"]], []).e;

package/lib/room-control/room-session/type.d.ts

@@ -1,11 +1,11 @@
-import { FcrSessionResponse } from '../../type';
+import { FcrPrivilegeUserRole, FcrSessionResponse } from '../../type';
 import { FcrRoomSessionParamsSchema, FcrSessionBaseSchema } from '../../schema';
 export interface FcrRoomSessionControl {
     /**
      * Starts a room session.
      * @param params
      */
-    startRoomSession(params: FcrRoomSessionParams): Promise<string>;
+    startRoomSession(params: FcrRoomSessionParams, targetRoles?: FcrPrivilegeUserRole[]): Promise<string>;
     /**
      * Stops a room session.
      * @param sessionId

package/lib/room-control/shared-cache.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -18,38 +19,44 @@ require("core-js/modules/esnext.map.merge.js");
 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/web.dom-collections.iterator.js");
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 class FcrRoomCache {
-  _platformMapByUserId = new Map();
-  _avatarMapByUserId = new Map();
-  getUserPlatform = userId => {
-    return this._platformMapByUserId.get(userId);
-  };
-  getUserAvatar = userId => {
-    return this._avatarMapByUserId.get(userId);
-  };
-  setUserPlatform = (userId, platform) => {
-    this._platformMapByUserId.set(userId, platform);
-  };
-  setUserAvatar = (userId, avatar) => {
-    this._avatarMapByUserId.set(userId, avatar);
-  };
-  deleteUserPlatform = userId => {
-    this._platformMapByUserId.delete(userId);
-  };
-  deleteUserAvatar = userId => {
-    this._avatarMapByUserId.delete(userId);
-  };
+  constructor() {
+    (0, _defineProperty2.default)(this, "_platformMapByUserId", new Map());
+    (0, _defineProperty2.default)(this, "_avatarMapByUserId", new Map());
+    (0, _defineProperty2.default)(this, "getUserPlatform", userId => {
+      return this._platformMapByUserId.get(userId);
+    });
+    (0, _defineProperty2.default)(this, "getUserAvatar", userId => {
+      return this._avatarMapByUserId.get(userId);
+    });
+    (0, _defineProperty2.default)(this, "setUserPlatform", (userId, platform) => {
+      this._platformMapByUserId.set(userId, platform);
+    });
+    (0, _defineProperty2.default)(this, "setUserAvatar", (userId, avatar) => {
+      this._avatarMapByUserId.set(userId, avatar);
+    });
+    (0, _defineProperty2.default)(this, "deleteUserPlatform", userId => {
+      this._platformMapByUserId.delete(userId);
+    });
+    (0, _defineProperty2.default)(this, "deleteUserAvatar", userId => {
+      this._avatarMapByUserId.delete(userId);
+    });
+  }
 }
 exports.FcrRoomCache = FcrRoomCache;
 class FcrSharedCache {
-  _roomCache = new Map();
-  getRoomCache = roomId => {
-    let roomCache = this._roomCache.get(roomId);
-    if (!roomCache) {
-      roomCache = new FcrRoomCache();
-      this._roomCache.set(roomId, roomCache);
-    }
-    return roomCache;
-  };
+  constructor() {
+    (0, _defineProperty2.default)(this, "_roomCache", new Map());
+    (0, _defineProperty2.default)(this, "getRoomCache", roomId => {
+      let roomCache = this._roomCache.get(roomId);
+      if (!roomCache) {
+        roomCache = new FcrRoomCache();
+        this._roomCache.set(roomId, roomCache);
+      }
+      return roomCache;
+    });
+  }
 }
 exports.FcrSharedCache = FcrSharedCache;

package/lib/room-control/sharing-control/index.d.ts

@@ -3,11 +3,11 @@ import { FcrCoreServiceApi } from '../../service/api';
 import { FcrScreenStreamCreateConfig, FcrSize, FcrStreamControl } from '../stream-control/type';
 import { FcrScreenSharingState, FcrSharingControl, FcrSharingObserver, FcrWhiteboardState } from './type';
 import { FcrPrivilegeControl } from '../privilege-control/type';
-import { FcrPrivilegedWhiteboardControl } from '../whiteboard-control-v2/whiteboard-control/type';
+import { FcrWhiteboardControl } from '../whiteboard-control-v2/whiteboard-control/type';
 import { FcrStreamInfo } from '../../type';
 import { FcrUserControl } from '../..';
 import { FcrSharedCache } from '../shared-cache';
-import { FcrPrivilegedAnnotationControl } from '../whiteboard-control-v2/annotation-control/type';
+import { FcrAnnotationControl } from '../whiteboard-control-v2/annotation-control/type';
 export declare class FcrSharingControlImpl implements FcrSharingControl {
     private _scene;
     private _api;
@@ -16,7 +16,7 @@ export declare class FcrSharingControlImpl implements FcrSharingControl {
     private _streamControl;
     private _sharedCache;
     private _userControl;
-    protected logger: import("agora-foundation/lib/logger").Logger;
+    protected logger: import("agora-foundation/lib/logger/type").Logger;
     private _observable;
     private _annotationControl;
     private _whiteboardControl;
@@ -35,9 +35,9 @@ export declare class FcrSharingControlImpl implements FcrSharingControl {
     stop(): Promise<void>;
     getScreenSharingState(): FcrScreenSharingState;
     getWhiteboardState(): FcrWhiteboardState;
-    getAnnotationControl(): FcrPrivilegedAnnotationControl;
+    getAnnotationControl(): FcrAnnotationControl;
     getSharingWindowSize(): FcrSize | undefined;
-    getBoardControl(): FcrPrivilegedWhiteboardControl;
+    getBoardControl(): FcrWhiteboardControl;
     addObserver(observer: FcrSharingObserver): void;
     removeObserver(observer: FcrSharingObserver): void;
     release(): void;