fcr-core 3.7.8 → 3.8.0-alpha

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

@@ -6,7 +6,7 @@ export declare class FcrChatConnectionImpl implements FcrChatConnection {
     private _api;
     private _chatIpList?;
     private _restIpList?;
-    protected logger: import("agora-foundation/lib/logger").Logger;
+    protected logger: import("agora-foundation/lib/logger/type").Logger;
     private _observable;
     private _initConfig?;
     private _conn?;

package/lib/engine/index.js

@@ -84,11 +84,12 @@ class FcrCoreEngine {
     (0, _defineProperty2.default)(this, "_observable", new _imports.AgoraObservable());
     this._config = config;
     (0, _domainHolder.resetSharedDomainHolder)();
+    this.logger.info('Fcr core engine is created, version: ', this.getVersion());
     const parameters = this._presetParameters(config.parameters);
     this._rteEngine = new _imports.AgoraRteEngine({
       appId: config.appId,
       userId: config.userId,
-      token: config.token,
+      userToken: config.token,
       rteRegion: config.region,
       rtcRegion: _imports.AgoraRtcRegion.AREA_GLOBAL,
       rtmRegion: _imports.AgoraRtmRegion.AREA_GLOBAL,
@@ -100,7 +101,7 @@ class FcrCoreEngine {
       dualScreenVideoStreamConfig: config.dualScreenVideoStreamConfig,
       parameters: parameters
     });
-    this._restfulClient = new _agoraRteSdk.AgoraRestfulClientImpl(this._rteEngine.getHttpAuthHeadersProvider(), (0, _imports.getSharedDomainHolder)(config.region));
+    this._restfulClient = new _agoraRteSdk.AgoraRestfulClientImpl(this._rteEngine.getHttpAuthHeadersProvider(), (0, _imports.getSharedDomainHolder)(config.region), this._rteEngine.getRequestScheduler());
     this._apiService = new _api.FcrCoreServiceApi(this._restfulClient, config.appId, config.region, !(0, _parameters.isEndpointRegionDisabled)(config.parameters));
 
     // cannot be lazy loaded, because all the observers should be added before the engine is started
@@ -185,7 +186,7 @@ class FcrCoreEngine {
     const scene = this._rteEngine.createScene({
       sceneId: roomId
     });
-    return new _mainroomControl.FcrMainRoomControlImpl(this._rteEngine, scene, this._apiService, this._config, this._sharedCache, this._chatConnection, new _chatroom.FcrChatRoomControlImpl(scene, this._chatConnection, this._sharedCache));
+    return new _mainroomControl.FcrMainRoomControlImpl(this._rteEngine, scene, this._apiService, this._config, this._sharedCache, this._chatConnection, new _chatroom.FcrChatRoomControlImpl(scene, this._chatConnection, this._sharedCache, false));
   }
 
   /**
@@ -197,7 +198,7 @@ class FcrCoreEngine {
     const scene = this._rteEngine.createScene({
       sceneId: roomId
     });
-    return new _waitingroomControl.FcrWaitingRoomControlImpl(this._rteEngine, scene, this._apiService, this._config, this._sharedCache, this._chatConnection, new _chatroom.FcrChatRoomControlImpl(scene, this._chatConnection, this._sharedCache));
+    return new _waitingroomControl.FcrWaitingRoomControlImpl(this._rteEngine, scene, this._apiService, this._config, this._sharedCache, this._chatConnection, new _chatroom.FcrChatRoomControlImpl(scene, this._chatConnection, this._sharedCache, false));
   }
 
   /**
@@ -382,7 +383,7 @@ class FcrCoreEngine {
       this.logger.info("setup fixed service domain list: ".concat(JSON.stringify(coreIpList)));
       (0, _domainHolder.resetSharedDomainHolder)();
       (0, _imports.getSharedDomainHolder)(this._config.region).setFixedDomainList(coreIpList);
-      this._restfulClient = new _agoraRteSdk.AgoraRestfulClientImpl(this._rteEngine.getHttpAuthHeadersProvider(), (0, _imports.getSharedDomainHolder)(this._config.region));
+      this._restfulClient = new _agoraRteSdk.AgoraRestfulClientImpl(this._rteEngine.getHttpAuthHeadersProvider(), (0, _imports.getSharedDomainHolder)(this._config.region), this._rteEngine.getRequestScheduler());
       this._apiService.setRestfulClient(this._restfulClient);
     }
   }

package/lib/imports.d.ts

@@ -16,6 +16,7 @@ export type { Whiteboard as FcrWhiteboard, WhiteboardToolType as FcrWhiteboardTo
 export { WhiteboardPermissionFlag as FcrWhiteboardPermissionFlag } from '@netless/forge-whiteboard';
 export type { JoinRoomOptions as FcrJoinRoomOptions } from '@netless/forge-room';
 export { getLogger, createLogger } from 'agora-foundation/lib/logger';
+export type { Logger } from 'agora-foundation/lib/logger';
 export { serializeArgs } from 'agora-foundation/lib/decorator/log/log-serializer';
 export { AgoraObservable } from 'agora-foundation/lib/utilities/observable';
 export { retryAttempt } from 'agora-foundation/lib/utilities/async-retry';
@@ -28,6 +29,7 @@ export { z, ZodError, anySchema, booleanSchema, numberSchema, stringSchema, fcrR
 export { validateParams } from 'agora-foundation/lib/decorator/validate';
 export { Mutex } from 'agora-foundation/lib/worker/mutex';
 export type { AgoraRtcNetworkStats, AgoraRtcDeviceInfo, AgoraRtcDisplayInfo, AgoraRtcWindowInfo, AgoraRtePerformanceInfo, AgoraRteScenePropertiesDeletedEvent, AgoraRteStreamEncryptionConfig, AgoraRteStreamJoinConfig, AgoraRteDualVideoStreamConfig, AgoraRteMessage, AgoraRteScenePropertiesUpdatedEvent, AgoraRteRenderView, AgoraRteScene, } from 'agora-rte-sdk';
+export type { AgoraRtmClient } from 'agora-rte-sdk/lib/core/rtm/client';
 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';
@@ -55,9 +57,12 @@ 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 { FcrWhiteboardControlFactoryImpl } from './room-control/whiteboard-control-v2/whiteboard-control';
-export { FcrAnnotationControlFactoryImpl } from './room-control/whiteboard-control-v2/annotation-control';
+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 type FcrImageData = ImageData;
 export type FcrWhiteboardView = HTMLElement;
 export { getVersion } from './utilities/package-info';
 export declare const localStorage: Storage;
+export { v4 } from 'uuid';
+export { default as merge } from 'lodash/merge';

package/lib/imports.js

@@ -226,7 +226,7 @@ Object.defineProperty(exports, "EasemobChatSDK", {
 Object.defineProperty(exports, "FcrAnnotationControlFactoryImpl", {
   enumerable: true,
   get: function () {
-    return _annotationControl.FcrAnnotationControlFactoryImpl;
+    return _factory2.FcrAnnotationControlFactoryImpl;
   }
 });
 Object.defineProperty(exports, "FcrApplicationPlatform", {
@@ -274,7 +274,7 @@ Object.defineProperty(exports, "FcrWhiteboardApplication", {
 Object.defineProperty(exports, "FcrWhiteboardControlFactoryImpl", {
   enumerable: true,
   get: function () {
-    return _whiteboardControl.FcrWhiteboardControlFactoryImpl;
+    return _factory.FcrWhiteboardControlFactoryImpl;
   }
 });
 Object.defineProperty(exports, "FcrWhiteboardPermissionFlag", {
@@ -343,6 +343,12 @@ Object.defineProperty(exports, "createUnionSchema", {
     return _schema.createUnionSchema;
   }
 });
+Object.defineProperty(exports, "deCompressGzipToJson", {
+  enumerable: true,
+  get: function () {
+    return _deCompressGzip.deCompressGzipToJson;
+  }
+});
 Object.defineProperty(exports, "fcrRenderViewSchema", {
   enumerable: true,
   get: function () {
@@ -392,6 +398,12 @@ Object.defineProperty(exports, "md5", {
     return _jsMd.md5;
   }
 });
+Object.defineProperty(exports, "merge", {
+  enumerable: true,
+  get: function () {
+    return _merge.default;
+  }
+});
 Object.defineProperty(exports, "numberSchema", {
   enumerable: true,
   get: function () {
@@ -476,6 +488,12 @@ Object.defineProperty(exports, "unknownSchema", {
     return _schema.unknownSchema;
   }
 });
+Object.defineProperty(exports, "v4", {
+  enumerable: true,
+  get: function () {
+    return _uuid.v4;
+  }
+});
 Object.defineProperty(exports, "validateParams", {
   enumerable: true,
   get: function () {
@@ -522,9 +540,12 @@ var _domainHolder = require("agora-rte-sdk/lib/core/services/domain-holder");
 var _type5 = require("agora-rte-sdk/lib/core/media/type");
 var _plugin = require("agora-rte-sdk/lib/core/engine/plugin");
 var _engine = require("./engine");
-var _whiteboardControl = require("./room-control/whiteboard-control-v2/whiteboard-control");
-var _annotationControl = require("./room-control/whiteboard-control-v2/annotation-control");
+var _factory = require("./room-control/whiteboard-control-v2/whiteboard-control/factory");
+var _factory2 = require("./room-control/whiteboard-control-v2/annotation-control/factory");
+var _deCompressGzip = require("./room-control/stt-control/de-compress-gzip");
 var _packageInfo = require("./utilities/package-info");
+var _uuid = require("uuid");
+var _merge = _interopRequireDefault(require("lodash/merge"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 // Other utility exports
 

package/lib/index.d.ts

@@ -1,3 +1,3 @@
-export type { FcrCoreEngineConfig, FcrDualVideoStreamConfig, FcrDesktopMediaControl, FcrDesktopMediaObserver, FcrMobileMediaControl, FcrMobileMediaObserver, FcrMonitorControl, FcrMonitorObserver, FcrBaseRoomControl, FcrRoomObserver, FcrUserControl, FcrUserObserver, FcrStreamControl, FcrStreamObserver, FcrPrivilegeControl, FcrPermission, } 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';
+export type { FcrCoreEngineConfig, FcrDualVideoStreamConfig, FcrDesktopMediaControl, FcrDesktopMediaObserver, FcrMobileMediaControl, FcrMobileMediaObserver, FcrMonitorControl, FcrMonitorObserver, FcrBaseRoomControl, FcrRoomObserver, FcrUserControl, FcrUserObserver, FcrStreamControl, FcrStreamObserver, FcrPrivilegeControl, FcrPermission, FcrBoardMainWindow, FcrBoardMainWindowObserver, FcrColor, } 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, FcrBoardToolType, FcrBoardShape, } from './type';
 export { FcrError } from './type';

package/lib/index.js

@@ -15,6 +15,18 @@ Object.defineProperty(exports, "FcrAudioSourceType", {
     return _type.FcrAudioSourceType;
   }
 });
+Object.defineProperty(exports, "FcrBoardShape", {
+  enumerable: true,
+  get: function () {
+    return _type.FcrBoardShape;
+  }
+});
+Object.defineProperty(exports, "FcrBoardToolType", {
+  enumerable: true,
+  get: function () {
+    return _type.FcrBoardToolType;
+  }
+});
 Object.defineProperty(exports, "FcrCapability", {
   enumerable: true,
   get: function () {

package/lib/media-control/desktop.js

@@ -121,22 +121,22 @@ class FcrDesktopMediaControlImpl {
     return this._mediaControl.getDisplayList();
   }
   getCameraTrack(deviceId) {
-    const track = this._mediaControl.getCameraVideoTrack(deviceId);
+    const track = this._mediaControl.getCameraTrack(deviceId);
     track.addObserver(this._cameraLogObserver);
     return track;
   }
   getMicrophoneTrack(deviceId) {
-    const track = this._mediaControl.getMicrophoneAudioTrack(deviceId);
+    const track = this._mediaControl.getMicrophoneTrack(deviceId);
     track.addObserver(this._microphoneLogObserver);
     return track;
   }
   getScreenTrack(sourceId) {
-    const track = this._mediaControl.getScreenVideoTrack(sourceId);
+    const track = this._mediaControl.getScreenTrack(sourceId);
     track.addObserver(this._screenLogObserver);
     return track;
   }
   getLoopbackTrack(sourceId) {
-    const track = this._mediaControl.getLoopbackAudioTrack(sourceId);
+    const track = this._mediaControl.getLoopbackTrack(sourceId);
     track.addObserver(this._loopbackLogObserver);
     return track;
   }

package/lib/media-control/mobile.js

@@ -53,12 +53,12 @@ class FcrMobileMediaControlImpl {
     (0, _defineProperty2.default)(this, "_screenDeviceName", undefined);
     (0, _defineProperty2.default)(this, "_loopbackDeviceName", undefined);
     this._mediaControl = mediaControl;
-    this._mediaControl.getCameraVideoTrack(this._cameraDeviceName).addObserver({
+    this._mediaControl.getCameraTrack(this._cameraDeviceName).addObserver({
       onCameraStateUpdated: (deviceId, state) => {
         this._observable.notifyObservers('onCameraStateUpdated', state);
       }
     });
-    this._mediaControl.getMicrophoneAudioTrack(this._microphoneDeviceName).addObserver({
+    this._mediaControl.getMicrophoneTrack(this._microphoneDeviceName).addObserver({
       onMicrophoneStateUpdated: (deviceId, state) => {
         this._observable.notifyObservers('onMicrophoneStateUpdated', state);
       },
@@ -66,7 +66,7 @@ class FcrMobileMediaControlImpl {
         this._observable.notifyObservers('onMicrophoneVolumeIndicationUpdated', volume);
       }
     });
-    this._mediaControl.getScreenVideoTrack(this._screenDeviceName).addObserver({
+    this._mediaControl.getScreenTrack(this._screenDeviceName).addObserver({
       onScreenCaptureStateUpdated: (sourceId, state) => {
         this._observable.notifyObservers('onScreenCaptureStateUpdated', state);
       }
@@ -102,45 +102,45 @@ class FcrMobileMediaControlImpl {
   getDeviceState(deviceType) {
     switch (deviceType) {
       case _type.FcrDeviceType.Camera:
-        return this._mediaControl.getCameraVideoTrack(this._cameraDeviceName).getState();
+        return this._mediaControl.getCameraTrack(this._cameraDeviceName).getState();
       case _type.FcrDeviceType.Microphone:
-        return this._mediaControl.getMicrophoneAudioTrack(this._microphoneDeviceName).getState();
+        return this._mediaControl.getMicrophoneTrack(this._microphoneDeviceName).getState();
       default:
         return _type.FcrMediaSourceState.CLOSE;
     }
   }
   startCameraTest() {
-    this._mediaControl.getCameraVideoTrack(this._cameraDeviceName).startTest();
+    this._mediaControl.getCameraTrack(this._cameraDeviceName).startTest();
   }
   stopCameraTest() {
-    this._mediaControl.getCameraVideoTrack(this._cameraDeviceName).startTest();
+    this._mediaControl.getCameraTrack(this._cameraDeviceName).startTest();
   }
   startCameraPreview(view, config) {
-    this._mediaControl.getCameraVideoTrack(this._cameraDeviceName).startPreview(config, view);
+    this._mediaControl.getCameraTrack(this._cameraDeviceName).startPreview(config, view);
   }
   stopCameraPreview(view) {
-    this._mediaControl.getCameraVideoTrack(this._cameraDeviceName).stopPreview(view);
+    this._mediaControl.getCameraTrack(this._cameraDeviceName).stopPreview(view);
   }
   stopCameraPreviewOnAllCanvas() {
     throw new Error('Method not implemented.');
   }
   startScreenCapture(excludeWindowList) {
-    this._mediaControl.getScreenVideoTrack(this._screenDeviceName).start(_imports.AgoraRteScreenCaptureType.SCREEN, excludeWindowList);
+    this._mediaControl.getScreenTrack(this._screenDeviceName).start(_imports.AgoraRteScreenCaptureType.SCREEN, excludeWindowList);
   }
   stopScreenCapture() {
-    this._mediaControl.getScreenVideoTrack(this._screenDeviceName).stop();
+    this._mediaControl.getScreenTrack(this._screenDeviceName).stop();
   }
   getScreenCaptureState() {
-    return this._mediaControl.getScreenVideoTrack(this._screenDeviceName).getState();
+    return this._mediaControl.getScreenTrack(this._screenDeviceName).getState();
   }
   startLoopbackRecording() {
-    this._mediaControl.getLoopbackAudioTrack(this._loopbackDeviceName).start();
+    this._mediaControl.getLoopbackTrack(this._loopbackDeviceName).start();
   }
   stopLoopbackRecording() {
-    this._mediaControl.getLoopbackAudioTrack(this._loopbackDeviceName).stop();
+    this._mediaControl.getLoopbackTrack(this._loopbackDeviceName).stop();
   }
   getLoopbackRecordingState() {
-    return this._mediaControl.getLoopbackAudioTrack(this._loopbackDeviceName).getState();
+    return this._mediaControl.getLoopbackTrack(this._loopbackDeviceName).getState();
   }
   enableSpeaker(enable) {
     this._mediaControl.setEnableSpeaker(enable);
@@ -177,17 +177,17 @@ class FcrMobileMediaControlImpl {
     }
   }
   switchCamera() {
-    this._mediaControl.getCameraVideoTrack(this._cameraDeviceName).switchPosition();
-    return this._mediaControl.getCameraVideoTrack(this._cameraDeviceName).getPosition();
+    this._mediaControl.getCameraTrack(this._cameraDeviceName).switchPosition();
+    return this._mediaControl.getCameraTrack(this._cameraDeviceName).getPosition();
   }
   getCameraPosition() {
-    return this._mediaControl.getCameraVideoTrack(this._cameraDeviceName).getPosition();
+    return this._mediaControl.getCameraTrack(this._cameraDeviceName).getPosition();
   }
   getCameraTrack(deviceId) {
-    return this._mediaControl.getCameraVideoTrack(deviceId);
+    return this._mediaControl.getCameraTrack(deviceId);
   }
   getMicrophoneTrack(deviceId) {
-    return this._mediaControl.getMicrophoneAudioTrack(deviceId);
+    return this._mediaControl.getMicrophoneTrack(deviceId);
   }
   isCapabilitySupported(capability) {
     return this._mediaControl.isCapabilitySupported(capability);

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

@@ -163,6 +163,14 @@ export interface FcrAudioEffectEnhancer {
      * Disables original sound mode for the audio track.
      */
     disableOriginalSoundMode(): void;
+    /**
+     * Enables AGC for the audio track.
+     */
+    enableAGC(): void;
+    /**
+     * Disables AGC for the audio track.
+     */
+    disableAGC(): void;
 }
 export interface FcrVideoEffectEnhancer {
     /**

package/lib/plugins/chatroom.js

@@ -62,14 +62,21 @@ class FcrChatRoomControlImpl {
     return this._chatConnection.getConnectionInstance();
   }
   get chatRoomId() {
+    if (!this._joinSceneSuccess) {
+      return '';
+    }
     return this._scene.getScenePropertiesByKeyPath('widgets.easemobIM.extra.chatRoomId');
   }
-  constructor(_scene, _chatConnection, _sharedCache) {
+  constructor(_scene, _chatConnection, sharedCache, joinSceneSuccess) {
     (0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'FcrChatRoomControlImpl'
     })));
     (0, _defineProperty2.default)(this, "_observable", new _observable.AgoraObservable());
     (0, _defineProperty2.default)(this, "_connectionState", _type.FcrChatRoomConnectionState.Disconnected);
+    (0, _defineProperty2.default)(this, "_sceneObserver", {
+      onJoinSceneSuccess: () => this._handleJoinSceneSuccess(),
+      onJoinSceneFailure: () => this._handleJoinSceneFailure()
+    });
     (0, _defineProperty2.default)(this, "_chatConnectionObserver", {
       onConnectionStateUpdated: async state => {
         // im reconnect
@@ -254,10 +261,17 @@ class FcrChatRoomControlImpl {
       }
       throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_CHATROOM, _error.FcrErrorCode.UNDEFINED_ERROR, 'unknown local message type', new Error('unknown local message type'));
     });
+    (0, _defineProperty2.default)(this, "_handleJoinSceneSuccess", () => {
+      this._joinSceneSuccess = true;
+      this._joinChatRoom(this._chatConnection.getConnectionState());
+    });
+    (0, _defineProperty2.default)(this, "_handleJoinSceneFailure", () => {
+      this._joinSceneSuccess = false;
+    });
     this._scene = _scene;
     this._chatConnection = _chatConnection;
-    this._sharedCache = _sharedCache;
-    this._roomCache = _sharedCache.getRoomCache(_scene.sceneId);
+    this._roomCache = sharedCache.getRoomCache(_scene.sceneId);
+    this._joinSceneSuccess = joinSceneSuccess;
     this._addLogObserver();
     this._chatConnection.addObserver(this._chatConnectionObserver);
     if (this._chatConnection.getConnectionInstance()) {
@@ -293,10 +307,12 @@ class FcrChatRoomControlImpl {
     });
   }
   _removeEventListener() {
+    this._scene.removeObserver(this._sceneObserver);
     this.conn.removeEventHandler("chatroom".concat(this._scene.sceneId));
   }
   _addEventListener() {
     this._removeEventListener();
+    this._scene.addObserver(this._sceneObserver);
     this.conn.addEventHandler("chatroom".concat(this._scene.sceneId), {
       onTextMessage: msg => {
         if (msg.to !== this.chatRoomId) {

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

@@ -4,7 +4,10 @@ export declare enum FcrAbility {
     RoomDetail = "room:detail",
     Live = "live",
     Interpreter = "interpreter",
-    Annotation = "annotation"
+    Annotation = "annotation",
+    Caption = "caption",
+    Transcribe = "transcribe",
+    Recording = "recording"
 }
 export interface FcrAbilityControl {
     isAbilitySupported(ability: FcrAbility): boolean;

package/lib/room-control/ability-control/type.js

@@ -10,5 +10,8 @@ let FcrAbility = exports.FcrAbility = /*#__PURE__*/function (FcrAbility) {
   FcrAbility["Live"] = "live";
   FcrAbility["Interpreter"] = "interpreter";
   FcrAbility["Annotation"] = "annotation";
+  FcrAbility["Caption"] = "caption";
+  FcrAbility["Transcribe"] = "transcribe";
+  FcrAbility["Recording"] = "recording";
   return FcrAbility;
 }({});

package/lib/room-control/helpers/constants.d.ts

@@ -44,6 +44,10 @@ export declare const ROOM_MESSAGE_COMMANDS: {
     readonly LIVE_STREAMING_UPDATE: 700;
     /** 用户被踢出命令 */
     readonly USER_KICK_OUT: 5;
+    /** 房间会话请求命令 */
+    readonly ROOM_SESSION_REQUEST: 1001;
+    /** 房间会话接受命令 */
+    readonly ROOM_SESSION_ACCEPT: 1002;
 };
 /**
  * 录制状态值

package/lib/room-control/helpers/constants.js

@@ -52,7 +52,11 @@ const ROOM_MESSAGE_COMMANDS = exports.ROOM_MESSAGE_COMMANDS = {
   /** 直播状态更新命令 */
   LIVE_STREAMING_UPDATE: 700,
   /** 用户被踢出命令 */
-  USER_KICK_OUT: 5
+  USER_KICK_OUT: 5,
+  /** 房间会话请求命令 */
+  ROOM_SESSION_REQUEST: 1001,
+  /** 房间会话接受命令 */
+  ROOM_SESSION_ACCEPT: 1002
 };
 
 /**

package/lib/room-control/index.js

@@ -45,6 +45,7 @@ var _logger = require("../utilities/logger");
 var _2 = require("..");
 var _helpers = require("./helpers");
 var _errorHelpers = require("../utilities/error-helpers");
+var _sttControl = require("./stt-control");
 var _FcrBaseRoomControlImpl;
 let _initProto; // Core SDK imports
 // Service and API imports
@@ -117,6 +118,7 @@ class FcrBaseRoomControlImpl {
           this.logger.info('[whiteboard]: join scene success, start create sharing control');
           this.sharingControl = new _sharingControl.FcrSharingControlImpl(this._scene, this._api, this._engine, this._privilegeControl, this._streamControl, this._sharedCache, this._userControl);
         }
+        this._sttControl = new _sttControl.FcrSttControlImpl(this._scene, this._api, this._sharedCache);
         this._observable.notifyObservers('onJoinRoomSuccess', sceneId);
       },
       // onJoinSceneFailure: (sceneId, error) => {
@@ -220,6 +222,17 @@ class FcrBaseRoomControlImpl {
       }
     };
   }
+
+  /**
+   * 获取字幕控制器
+   * @returns 字幕控制器实例
+   * @throws {FcrError} 如果控制器未初始化
+   */
+  // @trace
+  getSttControl() {
+    (0, _helpers.validateControllerInitialized)(this._sttControl, _errorHelpers.ControllerType.STT);
+    return this._sttControl;
+  }
   /**
    * 获取屏幕共享控制器
    * @returns 屏幕共享控制器实例
@@ -427,7 +440,7 @@ class FcrBaseRoomControlImpl {
    * @private
    */
   _handleJoinFailure(error) {
-    this.logger.error("\u52A0\u5165\u623F\u95F4\u5931\u8D25: ".concat(error.message));
+    this.logger.error("failed to join room: ".concat(error.message));
     this._observable.notifyObservers('onJoinRoomFailure', this._scene.sceneId, error);
   }
 
@@ -567,11 +580,9 @@ class FcrBaseRoomControlImpl {
     this._scene.removeObserver(this._sceneObserver);
     this._engine.removeObserver(this._engineObserver);
     try {
-      var _this$_chatRoomContro2;
+      var _this$_chatRoomContro2, _this$sharingControl, _this$sharingControl2;
       return await Promise.all([// @ts-ignore
-      (_this$_chatRoomContro2 = this._chatRoomControl) === null || _this$_chatRoomContro2 === void 0 ? void 0 : _this$_chatRoomContro2.leave(),
-      // this._whiteboardControl?.close(),
-      this._scene.leave()]);
+      (_this$_chatRoomContro2 = this._chatRoomControl) === null || _this$_chatRoomContro2 === void 0 ? void 0 : _this$_chatRoomContro2.leave(), (_this$sharingControl = this.sharingControl) === null || _this$sharingControl === void 0 ? void 0 : _this$sharingControl.getBoardControl().close(), (_this$sharingControl2 = this.sharingControl) === null || _this$sharingControl2 === void 0 ? void 0 : _this$sharingControl2.getAnnotationControl().close(), this._scene.leave()]);
     } finally {
       this._joinRoomSuccess = false;
     }

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

@@ -64,6 +64,7 @@ class FcrInterpreterControlImpl {
     this._roomCache = _sharedCache.getRoomCache(this._scene.sceneId);
     this._roomId = this._scene.sceneId;
     this._addInterpreterObservers();
+    this._addLogObserver();
   }
   createRoomControl(roomId) {
     return new _room.FcrInterpreterRoomControlImpl(this._engine, this._engine.createScene({
@@ -179,10 +180,7 @@ class FcrInterpreterControlImpl {
     });
   }
   _addLogObserver() {
-    this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onCloudRecordingStateUpdated', 'onJoinRoomFailure', 'onJoinRoomSuccess', 'onLiveStreamingStateUpdated',
-    // 'onNetworkQualityUpdated',
-    // 'onNetworkStatsUpdated',
-    'onRoomMessageReceived', 'onRoomPropertiesDeleted', 'onRoomPropertiesUpdated', 'onRoomStateUpdated', 'onInterpreterStateUpdated', 'onInterpreterUsersUpdated', 'onInterpreterRoomListUpdated']));
+    this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onInterpreterStateUpdated', 'onInterpreterUsersUpdated', 'onInterpreterRoomListUpdated']));
   }
 }
 exports.FcrInterpreterControlImpl = FcrInterpreterControlImpl;

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

