hunter-open-sdk 1.0.2 → 1.0.4

package/lib/getAndroidSn/index.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.GetAndroidSn = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _usb = require("usb");
@@ -159,29 +159,35 @@ var getWinSn = /*#__PURE__*/function () {
  * @param {Object} params - 参数
  * @param {Function} callBack - 回调函数
  */
-var GetAndroidSn = function GetAndroidSn(params, callBack) {
+var GetAndroidSn = exports.GetAndroidSn = function GetAndroidSn(params, callBack) {
   console.log('GetAndroidSn params', params);
   _usb.usb.on('attach', /*#__PURE__*/function () {
     var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(device) {
       return _regenerator.default.wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
+            saasCallBack({
+              data: {
+                eventName: 'type_usb_android_device_result',
+                eventCode: 0
+              }
+            });
             if (!(0, _utils.isMac)()) {
-              _context3.next = 3;
+              _context3.next = 4;
               break;
             }
             // mac获取sn
             getMacSn(device, callBack);
             return _context3.abrupt("return");
-          case 3:
+          case 4:
             if (!(0, _utils.isWin)()) {
-              _context3.next = 6;
+              _context3.next = 7;
               break;
             }
             // win获取sn
             getWinSn(device, callBack);
             return _context3.abrupt("return");
-          case 6:
+          case 7:
           case "end":
             return _context3.stop();
         }
@@ -192,5 +198,4 @@ var GetAndroidSn = function GetAndroidSn(params, callBack) {
     };
   }());
   _usb.usb.on('detach', function () {});
-};
-var _default = exports.default = GetAndroidSn;
+};

package/lib/getGeneralReport/index.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.GetGeneralReport = void 0;
 var _path = _interopRequireDefault(require("path"));
 var _utils = require("../utils/utils.global");
 // 预定义worker
@@ -62,7 +62,7 @@ function getReport(params) {
 }
 
 // 获取报告
-function GetGeneralReport(params, callBack) {
+var GetGeneralReport = exports.GetGeneralReport = function GetGeneralReport(params, callBack) {
   // 如果是在主进程，则直接获取报告
   if (isInMainProcess()) {
     var reportRes = (0, _utils.getGeneralReportCallKit)(params);
@@ -73,5 +73,4 @@ function GetGeneralReport(params, callBack) {
   initWorker();
   addWorkerListener(callBack);
   getReport(params);
-}
-var _default = exports.default = GetGeneralReport;
+};

package/lib/getSaaSReport/index.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.GetSaaSReport = void 0;
 var _path = _interopRequireDefault(require("path"));
 var _utils = require("../utils/utils.global");
 // 预定义worker
@@ -62,7 +62,7 @@ function getReport(params) {
 }
 
 // 获取报告
-function GetSaaSReport(params, callBack) {
+var GetSaaSReport = exports.GetSaaSReport = function GetSaaSReport(params, callBack) {
   // 如果是在主进程，则直接获取报告
   if (isInMainProcess()) {
     var reportRes = (0, _utils.getSaaSReportCallKit)(params);
@@ -73,5 +73,4 @@ function GetSaaSReport(params, callBack) {
   initWorker();
   addWorkerListener(callBack);
   getReport(params);
-}
-var _default = exports.default = GetSaaSReport;
+};

package/lib/index.js

@@ -1,14 +1,13 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _registerEvent = require("./registerEvent");
-var _getGeneralReport = _interopRequireDefault(require("./getGeneralReport"));
-var _getSaaSReport = _interopRequireDefault(require("./getSaaSReport"));
-var _getAndroidSn = _interopRequireDefault(require("./getAndroidSn"));
+var _getGeneralReport = require("./getGeneralReport");
+var _getSaaSReport = require("./getSaaSReport");
+var _getAndroidSn = require("./getAndroidSn");
 var Sentry = require("@sentry/browser");
 Sentry.init({
   dsn: "https://8a5296c59083430fbac0756f56ddbf5d@sentry.zhuanzhuan.com/2300",
@@ -19,7 +18,7 @@ console.log('Sentry initialized');
 var _default = exports.default = {
   registerEvent: _registerEvent.RegisterEvent,
   unregisterEvent: _registerEvent.UnregisterEvent,
-  getGeneralReport: _getGeneralReport.default,
-  getSaaSReport: _getSaaSReport.default,
-  getAndroidSn: _getAndroidSn.default
+  getGeneralReport: _getGeneralReport.GetGeneralReport,
+  getSaaSReport: _getSaaSReport.GetSaaSReport,
+  getAndroidSn: _getAndroidSn.GetAndroidSn
 };

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;
 
@@ -72,7 +68,7 @@ var DevicePair = /*#__PURE__*/function () {
           }
           pairRes = JSON.parse(devicePair);
           Code = pairRes.Code, Data = pairRes.Data;
-          if (!(Code == 0 && Data.imei)) {
+          if (!(Code == 0 && (Data.imei || Data.serialNumber))) {
             _context.next = 12;
             break;
           }
@@ -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/package.json

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