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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,13 +1,13 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
3
  Object.defineProperty(exports, "__esModule", {
5
4
  value: true
6
5
  });
7
6
  exports.activate = activate;
8
7
  var _webWorker = _interopRequireDefault(require("web-worker"));
9
- var _path = _interopRequireDefault(require("path"));
10
8
  var _url = _interopRequireDefault(require("url"));
9
+ var _utils = require("../../utils/utils.path");
10
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
11
11
  class Activate {
12
12
  constructor() {
13
13
  this.initWorker();
@@ -15,23 +15,25 @@ class Activate {
15
15
  }
16
16
  worker = null;
17
17
  callback = null;
18
- exec(paramStr, callback) {
18
+ exec(params, callback) {
19
19
  this.callback = callback;
20
20
  this.worker && this.worker.postMessage({
21
21
  type: 'activate',
22
- payload: {
23
- paramStr
24
- }
22
+ params
25
23
  });
26
24
  }
27
25
  initWorkerListener() {
28
26
  this.worker && this.worker.addEventListener('message', event => {
29
27
  const {
30
- type
31
- } = event?.data || {};
28
+ type,
29
+ data
30
+ } = event.data;
32
31
  switch (type) {
33
- case 'activate':
34
- typeof this.callback === 'function' && this.callback(event);
32
+ case 'activateSuccess':
33
+ this.callback(data);
34
+ break;
35
+ case 'activateFail':
36
+ this.callback(data);
35
37
  break;
36
38
  }
37
39
  this.callback = null;
@@ -39,7 +41,7 @@ class Activate {
39
41
  }
40
42
  initWorker() {
41
43
  if (!this.worker) {
42
- const workerPath = new _url.default.URL('file://' + _path.default.resolve(__dirname, "./worker.js"));
44
+ const workerPath = new _url.default.URL('file://' + (0, _utils.getCurrentEnvPath)(__dirname, './worker.js'));
43
45
  this.worker = new _webWorker.default(workerPath, {
44
46
  type: "module"
45
47
  });
@@ -1,38 +1,22 @@
1
1
  "use strict";
2
2
 
3
- const {
4
- callHunterInspectionKit
5
- } = require("../../utils/utils.global");
3
+ var _utils = require("../../utils/utils.global");
6
4
  function onMainMessage(event) {
7
5
  const {
8
6
  type,
9
- payload
7
+ params
10
8
  } = event.data;
11
- const workerResData = {
12
- type
13
- };
14
9
  switch (type) {
15
10
  case 'activate':
16
11
  {
17
- const {
18
- paramStr
19
- } = payload || {};
20
- if (!paramStr) {
12
+ if (!params) {
21
13
  return {
22
14
  code: -1,
23
15
  message: '【activate】方法缺少必要参数'
24
16
  };
25
17
  }
26
- const res = callHunterInspectionKit('InspectionKit', paramStr, 'activate', paramStr);
27
- const resObj = JSON.parse(res || '{}');
28
- const {
29
- Code,
30
- Message
31
- } = resObj || {};
32
- postMessage(Object.assign(workerResData, {
33
- code: Code,
34
- message: Message
35
- }));
18
+ const res = (0, _utils.activateCallKit)(params);
19
+ postMessage(res);
36
20
  break;
37
21
  }
38
22
  }
@@ -1,13 +1,13 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
3
  Object.defineProperty(exports, "__esModule", {
5
4
  value: true
6
5
  });
7
6
  exports.erase = erase;
8
7
  var _webWorker = _interopRequireDefault(require("web-worker"));
9
- var _path = _interopRequireDefault(require("path"));
10
8
  var _url = _interopRequireDefault(require("url"));
9
+ var _utils = require("../../utils/utils.path");
10
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
11
11
  class Erase {
12
12
  constructor() {
13
13
  this.initWorker();
@@ -15,23 +15,25 @@ class Erase {
15
15
  }
16
16
  worker = null;
17
17
  callback = null;
18
- exec(paramStr, callback) {
18
+ exec(params, callback) {
19
19
  this.callback = callback;
20
20
  this.worker && this.worker.postMessage({
21
21
  type: 'erase',
22
- payload: {
23
- paramStr
24
- }
22
+ params
25
23
  });
26
24
  }
27
25
  initWorkerListener() {
28
26
  this.worker && this.worker.addEventListener('message', event => {
29
27
  const {
30
- type
31
- } = event?.data || {};
28
+ type,
29
+ data
30
+ } = event.data;
32
31
  switch (type) {
33
- case 'erase':
34
- typeof this.callback === 'function' && this.callback(event);
32
+ case 'eraseSuccess':
33
+ this.callback(data);
34
+ break;
35
+ case 'eraseFail':
36
+ this.callback(data);
35
37
  break;
36
38
  }
37
39
  this.callback = null;
@@ -39,7 +41,7 @@ class Erase {
39
41
  }
40
42
  initWorker() {
41
43
  if (!this.worker) {
42
- const workerPath = new _url.default.URL('file://' + _path.default.resolve(__dirname, "./worker.js"));
44
+ const workerPath = new _url.default.URL('file://' + (0, _utils.getCurrentEnvPath)(__dirname, './worker.js'));
43
45
  this.worker = new _webWorker.default(workerPath, {
44
46
  type: "module"
45
47
  });
@@ -1,38 +1,22 @@
1
1
  "use strict";
2
2
 
3
- const {
4
- callHunterInspectionKit
5
- } = require("../../utils/utils.global");
3
+ var _utils = require("../../utils/utils.global");
6
4
  function onMainMessage(event) {
7
5
  const {
8
6
  type,
9
- payload
7
+ params
10
8
  } = event.data;
11
- const workerResData = {
12
- type
13
- };
14
9
  switch (type) {
15
10
  case 'erase':
16
11
  {
17
- const {
18
- paramStr
19
- } = payload || {};
20
- if (!paramStr) {
12
+ if (!params) {
21
13
  return {
22
14
  code: -1,
23
15
  message: '【erase】方法缺少必要参数'
24
16
  };
25
17
  }
26
- const res = callHunterInspectionKit('InspectionKit', paramStr, 'erase', paramStr);
27
- const resObj = JSON.parse(res || '{}');
28
- const {
29
- Code,
30
- Message
31
- } = resObj || {};
32
- postMessage(Object.assign(workerResData, {
33
- code: Code,
34
- message: Message
35
- }));
18
+ const res = (0, _utils.eraseCallKit)(params);
19
+ postMessage(res);
36
20
  break;
37
21
  }
38
22
  }
@@ -1,13 +1,13 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
3
  Object.defineProperty(exports, "__esModule", {
5
4
  value: true
6
5
  });
7
6
  exports.getGeneralReport = getGeneralReport;
8
7
  var _webWorker = _interopRequireDefault(require("web-worker"));
9
- var _path = _interopRequireDefault(require("path"));
10
8
  var _url = _interopRequireDefault(require("url"));
9
+ var _utils = require("../../utils/utils.path");
10
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
11
11
  class GetGeneralReport {
12
12
  constructor() {
13
13
  this.initWorker();
@@ -16,7 +16,6 @@ class GetGeneralReport {
16
16
  worker = null;
17
17
  callback = null;
18
18
  exec(params, callback) {
19
- console.log('GetGeneralReport exec params => ', params);
20
19
  this.callback = callback;
21
20
  this.worker && this.worker.postMessage({
22
21
  type: 'getGeneralReport',
@@ -25,7 +24,6 @@ class GetGeneralReport {
25
24
  }
26
25
  initWorkerListener() {
27
26
  this.worker && this.worker.addEventListener('message', event => {
28
- console.log('main onmessage event.data', event.data);
29
27
  const {
30
28
  type,
31
29
  data
@@ -43,7 +41,7 @@ class GetGeneralReport {
43
41
  }
44
42
  initWorker() {
45
43
  if (!this.worker) {
46
- const workerPath = new _url.default.URL('file://' + _path.default.resolve(__dirname, "./worker.js"));
44
+ const workerPath = new _url.default.URL('file://' + (0, _utils.getCurrentEnvPath)(__dirname, './worker.js'));
47
45
  this.worker = new _webWorker.default(workerPath, {
48
46
  type: "module"
49
47
  });
@@ -3,7 +3,6 @@
3
3
  var _utils = require("../../utils/utils.global");
4
4
  // 处理主进程消息
5
5
  function onMainMessage(event) {
6
- console.log('worker onMainMessage getGeneralReport event.data =>', event.data);
7
6
  const {
8
7
  type,
9
8
  params
@@ -1,13 +1,13 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
3
  Object.defineProperty(exports, "__esModule", {
5
4
  value: true
6
5
  });
7
6
  exports.getSaaSReport = getSaaSReport;
8
7
  var _webWorker = _interopRequireDefault(require("web-worker"));
9
- var _path = _interopRequireDefault(require("path"));
10
8
  var _url = _interopRequireDefault(require("url"));
9
+ var _utils = require("../../utils/utils.path");
10
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
11
11
  class GetSaaSReport {
12
12
  constructor() {
13
13
  this.initWorker();
@@ -16,7 +16,6 @@ class GetSaaSReport {
16
16
  worker = null;
17
17
  callback = null;
18
18
  exec(params, callback) {
19
- console.log('GetSaaSReport exec params => ', params);
20
19
  this.callback = callback;
21
20
  this.worker && this.worker.postMessage({
22
21
  type: 'getSaaSReport',
@@ -25,7 +24,6 @@ class GetSaaSReport {
25
24
  }
26
25
  initWorkerListener() {
27
26
  this.worker && this.worker.addEventListener('message', event => {
28
- console.log('main onmessage event.data', event.data);
29
27
  const {
30
28
  type,
31
29
  data
@@ -43,7 +41,7 @@ class GetSaaSReport {
43
41
  }
44
42
  initWorker() {
45
43
  if (!this.worker) {
46
- const workerPath = new _url.default.URL('file://' + _path.default.resolve(__dirname, "./worker.js"));
44
+ const workerPath = new _url.default.URL('file://' + (0, _utils.getCurrentEnvPath)(__dirname, './worker.js'));
47
45
  this.worker = new _webWorker.default(workerPath, {
48
46
  type: "module"
49
47
  });
@@ -3,7 +3,6 @@
3
3
  var _utils = require("../../utils/utils.global");
4
4
  // 处理主进程消息
5
5
  function onMainMessage(event) {
6
- console.log('worker onMainMessage getSaaSReport event.data =>', event.data);
7
6
  const {
8
7
  type,
9
8
  params
@@ -1,13 +1,13 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
3
  Object.defineProperty(exports, "__esModule", {
5
4
  value: true
6
5
  });
7
6
  exports.skip = skip;
8
7
  var _webWorker = _interopRequireDefault(require("web-worker"));
9
- var _path = _interopRequireDefault(require("path"));
10
8
  var _url = _interopRequireDefault(require("url"));
9
+ var _utils = require("../../utils/utils.path");
10
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
11
11
  class Skip {
12
12
  constructor() {
13
13
  this.initWorker();
@@ -15,23 +15,25 @@ class Skip {
15
15
  }
16
16
  worker = null;
17
17
  callback = null;
18
- exec(paramStr, callback) {
18
+ exec(params, callback) {
19
19
  this.callback = callback;
20
20
  this.worker && this.worker.postMessage({
21
21
  type: 'skip',
22
- payload: {
23
- paramStr
24
- }
22
+ params
25
23
  });
26
24
  }
27
25
  initWorkerListener() {
28
26
  this.worker && this.worker.addEventListener('message', event => {
29
27
  const {
30
- type
31
- } = event?.data || {};
28
+ type,
29
+ data
30
+ } = event.data;
32
31
  switch (type) {
33
- case 'skip':
34
- typeof this.callback === 'function' && this.callback(event);
32
+ case 'skipSuccess':
33
+ this.callback(data);
34
+ break;
35
+ case 'skipFail':
36
+ this.callback(data);
35
37
  break;
36
38
  }
37
39
  this.callback = null;
@@ -39,7 +41,7 @@ class Skip {
39
41
  }
40
42
  initWorker() {
41
43
  if (!this.worker) {
42
- const workerPath = new _url.default.URL('file://' + _path.default.resolve(__dirname, "./worker.js"));
44
+ const workerPath = new _url.default.URL('file://' + (0, _utils.getCurrentEnvPath)(__dirname, './worker.js'));
43
45
  this.worker = new _webWorker.default(workerPath, {
44
46
  type: "module"
45
47
  });
@@ -1,38 +1,22 @@
1
1
  "use strict";
2
2
 
3
- const {
4
- callHunterInspectionKit
5
- } = require("../../utils/utils.global");
3
+ var _utils = require("../../utils/utils.global");
6
4
  function onMainMessage(event) {
7
5
  const {
8
6
  type,
9
- payload
7
+ params
10
8
  } = event.data;
11
- const workerResData = {
12
- type
13
- };
14
9
  switch (type) {
15
10
  case 'skip':
16
11
  {
17
- const {
18
- paramStr
19
- } = payload || {};
20
- if (!paramStr) {
12
+ if (!params) {
21
13
  return {
22
14
  code: -1,
23
15
  message: '【skip】方法缺少必要参数'
24
16
  };
25
17
  }
26
- const res = callHunterInspectionKit('InspectionKit', paramStr, 'skip', paramStr);
27
- const resObj = JSON.parse(res || '{}');
28
- const {
29
- Code,
30
- Message
31
- } = resObj || {};
32
- postMessage(Object.assign(workerResData, {
33
- code: Code,
34
- message: Message
35
- }));
18
+ const res = (0, _utils.skipCallKit)(params);
19
+ postMessage(res);
36
20
  break;
37
21
  }
38
22
  }
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.default = void 0;
7
- var _utils = require("../../utils/utils");
7
+ var _utils = require("../../utils/utils.env");
8
8
  var _command = require("./command");
9
9
  var _winDriver = require("./winDriver");
10
10
  const path = require('path');
@@ -1,14 +1,14 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
3
  Object.defineProperty(exports, "__esModule", {
5
4
  value: true
6
5
  });
7
6
  exports.checkHasDriver = checkHasDriver;
8
7
  exports.downloadDriver = downloadDriver;
9
- var _utils = require("../../utils/utils");
8
+ var _utils = require("../../utils/utils.env");
10
9
  var _request = _interopRequireDefault(require("request"));
11
10
  var _fsExtra = _interopRequireDefault(require("fs-extra"));
11
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
12
12
  // import { app } from 'electron'
13
13
  // import { command } from '../../utils/utils.command'
14
14
 
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.UnregisterAndroidSn = exports.GetAndroidSn = void 0;
7
7
  var _usb = require("usb");
8
- var _utils = require("../utils/utils");
8
+ var _utils = require("../utils/utils.env");
9
9
  var _utils2 = require("../utils/utils.sn");
10
10
  const childProcess = require('child_process');
11
11
  const exec = childProcess.exec;
package/lib/index.js CHANGED
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.default = void 0;
7
7
  var _registerEvent = require("./registerEvent");
8
8
  var _getAndroidSn = require("./getAndroidSn");
9
- var _utils = require("./utils/utils.global");
10
9
  var _getSaaSReport = require("./abilities/getSaaSReport");
11
10
  var _getGeneralReport = require("./abilities/getGeneralReport");
12
11
  var _erase = require("./abilities/erase");
@@ -24,7 +23,6 @@ var _default = exports.default = {
24
23
  unregisterEvent: _registerEvent.UnregisterEvent,
25
24
  getAndroidSn: _getAndroidSn.GetAndroidSn,
26
25
  unregisterAndroidSn: _getAndroidSn.UnregisterAndroidSn,
27
- getUdidList: _utils.getUdidListCallKit,
28
26
  getSaaSReport: _getSaaSReport.getSaaSReport,
29
27
  getGeneralReport: _getGeneralReport.getGeneralReport,
30
28
  erase: _erase.erase,
@@ -4,11 +4,12 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.UnregisterEvent = exports.RegisterEvent = void 0;
7
- var _utils = require("../utils/utils");
7
+ var _utils = require("../utils/utils.env");
8
+ var _utils2 = require("../utils/utils.common");
8
9
  var _winDriver = require("../events/driver/winDriver");
9
- var _utils2 = require("../utils/utils.global");
10
+ var _utils3 = require("../utils/utils.global");
10
11
  var _deviceHelper = require("../helper/deviceHelper");
11
- var _utils3 = require("../utils/utils.initDll");
12
+ var _utils4 = require("../utils/utils.initDll");
12
13
  const usbmux = require('usbmux');
13
14
  const path = require('path');
14
15
  const request = require("request");
@@ -48,7 +49,7 @@ const publishPair = (udid = '', params) => {
48
49
  cmd: 'publish_pair',
49
50
  udid
50
51
  });
51
- return (0, _utils2.callHunterInspectionKit)('TheForceKit', JSON.stringify(kitParamsObj));
52
+ return (0, _utils3.callHunterInspectionKit)('TheForceKit', JSON.stringify(kitParamsObj));
52
53
  };
53
54
 
54
55
  /**
@@ -72,7 +73,7 @@ const getTrustStatus = async (udid = '', params, once = false) => {
72
73
  });
73
74
 
74
75
  // 获取信任状态
75
- const trustStatusRes = (0, _utils2.callHunterInspectionKit)('TheForceKit', JSON.stringify(kitParamsObj));
76
+ const trustStatusRes = (0, _utils3.callHunterInspectionKit)('TheForceKit', JSON.stringify(kitParamsObj));
76
77
  if (trustStatusRes) {
77
78
  const trustStatusResObj = JSON.parse(trustStatusRes);
78
79
  const {
@@ -82,7 +83,7 @@ const getTrustStatus = async (udid = '', params, once = false) => {
82
83
  if (Code == 0 && (Data.imei || Data.serialNumber)) {
83
84
  return Data;
84
85
  } else if (!once) {
85
- await (0, _utils.sleep)();
86
+ await (0, _utils2.sleep)();
86
87
  return await getTrustStatus(udid, params);
87
88
  }
88
89
  }
@@ -144,7 +145,7 @@ const writeDllVersion = version => {
144
145
  }
145
146
  console.log('========写入version成功');
146
147
  // 写入成功后 重新初始化dll
147
- (0, _utils3.initHunterInspectionKit)();
148
+ (0, _utils4.initHunterInspectionKit)();
148
149
  saasCallBack({
149
150
  data: {
150
151
  eventName: 'type_update_result',
@@ -195,7 +196,7 @@ const updateDllFileCheck = () => {
195
196
  label: (0, _utils.isWin)() ? 'Windows' : 'Mac',
196
197
  params: {}
197
198
  };
198
- const updateRes = (0, _utils2.callHunterInspectionKit)('TheForceKit', JSON.stringify(updateParams));
199
+ const updateRes = (0, _utils3.callHunterInspectionKit)('TheForceKit', JSON.stringify(updateParams));
199
200
  if (updateRes) {
200
201
  const updateResObj = JSON.parse(updateRes);
201
202
  const {
@@ -1 +1 @@
1
- 0.1.1
1
+ 0.2.0
@@ -0,0 +1,14 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.sleep = void 0;
7
+ const sleep = () => {
8
+ return new Promise(resolve => {
9
+ setTimeout(() => {
10
+ resolve();
11
+ }, 1000);
12
+ });
13
+ };
14
+ exports.sleep = sleep;
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.sleep = exports.isWin = exports.isProd = exports.isMac = exports.isLinux = exports.isDev = exports.isArm64 = exports.isAmd64 = void 0;
6
+ exports.isWin = exports.isProd = exports.isMac = exports.isLinux = exports.isDev = exports.isArm64 = exports.isAmd64 = void 0;
7
7
  const isMac = () => {
8
8
  return process.platform === 'darwin';
9
9
  };
@@ -51,12 +51,4 @@ exports.isArm64 = isArm64;
51
51
  const isAmd64 = () => {
52
52
  return process.arch === 'x64';
53
53
  };
54
- exports.isAmd64 = isAmd64;
55
- const sleep = () => {
56
- return new Promise(resolve => {
57
- setTimeout(() => {
58
- resolve();
59
- }, 1000);
60
- });
61
- };
62
- exports.sleep = sleep;
54
+ exports.isAmd64 = isAmd64;
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.setGlobalProperty = exports.hasGlobalProperty = exports.getUdidListCallKit = exports.getSaaSReportCallKit = exports.getHunterInspectionKit = exports.getGlobalProperty = exports.getGlobalObject = exports.getGeneralReportCallKit = exports.deleteGlobalProperty = exports.callHunterInspectionKit = void 0;
6
+ 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;
7
7
  var _utils = require("../utils/utils.initDll");
8
8
  /**
9
9
  * 全局对象兼容性处理工具
@@ -202,27 +202,117 @@ const getSaaSReportCallKit = params => {
202
202
  };
203
203
  };
204
204
  exports.getSaaSReportCallKit = getSaaSReportCallKit;
205
- const getUdidListCallKit = () => {
206
- const kitParamsObj = {
207
- cmd: 'device_list'
205
+ const eraseCallKit = paramStr => {
206
+ const res = callHunterInspectionKit('InspectionKit', paramStr, 'erase', paramStr);
207
+ if (res) {
208
+ const resObj = JSON.parse(res);
209
+ const {
210
+ Code,
211
+ Data,
212
+ Message
213
+ } = resObj;
214
+ if (Code == 0) {
215
+ return {
216
+ type: 'eraseSuccess',
217
+ data: {
218
+ code: 0,
219
+ data: Data,
220
+ message: '抹除设备成功'
221
+ }
222
+ };
223
+ }
224
+ return {
225
+ type: 'eraseFail',
226
+ data: {
227
+ code: -1,
228
+ data: {},
229
+ message: Message || '抹除设备失败'
230
+ }
231
+ };
232
+ }
233
+ return {
234
+ type: 'eraseFail',
235
+ data: {
236
+ code: -1,
237
+ data: {},
238
+ message: '抹除设备失败'
239
+ }
208
240
  };
209
- const reportRes = callHunterInspectionKit('TheForceKit', JSON.stringify(kitParamsObj));
210
- const {
211
- Code,
212
- Data,
213
- Message
214
- } = JSON.parse(reportRes || '{}');
215
- if (Code !== 0) {
241
+ };
242
+ exports.eraseCallKit = eraseCallKit;
243
+ const activateCallKit = paramStr => {
244
+ const res = callHunterInspectionKit('InspectionKit', paramStr, 'activate', paramStr);
245
+ if (res) {
246
+ const resObj = JSON.parse(res);
247
+ const {
248
+ Code,
249
+ Data,
250
+ Message
251
+ } = resObj;
252
+ if (Code == 0) {
253
+ return {
254
+ type: 'activateSuccess',
255
+ data: {
256
+ code: 0,
257
+ data: Data,
258
+ message: '激活设备成功'
259
+ }
260
+ };
261
+ }
216
262
  return {
263
+ type: 'activateFail',
264
+ data: {
265
+ code: -1,
266
+ data: {},
267
+ message: Message || '激活设备失败'
268
+ }
269
+ };
270
+ }
271
+ return {
272
+ type: 'activateFail',
273
+ data: {
217
274
  code: -1,
218
- data: [],
219
- message: Message
275
+ data: {},
276
+ message: '激活设备失败'
277
+ }
278
+ };
279
+ };
280
+ exports.activateCallKit = activateCallKit;
281
+ const skipCallKit = paramStr => {
282
+ const res = callHunterInspectionKit('InspectionKit', paramStr, 'skip', paramStr);
283
+ if (res) {
284
+ const resObj = JSON.parse(res);
285
+ const {
286
+ Code,
287
+ Data,
288
+ Message
289
+ } = resObj;
290
+ if (Code == 0) {
291
+ return {
292
+ type: 'skipSuccess',
293
+ data: {
294
+ code: 0,
295
+ data: Data,
296
+ message: '跳过向导成功'
297
+ }
298
+ };
299
+ }
300
+ return {
301
+ type: 'skipFail',
302
+ data: {
303
+ code: -1,
304
+ data: {},
305
+ message: Message || '跳过向导失败'
306
+ }
220
307
  };
221
308
  }
222
309
  return {
223
- code: 0,
224
- data: Data.map(item => item?.Properties?.SerialNumber || ''),
225
- message: ''
310
+ type: 'skipFail',
311
+ data: {
312
+ code: -1,
313
+ data: {},
314
+ message: '跳过向导失败'
315
+ }
226
316
  };
227
317
  };
228
- exports.getUdidListCallKit = getUdidListCallKit;
318
+ exports.skipCallKit = skipCallKit;
@@ -1,6 +1,5 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
3
  Object.defineProperty(exports, "__esModule", {
5
4
  value: true
6
5
  });
@@ -8,8 +7,10 @@ exports.initHunterInspectionKit = void 0;
8
7
  var _koffi = _interopRequireDefault(require("koffi"));
9
8
  var _path = _interopRequireDefault(require("path"));
10
9
  var _fs = _interopRequireDefault(require("fs"));
11
- var _utils = require("./utils");
10
+ var _utils = require("./utils.env");
12
11
  var _utils2 = require("./utils.global");
12
+ var _utils3 = require("./utils.path");
13
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
13
14
  /**
14
15
  * 声明dll函数
15
16
  * @param {String} udid 设备id
@@ -34,7 +35,7 @@ const initHunterInspectionKit = () => {
34
35
  }
35
36
  if (!(0, _utils.isDev)()) {
36
37
  // 如果是生产模式 则替换app.asar 路径 为了在生产调用dll
37
- dllPath = dllPath.replace('app.asar', 'app.asar.unpacked');
38
+ dllPath = (0, _utils3.getCurrentEnvPath)(dllPath);
38
39
  }
39
40
  const dllLib = _koffi.default.load(dllPath);
40
41
  const dllKit = {
@@ -3,15 +3,32 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.currentEnvPath = void 0;
7
- const path = require('path');
8
-
6
+ exports.getCurrentEnvPath = getCurrentEnvPath;
7
+ exports.getCurrentProcess = getCurrentProcess;
8
+ var _path = _interopRequireDefault(require("path"));
9
+ var _process = _interopRequireDefault(require("process"));
10
+ var _utils = require("./utils.env");
11
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
9
12
  /**
10
13
  * 当前环境地址转换
11
14
  * @param {*} path
12
15
  * @returns
13
16
  */
14
- const currentEnvPath = filePath => {
15
- return path.resolve(__dirname, filePath);
16
- };
17
- exports.currentEnvPath = currentEnvPath;
17
+ function getCurrentEnvPath(dirPath, filePath = '') {
18
+ let fixPath = dirPath;
19
+ if (!(0, _utils.isDev)()) {
20
+ fixPath = fixPath.replace('/app.asar/', '/app.asar.unpacked/');
21
+ }
22
+ return _path.default.resolve(fixPath, filePath);
23
+ }
24
+ function getCurrentProcess() {
25
+ if (typeof _process.default === 'undefined' || _process.default.type === undefined) {
26
+ return '这是在浏览器环境中';
27
+ } else {
28
+ if (_process.default.type === 'browser') {
29
+ return '这是在 Node.js 环境中';
30
+ } else {
31
+ return '这是在 Electron 的渲染进程中';
32
+ }
33
+ }
34
+ }
@@ -8,7 +8,6 @@ exports.isInMainProcess = isInMainProcess;
8
8
  exports.isInRenderProcess = isInRenderProcess;
9
9
  // 获取进程类型
10
10
  function getProccessType() {
11
- // console.log('process.type', process.type)
12
11
  return process.type;
13
12
  }
14
13
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "hunter-open-sdk",
3
- "version": "2.0.0-beta.7",
3
+ "version": "2.0.0-beta.9",
4
4
  "description": "采货侠SaaS版本桌面端sdk",
5
5
  "scripts": {
6
6
  "start": "zz dev",
@@ -39,7 +39,6 @@
39
39
  "web-worker": "1.5.0"
40
40
  },
41
41
  "devDependencies": {
42
- "@babel/plugin-transform-runtime": "7.21.0",
43
42
  "@commitlint/cli": "8.3.5",
44
43
  "@commitlint/config-conventional": "8.3.4",
45
44
  "@evilmartians/lefthook": "0.8.0",
@@ -53,11 +52,10 @@
53
52
  "commitlint": "17.0.2",
54
53
  "father": "4.6.7",
55
54
  "lint-staged": "10.0.8",
55
+ "minimatch": "3.0.0",
56
56
  "path-to-regexp": "2.4.0",
57
57
  "typedoc": "0.23.9",
58
- "typescript": "4.7.4",
59
- "minimatch": "3.0.0",
60
- "core-js": "3.6.5"
58
+ "typescript": "4.7.4"
61
59
  },
62
60
  "config": {
63
61
  "commitizen": {
@@ -65,8 +63,7 @@
65
63
  }
66
64
  },
67
65
  "files": [
68
- "lib",
69
- "es"
66
+ "lib"
70
67
  ],
71
68
  "engines": {
72
69
  "node": ">=20.0.0"