graceful-updater 1.0.5 → 1.0.6

package/build/common/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EventType = exports.DownloadProgressStatus = exports.ExecuteType = exports.UpdateType = exports.StateType = exports.InstallResultType = exports.OldArchivePrefix = void 0;
+exports.FileName = exports.EventType = exports.DownloadProgressStatus = exports.ExecuteType = exports.UpdateType = exports.StateType = exports.InstallResultType = exports.OldArchivePrefix = void 0;
 /**
  * 更新包备份前缀
  */
@@ -115,4 +115,8 @@ var EventType;
      */
     EventType["ERROR"] = "error";
 })(EventType = exports.EventType || (exports.EventType = {}));
+var FileName;
+(function (FileName) {
+    FileName["TARGET_REPLACEMENT_ASAR"] = "latest.asar";
+})(FileName = exports.FileName || (exports.FileName = {}));
 //# sourceMappingURL=constants.js.map

package/build/mac-updator.js

@@ -11,10 +11,10 @@ const install_macos_dmg_1 = __importDefault(require("./utils/install-macos-dmg")
 const utils_1 = require("./utils");
 class MacUpdator extends app_updator_1.AppUpdator {
     doGetAvailableUpdateInfo(updateInfo) {
-        this.logger.info('ElectronUpdator#MacUpdator#doGetAvailableUpdateInfo:start');
+        this.logger.info('MacUpdator#doGetAvailableUpdateInfo:start');
         const exePath = this.app.exePath;
         const resourcePath = path_1.default.resolve(exePath, '..', '..', 'Resources');
-        const latestAsarPath = path_1.default.resolve(resourcePath, 'latest.asar');
+        const latestAsarPath = path_1.default.resolve(resourcePath, constants_1.FileName.TARGET_REPLACEMENT_ASAR);
         const latestAppPath = path_1.default.resolve(resourcePath, 'latest');
         let downloadTargetDir = `${latestAsarPath}.zip`;
         if (updateInfo.updateType === constants_1.UpdateType.Package) {
@@ -27,7 +27,7 @@ class MacUpdator extends app_updator_1.AppUpdator {
         };
     }
     async doPreCheckForPackage() {
-        this.logger.info('ElectronUpdator#MacUpdator#doPreCheckForPackage:start');
+        this.logger.info('MacUpdator#doPreCheckForPackage:start');
         // Mac 全量安装前，先进行 dmg 安装检查
         return await (0, install_macos_dmg_1.default)(this.options, this.logger, this.availableUpdate, this.updateInfo, true);
     }
@@ -36,14 +36,25 @@ class MacUpdator extends app_updator_1.AppUpdator {
      * @return
      */
     async doUnzip() {
-        this.logger.info('MacUpdator#doUnzip:start');
-        const { resourcePath, downloadTargetDir } = this.availableUpdate;
+        const { resourcePath, downloadTargetDir, latestAsarPath } = this.availableUpdate;
+        this.logger.info('MacUpdator#doUnzip:start, unzip %s, to %s', downloadTargetDir, resourcePath);
         try {
             // 直接解压
             await (0, utils_1.execAsync)(`unzip -o ${downloadTargetDir}`, {
                 cwd: resourcePath,
                 maxBuffer: 2 ** 28,
             });
+            if (!await (0, utils_1.existsAsync)(latestAsarPath)) {
+                const zipInfo = await (0, utils_1.execAsync)(`unzip -Z -1 ${downloadTargetDir}`, {
+                    cwd: resourcePath,
+                    maxBuffer: 2 ** 28,
+                });
+                const fileName = zipInfo?.stdout?.trim();
+                if (fileName !== constants_1.FileName.TARGET_REPLACEMENT_ASAR) {
+                    const currentAsarPath = path_1.default.join(resourcePath, fileName);
+                    await (0, utils_1.renameAsync)(currentAsarPath, latestAsarPath);
+                }
+            }
             return {
                 success: true,
             };
@@ -56,9 +67,9 @@ class MacUpdator extends app_updator_1.AppUpdator {
         }
     }
     async doQuitAndInstallAsar() {
-        this.logger.info('ElectronUpdator#MacUpdator#doQuitAndInstallAsar:start');
+        this.logger.info('MacUpdator#doQuitAndInstallAsar:start');
         if (!this.availableUpdate) {
-            this.logger.error('ElectronUpdator#MacUpdator#doQuitAndInstallAsar:not availableUpdate');
+            this.logger.error('MacUpdator#doQuitAndInstallAsar:not availableUpdate');
             return Promise.resolve({ success: false });
         }
         const { resourcePath, latestAsarPath } = this.availableUpdate;
@@ -88,14 +99,14 @@ class MacUpdator extends app_updator_1.AppUpdator {
                 error,
             };
         }
-        this.logger.warn('quitAndInstall:install success');
+        this.logger.warn('MacUpdator#quitAndInstall:install success');
         this.app.relaunch();
         return {
             success: true,
         };
     }
     async doQuitAndInstallPackage() {
-        this.logger.info('ElectronUpdator#doQuitAndInstallPackage:start');
+        this.logger.info('MacUpdator#doQuitAndInstallPackage:start');
         const result = await (0, install_macos_dmg_1.default)(this.options, this.logger, this.availableUpdate, this.updateInfo);
         if (result.success) {
             this.logger.warn('quitAndInstall:install success');

package/build/windows-updator.js

@@ -32,12 +32,24 @@ class WindowsUpdator extends app_updator_1.AppUpdator {
         return Promise.resolve({ success: true });
     }
     async doUnzip() {
+        const { downloadTargetDir, resourcePath, latestAsarPath } = this.availableUpdate;
         this.logger.info('WindowsUpdator#doUnzip:start');
         try {
-            const { downloadTargetDir, resourcePath } = this.availableUpdate;
             const unzipExe = (0, utils_1.getExecuteFile)(this._windowHelperExeDir, 'unzip.exe');
             const executeCommand = `"${unzipExe}" -o "${downloadTargetDir}" -d "${resourcePath}"`;
             await (0, utils_1.execAsync)(executeCommand);
+            if (!await (0, utils_1.existsAsync)(latestAsarPath)) {
+                const zipInfoCommand = `"${unzipExe}" -Z -1 "${downloadTargetDir}"`;
+                const zipInfo = await (0, utils_1.execAsync)(zipInfoCommand, {
+                    cwd: resourcePath,
+                    maxBuffer: 2 ** 28,
+                });
+                const fileName = zipInfo?.stdout?.trim();
+                if (fileName !== constants_1.FileName.TARGET_REPLACEMENT_ASAR) {
+                    const currentAsarPath = path_1.default.join(resourcePath, fileName);
+                    await (0, utils_1.renameAsync)(currentAsarPath, latestAsarPath);
+                }
+            }
         }
         catch (error) {
             return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graceful-updater",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "graceful-updater is a software updator management solution for Electron applications, It is convenient to complete full software update and dynamic update.",
   "scripts": {
     "build": "sh ./build.sh",