graceful-updater 1.1.2-beta.1 → 1.1.2

package/build/app-updator.js

@@ -136,28 +136,6 @@ class AppUpdator extends eventemitter3_1.EventEmitter {
             this.dispatchError(e);
         }
     }
-    async install() {
-        this.logger.info(`install:state is ${this.state}`);
-        let result = { success: false };
-        this.setState(constants_1.StateType.Idle);
-        try {
-            this.emit(constants_1.EventType.BEFORE_QUIT_FOR_UPDATE);
-            if (this.updateInfo?.updateType === constants_1.UpdateType.Package) {
-                result = await this.doInstallPackage();
-            }
-            else {
-                result = await this.doInstallAsar();
-            }
-            if (!result.success) {
-                result.message = `error: ${result.error?.message}`;
-                this.dispatchError(result.error);
-            }
-        }
-        catch (e) {
-            this.dispatchError(e);
-        }
-        return result;
-    }
     async preCheckForAsar() {
         this.logger.info('preCheckForAsar');
         return await this.unzip();

package/build/mac-updator copy.js

@@ -0,0 +1,120 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MacUpdator = void 0;
+const path_1 = __importDefault(require("path"));
+const app_updator_1 = require("./app-updator");
+const constants_1 = require("./common/constants");
+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('MacUpdator#doGetAvailableUpdateInfo:start');
+        const resourcePath = path_1.default.resolve(this.app.userDataPath);
+        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) {
+            downloadTargetDir = `${latestAppPath}.dmg`;
+        }
+        return {
+            resourcePath,
+            downloadTargetDir,
+            latestAsarPath,
+        };
+    }
+    async doPreCheckForPackage() {
+        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);
+    }
+    /**
+     * 资源解压
+     * @return
+     */
+    async doUnzip() {
+        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,
+            };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error,
+            };
+        }
+    }
+    async doQuitAndInstallAsar() {
+        this.logger.info('MacUpdator#doQuitAndInstallAsar:start');
+        if (!this.availableUpdate) {
+            this.logger.error('MacUpdator#doQuitAndInstallAsar:not availableUpdate');
+            return Promise.resolve({ success: false });
+        }
+        const { resourcePath, latestAsarPath } = this.availableUpdate;
+        const oldAsarPath = path_1.default.resolve(resourcePath, `${constants_1.OldArchivePrefix}${new Date().getTime()}.asar`);
+        const exePath = this.app.exePath;
+        const currentPath = path_1.default.resolve(exePath, '..', '..', 'Resources');
+        const currentAsarPath = path_1.default.resolve(currentPath, 'app.asar');
+        try {
+            // 将老包改名 app.asar => old-xxxx.asar
+            if (await (0, utils_1.existsAsync)(currentAsarPath)) {
+                await (0, utils_1.renameAsync)(currentAsarPath, oldAsarPath);
+            }
+        }
+        catch (error) {
+            return {
+                success: false,
+                error,
+            };
+        }
+        try {
+            // 新包替换
+            await (0, utils_1.renameAsync)(latestAsarPath, currentAsarPath);
+        }
+        catch (error) {
+            // 替换出错，需要把老包还原
+            await (0, utils_1.renameAsync)(oldAsarPath, currentAsarPath);
+            return {
+                success: false,
+                error,
+            };
+        }
+        this.logger.warn('MacUpdator#quitAndInstall:install success');
+        this.app.relaunch();
+        return {
+            success: true,
+        };
+    }
+    async doQuitAndInstallPackage() {
+        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');
+            this.app.relaunch();
+        }
+        return result;
+    }
+}
+exports.MacUpdator = MacUpdator;
+//# sourceMappingURL=mac-updator%20copy.js.map

package/build/mac-updator.js

