fcr-core 3.6.3 → 3.7.0

package/lib/chat-connection/index.d.ts

@@ -11,7 +11,6 @@ export declare class FcrChatConnectionImpl implements FcrChatConnection {
     private _initConfig?;
     private _conn?;
     private _connectionState;
-    private _offlineListener;
     constructor(_userId: string, _api: FcrCoreServiceApi, _chatIpList?: string[] | undefined, _restIpList?: string[] | undefined);
     login(): Promise<void>;
     private _addEventListeners;

package/lib/chat-connection/index.js

@@ -1,14 +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.async-iterator.filter.js");
-require("core-js/modules/esnext.async-iterator.for-each.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");
@@ -24,44 +17,34 @@ 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");
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrChatConnectionImpl = void 0;
-require("core-js/modules/es.json.stringify.js");
-require("core-js/modules/es.regexp.exec.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 _config = require("./config");
 var _logger = require("../utilities/logger");
-var _FcrChatConnectionImpl;
+var _packageInfo = require("../utilities/package-info");
 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 FcrChatConnectionImpl {
+  static #_ = (() => [_initProto] = _applyDecs(this, [[_imports.trace, 2, "login"], [_imports.trace, 2, "logout"]], []).e)();
+  logger = (() => (_initProto(this), (0, _logger.createLogger)({
+    prefix: 'FcrChatConnectionImpl'
+  })))();
+  _observable = (() => new _imports.AgoraObservable())();
+  _connectionState = (() => _type.FcrChatConnectionState.DISCONNECTED)();
   constructor(_userId, _api, _chatIpList, _restIpList) {
-    (0, _defineProperty2.default)(this, "logger", (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrChatConnectionImpl'
-    })));
-    (0, _defineProperty2.default)(this, "_observable", new _imports.AgoraObservable());
-    (0, _defineProperty2.default)(this, "_connectionState", _type.FcrChatConnectionState.DISCONNECTED);
-    (0, _defineProperty2.default)(this, "_offlineListener", () => {
-      if (this._connectionState !== _type.FcrChatConnectionState.DISCONNECTED) {
-        this._setConnectionState(_type.FcrChatConnectionState.DISCONNECTED);
-      }
-    });
     this._userId = _userId;
     this._api = _api;
     this._chatIpList = _chatIpList;
     this._restIpList = _restIpList;
+    this.logger.info(`Chat Version: easemob-websdk@${(0, _packageInfo.getDependenciesInfo)('easemob-websdk')}`);
   }
   async login() {
     const privateConfig = this._getPrivateConfig();
@@ -71,19 +54,22 @@ class FcrChatConnectionImpl {
     await (0, _imports.to)((0, _imports.retryAttempt)(async () => {
       const tokenResult = await this._api.getUserToken(this._userId);
       this._initConfig = tokenResult;
-      const connParams = _objectSpread(_objectSpread(_objectSpread({}, _config.agoraChatConfig), privateConfig), {}, {
+      const connParams = {
+        ..._config.agoraChatConfig,
+        ...privateConfig,
         appKey: tokenResult.appKey,
-        autoReconnectNumMax: 99999
-      });
+        autoReconnectNumMax: 99999,
+        isFixedDeviceId: false
+      };
       _imports.EasemobChatSDK.logger.setConsoleLogVisibility(false);
       this._conn = new _imports.EasemobChatSDK.connection(connParams);
+      this._addEventListeners();
       await this._conn.open({
         accessToken: this._initConfig.token,
         user: this._userId
       });
-      this.logger.info("onConnectionLoginSuccess, token: ".concat(this._initConfig.token, ", userId: ").concat(this._userId));
+      this.logger.info(`onConnectionLoginSuccess, token: ${this._initConfig.token}, userId: ${this._userId}`);
       this._observable.notifyObservers('onConnectionLoginSuccess');
-      this._addEventListeners();
     }, [], {
       retriesMax: 3
     }).fail(async _ref => {
@@ -95,34 +81,44 @@ class FcrChatConnectionImpl {
       if (error instanceof _imports.AgoraRestfulClientError) {
         throw error;
       }
-      this.logger.error("retry to login ChatConnection, ".concat(error.message, ",retry ").concat(currentRetry, " times"));
+      this.logger.error(`retry to login ChatConnection, ${error.message},retry ${currentRetry} times`);
       await timeFn();
       return true;
     }).exec());
   }
   _addEventListeners() {
-    var _this$_conn;
-    window.addEventListener('offline', this._offlineListener);
-    (_this$_conn = this._conn) === null || _this$_conn === void 0 || _this$_conn.addEventHandler('connection', {
+    this._conn?.addEventHandler('connectionListener', {
       onError: e => {
         this.logger.error('onError', e.message);
       },
       onConnected: () => {
         this.logger.info('onConnected');
-        this._setConnectionState(_type.FcrChatConnectionState.CONNECTED);
+        if (this._connectionState !== _type.FcrChatConnectionState.CONNECTED) {
+          this._setConnectionState(_type.FcrChatConnectionState.CONNECTED);
+        }
       },
       onDisconnected: () => {
         if (this._connectionState !== _type.FcrChatConnectionState.DISCONNECTED) {
           this.logger.info('onDisconnected');
           this._setConnectionState(_type.FcrChatConnectionState.DISCONNECTED);
         }
+      },
+      onOnline: () => {
+        this.logger.info('onOnline');
+        if (this._connectionState !== _type.FcrChatConnectionState.CONNECTED) {
+          this._setConnectionState(_type.FcrChatConnectionState.CONNECTED);
+        }
+      },
+      onOffline: () => {
+        if (this._connectionState !== _type.FcrChatConnectionState.DISCONNECTED) {
+          this.logger.info('onOffline');
+          this._setConnectionState(_type.FcrChatConnectionState.DISCONNECTED);
+        }
       }
     });
   }
   logout() {
-    var _this$_conn2;
-    window.removeEventListener('offline', this._offlineListener);
-    (_this$_conn2 = this._conn) === null || _this$_conn2 === void 0 || _this$_conn2.close();
+    this._conn?.close();
   }
   _setConnectionState(state) {
     this._connectionState = state;
@@ -141,22 +137,18 @@ class FcrChatConnectionImpl {
     this._observable.removeObserver(observer);
   }
   _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
       };
-      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];
       }
       return privateConfig;
     }
   }
 }
