@taole/deploy-helper 1.0.0-beta.6 → 1.0.1

package/lib/project.mjs

@@ -0,0 +1,346 @@
+// 处理项目相关的操作
+import { simpleGit } from "simple-git";
+import path from "path";
+import fs from "fs";
+import archiver from "archiver";
+import { log, getJsonConfig, runCmdAsync } from "./util.mjs";
+import { getCache as getLoginCache } from "./login.mjs";
+
+const isDev = false;
+const apiHost = isDev ? "http://localhost:9000" : "https://fapi.tuwan.com";
+
+function genArchive(outputPath, dir) {
+  return new Promise((resolve, reject) => {
+    const output = fs.createWriteStream(outputPath);
+    const archive = archiver("zip", {
+      zlib: { level: 1 }, // Sets the compression level.
+    });
+    archive.on("error", reject);
+    archive.on("finish", () => {
+      // console.log("genArchive finish");
+      setTimeout(() => {
+        // console.log("genArchive finish true");
+        resolve();
+      }, 300);
+    });
+    archive.pipe(output);
+    archive.directory(dir, false);
+    archive.finalize();
+  });
+}
+
+async function apiDeployProject(name, version, env, userCache) {
+  try {
+    const urlPath = `/h5projects/${name}/deploy`;
+    const res = await fetch(`${apiHost}${urlPath}`, {
+      method: "POST",
+      body: JSON.stringify({
+        name: name,
+        version: version,
+        env: env,
+      }),
+      headers: {
+        "Content-Type": "application/json",
+        Cookie: `Tuwan_Passport=${userCache.Tuwan_Passport}`,
+      },
+    });
+    const resJson = await res.json();
+    if (!res.ok) {
+      const error = (resJson && resJson.message) || "部署项目失败";
+      throw new Error(error);
+    }
+    return resJson;
+  } catch (error) {
+    const errorMessage = error.message || "部署项目失败";
+    throw new Error(errorMessage);
+  }
+}
+
+async function apiCreateProject(name, userCache) {
+  try {
+    const res = await fetch(`${apiHost}/h5projects`, {
+      method: "POST",
+      body: JSON.stringify({
+        name: name,
+      }),
+      headers: {
+        "Content-Type": "application/json",
+        Cookie: `Tuwan_Passport=${userCache.Tuwan_Passport}`,
+      },
+    });
+    const resJson = await res.json();
+    if (!res.ok) {
+      const error = (resJson && resJson.message) || "创建项目失败";
+      throw new Error(error);
+    }
+    if (!resJson || resJson.name !== name) {
+      throw new Error(
+        `创建项目失败: 项目名称不匹配: ${resJson.name} !== ${name}`
+      );
+    }
+    return resJson;
+  } catch (error) {
+    throw new Error(`创建项目失败: ${error.message}`);
+  }
+}
+
+async function apiPublishProject(name, version, distZipPath, userCache) {
+  const urlPath = `/h5projects/${name}/publish`;
+  const formData = new FormData();
+  formData.append("updaterUid", userCache.userInfo.uid);
+  formData.append("version", version);
+  formData.append(
+    "file",
+    new Blob([fs.readFileSync(distZipPath)], { type: "application/zip" }),
+    "dist.zip"
+  );
+  const res = await fetch(`${apiHost}${urlPath}`, {
+    method: "POST",
+    body: formData,
+    headers: {
+      Cookie: `Tuwan_Passport=${userCache.Tuwan_Passport}`,
+    },
+  });
+  const resJson = await res.json();
+  if (!res.ok) {
+    const error = (resJson && resJson.message) || "更新项目失败";
+    throw new Error(error);
+  }
+  return resJson;
+}
+
+function patchVersion(version) {
+  const versions = version.split(".");
+  versions[versions.length - 1] = parseInt(versions[versions.length - 1]) + 1;
+  return versions.join(".");
+}
+
+/**
+ * 获取最新可以使用的版本号
+ */
+async function apiGetProjectVersion(name, userCache) {
+  const urlPath = `/h5projects/${name}/build/lasted`;
+  const res = await fetch(`${apiHost}${urlPath}`, {
+    headers: {
+      Cookie: `Tuwan_Passport=${userCache.Tuwan_Passport}`,
+    },
+  });
+  const resJson = await res.json();
+  if (!res.ok) {
+    if (res.status === 404) {
+      return "0.0.1";
+    }
+    const error = (resJson && resJson.message) || "获取项目版本失败";
+    throw new Error(error);
+  }
+  const version = resJson.version;
+  if (/^\d+\.\d+\.\d+$/.test(version)) {
+    return patchVersion(version);
+  }
+  throw new Error(`获取项目版本失败: ${version}`);
+}
+
+/**
+ * 创建项目
+ */
+export const cmdProjectCreate = async () => {
+  const name = process.argv[3];
+  const projectDir = path.join(process.cwd(), name);
+  if (!name) {
+    log("请输入项目名称");
+    process.exit(1);
+  }
+  if (!/^[a-zA-Z0-9-_]+$/.test(name)) {
+    log("项目名称只能包含字母、数字和-_");
+    process.exit(1);
+  }
+  // 不能是纯数字
+  if (/^\d+$/.test(name)) {
+    log("项目名称不能是纯数字");
+    process.exit(1);
+  }
+  if (fs.existsSync(projectDir)) {
+    log(`项目目录${projectDir}已存在`);
+    process.exit(1);
+  }
+  const userCache = await getLoginCache();
+  if (!userCache || !userCache.userInfo || !userCache.userInfo.uid) {
+    log("请先登录");
+    process.exit(1);
+  }
+  const createResult = await apiCreateProject(name, userCache);
+  const repoUrl = createResult.repoUrl;
+  log(`获得项目仓库地址: ${repoUrl}`);
+  const httpRepoUrl = repoUrl + ".git";
+  const sshRepoUrl = httpRepoUrl.replace(
+    "https://codeup.aliyun.com/",
+    "git@codeup.aliyun.com:"
+  );
+  //   https://codeup.aliyun.com/69b3821af7b43e00d420cb32/Web-Act/demo2-cli.git
+  //   https://codeup.aliyun.com/69b3821af7b43e00d420cb32/Web-Act/demo2-cli
+  //   git@codeup.aliyun.com:69b3821af7b43e00d420cb32/Web-Act/demo2-cli.git
+  let git = simpleGit(process.cwd());
+  let sshFail = false;
+  try {
+    await git.clone(sshRepoUrl, name);
+  } catch (error) {
+    log(`使用SSH协议克隆失败, 尝试使用HTTP协议克隆`);
+    sshFail = true;
+  }
+  if (sshFail) {
+    try {
+      await git.clone(httpRepoUrl, name);
+    } catch (error) {
+      throw new Error(`克隆仓库失败`);
+    }
+  }
+  log(`项目创建成功, 项目目录: ${name}`);
+  git = simpleGit(projectDir);
+  const targetPackageJson = getJsonConfig(projectDir, "package.json");
+  targetPackageJson.name = name;
+  fs.writeFileSync(
+    path.join(projectDir, "package.json"),
+    JSON.stringify(targetPackageJson, null, 2)
+  );
+  log(`项目package.json覆盖成功`);
+  await git.add(".");
+  await git.commit(`-#DH-07 feat: 项目初始化`);
+  log(`请cd至项目目录: ${projectDir} 手动执行: npm install 安装依赖`);
+  process.exit(0);
+};
+
+/**
+ * 更新项目到H5平台
+ */
+
+export const cmdProjectPublish = async () => {
+  const env = process.argv[3];
+  if (!env) {
+    log("请输入环境: test, prod");
+    process.exit(1);
+  }
+  if (env !== "test" && env !== "prod") {
+    log("环境只能输入test或prod");
+    process.exit(1);
+  }
+
+  const git = simpleGit(process.cwd());
+  const gitStatus = await git.status();
+  if (!gitStatus.isClean()) {
+    log("工作区还有未提交的代码，请先提交代码");
+    process.exit(1);
+  }
+  const userCache = await getLoginCache();
+  if (!userCache || !userCache.userInfo || !userCache.userInfo.uid) {
+    log("请先登录");
+    process.exit(1);
+  }
+  const packageJson = getJsonConfig(process.cwd(), "package.json");
+  if (!packageJson || !packageJson.version || !packageJson.name) {
+    log("package.json或者其version字段或name字段不存在");
+    process.exit(1);
+  }
+
+  const newVersion = await apiGetProjectVersion(packageJson.name, userCache);
+  packageJson.version = newVersion;
+  fs.writeFileSync(
+    path.join(process.cwd(), "package.json"),
+    JSON.stringify(packageJson, null, 2)
+  );
+  log(`更新package.json版本号为: ${newVersion}`);
+  await git.add(".");
+  await git.commit(`-#DH-07 feat: 更新版本号为: ${newVersion}`);
+  await git.push();
+  log(`提交代码成功，开始构建项目`);
+
+  const buildCmd = "npm run build";
+  await runCmdAsync(buildCmd);
+  log(`构建项目成功，开始打包构建产物`);
+  const distPath = path.join(process.cwd(), "dist");
+  const distZipPath = path.join(process.cwd(), "dist.zip");
+  if (!fs.existsSync(distPath)) {
+    log("dist目录不存在");
+    process.exit(1);
+  }
+  // 把dist目录打包为zip包
+  if (fs.existsSync(distZipPath)) {
+    fs.unlinkSync(distZipPath);
+  }
+  await genArchive(distZipPath, distPath);
+  log(`dist目录打包为zip包: ${distZipPath}, 开始推送构建产物`);
+  const _publishResult = await apiPublishProject(
+    packageJson.name,
+    packageJson.version,
+    distZipPath,
+    userCache
+  );
+  log(`构建产物推送成功, 开始部署项目至${env}环境`);
+  const _deployResult = await apiDeployProject(
+    packageJson.name,
+    packageJson.version,
+    env,
+    userCache
+  );
+  log(`部署项目至${env}环境成功`);
+  process.exit(0);
+};
+
+
+export const cmdProjectPull = async () => {
+  const name = process.argv[3];
+  const projectDir = path.join(process.cwd(), name);
+  if (!name) {
+    log("请输入项目名称");
+    process.exit(1);
+  }
+  if (!/^[a-zA-Z0-9-_]+$/.test(name)) {
+    log("项目名称只能包含字母、数字和-_");
+    process.exit(1);
+  }
+  // 不能是纯数字
+  if (/^\d+$/.test(name)) {
+    log("项目名称不能是纯数字");
+    process.exit(1);
+  }
+  if (fs.existsSync(projectDir)) {
+    log(`项目目录${projectDir}已存在`);
+    process.exit(1);
+  }
+  const repoUrl = `https://codeup.aliyun.com/69b3821af7b43e00d420cb32/Web-Act/${name}`;
+  log(`项目仓库地址: ${repoUrl}`);
+  const httpRepoUrl = repoUrl + ".git";
+  const sshRepoUrl = httpRepoUrl.replace(
+    "https://codeup.aliyun.com/",
+    "git@codeup.aliyun.com:"
+  );
+  let git = simpleGit(process.cwd());
+  let sshFail = false;
+  try {
+    await git.clone(sshRepoUrl, name);
+  } catch (error) {
+    log(`使用SSH协议克隆失败, 尝试使用HTTP协议克隆`);
+    sshFail = true;
+  }
+  if (sshFail) {
+    try {
+      await git.clone(httpRepoUrl, name);
+    } catch (error) {
+      throw new Error(`克隆仓库失败`);
+    }
+  }
+  log(`项目拉取成功, 项目目录: ${name}`);
+  git = simpleGit(projectDir);
+  const targetPackageJson = getJsonConfig(projectDir, "package.json");
+  if(targetPackageJson.name !== name){
+    targetPackageJson.name = name;
+    fs.writeFileSync(
+      path.join(projectDir, "package.json"),
+      JSON.stringify(targetPackageJson, null, 2)
+    );
+    log(`项目package.json覆盖成功`);
+    await git.add(".");
+    await git.commit(`-#DH-07 feat: 项目初始化`);
+  }
+  log(`请cd至项目目录: ${projectDir} 进行后续开发`);
+  process.exit(0);
+}

