fcr-core 3.4.1-edu.1 → 3.4.2

package/lib/chat-connection/index.js

@@ -154,4 +154,4 @@ class FcrChatConnectionImpl {
 }
 exports.FcrChatConnectionImpl = FcrChatConnectionImpl;
 _FcrChatConnectionImpl = FcrChatConnectionImpl;
-[_initProto] = _applyDecs(_FcrChatConnectionImpl, [[_logger.trace, 2, "login"], [_logger.trace, 2, "logout"], [_logger.trace, 2, "getConnectionState"], [_logger.trace, 2, "getConnectionInstance"], [_logger.trace, 2, "addObserver"], [_logger.trace, 2, "removeObserver"]], []).e;
+[_initProto] = _applyDecs(_FcrChatConnectionImpl, [[_logger.trace, 2, "login"], [_logger.trace, 2, "logout"], [_logger.trace, 2, "getConnectionState"], [_logger.trace, 2, "getConnectionInstance"]], []).e;

package/lib/engine/index.d.ts

@@ -83,4 +83,5 @@ export declare class FcrCoreEngine {
      */
     removeObserver(observer: FcrCoreEngineObserver): void;
     private _addRteEngineObserver;
+    private _addLogObserver;
 }

package/lib/engine/index.js

@@ -55,8 +55,7 @@ var _agoraRteSdk = require("agora-rte-sdk");
 var _helper = require("agora-rte-sdk/lib/core/scene/helper");
 var _mobile = require("../media-control/mobile");
 var _chatroom = require("../plugins/chatroom");
-var _whiteboardControl = require("../room-control/whiteboard-control");
-var _privilegeControl = require("../room-control/privilege-control");
+var _whiteboardControlV = require("../room-control/whiteboard-control-v2");
 var _logger = require("../utilities/logger");
 var _FcrCoreEngine;
 let _initProto;
