trtc-electron-sdk 11.0.501-beta.1 → 11.0.501

package/liteav/trtc.d.ts

@@ -34,7 +34,6 @@ declare class TRTCCloud extends EventEmitter {
     private screenCaptureStreamType;
     private isScreenCapturing;
     private vodPlayers;
-    private isEnterRoom;
     private isCaptureLocalVideoEnabled;
     private localRotation;
     private localMirrorType;
@@ -545,7 +544,7 @@ declare class TRTCCloud extends EventEmitter {
      * 当屏幕分享暂停时，SDK 会通过此回调通知
      *
      * @event TRTCCallback#onScreenCapturePaused
-     * @param {Number} reason - 停止原因，0：表示用户主动暂停；1：表示设置屏幕分享参数导致的暂停；2：表示屏幕分享窗口被最小化导致的暂停；3：表示屏幕分享窗口被隐藏导致的暂停
+     * @param {Number} reason - 停止原因，0：表示用户主动暂停；1：注意此字段的含义在 MAC 和 Windows 平台有稍微差异。屏幕窗口不可见暂停（Mac）。表示设置屏幕分享参数导致的暂停（Windows）；2：表示屏幕分享窗口被最小化导致的暂停（仅 Windows）；3：表示屏幕分享窗口被隐藏导致的暂停（仅 Windows）
      */
     handleOnScreenCapturePaused(reason: number): void;
     /**

package/liteav/trtc.js

@@ -184,7 +184,6 @@ class TRTCCloud extends events_1.EventEmitter {
         this.enableRenderFrame = true;
         this.screenCaptureStreamType = trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeSub;
         this.isScreenCapturing = false;
-        this.isEnterRoom = false;
         this.isCaptureLocalVideoEnabled = false;
         this.initEventHandler();
         console.log('trtc:constructor pixelFormat:' + this.pixelFormat + '|sdk version:' + pkg.version +
@@ -253,7 +252,6 @@ class TRTCCloud extends events_1.EventEmitter {
      * 清理资源
      */
     destroy() {
-        this.isEnterRoom = false;
         this.firstVideoFrameList = [];
         this.playAudioEffectIdList = [];
         this.remoteFillModeMap.clear();
@@ -503,9 +501,6 @@ class TRTCCloud extends events_1.EventEmitter {
      */
     handleOnEnterRoom(result) {
         this.fire('onEnterRoom', result);
-        if (result > 0) {
-            this.isEnterRoom = true;
-        }
         const params = {
             js_version: pkg.version,
             electron_version: process && process.versions && process.versions.electron || '',
@@ -528,7 +523,6 @@ class TRTCCloud extends events_1.EventEmitter {
      */
     handleOnExitRoom(reason) {
         this.firstVideoFrameList = [];
-        this.isEnterRoom = false;
         this.fire('onExitRoom', reason);
     }
     /**
@@ -1134,7 +1128,7 @@ class TRTCCloud extends events_1.EventEmitter {
      * 当屏幕分享暂停时，SDK 会通过此回调通知
      *
      * @event TRTCCallback#onScreenCapturePaused
-     * @param {Number} reason - 停止原因，0：表示用户主动暂停；1：表示设置屏幕分享参数导致的暂停；2：表示屏幕分享窗口被最小化导致的暂停；3：表示屏幕分享窗口被隐藏导致的暂停
+     * @param {Number} reason - 停止原因，0：表示用户主动暂停；1：注意此字段的含义在 MAC 和 Windows 平台有稍微差异。屏幕窗口不可见暂停（Mac）。表示设置屏幕分享参数导致的暂停（Windows）；2：表示屏幕分享窗口被最小化导致的暂停（仅 Windows）；3：表示屏幕分享窗口被隐藏导致的暂停（仅 Windows）
      */
     handleOnScreenCapturePaused(reason) {
         this.fire('onScreenCapturePaused', reason);
@@ -4084,7 +4078,7 @@ class TRTCCloud extends events_1.EventEmitter {
                 }
             });
         }
-        if (uid.length == 0 && this.isEnterRoom && this.isCaptureLocalVideoEnabled) {
+        if (uid.length == 0 && this.isCaptureLocalVideoEnabled) {
             this.fire(LOCAL_VIDEO_DATA, {
                 uid: '', type, rotation, timestamp,
                 pixelFormat: this.pixelFormat,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trtc-electron-sdk",
-  "version": "11.0.501-beta.1",
+  "version": "11.0.501",
   "description": "trtc electron sdk",
   "main": "./liteav/trtc.js",
   "types": "./liteav/trtc.d.ts",
@@ -15,7 +15,8 @@
     "semver": "^6.0.0",
     "signale": "^1.4.0",
     "yuv-buffer": "^1.0.0",
-    "yuv-canvas": "^1.2.6"
+    "yuv-canvas": "^1.2.6",
+    "hpagent": "^1.2.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.11.6",

package/scripts/download.js

@@ -4,6 +4,7 @@ const fs = require('fs-extra');
 const rimraf = require('rimraf');
 const signale = require('signale');
 const { exec } = require('child_process');
+const { HttpsProxyAgent } = require('hpagent');
 
 const {
     readCliArgv,
@@ -11,6 +12,7 @@ const {
     detectOS,
     detectOwnVersion,
     detectOwnName,
+    readProxyUrlFromEnv,
 } = require('./utils');
 const { Platform } = require('./constant');
 
@@ -68,10 +70,24 @@ const main = () => {
         signale.info('Download Url =', downloadUrl, '\n');
 
         signale.pending('Downloading C++ addon Electron SDK...\n');
-        download(downloadUrl, outputDir, {
+        const downloadOptions = {
             strip: 0,
             extract: true
-        }).then(() => {
+        };
+        const proxyUrl = readProxyUrlFromEnv(downloadUrl);
+        if (proxyUrl) {
+            downloadOptions.agent = {
+                https: new HttpsProxyAgent({
+                    keepAlive: true,
+                    keepAliveMsecs: 1000,
+                    maxSockets: 256,
+                    maxFreeSockets: 256,
+                    scheduling: 'lifo',
+                    proxy: proxyUrl
+                })
+            }
+        }
+        download(downloadUrl, outputDir, downloadOptions).then(() => {
             signale.success(`Download finished - ${platform}`);
 
             fs.copySync(

package/scripts/utils.js

@@ -27,6 +27,13 @@ module.exports.readCliArgv = function() {
   return newArgv;
 };
 
+module.exports.readProxyUrlFromEnv = function(downloadUrl) {
+  if (downloadUrl.indexOf('https') === 0) {
+    return process.env.https_proxy || ''
+  }
+  return process.env.http_proxy || '';
+}
+
 module.exports.readArgvFromNpmEnv = function() {
   const result = {};
   if (process.env.npm_config_trtc_electron_arch) {