electron-version-deployer-cli 0.3.6 → 0.3.8

package/dist/cli.cjs

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

package/dist/main.js

@@ -94,7 +94,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, sep, dirname, isAbsolute } = require("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    mkdirRecursiveSync(target);\n  }\n\n  // 获取源目录的文件列表\n  const files = readdirSync(source);\n\n  // 遍历文件列表，处理每个文件或子目录\n  files.forEach((folderOrFile) => {\n    const sourcePath = join(source, folderOrFile);\n    const targetPath = join(target, folderOrFile);\n\n    // 如果当前文件是文件夹，则递归复制文件夹\n    if (statSync(sourcePath).isDirectory()) {\n      if (folderOrFile === "node_modules") {\n        replaceChangedModuleSync(sourcePath, targetPath);\n      } else {\n        copyFolderRecursiveSync(sourcePath, targetPath);\n      }\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\nfunction replaceChangedModuleSync(\n  sourceNodeModulesFolder,\n  destNodeModulesFolder\n) {\n  //  读取 evdUnzip/node_modules 所有子文件\n  const fileOrFolder = readdirSync(sourceNodeModulesFolder);\n\n  // 遍历文件列表，处理每个文件或子目录\n  fileOrFolder.forEach((folderOrFileName) => {\n    const sourcePath = join(sourceNodeModulesFolder, folderOrFileName);\n    const targetPath = join(destNodeModulesFolder, folderOrFileName);\n\n    // 如果当前文件是文件夹，则判断是否要更新\n    if (statSync(sourcePath).isDirectory()) {\n      //  如果是组织文件夹比如\n      if (folderOrFileName.startsWith("@")) {\n        replaceChangedModuleSync(sourcePath, targetPath);\n      } else {\n        //  如果不存在，或者版本不一样则进行替换\n        if (shouldReplaceModule(sourcePath, targetPath)) {\n          copyFolderRecursiveSync(sourcePath, targetPath);\n        }\n      }\n    } else {\n      copyFileSync(sourcePath, targetPath);\n    }\n  });\n}\n\nfunction shouldReplaceModule(sourcePath, destPath) {\n  const sourceVersion = getPackageVersion(sourcePath);\n  const destVersion = getPackageVersion(destPath);\n  return sourceVersion !== destVersion;\n}\n\nfunction getPackageVersion(packagePath) {\n  try {\n    const packageJsonPath = join(packagePath, "package.json");\n    const packageJsonContent = readFileSync(packageJsonPath, "utf-8");\n    const packageJson = JSON.parse(packageJsonContent);\n    return packageJson.version;\n  } catch (error) {\n    console.error(`Error reading package.json in ${packagePath}:`, error);\n    return null;\n  }\n}\n\nfunction mkdirRecursiveSync(targetPath) {\n  // 将路径分割成数组\n  const initDir = isAbsolute(targetPath) ? sep : "";\n  const parts = targetPath.split(sep);\n\n  parts.forEach((part, index) => {\n    if (!part && index === 0) return; // 如果是绝对路径，跳过第一个空字符串\n    const currentPath = join(initDir, ...parts.slice(0, index + 1));\n    if (!existsSync(currentPath)) {\n      mkdirSync(currentPath);\n    }\n  });\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, sep, dirname, isAbsolute } = require("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    mkdirRecursiveSync(target);\n  }\n\n  // 获取源目录的文件列表\n  const files = readdirSync(source);\n\n  // 遍历文件列表，处理每个文件或子目录\n  files.forEach((folderOrFile) => {\n    const sourcePath = join(source, folderOrFile);\n    const targetPath = join(target, folderOrFile);\n\n    // 如果当前文件是文件夹，则递归复制文件夹\n    if (statSync(sourcePath).isDirectory()) {\n      if (folderOrFile === "node_modules") {\n        replaceChangedModuleSync(sourcePath, targetPath);\n      } else {\n        copyFolderRecursiveSync(sourcePath, targetPath);\n      }\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\nfunction replaceChangedModuleSync(\n  sourceNodeModulesFolder,\n  destNodeModulesFolder\n) {\n  //  读取 evdUnzip/node_modules 所有子文件\n  const fileOrFolder = readdirSync(sourceNodeModulesFolder);\n\n  // 遍历文件列表，处理每个文件或子目录\n  fileOrFolder.forEach((folderOrFileName) => {\n    const sourcePath = join(sourceNodeModulesFolder, folderOrFileName);\n    const targetPath = join(destNodeModulesFolder, folderOrFileName);\n\n    // 如果当前文件是文件夹，则判断是否要更新\n    if (statSync(sourcePath).isDirectory()) {\n      //  如果是组织文件夹比如\n      if (folderOrFileName.startsWith("@")) {\n        replaceChangedModuleSync(sourcePath, targetPath);\n      } else {\n        //  如果不存在，或者版本不一样则进行替换\n        if (shouldReplaceModule(sourcePath, targetPath)) {\n          copyFolderRecursiveSync(sourcePath, targetPath);\n        }\n      }\n    } else {\n      copyFileSync(sourcePath, targetPath);\n    }\n  });\n}\n\nfunction shouldReplaceModule(sourcePath, destPath) {\n  const sourceVersion = getPackageVersion(sourcePath);\n  const destVersion = getPackageVersion(destPath);\n  return sourceVersion !== destVersion;\n}\n\nfunction getPackageVersion(packagePath) {\n  try {\n    const packageJsonPath = join(packagePath, "package.json");\n    const packageJsonContent = readFileSync(packageJsonPath, "utf-8");\n    const packageJson = JSON.parse(packageJsonContent);\n    return packageJson.version;\n  } catch (error) {\n    console.error(`Error reading package.json in ${packagePath}:`, error);\n    return null;\n  }\n}\n\nfunction mkdirRecursiveSync(targetPath) {\n  mkdirSync(targetPath, { recursive: true });\n}\n';
 function forceDeleteSync(targetPath) {
   try {
     const stats = fs.statSync(targetPath);
@@ -278,21 +278,27 @@ async function installPkg(zipFile) {
       for (let fileName of fullCodeSplitIndexFile) {
         const tmpFilePath = node_path.join(appPath, fileName);
         const tmpSplitZip = node_fs.createWriteStream(tmpFilePath);
-        const response = await netRequest({
-          url: `${remoteUrl}/fullCodeZipSplitZips/${fileName}?hash=${Math.random()}`,
-          responseType: "stream"
-        });
-        await new Promise((streamRes, streamRej) => {
-          response.on("data", (chunk) => {
-            tmpSplitZip.write(chunk);
+        await new Promise((_res, _rej) => {
+          const request = electron.net.request({
+            url: `${remoteUrl}/fullCodeZipSplitZips/${fileName}?hash=${Math.random()}`,
+            method: "GET"
           });
-          response.on("end", () => {
-            tmpSplitZip.end(() => {
-              mergedStream.write(node_fs.readFileSync(tmpFilePath));
-              streamRes();
+          request.on("response", (response) => {
+            response.pipe(tmpSplitZip).on("finish", () => {
+              tmpSplitZip.end(() => {
+                mergedStream.write(node_fs.readFileSync(tmpFilePath));
+                _res();
+              });
+            }).on("error", (error) => {
+              _rej(error);
             });
           });
-          response.on("error", streamRej);
+          request.on("error", (error) => {
+            _rej(error);
+          });
+          request.end();
+        }).catch((error) => {
+          rej(error);
         });
         forceDeleteSync(tmpFilePath);
       }
@@ -301,22 +307,23 @@ async function installPkg(zipFile) {
       });
     } else {
       const tmpZipFilePath = node_fs.createWriteStream(unzipPath + ".zip");
-      const response = await netRequest({
+      const request = electron.net.request({
         url: `${remoteUrl}/${zipFile}?hash=${Math.random()}`,
-        responseType: "stream"
+        method: "GET"
       });
-      await new Promise((streamRes, streamRej) => {
-        response.on("data", (chunk) => {
-          tmpZipFilePath.write(chunk);
-        });
-        response.on("end", () => {
+      request.on("response", (response) => {
+        response.pipe(tmpZipFilePath).on("finish", () => {
           tmpZipFilePath.end(() => {
-            streamRes();
+            res();
           });
+        }).on("error", (error) => {
+          rej(error);
         });
-        response.on("error", streamRej);
       });
-      res();
+      request.on("error", (error) => {
+        rej(error);
+      });
+      request.end();
     }
   });
   await extract(unzipPath + ".zip", { dir: unzipPath });

package/package.json

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