hunter-open-sdk 1.1.1-beta.2 → 1.1.1-beta.4

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.
Files changed (2) hide show
  1. package/lib/registerEvent/index.js +76 -43
  2. package/package.json +1 -1
package/lib/registerEvent/index.js CHANGED
@@ -65,6 +65,7 @@ var getTrustStatus = /*#__PURE__*/function () {
65
65
  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
66
66
  var udid,
67
67
  params,
68
+ once,
68
69
  kitParamsObj,
69
70
  trustStatusRes,
70
71
  trustStatusResObj,
@@ -76,12 +77,13 @@ var getTrustStatus = /*#__PURE__*/function () {
76
77
  case 0:
77
78
  udid = _args.length > 0 && _args[0] !== undefined ? _args[0] : '';
78
79
  params = _args.length > 1 ? _args[1] : undefined;
80
+ once = _args.length > 2 && _args[2] !== undefined ? _args[2] : false;
79
81
  if (_deviceHelper.deviceHelper.hasUdid(udid)) {
80
- _context.next = 4;
82
+ _context.next = 5;
81
83
  break;
82
84
  }
83
85
  return _context.abrupt("return", false);
84
- case 4:
86
+ case 5:
85
87
  // 通过调用 trust_status 来判断信任状态
86
88
  kitParamsObj = JSON.parse(params); // 合并参数
87
89
  Object.assign(kitParamsObj, {
@@ -92,27 +94,31 @@ var getTrustStatus = /*#__PURE__*/function () {
92
94
  // 获取信任状态
93
95
  trustStatusRes = (0, _utils2.callHunterInspectionKit)('TheForceKit', JSON.stringify(kitParamsObj));
94
96
  if (!trustStatusRes) {
95
- _context.next = 19;
97
+ _context.next = 21;
96
98
  break;
97
99
  }
98
100
  trustStatusResObj = JSON.parse(trustStatusRes);
99
101
  Code = trustStatusResObj.Code, Data = trustStatusResObj.Data;
100
102
  if (!(Code == 0 && (Data.imei || Data.serialNumber))) {
101
- _context.next = 14;
103
+ _context.next = 15;
102
104
  break;
103
105
  }
104
106
  return _context.abrupt("return", Data);
105
- case 14:
106
- _context.next = 16;
107
- return (0, _utils.sleep)();
108
- case 16:
107
+ case 15:
108
+ if (once) {
109
+ _context.next = 21;
110
+ break;
111
+ }
109
112
  _context.next = 18;
110
- return getTrustStatus(udid, params);
113
+ return (0, _utils.sleep)();
111
114
  case 18:
115
+ _context.next = 20;
116
+ return getTrustStatus(udid, params);
117
+ case 20:
112
118
  return _context.abrupt("return", _context.sent);
113
- case 19:
119
+ case 21:
114
120
  return _context.abrupt("return", false);
115
- case 20:
121
+ case 22:
116
122
  case "end":
117
123
  return _context.stop();
118
124
  }
@@ -122,6 +128,25 @@ var getTrustStatus = /*#__PURE__*/function () {
122
128
  return _ref.apply(this, arguments);
123
129
  };
124
130
  }();
131
+ var getTrustStatusOnce = /*#__PURE__*/function () {
132
+ var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(udid, params) {
133
+ return _regenerator.default.wrap(function _callee2$(_context2) {
134
+ while (1) switch (_context2.prev = _context2.next) {
135
+ case 0:
136
+ _context2.next = 2;
137
+ return getTrustStatus(udid, params, true);
138
+ case 2:
139
+ return _context2.abrupt("return", _context2.sent);
140
+ case 3:
141
+ case "end":
142
+ return _context2.stop();
143
+ }
144
+ }, _callee2);
145
+ }));
146
+ return function getTrustStatusOnce(_x, _x2) {
147
+ return _ref2.apply(this, arguments);
148
+ };
149
+ }();
125
150
 
126
151
  /**
127
152
  * 配对并获取信任状态
@@ -129,24 +154,32 @@ var getTrustStatus = /*#__PURE__*/function () {
129
154
  * @returns
130
155
  */
131
156
  var DevicePair = /*#__PURE__*/function () {
132
- var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
157
+ var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
133
158
  var udid,
134
159
  params,
160
+ trustStatusOnceRes,
135
161
  trustStatusRes,
136
- _args2 = arguments;
137
- return _regenerator.default.wrap(function _callee2$(_context2) {
138
- while (1) switch (_context2.prev = _context2.next) {
162
+ _args3 = arguments;
163
+ return _regenerator.default.wrap(function _callee3$(_context3) {
164
+ while (1) switch (_context3.prev = _context3.next) {
139
165
  case 0:
140
- udid = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : '';
141
- params = _args2.length > 1 ? _args2[1] : undefined;
142
- // 发布配对
143
- publishPair(udid, params);
166
+ udid = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : '';
167
+ params = _args3.length > 1 ? _args3[1] : undefined;
168
+ _context3.next = 4;
169
+ return getTrustStatusOnce(udid, params);
170
+ case 4:
171
+ trustStatusOnceRes = _context3.sent;
172
+ // 未信任弹起信任窗口
173
+ if (!trustStatusOnceRes) {
174
+ // 发布配对
175
+ publishPair(udid, params);
176
+ }
144
177
 
145
178
  // 通过 trust_status 来判断信任状态
146
- _context2.next = 5;
179
+ _context3.next = 8;
147
180
  return getTrustStatus(udid, params);
148
- case 5:
149
- trustStatusRes = _context2.sent;
181
+ case 8:
182
+ trustStatusRes = _context3.sent;
150
183
  if (trustStatusRes) {
151
184
  saasCallBack({
152
185
  data: {
@@ -156,14 +189,14 @@ var DevicePair = /*#__PURE__*/function () {
156
189
  }
157
190
  });
158
191
  }
159
- case 7:
192
+ case 10:
160
193
  case "end":
161
- return _context2.stop();
194
+ return _context3.stop();
162
195
  }
163
- }, _callee2);
196
+ }, _callee3);
164
197
  }));
165
198
  return function DevicePair() {
166
- return _ref2.apply(this, arguments);
199
+ return _ref3.apply(this, arguments);
167
200
  };
168
201
  }();
169
202
 
@@ -318,9 +351,9 @@ var checkAndInstallDriver = function checkAndInstallDriver() {
318
351
  });