@@ -100,6 +99,7 @@ class FcrCoreEngine {
     this._monitorControl = new _monitorControl.FcrMonitorControlImpl(this._rteEngine, this._config);
     this._desktopMediaControl = new _desktop.FcrDesktopMediaControlImpl(this._rteEngine.getMediaControl());
     this._mobileMediaControl = new _mobile.FcrMobileMediaControlImpl(this._rteEngine.getMediaControl());
+    this._addLogObserver();
     this._addRteEngineObserver();
     const coreIpList = (0, _parameters.getCoreIpList)(config.parameters);
     if (coreIpList) {
@@ -160,7 +160,7 @@ class FcrCoreEngine {
     const scene = this._rteEngine.createScene({
       sceneId: roomId
     });
-    return new _mainroomControl.FcrMainRoomControlImpl(this._rteEngine, scene, this._apiService, this._config, _type2.FcrRoomType.Mainroom, this._chatConnection, new _chatroom.FcrChatRoomControlImpl(scene, this._chatConnection), new _whiteboardControl.FcrWhiteboardControlImpl(scene, new _privilegeControl.FcrPrivilegeControlImpl(this._rteEngine, scene, this._apiService), this._apiService));
+    return new _mainroomControl.FcrMainRoomControlImpl(this._rteEngine, scene, this._apiService, this._config, _type2.FcrRoomType.Mainroom, this._chatConnection, new _chatroom.FcrChatRoomControlImpl(scene, this._chatConnection), new _whiteboardControlV.FcrWhiteboardControlImpl(scene, this._apiService, this._rteEngine));
   }
 
   /**
@@ -345,7 +345,10 @@ class FcrCoreEngine {
       }
     });
   }
+  _addLogObserver() {
+    this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onConnectionStateUpdated', 'onPeerMessageReceived']));
+  }
 }
 exports.FcrCoreEngine = FcrCoreEngine;
 _FcrCoreEngine = FcrCoreEngine;
-[_initProto] = _applyDecs(_FcrCoreEngine, [[_logger.trace, 2, "release"], [_logger.trace, 2, "login"], [_logger.trace, 2, "logout"], [_logger.trace, 2, "getVersion"], [_logger.trace, 2, "createMainRoomControl"], [_logger.trace, 2, "createWaitingRoomControl"], [_logger.trace, 2, "createRoomControlAndJoin"], [_logger.trace, 2, "getDesktopMediaControl"], [_logger.trace, 2, "getMobileMediaControl"], [_logger.trace, 2, "getMonitorControl"], [_logger.trace, 2, "getPeerSessionControl"], [_logger.trace, 2, "sendPeerMessage"], [_logger.trace, 2, "setParameters"], [_logger.trace, 2, "addObserver"], [_logger.trace, 2, "removeObserver"]], []).e;
+[_initProto] = _applyDecs(_FcrCoreEngine, [[_logger.trace, 2, "release"], [_logger.trace, 2, "login"], [_logger.trace, 2, "logout"], [_logger.trace, 2, "getVersion"], [_logger.trace, 2, "createMainRoomControl"], [_logger.trace, 2, "createWaitingRoomControl"], [_logger.trace, 2, "createRoomControlAndJoin"], [_logger.trace, 2, "getDesktopMediaControl"], [_logger.trace, 2, "getMobileMediaControl"], [_logger.trace, 2, "getMonitorControl"], [_logger.trace, 2, "getPeerSessionControl"], [_logger.trace, 2, "sendPeerMessage"], [_logger.trace, 2, "setParameters"]], []).e;

package/lib/imports.d.ts

@@ -19,7 +19,7 @@ export { Duration } from 'agora-foundation/lib/schedule/scheduler';
 export { trace, bound } from 'agora-foundation/lib/decorator';
 export { AgoraScheduler, ActionWhenTaskFail } from 'agora-foundation/lib/schedule';
 export type { AgoraRtcNetworkStats, AgoraRtcDeviceInfo, AgoraRtcDisplayInfo, AgoraRtcWindowInfo, AgoraRtePerformanceInfo, AgoraRteScenePropertiesDeletedEvent, AgoraRteStreamEncryptionConfig, AgoraRteStreamJoinConfig, AgoraRteDualVideoStreamConfig, AgoraRteMessage, AgoraRteScenePropertiesUpdatedEvent, AgoraRteRenderView, AgoraRteScene, } from 'agora-rte-sdk';
-export type { AgoraRteVideoEncoderConfig } from 'agora-rte-sdk/lib/type';
+export type { AgoraRteVideoEncoderConfig, 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';
@@ -39,7 +39,6 @@ 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 type { AgoraRteUploadEvent } from 'agora-rte-sdk/lib/core/monitor/type';
 export { FcrCoreEngine } from './engine';
 export type FcrImageData = ImageData;
 export type FcrWhiteboardView = HTMLElement;

package/lib/media-control/desktop.js

@@ -144,7 +144,13 @@ class FcrDesktopMediaControlImpl {
   checkLoopbackDevice() {
     return this._mediaControl.checkLoopbackDevice();
   }
+  followSystemSpeaker(follow) {
+    return this._mediaControl.followSystemSpeaker(follow);
+  }
+  followSystemMicrophone(follow) {
+    return this._mediaControl.followSystemMicrophone(follow);
+  }
 }
 exports.FcrDesktopMediaControlImpl = FcrDesktopMediaControlImpl;
 _FcrDesktopMediaControlImpl = FcrDesktopMediaControlImpl;
-[_initProto] = _applyDecs(_FcrDesktopMediaControlImpl, [[_logger.trace, 2, "getCameraList"], [_logger.trace, 2, "getMicrophoneList"], [_logger.trace, 2, "getSpeakerList"], [_logger.trace, 2, "getSystemSelectedMicrophone"], [_logger.trace, 2, "getSystemSelectedSpeaker"], [_logger.trace, 2, "getWindowList"], [_logger.trace, 2, "getDisplayList"], [_logger.trace, 2, "getCameraTrack"], [_logger.trace, 2, "getMicrophoneTrack"], [_logger.trace, 2, "getScreenTrack"], [_logger.trace, 2, "getLoopbackTrack"], [_logger.trace, 2, "setSelectedSpeaker"], [_logger.trace, 2, "startSelectedSpeakerTest"], [_logger.trace, 2, "stopSelectedSpeakerTest"], [_logger.trace, 2, "isCapabilitySupported"], [_logger.trace, 2, "setSelectedSpeakerVolume"], [_logger.trace, 2, "getSelectedSpeakerVolume"], [_logger.trace, 2, "addObserver"], [_logger.trace, 2, "removeObserver"]], []).e;
+[_initProto] = _applyDecs(_FcrDesktopMediaControlImpl, [[_logger.trace, 2, "getCameraList"], [_logger.trace, 2, "getMicrophoneList"], [_logger.trace, 2, "getSpeakerList"], [_logger.trace, 2, "getSystemSelectedMicrophone"], [_logger.trace, 2, "getSystemSelectedSpeaker"], [_logger.trace, 2, "getWindowList"], [_logger.trace, 2, "getDisplayList"], [_logger.trace, 2, "getCameraTrack"], [_logger.trace, 2, "getMicrophoneTrack"], [_logger.trace, 2, "getScreenTrack"], [_logger.trace, 2, "getLoopbackTrack"], [_logger.trace, 2, "setSelectedSpeaker"], [_logger.trace, 2, "startSelectedSpeakerTest"], [_logger.trace, 2, "stopSelectedSpeakerTest"], [_logger.trace, 2, "isCapabilitySupported"], [_logger.trace, 2, "adjustOutputVolume"], [_logger.trace, 2, "setSelectedSpeakerVolume"], [_logger.trace, 2, "getSelectedSpeakerVolume"], [_logger.trace, 2, "checkLoopbackDevice"], [_logger.trace, 2, "followSystemSpeaker"], [_logger.trace, 2, "followSystemMicrophone"]], []).e;

package/lib/media-control/mobile.js

@@ -194,4 +194,4 @@ class FcrMobileMediaControlImpl {
 }
 exports.FcrMobileMediaControlImpl = FcrMobileMediaControlImpl;
 _FcrMobileMediaControlImpl = FcrMobileMediaControlImpl;
-[_initProto] = _applyDecs(_FcrMobileMediaControlImpl, [[_logger.trace, 2, "getDeviceId"], [_logger.trace, 2, "getDeviceState"], [_logger.trace, 2, "startCameraTest"], [_logger.trace, 2, "stopCameraTest"], [_logger.trace, 2, "startCameraPreview"], [_logger.trace, 2, "stopCameraPreview"], [_logger.trace, 2, "stopCameraPreviewOnAllCanvas"], [_logger.trace, 2, "startScreenCapture"], [_logger.trace, 2, "updateScreenCapture"], [_logger.trace, 2, "stopScreenCapture"], [_logger.trace, 2, "getScreenCaptureState"], [_logger.trace, 2, "enableSpeaker"], [_logger.trace, 2, "getAudioOutputRouting"], [_logger.trace, 2, "getAudioEffectEnhancer"], [_logger.trace, 2, "getVideoEffectEnhancer"], [_logger.trace, 2, "openDevice"], [_logger.trace, 2, "closeDevice"], [_logger.trace, 2, "switchCamera"], [_logger.trace, 2, "getCameraPosition"], [_logger.trace, 2, "isCapabilitySupported"], [_logger.trace, 2, "adjustOutputVolume"], [_logger.trace, 2, "addObserver"], [_logger.trace, 2, "removeObserver"]], []).e;
+[_initProto] = _applyDecs(_FcrMobileMediaControlImpl, [[_logger.trace, 2, "getDeviceId"], [_logger.trace, 2, "getDeviceState"], [_logger.trace, 2, "startCameraTest"], [_logger.trace, 2, "stopCameraTest"], [_logger.trace, 2, "startCameraPreview"], [_logger.trace, 2, "stopCameraPreview"], [_logger.trace, 2, "stopCameraPreviewOnAllCanvas"], [_logger.trace, 2, "startScreenCapture"], [_logger.trace, 2, "updateScreenCapture"], [_logger.trace, 2, "stopScreenCapture"], [_logger.trace, 2, "getScreenCaptureState"], [_logger.trace, 2, "enableSpeaker"], [_logger.trace, 2, "getAudioOutputRouting"], [_logger.trace, 2, "getAudioEffectEnhancer"], [_logger.trace, 2, "getVideoEffectEnhancer"], [_logger.trace, 2, "openDevice"], [_logger.trace, 2, "closeDevice"], [_logger.trace, 2, "switchCamera"], [_logger.trace, 2, "getCameraPosition"], [_logger.trace, 2, "isCapabilitySupported"], [_logger.trace, 2, "adjustOutputVolume"]], []).e;

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

@@ -588,6 +588,16 @@ export interface FcrDesktopMediaControl {
      * 2 if not installed/activated
      */
     checkLoopbackDevice(): Promise<number>;
+    /**
+     * Follow the system speaker.
+     * @param follow
+     */
+    followSystemSpeaker(follow: boolean): void;
+    /**
+     * Follow the system microphone.
+     * @param follow
+     */
+    followSystemMicrophone(follow: boolean): void;
 }
 export interface FcrMobileMediaControl {
     /**

package/lib/monitor-control/index.js

@@ -1,51 +1,17 @@
 "use strict";
 
-require("core-js/modules/es.symbol.description.js");
-require("core-js/modules/es.error.cause.js");
-require("core-js/modules/es.array.push.js");
-require("core-js/modules/esnext.function.metadata.js");
-require("core-js/modules/esnext.map.delete-all.js");
-require("core-js/modules/esnext.map.emplace.js");
-require("core-js/modules/esnext.map.every.js");
-require("core-js/modules/esnext.map.filter.js");
-require("core-js/modules/esnext.map.find.js");
-require("core-js/modules/esnext.map.find-key.js");
-require("core-js/modules/esnext.map.includes.js");
-require("core-js/modules/esnext.map.key-of.js");
-require("core-js/modules/esnext.map.map-keys.js");
-require("core-js/modules/esnext.map.map-values.js");
-require("core-js/modules/esnext.map.merge.js");
-require("core-js/modules/esnext.map.reduce.js");
-require("core-js/modules/esnext.map.some.js");
-require("core-js/modules/esnext.map.update.js");
-require("core-js/modules/esnext.symbol.metadata.js");
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrMonitorControlImpl = void 0;
-require("core-js/modules/web.dom-collections.iterator.js");
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _logger = require("../utilities/logger");
-var _FcrMonitorControlImpl;
-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 + ""; }
-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; }
 /**
  * @internal
  */
 class FcrMonitorControlImpl {
   constructor(engine, _config) {
-    (0, _defineProperty2.default)(this, "_monitor", void _initProto(this));
     this._config = _config;
     this._monitor = engine.getMonitor();
   }
-  async uploadEvent(event) {
-    return this._monitor.uploadEvent(event);
-  }
   addObserver(observer) {
     this._monitor.addObserver(observer);
   }
@@ -53,6 +19,4 @@ class FcrMonitorControlImpl {
     this._monitor.addObserver(observer);
   }
 }
-exports.FcrMonitorControlImpl = FcrMonitorControlImpl;
-_FcrMonitorControlImpl = FcrMonitorControlImpl;
-[_initProto] = _applyDecs(_FcrMonitorControlImpl, [[_logger.trace, 2, "uploadEvent"], [_logger.trace, 2, "addObserver"], [_logger.trace, 2, "removeObserver"]], []).e;
+exports.FcrMonitorControlImpl = FcrMonitorControlImpl;

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

@@ -1,15 +1,8 @@
-import { FcrMonitorUploadEvent, FcrPerformanceInfo } from '../type';
+import { FcrPerformanceInfo } from '../type';
 export interface FcrMonitorObserver {
     onPerformanceInfoUpdated?: (status: FcrPerformanceInfo) => void;
 }
 export interface FcrMonitorControl {
-    /**
-     * Uploads an event to the Agora Real-Time Engagement Monitor.
-     * @param event The event to be uploaded.
-     * @param success Callback function to be called if the upload is successful.
-     * @param failure Callback function to be called if the upload fails, with an error parameter.
-     */
-    uploadEvent(event: FcrMonitorUploadEvent): Promise<void>;
     /**
      * Add an observer to the monitor.
      * @param observer

package/lib/peer-session/index.js

@@ -62,6 +62,7 @@ class FcrPeerSessionControlImpl {
     this._rteEngine = _rteEngine;
     this._api = _api;
     this._userId = _userId;
+    this._addLogObserver();
     this._executeTask = this._executeTask.bind(this);
     this._rteEngine.addObserver({
       onPeerMessageReceived: this._handlePeerMessage.bind(this)
@@ -281,7 +282,10 @@ class FcrPeerSessionControlImpl {
   _isSessionExpired(session) {
     return session.timestamp + session.duration * _imports.Duration.second(1) < Date.now();
   }
+  _addLogObserver() {
+    this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onPeerSessionAccepted', 'onPeerSessionReceived', 'onPeerSessionRejected']));
+  }
 }
 exports.FcrPeerSessionControlImpl = FcrPeerSessionControlImpl;
 _FcrPeerSessionControlImpl = FcrPeerSessionControlImpl;
-[_initProto] = _applyDecs(_FcrPeerSessionControlImpl, [[_logger.trace, 2, "startPeerSession"], [_logger.trace, 2, "stopPeerSession"], [_logger.trace, 2, "acceptPeerSession"], [_logger.trace, 2, "rejectPeerSession"], [_logger.trace, 2, "addObserver"], [_logger.trace, 2, "removeObserver"]], []).e;
+[_initProto] = _applyDecs(_FcrPeerSessionControlImpl, [[_logger.trace, 2, "startPeerSession"], [_logger.trace, 2, "stopPeerSession"], [_logger.trace, 2, "acceptPeerSession"], [_logger.trace, 2, "rejectPeerSession"]], []).e;

package/lib/plugins/chatroom.js

@@ -29,8 +29,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FcrChatRoomControlImpl = void 0;
 require("core-js/modules/es.error.cause.js");
-require("core-js/modules/esnext.async-iterator.map.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 _observable = require("agora-foundation/lib/utilities/observable");
@@ -53,10 +51,6 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
  * @internal
  */
 class FcrChatRoomControlImpl {
-  _setConnectionState(state) {
-    this._connectionState = state;
-    this._observable.notifyObservers('onConnectionStateUpdated', this._scene.sceneId, state);
-  }
   get conn() {
     if (!this._chatConnection.getConnectionInstance()) {
       throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_CHATROOM, _error.FcrErrorCode.UNDEFINED_ERROR, 'chat room connection not initialized, please get chat room token first', new Error('chat room connection not initialized, please get chat room token first'));
@@ -114,24 +108,27 @@ class FcrChatRoomControlImpl {
             };
             return message;
           }
-        case 'img':
-          {
-            var _msg$ext, _msg$ext2;
-            const message = {
-              id: msg.id,
-              from: (_msg$ext = msg.ext) === null || _msg$ext === void 0 ? void 0 : _msg$ext.sender,
-              type: _type.FcrChatRoomMessageType.Image,
-              timestamp: msg.time,
-              url: msg.url || '',
-              isPrivate: (_msg$ext2 = msg.ext) === null || _msg$ext2 === void 0 ? void 0 : _msg$ext2.isPrivate
-            };
-            return message;
-          }
+        // TODO: 3.x
+        // case 'IMAGE': {
+        //   const message: FcrChatRoomReceiveImageMessage = {
+        //     id: msg.id,
+        //     //@ts-ignore
+        //     from: msg.ext.sender,
+        //     type: FcrChatRoomMessageType.Image,
+        //     //@ts-ignore
+        //     timestamp: parseInt(msg.time),
+        //     //@ts-ignore
+        //     file: msg.url,
+        //     //@ts-ignore
+        //     isPrivate: msg.ext.isPrivate,
+        //   };
+        //   return message;
+        // }
       }
       throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_CHATROOM, _error.FcrErrorCode.UNDEFINED_ERROR, 'unknown remote message type', new Error('unknown remote message type'));
     });
