hunter-open-sdk 2.0.0-beta.18 → 2.0.0-beta.19

package/lib/abilities/activate/index.js

@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.activate = activate;
 var _webWorker = _interopRequireDefault(require("web-worker"));
 var _url = _interopRequireDefault(require("url"));
-var _utils = require("../../utils/utils.path");
+var _utils = require("../../utils/utils.common");
+var _utils2 = require("../../utils/utils.path");
+var _utils3 = require("../../utils/utils.ability");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class Activate {
   constructor() {
@@ -15,33 +17,24 @@ class Activate {
   }
   worker = null;
   callback = null;
-  exec(params, callback) {
-    this.callback = callback;
+  exec(payload, callback) {
+    this.callback = typeof callback === 'function' ? callback : _utils3.defaultCallback;
     this.worker && this.worker.postMessage({
-      type: 'activate',
-      params
+      payload
     });
   }
   initWorkerListener() {
     this.worker && this.worker.addEventListener('message', event => {
       const {
-        type,
-        data
+        payload
       } = event.data;
-      switch (type) {
-        case 'activateSuccess':
-          this.callback(data);
-          break;
-        case 'activateFail':
-          this.callback(data);
-          break;
-      }
+      this.callback(payload);
       this.callback = null;
     });
   }
   initWorker() {
     if (!this.worker) {
-      const workerPath = new _url.default.URL('file://' + (0, _utils.getCurrentEnvPath)(__dirname, './worker.js'));
+      const workerPath = new _url.default.URL('file://' + (0, _utils2.getCurrentEnvPath)(__dirname, './worker.js'));
       this.worker = new _webWorker.default(workerPath, {
         type: 'module'
       });
@@ -49,6 +42,7 @@ class Activate {
   }
 }
 const entity = new Activate();
-function activate(paramStr, callback) {
-  entity.exec(paramStr, callback);
+function activate(params, callback) {
+  const payload = (0, _utils.parsePayload)(params);
+  entity.exec(payload, callback);
 }

package/lib/abilities/activate/worker.js

@@ -3,28 +3,17 @@
 const {
   initWorkerNodePath
 } = require("../../utils/utils.worker");
+
+// 先注册NodePath后才能正常使用node包，请勿挪动位置
 initWorkerNodePath();
 const {
-  activateCallKit
+  abilityCallKit
 } = require("../../utils/utils.global");
 function onMainMessage(event) {
   const {
-    type,
-    params
+    payload
   } = event.data;
-  switch (type) {
-    case 'activate':
-      {
-        if (!params) {
-          return {
-            code: -1,
-            message: '【activate】方法缺少必要参数'
-          };
-        }
-        const res = activateCallKit(params);
-        postMessage(res);
-        break;
-      }
-  }
+  const res = abilityCallKit('activate', payload);
+  postMessage(res);
 }
 addEventListener('message', onMainMessage);

package/lib/abilities/erase/index.js

@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.erase = erase;
 var _webWorker = _interopRequireDefault(require("web-worker"));
 var _url = _interopRequireDefault(require("url"));
-var _utils = require("../../utils/utils.path");
+var _utils = require("../../utils/utils.common");
+var _utils2 = require("../../utils/utils.path");
+var _utils3 = require("../../utils/utils.ability");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class Erase {
   constructor() {
@@ -15,33 +17,24 @@ class Erase {
   }
   worker = null;
   callback = null;
-  exec(params, callback) {
-    this.callback = callback;
+  exec(payload, callback) {
+    this.callback = typeof callback === 'function' ? callback : _utils3.defaultCallback;
     this.worker && this.worker.postMessage({
-      type: 'erase',
-      params
+      payload
     });
   }
   initWorkerListener() {
     this.worker && this.worker.addEventListener('message', event => {
       const {
-        type,
-        data
+        payload
       } = event.data;
-      switch (type) {
-        case 'eraseSuccess':
-          this.callback(data);
-          break;
-        case 'eraseFail':
-          this.callback(data);
-          break;
-      }
+      this.callback(payload);
       this.callback = null;
     });
   }
   initWorker() {
     if (!this.worker) {
-      const workerPath = new _url.default.URL('file://' + (0, _utils.getCurrentEnvPath)(__dirname, './worker.js'));
+      const workerPath = new _url.default.URL('file://' + (0, _utils2.getCurrentEnvPath)(__dirname, './worker.js'));
       this.worker = new _webWorker.default(workerPath, {
         type: 'module'
       });
@@ -49,6 +42,7 @@ class Erase {
   }
 }
 const entity = new Erase();
-function erase(paramStr, callback) {
-  entity.exec(paramStr, callback);
+function erase(params, callback) {
+  const payload = (0, _utils.parsePayload)(params);
+  entity.exec(payload, callback);
 }

package/lib/abilities/erase/worker.js

@@ -3,28 +3,17 @@
 const {
   initWorkerNodePath
 } = require("../../utils/utils.worker");
+
+// 先注册NodePath后才能正常使用node包，请勿挪动位置
 initWorkerNodePath();
 const {
-  eraseCallKit
+  abilityCallKit
 } = require("../../utils/utils.global");
 function onMainMessage(event) {
   const {
-    type,
-    params
+    payload
   } = event.data;
-  switch (type) {
-    case 'erase':
-      {
-        if (!params) {
-          return {
-            code: -1,
-            message: '【erase】方法缺少必要参数'
-          };
-        }
-        const res = eraseCallKit(params);
-        postMessage(res);
-        break;
-      }
-  }
+  const res = abilityCallKit('erase', payload);
+  postMessage(res);
 }
 addEventListener('message', onMainMessage);

package/lib/{registerEvent → abilities/eventManager}/index.js

@@ -3,19 +3,21 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.UnregisterEvent = exports.RegisterEvent = void 0;
-var _utils = require("../utils/utils.env");
-var _utils2 = require("../utils/utils.common");
-var _winDriver = require("../events/driver/winDriver");
-var _utils3 = require("../utils/utils.global");
-var _deviceHelper = require("../helper/deviceHelper");
-var _utils4 = require("../utils/utils.initDll");
-const usbmux = require('usbmux');
-const path = require('path');
-const request = require('request');
-const fs = require('fs');
-const Sentry = require('@sentry/browser');
-
+exports.unregisterEvent = exports.registerEvent = void 0;
+var _usbmux = _interopRequireDefault(require("usbmux"));
+var _path = _interopRequireDefault(require("path"));
+var _request = _interopRequireDefault(require("request"));
+var _fs = _interopRequireDefault(require("fs"));
+var Sentry = _interopRequireWildcard(require("@sentry/browser"));
+var _utils = require("../../utils/utils.env");
+var _utils2 = require("../../utils/utils.common");
+var _winDriver = require("../../events/driver/winDriver");
+var _utils3 = require("../../utils/utils.global");
+var _deviceHelper = require("../../helper/deviceHelper");
+var _utils4 = require("../../utils/utils.initDll");
+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; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // saas回调
 let saasCallBack;
 
@@ -27,10 +29,10 @@ let usbListener = null;
 const getResourcePath = () => {
   if ((0, _utils.isDev)()) {
     // 开发环境：使用源码目录
-    return path.resolve(__dirname, '../resources');
+    return _path.default.resolve(__dirname, '../resources');
   } else {
     // 生产环境：使用 Electron 的资源路径
-    return path.resolve(process.resourcesPath, 'resources');
+    return _path.default.resolve(process.resourcesPath, 'resources');
   }
 };
 
@@ -139,8 +141,8 @@ const DevicePair = async (udid = '', params) => {
 // 写入dll文件version
 const writeDllVersion = version => {
   const resourcePath = getResourcePath();
-  const versionPath = path.resolve(resourcePath, 'version.online');
-  fs.writeFile(versionPath, version, err => {
+  const versionPath = _path.default.resolve(resourcePath, 'version.online');
+  _fs.default.writeFile(versionPath, version, err => {
     if (err) {
       saasCallBack({
         data: {
@@ -169,13 +171,13 @@ const updateDll = (packageUrl, targetVersion) => {
   const resourcePath = getResourcePath();
   if ((0, _utils.isMac)()) {
     if ((0, _utils.isArm64)()) {
-      dllOutPath = path.resolve(resourcePath, `mac/libinspectionkit_arm64_${targetVersion}.dylib`);
+      dllOutPath = _path.default.resolve(resourcePath, `mac/libinspectionkit_arm64_${targetVersion}.dylib`);
     }
   } else {
-    dllOutPath = path.resolve(resourcePath, `dll/libinspectionkit_x64_${targetVersion}.dll`);
+    dllOutPath = _path.default.resolve(resourcePath, `dll/libinspectionkit_x64_${targetVersion}.dll`);
   }
-  const dllStream = fs.createWriteStream(dllOutPath);
-  request(packageUrl).pipe(dllStream).on('close', function (err) {
+  const dllStream = _fs.default.createWriteStream(dllOutPath);
+  (0, _request.default)(packageUrl).pipe(dllStream).on('close', function (err) {
     if (err) {
       saasCallBack({
         data: {
@@ -290,7 +292,7 @@ const checkAndInstallDriver = () => {
     });
   });
 };
-const RegisterEvent = async (params, callBack) => {
+const registerEvent = async (params, callBack) => {
   saasCallBack = callBack;
 
   // 检查是否需要更新dll
@@ -298,7 +300,7 @@ const RegisterEvent = async (params, callBack) => {
 
   // 在插线之前就检测驱动状态
   await checkAndInstallDriver();
-  usbListener = new usbmux.createListener().on('attached', async udid => {
+  usbListener = new _usbmux.default.createListener().on('attached', async udid => {
     if (!udid) return;
     // 插入设备通知
     saasCallBack({
@@ -328,9 +330,9 @@ const RegisterEvent = async (params, callBack) => {
     throw new Error(errMsg);
   });
 };
-exports.RegisterEvent = RegisterEvent;
-const UnregisterEvent = () => {
+exports.registerEvent = registerEvent;
+const unregisterEvent = () => {
   usbListener && usbListener.destroy();
   _deviceHelper.deviceHelper.clearUdidList();
 };
-exports.UnregisterEvent = UnregisterEvent;
+exports.unregisterEvent = unregisterEvent;

package/lib/{getAndroidSn → abilities/getAndroidSn}/index.js

@@ -3,12 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.UnregisterAndroidSn = exports.GetAndroidSn = void 0;
+exports.unregisterGetAndroidSn = exports.registerGetAndroidSn = void 0;
 var _usb = require("usb");
-var _utils = require("../utils/utils.env");
-var _utils2 = require("../utils/utils.sn");
-const childProcess = require('child_process');
-const exec = childProcess.exec;
+var _child_process = _interopRequireDefault(require("child_process"));
+var _utils = require("../../utils/utils.env");
+var _utils2 = require("../../utils/utils.sn");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const exec = _child_process.default.exec;
 let hadRegisterUsb = false; // 是否已经注册过usb事件
 let isPause = false; // 是否暂停获取sn
 
@@ -117,7 +118,7 @@ const getWinSn = async (device, callBack) => {
  * @param {Object} params - 参数
  * @param {Function} callBack - 回调函数
  */
-const GetAndroidSn = (params, callBack) => {
+const registerGetAndroidSn = (params, callBack) => {
   if (hadRegisterUsb) {
     isPause = false;
     return;
@@ -157,8 +158,8 @@ const GetAndroidSn = (params, callBack) => {
     }
   });
 };
-exports.GetAndroidSn = GetAndroidSn;
-const UnregisterAndroidSn = () => {
+exports.registerGetAndroidSn = registerGetAndroidSn;
+const unregisterGetAndroidSn = () => {
   isPause = true;
 };
-exports.UnregisterAndroidSn = UnregisterAndroidSn;
+exports.unregisterGetAndroidSn = unregisterGetAndroidSn;

package/lib/abilities/getGeneralReport/index.js

@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.getGeneralReport = getGeneralReport;
 var _webWorker = _interopRequireDefault(require("web-worker"));
 var _url = _interopRequireDefault(require("url"));
-var _utils = require("../../utils/utils.path");
+var _utils = require("../../utils/utils.common");
+var _utils2 = require("../../utils/utils.path");
+var _utils3 = require("../../utils/utils.ability");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class GetGeneralReport {
   constructor() {
@@ -15,33 +17,24 @@ class GetGeneralReport {
   }
   worker = null;
   callback = null;
-  exec(params, callback) {
-    this.callback = callback;
+  exec(payload, callback) {
+    this.callback = typeof callback === 'function' ? callback : _utils3.defaultCallback;
     this.worker && this.worker.postMessage({
-      type: 'getGeneralReport',
-      params
+      payload
     });
   }
   initWorkerListener() {
     this.worker && this.worker.addEventListener('message', event => {
       const {
-        type,
-        data
+        payload
       } = event.data;
-      switch (type) {
-        case 'getGeneralReportSuccess':
-          this.callback(data);
-          break;
-        case 'getGeneralReportFail':
-          this.callback(data);
-          break;
-      }
+      this.callback(payload);
       this.callback = null;
     });
   }
   initWorker() {
     if (!this.worker) {
-      const workerPath = new _url.default.URL('file://' + (0, _utils.getCurrentEnvPath)(__dirname, './worker.js'));
+      const workerPath = new _url.default.URL('file://' + (0, _utils2.getCurrentEnvPath)(__dirname, './worker.js'));
       this.worker = new _webWorker.default(workerPath, {
         type: 'module'
       });
@@ -50,5 +43,6 @@ class GetGeneralReport {
 }
 const entity = new GetGeneralReport();
 function getGeneralReport(params, callback) {
-  entity.exec(params, callback);
+  const payload = (0, _utils.parsePayload)(params);
+  entity.exec(payload, callback);
 }

package/lib/abilities/getGeneralReport/worker.js

@@ -3,9 +3,11 @@
 const {
   initWorkerNodePath
 } = require("../../utils/utils.worker");
+
+// 先注册NodePath后才能正常使用node包，请勿挪动位置
 initWorkerNodePath();
 const {
-  getGeneralReportCallKit
+  abilityCallKit
 } = require("../../utils/utils.global");
 const MAX_RETRY_COUNT = 3;
 const RETRY_INTERVAL = 300;
@@ -13,39 +15,24 @@ const RETRY_INTERVAL = 300;
 // 处理主进程消息
 function onMainMessage(event, retryCount = 0) {
   const {
-    type,
-    params
+    payload
   } = event.data;
-  switch (type) {
-    case 'getGeneralReport':
-      {
-        if (!params) {
-          return {
-            code: -1,
-            message: '【getGeneralReport】方法缺少必要参数'
-          };
-        }
-        const reportRes = getGeneralReportCallKit(params);
-        console.log(`第${retryCount + 1}次获取报告：`, reportRes);
-        const {
-          data: {
-            code
-          } = {}
-        } = reportRes;
+  const reportRes = abilityCallKit('general_report', payload);
+  const {
+    payload: {
+      code
+    } = {}
+  } = reportRes;
 
-        // 如果获取报告失败，则重试一次
-        if (code !== 0 && retryCount < MAX_RETRY_COUNT) {
-          retryCount++;
-          setTimeout(() => {
-            onMainMessage(event, retryCount);
-          }, retryCount * RETRY_INTERVAL);
-          break;
-        }
-        postMessage(reportRes);
-        break;
-      }
-    default:
-      break;
+  // 如果获取报告失败，则重试一次
+  if (code !== 0 && retryCount < MAX_RETRY_COUNT) {
+    retryCount++;
+    console.log(`获取报告失败，重试次数：${retryCount}/${MAX_RETRY_COUNT}`);
+    setTimeout(() => {
+      onMainMessage(event, retryCount);
+    }, retryCount * RETRY_INTERVAL);
+    return;
   }
+  postMessage(reportRes);
 }
 addEventListener('message', onMainMessage);

package/lib/abilities/getSaaSReport/index.js

@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.getSaaSReport = getSaaSReport;
 var _webWorker = _interopRequireDefault(require("web-worker"));
 var _url = _interopRequireDefault(require("url"));
-var _utils = require("../../utils/utils.path");
+var _utils = require("../../utils/utils.common");
+var _utils2 = require("../../utils/utils.path");
+var _utils3 = require("../../utils/utils.ability");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class GetSaaSReport {
   constructor() {
@@ -15,33 +17,24 @@ class GetSaaSReport {
   }
   worker = null;
   callback = null;
-  exec(params, callback) {
-    this.callback = callback;
+  exec(payload, callback) {
+    this.callback = typeof callback === 'function' ? callback : _utils3.defaultCallback;
     this.worker && this.worker.postMessage({
-      type: 'getSaaSReport',
-      params
+      payload
     });
   }
   initWorkerListener() {
     this.worker && this.worker.addEventListener('message', event => {
       const {
-        type,
-        data
+        payload
       } = event.data;
-      switch (type) {
-        case 'getSaaSReportSuccess':
-          this.callback(data);
-          break;
-        case 'getSaaSReportFail':
-          this.callback(data);
-          break;
-      }
+      this.callback(payload);
       this.callback = null;
     });
   }
   initWorker() {
     if (!this.worker) {
-      const workerPath = new _url.default.URL('file://' + (0, _utils.getCurrentEnvPath)(__dirname, './worker.js'));
+      const workerPath = new _url.default.URL('file://' + (0, _utils2.getCurrentEnvPath)(__dirname, './worker.js'));
       this.worker = new _webWorker.default(workerPath, {
         type: 'module'
       });
@@ -50,5 +43,6 @@ class GetSaaSReport {
 }
 const entity = new GetSaaSReport();
 function getSaaSReport(params, callback) {
-  entity.exec(params, callback);
+  const payload = (0, _utils.parsePayload)(params);
+  entity.exec(payload, callback);
 }

package/lib/abilities/getSaaSReport/worker.js

@@ -3,24 +3,19 @@
 const {
   initWorkerNodePath
 } = require("../../utils/utils.worker");
+
+// 先注册NodePath后才能正常使用node包，请勿挪动位置
 initWorkerNodePath();
 const {
-  getSaaSReportCallKit
+  abilityCallKit
 } = require("../../utils/utils.global");
 
 // 处理主进程消息
 function onMainMessage(event) {
   const {
-    type,
-    params
+    payload
   } = event.data;
-  switch (type) {
-    case 'getSaaSReport':
-      const reportRes = getSaaSReportCallKit(params);
-      postMessage(reportRes);
-      break;
-    default:
-      break;
-  }
+  const res = abilityCallKit('saas_report', payload);
+  postMessage(res);
 }
 addEventListener('message', onMainMessage);

package/lib/abilities/installApp/index.js

@@ -0,0 +1,48 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.installApp = installApp;
+var _webWorker = _interopRequireDefault(require("web-worker"));
+var _url = _interopRequireDefault(require("url"));
+var _utils = require("../../utils/utils.common");
+var _utils2 = require("../../utils/utils.path");
+var _utils3 = require("../../utils/utils.ability");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+class InstallApp {
+  constructor() {
+    this.initWorker();
+    this.initWorkerListener();
+  }
+  worker = null;
+  callback = null;
+  exec(payload, callback) {
+    this.callback = typeof callback === 'function' ? callback : _utils3.defaultCallback;
+    this.worker && this.worker.postMessage({
+      payload
+    });
+  }
+  initWorkerListener() {
+    this.worker && this.worker.addEventListener('message', event => {
+      const {
+        payload
+      } = event.data;
+      this.callback(payload);
+      this.callback = null;
+    });
+  }
+  initWorker() {
+    if (!this.worker) {
+      const workerPath = new _url.default.URL('file://' + (0, _utils2.getCurrentEnvPath)(__dirname, './worker.js'));
+      this.worker = new _webWorker.default(workerPath, {
+        type: 'module'
+      });
+    }
+  }
+}
+const entity = new InstallApp();
+function installApp(params, callback) {
+  const payload = (0, _utils.parsePayload)(params);
+  entity.exec(payload, callback);
+}

package/lib/abilities/installApp/worker.js

@@ -0,0 +1,19 @@
+"use strict";
+
+const {
+  initWorkerNodePath
+} = require("../../utils/utils.worker");
+
+// 先注册NodePath后才能正常使用node包，请勿挪动位置
+initWorkerNodePath();
+const {
+  abilityCallKit
+} = require("../../utils/utils.global");
+function onMainMessage(event) {
+  const {
+    payload
+  } = event.data;
+  const res = abilityCallKit('install_app', payload);
+  postMessage(res);
+}
+addEventListener('message', onMainMessage);