electron-incremental-update 0.7.8 → 0.7.10

package/dist/index.js

@@ -20,6 +20,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
+  DownloadError: () => DownloadError,
+  IncrementalUpdater: () => IncrementalUpdater,
   MinimumVersionError: () => MinimumVersionError,
   VerifyFailedError: () => VerifyFailedError,
   createUpdater: () => createUpdater,
@@ -31,34 +33,10 @@ var import_node_fs3 = require("fs");
 var import_electron3 = require("electron");
 
 // src/updater/index.ts
-var import_node_events = require("events");
-var import_node_buffer3 = require("buffer");
 var import_node_fs2 = require("fs");
+var import_node_buffer3 = require("buffer");
 var import_promises = require("fs/promises");
 
-// src/crypto.ts
-var import_node_crypto = require("crypto");
-var import_node_buffer = require("buffer");
-function decrypt(encryptedText, key2, iv) {
-  const decipher = (0, import_node_crypto.createDecipheriv)("aes-256-cbc", key2, iv);
-  let decrypted = decipher.update(encryptedText, "base64url", "utf8");
-  decrypted += decipher.final("utf8");
-  return decrypted;
-}
-function key(data, length) {
-  const hash = (0, import_node_crypto.createHash)("SHA256").update(data).digest("binary");
-  return import_node_buffer.Buffer.from(hash).subarray(0, length);
-}
-var verify = (buffer, signature, cert) => {
-  try {
-    const [sig, version] = decrypt(signature, key(cert, 32), key(buffer, 16)).split("%");
-    const result = (0, import_node_crypto.createVerify)("RSA-SHA256").update(buffer).verify(cert, sig, "base64");
-    return result ? version : false;
-  } catch (error) {
-    return false;
-  }
-};
-
 // src/utils.ts
 var import_node_fs = require("fs");
 var import_node_path = require("path");
@@ -80,11 +58,11 @@ function waitAppReady(duration = 1e3) {
     }, duration);
     import_electron.app.whenReady().then(() => {
       clearTimeout(timeout);
-      resolve2(null);
+      resolve2();
     });
   });
 }
