fcr-core 3.6.0 → 3.6.1

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

@@ -66,4 +66,4 @@ class FcrAbilityControlImpl {
 }
 exports.FcrAbilityControlImpl = FcrAbilityControlImpl;
 _FcrAbilityControlImpl = FcrAbilityControlImpl;
-[_initProto] = _applyDecs(_FcrAbilityControlImpl, [[_imports.trace, 2, "getPlatformAbility"], [_imports.trace, 2, "isAbilitySupported"], [_imports.trace, 2, "isPlatformAbilitySupported"]], []).e;
+[_initProto] = _applyDecs(_FcrAbilityControlImpl, [[_imports.trace, 2, "isPlatformAbilitySupported"]], []).e;

package/lib/room-control/index.js

@@ -565,6 +565,6 @@ class FcrBaseRoomControlImpl {
  */
 exports.FcrBaseRoomControlImpl = FcrBaseRoomControlImpl;
 _FcrBaseRoomControlImpl = FcrBaseRoomControlImpl;
-[_initProto] = _applyDecs(_FcrBaseRoomControlImpl, [[_imports.trace, 2, "getSyncTimestamp"], [_imports.trace, 2, "getRoomInfo"], [_imports.trace, 2, "getRoomSchedule"], [_imports.trace, 2, "join"], [_imports.trace, 2, "leave"], [_imports.trace, 2, "start"], [_imports.trace, 2, "end"], [_imports.trace, 2, "close"], [_imports.trace, 2, "getRoomState"], [_imports.trace, 2, "getRoomProperties"], [_imports.trace, 2, "getRoomPropertiesByKeyPath"], [_imports.trace, 2, "updateRoomProperties"], [_imports.trace, 2, "updateIncrementRoomProperties"], [_imports.trace, 2, "deleteRoomProperties"], [_imports.trace, 2, "startCloudRecording"], [_imports.trace, 2, "pauseCloudRecording"], [_imports.trace, 2, "resumeCloudRecording"], [_imports.trace, 2, "stopCloudRecording"], [_imports.trace, 2, "getLiveStreamingState"], [_imports.trace, 2, "getLiveStreamingConfig"], [_imports.trace, 2, "startLiveStreaming"], [_imports.trace, 2, "updateLiveStreamingLayout"], [_imports.trace, 2, "stopLiveStreaming"], [_imports.trace, 2, "getCloudRecordingState"], [_imports.trace, 2, "sendRoomMessage"], [_imports.trace, 2, "isHostKeyEnabled"]], []).e;
+[_initProto] = _applyDecs(_FcrBaseRoomControlImpl, [[_imports.trace, 2, "getSyncTimestamp"], [_imports.trace, 2, "getRoomInfo"], [_imports.trace, 2, "getRoomSchedule"], [_imports.trace, 2, "join"], [_imports.trace, 2, "leave"], [_imports.trace, 2, "start"], [_imports.trace, 2, "end"], [_imports.trace, 2, "close"], [_imports.trace, 2, "getRoomState"], [_imports.trace, 2, "getRoomProperties"], [_imports.trace, 2, "getRoomPropertiesByKeyPath"], [_imports.trace, 2, "updateRoomProperties"], [_imports.trace, 2, "updateIncrementRoomProperties"], [_imports.trace, 2, "deleteRoomProperties"], [_imports.trace, 2, "startCloudRecording"], [_imports.trace, 2, "pauseCloudRecording"], [_imports.trace, 2, "resumeCloudRecording"], [_imports.trace, 2, "stopCloudRecording"], [_imports.trace, 2, "getLiveStreamingState"], [_imports.trace, 2, "getLiveStreamingConfig"], [_imports.trace, 2, "startLiveStreaming"], [_imports.trace, 2, "updateLiveStreamingLayout"], [_imports.trace, 2, "stopLiveStreaming"], [_imports.trace, 2, "getCloudRecordingState"], [_imports.trace, 2, "sendRoomMessage"]], []).e;
 class FcrSubRoomControlImpl extends FcrBaseRoomControlImpl {}
 exports.FcrSubRoomControlImpl = FcrSubRoomControlImpl;

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

@@ -54,6 +54,7 @@ class FcrInterpreterControlImpl {
       prefix: 'FcrInterpreterControlImpl'
     })));
     (0, _defineProperty2.default)(this, "_observable", new _imports.AgoraObservable());
