electron-version-deployer-cli 0.0.16 → 0.0.18

package/dist/cli.cjs

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

package/dist/main.js

@@ -6,7 +6,6 @@ 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_child_process = require("node:child_process");
 const node_process = require("node:process");
 function fetchRemoteChangelogJSON(remote_url) {
   return new Promise((res, rej) => {
@@ -70,7 +69,7 @@ function compareObjectsIsEqual(obj1, obj2) {
   return true;
 }
 const CLI_NAME = "electron-version-deployer-cli";
-const installerCodeStr = '//  该文件用于 fork 使用，将会写入到\n//  app.getAppPath() + \'/_evdInstallerTmp.js\' 路径中\n//  从避免 window 上替换时出现的资源占用问题\nconst {\n  existsSync,\n  mkdirSync,\n  readdirSync,\n  statSync,\n  appendFileSync,\n  writeFileSync,\n  readFileSync,\n} = require("fs");\nconst { join, resolve, basename } = require("node:path");\n\nsetTimeout(() => {\n  try {\n    copyFolderRecursiveSync("__unzipPath__", "__appPath__");\n  } catch (error) {\n    appendFileSync(\n      resolve(__dirname, "evdInstallerErrors.txt"),\n      `\n        ${new Date().toString()}\\n\n        ${error.toString()}\\n\n        -- stack\\n\n        ${error.stack}\\n\n        ----------------------------------------------------------------\\n\n      `\n    );\n  }\n}, 1);\n\n// 复制文件夹及其内容的函数\nfunction copyFolderRecursiveSync(source, target) {\n  // 如果目标目录不存在，则创建目标目录\n  if (!existsSync(target)) {\n    mkdirSync(target);\n  }\n\n  // 获取源目录的文件列表\n  const files = readdirSync(source);\n\n  // 遍历文件列表，处理每个文件或子目录\n  files.forEach((file) => {\n    const sourcePath = join(source, file);\n    const targetPath = join(target, file);\n\n    // 如果当前文件是文件夹，则递归复制文件夹\n    if (statSync(sourcePath).isDirectory()) {\n      copyFolderRecursiveSync(sourcePath, targetPath);\n    } else {\n      // 否则，复制文件\n      try {\n        copyFileSync(sourcePath, targetPath);\n      } catch (error) {\n        appendFileSync(\n          resolve(__dirname, "evdInstallerErrors.txt"),\n          `\n        ${new Date().toString()}\\n\n        ${error.toString()}\\n\n        -- stack\\n\n        ${error.stack}\\n\n        ----------------------------------------------------------------\\n\n      `\n        );\n      }\n    }\n  });\n}\n\nfunction copyFileSync(source, target) {\n  let targetFile = target;\n\n  if (existsSync(target)) {\n    if (statSync(target).isDirectory()) {\n      targetFile = join(target, basename(source));\n    }\n  }\n\n  writeFileSync(targetFile, readFileSync(source));\n}\n';
+const installerCodeStr = '//  该文件用于 fork 使用，将会写入到\n//  app.getAppPath() + \'/_evdInstallerTmp.js\' 路径中\n//  从避免 window 上替换时出现的资源占用问题\nconst {\n  existsSync,\n  mkdirSync,\n  readdirSync,\n  statSync,\n  appendFileSync,\n  writeFileSync,\n  readFileSync,\n} = require("fs");\nconst { join, resolve, basename } = require("node:path");\n\ntry {\n  copyFolderRecursiveSync("__unzipPath__", "__appPath__");\n  process.parentPort.postMessage("exitManually");\n  process.exit(0);\n} catch (error) {\n  appendFileSync(\n    resolve(__dirname, "evdInstallerErrors.txt"),\n    `\n        ${new Date().toString()}\\n\n        ${error.toString()}\\n\n        -- stack\\n\n        ${error.stack}\\n\n        ----------------------------------------------------------------\\n\n      `\n  );\n  process.parentPort.postMessage("exitManually");\n  process.exit(0);\n}\n\n// 复制文件夹及其内容的函数\nfunction copyFolderRecursiveSync(source, target) {\n  // 如果目标目录不存在，则创建目标目录\n  if (!existsSync(target)) {\n    mkdirSync(target);\n  }\n\n  // 获取源目录的文件列表\n  const files = readdirSync(source);\n\n  // 遍历文件列表，处理每个文件或子目录\n  files.forEach((file) => {\n    const sourcePath = join(source, file);\n    const targetPath = join(target, file);\n\n    // 如果当前文件是文件夹，则递归复制文件夹\n    if (statSync(sourcePath).isDirectory()) {\n      copyFolderRecursiveSync(sourcePath, targetPath);\n    } else {\n      // 否则，复制文件\n      try {\n        copyFileSync(sourcePath, targetPath);\n      } catch (error) {\n        appendFileSync(\n          resolve(__dirname, "evdInstallerErrors.txt"),\n          `\n        ${new Date().toString()}\\n\n        ${error.toString()}\\n\n        -- stack\\n\n        ${error.stack}\\n\n        ----------------------------------------------------------------\\n\n      `\n        );\n      }\n    }\n  });\n}\n\nfunction copyFileSync(source, target) {\n  let targetFile = target;\n\n  if (existsSync(target)) {\n    if (statSync(target).isDirectory()) {\n      targetFile = join(target, basename(source));\n    }\n  }\n\n  writeFileSync(targetFile, readFileSync(source));\n}\n';
 const id = `${Date.now()}-${Math.random()}`;
 var EVDEventEnum = /* @__PURE__ */ ((EVDEventEnum2) => {
   EVDEventEnum2["OPEN_LINK"] = "evd-open-link";
@@ -178,7 +177,7 @@ async function showNewVersionDialog() {
       promptWindow.once("close", () => {
         cleanup(promptWindow);
       });
-      bindEvent(promptWindow);
+      bindEvent(promptWindow, onError);
     } catch (e) {
       onError(e);
     }
@@ -235,18 +234,22 @@ async function installPkg(zipFile) {
     }, installerCodeStr)
   );
   await new Promise((res) => setTimeout(res, 1e3));
-  const child = node_child_process.fork(node_path.join(appPath, "_evdInstallerTmp.js"), {
-    cwd: appPath,
-    stdio: "inherit"
-  });
+  const child = electron.utilityProcess.fork(node_path.join(appPath, "_evdInstallerTmp.js"));
   await Promise.race([
     new Promise((res) => {
       child.on("exit", () => res);
     }),
-    new Promise((res) => setTimeout(res, 2 * 60 * 1e3))
+    new Promise((res) => {
+      child.on("message", (msg) => {
+        if (msg === "exitManually") {
+          res(void 0);
+        }
+      });
+    }),
+    new Promise((res) => setTimeout(res, 5 * 60 * 1e3))
   ]);
 }
-function bindEvent(promptWindow) {
+function bindEvent(promptWindow, onError) {
   const { logo, onBeforeNewPkgInstall } = getConfigs();
   electron.ipcMain.on("evd-open-link", (_, link) => {
     electron.shell.openExternal(link);
@@ -257,9 +260,11 @@ function bindEvent(promptWindow) {
   electron.ipcMain.on("evd-update-now", (_) => {
     onBeforeNewPkgInstall(() => {
       installNewVersion().then(() => {
-        promptWindow.close();
-        electron.app.relaunch();
-        electron.app.exit();
+        setTimeout(() => promptWindow.close(), 1);
+        setTimeout(() => electron.app.relaunch(), 1);
+        setTimeout(() => electron.app.exit(), 1);
+      }).catch((e) => {
+        onError(e);
       });
     });
   });
@@ -294,9 +299,7 @@ function cleanup(promptWindow) {
   );
   try {
     promptWindow == null ? void 0 : promptWindow.focus();
-    if (promptWindow) {
-      promptWindow.destroy();
-    }
+    promptWindow == null ? void 0 : promptWindow.destroy();
   } catch (e) {
   }
 }

package/package.json

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