hunter-open-sdk 2.0.0-beta.15 → 2.0.0-beta.17

package/lib/abilities/activate/worker.js

@@ -1,6 +1,12 @@
 "use strict";
 
-var _utils = require("../../utils/utils.global");
+const {
+  initWorkerNodePath
+} = require("../../utils/utils.worker");
+initWorkerNodePath();
+const {
+  activateCallKit
+} = require("../../utils/utils.global");
 function onMainMessage(event) {
   const {
     type,
@@ -15,7 +21,7 @@ function onMainMessage(event) {
             message: '【activate】方法缺少必要参数'
           };
         }
-        const res = (0, _utils.activateCallKit)(params);
+        const res = activateCallKit(params);
         postMessage(res);
         break;
       }

package/lib/abilities/erase/worker.js

@@ -1,6 +1,12 @@
 "use strict";
 
-var _utils = require("../../utils/utils.global");
+const {
+  initWorkerNodePath
+} = require("../../utils/utils.worker");
+initWorkerNodePath();
+const {
+  eraseCallKit
+} = require("../../utils/utils.global");
 function onMainMessage(event) {
   const {
     type,
@@ -15,7 +21,7 @@ function onMainMessage(event) {
             message: '【erase】方法缺少必要参数'
           };
         }
-        const res = (0, _utils.eraseCallKit)(params);
+        const res = eraseCallKit(params);
         postMessage(res);
         break;
       }

package/lib/abilities/getGeneralReport/worker.js

@@ -1,6 +1,12 @@
 "use strict";
 
-var _utils = require("../../utils/utils.global");
+const {
+  initWorkerNodePath
+} = require("../../utils/utils.worker");
+initWorkerNodePath();
+const {
+  getGeneralReportCallKit
+} = require("../../utils/utils.global");
 const MAX_RETRY_COUNT = 3;
 const RETRY_INTERVAL = 300;
 
@@ -19,7 +25,7 @@ function onMainMessage(event, retryCount = 0) {
             message: '【getGeneralReport】方法缺少必要参数'
           };
         }
