hunter-open-sdk 2.0.0-beta.6 → 2.0.0-beta.8

package/lib/getAndroidSn/index.js

@@ -1,228 +1,164 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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");
-var _utils = require("../utils/utils");
+var _utils = require("../utils/utils.env");
 var _utils2 = require("../utils/utils.sn");
-var childProcess = require('child_process');
-var exec = childProcess.exec;
-var hadRegisterUsb = false; // 是否已经注册过usb事件
-var isPause = false; // 是否暂停获取sn
+const childProcess = require('child_process');
+const exec = childProcess.exec;
+let hadRegisterUsb = false; // 是否已经注册过usb事件
+let isPause = false; // 是否暂停获取sn
 
 // mac获取sn
-var getMacSn = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(device, callBack) {
-    var _deviceInfo$productNa, _deviceInfo$manufactu;
-    var attachDeviceId, customWebUSB, deviceList, currentDevice, deviceInfo, productName, manufacturerName, supportedBrands, isSupportedBrand;
-    return _regenerator.default.wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          // 拿到当前连接的设备deviceAddress 作为标识去usb列表筛选
-          attachDeviceId = device.deviceAddress;
-          customWebUSB = new _usb.WebUSB({
-            allowAllDevices: true
-          });
-          _context.next = 4;
-          return customWebUSB.getDevices();
-        case 4:
-          deviceList = _context.sent;
-          if (attachDeviceId) {
-            _context.next = 7;
-            break;
-          }
-          return _context.abrupt("return");
-        case 7:
-          // 删选出当前的设备信息 为获取到serialNumber
-          currentDevice = deviceList.filter(function (item) {
-            return item.device.deviceAddress == attachDeviceId;
-          });
-          if (currentDevice.length) {
-            _context.next = 11;
-            break;
-          }
-          callBack({
-            code: -1,
-            data: {},
-            message: '获取SN失败'
-          });
-          return _context.abrupt("return");
-        case 11:
-          // 检查设备是否为支持的三星、华为、荣耀手机品牌
-          deviceInfo = currentDevice[0];
-          productName = ((_deviceInfo$productNa = deviceInfo.productName) === null || _deviceInfo$productNa === void 0 ? void 0 : _deviceInfo$productNa.toLowerCase()) || '';
-          manufacturerName = ((_deviceInfo$manufactu = deviceInfo.manufacturerName) === null || _deviceInfo$manufactu === void 0 ? void 0 : _deviceInfo$manufactu.toLowerCase()) || ''; // 支持的三星、华为、荣耀品牌关键词
-          supportedBrands = ['samsung', 'galaxy', 'huawei', 'honor', 'honor magic'];
-          isSupportedBrand = supportedBrands.some(function (brand) {
-            return productName.includes(brand) || manufacturerName.includes(brand);
-          });
-          if (isSupportedBrand) {
-            _context.next = 19;
-            break;
-          }
-          callBack({
-            code: -1,
-            data: {},
-            message: '暂不支持该品牌手机查询SN'
-          });
-          return _context.abrupt("return");
-        case 19:
-          callBack({
-            code: 0,
-            data: {
-              SN: currentDevice[0].serialNumber
-            },
-            message: '获取SN成功'
-          });
-        case 20:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return function getMacSn(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-}();
+const getMacSn = async (device, callBack) => {
+  // 拿到当前连接的设备deviceAddress 作为标识去usb列表筛选
+  const attachDeviceId = device.deviceAddress;
+  const customWebUSB = new _usb.WebUSB({
+    allowAllDevices: true
+  });
+  const deviceList = await customWebUSB.getDevices();
+
+  // 如果设备没有attachDeviceId 则直接返回
+  if (!attachDeviceId) return;
+
+  // 删选出当前的设备信息 为获取到serialNumber
+  const currentDevice = deviceList.filter(item => item.device.deviceAddress == attachDeviceId);
+  if (!currentDevice.length) {
+    callBack({
+      code: -1,
+      data: {},
+      message: '获取SN失败'
+    });
+    return;
+  }
+
+  // 检查设备是否为支持的三星、华为、荣耀手机品牌
+  const deviceInfo = currentDevice[0];
+  const productName = deviceInfo.productName?.toLowerCase() || '';
+  const manufacturerName = deviceInfo.manufacturerName?.toLowerCase() || '';
+
+  // 支持的三星、华为、荣耀品牌关键词
+  const supportedBrands = ['samsung', 'galaxy', 'huawei', 'honor', 'honor magic'];
+  const isSupportedBrand = supportedBrands.some(brand => productName.includes(brand) || manufacturerName.includes(brand));
+  if (!isSupportedBrand) {
+    callBack({
+      code: -1,
+      data: {},
+      message: '暂不支持该品牌手机查询SN'
+    });
+    return;
+  }
+  callBack({
+    code: 0,
+    data: {
+      SN: currentDevice[0].serialNumber
+    },
+    message: '获取SN成功'
+  });
+};
 
 // win获取sn
-var getWinSn = /*#__PURE__*/function () {
-  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(device, callBack) {
-    var cmdStr;
-    return _regenerator.default.wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          // windows 需要运行命令获取sn
-          cmdStr = "wmic path Win32_PnPEntity where \"DeviceID like 'USB%'\" get Name, PNPDeviceID /value";
-          exec(cmdStr, function (err, stdout, stderr) {
-            if (err) {
-              // 运行失败 则直接返回获取失败
-              callBack({
-                code: -1,
-                data: {},
-                message: "windows\u8FD0\u884C\u7A0B\u5E8F\u83B7\u53D6SN\u5931\u8D25err: ".concat(err)
-              });
-              return;
-            }
-            if (stderr) {
-              // 运行失败 则直接返回获取失败
-              callBack({
-                code: -1,
-                data: {},
-                message: "windows\u8FD0\u884C\u7A0B\u5E8F\u83B7\u53D6SN\u5931\u8D25stderr: ".concat(stderr)
-              });
-              return;
-            }
+const getWinSn = async (device, callBack) => {
+  // windows 需要运行命令获取sn
+  const cmdStr = `wmic path Win32_PnPEntity where "DeviceID like \'USB%\'" get Name, PNPDeviceID /value`;
+  exec(cmdStr, function (err, stdout, stderr) {
+    if (err) {
+      // 运行失败 则直接返回获取失败
+      callBack({
+        code: -1,
+        data: {},
+        message: `windows运行程序获取SN失败err: ${err}`
+      });
+      return;
+    }
+    if (stderr) {
+      // 运行失败 则直接返回获取失败
+      callBack({
+        code: -1,
+        data: {},
+        message: `windows运行程序获取SN失败stderr: ${stderr}`
+      });
+      return;
+    }
 
-            // 处理WMIC输出并提取手机序列号
-            var phoneDevices = (0, _utils2.parseWmicOutput)(stdout);
-            if (phoneDevices.length === 0) {
-              callBack({
-                code: -1,
-                data: {},
-                message: "\u6682\u4E0D\u652F\u6301\u8BE5\u54C1\u724C\u624B\u673A\u67E5\u8BE2SN"
-              });
-            } else {
-              console.log('检测到的手机设备:');
-              var sn = phoneDevices[0].serial;
-              callBack({
-                code: 0,
-                data: {
-                  SN: sn
-                },
-                message: "\u83B7\u53D6SN\u6210\u529F"
-              });
-              // phoneDevices.forEach(device => {
-              //   console.log(`设备名称: ${device.name}`);
-              //   console.log(`序列号: ${device.serial}`);
-              //   console.log(`PNPDeviceID: ${device.pnpDeviceId}`);
-              //   console.log('---');
-              // });
-            }
-          });
-        case 2:
-        case "end":
-          return _context2.stop();
-      }
-    }, _callee2);
-  }));
-  return function getWinSn(_x3, _x4) {
-    return _ref2.apply(this, arguments);
-  };
-}();
+    // 处理WMIC输出并提取手机序列号
+    const phoneDevices = (0, _utils2.parseWmicOutput)(stdout);
+    if (phoneDevices.length === 0) {
+      callBack({
+        code: -1,
+        data: {},
+        message: `暂不支持该品牌手机查询SN`
+      });
+    } else {
+      console.log('检测到的手机设备:');
+      const sn = phoneDevices[0].serial;
+      callBack({
+        code: 0,
+        data: {
+          SN: sn
+        },
+        message: `获取SN成功`
+      });
+      // phoneDevices.forEach(device => {
+      //   console.log(`设备名称: ${device.name}`);
+      //   console.log(`序列号: ${device.serial}`);
+      //   console.log(`PNPDeviceID: ${device.pnpDeviceId}`);
+      //   console.log('---');
+      // });
+    }
+  });
+};
 
 /**
  * 获取Android SN
  * @param {Object} params - 参数
  * @param {Function} callBack - 回调函数
  */
