electron-incremental-update 0.8.4 → 0.8.6

package/dist/chunk-MFFH2NRM.mjs

@@ -0,0 +1,118 @@
+import {
+  __require
+} from "./chunk-CMBFI77K.mjs";
+
+// src/utils/core.ts
+import { readFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { release } from "node:os";
+import { app } from "electron";
+function getAppInfo() {
+  return {
+    dev: !app.isPackaged,
+    win: process.platform === "win32",
+    mac: process.platform === "darwin",
+    linux: process.platform === "linux",
+    electronVersion: getElectronVersion(),
+    system: release(),
+    locale: app.isReady() ? app.getLocale() : void 0
+  };
+}
+function getProductAsarPath(name) {
+  return !app.isPackaged ? "DEV.asar" : join(dirname(app.getAppPath()), `${name}.asar`);
+}
+function getElectronVersion() {
+  return app.getVersion();
+}
+function getAppVersion(name) {
+  return app.isPackaged ? readFileSync(join(getProductAsarPath(name), "version"), "utf-8") : getElectronVersion();
+}
+var NoSuchNativeModuleError = class extends Error {
+  moduleName;
+  constructor(moduleName) {
+    super(`no such native module: ${moduleName}`);
+    this.moduleName = moduleName;
+  }
+};
+function isNoSuchNativeModuleError(e) {
+  return e instanceof NoSuchNativeModuleError;
+}
+function requireNative(packageName) {
+  const path = app.isPackaged ? join(app.getAppPath(), "node_modules", packageName) : packageName;
+  try {
+    return __require(path);
+  } catch (error) {
+    return new NoSuchNativeModuleError(packageName);
+  }
+}
+function parseGithubCdnURL(repository, cdnPrefix, relativeFilePath) {
+  if (!repository.startsWith("https://github.com/")) {
+    throw new Error("url must start with https://github.com/");
+  }
+  repository = repository.trim().replace(/\/?$/, "/").trim();
+  relativeFilePath = relativeFilePath.trim().replace(/^\/|\/?$/g, "").trim();
+  cdnPrefix = cdnPrefix.trim().replace(/^\/?|\/?$/g, "").trim();
+  return repository.replace("github.com", cdnPrefix) + relativeFilePath;
+}
+function getGithubFileCdnGroup() {
+  return [
+    { cdnPrefix: "cdn.jsdelivr.net/gh", source: "jsdelivr" },
+    { cdnPrefix: "fastly.jsdelivr.net/gh", source: "jsdelivr-fastly" },
+    { cdnPrefix: "cdn.statically.io/gh", source: "statically" },
+    { cdnPrefix: "rawcdn.githack.com/gh", source: "githack" },
+    { cdnPrefix: "raw.githack.com/gh", source: "githack-dev" }
+  ];
+}
+function getGithubReleaseCdnGroup() {
+  return [
+    { cdnPrefix: "gh.gh2233.ml", source: "@X.I.U/XIU2" },
+    { cdnPrefix: "ghproxy.com", source: "gh-proxy" },
+    { cdnPrefix: "gh.ddlc.top", source: "@mtr-static-official" },
+    { cdnPrefix: "ghdl.feizhuqwq.cf", source: "feizhuqwq.com" },
+    { cdnPrefix: "slink.ltd", source: "\u77E5\u4E86\u5C0F\u7AD9" },
+    { cdnPrefix: "git.xfj0.cn", source: "anonymous1" },
+    { cdnPrefix: "gh.con.sh", source: "anonymous2" },
+    { cdnPrefix: "ghps.cc", source: "anonymous3" },
+    { cdnPrefix: "cors.isteed.cc/github.com", source: "Lufs's" },
+    { cdnPrefix: "hub.gitmirror.com", source: "GitMirror" },
+    { cdnPrefix: "js.xxooo.ml", source: "\u996D\u592A\u786C" },
+    { cdnPrefix: "download.njuu.cf", source: "LibraryCloud-njuu" },
+    { cdnPrefix: "download.yzuu.cf", source: "LibraryCloud-yzuu" },
+    { cdnPrefix: "download.nuaa.cf", source: "LibraryCloud-nuaa" }
+  ];
+}
+function restartApp() {
+  app.relaunch();
+  app.quit();
+}
+function waitAppReady(duration = 1e3) {
+  return new Promise((resolve, reject) => {
+    const timeout = setTimeout(() => {
+      reject(new Error("app is not ready"));
+    }, duration);
+    app.whenReady().then(() => {
+      clearTimeout(timeout);
+      resolve();
+    });
+  });
+}
+function handleUnexpectedErrors(callback) {
+  process.on("uncaughtException", callback);
+  process.on("unhandledRejection", callback);
+}
+
+export {
+  getAppInfo,
+  getProductAsarPath,
+  getElectronVersion,
+  getAppVersion,
+  NoSuchNativeModuleError,
+  isNoSuchNativeModuleError,
+  requireNative,
+  parseGithubCdnURL,
+  getGithubFileCdnGroup,
+  getGithubReleaseCdnGroup,
+  restartApp,
+  waitAppReady,
+  handleUnexpectedErrors
+};

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { UpdateJSON } from './updateJson.mjs';
+import { U as UpdateJSON } from './updateJson-7e45d9e1.js';
 
 declare class MinimumVersionError extends Error {
     currentVersion: string;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { UpdateJSON } from './updateJson.js';
+import { U as UpdateJSON } from './updateJson-7e45d9e1.js';
 
 declare class MinimumVersionError extends Error {
     currentVersion: string;

package/dist/index.js

@@ -36,59 +36,40 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_node_path2 = require("path");
-var import_node_fs3 = require("fs");
+var import_node_fs4 = require("fs");
 var import_electron3 = __toESM(require("electron"));
 
 // src/updater/index.ts
-var import_node_fs2 = require("fs");
+var import_node_fs3 = require("fs");
 var import_promises = require("fs/promises");
 
-// src/utils.ts
+// src/utils/core.ts
 var import_node_fs = require("fs");
 var import_node_path = require("path");
-var import_node_zlib = require("zlib");
-var import_electron = __toESM(require("electron"));
-var info = {
-  dev: !import_electron.default.app?.isPackaged,
-  platform: process.platform === "win32" ? "win" : process.platform === "darwin" ? "mac" : "linux",
-  appPath: import_electron.default.app?.getAppPath()
-};
+var import_node_os = require("os");
+var import_electron = require("electron");
 function getProductAsarPath(name) {
-  return info.dev ? "dev.asar" : (0, import_node_path.join)((0, import_node_path.dirname)(info.appPath), `${name}.asar`);
+  return !import_electron.app.isPackaged ? "DEV.asar" : (0, import_node_path.join)((0, import_node_path.dirname)(import_electron.app.getAppPath()), `${name}.asar`);
 }
-function getEntryVersion() {
-  return import_electron.default.app.getVersion();
+function getElectronVersion() {
+  return import_electron.app.getVersion();
 }
-function getProductVersion(name) {
-  return info.dev ? getEntryVersion() : (0, import_node_fs.readFileSync)((0, import_node_path.join)(getProductAsarPath(name), "version"), "utf-8");
+function getAppVersion(name) {
+  return import_electron.app.isPackaged ? (0, import_node_fs.readFileSync)((0, import_node_path.join)(getProductAsarPath(name), "version"), "utf-8") : getElectronVersion();
 }
 function waitAppReady(duration = 1e3) {
   return new Promise((resolve2, reject) => {
     const timeout = setTimeout(() => {
       reject(new Error("app is not ready"));
     }, duration);
-    import_electron.default.app.whenReady().then(() => {
+    import_electron.app.whenReady().then(() => {
       clearTimeout(timeout);
       resolve2();
     });
   });
 }
-async function unzipFile(gzipPath, targetFilePath = gzipPath.slice(0, -3)) {
-  if (!(0, import_node_fs.existsSync)(gzipPath)) {
-    throw new Error(`path to zipped file not exist: ${gzipPath}`);
-  }
-  const compressedBuffer = (0, import_node_fs.readFileSync)(gzipPath);
-  return new Promise((resolve2, reject) => {
-    (0, import_node_zlib.gunzip)(compressedBuffer, (err, buffer) => {
-      (0, import_node_fs.rmSync)(gzipPath);
-      if (err) {
-        reject(err);
-      }
-      (0, import_node_fs.writeFileSync)(targetFilePath, buffer);
-      resolve2(null);
-    });
-  });
-}
+
+// src/utils/version.ts
 function parseVersion(version) {
   const semver = /^(\d+)\.(\d+)\.(\d+)(?:-([a-zA-Z0-9\.-]+))?/i;
   const match = semver.exec(version);
@@ -114,6 +95,26 @@ function parseVersion(version) {
   return ret;
 }
 
+// src/utils/zip.ts
+var import_node_fs2 = require("fs");
+var import_node_zlib = require("zlib");
+async function unzipFile(gzipPath, targetFilePath = gzipPath.slice(0, -3)) {
+  if (!(0, import_node_fs2.existsSync)(gzipPath)) {
+    throw new Error(`path to zipped file not exist: ${gzipPath}`);
+  }
+  const compressedBuffer = (0, import_node_fs2.readFileSync)(gzipPath);
+  return new Promise((resolve2, reject) => {
+    (0, import_node_zlib.gunzip)(compressedBuffer, (err, buffer) => {
+      (0, import_node_fs2.rmSync)(gzipPath);
+      if (err) {
+        reject(err);
+      }
+      (0, import_node_fs2.writeFileSync)(targetFilePath, buffer);
+      resolve2(null);
+    });
+  });
+}
+
 // src/crypto.ts
 var import_node_crypto = require("crypto");
 function decrypt(encryptedText, key2, iv) {
@@ -168,11 +169,11 @@ var DownloadError = class extends Error {
 };
 
 // src/updater/defaultFunctions.ts
-var import_electron2 = __toESM(require("electron"));
+var import_electron2 = require("electron");
 var downloadJSONDefault = async (url, headers) => {
   await waitAppReady();
   return new Promise((resolve2, reject) => {
-    const request = import_electron2.default.net.request({
+    const request = import_electron2.net.request({
       url,
       method: "GET",
       redirect: "follow"
@@ -206,7 +207,7 @@ var downloadBufferDefault = async (url, headers, total, onDownloading) => {
   await waitAppReady();
   let current = 0;
   return new Promise((resolve2, reject) => {
-    const request = import_electron2.default.net.request({
+    const request = import_electron2.net.request({
       url,
       method: "GET",
       redirect: "follow"
@@ -284,8 +285,8 @@ var IncrementalUpdater = class {
   }
   async needUpdate(version, minVersion) {
     const compare = this.option.overrideFunctions?.compareVersion ?? compareVersionDefault;
-    const productVersion = getProductVersion(this.option.productName);
-    const entryVersion = getEntryVersion();
+    const productVersion = getAppVersion(this.option.productName);
+    const entryVersion = getElectronVersion();
     if (await compare(entryVersion, minVersion)) {
       throw new MinimumVersionError(entryVersion, minVersion);
     }
@@ -293,11 +294,11 @@ var IncrementalUpdater = class {
     return await compare(productVersion, version);
   }
   async parseData(format, data) {
-    if ((0, import_node_fs2.existsSync)(this.tmpFilePath)) {
+    if ((0, import_node_fs3.existsSync)(this.tmpFilePath)) {
       this.logger?.warn(`remove tmp file: ${this.tmpFilePath}`);
       await (0, import_promises.rm)(this.tmpFilePath);
     }
-    if ((0, import_node_fs2.existsSync)(this.gzipPath)) {
+    if ((0, import_node_fs3.existsSync)(this.gzipPath)) {
       this.logger?.warn(`remove .gz file: ${this.gzipPath}`);
       await (0, import_promises.rm)(this.gzipPath);
     }
@@ -427,9 +428,9 @@ function initApp(appOptions) {
     try {
       const asarPath = getProductAsarPath(updater.productName);
       const updateAsarPath = `${asarPath}.tmp`;
-      if ((0, import_node_fs3.existsSync)(updateAsarPath)) {
+      if ((0, import_node_fs4.existsSync)(updateAsarPath)) {
         await beforeDoUpdate?.(asarPath, updateAsarPath);
-        (0, import_node_fs3.renameSync)(updateAsarPath, asarPath);
+        (0, import_node_fs4.renameSync)(updateAsarPath, asarPath);
       }
       const mainDir = import_electron3.default.app.isPackaged ? asarPath : electronDevDistPath;
       const entry = (0, import_node_path2.resolve)(__dirname, mainDir, mainPath);

package/dist/index.mjs

@@ -1,25 +1,23 @@
 import {
+  isUpdateJSON,
   verify
-} from "./chunk-GXZSAUBR.mjs";
+} from "./chunk-5BZLJPHJ.mjs";
 import {
-  getEntryVersion,
+  getAppVersion,
+  getElectronVersion,
   getProductAsarPath,
-  getProductVersion,
-  parseVersion,
-  unzipFile,
   waitAppReady
-} from "./chunk-CR6HTU6P.mjs";
-import {
-  isUpdateJSON
-} from "./chunk-2JVXVTC5.mjs";
+} from "./chunk-MFFH2NRM.mjs";
 import {
-  __require
-} from "./chunk-ZFXKCRJC.mjs";
+  __require,
+  parseVersion,
+  unzipFile
+} from "./chunk-CMBFI77K.mjs";
 
 // src/index.ts
 import { resolve } from "node:path";
 import { existsSync as existsSync2, renameSync } from "node:fs";
-import Electron2 from "electron";
+import Electron from "electron";
 
 // src/updater/index.ts
 import { existsSync } from "node:fs";
@@ -51,11 +49,11 @@ var DownloadError = class extends Error {
 };
 
 // src/updater/defaultFunctions.ts
-import Electron from "electron";
+import { net } from "electron";
 var downloadJSONDefault = async (url, headers) => {
   await waitAppReady();
   return new Promise((resolve2, reject) => {
-    const request = Electron.net.request({
+    const request = net.request({
       url,
       method: "GET",
       redirect: "follow"
@@ -89,7 +87,7 @@ var downloadBufferDefault = async (url, headers, total, onDownloading) => {
   await waitAppReady();
   let current = 0;
   return new Promise((resolve2, reject) => {
-    const request = Electron.net.request({
+    const request = net.request({
       url,
       method: "GET",
       redirect: "follow"
@@ -167,8 +165,8 @@ var IncrementalUpdater = class {
   }
   async needUpdate(version, minVersion) {
     const compare = this.option.overrideFunctions?.compareVersion ?? compareVersionDefault;
-    const productVersion = getProductVersion(this.option.productName);
-    const entryVersion = getEntryVersion();
+    const productVersion = getAppVersion(this.option.productName);
+    const entryVersion = getElectronVersion();
     if (await compare(entryVersion, minVersion)) {
       throw new MinimumVersionError(entryVersion, minVersion);
     }
@@ -304,7 +302,7 @@ function initApp(appOptions) {
   } = hooks || {};
   function handleError(msg) {
     onStartError?.(new Error(msg));
-    Electron2.app.quit();
+    Electron.app.quit();
   }
   async function startup(updater) {
     try {
@@ -314,7 +312,7 @@ function initApp(appOptions) {
         await beforeDoUpdate?.(asarPath, updateAsarPath);
         renameSync(updateAsarPath, asarPath);
       }
-      const mainDir = Electron2.app.isPackaged ? asarPath : electronDevDistPath;
+      const mainDir = Electron.app.isPackaged ? asarPath : electronDevDistPath;
       const entry = resolve(__dirname, mainDir, mainPath);
       await beforeStart?.(entry);
       __require(entry)(updater);

package/dist/{updateJson.d.mts → updateJson-7e45d9e1.d.ts}

@@ -7,6 +7,5 @@ type UpdateInfo = {
 type UpdateJSON = UpdateInfo & {
     beta: UpdateInfo;
 };
-declare function isUpdateJSON(json: any): json is UpdateJSON;
 
-export { UpdateInfo, UpdateJSON, isUpdateJSON };
+export { UpdateJSON as U };

package/dist/utils.d.mts

@@ -1,36 +1,49 @@
 type Info = {
     dev: boolean;
-    platform: 'win' | 'mac' | 'linux';
-    appPath: string;
+    win: boolean;
+    mac: boolean;
+    linux: boolean;
+    electronVersion: string;
+    /**
+     * `os.release()`
+     */
+    system: string;
+    /**
+     * system locale, `undefined` when `!app.isReady()`
+     */
+    locale: string | undefined;
 };
-declare const info: Info;
 /**
- * get the application asar absolute path
+ * get app info
+ */
+declare function getAppInfo(): Info;
+/**
+ * get the application asar absolute path (not `app.asar`),
+ * if is in dev, return `'DEV.asar'`
  * @param name The name of the application
- * @todo support v8 bytecode
  */
 declare function getProductAsarPath(name: string): string;
 /**
- * get the version of entry (app.asar)
+ * get the version of Electron runtime
  */
-declare function getEntryVersion(): string;
+declare function getElectronVersion(): string;
 /**
  * get the version of application (name.asar)
  *
- * if is dev, return {@link getEntryVersion}
+ * if is dev, return {@link getElectronVersion}
  * @param name - The name of the application
  */
-declare function getProductVersion(name: string): string;
+declare function getAppVersion(name: string): string;
 declare class NoSuchNativeModuleError extends Error {
     moduleName: string;
     constructor(moduleName: string);
 }
+declare function isNoSuchNativeModuleError(e: unknown): e is NoSuchNativeModuleError;
 /**
- * require native package from app.asar
+ * require native package, if not found, return {@link NoSuchNativeModuleError}
  * @param packageName native package name
- * @throws error: {@link NoSuchNativeModuleError}
  */
-declare function requireNative<T = any>(packageName: string): T;
+declare function requireNative<T = any>(packageName: string): T | NoSuchNativeModuleError;
 /**
  * parse Github CDN URL for accelerating the speed of downloading
  */
@@ -57,9 +70,8 @@ declare function restartApp(): void;
  * ensure app is ready.
  */
 declare function waitAppReady(duration?: number): Promise<void>;
-declare function unzipFile(gzipPath: string, targetFilePath?: string): Promise<unknown>;
-declare function zipFile(filePath: string, targetFilePath?: string): Promise<unknown>;
-declare function handleUnexpectedErrors(callback: (err: Error) => void): void;
+declare function handleUnexpectedErrors(callback: (err: unknown) => void): void;
+
 interface Version {
     major: number;
     minor: number;
@@ -69,4 +81,7 @@ interface Version {
 }
 declare function parseVersion(version: string): Version;
 
-export { NoSuchNativeModuleError, Version, getEntryVersion, getGithubFileCdnGroup, getGithubReleaseCdnGroup, getProductAsarPath, getProductVersion, handleUnexpectedErrors, info, parseGithubCdnURL, parseVersion, requireNative, restartApp, unzipFile, waitAppReady, zipFile };
+declare function unzipFile(gzipPath: string, targetFilePath?: string): Promise<unknown>;
+declare function zipFile(filePath: string, targetFilePath?: string): Promise<unknown>;
+
+export { NoSuchNativeModuleError, Version, getAppInfo, getAppVersion, getElectronVersion, getGithubFileCdnGroup, getGithubReleaseCdnGroup, getProductAsarPath, handleUnexpectedErrors, isNoSuchNativeModuleError, parseGithubCdnURL, parseVersion, requireNative, restartApp, unzipFile, waitAppReady, zipFile };

package/dist/utils.d.ts

@@ -1,36 +1,49 @@
 type Info = {
     dev: boolean;
-    platform: 'win' | 'mac' | 'linux';
-    appPath: string;
+    win: boolean;
+    mac: boolean;
+    linux: boolean;
+    electronVersion: string;
+    /**
+     * `os.release()`
+     */
+    system: string;
+    /**
+     * system locale, `undefined` when `!app.isReady()`
+     */
+    locale: string | undefined;
 };
-declare const info: Info;
 /**
- * get the application asar absolute path
+ * get app info
+ */
+declare function getAppInfo(): Info;
+/**
+ * get the application asar absolute path (not `app.asar`),
+ * if is in dev, return `'DEV.asar'`
  * @param name The name of the application
- * @todo support v8 bytecode
  */
 declare function getProductAsarPath(name: string): string;
 /**
- * get the version of entry (app.asar)
+ * get the version of Electron runtime
  */
-declare function getEntryVersion(): string;
+declare function getElectronVersion(): string;
 /**
  * get the version of application (name.asar)
  *
- * if is dev, return {@link getEntryVersion}
+ * if is dev, return {@link getElectronVersion}
  * @param name - The name of the application
  */
-declare function getProductVersion(name: string): string;
+declare function getAppVersion(name: string): string;
 declare class NoSuchNativeModuleError extends Error {
     moduleName: string;
     constructor(moduleName: string);
 }
+declare function isNoSuchNativeModuleError(e: unknown): e is NoSuchNativeModuleError;
 /**
- * require native package from app.asar
+ * require native package, if not found, return {@link NoSuchNativeModuleError}
  * @param packageName native package name
- * @throws error: {@link NoSuchNativeModuleError}
  */
-declare function requireNative<T = any>(packageName: string): T;
+declare function requireNative<T = any>(packageName: string): T | NoSuchNativeModuleError;
 /**
  * parse Github CDN URL for accelerating the speed of downloading
  */
@@ -57,9 +70,8 @@ declare function restartApp(): void;
  * ensure app is ready.
  */
 declare function waitAppReady(duration?: number): Promise<void>;
-declare function unzipFile(gzipPath: string, targetFilePath?: string): Promise<unknown>;
-declare function zipFile(filePath: string, targetFilePath?: string): Promise<unknown>;
-declare function handleUnexpectedErrors(callback: (err: Error) => void): void;
+declare function handleUnexpectedErrors(callback: (err: unknown) => void): void;
+
 interface Version {
     major: number;
     minor: number;
@@ -69,4 +81,7 @@ interface Version {
 }
 declare function parseVersion(version: string): Version;
 
-export { NoSuchNativeModuleError, Version, getEntryVersion, getGithubFileCdnGroup, getGithubReleaseCdnGroup, getProductAsarPath, getProductVersion, handleUnexpectedErrors, info, parseGithubCdnURL, parseVersion, requireNative, restartApp, unzipFile, waitAppReady, zipFile };
+declare function unzipFile(gzipPath: string, targetFilePath?: string): Promise<unknown>;
+declare function zipFile(filePath: string, targetFilePath?: string): Promise<unknown>;
+
+export { NoSuchNativeModuleError, Version, getAppInfo, getAppVersion, getElectronVersion, getGithubFileCdnGroup, getGithubReleaseCdnGroup, getProductAsarPath, handleUnexpectedErrors, isNoSuchNativeModuleError, parseGithubCdnURL, parseVersion, requireNative, restartApp, unzipFile, waitAppReady, zipFile };