trtc-electron-sdk 11.3.502-beta.5 → 11.3.502-beta.6

package/liteav/trtc.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
 import { VodPlayer } from './vod_player';
-import { AudioMusicParam, Rect, TRTCAppScene, TRTCAudioEffectParam, TRTCAudioQuality, TRTCBeautyStyle, TRTCDeviceState, TRTCDeviceType, TRTCLogLevel, TRTCRenderParams, TRTCRoleType, TRTCSwitchRoomParam, TRTCVideoBufferType, TRTCVideoFillMode, TRTCVideoPixelFormat, TRTCVideoRotation, TRTCVideoStreamType, TRTCWaterMarkSrcType, PluginInfo, TRTCAudioRecordingParams, TRTCScreenCaptureSourceInfo, TRTCScreenCaptureProperty, TRTCSpeedTestParams, TRTCRecordType, TRTCDeviceInfo, TRTCCameraCaptureParams, TRTCImageBuffer, TRTCInitConfig } from './trtc_define';
+import { AudioMusicParam, Rect, TRTCAppScene, TRTCAudioEffectParam, TRTCAudioQuality, TRTCBeautyStyle, TRTCDeviceState, TRTCDeviceType, TRTCLogLevel, TRTCRenderParams, TRTCRoleType, TRTCSwitchRoomParam, TRTCVideoBufferType, TRTCVideoFillMode, TRTCVideoPixelFormat, TRTCVideoRotation, TRTCVideoStreamType, TRTCWaterMarkSrcType, PluginInfo, TRTCAudioRecordingParams, TRTCScreenCaptureSourceInfo, TRTCScreenCaptureProperty, TRTCSpeedTestParams, TRTCRecordType, TRTCDeviceInfo, TRTCCameraCaptureParams, TRTCImageBuffer, TRTCInitConfig, TRTCAudioParallelParams } from './trtc_define';
 export * from './trtc_define';
 export * from './trtc_code';
 export * from './vod_player';
@@ -1208,6 +1208,12 @@ declare class TRTCCloud extends EventEmitter {
      * 如果录制任务在退出房间前尚未通过本接口停止，则退出房间后录音任务会自动被停止。
      */
     stopLocalRecording(): void;
+    /**
+    * 设置远端音频流智能并发播放策略
+    *
+    * @param {TRTCAudioParallelParams} - 指定用户必定能并发播放。
+    */
+    setRemoteAudioParallelParams(param: TRTCAudioParallelParams): void;
     /**
      * 开启本地音频的采集和上行
      *

package/liteav/trtc.js

@@ -2367,6 +2367,28 @@ class TRTCCloud extends events_1.EventEmitter {
     stopLocalRecording() {
         this.rtcCloud.stopLocalRecording();
     }
+    /**
+    * 设置远端音频流智能并发播放策略
+    *
+    * @param {TRTCAudioParallelParams} - 指定用户必定能并发播放。
+    */
+    setRemoteAudioParallelParams(param) {
+        if (param.maxCount < 0) {
+            throw new Error("maxCount must be greater or equal 0");
+        }
+        if (Array.isArray(param.includeUsers) && param.includeUsers.length >= 1) {
+            const includeUsersFilterArray = param.includeUsers.filter(item => {
+                return typeof item === 'string';
+            });
+            this.rtcCloud.setRemoteAudioParallelParams({
+                maxCount: param.maxCount,
+                includeUsers: includeUsersFilterArray
+            });
+        }
+        else {
+            throw new Error('includeUsers must be Array<String> type and not empty');
+        }
+    }
     /////////////////////////////////////////////////////////////////////////////////
     //
     //                      （四）音频相关接口函数

package/liteav/trtc_define.d.ts

@@ -84,6 +84,12 @@ export declare enum TRTCRecordType {
     /** 同时录制音频、视频 */
     TRTCRecordTypeBoth = 2
 }
+export type TRTCAudioParallelParams = {
+    /** 最大并发播放数。默认值：0 */
+    maxCount: number;
+    /** 指定用户必定能并发播放 */
+    includeUsers: Array<string>;
+};
 export declare enum TRTCAppScene {
     TRTCAppSceneVideoCall = 0,
     TRTCAppSceneLIVE = 1,

package/liteav/trtc_define.js

@@ -338,6 +338,15 @@ var TRTCRecordType;
     /** 同时录制音频、视频 */
     TRTCRecordType[TRTCRecordType["TRTCRecordTypeBoth"] = 2] = "TRTCRecordTypeBoth";
 })(TRTCRecordType = exports.TRTCRecordType || (exports.TRTCRecordType = {}));
