@taole/deploy-helper 0.3.2 → 0.3.4

package/lib/pipelineApi.mjs

@@ -78,9 +78,9 @@ export function setDevToken(token) {
 async function getPipelineInfoByName(name) {
     let pipeline = null;
     try {
-        const pipelines = await listPipelinesFunc(organizationId, { pipelineName: name, perPage: 1, page: 1 });
+        const pipelines = await listPipelinesFunc(organizationId, { pipelineName: name, perPage: 50, page: 1 });
         if (pipelines && Array.isArray(pipelines.items) && pipelines.items.length > 0) {
-            pipeline = pipelines.items[0];
+            pipeline = pipelines.items.find(item => item.name === name);
         }
     } catch (error) {
         throw new Error(`获取流水线信息失败, 请确认流水线名称: ${name} 是否正确或检查云效token的权限是否足够: ${error}`);
@@ -126,9 +126,13 @@ export function checkYunxiaoToken(config, mode) {
 
 async function runSinglePipeline(pipeline, index, total) {
     console.log(`开始处理流水线: ${pipeline.name}， 当前是第${index + 1}个， 总共${total}个`);
-    // 获取流水线信息
-    const pipelineInfo = await getPipelineInfoByName(pipeline.name);
-    console.log(`流水线${pipeline.name}的id: ${pipelineInfo.id}`);
+    let pipelineId = pipeline.id || "";
+    if (!pipelineId) {
+        // 获取流水线信息
+        const pipelineInfo = await getPipelineInfoByName(pipeline.name);
+        pipelineId = pipelineInfo.id;
+    }
+    console.log(`流水线${pipeline.name}的id: ${pipelineId}`);
 
     // 处理分支强推的问题
     const force2Branch = pipeline.force2Branch;
@@ -159,9 +163,9 @@ async function runSinglePipeline(pipeline, index, total) {
     }
     // TODO: PERF: 获取流水线信息后， 可以缓存下来， 避免每次都重新获取
     // TODO: 触发流水线时， 可以传入参数， 比如分支， 比如环境, 但是不知道为什么覆盖不了。这里先不传了
-    const runId = await createPipelineRunFunc(organizationId, pipelineInfo.id, {});
-    const piplineRunDetailUrl = `https://flow.aliyun.com/pipelines/${pipelineInfo.id}/builds/${runId}`;
-    console.log(`流水线${pipelineInfo.name}触发成功，流水线执行id: ${runId}， 流水线执行详情: ${piplineRunDetailUrl}`);
+    const runId = await createPipelineRunFunc(organizationId, pipelineId, {});
+    const piplineRunDetailUrl = `https://flow.aliyun.com/pipelines/${pipelineId}/builds/${runId}`;
+    console.log(`流水线${pipeline.name}触发成功，流水线执行id: ${runId}， 流水线执行详情: ${piplineRunDetailUrl}`);
 }
 
 export async function runPipeline(config, mode) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taole/deploy-helper",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "脚本部署工具，用于将项目部署到测试环境或生产环境",
   "main": "index.mjs",
   "type": "module",
@@ -24,7 +24,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "alibabacloud-devops-mcp-server": "^0.1.26",
+    "alibabacloud-devops-mcp-server": "*",
     "node-scp": "^0.0.25",
     "simple-git": "^3.28.0"
   }