electron-incremental-update 2.2.1 → 2.2.3

package/README.md

@@ -94,8 +94,8 @@ See all config in [types](#plugin)
 in `vite.config.mts`
 
 ```ts
-import { defineConfig } from 'vite'
 import { debugStartup, electronWithUpdater } from 'electron-incremental-update/vite'
+import { defineConfig } from 'vite'
 
 export default defineConfig(async ({ command }) => {
   const isBuild = command === 'build'
@@ -180,9 +180,9 @@ The update steps are similar to [electron-updater](https://github.com/electron-u
 in `electron/main/index.ts`
 
 ```ts
-import { UpdaterError, startupWithUpdater } from 'electron-incremental-update'
-import { getPathFromAppNameAsar, getVersions } from 'electron-incremental-update/utils'
 import { app } from 'electron'
+import { startupWithUpdater, UpdaterError } from 'electron-incremental-update'
+import { getPathFromAppNameAsar, getVersions } from 'electron-incremental-update/utils'
 
 export default startupWithUpdater((updater) => {
   await app.whenReady()
@@ -260,7 +260,7 @@ const plugin = electronWithUpdater({
         db: './electron/native/db.ts',
         img: './electron/native/img.ts',
       },
-      postBuild: async ({ copyToEntryOutputDir }) => {
+      postBuild: async ({ copyToEntryOutputDir, copyModules }) => {
         // for better-sqlite3
         copyToEntryOutputDir({
           from: './node_modules/better-sqlite3/build/Release/better_sqlite3.node',
@@ -273,6 +273,8 @@ const plugin = electronWithUpdater({
         copyToEntryOutputDir({
           from: `./node_modules/.pnpm/${fileName}/node_modules/@napi-rs/image-${archName}/image.${archName}.node`,
         })
+        // or just copy specific dependency
+        copyModules({ modules: ['better-sqlite3'] })
       },
     },
   },
@@ -470,6 +472,60 @@ function getPathFromEntryAsar(...paths: string[]): string
  * @param callback callback function
  */
 function handleUnexpectedErrors(callback: (err: unknown) => void): void
+/**
+ * Safe get value from header
+ * @param headers response header
+ * @param key target header key
+ */
+function getHeader(headers: Record<string, Arrayable<string>>, key: any): any
+function downloadUtil<T>(
+  url: string,
+  headers: Record<string, any>,
+  signal: AbortSignal,
+  onResponse: (
+    resp: IncomingMessage,
+    resolve: (data: T) => void,
+    reject: (e: any) => void
+  ) => void
+): Promise<T>
+/**
+ * Default function to download json and parse to UpdateJson
+ * @param url target url
+ * @param headers extra headers
+ * @param signal abort signal
+ * @param resolveData on resolve
+ */
+function defaultDownloadJSON<T>(
+  url: string,
+  headers: Record<string, any>,
+  signal: AbortSignal,
+  resolveData?: ResolveDataFn
+): Promise<T>
+/**
+ * Default function to download json and parse to UpdateJson
+ * @param url target url
+ * @param headers extra headers
+ * @param signal abort signal
+ */
+function defaultDownloadUpdateJSON(
+  url: string,
+  headers: Record<string, any>,
+  signal: AbortSignal
+): Promise<UpdateJSON>
+/**
+ * Default function to download asar buffer,
+ * get total size from `Content-Length` header
+ * @param url target url
+ * @param headers extra headers
+ * @param signal abort signal
+ * @param onDownloading on downloading callback
+ */
+function defaultDownloadAsar(
+  url: string,
+  headers: Record<string, any>,
+  signal: AbortSignal,
+  onDownloading?: (progress: DownloadingInfo) => void
+): Promise<Buffer>
 ```
 
 ### Types
@@ -923,15 +979,14 @@ export interface GeneratorOverrideFunctions {
     version: string
   ) => Promisable<string>
   /**
-   * Custom generate version json function
+   * Custom generate update json function
    * @param existingJson The existing JSON object.
    * @param buffer file buffer
    * @param signature generated signature
    * @param version current version
    * @param minVersion The minimum version
-   * @returns The updated version json
    */
-  generateVersionJson?: (
+  generateUpdateJson?: (
     existingJson: UpdateJSON,
     signature: string,
     version: string,

package/dist/{bytecode-7V24FFYI.js → bytecode-R2B4KTMV.js}

@@ -1,10 +1,10 @@
 import { readableSize } from './chunk-TPTWE33H.js';
-import { convertLiteral, bytecodeModuleLoaderCode, bytecodeModuleLoader, convertArrowFunctionAndTemplate, compileToBytecode, useStrict, toRelativePath } from './chunk-7JCGLFGU.js';
+import { convertLiteral, bytecodeModuleLoaderCode, bytecodeModuleLoader, convertArrowFunctionAndTemplate, compileToBytecode, useStrict, toRelativePath } from './chunk-LR7LR5WG.js';
 import { bytecodeLog, bytecodeId } from './chunk-5NKEXGI3.js';
-import path from 'node:path';
 import fs from 'node:fs';
-import { createFilter, normalizePath } from 'vite';
+import path from 'node:path';
 import MagicString from 'magic-string';
+import { createFilter, normalizePath } from 'vite';
 
 function getBytecodeLoaderBlock(chunkFileName) {
   return `require("${toRelativePath(bytecodeModuleLoader, normalizePath(chunkFileName))}");`;

package/dist/chunk-D7NXTCQW.js

@@ -0,0 +1,135 @@
+import { isUpdateJSON } from './chunk-AAAM44NW.js';
+import crypto from 'node:crypto';
+import electron from 'electron';
+import zlib from 'node:zlib';
+
+function hashBuffer(data, length) {
+  const hash = crypto.createHash("SHA256").update(data).digest("binary");
+  return Buffer.from(hash).subarray(0, length);
+}
+function aesEncrypt(plainText, key, iv) {
+  const cipher = crypto.createCipheriv("aes-256-cbc", key, iv);
+  return cipher.update(plainText, "utf8", "base64url") + cipher.final("base64url");
+}
+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));
+}
+function aesDecrypt(encryptedText, key, iv) {
+  const decipher = crypto.createDecipheriv("aes-256-cbc", key, iv);
+  return decipher.update(encryptedText, "base64url", "utf8") + decipher.final("utf8");
+}
+function defaultVerifySignature(buffer, version, signature, cert) {
+  try {
+    const [sig, ver] = aesDecrypt(signature, hashBuffer(cert, 32), hashBuffer(buffer, 16)).split("%");
+    if (ver !== version) {
+      return false;
+    }
+    return crypto.createVerify("RSA-SHA256").update(buffer).verify(cert, sig, "base64");
+  } catch {
+    return false;
+  }
+}
+function getHeader(headers, key) {
+  const value = headers[key];
+  if (Array.isArray(value)) {
+    return value.length === 0 ? null : value[value.length - 1];
+  } else {
+    return value;
+  }
+}
+async function downloadUtil(url, headers, signal, onResponse) {
+  await electron.app.whenReady();
+  return new Promise((resolve, reject) => {
+    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")));
+      onResponse(resp, resolve, reject);
+    });
+    request.on("error", reject);
+    request.end();
+  });
+}
+function trimData(data) {
+  return data.trim().slice(0, 5e3).replace(/\s+/g, " ");
+}
+var defaultResolveDataFn = (data, resolve, reject) => {
+  try {
+    resolve(JSON.parse(data));
+  } catch {
+    reject(new Error(`Invalid json, "${trimData(data)}"`));
+  }
+};
+async function defaultDownloadJSON(url, headers, signal, resolveData = defaultResolveDataFn) {
+  return await downloadUtil(
+    url,
+    headers,
+    signal,
+    (resp, resolve, reject) => {
+      let data = "";
+      resp.on("data", (chunk) => data += chunk);
+      resp.on("end", () => resolveData(data, resolve, reject));
+    }
+  );
+}
+async function defaultDownloadUpdateJSON(url, headers, signal) {
+  return await defaultDownloadJSON(
+    url,
+    headers,
+    signal,
+    (data, resolve, reject) => {
+      try {
+        const json = JSON.parse(data);
+        if (isUpdateJSON(json)) {
+          resolve(json);
+        } else {
+          throw Error;
+        }
+      } catch {
+        reject(new Error(`Invalid update json, "${trimData(data)}"`));
+      }
+    }
+  );
+}
+async function defaultDownloadAsar(url, headers, signal, onDownloading) {
+  let transferred = 0;
+  let time = Date.now();
+  return await downloadUtil(
+    url,
+    headers,
+    signal,
+    (resp, resolve) => {
+      const total = +getHeader(resp.headers, "content-length") || -1;
+      const data = [];
+      resp.on("data", (chunk) => {
+        const delta = chunk.length;
+        transferred += delta;
+        const current = Date.now();
+        onDownloading?.({
+          percent: total > 0 ? +(transferred / total).toFixed(2) * 100 : -1,
+          total,
+          transferred,
+          delta,
+          bps: delta / (current - time)
+        });
+        time = current;
+        data.push(chunk);
+      });
+      resp.on("end", () => resolve(Buffer.concat(data)));
+    }
+  );
+}
+async function defaultZipFile(buffer) {
+  return new Promise((resolve, reject) => {
+    zlib.brotliCompress(buffer, (err, buffer2) => err ? reject(err) : resolve(buffer2));
+  });
+}
+async function defaultUnzipFile(buffer) {
+  return new Promise((resolve, reject) => {
+    zlib.brotliDecompress(buffer, (err, buffer2) => err ? reject(err) : resolve(buffer2));
+  });
+}
+
+export { aesDecrypt, aesEncrypt, defaultDownloadAsar, defaultDownloadJSON, defaultDownloadUpdateJSON, defaultSignature, defaultUnzipFile, defaultVerifySignature, defaultZipFile, downloadUtil, getHeader, hashBuffer };

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

@@ -96,5 +96,16 @@ function handleUnexpectedErrors(callback) {
   process.on("uncaughtException", callback);
   process.on("unhandledRejection", callback);
 }
+function reloadOnPreloadScriptChanged() {
+  if (isDev) {
+    process.on("message", (msg) => {
+      if (msg === "electron-vite&type=hot-reload") {
+        for (const window of electron.BrowserWindow.getAllWindows()) {
+          window.reload();
+        }
+      }
+    });
+  }
+}
 
-export { beautifyDevTools, disableHWAccForWin7, getAppVersion, getEntryVersion, getPathFromAppNameAsar, getPathFromEntryAsar, getPathFromMain, getPathFromPreload, getPathFromPublic, handleUnexpectedErrors, importNative, isDev, isLinux, isMac, isWin, loadPage, requireNative, restartApp, setAppUserModelId, setPortableAppDataPath, singleInstance };
+export { beautifyDevTools, disableHWAccForWin7, getAppVersion, getEntryVersion, getPathFromAppNameAsar, getPathFromEntryAsar, getPathFromMain, getPathFromPreload, getPathFromPublic, handleUnexpectedErrors, importNative, isDev, isLinux, isMac, isWin, loadPage, reloadOnPreloadScriptChanged, requireNative, restartApp, setAppUserModelId, setPortableAppDataPath, singleInstance };

package/dist/{esm-UJAQJA65.js → esm-4S4XCVEW.js}

@@ -1,4 +1,4 @@
-import { electronMajorVersion } from './chunk-7JCGLFGU.js';
+import { electronMajorVersion } from './chunk-LR7LR5WG.js';
 import { esmId } from './chunk-5NKEXGI3.js';
 import MagicString from 'magic-string';
 

package/dist/index.cjs

@@ -1,15 +1,15 @@
 'use strict';
 
 var fs3 = require('fs');
-var events = require('events');
+var path2 = require('path');
 var electron = require('electron');
-var path = require('path');
+var events = require('events');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var fs3__default = /*#__PURE__*/_interopDefault(fs3);
+var path2__default = /*#__PURE__*/_interopDefault(path2);
 var electron__default = /*#__PURE__*/_interopDefault(electron);
-var path__default = /*#__PURE__*/_interopDefault(path);
 
 var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
   get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
@@ -17,18 +17,12 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   if (typeof require !== "undefined") return require.apply(this, arguments);
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
-
-// src/utils/version.ts
-var is = (j) => !!(j && j.minimumVersion && j.signature && j.version);
-function isUpdateJSON(json) {
-  return is(json) && is(json?.beta);
-}
 var isDev = __EIU_IS_DEV__;
 process.platform === "win32";
 process.platform === "darwin";
 process.platform === "linux";
 function getPathFromAppNameAsar(...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);
+  return isDev ? "DEV.asar" : path2__default.default.join(path2__default.default.dirname(electron__default.default.app.getAppPath()), `${electron__default.default.app.name}.asar`, ...paths);
 }
 function getAppVersion() {
   return isDev ? getEntryVersion() : fs3__default.default.readFileSync(getPathFromAppNameAsar("version"), "utf-8");
@@ -40,8 +34,11 @@ 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/utils/version.ts
+var is = (j) => !!(j && j.minimumVersion && j.signature && j.version);
+function isUpdateJSON(json) {
+  return is(json) && is(json?.beta);
 }
 
 // src/entry/types.ts
@@ -136,18 +133,19 @@ var Updater = class extends events.EventEmitter {
     if (!_data) {
       return emitUnavailable("Failed to get update info", "UNAVAILABLE_ERROR");
     }
-    const { signature, version, minimumVersion, url = "" } = this.receiveBeta ? _data.beta : _data;
+    const { signature, version, minimumVersion, url = "", ...rest } = this.receiveBeta ? _data.beta : _data;
     const info = { signature, minimumVersion, version, url };
     const extraVersionInfo = {
       signature,
       minimumVersion,
       version,
       appVersion: getAppVersion(),
-      entryVersion: getEntryVersion()
+      entryVersion: getEntryVersion(),
+      ...rest
     };
     this.logger?.debug(`Checked update, version: ${version}, signature: ${signature}`);
     if (isDev && !this.forceUpdate && !data) {
-      return emitUnavailable("Skip check update in dev mode. To force update, set `updater.forceUpdate` to true or call checkUpdate with UpdateJSON", "UNAVAILABLE_DEV", extraVersionInfo);
+      return emitUnavailable("Skip check update in dev mode. To force update, set `updater.forceUpdate` to true or call checkUpdate with UpdateJSON", "UNAVAILABLE_DEV");
     }
     const isLowerVersion = this.provider.isLowerVersion;
     try {
@@ -225,6 +223,8 @@ async function autoUpdate(updater) {
     updater.quitAndInstall();
   }
 }
+
+// src/entry/core.ts
 function startupWithUpdater(fn) {
   return fn;
 }
@@ -235,7 +235,7 @@ var defaultOnInstall = (install, _, __, logger) => {
 async function createElectronApp(appOptions = {}) {
   const appNameAsarPath = getPathFromAppNameAsar();
   const {
-    mainPath = getPathFromMain(__EIU_MAIN_FILE__),
+    mainPath = isDev ? path2__default.default.join(electron__default.default.app.getAppPath(), __EIU_ELECTRON_DIST_PATH__, "main", __EIU_MAIN_FILE__) : path2__default.default.join(path2__default.default.dirname(electron__default.default.app.getAppPath()), __EIU_ASAR_BASE_NAME__, "main", __EIU_MAIN_FILE__),
     updater,
     onInstall = defaultOnInstall,
     beforeStart,
@@ -256,7 +256,7 @@ async function createElectronApp(appOptions = {}) {
       __require(mainPath)(updaterInstance);
     }
   } catch (error) {
-    logger?.error("startup error", error);
+    logger?.error("startup error, exit", error);
     onStartError?.(error, logger);
     electron__default.default.app.quit();
   }

package/dist/index.d.cts

@@ -1,7 +1,7 @@
-import { EventEmitter } from 'node:events';
-import { U as UpdateInfo, a as UpdateJSON } from './version-BYVQ367i.cjs';
-import { I as IProvider, D as DownloadingInfo, U as UpdateJSONWithURL } from './types-C6lSLZWB.cjs';
 import { Promisable } from '@subframe7536/type-utils';
+import { I as IProvider, U as UpdateInfo, D as DownloadingInfo, a as UpdateJSON, b as UpdateJSONWithURL } from './types-C5M2xRjF.cjs';
+import { EventEmitter } from 'node:events';
+import 'node:url';
 
 type UpdaterErrorCode = 'ERR_DOWNLOAD' | 'ERR_VALIDATE' | 'ERR_PARAM' | 'ERR_NETWORK';
 type UpdaterUnavailableCode = 'UNAVAILABLE_ERROR' | 'UNAVAILABLE_DEV' | 'UNAVAILABLE_VERSION';
@@ -36,15 +36,23 @@ interface UpdaterOption {
      */
     logger?: Logger;
 }
+/**
+ * Update info with current app version and entry version
+ */
 type UpdateInfoWithExtraVersion = UpdateInfo & {
+    /**
+     * Current app version
+     */
     appVersion: string;
+    /**
+     * Current entry version
+     */
     entryVersion: string;
 };
 
-declare class Updater extends EventEmitter<{
-    'checking': any;
-    'update-available': [data: UpdateInfoWithExtraVersion];
-    'update-not-available': [code: UpdaterUnavailableCode, msg: string, info?: UpdateInfoWithExtraVersion];
+declare class Updater<T extends UpdateInfoWithExtraVersion = UpdateInfoWithExtraVersion> extends EventEmitter<{
+    'update-available': [data: T];
+    'update-not-available': [code: UpdaterUnavailableCode, msg: string, info?: T];
     'error': [error: UpdaterError];
     'download-progress': [info: DownloadingInfo];
     'update-downloaded': any;

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-import { EventEmitter } from 'node:events';
-import { U as UpdateInfo, a as UpdateJSON } from './version-BYVQ367i.js';
-import { I as IProvider, D as DownloadingInfo, U as UpdateJSONWithURL } from './types-nE_pIMPo.js';
 import { Promisable } from '@subframe7536/type-utils';
+import { I as IProvider, U as UpdateInfo, D as DownloadingInfo, a as UpdateJSON, b as UpdateJSONWithURL } from './types-C5M2xRjF.js';
+import { EventEmitter } from 'node:events';
+import 'node:url';
 
 type UpdaterErrorCode = 'ERR_DOWNLOAD' | 'ERR_VALIDATE' | 'ERR_PARAM' | 'ERR_NETWORK';
 type UpdaterUnavailableCode = 'UNAVAILABLE_ERROR' | 'UNAVAILABLE_DEV' | 'UNAVAILABLE_VERSION';
@@ -36,15 +36,23 @@ interface UpdaterOption {
      */
     logger?: Logger;
 }
+/**
+ * Update info with current app version and entry version
+ */
 type UpdateInfoWithExtraVersion = UpdateInfo & {
+    /**
+     * Current app version
+     */
     appVersion: string;
+    /**
+     * Current entry version
+     */
     entryVersion: string;
 };
 
-declare class Updater extends EventEmitter<{
-    'checking': any;
-    'update-available': [data: UpdateInfoWithExtraVersion];
-    'update-not-available': [code: UpdaterUnavailableCode, msg: string, info?: UpdateInfoWithExtraVersion];
+declare class Updater<T extends UpdateInfoWithExtraVersion = UpdateInfoWithExtraVersion> extends EventEmitter<{
+    'update-available': [data: T];
+    'update-not-available': [code: UpdaterUnavailableCode, msg: string, info?: T];
     'error': [error: UpdaterError];
     'download-progress': [info: DownloadingInfo];
     'update-downloaded': any;

package/dist/index.js

@@ -1,8 +1,9 @@
-import { isDev, getAppVersion, getEntryVersion, getPathFromAppNameAsar, restartApp, getPathFromMain } from './chunk-JI27JWJN.js';
+import { isDev, getAppVersion, getEntryVersion, getPathFromAppNameAsar, restartApp } from './chunk-YZGE4RFY.js';
 import { isUpdateJSON, __require } from './chunk-AAAM44NW.js';
 import fs2 from 'node:fs';
+import path from 'node:path';
+import electron2 from 'electron';
 import { EventEmitter } from 'node:events';
-import electron from 'electron';
 
 // src/entry/types.ts
 var UpdaterError = class extends Error {
@@ -66,7 +67,7 @@ var Updater = class extends 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(electron2.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) {
@@ -96,18 +97,19 @@ var Updater = class extends EventEmitter {
     if (!_data) {
       return emitUnavailable("Failed to get update info", "UNAVAILABLE_ERROR");
     }
-    const { signature, version, minimumVersion, url = "" } = this.receiveBeta ? _data.beta : _data;
+    const { signature, version, minimumVersion, url = "", ...rest } = this.receiveBeta ? _data.beta : _data;
     const info = { signature, minimumVersion, version, url };
     const extraVersionInfo = {
       signature,
       minimumVersion,
       version,
       appVersion: getAppVersion(),
-      entryVersion: getEntryVersion()
+      entryVersion: getEntryVersion(),
+      ...rest
     };
     this.logger?.debug(`Checked update, version: ${version}, signature: ${signature}`);
     if (isDev && !this.forceUpdate && !data) {
-      return emitUnavailable("Skip check update in dev mode. To force update, set `updater.forceUpdate` to true or call checkUpdate with UpdateJSON", "UNAVAILABLE_DEV", extraVersionInfo);
+      return emitUnavailable("Skip check update in dev mode. To force update, set `updater.forceUpdate` to true or call checkUpdate with UpdateJSON", "UNAVAILABLE_DEV");
     }
     const isLowerVersion = this.provider.isLowerVersion;
     try {
@@ -185,6 +187,8 @@ async function autoUpdate(updater) {
     updater.quitAndInstall();
   }
 }
+
+// src/entry/core.ts
 function startupWithUpdater(fn) {
   return fn;
 }
@@ -195,7 +199,7 @@ var defaultOnInstall = (install, _, __, logger) => {
 async function createElectronApp(appOptions = {}) {
   const appNameAsarPath = getPathFromAppNameAsar();
   const {
-    mainPath = getPathFromMain(__EIU_MAIN_FILE__),
+    mainPath = isDev ? path.join(electron2.app.getAppPath(), __EIU_ELECTRON_DIST_PATH__, "main", __EIU_MAIN_FILE__) : path.join(path.dirname(electron2.app.getAppPath()), __EIU_ASAR_BASE_NAME__, "main", __EIU_MAIN_FILE__),
     updater,
     onInstall = defaultOnInstall,
     beforeStart,
@@ -216,9 +220,9 @@ async function createElectronApp(appOptions = {}) {
       __require(mainPath)(updaterInstance);
     }
   } catch (error) {
-    logger?.error("startup error", error);
+    logger?.error("startup error, exit", error);
     onStartError?.(error, logger);
-    electron.app.quit();
+    electron2.app.quit();
   }
 }
 var initApp = createElectronApp;