electron-version-deployer-cli 0.4.4 → 0.4.6

package/dist/cli.cjs

@@ -369,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") {
@@ -410,7 +445,11 @@ async function netRequest(options) {
       });
     });
     request.on("error", (error) => {
-      reject(error);
+      if (!isResolved) {
+        isResolved = true;
+        cleanup();
+        reject(error);
+      }
     });
     request.end();
   });
@@ -759,4 +798,4 @@ async function installPrebuilt(configs) {
 }
 commander.program.description(
   "Electron 版本部署 CLI，简化你的 Electron 软件更新，让一切变得简单。"
-).helpOption("-h, --help", "使用帮助").version("0.4.4", "-V, --version", "显示版本号").parse(process.argv);
+).helpOption("-h, --help", "使用帮助").version("0.4.6", "-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.4",
+  "version": "0.4.6",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.es.js",
@@ -19,7 +19,7 @@
   ],
   "devDependencies": {
     "@inquirer/prompts": "^1.2.3",
-    "@types/archiver": "^5.3.2",
+    "@types/archiver": "^7.0.0",
     "@types/node": "^20.2.5",
     "changelog-parser": "^3.0.1",
     "commander": "^10.0.1",
@@ -38,7 +38,7 @@
     "electron": "^25.3.2"
   },
   "dependencies": {
-    "archiver": "^5.3.1",
+    "archiver": "^7.0.1",
     "extract-zip": "^2.0.1",
     "pkg-up": "3.1.0"
   },