trtc-electron-sdk 12.0.605 → 12.1.607

package/scripts/download.js

@@ -1,203 +1,244 @@
-const download = require('download');
-const path = require('path');
-const fs = require('fs-extra');
-const rimraf = require('rimraf');
-const signale = require('signale');
-const { exec } = require('child_process');
-const { HttpsProxyAgent } = require('hpagent');
+const download = require("download");
+const path = require("path");
+const fs = require("fs-extra");
+const rimraf = require("rimraf");
+const signale = require("signale");
+const { HttpsProxyAgent } = require("hpagent");
 
 const currentPath = process.cwd();
-const pathFlagValue = `packages${process.platform === "win32" ? "\\" : "/"}trtc-electron-sdk`;
+const pathFlagValue = `packages${
+  process.platform === "win32" ? "\\" : "/"
+}trtc-electron-sdk`;
 if (currentPath.indexOf(pathFlagValue) !== -1) {
-    signale.info("trtc-electron-sdk: development mode, skip native sdk lib download");
-    return;
+  signale.info(
+    "trtc-electron-sdk: development mode, skip native sdk lib download"
+  );
+  return;
 }
 
 const {
-    readCliArgv,
-    readArgvFromNpmEnv,
-    detectOS,
-    detectOwnVersion,
-    detectOwnName,
-    readProxyUrlFromEnv,
-} = require('./utils');
-const { Platform } = require('./constant');
+  readCliArgv,
+  readArgvFromNpmEnv,
+  detectOS,
+  detectOwnVersion,
+  detectOwnName,
+  readProxyUrlFromEnv,
+  readArgvFromPkgJson,
+  detectConfigArgv,
+} = require("./utils");
+const { Platform } = require("./constant");
 
 const buildDownloadInfo = () => {
-    const configArgv = Object.assign({
-        arch: process.arch,
-        platform: process.platform,
-    }, readCliArgv(), readArgvFromNpmEnv());
-
-    // build os label
-    const osLabel = detectOS(configArgv.arch, configArgv.platform);
-
-    // build version label
-    const { version } = detectOwnVersion();
-    signale.info('buildDownloadInfo version=', version);
-
-    const name = detectOwnName();
-    signale.info('buildDownloadInfo name=', name);
-
-    // generate download url
-    return {
-        platform: osLabel,
-        downloadUrl: `https://web.sdk.qcloud.com/trtc/electron/download/${name}/${version}/${name}-${osLabel}-${version}.zip`,
-        name,
-        version,
-        archType: configArgv.arch
-    };
+  let configArgv = Object.assign(
+    {
+      arch: process.arch,
+      platform: process.platform,
+    },
+    readCliArgv(),
+    readArgvFromNpmEnv(),
+    readArgvFromPkgJson()
+  );
+
+  configArgv = detectConfigArgv(configArgv);
+  // build os label
+  const osLabel = detectOS(configArgv.arch, configArgv.platform);
+  // build version label
+  const { version } = detectOwnVersion();
+  signale.info("buildDownloadInfo version=", version);
+
+  const name = detectOwnName();
+  signale.info("buildDownloadInfo name=", name);
+  console.log("detectedArgv", osLabel);
+  // generate download url
+  return {
+    platform: osLabel,
+    downloadUrl: `https://web.sdk.qcloud.com/trtc/electron/download/${name}/${version}/${name}-${osLabel}-${version}.zip`,
+    name,
+    version,
+    archType: configArgv.arch,
+  };
 };
 
 const main = () => {
-    const {
-        platform,
-        downloadUrl,
-        name,
-        version,
-        archType
-    } = buildDownloadInfo();
-
-    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);
-        }
-
-        // 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.pending('Downloading C++ addon Electron SDK...\n');
-        const downloadOptions = {
+  const {
+    platform,
+    downloadUrl,
+    name,
+    version,
+    archType,
+  } = buildDownloadInfo();
+
+  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);
+    }
+
+    // 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.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,
+        }),
+      };
+    }
+    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
-        };
-        const proxyUrl = readProxyUrlFromEnv(downloadUrl);
-        if (proxyUrl) {
-            downloadOptions.agent = {
-                https: new HttpsProxyAgent({
-                    keepAlive: true,
-                    keepAliveMsecs: 1000,
-                    maxSockets: 256,
-                    maxFreeSockets: 256,
-                    scheduling: 'lifo',
-                    proxy: proxyUrl
-                })
-            }
+            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}`);
         }
-        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 === 'mac' || platform === 'mac-arm64') {
-                // 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 === 'linux-x64' || 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}`);
-            }
-        }).catch(err => {
-            signale.fatal(`Failed! Download error - ${platform}`, err);
-        });
-    });
+      })
+      .catch((err) => {
+        signale.fatal(`Failed! Download error - ${platform}`, err);
+      });
+  });
 };
 
 main();

package/scripts/utils.js

@@ -1,17 +1,16 @@
 /**
  * Utils for command line tools
  */
-const semver = require('semver');
-const pkg = require('../package.json');
+const semver = require("semver");
+const pkg = require("../package.json");
+const { Platform } = require("./constant");
 