319
352
  };
320
353
  var RegisterEvent = exports.RegisterEvent = /*#__PURE__*/function () {
321
- var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(params, callBack) {
322
- return _regenerator.default.wrap(function _callee4$(_context4) {
323
- while (1) switch (_context4.prev = _context4.next) {
354
+ var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(params, callBack) {
355
+ return _regenerator.default.wrap(function _callee5$(_context5) {
356
+ while (1) switch (_context5.prev = _context5.next) {
324
357
  case 0:
325
358
  saasCallBack = callBack;
326
359
 
@@ -328,19 +361,19 @@ var RegisterEvent = exports.RegisterEvent = /*#__PURE__*/function () {
328
361
  updateDllFileCheck();
329
362
 
330
363
  // 在插线之前就检测驱动状态
331
- _context4.next = 4;
364
+ _context5.next = 4;
332
365
  return checkAndInstallDriver();
333
366
  case 4:
334
367
  usbListener = new usbmux.createListener().on('attached', /*#__PURE__*/function () {
335
- var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(udid) {
336
- return _regenerator.default.wrap(function _callee3$(_context3) {
337
- while (1) switch (_context3.prev = _context3.next) {
368
+ var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(udid) {
369
+ return _regenerator.default.wrap(function _callee4$(_context4) {
370
+ while (1) switch (_context4.prev = _context4.next) {
338
371
  case 0:
339
372
  if (udid) {
340
- _context3.next = 2;
373
+ _context4.next = 2;
341
374
  break;
342
375
  }
343
- return _context3.abrupt("return");
376
+ return _context4.abrupt("return");
344
377
  case 2:
345
378
  // 插入设备通知
346
379
  saasCallBack({
@@ -355,12 +388,12 @@ var RegisterEvent = exports.RegisterEvent = /*#__PURE__*/function () {
355
388
  DevicePair(udid, params);
356
389
  case 5:
357
390
  case "end":
358
- return _context3.stop();
391
+ return _context4.stop();
359
392
  }
360
- }, _callee3);
393
+ }, _callee4);
361
394
  }));
362
- return function (_x3) {
363
- return _ref4.apply(this, arguments);
395
+ return function (_x5) {
396
+ return _ref5.apply(this, arguments);
364
397
  };
365
398
  }()).on('detached', function (udid) {
366
399
  // 拔出设备
@@ -380,12 +413,12 @@ var RegisterEvent = exports.RegisterEvent = /*#__PURE__*/function () {
380
413
  });
381
414
  case 5:
382
415
  case "end":
383
- return _context4.stop();
416
+ return _context5.stop();
384
417
  }
385
- }, _callee4);
418
+ }, _callee5);
386
419
  }));
387
- return function RegisterEvent(_x, _x2) {
388
- return _ref3.apply(this, arguments);
420
+ return function RegisterEvent(_x3, _x4) {
421
+ return _ref4.apply(this, arguments);
389
422
  };
390
423
  }();
391
424
  var UnregisterEvent = exports.UnregisterEvent = function UnregisterEvent() {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "hunter-open-sdk",
3
- "version": "1.1.1-beta.2",
3
+ "version": "1.1.1-beta.4",
4
4
  "description": "采货侠SaaS版本桌面端sdk",
5
5
  "scripts": {
6
6
  "start": "zz dev",