hunter-open-sdk 2.0.0-beta.12 → 2.0.0-beta.14

package/lib/abilities/activate/index.js

@@ -43,7 +43,7 @@ class Activate {
     if (!this.worker) {
       const workerPath = new _url.default.URL('file://' + (0, _utils.getCurrentEnvPath)(__dirname, './worker.js'));
       this.worker = new _webWorker.default(workerPath, {
-        type: "module"
+        type: 'module'
       });
     }
   }

package/lib/abilities/erase/index.js

@@ -43,7 +43,7 @@ class Erase {
     if (!this.worker) {
       const workerPath = new _url.default.URL('file://' + (0, _utils.getCurrentEnvPath)(__dirname, './worker.js'));
       this.worker = new _webWorker.default(workerPath, {
-        type: "module"
+        type: 'module'
       });
     }
   }

package/lib/abilities/getGeneralReport/index.js

@@ -43,7 +43,7 @@ class GetGeneralReport {
     if (!this.worker) {
       const workerPath = new _url.default.URL('file://' + (0, _utils.getCurrentEnvPath)(__dirname, './worker.js'));
       this.worker = new _webWorker.default(workerPath, {
-        type: "module"
+        type: 'module'
       });
     }
   }

package/lib/abilities/getGeneralReport/worker.js

@@ -1,8 +1,11 @@
 "use strict";
 
 var _utils = require("../../utils/utils.global");
+const MAX_RETRY_COUNT = 3;
+const RETRY_INTERVAL = 300;
+
 // 处理主进程消息
