hunter-open-sdk 0.0.12 → 0.0.14

package/lib/events/driver/winDriver.js

@@ -68,10 +68,13 @@ var checkCache = function checkCache() {
 };
 
 // 轮询检测是否存在进程
+var processCheckTimer = null;
 var checkProcessTimer = function checkProcessTimer() {
-  var timer = null;
-  clearTimeout(timer);
-  timer = setTimeout( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+  // 清除之前的定时器
+  if (processCheckTimer) {
+    clearTimeout(processCheckTimer);
+  }
+  processCheckTimer = setTimeout( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
     var hasDriver;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -84,9 +87,14 @@ var checkProcessTimer = function checkProcessTimer() {
             _context.next = 6;
             break;
           }
-          clearTimeout(timer);
+          // 检测到驱动，清除定时器并返回
+          if (processCheckTimer) {
+            clearTimeout(processCheckTimer);
+            processCheckTimer = null;
+          }
           return _context.abrupt("return");
         case 6:
+          // 继续轮询检测
           checkProcessTimer();
         case 7:
         case "end":

package/lib/getGeneralReport/index.js

@@ -4,8 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _utils = require("../utils/utils.global");
 var GetGeneralReport = function GetGeneralReport(params, callBack) {
-  var reportRes = window.HunterInspectionKit.InspectionKit(params, 'saas_report', params);
+  var reportRes = (0, _utils.callHunterInspectionKit)('InspectionKit', params, 'saas_report', params);
   if (reportRes) {
     var reportResObj = JSON.parse(reportRes);
     var Code = reportResObj.Code,

package/lib/registerEvent/index.js

@@ -10,6 +10,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _utils = require("../utils/utils");
 var _utils2 = require("../utils/utils.initDll");
 var _winDriver = require("../events/driver/winDriver");
+var _utils3 = require("../utils/utils.global");
 var usbmux = require('usbmux');
 var path = require('path');
 var request = require("request");
@@ -18,6 +19,10 @@ var fs = require('fs');
 // saas回调
 var saasCallBack;
 
+// 驱动安装状态
+var isDriverInstalling = false;
+var isDriverReady = false;
+
 // 初始化dll
 (0, _utils2.HunterInspectionKit)();
 
@@ -60,7 +65,7 @@ var DevicePair = /*#__PURE__*/function () {
             cmd: 'trust_status',
             udid: udid
           });
-          devicePair = window.HunterInspectionKit.TheForceKit(JSON.stringify(paramsObj));
+          devicePair = (0, _utils3.callHunterInspectionKit)('TheForceKit', JSON.stringify(paramsObj));
           if (!devicePair) {
             _context.next = 15;
             break;
@@ -163,7 +168,7 @@ var updateDllFileCheck = function updateDllFileCheck() {
     label: (0, _utils.isWin)() ? 'Windows' : 'Mac',
     params: {}
   };
-  var updateRes = window.HunterInspectionKit.TheForceKit(JSON.stringify(updateParams));
+  var updateRes = (0, _utils3.callHunterInspectionKit)('TheForceKit', JSON.stringify(updateParams));
   if (updateRes) {
     var updateResObj = JSON.parse(updateRes);
     var Code = updateResObj.Code,
@@ -192,11 +197,67 @@ var updateDllFileCheck = function updateDllFileCheck() {
     }
   }
 };
+
+/**
+ * 检查并安装驱动
+ */
+var checkAndInstallDriver = function checkAndInstallDriver() {
+  if (!(0, _utils.isWin)()) {
+    isDriverReady = true; // Mac不需要驱动，直接设置为就绪
+    return;
+  }
+  (0, _winDriver.checkHasDriver)().then(function (res) {
+    if (res) {
+      isDriverReady = true; // 已有驱动，设置为就绪
+      return;
+    }
+
+    // 没有驱动，开始下载安装
+    isDriverInstalling = true;
+    (0, _winDriver.downloadDriver)(function (percent) {
+      saasCallBack({
+        data: {
+          eventName: 'type_need_install_driver',
+          eventCode: 0,
+          eventContent: JSON.stringify({
+            percent: percent // 下载进度
+          })
+        }
+      });
+    }).then(function () {
+      // 成功
+      console.log('驱动下载并安装成功');
+      isDriverInstalling = false;
+      isDriverReady = true;
+      saasCallBack({
+        data: {
+          eventName: 'type_install_driver_result',
+          eventCode: 0 // 0 成功 -1 失败
+        }
+      });
+    }).catch(function (err) {
+      // 失败
+      console.error('驱动下载或安装失败', err);
+      isDriverInstalling = false;
+      saasCallBack({
+        data: {
+          eventName: 'type_install_driver_result',
+          eventCode: -1 // 0 成功 -1 失败
+        }
+      });
+    });
+  }).catch(function (err) {
+    console.error('驱动检测失败', err);
+  });
+};
 var RegisterEvent = function RegisterEvent(params, callBack) {
   saasCallBack = callBack;
 
   // 检查是否需要更新dll
   updateDllFileCheck();
+
+  // 在插线之前就检测驱动状态
+  checkAndInstallDriver();
   new usbmux.createListener().on('attached', /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(udid) {
       return _regenerator.default.wrap(function _callee2$(_context2) {
@@ -208,7 +269,7 @@ var RegisterEvent = function RegisterEvent(params, callBack) {
             }
             return _context2.abrupt("return");
           case 2:
-            // 插入设备
+            // 插入设备通知
             saasCallBack({
               data: {
                 eventName: 'type_usb_device_result',
@@ -218,46 +279,38 @@ var RegisterEvent = function RegisterEvent(params, callBack) {
             });
             if ((0, _utils.isWin)()) {
               // windows检查驱动 mac不需要
-              // 检查是否有驱动
-              (0, _winDriver.checkHasDriver)().then(function (res) {
-                if (res) {
-                  // 有驱动，直接运行脚本
-                  DevicePair(udid, params);
-                } else {
-                  // 没有驱动，则下载驱动
-                  (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 失败
-                      }
-                    });
-                  });
-                }
-              });
+              // 检查驱动是否就绪
+              if (isDriverReady) {
+                // 驱动就绪，直接进行配对
+                DevicePair(udid, params);
+              } else if (isDriverInstalling) {
+                // 驱动正在安装中，通知用户等待
+                saasCallBack({
+                  data: {
+                    eventName: 'type_usb_device_result',
+                    udid: udid,
+                    eventCode: -2,
+                    // -2 表示驱动安装中，请等待
+                    eventContent: JSON.stringify({
+                      message: '驱动正在安装中，请稍后重试'
+                    })
+                  }
+                });
+              } else {
+                // 驱动未安装，重新触发安装流程
+                checkAndInstallDriver();
+                saasCallBack({
+                  data: {
+                    eventName: 'type_usb_device_result',
+                    udid: udid,
+                    eventCode: -3,
+                    // -3 表示需要安装驱动
+                    eventContent: JSON.stringify({
+                      message: '需要安装驱动，正在处理中'
+                    })
+                  }
+                });
+              }
             } else {
               // 有驱动，直接运行脚本
               DevicePair(udid, params);

package/lib/resources/version.online

@@ -1 +1 @@
-0.0.5
+0.0.6

package/lib/utils/utils.global.js

@@ -0,0 +1,102 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.setGlobalProperty = exports.hasGlobalProperty = exports.getHunterInspectionKit = exports.getGlobalProperty = exports.getGlobalObject = exports.deleteGlobalProperty = exports.callHunterInspectionKit = void 0;
+/**
+ * 全局对象兼容性处理工具
+ * 兼容Electron主进程(global)和渲染进程(window)环境
+ */
+
+/**
+ * 获取全局对象
+ * @returns {Object} 全局对象
+ */
+var getGlobalObject = exports.getGlobalObject = function getGlobalObject() {
+  if (typeof global !== 'undefined') {
+    return global;
+  }
+  if (typeof window !== 'undefined') {
+    return window;
+  }
+  // 如果都不存在，返回一个空对象（理论上不会发生）
+  return {};
+};
+
+/**
+ * 设置全局属性
+ * @param {string} key 属性名
+ * @param {any} value 属性值
+ */
+var setGlobalProperty = exports.setGlobalProperty = function setGlobalProperty(key, value) {
+  var globalObj = getGlobalObject();
+  globalObj[key] = value;
+};
+
+/**
+ * 获取全局属性
+ * @param {string} key 属性名
+ * @param {any} defaultValue 默认值
+ * @returns {any} 属性值
+ */
+var getGlobalProperty = exports.getGlobalProperty = function getGlobalProperty(key) {
+  var defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
+  var globalObj = getGlobalObject();
+  return globalObj[key] !== undefined ? globalObj[key] : defaultValue;
+};
+
+/**
+ * 检查全局属性是否存在
+ * @param {string} key 属性名
+ * @returns {boolean} 是否存在
+ */
+var hasGlobalProperty = exports.hasGlobalProperty = function hasGlobalProperty(key) {
+  var globalObj = getGlobalObject();
+  return key in globalObj;
+};
+
+/**
+ * 删除全局属性
+ * @param {string} key 属性名
+ */
+var deleteGlobalProperty = exports.deleteGlobalProperty = function deleteGlobalProperty(key) {
+  var globalObj = getGlobalObject();
+  delete globalObj[key];
+};
+
+/**
+ * 安全地获取HunterInspectionKit对象
+ * @returns {Object|null} HunterInspectionKit对象，如果不存在则返回null
+ */
+var getHunterInspectionKit = exports.getHunterInspectionKit = function getHunterInspectionKit() {
+  var kit = getGlobalProperty('HunterInspectionKit');
+  if (!kit) {
+    console.warn('HunterInspectionKit未初始化，请先调用HunterInspectionKit()函数');
+    return null;
+  }
+  return kit;
+};
+
+/**
+ * 安全地调用HunterInspectionKit的方法
+ * @param {string} methodName 方法名
+ * @param {...any} args 参数
+ * @returns {any|null} 方法返回值，如果调用失败则返回null
+ */
+var callHunterInspectionKit = exports.callHunterInspectionKit = function callHunterInspectionKit(methodName) {
+  var kit = getHunterInspectionKit();
+  if (!kit || typeof kit[methodName] !== 'function') {
+    console.error("HunterInspectionKit.".concat(methodName, "\u65B9\u6CD5\u4E0D\u5B58\u5728\u6216\u672A\u521D\u59CB\u5316"));
+    return null;
+  }
+  try {
+    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      args[_key - 1] = arguments[_key];
+    }
+    return kit[methodName].apply(kit, args);
+  } catch (error) {
+    console.error("\u8C03\u7528HunterInspectionKit.".concat(methodName, "\u5931\u8D25:"), error);
+    return null;
+  }
+};

package/lib/utils/utils.initDll.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.HunterInspectionKit = void 0;
 var _utils = require("./utils");
+var _utils2 = require("./utils.global");
 var ffi = require('ffi-napi');
 var path = require('path');
 var fs = require('fs');
@@ -39,6 +40,6 @@ var HunterInspectionKit = exports.HunterInspectionKit = function HunterInspectio
     'InspectionKit': ['string', ['string', 'string', 'string']],
     'TheForceKit': ['string', ['string']]
   });
-  // 挂载全局window
-  window.HunterInspectionKit = kitFn;
+  // 挂载到全局对象，兼容主进程和渲染进程
+  (0, _utils2.setGlobalProperty)('HunterInspectionKit', kitFn);
 };

package/package.json

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