hunter-open-sdk 1.1.1-beta.4 → 1.1.2-beta.2

package/lib/registerEvent/index.js

@@ -216,7 +216,7 @@ var writeDllVersion = function writeDllVersion(version) {
     }
     console.log('========写入version成功');
     // 写入成功后 重新初始化dll
-    (0, _utils3.HunterInspectionKit)();
+    (0, _utils3.initHunterInspectionKit)();
     saasCallBack({
       data: {
         eventName: 'type_update_result',

package/lib/utils/utils.global.js

@@ -73,7 +73,7 @@ var deleteGlobalProperty = exports.deleteGlobalProperty = function deleteGlobalP
 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;
@@ -88,12 +88,12 @@ var getHunterInspectionKit = exports.getHunterInspectionKit = function getHunter
 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 {

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 
  */
 
-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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hunter-open-sdk",
-  "version": "1.1.1-beta.4",
+  "version": "1.1.2-beta.2",
   "description": "采货侠SaaS版本桌面端sdk",
   "scripts": {
     "start": "zz dev",
@@ -29,9 +29,9 @@
     "@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",
+    "koffi": "2.14.1",
     "lodash": "4.17.21",
     "request": "^2.88.2",
     "sudo-prompt": "^9.2.1",
@@ -45,13 +45,13 @@
     "@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/bunlder-module-father": "0.0.11",
     "@zz-common/dev-standard": "^2.0.8",
-    "@zz-common/zz-cli": "^5.0.3",
-    "@zz-common/zz-cli-types": "^0.0.9",
+    "@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.1.6",
+    "father": "4.6.7",
     "lint-staged": "10.0.8",
     "path-to-regexp": "2.4.0",
     "typedoc": "0.23.9",
@@ -65,5 +65,8 @@
   "files": [
     "lib",
     "es"
-  ]
+  ],
+  "engines": {
+    "node": ">=20.0.0"
+  }
 }