electron-incremental-update 0.7.1 → 0.7.2

package/dist/{chunk-3YKEHZAU.mjs → chunk-Q2K52LOG.mjs}

@@ -1,5 +1,5 @@
 // src/crypto.ts
-import { constants, createCipheriv, createDecipheriv, createHash, createSign, createVerify } from "node:crypto";
+import { createCipheriv, createDecipheriv, createHash, createPrivateKey, createSign, createVerify } from "node:crypto";
 import { Buffer } from "node:buffer";
 function encrypt(plainText, key2, iv) {
   const cipher = createCipheriv("aes-256-cbc", key2, iv);
@@ -18,11 +18,7 @@ function key(data, length) {
   return Buffer.from(hash).subarray(0, length);
 }
 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");
+  const sig = createSign("RSA-SHA256").update(buffer).sign(createPrivateKey(privateKey), "base64");
   return encrypt(`${sig}%${version}`, key(cert, 32), key(buffer, 16));
 };
 var verify = (buffer, signature2, cert) => {

package/dist/index.js

@@ -210,24 +210,24 @@ function createUpdater({
   } = {}
 }) {
   const updater = new import_node_events.EventEmitter();
-  let signature = "";
+  let signature, version;
   const asarPath = getProductAsarPath(productName);
   const gzipPath = `${asarPath}.gz`;
   const tmpFilePath = gzipPath.replace(".asar.gz", ".tmp.asar");
   function log(msg) {
     debug && updater.emit("debug", msg);
   }
-  function needUpdate(version) {
+  function needUpdate(version2) {
     if (!import_electron3.app.isPackaged) {
       log("in dev mode, no need to update");
       return false;
     }
     const currentVersion = getEntryVersion();
-    log(`check update: current version is ${currentVersion}, new version is ${version}`);
+    log(`check update: current version is ${currentVersion}, new version is ${version2}`);
     const _compare = compareVersion ?? compareVersionDefault;
-    return _compare(currentVersion, version);
+    return _compare(currentVersion, version2);
   }
-  async function parseData(format, data) {
+  async function parseData(format, data, version2) {
     if ((0, import_node_fs2.existsSync)(tmpFilePath)) {
       log(`remove tmp file: ${tmpFilePath}`);
       await (0, import_promises.rm)(tmpFilePath);
@@ -258,7 +258,7 @@ function createUpdater({
       } : {
         name: "releaseAsarURL",
         url: _release,
-        repoFallback: `${repository}/releases/download/latest/${productName}.asar.gz`,
+        repoFallback: `${repository}/releases/download/v${version2}/${productName}-${version2}.asar.gz`,
         fn: downloadBuffer ?? downloadBufferDefault
       };
       data ??= info.url;
@@ -267,6 +267,9 @@ function createUpdater({
         if (!repository) {
           throw new Error(`${info.name} or repository are not set`);
         }
+        if (format === "buffer" && !version2) {
+          throw new Error("version are not set");
+        }
         data = info.repoFallback;
       }
       log(`download ${format} from ${data}`);
@@ -280,15 +283,16 @@ function createUpdater({
   updater.setDebug = (isDebug) => debug = isDebug;
   updater.checkUpdate = async (data) => {
     try {
-      const { signature: _sig, size, version } = await parseData("json", data);
-      log(`checked version: ${version}, size: ${size}, signature: ${_sig}`);
-      if (!needUpdate(version)) {
-        log(`update unavailable: ${version}`);
+      const { signature: _sig, size, version: _ver } = await parseData("json", data);
+      log(`checked version: ${_ver}, size: ${size}, signature: ${_sig}`);
+      if (!needUpdate(_ver)) {
+        log(`update unavailable: ${_ver}`);
         return void 0;
       } else {
-        log(`update available: ${version}`);
+        log(`update available: ${_ver}`);
         signature = _sig;
-        return { size, version };
+        version = _ver;
+        return { size, version: _ver };
       }
     } catch (error) {
       log(error);
@@ -301,29 +305,29 @@ function createUpdater({
       if (!_sig) {
         throw new Error("signature are not set, please checkUpdate first or set the second parameter");
       }
-      const buffer = await parseData("buffer", data);
+      const buffer = await parseData("buffer", data, version);
       log("verify start");
       const _verify = verifySignaure ?? verify;
-      const version = _verify(buffer, _sig, SIGNATURE_CERT);
-      if (!version) {
+      const _ver = _verify(buffer, _sig, SIGNATURE_CERT);
+      if (!_ver) {
         throw new Error("verify failed, invalid signature");
       }
       log("verify success");
-      if (!needUpdate(version)) {
-        throw new Error(`update unavailable: ${version}`);
+      if (!needUpdate(_ver)) {
+        throw new Error(`update unavailable: ${_ver}`);
       }
       log(`write file: ${gzipPath}`);
       await (0, import_promises.writeFile)(gzipPath, buffer);
       log(`extract file: ${gzipPath}`);
       await unzipFile(gzipPath, tmpFilePath);
       const asarVersion = await (0, import_promises.readFile)((0, import_node_path2.resolve)(tmpFilePath, "version"), "utf8");
-      if (asarVersion !== version) {
+      if (asarVersion !== _ver) {
         (0, import_node_fs2.rmSync)(tmpFilePath);
-        throw new Error(`update failed: asar version is ${asarVersion}, but it should be ${version}`);
+        throw new Error(`update failed: asar version is ${asarVersion}, but it should be ${_ver}`);
       } else {
         await (0, import_promises.rename)(tmpFilePath, asarPath);
       }
-      log(`update success, version: ${version}`);
+      log(`update success, version: ${_ver}`);
       signature = "";
       return true;
     } catch (error) {

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import {
   verify
-} from "./chunk-3YKEHZAU.mjs";
+} from "./chunk-Q2K52LOG.mjs";
 import {
   __require,
   getEntryVersion,
@@ -132,24 +132,24 @@ function createUpdater({
   } = {}
 }) {
   const updater = new EventEmitter();
-  let signature = "";
+  let signature, version;
   const asarPath = getProductAsarPath(productName);
   const gzipPath = `${asarPath}.gz`;
   const tmpFilePath = gzipPath.replace(".asar.gz", ".tmp.asar");
   function log(msg) {
     debug && updater.emit("debug", msg);
   }
-  function needUpdate(version) {
+  function needUpdate(version2) {
     if (!app.isPackaged) {
       log("in dev mode, no need to update");
       return false;
     }
     const currentVersion = getEntryVersion();
-    log(`check update: current version is ${currentVersion}, new version is ${version}`);
+    log(`check update: current version is ${currentVersion}, new version is ${version2}`);
     const _compare = compareVersion ?? compareVersionDefault;
-    return _compare(currentVersion, version);
+    return _compare(currentVersion, version2);
   }
-  async function parseData(format, data) {
+  async function parseData(format, data, version2) {
     if (existsSync(tmpFilePath)) {
       log(`remove tmp file: ${tmpFilePath}`);
       await rm(tmpFilePath);
@@ -180,7 +180,7 @@ function createUpdater({
       } : {
         name: "releaseAsarURL",
         url: _release,
-        repoFallback: `${repository}/releases/download/latest/${productName}.asar.gz`,
+        repoFallback: `${repository}/releases/download/v${version2}/${productName}-${version2}.asar.gz`,
         fn: downloadBuffer ?? downloadBufferDefault
       };
       data ??= info.url;
@@ -189,6 +189,9 @@ function createUpdater({
         if (!repository) {
           throw new Error(`${info.name} or repository are not set`);
         }
+        if (format === "buffer" && !version2) {
+          throw new Error("version are not set");
+        }
         data = info.repoFallback;
       }
       log(`download ${format} from ${data}`);
@@ -202,15 +205,16 @@ function createUpdater({
   updater.setDebug = (isDebug) => debug = isDebug;
   updater.checkUpdate = async (data) => {
     try {
-      const { signature: _sig, size, version } = await parseData("json", data);
-      log(`checked version: ${version}, size: ${size}, signature: ${_sig}`);
-      if (!needUpdate(version)) {
-        log(`update unavailable: ${version}`);
+      const { signature: _sig, size, version: _ver } = await parseData("json", data);
+      log(`checked version: ${_ver}, size: ${size}, signature: ${_sig}`);
+      if (!needUpdate(_ver)) {
+        log(`update unavailable: ${_ver}`);
         return void 0;
       } else {
-        log(`update available: ${version}`);
+        log(`update available: ${_ver}`);
         signature = _sig;
-        return { size, version };
+        version = _ver;
+        return { size, version: _ver };
       }
     } catch (error) {
       log(error);
@@ -223,29 +227,29 @@ function createUpdater({
       if (!_sig) {
         throw new Error("signature are not set, please checkUpdate first or set the second parameter");
       }
-      const buffer = await parseData("buffer", data);
+      const buffer = await parseData("buffer", data, version);
       log("verify start");
       const _verify = verifySignaure ?? verify;
-      const version = _verify(buffer, _sig, SIGNATURE_CERT);
-      if (!version) {
+      const _ver = _verify(buffer, _sig, SIGNATURE_CERT);
+      if (!_ver) {
         throw new Error("verify failed, invalid signature");
       }
       log("verify success");
-      if (!needUpdate(version)) {
-        throw new Error(`update unavailable: ${version}`);
+      if (!needUpdate(_ver)) {
+        throw new Error(`update unavailable: ${_ver}`);
       }
       log(`write file: ${gzipPath}`);
       await writeFile(gzipPath, buffer);
       log(`extract file: ${gzipPath}`);
       await unzipFile(gzipPath, tmpFilePath);
       const asarVersion = await readFile(resolve(tmpFilePath, "version"), "utf8");
-      if (asarVersion !== version) {
+      if (asarVersion !== _ver) {
         rmSync(tmpFilePath);
-        throw new Error(`update failed: asar version is ${asarVersion}, but it should be ${version}`);
+        throw new Error(`update failed: asar version is ${asarVersion}, but it should be ${_ver}`);
       } else {
         await rename(tmpFilePath, asarPath);
       }
-      log(`update success, version: ${version}`);
+      log(`update success, version: ${_ver}`);
       signature = "";
       return true;
     } catch (error) {

package/dist/vite.d.mts

@@ -47,6 +47,11 @@ type Options = {
          * @default `release/${productName}.asar`
          */
         asarOutputPath?: string;
+        /**
+         * Path to gzipped asar file
+         * @default `release/${productName}-${version}.asar.gz`
+         */
+        gzipPath?: string;
         /**
          * Path to electron build output
          * @default `dist-electron`

package/dist/vite.d.ts

@@ -47,6 +47,11 @@ type Options = {
          * @default `release/${productName}.asar`
          */
         asarOutputPath?: string;
+        /**
+         * Path to gzipped asar file
+         * @default `release/${productName}-${version}.asar.gz`
+         */
+        gzipPath?: string;
         /**
          * Path to electron build output
          * @default `dist-electron`

package/dist/vite.js

@@ -53,11 +53,7 @@ function key(data, length) {
   return import_node_buffer.Buffer.from(hash).subarray(0, length);
 }
 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");
+  const sig = (0, import_node_crypto.createSign)("RSA-SHA256").update(buffer).sign((0, import_node_crypto.createPrivateKey)(privateKey), "base64");
   return encrypt(`${sig}%${version}`, key(cert, 32), key(buffer, 16));
 };
 
@@ -99,23 +95,24 @@ async function pack(dir, target) {
 async function buildAsar({
   version,
   asarOutputPath,
+  gzipPath,
   electronDistPath,
   rendererDistPath
 }) {
   await (0, import_promises.rename)(rendererDistPath, `${electronDistPath}/renderer`);
   await (0, import_promises.writeFile)(`${electronDistPath}/version`, version);
   await pack(electronDistPath, asarOutputPath);
-  await zipFile(asarOutputPath);
+  await zipFile(asarOutputPath, gzipPath);
 }
 async function buildVersion({
-  asarOutputPath,
+  gzipPath,
   versionPath,
   privateKey,
   cert,
   version,
   generateSignature
 }) {
-  const buffer = await (0, import_promises.readFile)(`${asarOutputPath}.gz`);
+  const buffer = await (0, import_promises.readFile)(gzipPath);
   const _func = generateSignature ?? signature;
   await (0, import_promises.writeFile)(versionPath, JSON.stringify({
     signature: _func(buffer, privateKey, cert, version),
@@ -138,6 +135,9 @@ async function buildEntry({
   });
 }
 
+// src/build-plugins/option.ts
+var import_ci_info = require("ci-info");
+
 // src/build-plugins/key.ts
 var import_node_fs2 = require("fs");
 var import_node_path2 = require("path");
@@ -182,7 +182,7 @@ function writeCertToMain(entryPath, cert) {
   }
   (0, import_node_fs2.writeFileSync)(entryPath, replaced);
 }
-function getKeys({
+function parseKeys({
   keyLength,
   privateKeyPath,
   certPath,
@@ -213,7 +213,6 @@ function getKeys({
 }
 
 // src/build-plugins/option.ts
-var import_ci_info = require("ci-info");
 function parseOptions(options) {
   const {
     isBuild,
@@ -223,7 +222,8 @@ function parseOptions(options) {
     paths: {
       entryPath = "electron/app.ts",
       entryOutputPath = "app.js",
-      asarOutputPath = `release/${productName}-${version}.asar`,
+      asarOutputPath = `release/${productName}.asar`,
+      gzipPath = `release/${productName}-${version}.asar.gz`,
       electronDistPath = "dist-electron",
       rendererDistPath = "dist",
       versionPath = "version.json"
@@ -250,6 +250,7 @@ function parseOptions(options) {
   const buildAsarOption = {
     version,
     asarOutputPath,
+    gzipPath,
     electronDistPath,
     rendererDistPath
   };
@@ -263,7 +264,7 @@ function parseOptions(options) {
     if (typeof expires === "number") {
       expires = new Date(Date.now() + expires);
     }
-    const { privateKey, cert } = getKeys({
+    const { privateKey, cert } = parseKeys({
       keyLength,
       privateKeyPath,
       certPath,
@@ -274,7 +275,7 @@ function parseOptions(options) {
     });
     buildVersionOption = {
       version,
-      asarOutputPath,
+      gzipPath,
       privateKey,
       cert,
       versionPath,

package/dist/vite.mjs

@@ -1,6 +1,6 @@
 import {
   signature
-} from "./chunk-3YKEHZAU.mjs";
+} from "./chunk-Q2K52LOG.mjs";
 import {
   zipFile
 } from "./chunk-CRBEZBU5.mjs";
@@ -31,23 +31,24 @@ async function pack(dir, target) {
 async function buildAsar({
   version,
   asarOutputPath,
+  gzipPath,
   electronDistPath,
   rendererDistPath
 }) {
   await rename(rendererDistPath, `${electronDistPath}/renderer`);
   await writeFile(`${electronDistPath}/version`, version);
   await pack(electronDistPath, asarOutputPath);
-  await zipFile(asarOutputPath);
+  await zipFile(asarOutputPath, gzipPath);
 }
 async function buildVersion({
-  asarOutputPath,
+  gzipPath,
   versionPath,
   privateKey,
   cert,
   version,
   generateSignature
 }) {
-  const buffer = await readFile(`${asarOutputPath}.gz`);
+  const buffer = await readFile(gzipPath);
   const _func = generateSignature ?? signature;
   await writeFile(versionPath, JSON.stringify({
     signature: _func(buffer, privateKey, cert, version),
@@ -70,6 +71,9 @@ async function buildEntry({
   });
 }
 
+// src/build-plugins/option.ts
+import { isCI } from "ci-info";
+
 // src/build-plugins/key.ts
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
@@ -114,7 +118,7 @@ function writeCertToMain(entryPath, cert) {
   }
   writeFileSync(entryPath, replaced);
 }
-function getKeys({
+function parseKeys({
   keyLength,
   privateKeyPath,
   certPath,
@@ -145,7 +149,6 @@ function getKeys({
 }
 
 // src/build-plugins/option.ts
-import { isCI } from "ci-info";
 function parseOptions(options) {
   const {
     isBuild,
@@ -155,7 +158,8 @@ function parseOptions(options) {
     paths: {
       entryPath = "electron/app.ts",
       entryOutputPath = "app.js",
-      asarOutputPath = `release/${productName}-${version}.asar`,
+      asarOutputPath = `release/${productName}.asar`,
+      gzipPath = `release/${productName}-${version}.asar.gz`,
       electronDistPath = "dist-electron",
       rendererDistPath = "dist",
       versionPath = "version.json"
@@ -182,6 +186,7 @@ function parseOptions(options) {
   const buildAsarOption = {
     version,
     asarOutputPath,
+    gzipPath,
     electronDistPath,
     rendererDistPath
   };
@@ -195,7 +200,7 @@ function parseOptions(options) {
     if (typeof expires === "number") {
       expires = new Date(Date.now() + expires);
     }
-    const { privateKey, cert } = getKeys({
+    const { privateKey, cert } = parseKeys({
       keyLength,
       privateKeyPath,
       certPath,
@@ -206,7 +211,7 @@ function parseOptions(options) {
     });
     buildVersionOption = {
       version,
-      asarOutputPath,
+      gzipPath,
       privateKey,
       cert,
       versionPath,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "electron-incremental-update",
   "author": "subframe7536",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "electron incremental update tools, powered by vite",
   "scripts": {
     "build": "tsup && node fix-module.js",
@@ -50,7 +50,6 @@
     "bumpp": "^9.1.1",
     "electron": "^25.2.0",
     "eslint": "^8.43.0",
-    "fs-jetpack": "^5.1.0",
     "tsup": "^7.1.0",
     "typescript": "^5.1.5",
     "vite": "^4.3.9",