fcr-core 3.8.2 → 3.9.0-alpha

package/lib-es/engine/index.js

@@ -1,3 +1,4 @@
+import "core-js/modules/es.array.push.js";
 import "core-js/modules/esnext.function.metadata.js";
 import "core-js/modules/esnext.map.delete-all.js";
 import "core-js/modules/esnext.map.emplace.js";
@@ -14,8 +15,7 @@ import "core-js/modules/esnext.map.reduce.js";
 import "core-js/modules/esnext.map.some.js";
 import "core-js/modules/esnext.map.update.js";
 import "core-js/modules/esnext.symbol.metadata.js";
-let _initProto, _createMainRoomControlDecs, _createWaitingRoomControlDecs, _createRoomRouterDecs, _createRoomControlAndJoinDecs, _sendPeerMessageDecs, _setParametersDecs;
-import "core-js/modules/es.array.push.js";
+let _initProto, _renewUserTokenDecs, _createMainRoomControlDecs, _createWaitingRoomControlDecs, _createRoomRouterDecs, _createRoomControlAndJoinDecs, _sendPeerMessageDecs, _setParametersDecs;
 import "core-js/modules/es.json.stringify.js";
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.map.js";
@@ -24,39 +24,44 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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; }
-import { AgoraRteEngine, getSharedDomainHolder, retryAttempt, getPlatform, to, AgoraRtcRegion, AgoraRtmRegion, Mutex, trace, AgoraObservable } from '../imports';
-import { FcrCoreServiceApi } from '../service/api';
-import { FcrMonitorControlImpl } from '../monitor-control';
-import { FcrUserRoleToStringMap } from '../type';
+import { trace } from 'agora-foundation/lib/decorator';
+import { retryAttempt } from 'agora-foundation/lib/utilities/async-retry';
+import { getPlatform } from 'agora-foundation/lib/utilities/env';
+import { ErrorModuleCode } from 'agora-foundation/lib/utilities/error/error-code';
+import { AgoraObservable } from 'agora-foundation/lib/utilities/observable';
+import { Mutex } from 'agora-foundation/lib/worker/mutex';
+import { AgoraRestfulClientImpl, AgoraRteEngine, convertStreamTypeToPublishState } from 'agora-rte-sdk';
+import { AgoraRtcRegion } from 'agora-rte-sdk/lib/core/rtc/type';
+import { AgoraRtmRegion } from 'agora-rte-sdk/lib/core/rtm/type';
+import { getSharedDomainHolder, resetSharedDomainHolder } from 'agora-rte-sdk/lib/core/services/domain-holder';
+import to from 'await-to-js';
+import { FcrConnectionState } from '..';
 import { FcrDesktopMediaControlImpl } from '../media-control/desktop';
+import { FcrMobileMediaControlImpl } from '../media-control/mobile';
+import { FcrMonitorControlImpl } from '../monitor-control';
 import { FcrPeerSessionControlImpl } from '../peer-session';
-import { getCoreIpList, getEasemobChatIpList, getEasemobRestIpList, isEndpointRegionDisabled, getRtcPresetParameters } from '../utilities/parameters';
-import { getVersion } from '../imports';
-import { FcrErrorModuleCode, FcrError, handleRequestError, ERROR_CODES_NOT_RETRYABLE_WHEN_JOINING_ROOM } from '../utilities/error';
-import { CMD_PEER_MESSAGE } from '../utilities/cmd';
-import { FcrRoomType } from '../room-control/type';
-import { FcrChatConnectionImpl } from '../chat-connection';
+import { FcrChatRoomControlImpl } from '../plugins/chat/chatroom';
+import { FcrChatConnectorImpl } from '../plugins/chat/connector';
 import { FcrMainRoomControlImpl } from '../room-control/mainroom-control';
+import { FcrSharedCache } from '../room-control/shared-cache';
+import { FcrRoomType } from '../room-control/type';
 import { FcrWaitingRoomControlImpl } from '../room-control/waitingroom-control';
-import { FcrConnectionState } from '..';
-import { resetSharedDomainHolder } from 'agora-rte-sdk/lib/core/services/domain-holder';
-import { AgoraRestfulClientImpl } from 'agora-rte-sdk';
-import { convertStreamTypeToPublishState } from 'agora-rte-sdk/lib/core/scene/helper';
-import { FcrMobileMediaControlImpl } from '../media-control/mobile';
-import { FcrChatRoomControlImpl } from '../plugins/chatroom';
+import { FcrRoomRouterImpl } from '../room-router';
+import { booleanSchema, fcrRoomJoinOptionsSchema, stringKeyUnknownValueSchema, stringSchema } from '../schema';
+import { FcrCoreServiceApi } from '../service/api';
+import { FcrReturnCode, FcrUserRoleToStringMap } from '../type';
+import { CMD_PEER_MESSAGE } from '../utilities/cmd';
+import { ERROR_CODES_NOT_RETRYABLE_WHEN_JOINING_ROOM, FcrError, handleRequestError } from '../utilities/error';
 import { createLogger, generateLogObserver } from '../utilities/logger';