package/lib/upload.js

@@ -0,0 +1,49 @@
+import OSS from "ali-oss";
+
+
+function UUIDNOCA() {
+    return "xxxxxxxxxxxxxxxxyxxxxxxxxxxxxxxx".replace(/[xy]/g, function (c) {
+        var r = (Math.random() * 16) | 0;
+        var v = c === "x" ? r : (r & 0x3) | 0x8;
+        return v.toString(16);
+    });
+};
+
+let keyConfig = null;
+async function getKeyConfig(ossToken) {
+    if (keyConfig) {
+        return keyConfig;
+    }
+    const reqUrl = `https://u.tuwan.com/Oss/sts?token=${ossToken}`;
+    const res = await fetch(reqUrl);
+    const resText = await res.text();
+    let fmtJson = resText.substring(1, resText.length - 1).replace("'", '"');
+    const realData = JSON.parse(fmtJson).data;
+    keyConfig = realData;
+    return keyConfig;   
+}
+
+let ossClient = null;
+async function getUploadConfig(ossToken) {
+    if (ossClient) {
+        return ossClient;
+    }
+    const keyConfig = await getKeyConfig(ossToken);
+    ossClient = new OSS({
+        endpoint: "oss-cn-qingdao.aliyuncs.com",
+        accessKeyId: keyConfig.AccessKeyId,
+        accessKeySecret: keyConfig.AccessKeySecret,
+        bucket: "tuwanpicshare",
+        stsToken: keyConfig.SecurityToken,
+        secure: true,
+    });
+    return ossClient;
+}
+
+export async function uploadFile(ossToken, filePath, name) {
+    const str = filePath;
+    const ext = str.substr(str.lastIndexOf(".") + 1);
+    const fileName = `offlinepkg/${name || UUIDNOCA()}.${ext}`;
+    const ossClient = await getUploadConfig(ossToken);
+    return ossClient.put(fileName, filePath);
+}

