electron-version-deployer-cli 0.4.7 → 0.4.9

package/dist/cli.cjs

@@ -402,29 +402,48 @@ async function netRequest(options) {
   }
   return new Promise((resolve, reject) => {
     const request = electron.net.request(options.url);
+    request.setHeader("Accept-Encoding", "identity");
+    request.setHeader("Cache-Control", "no-cache");
     let data = "";
     let isResolved = false;
+    const failOnce = (error) => {
+      if (isResolved)
+        return;
+      isResolved = true;
+      cleanup();
+      reject(error);
+    };
     const timeoutId = setTimeout(() => {
-      if (!isResolved) {
-        isResolved = true;
-        request.abort();
-        reject(new Error("网络请求超时，请检查网络连接或使用 VPN 后重试"));
-      }
+      request.abort();
+      failOnce(new Error("网络请求超时，请检查网络连接或使用 VPN 后重试"));
     }, TIMEOUT_MS);
     const cleanup = () => {
       clearTimeout(timeoutId);
     };
     request.on("response", (response) => {
+      const statusCode = response.statusCode ?? 0;
+      if (statusCode < 200 || statusCode >= 300) {
+        failOnce(
+          new Error(
+            `请求失败，状态码: ${statusCode} ${response.statusMessage ?? ""}`.trim()
+          )
+        );
+        return;
+      }
       response.on("data", (chunk) => {
-        if (options.responseType === "stream") {
-          if (!isResolved) {
-            isResolved = true;
-            cleanup();
-            resolve(response);
+        try {
+          if (options.responseType === "stream") {
+            if (!isResolved) {
+              isResolved = true;
+              cleanup();
+              resolve(response);
+            }
+            return;
           }
-          return;
+          data += chunk;
+        } catch (error) {
+          failOnce(error);
         }
-        data += chunk;
       });
       response.on("end", () => {
         if (isResolved)
@@ -433,23 +452,26 @@ async function netRequest(options) {
         cleanup();
         if (options.responseType === "stream")
           return;
-        if (options.responseType === "json") {
-          try {
-            resolve(JSON.parse(data));
-          } catch (e) {
-            resolve(null);
+        try {
+          if (options.responseType === "json") {
+            try {
+              resolve(JSON.parse(data));
+            } catch (e) {
+              resolve(null);
+            }
+          } else {
+            resolve(data);
           }
-        } else {
-          resolve(data);
+        } catch (error) {
+          failOnce(error);
         }
       });
+      response.on("error", (error) => {
+        failOnce(error);
+      });
     });
     request.on("error", (error) => {
-      if (!isResolved) {
-        isResolved = true;
-        cleanup();
-        reject(error);
-      }
+      failOnce(error);
     });
     request.end();
   });
@@ -472,7 +494,7 @@ function versionToNum(a) {
   let res = c.join("");
   return res;
 }
-const _Netlify = class _Netlify {
+const _Netlify = class {
   static get instance() {
     if (!this._instance) {
       this._instance = new _Netlify();
@@ -530,8 +552,8 @@ const _Netlify = class _Netlify {
     return `configs.netlify 配置不存在`;
   }
 };
-__publicField(_Netlify, "_instance");
 let Netlify = _Netlify;
+__publicField(Netlify, "_instance");
 function forceDeleteSync(targetPath) {
   try {
     const stats = fs.statSync(targetPath);
@@ -555,7 +577,7 @@ function forceDeleteSync(targetPath) {
     }
   }
 }
-const _Cloudflare = class _Cloudflare {
+const _Cloudflare = class {
   static get instance() {
     if (!this._instance) {
       this._instance = new _Cloudflare();
@@ -654,8 +676,8 @@ const _Cloudflare = class _Cloudflare {
     return `configs.cloudflare 配置不存在`;
   }
 };
-__publicField(_Cloudflare, "_instance");
 let Cloudflare = _Cloudflare;
+__publicField(Cloudflare, "_instance");
 commander.program.command("deploy").description("执行部署").action(async (source, destination) => {
   const configs = await getConfigs();
   try {
@@ -798,4 +820,4 @@ async function installPrebuilt(configs) {
 }
 commander.program.description(
   "Electron 版本部署 CLI，简化你的 Electron 软件更新，让一切变得简单。"
-).helpOption("-h, --help", "使用帮助").version("0.4.7", "-V, --version", "显示版本号").parse(process.argv);
+).helpOption("-h, --help", "使用帮助").version("0.4.9", "-V, --version", "显示版本号").parse(process.argv);

package/dist/helpers/netRequest.d.ts

@@ -1,6 +1,6 @@
 interface RequestOptions {
     url: string;
-    responseType?: 'json' | 'stream' | 'text';
+    responseType?: "json" | "stream" | "text";
 }
 export declare function netRequest<T = any>(options: RequestOptions): Promise<T>;
 export {};

package/dist/main.js

@@ -41,29 +41,48 @@ async function netRequest(options) {
   }
   return new Promise((resolve, reject) => {
     const request = electron.net.request(options.url);
+    request.setHeader("Accept-Encoding", "identity");
+    request.setHeader("Cache-Control", "no-cache");
     let data = "";
     let isResolved = false;
+    const failOnce = (error) => {
+      if (isResolved)
+        return;
+      isResolved = true;
+      cleanup2();
+      reject(error);
+    };
     const timeoutId = setTimeout(() => {
-      if (!isResolved) {
-        isResolved = true;
-        request.abort();
-        reject(new Error("网络请求超时，请检查网络连接或使用 VPN 后重试"));
-      }
+      request.abort();
+      failOnce(new Error("网络请求超时，请检查网络连接或使用 VPN 后重试"));
     }, TIMEOUT_MS);
     const cleanup2 = () => {
       clearTimeout(timeoutId);
     };
     request.on("response", (response) => {
+      const statusCode = response.statusCode ?? 0;
+      if (statusCode < 200 || statusCode >= 300) {
+        failOnce(
+          new Error(
+            `请求失败，状态码: ${statusCode} ${response.statusMessage ?? ""}`.trim()
+          )
+        );
+        return;
+      }
       response.on("data", (chunk) => {
-        if (options.responseType === "stream") {
-          if (!isResolved) {
-            isResolved = true;
-            cleanup2();
-            resolve(response);
+        try {
+          if (options.responseType === "stream") {
+            if (!isResolved) {
+              isResolved = true;
+              cleanup2();
+              resolve(response);
+            }
+            return;
           }
-          return;
+          data += chunk;
+        } catch (error) {
+          failOnce(error);
         }
-        data += chunk;
       });
       response.on("end", () => {
         if (isResolved)
@@ -72,23 +91,26 @@ async function netRequest(options) {
         cleanup2();
         if (options.responseType === "stream")
           return;
-        if (options.responseType === "json") {
-          try {
-            resolve(JSON.parse(data));
-          } catch (e) {
-            resolve(null);
+        try {
+          if (options.responseType === "json") {
+            try {
+              resolve(JSON.parse(data));
+            } catch (e) {
+              resolve(null);
+            }
+          } else {
+            resolve(data);
           }
-        } else {
-          resolve(data);
+        } catch (error) {
+          failOnce(error);
         }
       });
+      response.on("error", (error) => {
+        failOnce(error);
+      });
     });
     request.on("error", (error) => {
-      if (!isResolved) {
-        isResolved = true;
-        cleanup2();
-        reject(error);
-      }
+      failOnce(error);
     });
     request.end();
   });
@@ -322,6 +344,8 @@ async function installPkg(zipFile) {
             url: `${remoteUrl}/fullCodeZipSplitZips/${fileName}?hash=${Math.random()}`,
             method: "GET"
           });
+          request.setHeader("Accept-Encoding", "identity");
+          request.setHeader("Cache-Control", "no-cache");
           request.on("response", (response) => {
             response.pipe(tmpSplitZip).on("finish", () => {
               tmpSplitZip.end(() => {
@@ -350,6 +374,8 @@ async function installPkg(zipFile) {
         url: `${remoteUrl}/${zipFile}?hash=${Math.random()}`,
         method: "GET"
       });
+      request.setHeader("Accept-Encoding", "identity");
+      request.setHeader("Cache-Control", "no-cache");
       request.on("response", (response) => {
         response.pipe(tmpZipFilePath).on("finish", () => {
           tmpZipFilePath.end(() => {

package/package.json

@@ -1,10 +1,14 @@
 {
   "name": "electron-version-deployer-cli",
   "private": false,
-  "version": "0.4.7",
+  "version": "0.4.9",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.es.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/FrontEndSharedProject/electron-version-deployer-cli.git"
+  },
   "scripts": {
     "serve": "esno ./watch.ts",
     "build": "MODE=production esno ./watch.ts && tsc -p ./tsconfig.dist.json -emitDeclarationOnly && tsc-alias -p ./tsconfig.dist.json",