hunter-open-sdk 2.0.0-beta.8 → 2.0.0-beta.9

package/lib/abilities/activate/index.js

@@ -1,13 +1,13 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.activate = activate;
 var _webWorker = _interopRequireDefault(require("web-worker"));
-var _path = _interopRequireDefault(require("path"));
 var _url = _interopRequireDefault(require("url"));
+var _utils = require("../../utils/utils.path");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class Activate {
   constructor() {
     this.initWorker();
@@ -15,13 +15,11 @@ class Activate {
   }
   worker = null;
   callback = null;
-  exec(paramStr, callback) {
+  exec(params, callback) {
     this.callback = callback;
     this.worker && this.worker.postMessage({
       type: 'activate',
-      payload: {
-        paramStr
-      }
+      params
     });
   }
   initWorkerListener() {
@@ -43,7 +41,7 @@ class Activate {
   }
   initWorker() {
     if (!this.worker) {
-      const workerPath = new _url.default.URL('file://' + _path.default.resolve(__dirname, "./worker.js"));
+      const workerPath = new _url.default.URL('file://' + (0, _utils.getCurrentEnvPath)(__dirname, './worker.js'));
       this.worker = new _webWorker.default(workerPath, {
         type: "module"
       });

package/lib/abilities/activate/worker.js

@@ -1,26 +1,21 @@
 "use strict";
 
-const {
-  activateCallKit
-} = require("../../utils/utils.global");
+var _utils = require("../../utils/utils.global");
 function onMainMessage(event) {
   const {
     type,
-    payload
+    params
   } = event.data;
   switch (type) {
     case 'activate':
       {
-        const {
-          paramStr
-        } = payload || {};
-        if (!paramStr) {
+        if (!params) {
           return {
             code: -1,
             message: '【activate】方法缺少必要参数'
           };
         }
-        const res = activateCallKit(paramStr);
+        const res = (0, _utils.activateCallKit)(params);
         postMessage(res);
         break;
       }

package/lib/abilities/erase/index.js

@@ -1,13 +1,13 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.erase = erase;
 var _webWorker = _interopRequireDefault(require("web-worker"));
-var _path = _interopRequireDefault(require("path"));
 var _url = _interopRequireDefault(require("url"));
+var _utils = require("../../utils/utils.path");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class Erase {
   constructor() {
     this.initWorker();
@@ -15,13 +15,11 @@ class Erase {
   }
   worker = null;
   callback = null;
-  exec(paramStr, callback) {
+  exec(params, callback) {
     this.callback = callback;
     this.worker && this.worker.postMessage({
       type: 'erase',
-      payload: {
-        paramStr
-      }
+      params
     });
   }
   initWorkerListener() {
@@ -43,7 +41,7 @@ class Erase {
   }
   initWorker() {
     if (!this.worker) {
-      const workerPath = new _url.default.URL('file://' + _path.default.resolve(__dirname, "./worker.js"));
+      const workerPath = new _url.default.URL('file://' + (0, _utils.getCurrentEnvPath)(__dirname, './worker.js'));
       this.worker = new _webWorker.default(workerPath, {
         type: "module"
       });

package/lib/abilities/erase/worker.js

@@ -1,26 +1,21 @@
 "use strict";
 
-const {
-  eraseCallKit
-} = require("../../utils/utils.global");
+var _utils = require("../../utils/utils.global");
 function onMainMessage(event) {
   const {
     type,
-    payload
+    params
   } = event.data;
   switch (type) {
     case 'erase':
       {
-        const {
-          paramStr
-        } = payload || {};
-        if (!paramStr) {
+        if (!params) {
           return {
             code: -1,
             message: '【erase】方法缺少必要参数'
           };
         }
-        const res = eraseCallKit(paramStr);
+        const res = (0, _utils.eraseCallKit)(params);
         postMessage(res);
         break;
       }

package/lib/abilities/getGeneralReport/index.js

@@ -1,13 +1,13 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getGeneralReport = getGeneralReport;
 var _webWorker = _interopRequireDefault(require("web-worker"));
-var _path = _interopRequireDefault(require("path"));
 var _url = _interopRequireDefault(require("url"));
+var _utils = require("../../utils/utils.path");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class GetGeneralReport {
   constructor() {
     this.initWorker();
@@ -41,7 +41,7 @@ class GetGeneralReport {
   }
   initWorker() {
     if (!this.worker) {
-      const workerPath = new _url.default.URL('file://' + _path.default.resolve(__dirname, "./worker.js"));
+      const workerPath = new _url.default.URL('file://' + (0, _utils.getCurrentEnvPath)(__dirname, './worker.js'));
       this.worker = new _webWorker.default(workerPath, {
         type: "module"
       });

package/lib/abilities/getSaaSReport/index.js

@@ -1,13 +1,13 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getSaaSReport = getSaaSReport;
 var _webWorker = _interopRequireDefault(require("web-worker"));
-var _path = _interopRequireDefault(require("path"));
 var _url = _interopRequireDefault(require("url"));
+var _utils = require("../../utils/utils.path");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class GetSaaSReport {
   constructor() {
     this.initWorker();
@@ -41,7 +41,7 @@ class GetSaaSReport {
   }
   initWorker() {
     if (!this.worker) {
-      const workerPath = new _url.default.URL('file://' + _path.default.resolve(__dirname, "./worker.js"));
+      const workerPath = new _url.default.URL('file://' + (0, _utils.getCurrentEnvPath)(__dirname, './worker.js'));
       this.worker = new _webWorker.default(workerPath, {
         type: "module"
       });

package/lib/abilities/skip/index.js

@@ -1,13 +1,13 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.skip = skip;
 var _webWorker = _interopRequireDefault(require("web-worker"));
-var _path = _interopRequireDefault(require("path"));
 var _url = _interopRequireDefault(require("url"));
+var _utils = require("../../utils/utils.path");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class Skip {
   constructor() {
     this.initWorker();
@@ -15,13 +15,11 @@ class Skip {
   }
   worker = null;
   callback = null;
-  exec(paramStr, callback) {
+  exec(params, callback) {
     this.callback = callback;
     this.worker && this.worker.postMessage({
       type: 'skip',
-      payload: {
-        paramStr
-      }
+      params
     });
   }
   initWorkerListener() {
@@ -43,7 +41,7 @@ class Skip {
   }
   initWorker() {
     if (!this.worker) {
-      const workerPath = new _url.default.URL('file://' + _path.default.resolve(__dirname, "./worker.js"));
+      const workerPath = new _url.default.URL('file://' + (0, _utils.getCurrentEnvPath)(__dirname, './worker.js'));
       this.worker = new _webWorker.default(workerPath, {
         type: "module"
       });

package/lib/abilities/skip/worker.js

@@ -1,26 +1,21 @@
 "use strict";
 
-const {
-  skipCallKit
-} = require("../../utils/utils.global");
+var _utils = require("../../utils/utils.global");
 function onMainMessage(event) {
   const {
     type,
-    payload
+    params
   } = event.data;
   switch (type) {
     case 'skip':
       {
-        const {
-          paramStr
-        } = payload || {};
-        if (!paramStr) {
+        if (!params) {
           return {
             code: -1,
             message: '【skip】方法缺少必要参数'
           };
         }
-        const res = skipCallKit(paramStr);
+        const res = (0, _utils.skipCallKit)(params);
         postMessage(res);
         break;
       }

package/lib/events/driver/winDriver.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,6 +8,7 @@ exports.downloadDriver = downloadDriver;
 var _utils = require("../../utils/utils.env");
 var _request = _interopRequireDefault(require("request"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // import { app } from 'electron'
 // import { command } from '../../utils/utils.command'
 

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
 });
@@ -10,6 +9,8 @@ var _path = _interopRequireDefault(require("path"));
 var _fs = _interopRequireDefault(require("fs"));
 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
@@ -34,7 +35,7 @@ const initHunterInspectionKit = () => {
   }
   if (!(0, _utils.isDev)()) {
     // 如果是生产模式 则替换app.asar 路径 为了在生产调用dll
-    dllPath = dllPath.replace('app.asar', 'app.asar.unpacked');
+    dllPath = (0, _utils3.getCurrentEnvPath)(dllPath);
   }
   const dllLib = _koffi.default.load(dllPath);
   const dllKit = {

package/lib/utils/utils.path.js

@@ -3,15 +3,32 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.currentEnvPath = void 0;
-const path = require('path');
-
+exports.getCurrentEnvPath = getCurrentEnvPath;
+exports.getCurrentProcess = getCurrentProcess;
+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
  * @returns
  */
-const currentEnvPath = filePath => {
-  return path.resolve(__dirname, filePath);
-};
-exports.currentEnvPath = currentEnvPath;
+function getCurrentEnvPath(dirPath, filePath = '') {
+  let fixPath = dirPath;
+  if (!(0, _utils.isDev)()) {
+    fixPath = fixPath.replace('/app.asar/', '/app.asar.unpacked/');
+  }
+  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 的渲染进程中';
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hunter-open-sdk",
-  "version": "2.0.0-beta.8",
+  "version": "2.0.0-beta.9",
   "description": "采货侠SaaS版本桌面端sdk",
   "scripts": {
     "start": "zz dev",
@@ -39,7 +39,6 @@
     "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,11 +52,10 @@
     "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",
-    "minimatch": "3.0.0",
-    "core-js": "3.6.5"
+    "typescript": "4.7.4"
   },
   "config": {
     "commitizen": {