agora-rte-sdk 3.8.0-alpha → 3.8.1-alpha

package/lib/core/scene/index.d.ts

@@ -5,13 +5,13 @@ import { AgoraRteStreamPlayer } from './stream-player';
 import { AgoraRteLocalUser } from './local-user';
 import { AgoraRteServiceApi } from '../services/api';
 import { AgoraObservable, AgoraRteError } from '../../imports';
-import { AgoraRtcMediaSourceState, AgoraRtcScreenCaptureType } from '../rtc/type';
+import { AgoraRtcMediaSourceState, AgoraRtcScreenCaptureType, AgoraRtcVideoSourceType } from '../rtc/type';
 export declare class AgoraRteScene {
     protected logger: import("agora-foundation/lib/logger/type").Logger;
     protected readonly observable: AgoraObservable<Partial<{
         onJoinSceneSuccess(sceneId: string, localUser: AgoraRteLocalUser, streamPlayer: AgoraRteStreamPlayer): void;
         onJoinSceneFailure(sceneId: string, error: AgoraRteError): void;
-        onSceneMessageReceived(sceneId: string, message: import("../..").AgoraRteMessage): void;
+        onSceneMessageReceived(sceneId: string, message: import("../../type").AgoraRteMessage): void;
         onScenePropertiesUpdated(sceneId: string, event: import("./type").AgoraRteScenePropertiesUpdatedEvent): void;
         onScenePropertiesDeleted(sceneId: string, event: import("./type").AgoraRteScenePropertiesDeletedEvent): void;
         onUserPropertiesUpdated(sceneId: string, event: AgoraRteUserPropertiesUpdatedEvent): void;
@@ -45,6 +45,7 @@ export declare class AgoraRteScene {
     private _stateSynchronizer?;
     private _messageSynchronizer?;
     private _messageHandlerObservers?;
+    private _screenStreamLabelMap;
     private _streamPlayer?;
     private _timestampGap;
     private _totalUserCount;
@@ -122,6 +123,9 @@ export declare class AgoraRteScene {
      *
      */
     fetchUserList(params: AgoraRteUserPageParams): Promise<AgoraRteUserPageResponse>;
+    addLocalStreamLabels(streamId: string, labels: Map<string, any>): void;
+    removeLocalStreamLabel(streamId: string): void;
+    getLocalStreamSourceTypeFromStreamLabel(streamId: string): AgoraRtcVideoSourceType.CAMERA | AgoraRtcVideoSourceType.SCREEN;
     /**
      * Get all streams in scene, return as object
      * @returns {Record<string, AgoraRteMediaStreamInfo[]>} all streams in scene

package/lib/core/scene/index.js

@@ -88,6 +88,7 @@ var _error2 = require("../utilities/error");
 var _type2 = require("../rtc/type");
 var _client = require("../services/client");
 var _type3 = require("../rtm/type");
+var _type4 = require("../../type");
 var _AgoraRteScene;
 var _initProto;
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
@@ -115,6 +116,8 @@ var AgoraRteScene = exports.AgoraRteScene = /*#__PURE__*/function () {
       prefix: 'AgoraRteScene'
     })));
     (0, _defineProperty2["default"])(this, "observable", new _imports.AgoraObservable());
+    // key is streamId, value is label
+    (0, _defineProperty2["default"])(this, "_screenStreamLabelMap", new Map());
     (0, _defineProperty2["default"])(this, "_timestampGap", 0);
     (0, _defineProperty2["default"])(this, "_totalUserCount", 0);
     (0, _defineProperty2["default"])(this, "_joinSuccess", false);
@@ -576,12 +579,31 @@ var AgoraRteScene = exports.AgoraRteScene = /*#__PURE__*/function () {
         return _fetchUserList.apply(this, arguments);
       }
       return fetchUserList;
-    }()
+    }())
+  }, {
+    key: "addLocalStreamLabels",
+    value: function addLocalStreamLabels(streamId, labels) {
+      this._screenStreamLabelMap.set(streamId, labels);
+    }
+  }, {
+    key: "removeLocalStreamLabel",
+    value: function removeLocalStreamLabel(streamId) {
+      this._screenStreamLabelMap["delete"](streamId);
+    }
+  }, {
+    key: "getLocalStreamSourceTypeFromStreamLabel",
+    value: function getLocalStreamSourceTypeFromStreamLabel(streamId) {
+      var label = this._screenStreamLabelMap.get(streamId);
+      if ((label === null || label === void 0 ? void 0 : label.get('localSourceType')) === 'screen') {
+        return _type4.AgoraRteVideoSourceType.SCREEN;
+      }
+      return _type4.AgoraRteVideoSourceType.CAMERA;
+    }
+
     /**
      * Get all streams in scene, return as object
      * @returns {Record<string, AgoraRteMediaStreamInfo[]>} all streams in scene
      */
-    )
   }, {
     key: "getStreams",
     value: function getStreams() {
@@ -1116,7 +1138,7 @@ var AgoraRteScene = exports.AgoraRteScene = /*#__PURE__*/function () {
       var _this7 = this;
       streams.forEach(/*#__PURE__*/function () {
         var _ref9 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee12(stream) {
-          var streamToken, shouldPublishAudio, shouldPublishVideo, _this7$_rtcMainChanne, _this7$rtcMainChannel, _this7$_rtcMainChanne2, _this7$rtcMainChannel2, observer;
+          var streamToken, shouldPublishAudio, shouldPublishVideo, sourceType, _this7$_rtcMainChanne, _this7$rtcMainChannel, _this7$_rtcMainChanne2, _this7$rtcMainChannel2, observer;
           return _regenerator["default"].wrap(function (_context12) {
             while (1) switch (_context12.prev = _context12.next) {
               case 0:
@@ -1124,10 +1146,11 @@ var AgoraRteScene = exports.AgoraRteScene = /*#__PURE__*/function () {
                   streamToken = _this7.localUser.getStreamTokenByStreamId(stream.streamId);
                   shouldPublishAudio = stream.streamType === _type.AgoraRteMediaStreamType.BOTH || stream.streamType === _type.AgoraRteMediaStreamType.AUDIO;
                   shouldPublishVideo = stream.streamType === _type.AgoraRteMediaStreamType.BOTH || stream.streamType === _type.AgoraRteMediaStreamType.VIDEO;
+                  sourceType = _this7.getLocalStreamSourceTypeFromStreamLabel(stream.streamId);
                   if (shouldPublishVideo) {
-                    (_this7$_rtcMainChanne = _this7._rtcMainChannelClient) === null || _this7$_rtcMainChanne === void 0 || _this7$_rtcMainChanne.publisher.publishLocalVideoStream(streamToken, stream.streamId, stream.videoSourceId, stream.videoSourceType);
+                    (_this7$_rtcMainChanne = _this7._rtcMainChannelClient) === null || _this7$_rtcMainChanne === void 0 || _this7$_rtcMainChanne.publisher.publishLocalVideoStream(streamToken, stream.streamId, stream.videoSourceId, sourceType);
                   } else {
-                    (_this7$rtcMainChannel = _this7.rtcMainChannelClient) === null || _this7$rtcMainChannel === void 0 || _this7$rtcMainChannel.publisher.unpublishLocalVideoStream(stream.streamId, stream.videoSourceType);
+                    (_this7$rtcMainChannel = _this7.rtcMainChannelClient) === null || _this7$rtcMainChannel === void 0 || _this7$rtcMainChannel.publisher.unpublishLocalVideoStream(stream.streamId, sourceType);
                   }
                   if (shouldPublishAudio) {
                     (_this7$_rtcMainChanne2 = _this7._rtcMainChannelClient) === null || _this7$_rtcMainChanne2 === void 0 || _this7$_rtcMainChanne2.publisher.publishLocalAudioStream(streamToken, stream.streamId, stream.audioSourceId, stream.audioSourceType);
@@ -1145,7 +1168,7 @@ var AgoraRteScene = exports.AgoraRteScene = /*#__PURE__*/function () {
                           }
                           if (shouldPublishVideo) {
                             var _this7$_rtcMainChanne4;
-                            (_this7$_rtcMainChanne4 = _this7._rtcMainChannelClient) === null || _this7$_rtcMainChanne4 === void 0 || _this7$_rtcMainChanne4.publisher.publishLocalVideoStream(token, stream.streamId, stream.videoSourceId, stream.videoSourceType);
+                            (_this7$_rtcMainChanne4 = _this7._rtcMainChannelClient) === null || _this7$_rtcMainChanne4 === void 0 || _this7$_rtcMainChanne4.publisher.publishLocalVideoStream(token, stream.streamId, stream.videoSourceId, sourceType);
                           }
                           _this7.localUser.removeObserver(observer);
                         }
@@ -1737,6 +1760,7 @@ var AgoraRteScene = exports.AgoraRteScene = /*#__PURE__*/function () {
     value: function _cleanup() {
       var _this$_stateSynchroni3;
       (_this$_stateSynchroni3 = this._stateSynchronizer) === null || _this$_stateSynchroni3 === void 0 || _this$_stateSynchroni3.stop();
+      this._screenStreamLabelMap.clear();
       this._stopDeviceStateSync();
       this._localUser = undefined;
       this._streamPlayer = undefined;

package/lib/plugin/rtc/electron/client.js

@@ -1164,7 +1164,7 @@ var AgoraRtcClientImpl = exports.AgoraRtcClientImpl = /*#__PURE__*/function (_Ag
               newDevice = audioPlaybackDevices.find(function (device) {
                 return _this4._isValidDevice(device) && device.deviceId === deviceId;
               });
-              deviceInfoString = "".concat(newDevice === null || newDevice === void 0 ? void 0 : newDevice.deviceName, " id: ").concat(newDevice === null || newDevice === void 0 ? void 0 : newDevice.vendorId, ":").concat(newDevice === null || newDevice === void 0 ? void 0 : newDevice.productId);
+              deviceInfoString = "deviceName\uFF1A".concat(newDevice === null || newDevice === void 0 ? void 0 : newDevice.deviceName, "  deviceId: ").concat(newDevice === null || newDevice === void 0 ? void 0 : newDevice.deviceId, ", vendorId: ").concat(newDevice === null || newDevice === void 0 ? void 0 : newDevice.vendorId, ", productId: ").concat(newDevice === null || newDevice === void 0 ? void 0 : newDevice.productId);
               this.logger.info("[RtcClient] PlaybackDevices deviceInfoString: ".concat(deviceInfoString));
               if (!(newDevice && newDevice.deviceId && newDevice.deviceName)) {
                 _context5.next = 2;

package/lib/plugin/rtc/electron/source-manager.js

@@ -1082,7 +1082,7 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
             productId: device.productId
           };
           newMicList.set(device.deviceId, deviceInfo);
-          var deviceInfoString = "".concat(deviceInfo.deviceName, " id: ").concat(deviceInfo.vendorId, ":").concat(deviceInfo.productId);
+          var deviceInfoString = "deviceName\uFF1A".concat(deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.deviceName, "  deviceId: ").concat(deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.deviceId, ", vendorId: ").concat(deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.vendorId, ", productId: ").concat(deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.productId);
           _this1.logger.info("[RtcClient] RecordingDevices deviceInfoString: ".concat(deviceInfoString));
         }
       });

package/lib/plugin/rtc/electron/utils.d.ts

@@ -31,7 +31,7 @@ export declare const convertCameraSourceTypeToPublishConfig: (sourceType: VideoS
 /**
  * 摄像头视频源类型列表
  */
-export declare const cameraVideoSourceTypes: readonly [VideoSourceType.VideoSourceCameraPrimary, VideoSourceType.VideoSourceCameraSecondary, VideoSourceType.VideoSourceCameraThird, VideoSourceType.VideoSourceCameraFourth];
+export declare const cameraVideoSourceTypes: readonly [0, 1, 11, 12];
 /**
  * 比较两个设备信息 Map，返回新增和移除的设备列表
  * @param oldMap - 旧设备信息 Map

package/lib/plugin/rtc/electron/utils.js

@@ -347,7 +347,30 @@ var startVideoRender = exports.startVideoRender = function startVideoRender(_ref
           }
           return rtcEngine.setRemoteRenderModeEx(Number(sourceId), renderModeType, mirrorModeType, connection);
         } else {
-          return rtcEngine.setLocalRenderMode(renderModeType, mirrorModeType);
+          // 使用此API会更新所有本地视图，谨慎使用
+          // return rtcEngine.setLocalRenderMode(
+          //   renderModeType,
+          //   2 satisfies VideoMirrorModeType.VideoMirrorModeDisabled,
+          // );
+
+          var vst;
+          if (sourceType === _type.AgoraRtcRenderSourceType.LOCAL_SCREEN) {
+            vst = 2;
+          } else {
+            var sourceIndex = sourceManager.getCameraSourceIndex(sourceId);
+            if (sourceIndex === -1) {
+              logger.warn("Invalid source index for sourceId: ".concat(sourceId));
+              return _constant.AgoraRtcErrorCode.SOURCE_INDEX_IS_NOT_VALID;
+            }
+            vst = convertSourceIndexToSourceType(sourceIndex);
+          }
+          return rtcEngine.setupLocalVideo({
+            view: placementRef,
+            setupMode: 0,
+            sourceType: vst,
+            renderMode: renderModeType,
+            mirrorMode: mirrorModeType
+          });
         }
       }
     case _type.AgoraRtcRenderResultType.ADD:
@@ -365,6 +388,7 @@ var startVideoRender = exports.startVideoRender = function startVideoRender(_ref
           return _constant.AgoraRtcErrorCode.PLACEMENT_IS_NOT_RENDERED;
         }
         canvasTagPool.ifNeedStopRenderCanvas(view);
+        // 创建新的 placementRef 之前的 placementRef不需要先删除吗？
         placementRef = createVideoRendererPlacement(view);
         canvas = createCanvasAndAddTag(view, sourceId, placementRef, renderMode, isMirror, sourceType, canvasTagPool, connection);
         return addRenderer();

package/lib/plugin/rtc/web/client.js

@@ -105,7 +105,7 @@ var AgoraRtcWebAdapterImp = exports.AgoraRtcWebAdapterImp = /*#__PURE__*/functio
     (0, _classCallCheck2["default"])(this, AgoraRtcWebAdapterImp);
     _this = _callSuper(this, AgoraRtcWebAdapterImp);
     (0, _defineProperty2["default"])(_this, "logger", (_initProto(_this), (0, _logger.createLogger)({
-      prefix: 'AgoraRtcWebAdapterImp'
+      prefix: 'AgoraRtcWebAdapterImpl'
     })));
     // @internal
     (0, _defineProperty2["default"])(_this, "_cameraViewCanvasMap", new Map());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agora-rte-sdk",
-  "version": "3.8.0-alpha",
+  "version": "3.8.1-alpha",
   "description": "SDK for building interactive scenarios",
   "author": "agora.io",
   "license": "ISC",
@@ -10,7 +10,6 @@
     "lib"
   ],
   "scripts": {
-    "prepare": "husky",
     "build": "agora-tc-transpile",
     "test-browser": "agora-tc-test-karma-browser",
     "test-electron": "agora-tc-test-karma-electron"
@@ -28,7 +27,7 @@
     "@types/sinon": "^17.0.2",
     "@types/ua-parser-js": "^0.7.35",
     "agora-token": "^2.0.3",
-    "agora-toolchain": "3.8.0-alpha",
+    "agora-toolchain": "3.8.1-alpha",
     "core-js": "^3.33.3",
     "electron": "22.3.27",
     "husky": "^9.0.11",
@@ -43,7 +42,7 @@
     "agora-extension-ai-denoiser": "^1.0.0",
     "agora-extension-beauty-effect": "^1.0.1-beta",
     "agora-extension-virtual-background": "^2.1.0",
-    "agora-foundation": "3.8.0-alpha",
+    "agora-foundation": "3.8.1-alpha",
     "agora-rtc-sdk-ng": "4.23.3",
     "agora-rtm": "2.2.2-3",
     "await-to-js": "^3.0.0",