hunter-open-sdk 2.0.0-beta.3 → 2.0.0-beta.30

package/lib/utils/utils.initDll.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -8,40 +7,43 @@ exports.initHunterInspectionKit = void 0;
 var _koffi = _interopRequireDefault(require("koffi"));
 var _path = _interopRequireDefault(require("path"));
 var _fs = _interopRequireDefault(require("fs"));
-var _utils = require("./utils");
+var _utils = require("./utils.env");
 var _utils2 = require("./utils.global");
+var _utils3 = require("./utils.path");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * 声明dll函数
  * @param {String} udid 设备id
- * @returns 
+ * @returns
  */
 
-var initHunterInspectionKit = exports.initHunterInspectionKit = function initHunterInspectionKit() {
-  var dllPath;
+const initHunterInspectionKit = () => {
+  let dllPath;
 
   // 读取本地sdk的version
-  var versionPath = _path.default.resolve(__dirname, '../resources/version.online');
-  var version = _fs.default.readFileSync(versionPath, 'utf-8');
+  const versionPath = (0, _utils3.getPathWithLocalResource)('version.online');
+  const version = _fs.default.readFileSync(versionPath, 'utf-8').trim();
   if ((0, _utils.isMac)()) {
     if ((0, _utils.isArm64)()) {
-      dllPath = _path.default.resolve(__dirname, "../resources/mac/libinspectionkit_arm64_".concat(version, ".dylib"));
+      dllPath = (0, _utils3.getPathWithLocalResource)(`dylib/libinspectionkit_arm64_${version}.dylib`);
     }
     if ((0, _utils.isAmd64)()) {
-      dllPath = _path.default.resolve(__dirname, "../resources/mac/libinspectionkit_amd64_".concat(version, ".dylib"));
+      dllPath = (0, _utils3.getPathWithLocalResource)(`dylib/libinspectionkit_amd64_${version}.dylib`);
     }
   } else {
-    dllPath = _path.default.resolve(__dirname, "../resources/dll/libinspectionkit_x64_".concat(version, ".dll"));
+    dllPath = (0, _utils3.getPathWithLocalResource)(`dll/libinspectionkit_x64_${version}.dll`);
   }
   if (!(0, _utils.isDev)()) {
     // 如果是生产模式 则替换app.asar 路径 为了在生产调用dll
-    dllPath = dllPath.replace('app.asar', 'app.asar.unpacked');
+    dllPath = (0, _utils3.convertPathWithCurrentEnv)(dllPath);
   }
-  var dllLib = _koffi.default.load(dllPath);
-  var dllKit = {
+  const dllLib = _koffi.default.load(dllPath);
+  const dllKit = {
     InspectionKit: dllLib.func('InspectionKit', 'str', ['str', 'str', 'str']),
     TheForceKit: dllLib.func('TheForceKit', 'str', ['str'])
   };
 
   // 挂载到全局对象，兼容主进程和渲染进程
   (0, _utils2.setGlobalProperty)('HunterInspectionKit', dllKit);
-};
+};
+exports.initHunterInspectionKit = initHunterInspectionKit;

package/lib/utils/utils.path.js

@@ -3,14 +3,63 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.currentEnvPath = void 0;
-var path = require('path');
-
+exports.convertPathWithCurrentEnv = convertPathWithCurrentEnv;
+exports.getCurrentNodePath = getCurrentNodePath;
+exports.getPathWithCWD = getPathWithCWD;
+exports.getPathWithElectornResource = getPathWithElectornResource;
+exports.getPathWithLocalResource = getPathWithLocalResource;
+var _path = _interopRequireDefault(require("path"));
+var _process = _interopRequireDefault(require("process"));
+var _utils = require("./utils.env");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * 当前环境地址转换
- * @param {*} path
+ * @param {*} dirPath 目录路径
+ * @param {*} filePath 文件路径，默认为空字符串
+ * @returns
+ */
+function convertPathWithCurrentEnv(dirPath, filePath = '') {
+  let fixPath = dirPath;
+  if (!(0, _utils.isDev)()) {
+    fixPath = fixPath.replace('/app.asar/', '/app.asar.unpacked/').replace('\\app.asar\\', '\\app.asar.unpacked\\');
+  }
+  return _path.default.join(fixPath, filePath);
+}
+
+/**
+ * 当前项目resources目录地址转换
+ * @param {*} dirPath
  * @returns
  */
-var currentEnvPath = exports.currentEnvPath = function currentEnvPath(filePath) {
-  return path.resolve(__dirname, filePath);
-};
+function getPathWithLocalResource(dirPath) {
+  const resourcesPath = _path.default.join(__dirname, '../resources');
+  return _path.default.join(resourcesPath, dirPath);
+}
+
+/**
+ * Electron资源目录地址转换
+ * @param {*} dirPath
+ * @returns
+ */
+function getPathWithElectornResource(dirPath) {
+  console.log('getPathWithElectornResource resourcesPath => ', _process.default.type || 'node', _process.default.resourcesPath);
+  return _path.default.join(_process.default.resourcesPath || '', dirPath);
+}
+
+/**
+ * 当前工作目录地址转换
+ * @param {*} dirPath 
+ * @returns 
+ */
+function getPathWithCWD(dirPath) {
+  const cwd = _process.default.cwd();
+  return _path.default.join(cwd, dirPath);
+}
+
+/**
+ * 获取当前nodePath环境变量
+ * @returns 
+ */
+function getCurrentNodePath() {
+  return _process.default.env.NODE_PATH || '';
+}

package/lib/utils/utils.process.js

@@ -0,0 +1,35 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getCurrentProcess = getCurrentProcess;
+exports.getProccessType = getProccessType;
+exports.isInMainProcess = isInMainProcess;
+exports.isInRenderProcess = isInRenderProcess;
+// 获取进程类型
+function getProccessType() {
+  return process.type;
+}
+
+// 是否在主进程
+function isInMainProcess() {
+  return getProccessType() === 'browser';
+}
+
+// 是否在渲染进程
+// eslint-disable-next-line no-unused-vars
+function isInRenderProcess() {
+  return getProccessType() === 'renderer';
+}
+function getCurrentProcess() {
+  if (typeof process === 'undefined' || process.type === undefined) {
+    return '这是在浏览器环境中';
+  } else {
+    if (process.type === 'browser') {
+      return '这是在 Node.js 环境中';
+    } else {
+      return '这是在 Electron 的渲染进程中';
+    }
+  }
+}

package/lib/utils/utils.sn.js

@@ -3,39 +3,33 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.SUPPORT_PHONE_VENDORS = exports.SUPPORT_PHONE_BRANDS = void 0;
 exports.parseWmicOutput = parseWmicOutput;
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+// 只支持三星、荣耀、华为的手机设备关键词
+const SUPPORT_PHONE_BRANDS = exports.SUPPORT_PHONE_BRANDS = ['samsung', 'galaxy', 'huawei', 'honor', 'honor magic'];
+
+// 只支持三星、荣耀、华为的手机厂商VID
+const SUPPORT_PHONE_VENDORS = exports.SUPPORT_PHONE_VENDORS = ['VID_04E8',
+// Samsung
+'VID_12D1',
+// Huawei
+'VID_2A45' // Honor (OnePlus VID，但荣耀也使用此VID)
+];
+
 /**
  * 判断设备是否为手机设备
  * @param {Object} device - 设备信息
  * @returns {boolean} 是否为手机设备
  */
 function isPhoneDevice(device) {
-  var name = device.name.toLowerCase();
-  var pnpId = device.pnpDeviceId.toLowerCase();
-
-  // 只支持三星、荣耀、华为的手机设备关键词
-  var phoneKeywords = ['samsung', 'galaxy', 'huawei', 'honor', 'honor magic'];
-
-  // 只支持三星、荣耀、华为的手机厂商VID
-  var phoneVendors = ['VID_04E8',
-  // Samsung
-  'VID_12D1',
-  // Huawei
-  'VID_2A45' // Honor (OnePlus VID，但荣耀也使用此VID)
-  ];
+  const name = device.name.toLowerCase();
+  const pnpId = device.pnpDeviceId.toLowerCase();
 
   // 检查名称中是否包含手机关键词
-  var isPhoneByName = phoneKeywords.some(function (keyword) {
-    return name.includes(keyword);
-  });
+  const isPhoneByName = SUPPORT_PHONE_BRANDS.some(keyword => name.includes(keyword));
 
   // 检查PNPDeviceID中是否包含手机厂商VID
-  var isPhoneByVendor = phoneVendors.some(function (vendor) {
-    return pnpId.includes(vendor.toLowerCase());
-  });
+  const isPhoneByVendor = SUPPORT_PHONE_VENDORS.some(vendor => pnpId.includes(vendor.toLowerCase()));
   return isPhoneByName || isPhoneByVendor;
 }
 
@@ -46,9 +40,9 @@ function isPhoneDevice(device) {
  */
 function extractSerialNumber(pnpDeviceId) {
   // USB设备ID格式通常为: USB\VID_v(4)&PID_d(4)\序列号
-  var parts = pnpDeviceId.split('\\');
+  const parts = pnpDeviceId.split('\\');
   if (parts.length >= 3) {
-    var serialPart = parts[parts.length - 1];
+    const serialPart = parts[parts.length - 1];
 
     // 验证序列号格式（通常不包含&和#等特殊字符）
     if (serialPart && !serialPart.includes('&') && !serialPart.includes('#')) {
@@ -65,43 +59,34 @@ function extractSerialNumber(pnpDeviceId) {
  * @returns {Array} 手机设备信息数组
  */
 function parseWmicOutput(output) {
-  var devices = [];
-  var lines = output.split('\r\n');
-  var currentDevice = {};
-  var _iterator = _createForOfIteratorHelper(lines),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var line = _step.value;
-      // 跳过空行
-      if (!line.trim()) {
-        // 如果当前设备有数据，则保存
-        if (currentDevice.name && currentDevice.pnpDeviceId) {
-          // 检查是否为手机设备
-          if (isPhoneDevice(currentDevice)) {
-            // 提取序列号
-            currentDevice.serial = extractSerialNumber(currentDevice.pnpDeviceId);
-            devices.push(currentDevice);
-          }
+  const devices = [];
+  const lines = output.split('\r\n');
+  let currentDevice = {};
+  for (const line of lines) {
+    // 跳过空行
+    if (!line.trim()) {
+      // 如果当前设备有数据，则保存
+      if (currentDevice.name && currentDevice.pnpDeviceId) {
+        // 检查是否为手机设备
+        if (isPhoneDevice(currentDevice)) {
+          // 提取序列号
+          currentDevice.serial = extractSerialNumber(currentDevice.pnpDeviceId);
+          devices.push(currentDevice);
         }
-        currentDevice = {};
-        continue;
-      }
-
-      // 解析Name和PNPDeviceID
-      if (line.startsWith('Name=')) {
-        currentDevice.name = line.substring(5).trim();
-      } else if (line.startsWith('PNPDeviceID=')) {
-        currentDevice.pnpDeviceId = line.substring(12).trim();
       }
+      currentDevice = {};
+      continue;
     }
 
-    // 处理最后一个设备
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
+    // 解析Name和PNPDeviceID
+    if (line.startsWith('Name=')) {
+      currentDevice.name = line.substring(5).trim();
+    } else if (line.startsWith('PNPDeviceID=')) {
+      currentDevice.pnpDeviceId = line.substring(12).trim();
+    }
   }
+
+  // 处理最后一个设备
   if (currentDevice.name && currentDevice.pnpDeviceId && isPhoneDevice(currentDevice)) {
     currentDevice.serial = extractSerialNumber(currentDevice.pnpDeviceId);
     devices.push(currentDevice);

package/lib/utils/utils.worker.js

@@ -0,0 +1,32 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getAsarNodePath = getAsarNodePath;
+exports.initWorkerNodePath = initWorkerNodePath;
+const path = require('path');
+const _module = require('module');
+const {
+  getPathWithElectornResource,
+  getCurrentNodePath
+} = require("./utils.path");
+function getAsarNodePath() {
+  const asarRoot = getPathWithElectornResource('app.asar');
+  const unpackedRoot = getPathWithElectornResource('app.asar.unpacked');
+  const nodeModulesPaths = [path.join(asarRoot, 'node_modules'), path.join(unpackedRoot, 'node_modules')];
+  return nodeModulesPaths.join(path.delimiter);
+}
+function initWorkerNodePath() {
+  const currentNodePath = getCurrentNodePath();
+  if (currentNodePath.includes('app.asar') && currentNodePath.includes('app.asar.unpacked')) {
+    console.log('Has process.env.NODE_PATH =>', process.env.NODE_PATH);
+    _module.Module._initPaths();
+    return;
+  }
+  const asarNodePath = getAsarNodePath();
+  const nodePathArr = [currentNodePath, asarNodePath];
+  process.env.NODE_PATH = nodePathArr.filter(Boolean).join(path.delimiter);
+  console.log('Set process.env.NODE_PATH =>', process.env.NODE_PATH);
+  _module.Module._initPaths();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hunter-open-sdk",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.30",
   "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",
@@ -22,13 +22,20 @@
     "prepare": "npx lefthook install"
   },
   "main": "lib/index.js",
+  "module": "lib/index.mjs",
   "types": "lib/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./lib/index.mjs",
+      "require": "./lib/index.js",
+      "types": "./lib/index.d.ts"
+    }
+  },
   "author": "xiexing <xiexing@zhuanzhuan.com>",
   "license": "ISC",
   "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 +43,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 +60,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 +71,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;