-    (0, _defineProperty2.default)(this, "_convertFcrChatRoomSendBaseMessageToAgoraChatMessage", (msg, progress) => {
-      var _message$to, _imageMessage$to;
+    (0, _defineProperty2.default)(this, "_convertFcrChatRoomSendBaseMessageToAgoraChatMessage", msg => {
+      var _message$to;
       switch (msg.type) {
         case _type.FcrChatRoomMessageType.Text:
           const message = msg;
@@ -149,36 +146,12 @@ class FcrChatRoomControlImpl {
             },
             receiverList: message.to
           });
-        case _type.FcrChatRoomMessageType.Image:
-          const imageMessage = msg;
-          const isPrivateImage = !!((_imageMessage$to = imageMessage.to) !== null && _imageMessage$to !== void 0 && _imageMessage$to.length);
-          const localUser = this._scene.getUser(this._scene.getLocalUser().getLocalUserId());
-          return _easemobWebsdk.default.message.create({
-            to: this.chatRoomId,
-            type: 'img',
-            chatType: 'chatRoom',
-            url: imageMessage.file.filePath,
-            file: {
-              filename: imageMessage.file.fileName,
-              filetype: imageMessage.file.fileType,
-              data: imageMessage.file.data,
-              url: ''
-            },
-            ext: {
-              sender: (0, _user.convertRteUserToFcrUser)(localUser),
-              roomUuid: this._scene.sceneId,
-              isPrivate: isPrivateImage
-            },
-            receiverList: imageMessage.to,
-            onFileUploadProgress: e => {
-              progress === null || progress === void 0 || progress(Math.round(e.loaded / e.total * 100));
-            }
-          });
       }
       throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_CHATROOM, _error.FcrErrorCode.UNDEFINED_ERROR, 'unknown local message type', new Error('unknown local message type'));
     });
     this._scene = _scene;
     this._chatConnection = _chatConnection;
