electron-version-deployer-cli 0.3.2 → 0.3.4

package/dist/cli.cjs

@@ -20,7 +20,7 @@ const jsdom = require("jsdom");
 const DOMPurify = require("dompurify");
 const archiver = require("archiver");
 const prompts = require("@inquirer/prompts");
-const node_https = require("node:https");
+const electron = require("electron");
 const node_os = require("node:os");
 const fs = require("fs");
 const path = require("path");
@@ -336,23 +336,44 @@ function genTmpFolder() {
   if (!node_fs.existsSync(folderPath))
     node_fs.mkdirSync(folderPath);
 }
-function fetchRemotePkgJSON(remote_url) {
-  return new Promise((res, rej) => {
-    node_https.get(`${remote_url}/package.json`, (_res) => {
-      let data = "";
-      _res.on("data", (chunk) => {
+async function netRequest(options) {
+  return new Promise((resolve, reject) => {
+    const request = electron.net.request(options.url);
+    let data = "";
+    request.on("response", (response) => {
+      response.on("data", (chunk) => {
+        if (options.responseType === "stream") {
+          resolve(response);
+          return;
+        }
         data += chunk;
       });
-      _res.on("end", () => {
-        try {
-          res(JSON.parse(data));
-        } catch (e) {
-          res(null);
+      response.on("end", () => {
+        if (options.responseType === "stream")
+          return;
+        if (options.responseType === "json") {
+          try {
+            resolve(JSON.parse(data));
+          } catch (e) {
+            resolve(null);
+          }
+        } else {
+          resolve(data);
         }
       });
-    }).on("error", (err) => {
-      rej(`自动更新检查请求失败:` + err.toString());
     });
+    request.on("error", (error) => {
+      reject(error);
+    });
+    request.end();
+  });
+}
+function fetchRemotePkgJSON(remote_url) {
+  return netRequest({
+    url: `${remote_url}/package.json`,
+    responseType: "json"
+  }).catch((error) => {
+    throw new Error(`自动更新检查请求失败: ${error}`);
   });
 }
 function versionToNum(a) {
@@ -663,4 +684,4 @@ async function installPrebuilt(configs) {
 }
 commander.program.description(
   "Electron 版本部署 CLI，简化你的 Electron 软件更新，让一切变得简单。"
-).helpOption("-h, --help", "使用帮助").version("0.3.2", "-V, --version", "显示版本号").parse(process.argv);
+).helpOption("-h, --help", "使用帮助").version("0.3.4", "-V, --version", "显示版本号").parse(process.argv);

package/dist/helpers/netRequest.d.ts

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

package/dist/main.js

@@ -3,48 +3,57 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const electron = require("electron");
 const node_url = require("node:url");
 const node_path = require("node:path");
-const node_https = require("node:https");
 const node_fs = require("node:fs");
-const extract = require("extract-zip");
 const node_process = require("node:process");
 const fs = require("fs");
 const path = require("path");
-function fetchRemoteChangelogJSON(remote_url) {
-  return new Promise((res, rej) => {
-    node_https.get(`${remote_url}/changelog.json`, (_res) => {
-      let data = "";
-      _res.on("data", (chunk) => {
+const extract = require("extract-zip");
+async function netRequest(options) {
+  return new Promise((resolve, reject) => {
+    const request = electron.net.request(options.url);
+    let data = "";
+    request.on("response", (response) => {
+      response.on("data", (chunk) => {
+        if (options.responseType === "stream") {
+          resolve(response);
+          return;
+        }
         data += chunk;
       });
-      _res.on("end", () => {
-        try {
-          res(JSON.parse(data));
-        } catch (e) {
-          res(null);
+      response.on("end", () => {
+        if (options.responseType === "stream")
+          return;
+        if (options.responseType === "json") {
+          try {
+            resolve(JSON.parse(data));
+          } catch (e) {
+            resolve(null);
+          }
+        } else {
+          resolve(data);
         }
       });
-    }).on("error", (err) => {
-      rej(`获取 changelog.json 失败:` + err.toString());
     });
+    request.on("error", (error) => {
+      reject(error);
+    });
+    request.end();
+  });
+}
+function fetchRemoteChangelogJSON(remote_url) {
+  return netRequest({
+    url: `${remote_url}/changelog.json`,
+    responseType: "json"
+  }).catch((error) => {
+    throw new Error(`获取 changelog.json 失败: ${error}`);
   });
 }
 function fetchRemotePkgJSON(remote_url) {
-  return new Promise((res, rej) => {
-    node_https.get(`${remote_url}/package.json`, (_res) => {
-      let data = "";
-      _res.on("data", (chunk) => {
-        data += chunk;
-      });
-      _res.on("end", () => {
-        try {
-          res(JSON.parse(data));
-        } catch (e) {
-          res(null);
-        }
-      });
-    }).on("error", (err) => {
-      rej(`自动更新检查请求失败:` + err.toString());
-    });
+  return netRequest({
+    url: `${remote_url}/package.json`,
+    responseType: "json"
+  }).catch((error) => {
+    throw new Error(`自动更新检查请求失败: ${error}`);
   });
 }
 function versionToNum(a) {
@@ -244,10 +253,10 @@ async function installPkg(zipFile) {
   await new Promise(async (res, rej) => {
     let fullCodeSplitIndexFile = false;
     try {
-      const request = await fetch(
-        `${remoteUrl}/fullCodeZipSplitZips/index.json?hash=${Math.random()}`
-      );
-      fullCodeSplitIndexFile = await request.json();
+      fullCodeSplitIndexFile = await netRequest({
+        url: `${remoteUrl}/fullCodeZipSplitZips/index.json?hash=${Math.random()}`,
+        responseType: "json"
+      });
     } catch (e) {
     }
     if (zipFile === "fullCode.zip" && fullCodeSplitIndexFile) {
@@ -255,22 +264,21 @@ async function installPkg(zipFile) {
       for (let fileName of fullCodeSplitIndexFile) {
         const tmpFilePath = node_path.join(appPath, fileName);
         const tmpSplitZip = node_fs.createWriteStream(tmpFilePath);
-        await new Promise((_res) => {
-          node_https.get(
-            `${remoteUrl}/fullCodeZipSplitZips/${fileName}?hash=${Math.random()}`,
-            (response) => {
-              response.pipe(tmpSplitZip).on("finish", () => {
-                tmpSplitZip.end(() => {
-                  mergedStream.write(node_fs.readFileSync(tmpFilePath));
-                  _res();
-                });
-              }).on("error", (err) => {
-                rej(err);
-              });
-            }
-          ).on("error", (err) => {
-            rej(err);
+        const response = await netRequest({
+          url: `${remoteUrl}/fullCodeZipSplitZips/${fileName}?hash=${Math.random()}`,
+          responseType: "stream"
+        });
+        await new Promise((streamRes, streamRej) => {
+          response.on("data", (chunk) => {
+            tmpSplitZip.write(chunk);
           });
+          response.on("end", () => {
+            tmpSplitZip.end(() => {
+              mergedStream.write(node_fs.readFileSync(tmpFilePath));
+              streamRes();
+            });
+          });
+          response.on("error", streamRej);
         });
         forceDeleteSync(tmpFilePath);
       }
@@ -279,17 +287,22 @@ async function installPkg(zipFile) {
       });
     } else {
       const tmpZipFilePath = node_fs.createWriteStream(unzipPath + ".zip");
-      node_https.get(`${remoteUrl}/${zipFile}?hash=${Math.random()}`, (response) => {
-        response.pipe(tmpZipFilePath).on("finish", () => {
+      const response = await netRequest({
+        url: `${remoteUrl}/${zipFile}?hash=${Math.random()}`,
+        responseType: "stream"
+      });
+      await new Promise((streamRes, streamRej) => {
+        response.on("data", (chunk) => {
+          tmpZipFilePath.write(chunk);
+        });
+        response.on("end", () => {
           tmpZipFilePath.end(() => {
-            res();
+            streamRes();
           });
-        }).on("error", (err) => {
-          rej(err);
         });
-      }).on("error", (err) => {
-        rej(err);
+        response.on("error", streamRej);
       });
+      res();
     }
   });
   await extract(unzipPath + ".zip", { dir: unzipPath });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "electron-version-deployer-cli",
   "private": false,
-  "version": "0.3.2",
+  "version": "0.3.4",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.es.js",
@@ -25,7 +25,6 @@
     "commander": "^10.0.1",
     "dompurify": "^3.0.3",
     "download": "^8.0.0",
-    "electron": "^25.0.1",
     "esno": "^0.16.3",
     "jsdom": "^22.1.0",
     "log-symbols": "=4.1.0",
@@ -38,6 +37,7 @@
     "wrangler": "^3.3.0"
   },
   "dependencies": {
+    "electron": "^25.3.2",
     "archiver": "^5.3.1",
     "extract-zip": "^2.0.1",
     "pkg-up": "3.1.0"