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

package/lib/registerEvent/index.js

@@ -1,32 +1,29 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.UnregisterEvent = exports.RegisterEvent = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _utils = require("../utils/utils");
 var _winDriver = require("../events/driver/winDriver");
 var _utils2 = require("../utils/utils.global");
 var _deviceHelper = require("../helper/deviceHelper");
 var _utils3 = require("../utils/utils.initDll");
-var usbmux = require('usbmux');
-var path = require('path');
-var request = require("request");
-var fs = require('fs');
-var Sentry = require("@sentry/browser");
+const usbmux = require('usbmux');
+const path = require('path');
+const request = require("request");
+const fs = require('fs');
+const Sentry = require("@sentry/browser");
 
 // saas回调
-var saasCallBack;
+let saasCallBack;
 
 // usb监听
-var usbListener = null;
+let usbListener = null;
 /**
  * 获取资源文件的基础路径
  */
-var getResourcePath = function getResourcePath() {
+const getResourcePath = () => {
   if ((0, _utils.isDev)()) {
     // 开发环境：使用源码目录
     return path.resolve(__dirname, '../resources');
@@ -42,16 +39,14 @@ var getResourcePath = function getResourcePath() {
  * @param {String} params 参数
  * @returns {String} 发布配对结果
  */
-var publishPair = function publishPair() {
-  var udid = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-  var params = arguments.length > 1 ? arguments[1] : undefined;
+const publishPair = (udid = '', params) => {
   // 通过调用 trust_status 来判断信任状态
-  var kitParamsObj = JSON.parse(params);
+  const kitParamsObj = JSON.parse(params);
 
   // 合并参数
   Object.assign(kitParamsObj, {
     cmd: 'publish_pair',
-    udid: udid
+    udid
   });
   return (0, _utils2.callHunterInspectionKit)('TheForceKit', JSON.stringify(kitParamsObj));
 };
@@ -61,150 +56,83 @@ var publishPair = function publishPair() {
  * @param {String} udid 设备id
  * @returns 
  */
-var getTrustStatus = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-    var udid,
-      params,
-      once,
-      kitParamsObj,
-      trustStatusRes,
-      trustStatusResObj,
-      Code,
-      Data,
-      _args = arguments;
-    return _regenerator.default.wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          udid = _args.length > 0 && _args[0] !== undefined ? _args[0] : '';
-          params = _args.length > 1 ? _args[1] : undefined;
-          once = _args.length > 2 && _args[2] !== undefined ? _args[2] : false;
-          if (_deviceHelper.deviceHelper.hasUdid(udid)) {
-            _context.next = 5;
-            break;
-          }
-          return _context.abrupt("return", false);
-        case 5:
-          // 通过调用 trust_status 来判断信任状态
-          kitParamsObj = JSON.parse(params); // 合并参数
-          Object.assign(kitParamsObj, {
-            cmd: 'trust_status',
-            udid: udid
-          });
+const getTrustStatus = async (udid = '', params, once = false) => {
+  if (!_deviceHelper.deviceHelper.hasUdid(udid)) {
+    // 防止一直循环占用cpu资源
+    return false;
+  }
 
-          // 获取信任状态
-          trustStatusRes = (0, _utils2.callHunterInspectionKit)('TheForceKit', JSON.stringify(kitParamsObj));
-          if (!trustStatusRes) {
-            _context.next = 21;
-            break;
-          }
-          trustStatusResObj = JSON.parse(trustStatusRes);
-          Code = trustStatusResObj.Code, Data = trustStatusResObj.Data;
-          if (!(Code == 0 && (Data.imei || Data.serialNumber))) {
-            _context.next = 15;
-            break;
-          }
-          return _context.abrupt("return", Data);
-        case 15:
-          if (once) {
-            _context.next = 21;
-            break;
-          }
-          _context.next = 18;
-          return (0, _utils.sleep)();
-        case 18:
-          _context.next = 20;
-          return getTrustStatus(udid, params);
-        case 20:
-          return _context.abrupt("return", _context.sent);
-        case 21:
-          return _context.abrupt("return", false);
-        case 22:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return function getTrustStatus() {
-    return _ref.apply(this, arguments);
-  };
-}();
-var getTrustStatusOnce = /*#__PURE__*/function () {
-  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(udid, params) {
-    return _regenerator.default.wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          _context2.next = 2;
-          return getTrustStatus(udid, params, true);
-        case 2:
-          return _context2.abrupt("return", _context2.sent);
-        case 3:
-        case "end":
-          return _context2.stop();
-      }
-    }, _callee2);
-  }));
-  return function getTrustStatusOnce(_x, _x2) {
-    return _ref2.apply(this, arguments);
-  };
-}();
+  // 通过调用 trust_status 来判断信任状态
+  const kitParamsObj = JSON.parse(params);
+
+  // 合并参数
+  Object.assign(kitParamsObj, {
+    cmd: 'trust_status',
+    udid
+  });
+
+  // 获取信任状态
+  const trustStatusRes = (0, _utils2.callHunterInspectionKit)('TheForceKit', JSON.stringify(kitParamsObj));
+  if (trustStatusRes) {
+    const trustStatusResObj = JSON.parse(trustStatusRes);
+    const {
+      Code,
+      Data
+    } = trustStatusResObj;
+    if (Code == 0 && (Data.imei || Data.serialNumber)) {
+      return Data;
+    } else if (!once) {
+      await (0, _utils.sleep)();
+      return await getTrustStatus(udid, params);
+    }
+  }
+  return false;
+};
+const getTrustStatusOnce = async (udid, params) => {
+  return await getTrustStatus(udid, params, true);
+};
 
 /**
  * 配对并获取信任状态
  * @param {String} udid 设备id
  * @returns 
  */
