electron-incremental-update 0.8.7 → 0.8.9

package/README.md

@@ -75,11 +75,12 @@ initApp({ onStart: console.log })
 make sure the plugin is set in the **last** build task
 
 - for `vite-plugin-electron`, set it to `preload` (the second object in the plugin option array)
+- cert is read from `process.env.UPDATER_CERT` first, then read config
+- privatekey is read from `process.env.UPDATER_PK` first, then read config
 
 ```ts
 // vite.config.ts
 export default defineConfig(({ command }) => {
-
   const isBuild = command === 'build'
   // ...
 

package/dist/{chunk-OGAOUYV3.mjs → chunk-6V5SXFGA.mjs}

@@ -13,15 +13,13 @@ var appInfo = {
   win: process.platform === "win32",
   mac: process.platform === "darwin",
   linux: process.platform === "linux",
-  electronVersion: getElectronVersion(),
-  appVersion: getAppVersion,
   systemVersion: release()
 };
 function getLocale() {
   return app.isReady() ? app.getLocale() : void 0;
 }
 function getProductAsarPath(name = DEFAULT_APP_NAME) {
-  return !app.isPackaged ? "DEV.asar" : join(dirname(app.getAppPath()), `${name}.asar`);
+  return !app.isPackaged ? join(dirname(app.getAppPath()), `${name}.asar`) : "DEV.asar";
 }
 function getElectronVersion() {
   return app.getVersion();
@@ -63,16 +61,13 @@ function restartApp() {
   app2.relaunch();
   app2.quit();
 }
-function waitAppReady(duration = 1e3) {
-  if (app2.isReady()) {
-    return Promise.resolve();
-  }
-  return new Promise((resolve, reject) => {
-    const timeout = setTimeout(() => {
+function waitAppReady(timeout = 1e3) {
+  return app2.isReady() ? Promise.resolve() : new Promise((resolve, reject) => {
+    const _ = setTimeout(() => {
       reject(new Error("app is not ready"));
-    }, duration);
+    }, timeout);
     app2.whenReady().then(() => {
-      clearTimeout(timeout);
+      clearTimeout(_);
       resolve();
     });
   });

package/dist/index.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/index.ts
@@ -37,7 +27,7 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 var import_node_path2 = require("path");
 var import_node_fs4 = require("fs");
-var import_electron4 = __toESM(require("electron"));
+var import_electron4 = require("electron");
 
 // src/updater/index.ts
 var import_node_fs3 = require("fs");
@@ -54,12 +44,10 @@ var appInfo = {
   win: process.platform === "win32",
   mac: process.platform === "darwin",
   linux: process.platform === "linux",
-  electronVersion: getElectronVersion(),
-  appVersion: getAppVersion,
   systemVersion: (0, import_node_os.release)()
 };
 function getProductAsarPath(name = DEFAULT_APP_NAME) {
-  return !import_electron.app.isPackaged ? "DEV.asar" : (0, import_node_path.join)((0, import_node_path.dirname)(import_electron.app.getAppPath()), `${name}.asar`);
+  return !import_electron.app.isPackaged ? (0, import_node_path.join)((0, import_node_path.dirname)(import_electron.app.getAppPath()), `${name}.asar`) : "DEV.asar";
 }
 function getElectronVersion() {
   return import_electron.app.getVersion();
@@ -116,16 +104,13 @@ async function unzipFile(gzipPath, targetFilePath = gzipPath.slice(0, -3)) {
 
 // src/utils/utils.ts
 var import_electron2 = require("electron");
-function waitAppReady(duration = 1e3) {
-  if (import_electron2.app.isReady()) {
-    return Promise.resolve();
-  }
-  return new Promise((resolve2, reject) => {
-    const timeout = setTimeout(() => {
+function waitAppReady(timeout = 1e3) {
+  return import_electron2.app.isReady() ? Promise.resolve() : new Promise((resolve2, reject) => {
+    const _ = setTimeout(() => {
       reject(new Error("app is not ready"));
-    }, duration);
+    }, timeout);
     import_electron2.app.whenReady().then(() => {
-      clearTimeout(timeout);
+      clearTimeout(_);
       resolve2();
     });
   });
@@ -438,7 +423,7 @@ function initApp(appOptions) {
   } = hooks || {};
   function handleError(msg) {
     onStartError?.(new Error(msg));
-    import_electron4.default.app.quit();
+    import_electron4.app.quit();
   }
   async function startup(updater) {
     try {
@@ -448,7 +433,7 @@ function initApp(appOptions) {
         await beforeDoUpdate?.(asarPath, updateAsarPath);
         (0, import_node_fs4.renameSync)(updateAsarPath, asarPath);
       }
-      const mainDir = import_electron4.default.app.isPackaged ? asarPath : electronDevDistPath;
+      const mainDir = import_electron4.app.isPackaged ? asarPath : electronDevDistPath;
       const entry = (0, import_node_path2.resolve)(__dirname, mainDir, mainPath);
       await beforeStart?.(entry);
       require(entry)(updater);

package/dist/index.mjs

@@ -8,7 +8,7 @@ import {
   getElectronVersion,
   getProductAsarPath,
   waitAppReady
-} from "./chunk-OGAOUYV3.mjs";
+} from "./chunk-6V5SXFGA.mjs";
 import {
   __require,
   parseVersion,
@@ -18,7 +18,7 @@ import {
 // src/index.ts
 import { resolve } from "node:path";
 import { existsSync as existsSync2, renameSync } from "node:fs";
-import Electron from "electron";
+import { app } from "electron";
 
 // src/updater/index.ts
 import { existsSync } from "node:fs";
@@ -303,7 +303,7 @@ function initApp(appOptions) {
   } = hooks || {};
   function handleError(msg) {
     onStartError?.(new Error(msg));
-    Electron.app.quit();
+    app.quit();
   }
   async function startup(updater) {
     try {
@@ -313,7 +313,7 @@ function initApp(appOptions) {
         await beforeDoUpdate?.(asarPath, updateAsarPath);
         renameSync(updateAsarPath, asarPath);
       }
-      const mainDir = Electron.app.isPackaged ? asarPath : electronDevDistPath;
+      const mainDir = app.isPackaged ? asarPath : electronDevDistPath;
       const entry = resolve(__dirname, mainDir, mainPath);
       await beforeStart?.(entry);
       __require(entry)(updater);

package/dist/utils.d.mts

@@ -4,8 +4,6 @@ type Info = {
     win: boolean;
     mac: boolean;
     linux: boolean;
-    electronVersion: string;
-    appVersion: (name?: string) => string;
     /**
      * `os.release()`
      */
@@ -68,8 +66,13 @@ declare function parseGithubCdnURL(originRepoURL: string, cdnPrefix: string, rel
 declare function restartApp(): void;
 /**
  * ensure app is ready.
+ * @param timeout wait timeout, @default 1000
+ */
+declare function waitAppReady(timeout?: number): Promise<void>;
+/**
+ * handle all unhandled error
+ * @param callback callback function
  */
-declare function waitAppReady(duration?: number): Promise<void>;
 declare function handleUnexpectedErrors(callback: (err: unknown) => void): void;
 
 export { DEFAULT_APP_NAME, NoSuchNativeModuleError, Version, appInfo, getAppVersion, getElectronVersion, getLocale, getProductAsarPath, handleUnexpectedErrors, isNoSuchNativeModuleError, parseGithubCdnURL, parseVersion, requireNative, restartApp, unzipFile, waitAppReady, zipFile };

package/dist/utils.d.ts

@@ -4,8 +4,6 @@ type Info = {
     win: boolean;
     mac: boolean;
     linux: boolean;
-    electronVersion: string;
-    appVersion: (name?: string) => string;
     /**
      * `os.release()`
      */
@@ -68,8 +66,13 @@ declare function parseGithubCdnURL(originRepoURL: string, cdnPrefix: string, rel
 declare function restartApp(): void;
 /**
  * ensure app is ready.
+ * @param timeout wait timeout, @default 1000
+ */
+declare function waitAppReady(timeout?: number): Promise<void>;
+/**
+ * handle all unhandled error
+ * @param callback callback function
  */
-declare function waitAppReady(duration?: number): Promise<void>;
 declare function handleUnexpectedErrors(callback: (err: unknown) => void): void;
 
 export { DEFAULT_APP_NAME, NoSuchNativeModuleError, Version, appInfo, getAppVersion, getElectronVersion, getLocale, getProductAsarPath, handleUnexpectedErrors, isNoSuchNativeModuleError, parseGithubCdnURL, parseVersion, requireNative, restartApp, unzipFile, waitAppReady, zipFile };

package/dist/utils.js

@@ -50,15 +50,13 @@ var appInfo = {
   win: process.platform === "win32",
   mac: process.platform === "darwin",
   linux: process.platform === "linux",
-  electronVersion: getElectronVersion(),
-  appVersion: getAppVersion,
   systemVersion: (0, import_node_os.release)()
 };
 function getLocale() {
   return import_electron.app.isReady() ? import_electron.app.getLocale() : void 0;
 }
 function getProductAsarPath(name = DEFAULT_APP_NAME) {
-  return !import_electron.app.isPackaged ? "DEV.asar" : (0, import_node_path.join)((0, import_node_path.dirname)(import_electron.app.getAppPath()), `${name}.asar`);
+  return !import_electron.app.isPackaged ? (0, import_node_path.join)((0, import_node_path.dirname)(import_electron.app.getAppPath()), `${name}.asar`) : "DEV.asar";
 }
 function getElectronVersion() {
   return import_electron.app.getVersion();
@@ -161,16 +159,13 @@ function restartApp() {
   import_electron2.app.relaunch();
   import_electron2.app.quit();
 }
-function waitAppReady(duration = 1e3) {
-  if (import_electron2.app.isReady()) {
-    return Promise.resolve();
-  }
-  return new Promise((resolve, reject) => {
-    const timeout = setTimeout(() => {
+function waitAppReady(timeout = 1e3) {
+  return import_electron2.app.isReady() ? Promise.resolve() : new Promise((resolve, reject) => {
+    const _ = setTimeout(() => {
       reject(new Error("app is not ready"));
-    }, duration);
+    }, timeout);
     import_electron2.app.whenReady().then(() => {
-      clearTimeout(timeout);
+      clearTimeout(_);
       resolve();
     });
   });

package/dist/utils.mjs

@@ -12,7 +12,7 @@ import {
   requireNative,
   restartApp,
   waitAppReady
-} from "./chunk-OGAOUYV3.mjs";
+} from "./chunk-6V5SXFGA.mjs";
 import {
   parseVersion,
   unzipFile,

package/dist/vite.d.mts

@@ -43,7 +43,7 @@ type Options = {
      * the name of you application
      *
      * you can set as 'name' in `package.json`
-    */
+     */
     productName: string;
     /**
      * the version of you application

package/dist/vite.d.ts

@@ -43,7 +43,7 @@ type Options = {
      * the name of you application
      *
      * you can set as 'name' in `package.json`
-    */
+     */
     productName: string;
     /**
      * the version of you application

package/dist/vite.js

@@ -189,9 +189,6 @@ async function buildEntry({
   });
 }
 
-// src/build-plugins/option.ts
-var import_ci_info = require("ci-info");
-
 // src/build-plugins/key.ts
 var import_node_fs3 = require("fs");
 var import_node_path = require("path");
@@ -250,8 +247,8 @@ function parseKeys({
   if (!(0, import_node_fs3.existsSync)(privateKeyPath) || !(0, import_node_fs3.existsSync)(certPath)) {
     generateKeyPair(keyLength, parseSubjects(subject), days, privateKeyPath, certPath);
   }
-  const privateKey = (0, import_node_fs3.readFileSync)(privateKeyPath, "utf-8");
-  const cert = (0, import_node_fs3.readFileSync)(certPath, "utf-8");
+  const privateKey = process.env.UPDATER_PK || (0, import_node_fs3.readFileSync)(privateKeyPath, "utf-8");
+  const cert = process.env.UPDATER_CERT || (0, import_node_fs3.readFileSync)(certPath, "utf-8");
   writeCertToMain(entryPath, cert);
   return {
     privateKey,
@@ -312,27 +309,24 @@ function parseOptions(options) {
     entryOutputPath,
     minify
   };
-  let buildVersionOption;
-  if (!import_ci_info.isCI) {
-    const { privateKey, cert } = parseKeys({
-      keyLength,
-      privateKeyPath,
-      certPath,
-      entryPath,
-      subject,
-      days
-    });
-    buildVersionOption = {
-      version,
-      minimumVersion,
-      gzipPath,
-      privateKey,
-      cert,
-      versionPath,
-      generateSignature,
-      generateVersionJson
-    };
-  }
+  const { privateKey, cert } = parseKeys({
+    keyLength,
+    privateKeyPath,
+    certPath,
+    entryPath,
+    subject,
+    days
+  });
+  const buildVersionOption = {
+    version,
+    minimumVersion,
+    gzipPath,
+    privateKey,
+    cert,
+    versionPath,
+    generateSignature,
+    generateVersionJson
+  };
   return { isBuild, buildAsarOption, buildEntryOption, buildVersionOption };
 }
 
@@ -347,16 +341,16 @@ function ElectronUpdater(options) {
     name: `vite-plugin-${id}`,
     enforce: "post",
     async closeBundle() {
-      log.info("build entry start");
+      log.info("build entry start", { timestamp: true });
       await buildEntry(buildEntryOption);
-      log.info(`build entry end, ${entryPath} -> ${entryOutputPath}`);
+      log.info(`build entry end, ${entryPath} -> ${entryOutputPath}`, { timestamp: true });
       if (!isBuild) {
         return;
       }
-      log.info("build asar start");
+      log.info("build asar start", { timestamp: true });
       await buildAsar(buildAsarOption);
-      buildVersionOption && await buildVersion(buildVersionOption);
-      log.info(`build asar end, output to ${asarOutputPath}`);
+      await buildVersion(buildVersionOption);
+      log.info(`build asar end, output to ${asarOutputPath}`, { timestamp: true });
     }
   };
 }

package/dist/vite.mjs

@@ -94,9 +94,6 @@ async function buildEntry({
   });
 }
 
-// src/build-plugins/option.ts
-import { isCI } from "ci-info";
-
 // src/build-plugins/key.ts
 import { existsSync as existsSync2, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
@@ -155,8 +152,8 @@ function parseKeys({
   if (!existsSync2(privateKeyPath) || !existsSync2(certPath)) {
     generateKeyPair(keyLength, parseSubjects(subject), days, privateKeyPath, certPath);
   }
-  const privateKey = readFileSync(privateKeyPath, "utf-8");
-  const cert = readFileSync(certPath, "utf-8");
+  const privateKey = process.env.UPDATER_PK || readFileSync(privateKeyPath, "utf-8");
+  const cert = process.env.UPDATER_CERT || readFileSync(certPath, "utf-8");
   writeCertToMain(entryPath, cert);
   return {
     privateKey,
@@ -217,27 +214,24 @@ function parseOptions(options) {
     entryOutputPath,
     minify
   };
-  let buildVersionOption;
-  if (!isCI) {
-    const { privateKey, cert } = parseKeys({
-      keyLength,
-      privateKeyPath,
-      certPath,
-      entryPath,
-      subject,
-      days
-    });
-    buildVersionOption = {
-      version,
-      minimumVersion,
-      gzipPath,
-      privateKey,
-      cert,
-      versionPath,
-      generateSignature,
-      generateVersionJson
-    };
-  }
+  const { privateKey, cert } = parseKeys({
+    keyLength,
+    privateKeyPath,
+    certPath,
+    entryPath,
+    subject,
+    days
+  });
+  const buildVersionOption = {
+    version,
+    minimumVersion,
+    gzipPath,
+    privateKey,
+    cert,
+    versionPath,
+    generateSignature,
+    generateVersionJson
+  };
   return { isBuild, buildAsarOption, buildEntryOption, buildVersionOption };
 }
 
@@ -252,16 +246,16 @@ function ElectronUpdater(options) {
     name: `vite-plugin-${id}`,
     enforce: "post",
     async closeBundle() {
-      log.info("build entry start");
+      log.info("build entry start", { timestamp: true });
       await buildEntry(buildEntryOption);
-      log.info(`build entry end, ${entryPath} -> ${entryOutputPath}`);
+      log.info(`build entry end, ${entryPath} -> ${entryOutputPath}`, { timestamp: true });
       if (!isBuild) {
         return;
       }
-      log.info("build asar start");
+      log.info("build asar start", { timestamp: true });
       await buildAsar(buildAsarOption);
-      buildVersionOption && await buildVersion(buildVersionOption);
-      log.info(`build asar end, output to ${asarOutputPath}`);
+      await buildVersion(buildVersionOption);
+      log.info(`build asar end, output to ${asarOutputPath}`, { timestamp: true });
     }
   };
 }

package/package.json

@@ -1,29 +1,15 @@
 {
   "name": "electron-incremental-update",
-  "author": "subframe7536",
-  "version": "0.8.7",
+  "version": "0.8.9",
   "description": "electron incremental update tools, powered by vite",
-  "scripts": {
-    "build": "tsup && node fix-module.js",
-    "release": "pnpm test && pnpm run build && bumpp --all && npm publish",
-    "test": "vitest --run",
-    "lint": "eslint . --fix"
-  },
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
-  "repository": "https://github.com/subframe7536/electron-incremental-update",
+  "author": "subframe7536",
   "license": "MIT",
-  "files": [
-    "dist",
-    "vite.js",
-    "vite.d.ts",
-    "utils.js",
-    "utils.d.ts"
+  "repository": "https://github.com/subframe7536/electron-incremental-update",
+  "keywords": [
+    "electron",
+    "incremental update",
+    "updater"
   ],
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
   "exports": {
     ".": {
       "import": "./dist/index.mjs",
@@ -38,25 +24,39 @@
       "require": "./dist/utils.js"
     }
   },
-  "keywords": [
-    "electron",
-    "incremental update",
-    "updater"
+  "main": "dist/index.js",
+  "module": "dist/index.mjs",
+  "files": [
+    "dist",
+    "utils.d.ts",
+    "utils.js",
+    "vite.d.ts",
+    "vite.js"
   ],
+  "scripts": {
+    "build": "tsup && node fix-module.js",
+    "release": "pnpm test && pnpm run build && bumpp --all && npm publish",
+    "test": "vitest --run",
+    "lint": "eslint . --fix"
+  },
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "dependencies": {
+    "@electron/asar": "^3.2.8",
+    "ci-info": "^4.0.0",
+    "selfsigned": "^2.4.1",
+    "vite": "^4.5.0"
+  },
   "devDependencies": {
-    "@subframe7536/eslint-config": "^0.2.9",
-    "@types/node": "^20.6.0",
+    "@subframe7536/eslint-config": "^0.4.1",
+    "@types/node": "^20.9.0",
     "bumpp": "^9.2.0",
-    "electron": "^26.2.0",
-    "eslint": "^8.49.0",
+    "electron": "^27.0.4",
+    "eslint": "^8.53.0",
     "tsup": "^7.2.0",
     "typescript": "^5.2.2",
-    "vitest": "^0.34.4"
-  },
-  "dependencies": {
-    "@electron/asar": "^3.2.4",
-    "ci-info": "^3.8.0",
-    "selfsigned": "^2.1.1",
-    "vite": "^4.4.9"
+    "vitest": "^0.34.6"
   }
 }