@taole/deploy-helper 1.2.7 → 1.2.9

package/index.mjs

@@ -227,6 +227,7 @@ async function main() {
         console.log(`command: test [-c {configFileName}] 测试环境部署`);
         console.log(`command: scp {file} 复制文件{file}到OfficialSite测试服务器{file}`);
         console.log(`command: scp {file} {dest} 复制文件{file}到OfficialSite测试服务器{dest}`);
+        console.log(`command: scp {subdir/file} OfficialSite目录下仅放开admin子目录, 如scp admin/xxx.htm`);
         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}， 指定分支(可省略)`);
@@ -258,8 +259,9 @@ async function main() {
             process.exit(1);
         }
         const workDir = process.cwd(); // 当前项目根目录
+        const isOfficialSite = workDir.replace(/\\/g, '/').split('/').includes('OfficialSite');
 
-        const srcFilePath = join(workDir, file);
+        const srcFilePath = path.resolve(workDir, file);
         if (!fs.existsSync(srcFilePath)) {
             log(`${srcFilePath}不存在`);
             process.exit(1);
@@ -268,20 +270,46 @@ async function main() {
             log(`${srcFilePath}是目录, 不支持scp目录`);
             process.exit(1);
         }
-        // 获取srcFilePath的目录
-        const fileDir = dirname(srcFilePath);
-        const fileName = basename(srcFilePath);
-        const dest = process.argv[4] || fileName;
-        if (dest.includes("/") || dest.includes("\\")) {
-            log(`dest不能包含/或\\`);
+
+        // 相对 workDir 的路径，用于判断是否在 admin/ 下
+        const relPath = path.relative(workDir, srcFilePath).replace(/\\/g, '/');
+        if (!relPath || relPath.startsWith('..') || path.isAbsolute(relPath)) {
+            log(`仅支持scp当前目录下的文件`);
             process.exit(1);
         }
+        // OfficialSite 仅放开 admin/ 这一级子目录
+        const isAdminSubFile = isOfficialSite && /^admin\/[^/]+$/.test(relPath);
+        const fileName = basename(srcFilePath);
+        const hasSubPath = relPath.includes('/');
 
-        if (workDir !== fileDir) {
-            log(`仅支持scp当前目录下的文件(不带子目录)`);
+        // OfficialSite 下 admin/xxx 时，默认保留相对路径到远端 play/admin/
+        let dest = process.argv[4] || (isAdminSubFile ? relPath : fileName);
+        dest = dest.replace(/\\/g, '/');
+        if (dest.includes('..')) {
+            log(`dest不能包含..`);
             process.exit(1);
         }
 
+        if (isAdminSubFile) {
+            // dest 只能是文件名，或 admin/文件名
+            if (dest.includes('/') && !/^admin\/[^/]+$/.test(dest)) {
+                log(`OfficialSite下仅支持admin子目录, dest须为文件名或admin/文件名`);
+                process.exit(1);
+            }
+            if (!dest.includes('/')) {
+                dest = `admin/${dest}`;
+            }
+        } else {
+            if (dest.includes("/")) {
+                log(`dest不能包含/或\\`);
+                process.exit(1);
+            }
+            if (hasSubPath) {
+                log(`仅支持scp当前目录下的文件(不带子目录); OfficialSite下可使用admin/文件名`);
+                process.exit(1);
+            }
+        }
+
         const destPath = "/home/web/website/tuwan_www/templets/static/play/" + (command === 'scp' ? '' : 'events/') + dest;
 
         const scpClient = await getScpClient();

package/lib/pipelineApi.mjs

@@ -136,9 +136,23 @@ export function setDevToken(token) {
 async function getPipelineInfoByName(name) {
     let pipeline = null;
     try {
+        // 云效 ListPipelines 不支持按创建时间排序，需本地按 createTime 升序取最早创建的同名流水线
         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);
+            const matched = pipelines.items
+                .filter((item) => item.name === name)
+                .sort((a, b) => {
+                    const ta = Number(a.createTime) || 0;
+                    const tb = Number(b.createTime) || 0;
+                    if (ta !== tb) {
+                        return ta - tb;
+                    }
+                    return Number(a.id) - Number(b.id);
+                });
+            if (matched.length > 1) {
+                log(`发现${matched.length}条同名流水线【${name}】，将使用最早创建的: id=${matched[0].id}, createTime=${matched[0].createTime}`);
+            }
+            pipeline = matched[0] || null;
         }
     } catch (error) {
         throw new Error(`获取流水线信息失败, 请确认流水线名称:【${name}】是否正确或检查云效token的权限是否足够: ${error}`);

package/lib/project.mjs

@@ -102,6 +102,20 @@ async function apiGetTemplateProjects(userCache) {
   }
 }
 
+async function apiGetProject(nameOrId, userCache) {
+  const res = await fetch(`${apiHost}/h5projects/${encodeURIComponent(nameOrId)}`, {
+    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;
+}
+
 async function apiCreateProject(name, userCache, templateId) {
   try {
     const body = { name };
@@ -388,7 +402,6 @@ export const cmdProjectPublish = async () => {
 
 export const cmdProjectPull = async () => {
   const name = process.argv[3];
-  const projectDir = path.join(process.cwd(), name);
   if (!name) {
     log("请输入项目名称");
     process.exit(1);
@@ -402,13 +415,30 @@ export const cmdProjectPull = async () => {
     log("项目名称不能是纯数字");
     process.exit(1);
   }
+  const projectDir = path.join(process.cwd(), name);
   if (fs.existsSync(projectDir)) {
     log(`项目目录${projectDir}已存在`);
     process.exit(1);
   }
-  const repoUrl = `https://codeup.aliyun.com/69b3821af7b43e00d420cb32/Web-Act/${name}`;
+
+  const userCache = await getLoginCache();
+  if (!userCache || !userCache.userInfo || !userCache.userInfo.uid) {
+    log("请先登录");
+    process.exit(1);
+  }
+
+  const project = await apiGetProject(name, userCache);
+  if (project.projectType !== "normal") {
+    log(`仅支持拉取 projectType=normal 的项目，当前类型为 ${project.projectType || "未知"}`);
+    process.exit(1);
+  }
+
+  const projectName = project.name || name;
+  const repoUrl =
+    project.repoUrl ||
+    `https://codeup.aliyun.com/69b3821af7b43e00d420cb32/Web-Act/${projectName}`;
   log(`项目仓库地址: ${repoUrl}`);