-const { Platform } = require('./constant');
-
-module.exports.readCliArgv = function() {
+module.exports.readCliArgv = function () {
   const cliArgv = process.argv;
   const newArgv = {};
   let tmp = [];
-  console.log('readCliArgv',cliArgv);
-  for (let i = 0, len = cliArgv.length ; i < len ; i++) {
+  console.log("readCliArgv", cliArgv);
+  for (let i = 0, len = cliArgv.length; i < len; i++) {
     if (i === 0) {
       newArgv.nodeDir = cliArgv[i];
       continue;
@@ -20,21 +19,21 @@ module.exports.readCliArgv = function() {
       newArgv.scriptDir = cliArgv[i];
       continue;
     }
-    tmp = cliArgv[i].replace('--','').split('=');
+    tmp = cliArgv[i].replace("--", "").split("=");
     newArgv[tmp[0]] = tmp[1];
     tmp = [];
   }
   return newArgv;
 };
 
-module.exports.readProxyUrlFromEnv = function(downloadUrl) {
-  if (downloadUrl.indexOf('https') === 0) {
-    return process.env.https_proxy || ''
+module.exports.readProxyUrlFromEnv = function (downloadUrl) {
+  if (downloadUrl.indexOf("https") === 0) {
+    return process.env.https_proxy || "";
   }
-  return process.env.http_proxy || '';
-}
+  return process.env.http_proxy || "";
+};
 
-module.exports.readArgvFromNpmEnv = function() {
+module.exports.readArgvFromNpmEnv = function () {
   const result = {};
   if (process.env.npm_config_trtc_electron_arch) {
     result.arch = process.env.npm_config_trtc_electron_arch;
@@ -45,25 +44,89 @@ module.exports.readArgvFromNpmEnv = function() {
   return result;
 };
 
-module.exports.detectOS = (archType = '', platformType = '') => {
-  const platform = platformType !== '' ? platformType : process.platform;
-  const arch = archType !== '' ? archType : process.arch;
-  if (platform === 'darwin') {
-    if (arch === 'x64') {
+module.exports.readArgvFromPkgJson = function () {
+  let INIT_CWD = process.env["INIT_CWD"];
+  if (!INIT_CWD) return {};
+  let rootDirIndex = 0;
+  let PkgJsonDir = "";
+  if (process.platform === "win32") {
+    INIT_CWD = INIT_CWD.split("\\");
+    rootDirIndex = INIT_CWD.findIndex((item) => item === "node_modules");
+    PkgJsonDir =
+      INIT_CWD.splice(0, rootDirIndex).join("\\\\") + "\\\\package.json";
+  } else {
+    INIT_CWD = INIT_CWD.split("/");
+    rootDirIndex = INIT_CWD.findIndex((item) => item === "node_modules");
+    PkgJsonDir = INIT_CWD.splice(0, rootDirIndex).join("/") + "/package.json";
+  }
+  const { trtc_electron } = require(PkgJsonDir);
+  console.log(
+    "INIT_CWD",
+    INIT_CWD,
+    "PkgJsonDir",
+    PkgJsonDir,
+    "trtc_electron",
+    trtc_electron
+  );
+
+  if (!trtc_electron) {
+    return {};
+  }
+  const { platform, arch } = trtc_electron;
+  const result = {};
+  if (platform) {
+    result.platform = platform;
+  }
+  if (arch) {
+    result.arch = arch;
+  }
+  return result;
+};
+
+module.exports.detectConfigArgv = function (configArgv) {
+  if (Object.prototype.toString.call(configArgv) === "[object Object]") {
+    const { platform, arch } = configArgv;
+    if (platform === "darwin") {
+      if (arch !== "x64" && arch !== "arm64") {
+        configArgv.arch = "x64";
+      }
+    } else if (platform === "win32") {
+      if (arch !== "ia32" && arch !== "x64") {
+        configArgv.arch = "x64";
+      }
+    } else if (platform === "linux") {
+      if (arch !== "x64" && arch !== "arm64") {
+        configArgv.arch = "x64";
+      }
+    }
+    return configArgv;
+  } else {
+    return {
+      platform: process.arch,
+      arch: process.platform,
+    };
+  }
+};
+
+module.exports.detectOS = (archType = "", platformType = "") => {
+  const platform = platformType !== "" ? platformType : process.platform;
+  const arch = archType !== "" ? archType : process.arch;
+  if (platform === "darwin") {
+    if (arch === "x64") {
       return Platform.MACOS;
     } else {
       return Platform.MACOS_ARM;
     }
-  } else if (platform === 'win32') {
-    if (arch === 'x64') {
+  } else if (platform === "win32") {
+    if (arch === "x64") {
       return Platform.WINDOWS64;
     } else {
       return Platform.WINDOWS32;
     }
-  } else if (platform === 'linux') {
-    if (arch === 'x64') {
+  } else if (platform === "linux") {
+    if (arch === "x64") {
       return Platform.LINUX_X64;
-    } else if (arch === 'arm64') {
+    } else if (arch === "arm64") {
       return Platform.LINUX_ARM64;
     } else {
       // unsupported
@@ -75,7 +138,10 @@ module.exports.detectOS = (archType = '', platformType = '') => {
 module.exports.detectOwnVersion = () => {
   const { major, minor, patch } = semver.coerce(pkg.version);
   return {
-    major, minor, patch, version: pkg.version
+    major,
+    minor,
+    patch,
+    version: pkg.version,
   };
 };
 
@@ -83,4 +149,3 @@ module.exports.detectOwnName = () => {
   const name = pkg.name;
   return name;
 };
-