electron-incremental-update 2.1.1 → 2.2.0

package/README.md

@@ -245,7 +245,7 @@ Luckily, `Esbuild` can bundle all the dependencies. Just follow the steps:
 1. setup `nativeModuleEntryMap` option
 2. Manually copy the native binaries in `postBuild` callback
 3. Exclude all the dependencies in `electron-builder`'s config
-4. call the native functions with `requireNative` in your code
+4. call the native functions with `requireNative` / `importNative` in your code
 
 #### Example
 
@@ -283,8 +283,9 @@ in `electron/native/db.ts`
 
 ```ts
 import Database from 'better-sqlite3'
+import { getPathFromEntryAsar } from 'electron-incremental-update/utils'
 
-const db = new Database(':memory:', { nativeBinding: './better_sqlite3.node' })
+const db = new Database(':memory:', { nativeBinding: getPathFromEntryAsar('./better_sqlite3.node') })
 
 export function test(): void {
   db.exec(
@@ -308,9 +309,13 @@ export function test(): void {
 in `electron/main/service.ts`
 
 ```ts
-import { requireNative } from 'electron-incremental-update/utils'
+import { importNative, requireNative } from 'electron-incremental-update/utils'
 
+// commonjs
 requireNative<typeof import('../native/db')>('db').test()