+/**
+* 设置远端音频流智能并发播放策略
+*
+* @typedef {Object} TRTCAudioParallelParam
+* @property {Number} maxCount - 最大并发播放数
+* @property {Array<String>} includeUsers - 指定用户必定能并发播放
+*
+*/
+const TRTCAudioParallelParams_HACK_JSDOC = null;
 /////////////////////////////////////////////////////////////////////////////////
 //
 //                    【（二）网络相关枚举值定义】

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trtc-electron-sdk",
-  "version": "11.3.502-beta.5",
+  "version": "11.3.502-beta.6",
   "description": "trtc electron sdk",
   "main": "./liteav/trtc.js",
   "types": "./liteav/trtc.d.ts",
@@ -18,6 +18,9 @@
     "yuv-canvas": "^1.2.6",
     "hpagent": "^1.2.0"
   },
+  "peerDependencies": {
+    "electron": ">=4.0.0"
+  },
   "devDependencies": {
     "@babel/cli": "^7.11.6",
     "@babel/core": "^7.11.6",
@@ -37,6 +40,7 @@
   "scripts": {
     "download": "node ./scripts/download.js",
     "install": "npm run download",
+    "postinstall": "node ./scripts/postinstall.js",
     "build": "npm run build:types && npm run build:js && npm run copy:types",
     "build:types": "rimraf ./types && tsc -p dtsconfig.json",
     "build:js": "rimraf ./liteav && tsc -p tsconfig.json",

package/scripts/download.js

@@ -142,9 +142,6 @@ const main = () => {
                         );
                         signale.success(`copy success! - mac ${anotherArch}`);
 
-                        // Mac 下完成文件下载后，执行该命令，同步文件到 Electron 目录下
-                        exec(`rsync -a ../../node_modules/trtc-electron-sdk/build/mac-framework/${archType}/ ../../node_modules/electron/dist/Electron.app/Contents/Frameworks`);
-
                         rimraf.sync(outputDir);
                     })
                     .catch(err => {

package/scripts/postinstall.js

@@ -0,0 +1,46 @@
+const { exec } = require('child_process');
+const path = require('path');
+const fs = require('fs');
+const { arch, platform } = process;
+
+let retryCount = 0;
+const retryInterval = 5000; // ms
+const maxRetryCount = 60;
+
+function rsync() {
+  if (platform === 'darwin') {
+    const sourcePath = path.join(__dirname, `../../trtc-electron-sdk/build/mac-framework/${arch}/`);
+    const targetPath = path.join(__dirname, '../../electron/dist/Electron.app/Contents/Frameworks');
+
+    if (targetPath.indexOf("node_modules") === -1) {
+      // SDK 本身安装，不用同步动态库，直接退出
+      console.warn(`trtc-electron-sdk self install do not need 'rsync'`);
+      return;
+    }
+
+    retryCount++;
+    if (fs.existsSync(targetPath)) {
+      const command = `rsync -a ${sourcePath} ${targetPath}`;
+      console.log(command);
+      exec(command);
+    } else {
+      if (retryCount <= maxRetryCount) {
+        setTimeout(rsync, retryInterval);
+      } else {
+        const errorMessage = `
+        'trtc-electron-sdk' 安装失败，请先确认 'Electron' 已安装，再执行 'npm install trtc-electron-sdk' 命令重新安装一次。
+        Failed to install trtc-electron-sdk correctly, please make sure that 'Electron' has been installed, then run 'npm install trtc-electron-sdk' command to try again.
+
+        more detail:
+        trtc-electron-sdk postinstall cwd: ${process.cwd()} 
+        __dirname: ${__dirname}
+        sourcePath: ${sourcePath}
+        targetPath: ${targetPath}
+        `;
+        console.error(errorMessage);
+      }
+    } 
+  }
+}
+
+rsync();