fcr-core 3.7.8 → 3.8.0-alpha

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

@@ -8,8 +8,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FcrStreamControlImpl = void 0;
+exports.FcrSubscribedStreamsControl = exports.FcrStreamControlImpl = void 0;
 require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.find.js");
@@ -66,7 +67,7 @@ class FcrStreamControlImpl {
     //@internal
     (0, _defineProperty2.default)(this, "_streamList", []);
     //@internal
-    (0, _defineProperty2.default)(this, "_remoteSubscribedStreamRenderMap", new Map());
+    (0, _defineProperty2.default)(this, "_subscribedStreamsControl", new FcrSubscribedStreamsControl());
     //@internal
     (0, _defineProperty2.default)(this, "_sceneObserver", {
       onStreamsAdded: (sceneId, events) => {
@@ -229,8 +230,8 @@ class FcrStreamControlImpl {
       return this._convertStreamInfo(streamInfo);
     }
   }
-  addLocalStreams(streams) {
-    return (0, _error.handleRequestError)(() => this._api.createStreamBatch(this._scene.sceneId, streams.map(config => {
+  async addLocalStreams(streams) {
+    const streamCreateResult = await (0, _error.handleRequestError)(() => this._api.createStreamBatch(this._scene.sceneId, streams.map(config => {
       var _config$generateToken;
       return _objectSpread({
         streamName: config.streamName,
@@ -244,6 +245,37 @@ class FcrStreamControlImpl {
         audioSourceUuid: config.audioSourceId
       }, (0, _imports.convertStreamTypeToPublishState)(config.streamType));
     })), _error.FcrErrorModuleCode.ROOM_STREAM, 'add local streams failed');
+
+    // 处理需要 token 的流
+    this._handleStreamTokensPreparation(streams, streamCreateResult.data);
+    return streamCreateResult;
+  }
+
+  /**
+   * 处理流的 token 准备工作
+   * @param streams 流配置列表
+   */
+  _handleStreamTokensPreparation(streams, streamCreateResultData) {
+    // 提前过滤出需要 token
+    const streamConfigMap = new Map();
+    streams.forEach(config => {
+      const needsToken = config.generateToken || config.videoSourceType === _imports.AgoraRteVideoSourceType.SCREEN;
+      if (needsToken) {
+        streamConfigMap.set(config.ownerId, config);
+      }
+    });
+
+    // 如果没有需要 token 的流，直接返回
+    if (streamConfigMap.size === 0) {
+      return;
+    }
+
+    // 遍历返回的流数据，准备发布流
+    streamCreateResultData.forEach(stream => {
+      if (stream.rtcToken && streamConfigMap.has(stream.userUuid)) {
+        this._scene.localUser.prepareToPublishStream(stream.streamUuid, stream.rtcToken);
+      }
+    });
   }
   bindLocalStreams(streams) {
     return this._scene.localUser.bindLocalStreams(streams);
@@ -285,49 +317,54 @@ class FcrStreamControlImpl {
       }), _error.FcrErrorModuleCode.ROOM_STREAM, 'update publish privilege of streams failed');
     }
   }
-  removeStreams(streams) {
-    return (0, _error.handleRequestError)(() => this._api.deleteStreamBatch(this._scene.sceneId, streams.map(streamUuid => ({
+  async removeStreams(streams) {
+    const res = await (0, _error.handleRequestError)(() => this._api.deleteStreamBatch(this._scene.sceneId, streams.map(streamUuid => ({
       streamUuid
     }))), _error.FcrErrorModuleCode.ROOM_STREAM, 'remove streams failed');
+    streams.forEach(streamUuid => {
+      this._scene.localUser.removePreparePublishStream(streamUuid);
+    });
+    return res;
   }
   setVideoEncoderConfig(streamId, config, streamType) {
     return this._scene.localUser.setVideoEncoderConfig(config, streamType, streamId);
   }
+  setDualStreamMode(streamId, enable) {
+    return this._scene.localUser.setDualStreamMode(streamId, enable);
+  }
   setScreenScenario(type) {
     return this._scene.localUser.setScreenScenario(type);
   }
   startRenderRemoteVideoStream(streamId, type, config, element) {
-    // 需要建立订阅的 streamId 的引用计数
-    // 可参考数据结构：Map <streamId,  array: canvasId>
-    // 当 startRender 相同的 streamId 时且 canvasId 不同时，计数加一
-    // 引用计数大于0时，不再调用 subscribeRemoteVideoStream；
-
-    const elements = this._remoteSubscribedStreamRenderMap.get(streamId) || [];
-    const renderCount = elements.length;
-    const isDifferentCanvas = !(elements !== null && elements !== void 0 && elements.includes(element));
-    if (renderCount === 0 || isDifferentCanvas) {
-      var _this$_remoteSubscrib;
-      this._remoteSubscribedStreamRenderMap.set(streamId, [...elements, element]);
-      this.logger.info("[FcrStreamControl][subscribe-remote-video-stream] start subscribe streamId: ".concat(streamId, ", before subscribe renderCount: ").concat(renderCount, ", after subscribe renderCount: ").concat((_this$_remoteSubscrib = this._remoteSubscribedStreamRenderMap.get(streamId)) === null || _this$_remoteSubscrib === void 0 ? void 0 : _this$_remoteSubscrib.length));
-    }
+    const startTime = Date.now();
+    const parameters = "streamId: ".concat(streamId, ", config: ").concat(JSON.stringify(config), ", type: ").concat(type, ", element: ").concat(element);
     this._scene.streamPlayer.subscribeRemoteVideoStream(streamId, type);
-    this._scene.streamPlayer.startRenderRemoteVideoStream(streamId, type, config.renderMode, config.isMirror, element);
+    try {
+      this._scene.streamPlayer.startRenderRemoteVideoStream(streamId, config.renderMode, config.isMirror, element);
+      const viewId = this._subscribedStreamsControl.getViewId(element);
+      this._subscribedStreamsControl.bind(viewId, streamId);
+    } catch (error) {
+      this.logger.error("[FcrStreamControl][start-render-remote-video-stream] render failed, streamId: ".concat(streamId, ", error: ").concat(error, ", parameters: ").concat(parameters, ", duration: ").concat(Date.now() - startTime, "ms"));
+      throw error;
+    }
   }
   stopRenderRemoteVideoStream(streamId, element) {
-    // 当 stopRender 相同的 streamId 与 canvasId 时，计数减一
-    // 引用计数减为 0 时，调用 unsubscribeRemoteVideoStream
-    const elements = this._remoteSubscribedStreamRenderMap.get(streamId) || [];
-    const isSameCanvas = elements === null || elements === void 0 ? void 0 : elements.includes(element);
-    if (isSameCanvas) {
-      const rest = elements === null || elements === void 0 ? void 0 : elements.filter(e => e !== element);
-      this._remoteSubscribedStreamRenderMap.set(streamId, rest);
-      this.logger.info("[FcrStreamControl][unsubscribe-remote-video-stream] has same canvas, streamId: ".concat(streamId, ", subtract renderCount, do not unsubscribe remote video stream, rest renderCount: ").concat(rest.length));
-    }
-    if (elements.length === 0) {
-      this._scene.streamPlayer.unsubscribeRemoteVideoStream(streamId);
-      this.logger.info("[FcrStreamControl][unsubscribe-remote-video-stream] renderCount ".concat(elements.length, " is 0, unsubscribeRemoteVideoStream streamId: ").concat(streamId));
+    const startTime = Date.now();
+    const parameters = "streamId: ".concat(streamId, ", element: ").concat(element);
+    try {
+      this._scene.streamPlayer.stopRenderRemoteVideoStream(streamId, element);
+      const viewId = this._subscribedStreamsControl.getViewId(element);
+      this._subscribedStreamsControl.unbind(viewId, streamId);
+      const shouldUnsubscribe = this._subscribedStreamsControl.isEmpty(streamId);
+      if (shouldUnsubscribe) {
+        this._scene.streamPlayer.unsubscribeRemoteVideoStream(streamId);
+      } else {
+        this.logger.info("[FcrStreamControl][unsubscribe-remote-video-stream] still has other views, do not unsubscribe, streamId: ".concat(streamId, ", parameters: ").concat(parameters, ", duration: ").concat(Date.now() - startTime, "ms"));
+      }
+    } catch (error) {
+      this.logger.error("[FcrStreamControl][stop-render-remote-video-stream] stop render failed, streamId: ".concat(streamId, ", error: ").concat(error, ", parameters: ").concat(parameters, ", duration: ").concat(Date.now() - startTime, "ms"));
+      throw error;
     }
-    this._scene.streamPlayer.stopRenderRemoteVideoStream(streamId, element);
   }
   startPlayRemoteAudioStream(streamId) {
     this._scene.streamPlayer.startPlayRemoteAudioStream(streamId);
@@ -370,7 +407,7 @@ class FcrStreamControlImpl {
       }
     } = res;
     this._screenStreamId = streamId;
-    this._scene.localUser.prepareToPublishScreenStream(streamId, token);
+    this._scene.localUser.prepareToPublishStream(streamId, token);
     return streamId;
   }
   async removeScreenStream() {
@@ -381,7 +418,7 @@ class FcrStreamControlImpl {
       });
     }, _error.FcrErrorModuleCode.ROOM_STREAM, 'remove screen stream failed');
     if (this._screenStreamId) {
-      this._scene.localUser.removePreparePublishScreenStream(this._screenStreamId);
+      this._scene.localUser.removePreparePublishStream(this._screenStreamId);
     }
     return res;
   }
@@ -437,4 +474,70 @@ class FcrStreamControlImpl {
 }
 exports.FcrStreamControlImpl = FcrStreamControlImpl;
 _FcrStreamControlImpl = FcrStreamControlImpl;
-[_initProto] = _applyDecs(_FcrStreamControlImpl, [[_imports.bound, 2, "getStreams"], [_imports.bound, 2, "getStreamList"], [_imports.bound, 2, "getStreamsByUserId"], [_imports.bound, 2, "getStreamByStreamId"], [_addLocalStreamsDecs, 2, "addLocalStreams"], [_bindLocalStreamsDecs, 2, "bindLocalStreams"], [_updatePublishPrivilegeOfStreamsDecs, 2, "updatePublishPrivilegeOfStreams"], [_removeStreamsDecs, 2, "removeStreams"], [_setVideoEncoderConfigDecs, 2, "setVideoEncoderConfig"], [_setScreenScenarioDecs, 2, "setScreenScenario"], [_startRenderRemoteVideoStreamDecs, 2, "startRenderRemoteVideoStream"], [_stopRenderRemoteVideoStreamDecs, 2, "stopRenderRemoteVideoStream"], [_startPlayRemoteAudioStreamDecs, 2, "startPlayRemoteAudioStream"], [_stopPlayRemoteAudioStreamDecs, 2, "stopPlayRemoteAudioStream"], [_takeSnapshotDecs, 2, "takeSnapshot"], [_addLocalScreenStreamDecs, 2, "addLocalScreenStream"], [[_imports.bound, _imports.trace], 2, "removeScreenStream"], [_adjustRemoteAudioStreamVolumeDecs, 2, "adjustRemoteAudioStreamVolume"], [_mergeAudioStreamDecs, 2, "mergeAudioStream"], [_splitAudioStreamDecs, 2, "splitAudioStream"]], []).e;
+[_initProto] = _applyDecs(_FcrStreamControlImpl, [[_imports.bound, 2, "getStreams"], [_imports.bound, 2, "getStreamList"], [_imports.bound, 2, "getStreamsByUserId"], [_imports.bound, 2, "getStreamByStreamId"], [_addLocalStreamsDecs, 2, "addLocalStreams"], [_bindLocalStreamsDecs, 2, "bindLocalStreams"], [_updatePublishPrivilegeOfStreamsDecs, 2, "updatePublishPrivilegeOfStreams"], [_removeStreamsDecs, 2, "removeStreams"], [_setVideoEncoderConfigDecs, 2, "setVideoEncoderConfig"], [[_imports.bound, _imports.trace], 2, "setDualStreamMode"], [_setScreenScenarioDecs, 2, "setScreenScenario"], [_startRenderRemoteVideoStreamDecs, 2, "startRenderRemoteVideoStream"], [_stopRenderRemoteVideoStreamDecs, 2, "stopRenderRemoteVideoStream"], [_startPlayRemoteAudioStreamDecs, 2, "startPlayRemoteAudioStream"], [_stopPlayRemoteAudioStreamDecs, 2, "stopPlayRemoteAudioStream"], [_takeSnapshotDecs, 2, "takeSnapshot"], [_addLocalScreenStreamDecs, 2, "addLocalScreenStream"], [[_imports.bound, _imports.trace], 2, "removeScreenStream"], [_adjustRemoteAudioStreamVolumeDecs, 2, "adjustRemoteAudioStreamVolume"], [_mergeAudioStreamDecs, 2, "mergeAudioStream"], [_splitAudioStreamDecs, 2, "splitAudioStream"]], []).e;
+class FcrSubscribedStreamsControl {
+  constructor() {
+    (0, _defineProperty2.default)(this, "logger", (0, _logger.createLogger)({
+      prefix: 'StreamSubscriptionManager'
+    }));
+    //@internal
+    /**
+     * Map of remote subscribed streams to their bound view IDs
+     * key: streamId - The ID of the remote video stream
+     * value: string[] - Array of viewIds bound to this stream
+     */
+    (0, _defineProperty2.default)(this, "_remoteSubscribedStreamRenderMap", new Map());
+  }
+  getViewId(element) {
+    // Adapt for harmony: AgoraRteRenderView is string in harmony, HTMLElement in web
+    if (typeof element === 'string') {
+      return element;
+    } else {
+      // @ts-ignore
+      const viewId = element.getAttribute('data-render-id');
+      if (!viewId) {
+        const uniqueId = (0, _imports.v4)();
+        // @ts-ignore
+        element.setAttribute('data-render-id', uniqueId);
+        return uniqueId;
+      }
+      return viewId;
+    }
+  }
+  isEmpty(streamId) {
+    const viewIds = this._remoteSubscribedStreamRenderMap.get(streamId);
+    return !viewIds || viewIds.length === 0;
+  }
+  bind(viewId, streamId) {
+    if (!streamId || !viewId) {
+      this.logger.warn("[FcrStreamControl][bind-view-to-stream] invalid parameters, streamId: ".concat(streamId, ", viewId: ").concat(viewId));
+      return;
+    }
+    const viewIds = this._remoteSubscribedStreamRenderMap.get(streamId) || [];
+    const isAlreadyBound = viewIds.includes(viewId);
+    if (!isAlreadyBound) {
+      viewIds.push(viewId);
+      this._remoteSubscribedStreamRenderMap.set(streamId, viewIds);
+    } else {
+      this.logger.warn("[FcrStreamControl][bind-view-to-stream] viewId already bound, streamId: ".concat(streamId, ", viewId: ").concat(viewId));
+    }
+  }
+  unbind(viewId, streamId) {
+    if (!streamId || !viewId) {
+      this.logger.warn("[FcrStreamControl][unbind-view-from-stream] invalid parameters, streamId: ".concat(streamId, ", viewId: ").concat(viewId));
+      return;
+    }
+    const viewIds = this._remoteSubscribedStreamRenderMap.get(streamId);
+    if (!viewIds || !viewIds.includes(viewId)) {
+      this.logger.warn("[FcrStreamControl][unbind-view-from-stream] viewId not found, streamId: ".concat(streamId, ", viewId: ").concat(viewId));
+      return;
+    }
+    const rest = viewIds.filter(id => id !== viewId);
+    if (rest.length === 0) {
+      this._remoteSubscribedStreamRenderMap.delete(streamId);
+    } else {
+      this._remoteSubscribedStreamRenderMap.set(streamId, rest);
+    }
+  }
+}
+exports.FcrSubscribedStreamsControl = FcrSubscribedStreamsControl;

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

@@ -59,6 +59,12 @@ export interface FcrStreamControl {
      * @param streamType
      */
     setVideoEncoderConfig(streamId: string, config: FcrVideoEncoderConfig, streamType: FcrVideoStreamType): void;
+    /**
+     * Sets the dual stream mode for a local stream.
+     * @param streamId
+     * @param enable
+     */
+    setDualStreamMode(streamId: string, enableDualStreamMode: boolean): void;
     /**
      * Starts rendering the remote video stream.
      * @param streamId

package/lib/room-control/stt-control/de-compress-gzip.d.ts

@@ -0,0 +1 @@
+export declare function deCompressGzipToJson(compressedData: Uint8Array<ArrayBufferLike>): Promise<any>;

package/lib/room-control/stt-control/de-compress-gzip.js

@@ -0,0 +1,49 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.deCompressGzipToJson = deCompressGzipToJson;
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.array-buffer.constructor.js");
+require("core-js/modules/es.array-buffer.slice.js");
+require("core-js/modules/es.typed-array.uint8-array.js");
+require("core-js/modules/es.typed-array.at.js");
+require("core-js/modules/es.typed-array.fill.js");
+require("core-js/modules/es.typed-array.find-last.js");
+require("core-js/modules/es.typed-array.find-last-index.js");
+require("core-js/modules/es.typed-array.set.js");
+require("core-js/modules/es.typed-array.sort.js");
+require("core-js/modules/es.typed-array.to-reversed.js");
+require("core-js/modules/es.typed-array.to-sorted.js");
+require("core-js/modules/es.typed-array.with.js");
+require("core-js/modules/esnext.array-buffer.detached.js");
+require("core-js/modules/esnext.array-buffer.transfer.js");
+require("core-js/modules/esnext.array-buffer.transfer-to-fixed-length.js");
+require("core-js/modules/esnext.json.parse.js");
+require("core-js/modules/esnext.typed-array.filter-reject.js");
+require("core-js/modules/esnext.typed-array.group-by.js");
+require("core-js/modules/esnext.typed-array.to-spliced.js");
+require("core-js/modules/esnext.typed-array.unique-by.js");
+async function deCompressGzipToJson(compressedData) {
+  try {
+    // 检查浏览器是否支持 Compression Streams API
+    if (typeof DecompressionStream === 'undefined') {
+      throw new Error('DecompressionStream is not supported in this browser');
+    }
+
+    // 创建解压缩流
+    const decompressionStream = new DecompressionStream('gzip');
+    const decompressedStream = new Blob([new Uint8Array(compressedData)]).stream().pipeThrough(decompressionStream);
+
+    // 获取解压缩后的文本
+    const response = new Response(decompressedStream);
+    const text = await response.text();
+
+    // 解析为 JSON 对象
+    return JSON.parse(text);
+  } catch (error) {
+    console.error('Gzip decompression to JSON failed:', error);
+    throw error;
+  }
+}

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

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