electron-incremental-update 0.6.1 → 0.6.2

package/dist/{chunk-VADH6AZA.mjs → chunk-KMBSE4OO.mjs}

@@ -26,15 +26,15 @@ function key(data, length) {
   const hash = createHash("SHA256").update(data).digest("binary");
   return Buffer2.from(hash).subarray(0, length);
 }
-function signature(buffer, privateKey, cert, version) {
+var signature = (buffer, privateKey, cert, version) => {
   const sig = createSign("RSA-SHA256").update(buffer).sign({
     key: privateKey,
     padding: constants.RSA_PKCS1_PADDING,
     saltLength: constants.RSA_PSS_SALTLEN_DIGEST
   }, "base64");
   return encrypt(`${sig}%${version}`, key(cert, 32), key(buffer, 16));
-}
-function verify(buffer, signature2, cert) {
+};
+var verify = (buffer, signature2, cert) => {
   try {
     const [sig, version] = decrypt(signature2, key(cert, 32), key(buffer, 16)).split("%");
     const result = createVerify("RSA-SHA256").update(buffer).verify(cert, sig, "base64");
@@ -42,7 +42,7 @@ function verify(buffer, signature2, cert) {
   } catch (error) {
     return false;
   }
-}
+};
 
 export {
   __require,

package/dist/index.cjs

@@ -59,7 +59,7 @@ function key(data, length) {
   const hash = (0, import_node_crypto.createHash)("SHA256").update(data).digest("binary");
   return import_node_buffer.Buffer.from(hash).subarray(0, length);
 }
-function verify(buffer, signature, cert) {
+var verify = (buffer, signature, cert) => {
   try {
     const [sig, version] = decrypt(signature, key(cert, 32), key(buffer, 16)).split("%");
     const result = (0, import_node_crypto.createVerify)("RSA-SHA256").update(buffer).verify(cert, sig, "base64");
@@ -67,7 +67,7 @@ function verify(buffer, signature, cert) {
   } catch (error) {
     return false;
   }
-}
+};
 
 // src/updater/defaultFunctions.ts
 var import_node_buffer2 = require("buffer");
@@ -200,7 +200,7 @@ async function downloadBufferDefault(url, updater, headers) {
     request.end();
   });
 }
-function compareVersionDefault(oldVersion, newVersion) {
+var compareVersionDefault = (oldVersion, newVersion) => {
   if (!oldVersion || !newVersion) {
     throw new TypeError("invalid version");
   }
@@ -221,7 +221,7 @@ function compareVersionDefault(oldVersion, newVersion) {
     return true;
   }
   return false;
-}
+};
 
 // src/updater/index.ts
 function createUpdater({
@@ -231,15 +231,19 @@ function createUpdater({
   releaseAsarURL: _release,
   updateJsonURL: _update,
   debug = false,
-  downloadConfig,
-  compareVersion
+  downloadConfig: { extraHeader, userAgent } = {},
+  overrideFunctions: {
+    compareVersion,
+    verifySignaure,
+    downloadBuffer,
+    downloadJSON
+  } = {}
 }) {
   const updater = new import_node_events.EventEmitter();
   let signature = "";
   const asarPath = getProductAsarPath(productName);
   const gzipPath = `${asarPath}.gz`;
   const tmpFilePath = gzipPath.replace(".asar.gz", ".tmp.asar");
-  const { downloadBuffer, downloadJSON, extraHeader, userAgent } = downloadConfig || {};
   function log(msg) {
     debug && updater.emit("debug", msg);
   }
@@ -323,6 +327,7 @@ function createUpdater({
       throw new Error(`invalid type at format '${format}': ${data}`);
     }
   }
+  updater.setDebug = (isDebug) => debug = isDebug;
   updater.checkUpdate = async (data) => {
     try {
       const { signature: _sig, size, version } = await parseData("json", data);
@@ -348,7 +353,8 @@ function createUpdater({
       }
       const buffer = await parseData("buffer", data);
       log("verify start");
-      const version = verify(buffer, _sig, SIGNATURE_CERT);
+      const _verify = verifySignaure ?? verify;
+      const version = _verify(buffer, _sig, SIGNATURE_CERT);
       if (!version) {
         throw new Error("verify failed, invalid signature");
       }

package/dist/index.d.ts

@@ -41,7 +41,10 @@ interface TypedUpdater<T extends Record<string | symbol, MaybeArray<any>>, Event
      * - `Error`: fail
      */
     downloadAndInstall(data?: string | Buffer, sig?: string): Promise<InstallResult>;
+    setDebug(debug: boolean): void;
 }
+type FunctionVerifySignature = (buffer: Buffer, signature: string, cert: string) => string | false;
+type FunctionCompareVersion = (oldVersion: string, newVersion: string) => boolean;
 type Updater = TypedUpdater<UpdateEvents>;
 interface UpdaterOption {
     /**
@@ -91,25 +94,23 @@ interface UpdaterOption {
      * whether to enable debug listener
      */
     debug?: boolean;
-    /**
-     * custom version compare function
-     * @param oldVersion old version string
-     * @param newVersion new version string
-     * @returns whether to update
-     */
-    compareVersion?: (oldVersion: string, newVersion: string) => boolean;
-    downloadConfig?: {
+    overrideFunctions?: {
         /**
-         * download user agent
-       * @default 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.183 Safari/537.36'
-        */
-        userAgent?: string;
+         * custom version compare function {@link FunctionCompareVersion}
+         * @param oldVersion old version string
+         * @param newVersion new version string
+         * @returns whether to update
+         */
+        compareVersion?: FunctionCompareVersion;
         /**
-        * extra download header, `accept` and `user-agent` is set by default
-       */
-        extraHeader?: Record<string, string>;
+         * custom verify signature function {@link FunctionVerifySignature}
+         * @param buffer file buffer
+         * @param signature signature
+         * @param cert certificate
+         */
+        verifySignaure?: FunctionVerifySignature;
         /**
-         * download JSON function
+         * custom download JSON function
          * @param url download url
          * @param updater updater, to trigger events
          * @param header download header
@@ -117,7 +118,7 @@ interface UpdaterOption {
          */
         downloadJSON?: (url: string, updater: Updater, headers: Record<string, any>) => Promise<UpdateJSON>;
         /**
-         * download buffer function
+         * custom download buffer function
          * @param url download url
          * @param updater updater, to trigger events
          * @param header download header
@@ -125,6 +126,17 @@ interface UpdaterOption {
          */
         downloadBuffer?: (url: string, updater: Updater, headers: Record<string, any>) => Promise<Buffer>;
     };
+    downloadConfig?: {
+        /**
+         * download user agent
+         * @default 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.183 Safari/537.36'
+         */
+        userAgent?: string;
+        /**
+         * extra download header, `accept` and `user-agent` is set by default
+         */
+        extraHeader?: Record<string, string>;
+    };
 }
 
 /**
@@ -160,7 +172,7 @@ declare function getGithubReleaseCdnGroup(): {
 declare function restartApp(): void;
 declare function waitAppReady(duration?: number): Promise<unknown>;
 
-declare function createUpdater({ SIGNATURE_CERT, repository, productName, releaseAsarURL: _release, updateJsonURL: _update, debug, downloadConfig, compareVersion, }: UpdaterOption): Updater;
+declare function createUpdater({ SIGNATURE_CERT, repository, productName, releaseAsarURL: _release, updateJsonURL: _update, debug, downloadConfig: { extraHeader, userAgent }, overrideFunctions: { compareVersion, verifySignaure, downloadBuffer, downloadJSON, }, }: UpdaterOption): Updater;
 
 type AppOption = {
     /**
@@ -221,4 +233,4 @@ declare function initApp(appOptions: AppOption): {
  */
 declare function initApp(appOptions: AppOption, updaterOptions: InitUpdaterOptions): undefined;
 
-export { AppOption, CheckResultType, InitUpdaterOptions, InstallResult, UpdateJSON, Updater, UpdaterOption, createUpdater, getEntryVersion, getGithubReleaseCdnGroup, getProductAsarPath, getProductVersion, initApp, isUpdateJSON, parseGithubCdnURL, requireNative, restartApp, waitAppReady };
+export { AppOption, CheckResultType, FunctionCompareVersion, FunctionVerifySignature, InitUpdaterOptions, InstallResult, UpdateJSON, Updater, UpdaterOption, createUpdater, getEntryVersion, getGithubReleaseCdnGroup, getProductAsarPath, getProductVersion, initApp, isUpdateJSON, parseGithubCdnURL, requireNative, restartApp, waitAppReady };

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import {
   __require,
   verify
-} from "./chunk-VADH6AZA.mjs";
+} from "./chunk-KMBSE4OO.mjs";
 
 // src/index.ts
 import { resolve as resolve2 } from "node:path";
@@ -147,7 +147,7 @@ async function downloadBufferDefault(url, updater, headers) {
     request.end();
   });
 }
-function compareVersionDefault(oldVersion, newVersion) {
+var compareVersionDefault = (oldVersion, newVersion) => {
   if (!oldVersion || !newVersion) {
     throw new TypeError("invalid version");
   }
@@ -168,7 +168,7 @@ function compareVersionDefault(oldVersion, newVersion) {
     return true;
   }
   return false;
-}
+};
 
 // src/updater/index.ts
 function createUpdater({
@@ -178,15 +178,19 @@ function createUpdater({
   releaseAsarURL: _release,
   updateJsonURL: _update,
   debug = false,
-  downloadConfig,
-  compareVersion
+  downloadConfig: { extraHeader, userAgent } = {},
+  overrideFunctions: {
+    compareVersion,
+    verifySignaure,
+    downloadBuffer,
+    downloadJSON
+  } = {}
 }) {
   const updater = new EventEmitter();
   let signature = "";
   const asarPath = getProductAsarPath(productName);
   const gzipPath = `${asarPath}.gz`;
   const tmpFilePath = gzipPath.replace(".asar.gz", ".tmp.asar");
-  const { downloadBuffer, downloadJSON, extraHeader, userAgent } = downloadConfig || {};
   function log(msg) {
     debug && updater.emit("debug", msg);
   }
@@ -270,6 +274,7 @@ function createUpdater({
       throw new Error(`invalid type at format '${format}': ${data}`);
     }
   }
+  updater.setDebug = (isDebug) => debug = isDebug;
   updater.checkUpdate = async (data) => {
     try {
       const { signature: _sig, size, version } = await parseData("json", data);
@@ -295,7 +300,8 @@ function createUpdater({
       }
       const buffer = await parseData("buffer", data);
       log("verify start");
-      const version = verify(buffer, _sig, SIGNATURE_CERT);
+      const _verify = verifySignaure ?? verify;
+      const version = _verify(buffer, _sig, SIGNATURE_CERT);
       if (!version) {
         throw new Error("verify failed, invalid signature");
       }

package/dist/vite.cjs

@@ -55,14 +55,14 @@ function key(data, length) {
   const hash = (0, import_node_crypto.createHash)("SHA256").update(data).digest("binary");
   return import_node_buffer.Buffer.from(hash).subarray(0, length);
 }
-function signature(buffer, privateKey, cert, version) {
+var signature = (buffer, privateKey, cert, version) => {
   const sig = (0, import_node_crypto.createSign)("RSA-SHA256").update(buffer).sign({
     key: privateKey,
     padding: import_node_crypto.constants.RSA_PKCS1_PADDING,
     saltLength: import_node_crypto.constants.RSA_PSS_SALTLEN_DIGEST
   }, "base64");
   return encrypt(`${sig}%${version}`, key(cert, 32), key(buffer, 16));
-}
+};
 
 // src/build-plugins/build.ts
 function gzipFile(filePath) {
@@ -106,11 +106,13 @@ async function buildVersion({
   versionPath,
   privateKey,
   cert,
-  version
+  version,
+  generateSignature
 }) {
   const buffer = await (0, import_promises.readFile)(`${asarOutputPath}.gz`);
+  const _func = generateSignature ?? signature;
   await (0, import_promises.writeFile)(versionPath, JSON.stringify({
-    signature: signature(buffer, privateKey, cert, version),
+    signature: _func(buffer, privateKey, cert, version),
     version,
     size: buffer.length
   }, null, 2));
@@ -136,23 +138,13 @@ var import_node_path = require("path");
 var import_node_os = require("os");
 var import_node_crypto2 = require("crypto");
 var import_jscert = require("@cyyynthia/jscert");
-function generateCert(privateKey) {
-  const dn = {
-    country: "zh-CN",
-    state: "zj",
-    locality: "hz",
-    organization: "test",
-    organizationalUnit: "test unit",
-    commonName: "test.test",
-    emailAddress: "test@example.com"
-  };
+function generateCert(privateKey, dn, expires) {
   const csr = new import_jscert.CertificateSigningRequest(dn, privateKey, { digest: "sha256" });
-  const expiry = new Date(Date.now() + 365 * 864e5);
-  return csr.createSelfSignedCertificate(expiry).toPem();
+  return csr.createSelfSignedCertificate(expires).toPem();
 }
-function generateKeys(length = 2048) {
+function generateKeyPairDefault(length, subjects, expires) {
   const { privateKey: _key } = (0, import_node_crypto2.generateKeyPairSync)("rsa", { modulusLength: length });
-  const cert = generateCert(_key);
+  const cert = generateCert(_key, subjects, expires);
   const privateKey = _key.export({ type: "pkcs1", format: "pem" });
   return {
     privateKey,
@@ -188,13 +180,17 @@ function getKeys({
   keyLength,
   privateKeyPath,
   certPath,
-  entryPath
+  entryPath,
+  subject,
+  expires,
+  generateKeyPair
 }) {
   const keysDir = (0, import_node_path.dirname)(privateKeyPath);
   !(0, import_node_fs2.existsSync)(keysDir) && (0, import_node_fs2.mkdirSync)(keysDir);
   let privateKey, cert;
   if (!(0, import_node_fs2.existsSync)(privateKeyPath) || !(0, import_node_fs2.existsSync)(certPath)) {
-    const keys = generateKeys(keyLength);
+    const _func = generateKeyPair ?? generateKeyPairDefault;
+    const keys = _func(keyLength, subject, expires);
     privateKey = keys.privateKey;
     cert = keys.cert;
     (0, import_node_fs2.writeFileSync)(privateKeyPath, privateKey);
@@ -213,28 +209,38 @@ function getKeys({
 // src/build-plugins/option.ts
 var import_ci_info = require("ci-info");
 function parseOptions(options) {
-  const { isBuild, productName, version, minify = false, paths = {}, keys = {} } = options;
   const {
-    entryPath = "electron/app.ts",
-    entryOutputPath = "app.js",
-    asarOutputPath = `release/${productName}-${version}.asar`,
-    electronDistPath = "dist-electron",
-    rendererDistPath = "dist",
-    versionPath = "version.json"
-  } = paths;
+    isBuild,
+    productName,
+    version,
+    minify = false,
+    paths: {
+      entryPath = "electron/app.ts",
+      entryOutputPath = "app.js",
+      asarOutputPath = `release/${productName}-${version}.asar`,
+      electronDistPath = "dist-electron",
+      rendererDistPath = "dist",
+      versionPath = "version.json"
+    } = {},
+    keys: {
+      privateKeyPath = "keys/private.pem",
+      certPath = "keys/cert.pem",
+      keyLength = 2048,
+      certInfo = {},
+      overrideFunctions = {}
+    } = {}
+  } = options;
   const {
-    privateKeyPath = "keys/private.pem",
-    certPath = "keys/cert.pem",
-    keyLength = 2048,
-    certInfo
-  } = keys;
+    generateKeyPair,
+    generateSignature
+  } = overrideFunctions;
   let {
     subject = {
       commonName: productName,
       organization: `org.${productName}`
     },
     expires = Date.now() + 365 * 864e5
-  } = certInfo || {};
+  } = certInfo;
   const buildAsarOption = {
     version,
     asarOutputPath,
@@ -257,14 +263,16 @@ function parseOptions(options) {
       certPath,
       entryPath,
       subject,
-      expires
+      expires,
+      generateKeyPair
     });
     buildVersionOption = {
       version,
       asarOutputPath,
       privateKey,
       cert,
-      versionPath
+      versionPath,
+      generateSignature
     };
   }
   return { isBuild, buildAsarOption, buildEntryOption, buildVersionOption };

package/dist/vite.d.ts

@@ -1,6 +1,12 @@
 import { Plugin } from 'vite';
+import { Buffer } from 'node:buffer';
 import { DistinguishedName } from '@cyyynthia/jscert';
 
+type FunctionGenerateKeyPair = (keyLength: number, subject: DistinguishedName, expires: Date) => {
+    privateKey: string;
+    cert: string;
+};
+type FunctionGenerateSignature = (buffer: Buffer, privateKey: string, cert: string, version: string) => string;
 type Options = {
     /**
      * whether is in build mode
@@ -99,6 +105,22 @@ type Options = {
              */
             expires?: Date | number;
         };
+        overrideFunctions?: {
+            /**
+             * custom key pair generate function {@link FunctionGenerateKeyPair}
+             * @param keyLength key length
+             * @param subject subject info
+             * @param expires expire date
+             */
+            generateKeyPair?: FunctionGenerateKeyPair;
+            /**
+             * custom signature generate function {@link FunctionGenerateSignature}
+             * @param buffer file buffer
+             * @param privateKey private key
+             * @param cert certificate
+             */
+            generateSignature?: FunctionGenerateSignature;
+        };
     };
 };
 

package/dist/vite.mjs

@@ -1,6 +1,6 @@
 import {
   signature
-} from "./chunk-VADH6AZA.mjs";
+} from "./chunk-KMBSE4OO.mjs";
 
 // src/vite.ts
 import { createLogger } from "vite";
@@ -51,11 +51,13 @@ async function buildVersion({
   versionPath,
   privateKey,
   cert,
-  version
+  version,
+  generateSignature
 }) {
   const buffer = await readFile(`${asarOutputPath}.gz`);
+  const _func = generateSignature ?? signature;
   await writeFile(versionPath, JSON.stringify({
-    signature: signature(buffer, privateKey, cert, version),
+    signature: _func(buffer, privateKey, cert, version),
     version,
     size: buffer.length
   }, null, 2));
@@ -81,23 +83,13 @@ import { dirname } from "node:path";
 import { EOL } from "node:os";
 import { generateKeyPairSync } from "node:crypto";
 import { CertificateSigningRequest } from "@cyyynthia/jscert";
-function generateCert(privateKey) {
-  const dn = {
-    country: "zh-CN",
-    state: "zj",
-    locality: "hz",
-    organization: "test",
-    organizationalUnit: "test unit",
-    commonName: "test.test",
-    emailAddress: "test@example.com"
-  };
+function generateCert(privateKey, dn, expires) {
   const csr = new CertificateSigningRequest(dn, privateKey, { digest: "sha256" });
-  const expiry = new Date(Date.now() + 365 * 864e5);
-  return csr.createSelfSignedCertificate(expiry).toPem();
+  return csr.createSelfSignedCertificate(expires).toPem();
 }
-function generateKeys(length = 2048) {
+function generateKeyPairDefault(length, subjects, expires) {
   const { privateKey: _key } = generateKeyPairSync("rsa", { modulusLength: length });
-  const cert = generateCert(_key);
+  const cert = generateCert(_key, subjects, expires);
   const privateKey = _key.export({ type: "pkcs1", format: "pem" });
   return {
     privateKey,
@@ -133,13 +125,17 @@ function getKeys({
   keyLength,
   privateKeyPath,
   certPath,
-  entryPath
+  entryPath,
+  subject,
+  expires,
+  generateKeyPair
 }) {
   const keysDir = dirname(privateKeyPath);
   !existsSync(keysDir) && mkdirSync(keysDir);
   let privateKey, cert;
   if (!existsSync(privateKeyPath) || !existsSync(certPath)) {
-    const keys = generateKeys(keyLength);
+    const _func = generateKeyPair ?? generateKeyPairDefault;
+    const keys = _func(keyLength, subject, expires);
     privateKey = keys.privateKey;
     cert = keys.cert;
     writeFileSync(privateKeyPath, privateKey);
@@ -158,28 +154,38 @@ function getKeys({
 // src/build-plugins/option.ts
 import { isCI } from "ci-info";
 function parseOptions(options) {
-  const { isBuild, productName, version, minify = false, paths = {}, keys = {} } = options;
   const {
-    entryPath = "electron/app.ts",
-    entryOutputPath = "app.js",
-    asarOutputPath = `release/${productName}-${version}.asar`,
-    electronDistPath = "dist-electron",
-    rendererDistPath = "dist",
-    versionPath = "version.json"
-  } = paths;
+    isBuild,
+    productName,
+    version,
+    minify = false,
+    paths: {
+      entryPath = "electron/app.ts",
+      entryOutputPath = "app.js",
+      asarOutputPath = `release/${productName}-${version}.asar`,
+      electronDistPath = "dist-electron",
+      rendererDistPath = "dist",
+      versionPath = "version.json"
+    } = {},
+    keys: {
+      privateKeyPath = "keys/private.pem",
+      certPath = "keys/cert.pem",
+      keyLength = 2048,
+      certInfo = {},
+      overrideFunctions = {}
+    } = {}
+  } = options;
   const {
-    privateKeyPath = "keys/private.pem",
-    certPath = "keys/cert.pem",
-    keyLength = 2048,
-    certInfo
-  } = keys;
+    generateKeyPair,
+    generateSignature
+  } = overrideFunctions;
   let {
     subject = {
       commonName: productName,
       organization: `org.${productName}`
     },
     expires = Date.now() + 365 * 864e5
-  } = certInfo || {};
+  } = certInfo;
   const buildAsarOption = {
     version,
     asarOutputPath,
@@ -202,14 +208,16 @@ function parseOptions(options) {
       certPath,
       entryPath,
       subject,
-      expires
+      expires,
+      generateKeyPair
     });
     buildVersionOption = {
       version,
       asarOutputPath,
       privateKey,
       cert,
-      versionPath
+      versionPath,
+      generateSignature
     };
   }
   return { isBuild, buildAsarOption, buildEntryOption, buildVersionOption };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron-incremental-update",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "electron incremental update tools, powered by vite",
   "scripts": {
     "build": "tsup",