+    (0, _defineProperty2.default)(this, "_interpreterUserList", null);
     this._api = _api;
     this._scene = _scene;
     this._config = _config;
@@ -63,6 +64,7 @@ class FcrInterpreterControlImpl {
     this._roomCache = _sharedCache.getRoomCache(this._scene.sceneId);
     this._roomId = this._scene.sceneId;
     this._addInterpreterObservers();
+    this._setInterpreterUserList();
   }
   createRoomControl(roomId) {
     return new _room.FcrInterpreterRoomControlImpl(this._engine, this._engine.createScene({
@@ -111,7 +113,7 @@ class FcrInterpreterControlImpl {
       };
     }) : null;
   }
-  getInterpreterUserList() {
+  _setInterpreterUserList() {
     const interpreter = this._scene.getScenePropertiesByKeyPath('interpreter');
     const {
       translates
@@ -131,7 +133,10 @@ class FcrInterpreterControlImpl {
         targetLanguage
       };
     });
-    return results.length > 0 ? results : null;
+    this._interpreterUserList = results.length > 0 ? results : null;
+  }
+  getInterpreterUserList() {
+    return this._interpreterUserList;
   }
   getInterpreterLanguageList() {
     const languages = this._scene.getScenePropertiesByKeyPath('interpreter.languages');
@@ -157,6 +162,9 @@ class FcrInterpreterControlImpl {
           const isUpdated = [
           // FcrInterpreterActionType.OPEN,
           _types.FcrInterpreterActionType.UPDATE].includes(actionType);
+          if (isStateUpdated || isUpdated) {
+            this._setInterpreterUserList();
+          }
           if (isStateUpdated) {
             this._observable.notifyObservers('onInterpreterStateUpdated', this._roomId, this.getState(), operatorUser);
           }
@@ -177,4 +185,4 @@ class FcrInterpreterControlImpl {
 }
 exports.FcrInterpreterControlImpl = FcrInterpreterControlImpl;
 _FcrInterpreterControlImpl = FcrInterpreterControlImpl;
-[_initProto] = _applyDecs(_FcrInterpreterControlImpl, [[_createRoomControlDecs, 2, "createRoomControl"], [_setInterpreterUsersDecs, 2, "setInterpreterUsers"], [_imports.trace, 2, "close"], [_imports.trace, 2, "getState"], [_imports.trace, 2, "getInterpreterRoomList"], [_imports.trace, 2, "getInterpreterUserList"], [_imports.trace, 2, "getInterpreterLanguageList"]], []).e;
+[_initProto] = _applyDecs(_FcrInterpreterControlImpl, [[_createRoomControlDecs, 2, "createRoomControl"], [_setInterpreterUsersDecs, 2, "setInterpreterUsers"], [_imports.trace, 2, "close"], [_imports.trace, 2, "getState"], [_imports.trace, 2, "getInterpreterRoomList"], [_imports.trace, 2, "getInterpreterLanguageList"]], []).e;

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

@@ -43,6 +43,7 @@ var _error = require("../../utilities/error");
 var _logger = require("../../utilities/logger");
 var _validateParams = _interopRequireDefault(require("../../utilities/validate-params"));
 var _schema = require("../../schema");
+var _type2 = require("agora-rte-sdk/lib/core/scene/type");
 var _FcrStreamControlImpl;
 let _initProto, _addLocalStreamsDecs, _bindLocalStreamsDecs, _updatePublishPrivilegeOfStreamsDecs, _removeStreamsDecs, _setVideoEncoderConfigDecs, _startRenderRemoteVideoStreamDecs, _stopRenderRemoteVideoStreamDecs, _startPlayRemoteAudioStreamDecs, _stopPlayRemoteAudioStreamDecs, _takeSnapshotDecs, _addLocalScreenStreamDecs, _adjustRemoteAudioStreamVolumeDecs, _mergeAudioStreamDecs, _splitAudioStreamDecs, _ref;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -52,10 +53,10 @@ 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; }
-_ref = (_addLocalStreamsDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.fcrLocalStreamCreateArrayConfigSchema)], _bindLocalStreamsDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.fcrStreamBindConfigArrySchema)], _updatePublishPrivilegeOfStreamsDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.fcrUpdateStreamCustomSchema, _schema.fcrUpdateStreamPrivilegeScopeSchema.optional())], _removeStreamsDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.stringArraySchema)], _setVideoEncoderConfigDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.stringSchema, _schema.agoraRtcVideoEncoderConfigurationSchema, _schema.fcrVideoStreamTypeSchema)], _startRenderRemoteVideoStreamDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.stringSchema, _schema.fcrVideoStreamTypeSchema, _schema.fcrRenderConfigSchema, (0, _schema.createUnionSchema)([_schema.fcrRenderViewSchema, _imports.objectSchema]))], _stopRenderRemoteVideoStreamDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.stringSchema, _schema.fcrRenderViewSchema)], _startPlayRemoteAudioStreamDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _stopPlayRemoteAudioStreamDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _takeSnapshotDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.stringSchema, _schema.stringSchema)], _addLocalScreenStreamDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.fcrScreenStreamCreateConfigSchema)], _adjustRemoteAudioStreamVolumeDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.stringSchema, _schema.numberSchema)], _mergeAudioStreamDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _splitAudioStreamDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.stringSchema)], "logger");
 /**
  * @internal
  */
