electron-incremental-update 2.0.0-beta.5 → 2.0.0-beta.7

package/dist/{chunk-JSYIRKTR.js → chunk-N77WQ5WB.js}

@@ -40,14 +40,16 @@ function aesDecrypt(encryptedText, key, iv) {
   const decipher = createDecipheriv("aes-256-cbc", key, iv);
   return decipher.update(encryptedText, "base64url", "utf8") + decipher.final("utf8");
 }
-function defaultVerify(buffer, signature, cert) {
+function defaultVerifySignature(buffer, version, signature, cert) {
   try {
-    const [sig, version] = aesDecrypt(signature, hashBuffer(cert, 32), hashBuffer(buffer, 16)).split("%");
-    const result = createVerify("RSA-SHA256").update(buffer).verify(cert, sig, "base64");
-    return result ? version : void 0;
+    const [sig, ver] = aesDecrypt(signature, hashBuffer(cert, 32), hashBuffer(buffer, 16)).split("%");
+    if (ver !== version) {
+      return false;
+    }
+    return createVerify("RSA-SHA256").update(buffer).verify(cert, sig, "base64");
   } catch {
-    return void 0;
+    return false;
   }
 }
 
-export { aesDecrypt, aesEncrypt, defaultSignature, defaultUnzipFile, defaultVerify, defaultZipFile, hashBuffer };
+export { aesDecrypt, aesEncrypt, defaultSignature, defaultUnzipFile, defaultVerifySignature, defaultZipFile, hashBuffer };

package/dist/{core-CXETH_bb.d.ts → core-DJdvtwvU.d.ts}

@@ -1,5 +1,5 @@
 import { EventEmitter } from 'node:events';
-import { a as UpdateJSON, U as UpdateInfo, D as DownloadingInfo, I as IProvider, c as URLHandler } from './types-C5P0h_bB.js';
+import { a as UpdateJSON, U as UpdateInfo, D as DownloadingInfo, I as IProvider, c as URLHandler } from './types-CItP6bL-.js';
 
 declare const ErrorInfo: {
     readonly download: "Download failed";
@@ -110,9 +110,9 @@ declare class Updater extends EventEmitter<{
     /**
      * download update using existing `asar.gz` buffer and signature
      * @param data existing `asar.gz` buffer
-     * @param sig signature
+     * @param info update info
      */
-    downloadUpdate(data: Uint8Array | Buffer, sig: string): Promise<boolean>;
+    downloadUpdate(data: Uint8Array, info: Omit<UpdateInfo, 'minimumVersion'>): Promise<boolean>;
     /**
      * quit App and install
      */

package/dist/{core-DmU2Vk_S.d.cts → core-ZUlLHadf.d.cts}

@@ -1,5 +1,5 @@
 import { EventEmitter } from 'node:events';
-import { a as UpdateJSON, U as UpdateInfo, D as DownloadingInfo, I as IProvider, c as URLHandler } from './types-C5P0h_bB.cjs';
+import { a as UpdateJSON, U as UpdateInfo, D as DownloadingInfo, I as IProvider, c as URLHandler } from './types-CItP6bL-.cjs';
 
 declare const ErrorInfo: {
     readonly download: "Download failed";
@@ -110,9 +110,9 @@ declare class Updater extends EventEmitter<{
     /**
      * download update using existing `asar.gz` buffer and signature
      * @param data existing `asar.gz` buffer
-     * @param sig signature
+     * @param info update info
      */
-    downloadUpdate(data: Uint8Array | Buffer, sig: string): Promise<boolean>;
+    downloadUpdate(data: Uint8Array, info: Omit<UpdateInfo, 'minimumVersion'>): Promise<boolean>;
     /**
      * quit App and install
      */

package/dist/index.cjs

@@ -153,10 +153,11 @@ var Updater = class extends events.EventEmitter {
     this.emit("update-available", this.info);
     return true;
   }
-  async downloadUpdate(data, sig) {
-    const _sig = sig ?? this.info?.signature;
-    if (!_sig) {
-      this.err("download failed", "param", "no update signature, please call `checkUpdate` first");
+  async downloadUpdate(data, info) {
+    const _sig = info?.signature ?? this.info?.signature;
+    const _version = info?.version ?? this.info?.version;
+    if (!_sig || !_version) {
+      this.err("download failed", "param", "no update signature, please call `checkUpdate` first or manually setup params");
       return false;
     }
     const buffer = await this.fetch("buffer", data ? Buffer.from(data) : void 0);
@@ -165,8 +166,7 @@ var Updater = class extends events.EventEmitter {
       return false;
     }
     this.logger?.debug("verify start");
-    const _ver = await this.provider.verifySignaure(buffer, _sig, this.CERT);
-    if (!_ver) {
+    if (!await this.provider.verifySignaure(buffer, _version, _sig, this.CERT)) {
       this.err("download failed", "validate", "invalid signature / certificate pair");
       return false;
     }
@@ -175,7 +175,7 @@ var Updater = class extends events.EventEmitter {
       const tmpFilePath = getPathFromAppNameAsar() + ".tmp";
       this.logger?.debug(`install to ${tmpFilePath}`);
       fs.writeFileSync(tmpFilePath, await this.provider.unzipFile(buffer));
-      this.logger?.info(`download success, version: ${_ver}`);
+      this.logger?.info(`download success, version: ${_version}`);
       this.info = void 0;
       this.emit("update-downloaded");
       return true;

package/dist/index.d.cts

@@ -1,6 +1,6 @@
-import { U as Updater, a as UpdaterOption, L as Logger } from './core-DmU2Vk_S.cjs';
-export { C as CheckResult, D as DownloadResult, E as ErrorInfo, b as UpdaterError } from './core-DmU2Vk_S.cjs';
-import { I as IProvider } from './types-C5P0h_bB.cjs';
+import { U as Updater, a as UpdaterOption, L as Logger } from './core-ZUlLHadf.cjs';
+export { C as CheckResult, D as DownloadResult, E as ErrorInfo, b as UpdaterError } from './core-ZUlLHadf.cjs';
+import { I as IProvider } from './types-CItP6bL-.cjs';
 import 'node:events';
 import '@subframe7536/type-utils';
 

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-import { U as Updater, a as UpdaterOption, L as Logger } from './core-CXETH_bb.js';
-export { C as CheckResult, D as DownloadResult, E as ErrorInfo, b as UpdaterError } from './core-CXETH_bb.js';
-import { I as IProvider } from './types-C5P0h_bB.js';
+import { U as Updater, a as UpdaterOption, L as Logger } from './core-DJdvtwvU.js';
+export { C as CheckResult, D as DownloadResult, E as ErrorInfo, b as UpdaterError } from './core-DJdvtwvU.js';
+import { I as IProvider } from './types-CItP6bL-.js';
 import 'node:events';
 import '@subframe7536/type-utils';
 

package/dist/index.js

@@ -123,10 +123,11 @@ var Updater = class extends EventEmitter {
     this.emit("update-available", this.info);
     return true;
   }
-  async downloadUpdate(data, sig) {
-    const _sig = sig ?? this.info?.signature;
-    if (!_sig) {
-      this.err("download failed", "param", "no update signature, please call `checkUpdate` first");
+  async downloadUpdate(data, info) {
+    const _sig = info?.signature ?? this.info?.signature;
+    const _version = info?.version ?? this.info?.version;
+    if (!_sig || !_version) {
+      this.err("download failed", "param", "no update signature, please call `checkUpdate` first or manually setup params");
       return false;
     }
     const buffer = await this.fetch("buffer", data ? Buffer.from(data) : void 0);
@@ -135,8 +136,7 @@ var Updater = class extends EventEmitter {
       return false;
     }
     this.logger?.debug("verify start");
-    const _ver = await this.provider.verifySignaure(buffer, _sig, this.CERT);
-    if (!_ver) {
+    if (!await this.provider.verifySignaure(buffer, _version, _sig, this.CERT)) {
       this.err("download failed", "validate", "invalid signature / certificate pair");
       return false;
     }
@@ -145,7 +145,7 @@ var Updater = class extends EventEmitter {
       const tmpFilePath = getPathFromAppNameAsar() + ".tmp";
       this.logger?.debug(`install to ${tmpFilePath}`);
       writeFileSync(tmpFilePath, await this.provider.unzipFile(buffer));
-      this.logger?.info(`download success, version: ${_ver}`);
+      this.logger?.info(`download success, version: ${_version}`);
       this.info = void 0;
       this.emit("update-downloaded");
       return true;

package/dist/provider.cjs

@@ -104,14 +104,15 @@ async function defaultDownloadAsar(url, headers, onDownloading) {
     const total = getHeader(resp.headers, "content-length") || -1;
     let data = [];
     resp.on("data", (chunk) => {
-      transferred += chunk.length;
+      const delta = chunk.length;
+      transferred += delta;
       const current = Date.now();
       onDownloading?.({
         percent: +(transferred / total).toFixed(2) * 100,
         total,
         transferred,
-        delta: chunk.length,
-        bps: chunk.length / ((current - time) * 1e3)
+        delta,
+        bps: delta / ((current - time) * 1e3)
       });
       time = current;
       data.push(chunk);
@@ -127,13 +128,15 @@ function aesDecrypt(encryptedText, key, iv) {
   const decipher = crypto.createDecipheriv("aes-256-cbc", key, iv);
   return decipher.update(encryptedText, "base64url", "utf8") + decipher.final("utf8");
 }
-function defaultVerify(buffer, signature, cert) {
+function defaultVerifySignature(buffer, version, signature, cert) {
   try {
-    const [sig, version] = aesDecrypt(signature, hashBuffer(cert, 32), hashBuffer(buffer, 16)).split("%");
-    const result = crypto.createVerify("RSA-SHA256").update(buffer).verify(cert, sig, "base64");
-    return result ? version : void 0;
+    const [sig, ver] = aesDecrypt(signature, hashBuffer(cert, 32), hashBuffer(buffer, 16)).split("%");
+    if (ver !== version) {
+      return false;
+    }
+    return crypto.createVerify("RSA-SHA256").update(buffer).verify(cert, sig, "base64");
   } catch {
-    return void 0;
+    return false;
   }
 }
 async function defaultUnzipFile(buffer) {
@@ -152,7 +155,7 @@ async function defaultUnzipFile(buffer) {
 var BaseProvider = class {
   name = "BaseProvider";
   isLowerVersion = defaultIsLowerVersion;
-  verifySignaure = defaultVerify;
+  verifySignaure = defaultVerifySignature;
   unzipFile = defaultUnzipFile;
 };
 
@@ -187,7 +190,7 @@ var GitHubProvider = class extends BaseProvider {
   }
   async downloadJSON(versionPath) {
     return await defaultDownloadUpdateJSON(
-      await this.parseURL(false, `HEAD/${versionPath}`),
+      await this.parseURL(false, `${this.options.branch ?? "HEAD"}/${versionPath}`),
       { accept: "application/json", ...this.options.extraHeaders }
     );
   }

package/dist/provider.d.cts

@@ -1,11 +1,11 @@
-import { I as IProvider, d as defaultIsLowerVersion, a as UpdateJSON, U as UpdateInfo, D as DownloadingInfo, c as URLHandler, O as OnDownloading } from './types-C5P0h_bB.cjs';
-import { f as defaultVerify, a as defaultUnzipFile } from './zip-WRrEMkgp.cjs';
+import { I as IProvider, d as defaultIsLowerVersion, a as UpdateJSON, U as UpdateInfo, D as DownloadingInfo, c as URLHandler, O as OnDownloading } from './types-CItP6bL-.cjs';
+import { f as defaultVerifySignature, a as defaultUnzipFile } from './zip-DPF5IFkK.cjs';
 import { Arrayable } from '@subframe7536/type-utils';
 
 declare abstract class BaseProvider implements IProvider {
     name: string;
     isLowerVersion: typeof defaultIsLowerVersion;
-    verifySignaure: typeof defaultVerify;
+    verifySignaure: typeof defaultVerifySignature;
     unzipFile: typeof defaultUnzipFile;
     abstract downloadJSON(versionPath: string): Promise<UpdateJSON>;
     abstract downloadAsar(name: string, info: UpdateInfo, onDownloading?: (info: DownloadingInfo) => void): Promise<Buffer>;
@@ -20,6 +20,11 @@ interface GitHubProviderOptions {
      * github repo name
      */
     repo: string;
+    /**
+     * github branch name that fetch version
+     * @default 'HEAD'
+     */
+    branch?: string;
     /**
      * extra headers
      */
@@ -59,7 +64,13 @@ declare class GitHubProvider extends BaseProvider {
 }
 
 declare function getHeader(response: Record<string, Arrayable<string>>, headerKey: any): any;
+/**
+ * download json and parse UpdateJson
+ */
 declare function defaultDownloadUpdateJSON(url: string, headers: Record<string, any>): Promise<UpdateJSON>;
+/**
+ * download asar buffer, get total size from `Content-Length` header
+ */
 declare function defaultDownloadAsar(url: string, headers: Record<string, any>, onDownloading?: OnDownloading): Promise<Buffer>;
 
 export { BaseProvider, DownloadingInfo, GitHubProvider, type GitHubProviderOptions, IProvider, OnDownloading, URLHandler, defaultDownloadAsar, defaultDownloadUpdateJSON, getHeader };

package/dist/provider.d.ts

@@ -1,11 +1,11 @@
-import { I as IProvider, d as defaultIsLowerVersion, a as UpdateJSON, U as UpdateInfo, D as DownloadingInfo, c as URLHandler, O as OnDownloading } from './types-C5P0h_bB.js';
-import { f as defaultVerify, a as defaultUnzipFile } from './zip-WRrEMkgp.js';
+import { I as IProvider, d as defaultIsLowerVersion, a as UpdateJSON, U as UpdateInfo, D as DownloadingInfo, c as URLHandler, O as OnDownloading } from './types-CItP6bL-.js';
+import { f as defaultVerifySignature, a as defaultUnzipFile } from './zip-DPF5IFkK.js';
 import { Arrayable } from '@subframe7536/type-utils';
 
 declare abstract class BaseProvider implements IProvider {
     name: string;
     isLowerVersion: typeof defaultIsLowerVersion;
-    verifySignaure: typeof defaultVerify;
+    verifySignaure: typeof defaultVerifySignature;
     unzipFile: typeof defaultUnzipFile;
     abstract downloadJSON(versionPath: string): Promise<UpdateJSON>;
     abstract downloadAsar(name: string, info: UpdateInfo, onDownloading?: (info: DownloadingInfo) => void): Promise<Buffer>;
@@ -20,6 +20,11 @@ interface GitHubProviderOptions {
      * github repo name
      */
     repo: string;
+    /**
+     * github branch name that fetch version
+     * @default 'HEAD'
+     */
+    branch?: string;
     /**
      * extra headers
      */
@@ -59,7 +64,13 @@ declare class GitHubProvider extends BaseProvider {
 }
 
 declare function getHeader(response: Record<string, Arrayable<string>>, headerKey: any): any;
+/**
+ * download json and parse UpdateJson
+ */
 declare function defaultDownloadUpdateJSON(url: string, headers: Record<string, any>): Promise<UpdateJSON>;
+/**
+ * download asar buffer, get total size from `Content-Length` header
+ */
 declare function defaultDownloadAsar(url: string, headers: Record<string, any>, onDownloading?: OnDownloading): Promise<Buffer>;
 
 export { BaseProvider, DownloadingInfo, GitHubProvider, type GitHubProviderOptions, IProvider, OnDownloading, URLHandler, defaultDownloadAsar, defaultDownloadUpdateJSON, getHeader };

package/dist/provider.js

@@ -1,4 +1,4 @@
-import { defaultVerify, defaultUnzipFile } from './chunk-JSYIRKTR.js';
+import { defaultVerifySignature, defaultUnzipFile } from './chunk-N77WQ5WB.js';
 import { defaultIsLowerVersion, isUpdateJSON } from './chunk-72ZAJ7AF.js';
 import { URL } from 'node:url';
 import { app, net } from 'electron';
@@ -50,14 +50,15 @@ async function defaultDownloadAsar(url, headers, onDownloading) {
     const total = getHeader(resp.headers, "content-length") || -1;
     let data = [];
     resp.on("data", (chunk) => {
-      transferred += chunk.length;
+      const delta = chunk.length;
+      transferred += delta;
       const current = Date.now();
       onDownloading?.({
         percent: +(transferred / total).toFixed(2) * 100,
         total,
         transferred,
-        delta: chunk.length,
-        bps: chunk.length / ((current - time) * 1e3)
+        delta,
+        bps: delta / ((current - time) * 1e3)
       });
       time = current;
       data.push(chunk);
@@ -70,7 +71,7 @@ async function defaultDownloadAsar(url, headers, onDownloading) {
 var BaseProvider = class {
   name = "BaseProvider";
   isLowerVersion = defaultIsLowerVersion;
-  verifySignaure = defaultVerify;
+  verifySignaure = defaultVerifySignature;
   unzipFile = defaultUnzipFile;
 };
 
@@ -105,7 +106,7 @@ var GitHubProvider = class extends BaseProvider {
   }
   async downloadJSON(versionPath) {
     return await defaultDownloadUpdateJSON(
-      await this.parseURL(false, `HEAD/${versionPath}`),
+      await this.parseURL(false, `${this.options.branch ?? "HEAD"}/${versionPath}`),
       { accept: "application/json", ...this.options.extraHeaders }
     );
   }

package/dist/{types-C5P0h_bB.d.ts → types-CItP6bL-.d.cts}

@@ -93,11 +93,12 @@ interface IProvider {
     /**
      * verify asar signature
      * @param buffer file buffer
+     * @param version target version
      * @param signature signature
      * @param cert certificate
      * @returns if signature is valid, returns the version, otherwise returns `undefined`
      */
-    verifySignaure: (buffer: Buffer, signature: string, cert: string) => Promisable<string | undefined>;
+    verifySignaure: (buffer: Buffer, version: string, signature: string, cert: string) => Promisable<boolean>;
 }
 
 export { type DownloadingInfo as D, type IProvider as I, type OnDownloading as O, type UpdateInfo as U, type Version as V, type UpdateJSON as a, defaultVersionJsonGenerator as b, type URLHandler as c, defaultIsLowerVersion as d, isUpdateJSON as i, parseVersion as p };

package/dist/{types-C5P0h_bB.d.cts → types-CItP6bL-.d.ts}

@@ -93,11 +93,12 @@ interface IProvider {
     /**
      * verify asar signature
      * @param buffer file buffer
+     * @param version target version
      * @param signature signature
      * @param cert certificate
      * @returns if signature is valid, returns the version, otherwise returns `undefined`
      */
-    verifySignaure: (buffer: Buffer, signature: string, cert: string) => Promisable<string | undefined>;
+    verifySignaure: (buffer: Buffer, version: string, signature: string, cert: string) => Promisable<boolean>;
 }
 
 export { type DownloadingInfo as D, type IProvider as I, type OnDownloading as O, type UpdateInfo as U, type Version as V, type UpdateJSON as a, defaultVersionJsonGenerator as b, type URLHandler as c, defaultIsLowerVersion as d, isUpdateJSON as i, parseVersion as p };

package/dist/utils.cjs

@@ -186,13 +186,15 @@ function aesDecrypt(encryptedText, key, iv) {
   const decipher = crypto.createDecipheriv("aes-256-cbc", key, iv);
   return decipher.update(encryptedText, "base64url", "utf8") + decipher.final("utf8");
 }
-function defaultVerify(buffer, signature, cert) {
+function defaultVerifySignature(buffer, version, signature, cert) {
   try {
-    const [sig, version] = aesDecrypt(signature, hashBuffer(cert, 32), hashBuffer(buffer, 16)).split("%");
-    const result = crypto.createVerify("RSA-SHA256").update(buffer).verify(cert, sig, "base64");
-    return result ? version : void 0;
+    const [sig, ver] = aesDecrypt(signature, hashBuffer(cert, 32), hashBuffer(buffer, 16)).split("%");
+    if (ver !== version) {
+      return false;
+    }
+    return crypto.createVerify("RSA-SHA256").update(buffer).verify(cert, sig, "base64");
   } catch {
-    return void 0;
+    return false;
   }
 }
 
@@ -209,7 +211,7 @@ exports.autoUpdate = autoUpdate;
 exports.defaultIsLowerVersion = defaultIsLowerVersion;
 exports.defaultSignature = defaultSignature;
 exports.defaultUnzipFile = defaultUnzipFile;
-exports.defaultVerify = defaultVerify;
+exports.defaultVerifySignature = defaultVerifySignature;
 exports.defaultVersionJsonGenerator = defaultVersionJsonGenerator;
 exports.defaultZipFile = defaultZipFile;
 exports.disableHWAccForWin7 = disableHWAccForWin7;

package/dist/utils.d.cts

@@ -1,7 +1,7 @@
 import { BrowserWindow } from 'electron';
-export { e as aesDecrypt, b as aesEncrypt, c as defaultSignature, a as defaultUnzipFile, f as defaultVerify, d as defaultZipFile, h as hashBuffer } from './zip-WRrEMkgp.cjs';
-export { U as UpdateInfo, a as UpdateJSON, V as Version, d as defaultIsLowerVersion, b as defaultVersionJsonGenerator, i as isUpdateJSON, p as parseVersion } from './types-C5P0h_bB.cjs';
-import { U as Updater } from './core-DmU2Vk_S.cjs';
+export { e as aesDecrypt, b as aesEncrypt, c as defaultSignature, a as defaultUnzipFile, f as defaultVerifySignature, d as defaultZipFile, h as hashBuffer } from './zip-DPF5IFkK.cjs';
+export { U as UpdateInfo, a as UpdateJSON, V as Version, d as defaultIsLowerVersion, b as defaultVersionJsonGenerator, i as isUpdateJSON, p as parseVersion } from './types-CItP6bL-.cjs';
+import { U as Updater } from './core-ZUlLHadf.cjs';
 import '@subframe7536/type-utils';
 import 'node:events';
 

package/dist/utils.d.ts

@@ -1,7 +1,7 @@
 import { BrowserWindow } from 'electron';
-export { e as aesDecrypt, b as aesEncrypt, c as defaultSignature, a as defaultUnzipFile, f as defaultVerify, d as defaultZipFile, h as hashBuffer } from './zip-WRrEMkgp.js';
-export { U as UpdateInfo, a as UpdateJSON, V as Version, d as defaultIsLowerVersion, b as defaultVersionJsonGenerator, i as isUpdateJSON, p as parseVersion } from './types-C5P0h_bB.js';
-import { U as Updater } from './core-CXETH_bb.js';
+export { e as aesDecrypt, b as aesEncrypt, c as defaultSignature, a as defaultUnzipFile, f as defaultVerifySignature, d as defaultZipFile, h as hashBuffer } from './zip-DPF5IFkK.js';
+export { U as UpdateInfo, a as UpdateJSON, V as Version, d as defaultIsLowerVersion, b as defaultVersionJsonGenerator, i as isUpdateJSON, p as parseVersion } from './types-CItP6bL-.js';
+import { U as Updater } from './core-DJdvtwvU.js';
 import '@subframe7536/type-utils';
 import 'node:events';
 

package/dist/utils.js

@@ -1,5 +1,5 @@
 export { disableHWAccForWin7, getAppVersion, getEntryVersion, getPathFromAppNameAsar, getPathFromEntryAsar, getPathFromPreload, getPathFromPublic, handleUnexpectedErrors, isDev, isLinux, isMac, isWin, loadPage, requireNative, restartApp, setAppUserModelId, setPortableAppDataPath, singleInstance } from './chunk-DFNDKSE6.js';
-export { aesDecrypt, aesEncrypt, defaultSignature, defaultUnzipFile, defaultVerify, defaultZipFile, hashBuffer } from './chunk-JSYIRKTR.js';
+export { aesDecrypt, aesEncrypt, defaultSignature, defaultUnzipFile, defaultVerifySignature, defaultZipFile, hashBuffer } from './chunk-N77WQ5WB.js';
 export { defaultIsLowerVersion, defaultVersionJsonGenerator, isUpdateJSON, parseVersion } from './chunk-72ZAJ7AF.js';
 
 // src/utils/updater.ts

package/dist/vite.d.ts

@@ -2,6 +2,7 @@ import { PluginOption } from 'vite';
 import { ElectronSimpleOptions } from 'vite-plugin-electron/simple';
 import { Promisable } from '@subframe7536/type-utils';
 import { BuildOptions } from 'esbuild';
+export { isCI } from 'ci-info';
 
 /**
  * update info json

package/dist/vite.js

@@ -6,6 +6,7 @@ import { startup } from 'vite-plugin-electron';
 import { notBundle } from 'vite-plugin-electron/plugin';
 import { getPackageInfoSync, loadPackageJSON } from 'local-pkg';
 import { isCI } from 'ci-info';
+export { isCI } from 'ci-info';
 import Asar from '@electron/asar';
 import { build } from 'esbuild';
 import { spawn } from 'node:child_process';
@@ -102,7 +103,7 @@ function toRelativePath(filename, importer) {
 }
 function compileToBytecode(code) {
   let data = Buffer.from([]);
-  const logErr = (...args) => log.error(args.join(" "), { timestamp: true });
+  const logErr = (...args) => bytecodeLog.error(args.join(" "), { timestamp: true });
   const electronPath = getElectronPath();
   const bytecodePath = getBytecodeCompilerPath();
   return new Promise((resolve2, reject) => {
@@ -151,11 +152,11 @@ function convertString(code, strings, sourcemap) {
     map: sourcemap ? s.generateMap({ hires: "boundary" }) : null
   } : { code };
 }
+var decodeFn = "function(a,b){return String.fromCharCode.apply(0,a.map(function(x){return x-b}))}";
 function obfuscateString(input) {
-  const offset = Math.floor(Math.random() * 2 << 4) + 1;
-  const hexArray = Array.from(input).map((c) => "0x" + (c.charCodeAt(0) + offset).toString(16));
-  const decodeFn = `function(a,b){return String.fromCharCode.apply(null,a.map(x=>+x-b))}`;
-  return `(${decodeFn})([${hexArray.join(",")}],${offset})`;
+  const offset = Math.random() << 4 | 0;
+  const hexArray = input.split("").map((c) => "0x" + (c.charCodeAt(0) + offset).toString(16));
+  return `(${decodeFn})(${JSON.stringify(hexArray)},${offset})`;
 }
 
 // src/build-plugins/utils.ts
@@ -247,6 +248,7 @@ async function buildEntry({
       entryNames: "[dir]/[name]",
       assetNames: "[dir]/[name]",
       external: ["electron", "original-fs"],
+      treeShaking: true,
       loader: {
         ".node": "empty"
       },
@@ -280,7 +282,7 @@ async function buildEntry({
       `${isEntry ? bytecodeModuleLoaderCode : useStrict}${isEntry ? "" : "module.exports = "}require("./${fileName}c")`
     );
     bytecodeLog.info(
-      `${filePath} => ${(buffer.byteLength / 1e3).toFixed(2)} kB`,
+      `${filePath} [${(buffer.byteLength / 1e3).toFixed(2)} kB]`,
       { timestamp: true }
     );
   }
@@ -431,8 +433,8 @@ function parseOptions(pkg, sourcemap = false, minify = false, options = {}) {
   };
   return { buildAsarOption, buildEntryOption, buildVersionOption, postBuild, cert };
 }
-function bytecodePlugin(isBuild, env, options = {}) {
-  if (!isBuild) {
+function bytecodePlugin(enable, env, options = {}) {
+  if (!enable) {
     return null;
   }
   const {
@@ -577,8 +579,6 @@ ${bytecodeLoaderBlock}`) : _code;
     }
   };
 }
-
-// src/vite.ts
 function debugStartup(args) {
   if (process.env.VSCODE_DEBUG) {
     console.log("[startup] Electron App");
@@ -616,7 +616,7 @@ async function electronWithUpdater(options) {
     preload: _preload,
     sourcemap = !isBuild,
     minify = isBuild,
-    buildVersionJson = isCI,
+    buildVersionJson,
     updater,
     bytecode,
     useNotBundle = true,
@@ -685,7 +685,8 @@ async function electronWithUpdater(options) {
   };
   let isInit = false;
   const rollupOptions = {
-    external: (src) => src.startsWith("node:") || Object.keys("dependencies" in pkg ? pkg.dependencies : {}).includes(src)
+    external: (src) => src.startsWith("node:") || Object.keys("dependencies" in pkg ? pkg.dependencies : {}).includes(src),
+    treeshake: true
   };
   const electronPluginOptions = {
     main: {
@@ -706,7 +707,7 @@ async function electronWithUpdater(options) {
         {
           plugins: [
             !isBuild && useNotBundle ? notBundle() : void 0,
-            bytecodeOptions && bytecodePlugin(isBuild, "main", bytecodeOptions)
+            bytecodeOptions && bytecodePlugin(!!bytecode, "main", bytecodeOptions)
           ],
           build: {
             sourcemap,
@@ -725,7 +726,7 @@ async function electronWithUpdater(options) {
       vite: mergeConfig(
         {
           plugins: [
-            bytecodeOptions && bytecodePlugin(isBuild, "preload", bytecodeOptions),
+            bytecodeOptions && bytecodePlugin(!!bytecode, "preload", bytecodeOptions),
             {
               name: `${id}-build`,
               enforce: "post",
@@ -736,7 +737,9 @@ async function electronWithUpdater(options) {
                 await _buildEntry();
                 await _postBuild();
                 const buffer = await buildAsar(buildAsarOption);
-                if (buildVersionJson) {
+                if (!buildVersionJson && !isCI) {
+                  log.warn("no `buildVersionJson` setup, skip build version json. Will build in CI by default", { timestamp: true });
+                } else {
                   await buildVersion(buildVersionOption, buffer);
                 }
               }

package/dist/{zip-WRrEMkgp.d.cts → zip-DPF5IFkK.d.cts}

@@ -2,9 +2,9 @@ declare function hashBuffer(data: string | Buffer, length: number): Buffer;
 declare function aesEncrypt(plainText: string, key: Buffer, iv: Buffer): string;
 declare function defaultSignature(buffer: Buffer, privateKey: string, cert: string, version: string): string;
 declare function aesDecrypt(encryptedText: string, key: Buffer, iv: Buffer): string;
-declare function defaultVerify(buffer: Buffer, signature: string, cert: string): string | undefined;
+declare function defaultVerifySignature(buffer: Buffer, version: string, signature: string, cert: string): boolean;
 
 declare function defaultZipFile(buffer: Buffer): Promise<Buffer>;
 declare function defaultUnzipFile(buffer: Buffer): Promise<Buffer>;
 
-export { defaultUnzipFile as a, aesEncrypt as b, defaultSignature as c, defaultZipFile as d, aesDecrypt as e, defaultVerify as f, hashBuffer as h };
+export { defaultUnzipFile as a, aesEncrypt as b, defaultSignature as c, defaultZipFile as d, aesDecrypt as e, defaultVerifySignature as f, hashBuffer as h };

package/dist/{zip-WRrEMkgp.d.ts → zip-DPF5IFkK.d.ts}

@@ -2,9 +2,9 @@ declare function hashBuffer(data: string | Buffer, length: number): Buffer;
 declare function aesEncrypt(plainText: string, key: Buffer, iv: Buffer): string;
 declare function defaultSignature(buffer: Buffer, privateKey: string, cert: string, version: string): string;
 declare function aesDecrypt(encryptedText: string, key: Buffer, iv: Buffer): string;
-declare function defaultVerify(buffer: Buffer, signature: string, cert: string): string | undefined;
+declare function defaultVerifySignature(buffer: Buffer, version: string, signature: string, cert: string): boolean;
 
 declare function defaultZipFile(buffer: Buffer): Promise<Buffer>;
 declare function defaultUnzipFile(buffer: Buffer): Promise<Buffer>;
 
-export { defaultUnzipFile as a, aesEncrypt as b, defaultSignature as c, defaultZipFile as d, aesDecrypt as e, defaultVerify as f, hashBuffer as h };
+export { defaultUnzipFile as a, aesEncrypt as b, defaultSignature as c, defaultZipFile as d, aesDecrypt as e, defaultVerifySignature as f, hashBuffer as h };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "electron-incremental-update",
   "type": "module",
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0-beta.7",
   "description": "electron incremental update tools, powered by vite",
   "author": "subframe7536",
   "license": "MIT",