electron-version-deployer-cli 0.4.3 → 0.4.5

package/dist/cli.cjs

@@ -19,11 +19,12 @@ const marked = require("marked");
 const jsdom = require("jsdom");
 const DOMPurify = require("dompurify");
 const archiver = require("archiver");
+const fs = require("fs");
+const path = require("path");
+const os = require("os");
 const prompts = require("@inquirer/prompts");
 const electron = require("electron");
 const node_os = require("node:os");
-const fs = require("fs");
-const path = require("path");
 const download = require("download");
 const pkgPath = pkgUp.sync();
 function r(...paths) {
@@ -172,6 +173,32 @@ function archiveFiles(outputPath, files) {
     archive.finalize();
   });
 }
+function countLineEndings(text) {
+  const crlf = (text.match(/\r\n/g) || []).length;
+  const noCRLF = text.replace(/\r\n/g, "");
+  const lf = (noCRLF.match(/\n/g) || []).length;
+  const cr = (noCRLF.match(/\r/g) || []).length;
+  return { crlf, lf, cr };
+}
+function normalizeToOSEOL(text, opts = {}) {
+  const { stripBOM = true, ensureFinalNewline = false } = opts;
+  if (stripBOM && text.charCodeAt(0) === 65279) {
+    text = text.slice(1);
+  }
+  const target = os.EOL;
+  const before = text;
+  let normalized = text.replace(/\r\n|\r|\n/g, target);
+  if (ensureFinalNewline && normalized.length > 0 && !normalized.endsWith(target)) {
+    normalized += target;
+  }
+  const changed = normalized !== before;
+  return {
+    text: normalized,
+    changed,
+    stats: countLineEndings(before),
+    target: target === "\r\n" ? "crlf" : target === "\r" ? "cr" : "lf"
+  };
+}
 commander.program.command("prepare").description(
   "部署前的准备工作，如获取编译软件获取逻辑代码，生成 changelog 等"
 ).action(async (source, destination) => {
@@ -256,8 +283,14 @@ async function genChangelog(configs) {
   }
   const pkgContent = JSON.parse(node_fs.readFileSync(outputPackageJSONPath, "utf-8"));
   const currentVersion = pkgContent.version;
+  const changelogText = node_fs.readFileSync(r(configs.changelogsPath), "utf-8");
   const changes = await parseChangelog({
-    filePath: r(configs.changelogsPath),
+    //  将 changelog 文件转换为 os.EOL
+    //  https://github.com/ungoldman/changelog-parser/issues/34
+    text: normalizeToOSEOL(changelogText, {
+      stripBOM: true,
+      ensureFinalNewline: true
+    }).text,
     removeMarkdown: false
   });
   const currentChange = changes.versions.find((change) => {
@@ -336,33 +369,68 @@ function genTmpFolder() {
   if (!node_fs.existsSync(folderPath))
     node_fs.mkdirSync(folderPath);
 }
+const TIMEOUT_MS = 5e3;
 async function netRequest(options) {
   if (!electron.net) {
-    const response = await fetch(options.url);
-    if (options.responseType === "json") {
-      try {
-        return await response.json();
-      } catch (e) {
-        return null;
+    const abortController = new AbortController();
+    const timeoutId = setTimeout(() => {
+      abortController.abort();
+    }, TIMEOUT_MS);
+    try {
+      const response = await fetch(options.url, {
+        signal: abortController.signal
+      });
+      clearTimeout(timeoutId);
+      if (options.responseType === "json") {
+        try {
+          return await response.json();
+        } catch (e) {
+          return null;
+        }
+      } else if (options.responseType === "stream") {
+        return response.body;
+      } else {
+        return await response.text();
       }
-    } else if (options.responseType === "stream") {
-      return response.body;
-    } else {
-      return await response.text();
+    } catch (error) {
+      clearTimeout(timeoutId);
+      if (error.name === "AbortError") {
+        throw new Error("网络请求超时，请检查网络连接或使用 VPN 后重试");
+      }
+      throw error;
     }
   }
   return new Promise((resolve, reject) => {
     const request = electron.net.request(options.url);
     let data = "";
+    let isResolved = false;
+    const timeoutId = setTimeout(() => {
+      if (!isResolved) {
+        isResolved = true;
+        request.abort();
+        reject(new Error("网络请求超时，请检查网络连接或使用 VPN 后重试"));
+      }
+    }, TIMEOUT_MS);
+    const cleanup = () => {
+      clearTimeout(timeoutId);
+    };
     request.on("response", (response) => {
       response.on("data", (chunk) => {
         if (options.responseType === "stream") {
-          resolve(response);
+          if (!isResolved) {
+            isResolved = true;
+            cleanup();
+            resolve(response);
+          }
           return;
         }
         data += chunk;
       });
       response.on("end", () => {
+        if (isResolved)
+          return;
+        isResolved = true;
+        cleanup();
         if (options.responseType === "stream")
           return;
         if (options.responseType === "json") {
@@ -377,7 +445,11 @@ async function netRequest(options) {
       });
     });
     request.on("error", (error) => {
-      reject(error);
+      if (!isResolved) {
+        isResolved = true;
+        cleanup();
+        reject(error);
+      }
     });
     request.end();
   });
@@ -726,4 +798,4 @@ async function installPrebuilt(configs) {
 }
 commander.program.description(
   "Electron 版本部署 CLI，简化你的 Electron 软件更新，让一切变得简单。"
-).helpOption("-h, --help", "使用帮助").version("0.4.3", "-V, --version", "显示版本号").parse(process.argv);
+).helpOption("-h, --help", "使用帮助").version("0.4.5", "-V, --version", "显示版本号").parse(process.argv);

package/dist/main.js

@@ -8,33 +8,68 @@ const node_process = require("node:process");
 const fs = require("fs");
 const path = require("path");
 const extract = require("extract-zip");
+const TIMEOUT_MS = 5e3;
 async function netRequest(options) {
   if (!electron.net) {
-    const response = await fetch(options.url);
-    if (options.responseType === "json") {
-      try {
-        return await response.json();
-      } catch (e) {
-        return null;
+    const abortController = new AbortController();
+    const timeoutId = setTimeout(() => {
+      abortController.abort();
+    }, TIMEOUT_MS);
+    try {
+      const response = await fetch(options.url, {
+        signal: abortController.signal
+      });
+      clearTimeout(timeoutId);
+      if (options.responseType === "json") {
+        try {
+          return await response.json();
+        } catch (e) {
+          return null;
+        }
+      } else if (options.responseType === "stream") {
+        return response.body;
+      } else {
+        return await response.text();
       }
-    } else if (options.responseType === "stream") {
-      return response.body;
-    } else {
-      return await response.text();
+    } catch (error) {
+      clearTimeout(timeoutId);
+      if (error.name === "AbortError") {
+        throw new Error("网络请求超时，请检查网络连接或使用 VPN 后重试");
+      }
+      throw error;
     }
   }
   return new Promise((resolve, reject) => {
     const request = electron.net.request(options.url);
     let data = "";
+    let isResolved = false;
+    const timeoutId = setTimeout(() => {
+      if (!isResolved) {
+        isResolved = true;
+        request.abort();
+        reject(new Error("网络请求超时，请检查网络连接或使用 VPN 后重试"));
+      }
+    }, TIMEOUT_MS);
+    const cleanup2 = () => {
+      clearTimeout(timeoutId);
+    };
     request.on("response", (response) => {
       response.on("data", (chunk) => {
         if (options.responseType === "stream") {
-          resolve(response);
+          if (!isResolved) {
+            isResolved = true;
+            cleanup2();
+            resolve(response);
+          }
           return;
         }
         data += chunk;
       });
       response.on("end", () => {
+        if (isResolved)
+          return;
+        isResolved = true;
+        cleanup2();
         if (options.responseType === "stream")
           return;
         if (options.responseType === "json") {
@@ -49,7 +84,11 @@ async function netRequest(options) {
       });
     });
     request.on("error", (error) => {
-      reject(error);
+      if (!isResolved) {
+        isResolved = true;
+        cleanup2();
+        reject(error);
+      }
     });
     request.end();
   });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "electron-version-deployer-cli",
   "private": false,
-  "version": "0.4.3",
+  "version": "0.4.5",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.es.js",