electron-incremental-update 0.7.5 → 0.7.7

package/dist/index.d.mts

@@ -4,6 +4,7 @@ type CheckResultType = Omit<UpdateJSON, 'signature'> | undefined | Error;
 type InstallResult = true | Error;
 type UpdateEvents = {
     downloading: [progress: number];
+    downloadBuffer: [buffer: Buffer];
     debug: [msg: string | Error];
 };
 type UpdateJSON = {
@@ -40,7 +41,7 @@ interface TypedUpdater<T extends Record<string | symbol, MaybeArray<any>>, Event
      * - `Error`: fail
      */
     download(data?: string | Buffer, sig?: string): Promise<InstallResult>;
-    setDebugMode(debug: boolean): void;
+    debugMode: boolean;
     productName: string;
 }
 type FunctionVerifySignature = (buffer: Buffer, signature: string, cert: string) => string | false;

package/dist/index.d.ts

@@ -4,6 +4,7 @@ type CheckResultType = Omit<UpdateJSON, 'signature'> | undefined | Error;
 type InstallResult = true | Error;
 type UpdateEvents = {
     downloading: [progress: number];
+    downloadBuffer: [buffer: Buffer];
     debug: [msg: string | Error];
 };
 type UpdateJSON = {
@@ -40,7 +41,7 @@ interface TypedUpdater<T extends Record<string | symbol, MaybeArray<any>>, Event
      * - `Error`: fail
      */
     download(data?: string | Buffer, sig?: string): Promise<InstallResult>;
-    setDebugMode(debug: boolean): void;
+    debugMode: boolean;
     productName: string;
 }
 type FunctionVerifySignature = (buffer: Buffer, signature: string, cert: string) => string | false;

package/dist/index.js

@@ -26,14 +26,13 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 var import_node_path2 = require("path");
 var import_node_fs3 = require("fs");
-var import_electron4 = require("electron");
+var import_electron3 = require("electron");
 
 // src/updater/index.ts
 var import_node_events = require("events");
 var import_node_buffer3 = require("buffer");
 var import_node_fs2 = require("fs");
 var import_promises = require("fs/promises");
-var import_electron3 = require("electron");
 
 // src/crypto.ts
 var import_node_crypto = require("crypto");
@@ -214,18 +213,13 @@ function createUpdater(updaterOptions) {
   const updater = new import_node_events.EventEmitter();
   let signature;
   let version;
-  let _debug = debug;
   const asarPath = getProductAsarPath(productName);
   const gzipPath = `${asarPath}.gz`;
   const tmpFilePath = `${asarPath}.tmp`;
   function log(msg) {
-    _debug && updater.emit("debug", msg);
+    debug && updater.emit("debug", msg);
   }
   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 ${version2}`);
     const _compare = compareVersion ?? compareVersionDefault;
@@ -279,13 +273,16 @@ function createUpdater(updaterOptions) {
       log(`download ${format} from ${data}`);
       const ret = await info.fn(data, updater, headers);
       log(`download ${format} success${format === "buffer" ? `, file size: ${ret.length}` : ""}`);
+      if (format === "buffer") {
+        updater.emit("downloadBuffer", ret);
+      }
       return ret;
     } else {
       throw new Error(`invalid type at format '${format}': ${data}`);
     }
   }
   updater.productName = productName;
-  updater.setDebugMode = (isDebug) => _debug = isDebug;
+  updater.debugMode = debug;
   updater.checkUpdate = async (data) => {
     try {
       const { signature: _sig, size, version: _ver } = await parseData("json", data);
@@ -343,7 +340,7 @@ function initApp(appOptions) {
   } = appOptions || {};
   function handleError(msg) {
     onStartError?.(new Error(msg));
-    import_electron4.app.quit();
+    import_electron3.app.quit();
   }
   function startup(updater) {
     try {
@@ -351,7 +348,7 @@ function initApp(appOptions) {
       if ((0, import_node_fs3.existsSync)(`${asarPath}.tmp`)) {
         (0, import_node_fs3.renameSync)(`${asarPath}.tmp`, asarPath);
       }
-      const mainDir = import_electron4.app.isPackaged ? asarPath : electronDevDistPath;
+      const mainDir = import_electron3.app.isPackaged ? asarPath : electronDevDistPath;
       const entry = (0, import_node_path2.resolve)(__dirname, mainDir, mainPath);
       onStart?.(entry);
       require(entry)(updater);

package/dist/index.mjs

@@ -12,14 +12,13 @@ import {
 // src/index.ts
 import { resolve } from "node:path";
 import { existsSync as existsSync2, renameSync } from "node:fs";
-import { app as app2 } from "electron";
+import { app } from "electron";
 
 // src/updater/index.ts
 import { EventEmitter } from "node:events";
 import { Buffer as Buffer2 } from "node:buffer";
 import { existsSync } from "node:fs";
 import { rm, writeFile } from "node:fs/promises";
-import { app } from "electron";
 
 // src/updater/defaultFunctions.ts
 import { Buffer } from "node:buffer";
@@ -138,18 +137,13 @@ function createUpdater(updaterOptions) {
   const updater = new EventEmitter();
   let signature;
   let version;
-  let _debug = debug;
   const asarPath = getProductAsarPath(productName);
   const gzipPath = `${asarPath}.gz`;
   const tmpFilePath = `${asarPath}.tmp`;
   function log(msg) {
-    _debug && updater.emit("debug", msg);
+    debug && updater.emit("debug", msg);
   }
   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 ${version2}`);
     const _compare = compareVersion ?? compareVersionDefault;