+_ref = (_addLocalStreamsDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.fcrLocalStreamCreateArrayConfigSchema)], _bindLocalStreamsDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.fcrStreamBindConfigArrySchema)], _updatePublishPrivilegeOfStreamsDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.fcrUpdateStreamCustomSchema, _schema.fcrUpdateStreamPrivilegeScopeSchema.optional())], _removeStreamsDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.stringArraySchema)], _setVideoEncoderConfigDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.stringSchema, _schema.agoraRtcVideoEncoderConfigurationSchema, _schema.fcrVideoStreamTypeSchema)], _startRenderRemoteVideoStreamDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.stringSchema, _schema.fcrVideoStreamTypeSchema, _schema.fcrRenderConfigSchema, (0, _schema.createUnionSchema)([_schema.fcrRenderViewSchema, _imports.objectSchema]))], _stopRenderRemoteVideoStreamDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.stringSchema, _schema.fcrRenderViewSchema)], _startPlayRemoteAudioStreamDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _stopPlayRemoteAudioStreamDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _takeSnapshotDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.stringSchema, _schema.stringSchema)], _addLocalScreenStreamDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.fcrScreenStreamCreateConfigSchema)], _adjustRemoteAudioStreamVolumeDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.stringSchema, _schema.numberSchema)], _mergeAudioStreamDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _splitAudioStreamDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.stringSchema)], "logger");
 class FcrStreamControlImpl {
   constructor(_engine, _scene, _api, _sharedCache) {
     //@internal
@@ -160,6 +161,9 @@ class FcrStreamControlImpl {
         connectorType: info.connectorType
       };
     });
