electron-version-deployer-cli 0.3.1 → 0.3.3

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");
@@ -338,21 +338,24 @@ function genTmpFolder() {
 }
 function fetchRemotePkgJSON(remote_url) {
   return new Promise((res, rej) => {
-    node_https.get(`${remote_url}/package.json`, (_res) => {
-      let data = "";
-      _res.on("data", (chunk) => {
+    const request = electron.net.request(`${remote_url}/package.json`);
+    let data = "";
+    request.on("response", (response) => {
+      response.on("data", (chunk) => {
         data += chunk;
       });
-      _res.on("end", () => {
+      response.on("end", () => {
         try {
           res(JSON.parse(data));
         } catch (e) {
           res(null);
         }
       });
-    }).on("error", (err) => {
-      rej(`自动更新检查请求失败:` + err.toString());
     });
+    request.on("error", (error) => {
+      rej(`自动更新检查请求失败:` + error.toString());
+    });
+    request.end();
   });
 }
 function versionToNum(a) {
@@ -382,10 +385,11 @@ const _Netlify = class _Netlify {
       throw new Error("netlify 配置为空");
     return new Promise((res) => {
       const cmd = node_os.platform() === "win32" ? "netlify.cmd" : "netlify";
+      const folderPath = props.folder.includes(" ") ? `"${props.folder}"` : props.folder;
       const output = node_child_process.spawn(cmd, [
         "deploy",
         "--dir",
-        props.folder,
+        folderPath,
         "--site",
         netlifyConfig.siteID,
         "--auth",
@@ -662,4 +666,4 @@ async function installPrebuilt(configs) {
 }
 commander.program.description(
   "Electron 版本部署 CLI，简化你的 Electron 软件更新，让一切变得简单。"
-).helpOption("-h, --help", "使用帮助").version("0.3.1", "-V, --version", "显示版本号").parse(process.argv);
+).helpOption("-h, --help", "使用帮助").version("0.3.3", "-V, --version", "显示版本号").parse(process.argv);

package/dist/main.js

@@ -3,48 +3,53 @@ 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");
+const extract = require("extract-zip");
 function fetchRemoteChangelogJSON(remote_url) {
   return new Promise((res, rej) => {
-    node_https.get(`${remote_url}/changelog.json`, (_res) => {
-      let data = "";
-      _res.on("data", (chunk) => {
+    const request = electron.net.request(`${remote_url}/changelog.json`);
+    let data = "";
+    request.on("response", (response) => {
+      response.on("data", (chunk) => {
         data += chunk;
       });
-      _res.on("end", () => {
+      response.on("end", () => {
         try {
           res(JSON.parse(data));
         } catch (e) {
           res(null);
         }
       });
-    }).on("error", (err) => {
-      rej(`获取 changelog.json 失败:` + err.toString());
     });
+    request.on("error", (error) => {
+      rej(`获取 changelog.json 失败:` + error.toString());
+    });
+    request.end();
   });
 }
 function fetchRemotePkgJSON(remote_url) {
   return new Promise((res, rej) => {
-    node_https.get(`${remote_url}/package.json`, (_res) => {
-      let data = "";
-      _res.on("data", (chunk) => {
+    const request = electron.net.request(`${remote_url}/package.json`);
+    let data = "";
+    request.on("response", (response) => {
+      response.on("data", (chunk) => {
         data += chunk;
       });
-      _res.on("end", () => {
+      response.on("end", () => {
         try {
           res(JSON.parse(data));
         } catch (e) {
           res(null);
         }
       });
-    }).on("error", (err) => {
-      rej(`自动更新检查请求失败:` + err.toString());
     });
+    request.on("error", (error) => {
+      rej(`自动更新检查请求失败:` + error.toString());
+    });
+    request.end();
   });
 }
 function versionToNum(a) {
@@ -116,6 +121,10 @@ function EVDInit(props) {
   }
   globalArgs = props;
   const { detectionFrequency, detectAtStart, onError } = getConfigs();
+  const appPath = electron.app.getAppPath();
+  cacheCurrentPkgJSON = JSON.parse(
+    node_fs.readFileSync(node_path.join(appPath, "package.json"), "utf-8")
+  );
   setInterval(async () => {
     try {
       await EVDCheckUpdate();
@@ -132,10 +141,6 @@ function EVDInit(props) {
       onError(e);
     }
   }, 1e3 * 2);
-  const appPath = electron.app.getAppPath();
-  cacheCurrentPkgJSON = JSON.parse(
-    node_fs.readFileSync(node_path.join(appPath, "package.json"), "utf-8")
-  );
 }
 async function EVDCheckUpdate() {
   const { remoteUrl } = getConfigs();
@@ -255,22 +260,25 @@ 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);
+        await new Promise((_res, _rej) => {
+          const request = electron.net.request({
+            url: `${remoteUrl}/fullCodeZipSplitZips/${fileName}?hash=${Math.random()}`
+          });
+          request.on("response", (response) => {
+            response.on("data", (chunk) => {
+              tmpSplitZip.write(chunk);
+            });
+            response.on("end", () => {
+              tmpSplitZip.end(() => {
+                mergedStream.write(node_fs.readFileSync(tmpFilePath));
+                _res();
               });
-            }
-          ).on("error", (err) => {
-            rej(err);
+            });
           });
+          request.on("error", (error) => {
+            _rej(error);
+          });
+          request.end();
         });
         forceDeleteSync(tmpFilePath);
       }
@@ -279,17 +287,23 @@ 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 request = electron.net.request({
+        url: `${remoteUrl}/${zipFile}?hash=${Math.random()}`
+      });
+      request.on("response", (response) => {
+        response.on("data", (chunk) => {
+          tmpZipFilePath.write(chunk);
+        });
+        response.on("end", () => {
           tmpZipFilePath.end(() => {
             res();
           });
-        }).on("error", (err) => {
-          rej(err);
         });
-      }).on("error", (err) => {
-        rej(err);
       });
+      request.on("error", (error) => {
+        rej(error);
+      });
+      request.end();
     }
   });
   await extract(unzipPath + ".zip", { dir: unzipPath });

package/package.json

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