electron-updator 0.1.3 → 0.1.5

package/README.md

@@ -2,7 +2,6 @@
 
 [![NPM version][npm-image]][npm-url]
 [![CI][ci-image]][ci-url]
-[![Test coverage][codecov-image]][codecov-url]
 [![node version][node-image]][node-url]
 [![npm download][download-image]][download-url]
 
@@ -10,8 +9,6 @@
 [npm-url]: https://npmjs.org/package/electron-updator
 [ci-image]: https://github.com/electron-modules/electron-updator/actions/workflows/ci.yml/badge.svg
 [ci-url]: https://github.com/electron-modules/electron-updator/actions/workflows/ci.yml
-[codecov-image]: https://img.shields.io/codecov/c/github/electron-modules/electron-updator.svg?logo=codecov
-[codecov-url]: https://codecov.io/gh/electron-modules/electron-updator
 [node-image]: https://img.shields.io/badge/node.js-%3E=_16-green.svg
 [node-url]: http://nodejs.org/download/
 [download-image]: https://img.shields.io/npm/dm/electron-updator.svg
@@ -28,11 +25,11 @@ $ npm i electron-updator --save
 
 ## Contributors
 
-|[<img src="https://avatars.githubusercontent.com/u/1011681?v=4" width="100px;"/><br/><sub><b>xudafeng</b></sub>](https://github.com/xudafeng)<br/>|[<img src="https://avatars.githubusercontent.com/u/4081746?v=4" width="100px;"/><br/><sub><b>zlyi</b></sub>](https://github.com/zlyi)<br/>|
-| :---: | :---: |
+|[<img src="https://avatars.githubusercontent.com/u/4081746?v=4" width="100px;"/><br/><sub><b>zlyi</b></sub>](https://github.com/zlyi)<br/>|[<img src="https://avatars.githubusercontent.com/u/1011681?v=4" width="100px;"/><br/><sub><b>xudafeng</b></sub>](https://github.com/xudafeng)<br/>|[<img src="https://avatars.githubusercontent.com/u/52845048?v=4" width="100px;"/><br/><sub><b>snapre</b></sub>](https://github.com/snapre)<br/>|
+| :---: | :---: | :---: |
 
 
-This project follows the git-contributor [spec](https://github.com/xudafeng/git-contributor), auto updated at `Mon Jan 30 2023 19:21:07 GMT+0800`.
+This project follows the git-contributor [spec](https://github.com/xudafeng/git-contributor), auto updated at `Tue Jan 31 2023 14:31:40 GMT+0800`.
 
 <!-- GITCONTRIBUTOR_END -->
 

package/build/app-updator.js

@@ -14,7 +14,7 @@ class AppUpdator extends eventemitter3_1.EventEmitter {
         this.logger = this._wrapLogger(options.logger);
         this.app = app || new elelctron_app_adapter_1.ElectronAppAdapter();
         this.startTimeStamp = new Date().getTime();
-        this.logger.info('AppUpdator#constructor');
+        this.logger.info('ElectronUpdator#constructor');
         this.availableUpdate = {
             resourcePath: '',
             latestAsarPath: '',
@@ -41,30 +41,17 @@ class AppUpdator extends eventemitter3_1.EventEmitter {
         return _logger;
     }
     setState(state) {
-        this.logger.info(`AppUpdator#setState${state}`);
+        this.logger.info(`ElectronUpdator#setState${state}`);
         this.state = state;
     }
     setFeedUrl(url) {
-        this.logger.info(`AppUpdator#setFeedUrl:url is ${url}`);
+        this.logger.info(`ElectronUpdator#setFeedUrl:url is ${url}`);
         if (url && this.options) {
             this.options.url = url;
         }
     }
     async checkForUpdates(executeType = constants_1.ExecuteType.Auto) {
-        this.logger.info(`AppUpdator#checkForUpdates:state is ${this.state}`);
-        if (executeType === constants_1.ExecuteType.User) {
-            if (this.state === "downloaded" /* StateType.Downloaded */) {
-                this.logger.info(`AppUpdator#checkForUpdates:UPDATE_DOWNLOADED`);
-                this.emit(constants_1.EventType.UPDATE_DOWNLOADED, {
-                    executeType,
-                });
-            }
-            else {
-                this.logger.info(`AppUpdator#checkForUpdates:UPDATE_NOT_AVAILABLE`);
-                this.emit(constants_1.EventType.UPDATE_NOT_AVAILABLE, { updateInfo: this.updateInfo });
-            }
-            return;
-        }
+        this.logger.info(`ElectronUpdator#checkForUpdates:state is ${this.state}`);
         this.setState("idle" /* StateType.Idle */);
         try {
             // 新一轮更新流程，更新 TimeStamp
@@ -76,17 +63,20 @@ class AppUpdator extends eventemitter3_1.EventEmitter {
             const needUpdate = this.options?.needUpdate(updateInfoResponse);
             if (!needUpdate) {
                 this.logger.info(`updateInfo is ${JSON.stringify(this.updateInfo)},needUpdate is false`);
-                this.emit(constants_1.EventType.UPDATE_NOT_AVAILABLE, { updateInfo: this.updateInfo });
+                this.emit(constants_1.EventType.UPDATE_NOT_AVAILABLE, {
+                    updateInfo: this.updateInfo,
+                    executeType,
+                });
                 this.setState("idle" /* StateType.Idle */);
                 return;
             }
-            this.logger.info(`AppUpdator#checkForUpdates:needUpdate is true`);
+            this.logger.info('ElectronUpdator#checkForUpdates:needUpdate is true');
             this.availableUpdate = this.doGetAvailableUpdateInfo(this.updateInfo);
-            if (!this.options?.autoDownload) {
-                this.logger.info(`AppUpdator#checkForUpdates:emit UPDATE_AVAILABLE`);
+            if (!this.options?.autoDownload || executeType === constants_1.ExecuteType.User) {
+                this.logger.info('ElectronUpdator#checkForUpdates:emit UPDATE_AVAILABLE');
                 this.emit(constants_1.EventType.UPDATE_AVAILABLE, {
-                    executeType,
                     updateInfo: this.updateInfo,
+                    executeType,
                 });
                 return;
             }
@@ -99,11 +89,11 @@ class AppUpdator extends eventemitter3_1.EventEmitter {
         }
     }
     async downloadUpdate(executeType = constants_1.ExecuteType.User) {
-        this.logger.info(`AppUpdator#downloadUpdate:executeType is ${executeType}`);
+        this.logger.info(`ElectronUpdator#downloadUpdate:executeType is ${executeType}`);
         await this.downloadUpdateFile(this.updateInfo);
         const result = await this.preCheck();
         if (result.success) {
-            this.logger.info(`AppUpdator#downloadUpdate:emit UPDATE_DOWNLOADED`);
+            this.logger.info('ElectronUpdator#downloadUpdate:emit UPDATE_DOWNLOADED');
             this.emit(constants_1.EventType.UPDATE_DOWNLOADED, {
                 executeType,
             });
@@ -114,8 +104,9 @@ class AppUpdator extends eventemitter3_1.EventEmitter {
         }
     }
     async quitAndInstall() {
-        this.logger.info(`AppUpdator#quitAndInstall:state is ${this.state}`);
+        this.logger.info(`ElectronUpdator#quitAndInstall:state is ${this.state}`);
         if (this.state !== "downloaded" /* StateType.Downloaded */) {
+            this.downloadUpdate();
             return;
         }
         this.setState("idle" /* StateType.Idle */);
@@ -128,7 +119,7 @@ class AppUpdator extends eventemitter3_1.EventEmitter {
                 result = await this.doQuitAndInstallAsar();
             }
             if (result.success) {
-                this.logger.warn(`AppUpdator#quitAndInstall:install success`);
+                this.logger.warn('ElectronUpdator#quitAndInstall:install success');
                 this.emit(constants_1.EventType.BEFORE_QUIT_FOR_UPDATE);
             }
             else {
@@ -141,21 +132,21 @@ class AppUpdator extends eventemitter3_1.EventEmitter {
         }
     }
     async preCheckForAsar() {
-        this.logger.info(`AppUpdator#preCheckForAsar`);
+        this.logger.info('ElectronUpdator#preCheckForAsar');
         return await this.unzip();
     }
     async preCheck() {
-        this.logger.info(`AppUpdator#preCheck`);
+        this.logger.info('ElectronUpdator#preCheck');
         const { resourcePath } = this.availableUpdate;
         if (this.state !== "downloaded" /* StateType.Downloaded */) {
             return {
                 success: false,
-                error: new Error(`AppUpdator#preCheck:update status(${this.state}) error`),
+                error: new Error(`ElectronUpdator#preCheck:update status(${this.state}) error`),
             };
         }
         // 清理老包
         try {
-            this.logger.info(`AppUpdator#preCheck:cleanOldArchive`);
+            this.logger.info('ElectronUpdator#preCheck:cleanOldArchive');
             await (0, utils_1.cleanOldArchive)(resourcePath);
         }
         catch (e) {
@@ -189,7 +180,7 @@ class AppUpdator extends eventemitter3_1.EventEmitter {
     }
     async downloadUpdateFile(updateInfo) {
         if (this.state !== "checking-for-update" /* StateType.CheckingForUpdate */) {
-            throw new Error(`AppUpdator#downloadUpdateFile:update status(${this.state}) error`);
+            throw new Error(`ElectronUpdator#downloadUpdateFile:update status(${this.state}) error`);
         }
         const { url, signature } = updateInfo.files[0];
         const { downloadTargetDir } = this.availableUpdate;
@@ -205,7 +196,7 @@ class AppUpdator extends eventemitter3_1.EventEmitter {
                     this.emit(constants_1.EventType.UPDATE_DOWNLOAD_PROGRESS, data);
                 },
             });
-            this.logger.info(`AppUpdator#downloadUpdateFile:Downloaded`);
+            this.logger.info('ElectronUpdator#downloadUpdateFile:Downloaded');
             this.setState("downloaded" /* StateType.Downloaded */);
         }
         catch (e) {
@@ -215,7 +206,7 @@ class AppUpdator extends eventemitter3_1.EventEmitter {
         }
     }
     async unzip() {
-        this.logger.info(`AppUpdator#unzip:start`);
+        this.logger.info('ElectronUpdator#unzip:start');
         try {
             const result = await this.doUnzip();
             if (!result.success) {

package/build/mac-updator.js

@@ -91,16 +91,12 @@ class MacUpdator extends app_updator_1.AppUpdator {
                 error,
             };
         }
-        this.logger.warn('AppUpdator#quitAndInstall:install success');
-        this.emit(constants_1.EventType.BEFORE_QUIT_FOR_UPDATE);
-        // 重启应用
-        this.app.relaunch();
         return {
             success: true,
         };
     }
     async doQuitAndInstallPackage() {
-        this.logger.info('AppUpdator#doQuitAndInstallPackage:start');
+        this.logger.info('ElectronUpdator#doQuitAndInstallPackage:start');
         return await (0, install_macos_dmg_1.default)(this.options, this.logger, this.availableUpdate, this.updateInfo);
     }
 }

package/build/utils/download-file.js

@@ -20,6 +20,7 @@ const downloadFile = async ({ logger, url, signature, targetDir, progressHandle
     logger.info('downloadFile#downloadFile (start)');
     const writeStream = (0, _1.createWriteStream)(targetDir);
     let currentLength = 0;
+    let currentProgress = 0;
     progressHandle({
         status: constants_1.DownloadProgressStatus.Begin,
     });
@@ -37,9 +38,12 @@ const downloadFile = async ({ logger, url, signature, targetDir, progressHandle
                 try {
                     currentLength += data.length;
                     const progress = (currentLength / totalLength) * 100;
+                    if (progress > currentProgress) {
+                        currentProgress++;
+                    }
                     progressHandle({
                         status: constants_1.DownloadProgressStatus.Downloading,
-                        progress,
+                        progress: currentProgress,
                         url,
                         signature,
                         data,

package/build/utils/index.js

@@ -5,12 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExecuteFile = exports.requestUpdateInfo = exports.existFile = exports.cleanOldArchive = exports.spawnAsync = exports.waitUntil = exports.sleep = exports.getMacOSAppPath = exports.sudoPrompt = exports.existsSync = exports.createWriteStream = exports.isMac = exports.isWin = exports.execAsync = exports.rimrafAsync = exports.readdirAsync = exports.existsAsync = exports.renameAsync = void 0;
 const path_1 = __importDefault(require("path"));
-const child_process_1 = require("child_process");
 const util_1 = __importDefault(require("util"));
 const urllib_1 = __importDefault(require("urllib"));
 const sudo_prompt_alt_1 = __importDefault(require("sudo-prompt-alt"));
 exports.sudoPrompt = sudo_prompt_alt_1.default;
 const rimraf_alt_1 = __importDefault(require("rimraf-alt"));
+const child_process_1 = require("child_process");
 const original_fs_1 = require("original-fs");
 Object.defineProperty(exports, "existsSync", { enumerable: true, get: function () { return original_fs_1.existsSync; } });
 Object.defineProperty(exports, "createWriteStream", { enumerable: true, get: function () { return original_fs_1.createWriteStream; } });

package/build/windows-updator.js

@@ -12,7 +12,7 @@ const app_updator_1 = require("./app-updator");
 const utils_1 = require("./utils");
 class WindowsUpdator extends app_updator_1.AppUpdator {
     doGetAvailableUpdateInfo(updateInfo) {
-        this.logger.info(`WindowsUpdator#doGetAvailableUpdateInfo:start`);
+        this.logger.info('WindowsUpdator#doGetAvailableUpdateInfo:start');
         let resourcePath = path_1.default.resolve(this.app.userDataPath);
         const latestAsarPath = path_1.default.resolve(resourcePath, 'latest.asar');
         const latestAppPath = path_1.default.resolve(resourcePath, 'latest');
@@ -27,12 +27,12 @@ class WindowsUpdator extends app_updator_1.AppUpdator {
         };
     }
     async doPreCheckForPackage() {
-        this.logger.info(`WindowsUpdator#doPreCheckForPackage:start`);
+        this.logger.info('WindowsUpdator#doPreCheckForPackage:start');
         // Windows 全量安装默认预检正常
         return Promise.resolve({ success: true });
     }
     async doUnzip() {
-        this.logger.info(`WindowsUpdator#doUnzip:start`);
+        this.logger.info('WindowsUpdator#doUnzip:start');
         try {
             const { downloadTargetDir, resourcePath } = this.availableUpdate;
             const unzipExe = (0, utils_1.getExecuteFile)('unzip.exe');
@@ -45,13 +45,13 @@ class WindowsUpdator extends app_updator_1.AppUpdator {
                 error,
             };
         }
-        this.logger.info(`WindowsUpdator#doUnzip:success`);
+        this.logger.info('WindowsUpdator#doUnzip:success');
         return {
             success: true,
         };
     }
     async doQuitAndInstallPackage() {
-        this.logger.info(`WindowsUpdator#doQuitAndInstallPackage:success`);
+        this.logger.info('WindowsUpdator#doQuitAndInstallPackage:success');
         const { downloadTargetDir } = this.availableUpdate;
         try {
             // Windows 全量安装
@@ -67,7 +67,7 @@ class WindowsUpdator extends app_updator_1.AppUpdator {
         }
     }
     async doQuitAndInstallAsar() {
-        this.logger.info(`WindowsUpdator#doQuitAndInstallAsar:start`);
+        this.logger.info('WindowsUpdator#doQuitAndInstallAsar:start');
         const productName = this.options?.productName;
         const { resourcePath } = this.availableUpdate;
         const exePath = this.app.exePath;
@@ -76,6 +76,8 @@ class WindowsUpdator extends app_updator_1.AppUpdator {
         const executeCommand = `"${updateExePath}" "${targetPath}" "${resourcePath}" "${productName}.exe" "${exePath}"`;
         try {
             await (0, sudo_prompt_exec_1.sudoPromptExec)(this.options, this.logger, executeCommand);
+            this.logger.warn('ElectronUpdator#quitAndInstall:install success');
+            this.emit(constants_1.EventType.BEFORE_QUIT_FOR_UPDATE);
             return Promise.resolve({ success: true });
         }
         catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron-updator",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "electron-updator 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",
@@ -26,11 +26,11 @@
   },
   "dependencies": {
     "eventemitter3": "^4.0.0",
-    "lodash": "4.17.21",
-    "moment": "2.29.4",
+    "lodash": "4",
+    "moment": "2",
     "rimraf-alt": "*",
     "sudo-prompt-alt": "9",
-    "urllib": "2.34.1"
+    "urllib": "2"
   },
   "devDependencies": {
     "@applint/spec": "^1.2.0",
@@ -48,6 +48,8 @@
     "electron": "18",
     "electron-windows": "18",
     "eslint": "^7.32.0",
+    "eslint-config-egg": "^9.0.0",
+    "eslint-plugin-no-only-tests": "^2.6.0",
     "git-contributor": "*",
     "husky": "^7.0.4",
     "mm": "^3.0.2",
@@ -67,4 +69,4 @@
     }
   },
   "license": "MIT"
-}
+}