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

package/lib/abilities/activate/index.js

@@ -34,15 +34,18 @@ class Activate {
   }
   initWorker() {
     if (!this.worker) {
-      const workerPath = new _url.default.URL('file://' + (0, _utils2.getCurrentEnvPath)(__dirname, './worker.js'));
+      const workerPath = new _url.default.URL('file://' + (0, _utils2.convertPathWithCurrentEnv)(__dirname, './worker.js'));
       this.worker = new _webWorker.default(workerPath, {
         type: 'module'
       });
     }
   }
 }
-const entity = new Activate();
+let entity = null;
 function activate(params, callback) {
+  if (!entity) {
+    entity = new Activate();
+  }
   const payload = (0, _utils.parsePayload)(params);
   entity.exec(payload, callback);
 }

package/lib/abilities/erase/index.js

@@ -34,15 +34,18 @@ class Erase {
   }
   initWorker() {
     if (!this.worker) {
-      const workerPath = new _url.default.URL('file://' + (0, _utils2.getCurrentEnvPath)(__dirname, './worker.js'));
+      const workerPath = new _url.default.URL('file://' + (0, _utils2.convertPathWithCurrentEnv)(__dirname, './worker.js'));
       this.worker = new _webWorker.default(workerPath, {
         type: 'module'
       });
     }
   }
 }
-const entity = new Erase();
+let entity = null;
 function erase(params, callback) {
+  if (!entity) {
+    entity = new Erase();
+  }
   const payload = (0, _utils.parsePayload)(params);
   entity.exec(payload, callback);
 }

package/lib/abilities/getGeneralReport/index.js

@@ -21,7 +21,7 @@ class WorkerPool {
     }
   }
   _createWorker() {
-    const workerPath = new _url.default.URL('file://' + (0, _utils2.getCurrentEnvPath)(__dirname, './worker.js'));
+    const workerPath = new _url.default.URL('file://' + (0, _utils2.convertPathWithCurrentEnv)(__dirname, './worker.js'));
     return new _webWorker.default(workerPath, {
       type: 'module'
     });
@@ -53,12 +53,23 @@ class WorkerPool {
     });
   }
 }
-let pool = new WorkerPool(DEFAULT_POOL_SIZE);
+let pool = null;
 function getGeneralReport(params, callback, options = {}) {
   const cb = typeof callback === 'function' ? callback : _utils3.defaultCallback;
   const payload = (0, _utils.parsePayload)(params);
-  if (options?.poolSize != null && options.poolSize !== pool.poolSize) {
-    pool = new WorkerPool(options.poolSize);
+  const {
+    useMultiWorker = false,
+    poolSize = DEFAULT_POOL_SIZE
+  } = options;
+  if (!useMultiWorker) {
+    if (!pool || pool.poolSize !== 1) {
+      pool = new WorkerPool(1);
+    }
+  } else {
+    const targetSize = poolSize;
+    if (!pool || pool.poolSize !== targetSize) {
+      pool = new WorkerPool(targetSize);
+    }
   }
   pool.exec(payload, cb);
 }

package/lib/abilities/getSaaSReport/index.js

@@ -34,15 +34,18 @@ class GetSaaSReport {
   }
   initWorker() {
     if (!this.worker) {
-      const workerPath = new _url.default.URL('file://' + (0, _utils2.getCurrentEnvPath)(__dirname, './worker.js'));
+      const workerPath = new _url.default.URL('file://' + (0, _utils2.convertPathWithCurrentEnv)(__dirname, './worker.js'));
       this.worker = new _webWorker.default(workerPath, {
         type: 'module'
       });
     }
   }
 }
-const entity = new GetSaaSReport();
+let entity = null;
 function getSaaSReport(params, callback) {
+  if (!entity) {
+    entity = new GetSaaSReport();
+  }
   const payload = (0, _utils.parsePayload)(params);
   entity.exec(payload, callback);
 }

package/lib/abilities/installApp/index.js