-var DevicePair = /*#__PURE__*/function () {
-  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-    var udid,
-      params,
-      trustStatusOnceRes,
-      trustStatusRes,
-      _args3 = arguments;
-    return _regenerator.default.wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
-        case 0:
-          udid = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : '';
-          params = _args3.length > 1 ? _args3[1] : undefined;
-          _context3.next = 4;
-          return getTrustStatusOnce(udid, params);
-        case 4:
-          trustStatusOnceRes = _context3.sent;
-          // 未信任弹起信任窗口
-          if (!trustStatusOnceRes) {
-            // 发布配对
-            publishPair(udid, params);
-          }
-
-          // 通过 trust_status 来判断信任状态
-          _context3.next = 8;
-          return getTrustStatus(udid, params);
-        case 8:
-          trustStatusRes = _context3.sent;
-          if (trustStatusRes) {
-            saasCallBack({
-              data: {
-                eventName: 'type_trust_result',
-                udid: udid,
-                eventCode: 0
-              }
-            });
-          }
-        case 10:
-        case "end":
-          return _context3.stop();
+const DevicePair = async (udid = '', params) => {
+  const callBack = () => {
+    saasCallBack({
+      data: {
+        eventName: 'type_trust_result',
+        udid,
+        eventCode: 0
       }
-    }, _callee3);
-  }));
-  return function DevicePair() {
-    return _ref3.apply(this, arguments);
+    });
   };
-}();
+
+  // 单次获取信任状态
+  const trustStatusOnceRes = await getTrustStatusOnce(udid, params);
+
+  // 未信任弹起信任窗口
+  if (!trustStatusOnceRes) {
+    // 发布配对
+    publishPair(udid, params);
+
+    // 通过 trust_status 来判断信任状态
+    const trustStatusRes = await getTrustStatus(udid, params);
+    if (trustStatusRes) {
+      callBack();
+    }
+    return;
+  }
+
+  // 已信任 直接返回
+  callBack();
+};
 
 // 写入dll文件version
