graceful-updater 1.1.1-beta.1 → 1.1.2-beta.0

package/README.en.md

@@ -104,6 +104,7 @@ electronUpdator.on(EventType.UPDATE_DOWNLOAD_PROGRESS, (data) => {
 | logger | Object | No | Log method | `console` |
 | productName | String | Yes | Application Name | |
 | autoDownload | String | No | Whether to download automatically | false |
+| getWindowsHelperExeDir | Function | No | Windows helper directory | false |
 
 
 ### UpdateInfo

package/README.md

@@ -103,6 +103,7 @@ electronUpdator.on(EventType.UPDATE_DOWNLOAD_PROGRESS, (data) => {
 | logger | Object | 非必须 | 日志 | `console` |
 | productName | String | 必须 | 应用完整名称 | |
 | autoDownload | String | 非必须 | 是否自动下载 | false |
+| getWindowsHelperExeDir | Function | 非必须 | Windows 下 helper 目录 | false |
 
 
 ### UpdateInfo

package/build/app-updator.js

@@ -136,6 +136,28 @@ 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.js

@@ -12,8 +12,7 @@ const utils_1 = require("./utils");
 class MacUpdator extends app_updator_1.AppUpdator {
     doGetAvailableUpdateInfo(updateInfo) {
         this.logger.info('MacUpdator#doGetAvailableUpdateInfo:start');
-        const exePath = this.app.exePath;
-        const resourcePath = path_1.default.resolve(exePath, '..', '..', 'Resources');
+        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`;
@@ -67,6 +66,14 @@ 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');
@@ -99,21 +106,23 @@ class MacUpdator extends app_updator_1.AppUpdator {
                 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);
+        const result = await this.doInstallPackage();
         if (result.success) {
-            this.logger.warn('quitAndInstall:install success');
+            this.logger.warn('MacUpdator#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,6 +63,9 @@ 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;
@@ -80,6 +83,9 @@ 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.1-beta.1",
+  "version": "1.1.2-beta.0",
   "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",
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "eventemitter3": "^4.0.0",
-    "graceful-updater-windows-helper": "1.0.3-beta.1",
+    "graceful-updater-windows-helper": "1",
     "lodash": "4",
     "moment": "2",
     "nanoid": "^3.3.4",
@@ -70,4 +70,4 @@
     }
   },
   "license": "MIT"
-}
+}