@@ -203,13 +197,16 @@ function createUpdater(updaterOptions) {
       log(`download ${format} from ${data}`);
       const ret = await info.fn(data, updater, headers);
       log(`download ${format} success${format === "buffer" ? `, file size: ${ret.length}` : ""}`);
+      if (format === "buffer") {
+        updater.emit("downloadBuffer", ret);
+      }
       return ret;
     } else {
       throw new Error(`invalid type at format '${format}': ${data}`);
     }
   }
   updater.productName = productName;
-  updater.setDebugMode = (isDebug) => _debug = isDebug;
+  updater.debugMode = debug;
   updater.checkUpdate = async (data) => {
     try {
       const { signature: _sig, size, version: _ver } = await parseData("json", data);
@@ -267,7 +264,7 @@ function initApp(appOptions) {
   } = appOptions || {};
   function handleError(msg) {
     onStartError?.(new Error(msg));
-    app2.quit();
+    app.quit();
   }
   function startup(updater) {
     try {
@@ -275,7 +272,7 @@ function initApp(appOptions) {
       if (existsSync2(`${asarPath}.tmp`)) {
         renameSync(`${asarPath}.tmp`, asarPath);
       }
-      const mainDir = app2.isPackaged ? asarPath : electronDevDistPath;
+      const mainDir = app.isPackaged ? asarPath : electronDevDistPath;
       const entry = resolve(__dirname, mainDir, mainPath);
       onStart?.(entry);
       __require(entry)(updater);

package/dist/vite.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/vite.ts
@@ -37,6 +27,7 @@ var import_vite = require("vite");
 
 // src/build-plugins/build.ts
 var import_promises = require("fs/promises");
+var import_asar = require("@electron/asar");
 var import_esbuild = require("esbuild");
 
 // src/crypto.ts
@@ -79,23 +70,6 @@ async function zipFile(filePath, targetFilePath = `${filePath}.gz`) {
 }
 
 // src/build-plugins/build.ts
-async function pack(dir, target) {
-  let asar = null;
-  try {
-    asar = await import("asar");
-  } catch (ignore) {
-  }
-  if (!asar) {
-    try {
-      asar = await import("@electron/asar");
-    } catch (ignore) {
-    }
-  }
-  if (!asar) {
-    throw new Error("no asar, please install @electron/asar");
-  }
-  await asar.createPackage(dir, target);
-}
 async function buildAsar({
   version,
   asarOutputPath,
@@ -105,7 +79,7 @@ async function buildAsar({
 }) {
   await (0, import_promises.rename)(rendererDistPath, `${electronDistPath}/renderer`);
   await (0, import_promises.writeFile)(`${electronDistPath}/version`, version);
-  await pack(electronDistPath, asarOutputPath);
+  await (0, import_asar.createPackage)(electronDistPath, asarOutputPath);
   await zipFile(asarOutputPath, gzipPath);
 }
 async function buildVersion({
@@ -135,7 +109,7 @@ async function buildEntry({
     platform: "node",
     outfile,
     minify,
-    external: ["electron"]
+    external: ["electron", "original-fs"]
   });
 }
 
@@ -146,44 +120,19 @@ var import_ci_info = require("ci-info");
 var import_node_fs2 = require("fs");
 var import_node_path2 = require("path");
 var import_node_os = require("os");
-var import_node_child_process = require("child_process");
+var import_selfsigned = require("selfsigned");
 function generateKeyPair(keyLength, subject, days, privateKeyPath, certPath) {
-  const starter = `try {
-  require('selfsigned')
-} catch (e) {
-  console.error('to generate private key, please run "npm install --dev selfsigned"')
-}
-try {
-  const { existsSync, mkdirSync, writeFileSync } = require('node:fs')
-  const { dirname } = require('node:path')
-  const { generate } = require('selfsigned')
-  const privateKeyPath = '${privateKeyPath.replace(/\\/g, "/")}'
-  const certPath = '${certPath.replace(/\\/g, "/")}'
-  const privateKeyDir = dirname(privateKeyPath)
-  existsSync(privateKeyDir) || mkdirSync(privateKeyDir, { recursive: true })
-  const certDir = dirname(certPath)
-  existsSync(certDir) || mkdirSync(certDir, { recursive: true })
-
-  const { cert, private: privateKey } = generate(${JSON.stringify(subject)}, {
-    keySize: ${keyLength}, algorithm: 'sha256', days: ${days},
-  })
-
-  writeFileSync(privateKeyPath, privateKey.replace(/\\r\\n?/g, '\\n'))
-  writeFileSync(certPath, cert.replace(/\\r\\n?/g, '\\n'))
-} catch (e) {
-  console.error(e)
-  process.exit(-1)
-} finally {
-  process.exit(0)
-}
-`;
-  const fileName = "key-gen.js";
-  (0, import_node_fs2.writeFileSync)(`./${fileName}`, starter);
-  try {
-    (0, import_node_child_process.execSync)(`npx electron ${fileName}`, { stdio: "inherit" });
-  } finally {
-    (0, import_node_fs2.rmSync)(`./${fileName}`);
-  }
+  const privateKeyDir = (0, import_node_path2.dirname)(privateKeyPath);
+  (0, import_node_fs2.existsSync)(privateKeyDir) || (0, import_node_fs2.mkdirSync)(privateKeyDir, { recursive: true });
+  const certDir = (0, import_node_path2.dirname)(certPath);
+  (0, import_node_fs2.existsSync)(certDir) || (0, import_node_fs2.mkdirSync)(certDir, { recursive: true });
+  const { cert, private: privateKey } = (0, import_selfsigned.generate)(subject, {
+    keySize: keyLength,
+    algorithm: "sha256",
+    days
+  });
+  (0, import_node_fs2.writeFileSync)(privateKeyPath, privateKey.replace(/\r\n?/g, "\n"));
+  (0, import_node_fs2.writeFileSync)(certPath, cert.replace(/\r\n?/g, "\n"));
 }
 function writeCertToMain(entryPath, cert) {
   const file = (0, import_node_fs2.readFileSync)(entryPath, "utf-8");
@@ -208,7 +157,7 @@ function writeCertToMain(entryPath, cert) {
     !isMatched && lines.push(r);
     replaced = lines.join(import_node_os.EOL);
   }
-  (0, import_node_fs2.writeFileSync)(entryPath, replaced);
+  (0, import_node_fs2.writeFileSync)(entryPath, replaced.replace(/\r\n?/g, "\n"));
 }
 function parseKeys({
   keyLength,

package/dist/vite.mjs

@@ -10,24 +10,8 @@ import { createLogger } from "vite";
 
 // src/build-plugins/build.ts
 import { readFile, rename, writeFile } from "node:fs/promises";
+import { createPackage } from "@electron/asar";
 import { build } from "esbuild";
-async function pack(dir, target) {
-  let asar = null;
-  try {
-    asar = await import("asar");
-  } catch (ignore) {
-  }
-  if (!asar) {
-    try {
-      asar = await import("@electron/asar");
-    } catch (ignore) {
-    }
-  }
-  if (!asar) {
-    throw new Error("no asar, please install @electron/asar");
-  }
-  await asar.createPackage(dir, target);
-}
 async function buildAsar({
   version,
   asarOutputPath,
@@ -37,7 +21,7 @@ async function buildAsar({
 }) {
   await rename(rendererDistPath, `${electronDistPath}/renderer`);
   await writeFile(`${electronDistPath}/version`, version);
-  await pack(electronDistPath, asarOutputPath);
+  await createPackage(electronDistPath, asarOutputPath);
   await zipFile(asarOutputPath, gzipPath);
 }
 async function buildVersion({
@@ -67,7 +51,7 @@ async function buildEntry({
     platform: "node",
     outfile,
     minify,
-    external: ["electron"]
+    external: ["electron", "original-fs"]
   });
 }
 
@@ -75,47 +59,22 @@ async function buildEntry({
 import { isCI } from "ci-info";
 
 // src/build-plugins/key.ts
-import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
 import { EOL } from "node:os";
-import { execSync } from "node:child_process";
+import { generate } from "selfsigned";
 function generateKeyPair(keyLength, subject, days, privateKeyPath, certPath) {
-  const starter = `try {
-  require('selfsigned')
-} catch (e) {
-  console.error('to generate private key, please run "npm install --dev selfsigned"')
-}
-try {
-  const { existsSync, mkdirSync, writeFileSync } = require('node:fs')
-  const { dirname } = require('node:path')
-  const { generate } = require('selfsigned')
-  const privateKeyPath = '${privateKeyPath.replace(/\\/g, "/")}'
-  const certPath = '${certPath.replace(/\\/g, "/")}'
-  const privateKeyDir = dirname(privateKeyPath)
-  existsSync(privateKeyDir) || mkdirSync(privateKeyDir, { recursive: true })
-  const certDir = dirname(certPath)
-  existsSync(certDir) || mkdirSync(certDir, { recursive: true })
-
-  const { cert, private: privateKey } = generate(${JSON.stringify(subject)}, {
-    keySize: ${keyLength}, algorithm: 'sha256', days: ${days},
-  })
-
-  writeFileSync(privateKeyPath, privateKey.replace(/\\r\\n?/g, '\\n'))
-  writeFileSync(certPath, cert.replace(/\\r\\n?/g, '\\n'))
-} catch (e) {
-  console.error(e)
-  process.exit(-1)
-} finally {
-  process.exit(0)
-}
-`;
-  const fileName = "key-gen.js";
-  writeFileSync(`./${fileName}`, starter);
-  try {
-    execSync(`npx electron ${fileName}`, { stdio: "inherit" });
-  } finally {
-    rmSync(`./${fileName}`);
-  }
+  const privateKeyDir = dirname(privateKeyPath);
+  existsSync(privateKeyDir) || mkdirSync(privateKeyDir, { recursive: true });
+  const certDir = dirname(certPath);
+  existsSync(certDir) || mkdirSync(certDir, { recursive: true });
+  const { cert, private: privateKey } = generate(subject, {
+    keySize: keyLength,
+    algorithm: "sha256",
+    days
+  });
+  writeFileSync(privateKeyPath, privateKey.replace(/\r\n?/g, "\n"));
+  writeFileSync(certPath, cert.replace(/\r\n?/g, "\n"));
 }
 function writeCertToMain(entryPath, cert) {
   const file = readFileSync(entryPath, "utf-8");
@@ -140,7 +99,7 @@ function writeCertToMain(entryPath, cert) {
     !isMatched && lines.push(r);
     replaced = lines.join(EOL);
   }
-  writeFileSync(entryPath, replaced);
+  writeFileSync(entryPath, replaced.replace(/\r\n?/g, "\n"));
 }
 function parseKeys({
   keyLength,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "electron-incremental-update",
   "author": "subframe7536",
-  "version": "0.7.5",
+  "version": "0.7.7",
   "description": "electron incremental update tools, powered by vite",
   "scripts": {
     "build": "tsup && node fix-module.js",
@@ -43,10 +43,8 @@
     "updater"
   ],
   "devDependencies": {
-    "@electron/asar": "^3.2.4",
     "@subframe7536/eslint-config": "^0.1.9",
     "@types/node": "^20.3.2",
-    "asar": "^3.2.0",
     "bumpp": "^9.1.1",
     "electron": "^25.2.0",
     "eslint": "^8.43.0",
@@ -56,9 +54,8 @@
     "vitest": "^0.32.2"
   },
   "dependencies": {
-    "ci-info": "^3.8.0"
-  },
-  "peerDependencies": {
+    "@electron/asar": "^3.2.4",
+    "ci-info": "^3.8.0",
     "selfsigned": "^2.1.1"
   }
 }