@@ -25,6 +25,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FcrMainRoomControlImpl = void 0;
 require("core-js/modules/es.json.stringify.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _imports = require("../../imports");
@@ -38,6 +40,8 @@ var _schema = require("../../schema");
 var _logger = require("../../utilities/logger");
 var _validateParams = _interopRequireDefault(require("../../utilities/validate-params"));
 var _sharedStorage = require("../../utilities/shared-storage");
+var _utils = require("../whiteboard-control-v2/utils");
+var _utils2 = require("../whiteboard-control/utils");
 var _FcrMainRoomControlImpl;
 let _initProto, _enableWaitingRoomDecs, _moveToWaitingRoomByUserIdsDecs, _ref;
 function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function (e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O.static = l, O.private = f, f ? 2 === o ? k = function (e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function (e) { return e[n]; }, (o < 2 || 4 === o) && (F = function (e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == typeof P && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol.for("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol.for("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function (t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
@@ -60,6 +64,10 @@ class FcrMainRoomControlImpl extends _.FcrBaseRoomControlImpl {
     (0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'FcrMainRoomControlImpl'
     })));
+    (0, _defineProperty2.default)(this, "_privilegeObserver", {
+      onLocalUserPermissionInfoAdded: this._onLocalUserPermissionInfoAdded,
+      onLocalUserPermissionInfoDeleted: this._onLocalUserPermissionInfoDeleted
+    });
     this._groupControl = new _groupControl.FcrGroupControl(engine, scene, api, sharedCache);
     this._interpreterControl = new _interpreterControl.FcrInterpreterControlImpl(api, scene, config, engine, chatConnection, sharedCache);
     this._addLogObserver();
@@ -99,6 +107,8 @@ class FcrMainRoomControlImpl extends _.FcrBaseRoomControlImpl {
       (0, _sharedStorage.clearAnnotationBoardOptions)();
       (0, _sharedStorage.clearWhiteboardOptions)();
       await super.join(options);
+      const privilegeControl = this.getPrivilegeControl();
+      privilegeControl.addObserver(this._privilegeObserver);
       const task = sharedScheduler.addIntervalTask(() => {
         this._engine.getMonitor().uploadLog({
           userUuid: this._config.userId,
@@ -115,6 +125,8 @@ class FcrMainRoomControlImpl extends _.FcrBaseRoomControlImpl {
   }
   async leave() {
     try {
+      const privilegeControl = this.getPrivilegeControl();
+      privilegeControl.removeObserver(this._privilegeObserver);
       return await super.leave();
     } finally {
       var _this$_logUploadTask;
@@ -185,6 +197,59 @@ class FcrMainRoomControlImpl extends _.FcrBaseRoomControlImpl {
       userId
     }), _error.FcrErrorModuleCode.ROOM_WHITEBOARD, 'get whiteboard token failed');
   }
+  _onLocalUserPermissionInfoAdded(roomId, event) {
+    if ((0, _utils2.hasBoardWritePermission)(event.permissionInfo)) {
+      this.logger.info("add board write permission");
+      this.getSharingControl().getBoardControl().setOperationPrivilege(true);
+    }
+    if ((0, _utils2.hasAnnotationWritePermission)(event.permissionInfo)) {
+      this.logger.info("add annotation write permission");
+      this.getSharingControl().getAnnotationControl().setOperationPrivilege(true);
+    }
+  }
+  _onLocalUserPermissionInfoDeleted(roomId, event) {
+    if ((0, _utils2.hasBoardWritePermission)(event.permissionInfo)) {
+      this.logger.info("remove board write permission");
+      this.getSharingControl().getBoardControl().setOperationPrivilege(false);
+    }
+    if ((0, _utils2.hasAnnotationWritePermission)(event.permissionInfo)) {
+      this.logger.info("remove annotation write permission");
+      this.getSharingControl().getAnnotationControl().setOperationPrivilege(false);
+    }
+  }
+  _checkIfUpdateAnnotationMainWindow() {
+    const streamControl = this.getStreamControl();
+    const userControl = this.getUserControl();
+    const mainWindow = this.getSharingControl().getAnnotationControl().getMainWindow();
+    const annotationConfig = (0, _utils.getAnnotationConfigFromRoomProperties)(this._scene.getSceneProperties(), this.logger);
+    if (mainWindow) {
+      const stream = streamControl.getStreamList().find(stream => stream.videoSourceType === _type.FcrVideoSourceType.SCREEN);
+      const localUserId = userControl.getLocalUser().userId;
+      if (stream) {
+        var _userControl$getUser;
+        const ownerId = stream.owner.userId;
+        const isNotMeSharing = ownerId !== localUserId;
+        const platform = (_userControl$getUser = userControl.getUser(ownerId)) === null || _userControl$getUser === void 0 ? void 0 : _userControl$getUser.platform;
+        const isPcPlatform = platform && [_type.FcrPlatform.WEB_DESKTOP, _type.FcrPlatform.WINDOWS, _type.FcrPlatform.MACOS].includes(platform);
+        const isAndroidPlatform = platform && platform === _type.FcrPlatform.ANDROID;
+        this.logger.info("check if set auto cancel draw, isPcPlatform: ".concat(isPcPlatform, ", isAndroidPlatform: ").concat(isAndroidPlatform, ", isNotMeSharing: ").concat(isNotMeSharing, ", ownerId: ").concat(ownerId, ", localUserId: ").concat(localUserId, ", platform: ").concat(platform));
+        if (isPcPlatform) {
+          mainWindow.setAutoCancelDraw(false);
+        }
+        if (isAndroidPlatform) {
+          mainWindow.setAutoCancelDraw(isNotMeSharing);
+        }
+        if (!isNotMeSharing) {
+          mainWindow.clean();
+          mainWindow.updateWindowSize({
+            width: annotationConfig.size.width,
+            height: annotationConfig.size.height
+          });
+          this._api.syncScreenShareOwnerAnnotationOpenDone(this._scene.sceneId);
+        }
+      }
+    }
+  }
   _addLogObserver() {
     this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onCloudRecordingStateUpdated', 'onJoinRoomFailure', 'onJoinRoomSuccess', 'onLiveStreamingStateUpdated',
     // 'onNetworkQualityUpdated',
@@ -194,4 +259,4 @@ class FcrMainRoomControlImpl extends _.FcrBaseRoomControlImpl {
 }
 exports.FcrMainRoomControlImpl = FcrMainRoomControlImpl;
 _FcrMainRoomControlImpl = FcrMainRoomControlImpl;
-[_initProto] = _applyDecs(_FcrMainRoomControlImpl, [[_imports.trace, 2, "join"], [_imports.trace, 2, "leave"], [_enableWaitingRoomDecs, 2, "enableWaitingRoom"], [_moveToWaitingRoomByUserIdsDecs, 2, "moveToWaitingRoomByUserIds"], [_imports.trace, 2, "moveToWaitingRoomByUserRoles"], [_imports.bound, 2, "_getToken"], [_imports.bound, 2, "_getBoardToken"]], [], 0, void 0, _.FcrBaseRoomControlImpl).e;
+[_initProto] = _applyDecs(_FcrMainRoomControlImpl, [[_imports.trace, 2, "join"], [_imports.trace, 2, "leave"], [_enableWaitingRoomDecs, 2, "enableWaitingRoom"], [_moveToWaitingRoomByUserIdsDecs, 2, "moveToWaitingRoomByUserIds"], [_imports.trace, 2, "moveToWaitingRoomByUserRoles"], [_imports.bound, 2, "_onLocalUserPermissionInfoAdded"], [_imports.bound, 2, "_onLocalUserPermissionInfoDeleted"]], [], 0, void 0, _.FcrBaseRoomControlImpl).e;