-exports.FcrChatConnectionImpl = FcrChatConnectionImpl;
-_FcrChatConnectionImpl = FcrChatConnectionImpl;
-[_initProto] = _applyDecs(_FcrChatConnectionImpl, [[_imports.trace, 2, "login"], [_imports.trace, 2, "logout"]], []).e;
+exports.FcrChatConnectionImpl = FcrChatConnectionImpl;

package/lib/engine/index.js

@@ -1,13 +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.async-iterator.filter.js");
-require("core-js/modules/esnext.async-iterator.for-each.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");
@@ -29,12 +22,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FcrCoreEngine = void 0;
 require("core-js/modules/es.array.push.js");
-require("core-js/modules/es.json.stringify.js");
-require("core-js/modules/es.regexp.exec.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
-require("core-js/modules/web.dom-collections.iterator.js");
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _imports = require("../imports");
 var _api = require("../service/api");
 var _monitorControl = require("../monitor-control");
@@ -61,30 +50,46 @@ var _schema = require("../schema");
 var _error2 = require("agora-rte-sdk/lib/core/utilities/error");
 var _roomRouter = require("../room-router");
 var _sharedCache = require("../room-control/shared-cache");
-var _FcrCoreEngine;
-let _initProto, _createMainRoomControlDecs, _createWaitingRoomControlDecs, _createRoomRouterDecs, _createRoomControlAndJoinDecs, _sendPeerMessageDecs, _setParametersDecs, _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, _createMainRoomControlDecs, _createWaitingRoomControlDecs, _createRoomRouterDecs, _createRoomControlAndJoinDecs, _sendPeerMessageDecs, _setParametersDecs;
 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; }
