hunter-open-sdk 1.1.1-beta.3 → 1.1.2-beta.1

package/README.md

@@ -1,2 +1,2 @@
-采货侠SaaS版本桌面端sdk
-
+采货侠SaaS版本桌面端sdk
+

package/lib/getAndroidSn/index.js

@@ -156,10 +156,10 @@ var getWinSn = /*#__PURE__*/function () {
   };
 }();
 
-/**
- * 获取Android SN
- * @param {Object} params - 参数
- * @param {Function} callBack - 回调函数
+/**
+ * 获取Android SN
+ * @param {Object} params - 参数
+ * @param {Function} callBack - 回调函数
  */
 var GetAndroidSn = exports.GetAndroidSn = function GetAndroidSn(params, callBack) {
   if (hadRegisterUsb) {

package/lib/registerEvent/index.js

@@ -23,8 +23,8 @@ var saasCallBack;
 
 // usb监听
 var usbListener = null;
-/**
- * 获取资源文件的基础路径
+/**
+ * 获取资源文件的基础路径
  */
 var getResourcePath = function getResourcePath() {
   if ((0, _utils.isDev)()) {
@@ -36,11 +36,11 @@ var getResourcePath = function getResourcePath() {
   }
 };
 
-/**
- * 发布配对
- * @param {String} udid 设备id
- * @param {String} params 参数
- * @returns {String} 发布配对结果
+/**
+ * 发布配对
+ * @param {String} udid 设备id
+ * @param {String} params 参数
+ * @returns {String} 发布配对结果
  */
 var publishPair = function publishPair() {
   var udid = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
@@ -56,10 +56,10 @@ var publishPair = function publishPair() {
   return (0, _utils2.callHunterInspectionKit)('TheForceKit', JSON.stringify(kitParamsObj));
 };
 
-/**
- * 获取信任状态
- * @param {String} udid 设备id
- * @returns 
+/**
+ * 获取信任状态
+ * @param {String} udid 设备id
+ * @returns 
  */
 var getTrustStatus = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
@@ -148,10 +148,10 @@ var getTrustStatusOnce = /*#__PURE__*/function () {
   };
 }();
 
-/**
- * 配对并获取信任状态
- * @param {String} udid 设备id
- * @returns 
+/**
+ * 配对并获取信任状态
+ * @param {String} udid 设备id
+ * @returns 
  */
 var DevicePair = /*#__PURE__*/function () {
   var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
@@ -165,17 +165,20 @@ var DevicePair = /*#__PURE__*/function () {
         case 0:
           udid = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : '';
           params = _args3.length > 1 ? _args3[1] : undefined;
-          // 单次获取信任状态
-          trustStatusOnceRes = getTrustStatusOnce(udid, params); // 未信任弹起信任窗口
+          _context3.next = 4;
+          return getTrustStatusOnce(udid, params);
+        case 4:
+          trustStatusOnceRes = _context3.sent;
+          // 未信任弹起信任窗口
           if (!trustStatusOnceRes) {
             // 发布配对
             publishPair(udid, params);
           }
 
           // 通过 trust_status 来判断信任状态
-          _context3.next = 6;
+          _context3.next = 8;
           return getTrustStatus(udid, params);
-        case 6:
+        case 8:
           trustStatusRes = _context3.sent;
           if (trustStatusRes) {
             saasCallBack({
@@ -186,7 +189,7 @@ var DevicePair = /*#__PURE__*/function () {
               }
             });
           }
-        case 8:
+        case 10:
         case "end":
           return _context3.stop();
       }
@@ -213,7 +216,7 @@ var writeDllVersion = function writeDllVersion(version) {
     }
     console.log('========写入version成功');
     // 写入成功后 重新初始化dll
-    (0, _utils3.HunterInspectionKit)();
+    (0, _utils3.initHunterInspectionKit)();
     saasCallBack({
       data: {
         eventName: 'type_update_result',
@@ -251,10 +254,10 @@ var updateDll = function updateDll(packageUrl, targetVersion) {
   });
 };
 
-/**
- * 更新下载dll文件 并重写本地版本号
- * @param {String} udid 设备id
- * @returns 
+/**
+ * 更新下载dll文件 并重写本地版本号
+ * @param {String} udid 设备id
+ * @returns 
  */
 var updateDllFileCheck = function updateDllFileCheck() {
   // mac的amd不支持更新
@@ -294,8 +297,8 @@ var updateDllFileCheck = function updateDllFileCheck() {
   }
 };
 
-/**
- * 检查并安装驱动
+/**
+ * 检查并安装驱动
  */
 var checkAndInstallDriver = function checkAndInstallDriver() {
   return new Promise(function (resolve, reject) {

package/lib/utils/utils.global.js

@@ -5,14 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.setGlobalProperty = exports.hasGlobalProperty = exports.getSaaSReportCallKit = exports.getHunterInspectionKit = exports.getGlobalProperty = exports.getGlobalObject = exports.getGeneralReportCallKit = exports.deleteGlobalProperty = exports.callHunterInspectionKit = void 0;
 var _utils = require("../utils/utils.initDll");
-/**
- * 全局对象兼容性处理工具
- * 兼容Electron主进程(global)和渲染进程(window)环境
+/**
+ * 全局对象兼容性处理工具
+ * 兼容Electron主进程(global)和渲染进程(window)环境
  */
 var Sentry = require("@sentry/browser");
-/**
- * 获取全局对象
- * @returns {Object} 全局对象
+/**
+ * 获取全局对象
+ * @returns {Object} 全局对象
  */
 var getGlobalObject = exports.getGlobalObject = function getGlobalObject() {
   if (typeof global !== 'undefined') {
@@ -25,21 +25,21 @@ var getGlobalObject = exports.getGlobalObject = function getGlobalObject() {
   return {};
 };
 
-/**
- * 设置全局属性
- * @param {string} key 属性名
- * @param {any} value 属性值
+/**
+ * 设置全局属性
+ * @param {string} key 属性名
+ * @param {any} value 属性值
  */
 var setGlobalProperty = exports.setGlobalProperty = function setGlobalProperty(key, value) {
   var globalObj = getGlobalObject();
   globalObj[key] = value;
 };
 
-/**
- * 获取全局属性
- * @param {string} key 属性名
- * @param {any} defaultValue 默认值
- * @returns {any} 属性值
+/**
+ * 获取全局属性
+ * @param {string} key 属性名
+ * @param {any} defaultValue 默认值
+ * @returns {any} 属性值
  */
 var getGlobalProperty = exports.getGlobalProperty = function getGlobalProperty(key) {
   var defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
@@ -47,53 +47,53 @@ var getGlobalProperty = exports.getGlobalProperty = function getGlobalProperty(k
   return globalObj[key] !== undefined ? globalObj[key] : defaultValue;
 };
 
-/**
- * 检查全局属性是否存在
- * @param {string} key 属性名
- * @returns {boolean} 是否存在
+/**
+ * 检查全局属性是否存在
+ * @param {string} key 属性名
+ * @returns {boolean} 是否存在
  */
 var hasGlobalProperty = exports.hasGlobalProperty = function hasGlobalProperty(key) {
   var globalObj = getGlobalObject();
   return key in globalObj;
 };
 
-/**
- * 删除全局属性
- * @param {string} key 属性名
+/**
+ * 删除全局属性
+ * @param {string} key 属性名
  */
 var deleteGlobalProperty = exports.deleteGlobalProperty = function deleteGlobalProperty(key) {
   var globalObj = getGlobalObject();
   delete globalObj[key];
 };
 
-/**
- * 安全地获取HunterInspectionKit对象
- * @returns {Object|null} HunterInspectionKit对象，如果不存在则返回null
+/**
+ * 安全地获取HunterInspectionKit对象
+ * @returns {Object|null} HunterInspectionKit对象，如果不存在则返回null
  */
 var getHunterInspectionKit = exports.getHunterInspectionKit = function getHunterInspectionKit(willInit) {
   var kit = getGlobalProperty('HunterInspectionKit');
   if (!kit) {
-    !willInit && console.warn('HunterInspectionKit未初始化，请先调用HunterInspectionKit()函数');
+    !willInit && console.warn('HunterInspectionKit未初始化，请先调用 initHunterInspectionKit() 函数');
     return null;
   }
   return kit;
 };
 
-/**
- * 安全地调用HunterInspectionKit的方法
- * @param {string} methodName 方法名
- * @param {...any} args 参数
- * @returns {any|null} 方法返回值，如果调用失败则返回null
+/**
+ * 安全地调用HunterInspectionKit的方法
+ * @param {string} methodName 方法名
+ * @param {...any} args 参数
+ * @returns {any|null} 方法返回值，如果调用失败则返回null
  */
 var callHunterInspectionKit = exports.callHunterInspectionKit = function callHunterInspectionKit(methodName) {
   var kit = getHunterInspectionKit(true);
   if (!kit) {
-    (0, _utils.HunterInspectionKit)();
+    (0, _utils.initHunterInspectionKit)();
     kit = getHunterInspectionKit(false);
   }
   if (!kit || typeof kit[methodName] !== 'function') {
-    console.error("HunterInspectionKit.".concat(methodName, "\u65B9\u6CD5\u4E0D\u5B58\u5728\u6216\u672A\u521D\u59CB\u5316"));
-    Sentry.captureException("HunterInspectionKit.".concat(methodName, "\u65B9\u6CD5\u4E0D\u5B58\u5728\u6216\u672A\u521D\u59CB\u5316"));
+    console.error("initHunterInspectionKit.".concat(methodName, "\u65B9\u6CD5\u4E0D\u5B58\u5728\u6216\u672A\u521D\u59CB\u5316"));
+    Sentry.captureException("initHunterInspectionKit.".concat(methodName, "\u65B9\u6CD5\u4E0D\u5B58\u5728\u6216\u672A\u521D\u59CB\u5316"));
     return null;
   }
   try {
@@ -109,10 +109,10 @@ var callHunterInspectionKit = exports.callHunterInspectionKit = function callHun
   }
 };
 
-/**
- * 获取general报告
- * @param {Object} data 参数
- * @returns {Object} 报告结果
+/**
+ * 获取general报告
+ * @param {Object} data 参数
+ * @returns {Object} 报告结果
  */
 var getGeneralReportCallKit = exports.getGeneralReportCallKit = function getGeneralReportCallKit(data) {
   var params = data.params,
@@ -152,10 +152,10 @@ var getGeneralReportCallKit = exports.getGeneralReportCallKit = function getGene
   };
 };
 
-/**
- * 获取general报告
- * @param {Object} params 参数
- * @returns {Object} 报告结果
+/**
+ * 获取general报告
+ * @param {Object} params 参数
+ * @returns {Object} 报告结果
  */
 var getSaaSReportCallKit = exports.getSaaSReportCallKit = function getSaaSReportCallKit(params) {
   var reportRes = callHunterInspectionKit('InspectionKit', params, 'saas_report', params);

package/lib/utils/utils.initDll.js

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

package/lib/utils/utils.path.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.currentEnvPath = void 0;
 var path = require('path');
 
-/**
- * 当前环境地址转换
- * @param {*} path
- * @returns
+/**
+ * 当前环境地址转换
+ * @param {*} path
+ * @returns
  */
 var currentEnvPath = exports.currentEnvPath = function currentEnvPath(filePath) {
   return path.resolve(__dirname, filePath);

package/lib/utils/utils.sn.js

@@ -7,10 +7,10 @@ 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; }
-/**
- * 判断设备是否为手机设备
- * @param {Object} device - 设备信息
- * @returns {boolean} 是否为手机设备
+/**
+ * 判断设备是否为手机设备
+ * @param {Object} device - 设备信息
+ * @returns {boolean} 是否为手机设备
  */
 function isPhoneDevice(device) {
   var name = device.name.toLowerCase();
@@ -39,10 +39,10 @@ function isPhoneDevice(device) {
   return isPhoneByName || isPhoneByVendor;
 }
 
-/**
- * 从PNPDeviceID中提取序列号
- * @param {string} pnpDeviceId - PNPDeviceID
- * @returns {string} 序列号
+/**
+ * 从PNPDeviceID中提取序列号
+ * @param {string} pnpDeviceId - PNPDeviceID
+ * @returns {string} 序列号
  */
 function extractSerialNumber(pnpDeviceId) {
   // USB设备ID格式通常为: USB\VID_v(4)&PID_d(4)\序列号
@@ -59,10 +59,10 @@ function extractSerialNumber(pnpDeviceId) {
   // 如果无法提取序列号，返回空字符串
   return '';
 }
-/**
- * 解析WMIC输出并提取手机设备信息
- * @param {string} output - WMIC命令输出
- * @returns {Array} 手机设备信息数组
+/**
+ * 解析WMIC输出并提取手机设备信息
+ * @param {string} output - WMIC命令输出
+ * @returns {Array} 手机设备信息数组
  */
 function parseWmicOutput(output) {
   var devices = [];

package/package.json

@@ -1,69 +1,70 @@
-{
-  "name": "hunter-open-sdk",
-  "version": "1.1.1-beta.3",
-  "description": "采货侠SaaS版本桌面端sdk",
-  "scripts": {
-    "start": "zz dev",
-    "dev": "zz dev",
-    "dev-demo": "zz dev -d",
-    "build": "zz build",
-    "lint": "zz lint",
-    "fix": "zz lint --fix",
-    "staged": "zz lint --staged",
-    "staged-fix": "zz --staged --fix",
-    "pub": "zz pub",
-    "pub-beta": "zz pub --beta",
-    "unpub": "zz pub --unpub",
-    "doc": "zz doc && zz doc --upload",
-    "dev-doc": "zz doc --dev",
-    "build-doc": "zz doc",
-    "cz": "zz cz",
-    "test": "zz test",
-    "prepare": "npx lefthook install"
-  },
-  "main": "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",
-    "ffi-napi": "^4.0.3",
-    "fs": "^0.0.1-security",
-    "fs-extra": "^11.3.0",
-    "lodash": "4.17.21",
-    "request": "^2.88.2",
-    "sudo-prompt": "^9.2.1",
-    "usb": "^2.15.0",
-    "usbmux": "^0.1.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",
-    "@types/lodash": "4.14.182",
-    "@umijs/fabric": "2.12.2",
-    "@zz-common/bunlder-module-father": "^0.0.10",
-    "@zz-common/dev-standard": "^2.0.8",
-    "@zz-common/zz-cli": "^5.0.3",
-    "@zz-common/zz-cli-types": "^0.0.9",
-    "commitizen": "4.2.5",
-    "commitlint": "17.0.2",
-    "father": "4.1.6",
-    "lint-staged": "10.0.8",
-    "path-to-regexp": "2.4.0",
-    "typedoc": "0.23.9",
-    "typescript": "4.7.4"
-  },
-  "config": {
-    "commitizen": {
-      "path": "@zz-common/dev-standard/cz"
-    }
-  },
-  "files": [
-    "lib",
-    "es"
-  ]
-}
+{
+  "name": "hunter-open-sdk",
+  "version": "1.1.2-beta.1",
+  "description": "采货侠SaaS版本桌面端sdk",
+  "scripts": {
+    "start": "zz dev",
+    "dev": "zz dev",
+    "dev-demo": "zz dev -d",
+    "build": "zz build",
+    "lint": "zz lint",
+    "fix": "zz lint --fix",
+    "staged": "zz lint --staged",
+    "staged-fix": "zz --staged --fix",
+    "pub": "zz pub",
+    "pub-beta": "zz pub --beta",
+    "unpub": "zz pub --unpub",
+    "doc": "zz doc && zz doc --upload",
+    "dev-doc": "zz doc --dev",
+    "build-doc": "zz doc",
+    "cz": "zz cz",
+    "test": "zz test",
+    "prepare": "npx lefthook install"
+  },
+  "main": "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",
+    "lodash": "4.17.21",
+    "request": "^2.88.2",
+    "sudo-prompt": "^9.2.1",
+    "usb": "^2.15.0",
+    "usbmux": "^0.1.0",
+    "user": "^0.0.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",
+    "@types/lodash": "4.14.182",
+    "@umijs/fabric": "2.12.2",
+    "@zz-common/bunlder-module-father": "0.0.10",
+    "@zz-common/dev-standard": "^2.0.8",
+    "@zz-common/zz-cli": "5.0.6",
+    "@zz-common/zz-cli-types": "0.0.15",
+    "commitizen": "4.2.5",
+    "commitlint": "17.0.2",
+    "father": "4.6.7",
+    "lint-staged": "10.0.8",
+    "path-to-regexp": "2.4.0",
+    "typedoc": "0.23.9",
+    "typescript": "4.7.4"
+  },
+  "config": {
+    "commitizen": {
+      "path": "@zz-common/dev-standard/cz"
+    }
+  },
+  "files": [
+    "lib",
+    "es"
+  ]
+}