agora-electron-sdk 4.2.2-dev.4 → 4.2.2-dev.6

package/js/Private/IAgoraRtcEngine.js

@@ -32,11 +32,11 @@ var MediaDeviceType;
      */
     MediaDeviceType[MediaDeviceType["AudioApplicationPlayoutDevice"] = 4] = "AudioApplicationPlayoutDevice";
     /**
-     * (For macOS only)5: Virtual audio playback device (virtual sound card).
+     * (For macOS only) 5: Virtual audio playback device (virtual sound card).
      */
     MediaDeviceType[MediaDeviceType["AudioVirtualPlayoutDevice"] = 5] = "AudioVirtualPlayoutDevice";
     /**
-     * (For macOS only)6: Virtual audio capturing device (virtual sound card).
+     * (For macOS only) 6: Virtual audio capturing device (virtual sound card).
      */
     MediaDeviceType[MediaDeviceType["AudioVirtualRecordingDevice"] = 6] = "AudioVirtualRecordingDevice";
 })(MediaDeviceType = exports.MediaDeviceType || (exports.MediaDeviceType = {}));
@@ -54,11 +54,11 @@ var AudioMixingStateType;
      */
     AudioMixingStateType[AudioMixingStateType["AudioMixingStatePaused"] = 711] = "AudioMixingStatePaused";
     /**
-     * 713: The music file stops playing.The possible reasons include:AudioMixingReasonAllLoopsCompleted(723)AudioMixingReasonStoppedByUser(724)
+     * 713: The music file stops playing. The possible reasons include: AudioMixingReasonAllLoopsCompleted (723) AudioMixingReasonStoppedByUser (724)
      */
     AudioMixingStateType[AudioMixingStateType["AudioMixingStateStopped"] = 713] = "AudioMixingStateStopped";
     /**
-     * 714: An error occurs during the playback of the audio mixing file.The possible reasons include:AudioMixingReasonCanNotOpen(701)AudioMixingReasonTooFrequentCall(702)AudioMixingReasonInterruptedEof(703)
+     * 714: An error occurs during the playback of the audio mixing file. The possible reasons include: AudioMixingReasonCanNotOpen (701) AudioMixingReasonTooFrequentCall (702) AudioMixingReasonInterruptedEof (703)
      */
     AudioMixingStateType[AudioMixingStateType["AudioMixingStateFailed"] = 714] = "AudioMixingStateFailed";
 })(AudioMixingStateType = exports.AudioMixingStateType || (exports.AudioMixingStateType = {}));