-_ref = (_createMainRoomControlDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _createWaitingRoomControlDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _createRoomRouterDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _createRoomControlAndJoinDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema, _schema.fcrRoomJoinOptionsSchema)], _sendPeerMessageDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringKeyUnknownValueSchema, _schema.booleanSchema, _schema.stringSchema)], _setParametersDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringKeyUnknownValueSchema)], "logger");
 class FcrCoreEngine {
+  static #_ = (() => [_initProto] = _applyDecs(this, [[_imports.trace, 2, "release"], [_imports.trace, 2, "login"], [_imports.trace, 2, "logout"], [_imports.trace, 2, "renewUserToken"], [_imports.trace, 2, "getVersion"], [_createMainRoomControlDecs, 2, "createMainRoomControl"], [_createWaitingRoomControlDecs, 2, "createWaitingRoomControl"], [_createRoomRouterDecs, 2, "createRoomRouter"], [_createRoomControlAndJoinDecs, 2, "createRoomControlAndJoin"], [_imports.trace, 2, "getDesktopMediaControl"], [_imports.trace, 2, "getMobileMediaControl"], [_imports.trace, 2, "getMonitorControl"], [_imports.trace, 2, "getPeerSessionControl"], [_sendPeerMessageDecs, 2, "sendPeerMessage"], [_setParametersDecs, 2, "setParameters"]], []).e)();
+  // @internal
+  [(_createMainRoomControlDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _createWaitingRoomControlDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _createRoomRouterDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _createRoomControlAndJoinDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema, _schema.fcrRoomJoinOptionsSchema)], _sendPeerMessageDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringKeyUnknownValueSchema, _schema.booleanSchema, _schema.stringSchema)], _setParametersDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringKeyUnknownValueSchema)], "logger")] = (() => (_initProto(this), (0, _logger.createLogger)({
+    prefix: 'FcrCoreEngine'
+  })))();
+  // @internal
+
+  // @internal
+
+  // @internal
+
+  // @internal
+
+  // @internal
+
+  // @internal
+
+  // @internal
+
+  // @internal
+
+  // @internal
+
+  // @internal
+  _isLoggingIn = false;
+  // @internal
+  _sharedCache = (() => new _sharedCache.FcrSharedCache())();
+  // @internal
+  _lock = (() => new _imports.Mutex())();
+
+  // @internal
+  _observable = (() => new _imports.AgoraObservable())();
   constructor(config) {
-    // @internal
-    (0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrCoreEngine'
-    })));
-    // @internal
-    (0, _defineProperty2.default)(this, "_isLoggingIn", false);
-    // @internal
-    (0, _defineProperty2.default)(this, "_sharedCache", new _sharedCache.FcrSharedCache());
-    // @internal
-    (0, _defineProperty2.default)(this, "_lock", new _imports.Mutex());
-    // @internal
-    (0, _defineProperty2.default)(this, "_observable", new _imports.AgoraObservable());
     this._config = config;
     (0, _domainHolder.resetSharedDomainHolder)();
     const parameters = this._presetParameters(config.parameters);
