@taole/deploy-helper 1.0.2 → 1.0.4

package/README.md

@@ -1,8 +1,5 @@
 # deploy-helper
 脚本部署用
 
-# 关于modules/alibabacloud-devops-mcp-server
-
-使用里边封装的api, 但是太吵了(debug信息有点多，还没法关闭， 所以没有直接使用它的npm包)  
-npm包地址 https://www.npmjs.com/package/alibabacloud-devops-mcp-server
+云效流水线相关 HTTP 调用已收敛为 `lib/yunxiaoFlowApi.mjs`（直接调 OpenAPI，无 MCP/Zod 依赖）。
 

package/index.mjs

@@ -4,12 +4,10 @@ import { Client } from 'node-scp'
 import fs from 'fs';
 import { join, basename, dirname } from "path";
 import { simpleGit } from 'simple-git';
-import { homedir } from 'os'
 import { runPipeline, checkYunxiaoToken, triggerPipeline } from './lib/pipelineApi.mjs';
-import { setDebug, log, getUserDeployHelperConfig } from './lib/util.mjs';
+import { setDebug, log } from './lib/util.mjs';
 import path from 'path';
 import { fileURLToPath } from 'url';
-import { checkOfflinePkg, syncApi as syncOfflinePkgApi } from './lib/offlinePkg.mjs';
 import { cmdWhoami, cmdLogout, cmdLogin } from './lib/login.mjs';
 import { cmdProjectCreate, cmdProjectPublish, cmdProjectPull } from './lib/project.mjs';
 
