hunter-open-sdk 2.0.0-beta.2 → 2.0.0-beta.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hunter-open-sdk",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.21",
   "description": "采货侠SaaS版本桌面端sdk",
   "scripts": {
     "start": "zz dev",
@@ -11,8 +11,8 @@
     "fix": "zz lint --fix",
     "staged": "zz lint --staged",
     "staged-fix": "zz --staged --fix",
-    "pub": "zz pub",
-    "pub-beta": "zz pub --beta",
+    "pub": "npm run build && npm publish",
+    "pub-beta": "npm run build && npm publish --tag beta",
     "unpub": "zz pub --unpub",
     "doc": "zz doc && zz doc --upload",
     "dev-doc": "zz doc --dev",
@@ -28,7 +28,6 @@
   "dependencies": {
     "@sentry/browser": "^10.10.0",
     "compressing": "2.0.0",
-    "core-js": "3.6.5",
     "fs": "^0.0.1-security",
     "fs-extra": "^11.3.0",
     "koffi": "2.14.1",
@@ -36,10 +35,10 @@
     "request": "^2.88.2",
     "sudo-prompt": "^9.2.1",
     "usb": "^2.15.0",
-    "usbmux": "^0.1.0"
+    "usbmux": "^0.1.0",
+    "web-worker": "1.5.0"
   },
   "devDependencies": {
-    "@babel/plugin-transform-runtime": "7.21.0",
     "@commitlint/cli": "8.3.5",
     "@commitlint/config-conventional": "8.3.4",
     "@evilmartians/lefthook": "0.8.0",
@@ -53,6 +52,7 @@
     "commitlint": "17.0.2",
     "father": "4.6.7",
     "lint-staged": "10.0.8",
+    "minimatch": "3.0.0",
     "path-to-regexp": "2.4.0",
     "typedoc": "0.23.9",
     "typescript": "4.7.4"
@@ -63,8 +63,7 @@
     }
   },
   "files": [
-    "lib",
-    "es"
+    "lib"
   ],
   "engines": {
     "node": ">=20.0.0"

package/lib/events/driver/service.js

@@ -1,47 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _utils = require("../../utils/utils");
-var _command = require("./command");
-var _winDriver = require("./winDriver");
-var path = require('path');
-var Service = /*#__PURE__*/function () {
-  function Service() {
-    (0, _classCallCheck2.default)(this, Service);
-  }
-  (0, _createClass2.default)(Service, [{
-    key: "setup",
-    value:
-    // constructor () {}
-    function setup(mainWindow) {
-      console.log('Service setup');
-      if ((0, _utils.isMac)()) {
-        if ((0, _utils.isDev)()) {
-          (0, _command.command)(path.join(process.cwd(), './extraResources/ightools'));
-        }
-        if ((0, _utils.isProd)()) {
-          (0, _command.command)('nohup ' + path.join(process.resourcesPath, './extraResources/ightools') + ' > /dev/null 2>&1 & > ' + path.join(process.resourcesPath, './log/ightools.log'));
-        }
-      }
-      if ((0, _utils.isWin)()) {
-        (0, _winDriver.checkHasDriver)().then(function (res) {
-          console.log('------------checkHasDriver', res);
-          if (res) {
-            mainWindow.webContents.send("checkDriver", true);
-          } else {
-            mainWindow.webContents.send("checkDriver", false);
-            (0, _winDriver.downloadDriver)(mainWindow);
-          }
-        });
-      }
-    }
-  }]);
-  return Service;
-}();
-var _default = exports.default = Service;

package/lib/getAndroidSn/index.js

@@ -1,228 +0,0 @@
-"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 _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 () {
-  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);
-  };
-}();
-
-// 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;
-            }
-
-            // 处理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);
-  };
-}();
-
-/**
- * 获取Android SN
- * @param {Object} params - 参数
- * @param {Function} callBack - 回调函数
- */
-var GetAndroidSn = exports.GetAndroidSn = function 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 () {
-    if (isPause) {
-      return;
-    }
-  });
-};
-var UnregisterAndroidSn = exports.UnregisterAndroidSn = function UnregisterAndroidSn() {
-  isPause = true;
-};

package/lib/getGeneralReport/index.js

