hunter-open-sdk 1.0.3 → 1.0.5

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/helper/deviceHelper.js

@@ -0,0 +1,44 @@
+"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 = exports.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;
+}();

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

@@ -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,7 @@ var saasCallBack;
 
 // usb监听
 var usbListener = null;
-
+var deviceHelper = new _deviceHelper.DeviceHelper();
 /**
  * 获取资源文件的基础路径
  */
@@ -55,6 +56,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.hasUdid(udid)) {
+            _context.next = 4;
+            break;
+          }
+          return _context.abrupt("return");
+        case 4:
           // 通过调用read_pair来判断是否已配对【信任】
           paramsObj = JSON.parse(params); // 合并参数
           Object.assign(paramsObj, {
@@ -63,13 +70,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)) {
-            _context.next = 12;
+          if (!(Code == 0 && (Data.imei || Data.serialNumber))) {
+            _context.next = 14;
             break;
           }
           saasCallBack({
@@ -79,14 +86,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 +287,10 @@ var RegisterEvent = exports.RegisterEvent = /*#__PURE__*/function () {
                         eventCode: 0
                       }
                     });
+                    deviceHelper.addUdid(udid);
                     // 有驱动，直接运行脚本
                     DevicePair(udid, params);
-                  case 4:
+                  case 5:
                   case "end":
                     return _context2.stop();
                 }
@@ -300,6 +308,7 @@ var RegisterEvent = exports.RegisterEvent = /*#__PURE__*/function () {
                 eventCode: -1
               }
             });
+            deviceHelper.removeUdid(udid);
           }).on('error', function (err) {
             console.log('usb连接错误：', err);
             Sentry.captureException('usb连接错误:' + JSON.stringify(err));
@@ -318,4 +327,5 @@ var RegisterEvent = exports.RegisterEvent = /*#__PURE__*/function () {
 }();
 var UnregisterEvent = exports.UnregisterEvent = function UnregisterEvent() {
   usbListener && usbListener.destroy();
+  deviceHelper.clearUdidList();
 };

package/package.json

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