@@ -34,15 +34,18 @@ class InstallApp {
   }
   initWorker() {
     if (!this.worker) {
-      const workerPath = new _url.default.URL('file://' + (0, _utils2.getCurrentEnvPath)(__dirname, './worker.js'));
+      const workerPath = new _url.default.URL('file://' + (0, _utils2.convertPathWithCurrentEnv)(__dirname, './worker.js'));
       this.worker = new _webWorker.default(workerPath, {
         type: 'module'
       });
     }
   }
 }
-const entity = new InstallApp();
+let entity = null;
 function installApp(params, callback) {
+  if (!entity) {
+    entity = new InstallApp();
+  }
   const payload = (0, _utils.parsePayload)(params);
   entity.exec(payload, callback);
 }

package/lib/abilities/reboot/index.js

@@ -34,15 +34,18 @@ class Reboot {
   }
   initWorker() {
     if (!this.worker) {
-      const workerPath = new _url.default.URL('file://' + (0, _utils2.getCurrentEnvPath)(__dirname, './worker.js'));
+      const workerPath = new _url.default.URL('file://' + (0, _utils2.convertPathWithCurrentEnv)(__dirname, './worker.js'));
       this.worker = new _webWorker.default(workerPath, {
         type: "module"
       });
     }
   }
 }
-const entity = new Reboot();
+let entity = null;
 function reboot(params, callback) {
+  if (!entity) {
+    entity = new Reboot();
+  }
   const payload = (0, _utils.parsePayload)(params);
   entity.exec(payload, callback);
 }

package/lib/abilities/shutdown/index.js

@@ -34,15 +34,18 @@ class Shutdown {
   }
   initWorker() {
     if (!this.worker) {
-      const workerPath = new _url.default.URL('file://' + (0, _utils2.getCurrentEnvPath)(__dirname, './worker.js'));
+      const workerPath = new _url.default.URL('file://' + (0, _utils2.convertPathWithCurrentEnv)(__dirname, './worker.js'));
       this.worker = new _webWorker.default(workerPath, {
         type: "module"
       });
     }
   }
 }
-const entity = new Shutdown();
+let entity = null;
 function shutdown(params, callback) {
+  if (!entity) {
+    entity = new Shutdown();
+  }
   const payload = (0, _utils.parsePayload)(params);
   entity.exec(payload, callback);
 }

package/lib/abilities/skip/index.js

@@ -34,15 +34,18 @@ class Skip {
   }
   initWorker() {
     if (!this.worker) {
-      const workerPath = new _url.default.URL('file://' + (0, _utils2.getCurrentEnvPath)(__dirname, './worker.js'));
+      const workerPath = new _url.default.URL('file://' + (0, _utils2.convertPathWithCurrentEnv)(__dirname, './worker.js'));
       this.worker = new _webWorker.default(workerPath, {
         type: 'module'
       });
     }
   }
 }
-const entity = new Skip();
+let entity = null;
 function skip(params, callback) {
+  if (!entity) {
+    entity = new Skip();
+  }
   const payload = (0, _utils.parsePayload)(params);
   entity.exec(payload, callback);
 }

package/lib/events/driver/winDriver.js

