electron-version-deployer-cli 0.0.17 → 0.1.0

package/dist/cli.cjs

@@ -1,10 +1,15 @@
 #!/usr/bin/env node
 "use strict";
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 const commander = require("commander");
 const pkgUp = require("pkg-up");
 const node_fs = require("node:fs");
 const logSymbols = require("log-symbols");
-const prompts = require("@inquirer/prompts");
 const node_path = require("node:path");
 const vite = require("vite");
 const vm = require("node:vm");
@@ -14,6 +19,7 @@ const marked = require("marked");
 const jsdom = require("jsdom");
 const DOMPurify = require("dompurify");
 const archiver = require("archiver");
+const prompts = require("@inquirer/prompts");
 const node_https = require("node:https");
 const node_os = require("node:os");
 const download = require("download");
@@ -36,7 +42,7 @@ function formatBytes(bytes) {
 }
 const CLI_NAME = "electron-version-deployer-cli";
 const CONFIG_FILE_NAME = "evd.config.js";
-commander.program.command("init").option("-y", "自动确认初始化", false).description("生成配置文件").action(async (source, destination) => {
+commander.program.command("init").description("生成配置文件").action(async (source, destination) => {
   const pkgPath2 = pkgUp.sync();
   if (!pkgPath2)
     return console.log(
@@ -59,58 +65,13 @@ commander.program.command("init").option("-y", "自动确认初始化", false).d
       token: "",
       siteID: ""
     },
+    cloudflare: {
+      url: "",
+      token: "",
+      projectName: ""
+    },
     prebuiltConfig: {}
   };
-  if (!source.y) {
-    defaultConfig.compileCommand = await prompts.input({
-      message: "请输入编译命令",
-      default: defaultConfig.compileCommand
-      // validate(str) {
-      //   const scripts = pkgContent.scripts ?? {};
-      //   return Promise.resolve(
-      //     scripts[str] ? true : `无法在 package.json 中找到该命令！`
-      //   );
-      // },
-    });
-    defaultConfig.changelogsPath = await prompts.input({
-      message: "请输入 changelogs 文件位置（以项目根目录为准的相对路径)",
-      default: defaultConfig.changelogsPath
-      // validate(str) {
-      //   return Promise.resolve(
-      //     existsSync(r(str))
-      //       ? /\.md$/.test(str)
-      //         ? true
-      //         : "该文件必须是以 .md 结尾的 Markdown 文件"
-      //       : "该文件不存在！"
-      //   );
-      // },
-    });
-    defaultConfig.sources.folder = await prompts.input({
-      message: "请输入源文件目录",
-      default: `dist/mac-arm64/myapp.app/Resources/app`
-    });
-    defaultConfig.sources.nodeModules = await prompts.input({
-      message: "请输入源文件 node_modules 目录",
-      default: defaultConfig.sources.nodeModules
-    });
-    defaultConfig.sources.codes = await prompts.input({
-      message: "请输入源文件 逻辑代码目录",
-      default: defaultConfig.sources.codes
-    });
-    defaultConfig.sources.packageJSON = await prompts.input({
-      message: "请输入源文件 package.json 路径",
-      default: defaultConfig.sources.packageJSON
-    });
-    defaultConfig.netlify.url = await prompts.input({
-      message: "请输入 Netlify 网站域名"
-    });
-    defaultConfig.netlify.token = await prompts.input({
-      message: "请输入 Netlify Token"
-    });
-    defaultConfig.netlify.siteID = await prompts.input({
-      message: "请输入 Netlify SiteID"
-    });
-  }
   let evdConfigContent = node_fs.readFileSync(
     node_path.join(node_path.resolve(__dirname), "templates", "evd.config.ts"),
     "utf-8"
@@ -379,6 +340,120 @@ function versionToNum(a) {
   let res = c.join("");
   return res;
 }
+const _Netlify = class {
+  static get instance() {
+    if (!this._instance) {
+      this._instance = new _Netlify();
+    }
+    return this._instance;
+  }
+  getUrl(configs) {
+    var _a;
+    return (_a = configs.netlify) == null ? void 0 : _a.url;
+  }
+  deploy(props) {
+    const netlifyConfig = props.configs.netlify;
+    if (!netlifyConfig)
+      throw new Error("netlify 配置为空");
+    return new Promise((res) => {
+      const cmd = node_os.platform() === "win32" ? "netlify.cmd" : "netlify";
+      const output = node_child_process.spawn(cmd, [
+        "deploy",
+        "--dir",
+        props.folder,
+        "--site",
+        netlifyConfig.siteID,
+        "--auth",
+        netlifyConfig.token,
+        "--prod",
+        "--debug"
+      ], {
+        stdio: ["pipe", "inherit", "inherit"]
+      });
+      output.on("exit", function(code) {
+        if (code === 0) {
+          console.log(logSymbols.success, "部署完成！");
+          res();
+          return;
+        }
+        throw new Error("部署失败！");
+      });
+    });
+  }
+  validateConfig(configs) {
+    if (configs.netlify) {
+      if (!configs.netlify.url || !/^https/.test(configs.netlify.url)) {
+        return `configs.netlify.url 配置不正确`;
+      }
+      if (!configs.netlify.token) {
+        return `configs.netlify.token 未配置`;
+      }
+      if (!configs.netlify.siteID) {
+        return `configs.netlify.siteID 未配置`;
+      }
+    }
+    return `configs.netlify 配置不存在`;
+  }
+};
+let Netlify = _Netlify;
+__publicField(Netlify, "_instance");
+const _Cloudflare = class {
+  static get instance() {
+    if (!this._instance) {
+      this._instance = new _Cloudflare();
+    }
+    return this._instance;
+  }
+  getUrl(configs) {
+    var _a;
+    return (_a = configs.cloudflare) == null ? void 0 : _a.url;
+  }
+  deploy(props) {
+    const cloudflareConfig = props.configs.cloudflare;
+    if (!cloudflareConfig)
+      throw new Error("cloudflare 配置为空");
+    return new Promise((res) => {
+      const cmd = node_os.platform() === "win32" ? "wrangler.cmd" : "wrangler";
+      const output = node_child_process.spawn(cmd, [
+        "pages",
+        "deploy",
+        props.folder,
+        "--project-name",
+        cloudflareConfig.projectName
+      ], {
+        stdio: ["pipe", "inherit", "inherit"],
+        env: {
+          ...process.env,
+          "CLOUDFLARE_API_TOKEN": cloudflareConfig.token
+        }
+      });
+      output.on("exit", function(code) {
+        if (code === 0) {
+          console.log(logSymbols.success, "部署完成！");
+          res();
+          return;
+        }
+        throw new Error("部署失败！");
+      });
+    });
+  }
+  validateConfig(configs) {
+    if (configs.cloudflare) {
+      if (!configs.cloudflare.url || !/^https/.test(configs.cloudflare.url)) {
+        return `configs.cloudflare.url 配置不正确`;
+      }
+      if (!configs.cloudflare.token) {
+        return `configs.cloudflare.token 未配置`;
+      }
+      if (!configs.cloudflare.projectName) {
+        return `configs.cloudflare.projectName 未配置`;
+      }
+    }
+    return `configs.cloudflare 配置不存在`;
+  }
+};
+let Cloudflare = _Cloudflare;
+__publicField(Cloudflare, "_instance");
 commander.program.command("deploy").description("执行部署").action(async (source, destination) => {
   const configs = await getConfigs();
   try {
@@ -393,34 +468,18 @@ commander.program.command("deploy").description("执行部署").action(async (so
 });
 async function deploy(configs) {
   console.log(logSymbols.info, "开始部署", r());
-  const cmd = node_os.platform() === "win32" ? "netlify.cmd" : "netlify";
-  const output = node_child_process.spawn(cmd, [
-    "deploy",
-    "--dir",
-    r("node_modules/.evd"),
-    "--site",
-    configs.netlify.siteID,
-    "--auth",
-    configs.netlify.token,
-    "--prod",
-    "--debug"
-  ], {
-    stdio: ["pipe", "inherit", "inherit"]
-  });
-  output.on("exit", function(code) {
-    if (code === 0) {
-      console.log(logSymbols.success, "部署完成！");
-      return;
-    }
-    throw new Error("部署失败！");
+  await getWhichProvider(configs).deploy({
+    folder: r("node_modules/.evd"),
+    configs
   });
 }
 async function validateRemotePackageJSON(configs) {
+  const url = getWhichProvider(configs).getUrl(configs);
   const compiledPackageJSON = JSON.parse(
     node_fs.readFileSync(r("node_modules/.evd/package.json"), "utf-8")
   );
   const compiledName = compiledPackageJSON.name;
-  const remotePKG = await fetchRemotePkgJSON(configs.netlify.url);
+  const remotePKG = await fetchRemotePkgJSON(url);
   if (!remotePKG)
     return;
   const remoteName = remotePKG.name;
@@ -453,10 +512,11 @@ async function validateRemotePackageJSON(configs) {
   }
 }
 async function checkIsFirstTimeDeploy(configs) {
-  const remotePKG = await fetchRemotePkgJSON(configs.netlify.url);
+  const url = getWhichProvider(configs).getUrl(configs);
+  const remotePKG = await fetchRemotePkgJSON(url);
   if (!remotePKG) {
     const answer = await prompts.confirm({
-      message: `似乎 ${configs.netlify.url} 还未部署过任何版本，确认继续吗？`
+      message: `似乎 ${url} 还未部署过任何版本，确认继续吗？`
     });
     if (!answer) {
       throw new Error("部署已停止！");
@@ -464,15 +524,16 @@ async function checkIsFirstTimeDeploy(configs) {
   }
 }
 async function validateConfigs(configs) {
-  if (!configs.netlify.url || !/^https/.test(configs.netlify.url)) {
-    throw new Error(`configs.netlify.url 配置不正确`);
-  }
-  if (!configs.netlify.token) {
-    throw new Error(`configs.netlify.token 未配置`);
-  }
-  if (!configs.netlify.siteID) {
-    throw new Error(`configs.netlify.siteID 未配置`);
-  }
+  const error = getWhichProvider(configs).validateConfig(configs);
+  if (error)
+    throw new Error(error);
+}
+function getWhichProvider(configs) {
+  if (configs.netlify && configs.netlify.url && configs.netlify.siteID && configs.netlify.token)
+    return Netlify.instance;
+  if (configs.cloudflare && configs.cloudflare.projectName && configs.cloudflare.token && configs.cloudflare.url)
+    return Cloudflare.instance;
+  throw new Error("未提供/配置不正确 configs.netlify / configs.cloudflare");
 }
 async function checkEVDFolderExist() {
   if (!node_fs.existsSync(r("node_modules/.evd"))) {
@@ -507,4 +568,4 @@ async function installPrebuilt(configs) {
 }
 commander.program.description(
   "Electron 版本部署 CLI，简化你的 Electron 软件更新，让一切变得简单。"
-).helpOption("-h, --help", "使用帮助").version("0.0.17", "-V, --version", "显示版本号").parse(process.argv);
+).helpOption("-h, --help", "使用帮助").version("0.1.0", "-V, --version", "显示版本号").parse(process.argv);

package/dist/main.d.ts

@@ -7,13 +7,14 @@ export declare enum EVDEventEnum {
 }
 type EVDInitPropsType = {
     netlifyUrl: string;
+    remoteUrl: string;
     windowWidth?: number;
     windowHeight?: number;
     logo?: string;
     detectionFrequency?: number;
     detectAtStart?: boolean;
     onError?: (err: unknown) => void;
-    onBeforeNewPkgInstall?: (next: () => any) => void;
+    onBeforeNewPkgInstall?: (next: () => any, version: string) => void;
 };
 export declare function EVDInit(props: EVDInitPropsType): void;
 export declare function EVDCheckUpdate(): Promise<boolean>;

package/dist/main.js

@@ -82,6 +82,12 @@ var EVDEventEnum = /* @__PURE__ */ ((EVDEventEnum2) => {
 let globalArgs = null;
 let cacheCurrentPkgJSON = null;
 function EVDInit(props) {
+  if (props.netlifyUrl) {
+    props.remoteUrl = props.netlifyUrl;
+    console.warn(
+      "EVDInit 中的 netlifyUrl 参数已废弃，将会在下个主版本更新时删除，请使用 remoteUrl 代替"
+    );
+  }
   globalArgs = props;
   const { detectionFrequency, detectAtStart, onError } = getConfigs();
   setInterval(async () => {
@@ -106,11 +112,11 @@ function EVDInit(props) {
   );
 }
 async function EVDCheckUpdate() {
-  const { netlifyUrl } = getConfigs();
+  const { remoteUrl } = getConfigs();
   const { version } = cacheCurrentPkgJSON;
-  const remoteJSON = await fetchRemotePkgJSON(netlifyUrl);
+  const remoteJSON = await fetchRemotePkgJSON(remoteUrl);
   if (!remoteJSON)
-    throw new Error(`${netlifyUrl}package.json 文件不存在`);
+    throw new Error(`${remoteUrl}package.json 文件不存在`);
   const localVersion = versionToNum(version);
   const remoteVersion = versionToNum(remoteJSON.version);
   if (remoteVersion > localVersion) {
@@ -177,15 +183,15 @@ async function showNewVersionDialog() {
       promptWindow.once("close", () => {
         cleanup(promptWindow);
       });
-      bindEvent(promptWindow);
+      bindEvent(promptWindow, onError);
     } catch (e) {
       onError(e);
     }
   });
 }
 async function installNewVersion() {
-  const { netlifyUrl, onError } = getConfigs();
-  const remoteJSON = await fetchRemotePkgJSON(netlifyUrl);
+  const { remoteUrl, onError } = getConfigs();
+  const remoteJSON = await fetchRemotePkgJSON(remoteUrl);
   const needInstallFullSize = compareObjectsIsEqual(
     remoteJSON.dependencies,
     cacheCurrentPkgJSON.dependencies
@@ -197,7 +203,7 @@ async function installNewVersion() {
   }
 }
 async function installPkg(zipFile) {
-  const { netlifyUrl } = getConfigs();
+  const { remoteUrl } = getConfigs();
   const appPath = electron.app.getAppPath();
   const unzipPath = node_path.join(appPath, "evdUnzip");
   const installerFile = node_path.join(appPath, "_evdInstallerTmp.js");
@@ -211,7 +217,7 @@ async function installPkg(zipFile) {
   node_fs.mkdirSync(unzipPath);
   const tmpZipFilePath = node_fs.createWriteStream(unzipPath + ".zip");
   await new Promise(
-    (res, rej) => node_https.get(`${netlifyUrl}/${zipFile}`, (response) => {
+    (res, rej) => node_https.get(`${remoteUrl}/${zipFile}`, (response) => {
       response.pipe(tmpZipFilePath).on("finish", () => {
         res();
       }).on("error", (err) => {
@@ -249,8 +255,8 @@ async function installPkg(zipFile) {
     new Promise((res) => setTimeout(res, 5 * 60 * 1e3))
   ]);
 }
-function bindEvent(promptWindow) {
-  const { logo, onBeforeNewPkgInstall } = getConfigs();
+function bindEvent(promptWindow, onError) {
+  const { logo, onBeforeNewPkgInstall, remoteUrl } = getConfigs();
   electron.ipcMain.on("evd-open-link", (_, link) => {
     electron.shell.openExternal(link);
   });
@@ -258,20 +264,24 @@ function bindEvent(promptWindow) {
     promptWindow.close();
   });
   electron.ipcMain.on("evd-update-now", (_) => {
-    onBeforeNewPkgInstall(() => {
-      installNewVersion().then(() => {
-        promptWindow.close();
-        electron.app.relaunch();
-        electron.app.exit();
-      });
+    fetchRemotePkgJSON(remoteUrl).then((pkg) => {
+      onBeforeNewPkgInstall(() => {
+        installNewVersion().then(() => {
+          setTimeout(() => promptWindow.close(), 1);
+          setTimeout(() => electron.app.relaunch(), 1);
+          setTimeout(() => electron.app.exit(), 1);
+        }).catch((e) => {
+          onError(e);
+        });
+      }, pkg.version);
     });
   });
   electron.ipcMain.handle("evd-get-logo", () => {
     return logo;
   });
   electron.ipcMain.handle("evd-get-change-logs", async () => {
-    const { netlifyUrl } = getConfigs();
-    return await fetchRemoteChangelogJSON(netlifyUrl);
+    const { remoteUrl: remoteUrl2 } = getConfigs();
+    return await fetchRemoteChangelogJSON(remoteUrl2);
   });
 }
 function cleanup(promptWindow) {
@@ -297,9 +307,7 @@ function cleanup(promptWindow) {
   );
   try {
     promptWindow == null ? void 0 : promptWindow.focus();
-    if (promptWindow) {
-      promptWindow.destroy();
-    }
+    promptWindow == null ? void 0 : promptWindow.destroy();
   } catch (e) {
   }
 }
@@ -310,7 +318,7 @@ function getConfigs() {
     ...{
       onError: () => {
       },
-      onBeforeNewPkgInstall: (next) => {
+      onBeforeNewPkgInstall: (next, version) => {
         next();
       },
       windowHeight: 360,

package/dist/templates/evd.config.ts

@@ -15,5 +15,10 @@ export default defineEVDConfig({
     token: __netlify_token__,
     siteID: __netlify_siteID__,
   },
+  cloudflare: {
+    url: __cloudflare_url__,
+    token: __cloudflare_token__,
+    projectName: __cloudflare_projectName__,
+  },
   prebuiltConfig: {},
 });

package/dist/types/EVDConfigType.d.ts

@@ -11,10 +11,15 @@ export type EVDConfigType = {
         codes: string;
         packageJSON: string;
     };
-    netlify: {
+    netlify?: {
         url: string;
         token: string;
         siteID: string;
     };
+    cloudflare?: {
+        url: string;
+        token: string;
+        projectName: string;
+    };
     prebuiltConfig: PrebuiltConfigType;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "electron-version-deployer-cli",
   "private": false,
-  "version": "0.0.17",
+  "version": "0.1.0",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.es.js",
@@ -18,23 +18,24 @@
     "dist"
   ],
   "devDependencies": {
+    "@inquirer/prompts": "^1.2.3",
     "@types/archiver": "^5.3.2",
     "@types/node": "^20.2.5",
-    "electron": "^25.0.1",
-    "prettier": "^2.8.8",
-    "tsc-alias": "^1.8.6",
-    "typescript": "^5.0.2",
-    "vite": "^4.3.9",
-    "@inquirer/prompts": "^1.2.3",
     "changelog-parser": "^3.0.1",
     "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",
     "marked": "^5.0.4",
-    "netlify-cli": "^15.2.0"
+    "netlify-cli": "^15.2.0",
+    "prettier": "^2.8.8",
+    "tsc-alias": "^1.8.6",
+    "typescript": "^5.0.2",
+    "vite": "^4.3.9",
+    "wrangler": "^3.3.0"
   },
   "dependencies": {
     "archiver": "^5.3.1",
@@ -42,17 +43,18 @@
     "pkg-up": "3.1.0"
   },
   "peerDependencies": {
-    "electron": ">=10.0.0",
     "@inquirer/prompts": "^1.2.3",
     "changelog-parser": "^3.0.1",
     "commander": "^10.0.1",
     "dompurify": "^3.0.3",
     "download": "^8.0.0",
+    "electron": ">=10.0.0",
     "esno": "^0.16.3",
     "jsdom": "^22.1.0",
     "log-symbols": "=4.1.0",
     "marked": "^5.0.4",
     "netlify-cli": "^15.2.0",
-    "vite": "^4.3.9"
+    "vite": "^4.3.9",
+    "wrangler": "^3.3.0"
   }
 }