electron-incremental-update 2.2.0 → 2.2.2

package/dist/{version-DcFMG3pT.d.ts → version-Bl_0oO5f.d.cts}

@@ -35,14 +35,26 @@ declare function defaultIsLowerVersion(oldVer: string, newVer: string): boolean;
  * Update info json
  */
 type UpdateInfo = {
+    /**
+     * Update Asar signature
+     */
     signature: string;
+    /**
+     * Minimum version
+     */
     minimumVersion: string;
+    /**
+     * Target version
+     */
     version: string;
 };
 /**
  * {@link UpdateInfo} with beta
  */
 type UpdateJSON = UpdateInfo & {
+    /**
+     * Beta update info
+     */
     beta: UpdateInfo;
 };
 /**
@@ -59,4 +71,4 @@ declare function isUpdateJSON(json: any): json is UpdateJSON;
  */
 declare function defaultVersionJsonGenerator(existingJson: UpdateJSON, signature: string, version: string, minimumVersion: string): UpdateJSON;
 
-export { type UpdateJSON as U, type Version as V, type UpdateInfo as a, defaultVersionJsonGenerator as b, defaultIsLowerVersion as d, isUpdateJSON as i, parseVersion as p };
+export { type UpdateInfo as U, type Version as V, type UpdateJSON as a, defaultVersionJsonGenerator as b, defaultIsLowerVersion as d, isUpdateJSON as i, parseVersion as p };

package/dist/{version-DcFMG3pT.d.cts → version-Bl_0oO5f.d.ts}

@@ -35,14 +35,26 @@ declare function defaultIsLowerVersion(oldVer: string, newVer: string): boolean;
  * Update info json
  */
 type UpdateInfo = {
+    /**
+     * Update Asar signature
+     */
     signature: string;
+    /**
+     * Minimum version
+     */
     minimumVersion: string;
+    /**
+     * Target version
+     */
     version: string;
 };
 /**
  * {@link UpdateInfo} with beta
  */
 type UpdateJSON = UpdateInfo & {
+    /**
+     * Beta update info
+     */
     beta: UpdateInfo;
 };
 /**
@@ -59,4 +71,4 @@ declare function isUpdateJSON(json: any): json is UpdateJSON;
  */
 declare function defaultVersionJsonGenerator(existingJson: UpdateJSON, signature: string, version: string, minimumVersion: string): UpdateJSON;
 
-export { type UpdateJSON as U, type Version as V, type UpdateInfo as a, defaultVersionJsonGenerator as b, defaultIsLowerVersion as d, isUpdateJSON as i, parseVersion as p };
+export { type UpdateInfo as U, type Version as V, type UpdateJSON as a, defaultVersionJsonGenerator as b, defaultIsLowerVersion as d, isUpdateJSON as i, parseVersion as p };

package/dist/vite.d.ts

@@ -2,28 +2,53 @@ import { InlineConfig, PluginOption } from 'vite';
 import { ElectronSimpleOptions } from 'vite-plugin-electron/simple';
 import { Promisable } from '@subframe7536/type-utils';
 export { isCI } from 'ci-info';
+export { getPackageInfo, getPackageInfoSync, loadPackageJSON, resolveModule } from 'local-pkg';
+
+interface BytecodeOptions {
+    enable: boolean;
+    /**
+     * Enable in preload script. Remember to set `sandbox: false` when creating window
+     */
+    preload?: boolean;
+    /**
+     * Custom electron binary path
+     */
+    electronPath?: string;
+    /**
+     * Before transformed code compile function. If return `Falsy` value, it will be ignored
+     * @param code transformed code
+     * @param id file path
+     */
+    beforeCompile?: (code: string, id: string) => Promisable<string | null | undefined | void>;
+}
 
 /**
  * Update info json
  */
 type UpdateInfo = {
+    /**
+     * Update Asar signature
+     */
     signature: string;
+    /**
+     * Minimum version
+     */
     minimumVersion: string;
+    /**
+     * Target version
+     */
     version: string;
 };
 /**
  * {@link UpdateInfo} with beta
  */
 type UpdateJSON = UpdateInfo & {
+    /**
+     * Beta update info
+     */
     beta: UpdateInfo;
 };
 
