trtc-electron-sdk 12.2.115-beta.4 → 12.2.115-beta.6

package/liteav/trtc.d.ts

@@ -2958,6 +2958,24 @@ declare class TRTCCloud extends EventEmitter {
      * @param {String} jsonStr - 接口及参数描述的 JSON 字符串
      */
     callExperimentalAPI(jsonStr: string): void;
+    /**
+     * @private
+     *
+     * 开启/关闭视频渲染帧率控制
+     *
+     * @param {Record<string, unknown>} params  - 参数
+     *
+     * @example
+     * import TRTCCloud from "trtc-electron-sdk";
+     *
+     * const trtcCloud = TRTCCloud.getTRTCShareInstance();
+     * trtcCloud.callExperimentalAPI(JSON.stringify({
+     *   api: "disableLocalRenderFPSOptimization",
+     *   params: {
+     *     disable: true
+     *   }
+     * }));
+     */
     private disableLocalRenderFPSOptimization;
 }
 export default TRTCCloud;

package/liteav/trtc.js

@@ -5350,6 +5350,24 @@ class TRTCCloud extends events_1.EventEmitter {
             this.logger.warn(`callExperimentalAPI invalid JSON parameter`, error);
         }
     }
+    /**
+     * @private
+     *
+     * 开启/关闭视频渲染帧率控制
+     *
+     * @param {Record<string, unknown>} params  - 参数
+     *
+     * @example
+     * import TRTCCloud from "trtc-electron-sdk";
+     *
+     * const trtcCloud = TRTCCloud.getTRTCShareInstance();
+     * trtcCloud.callExperimentalAPI(JSON.stringify({
+     *   api: "disableLocalRenderFPSOptimization",
+     *   params: {
+     *     disable: true
+     *   }
+     * }));
+     */
     disableLocalRenderFPSOptimization(params) {
         this.videoRenderFPS = 60;
         if (params.disable === true) {

package/liteav/trtc_define.d.ts

@@ -234,7 +234,7 @@ export declare class TRTCVideoFrame {
  * 音频帧数据
  *
  * @param {TRTCAudioFrameFormat} audioFormat - 音频帧的格式
- * @param {ArrayBuffer} data - 音频数据
+ * @param {Buffer|ArrayBuffer} data - 音频数据
  * @param {Number} length - 音频数据的长度
  * @param {Number} sampleRate - 采样率
  * @param {Number} channel - 声道数
@@ -244,7 +244,7 @@ export declare class TRTCVideoFrame {
  */
 export declare class TRTCAudioFrame {
     audioFormat: TRTCAudioFrameFormat;
-    data: ArrayBuffer | null;
+    data: Buffer | ArrayBuffer | null;
     length: number;
     sampleRate: number;
     channel: number;

package/liteav/trtc_define.js

@@ -651,7 +651,7 @@ exports.TRTCVideoFrame = TRTCVideoFrame;
  * 音频帧数据
  *
  * @param {TRTCAudioFrameFormat} audioFormat - 音频帧的格式
- * @param {ArrayBuffer} data - 音频数据
+ * @param {Buffer|ArrayBuffer} data - 音频数据
  * @param {Number} length - 音频数据的长度
  * @param {Number} sampleRate - 采样率
  * @param {Number} channel - 声道数

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trtc-electron-sdk",
-  "version": "12.2.115-beta.4",
+  "version": "12.2.115-beta.6",
   "description": "trtc electron sdk",
   "main": "./liteav/index.js",
   "types": "./liteav/index.d.ts",

package/scripts/download.js

@@ -28,7 +28,13 @@ const {
 } = require("./utils");
 const { Platform } = require("./constant");
 
-const buildDownloadInfo = () => {
+const urlDomains = [
+  "web.sdk.qcloud.com",
+  "web.sdk.cloud.tencent.cn",
+  "web.sdk.tencent.cn",
+];
+
+const buildDownloadInfo = (urlDomain) => {
   let configArgv = Object.assign(
     {
       arch: process.arch,
@@ -52,193 +58,171 @@ const buildDownloadInfo = () => {
   // generate download url
   return {
     platform: osLabel,
-    downloadUrl: `https://web.sdk.qcloud.com/trtc/electron/download/${name}/${version}/${name}-${osLabel}-${version}.zip`,
+    downloadUrl: `https://${urlDomain}/trtc/electron/download/${name}/${version}/${name}-${osLabel}-${version}.zip`,
     name,
     version,
     archType: configArgv.arch,
   };
 };
 
-const main = () => {
+async function main(urlDomain) {
   const {
     platform,
     downloadUrl,
     name,
     version,
     archType,
-  } = buildDownloadInfo();
-
+  } = buildDownloadInfo(urlDomain);
+  
   const outputDir = path.join(__dirname, "../temp");
   const buildDir = path.join(__dirname, "../build");
 
   rimraf.sync(outputDir);
-  rimraf(buildDir, (err) => {
-    if (err) {
-      signale.fatal(err);
-      process.exit(1);
-    }
+  rimraf.sync(buildDir);
 
-    // print download info
-    signale.info("removeDir  =", buildDir);
-    signale.info("outputDir  =", outputDir);
+  // print download info
+  signale.info("removeDir  =", buildDir);
+  signale.info("outputDir  =", outputDir);
 
-    signale.info("Package Version =", version);
-    signale.info("Platform =", platform);
-    signale.info("Download Url =", downloadUrl, "\n");
+  signale.info("Package Version =", version);
+  signale.info("Platform =", platform);
+  signale.info("Download Url =", downloadUrl, "\n");
 
-    signale.pending("Downloading C++ addon Electron SDK...\n");
-    const downloadOptions = {
-      strip: 0,
-      extract: true,
+  signale.pending("Downloading C++ addon Electron SDK...\n");
+  const downloadOptions = {
+    strip: 0,
+    extract: true,
+  };
+  const proxyUrl = readProxyUrlFromEnv(downloadUrl);
+  if (proxyUrl) {
+    downloadOptions.agent = {
+      https: new HttpsProxyAgent({
+        keepAlive: true,
+        keepAliveMsecs: 1000,
+        maxSockets: 256,
+        maxFreeSockets: 256,
+        scheduling: "lifo",
+        proxy: proxyUrl,
+      }),
     };
-    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(
-          path.join(outputDir, "./build/Release"),
-          path.join(buildDir, "Release")
-        );
-        signale.success(`copy success! - ${platform}`);
-
-        if (
-          platform === Platform.WINDOWS32 ||
-          platform === Platform.WINDOWS64
-        ) {
-          // windows 下
-          rimraf.sync(outputDir);
-        } else if (
-          platform === Platform.MACOS ||
-          platform === Platform.MACOS_ARM
-        ) {
-          // mac 下
-          const arch = archType;
-          fs.copySync(
-            path.join(outputDir, "./build/Release/trtc_electron_sdk.node"),
-            path.join(buildDir, "Release", arch, "trtc_electron_sdk.node")
-          );
-          fs.copySync(
-            path.join(outputDir, "./build/mac-framework", arch),
-            path.join(buildDir, "mac-framework", arch)
-          );
-          signale.success(`copy success! - mac ${arch}`, "\n");
-
-          let anotherPlatform, anotherArch;
-          if (arch === "x64") {
-            // download arm64
-            anotherPlatform = Platform.MACOS_ARM;
-            anotherArch = "arm64";
-          } else {
-            // arch = arm64, download x64
-            anotherPlatform = Platform.MACOS;
-            anotherArch = "x64";
-          }
-          const anotherDownloadUrl = `https://web.sdk.qcloud.com/trtc/electron/download/${name}/${version}/${name}-${anotherPlatform}-${version}.zip`;
-          signale.info("Download Url =", anotherDownloadUrl, "\n");
-          signale.pending(
-            `Downloading C++ addon Electron SDK... ${anotherArch}\n`
-          );
-          download(anotherDownloadUrl, path.join(outputDir, anotherPlatform), {
-            strip: 0,
-            extract: true,
-          })
-            .then(() => {
-              signale.success(`Download finished - mac ${anotherArch}`);
-
-              fs.copySync(
-                path.join(
-                  outputDir,
-                  anotherPlatform,
-                  "/build/Release/trtc_electron_sdk.node"
-                ),
-                path.join(
-                  buildDir,
-                  "Release",
-                  anotherArch,
-                  "trtc_electron_sdk.node"
-                )
-              );
-              fs.copySync(
-                path.join(
-                  outputDir,
-                  anotherPlatform,
-                  "/build/mac-framework",
-                  anotherArch
-                ),
-                path.join(buildDir, "mac-framework", anotherArch)
-              );
-              signale.success(`copy success! - mac ${anotherArch}`);
-
-              rimraf.sync(outputDir);
-            })
-            .catch((err) => {
-              signale.fatal(`download error! - mac ${anotherPlatform}`, err);
-            });
-        } else if (
-          platform === Platform.LINUX_X64 ||
-          platform === Platform.LINUX_ARM64
-        ) {
-          // Linux 下
-          const arch = process.arch;
-          fs.copySync(
-            path.join(outputDir, "./build/Release"),
-            path.join(buildDir, "Release", arch)
-          );
-          signale.success(`copy success! - linux ${arch}`, "\n");
-
-          let anotherPlatform, anotherArch;
-          if (arch === "x64") {
-            // download arm64
-            anotherPlatform = Platform.LINUX_ARM64;
-            anotherArch = "arm64";
-          } else {
-            // arch = arm64, download x64
-            anotherPlatform = Platform.LINUX_X64;
-            anotherArch = "x64";
-          }
-          const anotherDownloadUrl = `https://web.sdk.qcloud.com/trtc/electron/download/${name}/${version}/${name}-${anotherPlatform}-${version}.zip`;
-          signale.info("Download Url =", anotherDownloadUrl, "\n");
-          signale.pending(
-            `Downloading C++ addon Electron SDK... ${anotherArch}\n`
-          );
-          download(anotherDownloadUrl, path.join(outputDir, anotherPlatform), {
-            strip: 0,
-            extract: true,
-          })
-            .then(() => {
-              signale.success(`Download finished - linux ${anotherArch}`);
-              fs.copySync(
-                path.join(outputDir, anotherPlatform, "/build/Release"),
-                path.join(buildDir, "Release", anotherArch)
-              );
-              signale.success(`copy success! - linux ${anotherArch}`);
-
-              rimraf.sync(outputDir);
-            })
-            .catch((err) => {
-              signale.fatal(`download error! - linux ${anotherPlatform}`, err);
-            });
-        } else {
-          signale.warn(`Not supported platform: ${platform}`);
-        }
+  }
+
+  try {
+    await download(downloadUrl, outputDir, downloadOptions);
+    signale.success(`Download finished - ${platform}`);
+
+    fs.copySync(
+      path.join(outputDir, "./build/Release"),
+      path.join(buildDir, "Release")
+    );
+    signale.success(`copy success! - ${platform}`);
+
+    if (platform === Platform.WINDOWS32 || platform === Platform.WINDOWS64) {
+      // windows 下
+      rimraf.sync(outputDir);
+    }  else if (platform === Platform.MACOS || platform === Platform.MACOS_ARM) {
+      // mac 下
+      const arch = archType;
+      fs.copySync(
+        path.join(outputDir, "./build/Release/trtc_electron_sdk.node"),
+        path.join(buildDir, "Release", arch, "trtc_electron_sdk.node")
+      );
+      fs.copySync(
+        path.join(outputDir, "./build/mac-framework", arch),
+        path.join(buildDir, "mac-framework", arch)
+      );
+      signale.success(`copy success! - mac ${arch}`, "\n");
+
+      let anotherPlatform, anotherArch;
+      if (arch === "x64") {
+        // download arm64
+        anotherPlatform = Platform.MACOS_ARM;
+        anotherArch = "arm64";
+      } else {
+        // arch = arm64, download x64
+        anotherPlatform = Platform.MACOS;
+        anotherArch = "x64";
+      }
+
+      const anotherDownloadUrl = `https://${urlDomain}/trtc/electron/download/${name}/${version}/${name}-${anotherPlatform}-${version}.zip`;
+      signale.info("Download Url =", anotherDownloadUrl, "\n");
+      signale.pending(`Downloading C++ addon Electron SDK... ${anotherArch}\n`);
+      await download(anotherDownloadUrl, path.join(outputDir, anotherPlatform), {
+        strip: 0,
+        extract: true,
       })
-      .catch((err) => {
-        signale.fatal(`Failed! Download error - ${platform}`, err);
-      });
-  });
-};
+      signale.success(`Download finished - mac ${anotherArch}`);
+      fs.copySync(
+        path.join(
+          outputDir,
+          anotherPlatform,
+          "/build/Release/trtc_electron_sdk.node"
+        ),
+        path.join(
+          buildDir,
+          "Release",
+          anotherArch,
+          "trtc_electron_sdk.node"
+        )
+      );
+      fs.copySync(
+        path.join(
+          outputDir,
+          anotherPlatform,
+          "/build/mac-framework",
+          anotherArch
+        ),
+        path.join(buildDir, "mac-framework", anotherArch)
+      );
+      signale.success(`copy success! - mac ${anotherArch}`);
+
+      rimraf.sync(outputDir);
+    } else if (platform === Platform.LINUX_X64 || platform === Platform.LINUX_ARM64) {
+      // Linux 下
+      const arch = process.arch;
+      fs.copySync(
+        path.join(outputDir, "./build/Release"),
+        path.join(buildDir, "Release", arch)
+      );
+      signale.success(`copy success! - linux ${arch}`, "\n");
+
+      let anotherPlatform, anotherArch;
+      if (arch === "x64") {
+        // download arm64
+        anotherPlatform = Platform.LINUX_ARM64;
+        anotherArch = "arm64";
+      } else {
+        // arch = arm64, download x64
+        anotherPlatform = Platform.LINUX_X64;
+        anotherArch = "x64";
+      }
+      const anotherDownloadUrl = `https://${urlDomain}/trtc/electron/download/${name}/${version}/${name}-${anotherPlatform}-${version}.zip`;
+      signale.info("Download Url =", anotherDownloadUrl, "\n");
+      signale.pending(`Downloading C++ addon Electron SDK... ${anotherArch}\n`);
+      await download(anotherDownloadUrl, path.join(outputDir, anotherPlatform), {
+        strip: 0,
+        extract: true,
+      })
+      signale.success(`Download finished - linux ${anotherArch}`);
+      fs.copySync(
+        path.join(outputDir, anotherPlatform, "/build/Release"),
+        path.join(buildDir, "Release", anotherArch)
+      );
+      signale.success(`copy success! - linux ${anotherArch}`);
+
+      rimraf.sync(outputDir);
+    } else {
+      signale.warn(`Not supported platform: ${platform}`);
+    }
+  } catch(err) {
+    const anotherUrlDomain = urlDomains.shift();
+    if (anotherUrlDomain) {
+      signale.info(`Try to download from another address:${anotherUrlDomain}`);
+      main(anotherUrlDomain);
+    } else {
+      signale.error(`Failed! Download error - ${platform}`, err);
+    }
+  }
+}
 
-main();
+main(urlDomains.shift());