electron-version-deployer-cli 0.3.3 → 0.3.5

package/dist/cli.cjs

@@ -336,28 +336,60 @@ function genTmpFolder() {
   if (!node_fs.existsSync(folderPath))
     node_fs.mkdirSync(folderPath);
 }
-function fetchRemotePkgJSON(remote_url) {
-  return new Promise((res, rej) => {
-    const request = electron.net.request(`${remote_url}/package.json`);
+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;
+      }
+    } else if (options.responseType === "stream") {
+      return response.body;
+    } else {
+      return await response.text();
+    }
+  }
+  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;
       });
       response.on("end", () => {
-        try {
-          res(JSON.parse(data));
-        } catch (e) {
-          res(null);
+        if (options.responseType === "stream")
+          return;
+        if (options.responseType === "json") {
+          try {
+            resolve(JSON.parse(data));
+          } catch (e) {
+            resolve(null);
+          }
+        } else {
+          resolve(data);
         }
       });
     });
     request.on("error", (error) => {
-      rej(`自动更新检查请求失败:` + error.toString());
+      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) {
   let c = a.split(".");
   let num_place = ["", "0", "00", "000", "0000"], r2 = num_place.reverse();
@@ -666,4 +698,4 @@ async function installPrebuilt(configs) {
 }
 commander.program.description(
   "Electron 版本部署 CLI，简化你的 Electron 软件更新，让一切变得简单。"
-).helpOption("-h, --help", "使用帮助").version("0.3.3", "-V, --version", "显示版本号").parse(process.argv);
+).helpOption("-h, --help", "使用帮助").version("0.3.5", "-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

@@ -8,48 +8,66 @@ const node_process = require("node:process");
 const fs = require("fs");
 const path = require("path");
 const extract = require("extract-zip");
-function fetchRemoteChangelogJSON(remote_url) {
-  return new Promise((res, rej) => {
-    const request = electron.net.request(`${remote_url}/changelog.json`);
+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;
+      }
+    } else if (options.responseType === "stream") {
+      return response.body;
+    } else {
+      return await response.text();
+    }
+  }
+  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;
       });
       response.on("end", () => {
-        try {
-          res(JSON.parse(data));
-        } catch (e) {
-          res(null);
+        if (options.responseType === "stream")
+          return;
+        if (options.responseType === "json") {
+          try {
+            resolve(JSON.parse(data));
+          } catch (e) {
+            resolve(null);
+          }
+        } else {
+          resolve(data);
         }
       });
     });
     request.on("error", (error) => {
-      rej(`获取 changelog.json 失败:` + error.toString());
+      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) => {
-    const request = electron.net.request(`${remote_url}/package.json`);
-    let data = "";
-    request.on("response", (response) => {
-      response.on("data", (chunk) => {
-        data += chunk;
-      });
-      response.on("end", () => {
-        try {
-          res(JSON.parse(data));
-        } catch (e) {
-          res(null);
-        }
-      });
-    });
-    request.on("error", (error) => {
-      rej(`自动更新检查请求失败:` + error.toString());
-    });
-    request.end();
+  return netRequest({
+    url: `${remote_url}/package.json`,
+    responseType: "json"
+  }).catch((error) => {
+    throw new Error(`自动更新检查请求失败: ${error}`);
   });
 }
 function versionToNum(a) {
@@ -249,10 +267,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) {
@@ -260,25 +278,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, _rej) => {
-          const request = electron.net.request({
-            url: `${remoteUrl}/fullCodeZipSplitZips/${fileName}?hash=${Math.random()}`
+        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);
           });
-          request.on("response", (response) => {
-            response.on("data", (chunk) => {
-              tmpSplitZip.write(chunk);
+          response.on("end", () => {
+            tmpSplitZip.end(() => {
+              mergedStream.write(node_fs.readFileSync(tmpFilePath));
+              streamRes();
             });
-            response.on("end", () => {
-              tmpSplitZip.end(() => {
-                mergedStream.write(node_fs.readFileSync(tmpFilePath));
-                _res();
-              });
-            });
-          });
-          request.on("error", (error) => {
-            _rej(error);
           });
-          request.end();
+          response.on("error", streamRej);
         });
         forceDeleteSync(tmpFilePath);
       }
@@ -287,23 +301,22 @@ async function installPkg(zipFile) {
       });
     } else {
       const tmpZipFilePath = node_fs.createWriteStream(unzipPath + ".zip");
-      const request = electron.net.request({
-        url: `${remoteUrl}/${zipFile}?hash=${Math.random()}`
+      const response = await netRequest({
+        url: `${remoteUrl}/${zipFile}?hash=${Math.random()}`,
+        responseType: "stream"
       });
-      request.on("response", (response) => {
+      await new Promise((streamRes, streamRej) => {
         response.on("data", (chunk) => {
           tmpZipFilePath.write(chunk);
         });
         response.on("end", () => {
           tmpZipFilePath.end(() => {
-            res();
+            streamRes();
           });
         });
+        response.on("error", streamRej);
       });
-      request.on("error", (error) => {
-        rej(error);
-      });
-      request.end();
+      res();
     }
   });
   await extract(unzipPath + ".zip", { dir: unzipPath });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "electron-version-deployer-cli",
   "private": false,
-  "version": "0.3.3",
+  "version": "0.3.5",
   "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"