-var writeDllVersion = function writeDllVersion(version) {
-  var resourcePath = getResourcePath();
-  var versionPath = path.resolve(resourcePath, 'version.online');
-  fs.writeFile(versionPath, version, function (err) {
+const writeDllVersion = version => {
+  const resourcePath = getResourcePath();
+  const versionPath = path.resolve(resourcePath, 'version.online');
+  fs.writeFile(versionPath, version, err => {
     if (err) {
       saasCallBack({
         data: {
@@ -227,18 +155,18 @@ var writeDllVersion = function writeDllVersion(version) {
 };
 
 // 下载更新dll
-var updateDll = function updateDll(packageUrl, targetVersion) {
+const updateDll = (packageUrl, targetVersion) => {
   // 若需要更新 则下载完成后 覆盖本地dll文件
-  var dllOutPath;
-  var resourcePath = getResourcePath();
+  let dllOutPath;
+  const resourcePath = getResourcePath();
   if ((0, _utils.isMac)()) {
     if ((0, _utils.isArm64)()) {
-      dllOutPath = path.resolve(resourcePath, "mac/libinspectionkit_arm64_".concat(targetVersion, ".dylib"));
+      dllOutPath = path.resolve(resourcePath, `mac/libinspectionkit_arm64_${targetVersion}.dylib`);
     }
   } else {
-    dllOutPath = path.resolve(resourcePath, "dll/libinspectionkit_x64_".concat(targetVersion, ".dll"));
+    dllOutPath = path.resolve(resourcePath, `dll/libinspectionkit_x64_${targetVersion}.dll`);
   }
-  var dllStream = fs.createWriteStream(dllOutPath);
+  const dllStream = fs.createWriteStream(dllOutPath);
   request(packageUrl).pipe(dllStream).on("close", function (err) {
     if (err) {
       saasCallBack({
@@ -259,23 +187,27 @@ var updateDll = function updateDll(packageUrl, targetVersion) {
  * @param {String} udid 设备id
  * @returns 
  */
-var updateDllFileCheck = function updateDllFileCheck() {
+const updateDllFileCheck = () => {
   // mac的amd不支持更新
   if ((0, _utils.isMac)() && (0, _utils.isAmd64)()) return;
-  var updateParams = {
+  const updateParams = {
     cmd: 'hot_update',
     label: (0, _utils.isWin)() ? 'Windows' : 'Mac',
     params: {}
   };
-  var updateRes = (0, _utils2.callHunterInspectionKit)('TheForceKit', JSON.stringify(updateParams));
+  const updateRes = (0, _utils2.callHunterInspectionKit)('TheForceKit', JSON.stringify(updateParams));
   if (updateRes) {
-    var updateResObj = JSON.parse(updateRes);
-    var Code = updateResObj.Code,
-      Data = updateResObj.Data;
+    const updateResObj = JSON.parse(updateRes);
+    const {
+      Code,
+      Data
+    } = updateResObj;
     if (Code == 0) {
-      var isHot = Data.isHot,
-        url = Data.url,
-        targetVersion = Data.targetVersion;
+      const {
+        isHot,
+        url,
+        targetVersion
+      } = Data;
 
       // 需要更新 则直接下载
       isHot == 1 && updateDll(url, targetVersion);
@@ -300,28 +232,28 @@ var updateDllFileCheck = function updateDllFileCheck() {
 /**
  * 检查并安装驱动
  */
-var checkAndInstallDriver = function checkAndInstallDriver() {
-  return new Promise(function (resolve, reject) {
+const checkAndInstallDriver = () => {
+  return new Promise((resolve, reject) => {
     if (!(0, _utils.isWin)()) {
       resolve();
       return;
     }
-    (0, _winDriver.checkHasDriver)().then(function (res) {
+    (0, _winDriver.checkHasDriver)().then(res => {
       if (res) {
         resolve();
         return;
       }
-      (0, _winDriver.downloadDriver)(function (percent) {
+      (0, _winDriver.downloadDriver)(percent => {
         saasCallBack({
           data: {
             eventName: 'type_need_install_driver',
             eventCode: 0,
             eventContent: JSON.stringify({
-              percent: percent // 下载进度
+              percent // 下载进度
             })
           }
         });
-      }).then(function () {
+      }).then(() => {
         // 成功
         console.log('驱动下载并安装成功');
         saasCallBack({
@@ -331,7 +263,7 @@ var checkAndInstallDriver = function checkAndInstallDriver() {
           }
         });
         resolve();
-      }).catch(function (err) {
+      }).catch(err => {
         // 失败
         console.error('驱动下载或安装失败', err);
         Sentry.captureException('驱动下载或安装失败:' + JSON.stringify(err));
@@ -343,85 +275,54 @@ var checkAndInstallDriver = function checkAndInstallDriver() {
         });
         reject();
       });
-    }).catch(function (err) {
+    }).catch(err => {
       console.error('驱动检测失败', err);
       Sentry.captureException('驱动检测失败:' + JSON.stringify(err));
       reject();
     });
   });
 };
-var RegisterEvent = exports.RegisterEvent = /*#__PURE__*/function () {
-  var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(params, callBack) {
-    return _regenerator.default.wrap(function _callee5$(_context5) {
-      while (1) switch (_context5.prev = _context5.next) {
-        case 0:
-          saasCallBack = callBack;
+const RegisterEvent = async (params, callBack) => {
+  saasCallBack = callBack;
 
-          // 检查是否需要更新dll
-          updateDllFileCheck();
+  // 检查是否需要更新dll
+  updateDllFileCheck();
 
-          // 在插线之前就检测驱动状态
-          _context5.next = 4;
-          return checkAndInstallDriver();
-        case 4:
-          usbListener = new usbmux.createListener().on('attached', /*#__PURE__*/function () {
-            var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(udid) {
-              return _regenerator.default.wrap(function _callee4$(_context4) {
-                while (1) switch (_context4.prev = _context4.next) {
-                  case 0:
-                    if (udid) {
-                      _context4.next = 2;
-                      break;
-                    }
-                    return _context4.abrupt("return");
-                  case 2:
-                    // 插入设备通知
-                    saasCallBack({
-                      data: {
-                        eventName: 'type_usb_device_result',
-                        udid: udid,
-                        eventCode: 0
-                      }
-                    });
-                    _deviceHelper.deviceHelper.addUdid(udid);
-                    // 有驱动，直接运行脚本
-                    DevicePair(udid, params);
-                  case 5:
-                  case "end":
-                    return _context4.stop();
-                }
-              }, _callee4);
-            }));
-            return function (_x5) {
-              return _ref5.apply(this, arguments);
-            };
-          }()).on('detached', function (udid) {
-            // 拔出设备
-            saasCallBack({
-              data: {
-                eventName: 'type_usb_device_result',
-                udid: udid,
-                eventCode: -1
-              }
-            });
-            _deviceHelper.deviceHelper.removeUdid(udid);
-          }).on('error', function (err) {
-            console.log('usb连接错误：', err);
-            Sentry.captureException('usb连接错误:' + JSON.stringify(err));
-            var errMsg = "usb\u8FDE\u63A5\u9519\u8BEF\uFF1A".concat(err);
-            throw new Error(errMsg);
-          });
-        case 5:
-        case "end":
-          return _context5.stop();
+  // 在插线之前就检测驱动状态
+  await checkAndInstallDriver();
+  usbListener = new usbmux.createListener().on('attached', async udid => {
+    if (!udid) return;
+    // 插入设备通知
+    saasCallBack({
+      data: {
+        eventName: 'type_usb_device_result',
+        udid,
+        eventCode: 0
       }
-    }, _callee5);
-  }));
-  return function RegisterEvent(_x3, _x4) {
-    return _ref4.apply(this, arguments);
-  };
-}();
-var UnregisterEvent = exports.UnregisterEvent = function UnregisterEvent() {
+    });
+    _deviceHelper.deviceHelper.addUdid(udid);
+    // 有驱动，直接运行脚本
+    DevicePair(udid, params);
+  }).on('detached', function (udid) {
+    // 拔出设备
+    saasCallBack({
+      data: {
+        eventName: 'type_usb_device_result',
+        udid,
+        eventCode: -1
+      }
+    });
+    _deviceHelper.deviceHelper.removeUdid(udid);
+  }).on('error', function (err) {
+    console.log('usb连接错误：', err);
+    Sentry.captureException('usb连接错误:' + JSON.stringify(err));
+    const errMsg = `usb连接错误：${err}`;
+    throw new Error(errMsg);
+  });
+};
+exports.RegisterEvent = RegisterEvent;
+const UnregisterEvent = () => {
   usbListener && usbListener.destroy();
   _deviceHelper.deviceHelper.clearUdidList();
-};
+};
+exports.UnregisterEvent = UnregisterEvent;

package/lib/resources/version.online

@@ -1 +1 @@
-0.1.0
+0.1.1

package/lib/utils/utils.command.js

@@ -4,29 +4,28 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.command = command;
-var exec = require('child_process').exec;
-function command(cmd) {
-  var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : './';
+const exec = require('child_process').exec;
+function command(cmd, path = './') {
   // 任何你期望执行的cmd命令，ls都可以
-  var cmdStr1 = cmd;
-  var cmdPath = path;
+  let cmdStr1 = cmd;
+  let cmdPath = path;
   // 子进程名称
-  var workerProcess;
+  let workerProcess;
   runExec(cmdStr1);
   function runExec(cmdStr) {
     workerProcess = exec(cmdStr, {
       cwd: cmdPath
     });
     // 打印正常的后台可执行程序输出
-    workerProcess.stdout.on('data', function (data) {
+    workerProcess.stdout.on('data', data => {
       console.log('stdout: ' + data);
     });
     // 打印错误的后台可执行程序输出
-    workerProcess.stderr.on('data', function (data) {
+    workerProcess.stderr.on('data', data => {
       console.log('stderr: ' + data);
     });
     // 退出之后的输出
-    workerProcess.on('close', function (code) {
+    workerProcess.on('close', code => {
       console.log('out code：' + code);
     });
   }