electron-version-deployer-cli 0.0.10 → 0.0.12

package/dist/cli.cjs

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

package/dist/installer.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/main.js

@@ -6,6 +6,7 @@ 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");
 function fetchRemoteChangelogJSON(remote_url) {
   return new Promise((res, rej) => {
     node_https.get(`${remote_url}/changelog.json`, (_res) => {
@@ -68,6 +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 id = `${Date.now()}-${Math.random()}`;
 var EVDEventEnum = /* @__PURE__ */ ((EVDEventEnum2) => {
   EVDEventEnum2["OPEN_LINK"] = "evd-open-link";
@@ -187,6 +189,7 @@ async function installPkg(zipFile) {
   const { netlifyUrl } = getConfigs();
   const appPath = electron.app.getAppPath();
   const unzipPath = node_path.join(appPath, "evdUnzip");
+  const installerFile = node_path.join(appPath, "_evdInstallerTmp.js");
   if (node_fs.existsSync(unzipPath)) {
     node_fs.rmSync(unzipPath, {
       force: true,
@@ -209,8 +212,27 @@ async function installPkg(zipFile) {
   );
   await extract(unzipPath + ".zip", { dir: unzipPath });
   await new Promise((res) => setTimeout(res, 1e3));
-  copyFolderRecursiveSync(unzipPath, appPath);
+  node_fs.writeFileSync(
+    installerFile,
+    Object.entries({
+      __unzipPath__: unzipPath,
+      __appPath__: appPath
+    }).reduce((prev, current) => {
+      const [key, value] = current;
+      return prev.replace(key, value.split(node_path.sep).join("/"));
+    }, installerCodeStr)
+  );
   await new Promise((res) => setTimeout(res, 1e3));
+  const child = node_child_process.fork(node_path.join(appPath, "_evdInstallerTmp.js"), {
+    cwd: appPath,
+    stdio: "inherit"
+  });
+  await Promise.race([
+    new Promise((res) => {
+      child.on("exit", () => res);
+    }),
+    new Promise((res) => setTimeout(res, 10 * 1e3))
+  ]);
 }
 function bindEvent(promptWindow) {
   const { logo, onBeforeNewPkgInstall } = getConfigs();
@@ -283,30 +305,6 @@ function getConfigs() {
     ...globalArgs
   };
 }
-function copyFileSync(source, target) {
-  let targetFile = target;
-  if (node_fs.existsSync(target)) {
-    if (node_fs.statSync(target).isDirectory()) {
-      targetFile = node_path.join(target, node_path.basename(source));
-    }
-  }
-  node_fs.writeFileSync(targetFile, node_fs.readFileSync(source));
-}
-function copyFolderRecursiveSync(source, target) {
-  if (!node_fs.existsSync(target)) {
-    node_fs.mkdirSync(target);
-  }
-  const files = node_fs.readdirSync(source);
-  files.forEach((file) => {
-    const sourcePath = node_path.join(source, file);
-    const targetPath = node_path.join(target, file);
-    if (node_fs.statSync(sourcePath).isDirectory()) {
-      copyFolderRecursiveSync(sourcePath, targetPath);
-    } else {
-      copyFileSync(sourcePath, targetPath);
-    }
-  });
-}
 exports.EVDCheckUpdate = EVDCheckUpdate;
 exports.EVDEventEnum = EVDEventEnum;
 exports.EVDInit = EVDInit;

package/package.json

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