hunter-open-sdk 1.0.1 → 1.0.3

package/lib/events/driver/winDriver.js

@@ -299,8 +299,7 @@ function _checkHasDriver() {
           _context3.t1 = 0;
         case 15:
           hasCache = _context3.t1;
-          // const state = hasDriver + hasCache
-          state = 0;
+          state = hasDriver + hasCache;
           _context3.t2 = state;
           _context3.next = _context3.t2 === 3 ? 20 : _context3.t2 === 1 ? 20 : _context3.t2 === 2 ? 21 : 26;
           break;

package/lib/registerEvent/index.js

@@ -19,10 +19,6 @@ var Sentry = require("@sentry/browser");
 // saas回调
 var saasCallBack;
 
-// 驱动安装状态
-var isDriverInstalling = false;
-var isDriverReady = false;
-
 // usb监听
 var usbListener = null;
 
@@ -202,146 +198,124 @@ 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 new Promise(function (resolve, reject) {
+    if (!(0, _utils.isWin)()) {
+      resolve();
       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 失败
-        }
+    (0, _winDriver.checkHasDriver)().then(function (res) {
+      if (res) {
+        resolve();
+        return;
+      }
+      (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 失败
+          }
+        });
+        resolve();
+      }).catch(function (err) {
+        // 失败
+        console.error('驱动下载或安装失败', err);
+        Sentry.captureException('驱动下载或安装失败:' + JSON.stringify(err));
+        saasCallBack({
+          data: {
+            eventName: 'type_install_driver_result',
+            eventCode: -1 // 0 成功 -1 失败
+          }
+        });
+        reject();
       });
     }).catch(function (err) {
-      // 失败
-      console.error('驱动下载或安装失败', err);
-      Sentry.captureException('驱动下载或安装失败:' + JSON.stringify(err));
-      isDriverInstalling = false;
-      saasCallBack({
-        data: {
-          eventName: 'type_install_driver_result',
-          eventCode: -1 // 0 成功 -1 失败
-        }
-      });
+      console.error('驱动检测失败', err);
+      Sentry.captureException('驱动检测失败:' + JSON.stringify(err));
+      reject();
     });
-  }).catch(function (err) {
-    console.error('驱动检测失败', err);
-    Sentry.captureException('驱动检测失败:' + JSON.stringify(err));
   });
 };
-var RegisterEvent = exports.RegisterEvent = function RegisterEvent(params, callBack) {
-  saasCallBack = callBack;
+var RegisterEvent = exports.RegisterEvent = /*#__PURE__*/function () {
+  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(params, callBack) {
+    return _regenerator.default.wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          saasCallBack = callBack;
 
-  // 检查是否需要更新dll
-  updateDllFileCheck();
+          // 检查是否需要更新dll
+          updateDllFileCheck();
 
-  // 在插线之前就检测驱动状态
-  checkAndInstallDriver();
-  usbListener = 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) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            if (udid) {
-              _context2.next = 2;
-              break;
-            }
-            return _context2.abrupt("return");
-          case 2:
-            // 插入设备通知
+          // 在插线之前就检测驱动状态
+          _context3.next = 4;
+          return checkAndInstallDriver();
+        case 4:
+          usbListener = new usbmux.createListener().on('attached', /*#__PURE__*/function () {
+            var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(udid) {
+              return _regenerator.default.wrap(function _callee2$(_context2) {
+                while (1) switch (_context2.prev = _context2.next) {
+                  case 0:
+                    if (udid) {
+                      _context2.next = 2;
+                      break;
+                    }
+                    return _context2.abrupt("return");
+                  case 2:
+                    // 插入设备通知
+                    saasCallBack({
+                      data: {
+                        eventName: 'type_usb_device_result',
+                        udid: udid,
+                        eventCode: 0
+                      }
+                    });
+                    // 有驱动，直接运行脚本
+                    DevicePair(udid, params);
+                  case 4:
+                  case "end":
+                    return _context2.stop();
+                }
+              }, _callee2);
+            }));
+            return function (_x3) {
+              return _ref3.apply(this, arguments);
+            };
+          }()).on('detached', function (udid) {
+            // 拔出设备
             saasCallBack({
               data: {
                 eventName: 'type_usb_device_result',
                 udid: udid,
-                eventCode: 0
+                eventCode: -1
               }
             });
-            if ((0, _utils.isWin)()) {
-              // windows检查驱动 mac不需要
-              // 检查驱动是否就绪
-              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);
-            }
-          case 4:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2);
-    }));
-    return function (_x) {
-      return _ref2.apply(this, arguments);
-    };
-  }()).on('detached', function (udid) {
-    // 拔出设备
-    saasCallBack({
-      data: {
-        eventName: 'type_usb_device_result',
-        udid: udid,
-        eventCode: -1
+          }).on('error', function (err) {
+            console.log('usb连接错误：', err);
+            Sentry.captureException('usb连接错误:' + JSON.stringify(err));
+            var errMsg = "usb\u8FDE\u63A5\u9519\u8BEF\uFF1A".concat(err);
+            throw new Error(errMsg);
+          });
+        case 5:
+        case "end":
+          return _context3.stop();
       }
-    });
-  }).on('error', function (err) {
-    console.log('usb连接错误：', err);
-    Sentry.captureException('usb连接错误:' + JSON.stringify(err));
-    var errMsg = "usb\u8FDE\u63A5\u9519\u8BEF\uFF1A".concat(err);
-    throw new Error(errMsg);
-  });
-};
+    }, _callee3);
+  }));
+  return function RegisterEvent(_x, _x2) {
+    return _ref2.apply(this, arguments);
+  };
+}();
 var UnregisterEvent = exports.UnregisterEvent = function UnregisterEvent() {
   usbListener && usbListener.destroy();
 };

package/lib/utils/utils.global.js

@@ -121,7 +121,8 @@ var getGeneralReportCallKit = exports.getGeneralReportCallKit = function getGene
   if (reportRes) {
     var reportResObj = JSON.parse(reportRes);
     var Code = reportResObj.Code,
-      Data = reportResObj.Data;
+      Data = reportResObj.Data,
+      Message = reportResObj.Message;
     if (Code == 0 && Data) {
       return {
         type: 'getGeneralReportSuccess',
@@ -137,7 +138,7 @@ var getGeneralReportCallKit = exports.getGeneralReportCallKit = function getGene
       data: {
         code: -1,
         data: {},
-        message: '获取报告结果为空'
+        message: Message || '获取报告结果为空'
       }
     };
   }
@@ -161,7 +162,8 @@ var getSaaSReportCallKit = exports.getSaaSReportCallKit = function getSaaSReport
   if (reportRes) {
     var reportResObj = JSON.parse(reportRes);
     var Code = reportResObj.Code,
-      Data = reportResObj.Data;
+      Data = reportResObj.Data,
+      Message = reportResObj.Message;
     if (Code == 0 && Data) {
       return {
         type: 'getSaaSReportSuccess',
@@ -177,7 +179,7 @@ var getSaaSReportCallKit = exports.getSaaSReportCallKit = function getSaaSReport
       data: {
         code: -1,
         data: {},
-        message: '获取SaaS报告结果为空'
+        message: Message || '获取SaaS报告结果为空'
       }
     };
   }

package/package.json

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