hunter-open-sdk 0.0.14 → 0.0.16

package/lib/events/driver/service.js

@@ -36,7 +36,17 @@ var Service = /*#__PURE__*/function () {
             mainWindow.webContents.send("checkDriver", true);
           } else {
             mainWindow.webContents.send("checkDriver", false);
-            (0, _winDriver.downloadDriver)(mainWindow);
+            // 修复：传入正确的进度回调函数
+            (0, _winDriver.downloadDriver)(function (percent) {
+              console.log('下载进度:', percent + '%');
+              mainWindow.webContents.send("downloadProgress", percent);
+            }).then(function () {
+              console.log('驱动下载安装成功');
+              mainWindow.webContents.send("checkDriver", true);
+            }).catch(function (err) {
+              console.error('驱动下载安装失败:', err);
+              mainWindow.webContents.send("checkDriver", false);
+            });
           }
         });
       }

package/lib/events/driver/winDriver.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.checkHasDriver = checkHasDriver;
 exports.downloadDriver = downloadDriver;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _utils = require("../../utils/utils");
 var _utils2 = require("../../utils/utils.command");
@@ -109,6 +110,12 @@ 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");
+  console.log('开始安装驱动，命令:', cmdStr);
+  console.log('检查安装文件是否存在:');
+  console.log('AppleApplicationSupport:', fs.existsSync(AppleApplicationSupport));
+  console.log('AppleApplicationSupport64:', fs.existsSync(AppleApplicationSupport64));
+  console.log('AppleMobileDeviceSupport64:', fs.existsSync(AppleMobileDeviceSupport64));
+  console.log('Bonjour64:', fs.existsSync(Bonjour64));
   return new Promise(function (resolve, reject) {
     sudo.exec(cmdStr, options, function (error, stdout, stderr) {
       console.log('安装 error>>', error);
@@ -121,8 +128,10 @@ var installDriver = function installDriver() {
       }
       checkProcessTimer();
       if (error) {
+        console.error('驱动安装失败:', error);
         reject(error); // 安装失败
       } else {
+        console.log('驱动安装成功');
         resolve(); // 安装成功
       }
     });
@@ -131,68 +140,119 @@ var installDriver = function installDriver() {
 // 解压文件
 var uncopressingFile = function uncopressingFile(filePath) {
   return new Promise(function (resolve) {
+    console.log('开始解压文件:', filePath);
     compressing.zip.uncompress(filePath, CACHE_PATH).then(function () {
+      console.log('文件解压成功');
       resolve(true);
     }).catch(function (err) {
+      console.error('文件解压失败:', err);
       resolve(false);
-      console.log('error', err);
     });
   });
 };
 
 // Promise 版本的 downloadDriver，onProgress 作为参数，成功 resolve，失败 reject
 function downloadDriver(onProgress) {
+  console.log('=== downloadDriver 函数被调用 ===');
+  console.log('onProgress 参数:', (0, _typeof2.default)(onProgress));
   return new Promise(function (resolve, reject) {
+    console.log('=== 开始创建Promise ===');
     var url = 'http://ljtools.zhuanstatic.com/download/iTunesDriver/iTunesOL_Lite_64_12.10.0.7.zip';
     var dest = filePath;
+    console.log('开始下载驱动文件:', url);
+    console.log('目标路径:', dest);
+
+    // 检查目标目录是否存在
+    var destDir = path.dirname(dest);
+    console.log('目标目录:', destDir);
+    console.log('目录是否存在:', fs.existsSync(destDir));
     var fileStream = _fsExtra.default.createWriteStream(dest);
     var received = 0;
     var total = 0;
+
+    // 进度回调限流：每100ms最多调用一次，或者进度变化超过5%时调用
+    var lastProgressCall = 0;
+    var lastProgressPercent = 0;
+    var PROGRESS_THROTTLE_MS = 100; // 100ms限流
+    var PROGRESS_THRESHOLD = 5; // 5%阈值
+
+    var throttledProgressCallback = function throttledProgressCallback(percent) {
+      var now = Date.now();
+      var shouldCall = now - lastProgressCall >= PROGRESS_THROTTLE_MS || Math.abs(percent - lastProgressPercent) >= PROGRESS_THRESHOLD;
+      if (shouldCall && onProgress) {
+        onProgress(percent);
+        lastProgressCall = now;
+        lastProgressPercent = percent;
+        console.log("\u4E0B\u8F7D\u8FDB\u5EA6: ".concat(percent, "% (").concat(received, "/").concat(total, ")"));
+      }
+    };
+    console.log('=== 开始创建request ===');
     (0, _request.default)(url).on('response', function (response) {
+      console.log('下载响应状态:', response.statusCode);
       if (response.statusCode !== 200) {
         reject(new Error("\u4E0B\u8F7D\u5931\u8D25: ".concat(response.statusMessage)));
         return;
       }
       total = parseInt(response.headers['content-length'], 10);
+      console.log('文件总大小:', total, 'bytes');
     }).on('data', function (chunk) {
       received += chunk.length;
-      if (onProgress && total) {
-        onProgress(Math.round(received / total * 100));
+      if (total) {
+        var percent = Math.round(received / total * 100);
+        throttledProgressCallback(percent);
       }
     }).on('error', function (err) {
       console.error('驱动下载失败', err);
+      fileStream.end(); // 确保关闭文件流
       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.prev = 0;
-            _context2.next = 3;
+            console.log('=== FINISH 事件被触发 ===');
+            console.log('文件下载完成，开始解压...');
+
+            // 确保最后一次进度回调被调用（100%）
+            if (onProgress && total) {
+              onProgress(100);
+              console.log('下载完成: 100%');
+            }
+            _context2.prev = 3;
+            _context2.next = 6;
             return uncopressingFile(filePath);
-          case 3:
+          case 6:
             uncopressing = _context2.sent;
+            console.log('解压结果:', uncopressing);
             if (uncopressing) {
+              console.log('开始安装驱动...');
               installDriver().then(function () {
+                console.log('驱动安装成功');
                 resolve();
               }).catch(function (err) {
+                console.error('驱动安装失败:', err);
                 reject(err);
               });
             } else {
+              console.error('解压失败');
               reject(new Error('解压失败'));
             }
-            _context2.next = 10;
+            _context2.next = 15;
             break;
-          case 7:
-            _context2.prev = 7;
-            _context2.t0 = _context2["catch"](0);
+          case 11:
+            _context2.prev = 11;
+            _context2.t0 = _context2["catch"](3);
+            console.error('解压或安装过程中出错:', _context2.t0);
             reject(_context2.t0);
-          case 10:
+          case 15:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[0, 7]]);
-    })));
+      }, _callee2, null, [[3, 11]]);
+    }))).on('error', function (err) {
+      console.error('文件流写入错误:', err);
+      reject(err);
+    });
   });
 }
 function checkHasDriver() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hunter-open-sdk",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "采货侠SaaS版本桌面端sdk",
   "scripts": {
     "start": "zz dev",