@taole/deploy-helper 0.3.6 → 0.4.0

package/index.mjs

@@ -88,7 +88,6 @@ async function main() {
     // 默认开启debug debug目前只是打印日志的时候额外打印时间
     setDebug(true);
 
-    log("deploy-helper start");
 
     // await devTest();
     // log(`process.argv: ${process.argv[2]} ${process.argv[3]} ${process.argv[4]}`);
@@ -110,9 +109,13 @@ async function main() {
         console.log(`command: scp {file} {dest} 复制文件{file}到OfficialSite测试服务器{dest}`);
         console.log(`command: scpevt {file} 复制文件{file}到events测试服务器{file}`);
         console.log(`command: scpevt {file} {dest} 复制文件{file}到events测试服务器{dest}`);
-        log(`command: pipeline {pipelineName|pipelineId} 触发流水线{pipelineName|pipelineId}`);
+        console.log(`command: pipeline {pipelineName|pipelineId} 触发流水线{pipelineName|pipelineId}`);
         process.exit(0);
-    } else if (command === "init") {
+    }
+    log("deploy-helper start");
+    
+    // 其他命令
+    if (command === "init") {
         await initConfigJson();
         process.exit(0);
     } else if (["scp", "scpevt"].includes(command)) {
@@ -160,7 +163,7 @@ async function main() {
             process.exit(1);
         }
         try {
-            await triggerPipeline(pipelineName);
+            await triggerPipeline(pipelineName, true);
             process.exit(0);
         } catch (error) {
             log(`触发流水线失败: ${error}`);
@@ -196,7 +199,7 @@ async function main() {
         const entryTestBranch = (config.entry && config.entry.testBranch) || "test";
         const entryProdBranch = (config.entry && config.entry.prodBranch) || "master";
         const entryTargetBranch = mode === 'prod' ? entryProdBranch : entryTestBranch;
-        const currentProdBranch = config.prodBranch || "master";
+        // const currentProdBranch = config.prodBranch || "master";
 
 
         // 检查流水线配置
@@ -264,9 +267,13 @@ async function main() {
         }
 
         // 4. 执行git pull
+        log(`${assetsDest}执行git pull`);
         await assetsGit.pull();
+        log(`${assetsDest} git pull done`);
         if (entryGit) {
+            log(`${entryDest}执行git pull`);
             await entryGit.pull();
+            log(`${entryDest} git pull done`);
         }
 
         // 5. 复制构建产物
@@ -340,6 +347,7 @@ async function main() {
 
         // 7. 推送
         if (canPushAssets) {
+            log(`assets push start`);
             try {
                 await assetsGit.push();
             } catch (error) {
@@ -348,6 +356,7 @@ async function main() {
             log(`assets push done.`);
         }
         if (canPushEntry) {
+            log(`entry push start`);
             try {
                 await entryGit.push();
             } catch (error) {

package/lib/pipelineApi.mjs

@@ -3,12 +3,68 @@ import { join } from 'node:path';
 import fs from 'node:fs';
 import simpleGit from 'simple-git';
 import { log, isDebug } from './util.mjs';
+import { PipelineRunSchema } from "../modules/alibabacloud-devops-mcp-server/dist/common/types.js";
+import { z } from "zod";
+import * as utils from "../modules/alibabacloud-devops-mcp-server/dist/common/utils.js";
 
-import { createPipelineRunFunc, listPipelinesFunc, getPipelineFunc } from '../modules/alibabacloud-devops-mcp-server/dist/operations/flow/pipeline.js'
+import { createPipelineRunFunc, listPipelinesFunc, getPipelineFunc, getPipelineRunFunc }
+    from '../modules/alibabacloud-devops-mcp-server/dist/operations/flow/pipeline.js'
 
 export const organizationId = "5ec8bb7bd1d1abe63b55cd33";
 
 
+// docs: https://help.aliyun.com/zh/yunxiao/developer-reference/passpipelinevalidate
+// POST https://{domain}/oapi/v1/flow/organizations/{organizationId}/pipelines/{pipelineId}/pipelineRuns/{pipelineRunId}/jobs/{jobId}/pass
+
+/**
+ * 获取当前阶段和任务
+ * @param {z.infer<typeof PipelineRunSchema>} runDetail 流水线执行详情
+ */
+function getCurrentJob(runDetail) {
+    let currentStage = null;
+    let currentJob = null;
+    const stages = runDetail.stages;
+
+    // 找到当前阶段
+    for(let i = 0; i < stages.length; i++) {
+        const stage = stages[i];
+        currentStage = stage;
+        const stageStatus = stage.stageInfo.status;
+        if(stageStatus === "RUNNING" || stageStatus === "WAITING" || stageStatus === "FAIL") {
+            break;
+        }
+    }
+
+    if(currentStage) {
+        const jobs = currentStage.stageInfo.jobs;
+        for(let i = 0; i < jobs.length; i++) {
+            const job = jobs[i];
+            currentJob = job;
+            const jobStatus = job.status;
+            if(jobStatus === "RUNNING" || jobStatus === "WAITING" || jobStatus === "FAIL") {
+                break;
+            }
+        }
+    }
+    return {stage: currentStage, job: currentJob};
+}
+
+/**
+ * 通过人工卡点
+ * @param {*} pipelineID 流水线id
+ * @param {*} runId 流水线执行id
+ * @param {*} jobId 流水线执行任务id
+ * @returns 是否通过
+ */
+async function passPipelineJob(pipelineID, runId, jobId) {
+    const url = `/oapi/v1/flow/organizations/${organizationId}/pipelines/${pipelineID}/pipelineRuns/${runId}/jobs/${jobId}/pass`;
+    const response = await utils.yunxiaoRequest(url, {
+        method: "POST",
+    });
+    return Boolean(response);
+}
+
+
 
 let isFirstFoundToken = true;
 
@@ -92,14 +148,57 @@ async function getPipelineInfoByName(name) {
     return pipeline;
 }
 
-export async function triggerPipeline(pipelineName) {
+/**
+ * 等待流水线执行完成(尝试自行通过人工卡点)
+ * @param {string|number} pipelineID 流水线id
+ * @param {string|number} runId 流水线执行id
+ * @param {number} interval 轮询间隔时间
+ * @returns 流水线执行详情
+ */
+async function waitPipelineRunFinish(pipelineID, runId, interval = 3000) {
+    const pipelineRunDetailUrl = `https://flow.aliyun.com/pipelines/${pipelineID}/builds/${runId}`;
+    log(`开始轮询至流水线执行完成`);
+    let runDetail = await getPipelineRunFunc(organizationId, pipelineID, runId);
+    while (runDetail.status === "RUNNING" || runDetail.status === "WAITING") {
+        const { stage, job } = getCurrentJob(runDetail);
+        log(`流水线执行状态: ${runDetail.status}，阶段: ${stage.name}，任务: ${job.name}，等${interval / 1000}秒后重新轮询`);
+        if (runDetail.status === "WAITING") {
+            if (stage && job) {
+                log(`尝试自动通过人工卡点`);
+                const isPass = await passPipelineJob(pipelineID, runId, job.id);
+                if (isPass) {
+                    log(`人工卡点通过`);
+                } else {
+                    log(`人工卡点通过失败`);
+                    break;
+                }
+            }
+        }
+        await new Promise(resolve => setTimeout(resolve, interval));
+        runDetail = await getPipelineRunFunc(organizationId, pipelineID, runId);
+    }
+    if (runDetail.status === "SUCCESS") {
+        log(`流水线执行完成，当前状态: ${runDetail.status}`);
+    } else {
+        log(`流水线执行失败，当前状态: ${runDetail.status}, 请查看详情${pipelineRunDetailUrl}`);
+    }
+    return runDetail;
+}
+
+
+/**
+ * 触发流水线
+ * @param {*} pipelineName 流水线名称或id
+ * @param {*} waitResult 是否等待流水线执行完成
+ */
+export async function triggerPipeline(pipelineName, waitResult = false) {
     const yunxiaoToken = getYunxiaoToken({});
-    if(!yunxiaoToken) {
+    if (!yunxiaoToken) {
         throw new Error(`未设置云效token， 请检查云效token是否正确`);
     }
     let pipelineID = "";
     let name = pipelineName;
-    if(/^\d+$/.test(pipelineName)) {
+    if (/^\d+$/.test(pipelineName)) {
         pipelineID = pipelineName;
         const pipelineInfo = await getPipelineFunc(organizationId, pipelineID);
         name = pipelineInfo.name;
@@ -111,6 +210,9 @@ export async function triggerPipeline(pipelineName) {
     const runId = await createPipelineRunFunc(organizationId, pipelineID, {});
     const pipelineRunDetailUrl = `https://flow.aliyun.com/pipelines/${pipelineID}/builds/${runId}`;
     log(`流水线${name}[${pipelineID}]触发成功，流水线执行id: ${runId}， 流水线执行详情: ${pipelineRunDetailUrl}`);
+    if (waitResult) {
+        await waitPipelineRunFinish(pipelineID, runId);
+    }
 }
 
 
@@ -163,7 +265,7 @@ async function runSinglePipeline(pipeline, index, total) {
         if (!fs.existsSync(repo)) {
             log(`仓库${repo}有未提交的修改， 跳过流水线处理`);
             return;
-        }   
+        }
         // 强推到指定分支
         const git = simpleGit(repo);
         const gitStatus = await git.status();
@@ -187,6 +289,9 @@ async function runSinglePipeline(pipeline, index, total) {
     const runId = await createPipelineRunFunc(organizationId, pipelineId, {});
     const piplineRunDetailUrl = `https://flow.aliyun.com/pipelines/${pipelineId}/builds/${runId}`;
     log(`流水线${pipeline.name}触发成功，流水线执行id: ${runId}， 流水线执行详情: ${piplineRunDetailUrl}`);
+    if(pipeline.waitResult) {
+        await waitPipelineRunFinish(pipelineId, runId);
+    }
 }
 
 export async function runPipeline(config, mode) {

package/lib/util.mjs

@@ -9,8 +9,8 @@ export function isDebug() {
 
 export function log(...args) {
     if (_isDebug) {
-        // 打印时间
-        console.log(`[${new Date().toLocaleString()}]`, ...args);
+        // 打印时间 
+        console.log(`[${new Date().toLocaleTimeString()}]`, ...args);
     } else {
         console.log(...args);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taole/deploy-helper",
-  "version": "0.3.6",
+  "version": "0.4.0",
   "description": "脚本部署工具，用于将项目部署到测试环境或生产环境",
   "main": "index.mjs",
   "type": "module",