@@ -155,7 +153,7 @@ async function main() {
     const registeredCommand = commandMap[command];
     if(registeredCommand){
         // pass
-    } else if (!["init", "prod", "test", "scp", "scpevt", "pipeline", "offlinepkgrm"].includes(command)) {
+    } else if (!["init", "prod", "test", "scp", "scpevt", "pipeline"].includes(command)) {
         command = "help";
     }
 
@@ -182,7 +180,6 @@ async function main() {
         console.log(`command: scpevt {file} 复制文件{file}到events测试服务器{file}`);
         console.log(`command: scpevt {file} {dest} 复制文件{file}到events测试服务器{dest}`);
         console.log(`command: pipeline {pipelineName|pipelineId} [branch] 触发流水线{pipelineName|pipelineId}， 指定分支(可省略)`);
-        console.log(`command: offlinepkgrm {name} {platform} [mode] 删除离线包{name}， 指定平台{platform}， 指定模式(可省略，默认test)`);
         Object.keys(commandMap).forEach(command => {
             const cmdObj = commandMap[command];
             console.log(`command: ${command} ${cmdObj.help}`);
@@ -256,29 +253,6 @@ async function main() {
             process.exit(1);
         }
 
-    } else if (command === "offlinepkgrm") {
-        const name = process.argv[3];
-        if (!name) {
-            log(`name参数不能为空`);
-            process.exit(1);
-        }
-        const platform = process.argv[4];
-        if (!platform) {
-            log(`platform参数不能为空`);
-            process.exit(1);
-        }
-        const mode = process.argv[5] || "test";
-        if (!["prod", "test"].includes(mode)) {
-            log(`mode参数只能是prod或test`);
-            process.exit(1);
-        }
-        const userDeployHelperConfig = getUserDeployHelperConfig();
-        if (!userDeployHelperConfig || !userDeployHelperConfig.offlineApi || !userDeployHelperConfig.offlineApi.get || !userDeployHelperConfig.offlineApi.set) {
-            log(`配置文件未配置离线包api接口, 请先配置`);
-            process.exit(1);
-        }
-        await syncOfflinePkgApi(userDeployHelperConfig, mode, { name, remove: true, platform }, null);
-        process.exit(0);
     }
     try {
         const workDir = process.cwd(); // 当前项目根目录
@@ -322,17 +296,6 @@ async function main() {
 
         // 检查流水线配置
         checkYunxiaoToken(config, mode);
-        const offlinePkgResult = checkOfflinePkg({
-            workDir: workDir,
-            mode,
-        });
-        if (!offlinePkgResult.canBuild && offlinePkgResult.errorMsg) {
-            log(`${offlinePkgResult.errorMsg}`);
-            process.exit(1);
-        }
-        if (offlinePkgResult.canBuild) {
-            await offlinePkgResult.hookPostBuild();
-        }
 
         // 检查项目
         // 1. 检查项目是否存在

package/lib/pipelineApi.mjs

@@ -2,13 +2,14 @@ import { homedir } from 'node:os';
 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, getPipelineRunFunc }
-    from '../modules/alibabacloud-devops-mcp-server/dist/operations/flow/pipeline.js'
+import { log } from './util.mjs';
+import {
+    yunxiaoRequest,
+    listPipelines,
+    getPipeline,
+    getPipelineRun,
+    createPipelineRun,
+} from './yunxiaoFlowApi.mjs';
 
 export const organizationId = "5ec8bb7bd1d1abe63b55cd33";
 
@@ -18,7 +19,7 @@ export const organizationId = "5ec8bb7bd1d1abe63b55cd33";
 
 /**
  * 获取当前阶段和任务
- * @param {z.infer<typeof PipelineRunSchema>} runDetail 流水线执行详情
+ * @param {object} runDetail 流水线执行详情（云效 runs 接口原始结构）
  */
 function getCurrentJob(runDetail) {
     let currentStage = null;
@@ -58,7 +59,7 @@ function getCurrentJob(runDetail) {
  */
 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, {
+    const response = await yunxiaoRequest(url, {
         method: "POST",
     });
     return Boolean(response);
@@ -135,7 +136,7 @@ export function setDevToken(token) {
 async function getPipelineInfoByName(name) {
     let pipeline = null;
     try {
-        const pipelines = await listPipelinesFunc(organizationId, { pipelineName: name, perPage: 50, page: 1 });
+        const pipelines = await listPipelines(organizationId, { pipelineName: name, perPage: 50, page: 1 });
         if (pipelines && Array.isArray(pipelines.items) && pipelines.items.length > 0) {
             pipeline = pipelines.items.find(item => item.name === name);
         }
@@ -158,7 +159,7 @@ async function getPipelineInfoByName(name) {
 async function waitPipelineRunFinish(pipelineID, runId, interval = 5000) {
     const pipelineRunDetailUrl = `https://flow.aliyun.com/pipelines/${pipelineID}/builds/${runId}`;
     log(`开始轮询至流水线执行完成`);
-    let runDetail = await getPipelineRunFunc(organizationId, pipelineID, runId);
+    let runDetail = await getPipelineRun(organizationId, pipelineID, runId);
     let passFailedCount = 0;
     let passFailedMaxCount = 3;
     while (runDetail.status === "RUNNING" || runDetail.status === "WAITING" || runDetail.status === "INIT") {
@@ -189,7 +190,7 @@ async function waitPipelineRunFinish(pipelineID, runId, interval = 5000) {
             }
         }
         await new Promise(resolve => setTimeout(resolve, interval));
-        runDetail = await getPipelineRunFunc(organizationId, pipelineID, runId);
+        runDetail = await getPipelineRun(organizationId, pipelineID, runId);
     }
     if (runDetail.status === "SUCCESS") {
         log(`流水线执行完成，当前状态: ${runDetail.status}`);
@@ -212,7 +213,7 @@ async function getPipelineInfoDetail(pipelineName, targetBranch = "") {
     let hasDetail = false;
     if (/^\d+$/.test(pipelineName)) {
         pipelineID = pipelineName;
-        pipelineInfo = await getPipelineFunc(organizationId, pipelineID);
+        pipelineInfo = await getPipeline(organizationId, pipelineID);
         pipelineInfo.id = pipelineID;
         hasDetail = true;
     } else {
@@ -224,7 +225,7 @@ async function getPipelineInfoDetail(pipelineName, targetBranch = "") {
     // 如果需要指定分支，则需要获取源码仓库信息
     if (targetBranch) {
         if (!hasDetail) {
-            pipelineInfo = await getPipelineFunc(organizationId, pipelineID);
+            pipelineInfo = await getPipeline(organizationId, pipelineID);
             pipelineInfo.id = pipelineID;
         }
         if (pipelineInfo && pipelineInfo.pipelineConfig && Array.isArray(pipelineInfo.pipelineConfig.sources)) {
@@ -266,7 +267,7 @@ export async function triggerPipeline(pipelineName, opts = {}) {
         throw new Error(`未设置云效token， 请检查云效token是否正确`);
     }
     const { pipelineInfo, runParams } = await getPipelineInfoDetail(pipelineName, opts.branch);
-    const runId = await createPipelineRunFunc(organizationId, pipelineInfo.id, runParams);
+    const runId = await createPipelineRun(organizationId, pipelineInfo.id, runParams);
     const pipelineRunDetailUrl = `https://flow.aliyun.com/pipelines/${pipelineInfo.id}/builds/${runId}`;
     log(`流水线${pipelineInfo.name}[${pipelineInfo.id}]触发成功，流水线执行id: ${runId}， 流水线执行详情: ${pipelineRunDetailUrl}`);
     if (waitResult) {
@@ -338,7 +339,7 @@ async function runSinglePipeline(pipeline, index, total) {
         await git.raw("push", "origin", `${force2Branch.src}:${force2Branch.dest}`, "--force");
         log(`仓库${repo}强推${force2Branch.src}到${force2Branch.dest}完成`);
     }
-    const runId = await createPipelineRunFunc(organizationId, pipelineInfo.id, runParams);
+    const runId = await createPipelineRun(organizationId, pipelineInfo.id, runParams);
     const piplineRunDetailUrl = `https://flow.aliyun.com/pipelines/${pipelineInfo.id}/builds/${runId}`;
     log(`流水线${pipelineInfo.name}触发成功，流水线执行id: ${runId}， 流水线执行详情: ${piplineRunDetailUrl}`);
     if (pipeline.waitResult) {

package/lib/util.mjs

@@ -1,6 +1,5 @@
 import fs from 'fs';
 import { join } from "node:path"
-import { homedir } from "node:os"
 import { exec } from 'child_process';
 
 let _isDebug = false;
@@ -21,45 +20,6 @@ export function log(...args) {
     }
 }
 
-export function getOssToken() {
-    let token = "";
-    token = process.env.TW_DH_OSS_TOKEN || ""
-    if (token) {
-        log(`将使用来自环境变量TW_DH_OSS_TOKEN的token`);
-        return token;
-    }
-    const userDeployHelperDir = join(homedir(), "deploy-helper.config.json");
-    if (fs.existsSync(userDeployHelperDir)) {
-        try {
-            const userDeployHelperConfig = JSON.parse(fs.readFileSync(userDeployHelperDir, "utf-8"));
-            token = userDeployHelperConfig.ossToken || "";
-        } catch (error) {
-            console.error(`读取${userDeployHelperDir}配置失败: ${error}`);
-        }
-        if (token) {
-            log(`将使用来自${userDeployHelperDir}的ossToken`);
-            return token;
-        }
-    }
-    return token;
-}
-
-/**
- * 读取dh用户配置文件deploy-helper.config.json
- * @returns {Object|null} 用户配置
- */
-export function getUserDeployHelperConfig() {
-    const userDeployHelperDir = join(homedir(), "deploy-helper.config.json");
-    if (fs.existsSync(userDeployHelperDir)) {
-        try {
-            const userDeployHelperConfig = JSON.parse(fs.readFileSync(userDeployHelperDir, "utf-8"));
-            return userDeployHelperConfig;
-        } catch (error) {
-            console.error(`读取${userDeployHelperDir}配置失败: ${error}`);
-        }
-    }
-    return null;
-}
 /**
  * json配置
  * @param {string} workDir 项目工作目录

package/lib/yunxiaoFlowApi.mjs

@@ -0,0 +1,115 @@
+/**
+ * 云效 Flow OpenAPI 薄封装（仅 deploy-helper 流水线触发/查询所需），不做 Zod 等严格校验。
+ * 文档基址与鉴权与官方 OpenAPI 一致。
+ */
+
+const DEFAULT_BASE = "https://openapi-rdc.aliyuncs.com";
+
+function getBaseUrl() {
+    return process.env.YUNXIAO_API_BASE_URL || DEFAULT_BASE;
+}
+
+function buildUrl(path, query = {}) {
+    const base = getBaseUrl();
+    const full = `${base}${path.startsWith("/") ? path : `/${path}`}`;
+    const u = new URL(full);
+    for (const [k, v] of Object.entries(query)) {
+        if (v !== undefined && v !== null) {
+            u.searchParams.append(k, String(v));
+        }
+    }
+    return u.pathname + u.search;
+}
+
+async function parseBody(response) {
+    const ct = response.headers.get("content-type") || "";
+    if (ct.includes("application/json")) {
+        return response.json();
+    }
+    return response.text();
+}
+
+/**
+ * @param {string} urlPath 相对路径或绝对 URL
+ * @param {{ method?: string, body?: object, headers?: Record<string, string> }} [options]
+ */
+export async function yunxiaoRequest(urlPath, options = {}) {
+    const isAbs = urlPath.startsWith("http://") || urlPath.startsWith("https://");
+    const url = isAbs ? urlPath : `${getBaseUrl()}${urlPath.startsWith("/") ? urlPath : `/${urlPath}`}`;
+    const headers = {
+        Accept: "application/json",
+        "Content-Type": "application/json",
+        "User-Agent": "@taole/deploy-helper/yunxiao-flow",
+        ...options.headers,
+    };
+    if (process.env.YUNXIAO_ACCESS_TOKEN) {
+        headers["x-yunxiao-token"] = process.env.YUNXIAO_ACCESS_TOKEN;
+    }
+    const res = await fetch(url, {
+        method: options.method || "GET",
+        headers,
+        body: options.body !== undefined ? JSON.stringify(options.body) : undefined,
+    });
+    const data = await parseBody(res);
+    if (!res.ok) {
+        const msg =
+            data && typeof data === "object" && "message" in data
+                ? String(data.message)
+                : typeof data === "string"
+                  ? data
+                  : res.statusText;
+        throw new Error(`云效 API ${res.status}: ${msg}`);
+    }
+    return data;
+}
+
+/**
+ * @param {string} organizationId
+ * @param {{ pipelineName?: string, perPage?: number, page?: number }} [query]
+ */
+export async function listPipelines(organizationId, query = {}) {
+    const path = `/oapi/v1/flow/organizations/${organizationId}/pipelines`;
+    const url = buildUrl(path, {
+        pipelineName: query.pipelineName,
+        perPage: query.perPage,
+        page: query.page,
+    });
+    const response = await yunxiaoRequest(url, { method: "GET" });
+    let items = [];
+    if (Array.isArray(response)) {
+        items = response.map((item) => ({
+            ...item,
+            id: item.id ?? item.pipelineId,
+            name: item.name ?? item.pipelineName,
+        }));
+    }
+    return { items };
+}
+
+export async function getPipeline(organizationId, pipelineId) {
+    const url = `/oapi/v1/flow/organizations/${organizationId}/pipelines/${pipelineId}`;
+    return yunxiaoRequest(url, { method: "GET" });
+}
+
+export async function getPipelineRun(organizationId, pipelineId, pipelineRunId) {
+    const url = `/oapi/v1/flow/organizations/${organizationId}/pipelines/${pipelineId}/runs/${pipelineRunId}`;
+    return yunxiaoRequest(url, { method: "GET" });
+}
+
+/**
+ * @param {string} organizationId
+ * @param {string|number} pipelineId
+ * @param {{ params?: string }} options params 为 JSON 字符串（与云效 OpenAPI 一致）
+ */
+export async function createPipelineRun(organizationId, pipelineId, options = {}) {
+    const url = `/oapi/v1/flow/organizations/${organizationId}/pipelines/${pipelineId}/runs`;
+    const body = {};
+    if (options.params !== undefined) {
+        body.params = options.params;
+    }
+    const response = await yunxiaoRequest(url, {
+        method: "POST",
+        body,
+    });
+    return Number(response);
+}

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@taole/deploy-helper",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "脚本部署工具，用于将项目部署到测试环境或生产环境",
   "main": "index.mjs",
   "type": "module",
   "scripts": {
     "start": "node index.mjs",
-    "test": "node test.mjs"
+    "test": "node test.mjs",
+    "test:unit": "node --test ./test/yunxiaoFlowApi.test.mjs"
   },
   "bin": {
     "deploy-helper": "index.mjs",
@@ -18,18 +19,14 @@
   },
   "files": [
     "index.mjs",
-    "lib",
-    "modules/alibabacloud-devops-mcp-server/dist"
+    "lib"
   ],
   "keywords": [],
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "ali-oss": "^6.23.0",
-    "alibabacloud-devops-mcp-server": "*",
     "archiver": "^7.0.1",
     "form-data": "^4.0.5",
-    "md5-file": "^5.0.0",
     "node-scp": "^0.0.25",
     "simple-git": "^3.28.0"
   }