hunter-open-sdk 0.0.9 → 0.0.10

package/lib/events/driver/winDriver.js

@@ -10,6 +10,8 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _utils = require("../../utils/utils");
 var _utils2 = require("../../utils/utils.command");
+var _request = _interopRequireDefault(require("request"));
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
 // import { app } from 'electron'
 
 var sudo = require('sudo-prompt');
@@ -26,7 +28,6 @@ var msiStr = 'AppleMobileDeviceService';
 var cmdStr = process.platform === 'win32' ? 'tasklist' : 'ps aux';
 var CACHE_PATH = (0, _utils.isDev)() ? path.join(process.cwd(), './cache') : path.join(process.resourcesPath, './cache');
 var filePath = path.join(CACHE_PATH, './iTunesOL_Lite_64_12.10.0.7.zip');
-var mainWindowObj;
 var checkProcess = function checkProcess() {
   return new Promise(function (resolve, reject) {
     exec(cmdStr, function (err, stdout, stderr) {
@@ -83,7 +84,7 @@ var checkProcessTimer = function checkProcessTimer() {
             _context.next = 6;
             break;
           }
-          mainWindowObj.webContents.send("driverDone");
+          clearTimeout(timer);
           return _context.abrupt("return");
         case 6:
           checkProcessTimer();
@@ -100,16 +101,23 @@ var installDriver = function installDriver() {
   var AppleMobileDeviceSupport64 = path.join(CACHE_PATH, './AppleMobileDeviceSupport64.msi');
   var Bonjour64 = path.join(CACHE_PATH, './Bonjour64.msi');
   var cmdStr = "start /i /wait ".concat(AppleApplicationSupport, " /qn && start /i /wait ").concat(AppleApplicationSupport64, " /qn && start /i /wait ").concat(AppleMobileDeviceSupport64, " /qn && start /i /wait ").concat(Bonjour64, " /qn");
-  sudo.exec(cmdStr, options, function (error, stdout, stderr) {
-    console.log('安装 error>>', error);
-    console.log('安装 stdout>>>', stdout);
-    console.log('安装 stderr>>>', stderr);
-    if ((0, _utils.isDev)()) {
-      (0, _utils2.command)(path.join(process.cwd(), './extraResources/ightools.exe'));
-    } else {
-      (0, _utils2.command)(path.join(process.resourcesPath, './extraResources/ightools.exe'));
-    }
-    checkProcessTimer();
+  return new Promise(function (resolve, reject) {
+    sudo.exec(cmdStr, options, function (error, stdout, stderr) {
+      console.log('安装 error>>', error);
+      console.log('安装 stdout>>>', stdout);
+      console.log('安装 stderr>>>', stderr);
+      if ((0, _utils.isDev)()) {
+        (0, _utils2.command)(path.join(process.cwd(), './extraResources/ightools.exe'));
+      } else {
+        (0, _utils2.command)(path.join(process.resourcesPath, './extraResources/ightools.exe'));
+      }
+      checkProcessTimer();
+      if (error) {
+        reject(error); // 安装失败
+      } else {
+        resolve(); // 安装成功
+      }
+    });
   });
 };
 // 解压文件
@@ -123,46 +131,60 @@ var uncopressingFile = function uncopressingFile(filePath) {
     });
   });
 };
-function downloadDriver(mainWindow) {
-  mainWindowObj = mainWindow;
-  mainWindow.webContents.downloadURL('http://ljtools.zhuanstatic.com/download/iTunesDriver/iTunesOL_Lite_64_12.10.0.7.zip');
-  mainWindow.webContents.session.on('will-download', function (e, item) {
-    // 文件总大小
-    var totalBytes = item.getTotalBytes();
-    // 设置保存路径
-    var rootPath = path.join(CACHE_PATH, item.getFilename());
-    item.setSavePath(rootPath);
-    item.on('updated', function () {
-      try {
-        // 获取进度，设置进度条
-        var _process = item.getReceivedBytes() / totalBytes;
-        _process = Math.round(_process * 100);
-        mainWindow.webContents.send('downloadProcess', _process);
-      } catch (e) {
-        console.log('驱动下载失败');
+
+// Promise 版本的 downloadDriver，onProgress 作为参数，成功 resolve，失败 reject
+function downloadDriver(onProgress) {
+  return new Promise(function (resolve, reject) {
+    var url = 'http://ljtools.zhuanstatic.com/download/iTunesDriver/iTunesOL_Lite_64_12.10.0.7.zip';
+    var dest = filePath;
+    var fileStream = _fsExtra.default.createWriteStream(dest);
+    var received = 0;
+    var total = 0;
+    (0, _request.default)(url).on('response', function (response) {
+      if (response.statusCode !== 200) {
+        reject(new Error("\u4E0B\u8F7D\u5931\u8D25: ".concat(response.statusMessage)));
+        return;
       }
-    });
-    // 下载完成
-    item.on('done', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+      total = parseInt(response.headers['content-length'], 10);
+    }).on('data', function (chunk) {
+      received += chunk.length;
+      if (onProgress && total) {
+        onProgress(Math.round(received / total * 100));
+      }
+    }).on('error', function (err) {
+      console.error('驱动下载失败', err);
+      reject(err);
+    }).pipe(fileStream).on('finish', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
       var uncopressing;
       return _regenerator.default.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context2.next = 2;
+            _context2.prev = 0;
+            _context2.next = 3;
             return uncopressingFile(filePath);
-          case 2:
+          case 3:
             uncopressing = _context2.sent;
-            if (uncopressing) installDriver();
-            mainWindow.webContents.send('downloadDriverDone');
-          case 5:
+            if (uncopressing) {
+              installDriver().then(function () {
+                resolve();
+              }).catch(function (err) {
+                reject(err);
+              });
+            } else {
+              reject(new Error('解压失败'));
+            }
+            _context2.next = 10;
+            break;
+          case 7:
+            _context2.prev = 7;
+            _context2.t0 = _context2["catch"](0);
+            reject(_context2.t0);
+          case 10:
           case "end":
             return _context2.stop();
         }
-      }, _callee2);
+      }, _callee2, null, [[0, 7]]);
     })));
-    item.on('error', function () {
-      console.log('驱动下载失败');
-    });
   });
 }
 function checkHasDriver() {

package/lib/getAndroidSn/index.js

@@ -24,12 +24,18 @@ var GetAndroidSn = function GetAndroidSn(params, callBack) {
             return customWebUSB.getDevices();
           case 4:
             deviceList = _context.sent;
+            if (attachDeviceId) {
+              _context.next = 7;
+              break;
+            }
+            return _context.abrupt("return");
+          case 7:
             // 删选出当前的设备信息 为获取到serialNumber
             currentDevice = deviceList.filter(function (item) {
               return item.device.deviceAddress == attachDeviceId;
             });
             if (currentDevice.length) {
-              _context.next = 9;
+              _context.next = 11;
               break;
             }
             callBack({
@@ -38,7 +44,7 @@ var GetAndroidSn = function GetAndroidSn(params, callBack) {
               message: '获取SN失败'
             });
             return _context.abrupt("return");
-          case 9:
+          case 11:
             callBack({
               code: 0,
               data: {
@@ -46,7 +52,7 @@ var GetAndroidSn = function GetAndroidSn(params, callBack) {
               },
               message: '获取SN成功'
             });
-          case 10:
+          case 12:
           case "end":
             return _context.stop();
         }

package/lib/registerEvent/index.js

@@ -21,6 +21,19 @@ var saasCallBack;
 // 初始化dll
 (0, _utils2.HunterInspectionKit)();
 
+/**
+ * 获取资源文件的基础路径
+ */
+var getResourcePath = function getResourcePath() {
+  if ((0, _utils.isDev)()) {
+    // 开发环境：使用源码目录
+    return path.resolve(__dirname, '../resources');
+  } else {
+    // 生产环境：使用 Electron 的资源路径
+    return path.resolve(process.resourcesPath, 'resources');
+  }
+};
+
 /**
  * 配对
  * @param {String} udid 设备id
@@ -85,7 +98,8 @@ var DevicePair = /*#__PURE__*/function () {
 
 // 写入dll文件version
 var writeDllVersion = function writeDllVersion(version) {
-  var versionPath = path.resolve(__dirname, '../resources/version.online');
+  var resourcePath = getResourcePath();
+  var versionPath = path.resolve(resourcePath, 'version.online');
   fs.writeFile(versionPath, version, function (err) {
     if (err) {
       saasCallBack({
@@ -112,12 +126,13 @@ var writeDllVersion = function writeDllVersion(version) {
 var updateDll = function updateDll(packageUrl, targetVersion) {
   // 若需要更新 则下载完成后 覆盖本地dll文件
   var dllOutPath;
+  var resourcePath = getResourcePath();
   if ((0, _utils.isMac)()) {
     if ((0, _utils.isArm64)()) {
-      dllOutPath = path.resolve(__dirname, "../resources/mac/libinspectionkit_arm64_".concat(targetVersion, ".dylib"));
+      dllOutPath = path.resolve(resourcePath, "mac/libinspectionkit_arm64_".concat(targetVersion, ".dylib"));
     }
   } else {
-    dllOutPath = path.resolve(__dirname, "../resources/dll/libinspectionkit_x64_".concat(targetVersion, ".dll"));
+    dllOutPath = path.resolve(resourcePath, "dll/libinspectionkit_x64_".concat(targetVersion, ".dll"));
   }
   var dllStream = fs.createWriteStream(dllOutPath);
   request(packageUrl).pipe(dllStream).on("close", function (err) {
@@ -209,7 +224,38 @@ var RegisterEvent = function RegisterEvent(params, callBack) {
                   // 有驱动，直接运行脚本
                   DevicePair(udid, params);
                 } else {
-                  (0, _winDriver.downloadDriver)();
+                  // 没有驱动，则下载驱动
+                  (0, _winDriver.downloadDriver)(function (percent) {
+                    saasCallBack({
+                      data: {
+                        eventName: 'type_need_install_driver',
+                        eventCode: 0,
+                        eventContent: JSON.stringify({
+                          percent: percent // 下载进度
+                        })
+                      }
+                    });
+                  }).then(function () {
+                    // 成功
+                    console.log('驱动下载并安装成功');
+                    saasCallBack({
+                      data: {
+                        eventName: 'type_install_driver_result',
+                        eventCode: 0 // 0 成功 -1 失败
+                      }
+                    });
+                    // 成功后进行配对
+                    DevicePair(udid, params);
+                  }).catch(function (err) {
+                    // 失败
+                    console.error('驱动下载或安装失败', err);
+                    saasCallBack({
+                      data: {
+                        eventName: 'type_install_driver_result',
+                        eventCode: -1 // 0 成功 -1 失败
+                      }
+                    });
+                  });
                 }
               });
             } else {

package/lib/utils/utils.js

@@ -14,7 +14,26 @@ var isLinux = exports.isLinux = function isLinux() {
   return process.platform === 'linux';
 };
 var isDev = exports.isDev = function isDev() {
-  return process.env.WEBPACK_DEV_SERVER === 'true';
+  // 检查 NODE_ENV 是否为 development
+  if (process.env.NODE_ENV === 'development') {
+    return true;
+  }
+
+  // 检查是否在 Electron 开发模式下运行
+  if (process.env.ELECTRON_IS_DEV) {
+    return true;
+  }
+
+  // 检查是否在 webpack dev server 模式下运行
+  if (process.env.WEBPACK_DEV_SERVER === 'true') {
+    return true;
+  }
+
+  // 检查是否在 Electron 主进程中，且没有打包
+  if (process.type === 'browser' && !process.resourcesPath.includes('app.asar')) {
+    return true;
+  }
+  return false;
 };
 var isProd = exports.isProd = function isProd() {
   return process.env.NODE_ENV === 'production';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hunter-open-sdk",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "采货侠SaaS版本桌面端sdk",
   "scripts": {
     "start": "zz dev",
@@ -29,6 +29,7 @@
     "core-js": "3.6.5",
     "ffi-napi": "^4.0.3",
     "fs": "^0.0.1-security",
+    "fs-extra": "^11.3.0",
     "lodash": "4.17.21",
     "request": "^2.88.2",
     "sudo-prompt": "^9.2.1",