package/lib/util.mjs

@@ -1,17 +1,102 @@
-let _isDebug = false;
-export function setDebug(debug) {
-    _isDebug = debug;
-}
-
-export function isDebug() {
-    return _isDebug;
-}
-
-export function log(...args) {
-    if (_isDebug) {
-        // 打印时间 
-        console.log(`[${new Date().toLocaleTimeString()}]`, ...args);
-    } else {
-        console.log(...args);
-    }
+import fs from 'fs';
+import { join } from "node:path"
+import { homedir } from "node:os"
+import { exec } from 'child_process';
+
+let _isDebug = false;
+export function setDebug(debug) {
+    _isDebug = debug;
+}
+
+export function isDebug() {
+    return _isDebug;
+}
+
+export function log(...args) {
+    if (_isDebug) {
+        // 打印时间 
+        console.log(`[${new Date().toLocaleTimeString()}]`, ...args);
+    } else {
+        console.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 项目工作目录
+ * @returns {Object|null} 配置
+ */
+export function getJsonConfig(workDir, name) {
+    const filePath = join(workDir, name);
+    if (fs.existsSync(filePath)) {
+        try {
+            return JSON.parse(fs.readFileSync(filePath, "utf-8"));
+        } catch (_error) {
+            // pass
+        }
+    }
+    return null;
+}
+
+/**
+ * 执行命令
+ * @param {*} cmd string 命令
+ * @param {*} options { cwd: string, env: object } 可选参数
+ * @returns Promise<string> 命令执行结果
+ */
+export async function runCmdAsync(cmd, options) {
+    log("执行命令:", cmd);
+    return new Promise((resolve, reject) => {
+        exec(cmd, options, (error, stdout, stderr) => {
+            if (error) {
+                reject(error);
+            }
+            if(stdout){
+                console.log(stdout);
+            }
+            if (stderr) {
+                console.error(stderr);
+            }
+            resolve(stdout);
+        });
+    });
 }

package/modules/alibabacloud-devops-mcp-server/dist/operations/flow/pipeline.js

@@ -52,7 +52,7 @@ export async function listPipelinesFunc(organizationId, options) {
         queryParams.page = options.page;
     }
     const url = utils.buildUrl(baseUrl, queryParams);
-    const response = await utils.yunxiaoRequest(url, {
+    let response = await utils.yunxiaoRequest(url, {
         method: "GET",
     });
     const pagination = {
@@ -65,6 +65,13 @@ export async function listPipelinesFunc(organizationId, options) {
     };
     let items = [];
     if (Array.isArray(response)) {
+        response = response.map((item) => ({
+            ...item,
+            id: item.id || item.pipelineId,
+            name: item.name || item.pipelineName,
+            creatorAccountId: item.creatorAccountId || item.createAccountId,
+            createTime: item.createTime || item.createTime,
+        }))
         items = response.map(item => PipelineListItemSchema.parse(item));
     }
     return {

package/package.json

@@ -1,31 +1,36 @@
-{
-  "name": "@taole/deploy-helper",
-  "version": "1.0.0-beta.6",
-  "description": "脚本部署工具，用于将项目部署到测试环境或生产环境",
-  "main": "index.mjs",
-  "type": "module",
-  "bin": {
-    "deploy-helper": "index.mjs",
-    "dh": "index.mjs"
-  },
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
-  "files": [
-    "index.mjs",
-    "deploy.mjs",
-    "deploy2.mjs",
-    "util.mjs",
-    "lib",
-    "modules/alibabacloud-devops-mcp-server/dist"
-  ],
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "alibabacloud-devops-mcp-server": "0.1.26",
-    "node-scp": "^0.0.25",
-    "simple-git": "^3.28.0"
-  }
-}
+{
+  "name": "@taole/deploy-helper",
+  "version": "1.0.1",
+  "description": "脚本部署工具，用于将项目部署到测试环境或生产环境",
+  "main": "index.mjs",
+  "type": "module",
+  "scripts": {
+    "start": "node index.mjs",
+    "test": "node test.mjs"
+  },
+  "bin": {
+    "deploy-helper": "index.mjs",
+    "dh": "index.mjs"
+  },
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "files": [
+    "index.mjs",
+    "lib",
+    "modules/alibabacloud-devops-mcp-server/dist"
+  ],
+  "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"
+  }
+}