-var GetAndroidSn = exports.GetAndroidSn = function GetAndroidSn(params, callBack) {
+const GetAndroidSn = (params, callBack) => {
   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) {
-      var idVendor;
-      return _regenerator.default.wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
-          case 0:
-            if (!isPause) {
-              _context3.next = 2;
-              break;
-            }
-            return _context3.abrupt("return");
-          case 2:
-            idVendor = device.deviceDescriptor.idVendor;
-            if (!(idVendor == 1452)) {
-              _context3.next = 5;
-              break;
-            }
-            return _context3.abrupt("return");
-          case 5:
-            callBack({
-              data: {
-                eventName: 'type_usb_android_device_result',
-                eventCode: 0
-              }
-            });
-            if (!(0, _utils.isMac)()) {
-              _context3.next = 9;
-              break;
-            }
-            // mac获取sn
-            getMacSn(device, callBack);
-            return _context3.abrupt("return");
-          case 9:
-            if (!(0, _utils.isWin)()) {
-              _context3.next = 12;
-              break;
-            }
-            // win获取sn
-            getWinSn(device, callBack);
-            return _context3.abrupt("return");
-          case 12:
-          case "end":
-            return _context3.stop();
-        }
-      }, _callee3);
-    }));
-    return function (_x5) {
-      return _ref3.apply(this, arguments);
-    };
-  }());
-  _usb.usb.on('detach', function () {
+  _usb.usb.on('attach', async device => {
+    if (isPause) {
+      return;
+    }
+    const {
+      idVendor
+    } = device.deviceDescriptor;
+    if (idVendor == 1452) {
+      // 表示该机器为苹果产品，则不进行获取sn
+      return;
+    }
+    callBack({
+      data: {
+        eventName: 'type_usb_android_device_result',
+        eventCode: 0
+      }
+    });
+    if ((0, _utils.isMac)()) {
+      // mac获取sn
+      getMacSn(device, callBack);
+      return;
+    }
+    if ((0, _utils.isWin)()) {
+      // win获取sn
+      getWinSn(device, callBack);
+      return;
+    }
+  });
+  _usb.usb.on('detach', () => {
     if (isPause) {
       return;
     }
   });
 };
-var UnregisterAndroidSn = exports.UnregisterAndroidSn = function UnregisterAndroidSn() {
+exports.GetAndroidSn = GetAndroidSn;
+const UnregisterAndroidSn = () => {
   isPause = true;
-};
+};
+exports.UnregisterAndroidSn = UnregisterAndroidSn;

package/lib/helper/deviceHelper.js

@@ -1,45 +1,27 @@
 "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);
+class DeviceHelper {
+  constructor() {
     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();
+  addUdid(udid) {
+    this.udidList.push(udid);
+  }
+  getUdidList() {
+    return this.udidList;
+  }
+  removeUdid(udid) {
+    this.udidList = this.udidList.filter(item => item !== udid);
+  }
+  hasUdid(udid) {
+    return this.udidList.includes(udid);
+  }
+  clearUdidList() {
+    this.udidList = [];
+  }
+}
+const deviceHelper = exports.deviceHelper = new DeviceHelper();

package/lib/index.js

@@ -5,10 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _registerEvent = require("./registerEvent");
-var _getGeneralReport = require("./getGeneralReport");
-var _getSaaSReport = require("./getSaaSReport");
 var _getAndroidSn = require("./getAndroidSn");
-var Sentry = require("@sentry/browser");
+var _getSaaSReport = require("./abilities/getSaaSReport");
+var _getGeneralReport = require("./abilities/getGeneralReport");
+var _erase = require("./abilities/erase");
+var _activate = require("./abilities/activate");
+var _skip = require("./abilities/skip");
+const Sentry = require("@sentry/browser");
 Sentry.init({
   dsn: "https://8a5296c59083430fbac0756f56ddbf5d@sentry.zhuanzhuan.com/2300",
   tracesSampleRate: 1.0
@@ -18,8 +21,11 @@ console.log('Sentry initialized');
 var _default = exports.default = {
   registerEvent: _registerEvent.RegisterEvent,
   unregisterEvent: _registerEvent.UnregisterEvent,
-  getGeneralReport: _getGeneralReport.GetGeneralReport,
-  getSaaSReport: _getSaaSReport.GetSaaSReport,
   getAndroidSn: _getAndroidSn.GetAndroidSn,
-  unregisterAndroidSn: _getAndroidSn.UnregisterAndroidSn
+  unregisterAndroidSn: _getAndroidSn.UnregisterAndroidSn,
+  getSaaSReport: _getSaaSReport.getSaaSReport,
+  getGeneralReport: _getGeneralReport.getGeneralReport,
+  erase: _erase.erase,
+  activate: _activate.activate,
+  skip: _skip.skip
 };