+    (0, _defineProperty2.default)(this, "_getPublishStateByPrivilege", privilege => {
+      return privilege === _type2.AgoraRteStreamPrivilegeOperation.HAS_PRIVILEGE ? 1 : privilege === _type2.AgoraRteStreamPrivilegeOperation.NOPRIVILEGE ? 0 : undefined;
+    });
     (0, _defineProperty2.default)(this, "_convertStreamEvent", event => {
       return {
         modifiedStream: this._convertStreamInfo(event.modifiedStream),
@@ -231,28 +235,69 @@ class FcrStreamControlImpl {
     }
   }
   addLocalStreams(streams) {
-    return (0, _error.handleRequestError)(() => this._scene.localUser.addLocalStreams(streams), _error.FcrErrorModuleCode.ROOM_STREAM, 'add local streams failed');
+    return (0, _error.handleRequestError)(() => this._api.upsertStreamBatch(this._scene.sceneId, streams.map(config => {
+      var _config$generateToken;
+      return _objectSpread({
+        streamName: config.streamName,
+        streamUuid: '0',
+        // means that this stream needs to be created
+        generateToken: (_config$generateToken = config.generateToken) !== null && _config$generateToken !== void 0 ? _config$generateToken : config.videoSourceType === _imports.AgoraRteVideoSourceType.SCREEN,
+        userUuid: config.ownerId,
+        videoSourceType: config.videoSourceType,
+        audioSourceType: config.audioSourceType,
+        videoSourceUuid: config.videoSourceId,
+        audioSourceUuid: config.audioSourceId
+      }, (0, _imports.convertStreamTypeToPublishState)(config.streamType));
+    })), _error.FcrErrorModuleCode.ROOM_STREAM, 'add local streams failed');
   }
   bindLocalStreams(streams) {
-    return (0, _error.handleRequestError)(() => this._scene.localUser.bindLocalStreams(streams), _error.FcrErrorModuleCode.ROOM_STREAM, 'bind local streams failed');
+    return (0, _error.handleRequestError)(() => this._api.upsertStreamBatch(this._scene.sceneId, streams.map(config => ({
+      streamUuid: config.streamId,
+      videoSourceUuid: config.videoSourceId,
+      audioSourceUuid: config.audioSourceId
+    }))), _error.FcrErrorModuleCode.ROOM_STREAM, 'bind local streams failed');
   }
   updatePublishPrivilegeOfStreams() {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
     if (args.length === 1) {
-      return (0, _error.handleRequestError)(() => this._scene.localUser.updatePublishPrivilegeOfStreams(args[0]), _error.FcrErrorModuleCode.ROOM_STREAM, 'update publish privilege of streams failed');
+      const privileges = args[0];
+      return (0, _error.handleRequestError)(() => this._api.upsertStreamBatch(this._scene.sceneId, Object.keys(privileges).map(streamId => ({
+        streamUuid: streamId,
+        audioState: this._getPublishStateByPrivilege(privileges[streamId].audioPrivilege),
+        videoState: this._getPublishStateByPrivilege(privileges[streamId].videoPrivilege)
+      }))), _error.FcrErrorModuleCode.ROOM_STREAM, 'update publish privilege of streams failed');
     } else if (args.length === 2) {
       const [privilege, scope] = args;
       const targetRteRoles = scope.targetRoleType.map(role => _type.FcrUserRoleToStringMap[role]);
-      return (0, _error.handleRequestError)(() => this._scene.localUser.updatePublishPrivilegeOfStreams(privilege, {
-        targetRoleType: targetRteRoles,
-        targetRoleTypeIsInclude: scope.targetRoleTypeIsInclude
+      const includeRoles = [];
+      const excludeRoles = [];
+      const condition = {
+        videoSourceType: scope.videoSourceType,
+        audioSourceType: scope.audioSourceType
+      };
+      if (scope.targetRoleTypeIsInclude) {
+        includeRoles.push(...targetRteRoles);
+      } else {
+        excludeRoles.push(...targetRteRoles);
+      }
+      const audioState = this._getPublishStateByPrivilege(privilege.audioPrivilege);
+      const videoState = this._getPublishStateByPrivilege(privilege.videoPrivilege);
+      return (0, _error.handleRequestError)(() => this._api.updateStreamBatchByCondition({
+        roomUuid: this._scene.sceneId,
+        includeRoles,
+        excludeRoles,
+        videoState,
+        audioState,
+        condition
       }), _error.FcrErrorModuleCode.ROOM_STREAM, 'update publish privilege of streams failed');
     }
   }
   removeStreams(streams) {
-    return (0, _error.handleRequestError)(() => this._scene.localUser.removeStreams(streams), _error.FcrErrorModuleCode.ROOM_STREAM, 'remove streams failed');
+    return (0, _error.handleRequestError)(() => this._api.deleteStreamBatch(this._scene.sceneId, streams.map(streamUuid => ({
+      streamUuid
+    }))), _error.FcrErrorModuleCode.ROOM_STREAM, 'remove streams failed');
   }
   setVideoEncoderConfig(streamId, config, streamType) {
     return this._scene.localUser.setVideoEncoderConfig(config, streamType, streamId);

package/lib/service/api.d.ts

@@ -5,6 +5,7 @@ import { FcrCheckInParams, FcrChatRoomTokenResData } from './type';
 import { FcrBoardRegion, FcrSharePermissionState } from '../room-control/whiteboard-control/enums';
 import { FcrPrivilegeUserRole, FcrSecuritySendChatPayload } from '../room-control/privilege-control/type';
 import { FcrUserKickedOutType } from '../room-control/user-control/type';
+import { AgoraRteAudioSourceType, AgoraRteMediaPublishState, AgoraRteVideoSourceType } from 'agora-rte-sdk/lib/type';
 export declare class FcrCoreServiceApi {
     private _client;
     protected logger: import("agora-foundation/lib/logger").Logger;
@@ -347,4 +348,29 @@ export declare class FcrCoreServiceApi {
     closeInterpreter(params: {
         roomId: string;
     }): Promise<any>;
+    upsertStreamBatch(roomUuid: string, streams: {
+        streamName?: string;
+        userUuid?: string;
+        streamUuid?: string;
+        videoState?: AgoraRteMediaPublishState;
+        audioState?: AgoraRteMediaPublishState;
+        videoSourceType?: AgoraRteVideoSourceType;
+        audioSourceType?: AgoraRteAudioSourceType;
+        videoSourceUuid?: string;
+        audioSourceUuid?: string;
+    }[]): Promise<any>;
+    updateStreamBatchByCondition({ roomUuid, videoState, audioState, includeRoles, excludeRoles, condition, }: {
+        roomUuid: string;
+        videoState?: number;
+        audioState?: number;
+        includeRoles?: string[];
+        excludeRoles?: string[];
+        condition?: {
+            videoSourceType?: number;
+            audioSourceType?: number;
+        };
+    }): Promise<any>;
+    deleteStreamBatch(roomUuid: string, streams: {
+        streamUuid: string;
+    }[]): Promise<any>;
 }

package/lib/service/api.js

@@ -960,5 +960,46 @@ class FcrCoreServiceApi {
     });
     return res;
   }
+  async upsertStreamBatch(roomUuid, streams) {
+    return await this._client.fetch({
+      path: "/v1/rooms/".concat(roomUuid, "/streams"),
+      method: 'PUT',
+      data: {
+        streams
+      }
+    });
+  }
+  async updateStreamBatchByCondition(_ref21) {
+    let {
+      roomUuid,
+      videoState,
+      audioState,
+      includeRoles,
+      excludeRoles,
+      condition
+    } = _ref21;
+    return await this._client.fetch({
+      path: "/v1/rooms/".concat(roomUuid, "/conditions/streams"),
+      method: 'PUT',
+      data: {
+        includeRoles,
+        excludeRoles,
+        stream: {
+          videoState,
+          audioState
+        },
+        condition
+      }
+    });
+  }
+  async deleteStreamBatch(roomUuid, streams) {
+    return await this._client.fetch({
+      path: "/v1/rooms/".concat(roomUuid, "/streams"),
+      method: 'DELETE',
+      data: {
+        streams
+      }
+    });
+  }
 }
 exports.FcrCoreServiceApi = FcrCoreServiceApi;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fcr-core",
   "description": "Core APIs for building online scenes",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "module": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -40,7 +40,7 @@
     "@types/lodash": "^4.14.168",
     "@types/sinon": "^17.0.2",
     "@types/uuid": "^8.3.0",
-    "agora-toolchain": "^3.6.0",
+    "agora-toolchain": "~3.6.1",
     "core-js": "^3.33.3",
     "decomment": "^0.9.5",
     "husky": "^9.0.11",
@@ -60,8 +60,8 @@
     "@netless/video-js-plugin": "^0.3.8",
     "@netless/white-snapshot": "^0.4.2",
     "@netless/window-manager": "^0.4.72",
-    "agora-foundation": "^3.6.0",
-    "agora-rte-sdk": "^3.6.0",
+    "agora-foundation": "~3.6.1",
+    "agora-rte-sdk": "~3.6.1",
     "await-to-js": "^3.0.0",
     "dayjs": "^1.10.4",
     "easemob-websdk": "4.8.1",