trtc-electron-sdk 11.0.501 → 11.0.502-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trtc-electron-sdk",
-  "version": "11.0.501",
+  "version": "11.0.502-beta.0",
   "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();