hunter-open-sdk 1.0.4 → 1.0.7-beta.1

package/lib/getAndroidSn/index.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.GetAndroidSn = void 0;
+exports.UnregisterAndroidSn = exports.GetAndroidSn = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _usb = require("usb");
@@ -12,6 +12,8 @@ var _utils = require("../utils/utils");
 var _utils2 = require("../utils/utils.sn");
 var childProcess = require('child_process');
 var exec = childProcess.exec;
+var hadRegisterUsb = false; // 是否已经注册过usb事件
+var isPause = false; // 是否暂停获取sn
 
 // mac获取sn
 var getMacSn = /*#__PURE__*/function () {
@@ -30,18 +32,22 @@ var getMacSn = /*#__PURE__*/function () {
           return customWebUSB.getDevices();
         case 4:
           deviceList = _context.sent;
-          if (attachDeviceId) {
-            _context.next = 7;
+          console.log('deviceList', deviceList);
+
+          // 如果设备没有attachDeviceId 则直接返回
+          if (!(!attachDeviceId || !deviceList.length)) {
+            _context.next = 8;
             break;
           }
           return _context.abrupt("return");
-        case 7:
+        case 8:
           // 删选出当前的设备信息 为获取到serialNumber
           currentDevice = deviceList.filter(function (item) {
             return item.device.deviceAddress == attachDeviceId;
           });
+          console.log('currentDevice', currentDevice);
           if (currentDevice.length) {
-            _context.next = 11;
+            _context.next = 13;
             break;
           }
           callBack({
@@ -50,7 +56,7 @@ var getMacSn = /*#__PURE__*/function () {
             message: '获取SN失败'
           });
           return _context.abrupt("return");
-        case 11:
+        case 13:
           // 检查设备是否为支持的三星、华为、荣耀手机品牌
           deviceInfo = currentDevice[0];
           productName = ((_deviceInfo$productNa = deviceInfo.productName) === null || _deviceInfo$productNa === void 0 ? void 0 : _deviceInfo$productNa.toLowerCase()) || '';
@@ -59,8 +65,9 @@ var getMacSn = /*#__PURE__*/function () {
           isSupportedBrand = supportedBrands.some(function (brand) {
             return productName.includes(brand) || manufacturerName.includes(brand);
           });
+          console.log('deviceInfo', deviceInfo, productName, manufacturerName);
           if (isSupportedBrand) {
-            _context.next = 19;
+            _context.next = 22;
             break;
           }
           callBack({
@@ -69,7 +76,7 @@ var getMacSn = /*#__PURE__*/function () {
             message: '暂不支持该品牌手机查询SN'
           });
           return _context.abrupt("return");
-        case 19:
+        case 22:
           callBack({
             code: 0,
             data: {
@@ -77,7 +84,7 @@ var getMacSn = /*#__PURE__*/function () {
             },
             message: '获取SN成功'
           });
-        case 20:
+        case 23:
         case "end":
           return _context.stop();
       }
@@ -160,34 +167,45 @@ var getWinSn = /*#__PURE__*/function () {
  * @param {Function} callBack - 回调函数
  */
 var GetAndroidSn = exports.GetAndroidSn = function GetAndroidSn(params, callBack) {
-  console.log('GetAndroidSn params', params);
+  if (hadRegisterUsb) {
+    isPause = false;
+    return;
+  }
+  hadRegisterUsb = true;
   _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({
+            if (!isPause) {
+              _context3.next = 2;
+              break;
+            }
+            return _context3.abrupt("return");
+          case 2:
+            console.log('attach GetAndroidSn', device);
+            callBack({
               data: {
                 eventName: 'type_usb_android_device_result',
                 eventCode: 0
               }
             });
             if (!(0, _utils.isMac)()) {
-              _context3.next = 4;
+              _context3.next = 7;
               break;
             }
             // mac获取sn
             getMacSn(device, callBack);
             return _context3.abrupt("return");
-          case 4:
+          case 7:
             if (!(0, _utils.isWin)()) {
-              _context3.next = 7;
+              _context3.next = 10;
               break;
             }
             // win获取sn
             getWinSn(device, callBack);
             return _context3.abrupt("return");
-          case 7:
+          case 10:
           case "end":
             return _context3.stop();
         }
@@ -197,5 +215,12 @@ var GetAndroidSn = exports.GetAndroidSn = function GetAndroidSn(params, callBack
       return _ref3.apply(this, arguments);
     };
   }());
-  _usb.usb.on('detach', function () {});
+  _usb.usb.on('detach', function () {
+    if (isPause) {
+      return;
+    }
+  });
+};
+var UnregisterAndroidSn = exports.UnregisterAndroidSn = function UnregisterAndroidSn() {
+  isPause = true;
 };

package/lib/helper/deviceHelper.js

@@ -0,0 +1,45 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.deviceHelper = void 0;
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var DeviceHelper = /*#__PURE__*/function () {
+  function DeviceHelper() {
+    (0, _classCallCheck2.default)(this, DeviceHelper);
+    this.udidList = [];
+  }
+  (0, _createClass2.default)(DeviceHelper, [{
+    key: "addUdid",
+    value: function addUdid(udid) {
+      this.udidList.push(udid);
+    }
+  }, {
+    key: "getUdidList",
+    value: function getUdidList() {
+      return this.udidList;
+    }
+  }, {
+    key: "removeUdid",
+    value: function removeUdid(udid) {
+      this.udidList = this.udidList.filter(function (item) {
+        return item !== udid;
+      });
+    }
+  }, {
+    key: "hasUdid",
+    value: function hasUdid(udid) {
+      return this.udidList.includes(udid);
+    }
+  }, {
+    key: "clearUdidList",
+    value: function clearUdidList() {
+      this.udidList = [];
+    }
+  }]);
+  return DeviceHelper;
+}();
+var deviceHelper = exports.deviceHelper = new DeviceHelper();

package/lib/index.js

@@ -20,5 +20,6 @@ var _default = exports.default = {
   unregisterEvent: _registerEvent.UnregisterEvent,
   getGeneralReport: _getGeneralReport.GetGeneralReport,
   getSaaSReport: _getSaaSReport.GetSaaSReport,
-  getAndroidSn: _getAndroidSn.GetAndroidSn
+  getAndroidSn: _getAndroidSn.GetAndroidSn,
+  unregisterAndroidSn: _getAndroidSn.UnregisterAndroidSn
 };

package/lib/registerEvent/index.js

@@ -10,6 +10,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _utils = require("../utils/utils");
 var _winDriver = require("../events/driver/winDriver");
 var _utils2 = require("../utils/utils.global");
+var _deviceHelper = require("../helper/deviceHelper");
 var usbmux = require('usbmux');
 var path = require('path');
 var request = require("request");
@@ -21,7 +22,6 @@ var saasCallBack;
 
 // usb监听
 var usbListener = null;
-
 /**
  * 获取资源文件的基础路径
  */
@@ -55,6 +55,12 @@ var DevicePair = /*#__PURE__*/function () {
         case 0:
           udid = _args.length > 0 && _args[0] !== undefined ? _args[0] : '';
           params = _args.length > 1 ? _args[1] : undefined;
+          if (_deviceHelper.deviceHelper.hasUdid(udid)) {
+            _context.next = 4;
+            break;
+          }
+          return _context.abrupt("return");
+        case 4:
           // 通过调用read_pair来判断是否已配对【信任】
           paramsObj = JSON.parse(params); // 合并参数
           Object.assign(paramsObj, {
@@ -63,13 +69,13 @@ var DevicePair = /*#__PURE__*/function () {
           });
           devicePair = (0, _utils2.callHunterInspectionKit)('TheForceKit', JSON.stringify(paramsObj));
           if (!devicePair) {
-            _context.next = 15;
+            _context.next = 17;
             break;
           }
           pairRes = JSON.parse(devicePair);
           Code = pairRes.Code, Data = pairRes.Data;
           if (!(Code == 0 && (Data.imei || Data.serialNumber))) {
-            _context.next = 12;
+            _context.next = 14;
             break;
           }
           saasCallBack({
@@ -79,14 +85,14 @@ var DevicePair = /*#__PURE__*/function () {
               eventCode: 0
             }
           });
-          _context.next = 15;
+          _context.next = 17;
           break;
-        case 12:
-          _context.next = 14;
-          return (0, _utils.sleep)();
         case 14:
+          _context.next = 16;
+          return (0, _utils.sleep)();
+        case 16:
           DevicePair(udid, params);
-        case 15:
+        case 17:
         case "end":
           return _context.stop();
       }
@@ -280,9 +286,10 @@ var RegisterEvent = exports.RegisterEvent = /*#__PURE__*/function () {
                         eventCode: 0
                       }
                     });
+                    _deviceHelper.deviceHelper.addUdid(udid);
                     // 有驱动，直接运行脚本
                     DevicePair(udid, params);
-                  case 4:
+                  case 5:
                   case "end":
                     return _context2.stop();
                 }
@@ -300,6 +307,7 @@ var RegisterEvent = exports.RegisterEvent = /*#__PURE__*/function () {
                 eventCode: -1
               }
             });
+            _deviceHelper.deviceHelper.removeUdid(udid);
           }).on('error', function (err) {
             console.log('usb连接错误：', err);
             Sentry.captureException('usb连接错误:' + JSON.stringify(err));
@@ -318,4 +326,5 @@ var RegisterEvent = exports.RegisterEvent = /*#__PURE__*/function () {
 }();
 var UnregisterEvent = exports.UnregisterEvent = function UnregisterEvent() {
   usbListener && usbListener.destroy();
+  _deviceHelper.deviceHelper.clearUdidList();
 };

package/package.json

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