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

package/lib/abilities/activate/index.js

@@ -27,11 +27,15 @@ class Activate {
   initWorkerListener() {
     this.worker && this.worker.addEventListener('message', event => {
       const {
-        type
-      } = event?.data || {};
+        type,
+        data
+      } = event.data;
       switch (type) {
-        case 'activate':
-          typeof this.callback === 'function' && this.callback(event);
+        case 'activateSuccess':
+          this.callback(data);
+          break;
+        case 'activateFail':
+          this.callback(data);
           break;
       }
       this.callback = null;

package/lib/abilities/activate/worker.js

@@ -1,16 +1,13 @@
 "use strict";
 
 const {
-  callHunterInspectionKit
+  activateCallKit
 } = require("../../utils/utils.global");
 function onMainMessage(event) {
   const {
     type,
     payload
   } = event.data;
-  const workerResData = {
-    type
-  };
   switch (type) {
     case 'activate':
       {
@@ -23,16 +20,8 @@ function onMainMessage(event) {
             message: '【activate】方法缺少必要参数'
           };
         }
-        const res = callHunterInspectionKit('InspectionKit', paramStr, 'activate', paramStr);
-        const resObj = JSON.parse(res || '{}');
-        const {
-          Code,
-          Message
-        } = resObj || {};
-        postMessage(Object.assign(workerResData, {
-          code: Code,
-          message: Message
-        }));
+        const res = activateCallKit(paramStr);
+        postMessage(res);
         break;
       }
   }

package/lib/abilities/erase/index.js

@@ -27,11 +27,15 @@ class Erase {
   initWorkerListener() {
     this.worker && this.worker.addEventListener('message', event => {
       const {
-        type
-      } = event?.data || {};
+        type,
+        data
+      } = event.data;
       switch (type) {
-        case 'erase':
-          typeof this.callback === 'function' && this.callback(event);
+        case 'eraseSuccess':
+          this.callback(data);
+          break;
+        case 'eraseFail':
+          this.callback(data);
           break;
       }
       this.callback = null;

package/lib/abilities/erase/worker.js

@@ -1,16 +1,13 @@
 "use strict";
 
 const {
-  callHunterInspectionKit
+  eraseCallKit
 } = require("../../utils/utils.global");
 function onMainMessage(event) {
   const {
     type,
     payload
   } = event.data;
-  const workerResData = {
-    type
-  };
   switch (type) {
     case 'erase':
       {
@@ -23,16 +20,8 @@ function onMainMessage(event) {
             message: '【erase】方法缺少必要参数'
           };
         }
-        const res = callHunterInspectionKit('InspectionKit', paramStr, 'erase', paramStr);
-        const resObj = JSON.parse(res || '{}');
-        const {
-          Code,
-          Message
-        } = resObj || {};
-        postMessage(Object.assign(workerResData, {
-          code: Code,
-          message: Message
-        }));
+        const res = eraseCallKit(paramStr);
+        postMessage(res);
         break;
       }
   }

package/lib/abilities/getGeneralReport/index.js

@@ -16,7 +16,6 @@ class GetGeneralReport {
   worker = null;
   callback = null;
   exec(params, callback) {
-    console.log('GetGeneralReport exec params => ', params);
     this.callback = callback;
     this.worker && this.worker.postMessage({
       type: 'getGeneralReport',
@@ -25,7 +24,6 @@ class GetGeneralReport {
   }
   initWorkerListener() {
     this.worker && this.worker.addEventListener('message', event => {
-      console.log('main onmessage event.data', event.data);
       const {
         type,
         data

package/lib/abilities/getGeneralReport/worker.js

@@ -3,7 +3,6 @@
 var _utils = require("../../utils/utils.global");
 // 处理主进程消息
 function onMainMessage(event) {
-  console.log('worker onMainMessage getGeneralReport event.data =>', event.data);
   const {
     type,
     params

package/lib/abilities/getSaaSReport/index.js

@@ -16,7 +16,6 @@ class GetSaaSReport {
   worker = null;
   callback = null;
   exec(params, callback) {
-    console.log('GetSaaSReport exec params => ', params);
     this.callback = callback;
     this.worker && this.worker.postMessage({
       type: 'getSaaSReport',
@@ -25,7 +24,6 @@ class GetSaaSReport {
   }
   initWorkerListener() {
     this.worker && this.worker.addEventListener('message', event => {
-      console.log('main onmessage event.data', event.data);
       const {
         type,
         data

package/lib/abilities/getSaaSReport/worker.js

@@ -3,7 +3,6 @@
 var _utils = require("../../utils/utils.global");
 // 处理主进程消息
 function onMainMessage(event) {
-  console.log('worker onMainMessage getSaaSReport event.data =>', event.data);
   const {
     type,
     params

package/lib/abilities/skip/index.js

@@ -27,11 +27,15 @@ class Skip {
   initWorkerListener() {
     this.worker && this.worker.addEventListener('message', event => {
       const {
-        type
-      } = event?.data || {};
+        type,
+        data
+      } = event.data;
       switch (type) {
-        case 'skip':
-          typeof this.callback === 'function' && this.callback(event);
+        case 'skipSuccess':
+          this.callback(data);
+          break;
+        case 'skipFail':
+          this.callback(data);
           break;
       }
       this.callback = null;

package/lib/abilities/skip/worker.js

@@ -1,16 +1,13 @@
 "use strict";
 
 const {
-  callHunterInspectionKit
+  skipCallKit
 } = require("../../utils/utils.global");
 function onMainMessage(event) {
   const {
     type,
     payload
   } = event.data;
-  const workerResData = {
-    type
-  };
   switch (type) {
     case 'skip':
       {
@@ -23,16 +20,8 @@ function onMainMessage(event) {
             message: '【skip】方法缺少必要参数'
           };
         }
-        const res = callHunterInspectionKit('InspectionKit', paramStr, 'skip', paramStr);
-        const resObj = JSON.parse(res || '{}');
-        const {
-          Code,
-          Message
-        } = resObj || {};
-        postMessage(Object.assign(workerResData, {
-          code: Code,
-          message: Message
-        }));
+        const res = skipCallKit(paramStr);
+        postMessage(res);
         break;
       }
   }

package/lib/events/driver/service.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _utils = require("../../utils/utils");
+var _utils = require("../../utils/utils.env");
 var _command = require("./command");
 var _winDriver = require("./winDriver");
 const path = require('path');

package/lib/events/driver/winDriver.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.checkHasDriver = checkHasDriver;
 exports.downloadDriver = downloadDriver;
-var _utils = require("../../utils/utils");
+var _utils = require("../../utils/utils.env");
 var _request = _interopRequireDefault(require("request"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 // import { app } from 'electron'

package/lib/getAndroidSn/index.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.UnregisterAndroidSn = exports.GetAndroidSn = void 0;
 var _usb = require("usb");
-var _utils = require("../utils/utils");
+var _utils = require("../utils/utils.env");
 var _utils2 = require("../utils/utils.sn");
 const childProcess = require('child_process');
 const exec = childProcess.exec;

package/lib/index.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _registerEvent = require("./registerEvent");
 var _getAndroidSn = require("./getAndroidSn");
-var _utils = require("./utils/utils.global");
 var _getSaaSReport = require("./abilities/getSaaSReport");
 var _getGeneralReport = require("./abilities/getGeneralReport");
 var _erase = require("./abilities/erase");
@@ -24,7 +23,6 @@ var _default = exports.default = {
   unregisterEvent: _registerEvent.UnregisterEvent,
   getAndroidSn: _getAndroidSn.GetAndroidSn,
   unregisterAndroidSn: _getAndroidSn.UnregisterAndroidSn,
-  getUdidList: _utils.getUdidListCallKit,
   getSaaSReport: _getSaaSReport.getSaaSReport,
   getGeneralReport: _getGeneralReport.getGeneralReport,
   erase: _erase.erase,

package/lib/registerEvent/index.js

@@ -4,11 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.UnregisterEvent = exports.RegisterEvent = void 0;
-var _utils = require("../utils/utils");
+var _utils = require("../utils/utils.env");
+var _utils2 = require("../utils/utils.common");
 var _winDriver = require("../events/driver/winDriver");
-var _utils2 = require("../utils/utils.global");
+var _utils3 = require("../utils/utils.global");
 var _deviceHelper = require("../helper/deviceHelper");
-var _utils3 = require("../utils/utils.initDll");
+var _utils4 = require("../utils/utils.initDll");
 const usbmux = require('usbmux');
 const path = require('path');
 const request = require("request");
@@ -48,7 +49,7 @@ const publishPair = (udid = '', params) => {
     cmd: 'publish_pair',
     udid
   });
-  return (0, _utils2.callHunterInspectionKit)('TheForceKit', JSON.stringify(kitParamsObj));
+  return (0, _utils3.callHunterInspectionKit)('TheForceKit', JSON.stringify(kitParamsObj));
 };
 
 /**
@@ -72,7 +73,7 @@ const getTrustStatus = async (udid = '', params, once = false) => {
   });
 
   // 获取信任状态
-  const trustStatusRes = (0, _utils2.callHunterInspectionKit)('TheForceKit', JSON.stringify(kitParamsObj));
+  const trustStatusRes = (0, _utils3.callHunterInspectionKit)('TheForceKit', JSON.stringify(kitParamsObj));
   if (trustStatusRes) {
     const trustStatusResObj = JSON.parse(trustStatusRes);
     const {
@@ -82,7 +83,7 @@ const getTrustStatus = async (udid = '', params, once = false) => {
     if (Code == 0 && (Data.imei || Data.serialNumber)) {
       return Data;
     } else if (!once) {
-      await (0, _utils.sleep)();
+      await (0, _utils2.sleep)();
       return await getTrustStatus(udid, params);
     }
   }
@@ -144,7 +145,7 @@ const writeDllVersion = version => {
     }
     console.log('========写入version成功');
     // 写入成功后 重新初始化dll
-    (0, _utils3.initHunterInspectionKit)();
+    (0, _utils4.initHunterInspectionKit)();
     saasCallBack({
       data: {
         eventName: 'type_update_result',
@@ -195,7 +196,7 @@ const updateDllFileCheck = () => {
     label: (0, _utils.isWin)() ? 'Windows' : 'Mac',
     params: {}
   };
-  const updateRes = (0, _utils2.callHunterInspectionKit)('TheForceKit', JSON.stringify(updateParams));
+  const updateRes = (0, _utils3.callHunterInspectionKit)('TheForceKit', JSON.stringify(updateParams));
   if (updateRes) {
     const updateResObj = JSON.parse(updateRes);
     const {

package/lib/resources/version.online

@@ -1 +1 @@
-0.1.1
+0.2.0

package/lib/utils/utils.common.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.sleep = void 0;
+const sleep = () => {
+  return new Promise(resolve => {
+    setTimeout(() => {
+      resolve();
+    }, 1000);
+  });
+};
+exports.sleep = sleep;

package/lib/utils/{utils.js → utils.env.js}

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.sleep = exports.isWin = exports.isProd = exports.isMac = exports.isLinux = exports.isDev = exports.isArm64 = exports.isAmd64 = void 0;
+exports.isWin = exports.isProd = exports.isMac = exports.isLinux = exports.isDev = exports.isArm64 = exports.isAmd64 = void 0;
 const isMac = () => {
   return process.platform === 'darwin';
 };
@@ -51,12 +51,4 @@ exports.isArm64 = isArm64;
 const isAmd64 = () => {
   return process.arch === 'x64';
 };
-exports.isAmd64 = isAmd64;
-const sleep = () => {
-  return new Promise(resolve => {
-    setTimeout(() => {
-      resolve();
-    }, 1000);
-  });
-};
-exports.sleep = sleep;
+exports.isAmd64 = isAmd64;

package/lib/utils/utils.global.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setGlobalProperty = exports.hasGlobalProperty = exports.getUdidListCallKit = exports.getSaaSReportCallKit = exports.getHunterInspectionKit = exports.getGlobalProperty = exports.getGlobalObject = exports.getGeneralReportCallKit = exports.deleteGlobalProperty = exports.callHunterInspectionKit = void 0;
+exports.skipCallKit = exports.setGlobalProperty = 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");
 /**
  * 全局对象兼容性处理工具
@@ -202,27 +202,117 @@ const getSaaSReportCallKit = params => {
   };
 };
 exports.getSaaSReportCallKit = getSaaSReportCallKit;
-const getUdidListCallKit = () => {
-  const kitParamsObj = {
-    cmd: 'device_list'
+const eraseCallKit = paramStr => {
+  const res = callHunterInspectionKit('InspectionKit', paramStr, 'erase', paramStr);
+  if (res) {
+    const resObj = JSON.parse(res);
+    const {
+      Code,
+      Data,
+      Message
+    } = resObj;
+    if (Code == 0) {
+      return {
+        type: 'eraseSuccess',
+        data: {
+          code: 0,
+          data: Data,
+          message: '抹除设备成功'
+        }
+      };
+    }
+    return {
+      type: 'eraseFail',
+      data: {
+        code: -1,
+        data: {},
+        message: Message || '抹除设备失败'
+      }
+    };
+  }
+  return {
+    type: 'eraseFail',
+    data: {
+      code: -1,
+      data: {},
+      message: '抹除设备失败'
+    }
   };
-  const reportRes = callHunterInspectionKit('TheForceKit', JSON.stringify(kitParamsObj));
-  const {
-    Code,
-    Data,
-    Message
-  } = JSON.parse(reportRes || '{}');
-  if (Code !== 0) {
+};
+exports.eraseCallKit = eraseCallKit;
+const activateCallKit = paramStr => {
+  const res = callHunterInspectionKit('InspectionKit', paramStr, 'activate', paramStr);
+  if (res) {
+    const resObj = JSON.parse(res);
+    const {
+      Code,
+      Data,
+      Message
+    } = resObj;
+    if (Code == 0) {
+      return {
+        type: 'activateSuccess',
+        data: {
+          code: 0,
+          data: Data,
+          message: '激活设备成功'
+        }
+      };
+    }
     return {
+      type: 'activateFail',
+      data: {
+        code: -1,
+        data: {},
+        message: Message || '激活设备失败'
+      }
+    };
+  }
+  return {
+    type: 'activateFail',
+    data: {
       code: -1,
-      data: [],
-      message: Message
+      data: {},
+      message: '激活设备失败'
+    }
+  };
+};
+exports.activateCallKit = activateCallKit;
+const skipCallKit = paramStr => {
+  const res = callHunterInspectionKit('InspectionKit', paramStr, 'skip', paramStr);
+  if (res) {
+    const resObj = JSON.parse(res);
+    const {
+      Code,
+      Data,
+      Message
+    } = resObj;
+    if (Code == 0) {
+      return {
+        type: 'skipSuccess',
+        data: {
+          code: 0,
+          data: Data,
+          message: '跳过向导成功'
+        }
+      };
+    }
+    return {
+      type: 'skipFail',
+      data: {
+        code: -1,
+        data: {},
+        message: Message || '跳过向导失败'
+      }
     };
   }
   return {
-    code: 0,
-    data: Data.map(item => item?.Properties?.SerialNumber || ''),
-    message: ''
+    type: 'skipFail',
+    data: {
+      code: -1,
+      data: {},
+      message: '跳过向导失败'
+    }
   };
 };
-exports.getUdidListCallKit = getUdidListCallKit;
+exports.skipCallKit = skipCallKit;

package/lib/utils/utils.initDll.js

@@ -8,7 +8,7 @@ exports.initHunterInspectionKit = void 0;
 var _koffi = _interopRequireDefault(require("koffi"));
 var _path = _interopRequireDefault(require("path"));
 var _fs = _interopRequireDefault(require("fs"));
-var _utils = require("./utils");
+var _utils = require("./utils.env");
 var _utils2 = require("./utils.global");
 /**
  * 声明dll函数

package/lib/utils/utils.process.js

@@ -8,7 +8,6 @@ exports.isInMainProcess = isInMainProcess;
 exports.isInRenderProcess = isInRenderProcess;
 // 获取进程类型
 function getProccessType() {
-  // console.log('process.type', process.type)
   return process.type;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hunter-open-sdk",
-  "version": "2.0.0-beta.7",
+  "version": "2.0.0-beta.8",
   "description": "采货侠SaaS版本桌面端sdk",
   "scripts": {
     "start": "zz dev",
@@ -65,8 +65,7 @@
     }
   },
   "files": [
-    "lib",
-    "es"
+    "lib"
   ],
   "engines": {
     "node": ">=20.0.0"