@@ -247,7 +247,7 @@ async function checkHasDriver() {
     // 仅存在安装包 进行解压安装
     case 2:
       const uncopressing = await uncopressingFile(filePath);
-      if (uncopressing) installDriver();
+      if (uncopressing) await installDriver();
       return true;
 
     // state = 0,

package/lib/index.js

@@ -15,12 +15,13 @@ var _reboot = require("./abilities/reboot");
 var _shutdown = require("./abilities/shutdown");
 var _installApp = require("./abilities/installApp");
 const Sentry = require('@sentry/browser');
+
+// 初始化 Sentry 用于错误捕获
 Sentry.init({
   dsn: 'https://8a5296c59083430fbac0756f56ddbf5d@sentry.zhuanzhuan.com/2300',
   tracesSampleRate: 1.0
 });
 console.log('Sentry initialized');
-// 初始化
 var _default = exports.default = {
   registerEvent: _eventManager.registerEvent,
   unregisterEvent: _eventManager.unregisterEvent,

package/lib/utils/utils.global.js

@@ -122,7 +122,7 @@ const callHunterInspectionKit = (methodName, ...args) => {
  */
 exports.callHunterInspectionKit = callHunterInspectionKit;
 function abilityCallKit(cmd, payload) {
-  console.log(`调用【${cmd}】方法，参数：`, payload);
+  console.log(`调用【${cmd}】方法，参数：`, JSON.stringify(payload));
   const {
     biz = "",
     params

package/lib/utils/utils.initDll.js

@@ -21,21 +21,21 @@ const initHunterInspectionKit = () => {
   let dllPath;
 
   // 读取本地sdk的version
-  const versionPath = _path.default.resolve(__dirname, '../resources/version.online');
+  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_${version}.dylib`);
+      dllPath = (0, _utils3.getPathWithLocalResource)(`mac/libinspectionkit_arm64_${version}.dylib`);
     }
     if ((0, _utils.isAmd64)()) {
-      dllPath = _path.default.resolve(__dirname, `../resources/mac/libinspectionkit_amd64_${version}.dylib`);
+      dllPath = (0, _utils3.getPathWithLocalResource)(`mac/libinspectionkit_amd64_${version}.dylib`);
     }
   } else {
-    dllPath = _path.default.resolve(__dirname, `../resources/dll/libinspectionkit_x64_${version}.dll`);
+    dllPath = (0, _utils3.getPathWithLocalResource)(`dll/libinspectionkit_x64_${version}.dll`);
   }
   if (!(0, _utils.isDev)()) {
     // 如果是生产模式 则替换app.asar 路径 为了在生产调用dll
-    dllPath = (0, _utils3.getCurrentEnvPath)(dllPath);
+    dllPath = (0, _utils3.convertPathWithCurrentEnv)(dllPath);
   }
   const dllLib = _koffi.default.load(dllPath);
   const dllKit = {

package/lib/utils/utils.path.js

@@ -3,29 +3,63 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getCurrentEnvPath = getCurrentEnvPath;
+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 getCurrentEnvPath(dirPath, filePath = '') {
+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\\/);
+    fixPath = fixPath.replace('/app.asar/', '/app.asar.unpacked/').replace('\\app.asar\\', '\\app.asar.unpacked\\');
   }
-  return _path.default.resolve(fixPath, filePath);
+  return _path.default.join(fixPath, filePath);
 }
+
+/**
+ * 当前项目resources目录地址转换
+ * @param {*} dirPath
+ * @returns
+ */
+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.worker.js

@@ -8,12 +8,12 @@ exports.initWorkerNodePath = initWorkerNodePath;
 const path = require('path');
 const _module = require('module');
 const {
-  getPathWithCWD,
+  getPathWithElectornResource,
   getCurrentNodePath
 } = require("./utils.path");
 function getAsarNodePath() {
-  const asarRoot = getPathWithCWD('app.asar');
-  const unpackedRoot = asarRoot.replace('app.asar', 'app.asar.unpacked');
+  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);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hunter-open-sdk",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "采货侠SaaS版本桌面端sdk",
   "scripts": {
     "start": "zz dev",

package/lib/events/driver/service.js

@@ -1,36 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _utils = require("../../utils/utils.env");
-var _command = require("./command");
-var _winDriver = require("./winDriver");
-const path = require('path');
-class Service {
-  // constructor () {}
-  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(res => {
-        console.log('------------checkHasDriver', res);
-        if (res) {
-          mainWindow.webContents.send('checkDriver', true);
-        } else {
-          mainWindow.webContents.send('checkDriver', false);
-          (0, _winDriver.downloadDriver)(mainWindow);
-        }
-      });
-    }
-  }
-}
-var _default = exports.default = Service;