-interface PKG {
-    name: string;
-    version: string;
-    main: string;
-    type: 'commonjs' | 'module';
-}
 interface DistinguishedName {
     countryName?: string;
     stateOrProvinceName?: string;
@@ -37,6 +62,13 @@ interface DistinguishedName {
     businessCategory?: string;
     emailAddress?: string;
 }
+
+interface PKG {
+    name: string;
+    version: string;
+    main: string;
+    type: 'commonjs' | 'module';
+}
 interface BuildEntryOption {
     /**
      * Override to minify on entry
@@ -72,12 +104,24 @@ interface BuildEntryOption {
      */
     ignoreDynamicRequires?: boolean;
     /**
-     * `external` option in `build.rollupOptions`
-     * @default source => source.endsWith('.node')
+     * `external` option in `build.rollupOptions`, external `.node` by default
      */
-    external?: (source: string, importer: string | undefined, isResolved: boolean) => boolean | null | undefined | void;
+    external?: string | string[] | ((source: string, importer: string | undefined, isResolved: boolean) => boolean | null | undefined | void);
     /**
      * Custom options for `vite` build
+     * ```ts
+     * const options = {
+     *   plugins: [esm(), bytecodePlugin()], // load on needed
+     *   build: {
+     *     sourcemap,
+     *     minify,
+     *     outDir: entryOutputDirPath,
+     *     commonjsOptions: { ignoreDynamicRequires },
+     *     rollupOptions: { external },
+     *   },
+     *   define,
+     * }
+     * ```
      */
     overrideViteOptions?: InlineConfig;
     /**
@@ -105,6 +149,20 @@ interface BuildEntryOption {
              */
             skipIfExist?: boolean;
         }) => void;
