fcr-core 3.6.4 → 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

@@ -25,6 +25,7 @@ var _imports = require("../imports");
 var _type = require("./type");
 var _config = require("./config");
 var _logger = require("../utilities/logger");
+var _packageInfo = require("../utilities/package-info");
 let _initProto;
 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 + ""; }
@@ -38,16 +39,12 @@ class FcrChatConnectionImpl {
   })))();
   _observable = (() => new _imports.AgoraObservable())();
   _connectionState = (() => _type.FcrChatConnectionState.DISCONNECTED)();
-  _offlineListener = () => {
-    if (this._connectionState !== _type.FcrChatConnectionState.DISCONNECTED) {
-      this._setConnectionState(_type.FcrChatConnectionState.DISCONNECTED);
-    }
-  };
   constructor(_userId, _api, _chatIpList, _restIpList) {
     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();
@@ -61,17 +58,18 @@ class FcrChatConnectionImpl {
         ..._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: ${this._initConfig.token}, userId: ${this._userId}`);
       this._observable.notifyObservers('onConnectionLoginSuccess');
-      this._addEventListeners();
     }, [], {
       retriesMax: 3
     }).fail(async _ref => {
@@ -89,25 +87,37 @@ class FcrChatConnectionImpl {
     }).exec());
   }
   _addEventListeners() {
-    window.addEventListener('offline', this._offlineListener);
-    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() {
-    window.removeEventListener('offline', this._offlineListener);
     this._conn?.close();
   }
   _setConnectionState(state) {

package/lib/engine/index.js

@@ -240,7 +240,8 @@ class FcrCoreEngine {
           videoSourceState: s.videoSourceState
         })),
         version: (0, _imports.getVersion)(),
-        password: options.password
+        password: options.password,
+        avatar: options.avatar
       }), _error.FcrErrorModuleCode.ENGINE);
       const {
         data,
@@ -415,7 +416,7 @@ 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}');
     }

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

@@ -108,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 () {
@@ -216,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 () {
@@ -450,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");
@@ -462,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");

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';

package/lib/index.js

@@ -6,85 +6,85 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "FcrAiDenoiseLevel", {
   enumerable: true,
   get: function () {
-    return _imports.AgoraRtcAiDenoiseLevel;
+    return _type.FcrAiDenoiseLevel;
   }
 });
 Object.defineProperty(exports, "FcrAudioSourceType", {
   enumerable: true,
   get: function () {
-    return _imports.AgoraRtcAudioSourceType;
+    return _type.FcrAudioSourceType;
   }
 });
 Object.defineProperty(exports, "FcrCapability", {
   enumerable: true,
   get: function () {
-    return _imports.AgoraRtcCapability;
+    return _type.FcrCapability;
   }
 });
 Object.defineProperty(exports, "FcrConnectionState", {
   enumerable: true,
   get: function () {
-    return _imports.AgoraRteConnectionState;
+    return _type.FcrConnectionState;
   }
 });
 Object.defineProperty(exports, "FcrCoreEngine", {
   enumerable: true,
   get: function () {
-    return _imports.FcrCoreEngine;
+    return _type.FcrCoreEngine;
   }
 });
 Object.defineProperty(exports, "FcrMediaSourceState", {
   enumerable: true,
   get: function () {
-    return _imports.AgoraRtcMediaSourceState;
+    return _type.FcrMediaSourceState;
   }
 });
 Object.defineProperty(exports, "FcrPermissionAction", {
   enumerable: true,
   get: function () {
-    return _type2.FcrPermissionAction;
+    return _type.FcrPermissionAction;
   }
 });
 Object.defineProperty(exports, "FcrPrivilegeUserRole", {
   enumerable: true,
   get: function () {
-    return _type2.FcrPrivilegeUserRole;
+    return _type.FcrPrivilegeUserRole;
   }
 });
 Object.defineProperty(exports, "FcrRegion", {
   enumerable: true,
   get: function () {
-    return _imports.AgoraRteRegion;
+    return _type.FcrRegion;
   }
 });
 Object.defineProperty(exports, "FcrRoomConnectorType", {
   enumerable: true,
   get: function () {
-    return _imports.AgoraRteRoomConnectorType;
+    return _type.FcrRoomConnectorType;
   }
 });
 Object.defineProperty(exports, "FcrStreamLatencyLevel", {
   enumerable: true,
   get: function () {
-    return _imports.AgoraRteLatencyLevel;
+    return _type.FcrStreamLatencyLevel;
   }
 });
 Object.defineProperty(exports, "FcrStreamPrivilegeAudioSourceType", {
   enumerable: true,
   get: function () {
-    return _imports.AgoraRteStreamPrivilegeAudioSourceType;
+    return _type.FcrStreamPrivilegeAudioSourceType;
   }
 });
 Object.defineProperty(exports, "FcrStreamPrivilegeOperation", {
   enumerable: true,
   get: function () {
-    return _imports.AgoraRteStreamPrivilegeOperation;
+    return _type.FcrStreamPrivilegeOperation;
   }
 });
 Object.defineProperty(exports, "FcrStreamPrivilegeVideoSourceType", {
   enumerable: true,
   get: function () {
-    return _imports.AgoraRteStreamPrivilegeVideoSourceType;
+    return _type.FcrStreamPrivilegeVideoSourceType;
   }
 });
 Object.defineProperty(exports, "FcrStreamState", {
@@ -96,7 +96,7 @@ Object.defineProperty(exports, "FcrStreamState", {
 Object.defineProperty(exports, "FcrStreamType", {
   enumerable: true,
   get: function () {
-    return _imports.AgoraRteMediaStreamType;
+    return _type.FcrStreamType;
   }
 });
 Object.defineProperty(exports, "FcrUserRole", {
@@ -108,33 +108,31 @@ Object.defineProperty(exports, "FcrUserRole", {
 Object.defineProperty(exports, "FcrUserUpdatedReason", {
   enumerable: true,
   get: function () {
-    return _imports.AgoraRteUserUpdatedReason;
+    return _type.FcrUserUpdatedReason;
   }
 });
 Object.defineProperty(exports, "FcrVideoRenderMode", {
   enumerable: true,
   get: function () {
-    return _imports.AgoraRtcRenderMode;
+    return _type.FcrVideoRenderMode;
   }
 });
 Object.defineProperty(exports, "FcrVideoSourceType", {
   enumerable: true,
   get: function () {
-    return _imports.AgoraRtcVideoSourceType;
+    return _type.FcrVideoSourceType;
   }
 });
 Object.defineProperty(exports, "FcrVideoStreamType", {
   enumerable: true,
   get: function () {
-    return _imports.AgoraRtcVideoStreamType;
+    return _type.FcrVideoStreamType;
   }
 });
 Object.defineProperty(exports, "registerPlugin", {
   enumerable: true,
   get: function () {
-    return _imports.registerPlugin;
+    return _type.registerPlugin;
   }
 });
-var _type = require("./type");
-var _type2 = require("./room-control/privilege-control/type");
-var _imports = require("./imports");
+var _type = require("./type");

package/lib/media-control/desktop.js

@@ -38,7 +38,7 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
  * @internal
  */
 class FcrDesktopMediaControlImpl {
-  static #_ = (() => [_initProto] = _applyDecs(this, [[_imports.trace, 2, "getCameraList"], [_imports.trace, 2, "getMicrophoneList"], [_imports.trace, 2, "getSpeakerList"], [_imports.trace, 2, "getSystemSelectedMicrophone"], [_imports.trace, 2, "getSystemSelectedSpeaker"], [_imports.trace, 2, "getWindowList"], [_imports.trace, 2, "getDisplayList"], [_getCameraTrackDecs, 2, "getCameraTrack"], [_getMicrophoneTrackDecs, 2, "getMicrophoneTrack"], [_getScreenTrackDecs, 2, "getScreenTrack"], [_getLoopbackTrackDecs, 2, "getLoopbackTrack"], [_setSelectedSpeakerDecs, 2, "setSelectedSpeaker"], [_startSelectedSpeakerTestDecs, 2, "startSelectedSpeakerTest"], [_imports.trace, 2, "stopSelectedSpeakerTest"], [_isCapabilitySupportedDecs, 2, "isCapabilitySupported"], [_adjustOutputVolumeDecs, 2, "adjustOutputVolume"], [_setSelectedSpeakerVolumeDecs, 2, "setSelectedSpeakerVolume"], [_imports.trace, 2, "getSelectedSpeakerVolume"], [_imports.trace, 2, "checkLoopbackDevice"], [_imports.trace, 2, "followSystemSpeaker"], [_imports.trace, 2, "followSystemMicrophone"]], []).e)();
+  static #_ = (() => [_initProto] = _applyDecs(this, [[_imports.trace, 2, "getCameraList"], [_imports.trace, 2, "getMicrophoneList"], [_imports.trace, 2, "getSpeakerList"], [_imports.trace, 2, "getSystemSelectedMicrophone"], [_imports.trace, 2, "getSystemSelectedSpeaker"], [_imports.trace, 2, "getWindowList"], [_imports.trace, 2, "getDisplayList"], [_getCameraTrackDecs, 2, "getCameraTrack"], [_getMicrophoneTrackDecs, 2, "getMicrophoneTrack"], [_getScreenTrackDecs, 2, "getScreenTrack"], [_getLoopbackTrackDecs, 2, "getLoopbackTrack"], [_setSelectedSpeakerDecs, 2, "setSelectedSpeaker"], [_startSelectedSpeakerTestDecs, 2, "startSelectedSpeakerTest"], [_imports.trace, 2, "stopSelectedSpeakerTest"], [_isCapabilitySupportedDecs, 2, "isCapabilitySupported"], [_adjustOutputVolumeDecs, 2, "adjustOutputVolume"], [_setSelectedSpeakerVolumeDecs, 2, "setSelectedSpeakerVolume"], [_imports.trace, 2, "getSelectedSpeakerVolume"], [_imports.trace, 2, "checkLoopbackDevice"], [_imports.trace, 2, "observeSystemSelectedSpeakerChanged"], [_imports.trace, 2, "observeSystemSelectedMicrophoneChanged"], [_imports.trace, 2, "disableAGC"], [_imports.trace, 2, "enableAGC"]], []).e)();
   [(_getCameraTrackDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _getMicrophoneTrackDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _getScreenTrackDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _getLoopbackTrackDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _setSelectedSpeakerDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _startSelectedSpeakerTestDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema, _schema.numberSchema)], _isCapabilitySupportedDecs = [_imports.trace, (0, _validateParams.default)(_schema.fcrCapabilitySchema)], _adjustOutputVolumeDecs = [_imports.trace, (0, _validateParams.default)(_schema.numberSchema)], _setSelectedSpeakerVolumeDecs = [_imports.trace, (0, _validateParams.default)(_schema.numberSchema)], "logger")] = (() => (_initProto(this), (0, _logger.createLogger)({
     prefix: 'FcrDesktopMediaControlImpl'
   })))();
@@ -78,6 +78,12 @@ class FcrDesktopMediaControlImpl {
       },
       onSelectedSpeakerVolumeUpdated: (volume, muted) => {
         this._observable.notifyObservers('onSelectedSpeakerVolumeUpdated', volume, muted);
+      },
+      onSystemSelectedSpeakerChanged: speaker => {
+        this._observable.notifyObservers('onSystemSelectedSpeakerChanged', speaker);
+      },
+      onSystemSelectedMicrophoneChanged: microphone => {
+        this._observable.notifyObservers('onSystemSelectedMicrophoneChanged', microphone);
       }
     });
   }
@@ -144,11 +150,17 @@ class FcrDesktopMediaControlImpl {
   checkLoopbackDevice() {
     return this._mediaControl.checkLoopbackDevice();
   }
-  followSystemSpeaker(follow) {
-    return this._mediaControl.followSystemSpeaker(follow);
+  observeSystemSelectedSpeakerChanged(follow) {
+    return this._mediaControl.observeSystemSelectedSpeakerChanged(follow);
+  }
+  observeSystemSelectedMicrophoneChanged(follow) {
+    return this._mediaControl.observeSystemSelectedMicrophoneChanged(follow);
+  }
+  disableAGC() {
+    return this._mediaControl.disableAGC();
   }
-  followSystemMicrophone(follow) {
-    return this._mediaControl.followSystemMicrophone(follow);
+  enableAGC() {
+    return this._mediaControl.enableAGC();
   }
 }
 exports.FcrDesktopMediaControlImpl = FcrDesktopMediaControlImpl;

package/lib/media-control/mobile.js

@@ -24,7 +24,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.FcrMobileMediaControlImpl = void 0;
 var _imports = require("../imports");
 var _type = require("../type");
-var _ = require("..");
 var _schema = require("../schema");
 var _validateParams = _interopRequireDefault(require("../utilities/validate-params"));
 var _logger = require("../utilities/logger");
@@ -102,7 +101,7 @@ class FcrMobileMediaControlImpl {
       case _type.FcrDeviceType.Microphone:
         return this._mediaControl.getMicrophoneAudioTrack(this._microphoneDeviceName).getState();
       default:
-        return _.FcrMediaSourceState.CLOSE;
+        return _type.FcrMediaSourceState.CLOSE;
     }
   }
   startCameraTest() {

package/lib/media-control/type.d.ts

@@ -1,6 +1,6 @@
 import { AgoraRteAudioRawDataConfig, AgoraRteBeautyOptions, AgoraRteCameraPosition, AgoraRteScreenCaptureParams, AgoraRteScreenCaptureType, AgoraRteVirtualBackgroundOptions, AgoraRteVideoOrientation, AgoraRteCameraCaptureParams, AgoraRtcAudioOutputRouting } from '../imports';
 import { FcrDeviceInfo, FcrDisplayInfo, FcrRenderView, FcrWindowInfo } from '../type';
-import { FcrMediaSourceState, FcrAiDenoiseLevel, FcrVideoSourceType, FcrAudioSourceType, FcrCapability } from '..';
+import { FcrMediaSourceState, FcrAiDenoiseLevel, FcrVideoSourceType, FcrAudioSourceType, FcrCapability } from '../type';
 import { FcrRenderConfigSchema } from '../schema';
 export type FcrAudioOutputRouting = AgoraRtcAudioOutputRouting;
 export type FcrDesktopMediaObserver = {
@@ -49,6 +49,8 @@ export type FcrDesktopMediaObserver = {
      * @param muted
      */
     onSelectedSpeakerVolumeUpdated?(volume: number, muted: boolean): void;
+    onSystemSelectedSpeakerChanged?(speaker: FcrDeviceInfo): void;
+    onSystemSelectedMicrophoneChanged?(microphone: FcrDeviceInfo): void;
 };
 export type FcrMobileMediaObserver = {
     /**
@@ -590,12 +592,14 @@ export interface FcrDesktopMediaControl {
      * Follow the system speaker.
      * @param follow
      */
-    followSystemSpeaker(follow: boolean): void;
+    observeSystemSelectedSpeakerChanged(enable: boolean): void;
     /**
      * Follow the system microphone.
      * @param follow
      */
-    followSystemMicrophone(follow: boolean): void;
+    observeSystemSelectedMicrophoneChanged(enable: boolean): void;
+    disableAGC(): number;
+    enableAGC(): number;
 }
 export interface FcrMobileMediaControl {
     /**

package/lib/plugins/chatroom.js

@@ -119,9 +119,27 @@ class FcrChatRoomControlImpl {
     if (state === _type2.FcrChatConnectionState.CONNECTED && this.getConnectionState() === _type.FcrChatRoomConnectionState.Disconnected && this.chatRoomId) {
       this._setConnectionState(_type.FcrChatRoomConnectionState.Connecting);
       this.logger.info(`start join chat room, room id: ${this.chatRoomId}, scene id: ${this._scene.sceneId}`);
-      await this.conn.joinChatRoom({
-        roomId: this.chatRoomId
-      });
+      let error = null;
+      [error] = await (0, _imports.to)((0, _imports.retryAttempt)(async () => {
+        await this.conn.joinChatRoom({
+          roomId: this.chatRoomId
+        });
+      }, [], {
+        retriesMax: 4
+      }).fail(async _ref => {
+        let {
+          error,
+          timeFn,
+          currentRetry
+        } = _ref;
+        this.logger.error(`retry to join chat room, ${error.message}, retry ${currentRetry} times`);
+        await timeFn();
+        return true;
+      }).exec());
+      if (error) {
+        this._setConnectionState(_type.FcrChatRoomConnectionState.Disconnected);
+        throw error;
+      }
       this._setConnectionState(_type.FcrChatRoomConnectionState.Connected);
     }
   };

package/lib/room-control/index.js

@@ -35,7 +35,6 @@ var _collection = require("../utilities/collection");
 var _ = require("..");
 var _logger = require("../utilities/logger");
 var _abilityControl = require("./ability-control");
-var _error2 = require("agora-rte-sdk/lib/core/utilities/error");
 var _sharingControl = require("./sharing-control");
 let _initProto;
 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)]; } }; }
@@ -86,7 +85,7 @@ class FcrBaseRoomControlImpl {
         this._roomConnectorControl = new _roomConnectorControl.FcrRoomConnectorControlImpl(this._scene, this._engine, this._api);
         this._abilityControl = new _abilityControl.FcrAbilityControlImpl(this._scene);
         if (this._whiteboardControl && this._streamControl) {
-          this.sharingControl = new _sharingControl.FcrSharingControlImpl(this._scene, this._api, this._engine, this._privilegeControl, this._whiteboardControl, this._streamControl, this._sharedCache);
+          this.sharingControl = new _sharingControl.FcrSharingControlImpl(this._scene, this._api, this._engine, this._privilegeControl, this._whiteboardControl, this._streamControl, this._sharedCache, this._userControl);
         }
         this._observable.notifyObservers('onJoinRoomSuccess', sceneId);
       },
@@ -363,10 +362,14 @@ class FcrBaseRoomControlImpl {
             currentRetry
           } = _ref;
           handleJoinAborted();
-          if ((error instanceof _error2.AgoraRteError || error instanceof _error.FcrError) && _error.RTE_ERROR_CODES_NOT_RETRYABLE_WHEN_JOINING_ROOM.includes(error.code)) {
-            throw error;
+          if (error instanceof _error.FcrError || error instanceof _imports.AgoraRteError) {
+            this.logger.error(`join room failed, message: ${error.message}, code: ${error.code}`);
+            if (_error.RTE_ERROR_CODES_NOT_RETRYABLE_WHEN_JOINING_ROOM.includes(error.code)) {
+              this.logger.error(`cancel retry to join room, message: ${error.message}, code: ${error.code}`);
+              throw error;
+            }
           }
-          this.logger.error(`retry to join room, ${error.message}, retry ${currentRetry} times`);
+          this.logger.warn(`retry to join room, error message: ${error.message}, retry ${currentRetry} times`);
           await timeFn();
           return true;
         }).exec());

package/lib/room-control/interpreter-control/types.d.ts

@@ -29,6 +29,7 @@ export type FcrInterpreterUserInfo = {
     userName: string;
     sourceLanguage: FcrLanguage;
     targetLanguage: FcrLanguage;
+    avatar?: string;
 };
 export type FcrInterpreterRoomInfo = {
     roomId: string;

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

@@ -25,9 +25,8 @@ exports.FcrMainRoomControlImpl = void 0;
 var _imports = require("../../imports");
 var _ = require("..");
 var _groupControl = require("../group-control");
-var _2 = require("../..");
-var _type = require("../type");
-var _type2 = require("../../type");
+var _type = require("../../type");
+var _type2 = require("../type");
 var _error = require("../../utilities/error");
 var _interpreterControl = require("../interpreter-control");
 var _schema = require("../../schema");
@@ -56,7 +55,7 @@ class FcrMainRoomControlImpl extends _.FcrBaseRoomControlImpl {
     return this._observable;
   }
   constructor(engine, scene, api, config, sharedCache, chatConnection, chatRoomControl, whitBoardControl) {
-    super(engine, scene, api, config, _type.FcrRoomType.Mainroom, chatConnection, sharedCache, chatRoomControl, whitBoardControl);
+    super(engine, scene, api, config, _type2.FcrRoomType.Mainroom, chatConnection, sharedCache, chatRoomControl, whitBoardControl);
     this._groupControl = new _groupControl.FcrGroupControl(engine, scene, api, sharedCache);
     this._interpreterControl = new _interpreterControl.FcrInterpreterControlImpl(api, scene, config, engine, chatConnection, sharedCache);
     this._addLogObserver();
@@ -123,13 +122,15 @@ class FcrMainRoomControlImpl extends _.FcrBaseRoomControlImpl {
     }
   }
   async moveToWaitingRoomByUserRoles() {
-    return this._api.moveToWaitingRoomByUserRoles([_type2.FcrUserRoleToStringMap[_2.FcrUserRole.PARTICIPANT]], this._scene.sceneId);
+    return this._api.moveToWaitingRoomByUserRoles([_type.FcrUserRoleToStringMap[_type.FcrUserRole.PARTICIPANT]], this._scene.sceneId);
   }
   async _initAnnotationInfo() {
     const roomId = this._scene.sceneId;
     const userId = this._scene.localUser.getLocalUserId();
     const boardOptions = (await this._getToken(roomId, userId)).data;
+    // @ts-ignore
     if (localStorage) {
+      // @ts-ignore
       localStorage.setItem('board_options', JSON.stringify(boardOptions));
     }
   }