npm - electron-version-deployer-cli - Versions diffs - 0.0.1 → 0.0.3 - Mend

electron-version-deployer-cli 0.0.1 → 0.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/dist/cli.cjs +1 -1
package/dist/main.d.ts +2 -1
package/dist/{main.cjs.js → main.js} +15 -16
package/dist/templates/newVersionDialog.html +148 -140
package/package.json +4 -2
package/dist/main.es.js +0 -306

package/dist/cli.cjs CHANGED Viewed

@@ -493,4 +493,4 @@ async function installPrebuilt(configs) {
 }
 commander.program.description(
   "Electron 版本部署 CLI，简化你的 Electron 软件更新，让一切变得简单。"
-).helpOption("-h, --help", "使用帮助").version("0.0.1", "-V, --version", "显示版本号").parse(process.argv);
+).helpOption("-h, --help", "使用帮助").version("0.0.3", "-V, --version", "显示版本号").parse(process.argv);

package/dist/main.d.ts CHANGED Viewed

@@ -2,7 +2,8 @@ export declare enum EVDEventEnum {
     OPEN_LINK = "evd-open-link",
     UPDATE = "evd-update-now",
     SKIP = "evd-skip",
-    GET_CHANGELOGS = "evd-get-change-logs"
+    GET_CHANGELOGS = "evd-get-change-logs",
+    GET_LOGO = "evd-get-logo"
 }
 type EVDInitPropsType = {
     netlifyUrl: string;

package/dist/{main.cjs.js → main.js} RENAMED Viewed

@@ -74,6 +74,7 @@ var EVDEventEnum = /* @__PURE__ */ ((EVDEventEnum2) => {
   EVDEventEnum2["UPDATE"] = "evd-update-now";
   EVDEventEnum2["SKIP"] = "evd-skip";
   EVDEventEnum2["GET_CHANGELOGS"] = "evd-get-change-logs";
+  EVDEventEnum2["GET_LOGO"] = "evd-get-logo";
   return EVDEventEnum2;
 })(EVDEventEnum || {});
 let globalArgs = null;
@@ -167,7 +168,7 @@ async function showNewVersionDialog() {
   });
 }
 async function installNewVersion() {
-  const { netlifyUrl } = getConfigs();
+  const { netlifyUrl, onError } = getConfigs();
   const remoteJSON = await fetchRemotePkgJSON(netlifyUrl);
   const needInstallFullSize = compareObjectsIsEqual(
     remoteJSON.dependencies,
@@ -176,21 +177,7 @@ async function installNewVersion() {
   try {
     await installPkg(needInstallFullSize ? "fullCode.zip" : "logicCode.zip");
   } catch (error) {
-    node_fs.appendFileSync(
-      node_path.join(electron.app.getPath("userData"), "evd-runtime-error.txt"),
-      `
-    ${(/* @__PURE__ */ new Date()).toString()}
-    ${error.toString()}
-    -- stack
-    ${error.stack}
-    ----------------------------------------------------------------
-  `
-    );
+    onError(error);
   }
 }
 async function installPkg(zipFile) {
@@ -223,6 +210,7 @@ async function installPkg(zipFile) {
   await new Promise((res) => setTimeout(res, 1e3));
 }
 function bindEvent(promptWindow) {
+  const { logo } = getConfigs();
   electron.ipcMain.on("evd-open-link", (_, link) => {
     electron.shell.openExternal(link);
   });
@@ -237,6 +225,9 @@ function bindEvent(promptWindow) {
       electron.app.exit();
     });
   });
+  electron.ipcMain.handle("evd-get-logo", () => {
+    return logo;
+  });
   electron.ipcMain.handle("evd-get-change-logs", async () => {
     const { netlifyUrl } = getConfigs();
     return await fetchRemoteChangelogJSON(netlifyUrl);
@@ -255,6 +246,14 @@ function cleanup(promptWindow) {
     "evd-update-now"
     /* UPDATE */
   );
+  electron.ipcMain.removeHandler(
+    "evd-get-change-logs"
+    /* GET_CHANGELOGS */
+  );
+  electron.ipcMain.removeHandler(
+    "evd-get-logo"
+    /* GET_LOGO */
+  );
   promptWindow == null ? void 0 : promptWindow.focus();
   if (promptWindow) {
     promptWindow.destroy();

package/dist/templates/newVersionDialog.html CHANGED Viewed

@@ -1,163 +1,171 @@
 <!DOCTYPE html>
 <html lang="zh">
-<head>
+  <head>
     <meta charset="UTF-8" />
     <meta
-            name="viewport"
-            content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"
+      name="viewport"
+      content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"
     />
     <link
-            rel="icon"
-            type="image/png"
-            sizes="32x32"
-            href="https://chat.openai.com/favicon-32x32.png"
+      rel="icon"
+      type="image/png"
+      sizes="32x32"
+      href="https://chat.openai.com/favicon-32x32.png"
     />
     <meta http-equiv="X-UA-Compatible" content="ie=edge" />
     <title>有可用的更新 (4.3.5)</title>
     <style>
-        * {
-            margin: 0;
-            padding: 0;
-        }
-        body {
-            font-family: -apple-system, Helvetica, Arial, sans-serif,
-            "Microsoft YaHei", "ST Heiti";
-            color: #333;
-            padding: 20px;
-            background-color: #f5f5f5;
-        }
-        .title {
-            font-size: 18px;
-            font-weight: bold;
-            margin-bottom: 10px;
-        }
-        .content {
-            margin-top: 8px;
-            margin-bottom: 12px;
-            margin-left: -20px;
-            margin-right: -20px;
-            height: 200px;
-            overflow: auto;
-            padding: 0 20px;
-        }
-        .content ul {
-            padding-left: 20px;
-            margin-top: 5px;
-            margin-bottom: 10px;
-        }
-        .content ul li {
-            margin-bottom: 4px;
-        }
-        .buttons-box {
-            display: flex;
-            justify-content: flex-end;
-        }
-        .buttons-box button {
-            padding: 10px 20px;
-            font-size: 14px;
-            font-weight: bold;
-            border-radius: 5px;
-            border: none;
-            cursor: pointer;
-            margin-left: 12px;
-        }
-        .buttons-box button:first-child {
-            background-color: #007bff;
-            color: #fff;
-        }
-        .buttons-box button:last-child {
-            background-color: #ccc;
-            color: #333;
-        }
+      * {
+        margin: 0;
+        padding: 0;
+      }
+      body {
+        font-family: -apple-system, Helvetica, Arial, sans-serif,
+          "Microsoft YaHei", "ST Heiti";
+        color: #333;
+        padding: 20px;
+        background-color: #f5f5f5;
+      }
+      .title {
+        font-size: 18px;
+        font-weight: bold;
+        margin-bottom: 10px;
+      }
+      .content {
+        margin-top: 8px;
+        margin-bottom: 12px;
+        margin-left: -20px;
+        margin-right: -20px;
+        height: 200px;
+        overflow: auto;
+        padding: 0 20px;
+      }
+      .content ul {
+        padding-left: 20px;
+        margin-top: 5px;
+        margin-bottom: 10px;
+      }
+      .content ul li {
+        margin-bottom: 4px;
+      }
+      .buttons-box {
+        display: flex;
+        justify-content: flex-end;
+      }
+      .buttons-box button {
+        padding: 10px 20px;
+        font-size: 14px;
+        font-weight: bold;
+        border-radius: 5px;
+        border: none;
+        cursor: pointer;
+        margin-left: 12px;
+      }
+      .buttons-box button:first-child {
+        background-color: #007bff;
+        color: #fff;
+      }
+      .buttons-box button:last-child {
+        background-color: #ccc;
+        color: #333;
+      }
+      .buttons-box button:first-child:hover {
+        background-color: #0056b3;
+      }
+      .buttons-box button:last-child:hover {
+        background-color: #b3b3b3;
+      }
+      .title-bar {
+        display: flex;
+        flex-direction: row;
+        justify-content: flex-start;
+        align-items: center;
+      }
+      .title-bar img {
+        margin-right: 8px;
+      }
+      .loading-box {
+        position: fixed;
+        left: 0;
+        top: 0;
+        bottom: 0;
+        right: 0;
+        background: rgba(255, 255, 255, 0.9);
+        font-size: 18px;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        display: none;
+        font-weight: bold;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="loading-box">软件更新中……</div>
+    <div class="title-bar">
+      <img src="" width="28" class="logo" style="display: none" />
+      <span>有可用的新版本：</span>
+    </div>
+    <div class="content">具体更新内容请查看 Changelogs</div>
+    <div class="buttons-box">
+      <button id="updateBtn">现在更新</button>
+      <button id="skipBtn">稍后再提醒我</button>
+    </div>
+    <script>
+      const { ipcRenderer } = require("electron");
+      document.querySelector("#updateBtn").addEventListener("click", () => {
+        ipcRenderer.send("evd-update-now");
+        document.querySelector(".loading-box").style.display = "flex";
+      });
-        .buttons-box button:first-child:hover {
-            background-color: #0056b3;
-        }
+      document.querySelector("#skipBtn").addEventListener("click", () => {
+        ipcRenderer.send("evd-skip");
+      });
-        .buttons-box button:last-child:hover {
-            background-color: #b3b3b3;
+      ipcRenderer.invoke("evd-get-logo").then((link) => {
+        if (link) {
+          const imgRef = document.querySelector(".logo");
+          imgRef.src = link;
+          imgRef.style.display = "inline-block";
         }
+      });
-        .title-bar {
-            display: flex;
-            flex-direction: row;
-            justify-content: flex-start;
-            align-items: center;
-        }
+      ipcRenderer.invoke("evd-get-change-logs").then((data) => {
+        //  如果没有数据就不渲染
+        if (!data) return;
-        .title-bar img {
-            margin-right: 8px;
-        }
+        const contentRef = document.querySelector(".content");
-        .loading-box {
-            position: fixed;
-            left: 0;
-            top: 0;
-            bottom: 0;
-            right: 0;
-            background: rgba(255, 255, 255, 0.9);
-            font-size: 18px;
-            flex-direction: row;
-            align-items: center;
-            justify-content: center;
-            display: none;
-            font-weight: bold;
-        }
-    </style>
-</head>
-<body>
-<div class="loading-box">软件更新中……</div>
-<div class="title-bar">
-    <img src="https://chat.openai.com/favicon-32x32.png" width="28" alt="" />
-    <span>有可用的新版本：</span>
-</div>
-<div class="content">具体更新内容请查看 Changelogs</div>
-<div class="buttons-box">
-    <button id="updateBtn">现在更新</button>
-    <button id="skipBtn">稍后再提醒我</button>
-</div>
-<script>
-  const { ipcRenderer } = require("electron");
-  document.querySelector("#updateBtn").addEventListener("click", () => {
-    ipcRenderer.send("evd-update-now");
-    document.querySelector(".loading-box").style.display = "flex";
-  });
-  document.querySelector("#skipBtn").addEventListener("click", () => {
-    ipcRenderer.send("evd-skip");
-  });
-  ipcRenderer.invoke("evd-get-change-logs").then((data) => {
-    //  如果没有数据就不渲染
-    if (!data) return;
-    const contentRef = document.querySelector(".content");
-    contentRef.innerHTML = `
+        contentRef.innerHTML = `
         <p class="title">${data.title}</p>
         ${data.changes}
         `;
-    //  监听所有 A 链接点击
-    Array.from(document.querySelectorAll("a")).map((a) => {
-      a.addEventListener("click", (ev) => {
-        ev.preventDefault();
+        //  监听所有 A 链接点击
+        Array.from(document.querySelectorAll("a")).map((a) => {
+          a.addEventListener("click", (ev) => {
+            ev.preventDefault();
-        ipcRenderer.send("evd-open-link", ev.target.href);
+            ipcRenderer.send("evd-open-link", ev.target.href);
+          });
+        });
       });
-    });
-  });
-</script>
-</body>
+    </script>
+  </body>
 </html>

package/package.json CHANGED Viewed

@@ -1,13 +1,15 @@
 {
   "name": "electron-version-deployer-cli",
   "private": false,
-  "version": "0.0.1",
+  "version": "0.0.3",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.es.js",
   "scripts": {
     "serve": "esno ./watch.ts",
-    "build": "MODE=production esno ./watch.ts && tsc -p ./tsconfig.dist.json -emitDeclarationOnly && tsc-alias -p ./tsconfig.dist.json"
+    "build": "MODE=production esno ./watch.ts && tsc -p ./tsconfig.dist.json -emitDeclarationOnly && tsc-alias -p ./tsconfig.dist.json",
+    "format": "npx prettier --write \"**/*.{js,mjs,cjs,ts,tsx,jsx,json,html}\"",
+    "typecheck": "tsc -p tsconfig.json"
   },
   "bin": {
     "evd": "./dist/cli.cjs"

package/dist/main.es.js DELETED Viewed

@@ -1,306 +0,0 @@
-import { app, BrowserWindow, ipcMain, shell } from "electron";
-import { format } from "node:url";
-import { join, basename } from "node:path";
-import { get } from "node:https";
-import { readFileSync, appendFileSync, existsSync, rmSync, mkdirSync, createWriteStream, readdirSync, statSync, writeFileSync } from "node:fs";
-import extract from "extract-zip";
-function fetchRemoteChangelogJSON(remote_url) {
-  return new Promise((res, rej) => {
-    get(`${remote_url}/changelog.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(`获取 changelog.json 失败:` + err.toString());
-    });
-  });
-}
-function fetchRemotePkgJSON(remote_url) {
-  return new Promise((res, rej) => {
-    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());
-    });
-  });
-}
-function versionToNum(a) {
-  let c = a.split(".");
-  let num_place = ["", "0", "00", "000", "0000"], r = num_place.reverse();
-  for (let i = 0; i < c.length; i++) {
-    let len = c[i].length;
-    c[i] = r[len] + c[i];
-  }
-  let res = c.join("");
-  return res;
-}
-function compareObjectsIsEqual(obj1, obj2) {
-  const keys1 = Object.keys(obj1);
-  const keys2 = Object.keys(obj2);
-  if (keys1.length !== keys2.length) {
-    return false;
-  }
-  for (let key of keys1) {
-    if (obj1[key] !== obj2[key]) {
-      return false;
-    }
-  }
-  return true;
-}
-const CLI_NAME = "electron-version-deployer-cli";
-const id = `${Date.now()}-${Math.random()}`;
-var EVDEventEnum = /* @__PURE__ */ ((EVDEventEnum2) => {
-  EVDEventEnum2["OPEN_LINK"] = "evd-open-link";
-  EVDEventEnum2["UPDATE"] = "evd-update-now";
-  EVDEventEnum2["SKIP"] = "evd-skip";
-  EVDEventEnum2["GET_CHANGELOGS"] = "evd-get-change-logs";
-  return EVDEventEnum2;
-})(EVDEventEnum || {});
-let globalArgs = null;
-let cacheCurrentPkgJSON = null;
-function EVDInit(props) {
-  globalArgs = props;
-  const { detectionFrequency, detectAtStart, onError } = getConfigs();
-  setInterval(async () => {
-    try {
-      await EVDCheckUpdate();
-    } catch (e) {
-      onError(e);
-    }
-  }, 1e3 * detectionFrequency);
-  if (!detectAtStart)
-    return;
-  setTimeout(async () => {
-    try {
-      await EVDCheckUpdate();
-    } catch (e) {
-      onError(e);
-    }
-  }, 1e3 * 2);
-  const appPath = app.getAppPath();
-  cacheCurrentPkgJSON = JSON.parse(
-    readFileSync(join(appPath, "package.json"), "utf-8")
-  );
-}
-async function EVDCheckUpdate() {
-  const { netlifyUrl } = getConfigs();
-  const { version } = cacheCurrentPkgJSON;
-  const remoteJSON = await fetchRemotePkgJSON(netlifyUrl);
-  if (!remoteJSON)
-    throw new Error(`${netlifyUrl}package.json 文件不存在`);
-  const localVersion = versionToNum(version);
-  const remoteVersion = versionToNum(remoteJSON.version);
-  if (remoteVersion > localVersion) {
-    await showNewVersionDialog();
-  }
-}
-async function showNewVersionDialog() {
-  const { windowHeight, windowWidth, onError } = getConfigs();
-  app.whenReady().then(async () => {
-    try {
-      let promptWindow = new BrowserWindow({
-        frame: true,
-        width: windowWidth,
-        height: windowHeight,
-        minWidth: windowWidth,
-        minHeight: windowHeight,
-        resizable: false,
-        minimizable: true,
-        fullscreenable: false,
-        maximizable: false,
-        skipTaskbar: true,
-        alwaysOnTop: true,
-        useContentSize: false,
-        title: "有可用的更新",
-        webPreferences: {
-          nodeIntegration: true,
-          contextIsolation: false
-        },
-        show: false
-      });
-      promptWindow.setMenu(null);
-      promptWindow.setMenuBarVisibility(false);
-      const promptUrl = format({
-        protocol: "file",
-        slashes: true,
-        pathname: join(
-          app.getAppPath(),
-          "node_modules",
-          CLI_NAME,
-          "dist",
-          "templates",
-          "newVersionDialog.html"
-        ),
-        hash: id
-      });
-      promptWindow.loadURL(promptUrl);
-      promptWindow.once("ready-to-show", () => {
-        promptWindow.show();
-      });
-      promptWindow.once("close", () => {
-        cleanup(promptWindow);
-      });
-      bindEvent(promptWindow);
-    } catch (e) {
-      onError(e);
-    }
-  });
-}
-async function installNewVersion() {
-  const { netlifyUrl } = getConfigs();
-  const remoteJSON = await fetchRemotePkgJSON(netlifyUrl);
-  const needInstallFullSize = compareObjectsIsEqual(
-    remoteJSON.dependencies,
-    cacheCurrentPkgJSON.dependencies
-  );
-  try {
-    await installPkg(needInstallFullSize ? "fullCode.zip" : "logicCode.zip");
-  } catch (error) {
-    appendFileSync(
-      join(app.getPath("userData"), "evd-runtime-error.txt"),
-      `
-    ${(/* @__PURE__ */ new Date()).toString()}
-    ${error.toString()}
-    -- stack
-    ${error.stack}
-    ----------------------------------------------------------------
-  `
-    );
-  }
-}
-async function installPkg(zipFile) {
-  const { netlifyUrl } = getConfigs();
-  const appPath = app.getAppPath();
-  const unzipPath = join(appPath, "evdUnzip");
-  if (existsSync(unzipPath)) {
-    rmSync(unzipPath, {
-      force: true,
-      maxRetries: 3,
-      recursive: true
-    });
-  }
-  mkdirSync(unzipPath);
-  const tmpZipFilePath = createWriteStream(unzipPath + ".zip");
-  await new Promise(
-    (res, rej) => get(`${netlifyUrl}/${zipFile}`, (response) => {
-      response.pipe(tmpZipFilePath).on("finish", () => {
-        res();
-      }).on("error", (err) => {
-        rej(err);
-      });
-    }).on("error", (err) => {
-      rej(err);
-    })
-  );
-  await extract(unzipPath + ".zip", { dir: unzipPath });
-  await new Promise((res) => setTimeout(res, 1e3));
-  copyFolderRecursiveSync(unzipPath, appPath);
-  await new Promise((res) => setTimeout(res, 1e3));
-}
-function bindEvent(promptWindow) {
-  ipcMain.on("evd-open-link", (_, link) => {
-    shell.openExternal(link);
-  });
-  ipcMain.on("evd-skip", (_) => {
-    promptWindow.close();
-  });
-  ipcMain.on("evd-update-now", (_) => {
-    installNewVersion().then(() => {
-      console.log(222);
-      promptWindow.close();
-      app.relaunch();
-      app.exit();
-    });
-  });
-  ipcMain.handle("evd-get-change-logs", async () => {
-    const { netlifyUrl } = getConfigs();
-    return await fetchRemoteChangelogJSON(netlifyUrl);
-  });
-}
-function cleanup(promptWindow) {
-  ipcMain.removeAllListeners(
-    "evd-open-link"
-    /* OPEN_LINK */
-  );
-  ipcMain.removeAllListeners(
-    "evd-skip"
-    /* SKIP */
-  );
-  ipcMain.removeAllListeners(
-    "evd-update-now"
-    /* UPDATE */
-  );
-  promptWindow == null ? void 0 : promptWindow.focus();
-  if (promptWindow) {
-    promptWindow.destroy();
-  }
-}
-function getConfigs() {
-  if (!globalArgs)
-    throw new Error("必须先执行 EVDInit 后才能继续运行！");
-  return {
-    ...{
-      onError: () => {
-      },
-      windowHeight: 360,
-      windowWidth: 400,
-      logo: void 0,
-      //  默认六小时检测一次
-      detectionFrequency: 60 * 60 * 6,
-      detectAtStart: true
-    },
-    ...globalArgs
-  };
-}
-function copyFileSync(source, target) {
-  let targetFile = target;
-  if (existsSync(target)) {
-    if (statSync(target).isDirectory()) {
-      targetFile = join(target, basename(source));
-    }
-  }
-  writeFileSync(targetFile, readFileSync(source));
-}
-function copyFolderRecursiveSync(source, target) {
-  if (!existsSync(target)) {
-    mkdirSync(target);
-  }
-  const files = readdirSync(source);
-  files.forEach((file) => {
-    const sourcePath = join(source, file);
-    const targetPath = join(target, file);
-    if (statSync(sourcePath).isDirectory()) {
-      copyFolderRecursiveSync(sourcePath, targetPath);
-    } else {
-      copyFileSync(sourcePath, targetPath);
-    }
-  });
-}
-export {
-  EVDCheckUpdate,
-  EVDEventEnum,
-  EVDInit
-};