+        /**
+         * Copy specified modules to entry output dir, just like `external` option in rollup
+         */
+        copyModules: (options: {
+            /**
+             * External Modules
+             */
+            modules: string[];
+            /**
+             * Skip copy if `to` exist
+             * @default true
+             */
+            skipIfExist?: boolean;
+        }) => void;
     }) => Promisable<void>;
 }
 interface GeneratorOverrideFunctions {
@@ -220,23 +278,16 @@ interface ElectronUpdaterOptions {
     overrideGenerator?: GeneratorOverrideFunctions;
 }
 
-interface BytecodeOptions {
-    enable: boolean;
-    /**
-     * Enable in preload script. Remember to set `sandbox: false` when creating window
-     */
-    preload?: boolean;
-    /**
-     * Custom electron binary path
-     */
-    electronPath?: string;
-    /**
-     * Before transformed code compile function. If return `Falsy` value, it will be ignored
-     * @param code transformed code
-     * @param id file path
-     */
-    beforeCompile?: (code: string, id: string) => Promisable<string | null | undefined | void>;
-}
+/**
+ * Obfuscate string
+ * @param code source code
+ * @param sourcemap whether to generate sourcemap
+ * @param offset custom offset
+ */
+declare function convertLiteral(code: string, sourcemap?: boolean, offset?: number): {
+    code: string;
+    map?: any;
+};
 
 type MakeRequired<T, K extends keyof T> = Exclude<T, undefined> & {
     [P in K]-?: T[P];
@@ -245,8 +296,9 @@ type ReplaceKey<T, Key extends keyof T, NewKey extends string> = Omit<T, Key> &
     [P in NewKey]: T[Key];
 };
 type MakeRequiredAndReplaceKey<T, K extends keyof T, NewKey extends string> = MakeRequired<ReplaceKey<T, K, NewKey>, NewKey>;
+type StartupFn = Exclude<Exclude<ElectronSimpleOptions['preload'], undefined>['onstart'], undefined>;
 /**
- * startup function for debug (see {@link https://github.com/electron-vite/electron-vite-vue/blob/main/vite.config.ts electron-vite-vue template})
+ * Startup function for debug (see {@link https://github.com/electron-vite/electron-vite-vue/blob/main/vite.config.ts electron-vite-vue template})
  * @example
  * import { debugStartup, buildElectronPluginOptions } from 'electron-incremental-update/vite'
  * const options = buildElectronPluginOptions({
@@ -257,10 +309,20 @@ type MakeRequiredAndReplaceKey<T, K extends keyof T, NewKey extends string> = Ma
  *   },
  * })
  */
-declare function debugStartup(args: {
-    startup: (argv?: string[]) => Promise<void>;
-    reload: () => void;
-}): void;
+declare const debugStartup: StartupFn;
+/**
+ * Startup function util to fix Windows terminal charset
+ * @example
+ * import { debugStartup, fixWinCharEncoding, buildElectronPluginOptions } from 'electron-incremental-update/vite'
+ * const options = buildElectronPluginOptions({
+ *   // ...
+ *   main: {
+ *     // ...
+ *     startup: fixWinCharEncoding(debugStartup)
+ *   },
+ * })
+ */
+declare function fixWinCharEncoding(fn: StartupFn): StartupFn;
 type ExcludeOutputDirOptions = {
     vite?: {
         build?: {
@@ -393,4 +455,4 @@ interface ElectronWithUpdaterOptions {
  */
 declare function electronWithUpdater(options: ElectronWithUpdaterOptions): Promise<PluginOption[] | undefined>;
 
-export { type ElectronWithUpdaterOptions, debugStartup, electronWithUpdater as default, electronWithUpdater };
+export { type ElectronWithUpdaterOptions, convertLiteral, debugStartup, electronWithUpdater as default, electronWithUpdater, fixWinCharEncoding };

package/dist/vite.js

@@ -1,18 +1,20 @@
-import { readableSize } from './chunk-WYQ5DRO7.js';
-import { isUpdateJSON, defaultVersionJsonGenerator } from './chunk-CTUEQCKL.js';
+import { readableSize, copyAndSkipIfExist } from './chunk-TPTWE33H.js';
+import { isUpdateJSON, defaultVersionJsonGenerator } from './chunk-LR7LR5WG.js';
+export { convertLiteral } from './chunk-LR7LR5WG.js';
 import { log, id } from './chunk-5NKEXGI3.js';
-import path3 from 'node:path';
 import fs2 from 'node:fs';
+import path3 from 'node:path';
+import { isCI } from 'ci-info';
+export { isCI } from 'ci-info';
+import { loadPackageJSON, getPackageInfoSync } from 'local-pkg';
+export { getPackageInfo, getPackageInfoSync, loadPackageJSON, resolveModule } from 'local-pkg';
 import { normalizePath, mergeConfig } from 'vite';
-import ElectronSimple from 'vite-plugin-electron/simple';
 import { startup, build } from 'vite-plugin-electron';
 import { notBundle } from 'vite-plugin-electron/plugin';
-import { loadPackageJSON } from 'local-pkg';
-import { isCI } from 'ci-info';
-export { isCI } from 'ci-info';
+import ElectronSimple from 'vite-plugin-electron/simple';
 import Asar from '@electron/asar';
-import zlib from 'node:zlib';
 import crypto from 'node:crypto';
+import zlib from 'node:zlib';
 import { generate } from 'selfsigned';
 
 async function buildAsar({
@@ -86,29 +88,20 @@ async function buildEntry({
     },
     vite: mergeConfig({
       plugins: [
-        isESM && await import('./esm-5YR6V7VN.js').then((m) => m.esm()),
-        bytecodeOptions && await import('./bytecode-Z5ZF4YGN.js').then((m) => m.bytecodePlugin("main", bytecodeOptions))
+        isESM && await import('./esm-4S4XCVEW.js').then((m) => m.esm()),
+        bytecodeOptions && await import('./bytecode-R2B4KTMV.js').then((m) => m.bytecodePlugin("main", bytecodeOptions))
       ],
       build: {
         sourcemap,
         minify,
         outDir: entryOutputDirPath,
-        commonjsOptions: {
-          ignoreDynamicRequires
-        },
-        rollupOptions: {
-          external
-        }
+        commonjsOptions: { ignoreDynamicRequires },
+        rollupOptions: { external }
       },
       define
     }, overrideViteOptions ?? {})
   });
 }
-async function defaultZipFile(buffer) {
-  return new Promise((resolve, reject) => {
-    zlib.brotliCompress(buffer, (err, buffer2) => err ? reject(err) : resolve(buffer2));
-  });
-}
 function hashBuffer(data, length) {
   const hash = crypto.createHash("SHA256").update(data).digest("binary");
   return Buffer.from(hash).subarray(0, length);
@@ -121,6 +114,11 @@ function defaultSignature(buffer, privateKey, cert, version) {
   const sig = crypto.createSign("RSA-SHA256").update(buffer).sign(crypto.createPrivateKey(privateKey), "base64");
   return aesEncrypt(`${sig}%${version}`, hashBuffer(cert, 32), hashBuffer(buffer, 16));
 }
+async function defaultZipFile(buffer) {
+  return new Promise((resolve, reject) => {
+    zlib.brotliCompress(buffer, (err, buffer2) => err ? reject(err) : resolve(buffer2));
+  });
+}
 function generateKeyPair(keyLength, subject, days, privateKeyPath, certPath) {
   const privateKeyDir = path3.dirname(privateKeyPath);
   if (!fs2.existsSync(privateKeyDir)) {
@@ -179,7 +177,7 @@ function parseOptions(pkg, sourcemap = false, minify = false, options = {}) {
       nativeModuleEntryMap = {},
       postBuild,
       ignoreDynamicRequires = false,
-      external = (source) => source.endsWith(".node"),
+      external,
       overrideViteOptions = {}
     } = {},
     paths: {
@@ -223,7 +221,21 @@ function parseOptions(pkg, sourcemap = false, minify = false, options = {}) {
     nativeModuleEntryMap,
     overrideViteOptions,
     ignoreDynamicRequires,
-    external
+    external: (source, importer, isResolved) => {
+      if (source.endsWith(".node")) {
+        return false;
+      }
+      if (!external) {
+        return void 0;
+      }
+      if (typeof external === "string") {
+        return source === external;
+      }
+      if (Array.isArray(external)) {
+        return external.includes(source);
+      }
+      return external(source, importer, isResolved);
+    }
   };
   const { privateKey, cert } = parseKeys({
     keyLength,
@@ -243,12 +255,20 @@ function parseOptions(pkg, sourcemap = false, minify = false, options = {}) {
   };
   return { buildAsarOption, buildEntryOption, buildVersionOption, postBuild, cert };
 }
-function debugStartup(args) {
+var debugStartup = (args) => {
   if (process.env.VSCODE_DEBUG) {
     console.log("[startup] Electron App");
   } else {
     args.startup();
   }
+};
+function fixWinCharEncoding(fn) {
+  return async (...args) => {
+    if (process.platform === "win32") {
+      (await import('node:child_process')).spawnSync("chcp", ["65001"]);
+    }
+    await fn(...args);
+  };
 }
 function getMainFileBaseName(options) {
   let mainFilePath;
@@ -320,6 +340,7 @@ async function electronWithUpdater(options) {
     throw new Error(`Wrong "main" field in package.json: "${pkg.main}", it should be "${_appPath}"`);
   }
   const define = {
+    __EIU_ASAR_BASE_NAME__: JSON.stringify(path3.basename(buildAsarOption.asarOutputPath)),
     __EIU_ELECTRON_DIST_PATH__: JSON.stringify(normalizePath(buildAsarOption.electronDistPath)),
     __EIU_ENTRY_DIST_PATH__: JSON.stringify(normalizePath(buildEntryOption.entryOutputDirPath)),
     __EIU_IS_DEV__: JSON.stringify(!isBuild),
@@ -342,15 +363,22 @@ async function electronWithUpdater(options) {
       return path3.join(entryOutputDirPath, ...paths);
     },
     copyToEntryOutputDir({ from, to, skipIfExist = true }) {
-      if (fs2.existsSync(from)) {
-        const target = path3.join(entryOutputDirPath, to ?? path3.basename(from));
-        if (!skipIfExist || !fs2.existsSync(target)) {
-          try {
-            fs2.cpSync(from, target);
-          } catch (error) {
-            log.warn(`Copy failed: ${error}`, { timestamp: true });
-          }
+      if (!fs2.existsSync(from)) {
+        log.warn(`${from} not found`, { timestamp: true });
+        return;
+      }
+      const target = path3.join(entryOutputDirPath, to ?? path3.basename(from));
+      copyAndSkipIfExist(from, target, skipIfExist);
+    },
+    copyModules({ modules, skipIfExist = true }) {
+      const nodeModulesPath = path3.join(entryOutputDirPath, "node_modules");
+      for (const m of modules) {
+        const { rootPath } = getPackageInfoSync(m) || {};
+        if (!rootPath) {
+          log.warn(`Package '${m}' not found`, { timestamp: true });
+          continue;
         }
+        copyAndSkipIfExist(rootPath, path3.join(nodeModulesPath, m), skipIfExist);
       }
     }
   }) : async () => {
@@ -360,7 +388,7 @@ async function electronWithUpdater(options) {
     external: (src) => src.startsWith("node:") || Object.keys("dependencies" in pkg ? pkg.dependencies : {}).includes(src) || src === "original-fs",
     treeshake: true
   };
-  const esmShimPlugin = isESM ? (await import('./esm-5YR6V7VN.js')).esm() : void 0;
+  const esmShimPlugin = isESM ? (await import('./esm-4S4XCVEW.js')).esm() : void 0;
   const electronPluginOptions = {
     main: {
       entry: _main.files,
@@ -380,7 +408,7 @@ async function electronWithUpdater(options) {
         {
           plugins: [
             !isBuild && useNotBundle ? notBundle() : void 0,
-            bytecodeOptions && await import('./bytecode-Z5ZF4YGN.js').then((m) => m.bytecodePlugin("main", bytecodeOptions)),
+            bytecodeOptions && await import('./bytecode-R2B4KTMV.js').then((m) => m.bytecodePlugin("main", bytecodeOptions)),
             esmShimPlugin
           ],
           build: {
@@ -400,7 +428,7 @@ async function electronWithUpdater(options) {
       vite: mergeConfig(
         {
           plugins: [
-            bytecodeOptions && (await import('./bytecode-Z5ZF4YGN.js')).bytecodePlugin("preload", bytecodeOptions),
+            bytecodeOptions && (await import('./bytecode-R2B4KTMV.js')).bytecodePlugin("preload", bytecodeOptions),
             esmShimPlugin,
             {
               name: `${id}-build`,
@@ -472,4 +500,4 @@ async function electronWithUpdater(options) {
 }
 var vite_default = electronWithUpdater;
 
-export { debugStartup, vite_default as default, electronWithUpdater };
+export { debugStartup, vite_default as default, electronWithUpdater, fixWinCharEncoding };

package/dist/{zip-rm9ED9nU.d.cts → zip-DQdr8pFv.d.cts}

@@ -30,4 +30,4 @@ 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, defaultVerifySignature as f, hashBuffer as h };
+export { aesEncrypt as a, aesDecrypt as b, defaultVerifySignature as c, defaultSignature as d, defaultZipFile as e, defaultUnzipFile as f, hashBuffer as h };

package/dist/{zip-rm9ED9nU.d.ts → zip-DQdr8pFv.d.ts}

@@ -30,4 +30,4 @@ 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, defaultVerifySignature as f, hashBuffer as h };
+export { aesEncrypt as a, aesDecrypt as b, defaultVerifySignature as c, defaultSignature as d, defaultZipFile as e, defaultUnzipFile as f, hashBuffer as h };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "electron-incremental-update",
   "type": "module",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "Electron incremental update tools with Vite plugin, support bytecode protection",
   "author": "subframe7536",
   "license": "MIT",
@@ -45,7 +45,7 @@
   ],
   "scripts": {
     "dev": "tsup --watch",
-    "build": "tsup && esno fix-module.cjs",
+    "build": "tsup && node fix-module.cjs",
     "release": "pnpm test && pnpm run build && bumpp --all && npm publish",
     "test": "vitest --run",
     "test:dev": "vitest",
@@ -60,28 +60,27 @@
     "esbuild": "*"
   },
   "dependencies": {
-    "@babel/core": "^7.25.2",
-    "@babel/plugin-transform-arrow-functions": "^7.24.7",
-    "@babel/plugin-transform-template-literals": "^7.24.7",
+    "@babel/core": "^7.25.7",
+    "@babel/plugin-transform-arrow-functions": "^7.25.7",
+    "@babel/plugin-transform-template-literals": "^7.25.7",
     "@subframe7536/type-utils": "^0.1.6",
     "ci-info": "^4.0.0",
     "local-pkg": "^0.5.0",
     "magic-string": "^0.30.11",
     "selfsigned": "^2.4.1",
-    "vite-plugin-electron": "^0.28.7"
+    "vite-plugin-electron": "^0.28.8"
   },
   "devDependencies": {
-    "@subframe7536/eslint-config": "^0.8.0",
+    "@subframe7536/eslint-config": "^0.9.4",
     "@types/babel__core": "^7.20.5",
-    "@types/node": "^20.16.3",
-    "bumpp": "^9.5.2",
+    "@types/node": "^20.16.11",
+    "bumpp": "^9.6.1",
     "electron": "28.2.10",
-    "eslint": "^9.9.1",
-    "esno": "^4.7.0",
-    "tsup": "^8.2.4",
-    "typescript": "^5.5.4",
-    "vite": "^5.4.2",
-    "vite-plugin-electron": "^0.28.7",
-    "vitest": "^2.0.5"
+    "eslint": "^9.12.0",
+    "tsup": "^8.3.0",
+    "typescript": "^5.6.3",
+    "vite": "^5.4.8",
+    "vite-plugin-electron": "^0.28.8",
+    "vitest": "^2.1.2"
   }
 }

package/dist/chunk-CTUEQCKL.js

@@ -1,43 +0,0 @@
-// src/utils/version.ts
-function parseVersion(version) {
-  const match = /^(\d+)\.(\d+)\.(\d+)(?:-([a-z0-9.-]+))?/i.exec(version);
-  if (!match) {
-    throw new TypeError(`invalid version: ${version}`);
-  }
-  const [major, minor, patch] = match.slice(1, 4).map(Number);
-  const ret = {
-    major,
-    minor,
-    patch,
-    stage: "",
-    stageVersion: -1
-  };
-  if (match[4]) {
-    let [stage, _v] = match[4].split(".");
-    ret.stage = stage;
-    ret.stageVersion = Number(_v) || -1;
-  }
-  if (Number.isNaN(major) || Number.isNaN(minor) || Number.isNaN(patch) || Number.isNaN(ret.stageVersion)) {
-    throw new TypeError(`Invalid version: ${version}`);
-  }
-  return ret;
-}
-var is = (j) => !!(j && j.minimumVersion && j.signature && j.version);
-function isUpdateJSON(json) {
-  return is(json) && is(json?.beta);
-}
-function defaultVersionJsonGenerator(existingJson, signature, version, minimumVersion) {
-  existingJson.beta = {
-    version,
-    minimumVersion,
-    signature
-  };
-  if (!parseVersion(version).stage) {
-    existingJson.version = version;
-    existingJson.minimumVersion = minimumVersion;
-    existingJson.signature = signature;
-  }
-  return existingJson;
-}
-
-export { defaultVersionJsonGenerator, isUpdateJSON, parseVersion };

package/dist/chunk-WYQ5DRO7.js

@@ -1,12 +0,0 @@
-// src/vite/utils.ts
-function readableSize(size) {
-  const units = ["B", "KB", "MB", "GB"];
-  let i = 0;
-  while (size >= 1024 && i < units.length - 1) {
-    size /= 1024;
-    i++;
-  }
-  return `${size.toFixed(2)} ${units[i]}`;
-}
-
-export { readableSize };