-function onMainMessage(event) {
+function onMainMessage(event, retryCount = 0) {
   const {
     type,
     params
@@ -17,6 +20,21 @@ function onMainMessage(event) {
           };
         }
         const reportRes = (0, _utils.getGeneralReportCallKit)(params);
+        console.log(`第${retryCount + 1}次获取报告：`, reportRes);
+        const {
+          data: {
+            code
+          } = {}
+        } = reportRes;
+
+        // 如果获取报告失败，则重试一次
+        if (code !== 0 && retryCount < MAX_RETRY_COUNT) {
+          retryCount++;
+          setTimeout(() => {
+            onMainMessage(event, retryCount);
+          }, retryCount * RETRY_INTERVAL);
+          break;
+        }
         postMessage(reportRes);
         break;
       }

package/lib/abilities/getSaaSReport/index.js

@@ -43,7 +43,7 @@ class GetSaaSReport {
     if (!this.worker) {
       const workerPath = new _url.default.URL('file://' + (0, _utils.getCurrentEnvPath)(__dirname, './worker.js'));
       this.worker = new _webWorker.default(workerPath, {
-        type: "module"
+        type: 'module'
       });
     }
   }

package/lib/abilities/skip/index.js

@@ -43,7 +43,7 @@ class Skip {
     if (!this.worker) {
       const workerPath = new _url.default.URL('file://' + (0, _utils.getCurrentEnvPath)(__dirname, './worker.js'));
       this.worker = new _webWorker.default(workerPath, {
-        type: "module"
+        type: 'module'
       });
     }
   }

package/lib/events/driver/service.js

@@ -24,9 +24,9 @@ class Service {
       (0, _winDriver.checkHasDriver)().then(res => {
         console.log('------------checkHasDriver', res);
         if (res) {
-          mainWindow.webContents.send("checkDriver", true);
+          mainWindow.webContents.send('checkDriver', true);
         } else {
-          mainWindow.webContents.send("checkDriver", false);
+          mainWindow.webContents.send('checkDriver', false);
           (0, _winDriver.downloadDriver)(mainWindow);
         }
       });

package/lib/events/driver/winDriver.js

@@ -12,7 +12,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // import { app } from 'electron'
 // import { command } from '../../utils/utils.command'
 
-const Sentry = require("@sentry/browser");
+const Sentry = require('@sentry/browser');
 const sudo = require('sudo-prompt');
 const path = require('path');
 const fs = require('fs');

package/lib/index.js

@@ -11,9 +11,9 @@ var _getGeneralReport = require("./abilities/getGeneralReport");
 var _erase = require("./abilities/erase");
 var _activate = require("./abilities/activate");
 var _skip = require("./abilities/skip");
-const Sentry = require("@sentry/browser");
+const Sentry = require('@sentry/browser');
 Sentry.init({
-  dsn: "https://8a5296c59083430fbac0756f56ddbf5d@sentry.zhuanzhuan.com/2300",
+  dsn: 'https://8a5296c59083430fbac0756f56ddbf5d@sentry.zhuanzhuan.com/2300',
   tracesSampleRate: 1.0
 });
 console.log('Sentry initialized');

package/lib/registerEvent/index.js

@@ -12,9 +12,9 @@ var _deviceHelper = require("../helper/deviceHelper");
 var _utils4 = require("../utils/utils.initDll");
 const usbmux = require('usbmux');
 const path = require('path');
-const request = require("request");
+const request = require('request');
 const fs = require('fs');
-const Sentry = require("@sentry/browser");
+const Sentry = require('@sentry/browser');
 
 // saas回调
 let saasCallBack;
@@ -55,7 +55,7 @@ const publishPair = (udid = '', params) => {
 /**
  * 获取信任状态
  * @param {String} udid 设备id
- * @returns 
+ * @returns
  */
 const getTrustStatus = async (udid = '', params, once = false) => {
   if (!_deviceHelper.deviceHelper.hasUdid(udid)) {
@@ -63,14 +63,21 @@ const getTrustStatus = async (udid = '', params, once = false) => {
     return false;
   }
 
-  // 通过调用 trust_status 来判断信任状态
-  const kitParamsObj = JSON.parse(params);
-
   // 合并参数
-  Object.assign(kitParamsObj, {
-    cmd: 'trust_status',
+  const paramsObj = Object.assign(JSON.parse(params), {
     udid
   });
+  let label = 'Windows';
+  if ((0, _utils.isMac)()) {
+    label = 'Mac';
+  }
+
+  // 通过调用 trust_status 来判断信任状态
+  const kitParamsObj = {
+    cmd: 'trust_status',
+    label,
+    params: JSON.stringify(paramsObj)
+  };
 
   // 获取信任状态
   const trustStatusRes = (0, _utils3.callHunterInspectionKit)('TheForceKit', JSON.stringify(kitParamsObj));
@@ -96,7 +103,7 @@ const getTrustStatusOnce = async (udid, params) => {
 /**
  * 配对并获取信任状态
  * @param {String} udid 设备id
- * @returns 
+ * @returns
  */
 const DevicePair = async (udid = '', params) => {
   const callBack = () => {
@@ -168,7 +175,7 @@ const updateDll = (packageUrl, targetVersion) => {
     dllOutPath = path.resolve(resourcePath, `dll/libinspectionkit_x64_${targetVersion}.dll`);
   }
   const dllStream = fs.createWriteStream(dllOutPath);
-  request(packageUrl).pipe(dllStream).on("close", function (err) {
+  request(packageUrl).pipe(dllStream).on('close', function (err) {
     if (err) {
       saasCallBack({
         data: {
@@ -186,7 +193,7 @@ const updateDll = (packageUrl, targetVersion) => {
 /**
  * 更新下载dll文件 并重写本地版本号
  * @param {String} udid 设备id
- * @returns 
+ * @returns
  */
 const updateDllFileCheck = () => {
   // mac的amd不支持更新

package/lib/resources/version.online

@@ -1 +1 @@
-0.2.0
+0.2.1

package/lib/utils/utils.global.js

@@ -9,7 +9,7 @@ var _utils = require("../utils/utils.initDll");
  * 全局对象兼容性处理工具
  * 兼容Electron主进程(global)和渲染进程(window)环境
  */
-const Sentry = require("@sentry/browser");
+const Sentry = require('@sentry/browser');
 /**
  * 获取全局对象
  * @returns {Object} 全局对象

package/lib/utils/utils.initDll.js

@@ -14,7 +14,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * 声明dll函数
  * @param {String} udid 设备id
- * @returns 
+ * @returns
  */
 
 const initHunterInspectionKit = () => {

package/package.json

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