+import { getDependenciesInfo, getVersion } from '../utilities/package-info';
+import { getCoreIpList, getEasemobChatIpList, getEasemobRestIpList, isEndpointRegionDisabled } from '../utilities/parameters';
 import validateParams from '../utilities/validate-params';
-import { booleanSchema, fcrRoomJoinOptionsSchema, stringKeyUnknownValueSchema, stringSchema } from '../schema';
-import { AgoraRteError } from 'agora-rte-sdk/lib/core/utilities/error';
-import { FcrRoomRouterImpl } from '../room-router';
-import { FcrSharedCache } from '../room-control/shared-cache';
-import { getDependenciesInfo } from '../utilities/package-info';
-export class FcrCoreEngine {
+export class FcrCoreEngineImpl {
   static {
-    [_initProto] = _applyDecs(this, [[trace, 2, "release"], [trace, 2, "login"], [trace, 2, "logout"], [trace, 2, "renewUserToken"], [trace, 2, "getVersion"], [_createMainRoomControlDecs, 2, "createMainRoomControl"], [_createWaitingRoomControlDecs, 2, "createWaitingRoomControl"], [_createRoomRouterDecs, 2, "createRoomRouter"], [_createRoomControlAndJoinDecs, 2, "createRoomControlAndJoin"], [trace, 2, "getDesktopMediaControl"], [trace, 2, "getMobileMediaControl"], [trace, 2, "getMonitorControl"], [trace, 2, "getPeerSessionControl"], [_sendPeerMessageDecs, 2, "sendPeerMessage"], [_setParametersDecs, 2, "setParameters"]], []).e;
+    [_initProto] = _applyDecs(this, [[trace, 2, "release"], [trace, 2, "login"], [trace, 2, "logout"], [_renewUserTokenDecs, 2, "renewUserToken"], [trace, 2, "getVersion"], [_createMainRoomControlDecs, 2, "createMainRoomControl"], [_createWaitingRoomControlDecs, 2, "createWaitingRoomControl"], [_createRoomRouterDecs, 2, "createRoomRouter"], [_createRoomControlAndJoinDecs, 2, "createRoomControlAndJoin"], [trace, 2, "getDesktopMediaControl"], [trace, 2, "getMobileMediaControl"], [trace, 2, "getMonitorControl"], [trace, 2, "getPeerSessionControl"], [_sendPeerMessageDecs, 2, "sendPeerMessage"], [_setParametersDecs, 2, "setParameters"]], []).e;
   }
   // @internal
-  [(_createMainRoomControlDecs = [trace, validateParams(stringSchema)], _createWaitingRoomControlDecs = [trace, validateParams(stringSchema)], _createRoomRouterDecs = [trace, validateParams(stringSchema)], _createRoomControlAndJoinDecs = [trace, validateParams(stringSchema, fcrRoomJoinOptionsSchema)], _sendPeerMessageDecs = [trace, validateParams(stringKeyUnknownValueSchema, booleanSchema, stringSchema)], _setParametersDecs = [trace, validateParams(stringKeyUnknownValueSchema)], "logger")] = (_initProto(this), createLogger({
+  [(_renewUserTokenDecs = trace(['token'], true), _createMainRoomControlDecs = [trace(['roomId']), validateParams(stringSchema)], _createWaitingRoomControlDecs = [trace(['roomId']), validateParams(stringSchema)], _createRoomRouterDecs = [trace(['roomId']), validateParams(stringSchema)], _createRoomControlAndJoinDecs = [trace(['roomId', 'options']), validateParams(stringSchema, fcrRoomJoinOptionsSchema)], _sendPeerMessageDecs = [trace(['payload', 'guaranteedDelivery', 'receiverId'], true), validateParams(stringKeyUnknownValueSchema, booleanSchema, stringSchema)], _setParametersDecs = [trace(['parameters'], true), validateParams(stringKeyUnknownValueSchema)], "logger")] = (_initProto(this), createLogger({
     prefix: 'FcrCoreEngine'
   }));
   // @internal
@@ -89,7 +94,6 @@ export class FcrCoreEngine {
     this._config = config;
     resetSharedDomainHolder();
     this.logger.info('Fcr core engine is created, version: ', this.getVersion());
-    const parameters = this._presetParameters(config.parameters);
     this._rteEngine = new AgoraRteEngine({
       appId: config.appId,
       userId: config.userId,
@@ -103,9 +107,10 @@ export class FcrCoreEngine {
       },
       dualCameraVideoStreamConfig: config.dualCameraVideoStreamConfig,
       dualScreenVideoStreamConfig: config.dualScreenVideoStreamConfig,
-      parameters: parameters
+      parameters: config.parameters
     });
-    this._restfulClient = new AgoraRestfulClientImpl(this._rteEngine.getHttpAuthHeadersProvider(), getSharedDomainHolder(config.region), this._rteEngine.getRequestScheduler());
+    const domainHolder = getSharedDomainHolder(config.region);
+    this._restfulClient = new AgoraRestfulClientImpl(this._rteEngine.getHttpAuthHeadersProvider(), domainHolder, this._rteEngine.getRequestScheduler());
     this._apiService = new FcrCoreServiceApi(this._restfulClient, config.appId, config.region, !isEndpointRegionDisabled(config.parameters));
 
     // cannot be lazy loaded, because all the observers should be added before the engine is started
@@ -125,6 +130,7 @@ export class FcrCoreEngine {
    */
   release() {
     this._rteEngine.release();
+    return FcrReturnCode.SUCCESS;
   }
 
   /**
@@ -133,12 +139,12 @@ export class FcrCoreEngine {
   async login() {
     await this._lock.dispatch(async () => {
       if (this._isLoggingIn) {
-        return;
+        return FcrReturnCode.UNDEFINED;
       }
       try {
         this._isLoggingIn = true;
         this._chatConnection.login();
-        await this._rteEngine.login();
+        return await this._rteEngine.login();
       } finally {
         this._isLoggingIn = false;
         this._rteEngine.getMonitor().uploadLog({
@@ -155,7 +161,7 @@ export class FcrCoreEngine {
     await this._lock.dispatch(async () => {
       this._isLoggingIn = false;
       this._chatConnection.logout();
-      await this._rteEngine.logout();
+      return await this._rteEngine.logout();
     });
   }
   /**
@@ -163,7 +169,7 @@ export class FcrCoreEngine {
    * @param token
    */
   renewUserToken(token) {
-    this._rteEngine.renewUserToken(token);
+    return this._rteEngine.renewUserToken(token);
   }
 
   /**
@@ -247,7 +253,7 @@ export class FcrCoreEngine {
         version: getVersion(),
         password: options.password,
         avatar: options.avatar
-      }), FcrErrorModuleCode.ENGINE);
+      }), ErrorModuleCode.FCR_ENGINE);
       const {
         data,
         ts
@@ -270,7 +276,7 @@ export class FcrCoreEngine {
       timeFn,
       currentRetry
     }) => {
-      if ((error instanceof AgoraRteError || error instanceof FcrError) && ERROR_CODES_NOT_RETRYABLE_WHEN_JOINING_ROOM.includes(error.code)) {
+      if (error instanceof FcrError && ERROR_CODES_NOT_RETRYABLE_WHEN_JOINING_ROOM.includes(error.code)) {
         throw error;
       }
       this.logger.error(`retry to join room, ${error.message}, retry ${currentRetry} times`);
@@ -323,7 +329,7 @@ export class FcrCoreEngine {
    * @param receiverId
    */
   async sendPeerMessage(payload, guaranteedDelivery, receiverId) {
-    await this._rteEngine.sendPeerMessage(payload, `${CMD_PEER_MESSAGE}`, guaranteedDelivery, receiverId);
+    return await this._rteEngine.sendPeerMessage(payload, `${CMD_PEER_MESSAGE}`, guaranteedDelivery, receiverId);
   }
 
   /**
@@ -339,13 +345,14 @@ export class FcrCoreEngine {
         rtc,
         rtm
       } = parameters;
-      this._rteEngine.setParameters({
+      return this._rteEngine.setParameters({
         rtc,
         rtm,
         rte
       });
     } catch (e) {
       this.logger.warn('setParameters failed', e);
+      return FcrReturnCode.UNDEFINED;
     }
   }
 
@@ -377,7 +384,7 @@ export class FcrCoreEngine {
     });
   }
   _addLogObserver() {
-    this.addObserver(generateLogObserver(this.logger, ['onConnectionStateUpdated', 'onPeerMessageReceived', 'onUserTokenWillExpire']));
+    this.addObserver(generateLogObserver(this.logger, [['onConnectionStateUpdated', ['state']], ['onPeerMessageReceived', ['message']], 'onUserTokenWillExpire']));
   }
   _setupCoreIpList(parameters) {
     const coreIpList = getCoreIpList(parameters);
@@ -400,23 +407,6 @@ export class FcrCoreEngine {
   _createChatConnection(parameters) {
     const chatIpList = getEasemobChatIpList(parameters);
     const restIpList = getEasemobRestIpList(parameters);
-    return new FcrChatConnectionImpl(this._config.userId, this._apiService, chatIpList, restIpList);
-  }
-  _presetParameters(parameters) {
-    if (!parameters) {
-      parameters = {
-        rtc: getRtcPresetParameters()
-      };
-    } else if (!parameters.rtc) {
-      parameters.rtc = getRtcPresetParameters();
-    } else {
-      parameters.rtc = this._mergeRtcPresetParameters(parameters.rtc);
-    }
-    return parameters;
-  }
-  _mergeRtcPresetParameters(parametersList) {
-    const rtcPresetParameters = getRtcPresetParameters();
-    parametersList.push(...rtcPresetParameters);
-    return parametersList;
+    return new FcrChatConnectorImpl(this._config.userId, this._apiService, chatIpList, restIpList);
   }
 }

package/lib-es/engine/type.js

@@ -0,0 +1 @@
+export {};

package/lib-es/imports.js

@@ -36,7 +36,7 @@ export { Mutex } from 'agora-foundation/lib/worker/mutex';
 // Agora RTE exports
 
 export { AgoraRteError } from 'agora-rte-sdk/lib/core/utilities/error';
-export { AgoraError as FcrError } from 'agora-foundation/lib/utilities/agora-error';
+export { AgoraError as FcrError } from 'agora-foundation/lib/utilities/error/agora-error';
 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';
@@ -47,11 +47,13 @@ export { getSharedDomainHolder } from 'agora-rte-sdk/lib/core/services/domain-ho
 export { AgoraRteScreenCaptureType, AgoraRteVideoOrientation } from 'agora-rte-sdk/lib/core/media/type';
 export { registerPlugin } from 'agora-rte-sdk/lib/core/engine/plugin';
 export { AgoraRteUserUpdatedReason } from 'agora-rte-sdk/lib/core/scene/type';
-export { FcrCoreEngine } from './engine';
+export { LoggerManager } from 'agora-foundation/lib/utilities/logger';
 export { FcrWhiteboardControlFactoryImpl } from './room-control/whiteboard-control-v2/whiteboard-control/factory';
 export { FcrAnnotationControlFactoryImpl } from './room-control/whiteboard-control-v2/annotation-control/factory';
 export { deCompressGzipToJson } from './room-control/stt-control/de-compress-gzip';
 export { getVersion } from './utilities/package-info';
 export const localStorage = window.localStorage;
 export { v4 } from 'uuid';
-export { default as merge } from 'lodash/merge';
+export { default as merge } from 'lodash/merge';
+export { DetailErrorCode, ErrorModuleCode, ErrorServiceType } from 'agora-foundation/lib/utilities/error/error-code';
+export { FcrChatRoomControlImpl } from './plugins/chat/chatroom';

package/lib-es/index.js

@@ -1,7 +1,8 @@
 // types
 
 //enums
-export { FcrStreamLatencyLevel, FcrPermissionAction, FcrPrivilegeUserRole, FcrUserRole, FcrStreamState, FcrRegion, FcrStreamType, FcrUserUpdatedReason, FcrRoomConnectorType, FcrVideoSourceType, FcrAudioSourceType, FcrMediaSourceState, FcrVideoRenderMode, FcrVideoStreamType, FcrCapability, FcrAiDenoiseLevel, FcrStreamPrivilegeOperation, FcrStreamPrivilegeVideoSourceType, FcrStreamPrivilegeAudioSourceType, FcrConnectionState, FcrCoreEngine, registerPlugin, FcrBoardToolType, FcrBoardShape } from './type';
+export { FcrStreamLatencyLevel, FcrPermissionAction, FcrPrivilegeUserRole, FcrUserRole, FcrStreamState, FcrRegion, FcrStreamType, FcrUserUpdatedReason, FcrRoomConnectorType, FcrVideoSourceType, FcrAudioSourceType, FcrMediaSourceState, FcrVideoRenderMode, FcrVideoStreamType, FcrCapability, FcrAiDenoiseLevel, FcrStreamPrivilegeOperation, FcrStreamPrivilegeVideoSourceType, FcrStreamPrivilegeAudioSourceType, FcrConnectionState, registerPlugin, FcrBoardToolType, FcrBoardShape, FcrCoreEngineConfig, FcrVideoEncoderConfig, FcrDualVideoStreamConfig } from './type';
+export { FcrCoreEngineImpl as FcrCoreEngine } from './engine';
 
 // classes
 export { FcrError } from './type';

package/lib-es/media-control/desktop.js

@@ -15,7 +15,7 @@ import "core-js/modules/esnext.map.reduce.js";
 import "core-js/modules/esnext.map.some.js";
 import "core-js/modules/esnext.map.update.js";
 import "core-js/modules/esnext.symbol.metadata.js";
-let _initProto, _getCameraTrackDecs, _getMicrophoneTrackDecs, _getScreenTrackDecs, _getLoopbackTrackDecs, _setSelectedSpeakerDecs, _startSelectedSpeakerTestDecs, _isCapabilitySupportedDecs, _adjustOutputVolumeDecs, _setSelectedSpeakerVolumeDecs;
+let _initProto, _getCameraTrackDecs, _getMicrophoneTrackDecs, _getScreenTrackDecs, _getLoopbackTrackDecs, _setSelectedSpeakerDecs, _startSelectedSpeakerTestDecs, _stopSelectedSpeakerTestDecs, _isCapabilitySupportedDecs, _adjustOutputVolumeDecs, _setSelectedSpeakerVolumeDecs, _observeSystemSelectedSpeakerChangedDecs, _observeSystemSelectedMicrophoneChangedDecs, _disableAGCDecs, _enableAGCDecs;
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.for-each.js";
 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)]; } }; }
@@ -32,16 +32,16 @@ import { createLogger, generateLogObserver } from '../utilities/logger';
  */
 export class FcrDesktopMediaControlImpl {
   static {
-    [_initProto] = _applyDecs(this, [[trace, 2, "getLoopbackList"], [trace, 2, "getCameraList"], [trace, 2, "getMicrophoneList"], [trace, 2, "getSpeakerList"], [trace, 2, "getSystemSelectedMicrophone"], [trace, 2, "getSystemSelectedSpeaker"], [trace, 2, "getWindowList"], [trace, 2, "getDisplayList"], [_getCameraTrackDecs, 2, "getCameraTrack"], [_getMicrophoneTrackDecs, 2, "getMicrophoneTrack"], [_getScreenTrackDecs, 2, "getScreenTrack"], [_getLoopbackTrackDecs, 2, "getLoopbackTrack"], [_setSelectedSpeakerDecs, 2, "setSelectedSpeaker"], [_startSelectedSpeakerTestDecs, 2, "startSelectedSpeakerTest"], [trace, 2, "stopSelectedSpeakerTest"], [_isCapabilitySupportedDecs, 2, "isCapabilitySupported"], [_adjustOutputVolumeDecs, 2, "adjustOutputVolume"], [_setSelectedSpeakerVolumeDecs, 2, "setSelectedSpeakerVolume"], [trace, 2, "getSelectedSpeakerVolume"], [trace, 2, "observeSystemSelectedSpeakerChanged"], [trace, 2, "observeSystemSelectedMicrophoneChanged"], [trace, 2, "disableAGC"], [trace, 2, "enableAGC"]], []).e;
+    [_initProto] = _applyDecs(this, [[trace, 2, "getLoopbackList"], [trace, 2, "getCameraList"], [trace, 2, "getMicrophoneList"], [trace, 2, "getSpeakerList"], [trace, 2, "getSystemSelectedMicrophone"], [trace, 2, "getSystemSelectedSpeaker"], [trace, 2, "getWindowList"], [trace, 2, "getDisplayList"], [_getCameraTrackDecs, 2, "getCameraTrack"], [_getMicrophoneTrackDecs, 2, "getMicrophoneTrack"], [_getScreenTrackDecs, 2, "getScreenTrack"], [_getLoopbackTrackDecs, 2, "getLoopbackTrack"], [_setSelectedSpeakerDecs, 2, "setSelectedSpeaker"], [_startSelectedSpeakerTestDecs, 2, "startSelectedSpeakerTest"], [_stopSelectedSpeakerTestDecs, 2, "stopSelectedSpeakerTest"], [_isCapabilitySupportedDecs, 2, "isCapabilitySupported"], [_adjustOutputVolumeDecs, 2, "adjustOutputVolume"], [_setSelectedSpeakerVolumeDecs, 2, "setSelectedSpeakerVolume"], [trace, 2, "getSelectedSpeakerVolume"], [_observeSystemSelectedSpeakerChangedDecs, 2, "observeSystemSelectedSpeakerChanged"], [_observeSystemSelectedMicrophoneChangedDecs, 2, "observeSystemSelectedMicrophoneChanged"], [_disableAGCDecs, 2, "disableAGC"], [_enableAGCDecs, 2, "enableAGC"]], []).e;
   }
-  [(_getCameraTrackDecs = [trace, validateParams(stringSchema)], _getMicrophoneTrackDecs = [trace, validateParams(stringSchema)], _getScreenTrackDecs = [trace, validateParams(stringSchema)], _getLoopbackTrackDecs = [trace, validateParams(stringSchema)], _setSelectedSpeakerDecs = [trace, validateParams(stringSchema)], _startSelectedSpeakerTestDecs = [trace, validateParams(stringSchema)], _isCapabilitySupportedDecs = [trace, validateParams(fcrCapabilitySchema)], _adjustOutputVolumeDecs = [trace, validateParams(numberSchema)], _setSelectedSpeakerVolumeDecs = [trace, validateParams(numberSchema)], "logger")] = (_initProto(this), createLogger({
+  [(_getCameraTrackDecs = [trace(['deviceId']), validateParams(stringSchema)], _getMicrophoneTrackDecs = [trace(['deviceId']), validateParams(stringSchema)], _getScreenTrackDecs = [trace(['sourceId']), validateParams(stringSchema)], _getLoopbackTrackDecs = [trace(['sourceId']), validateParams(stringSchema)], _setSelectedSpeakerDecs = [trace(['deviceId'], true), validateParams(stringSchema)], _startSelectedSpeakerTestDecs = [trace(['url'], true), validateParams(stringSchema)], _stopSelectedSpeakerTestDecs = trace(true), _isCapabilitySupportedDecs = [trace(['capability']), validateParams(fcrCapabilitySchema)], _adjustOutputVolumeDecs = [trace(['volume'], true), validateParams(numberSchema)], _setSelectedSpeakerVolumeDecs = [trace(['volume'], true), validateParams(numberSchema)], _observeSystemSelectedSpeakerChangedDecs = trace(true), _observeSystemSelectedMicrophoneChangedDecs = trace(true), _disableAGCDecs = trace(true), _enableAGCDecs = trace(true), "logger")] = (_initProto(this), createLogger({
     prefix: 'FcrDesktopMediaControlImpl'
   }));
   _observable = new AgoraObservable();
-  _cameraLogObserver = generateLogObserver(this.logger, ['onCameraStateUpdated']);
-  _microphoneLogObserver = generateLogObserver(this.logger, ['onMicrophoneStateUpdated']);
-  _screenLogObserver = generateLogObserver(this.logger, ['onScreenCaptureStateUpdated']);
-  _loopbackLogObserver = generateLogObserver(this.logger, ['onLoopbackRecordingStateUpdated']);
+  _cameraLogObserver = generateLogObserver(this.logger, [['onCameraStateUpdated', ['deviceId', 'state']]]);
+  _microphoneLogObserver = generateLogObserver(this.logger, [['onMicrophoneStateUpdated', ['deviceId', 'state']]]);
+  _screenLogObserver = generateLogObserver(this.logger, [['onScreenCaptureStateUpdated', ['sourceId', 'state']]]);
+  _loopbackLogObserver = generateLogObserver(this.logger, [['onLoopbackRecordingStateUpdated', ['deviceId', 'state']]]);
   constructor(mediaControl) {
     this._mediaControl = mediaControl;
     this._mediaControl.addObserver({
@@ -131,22 +131,22 @@ export class FcrDesktopMediaControlImpl {
     return track;
   }
   setSelectedSpeaker(deviceId) {
-    this._mediaControl.setSelectedSpeaker(deviceId);
+    return this._mediaControl.setSelectedSpeaker(deviceId);
   }
   startSelectedSpeakerTest(url) {
-    this._mediaControl.startSpeakerTest(url);
+    return this._mediaControl.startSpeakerTest(url);
   }
   stopSelectedSpeakerTest() {
-    this._mediaControl.stopSpeakerTest();
+    return this._mediaControl.stopSpeakerTest();
   }
   isCapabilitySupported(capability) {
     return this._mediaControl.isCapabilitySupported(capability);
   }
   adjustOutputVolume(volume) {
-    this._mediaControl.adjustAudioOutputVolume(volume);
+    return this._mediaControl.adjustAudioOutputVolume(volume);
   }
   setSelectedSpeakerVolume(volume) {
-    this._mediaControl.setSelectedSpeakerVolume(volume);
+    return this._mediaControl.setSelectedSpeakerVolume(volume);
   }
   getSelectedSpeakerVolume() {
     return this._mediaControl.getSelectedSpeakerVolume();

package/lib-es/media-control/mobile.js

@@ -120,6 +120,10 @@ export class FcrMobileMediaControlImpl {
   stopScreenCapture() {
     this._mediaControl.getScreenTrack(this._screenDeviceName).stop();
   }
+  startScreenCaptureWithParams(params) {
+    this._mediaControl.getScreenTrack(this._screenDeviceName).setCaptureParams(params);
+    this._mediaControl.getScreenTrack(this._screenDeviceName).start(AgoraRteScreenCaptureType.SCREEN, []);
+  }
   getScreenCaptureState() {
     return this._mediaControl.getScreenTrack(this._screenDeviceName).getState();
   }

package/lib-es/monitor-control/index.js

@@ -15,7 +15,7 @@ import "core-js/modules/esnext.map.reduce.js";
 import "core-js/modules/esnext.map.some.js";
 import "core-js/modules/esnext.map.update.js";
 import "core-js/modules/esnext.symbol.metadata.js";
-let _initProto;
+let _initProto, _uploadEventDecs;
 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); }
@@ -27,9 +27,9 @@ import { trace } from '../imports';
  */
 export class FcrMonitorControlImpl {
   static {
-    [_initProto] = _applyDecs(this, [[trace, 2, "uploadEvent"]], []).e;
+    [_initProto] = _applyDecs(this, [[_uploadEventDecs, 2, "uploadEvent"]], []).e;
   }
-  _monitor = void _initProto(this);
+  [(_uploadEventDecs = trace(['event']), "_monitor")] = void _initProto(this);
   constructor(engine, _config) {
     this._config = _config;
     this._monitor = engine.getMonitor();

package/lib-es/peer-session/index.js

@@ -23,10 +23,11 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 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; }
 import { AgoraObservable, md5, Duration, ActionWhenTaskFail, AgoraScheduler, trace } from '../imports';
-import { FcrErrorCode, generateFcrCoreServerError } from '../utilities/error';
+import { generateFcrCoreServerError } from '../utilities/error';
 import { createLogger, generateLogObserver } from '../utilities/logger';
 import { fcrPeerSessionParamsSchema, fcrSessionBaseSchema, stringKeyUnknownValueSchema, stringSchema } from '../schema';
 import validateParams from '../utilities/validate-params';
+import { DetailErrorCode } from '../imports';
 /**
  * @internal
  */
@@ -35,7 +36,7 @@ export class FcrPeerSessionControlImpl {
     [_initProto] = _applyDecs(this, [[_startPeerSessionDecs, 2, "startPeerSession"], [_stopPeerSessionDecs, 2, "stopPeerSession"], [_acceptPeerSessionDecs, 2, "acceptPeerSession"], [_rejectPeerSessionDecs, 2, "rejectPeerSession"]], []).e;
   }
   //@internal
-  [(_startPeerSessionDecs = [trace, validateParams(fcrPeerSessionParamsSchema)], _stopPeerSessionDecs = [trace, validateParams(stringSchema)], _acceptPeerSessionDecs = [trace, validateParams(fcrSessionBaseSchema, stringKeyUnknownValueSchema.optional())], _rejectPeerSessionDecs = [trace, validateParams(fcrSessionBaseSchema, stringKeyUnknownValueSchema.optional())], "logger")] = (_initProto(this), createLogger({
+  [(_startPeerSessionDecs = [trace(['params']), validateParams(fcrPeerSessionParamsSchema)], _stopPeerSessionDecs = [trace(['sessionId']), validateParams(stringSchema)], _acceptPeerSessionDecs = [trace(['session', 'cause']), validateParams(fcrSessionBaseSchema, stringKeyUnknownValueSchema.optional())], _rejectPeerSessionDecs = [trace(['session', 'cause']), validateParams(fcrSessionBaseSchema, stringKeyUnknownValueSchema.optional())], "logger")] = (_initProto(this), createLogger({
     prefix: 'FcrPeerSessionControlImpl'
   }));
   //@internal
@@ -89,18 +90,18 @@ export class FcrPeerSessionControlImpl {
       this.logger.info(`[PeerSession] put into session schedule: ${session.sessionId}, next ts: ${nextTs}, remain: ${nextTs - Date.now()}ms`);
       return session.sessionId;
     } catch (e) {
-      throw generateFcrCoreServerError(FcrErrorCode.LOCAL_HTTP_REQUEST_FAILED, 'start peer session failed', e);
+      throw generateFcrCoreServerError(DetailErrorCode.LOCAL_HTTP_REQUEST_FAILED, 'start peer session failed', e);
     }
   }
   stopPeerSession(sessionId) {
-    this._scheduleMap.delete(sessionId);
+    return this._scheduleMap.delete(sessionId);
   }
   async acceptPeerSession(session, cause) {
     if (this._isSessionExpired(session)) {
-      throw generateFcrCoreServerError(FcrErrorCode.EXPIRED, 'accept peer session failed: session expired', new Error());
+      throw generateFcrCoreServerError(DetailErrorCode.EXPIRED, 'accept peer session failed: session expired', new Error());
     }
     try {
-      this._api.deletePeerSession({
+      return this._api.deletePeerSession({
         userId: this._userId,
         sessionId: session.sessionId,
         sessionKey: session.sessionKey,
@@ -111,15 +112,15 @@ export class FcrPeerSessionControlImpl {
         }
       });
     } catch (e) {
-      throw generateFcrCoreServerError(FcrErrorCode.LOCAL_HTTP_REQUEST_FAILED, 'accept peer session failed', e);
+      throw generateFcrCoreServerError(DetailErrorCode.LOCAL_HTTP_REQUEST_FAILED, 'accept peer session failed', e);
     }
   }
   async rejectPeerSession(session, cause) {
     if (this._isSessionExpired(session)) {
-      throw generateFcrCoreServerError(FcrErrorCode.EXPIRED, 'reject peer session failed: session expired', new Error());
+      throw generateFcrCoreServerError(DetailErrorCode.EXPIRED, 'reject peer session failed: session expired', new Error());
     }
     try {
-      this._api.deletePeerSession({
+      return this._api.deletePeerSession({
         userId: this._userId,
         sessionId: session.sessionId,
         sessionKey: session.sessionKey,
@@ -130,7 +131,7 @@ export class FcrPeerSessionControlImpl {
         }
       });
     } catch (e) {
-      throw generateFcrCoreServerError(FcrErrorCode.LOCAL_HTTP_REQUEST_FAILED, 'reject peer session failed', e);
+      throw generateFcrCoreServerError(DetailErrorCode.LOCAL_HTTP_REQUEST_FAILED, 'reject peer session failed', e);
     }
   }
   addObserver(observer) {
@@ -155,13 +156,13 @@ export class FcrPeerSessionControlImpl {
         interval: 0
       };
       if (this._isSessionExpired(session)) {
-        this.logger.info(`[PeerSession] peer session expired, removed: ${session.sessionId}`);
+        this.logger.info(`peer session expired, removed: ${session.sessionId}`);
         this._scheduleMap.delete(session.sessionId);
         continue;
       }
       // check timeout
       if (params.nextTs < Date.now()) {
-        this.logger.info(`[PeerSession] ping session: ${session.sessionId}`);
+        this.logger.info(`ping session: ${session.sessionId}`);
         try {
           const {
             data: {
@@ -184,7 +185,7 @@ export class FcrPeerSessionControlImpl {
             this.logger.info(`[PeerSession] refresh session schedule: ${session.sessionId}, next ts: ${nextTs}`);
           }
         } catch (e) {
-          this.logger.error(`[PeerSession] ping session failed: ${e}`);
+          this.logger.error(`ping session failed: ${e}`);
         }
       }
     }
@@ -193,7 +194,7 @@ export class FcrPeerSessionControlImpl {
       const session = this._receivedMap.get(key);
       if (this._isSessionExpired(session)) {
         this._receivedMap.delete(key);
-        this.logger.info(`[PeerSession] delete session callback: ${key}`);
+        this.logger.info(`delete session callback: ${key}`);
       }
     }
   }
@@ -273,6 +274,6 @@ export class FcrPeerSessionControlImpl {
     return session.timestamp + session.duration * Duration.second(1) < Date.now();
   }
   _addLogObserver() {
-    this.addObserver(generateLogObserver(this.logger, ['onPeerSessionAccepted', 'onPeerSessionReceived', 'onPeerSessionRejected']));
+    this.addObserver(generateLogObserver(this.logger, [['onPeerSessionAccepted', ['session']], ['onPeerSessionReceived', ['session']], ['onPeerSessionRejected', ['session']]]));
   }
 }