-        const reportRes = (0, _utils.getGeneralReportCallKit)(params);
+        const reportRes = getGeneralReportCallKit(params);
         console.log(`第${retryCount + 1}次获取报告：`, reportRes);
         const {
           data: {

package/lib/abilities/getSaaSReport/worker.js

@@ -1,6 +1,13 @@
 "use strict";
 
-var _utils = require("../../utils/utils.global");
+const {
+  initWorkerNodePath
+} = require("../../utils/utils.worker");
+initWorkerNodePath();
+const {
+  getSaaSReportCallKit
+} = require("../../utils/utils.global");
+
 // 处理主进程消息
 function onMainMessage(event) {
   const {
@@ -9,7 +16,7 @@ function onMainMessage(event) {
   } = event.data;
   switch (type) {
     case 'getSaaSReport':
-      const reportRes = (0, _utils.getSaaSReportCallKit)(params);
+      const reportRes = getSaaSReportCallKit(params);
       postMessage(reportRes);
       break;
     default:

package/lib/abilities/reboot/worker.js

@@ -1,6 +1,12 @@
 "use strict";
 
-var _utils = require("../../utils/utils.global");
+const {
+  initWorkerNodePath
+} = require("../../utils/utils.worker");
+initWorkerNodePath();
+const {
+  rebootCallKit
+} = require("../../utils/utils.global");
 function onMainMessage(event) {
   const {
     type,
@@ -15,7 +21,7 @@ function onMainMessage(event) {
             message: '【reboot】方法缺少必要参数'
           };
         }
-        const res = (0, _utils.rebootCallKit)(params);
+        const res = rebootCallKit(params);
         postMessage(res);
         break;
       }

package/lib/abilities/shutdown/worker.js

@@ -1,6 +1,12 @@
 "use strict";
 
-var _utils = require("../../utils/utils.global");
+const {
+  initWorkerNodePath
+} = require("../../utils/utils.worker");
+initWorkerNodePath();
+const {
+  shutdownCallKit
+} = require("../../utils/utils.global");
 function onMainMessage(event) {
   const {
     type,
@@ -15,7 +21,7 @@ function onMainMessage(event) {
             message: '【shutdown】方法缺少必要参数'
           };
         }
-        const res = (0, _utils.shutdownCallKit)(params);
+        const res = shutdownCallKit(params);
         postMessage(res);
         break;
       }

package/lib/abilities/skip/worker.js

@@ -1,6 +1,12 @@
 "use strict";
 
-var _utils = require("../../utils/utils.global");
+const {
+  initWorkerNodePath
+} = require("../../utils/utils.worker");
+initWorkerNodePath();
+const {
+  skipCallKit
+} = require("../../utils/utils.global");
 function onMainMessage(event) {
   const {
     type,
@@ -15,7 +21,7 @@ function onMainMessage(event) {
             message: '【skip】方法缺少必要参数'
           };
         }
-        const res = (0, _utils.skipCallKit)(params);
+        const res = skipCallKit(params);
         postMessage(res);
         break;
       }

package/lib/resources/version.online

@@ -1 +1 @@
-0.3.0
+0.3.1

package/lib/utils/utils.global.js

@@ -5,11 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.skipCallKit = exports.shutdownCallKit = exports.setGlobalProperty = exports.rebootCallKit = exports.hasGlobalProperty = exports.getSaaSReportCallKit = exports.getHunterInspectionKit = exports.getGlobalProperty = exports.getGlobalObject = exports.getGeneralReportCallKit = exports.eraseCallKit = exports.deleteGlobalProperty = exports.callHunterInspectionKit = exports.activateCallKit = void 0;
 var _utils = require("../utils/utils.initDll");
+var Sentry = _interopRequireWildcard(require("@sentry/browser"));
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /**
  * 全局对象兼容性处理工具
  * 兼容Electron主进程(global)和渲染进程(window)环境
  */
-const Sentry = require('@sentry/browser');
+
 /**
  * 获取全局对象
  * @returns {Object} 全局对象

package/lib/utils/utils.path.js

@@ -4,7 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getCurrentEnvPath = getCurrentEnvPath;
-exports.getCurrentProcess = getCurrentProcess;
+exports.getCurrentNodePath = getCurrentNodePath;
+exports.getPathWithCWD = getPathWithCWD;
 var _path = _interopRequireDefault(require("path"));
 var _process = _interopRequireDefault(require("process"));
 var _utils = require("./utils.env");
@@ -21,14 +22,10 @@ function getCurrentEnvPath(dirPath, filePath = '') {
   }
   return _path.default.resolve(fixPath, filePath);
 }
-function getCurrentProcess() {
-  if (typeof _process.default === 'undefined' || _process.default.type === undefined) {
-    return '这是在浏览器环境中';
-  } else {
-    if (_process.default.type === 'browser') {
-      return '这是在 Node.js 环境中';
-    } else {
-      return '这是在 Electron 的渲染进程中';
-    }
-  }
+function getPathWithCWD(dirPath) {
+  const cwd = _process.default.cwd();
+  return _path.default.join(cwd, dirPath);
+}
+function getCurrentNodePath() {
+  return _process.default.env.NODE_PATH || '';
 }

package/lib/utils/utils.process.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.getCurrentProcess = getCurrentProcess;
 exports.getProccessType = getProccessType;
 exports.isInMainProcess = isInMainProcess;
 exports.isInRenderProcess = isInRenderProcess;
@@ -20,4 +21,15 @@ function isInMainProcess() {
 // 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.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 {
+  getPathWithCWD,
+  getCurrentNodePath
+} = require("./utils.path");
+function getAsarNodePath() {
+  const asarRoot = getPathWithCWD('app.asar');
+  const unpackedRoot = asarRoot.replace('app.asar', '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.15",
+  "version": "2.0.0-beta.17",
   "description": "采货侠SaaS版本桌面端sdk",
   "scripts": {
     "start": "zz dev",