electron-incremental-update 2.3.8 → 2.4.0

package/README.md

@@ -103,7 +103,6 @@ export default defineConfig(async ({ command }) => {
     plugins: [
       electronWithUpdater({
         isBuild,
-        logParsedOptions: true,
         main: {
           files: ['./electron/main/index.ts', './electron/main/worker.ts'],
           // see https://github.com/electron-vite/electron-vite-vue/blob/85ed267c4851bf59f32888d766c0071661d4b94c/vite.config.ts#L22-L28
@@ -824,12 +823,6 @@ export interface ElectronWithUpdaterOptions {
    * @default isCI
    */
   buildVersionJson?: boolean
-  /**
-   * Whether to log parsed options
-   *
-   * To show certificate and private keys, set `logParsedOptions: { showKeys: true }`
-   */
-  logParsedOptions?: boolean | { showKeys: boolean }
   /**
    * Main process options
    *

package/dist/index.cjs

@@ -56,6 +56,7 @@ var Updater = class extends events.EventEmitter {
   controller;
   info;
   tmpFilePath;
+  processing = false;
   provider;
   /**
    * Updater logger
@@ -142,9 +143,17 @@ var Updater = class extends events.EventEmitter {
   async checkForUpdates(data) {
     const emitUnavailable = (msg, code, info2) => {
       this.logger?.info(`[${code}] ${msg}`);
+      this.logger?.debug("Check update end");
+      this.processing = false;
       this.emit("update-not-available", code, msg, info2);
       return false;
     };
+    if (this.processing) {
+      this.logger?.info("Updater is already processing, skip check update");
+      return false;
+    }
+    this.processing = true;
+    this.logger?.debug("Check update start");
     if (!data && !this.provider) {
       const msg = "No update json or provider";
       this.err("Check update failed", "ERR_PARAM", msg);
@@ -195,8 +204,10 @@ var Updater = class extends events.EventEmitter {
         );
       }
       this.logger?.info(`Update available: ${version}`);
-      this.emit("update-available", extraVersionInfo);
       this.info = info;
+      this.processing = false;
+      this.logger?.debug("Check update end");
+      this.emit("update-available", extraVersionInfo);
       return true;
     } catch {
       const msg = "Fail to parse version string";
@@ -209,41 +220,45 @@ var Updater = class extends events.EventEmitter {
     }
   }
   async downloadUpdate(data, info) {
+    const emitError = (code, errorInfo) => {
+      this.err(`Download update failed`, code, errorInfo);
+      this.logger?.debug("Download update end");
+      this.processing = false;
+      return false;
+    };
+    if (this.processing) {
+      this.logger?.info("Updater is already processing, skip download update");
+      return false;
+    }
+    this.processing = true;
+    this.logger?.debug("Download update start");
     const _sig = info?.signature ?? this.info?.signature;
     const _version = info?.version ?? this.info?.version;
     if (!_sig || !_version) {
-      this.err(
-        "Download failed",
+      return emitError(
         "ERR_PARAM",
         "No update signature, please call `checkUpdate` first or manually setup params"
       );
-      return false;
     }
     if (!data && !this.provider) {
-      this.err(
-        "Download failed",
+      return emitError(
         "ERR_PARAM",
         "No update asar buffer and provider"
       );
-      return false;
     }
     const buffer = await this.fetch("buffer", data ? Buffer.from(data) : void 0);
     if (!buffer) {
-      this.err(
-        "Download failed",
+      return emitError(
         "ERR_PARAM",
         "No update asar file buffer"
       );
-      return false;
     }
     this.logger?.debug("Validation start");
     if (!await this.provider.verifySignaure(buffer, _version, _sig, this.CERT)) {
-      this.err(
-        "Download failed",
+      return emitError(
         "ERR_VALIDATE",
         "Invalid update asar file"
       );
-      return false;
     }
     this.logger?.debug("Validation end");
     try {
@@ -253,15 +268,15 @@ var Updater = class extends events.EventEmitter {
       this.logger?.info(`Download success, version: ${_version}`);
       this.info = void 0;
       this.emit("update-downloaded");
+      this.processing = false;
+      this.logger?.debug("Download update end");
       return true;
     } catch (error) {
       this.cleanup();
-      this.err(
-        "Download failed",
+      return emitError(
         "ERR_DOWNLOAD",
-        `Fail to unwrap asar file, ${error}`
+        `Failed to write update file: ${error instanceof Error ? error.message : error}`
       );
-      return false;
     }
   }
   /**

package/dist/index.d.cts

@@ -62,6 +62,7 @@ declare class Updater<T extends UpdateInfoWithExtraVersion = UpdateInfoWithExtra
     private controller;
     private info?;
     private tmpFilePath?;
+    private processing;
     provider?: IProvider;
     /**
      * Updater logger

package/dist/index.d.ts

@@ -62,6 +62,7 @@ declare class Updater<T extends UpdateInfoWithExtraVersion = UpdateInfoWithExtra
     private controller;
     private info?;
     private tmpFilePath?;
+    private processing;
     provider?: IProvider;
     /**
      * Updater logger

package/dist/index.js

@@ -20,6 +20,7 @@ var Updater = class extends EventEmitter {
   controller;
   info;
   tmpFilePath;
+  processing = false;
   provider;
   /**
    * Updater logger
@@ -106,9 +107,17 @@ var Updater = class extends EventEmitter {
   async checkForUpdates(data) {
     const emitUnavailable = (msg, code, info2) => {
       this.logger?.info(`[${code}] ${msg}`);
+      this.logger?.debug("Check update end");
+      this.processing = false;
       this.emit("update-not-available", code, msg, info2);
       return false;
     };
+    if (this.processing) {
+      this.logger?.info("Updater is already processing, skip check update");
+      return false;
+    }
+    this.processing = true;
+    this.logger?.debug("Check update start");
     if (!data && !this.provider) {
       const msg = "No update json or provider";
       this.err("Check update failed", "ERR_PARAM", msg);
@@ -159,8 +168,10 @@ var Updater = class extends EventEmitter {
         );
       }
       this.logger?.info(`Update available: ${version}`);
-      this.emit("update-available", extraVersionInfo);
       this.info = info;
+      this.processing = false;
+      this.logger?.debug("Check update end");
+      this.emit("update-available", extraVersionInfo);
       return true;
     } catch {
       const msg = "Fail to parse version string";
@@ -173,41 +184,45 @@ var Updater = class extends EventEmitter {
     }
   }
   async downloadUpdate(data, info) {
+    const emitError = (code, errorInfo) => {
+      this.err(`Download update failed`, code, errorInfo);
+      this.logger?.debug("Download update end");
+      this.processing = false;
+      return false;
+    };
+    if (this.processing) {
+      this.logger?.info("Updater is already processing, skip download update");
+      return false;
+    }
+    this.processing = true;
+    this.logger?.debug("Download update start");
     const _sig = info?.signature ?? this.info?.signature;
     const _version = info?.version ?? this.info?.version;
     if (!_sig || !_version) {
-      this.err(
-        "Download failed",
+      return emitError(
         "ERR_PARAM",
         "No update signature, please call `checkUpdate` first or manually setup params"
       );
-      return false;
     }
     if (!data && !this.provider) {
-      this.err(
-        "Download failed",
+      return emitError(
         "ERR_PARAM",
         "No update asar buffer and provider"
       );
-      return false;
     }
     const buffer = await this.fetch("buffer", data ? Buffer.from(data) : void 0);
     if (!buffer) {
-      this.err(
-        "Download failed",
+      return emitError(
         "ERR_PARAM",
         "No update asar file buffer"
       );
-      return false;
     }
     this.logger?.debug("Validation start");
     if (!await this.provider.verifySignaure(buffer, _version, _sig, this.CERT)) {
-      this.err(
-        "Download failed",
+      return emitError(
         "ERR_VALIDATE",
         "Invalid update asar file"
       );
-      return false;
     }
     this.logger?.debug("Validation end");
     try {
@@ -217,15 +232,15 @@ var Updater = class extends EventEmitter {
       this.logger?.info(`Download success, version: ${_version}`);
       this.info = void 0;
       this.emit("update-downloaded");
+      this.processing = false;
+      this.logger?.debug("Download update end");
       return true;
     } catch (error) {
       this.cleanup();
-      this.err(
-        "Download failed",
+      return emitError(
         "ERR_DOWNLOAD",
-        `Fail to unwrap asar file, ${error}`
+        `Failed to write update file: ${error instanceof Error ? error.message : error}`
       );
-      return false;
     }
   }
   /**

package/dist/provider.cjs

@@ -337,6 +337,8 @@ var GitHubAtomProvider = class extends BaseGitHubProvider {
     return `releases/download/v${tag}/${versionPath}`;
   }
 };
+
+// src/provider/github/file.ts
 var GitHubProvider = class extends BaseGitHubProvider {
   name = "GithubProvider";
   /**

package/dist/provider.js

@@ -149,6 +149,8 @@ var GitHubAtomProvider = class extends BaseGitHubProvider {
     return `releases/download/v${tag}/${versionPath}`;
   }
 };
+
+// src/provider/github/file.ts
 var GitHubProvider = class extends BaseGitHubProvider {
   name = "GithubProvider";
   /**

package/dist/vite.d.ts

@@ -407,14 +407,6 @@ interface ElectronWithUpdaterOptions {
      * @default isCI
      */
     buildVersionJson?: boolean;
-    /**
-     * Whether to log parsed options
-     *
-     * To show certificate and private keys, set `logParsedOptions: { showKeys: true }`
-     */
-    logParsedOptions?: boolean | {
-        showKeys: boolean;
-    };
     /**
      * Main process options
      *
@@ -454,7 +446,6 @@ interface ElectronWithUpdaterOptions {
  *     plugins: [
  *       electronWithUpdater({
  *         isBuild,
- *         logParsedOptions: true,
  *         main: {
  *           files: ['./electron/main/index.ts', './electron/main/worker.ts'],
  *           // see https://github.com/electron-vite/electron-vite-vue/blob/85ed267c4851bf59f32888d766c0071661d4b94c/vite.config.ts#L22-L28

package/dist/vite.js

@@ -735,8 +735,7 @@ async function electronWithUpdater(options) {
     buildVersionJson,
     updater,
     bytecode,
-    useNotBundle = true,
-    logParsedOptions
+    useNotBundle = true
   } = options;
   if (!pkg || !pkg.version || !pkg.name || !pkg.main) {
     log.error("package.json not found or invalid", { timestamp: true });
@@ -887,20 +886,6 @@ async function electronWithUpdater(options) {
       )
     }
   };
-  if (logParsedOptions) {
-    const shouldShowKey = typeof logParsedOptions === "object" && logParsedOptions.showKeys === true;
-    log.info(
-      JSON.stringify(
-        {
-          ...electronPluginOptions,
-          updater: { buildAsarOption, buildEntryOption, buildVersionOption }
-        },
-        (key, value) => key === "privateKey" || key === "cert" ? shouldShowKey ? value : `<${key.toUpperCase()}>` : value,
-        2
-      ),
-      { timestamp: true }
-    );
-  }
   const result = [ElectronSimple(electronPluginOptions)];
   if (nativeModuleEntryMap) {
     const files = [

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "electron-incremental-update",
   "type": "module",
-  "version": "2.3.8",
+  "version": "2.4.0",
   "description": "Electron incremental update tools with Vite plugin, support bytecode protection",
   "author": "subframe7536",
   "license": "MIT",