electron-version-deployer-cli 0.0.11 → 0.0.13

package/dist/cli.cjs

@@ -15,6 +15,7 @@ const jsdom = require("jsdom");
 const DOMPurify = require("dompurify");
 const archiver = require("archiver");
 const node_https = require("node:https");
+const node_os = require("node:os");
 const download = require("download");
 const pkgPath = pkgUp.sync();
 function r(...paths) {
@@ -382,7 +383,8 @@ commander.program.command("deploy").description("执行部署").action(async (so
 });
 async function deploy(configs) {
   console.log(logSymbols.info, "开始部署", r());
-  const output = node_child_process.spawn("netlify", [
+  const cmd = node_os.platform() === "win32" ? "netlify.cmd" : "netlify";
+  const output = node_child_process.spawn(cmd, [
     "deploy",
     "--dir",
     r("node_modules/.evd"),
@@ -495,4 +497,4 @@ async function installPrebuilt(configs) {
 }
 commander.program.description(
   "Electron 版本部署 CLI，简化你的 Electron 软件更新，让一切变得简单。"
-).helpOption("-h, --help", "使用帮助").version("0.0.11", "-V, --version", "显示版本号").parse(process.argv);
+).helpOption("-h, --help", "使用帮助").version("0.0.13", "-V, --version", "显示版本号").parse(process.argv);

package/dist/main.js

@@ -69,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      copyFileSync(sourcePath, targetPath);\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\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 id = `${Date.now()}-${Math.random()}`;
 var EVDEventEnum = /* @__PURE__ */ ((EVDEventEnum2) => {
   EVDEventEnum2["OPEN_LINK"] = "evd-open-link";
@@ -219,15 +219,20 @@ async function installPkg(zipFile) {
       __appPath__: appPath
     }).reduce((prev, current) => {
       const [key, value] = current;
-      return prev.replace(key, value);
+      return prev.replace(key, value.split(node_path.sep).join("/"));
     }, installerCodeStr)
   );
   await new Promise((res) => setTimeout(res, 1e3));
-  node_child_process.fork(node_path.join(appPath, "_evdInstallerTmp.js"), {
+  const child = node_child_process.fork(node_path.join(appPath, "_evdInstallerTmp.js"), {
     cwd: appPath,
     stdio: "inherit"
   });
-  await new Promise((res) => setTimeout(res, 5e3));
+  await Promise.race([
+    new Promise((res) => {
+      child.on("exit", () => res);
+    }),
+    new Promise((res) => setTimeout(res, 10 * 1e3))
+  ]);
 }
 function bindEvent(promptWindow) {
   const { logo, onBeforeNewPkgInstall } = getConfigs();

package/package.json

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