@@ -217,29 +222,27 @@ class FcrCoreEngine {
     } = this._rteEngine.getConfig();
     let roomControl = null;
     let [error] = await (0, _imports.to)((0, _imports.retryAttempt)(async () => {
-      const res = await (0, _error.handleRequestError)(() => {
-        var _options$createStream;
-        return this._apiService.checkIn({
-          userName: options.userName,
-          userId,
-          userRole: _type.FcrUserRoleToStringMap[options.userRole],
-          userProperties: options.userProperties,
-          roomId,
-          platform: (0, _imports.getPlatform)(),
-          streams: (_options$createStream = options.createStreamConfigs) === null || _options$createStream === void 0 ? void 0 : _options$createStream.map(s => _objectSpread(_objectSpread({
-            videoSourceUuid: s.videoSourceId,
-            audioSourceUuid: s.audioSourceId,
-            streamName: s.streamName
-          }, (0, _helper.convertStreamTypeToPublishState)(s.streamType)), {}, {
-            videoSourceType: s.videoSourceType,
-            audioSourceType: s.audioSourceType,
-            audioSourceState: s.audioSourceState,
-            videoSourceState: s.videoSourceState
-          })),
-          version: (0, _imports.getVersion)(),
-          password: options.password
-        });
-      }, _error.FcrErrorModuleCode.ENGINE);
+      const res = await (0, _error.handleRequestError)(() => this._apiService.checkIn({
+        userName: options.userName,
+        userId,
+        userRole: _type.FcrUserRoleToStringMap[options.userRole],
+        userProperties: options.userProperties,
+        roomId,
+        platform: (0, _imports.getPlatform)(),
+        streams: options.createStreamConfigs?.map(s => ({
+          videoSourceUuid: s.videoSourceId,
+          audioSourceUuid: s.audioSourceId,
+          streamName: s.streamName,
+          ...(0, _helper.convertStreamTypeToPublishState)(s.streamType),
+          videoSourceType: s.videoSourceType,
+          audioSourceType: s.audioSourceType,
+          audioSourceState: s.audioSourceState,
+          videoSourceState: s.videoSourceState
+        })),
+        version: (0, _imports.getVersion)(),
+        password: options.password,
+        avatar: options.avatar
+      }), _error.FcrErrorModuleCode.ENGINE);
       const {
         data,
         ts
@@ -249,28 +252,29 @@ class FcrCoreEngine {
       } else {
         roomControl = this.createMainRoomControl(roomId);
       }
-      await roomControl.join(_objectSpread(_objectSpread({}, options), {}, {
+      await roomControl.join({
+        ...options,
         snapshot: data,
         timestamp: ts,
         createStreamConfigs: data.room.roomProperties.roomType === _type2.FcrRoomType.Waitingroom ? [] : options.createStreamConfigs
-      }));
+      });
     }, [], {
       retriesMax: 10
-    }).fail(async _ref2 => {
+    }).fail(async _ref => {
       let {
         error,
         timeFn,
         currentRetry
-      } = _ref2;
+      } = _ref;
       if ((error instanceof _error2.AgoraRteError || error instanceof _error.FcrError) && _error.RTE_ERROR_CODES_NOT_RETRYABLE_WHEN_JOINING_ROOM.includes(error.code)) {
         throw error;
       }
-      this.logger.error("retry to join room, ".concat(error.message, ", retry ").concat(currentRetry, " times"));
+      this.logger.error(`retry to join room, ${error.message}, retry ${currentRetry} times`);
       await timeFn();
       return true;
     }).exec());
     if (error) {
-      this.logger.error("join room failed, ".concat(error.message, "-").concat(JSON.stringify(error)));
+      this.logger.error(`join room failed, ${error.message}-${JSON.stringify(error)}`);
       throw error;
     }
     return roomControl;