@@ -12,12 +12,12 @@ const utils_1 = require("./utils");
 class MacUpdator extends app_updator_1.AppUpdator {
     doGetAvailableUpdateInfo(updateInfo) {
         this.logger.info('MacUpdator#doGetAvailableUpdateInfo:start');
-        const resourcePath = path_1.default.resolve(this.app.userDataPath);
+        const exePath = this.app.exePath;
+        const resourcePath = path_1.default.resolve(exePath, '..', '..', 'Resources');
         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) {
-            downloadTargetDir = `${latestAppPath}.dmg`;
+            downloadTargetDir = path_1.default.resolve(path_1.default.resolve(this.app.userDataPath), 'latest.dmg');
         }
         return {
             resourcePath,
@@ -39,12 +39,12 @@ class MacUpdator extends app_updator_1.AppUpdator {
         this.logger.info('MacUpdator#doUnzip:start, unzip %s, to %s', downloadTargetDir, resourcePath);
         try {
             // 直接解压
-            await (0, utils_1.execAsync)(`unzip -o '${downloadTargetDir}'`, {
+            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}'`, {
+                const zipInfo = await (0, utils_1.execAsync)(`unzip -Z -1 ${downloadTargetDir}`, {
                     cwd: resourcePath,
                     maxBuffer: 2 ** 28,
                 });
@@ -66,14 +66,6 @@ class MacUpdator extends app_updator_1.AppUpdator {
         }
     }
     async doQuitAndInstallAsar() {
-        const result = await this.doInstallAsar();
-        if (result.success) {
-            this.logger.warn('MacUpdator#quitAndInstall:install success');
-            this.app.relaunch();
-        }
-        return result;
-    }
-    async doInstallAsar() {
         this.logger.info('MacUpdator#doQuitAndInstallAsar:start');
         if (!this.availableUpdate) {
             this.logger.error('MacUpdator#doQuitAndInstallAsar:not availableUpdate');
@@ -81,9 +73,7 @@ class MacUpdator extends app_updator_1.AppUpdator {
         }
         const { resourcePath, latestAsarPath } = this.availableUpdate;
         const oldAsarPath = path_1.default.resolve(resourcePath, `${constants_1.OldArchivePrefix}${new Date().getTime()}.asar`);
-        const exePath = this.app.exePath;
-        const currentPath = path_1.default.resolve(exePath, '..', '..', 'Resources');
-        const currentAsarPath = path_1.default.resolve(currentPath, 'app.asar');
+        const currentAsarPath = path_1.default.resolve(resourcePath, 'app.asar');
         try {
             // 将老包改名 app.asar => old-xxxx.asar
             if (await (0, utils_1.existsAsync)(currentAsarPath)) {
@@ -108,23 +98,21 @@ class MacUpdator extends app_updator_1.AppUpdator {
                 error,
             };
         }
+        this.logger.warn('MacUpdator#quitAndInstall:install success');
+        this.app.relaunch();
         return {
             success: true,
         };
     }
     async doQuitAndInstallPackage() {
-        const result = await this.doInstallPackage();
+        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('MacUpdator#quitAndInstall:install success');
+            this.logger.warn('quitAndInstall:install success');
             this.app.relaunch();
         }
         return result;
     }
-    async doInstallPackage() {
-        this.logger.info('MacUpdator#doQuitAndInstallPackage:start');
-        const result = await (0, install_macos_dmg_1.default)(this.options, this.logger, this.availableUpdate, this.updateInfo);
-        return result;
-    }
 }
 exports.MacUpdator = MacUpdator;
 //# sourceMappingURL=mac-updator.js.map

package/build/windows-updator.js

@@ -63,9 +63,6 @@ class WindowsUpdator extends app_updator_1.AppUpdator {
             success: true,
         };
     }
-    async doInstallPackage() {
-        return { success: false };
-    }
     async doQuitAndInstallPackage() {
         this.logger.info('WindowsUpdator#doQuitAndInstallPackage:success');
         const { downloadTargetDir } = this.availableUpdate;
@@ -83,9 +80,6 @@ class WindowsUpdator extends app_updator_1.AppUpdator {
             return Promise.resolve({ success: false, error });
         }
     }
-    async doInstallAsar() {
-        return { success: false };
-    }
     async doQuitAndInstallAsar() {
         this.logger.info('WindowsUpdator#doQuitAndInstallAsar:start');
         const productName = this.options?.productName;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graceful-updater",
-  "version": "1.1.2-beta.1",
+  "version": "1.1.2",
   "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",
@@ -70,4 +70,4 @@
     }
   },
   "license": "MIT"
-}
+}