trtc-electron-sdk 10.3.112-beta.7 → 10.3.112-beta.9

package/package.json

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

package/scripts/constant.js

@@ -1,6 +1,7 @@
 module.exports.Platform = {
-  MACOS: 'mac',
+  MACOS: 'mac', // mac-x64
+  MACOS_ARM: 'mac-arm64',
   WINDOWS32: 'win32',
   WINDOWS64: 'win64',
   UNSUPPORTED: 'unsupported'
-};
+};

package/scripts/download.js

@@ -12,6 +12,7 @@ const {
     detectOwnVersion,
     detectOwnName,
 } = require('./utils');
+const { Platform } = require('./constant');
 
 const buildDownloadInfo = () => {
     const configArgv = Object.assign({}, readCliArgv(), readArgvFromNpmEnv());
@@ -28,22 +29,25 @@ const buildDownloadInfo = () => {
 
     // generate download url
     return {
-        packageVersion: version,
         platform: osLabel,
-        downloadUrl: `https://web.sdk.qcloud.com/trtc/electron/download/${name}/${version}/${name}-${osLabel}-${version}.zip`
+        downloadUrl: `https://web.sdk.qcloud.com/trtc/electron/download/${name}/${version}/${name}-${osLabel}-${version}.zip`,
+        name,
+        version
     };
 };
 
 const main = () => {
     const {
-        packageVersion,
         platform,
-        downloadUrl
+        downloadUrl,
+        name,
+        version
     } = buildDownloadInfo();
 
-    const outputDir = './temp';
+    const outputDir = path.join(__dirname, '../temp');
     const buildDir = path.join(__dirname, '../build');
 
+    rimraf.sync(outputDir);
     rimraf(buildDir, err => {
         if (err) {
             signale.fatal(err);
@@ -54,33 +58,79 @@ const main = () => {
         signale.info('removeDir  =', buildDir);
         signale.info('outputDir  =', outputDir);
 
-        signale.info('Package Version =', packageVersion);
+        signale.info('Package Version =', version);
         signale.info('Platform =', platform);
         signale.info('Download Url =', downloadUrl, '\n');
 
-        // start
         signale.pending('Downloading C++ addon Electron SDK...\n');
         download(downloadUrl, outputDir, {
             strip: 0,
             extract: true
         }).then(() => {
-            signale.success('Success', 'Download finished');
+            signale.success(`Download finished - ${platform}`);
 
-            fs.copy(path.join(outputDir, './build'), buildDir)
-                .then(() => {
-                    console.log('copy success!');
-                    rimraf.sync(outputDir);
+            fs.copySync(
+                path.join(outputDir, './build/Release'),
+                path.join(buildDir, 'Release')
+            );
+            signale.success(`copy success! - ${platform}`);
+
+            if (platform === Platform.WINDOWS32 || platform === Platform.WINDOWS64) {
+                rimraf.sync(outputDir); // windows 下
+            } else {
+                // mac 下
+                const arch = process.arch;
+                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'),
+                    path.join(buildDir, 'mac-framework')
+                );
+                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')
+                        );
+                        signale.success(`copy success! - mac ${anotherArch}`);
 
-                    if (process.platform === 'darwin') {
                         // Mac 下完成文件下载后，执行该命令，同步文件到 Electron 目录下
+                        // exec('npm run postinstall-mac');
+                        // exec(`rsync -a ../../node_modules/trtc-electron-sdk/build/mac-framework/${process.arch}/ ../../node_modules/electron/dist/Electron.app/Contents/Frameworks`);
                         exec(`rsync -a ../../node_modules/trtc-electron-sdk/build/mac-framework/ ../../node_modules/electron/dist/Electron.app/Contents/Frameworks`);
-                    }
-                })
-                .catch(err => console.error(err));
+
+                        rimraf.sync(outputDir);
+                    })
+                    .catch(err => {
+                        signale.fatal(`download error! - mac ${anotherPlatform}`, err);
+                    });
+            }
         }).catch(err => {
-            signale.fatal('Failed', err);
+            signale.fatal(`Failed! Download error - ${platform}`, err);
         });
     });
 };
 
-main();
+main();

package/scripts/utils.js

@@ -43,7 +43,11 @@ module.exports.detectOS = (archType = '') => {
   const platform = process.platform;
   const arch = archType !== '' ? archType : process.arch;
   if (platform === 'darwin') {
-    return Platform.MACOS;
+    if (arch === 'x64') {
+      return Platform.MACOS;
+    } else {
+      return Platform.MACOS_ARM;
+    }
   }
   if (platform === 'win32') {
     if (arch === 'x64') {
@@ -66,4 +70,3 @@ module.exports.detectOwnName = () => {
   const name = pkg.name;
   return name;
 };
-