hunter-open-sdk 0.0.2 → 0.0.4

package/README.md

@@ -1,92 +1,2 @@
-# hunter-coruscant@0.0.1
-
 采货侠SaaS版本桌面端sdk
 
-> Git仓库地址：[GitLab](http://gitlab.zhuanspirit.com/u/hunter-coruscant)
->
-> 文档线上地址：[文档](https://fe.zhuanspirit.com/u/hunter-coruscant/)
-
-## 使用
-
-### npm
-
-```bash
-$ npm i hunter-coruscant -S
-```
-
-### CDN
-
-<!-- 需要在 beetle 自行配置业务线和包名 -->
-
-```html
-<script src="https://m.zhuanzhuan.com/u/hunter-coruscant/static/js/0.0.1/index.js"></script>
-<script src="https://m.zhuanzhuan.com/u/hunter-coruscant/static/js/0.0.1/index.min.js"></script>
-```
-
-### 按需加载
-
-```bash
-$ npm i babel-plugin-import -D
-```
-
-此 `npm` 包实现了按需加载，使用时，需要设置 `babel` 配置，如下：
-
-```javascript
-// babel.config.js
-{
-  "plugins": [
-    ["import", {
-      "libraryName": "hunter-coruscant"
-    }]
-  ]
-}
-```
-
-## 开发
-
-### 命令行
-
-```bash
-# 统一的 git commit 指令
-$ npm run cz
-
-# eslint 校验
-$ npm run lint
-
-# eslint 校验并修复
-$ npm run fix
-
-# eslint 校验暂存区的文件
-$ npm run staged
-
-# 本地测试模式
-$ npm run dev
-
-# 编译代码
-$ npm run build
-
-# 发布npm包，同时gitlab标签
-$ npm run pub
-
-# 发布npm的beta包，同时gitlab标签
-$ npm run pub-beta
-
-# 删除gitlab及npm包对应版本代码
-$ npm run unpub
-
-# 打开开发文档在浏览器中运行
-$ npm run doc
-
-# 编译开发文档
-$ npm run build-doc
-
-# 上传文档到ftp
-$ npm run doc-upload
-```
-
-### 文档
-
-按照 `tsdoc` 自动生成文档
-### 更新日志
-
-每次发正式包时务必更新当前版本的 `changelog`，否则会在 `npm run pub` 这一步被驳回

package/lib/events/driver/winDriver.js

@@ -22,7 +22,7 @@ var options = {
   name: 'Electron'
 };
 var msiStr = 'AppleMobileDeviceService';
-var reddirPath = 'C:/Program Files (x86)/Common Files/Apple/Apple Application Support';
+// const reddirPath = 'C:/Program Files (x86)/Common Files/Apple/Apple Application Support'
 var cmdStr = process.platform === 'win32' ? 'tasklist' : 'ps aux';
 var CACHE_PATH = (0, _utils.isDev)() ? path.join(process.cwd(), './cache') : path.join(process.resourcesPath, './cache');
 var filePath = path.join(CACHE_PATH, './iTunesOL_Lite_64_12.10.0.7.zip');
@@ -31,7 +31,7 @@ var checkProcess = function checkProcess() {
   return new Promise(function (resolve, reject) {
     exec(cmdStr, function (err, stdout, stderr) {
       // console.log('stdout>>>', stdout)
-      // console.log('stderr>>>', stderr)
+      console.log('stderr>>>', stderr);
       if (err) {
         return reject(err);
       }
@@ -50,13 +50,14 @@ var checkProcess = function checkProcess() {
     });
   });
 };
-var checkFs = function checkFs(paths) {
-  return new Promise(function (resolve) {
-    fs.readdir(paths, function (err) {
-      resolve(err ? false : true);
-    });
-  });
-};
+// const checkFs = (paths) => {
+//   return new Promise((resolve) => {
+//     fs.readdir(paths, function(err) {
+//       resolve(err ? false : true)
+//     })
+//   })
+// }
+
 var checkCache = function checkCache() {
   return new Promise(function (resolve) {
     fs.readFile(filePath, function (err) {
@@ -114,7 +115,7 @@ var installDriver = function installDriver() {
 // 解压文件
 var uncopressingFile = function uncopressingFile(filePath) {
   return new Promise(function (resolve) {
-    compressing.zip.uncompress(filePath, CACHE_PATH).then(function (res) {
+    compressing.zip.uncompress(filePath, CACHE_PATH).then(function () {
       resolve(true);
     }).catch(function (err) {
       resolve(false);
@@ -142,28 +143,23 @@ function downloadDriver(mainWindow) {
       }
     });
     // 下载完成
-    item.on('done', /*#__PURE__*/function () {
-      var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(e, start) {
-        var uncopressing;
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 2;
-              return uncopressingFile(filePath);
-            case 2:
-              uncopressing = _context2.sent;
-              if (uncopressing) installDriver();
-              mainWindow.webContents.send('downloadDriverDone');
-            case 5:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2);
-      }));
-      return function (_x, _x2) {
-        return _ref2.apply(this, arguments);
-      };
-    }());
+    item.on('done', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+      var uncopressing;
+      return _regenerator.default.wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return uncopressingFile(filePath);
+          case 2:
+            uncopressing = _context2.sent;
+            if (uncopressing) installDriver();
+            mainWindow.webContents.send('downloadDriverDone');
+          case 5:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    })));
     item.on('error', function () {
       console.log('驱动下载失败');
     });

package/lib/getAndroidSn/index.js

@@ -10,7 +10,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _usb = require("usb");
 var GetAndroidSn = function GetAndroidSn(params, callBack) {
   _usb.usb.on('attach', /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(device, res) {
+    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(device) {
       var attachDeviceId, customWebUSB, deviceList, currentDevice;
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -52,7 +52,7 @@ var GetAndroidSn = function GetAndroidSn(params, callBack) {
         }
       }, _callee);
     }));
-    return function (_x, _x2) {
+    return function (_x) {
       return _ref.apply(this, arguments);
     };
   }());

package/lib/registerEvent/index.js

@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _utils = require("../utils/utils");
 var _utils2 = require("../utils/utils.initDll");
@@ -84,23 +82,48 @@ var DevicePair = /*#__PURE__*/function () {
     return _ref.apply(this, arguments);
   };
 }();
-var updateDll = function updateDll(packageUrl) {
+
+// 写入dll文件version
+var writeDllVersion = function writeDllVersion(version) {
+  var versionPath = path.resolve(__dirname, '../resources/version.online');
+  fs.writeFile(versionPath, version, function (err) {
+    if (err) return console.log(err);
+    console.log('========写入version成功');
+  });
+};
+
+// 下载更新dll
+var updateDll = function updateDll(packageUrl, version) {
   // 若需要更新 则下载完成后 覆盖本地dll文件
   var dllOutPath;
   if ((0, _utils.isMac)()) {
     if ((0, _utils.isArm64)()) {
-      dllOutPath = path.resolve(__dirname, '../resources/mac/arm64.dylib');
-    }
-    if ((0, _utils.isAmd64)()) {
-      dllOutPath = path.resolve(__dirname, '../resources/mac/amd64.dylib');
+      dllOutPath = path.resolve(__dirname, "../resources/mac/arm64-".concat(version, ".dylib"));
     }
   } else {
-    dllOutPath = path.resolve(__dirname, "../resources/dll/x64.dll");
+    dllOutPath = path.resolve(__dirname, "../resources/dll/x64-".concat(version, ".dll"));
   }
   var dllStream = fs.createWriteStream(dllOutPath);
-  request(packageUrl).pipe(dllStream).on("close", function () {
-    // 下载完成后 重新初始化dll
-    (0, _utils2.HunterInspectionKit)();
+  request(packageUrl).pipe(dllStream).on("close", function (err) {
+    if (err) {
+      saasCallBack({
+        data: {
+          eventName: 'type_update_result',
+          eventCode: -1 // eventCode 0 更新成功 -1 更新失败
+        }
+      });
+    } else {
+      // 写version文件内容
+      writeDllVersion(version);
+      // 下载完成后 重新初始化dll
+      (0, _utils2.HunterInspectionKit)();
+      saasCallBack({
+        data: {
+          eventName: 'type_update_result',
+          eventCode: 0 // eventCode 0 更新成功 -1 更新失败
+        }
+      });
+    }
   });
 };
 
@@ -110,97 +133,103 @@ var updateDll = function updateDll(packageUrl) {
  * @returns 
  */
 var updateDllFileCheck = function updateDllFileCheck() {
+  // amd不支持更新
+  if ((0, _utils.isAmd64)()) return;
   var updateParams = {
     cmd: 'hot_update',
     label: (0, _utils.isWin)() ? 'Windows' : 'Mac',
     params: {}
   };
   var updateRes = window.HunterInspectionKit.TheForceKit(JSON.stringify(updateParams));
-  console.log('------updateRes', updateRes);
   if (updateRes) {
     var updateResObj = JSON.parse(updateRes);
     var Code = updateResObj.Code,
       Data = updateResObj.Data;
     if (Code == 0) {
       var isHot = Data.isHot,
-        url = Data.url;
-      if (isHot == 1) {
-        // 需要更新 则直接下载
-        updateDll(url);
-      } else {}
+        url = Data.url,
+        version = Data.version;
+
+      // 需要更新 则直接下载
+      isHot == 1 && updateDll(url, version);
+      saasCallBack({
+        data: {
+          eventName: 'type_need_update',
+          eventCode: isHot == 1 ? 0 : -1 // eventCode 0 需要更新 -1 不需要更新
+        }
+      });
+    } else {
+      // 错误的时候不需要更新
+      saasCallBack({
+        data: {
+          eventName: 'type_need_update',
+          eventCode: -1 // eventCode 0 需要更新 -1 不需要更新
+        }
+      });
     }
   }
 };
-var RegisterEvent = /*#__PURE__*/function () {
-  function RegisterEvent() {
-    (0, _classCallCheck2.default)(this, RegisterEvent);
-  }
-  (0, _createClass2.default)(RegisterEvent, [{
-    key: "init",
-    value: function () {
-      var _init = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(params, callBack) {
-        return _regenerator.default.wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              saasCallBack = callBack;
+var RegisterEvent = function RegisterEvent(params, callBack) {
+  saasCallBack = callBack;
 
-              // 检查是否需要更新dll
-              updateDllFileCheck();
-              new usbmux.createListener().on('attached', /*#__PURE__*/function () {
-                var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(udid) {
-                  return _regenerator.default.wrap(function _callee2$(_context2) {
-                    while (1) switch (_context2.prev = _context2.next) {
-                      case 0:
-                        if (udid) {
-                          _context2.next = 2;
-                          break;
-                        }
-                        return _context2.abrupt("return");
-                      case 2:
-                        if ((0, _utils.isWin)()) {
-                          // windows检查驱动 mac不需要
-                          // 检查是否有驱动
-                          (0, _winDriver.checkHasDriver)().then(function (res) {
-                            if (res) {
-                              // 有驱动，直接运行脚本
-                              DevicePair(udid, params);
-                            } else {
-                              (0, _winDriver.downloadDriver)();
-                            }
-                          });
-                        } else {
-                          // 有驱动，直接运行脚本
-                          DevicePair(udid, params);
-                        }
-                      case 3:
-                      case "end":
-                        return _context2.stop();
-                    }
-                  }, _callee2);
-                }));
-                return function (_x3) {
-                  return _ref2.apply(this, arguments);
-                };
-              }()).on('detached', function (udid) {
-                console.log('--------udid', udid);
-                // clearInterval(pairTimer)
-              }).on('error', function (err) {
-                console.log('usb连接错误：', err);
-                var errMsg = "usb\u8FDE\u63A5\u9519\u8BEF\uFF1A".concat(err);
-                throw new Error(errMsg);
+  // 检查是否需要更新dll
+  updateDllFileCheck();
+  new usbmux.createListener().on('attached', /*#__PURE__*/function () {
+    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(udid) {
+      return _regenerator.default.wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            if (udid) {
+              _context2.next = 2;
+              break;
+            }
+            return _context2.abrupt("return");
+          case 2:
+            // 插入设备
+            saasCallBack({
+              data: {
+                eventName: 'type_usb_device_result',
+                udid: udid,
+                eventCode: 0
+              }
+            });
+            if ((0, _utils.isWin)()) {
+              // windows检查驱动 mac不需要
+              // 检查是否有驱动
+              (0, _winDriver.checkHasDriver)().then(function (res) {
+                if (res) {
+                  // 有驱动，直接运行脚本
+                  DevicePair(udid, params);
+                } else {
+                  (0, _winDriver.downloadDriver)();
+                }
               });
-            case 3:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3);
-      }));
-      function init(_x, _x2) {
-        return _init.apply(this, arguments);
+            } else {
+              // 有驱动，直接运行脚本
+              DevicePair(udid, params);
+            }
+          case 4:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function (_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }()).on('detached', function (udid) {
+    // 拔出设备
+    saasCallBack({
+      data: {
+        eventName: 'type_usb_device_result',
+        udid: udid,
+        eventCode: -1
       }
-      return init;
-    }()
-  }]);
-  return RegisterEvent;
-}();
+    });
+  }).on('error', function (err) {
+    console.log('usb连接错误：', err);
+    var errMsg = "usb\u8FDE\u63A5\u9519\u8BEF\uFF1A".concat(err);
+    throw new Error(errMsg);
+  });
+};
 var _default = exports.default = RegisterEvent;

package/lib/resources/version.online

@@ -0,0 +1 @@
+0.0.3

package/lib/utils/utils.initDll.js

@@ -7,6 +7,7 @@ exports.HunterInspectionKit = void 0;
 var _utils = require("./utils");
 var ffi = require('ffi-napi');
 var path = require('path');
+var fs = require('fs');
 
 /**
  * 声明dll函数
@@ -16,15 +17,19 @@ var path = require('path');
 
 var HunterInspectionKit = exports.HunterInspectionKit = function HunterInspectionKit() {
   var dllPath;
+
+  // 读取本地sdk的version
+  var versionPath = path.resolve(__dirname, '../resources/version.online');
+  var version = fs.readFileSync(versionPath, 'utf-8');
   if ((0, _utils.isMac)()) {
     if ((0, _utils.isArm64)()) {
-      dllPath = path.resolve(__dirname, '../resources/mac/arm64.dylib');
+      dllPath = path.resolve(__dirname, "../resources/mac/arm64-".concat(version, ".dylib"));
     }
     if ((0, _utils.isAmd64)()) {
-      dllPath = path.resolve(__dirname, '../resources/mac/amd64.dylib');
+      dllPath = path.resolve(__dirname, "../resources/mac/amd64-".concat(version, ".dylib"));
     }
   } else {
-    dllPath = path.resolve(__dirname, '../resources/dll/x64.dll');
+    dllPath = path.resolve(__dirname, "../resources/dll/x64-".concat(version, ".dll"));
   }
   if (!(0, _utils.isDev)()) {
     // 如果是生产模式 则替换app.asar 路径 为了在生产调用dll

package/package.json

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