+
+// esm
+importNative<typeof import('../native/db')>('db').test()
 ```
 
 in `electron-builder.config.js`
@@ -349,6 +354,124 @@ https://electron-vite.org/guide/source-code-protection
 - Only support commonjs
 - Only for main process by default, if you want to use in preload script, please use `electronWithUpdater({ bytecode: { enablePreload: true } })` and set `sandbox: false` when creating window
 
+### Utils
+
+```ts
+/**
+ * Compile time dev check
+ */
+const isDev: boolean
+const isWin: boolean
+const isMac: boolean
+const isLinux: boolean
+/**
+ * Get joined path of `${electron.app.name}.asar` (not `app.asar`)
+ *
+ * If is in dev, **always** return `'DEV.asar'`
+ */
+function getPathFromAppNameAsar(...paths: string[]): string
+/**
+ * Get app version, if is in dev, return `getEntryVersion()`
+ */
+function getAppVersion(): string
+/**
+ * Get entry version
+ */
+function getEntryVersion(): string
+/**
+ * Use `require` to load native module from entry asar
+ * @param moduleName file name in entry
+ * @example
+ * requireNative<typeof import('../native/db')>('db')
+ */
+function requireNative<T = any>(moduleName: string): T
+/**
+ * Use `import` to load native module from entry asar
+ * @param moduleName file name in entry
+ * @example
+ * await importNative<typeof import('../native/db')>('db')
+ */
+function importNative<T = any>(moduleName: string): Promise<T>
+/**
+ * Restarts the Electron app.
+ */
+function restartApp(): void
+/**
+ * Fix app use model id, only for Windows
+ * @param id app id, default is `org.${electron.app.name}`
+ */
+function setAppUserModelId(id?: string): void
+/**
+ * Disable hardware acceleration for Windows 7
+ *
+ * Only support CommonJS
+ */
+function disableHWAccForWin7(): void
+/**
+ * Keep single electron instance and auto restore window on `second-instance` event
+ * @param window brwoser window to show
+ */
+function singleInstance(window?: BrowserWindow): void
+/**
+ * Set `AppData` dir to the dir of .exe file
+ *
+ * Useful for portable Windows app
+ * @param dirName dir name, default to `data`
+ */
+function setPortableAppDataPath(dirName?: string): void
+/**
+ * Load `process.env.VITE_DEV_SERVER_URL` when dev, else load html file
+ * @param win window
+ * @param htmlFilePath html file path, default is `index.html`
+ */
+function loadPage(win: BrowserWindow, htmlFilePath?: string): void
+interface BeautifyDevToolsOptions {
+  /**
+   * Sans-serif font family
+   */
+  sans: string
+  /**
+   * Monospace font family
+   */
+  mono: string
+  /**
+   * Whether to round scrollbar
+   */
+  scrollbar?: boolean
+}
+/**
+ * Beautify devtools' font and scrollbar
+ * @param win target window
+ * @param options sans font family, mono font family and scrollbar
+ */
+function beautifyDevTools(win: BrowserWindow, options: BeautifyDevToolsOptions): void
+/**
+ * Get joined path from main dir
+ * @param paths rest paths
+ */
+function getPathFromMain(...paths: string[]): string
+/**
+ * Get joined path from preload dir
+ * @param paths rest paths
+ */
+function getPathFromPreload(...paths: string[]): string
+/**
+ * Get joined path from publich dir
+ * @param paths rest paths
+ */
+function getPathFromPublic(...paths: string[]): string
+/**
+ * Get joined path from entry asar
+ * @param paths rest paths
+ */
+function getPathFromEntryAsar(...paths: string[]): string
+/**
+ * Handle all unhandled error
+ * @param callback callback function
+ */
+function handleUnexpectedErrors(callback: (err: unknown) => void): void
+```
+
 ### Types
 
 #### Entry

package/dist/{bytecode-I4PMYUGT.js → bytecode-Z5ZF4YGN.js}

@@ -1,13 +1,15 @@
 import { readableSize } from './chunk-WYQ5DRO7.js';
-import { convertLiteral, bytecodeModuleLoader, convertArrowFunctionAndTemplate, compileToBytecode, useStrict, toRelativePath } from './chunk-AUY7A2FL.js';
-import './chunk-7M7DIMDN.js';
+import { convertLiteral, bytecodeModuleLoaderCode, bytecodeModuleLoader, convertArrowFunctionAndTemplate, compileToBytecode, useStrict, toRelativePath } from './chunk-I2EHKJU4.js';
+import './chunk-CTUEQCKL.js';
 import { bytecodeLog, bytecodeId } from './chunk-5NKEXGI3.js';
-import { bytecodeModuleLoaderCode } from './chunk-7IRGAAL2.js';
 import path from 'node:path';
 import fs from 'node:fs';
 import { createFilter, normalizePath } from 'vite';
 import MagicString from 'magic-string';
 
+function getBytecodeLoaderBlock(chunkFileName) {
+  return `require("${toRelativePath(bytecodeModuleLoader, normalizePath(chunkFileName))}");`;
+}
 function bytecodePlugin(env, options) {
   const {
     enable,
@@ -77,9 +79,6 @@ function bytecodePlugin(env, options) {
       const nonEntryChunks = chunks.filter((chunk) => !chunk.isEntry).map((chunk) => path.basename(chunk.fileName));
       const pattern = nonEntryChunks.map((chunk) => `(${chunk})`).join("|");
       const bytecodeRE = pattern ? new RegExp(`require\\(\\S*(?=(${pattern})\\S*\\))`, "g") : null;
-      const getBytecodeLoaderBlock = (chunkFileName) => {
-        return `require("${toRelativePath(bytecodeModuleLoader, normalizePath(chunkFileName))}");`;
-      };
       await Promise.all(
         bundles.map(async (name) => {
           const chunk = output[name];

package/dist/{chunk-RCRKUKFX.js → chunk-AAAM44NW.js}

@@ -29,17 +29,17 @@ function parseVersion(version) {
   }
   return ret;
 }
+function compareStrings(str1, str2) {
+  if (str1 === "") {
+    return str2 !== "";
+  } else if (str2 === "") {
+    return true;
+  }
+  return str1 < str2;
+}
 function defaultIsLowerVersion(oldVer, newVer) {
   const oldV = parseVersion(oldVer);
   const newV = parseVersion(newVer);
-  function compareStrings(str1, str2) {
-    if (str1 === "") {
-      return str2 !== "";
-    } else if (str2 === "") {
-      return true;
-    }
-    return str1 < str2;
-  }
   for (let key of Object.keys(oldV)) {
     if (key === "stage" && compareStrings(oldV[key], newV[key])) {
       return true;
@@ -49,8 +49,8 @@ function defaultIsLowerVersion(oldVer, newVer) {
   }
   return false;
 }
+var is = (j) => !!(j && j.minimumVersion && j.signature && j.version);
 function isUpdateJSON(json) {
-  const is = (j) => !!(j && j.minimumVersion && j.signature && j.version);
   return is(json) && is(json?.beta);
 }
 function defaultVersionJsonGenerator(existingJson, signature, version, minimumVersion) {

package/dist/{chunk-7M7DIMDN.js → chunk-CTUEQCKL.js}

@@ -22,8 +22,8 @@ function parseVersion(version) {
   }
   return ret;
 }
+var is = (j) => !!(j && j.minimumVersion && j.signature && j.version);
 function isUpdateJSON(json) {
-  const is = (j) => !!(j && j.minimumVersion && j.signature && j.version);
   return is(json) && is(json?.beta);
 }
 function defaultVersionJsonGenerator(existingJson, signature, version, minimumVersion) {

package/dist/{chunk-AUY7A2FL.js → chunk-I2EHKJU4.js}

@@ -1,6 +1,5 @@
-import { parseVersion } from './chunk-7M7DIMDN.js';
+import { parseVersion } from './chunk-CTUEQCKL.js';
 import { bytecodeLog } from './chunk-5NKEXGI3.js';
-import { bytecodeGeneratorScript } from './chunk-7IRGAAL2.js';
 import path from 'node:path';
 import fs from 'node:fs';
 import cp from 'node:child_process';
@@ -8,6 +7,9 @@ import * as babel from '@babel/core';
 import MagicString from 'magic-string';
 import { getPackageInfoSync } from 'local-pkg';
 
+// src/vite/bytecode/code.ts
+var bytecodeGeneratorScript = "const vm = require('vm')\nconst v8 = require('v8')\nconst wrap = require('module').wrap\nv8.setFlagsFromString('--no-lazy')\nv8.setFlagsFromString('--no-flush-bytecode')\nlet code = ''\nprocess.stdin.setEncoding('utf-8')\nprocess.stdin.on('readable', () => {\n  const data = process.stdin.read()\n  if (data !== null) {\n    code += data\n  }\n})\nprocess.stdin.on('end', () => {\n  try {\n    if (typeof code !== 'string') {\n      throw new Error('javascript code must be string.')\n    }\n    const script = new vm.Script(wrap(code), { produceCachedData: true })\n    const bytecodeBuffer = script.createCachedData()\n    process.stdout.write(bytecodeBuffer)\n  } catch (error) {\n    console.error(error)\n  }\n})\n";
+var bytecodeModuleLoaderCode = '"use strict";\nconst fs = require("fs");\nconst path = require("path");\nconst vm = require("vm");\nconst v8 = require("v8");\nconst Module = require("module");\nv8.setFlagsFromString("--no-lazy");\nv8.setFlagsFromString("--no-flush-bytecode");\nconst FLAG_HASH_OFFSET = 12;\nconst SOURCE_HASH_OFFSET = 8;\nlet dummyBytecode;\nfunction setFlagHashHeader(bytecodeBuffer) {\n  if (!dummyBytecode) {\n    const script = new vm.Script("", {\n      produceCachedData: true\n    });\n    dummyBytecode = script.createCachedData();\n  }\n  dummyBytecode.slice(FLAG_HASH_OFFSET, FLAG_HASH_OFFSET + 4).copy(bytecodeBuffer, FLAG_HASH_OFFSET);\n};\nfunction getSourceHashHeader(bytecodeBuffer) {\n  return bytecodeBuffer.slice(SOURCE_HASH_OFFSET, SOURCE_HASH_OFFSET + 4);\n};\nfunction buffer2Number(buffer) {\n  let ret = 0;\n  ret |= buffer[3] << 24;\n  ret |= buffer[2] << 16;\n  ret |= buffer[1] << 8;\n  ret |= buffer[0];\n  return ret;\n};\nModule._extensions[".jsc"] = Module._extensions[".cjsc"] = function (module, filename) {\n  const bytecodeBuffer = fs.readFileSync(filename);\n  if (!Buffer.isBuffer(bytecodeBuffer)) {\n    throw new Error("BytecodeBuffer must be a buffer object.");\n  }\n  setFlagHashHeader(bytecodeBuffer);\n  const length = buffer2Number(getSourceHashHeader(bytecodeBuffer));\n  let dummyCode = "";\n  if (length > 1) {\n    dummyCode = "\\"" + "\\u200b".repeat(length - 2) + "\\"";\n  }\n  const script = new vm.Script(dummyCode, {\n    filename: filename,\n    lineOffset: 0,\n    displayErrors: true,\n    cachedData: bytecodeBuffer\n  });\n  if (script.cachedDataRejected) {\n    throw new Error("Invalid or incompatible cached data (cachedDataRejected)");\n  }\n  const require = function (id) {\n    return module.require(id);\n  };\n  require.resolve = function (request, options) {\n    return Module._resolveFilename(request, module, false, options);\n  };\n  if (process.mainModule) {\n    require.main = process.mainModule;\n  }\n  require.extensions = Module._extensions;\n  require.cache = Module._cache;\n  const compiledWrapper = script.runInThisContext({\n    filename: filename,\n    lineOffset: 0,\n    columnOffset: 0,\n    displayErrors: true\n  });\n  const dirname = path.dirname(filename);\n  const args = [module.exports, require, module, filename, dirname, process, global];\n  return compiledWrapper.apply(module.exports, args);\n};\n';
 var electronModule = getPackageInfoSync("electron");
 var electronMajorVersion = parseVersion(electronModule.version).major;
 var useStrict = "'use strict';";
@@ -44,9 +46,9 @@ function toRelativePath(filename, importer) {
   const relPath = path.posix.relative(path.dirname(importer), filename);
   return relPath.startsWith(".") ? relPath : `./${relPath}`;
 }
+var logErr = (...args) => bytecodeLog.error(args.join(" "), { timestamp: true });
 function compileToBytecode(code, electronPath = getElectronPath()) {
   let data = Buffer.from([]);
-  const logErr = (...args) => bytecodeLog.error(args.join(" "), { timestamp: true });
   const bytecodePath = getBytecodeCompilerPath();
   return new Promise((resolve, reject) => {
     const proc = cp.spawn(electronPath, [bytecodePath], {
@@ -144,4 +146,4 @@ function convertLiteral(code, sourcemap, offset) {
   };
 }
 
-export { bytecodeModuleLoader, compileToBytecode, convertArrowFunctionAndTemplate, convertLiteral, decodeFn, electronMajorVersion, electronModule, obfuscateString, toRelativePath, useStrict };
+export { bytecodeModuleLoader, bytecodeModuleLoaderCode, compileToBytecode, convertArrowFunctionAndTemplate, convertLiteral, electronMajorVersion, toRelativePath, useStrict };

package/dist/{chunk-ZM5CIZ4L.js → chunk-JI27JWJN.js}

@@ -1,4 +1,4 @@
-import { __require } from './chunk-RCRKUKFX.js';
+import { __require } from './chunk-AAAM44NW.js';
 import fs from 'node:fs';
 import path from 'node:path';
 import electron from 'electron';
@@ -45,21 +45,15 @@ function disableHWAccForWin7() {
   }
 }
 function singleInstance(window) {
-  const result = electron.app.requestSingleInstanceLock();
-  if (result) {
-    electron.app.on("second-instance", () => {
-      if (window) {
-        window.show();
-        if (window.isMinimized()) {
-          window.restore();
-        }
-        window.focus();
+  electron.app.on("second-instance", () => {
+    if (window) {
+      window.show();
+      if (window.isMinimized()) {
+        window.restore();
       }
-    });
-  } else {
-    electron.app.quit();
-  }
-  return result;
+      window.focus();
+    }
+  });
 }
 function setPortableAppDataPath(dirName = "data") {
   const portablePath = path.join(path.dirname(electron.app.getPath("exe")), dirName);

package/dist/{chunk-KZSYEXLO.js → chunk-PUVBFHOK.js}

@@ -4,24 +4,12 @@ import crypto from 'node:crypto';
 // src/utils/zip.ts
 async function defaultZipFile(buffer) {
   return new Promise((resolve, reject) => {
-    zlib.brotliCompress(buffer, (err, buffer2) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve(buffer2);
-      }
-    });
+    zlib.brotliCompress(buffer, (err, buffer2) => err ? reject(err) : resolve(buffer2));
   });
 }
 async function defaultUnzipFile(buffer) {
   return new Promise((resolve, reject) => {
-    zlib.brotliDecompress(buffer, (err, buffer2) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve(buffer2);
-      }
-    });
+    zlib.brotliDecompress(buffer, (err, buffer2) => err ? reject(err) : resolve(buffer2));
   });
 }
 function hashBuffer(data, length) {

package/dist/{chunk-5CE27A6G.js → esm-5YR6V7VN.js}

@@ -1,4 +1,6 @@
-import { electronMajorVersion } from './chunk-AUY7A2FL.js';
+import { electronMajorVersion } from './chunk-I2EHKJU4.js';
+import './chunk-CTUEQCKL.js';
+import { esmId } from './chunk-5NKEXGI3.js';
 import MagicString from 'magic-string';
 
 // src/vite/esm/constant.ts
@@ -41,4 +43,23 @@ function insertCJSShim(code, sourcemap, insertPosition = 0) {
   };
 }
 
-export { findStaticImports, insertCJSShim };
+// src/vite/esm/index.ts
+function esm() {
+  let sourcemap;
+  return {
+    name: esmId,
+    enforce: "post",
+    configResolved(config) {
+      sourcemap = config.build.sourcemap;
+    },
+    renderChunk(code, _chunk, options) {
+      if (options.format === "es") {
+        const lastESMImport = findStaticImports(code).pop();
+        const pos = lastESMImport ? lastESMImport.end : 0;
+        return insertCJSShim(code, sourcemap, pos);
+      }
+    }
+  };
+}
+
+export { esm };

package/dist/index.cjs

@@ -19,8 +19,8 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 });
 
 // src/utils/version.ts
+var is = (j) => !!(j && j.minimumVersion && j.signature && j.version);
 function isUpdateJSON(json) {
-  const is = (j) => !!(j && j.minimumVersion && j.signature && j.version);
   return is(json) && is(json?.beta);
 }
 var isDev = __EIU_IS_DEV__;
@@ -40,6 +40,9 @@ function restartApp() {
   electron__default.default.app.relaunch();
   electron__default.default.app.quit();
 }
+function getPathFromMain(...paths) {
+  return isDev ? path__default.default.join(electron__default.default.app.getAppPath(), __EIU_ELECTRON_DIST_PATH__, "main", ...paths) : getPathFromAppNameAsar("main", ...paths);
+}
 
 // src/entry/types.ts
 var UpdaterError = class extends Error {
@@ -103,7 +106,7 @@ var Updater = class extends events.EventEmitter {
     }
     this.logger?.debug(`Download from \`${this.provider.name}\``);
     try {
-      const result = format === "json" ? await this.provider.downloadJSON(electron.app.name, __EIU_VERSION_PATH__, this.controller.signal) : await this.provider.downloadAsar(this.info, this.controller.signal, (info) => this.emit("download-progress", info));
+      const result = format === "json" ? await this.provider.downloadJSON(electron__default.default.app.name, __EIU_VERSION_PATH__, this.controller.signal) : await this.provider.downloadAsar(this.info, this.controller.signal, (info) => this.emit("download-progress", info));
       this.logger?.debug(`Download ${format} success${format === "buffer" ? `, file size: ${result.length}` : ""}`);
       return result;
     } catch (e) {
@@ -232,22 +235,13 @@ var defaultOnInstall = (install, _, __, logger) => {
 async function createElectronApp(appOptions = {}) {
   const appNameAsarPath = getPathFromAppNameAsar();
   const {
-    mainPath = path__default.default.join(
-      isDev ? path__default.default.join(electron.app.getAppPath(), __EIU_MAIN_DEV_DIR__) : appNameAsarPath,
-      "main",
-      __EIU_MAIN_FILE__
-    ),
+    mainPath = getPathFromMain(__EIU_MAIN_FILE__),
     updater,
     onInstall = defaultOnInstall,
     beforeStart,
     onStartError
   } = appOptions;
-  let updaterInstance;
-  if (typeof updater === "object" || !updater) {
-    updaterInstance = new Updater(updater);
-  } else {
-    updaterInstance = await updater();
-  }
+  const updaterInstance = typeof updater === "object" || !updater ? new Updater(updater) : await updater();
   const logger = updaterInstance.logger;
   try {
     const tempAsarPath = `${appNameAsarPath}.tmp`;
@@ -264,7 +258,7 @@ async function createElectronApp(appOptions = {}) {
   } catch (error) {
     logger?.error("startup error", error);
     onStartError?.(error, logger);
-    electron.app.quit();
+    electron__default.default.app.quit();
   }
 }
 var initApp = createElectronApp;

package/dist/index.d.cts

@@ -1,13 +1,13 @@
 import { EventEmitter } from 'node:events';
 import { U as UpdateJSON, a as UpdateInfo } from './version-DcFMG3pT.cjs';
-import { U as UpdateInfoWithExtraVersion, a as UnavailableCode, b as UpdaterError, D as DownloadingInfo, I as IProvider, L as Logger, c as UpdaterOption, d as UpdateJSONWithURL } from './types-DADYYy6C.cjs';
-export { E as ErrorCode, e as UpdateInfoWithURL } from './types-DADYYy6C.cjs';
+import { U as UpdateInfoWithExtraVersion, a as UpdaterUnavailableCode, b as UpdaterError, D as DownloadingInfo, I as IProvider, L as Logger, c as UpdaterOption, d as UpdateJSONWithURL } from './types-BPH66pNz.cjs';
+export { f as UpdateInfoWithURL, e as UpdaterErrorCode } from './types-BPH66pNz.cjs';
 import { Promisable } from '@subframe7536/type-utils';
 
 declare class Updater extends EventEmitter<{
     'checking': any;
     'update-available': [data: UpdateInfoWithExtraVersion];
-    'update-not-available': [code: UnavailableCode, msg: string, info?: UpdateInfoWithExtraVersion];
+    'update-not-available': [code: UpdaterUnavailableCode, msg: string, info?: UpdateInfoWithExtraVersion];
     'error': [error: UpdaterError];
     'download-progress': [info: DownloadingInfo];
     'update-downloaded': any;
@@ -143,4 +143,4 @@ declare function createElectronApp(appOptions?: AppOption): Promise<void>;
  */
 declare const initApp: typeof createElectronApp;
 
-export { type AppOption, Logger, UnavailableCode, UpdateInfoWithExtraVersion, Updater, UpdaterError, UpdaterOption, autoUpdate, createElectronApp, initApp, startupWithUpdater };
+export { type AppOption, Logger, UpdateInfoWithExtraVersion, Updater, UpdaterError, UpdaterOption, UpdaterUnavailableCode, autoUpdate, createElectronApp, initApp, startupWithUpdater };

package/dist/index.d.ts

@@ -1,13 +1,13 @@
 import { EventEmitter } from 'node:events';
 import { U as UpdateJSON, a as UpdateInfo } from './version-DcFMG3pT.js';
-import { U as UpdateInfoWithExtraVersion, a as UnavailableCode, b as UpdaterError, D as DownloadingInfo, I as IProvider, L as Logger, c as UpdaterOption, d as UpdateJSONWithURL } from './types-BVcfNRXE.js';
-export { E as ErrorCode, e as UpdateInfoWithURL } from './types-BVcfNRXE.js';
+import { U as UpdateInfoWithExtraVersion, a as UpdaterUnavailableCode, b as UpdaterError, D as DownloadingInfo, I as IProvider, L as Logger, c as UpdaterOption, d as UpdateJSONWithURL } from './types-DQKdsHc_.js';
+export { f as UpdateInfoWithURL, e as UpdaterErrorCode } from './types-DQKdsHc_.js';
 import { Promisable } from '@subframe7536/type-utils';
 
 declare class Updater extends EventEmitter<{
     'checking': any;
     'update-available': [data: UpdateInfoWithExtraVersion];
-    'update-not-available': [code: UnavailableCode, msg: string, info?: UpdateInfoWithExtraVersion];
+    'update-not-available': [code: UpdaterUnavailableCode, msg: string, info?: UpdateInfoWithExtraVersion];
     'error': [error: UpdaterError];
     'download-progress': [info: DownloadingInfo];
     'update-downloaded': any;
@@ -143,4 +143,4 @@ declare function createElectronApp(appOptions?: AppOption): Promise<void>;
  */
 declare const initApp: typeof createElectronApp;
 
-export { type AppOption, Logger, UnavailableCode, UpdateInfoWithExtraVersion, Updater, UpdaterError, UpdaterOption, autoUpdate, createElectronApp, initApp, startupWithUpdater };
+export { type AppOption, Logger, UpdateInfoWithExtraVersion, Updater, UpdaterError, UpdaterOption, UpdaterUnavailableCode, autoUpdate, createElectronApp, initApp, startupWithUpdater };

package/dist/index.js

@@ -1,9 +1,8 @@
-import { isDev, getAppVersion, getEntryVersion, getPathFromAppNameAsar, restartApp } from './chunk-ZM5CIZ4L.js';
-import { isUpdateJSON, __require } from './chunk-RCRKUKFX.js';
+import { isDev, getAppVersion, getEntryVersion, getPathFromAppNameAsar, restartApp, getPathFromMain } from './chunk-JI27JWJN.js';
+import { isUpdateJSON, __require } from './chunk-AAAM44NW.js';
 import fs2 from 'node:fs';
 import { EventEmitter } from 'node:events';
-import { app } from 'electron';
-import path from 'node:path';
+import electron from 'electron';
 
 // src/entry/types.ts
 var UpdaterError = class extends Error {
@@ -67,7 +66,7 @@ var Updater = class extends EventEmitter {
     }
     this.logger?.debug(`Download from \`${this.provider.name}\``);
     try {
-      const result = format === "json" ? await this.provider.downloadJSON(app.name, __EIU_VERSION_PATH__, this.controller.signal) : await this.provider.downloadAsar(this.info, this.controller.signal, (info) => this.emit("download-progress", info));
+      const result = format === "json" ? await this.provider.downloadJSON(electron.app.name, __EIU_VERSION_PATH__, this.controller.signal) : await this.provider.downloadAsar(this.info, this.controller.signal, (info) => this.emit("download-progress", info));
       this.logger?.debug(`Download ${format} success${format === "buffer" ? `, file size: ${result.length}` : ""}`);
       return result;
     } catch (e) {
@@ -196,22 +195,13 @@ var defaultOnInstall = (install, _, __, logger) => {
 async function createElectronApp(appOptions = {}) {
   const appNameAsarPath = getPathFromAppNameAsar();
   const {
-    mainPath = path.join(
-      isDev ? path.join(app.getAppPath(), __EIU_MAIN_DEV_DIR__) : appNameAsarPath,
-      "main",
-      __EIU_MAIN_FILE__
-    ),
+    mainPath = getPathFromMain(__EIU_MAIN_FILE__),
     updater,
     onInstall = defaultOnInstall,
     beforeStart,
     onStartError
   } = appOptions;
-  let updaterInstance;
-  if (typeof updater === "object" || !updater) {
-    updaterInstance = new Updater(updater);
-  } else {
-    updaterInstance = await updater();
-  }
+  const updaterInstance = typeof updater === "object" || !updater ? new Updater(updater) : await updater();
   const logger = updaterInstance.logger;
   try {
     const tempAsarPath = `${appNameAsarPath}.tmp`;
@@ -228,7 +218,7 @@ async function createElectronApp(appOptions = {}) {
   } catch (error) {
     logger?.error("startup error", error);
     onStartError?.(error, logger);
-    app.quit();
+    electron.app.quit();
   }
 }
 var initApp = createElectronApp;

package/dist/provider.cjs

@@ -37,17 +37,17 @@ function parseVersion(version) {
   }
   return ret;
 }
+function compareStrings(str1, str2) {
+  if (str1 === "") {
+    return str2 !== "";
+  } else if (str2 === "") {
+    return true;
+  }
+  return str1 < str2;
+}
 function defaultIsLowerVersion(oldVer, newVer) {
   const oldV = parseVersion(oldVer);
   const newV = parseVersion(newVer);
-  function compareStrings(str1, str2) {
-    if (str1 === "") {
-      return str2 !== "";
-    } else if (str2 === "") {
-      return true;
-    }
-    return str1 < str2;
-  }
   for (let key of Object.keys(oldV)) {
     if (key === "stage" && compareStrings(oldV[key], newV[key])) {
       return true;
@@ -57,8 +57,8 @@ function defaultIsLowerVersion(oldVer, newVer) {
   }
   return false;
 }
+var is = (j) => !!(j && j.minimumVersion && j.signature && j.version);
 function isUpdateJSON(json) {
-  const is = (j) => !!(j && j.minimumVersion && j.signature && j.version);
   return is(json) && is(json?.beta);
 }
 
@@ -175,13 +175,7 @@ function defaultVerifySignature(buffer, version, signature, cert) {
 }
 async function defaultUnzipFile(buffer) {
   return new Promise((resolve, reject) => {
-    zlib__default.default.brotliDecompress(buffer, (err, buffer2) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve(buffer2);
-      }
-    });
+    zlib__default.default.brotliDecompress(buffer, (err, buffer2) => err ? reject(err) : resolve(buffer2));
   });
 }
 

package/dist/provider.d.cts

@@ -1,4 +1,4 @@
-import { I as IProvider, d as UpdateJSONWithURL, e as UpdateInfoWithURL, D as DownloadingInfo, f as URLHandler, O as OnDownloading } from './types-DADYYy6C.cjs';
+import { I as IProvider, d as UpdateJSONWithURL, f as UpdateInfoWithURL, D as DownloadingInfo, g as URLHandler, O as OnDownloading } from './types-BPH66pNz.cjs';
 import { f as defaultVerifySignature, a as defaultUnzipFile } from './zip-rm9ED9nU.cjs';
 import { d as defaultIsLowerVersion, U as UpdateJSON } from './version-DcFMG3pT.cjs';
 import { Arrayable } from '@subframe7536/type-utils';

package/dist/provider.d.ts

@@ -1,4 +1,4 @@
-import { I as IProvider, d as UpdateJSONWithURL, e as UpdateInfoWithURL, D as DownloadingInfo, f as URLHandler, O as OnDownloading } from './types-BVcfNRXE.js';
+import { I as IProvider, d as UpdateJSONWithURL, f as UpdateInfoWithURL, D as DownloadingInfo, g as URLHandler, O as OnDownloading } from './types-DQKdsHc_.js';
 import { f as defaultVerifySignature, a as defaultUnzipFile } from './zip-rm9ED9nU.js';
 import { d as defaultIsLowerVersion, U as UpdateJSON } from './version-DcFMG3pT.js';
 import { Arrayable } from '@subframe7536/type-utils';

package/dist/provider.js

@@ -1,5 +1,5 @@
-import { defaultVerifySignature, defaultUnzipFile } from './chunk-KZSYEXLO.js';
-import { isUpdateJSON, defaultIsLowerVersion } from './chunk-RCRKUKFX.js';
+import { defaultVerifySignature, defaultUnzipFile } from './chunk-PUVBFHOK.js';
+import { isUpdateJSON, defaultIsLowerVersion } from './chunk-AAAM44NW.js';
 import { URL } from 'node:url';
 import electron from 'electron';
 

package/dist/{types-DADYYy6C.d.cts → types-BPH66pNz.d.cts}

@@ -1,11 +1,11 @@
 import { Promisable } from '@subframe7536/type-utils';
 import { a as UpdateInfo } from './version-DcFMG3pT.cjs';
 
-type ErrorCode = 'ERR_DOWNLOAD' | 'ERR_VALIDATE' | 'ERR_PARAM' | 'ERR_NETWORK';
-type UnavailableCode = 'UNAVAILABLE_ERROR' | 'UNAVAILABLE_DEV' | 'UNAVAILABLE_VERSION';
+type UpdaterErrorCode = 'ERR_DOWNLOAD' | 'ERR_VALIDATE' | 'ERR_PARAM' | 'ERR_NETWORK';
+type UpdaterUnavailableCode = 'UNAVAILABLE_ERROR' | 'UNAVAILABLE_DEV' | 'UNAVAILABLE_VERSION';
 declare class UpdaterError extends Error {
-    code: ErrorCode;
-    constructor(code: ErrorCode, info: string);
+    code: UpdaterErrorCode;
+    constructor(code: UpdaterErrorCode, info: string);
 }
 interface Logger {
     info: (msg: string) => void;
@@ -114,4 +114,4 @@ interface IProvider {
 }
 type URLHandler = (url: URL) => Promisable<URL | string | undefined | null>;
 
-export { type DownloadingInfo as D, type ErrorCode as E, type IProvider as I, type Logger as L, type OnDownloading as O, type UpdateInfoWithExtraVersion as U, type UnavailableCode as a, UpdaterError as b, type UpdaterOption as c, type UpdateJSONWithURL as d, type UpdateInfoWithURL as e, type URLHandler as f };
+export { type DownloadingInfo as D, type IProvider as I, type Logger as L, type OnDownloading as O, type UpdateInfoWithExtraVersion as U, type UpdaterUnavailableCode as a, UpdaterError as b, type UpdaterOption as c, type UpdateJSONWithURL as d, type UpdaterErrorCode as e, type UpdateInfoWithURL as f, type URLHandler as g };

package/dist/{types-BVcfNRXE.d.ts → types-DQKdsHc_.d.ts}

@@ -1,11 +1,11 @@
 import { Promisable } from '@subframe7536/type-utils';
 import { a as UpdateInfo } from './version-DcFMG3pT.js';
 
-type ErrorCode = 'ERR_DOWNLOAD' | 'ERR_VALIDATE' | 'ERR_PARAM' | 'ERR_NETWORK';
-type UnavailableCode = 'UNAVAILABLE_ERROR' | 'UNAVAILABLE_DEV' | 'UNAVAILABLE_VERSION';
+type UpdaterErrorCode = 'ERR_DOWNLOAD' | 'ERR_VALIDATE' | 'ERR_PARAM' | 'ERR_NETWORK';
+type UpdaterUnavailableCode = 'UNAVAILABLE_ERROR' | 'UNAVAILABLE_DEV' | 'UNAVAILABLE_VERSION';
 declare class UpdaterError extends Error {
-    code: ErrorCode;
-    constructor(code: ErrorCode, info: string);
+    code: UpdaterErrorCode;
+    constructor(code: UpdaterErrorCode, info: string);
 }
 interface Logger {
     info: (msg: string) => void;
@@ -114,4 +114,4 @@ interface IProvider {
 }
 type URLHandler = (url: URL) => Promisable<URL | string | undefined | null>;
 
-export { type DownloadingInfo as D, type ErrorCode as E, type IProvider as I, type Logger as L, type OnDownloading as O, type UpdateInfoWithExtraVersion as U, type UnavailableCode as a, UpdaterError as b, type UpdaterOption as c, type UpdateJSONWithURL as d, type UpdateInfoWithURL as e, type URLHandler as f };
+export { type DownloadingInfo as D, type IProvider as I, type Logger as L, type OnDownloading as O, type UpdateInfoWithExtraVersion as U, type UpdaterUnavailableCode as a, UpdaterError as b, type UpdaterOption as c, type UpdateJSONWithURL as d, type UpdaterErrorCode as e, type UpdateInfoWithURL as f, type URLHandler as g };