electron-incremental-update 2.0.0-beta.10 → 2.0.0-beta.11

package/dist/provider.js

@@ -1,7 +1,7 @@
 import { defaultVerifySignature, defaultUnzipFile } from './chunk-KZSYEXLO.js';
-import { defaultIsLowerVersion, isUpdateJSON } from './chunk-72ZAJ7AF.js';
+import { defaultIsLowerVersion, isUpdateJSON } from './chunk-RCRKUKFX.js';
 import { URL } from 'node:url';
-import { app, net } from 'electron';
+import electron from 'electron';
 
 function getHeader(headers, key) {
   const value = headers[key];
@@ -11,10 +11,11 @@ function getHeader(headers, key) {
     return value;
   }
 }
-async function downloadFn(url, headers, onResponse) {
-  await app.whenReady();
+async function downloadFn(url, headers, signal, onResponse) {
+  await electron.app.whenReady();
   return new Promise((resolve, reject) => {
-    const request = net.request({ url, method: "GET", redirect: "follow", headers });
+    const request = electron.net.request({ url, method: "GET", redirect: "follow", headers, cache: "no-cache" });
+    signal.addEventListener("abort", () => request.abort(), { once: true });
     request.on("response", (resp) => {
       resp.on("aborted", () => reject(new Error("aborted")));
       resp.on("error", () => reject(new Error("download error")));
@@ -24,46 +25,56 @@ async function downloadFn(url, headers, onResponse) {
     request.end();
   });
 }
-async function defaultDownloadUpdateJSON(url, headers) {
-  return await downloadFn(url, headers, (resp, resolve, reject) => {
-    let data = "";
-    resp.on("data", (chunk) => data += chunk);
-    resp.on("end", () => {
-      try {
-        const json = JSON.parse(data);
-        if (isUpdateJSON(json)) {
-          resolve(json);
-        } else {
-          throw Error;
+async function defaultDownloadUpdateJSON(url, headers, signal) {
+  return await downloadFn(
+    url,
+    headers,
+    signal,
+    (resp, resolve, reject) => {
+      let data = "";
+      resp.on("data", (chunk) => data += chunk);
+      resp.on("end", () => {
+        try {
+          const json = JSON.parse(data);
+          if (isUpdateJSON(json)) {
+            resolve(json);
+          } else {
+            throw Error;
+          }
+        } catch {
+          reject(new Error("invalid update json " + data));
         }
-      } catch {
-        reject(new Error("invalid update json"));
-      }
-    });
-  });
+      });
+    }
+  );
 }
-async function defaultDownloadAsar(url, headers, onDownloading) {
+async function defaultDownloadAsar(url, headers, signal, onDownloading) {
   let transferred = 0;
   let time = Date.now();
-  return await downloadFn(url, headers, (resp, resolve) => {
-    const total = getHeader(resp.headers, "content-length") || -1;
-    let data = [];
-    resp.on("data", (chunk) => {
-      const delta = chunk.length;
-      transferred += delta;
-      const current = Date.now();
-      onDownloading?.({
-        percent: +(transferred / total).toFixed(2) * 100,
-        total,
-        transferred,
-        delta,
-        bps: delta / ((current - time) * 1e3)
+  return await downloadFn(
+    url,
+    headers,
+    signal,
+    (resp, resolve) => {
+      const total = +getHeader(resp.headers, "content-length") || -1;
+      let data = [];
+      resp.on("data", (chunk) => {
+        const delta = chunk.length;
+        transferred += delta;
+        const current = Date.now();
+        onDownloading?.({
+          percent: total ? +(transferred / total).toFixed(2) * 100 : -1,
+          total,
+          transferred,
+          delta,
+          bps: delta / ((current - time) * 1e3)
+        });
+        time = current;
+        data.push(chunk);
       });
-      time = current;
-      data.push(chunk);
-    });
-    resp.on("end", () => resolve(Buffer.concat(data)));
-  });
+      resp.on("end", () => resolve(Buffer.concat(data)));
+    }
+  );
 }
 
 // src/provider/base.ts
@@ -92,7 +103,7 @@ var GitHubProvider = class extends BaseProvider {
    * - download update json from `https://raw.githubusercontent.com/{user}/{repo}/HEAD/{versionPath}`
    * - download update asar from `https://github.com/{user}/{repo}/releases/download/v{version}/{name}-{version}.asar.gz`
    *
-   * you can setup `urlHandler` in {@link GitHubProviderOptions} or `Updater` to modify url before request
+   * you can setup `urlHandler` in {@link GitHubProviderOptions} to modify url before request
    * @param options provider options
    */
   constructor(options) {
@@ -110,7 +121,7 @@ var GitHubProvider = class extends BaseProvider {
   }
   async parseURL(isDownloadAsar, extraPath) {
     const url = new URL(
-      `/${this.options.username}/${this.options.repo}/${extraPath}`,
+      `/${this.options.user}/${this.options.repo}/${extraPath}`,
       "https://" + (isDownloadAsar ? "github.com" : "raw.githubusercontent.com")
     );
     return (await this.urlHandler?.(url, isDownloadAsar) || url).toString();
@@ -118,19 +129,21 @@ var GitHubProvider = class extends BaseProvider {
   /**
    * @inheritdoc
    */
-  async downloadJSON(versionPath) {
+  async downloadJSON(versionPath, signal) {
     return await defaultDownloadUpdateJSON(
       await this.parseURL(false, `${this.options.branch}/${versionPath}`),
-      { Accept: "application/json", ...this.options.extraHeaders }
+      { Accept: "application/json", ...this.options.extraHeaders },
+      signal
     );
   }
   /**
    * @inheritdoc
    */
-  async downloadAsar(name, info, onDownloading) {
+  async downloadAsar(name, info, signal, onDownloading) {
     return await defaultDownloadAsar(
       await this.parseURL(true, `releases/download/v${info.version}/${name}-${info.version}.asar.gz`),
       { Accept: "application/octet-stream", ...this.options.extraHeaders },
+      signal,
       onDownloading
     );
   }

package/dist/{types-Bnc4jz6R.d.ts → types-C8JhnJjU.d.ts}

@@ -1,5 +1,5 @@
 import { Promisable } from '@subframe7536/type-utils';
-import { a as UpdateJSON, U as UpdateInfo } from './version-C4tF_trh.js';
+import { a as UpdateJSON, U as UpdateInfo } from './version-BYVQ367i.js';
 
 type URLHandler = (url: URL, isDownloadAsar: boolean) => Promisable<URL | string | undefined | null>;
 type OnDownloading = (progress: DownloadingInfo) => void;
@@ -11,7 +11,7 @@ interface DownloadingInfo {
     /**
      * Downloaded percent, 0 ~ 100
      *
-     * If no `Content-Length` header, will be nagative
+     * If no `Content-Length` header, will be -1
      */
     percent: number;
     /**
@@ -44,15 +44,17 @@ interface IProvider {
     /**
      * Download update json
      * @param versionPath parsed version path in project
+     * @param signal abort signal
      */
-    downloadJSON: (versionPath: string) => Promise<UpdateJSON>;
+    downloadJSON: (versionPath: string, signal: AbortSignal) => Promise<UpdateJSON>;
     /**
      * Download update asar
      * @param name app name
      * @param updateInfo existing update info
+     * @param signal abort signal
      * @param onDownloading hook for on downloading
      */
-    downloadAsar: (name: string, updateInfo: UpdateInfo, onDownloading?: (info: DownloadingInfo) => void) => Promise<Buffer>;
+    downloadAsar: (name: string, updateInfo: UpdateInfo, signal: AbortSignal, onDownloading?: (info: DownloadingInfo) => void) => Promise<Buffer>;
     /**
      * Check the old version is less than new version
      * @param oldVer old version string

package/dist/{types-DEYw5VrL.d.cts → types-CGSkHX4Y.d.cts}

@@ -1,5 +1,5 @@
 import { Promisable } from '@subframe7536/type-utils';
-import { a as UpdateJSON, U as UpdateInfo } from './version-C4tF_trh.cjs';
+import { a as UpdateJSON, U as UpdateInfo } from './version-BYVQ367i.cjs';
 
 type URLHandler = (url: URL, isDownloadAsar: boolean) => Promisable<URL | string | undefined | null>;
 type OnDownloading = (progress: DownloadingInfo) => void;
@@ -11,7 +11,7 @@ interface DownloadingInfo {
     /**
      * Downloaded percent, 0 ~ 100
      *
-     * If no `Content-Length` header, will be nagative
+     * If no `Content-Length` header, will be -1
      */
     percent: number;
     /**
@@ -44,15 +44,17 @@ interface IProvider {
     /**
      * Download update json
      * @param versionPath parsed version path in project
+     * @param signal abort signal
      */
-    downloadJSON: (versionPath: string) => Promise<UpdateJSON>;
+    downloadJSON: (versionPath: string, signal: AbortSignal) => Promise<UpdateJSON>;
     /**
      * Download update asar
      * @param name app name
      * @param updateInfo existing update info
+     * @param signal abort signal
      * @param onDownloading hook for on downloading
      */
-    downloadAsar: (name: string, updateInfo: UpdateInfo, onDownloading?: (info: DownloadingInfo) => void) => Promise<Buffer>;
+    downloadAsar: (name: string, updateInfo: UpdateInfo, signal: AbortSignal, onDownloading?: (info: DownloadingInfo) => void) => Promise<Buffer>;
     /**
      * Check the old version is less than new version
      * @param oldVer old version string

package/dist/utils.cjs

@@ -10,6 +10,7 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var fs__default = /*#__PURE__*/_interopDefault(fs);
 var path__default = /*#__PURE__*/_interopDefault(path);
+var electron__default = /*#__PURE__*/_interopDefault(electron);
 var zlib__default = /*#__PURE__*/_interopDefault(zlib);
 var crypto__default = /*#__PURE__*/_interopDefault(crypto);
 
@@ -24,35 +25,38 @@ var isWin = process.platform === "win32";
 var isMac = process.platform === "darwin";
 var isLinux = process.platform === "linux";
 function getPathFromAppNameAsar(...paths) {
-  return isDev ? "DEV.asar" : path__default.default.join(path__default.default.dirname(electron.app.getAppPath()), `${electron.app.name}.asar`, ...paths);
+  return isDev ? "DEV.asar" : path__default.default.join(path__default.default.dirname(electron__default.default.app.getAppPath()), `${electron__default.default.app.name}.asar`, ...paths);
 }
 function getAppVersion() {
   return isDev ? getEntryVersion() : fs__default.default.readFileSync(getPathFromAppNameAsar("version"), "utf-8");
 }
 function getEntryVersion() {
-  return electron.app.getVersion();
+  return electron__default.default.app.getVersion();
 }
 function requireNative(moduleName) {
-  return __require(path__default.default.join(electron.app.getAppPath(), __EIU_ENTRY_DIST_PATH__, moduleName));
+  if (__EIU_IS_ESM__) {
+    throw new Error(`Cannot require "${path__default.default.join(__EIU_ENTRY_DIST_PATH__, moduleName)}", \`requireNative\` only support CommonJS`);
+  }
+  return __require(path__default.default.join(electron__default.default.app.getAppPath(), __EIU_ENTRY_DIST_PATH__, moduleName));
 }
 function restartApp() {
-  electron.app.relaunch();
-  electron.app.quit();
+  electron__default.default.app.relaunch();
+  electron__default.default.app.quit();
 }
 function setAppUserModelId(id) {
   if (isWin) {
-    electron.app.setAppUserModelId(id ?? `org.${electron.app.name}`);
+    electron__default.default.app.setAppUserModelId(id ?? `org.${electron__default.default.app.name}`);
   }
 }
 function disableHWAccForWin7() {
-  if (__require("os").release().startsWith("6.1")) {
-    electron.app.disableHardwareAcceleration();
+  if (!__EIU_IS_ESM__ && __require("os").release().startsWith("6.1")) {
+    electron__default.default.app.disableHardwareAcceleration();
   }
 }
 function singleInstance(window) {
-  const result = electron.app.requestSingleInstanceLock();
+  const result = electron__default.default.app.requestSingleInstanceLock();
   if (result) {
-    electron.app.on("second-instance", () => {
+    electron__default.default.app.on("second-instance", () => {
       if (window) {
         window.show();
         if (window.isMinimized()) {
@@ -62,16 +66,16 @@ function singleInstance(window) {
       }
     });
   } else {
-    electron.app.quit();
+    electron__default.default.app.quit();
   }
   return result;
 }
 function setPortableAppDataPath(dirName = "data") {
-  const portablePath = path__default.default.join(path__default.default.dirname(electron.app.getPath("exe")), dirName);
+  const portablePath = path__default.default.join(path__default.default.dirname(electron__default.default.app.getPath("exe")), dirName);
   if (!fs__default.default.existsSync(portablePath)) {
     fs__default.default.mkdirSync(portablePath);
   }
-  electron.app.setPath("appData", portablePath);
+  electron__default.default.app.setPath("appData", portablePath);
 }
 function loadPage(win, htmlFilePath = "index.html") {
   if (isDev) {
@@ -80,14 +84,17 @@ function loadPage(win, htmlFilePath = "index.html") {
     win.loadFile(getPathFromAppNameAsar("renderer", htmlFilePath));
   }
 }
+function getPathFromMain(...paths) {
+  return isDev ? path__default.default.join(electron__default.default.app.getAppPath(), __EIU_ELECTRON_DIST_PATH__, "main", ...paths) : getPathFromAppNameAsar("main", ...paths);
+}
 function getPathFromPreload(...paths) {
-  return isDev ? path__default.default.join(electron.app.getAppPath(), __EIU_ELECTRON_DIST_PATH__, "preload", ...paths) : getPathFromAppNameAsar("preload", ...paths);
+  return isDev ? path__default.default.join(electron__default.default.app.getAppPath(), __EIU_ELECTRON_DIST_PATH__, "preload", ...paths) : getPathFromAppNameAsar("preload", ...paths);
 }
 function getPathFromPublic(...paths) {
-  return isDev ? path__default.default.join(electron.app.getAppPath(), "public", ...paths) : getPathFromAppNameAsar("renderer", ...paths);
+  return isDev ? path__default.default.join(electron__default.default.app.getAppPath(), "public", ...paths) : getPathFromAppNameAsar("renderer", ...paths);
 }
 function getPathFromEntryAsar(...paths) {
-  return path__default.default.join(electron.app.getAppPath(), __EIU_ENTRY_DIST_PATH__, ...paths);
+  return path__default.default.join(electron__default.default.app.getAppPath(), __EIU_ENTRY_DIST_PATH__, ...paths);
 }
 function handleUnexpectedErrors(callback) {
   process.on("uncaughtException", callback);
@@ -136,7 +143,7 @@ function parseVersion(version) {
     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}`);
+    throw new TypeError(`Invalid version: ${version}`);
   }
   return ret;
 }
@@ -218,6 +225,7 @@ exports.getAppVersion = getAppVersion;
 exports.getEntryVersion = getEntryVersion;
 exports.getPathFromAppNameAsar = getPathFromAppNameAsar;
 exports.getPathFromEntryAsar = getPathFromEntryAsar;
+exports.getPathFromMain = getPathFromMain;
 exports.getPathFromPreload = getPathFromPreload;
 exports.getPathFromPublic = getPathFromPublic;
 exports.handleUnexpectedErrors = handleUnexpectedErrors;

package/dist/utils.d.cts

@@ -1,6 +1,6 @@
 import { BrowserWindow } from 'electron';
 export { e as aesDecrypt, b as aesEncrypt, c as defaultSignature, a as defaultUnzipFile, f as defaultVerifySignature, d as defaultZipFile, h as hashBuffer } from './zip-rm9ED9nU.cjs';
-export { U as UpdateInfo, a as UpdateJSON, V as Version, d as defaultIsLowerVersion, b as defaultVersionJsonGenerator, i as isUpdateJSON, p as parseVersion } from './version-C4tF_trh.cjs';
+export { U as UpdateInfo, a as UpdateJSON, V as Version, d as defaultIsLowerVersion, b as defaultVersionJsonGenerator, i as isUpdateJSON, p as parseVersion } from './version-BYVQ367i.cjs';
 
 /**
  * Compile time dev check
@@ -10,7 +10,7 @@ declare const isWin: boolean;
 declare const isMac: boolean;
 declare const isLinux: boolean;
 /**
- * Get the absolute path of `${electron.app.name}.asar` (not `app.asar`)
+ * Get joined path of `${electron.app.name}.asar` (not `app.asar`)
  *
  * If is in dev, **always** return `'DEV.asar'`
  */
@@ -41,6 +41,8 @@ declare function restartApp(): void;
 declare function setAppUserModelId(id?: string): void;
 /**
  * Disable hardware acceleration for Windows 7
+ *
+ * Only support CommonJS
  */
 declare function disableHWAccForWin7(): void;
 /**
@@ -62,6 +64,11 @@ declare function setPortableAppDataPath(dirName?: string): void;
  * @param htmlFilePath html file path, default is `index.html`
  */
 declare function loadPage(win: BrowserWindow, htmlFilePath?: string): void;
+/**
+ * Get joined path from preload dir
+ * @param paths rest paths
+ */
+declare function getPathFromMain(...paths: string[]): string;
 /**
  * Get joined path from preload dir
  * @param paths rest paths
@@ -83,4 +90,4 @@ declare function getPathFromEntryAsar(...paths: string[]): string;
  */
 declare function handleUnexpectedErrors(callback: (err: unknown) => void): void;
 
-export { disableHWAccForWin7, getAppVersion, getEntryVersion, getPathFromAppNameAsar, getPathFromEntryAsar, getPathFromPreload, getPathFromPublic, handleUnexpectedErrors, isDev, isLinux, isMac, isWin, loadPage, requireNative, restartApp, setAppUserModelId, setPortableAppDataPath, singleInstance };
+export { disableHWAccForWin7, getAppVersion, getEntryVersion, getPathFromAppNameAsar, getPathFromEntryAsar, getPathFromMain, getPathFromPreload, getPathFromPublic, handleUnexpectedErrors, isDev, isLinux, isMac, isWin, loadPage, requireNative, restartApp, setAppUserModelId, setPortableAppDataPath, singleInstance };

package/dist/utils.d.ts

@@ -1,6 +1,6 @@
 import { BrowserWindow } from 'electron';
 export { e as aesDecrypt, b as aesEncrypt, c as defaultSignature, a as defaultUnzipFile, f as defaultVerifySignature, d as defaultZipFile, h as hashBuffer } from './zip-rm9ED9nU.js';
-export { U as UpdateInfo, a as UpdateJSON, V as Version, d as defaultIsLowerVersion, b as defaultVersionJsonGenerator, i as isUpdateJSON, p as parseVersion } from './version-C4tF_trh.js';
+export { U as UpdateInfo, a as UpdateJSON, V as Version, d as defaultIsLowerVersion, b as defaultVersionJsonGenerator, i as isUpdateJSON, p as parseVersion } from './version-BYVQ367i.js';
 
 /**
  * Compile time dev check
@@ -10,7 +10,7 @@ declare const isWin: boolean;
 declare const isMac: boolean;
 declare const isLinux: boolean;
 /**
- * Get the absolute path of `${electron.app.name}.asar` (not `app.asar`)
+ * Get joined path of `${electron.app.name}.asar` (not `app.asar`)
  *
  * If is in dev, **always** return `'DEV.asar'`
  */
@@ -41,6 +41,8 @@ declare function restartApp(): void;
 declare function setAppUserModelId(id?: string): void;
 /**
  * Disable hardware acceleration for Windows 7
+ *
+ * Only support CommonJS
  */
 declare function disableHWAccForWin7(): void;
 /**
@@ -62,6 +64,11 @@ declare function setPortableAppDataPath(dirName?: string): void;
  * @param htmlFilePath html file path, default is `index.html`
  */
 declare function loadPage(win: BrowserWindow, htmlFilePath?: string): void;
+/**
+ * Get joined path from preload dir
+ * @param paths rest paths
+ */
+declare function getPathFromMain(...paths: string[]): string;
 /**
  * Get joined path from preload dir
  * @param paths rest paths
@@ -83,4 +90,4 @@ declare function getPathFromEntryAsar(...paths: string[]): string;
  */
 declare function handleUnexpectedErrors(callback: (err: unknown) => void): void;
 
-export { disableHWAccForWin7, getAppVersion, getEntryVersion, getPathFromAppNameAsar, getPathFromEntryAsar, getPathFromPreload, getPathFromPublic, handleUnexpectedErrors, isDev, isLinux, isMac, isWin, loadPage, requireNative, restartApp, setAppUserModelId, setPortableAppDataPath, singleInstance };
+export { disableHWAccForWin7, getAppVersion, getEntryVersion, getPathFromAppNameAsar, getPathFromEntryAsar, getPathFromMain, getPathFromPreload, getPathFromPublic, handleUnexpectedErrors, isDev, isLinux, isMac, isWin, loadPage, requireNative, restartApp, setAppUserModelId, setPortableAppDataPath, singleInstance };

package/dist/utils.js

@@ -1,3 +1,3 @@
-export { disableHWAccForWin7, getAppVersion, getEntryVersion, getPathFromAppNameAsar, getPathFromEntryAsar, getPathFromPreload, getPathFromPublic, handleUnexpectedErrors, isDev, isLinux, isMac, isWin, loadPage, requireNative, restartApp, setAppUserModelId, setPortableAppDataPath, singleInstance } from './chunk-4MH6ZXCY.js';
+export { disableHWAccForWin7, getAppVersion, getEntryVersion, getPathFromAppNameAsar, getPathFromEntryAsar, getPathFromMain, getPathFromPreload, getPathFromPublic, handleUnexpectedErrors, isDev, isLinux, isMac, isWin, loadPage, requireNative, restartApp, setAppUserModelId, setPortableAppDataPath, singleInstance } from './chunk-IABBXJFB.js';
 export { aesDecrypt, aesEncrypt, defaultSignature, defaultUnzipFile, defaultVerifySignature, defaultZipFile, hashBuffer } from './chunk-KZSYEXLO.js';
-export { defaultIsLowerVersion, defaultVersionJsonGenerator, isUpdateJSON, parseVersion } from './chunk-72ZAJ7AF.js';
+export { defaultIsLowerVersion, defaultVersionJsonGenerator, isUpdateJSON, parseVersion } from './chunk-RCRKUKFX.js';

package/dist/{version-C4tF_trh.d.cts → version-BYVQ367i.d.cts}

@@ -1,22 +1,22 @@
 interface Version {
     /**
-     * `2` of `2.1.0-beta.10`
+     * `4` of `4.3.2-beta.1`
      */
     major: number;
     /**
-     * `1` of `2.1.0-beta.10`
+     * `3` of `4.3.2-beta.1`
      */
     minor: number;
     /**
-     * `0` of `2.1.0-beta.10`
+     * `2` of `4.3.2-beta.1`
      */
     patch: number;
     /**
-     * `beta` of `2.1.0-beta.10`
+     * `beta` of `4.3.2-beta.1`
      */
     stage: string;
     /**
-     * `10` of `2.1.0-beta.10`
+     * `1` of `4.3.2-beta.1`
      */
     stageVersion: number;
 }

package/dist/{version-C4tF_trh.d.ts → version-BYVQ367i.d.ts}

@@ -1,22 +1,22 @@
 interface Version {
     /**
-     * `2` of `2.1.0-beta.10`
+     * `4` of `4.3.2-beta.1`
      */
     major: number;
     /**
-     * `1` of `2.1.0-beta.10`
+     * `3` of `4.3.2-beta.1`
      */
     minor: number;
     /**
-     * `0` of `2.1.0-beta.10`
+     * `2` of `4.3.2-beta.1`
      */
     patch: number;
     /**
-     * `beta` of `2.1.0-beta.10`
+     * `beta` of `4.3.2-beta.1`
      */
     stage: string;
     /**
-     * `10` of `2.1.0-beta.10`
+     * `1` of `4.3.2-beta.1`
      */
     stageVersion: number;
 }

package/dist/vite.d.ts

@@ -23,6 +23,7 @@ interface PKG {
     name: string;
     version: string;
     main: string;
+    type: 'commonjs' | 'module';
 }
 interface DistinguishedName {
     countryName?: string;
@@ -86,7 +87,8 @@ interface BuildEntryOption {
      *     '.node': 'empty',
      *   },
      *   define: {
-     *     __SIGNATURE_CERT__: JSON.stringify(cert),
+     *     __EIU_SIGNATURE_CERT__: JSON.stringify(cert),
+     *     // ...
      *   },
      * }
      * ```

package/dist/vite.js

@@ -38,7 +38,7 @@ function parseVersion(version) {
     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}`);
+    throw new TypeError(`Invalid version: ${version}`);
   }
   return ret;
 }
@@ -275,7 +275,7 @@ async function buildEntry({
   entryOutputDirPath,
   nativeModuleEntryMap,
   overrideEsbuildOptions
-}, define, bytecodeOptions) {
+}, isESM, define, bytecodeOptions) {
   const option = mergeConfig(
     {
       entryPoints: {
@@ -295,7 +295,8 @@ async function buildEntry({
       loader: {
         ".node": "empty"
       },
-      define
+      define,
+      format: isESM ? "esm" : "cjs"
     },
     overrideEsbuildOptions ?? {}
   );
@@ -511,7 +512,7 @@ function bytecodePlugin(env, options) {
     renderChunk(code, chunk, options2) {
       if (options2.format === "es") {
         bytecodeLog.warn(
-          '`bytecodePlugin` does not support ES module, please remove "type": "module" in package.json or set the "build.rollupOptions.output.format" option to "cjs".',
+          '`bytecodePlugin` does not support ES module, please set "build.rollupOptions.output.format" option to "cjs"',
           { timestamp: true }
         );
         return null;
@@ -544,8 +545,9 @@ function bytecodePlugin(env, options) {
           const chunk = output[name];
           if (chunk.type === "chunk") {
             let _code = chunk.code;
+            const chunkFilePath = path5.resolve(outDir, name);
             if (beforeCompile) {
-              const cbResult = await beforeCompile(_code, chunk.fileName);
+              const cbResult = await beforeCompile(_code, chunkFilePath);
               if (cbResult) {
                 _code = cbResult;
               }
@@ -562,7 +564,6 @@ function bytecodePlugin(env, options) {
               }
               _code = s.toString();
             }
-            const chunkFilePath = path5.resolve(outDir, name);
             if (bytecodeChunks.includes(name)) {
               const bytecodeBuffer = await compileToBytecode(_code);
               fs3.writeFileSync(chunkFilePath + "c", bytecodeBuffer);
@@ -641,6 +642,7 @@ function getMainFilePath(options) {
     }
     mainFilePath = options?.index ? "index.js" : "main.js";
   }
+  log.info(`Using "${mainFilePath}" as main file`, { timestamp: true });
   return mainFilePath.replace(/\.[cm]?ts$/, ".js");
 }
 function parseVersionPath(versionPath) {
@@ -664,24 +666,33 @@ async function electronWithUpdater(options) {
     useNotBundle = true,
     logParsedOptions
   } = options;
-  if (!pkg) {
-    log.error(`package.json not found`, { timestamp: true });
+  if (!pkg || !pkg.version || !pkg.name || !pkg.main) {
+    log.error("package.json not found or invalid", { timestamp: true });
     return void 0;
   }
-  if (!pkg.version || !pkg.name || !pkg.main) {
-    log.error(`package.json not valid`, { timestamp: true });
-    return void 0;
+  const isESM = pkg.type === "module";
+  let bytecodeOptions = typeof bytecode === "object" ? bytecode : bytecode === true ? { enable: true } : void 0;
+  if (isESM && bytecodeOptions?.enable) {
+    bytecodeLog.warn(
+      '`bytecodePlugin` does not support ES module, please remove "type": "module" in package.json',
+      { timestamp: true }
+    );
+    bytecodeOptions = void 0;
   }
-  const _options = parseOptions(pkg, sourcemap, minify, updater);
-  const bytecodeOptions = typeof bytecode === "object" ? bytecode : bytecode === true ? { enable: true } : void 0;
+  const {
+    buildAsarOption,
+    buildEntryOption,
+    buildVersionOption,
+    postBuild,
+    cert
+  } = parseOptions(pkg, sourcemap, minify, updater);
+  const { entryOutputDirPath, nativeModuleEntryMap, appEntryPath } = buildEntryOption;
   try {
-    fs3.rmSync(_options.buildAsarOption.electronDistPath, { recursive: true, force: true });
-    fs3.rmSync(_options.buildEntryOption.entryOutputDirPath, { recursive: true, force: true });
+    fs3.rmSync(buildAsarOption.electronDistPath, { recursive: true, force: true });
+    fs3.rmSync(entryOutputDirPath, { recursive: true, force: true });
   } catch {
   }
-  log.info(`Remove old files`, { timestamp: true });
-  const { buildAsarOption, buildEntryOption, buildVersionOption, postBuild, cert } = _options;
-  const { entryOutputDirPath, nativeModuleEntryMap, appEntryPath } = buildEntryOption;
+  log.info(`Clear cache files`, { timestamp: true });
   sourcemap ??= isBuild || !!process.env.VSCODE_DEBUG;
   const _appPath = normalizePath(path5.join(entryOutputDirPath, "entry.js"));
   if (path5.resolve(normalizePath(pkg.main)) !== path5.resolve(_appPath)) {
@@ -691,6 +702,7 @@ async function electronWithUpdater(options) {
     __EIU_ELECTRON_DIST_PATH__: JSON.stringify(buildAsarOption.electronDistPath),
     __EIU_ENTRY_DIST_PATH__: JSON.stringify(buildEntryOption.entryOutputDirPath),
     __EIU_IS_DEV__: JSON.stringify(!isBuild),
+    __EIU_IS_ESM__: JSON.stringify(isESM),
     __EIU_MAIN_DEV_DIR__: JSON.stringify(buildAsarOption.electronDistPath),
     __EIU_MAIN_FILE__: JSON.stringify(getMainFilePath(_main.files)),
     __EIU_SIGNATURE_CERT__: JSON.stringify(cert),
@@ -699,6 +711,7 @@ async function electronWithUpdater(options) {
   const _buildEntry = async () => {
     await buildEntry(
       buildEntryOption,
+      isESM,
       define,
       bytecodeOptions
     );