hunter-open-sdk 0.0.4 → 0.0.6

package/lib/registerEvent/index.js

@@ -87,21 +87,37 @@ var DevicePair = /*#__PURE__*/function () {
 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);
+    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, version) {
+var updateDll = function updateDll(packageUrl, targetVersion) {
   // 若需要更新 则下载完成后 覆盖本地dll文件
   var dllOutPath;
   if ((0, _utils.isMac)()) {
     if ((0, _utils.isArm64)()) {
-      dllOutPath = path.resolve(__dirname, "../resources/mac/arm64-".concat(version, ".dylib"));
+      dllOutPath = path.resolve(__dirname, "../resources/mac/libinspectionkit_arm64_".concat(targetVersion, ".dylib"));
     }
   } else {
-    dllOutPath = path.resolve(__dirname, "../resources/dll/x64-".concat(version, ".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) {
@@ -114,15 +130,7 @@ var updateDll = function updateDll(packageUrl, version) {
       });
     } else {
       // 写version文件内容
-      writeDllVersion(version);
-      // 下载完成后 重新初始化dll
-      (0, _utils2.HunterInspectionKit)();
-      saasCallBack({
-        data: {
-          eventName: 'type_update_result',
-          eventCode: 0 // eventCode 0 更新成功 -1 更新失败
-        }
-      });
+      writeDllVersion(targetVersion);
     }
   });
 };
@@ -133,8 +141,8 @@ var updateDll = function updateDll(packageUrl, version) {
  * @returns 
  */
 var updateDllFileCheck = function updateDllFileCheck() {
-  // amd不支持更新
-  if ((0, _utils.isAmd64)()) return;
+  // mac的amd不支持更新
+  if ((0, _utils.isMac)() && (0, _utils.isAmd64)()) return;
   var updateParams = {
     cmd: 'hot_update',
     label: (0, _utils.isWin)() ? 'Windows' : 'Mac',
@@ -148,10 +156,10 @@ var updateDllFileCheck = function updateDllFileCheck() {
     if (Code == 0) {
       var isHot = Data.isHot,
         url = Data.url,
-        version = Data.version;
+        targetVersion = Data.targetVersion;
 
       // 需要更新 则直接下载
-      isHot == 1 && updateDll(url, version);
+      isHot == 1 && updateDll(url, targetVersion);
       saasCallBack({
         data: {
           eventName: 'type_need_update',

package/lib/resources/version.online

@@ -1 +1 @@
-0.0.3
+0.0.4

package/lib/utils/utils.initDll.js

@@ -23,13 +23,13 @@ var HunterInspectionKit = exports.HunterInspectionKit = function HunterInspectio
   var version = fs.readFileSync(versionPath, 'utf-8');
   if ((0, _utils.isMac)()) {
     if ((0, _utils.isArm64)()) {
-      dllPath = path.resolve(__dirname, "../resources/mac/arm64-".concat(version, ".dylib"));
+      dllPath = path.resolve(__dirname, "../resources/mac/libinspectionkit_arm64_".concat(version, ".dylib"));
     }
     if ((0, _utils.isAmd64)()) {
-      dllPath = path.resolve(__dirname, "../resources/mac/amd64-".concat(version, ".dylib"));
+      dllPath = path.resolve(__dirname, "../resources/mac/libinspectionkit_amd64_".concat(version, ".dylib"));
     }
   } else {
-    dllPath = path.resolve(__dirname, "../resources/dll/x64-".concat(version, ".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.4",
+  "version": "0.0.6",
   "description": "采货侠SaaS版本桌面端sdk",
   "scripts": {
     "start": "zz dev",