@infly/libs 2.0.36 → 2.0.37

package/script/build/webhook.js

@@ -0,0 +1,118 @@
+const fs = require("fs");
+
+function shouldSkipWebhook(args) {
+  return args.some((arg) => ["--nowebhook", "--noWebhook", "--no-webhook"].includes(arg));
+}
+
+function getVersionFromRecord(record) {
+  const fileName = record.extraParams?.newFileName || "";
+  const match = fileName.match(/-v([^-.]+(?:\.[^-.]+)*)-/);
+  return match ? match[1] : "";
+}
+
+function getProjectLine(record) {
+  const { projectName, gitInfo = {}, repos } = record.extraParams || {};
+  const version = getVersionFromRecord(record);
+  const branch = gitInfo.branch || "";
+  const repoText = repos ? `，构建仓库：${repos}` : "";
+  return `- ${projectName || "unknown"}${version ? ` v${version}` : ""}${branch ? ` ${branch}` : ""}${repoText}`;
+}
+
+function getRecordContent(record, deployUrl) {
+  const { publishText = "", extraParams = {} } = record || {};
+  const {
+    gitInfo = {},
+    gitAutoPushReposBranchMap,
+    repos,
+    newFileName,
+    projectName,
+    webhookExtraText = ""
+  } = extraParams;
+  const { branch, author } = gitInfo || {};
+
+  if (gitAutoPushReposBranchMap) {
+    const targetBranch = gitAutoPushReposBranchMap[branch] || branch || "";
+    return [
+      publishText,
+      `构建文件：已推送对应仓库【${repos || ""}】- 分支【${targetBranch}】`,
+      `构建人：${author || ""}`,
+      `部署系统：${deployUrl}`
+    ]
+      .filter(Boolean)
+      .join("\n");
+  }
+
+  const gitPath =
+    projectName && branch && newFileName
+      ? `https://gitee.com/gdinfly_1/${projectName}/blob/${branch}/${newFileName}`
+      : "";
+
+  return [
+    publishText,
+    gitPath ? `构建文件下载地址：${gitPath}` : "",
+    webhookExtraText
+  ]
+    .filter(Boolean)
+    .join("\n");
+}
+
+async function postBatchWebhook(batchWebhookFile, extraArgs, mode) {
+  if (shouldSkipWebhook(extraArgs)) {
+    console.log("\n已跳过企业微信机器人汇总推送（nowebhook）");
+    return;
+  }
+
+  if (!fs.existsSync(batchWebhookFile)) {
+    return;
+  }
+
+  const records = fs
+    .readFileSync(batchWebhookFile, "utf8")
+    .split(/\r?\n/)
+    .filter(Boolean)
+    .map((line) => JSON.parse(line));
+
+  if (records.length === 0) {
+    return;
+  }
+
+  const [firstRecord] = records;
+  const { webhookUrl, webhookAtUser = [], gitInfo = {}, deployUrl = "https://cicd.sutpay.com/" } =
+    firstRecord.extraParams || {};
+
+  if (!webhookUrl) {
+    return;
+  }
+
+  let content = [
+    records.map((record) => getRecordContent(record, deployUrl)).join("\n\n")
+  ].join("\n");
+  // 防御性过滤：防止运行时数据中的 %s 等格式化占位符泄露到推送内容
+  content = (content || "").replace(/%s/g, "");
+  const mentionedMobileList = Array.isArray(webhookAtUser) ? webhookAtUser : webhookAtUser[gitInfo.branch];
+
+  try {
+    await require("axios").post(
+      webhookUrl,
+      {
+        msgtype: "text",
+        text: {
+          content,
+          mentioned_mobile_list: mentionedMobileList
+        }
+      },
+      {
+        headers: {
+          "Content-Type": "application/json"
+        }
+      }
+    );
+    console.log("\n已发送批量构建企业微信汇总推送");
+  } catch (error) {
+    console.error("企业微信汇总推送失败", error.message);
+  }
+}
+
+module.exports = {
+  postBatchWebhook
+};

package/script/git-automation/check-packages.js