+    this._addLogObserver();
     this._chatConnection.addObserver(this._chatConnectionObserver);
     if (this._chatConnection.getConnectionInstance()) {
       this._addEventListener();
@@ -187,74 +160,22 @@ class FcrChatRoomControlImpl {
   async join() {
     await this._joinChatRoom(this._chatConnection.getConnectionState());
   }
-  _removeEventListener() {
-    this.conn.removeEventHandler("chatroom".concat(this._scene.sceneId));
-  }
-  _addEventListener() {
-    this._removeEventListener();
-    this.conn.addEventHandler("chatroom".concat(this._scene.sceneId), {
-      onTextMessage: msg => {
-        if (msg.to !== this.chatRoomId) {
-          return;
-        }
-        const message = this._convertAgoraChatMessageToFcrChatRoomReceiveMessage(msg);
-        this._observable.notifyObservers('onTextMessageReceived', this._scene.sceneId, message);
-      }
-    });
-    this.conn.onPictureMessage = msg => {
-      if (msg.to !== this.chatRoomId) {
-        return;
-      }
-      // 这里的数据结构和 onTextMessage 不一样,实际上contentsType是img ，type是chatroom，
-      // 但是因为在onPictureMessage的回调中，所以这里直接用type: 'img'，后续可以考虑优化
-      const message = this._convertAgoraChatMessageToFcrChatRoomReceiveMessage(_objectSpread(_objectSpread({}, msg), {}, {
-        type: 'img'
-      }));
-      this._observable.notifyObservers('onImageMessageReceived', this._scene.sceneId, message);
-    };
-
-    // TODO: 3.x
-    // this.conn.onCmdMessage = (msg) => {
-    //   if (msg.to !== this.initConfig.chatRoomId) {
-    //     return;
-    //   }
-    //   const message: FcrChatRoomReceiveCustomMessage =
-    //     this._convertAgoraChatMessageToFcrChatRoomReceiveMessage(msg);
-    //   this._observable.notifyObservers('onCustomMessageReceived', this._scene.sceneId, message);
-    // };
-
-    // TODO: 3.x
-    // this.conn.onChatroomEvent = (eventData: EasemobChat.ChatroomEvent) => {
-    //   if (eventData.operation === 'updateAnnouncement') {
-    //     this._observable.notifyObservers(
-    //       'onAnnouncementUpdated',
-    //       this._scene.sceneId,
-    //       // TODO: 应该用什么字段传递?
-    //       (eventData.attributes as { [key: string]: string })?.announcement,
-    //     );
-    //   } else if (eventData.operation === 'deleteAnnouncement') {
-    //     this._observable.notifyObservers('onAnnouncementDeleted', this._scene.sceneId);
-    //   }
-    // };
-  }
   getConnectionState() {
     return this._connectionState;
   }
-  async sendMessage(message, progress) {
+  async sendMessage(message) {
     var _message$to2;
-    const msg = this._convertFcrChatRoomSendBaseMessageToAgoraChatMessage(message, progress);
-    const sendMsgRes = await this.conn.send(msg);
+    const msg = this._convertFcrChatRoomSendBaseMessageToAgoraChatMessage(message);
+    await this.conn.send(msg);
     const localUserInfo = this._scene.getUser(this._scene.getLocalUser().getLocalUserId());
     const res = _objectSpread(_objectSpread({}, message.type === _type.FcrChatRoomMessageType.Text ? {
       content: message.content
-    } :
-    // @ts-ignore
-    {
-      url: sendMsgRes.message.url
+    } : {
+      file: message.file
     }), {}, {
       from: (0, _user.convertRteUserToFcrUser)(localUserInfo),
-      id: sendMsgRes.serverMsgId,
-      type: message.type,
+      id: msg.id,
+      type: _type.FcrChatRoomMessageType.Text,
       properties: message.properties,
       timestamp: Date.now(),
       isPrivate: !!((_message$to2 = message.to) !== null && _message$to2 !== void 0 && _message$to2.length)
@@ -268,6 +189,9 @@ class FcrChatRoomControlImpl {
     this._observable.removeObserver(observer);
   }
   async leave() {
+    if (!this._chatConnection.getConnectionInstance()) {
+      return;
+    }
     await new Promise(async (resolve, reject) => {
       this._removeEventListener();
       try {
@@ -285,24 +209,106 @@ class FcrChatRoomControlImpl {
       }
     });
   }
-  async getHistoryMessageList(pageSize, startedMessageId) {
-    if (pageSize > 50) {
-      throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_CHATROOM, _error.FcrErrorCode.UNDEFINED_ERROR, 'pageSize should be less than 50', new Error('pageSize should be less than 50'));
-    }
-    const assembleRet = await this.conn.fetchHistoryMessages({
-      queue: this.chatRoomId,
-      count: pageSize,
-      start: startedMessageId,
-      isGroup: true,
-      fail(error) {
-        throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_CHATROOM, _error.FcrErrorCode.UNDEFINED_ERROR, error.message, new Error('get history message list failed'));
+  _removeEventListener() {
+    this.conn.removeEventHandler("chatroom".concat(this._scene.sceneId));
+  }
+  _addEventListener() {
+    this._removeEventListener();
+    this.conn.addEventHandler("chatroom".concat(this._scene.sceneId), {
+      onTextMessage: msg => {
+        if (msg.to !== this.chatRoomId) {
+          return;
+        }
+        const message = this._convertAgoraChatMessageToFcrChatRoomReceiveMessage(msg);
+        this._observable.notifyObservers('onTextMessageReceived', this._scene.sceneId, message);
       }
     });
-    const ret = assembleRet.map(msgBody => {
-      return this._convertAgoraChatMessageToFcrChatRoomReceiveMessage(msgBody);
-    });
-    return ret;
+    // TODO: 3.x
+    // this.conn.onPictureMessage = (msg) => {
+    //   if (msg.to !== this.initConfig.chatRoomId) {
+    //     return;
+    //   }
+    //   const message: FcrChatRoomReceiveImageMessage =
+    //     this._convertAgoraChatMessageToFcrChatRoomReceiveMessage(
+    //       msg,
+    //     ) as FcrChatRoomReceiveImageMessage;
+    //   this._observable.notifyObservers('onImageMessageReceived', this._scene.sceneId, message);
+    // };
+
+    // TODO: 3.x
+    // this.conn.onCmdMessage = (msg) => {
+    //   if (msg.to !== this.initConfig.chatRoomId) {
+    //     return;
+    //   }
+    //   const message: FcrChatRoomReceiveCustomMessage =
+    //     this._convertAgoraChatMessageToFcrChatRoomReceiveMessage(msg);
+    //   this._observable.notifyObservers('onCustomMessageReceived', this._scene.sceneId, message);
+    // };
+
+    // TODO: 3.x
+    // this.conn.onChatroomEvent = (eventData: EasemobChat.ChatroomEvent) => {
+    //   if (eventData.operation === 'updateAnnouncement') {
+    //     this._observable.notifyObservers(
+    //       'onAnnouncementUpdated',
+    //       this._scene.sceneId,
+    //       // TODO: 应该用什么字段传递?
+    //       (eventData.attributes as { [key: string]: string })?.announcement,
+    //     );
+    //   } else if (eventData.operation === 'deleteAnnouncement') {
+    //     this._observable.notifyObservers('onAnnouncementDeleted', this._scene.sceneId);
+    //   }
+    // };
+  }
+  _setConnectionState(state) {
+    this._connectionState = state;
+    this._observable.notifyObservers('onConnectionStateUpdated', this._scene.sceneId, state);
   }
+  _addLogObserver() {
+    this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onConnectionStateUpdated', 'onErrorOccurred'
+    // 'onTextMessageReceived'
+    ]));
+  }
+
+  // TODO: 3.x
+  // /**
+  //  *
+  //  * @param pageSize max 50
+  //  * @param startedMessageId
+  //  * @returns
+  //  */
+  // async getHistoryMessageList(
+  //   pageSize: number,
+  //   startedMessageId: string,
+  // ): Promise<Array<FcrChatRoomReceiveBaseMessage>> {
+  //   if (pageSize > 50) {
+  //     throw generateFcrCoreClientError(
+  //       FcrErrorModuleCode.ROOM_CHATROOM,
+  //       FcrErrorCode.UNDEFINED_ERROR,
+  //       'pageSize should be less than 50',
+  //       new Error('pageSize should be less than 50'),
+  //     );
+  //   }
+
+  //   const assembleRet = await this.conn.fetchHistoryMessages({
+  //     queue: this.initConfig.chatRoomId,
+  //     isGroup: true,
+  //     count: pageSize,
+  //     start: startedMessageId,
+  //     fail(error) {
+  //       throw generateFcrCoreClientError(
+  //         FcrErrorModuleCode.ROOM_CHATROOM,
+  //         FcrErrorCode.UNDEFINED_ERROR,
+  //         error.message,
+  //         new Error('get history message list failed'),
+  //       );
+  //     },
+  //   });
+
+  //   const ret: FcrChatRoomReceiveBaseMessage[] = assembleRet.map((msgBody) => {
+  //     return this._convertAgoraChatMessageToFcrChatRoomReceiveMessage(msgBody);
+  //   });
+  //   return ret;
+  // }
 
   // TODO: 3.x
   // async getAnnouncement(): Promise<string> {
@@ -358,4 +364,4 @@ class FcrChatRoomControlImpl {
 }
 exports.FcrChatRoomControlImpl = FcrChatRoomControlImpl;
 _FcrChatRoomControlImpl = FcrChatRoomControlImpl;
-[_initProto] = _applyDecs(_FcrChatRoomControlImpl, [[_logger.trace, 2, "join"], [_logger.trace, 2, "getConnectionState"], [_logger.trace, 2, "sendMessage"], [_logger.trace, 2, "addObserver"], [_logger.trace, 2, "removeObserver"], [_logger.trace, 2, "leave"]], []).e;
+[_initProto] = _applyDecs(_FcrChatRoomControlImpl, [[_logger.trace, 2, "join"], [_logger.trace, 2, "getConnectionState"], [_logger.trace, 2, "sendMessage"], [_logger.trace, 2, "leave"]], []).e;

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

@@ -9,9 +9,8 @@ export interface FcrChatRoomControl {
     /**
      * Sends a message to the chat room.
      * @param message
-     * @param onProgress
      */
-    sendMessage(message: FcrChatRoomSendBaseMessage, progress?: (progress: number) => void): Promise<FcrChatRoomReceivedBaseMessage>;
+    sendMessage(message: FcrChatRoomSendBaseMessage): Promise<FcrChatRoomReceiveBaseMessage>;
     /**
      * Adds an observer to the chat room.
      * @param observer
@@ -22,12 +21,6 @@ export interface FcrChatRoomControl {
      * @param observer
      */
     removeObserver(observer: FcrChatRoomObserver): void;
-    /**
-     * Gets the history message list of the chat room.
-     * @param pageSize
-     * @param startedMessageId
-     */
-    getHistoryMessageList(pageSize: number, startedMessageId?: string): Promise<FcrChatRoomReceivedBaseMessage[]>;
 }
 export declare enum FcrChatRoomConnectionState {
     Disconnected = 0,
@@ -47,7 +40,7 @@ export type FcrChatRoomSendBaseMessage = {
 export type FcrChatRoomSendTextMessage = FcrChatRoomSendBaseMessage & {
     content: string;
 };
-export type FcrChatRoomReceivedBaseMessage = {
+export type FcrChatRoomReceiveBaseMessage = {
     id: string;
     from: FcrUserInfo;
     type: FcrChatRoomMessageType;
@@ -55,22 +48,22 @@ export type FcrChatRoomReceivedBaseMessage = {
     timestamp: number;
     isPrivate: boolean;
 };
-export type FcrChatRoomReceivedTextMessage = FcrChatRoomReceivedBaseMessage & {
+export type FcrChatRoomReceiveTextMessage = FcrChatRoomReceiveBaseMessage & {
     content: string;
 };
 export type FcrChatRoomFile = {
-    fileName: string;
-    fileType: string;
-    filePath?: string;
-    data?: any;
-};
-export type FcrChatRoomReceivedImageMessage = FcrChatRoomReceivedBaseMessage & {
+    filename: string;
+    filetype: string;
     url: string;
+    data: any;
+};
+export type FcrChatRoomReceiveImageMessage = FcrChatRoomReceiveBaseMessage & {
+    file: FcrChatRoomFile;
 };
 export type FcrChatRoomSendImageMessage = FcrChatRoomSendBaseMessage & {
     file: FcrChatRoomFile;
 };
-export type FcrChatRoomReceiveCustomMessage = FcrChatRoomReceivedBaseMessage & {};
+export type FcrChatRoomReceiveCustomMessage = FcrChatRoomReceiveBaseMessage & {};
 export type FcrChatRoomObserver = {
     /**
      * Callback to receive the connection state change of the chat room.
@@ -85,7 +78,7 @@ export type FcrChatRoomObserver = {
      * @param message
      * @returns
      */
-    onTextMessageReceived?: (roomId: string, message: FcrChatRoomReceivedTextMessage) => void;
+    onTextMessageReceived?: (roomId: string, message: FcrChatRoomReceiveTextMessage) => void;
     /**
      * Callback when an error occurs.
      * @param roomId
@@ -93,13 +86,6 @@ export type FcrChatRoomObserver = {
      * @returns
      */
     onErrorOccurred?: (roomId: string, error: FcrError) => void;
-    /**
-     * Callback to receive the image message sent to the chat room.
-     * @param roomId The ID of the chat room.
-     * @param message The image message received in the chat room.
-     * @returns void
-     */
-    onImageMessageReceived?: (roomId: string, message: FcrChatRoomReceivedImageMessage) => void;
 };
 export type FcrChatRoomControlInitConfig = {
     appkey: string;

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

@@ -246,4 +246,4 @@ class FcrGroupControl {
 }
 exports.FcrGroupControl = FcrGroupControl;
 _FcrGroupControl = FcrGroupControl;
-[_initProto] = _applyDecs(_FcrGroupControl, [[_logger.trace, 2, "getGroupList"], [_logger.trace, 2, "getGroupUserList"], [_logger.trace, 2, "addGroups"], [_logger.trace, 2, "updateGroups"], [_logger.trace, 2, "deleteGroups"], [_logger.trace, 2, "deleteAllGroups"], [_logger.trace, 2, "addUsers"], [_logger.trace, 2, "removeUsers"], [_logger.trace, 2, "moveUsers"], [_logger.trace, 2, "addObserver"], [_logger.trace, 2, "removeObserver"]], []).e;
+[_initProto] = _applyDecs(_FcrGroupControl, [[_logger.trace, 2, "getGroupList"], [_logger.trace, 2, "getGroupUserList"], [_logger.trace, 2, "addGroups"], [_logger.trace, 2, "updateGroups"], [_logger.trace, 2, "deleteGroups"], [_logger.trace, 2, "deleteAllGroups"], [_logger.trace, 2, "addUsers"], [_logger.trace, 2, "removeUsers"], [_logger.trace, 2, "moveUsers"]], []).e;