hunter-open-sdk 0.0.3 → 0.0.6

package/README.md

@@ -1,4 +1,2 @@
-# hunter-coruscant@0.0.1
-
 采货侠SaaS版本桌面端sdk
 

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

@@ -82,18 +82,42 @@ 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) {
+      saasCallBack({
+        data: {
+          eventName: 'type_update_result',
+          eventCode: -1 // eventCode 0 更新成功 -1 更新失败
+        }
+      });
+      return;
+    }
+    console.log('========写入version成功');
+    // 写入成功后 重新初始化dll
+    (0, _utils2.HunterInspectionKit)();
+    saasCallBack({
+      data: {
+        eventName: 'type_update_result',
+        eventCode: 0 // eventCode 0 更新成功 -1 更新失败
+      }
+    });
+  });
+};
+
+// 下载更新dll
+var updateDll = function updateDll(packageUrl, targetVersion) {
   // 若需要更新 则下载完成后 覆盖本地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/libinspectionkit_arm64_".concat(targetVersion, ".dylib"));
     }
   } else {
-    dllOutPath = path.resolve(__dirname, "../resources/dll/x64.dll");
+    dllOutPath = path.resolve(__dirname, "../resources/dll/libinspectionkit_x64_".concat(targetVersion, ".dll"));
   }
   var dllStream = fs.createWriteStream(dllOutPath);
   request(packageUrl).pipe(dllStream).on("close", function (err) {
@@ -105,14 +129,8 @@ var updateDll = function updateDll(packageUrl) {
         }
       });
     } else {
-      // 下载完成后 重新初始化dll
-      (0, _utils2.HunterInspectionKit)();
-      saasCallBack({
-        data: {
-          eventName: 'type_update_result',
-          eventCode: 0 // eventCode 0 更新成功 -1 更新失败
-        }
-      });
+      // 写version文件内容
+      writeDllVersion(targetVersion);
     }
   });
 };
@@ -123,6 +141,8 @@ var updateDll = function updateDll(packageUrl) {
  * @returns 
  */
 var updateDllFileCheck = function updateDllFileCheck() {
+  // mac的amd不支持更新
+  if ((0, _utils.isMac)() && (0, _utils.isAmd64)()) return;
   var updateParams = {
     cmd: 'hot_update',
     label: (0, _utils.isWin)() ? 'Windows' : 'Mac',
@@ -135,10 +155,11 @@ var updateDllFileCheck = function updateDllFileCheck() {
       Data = updateResObj.Data;
     if (Code == 0) {
       var isHot = Data.isHot,
-        url = Data.url;
+        url = Data.url,
+        targetVersion = Data.targetVersion;
 
       // 需要更新 则直接下载
-      isHot == 1 && updateDll(url);
+      isHot == 1 && updateDll(url, targetVersion);
       saasCallBack({
         data: {
           eventName: 'type_need_update',

package/lib/resources/version.online

@@ -0,0 +1 @@
+0.0.4

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/libinspectionkit_arm64_".concat(version, ".dylib"));
     }
     if ((0, _utils.isAmd64)()) {
-      dllPath = path.resolve(__dirname, '../resources/mac/amd64.dylib');
+      dllPath = path.resolve(__dirname, "../resources/mac/libinspectionkit_amd64_".concat(version, ".dylib"));
     }
   } else {
-    dllPath = path.resolve(__dirname, '../resources/dll/x64.dll');
+    dllPath = path.resolve(__dirname, "../resources/dll/libinspectionkit_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.3",
+  "version": "0.0.6",
   "description": "采货侠SaaS版本桌面端sdk",
   "scripts": {
     "start": "zz dev",