@@ -451,7 +451,7 @@ exports.ImageTrackOptions = ImageTrackOptions;
 /**
  * The channel media options.
  *
- * Agora supports publishing multiple audio streams and one video stream at the same time and in the same RtcConnection . For example, publishMicrophoneTrack , publishAudioTrack , publishCustomAudioTrack, and publishMediaPlayerAudioTrack can be set as true at the same time, but only one of publishCameraTrack , publishScreenTrack , publishCustomVideoTrack , or publishEncodedVideoTrack can be set as true . Agora recommends that you set member parameter values yourself according to your business scenario, otherwise the SDK will automatically assign values to member parameters.
+ * Agora supports publishing multiple audio streams and one video stream at the same time and in the same RtcConnection. For example, publishMicrophoneTrack, publishAudioTrack, publishCustomAudioTrack, and publishMediaPlayerAudioTrack can be set as true at the same time, but only one of publishCameraTrack, publishScreenTrack, publishCustomVideoTrack, or publishEncodedVideoTrack can be set as true. Agora recommends that you set member parameter values yourself according to your business scenario, otherwise the SDK will automatically assign values to member parameters.
  */
 var ChannelMediaOptions = /** @class */ (function () {
     function ChannelMediaOptions() {
@@ -757,15 +757,15 @@ var VideoProfileType;
      */
     VideoProfileType[VideoProfileType["VideoProfileLandscape360p8"] = 37] = "VideoProfileLandscape360p8";
     /**
-     * 38: 640 × 360, frame rate 15 fps, bitrate 800 Kbps.This profile applies only to the live streaming channel profile.
+     * 38: 640 × 360, frame rate 15 fps, bitrate 800 Kbps. This profile applies only to the live streaming channel profile.
      */
     VideoProfileType[VideoProfileType["VideoProfileLandscape360p9"] = 38] = "VideoProfileLandscape360p9";
     /**
-     * 39: 640 × 360, frame rate 24 fps, bitrate 800 Kbps.This profile applies only to the live streaming channel profile.
+     * 39: 640 × 360, frame rate 24 fps, bitrate 800 Kbps. This profile applies only to the live streaming channel profile.
      */
     VideoProfileType[VideoProfileType["VideoProfileLandscape360p10"] = 39] = "VideoProfileLandscape360p10";
     /**
-     * 100: 640 × 360, frame rate 24 fps, bitrate 1000 Kbps.This profile applies only to the live streaming channel profile.
+     * 100: 640 × 360, frame rate 24 fps, bitrate 1000 Kbps. This profile applies only to the live streaming channel profile.
      */
     VideoProfileType[VideoProfileType["VideoProfileLandscape360p11"] = 100] = "VideoProfileLandscape360p11";
     /**
@@ -897,15 +897,15 @@ var VideoProfileType;
      */
     VideoProfileType[VideoProfileType["VideoProfilePortrait360p8"] = 1037] = "VideoProfilePortrait360p8";
     /**
-     * 1038: 360 × 640, frame rate 15 fps, bitrate 800 Kbps.This profile applies only to the live streaming channel profile.
+     * 1038: 360 × 640, frame rate 15 fps, bitrate 800 Kbps. This profile applies only to the live streaming channel profile.
      */
     VideoProfileType[VideoProfileType["VideoProfilePortrait360p9"] = 1038] = "VideoProfilePortrait360p9";
     /**
-     * 1039: 360 × 640, frame rate 24 fps, bitrate 800 Kbps.This profile applies only to the live streaming channel profile.
+     * 1039: 360 × 640, frame rate 24 fps, bitrate 800 Kbps. This profile applies only to the live streaming channel profile.
      */
     VideoProfileType[VideoProfileType["VideoProfilePortrait360p10"] = 1039] = "VideoProfilePortrait360p10";
     /**
-     * 1100: 360 × 640, frame rate 24 fps, bitrate 1000 Kbps.This profile applies only to the live streaming channel profile.
+     * 1100: 360 × 640, frame rate 24 fps, bitrate 1000 Kbps. This profile applies only to the live streaming channel profile.
      */
     VideoProfileType[VideoProfileType["VideoProfilePortrait360p11"] = 1100] = "VideoProfilePortrait360p11";
     /**

package/js/Private/IAgoraRtcEngineEx.js

@@ -30,7 +30,7 @@ exports.RtcConnection = RtcConnection;
 /**
  * This interface class contains multi-channel methods.
  *
- * Inherited from IRtcEngine .
+ * Inherited from IRtcEngine.
  */
 var IRtcEngineEx = /** @class */ (function (_super) {
     __extends(IRtcEngineEx, _super);

package/js/Private/IAgoraSpatialAudio.js

@@ -38,7 +38,7 @@ exports.SpatialAudioZone = SpatialAudioZone;
 /**
  * This class contains some of the APIs in the ILocalSpatialAudioEngine class.
  *
- * The ILocalSpatialAudioEngine class inherits from IBaseSpatialAudioEngine .
+ * The ILocalSpatialAudioEngine class inherits from IBaseSpatialAudioEngine.
  */
 var IBaseSpatialAudioEngine = /** @class */ (function () {
     function IBaseSpatialAudioEngine() {
@@ -49,7 +49,7 @@ exports.IBaseSpatialAudioEngine = IBaseSpatialAudioEngine;
 /**
  * This class calculates user positions through the SDK to implement the spatial audio effect.
  *
- * This class inherits from IBaseSpatialAudioEngine . Before calling other APIs in this class, you need to call the initialize method to initialize this class.
+ * This class inherits from IBaseSpatialAudioEngine. Before calling other APIs in this class, you need to call the initialize method to initialize this class.
  */
 var ILocalSpatialAudioEngine = /** @class */ (function (_super) {
     __extends(ILocalSpatialAudioEngine, _super);

package/js/Private/impl/IAgoraMediaEngineImpl.js

@@ -69,14 +69,20 @@ var IMediaEngineImpl = /** @class */ (function () {
         if (trackId === void 0) { trackId = 0; }
         return 'MediaEngine_pushAudioFrame';
     };
-    IMediaEngineImpl.prototype.pullAudioFrame = function () {
-        var apiType = this.getApiTypeFromPullAudioFrame();
-        var jsonParams = {};
+    IMediaEngineImpl.prototype.pullAudioFrame = function (frame) {
+        var apiType = this.getApiTypeFromPullAudioFrame(frame);
+        var jsonParams = {
+            frame: frame,
+            toJSON: function () {
+                return {
+                    frame: frame,
+                };
+            },
+        };
         var jsonResults = IrisApiEngine_1.callIrisApi.call(this, apiType, jsonParams);
-        var frame = jsonResults.frame;
-        return frame;
+        return jsonResults.result;
     };
-    IMediaEngineImpl.prototype.getApiTypeFromPullAudioFrame = function () {
+    IMediaEngineImpl.prototype.getApiTypeFromPullAudioFrame = function (frame) {
         return 'MediaEngine_pullAudioFrame';
     };
     IMediaEngineImpl.prototype.setExternalVideoSource = function (enabled, useTexture, sourceType, encodedVideoOption) {

package/js/Private/impl/IAgoraRtcEngineImpl.js

@@ -107,7 +107,7 @@ function processIRtcEngineEventHandler(handler, event, jsonParams) {
             break;
         case 'onFirstLocalVideoFramePublished':
             if (handler.onFirstLocalVideoFramePublished !== undefined) {
-                handler.onFirstLocalVideoFramePublished(jsonParams.connection, jsonParams.elapsed);
+                handler.onFirstLocalVideoFramePublished(jsonParams.source, jsonParams.elapsed);
             }
             break;
         case 'onFirstRemoteVideoDecoded':
@@ -182,7 +182,7 @@ function processIRtcEngineEventHandler(handler, event, jsonParams) {
             break;
         case 'onLocalVideoStats':
             if (handler.onLocalVideoStats !== undefined) {
-                handler.onLocalVideoStats(jsonParams.connection, jsonParams.stats);
+                handler.onLocalVideoStats(jsonParams.source, jsonParams.stats);
             }
             break;
         case 'onRemoteVideoStats':
@@ -3311,20 +3311,20 @@ var IRtcEngineImpl = /** @class */ (function () {
     IRtcEngineImpl.prototype.getApiTypeFromIsCameraExposureSupported = function () {
         return 'RtcEngine_isCameraExposureSupported';
     };
-    IRtcEngineImpl.prototype.setCameraExposureFactor = function (value) {
-        var apiType = this.getApiTypeFromSetCameraExposureFactor(value);
+    IRtcEngineImpl.prototype.setCameraExposureFactor = function (factor) {
+        var apiType = this.getApiTypeFromSetCameraExposureFactor(factor);
         var jsonParams = {
-            value: value,
+            factor: factor,
             toJSON: function () {
                 return {
-                    value: value,
+                    factor: factor,
                 };
             },
         };
         var jsonResults = IrisApiEngine_1.callIrisApi.call(this, apiType, jsonParams);
         return jsonResults.result;
     };
-    IRtcEngineImpl.prototype.getApiTypeFromSetCameraExposureFactor = function (value) {
+    IRtcEngineImpl.prototype.getApiTypeFromSetCameraExposureFactor = function (factor) {
         return 'RtcEngine_setCameraExposureFactor';
     };
     IRtcEngineImpl.prototype.isCameraAutoExposureFaceModeSupported = function () {

package/js/Private/internal/MusicContentCenterInternal.js

@@ -87,6 +87,9 @@ var MusicContentCenterInternal = /** @class */ (function (_super) {
         var mediaPlayerId = _super.prototype.createMusicPlayer.call(this);
         return new MusicPlayerInternal(mediaPlayerId);
     };
+    MusicContentCenterInternal.prototype.getApiTypeFromPreload = function (songCode) {
+        return 'MusicContentCenter_preload2';
+    };
     MusicContentCenterInternal._event_handlers = [];
     return MusicContentCenterInternal;
 }(IAgoraMusicContentCenterImpl_1.IMusicContentCenterImpl));

package/js/Private/internal/RtcEngineExInternal.js

@@ -282,7 +282,7 @@ var RtcEngineExInternal = /** @class */ (function (_super) {
         return 'RtcEngine_stopScreenCapture2';
     };
     RtcEngineExInternal.prototype.getApiTypeFromPreloadChannelWithUserAccount = function (token, channelId, userAccount) {
-        return 'RtcEngine_preloadChannelWithUserAccount2';
+        return 'RtcEngine_preloadChannel2';
     };
     RtcEngineExInternal.prototype.getAudioDeviceManager = function () {
         return this._audio_device_manager;
@@ -322,16 +322,29 @@ var RtcEngineExInternal = /** @class */ (function (_super) {
         return _super.prototype.unregisterAudioSpectrumObserver.call(this, observer);
     };
     RtcEngineExInternal.prototype.getScreenCaptureSources = function (thumbSize, iconSize, includeScreen) {
-        return _super.prototype.getScreenCaptureSources.call(this, thumbSize, iconSize, includeScreen)
-            .map(function (value) {
-            var _a;
-            if (value.thumbImage.buffer == 0) {
+        var apiType = this.getApiTypeFromGetScreenCaptureSources(thumbSize, iconSize, includeScreen);
+        var jsonParams = {
+            thumbSize: thumbSize,
+            iconSize: iconSize,
+            includeScreen: includeScreen,
+            toJSON: function () {
+                return {
+                    thumbSize: thumbSize,
+                    iconSize: iconSize,
+                    includeScreen: includeScreen,
+                };
+            },
+        };
+        var _a = IrisApiEngine_1.callIrisApi.call(this, apiType, jsonParams), result = _a.result, sources = _a.sources;
+        var screenCaptureSources = result.map(function (value) {
+            var _a, _b, _c, _d;
+            if (!((_a = value.thumbImage) === null || _a === void 0 ? void 0 : _a.buffer) || !((_b = value.thumbImage) === null || _b === void 0 ? void 0 : _b.length)) {
                 value.thumbImage.buffer = undefined;
             }
             else {
-                value.thumbImage.buffer = Utils_1.AgoraEnv.AgoraElectronBridge.GetBuffer(value.thumbImage.buffer, (_a = value.thumbImage) === null || _a === void 0 ? void 0 : _a.length);
+                value.thumbImage.buffer = Utils_1.AgoraEnv.AgoraElectronBridge.GetBuffer(value.thumbImage.buffer, value.thumbImage.length);
             }
-            if (value.iconImage.buffer == 0) {
+            if (!((_c = value.iconImage) === null || _c === void 0 ? void 0 : _c.buffer) || !((_d = value.iconImage) === null || _d === void 0 ? void 0 : _d.length)) {
                 value.iconImage.buffer = undefined;
             }
             else {
@@ -339,6 +352,10 @@ var RtcEngineExInternal = /** @class */ (function (_super) {
             }
             return value;
         });
+        IrisApiEngine_1.callIrisApi.call(this, 'RtcEngine_releaseScreenCaptureSources', {
+            sources: sources,
+        });
+        return screenCaptureSources;
     };
     RtcEngineExInternal.prototype.setupLocalVideo = function (canvas) {
         var _a, _b;

package/js/Private/ti/IAgoraRtcEngine-ti.js

@@ -50,7 +50,7 @@ exports.IRtcEngineEventHandler = t.iface([], {
     "onDownlinkNetworkInfoUpdated": t.opt(t.func("void", t.param("info", "DownlinkNetworkInfo"))),
     "onLastmileQuality": t.opt(t.func("void", t.param("quality", "QualityType"))),
     "onFirstLocalVideoFrame": t.opt(t.func("void", t.param("source", "VideoSourceType"), t.param("width", "number"), t.param("height", "number"), t.param("elapsed", "number"))),
-    "onFirstLocalVideoFramePublished": t.opt(t.func("void", t.param("connection", "RtcConnection"), t.param("elapsed", "number"))),
+    "onFirstLocalVideoFramePublished": t.opt(t.func("void", t.param("source", "VideoSourceType"), t.param("elapsed", "number"))),
     "onFirstRemoteVideoDecoded": t.opt(t.func("void", t.param("connection", "RtcConnection"), t.param("remoteUid", "number"), t.param("width", "number"), t.param("height", "number"), t.param("elapsed", "number"))),
     "onVideoSizeChanged": t.opt(t.func("void", t.param("connection", "RtcConnection"), t.param("sourceType", "VideoSourceType"), t.param("uid", "number"), t.param("width", "number"), t.param("height", "number"), t.param("rotation", "number"))),
     "onLocalVideoStateChanged": t.opt(t.func("void", t.param("source", "VideoSourceType"), t.param("state", "LocalVideoStreamState"), t.param("error", "LocalVideoStreamError"))),
@@ -65,7 +65,7 @@ exports.IRtcEngineEventHandler = t.iface([], {
     "onUserEnableLocalVideo": t.opt(t.func("void", t.param("connection", "RtcConnection"), t.param("remoteUid", "number"), t.param("enabled", "boolean"))),
     "onLocalAudioStats": t.opt(t.func("void", t.param("connection", "RtcConnection"), t.param("stats", "LocalAudioStats"))),
     "onRemoteAudioStats": t.opt(t.func("void", t.param("connection", "RtcConnection"), t.param("stats", "RemoteAudioStats"))),
-    "onLocalVideoStats": t.opt(t.func("void", t.param("connection", "RtcConnection"), t.param("stats", "LocalVideoStats"))),
+    "onLocalVideoStats": t.opt(t.func("void", t.param("source", "VideoSourceType"), t.param("stats", "LocalVideoStats"))),
     "onRemoteVideoStats": t.opt(t.func("void", t.param("connection", "RtcConnection"), t.param("stats", "RemoteVideoStats"))),
     "onCameraReady": t.opt(t.func("void")),
     "onCameraFocusAreaChanged": t.opt(t.func("void", t.param("x", "number"), t.param("y", "number"), t.param("width", "number"), t.param("height", "number"))),

package/js/Renderer/WebGLRenderer/index.js

@@ -70,6 +70,22 @@ var GlRenderer = /** @class */ (function (_super) {
         _this.lastImageHeight = 0;
         _this.lastImageRotation = 0;
         _this.videoBuffer = {};
+        _this.handleContextLost = function () {
+            try {
+                _this.canvas &&
+                    _this.canvas.removeEventListener('webglcontextlost', _this.handleContextLost, false);
+            }
+            catch (error) {
+                (0, Utils_1.logWarn)('webglcontextlost error', error);
+            }
+            finally {
+                _this.gl = undefined;
+                _this.failInitRenderCB &&
+                    _this.failInitRenderCB({
+                        error: 'Browser not support! No WebGL detected.',
+                    });
+            }
+        };
         _this.failInitRenderCB = failCallback;
         return _this;
     }
@@ -108,6 +124,8 @@ var GlRenderer = /** @class */ (function (_super) {
         catch (e) {
             (0, Utils_1.logWarn)('webgl renderer unbind happen some error', e);
         }
+        this.canvas &&
+            this.canvas.removeEventListener('webglcontextlost', this.handleContextLost, false);
         this.canvas = undefined;
         this.container = undefined;
         this.parentElement = undefined;
@@ -348,7 +366,6 @@ var GlRenderer = /** @class */ (function (_super) {
         }
     };
     GlRenderer.prototype.initCanvas = function (view, width, height, rotation) {
-        var _this = this;
         this.clientWidth = view.clientWidth;
         this.clientHeight = view.clientHeight;
         this.parentElement = view;
@@ -379,24 +396,7 @@ var GlRenderer = /** @class */ (function (_super) {
                 preserveDrawingBuffer: true,
             });
             // context list after toggle resolution on electron 12.0.6
-            var handleContextLost_1 = function () {
-                try {
-                    _this.gl = null;
-                    _this.canvas &&
-                        _this.canvas.removeEventListener('webglcontextlost', handleContextLost_1, false);
-                }
-                catch (error) {
-                    (0, Utils_1.logWarn)('webglcontextlost error', error);
-                }
-                finally {
-                    _this.gl = undefined;
-                    _this.failInitRenderCB &&
-                        _this.failInitRenderCB({
-                            error: 'Browser not support! No WebGL detected.',
-                        });
-                }
-            };
-            this.canvas.addEventListener('webglcontextlost', handleContextLost_1, false);
+            this.canvas.addEventListener('webglcontextlost', this.handleContextLost, false);
         }
         catch (e) {
             (0, Utils_1.logWarn)('webgl create happen some warming', this.gl, this.canvas);

package/js/Renderer/YUVCanvasRenderer/index.js

@@ -145,7 +145,7 @@ var YUVCanvasRenderer = /** @class */ (function (_super) {
             var scale = this.zoom(options.rotation === 90 || options.rotation === 270, options.contentMode, options.frameWidth, options.frameHeight, options.clientWidth, options.clientHeight);
             this.canvas.style.transform = "scale(".concat(scale.toString(), ")");
             if (transformItems.length > 0) {
-                this.canvas.style.transform = "".concat(transformItems.join(' '));
+                this.canvas.style.transform += " ".concat(transformItems.join(' '));
             }
         }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agora-electron-sdk",
-  "version": "4.2.2-dev.4",
+  "version": "4.2.2-dev.6",
   "description": "agora-electron-sdk",
   "main": "js/AgoraSdk",
   "types": "types/AgoraSdk.d.ts",
@@ -134,7 +134,7 @@
     "yuv-canvas": "1.2.6"
   },
   "agora_electron": {
-    "iris_sdk_win": "https://download.agora.io/sdk/release/iris_4.2.2-dev.4_DCG_Windows_Video_20230615_1046.zip",
-    "iris_sdk_mac": "https://download.agora.io/sdk/release/iris_4.2.2-dev.4_DCG_Mac_Video_20230614_0816.zip"
+    "iris_sdk_win": "https://download.agora.io/sdk/release/iris_4.2.2-dev.6_DCG_Windows_Video_20230704_0337.zip",
+    "iris_sdk_mac": "https://download.agora.io/sdk/release/iris_4.2.2-dev.6_DCG_Mac_Video_20230704_0337.zip"
   }
 }

package/scripts/zipBuild.js

@@ -1,3 +1,5 @@
+const path = require('path');
+
 const { exec } = require('shelljs');
 
 const logger = require('./logger');
@@ -5,7 +7,7 @@ const { getOS } = require('./util');
 
 const zipBuild = async () => {
   const isMac = getOS() === 'mac';
-  const fileListStr = ' build js types package.json';
+  const fileListStr = ` build${path.sep}Release js types package.json`;
   const shellStr =
     (isMac ? 'zip -ry electron.zip' : '7z a electron.zip') + fileListStr;
   const { code, stderr } = await exec(shellStr);