fcr-core 3.8.0 → 3.8.1-beta

package/lib/room-control/sharing-control/index.d.ts

@@ -29,7 +29,7 @@ export declare class FcrSharingControlImpl implements FcrSharingControl {
     get ownerId(): string;
     get ownerStream(): FcrStreamInfo | null;
     constructor(_scene: AgoraRteScene, _api: FcrCoreServiceApi, _engine: AgoraRteEngine, _privilegeControl: FcrPrivilegeControl, _streamControl: FcrStreamControl, _sharedCache: FcrSharedCache, _userControl: FcrUserControl);
-    startScreenSharing(config: FcrScreenStreamCreateConfig, size?: FcrSize): Promise<string>;
+    startScreenSharing(config: FcrScreenStreamCreateConfig, size?: FcrSize, labels?: Map<string, any>): Promise<string>;
     startWhiteboard(): Promise<void>;
     updateScreenSharing(enableAnnotation: boolean): Promise<void>;
     stop(): Promise<void>;

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

@@ -85,9 +85,9 @@ class FcrSharingControlImpl {
     this._scene.addObserver(this._sceneObserver);
     this.logger.info(`initialized, room id: ${this._scene.sceneId}`);
   }
-  async startScreenSharing(config, size) {
+  async startScreenSharing(config, size, labels) {
     try {
-      const streamId = await this._streamControl.addLocalScreenStream(config, size);
+      const streamId = await this._streamControl.addLocalScreenStream(config, size, labels);
       return streamId;
     } catch (error) {
       throw error;

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

@@ -319,7 +319,7 @@ class FcrStreamControlImpl {
   takeSnapshot(streamId, filePath) {
     return this._scene.streamPlayer.takeSnapshot(streamId, filePath);
   }
-  async addLocalScreenStream(config, size) {
+  async addLocalScreenStream(config, size, labels) {
     const res = await (0, _error.handleRequestError)(() => this._api.startShareScreen({
       roomId: this._scene.sceneId,
       userId: this._scene.getLocalUser().getLocalUserId(),
@@ -352,6 +352,10 @@ class FcrStreamControlImpl {
     } = res;
     this._screenStreamId = streamId;
     this._scene.localUser.prepareToPublishStream(streamId, token);
+    if (labels) {
+      // add label to scene
+      this._scene.addLocalStreamLabels(streamId, labels);
+    }
     return streamId;
   }
   async removeScreenStream() {
@@ -362,6 +366,7 @@ class FcrStreamControlImpl {
       });
     }, _error.FcrErrorModuleCode.ROOM_STREAM, 'remove screen stream failed');
     if (this._screenStreamId) {
+      this._scene.removeLocalStreamLabel(this._screenStreamId);
       this._scene.localUser.removePreparePublishStream(this._screenStreamId);
     }
     return res;

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

@@ -114,7 +114,7 @@ export interface FcrStreamControl {
      * Adds a local screen stream.
      * @param config
      */
-    addLocalScreenStream(config: FcrScreenStreamCreateConfig, size?: FcrSize): Promise<string>;
+    addLocalScreenStream(config: FcrScreenStreamCreateConfig, size?: FcrSize, label?: Map<string, any>): Promise<string>;
     /**
      * Removes the local screen stream.
      */

package/lib/room-router/index.js

@@ -98,8 +98,12 @@ class FcrRoomRouterImpl {
     this._abortController = null;
     if (error) {
       this._handleJoinRoomError(error);
-      throw error;
+      return Promise.reject(error);
     }
+    if (!this._roomControl) {
+      return Promise.reject(new Error('Room control is not initialized'));
+    }
+    return Promise.resolve(this._roomControl);
   }
   async leaveRoom() {
     this._abortController?.abort();

package/lib/room-router/type.d.ts

@@ -1,7 +1,7 @@
 import { FcrInterpreterRoomControlImpl } from '../room-control/interpreter-control/room';
 import { FcrJoinBeforeHostWaitingRoomControlImpl } from '../room-control/join-before-host-waitingroom-control';
 import { FcrMainRoomControlImpl } from '../room-control/mainroom-control';
-import { FcrJoinBeforeHostWaitingRoomControl, FcrMainRoomControl, FcrRoomJoinOptions, FcrRoomType, FcrWaitingRoomControl } from '../room-control/type';
+import { FcrBaseRoomControl, FcrJoinBeforeHostWaitingRoomControl, FcrMainRoomControl, FcrRoomJoinOptions, FcrRoomType, FcrWaitingRoomControl } from '../room-control/type';
 import { FcrWaitingRoomControlImpl } from '../room-control/waitingroom-control';
 import { FcrError } from '../utilities/error';
 export type FcrRoomControlType = FcrMainRoomControl | FcrWaitingRoomControl | FcrJoinBeforeHostWaitingRoomControl;
@@ -34,7 +34,7 @@ export interface FcrRoomRouter {
     /**
      * 加入会议
      */
-    joinRoom(options: FcrRoomJoinOptions): Promise<void>;
+    joinRoom(options: FcrRoomJoinOptions): Promise<FcrBaseRoomControl>;
     /**
      * 离开会议
      */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fcr-core",
   "description": "Core APIs for building online scenes",
-  "version": "3.8.0",
+  "version": "3.8.1-beta",
   "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.8.0",
+    "agora-toolchain": "3.8.1-beta",
     "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": "^1.0.7-beta.6",
-    "agora-foundation": "3.8.0",
-    "agora-rte-sdk": "3.8.0",
+    "agora-foundation": "3.8.1-beta",
+    "agora-rte-sdk": "3.8.1-beta",
     "await-to-js": "^3.0.0",
     "dayjs": "^1.10.4",
     "easemob-websdk": "4.13.0",
@@ -92,4 +92,4 @@
   "lint-staged": {
     "*.{ts,tsx,html,css}": "prettier --write"
   }
-}
+}