@@ -13,23 +13,23 @@ global.logColor = {
 /**
  * 主函数：检查 packages 并处理
  */
-function main() {
+async function main() {
   // packages 目录路径（相对于当前脚本的位置）
   const packagesDir = path.resolve(__dirname, '../../../../packages');
-  
+
   console.log(global.logColor.info, `\n🔍 开始检查 packages 目录: ${packagesDir}\n`);
-  
+
   try {
     // 执行完整的检查和更新流程
     // 如果有未提交代码会自动中止并退出进程
     // 如果没有问题会自动切换到 master 分支并拉取最新代码
-    checkAndUpdatePackages(packagesDir, 'master');
-    
+    await checkAndUpdatePackages(packagesDir, 'master');
+
     console.log(global.logColor.success, `\n✨ packages 检查和更新完成，可以继续执行后续操作！\n`);
-    
+
     // 在这里可以继续执行你的其他逻辑
     // 比如构建、发布等操作
-    
+
   } catch (error) {
     console.error(global.logColor.error, `\n💥 执行失败: ${error.message}\n`);
     process.exit(1);
@@ -38,7 +38,10 @@ function main() {
 
 // 如果直接运行此文件，则执行主函数
 if (require.main === module) {
-  main();
+  main().catch(error => {
+    console.error(global.logColor.error, `\n💥 执行失败: ${error.message}\n`);
+    process.exit(1);
+  });
 }
 
 module.exports = { main };

package/script/git-automation/git-utils.js

@@ -0,0 +1,67 @@
+const fs = require("fs");
+const path = require("path");
+const { execFileSync } = require("child_process");
+
+function gitOutput(args, cwd = process.cwd()) {
+  return execFileSync("git", args, {
+    cwd,
+    encoding: "utf8",
+    shell: process.platform === "win32"
+  }).trim();
+}
+
+function findGitRepo(cwd) {
+  let currentDir = path.resolve(cwd || process.cwd());
+
+  while (true) {
+    const gitPath = path.join(currentDir, ".git");
+
+    if (fs.existsSync(gitPath)) {
+      const stat = fs.statSync(gitPath);
+      const repo = {
+        root: currentDir,
+        commonDir: gitPath
+      };
+
+      if (stat.isFile()) {
+        const content = fs.readFileSync(gitPath, "utf8");
+        const match = content.match(/gitdir:\s*(.+)/i);
+
+        if (match) {
+          repo.commonDir = path.resolve(currentDir, match[1].trim());
+        }
+      }
+
+      return repo;
+    }
+
+    const parentDir = path.dirname(currentDir);
+
+    if (parentDir === currentDir) {
+      return null;
+    }
+
+    currentDir = parentDir;
+  }
+}
+
+function getGitCommonDir(cwd) {
+  const repo = findGitRepo(cwd);
+
+  if (repo) {
+    return repo.commonDir;
+  }
+
+  try {
+    const commonDir = gitOutput(["-C", cwd, "rev-parse", "--git-common-dir"]);
+    return path.resolve(cwd, commonDir);
+  } catch {
+    return path.resolve(cwd || process.cwd());
+  }
+}
+
+module.exports = {
+  gitOutput,
+  findGitRepo,
+  getGitCommonDir
+};

package/script/git-automation/index.js

@@ -1,6 +1,10 @@
 const fs = require("fs");
 const path = require("path");
-const { execSync } = require("child_process");
+const crypto = require("crypto");
+const { execSync, exec } = require("child_process");
+const { promisify } = require("util");
+const { getGitCommonDir } = require("./git-utils");
+const execAsync = promisify(exec);
 
 /**
  * 获取当前 Git 分支名称
@@ -117,6 +121,14 @@ function checkGitStatus(excludeDir, extraFilter, extraParams) {
     onlyCheckStatus,
     startLogText = "Git自动提交开始执行, 正在检查非构建文件"
   } = extraParams || {};
+
+  // 如果指定了构建输出目录但目录不存在，则自动创建并初始化 Git 仓库
+  if (targetProjectOutputDir && !fs.existsSync(targetProjectOutputDir)) {
+    console.log(global.logColor.warning, `⚠️  构建目录不存在，正在自动创建：${targetProjectOutputDir}`);
+    fs.mkdirSync(targetProjectOutputDir, { recursive: true });
+    console.log(global.logColor.success, `✅ 构建目录已创建并初始化 Git 仓库：${targetProjectOutputDir}`);
+  }
+
   try {
     // 获取所有未跟踪和已修改的文件列表
     const files = execSync(`git${targetProjectOutputDirCmd} status --porcelain -z`, { encoding: "utf8" })
@@ -173,6 +185,56 @@ function runGitCommand(command, options = {}) {
   }
 }
 
+function hasStagedChanges(targetProjectOutputDirCmd = "") {
+  try {
+    execSync(`git${targetProjectOutputDirCmd} diff --cached --quiet`, {
+      stdio: "ignore"
+    });
+    return false;
+  } catch (error) {
+    return error.status === 1;
+  }
+}
+
+function sleepSync(ms) {
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+}
+
+function withGitRepoLock(lockDir, lockKey, task) {
+  if (!lockDir || !lockKey) {
+    return task();
+  }
+
+  fs.mkdirSync(lockDir, { recursive: true });
+  const lockName = crypto.createHash("md5").update(lockKey).digest("hex");
+  const lockPath = path.join(lockDir, `${lockName}.lock`);
+  const startTime = Date.now();
+  const timeout = 10 * 60 * 1000;
+
+  while (true) {
+    try {
+      fs.mkdirSync(lockPath);
+      break;
+    } catch (error) {
+      if (error.code !== "EEXIST") {
+        throw error;
+      }
+
+      if (Date.now() - startTime > timeout) {
+        throw new Error(`等待 Git 仓库锁超时: ${lockKey}`);
+      }
+
+      sleepSync(500);
+    }
+  }
+
+  try {
+    return task();
+  } finally {
+    fs.rmSync(lockPath, { recursive: true, force: true });
+  }
+}
+
 /**
  * git自动推送
  * @param {String} buildFoldName 构建文件名称
@@ -189,10 +251,24 @@ function autoGitProcess(buildFoldName, newFileName, extraParams = {}) {
     targetProjectOutputDir,
     gitAutoPushReposBranchMap = {},
     targetProjectOutputDirCmd = gitAutoPushRepos ? ` -C ${targetProjectOutputDir}` : "",
-    projectName
+    projectName,
+    gitLockDir,
+    gitProcessOrder
   } = extraParams || {};
-  // 每次执行自动分支提交先先进行校验
-  const fileList = checkGitStatus(buildFoldName, newFileName, extraParams) || [];
+  const appFirst = gitAutoPushRepos && gitProcessOrder === "app-first";
+  const runAppGitProcess = () => {
+    const overrideParams = {
+      ...extraParams,
+      targetProjectOutputDir: "",
+      targetProjectOutputDirCmd: "",
+      gitAutoPushRepos: false
+    };
+    autoGitProcess(buildFoldName, newFileName, overrideParams);
+  };
+
+  if (appFirst) {
+    runAppGitProcess();
+  }
 
   const { commitMsg, branch } = gitInfo || {};
   const gitRepos = gitAutoPushRepos ? `构建仓库: ${targetProjectOutputDir}` : `当前项目: ${projectName}`;
@@ -207,36 +283,39 @@ function autoGitProcess(buildFoldName, newFileName, extraParams = {}) {
   const commitCmd = `git${targetProjectOutputDirCmd} commit -m "${tempGitAutoCommitText}"`;
   const pushCommand = `git${targetProjectOutputDirCmd} push origin ${tempBranch}`;
 
-  // 无分支则不执行，自动推送到单独仓库必须得配置分支枚举对应
-  /* "gitAutoPushReposBranchMap": {
-        "release-zkhTest": "develop-zkhTest"
-  }, */
   if (!tempBranch) {
     console.log(global.logColor.error, `❌ 缺少分支配置`);
     return;
   }
 
-  // 先执行构建仓库的推送，防止git提交信息被覆盖
-  if (fileList.length > 0) {
+  const checkCommitAndPush = () => {
+    const fileList = checkGitStatus(buildFoldName, newFileName, extraParams) || [];
+
+    if (fileList.length === 0) {
+      return;
+    }
+
     runGitCommand(addCmd);
-    runGitCommand(commitCmd);
-    runGitCommand(pushCommand);
-  }
+    if (!hasStagedChanges(targetProjectOutputDirCmd)) {
+      console.log(global.logColor.warning, `⚠️  Git ${gitRepos} 没有可提交的变更，跳过自动提交`);
+    } else {
+      runGitCommand(commitCmd);
+      runGitCommand(pushCommand);
+    }
+  };
 
-  // 后执行当前项目的分支自动推送
   if (gitAutoPushRepos) {
-    const overrideParams = {
-      ...extraParams,
-      targetProjectOutputDir: "",
-      targetProjectOutputDirCmd: "",
-      gitAutoPushRepos: false
-    }; // 确保所有配置为非构建仓库配置
-    autoGitProcess(buildFoldName, newFileName, overrideParams); // 执行自动推送当前项目的git信息
+    withGitRepoLock(gitLockDir, getGitCommonDir(targetProjectOutputDir), checkCommitAndPush);
+  } else {
+    checkCommitAndPush();
+  }
+
+  if (gitAutoPushRepos && !appFirst) {
+    runAppGitProcess();
   }
 
   console.log(global.logColor.success, `✅ Git \x1b[34m${gitRepos}\x1b[32m 自动提交和推送成功！`);
 }
-
 /**
  * 自动分支处理
  * @param {Object} config - 分支配置
@@ -278,7 +357,7 @@ async function autoBranchProcess(config) {
  * @param {string} packagesDir - packages 目录的绝对路径
  * @returns {Object} 检查结果
  */
-function checkPackagesGitStatus(packagesDir) {
+async function checkPackagesGitStatus(packagesDir) {
   const fs = require("fs");
 
   if (!fs.existsSync(packagesDir)) {
@@ -293,45 +372,42 @@ function checkPackagesGitStatus(packagesDir) {
 
   // console.log(global.logColor.info, `📦 检查 packages 下的 ${modules.length} 个模块...`);
 
-  const uncommittedModules = [];
-
-  for (const module of modules) {
-    const modulePath = path.join(packagesDir, module);
-    const gitPath = path.join(modulePath, ".git");
+  const uncommittedModules = await Promise.all(
+    modules.map(async (module) => {
+      const modulePath = path.join(packagesDir, module);
+      const gitPath = path.join(modulePath, ".git");
 
-    // 检查是否是 git 仓库
-    if (!fs.existsSync(gitPath)) {
-      console.log(global.logColor.warning, `⚠️  ${module}: 不是 git 仓库，跳过检查`);
-      continue;
-    }
-
-    try {
-      // 切换到模块目录并检查 git status
-      const statusOutput = execSync("git status --porcelain", {
-        cwd: modulePath,
-        encoding: "utf8"
-      }).trim();
+      // 检查是否是 git 仓库
+      if (!fs.existsSync(gitPath)) {
+        console.log(global.logColor.warning, `⚠️  ${module}: 不是 git 仓库，跳过检查`);
+        return null;
+      }
 
-      if (statusOutput) {
-        console.log(global.logColor.error, `❌ ${module}: 存在未提交的更改`);
-        console.log(global.logColor.error, `   ${statusOutput.split("\n").join("\n   ")}`);
-        uncommittedModules.push({
+      try {
+        // 切换到模块目录并检查 git status
+        const { stdout } = await execAsync("git status --porcelain", { cwd: modulePath });
+        const statusOutput = stdout.trim();
+
+        if (statusOutput) {
+          console.log(global.logColor.error, `❌ ${module}: 存在未提交的更改`);
+          console.log(global.logColor.error, `   ${statusOutput.split("\n").join("\n   ")}`);
+          return {
+            name: module,
+            path: modulePath,
+            changes: statusOutput.split("\n")
+          };
+        }
+        return null;
+      } catch (error) {
+        console.error(global.logColor.error, `❌ ${module}: 检查失败 - ${error.message}`);
+        return {
           name: module,
           path: modulePath,
-          changes: statusOutput.split("\n")
-        });
-      } else {
-        // console.log(global.logColor.success, `✅ ${module}: 工作区干净`);
+          error: error.message
+        };
       }
-    } catch (error) {
-      console.error(global.logColor.error, `❌ ${module}: 检查失败 - ${error.message}`);
-      uncommittedModules.push({
-        name: module,
-        path: modulePath,
-        error: error.message
-      });
-    }
-  }
+    })
+  ).then(results => results.filter(r => r !== null));
 
   return {
     hasUncommitted: uncommittedModules.length > 0,
@@ -346,7 +422,7 @@ function checkPackagesGitStatus(packagesDir) {
  * @param {string} packagesDir - packages 目录的绝对路径
  * @param {string} targetBranch - 目标分支名，默认为 'master'
  */
-function pullPackagesFromMaster(packagesDir, targetBranch = "master") {
+async function pullPackagesFromMaster(packagesDir, targetBranch = "master") {
   const fs = require("fs");
 
   if (!fs.existsSync(packagesDir)) {
@@ -361,53 +437,38 @@ function pullPackagesFromMaster(packagesDir, targetBranch = "master") {
 
   // console.log(global.logColor.info, `🔄 切换 packages 下的模块到 ${targetBranch} 分支并拉取最新代码...`);
 
-  const results = [];
-
-  for (const module of modules) {
-    const modulePath = path.join(packagesDir, module);
-    const gitPath = path.join(modulePath, ".git");
+  const results = await Promise.all(
+    modules.map(async (module) => {
+      const modulePath = path.join(packagesDir, module);
+      const gitPath = path.join(modulePath, ".git");
 
-    // 检查是否是 git 仓库
-    if (!fs.existsSync(gitPath)) {
-      console.log(global.logColor.warning, `⚠️  ${module}: 不是 git 仓库，跳过操作`);
-      results.push({ module, success: false, reason: "不是 git 仓库" });
-      continue;
-    }
-
-    try {
-      // console.log(global.logColor.info, `🔄 处理模块: ${module}`);
-
-      // 获取当前分支
-      const currentBranch = execSync("git rev-parse --abbrev-ref HEAD", {
-        cwd: modulePath,
-        encoding: "utf8"
-      }).trim();
-
-      // console.log(global.logColor.info, `   当前分支: ${currentBranch}`);
-
-      // 如果不在目标分支，则切换
-      if (currentBranch !== targetBranch) {
-        // console.log(global.logColor.info, `   切换到 ${targetBranch} 分支...`);
-        execSync(`git checkout ${targetBranch}`, {
-          cwd: modulePath,
-          stdio: "pipe"
-        });
+      // 检查是否是 git 仓库
+      if (!fs.existsSync(gitPath)) {
+        console.log(global.logColor.warning, `⚠️  ${module}: 不是 git 仓库，跳过操作`);
+        return { module, success: false, reason: "不是 git 仓库" };
       }
 
-      // 拉取最新代码
-      // console.log(global.logColor.info, `   拉取 ${targetBranch} 最新代码...`);
-      execSync(`git pull origin ${targetBranch}`, {
-        cwd: modulePath,
-        stdio: "pipe"
-      });
-
-      console.log(global.logColor.success, `✅ \x1b[34m${module}\x1b[32m[${targetBranch}]: 更新到最新代码`);
-      results.push({ module, success: true });
-    } catch (error) {
-      console.error(global.logColor.error, `❌ ${module}: 操作失败 - ${error.message}`);
-      results.push({ module, success: false, reason: error.message });
-    }
-  }
+      try {
+        // 获取当前分支
+        const { stdout: branchOut } = await execAsync("git rev-parse --abbrev-ref HEAD", { cwd: modulePath });
+        const currentBranch = branchOut.trim();
+
+        // 如果不在目标分支，则切换
+        if (currentBranch !== targetBranch) {
+          await execAsync(`git checkout ${targetBranch}`, { cwd: modulePath });
+        }
+
+        // 拉取最新代码
+        await execAsync(`git pull origin ${targetBranch}`, { cwd: modulePath });
+
+        console.log(global.logColor.success, `✅ \x1b[34m${module}\x1b[32m[${targetBranch}]: 更新到最新代码`);
+        return { module, success: true };
+      } catch (error) {
+        console.error(global.logColor.error, `❌ ${module}: 操作失败 - ${error.message}`);
+        return { module, success: false, reason: error.message };
+      }
+    })
+  );
 
   // 输出结果摘要
   const successful = results.filter((r) => r.success).length;
@@ -419,6 +480,66 @@ function pullPackagesFromMaster(packagesDir, targetBranch = "master") {
 }
 
 // 获取 packages 目录路径（相对于当前项目根目录）
+function hasGitModules(packagesDir) {
+  if (!fs.existsSync(packagesDir)) {
+    return false;
+  }
+
+  return ["infly-libs", "infly-ui"].some((item) => fs.existsSync(path.join(packagesDir, item, ".git")));
+}
+
+function checkAndUpdateRootPackages(packagesDir, targetBranch = "master") {
+  const rootDir = path.resolve(packagesDir, "..");
+  const gitPath = path.join(rootDir, ".git");
+
+  if (!fs.existsSync(gitPath)) {
+    console.log(global.logColor.warning, `⚠️  packages 不属于独立 git 仓库，也未找到根仓库，跳过 packages 更新`);
+    return [];
+  }
+
+  const statusOutput = execSync("git status --porcelain", {
+    cwd: rootDir,
+    encoding: "utf8"
+  }).trim();
+
+  if (statusOutput) {
+    console.log(global.logColor.error, `\n❌ admin-monorepo 存在未提交的更改，无法合并 ${targetBranch}`);
+    console.log(global.logColor.error, `   ${statusOutput.split("\n").join("\n   ")}`);
+    process.exit(1);
+  }
+
+  const currentBranch = execSync("git rev-parse --abbrev-ref HEAD", {
+    cwd: rootDir,
+    encoding: "utf8"
+  }).trim();
+
+  console.log(global.logColor.info, `🔄 保持当前分支 ${currentBranch}，合并 ${targetBranch} 的最新更改...`);
+
+  // 拉取远程最新的 targetBranch
+  execSync(`git fetch origin ${targetBranch}`, {
+    cwd: rootDir,
+    stdio: "inherit"
+  });
+
+  // 使用 merge-from-master.sh 脚本进行安全合并
+  const mergeScriptPath = path.join(rootDir, "script", "merge-from-master.sh");
+  if (fs.existsSync(mergeScriptPath)) {
+    execSync(`bash "${mergeScriptPath}" ${targetBranch}`, {
+      cwd: rootDir,
+      stdio: "inherit"
+    });
+  } else {
+    // 如果脚本不存在，使用基本的 merge 命令
+    execSync(`git merge origin/${targetBranch} --no-edit`, {
+      cwd: rootDir,
+      stdio: "inherit"
+    });
+  }
+
+  console.log(global.logColor.success, `✅ admin-monorepo[${currentBranch}]: 已合并 ${targetBranch} 的最新更改到 packages、docs 等目录`);
+  return [{ module: "admin-monorepo", success: true }];
+}
+
 function findPackagesDir(currentDir) {
   let searchDir = currentDir || process.cwd();
 
@@ -552,7 +673,11 @@ async function checkAndUpdatePackages(outPackagesDir, targetBranch = "master") {
     console.log(global.logColor.info, `\n🚀 开始检查和更新 packages 模块...`);
 
     // 1. 检查未提交的更改
-    const checkResult = checkPackagesGitStatus(packagesDir);
+    if (!hasGitModules(packagesDir)) {
+      return checkAndUpdateRootPackages(packagesDir, targetBranch);
+    }
+
+    const checkResult = await checkPackagesGitStatus(packagesDir);
 
     if (checkResult.hasUncommitted) {
       // console.log(global.logColor.error, `\n❌ 发现 ${checkResult.modules.length} 个模块存在未提交的更改:`);
@@ -566,7 +691,7 @@ async function checkAndUpdatePackages(outPackagesDir, targetBranch = "master") {
     // console.log(global.logColor.success, `\n✅ 所有模块工作区都是干净的，继续执行...`);
 
     // 2. 切换到 master 并拉取最新代码
-    const updateResults = pullPackagesFromMaster(packagesDir, targetBranch);
+    const updateResults = await pullPackagesFromMaster(packagesDir, targetBranch);
 
     // 3. 检查是否有失败的操作
     const failedUpdates = updateResults.filter((r) => !r.success);