-async function unzipFile(gzipPath, targetFilePath) {
+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}`);
   }
@@ -107,12 +85,47 @@ function parseVersion(version) {
     throw new TypeError(`invalid version: ${version}`);
   }
   const [major, minor, patch] = match.slice(1, 4).map(Number);
-  if (isNaN(major) || isNaN(minor) || isNaN(patch)) {
+  const ret = {
+    major,
+    minor,
+    patch,
+    stage: "",
+    stageVersion: -1
+  };
+  if (match[4]) {
+    let [stage, _v] = match[4].split(".");
+    ret.stage = stage;
+    ret.stageVersion = Number(_v) || -1;
+  }
+  if (isNaN(major) || isNaN(minor) || isNaN(patch) || isNaN(ret.stageVersion)) {
     throw new TypeError(`invalid version: ${version}`);
   }
-  return { major, minor, patch, stage: match[4] };
+  return ret;
 }
 
+// src/crypto.ts
+var import_node_crypto = require("crypto");
+var import_node_buffer = require("buffer");
+function decrypt(encryptedText, key2, iv) {
+  const decipher = (0, import_node_crypto.createDecipheriv)("aes-256-cbc", key2, iv);
+  let decrypted = decipher.update(encryptedText, "base64url", "utf8");
+  decrypted += decipher.final("utf8");
+  return decrypted;
+}
+function key(data, length) {
+  const hash = (0, import_node_crypto.createHash)("SHA256").update(data).digest("binary");
+  return import_node_buffer.Buffer.from(hash).subarray(0, length);
+}
+var verify = (buffer, signature, cert) => {
+  try {
+    const [sig, version] = decrypt(signature, key(cert, 32), key(buffer, 16)).split("%");
+    const result = (0, import_node_crypto.createVerify)("RSA-SHA256").update(buffer).verify(cert, sig, "base64");
+    return result ? version : false;
+  } catch (error) {
+    return false;
+  }
+};
+
 // src/updateJson.ts
 function isUpdateJSON(json) {
   const is = (j) => "signature" in j && "version" in j && "size" in j && "minimumVersion" in j;
@@ -122,7 +135,7 @@ function isUpdateJSON(json) {
 // src/updater/defaultFunctions.ts
 var import_node_buffer2 = require("buffer");
 var import_electron2 = require("electron");
-async function downloadJSONDefault(url, updater, headers) {
+var downloadJSONDefault = async (url, headers) => {
   await waitAppReady();
   return new Promise((resolve2, reject) => {
     const request = import_electron2.net.request({
@@ -154,10 +167,10 @@ async function downloadJSONDefault(url, updater, headers) {
     });
     request.end();
   });
-}
-async function downloadBufferDefault(url, updater, headers) {
+};
+var downloadBufferDefault = async (url, headers, total, onDownloading) => {
   await waitAppReady();
-  let progress = 0;
+  let current = 0;
   return new Promise((resolve2, reject) => {
     const request = import_electron2.net.request({
       url,
@@ -170,8 +183,12 @@ async function downloadBufferDefault(url, updater, headers) {
     request.on("response", (res) => {
       let data = [];
       res.on("data", (chunk) => {
-        progress += chunk.length;
-        updater.emit("downloading", progress);
+        current += chunk.length;
+        onDownloading?.({
+          percent: `${+(current / total).toFixed(2) * 100}%`,
+          total,
+          current
+        });
         data.push(chunk);
       });
       res.on("end", () => {
@@ -182,15 +199,24 @@ async function downloadBufferDefault(url, updater, headers) {
     });
     request.end();
   });
-}
-var compareVersionDefault = (oldVersion, newVersion) => {
-  const oldV = parseVersion(oldVersion);
-  const newV = parseVersion(newVersion);
-  if (oldV.major < newV.major || oldV.major === newV.major && oldV.minor < newV.minor || oldV.major === newV.major && oldV.minor === newV.minor && oldV.patch < newV.patch) {
-    return true;
+};
+var compareVersionDefault = (version1, version2) => {
+  const oldV = parseVersion(version1);
+  const newV = parseVersion(version2);
+  function compareStrings(str1, str2) {
+    if (str1 === "") {
+      return str2 !== "";
+    } else if (str2 === "") {
+      return true;
+    }
+    return str1 < str2;
   }
-  if (oldV.stage < newV.stage || !newV.stage && oldV.stage) {
-    return true;
+  for (let key2 of Object.keys(oldV)) {
+    if (key2 === "stage" && compareStrings(oldV[key2], newV[key2])) {
+      return true;
+    } else if (oldV[key2] !== newV[key2]) {
+      return oldV[key2] < newV[key2];
+    }
   }
   return false;
 };
@@ -214,158 +240,160 @@ var VerifyFailedError = class extends Error {
     this.cert = cert;
   }
 };
-function createUpdater(updaterOptions) {
-  const {
-    SIGNATURE_CERT,
-    repository,
-    productName,
-    releaseAsarURL: _release,
-    updateJsonURL: _update,
-    debug = false,
-    receiveBeta = false,
-    downloadConfig: { extraHeader, userAgent } = {},
-    overrideFunctions: {
-      compareVersion,
-      verifySignaure,
-      downloadBuffer,
-      downloadJSON
-    } = {}
-  } = updaterOptions;
-  const updater = new import_node_events.EventEmitter();
-  let signature;
-  let version;
-  const asarPath = getProductAsarPath(productName);
-  const gzipPath = `${asarPath}.gz`;
-  const tmpFilePath = `${asarPath}.tmp`;
-  function log(msg) {
-    debug && updater.emit("debug", msg);
+var DownloadError = class extends Error {
+  constructor() {
+    super("download update error");
+  }
+};
+var IncrementalUpdater = class {
+  info;
+  option;
+  asarPath;
+  gzipPath;
+  tmpFilePath;
+  logger;
+  onDownloading;
+  get productName() {
+    return this.option.productName;
+  }
+  set productName(name) {
+    this.option.productName = name;
   }
-  async function needUpdate(version2, minVersion) {
-    const compare = compareVersion ?? compareVersionDefault;
-    const productVersion = getProductVersion(productName);
+  get receiveBeta() {
+    return !!this.option.receiveBeta;
+  }
+  set receiveBeta(receiveBeta) {
+    this.option.receiveBeta = receiveBeta;
+  }
+  constructor(option) {
+    this.option = option;
+    this.asarPath = getProductAsarPath(this.productName);
+    this.gzipPath = `${this.asarPath}.gz`;
+    this.tmpFilePath = `${this.asarPath}.tmp`;
+  }
+  async needUpdate(version, minVersion) {
+    const compare = this.option.overrideFunctions?.compareVersion ?? compareVersionDefault;
+    const productVersion = getProductVersion(this.option.productName);
     const entryVersion = getEntryVersion();
     if (await compare(entryVersion, minVersion)) {
       throw new MinimumVersionError(entryVersion, minVersion);
     }
-    log(`check update: current version is ${productVersion}, new version is ${version2}`);
-    return await compare(productVersion, version2);
+    this.logger?.info(`check update: current version is ${productVersion}, new version is ${version}`);
+    return await compare(productVersion, version);
   }
-  async function parseData(format, data, version2) {
-    if ((0, import_node_fs2.existsSync)(tmpFilePath)) {
-      log(`remove tmp file: ${tmpFilePath}`);
-      await (0, import_promises.rm)(tmpFilePath);
+  async parseData(format, data) {
+    if ((0, import_node_fs2.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)) {
+      this.logger?.warn(`remove .gz file: ${this.gzipPath}`);
+      await (0, import_promises.rm)(this.gzipPath);
+    }
+    if (!["string", "object", "undefined"].includes(typeof data)) {
+      throw new TypeError(`invalid type at format '${format}': ${data}`);
     }
-    if ((0, import_node_fs2.existsSync)(gzipPath)) {
-      log(`remove .gz file: ${gzipPath}`);
-      await (0, import_promises.rm)(gzipPath);
+    if (typeof data === "object" && (format === "json" && isUpdateJSON(data) || format === "buffer" && import_node_buffer3.Buffer.isBuffer(data))) {
+      return data;
     }
     if (typeof data === "object") {
-      if (format === "json" && isUpdateJSON(data) || format === "buffer" && import_node_buffer3.Buffer.isBuffer(data)) {
-        return data;
-      } else {
-        throw new TypeError(`invalid type at format '${format}': ${data}`);
-      }
-    } else if (["string", "undefined"].includes(typeof data)) {
-      const ua = userAgent || "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.183 Safari/537.36";
-      const headers = {
-        Accept: `application/${format === "json" ? "json" : "octet-stream"}`,
-        UserAgent: ua,
-        ...extraHeader
-      };
-      log(`download headers: ${JSON.stringify(headers, null, 2)}`);
-      const info = format === "json" ? {
-        name: "updateJsonURL",
-        url: _update,
-        repoFallback: `${repository.replace("github.com", "raw.githubusercontent.com")}/master/version.json`,
-        fn: downloadJSON ?? downloadJSONDefault
-      } : {
-        name: "releaseAsarURL",
-        url: _release,
-        repoFallback: `${repository}/releases/download/v${version2}/${productName}-${version2}.asar.gz`,
-        fn: downloadBuffer ?? downloadBufferDefault
-      };
-      data ??= info.url;
-      if (!data) {
-        log(`no ${info.name}, fallback to use repository`);
-        if (!repository) {
-          throw new Error(`${info.name} or repository are not set`);
-        }
-        if (format === "buffer" && !version2) {
-          throw new Error("version are not set");
-        }
-        data = info.repoFallback;
+      throw new TypeError(`invalid type at format '${format}': ${data}`);
+    }
+    const ua = this.option.downloadConfig?.userAgent || "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.183 Safari/537.36";
+    const headers = {
+      Accept: `application/${format === "json" ? "json" : "octet-stream"}`,
+      UserAgent: ua,
+      ...this.option.downloadConfig?.extraHeader
+    };
+    this.logger?.info(`download headers: ${JSON.stringify(headers, null, 2)}`);
+    const config = format === "json" ? {
+      name: "updateJsonURL",
+      url: this.option.updateJsonURL,
+      repoFallback: `${this.option.repository.replace("github.com", "raw.githubusercontent.com")}/master/version.json`,
+      fn: this.option.overrideFunctions?.downloadJSON ?? downloadJSONDefault
+    } : {
+      name: "releaseAsarURL",
+      url: this.option.releaseAsarURL,
+      repoFallback: `${this.option.repository}/releases/download/v${this.info?.version}/${this.productName}-${this.info?.version}.asar.gz`,
+      fn: this.option.overrideFunctions?.downloadBuffer ?? downloadBufferDefault
+    };
+    data ??= config.url;
+    if (!data) {
+      this.logger?.debug(`no ${config.name}, fallback to use repository`);
+      if (!this.option.repository) {
+        throw new Error(`${config.name} or repository are not set`);
       }
-      log(`download ${format} from ${data}`);
-      const ret = await info.fn(data, updater, headers);
-      log(`download ${format} success${format === "buffer" ? `, file size: ${ret.length}` : ""}`);
-      if (format === "buffer") {
-        updater.emit("downloadBuffer", ret);
+      if (format === "buffer" && !this.info?.version) {
+        throw new Error("version are not set");
       }
+      data = config.repoFallback;
+    }
+    this.logger?.info(`download ${format} from ${data}`);
+    try {
+      const ret = format === "json" ? await config.fn(data, headers) : await config.fn(data, headers, this.info.size, this.onDownloading);
+      this.logger?.info(`download ${format} success${format === "buffer" ? `, file size: ${ret.length}` : ""}`);
       return ret;
-    } else {
-      throw new TypeError(`invalid type at format '${format}': ${data}`);
+    } catch (e) {
+      throw new DownloadError();
     }
   }
-  updater.productName = productName;
-  updater.debug = debug;
-  updater.receiveBeta = receiveBeta;
-  updater.checkUpdate = async (data) => {
+  async checkUpdate(data) {
     try {
-      let {
-        signature: _sig,
-        size,
-        version: _ver,
-        minimumVersion,
-        beta
-      } = await parseData("json", data);
-      if (receiveBeta) {
-        _ver = beta.version;
-        _sig = beta.signature;
+      let { signature, size, version, minimumVersion, beta } = await this.parseData("json", data);
+      if (this.receiveBeta) {
+        version = beta.version;
+        signature = beta.signature;
         minimumVersion = beta.minimumVersion;
         size = beta.size;
       }
-      log(`checked version: ${_ver}, size: ${size}, signature: ${_sig}`);
-      if (!await needUpdate(_ver, minimumVersion)) {
-        log(`update unavailable: ${_ver}`);
+      this.logger?.info(`checked version: ${version}, size: ${size}, signature: ${signature}`);
+      if (!await this.needUpdate(version, minimumVersion)) {
+        this.logger?.info(`update unavailable: ${version} is the latest version`);
         return void 0;
       } else {
-        log(`update available: ${_ver}`);
-        signature = _sig;
-        version = _ver;
-        return { size, version: _ver };
+        this.logger?.info(`update available: ${version}`);
+        this.info = {
+          signature,
+          minimumVersion,
+          version,
+          size
+        };
+        return { size, version };
       }
     } catch (error) {
-      log(error);
+      this.logger?.error("check update failed", error);
       return error;
     }
-  };
-  updater.download = async (data, sig) => {
+  }
+  async download(data, sig) {
     try {
-      const _sig = sig ?? signature;
+      const _sig = sig ?? this.info?.signature;
       if (!_sig) {
         throw new Error("signature are not set, please checkUpdate first or set the second parameter");
       }
-      const buffer = await parseData("buffer", data, version);
-      log("verify start");
-      const _verify = verifySignaure ?? verify;
-      const _ver = await _verify(buffer, _sig, SIGNATURE_CERT);
+      const buffer = await this.parseData("buffer", data);
+      this.logger?.info("verify start");
+      const _verify = this.option.overrideFunctions?.verifySignaure ?? verify;
+      const _ver = await _verify(buffer, _sig, this.option.SIGNATURE_CERT);
       if (!_ver) {
-        throw new VerifyFailedError(_sig, SIGNATURE_CERT);
+        throw new VerifyFailedError(_sig, this.option.SIGNATURE_CERT);
       }
-      log("verify success");
-      log(`write to ${gzipPath}`);
-      await (0, import_promises.writeFile)(gzipPath, buffer);
-      log(`extract to ${tmpFilePath}`);
-      await unzipFile(gzipPath, tmpFilePath);
-      log(`download success, version: ${_ver}`);
-      signature = "";
+      this.logger?.info("verify success");
+      this.logger?.info(`write to ${this.gzipPath}`);
+      await (0, import_promises.writeFile)(this.gzipPath, buffer);
+      this.logger?.info(`extract to ${this.tmpFilePath}`);
+      await unzipFile(this.gzipPath, this.tmpFilePath);
+      this.logger?.info(`download success${typeof _ver === "string" ? `, version: ${_ver}` : ""}`);
+      this.info = void 0;
       return true;
     } catch (error) {
-      log(error);
+      this.logger?.error("download asar failed", error);
       return error;
     }
-  };
-  return updater;
+  }
+};
+function createUpdater(option) {
+  return new IncrementalUpdater(option);
 }
 
 // src/index.ts
@@ -412,6 +440,8 @@ function initApp(appOptions) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  DownloadError,
+  IncrementalUpdater,
   MinimumVersionError,
   VerifyFailedError,
   createUpdater,