-  const httpRepoUrl = repoUrl + ".git";
+  const httpRepoUrl = repoUrl.endsWith(".git") ? repoUrl : repoUrl + ".git";
   const sshRepoUrl = httpRepoUrl.replace(
     "https://codeup.aliyun.com/",
     "git@codeup.aliyun.com:"
@@ -416,32 +446,33 @@ export const cmdProjectPull = async () => {
   let git = simpleGit(process.cwd());
   let sshFail = false;
   try {
-    await git.clone(sshRepoUrl, name);
+    await git.clone(sshRepoUrl, projectName);
   } catch (error) {
     log(`使用SSH协议克隆失败, 尝试使用HTTP协议克隆`);
     sshFail = true;
   }
   if (sshFail) {
     try {
-      await git.clone(httpRepoUrl, name);
+      await git.clone(httpRepoUrl, projectName);
     } catch (error) {
       throw new Error(`克隆仓库失败`);
     }
   }
-  log(`项目拉取成功, 项目目录: ${name}`);
-  git = simpleGit(projectDir);
-  const targetPackageJson = getJsonConfig(projectDir, "package.json");
-  if (targetPackageJson.name !== name) {
-    targetPackageJson.name = name;
+  const clonedDir = path.join(process.cwd(), projectName);
+  log(`项目拉取成功, 项目目录: ${projectName}`);
+  git = simpleGit(clonedDir);
+  const targetPackageJson = getJsonConfig(clonedDir, "package.json");
+  if (targetPackageJson.name !== projectName) {
+    targetPackageJson.name = projectName;
     fs.writeFileSync(
-      path.join(projectDir, "package.json"),
+      path.join(clonedDir, "package.json"),
       JSON.stringify(targetPackageJson, null, 2)
     );
     log(`项目package.json覆盖成功`);
     await git.add(".");
     await git.commit(`-#DH-07 feat: 项目初始化`);
   }
-  log(`请cd至项目目录: ${projectDir} 进行后续开发`);
+  log(`请cd至项目目录: ${clonedDir} 进行后续开发`);
   process.exit(0);
 };
 

package/package.json

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