@@ -1,76 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.GetGeneralReport = void 0;
-var _path = _interopRequireDefault(require("path"));
-var _utils = require("../utils/utils.global");
-// 预定义worker
-var worker = null;
-
-// 获取进程类型
-function getProccessType() {
-  // console.log('process.type', process.type)
-  return process.type;
-}
-
-// 是否在主进程
-function isInMainProcess() {
-  return getProccessType() === 'browser';
-}
-
-// 是否在渲染进程
-// eslint-disable-next-line no-unused-vars
-function isInRenderProcess() {
-  return getProccessType() === 'renderer';
-}
-
-// 初始化worker
-function initWorker() {
-  if (!worker) {
-    worker = new Worker('file://' + _path.default.resolve(__dirname, "./worker.js"));
-  }
-}
-
-// 添加worker监听
-function addWorkerListener(callBack) {
-  worker && (worker.onmessage = function (event) {
-    // console.log('main thread onmessage event.data', event.data)
-
-    var _event$data = event.data,
-      type = _event$data.type,
-      data = _event$data.data;
-    switch (type) {
-      case 'getGeneralReportSuccess':
-        callBack(data);
-        break;
-      case 'getGeneralReportFail':
-        callBack(data);
-        break;
-    }
-  });
-}
-
-// 发起获取报告消息
-function getReport(params) {
-  worker && worker.postMessage({
-    type: 'getGeneralReport',
-    params: params
-  });
-}
-
-// 获取报告
-var GetGeneralReport = exports.GetGeneralReport = function GetGeneralReport(params, callBack) {
-  // 如果是在主进程，则直接获取报告
-  if (isInMainProcess()) {
-    var reportRes = (0, _utils.getGeneralReportCallKit)(params);
-    return callBack(reportRes.data);
-  }
-
-  // 如果是在渲染进程，则通过worker获取报告
-  initWorker();
-  addWorkerListener(callBack);
-  getReport(params);
-};

package/lib/getGeneralReport/worker.js

@@ -1,20 +0,0 @@
-"use strict";
-
-var _utils = require("../utils/utils.global");
-// 处理主进程消息
-function onMainMessage(event) {
-  // console.log('worker thread worker onmessage event.data', event.data)
-
-  var _event$data = event.data,
-    type = _event$data.type,
-    params = _event$data.params;
-  switch (type) {
-    case 'getGeneralReport':
-      var reportRes = (0, _utils.getGeneralReportCallKit)(params);
-      self.postMessage(reportRes);
-      break;
-    default:
-      break;
-  }
-}
-self.onmessage = onMainMessage;

package/lib/getSaaSReport/index.js

@@ -1,76 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.GetSaaSReport = void 0;
-var _path = _interopRequireDefault(require("path"));
-var _utils = require("../utils/utils.global");
-// 预定义worker
-var worker = null;
-
-// 获取进程类型
-function getProccessType() {
-  // console.log('process.type', process.type)
-  return process.type;
-}
-
-// 是否在主进程
-function isInMainProcess() {
-  return getProccessType() === 'browser';
-}
-
-// 是否在渲染进程
-// eslint-disable-next-line no-unused-vars
-function isInRenderProcess() {
-  return getProccessType() === 'renderer';
-}
-
-// 初始化worker
-function initWorker() {
-  if (!worker) {
-    worker = new Worker('file://' + _path.default.resolve(__dirname, "./worker.js"));
-  }
-}
-
-// 添加worker监听
-function addWorkerListener(callBack) {
-  worker && (worker.onmessage = function (event) {
-    // console.log('main thread onmessage event.data', event.data)
-
-    var _event$data = event.data,
-      type = _event$data.type,
-      data = _event$data.data;
-    switch (type) {
-      case 'getSaaSReportSuccess':
-        callBack(data);
-        break;
-      case 'getSaaSReportFail':
-        callBack(data);
-        break;
-    }
-  });
-}
-
-// 发起获取报告消息
-function getReport(params) {
-  worker && worker.postMessage({
-    type: 'getSaaSReport',
-    params: params
-  });
-}
-
-// 获取报告
-var GetSaaSReport = exports.GetSaaSReport = function GetSaaSReport(params, callBack) {
-  // 如果是在主进程，则直接获取报告
-  if (isInMainProcess()) {
-    var reportRes = (0, _utils.getSaaSReportCallKit)(params);
-    return callBack(reportRes.data);
-  }
-
-  // 如果是在渲染进程，则通过worker获取报告
-  initWorker();
-  addWorkerListener(callBack);
-  getReport(params);
-};

package/lib/getSaaSReport/worker.js

@@ -1,20 +0,0 @@
-"use strict";
-
-var _utils = require("../utils/utils.global");
-// 处理主进程消息
-function onMainMessage(event) {
-  // console.log('worker thread worker onmessage event.data', event.data)
-
-  var _event$data = event.data,
-    type = _event$data.type,
-    params = _event$data.params;
-  switch (type) {
-    case 'getSaaSReport':
-      var reportRes = (0, _utils.getSaaSReportCallKit)(params);
-      self.postMessage(reportRes);
-      break;
-    default:
-      break;
-  }
-}
-self.onmessage = onMainMessage;