@@ -315,7 +319,7 @@ class FcrCoreEngine {
    * @param receiverId
    */
   async sendPeerMessage(payload, guaranteedDelivery, receiverId) {
-    await this._rteEngine.sendPeerMessage(payload, "".concat(_cmd.CMD_PEER_MESSAGE), guaranteedDelivery, receiverId);
+    await this._rteEngine.sendPeerMessage(payload, `${_cmd.CMD_PEER_MESSAGE}`, guaranteedDelivery, receiverId);
   }
 
   /**
@@ -374,7 +378,7 @@ class FcrCoreEngine {
   _setupCoreIpList(parameters) {
     const coreIpList = (0, _parameters.getCoreIpList)(parameters);
     if (coreIpList) {
-      this.logger.info("setup fixed service domain list: ".concat(JSON.stringify(coreIpList)));
+      this.logger.info(`setup fixed service domain list: ${JSON.stringify(coreIpList)}`);
       (0, _domainHolder.resetSharedDomainHolder)();
       (0, _imports.getSharedDomainHolder)(this._config.region).setFixedDomainList(coreIpList);
       this._restfulClient = new _agoraRteSdk.AgoraRestfulClientImpl(this._rteEngine.getHttpAuthHeadersProvider(), (0, _imports.getSharedDomainHolder)(this._config.region));
@@ -385,8 +389,8 @@ class FcrCoreEngine {
     const chatIpList = (0, _parameters.getEasemobChatIpList)(parameters);
     const restIpList = (0, _parameters.getEasemobRestIpList)(parameters);
     if (chatIpList && restIpList) {
-      this.logger.info("setup chat ip list: ".concat(JSON.stringify(chatIpList), ", rest ip list: ").concat(JSON.stringify(restIpList)));
-      this._chatConnection = this._createChatConnection();
+      this.logger.info(`setup chat ip list: ${JSON.stringify(chatIpList)}, rest ip list: ${JSON.stringify(restIpList)}`);
+      this._chatConnection = this._createChatConnection(parameters);
     }
   }
   _createChatConnection(parameters) {
@@ -412,13 +416,11 @@ class FcrCoreEngine {
     return parametersList;
   }
   _getRtcPresetParameters() {
-    let rtcPresetParameters = ['{\"che.video.videoCodecIndex\": 1}', '{\"rtc.video.new_complexity\": true}', '{\"rtc.video.default_complexity\": 1027}', '{\"rtc.video.enable_doc_screen_share_sr\":true}', '{\"rtc.video.enable_pvc\":false}', '{\"che.video.brightness_detection_enable\":false} ', '{\"che.audio.bitrate_level\":1}', '{\"rtc.video.downMaxRetryTimes\":5}'];
+    let rtcPresetParameters = ['{\"che.video.videoCodecIndex\": 1}', '{\"rtc.video.new_complexity\": true}', '{\"rtc.video.default_complexity\": 1027}', '{\"rtc.video.enable_doc_screen_share_sr\":true}', '{\"rtc.video.enable_pvc\":false}', '{\"che.video.brightness_detection_enable\":false} ', '{\"che.audio.bitrate_level\":1}', '{\"rtc.video.downMaxRetryTimes\":5}', '{\"che.video.vqc_min_width\": 1280}', '{\"che.video.vqc_min_height\": 720}', '{\"che.video.lowest_dev_score_4_seg\":0}'];
     if ((0, _imports.getPlatform)() == _imports.FcrApplicationPlatform.WINDOWS) {
       rtcPresetParameters.push('{\"engine.video.hw_decoder_provider\":\"qsv\"}', '{\"rtc.video.default_hw_decoder_thres\":921600}');
     }
     return rtcPresetParameters;
   }
 }
-exports.FcrCoreEngine = FcrCoreEngine;
-_FcrCoreEngine = FcrCoreEngine;
-[_initProto] = _applyDecs(_FcrCoreEngine, [[_imports.trace, 2, "release"], [_imports.trace, 2, "login"], [_imports.trace, 2, "logout"], [_imports.trace, 2, "renewUserToken"], [_imports.trace, 2, "getVersion"], [_createMainRoomControlDecs, 2, "createMainRoomControl"], [_createWaitingRoomControlDecs, 2, "createWaitingRoomControl"], [_createRoomRouterDecs, 2, "createRoomRouter"], [_createRoomControlAndJoinDecs, 2, "createRoomControlAndJoin"], [_imports.trace, 2, "getDesktopMediaControl"], [_imports.trace, 2, "getMobileMediaControl"], [_imports.trace, 2, "getMonitorControl"], [_imports.trace, 2, "getPeerSessionControl"], [_sendPeerMessageDecs, 2, "sendPeerMessage"], [_setParametersDecs, 2, "setParameters"]], []).e;
+exports.FcrCoreEngine = FcrCoreEngine;

package/lib/imports.d.ts

@@ -11,6 +11,11 @@ export { EasemobChat } from 'easemob-websdk';
 export { WhiteWebSdk, createPlugins } from 'white-web-sdk';
 export * as netlessVideoPlugin from '@netless/video-js-plugin';
 export { WindowManager } from '@netless/window-manager';
+export { RTMProvider_2_2 as FcrRTMProvider_2_2 } from '@netless/forge-rtm';
+export { Room as FcrRoom } from '@netless/forge-room';
+export { WhiteboardApplication as FcrWhiteboardApplication } from '@netless/forge-whiteboard';
+export type { ApplicationInstanceType as FcrApplicationInstanceType } from '@netless/forge-room';
+export type { Whiteboard as FcrWhiteboard, WhiteboardToolType as FcrWhiteboardToolType, } from '@netless/forge-whiteboard';
 export { getLogger, createLogger } from 'agora-foundation/lib/logger';
 export { serializeArgs } from 'agora-foundation/lib/decorator/log/log-serializer';
 export { AgoraObservable } from 'agora-foundation/lib/utilities/observable';
@@ -28,6 +33,7 @@ export type { AgoraRteEngineObserver } from 'agora-rte-sdk/lib/type';
 export type { AgoraRteNetworkQualityEvent } from 'agora-rte-sdk/lib/core/scene/type';
 export type { AgoraRteOperatCause } from 'agora-rte-sdk/lib/core/processor/type';
 export type { AgoraRestfulClient } from 'agora-rte-sdk/lib/core/services/client';
+export { AgoraRteError } from 'agora-rte-sdk/lib/core/utilities/error';
 export type { AgoraRteUserUpdatedReason as FcrUserUpdatedReason, AgoraRteUserPageParams, AgoraRteUserPageResponse, AgoraRteUserPropertiesDeletedEvent, AgoraRteUserPropertiesUpdatedEvent, AgoraRteUserInfo, AgoraRteSceneObserver, AgoraRteSnapshotInfo, AgoraRteEntryRoomResponse, AgoraRteMediaStreamEvent, } from 'agora-rte-sdk/lib/core/scene/type';
 export type AgoraRteMediaStreamCreateConfig = FcrMediaStreamCreateConfigSchema;
 export type AgoraRteStreamBindConfig = FcrStreamBindConfigSchema;
@@ -37,11 +43,12 @@ export type { AgoraRteAudioRawDataConfig, AgoraRteBeautyOptions, AgoraRteCameraP
 export type { AgoraRteMediaStreamInfo } from 'agora-rte-sdk/lib/core/processor/struct';
 export type { AgoraRteMonitor } from 'agora-rte-sdk/lib/core/monitor';
 export type { AgoraRteMediaControl } from 'agora-rte-sdk/lib/core/media';
+export type { AgoraRteUpdateStreamPrivilege } from 'agora-rte-sdk/lib/core/scene/type';
 export { AgoraRteConnectionState, AgoraRteEngine, convertStreamTypeToPublishState, AgoraRteLatencyLevel, } from 'agora-rte-sdk';
 export { AgoraRteRoomConnectorType, AgoraRteStreamPrivilegeOperation, AgoraRteStreamPrivilegeVideoSourceType, AgoraRteStreamPrivilegeAudioSourceType, AgoraRteMediaStreamType, } from 'agora-rte-sdk/lib/core/scene/type';
 export { AgoraRtcRegion, AgoraRtcVideoSourceType, AgoraRtcAudioSourceType, AgoraRtcMediaSourceState, AgoraRtcRenderMode, AgoraRtcVideoStreamType, AgoraRtcCapability, AgoraRtcAiDenoiseLevel, AgoraRtcAudioOutputRouting, AgoraRtcLatencyLevelType, AgoraRtcEncryptionMode, } from 'agora-rte-sdk/lib/core/rtc/type';
 export { AgoraRtmRegion } from 'agora-rte-sdk/lib/core/rtm/type';
-export { AgoraRteRegion, AgoraRteAudioSourceType, AgoraRteVideoSourceType, } from 'agora-rte-sdk/lib/type';
+export { AgoraRteRegion, AgoraRteAudioSourceType, AgoraRteVideoSourceType, AgoraRteMediaPublishState, AgoraRteScreenScenarioType as FcrScreenScenarioType, } from 'agora-rte-sdk/lib/type';
 export { AgoraRestfulClientError } from 'agora-rte-sdk/lib/core/services/client';
 export { getSharedDomainHolder } from 'agora-rte-sdk/lib/core/services/domain-holder';
 export { AgoraRteScreenCaptureType, AgoraRteVideoOrientation, } from 'agora-rte-sdk/lib/core/media/type';

package/lib/imports.js

@@ -2,7 +2,6 @@
 
 require("core-js/modules/esnext.weak-map.delete-all.js");
 require("core-js/modules/esnext.weak-map.emplace.js");
-require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -109,12 +108,24 @@ Object.defineProperty(exports, "AgoraRteEngine", {
     return _agoraRteSdk.AgoraRteEngine;
   }
 });
+Object.defineProperty(exports, "AgoraRteError", {
+  enumerable: true,
+  get: function () {
+    return _error.AgoraRteError;
+  }
+});
 Object.defineProperty(exports, "AgoraRteLatencyLevel", {
   enumerable: true,
   get: function () {
     return _agoraRteSdk.AgoraRteLatencyLevel;
   }
 });
+Object.defineProperty(exports, "AgoraRteMediaPublishState", {
+  enumerable: true,
+  get: function () {
+    return _type4.AgoraRteMediaPublishState;
+  }
+});
 Object.defineProperty(exports, "AgoraRteMediaStreamType", {
   enumerable: true,
   get: function () {
@@ -217,6 +228,30 @@ Object.defineProperty(exports, "FcrCoreEngine", {
     return _engine.FcrCoreEngine;
   }
 });
+Object.defineProperty(exports, "FcrRTMProvider_2_2", {
+  enumerable: true,
+  get: function () {
+    return _forgeRtm.RTMProvider_2_2;
+  }
+});
+Object.defineProperty(exports, "FcrRoom", {
+  enumerable: true,
+  get: function () {
+    return _forgeRoom.Room;
+  }
+});
+Object.defineProperty(exports, "FcrScreenScenarioType", {
+  enumerable: true,
+  get: function () {
+    return _type4.AgoraRteScreenScenarioType;
+  }
+});
+Object.defineProperty(exports, "FcrWhiteboardApplication", {
+  enumerable: true,
+  get: function () {
+    return _forgeWhiteboard.WhiteboardApplication;
+  }
+});
 Object.defineProperty(exports, "Mutex", {
   enumerable: true,
   get: function () {
@@ -451,6 +486,9 @@ var _whiteWebSdk = require("white-web-sdk");
 var _netlessVideoPlugin = _interopRequireWildcard(require("@netless/video-js-plugin"));
 exports.netlessVideoPlugin = _netlessVideoPlugin;
 var _windowManager = require("@netless/window-manager");
+var _forgeRtm = require("@netless/forge-rtm");
+var _forgeRoom = require("@netless/forge-room");
+var _forgeWhiteboard = require("@netless/forge-whiteboard");
 var _logger = require("agora-foundation/lib/logger");
 var _logSerializer = require("agora-foundation/lib/decorator/log/log-serializer");
 var _observable = require("agora-foundation/lib/utilities/observable");
@@ -463,6 +501,7 @@ var _misc = require("agora-foundation/lib/utilities/misc");
 var _schema = require("agora-foundation/lib/utilities/schema");
 var _validate = require("agora-foundation/lib/decorator/validate");
 var _mutex = require("agora-foundation/lib/worker/mutex");
+var _error = require("agora-rte-sdk/lib/core/utilities/error");
 var _agoraRteSdk = require("agora-rte-sdk");
 var _type = require("agora-rte-sdk/lib/core/scene/type");
 var _type2 = require("agora-rte-sdk/lib/core/rtc/type");
@@ -474,5 +513,4 @@ var _type5 = require("agora-rte-sdk/lib/core/media/type");
 var _plugin = require("agora-rte-sdk/lib/core/engine/plugin");
 var _engine = require("./engine");
 var _packageInfo = require("./utilities/package-info");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }

package/lib/index.d.ts

@@ -1,23 +1,2 @@
-export { FcrUserRole, FcrStreamState } from './type';
-export { FcrPermissionAction, FcrPrivilegeUserRole } from './room-control/privilege-control/type';
-export type { FcrError } from './utilities/error';
-export type { FcrCoreEngineConfig, FcrDualVideoStreamConfig } from './type';
-export type { FcrDesktopMediaControl, FcrDesktopMediaObserver, FcrMobileMediaControl, FcrMobileMediaObserver, } from './media-control/type';
-export type { FcrMonitorControl, FcrMonitorObserver } from './monitor-control/type';
-export type { FcrBaseRoomControl, FcrRoomObserver } from './room-control/type';
-export type { FcrUserControl, FcrUserObserver } from './room-control/user-control/type';
-export type { FcrStreamControl, FcrStreamObserver } from './room-control/stream-control/type';
-export type { FcrPrivilegeControl, FcrPermission } from './room-control/privilege-control/type';
-export { AgoraRteLatencyLevel as FcrStreamLatencyLevel } from './imports';
-export { AgoraRteRegion as FcrRegion } from './imports';
-export { AgoraRteMediaStreamType as FcrStreamType } from './imports';
-export { AgoraRteUserUpdatedReason as FcrUserUpdatedReason } from './imports';
-export { AgoraRteRoomConnectorType as FcrRoomConnectorType } from './imports';
-export { AgoraRtcVideoSourceType as FcrVideoSourceType, AgoraRtcAudioSourceType as FcrAudioSourceType, AgoraRtcMediaSourceState as FcrMediaSourceState, } from './imports';
-export { AgoraRtcRenderMode as FcrVideoRenderMode } from './imports';
-export { AgoraRtcVideoStreamType as FcrVideoStreamType } from './imports';
-export { AgoraRtcCapability as FcrCapability } from './imports';
-export { AgoraRtcAiDenoiseLevel as FcrAiDenoiseLevel } from './imports';
-export { AgoraRteStreamPrivilegeOperation as FcrStreamPrivilegeOperation, AgoraRteStreamPrivilegeVideoSourceType as FcrStreamPrivilegeVideoSourceType, AgoraRteStreamPrivilegeAudioSourceType as FcrStreamPrivilegeAudioSourceType, } from './imports';
-export { AgoraRteConnectionState as FcrConnectionState } from './imports';
-export { FcrCoreEngine, registerPlugin } from './imports';
+export type { FcrCoreEngineConfig, FcrDualVideoStreamConfig, FcrDesktopMediaControl, FcrDesktopMediaObserver, FcrMobileMediaControl, FcrMobileMediaObserver, FcrMonitorControl, FcrMonitorObserver, FcrBaseRoomControl, FcrRoomObserver, FcrUserControl, FcrUserObserver, FcrStreamControl, FcrStreamObserver, FcrPrivilegeControl, FcrPermission, FcrError, } from './type';
+export { FcrStreamLatencyLevel, FcrPermissionAction, FcrPrivilegeUserRole, FcrUserRole, FcrStreamState, FcrRegion, FcrStreamType, FcrUserUpdatedReason, FcrRoomConnectorType, FcrVideoSourceType, FcrAudioSourceType, FcrMediaSourceState, FcrVideoRenderMode, FcrVideoStreamType, FcrCapability, FcrAiDenoiseLevel, FcrStreamPrivilegeOperation, FcrStreamPrivilegeVideoSourceType, FcrStreamPrivilegeAudioSourceType, FcrConnectionState, FcrCoreEngine, registerPlugin, } from './type';