electron-updator 0.1.6 → 1.0.1

package/build/app-updator.js

@@ -59,10 +59,10 @@ class AppUpdator extends eventemitter3_1.EventEmitter {
             this.setState(constants_1.StateType.CheckingForUpdate);
             this.emit(constants_1.EventType.CHECKING_FOR_UPDATE);
             const updateInfoResponse = await (0, utils_1.requestUpdateInfo)(this.options);
-            this.updateInfo = (this.options?.responseFormatter ? this.options?.responseFormatter(updateInfoResponse) : updateInfoResponse);
-            const needUpdate = this.options?.needUpdate(updateInfoResponse);
-            if (!needUpdate) {
-                this.logger.info(`updateInfo is ${JSON.stringify(this.updateInfo)},needUpdate is false`);
+            this.updateInfo = (this.options?.updateInfoFormatter ? this.options?.updateInfoFormatter(updateInfoResponse) : updateInfoResponse);
+            const ifNeedUpdate = this.options?.ifNeedUpdate(updateInfoResponse);
+            if (!ifNeedUpdate) {
+                this.logger.info(`ElectronUpdator#updateInfo is ${JSON.stringify(this.updateInfo)},ifNeedUpdate is false`);
                 this.emit(constants_1.EventType.UPDATE_NOT_AVAILABLE, {
                     updateInfo: this.updateInfo,
                     executeType,
@@ -70,7 +70,7 @@ class AppUpdator extends eventemitter3_1.EventEmitter {
                 this.setState(constants_1.StateType.Idle);
                 return;
             }
-            this.logger.info('ElectronUpdator#checkForUpdates:needUpdate is true');
+            this.logger.info('ElectronUpdator#checkForUpdates:ifNeedUpdate is true');
             this.availableUpdate = this.doGetAvailableUpdateInfo(this.updateInfo);
             if (!this.options?.autoDownload || executeType === constants_1.ExecuteType.User) {
                 this.logger.info('ElectronUpdator#checkForUpdates:emit UPDATE_AVAILABLE');

package/build/mac-updator.js

@@ -11,7 +11,7 @@ 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');
+        this.logger.info('ElectronUpdator#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');
@@ -27,7 +27,7 @@ class MacUpdator extends app_updator_1.AppUpdator {
         };
     }
     async doPreCheckForPackage() {
-        this.logger.info('MacUpdator#doPreCheckForPackage:start');
+        this.logger.info('ElectronUpdator#MacUpdator#doPreCheckForPackage:start');
         // Mac 全量安装前，先进行 dmg 安装检查
         return await (0, install_macos_dmg_1.default)(this.options, this.logger, this.availableUpdate, this.updateInfo, true);
     }
@@ -36,7 +36,7 @@ class MacUpdator extends app_updator_1.AppUpdator {
      * @return
      */
     async doUnzip() {
-        this.logger.info('MacUpdator#doUnzip:start');
+        this.logger.info('ElectronUpdator#MacUpdator#doUnzip:start');
         const { resourcePath, downloadTargetDir } = this.availableUpdate;
         try {
             // 直接解压
@@ -56,9 +56,9 @@ class MacUpdator extends app_updator_1.AppUpdator {
         }
     }
     async doQuitAndInstallAsar() {
-        this.logger.info('MacUpdator#doQuitAndInstallAsar:start');
+        this.logger.info('ElectronUpdator#MacUpdator#doQuitAndInstallAsar:start');
         if (!this.availableUpdate) {
-            this.logger.error('MacUpdator#doQuitAndInstallAsar:not availableUpdate');
+            this.logger.error('ElectronUpdator#MacUpdator#doQuitAndInstallAsar:not availableUpdate');
             return Promise.resolve({ success: false });
         }
         const { resourcePath, latestAsarPath } = this.availableUpdate;

package/build/utils/download-file.js

@@ -17,7 +17,7 @@ const _1 = require(".");
  * @return
  */
 const downloadFile = async ({ logger, url, signature, targetDir, progressHandle }) => {
-    logger.info('downloadFile#downloadFile (start)');
+    logger.info('ElectronUpdator#downloadFile#downloadFile (start)');
     const writeStream = (0, _1.createWriteStream)(targetDir);
     let currentLength = 0;
     let currentProgress = 0;
@@ -33,7 +33,7 @@ const downloadFile = async ({ logger, url, signature, targetDir, progressHandle
         })
             .then((res) => {
             const totalLength = res.headers['content-length'];
-            logger.info(`downloadFile#downloadFile (then),totalLength is ${totalLength}`);
+            logger.info(`ElectronUpdator#downloadFile#downloadFile (then),totalLength is ${totalLength}`);
             res.res.on('data', (data) => {
                 try {
                     currentLength += data.length;
@@ -63,7 +63,7 @@ const downloadFile = async ({ logger, url, signature, targetDir, progressHandle
                         url,
                         signature,
                     });
-                    logger.info('download file success, url:%s, to %s', url, targetDir);
+                    logger.info('ElectronUpdator#download file success, url:%s, to %s', url, targetDir);
                     resolve();
                 }
                 catch (e) {

package/build/utils/sudo-prompt-exec.js

@@ -7,15 +7,15 @@ function sudoPromptExec(appUpdatorOptions, logger, shell) {
         name: appUpdatorOptions.productName,
     };
     return new Promise((resolve, reject) => {
-        logger.warn(`update#sudoPromptExec_shell_${shell}`);
+        logger.warn(`ElectronUpdator#update#sudoPromptExec_shell_${shell}`);
         index_1.sudoPrompt.exec(shell, options, (error, stdout) => {
             if (error) {
                 reject(error);
-                logger.error(`update#sudoPromptExec_error_${error}`);
+                logger.error(`ElectronUpdator#update#sudoPromptExec_error_${error}`);
                 return;
             }
             resolve(stdout);
-            logger.warn(`update#sudoPromptExec_stdout_${stdout}`);
+            logger.warn(`ElectronUpdator#update#sudoPromptExec_stdout_${stdout}`);
         });
     });
 }

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('ElectronUpdator#WindowsUpdator#doGetAvailableUpdateInfo:start');
         const 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('ElectronUpdator#WindowsUpdator#doPreCheckForPackage:start');
         // Windows 全量安装默认预检正常
         return Promise.resolve({ success: true });
     }
     async doUnzip() {
-        this.logger.info('WindowsUpdator#doUnzip:start');
+        this.logger.info('ElectronUpdator#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('ElectronUpdator#WindowsUpdator#doUnzip:success');
         return {
             success: true,
         };
     }
     async doQuitAndInstallPackage() {
-        this.logger.info('WindowsUpdator#doQuitAndInstallPackage:success');
+        this.logger.info('ElectronUpdator#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('ElectronUpdator#WindowsUpdator#doQuitAndInstallAsar:start');
         const productName = this.options?.productName;
         const { resourcePath } = this.availableUpdate;
         const exePath = this.app.exePath;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron-updator",
-  "version": "0.1.6",
+  "version": "1.0.1",
   "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",