@taole/deploy-helper 1.0.4 → 1.0.5-beta.2

package/index.mjs

@@ -10,6 +10,8 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 import { cmdWhoami, cmdLogout, cmdLogin } from './lib/login.mjs';
 import { cmdProjectCreate, cmdProjectPublish, cmdProjectPull } from './lib/project.mjs';
+import { cmdCommit } from './lib/git.mjs';
+import { lightDeploy } from './lib/lightDeploy.mjs';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -106,10 +108,10 @@ async function getScpClient() {
     return scpClient;
 }
 
-async function getVersion() {
+function getPackageJson() {
     const packageJsonPath = join(__dirname, "package.json");
     const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
-    return packageJson.version;
+    return packageJson;
 }
 
 const commandMap = {};
@@ -128,6 +130,7 @@ function doRegisterCommands() {
     registerCommand("create", cmdProjectCreate, "创建项目");
     registerCommand("publish", cmdProjectPublish, "更新项目到H5平台");
     registerCommand("pull", cmdProjectPull, "拉取已有项目到本地");
+    registerCommand("commit", cmdCommit, "按任务号提交（参数为说明，如 feat: xxx）");
     registerCommand("whoami", cmdWhoami, "查看当前登录用户信息");
     registerCommand("logout", cmdLogout, "退出登录");
     registerCommand("login", cmdLogin, "登录");
@@ -136,7 +139,8 @@ function doRegisterCommands() {
 doRegisterCommands();
 
 async function main() {
-    const version = await getVersion();
+    const packageJson = getPackageJson();
+    const version = packageJson.version;
 
     // process.argv.includes("--debug") || 
     // 默认开启debug debug目前只是打印日志的时候额外打印时间
@@ -283,7 +287,10 @@ async function main() {
             process.exit(1);
         }
 
-
+        const needHandleLight = config.type === "ddfe:cdn";
+        if(needHandleLight){
+            await lightDeploy(config, mode);
+        }
         const needHandleAssets = config.assets && config.assets.dest;
 
         // 需要处理entry

package/lib/git.mjs

@@ -0,0 +1,102 @@
+// Git 辅助操作（基于 simple-git）
+import { simpleGit } from "simple-git";
+import { log } from "./util.mjs";
+
+/**
+ * @param {string} branch
+ * @param {string} latestCommitMsg
+ */
+function extractTaskId(branch, latestCommitMsg) {
+  const fromBranch = branch.match(/#([A-Z]+-\d+)$/);
+  if (fromBranch) return fromBranch[1];
+  const fromCommit = latestCommitMsg.match(/-#([A-Z]+-\d+)/);
+  if (fromCommit) return fromCommit[1];
+  return null;
+}
+
+function getUserMessage() {
+  const argvMsg = process.argv.slice(3).join(" ").trim();
+  if (argvMsg) return argvMsg;
+  const envMsg = (
+    process.env.npm_config_message ||
+    process.env.npm_config_msg ||
+    ""
+  ).trim();
+  return envMsg;
+}
+
+/**
+ * @param {string} input
+ * @returns {{ full: string, typePart: null } | { full: null, typePart: string } | null}
+ */
+/** 参数是否已自带 `-#PROJ-123` 形式任务前缀（无需再从分支/历史解析） */
+function hasExplicitTaskPrefix(msg) {
+  return /^-#[A-Z]+-\d+/.test(msg.trim());
+}
+
+function normalizeMessage(input) {
+  const msg = input.trim();
+  if (!msg) return null;
+  if (msg.startsWith("-#")) {
+    return { full: msg, typePart: null };
+  }
+  const match = msg.match(/^([a-z]+):\s*(.+)$/i);
+  if (!match) return null;
+  return { full: null, typePart: `${match[1]}: ${match[2]}` };
+}
+
+async function getLatestSubject(git) {
+  try {
+    const logResult = await git.log({ maxCount: 1 });
+    if (!logResult.latest) return "";
+    return logResult.latest.message.split("\n")[0].trim();
+  } catch {
+    return "";
+  }
+}
+
+/**
+ * 按任务号规范提交：默认从分支名（末尾 #任务号）或最新提交中提取任务号；若参数已含 `-#DDKH-4169` 形式前缀则直接使用该说明提交。
+ * 用法: dh commit "feat: 说明" 或 dh commit "-#DDKH-4169 feat: 完整信息"
+ */
+export async function cmdCommit() {
+  const git = simpleGit(process.cwd());
+  const rawMsg = getUserMessage();
+
+  let commitMsg;
+
+  if (rawMsg.trim() && hasExplicitTaskPrefix(rawMsg)) {
+    const parsed = normalizeMessage(rawMsg);
+    if (!parsed) {
+      log('请传入提交说明，例如: dh commit "feat:我的提交信息"');
+      process.exit(1);
+    }
+    commitMsg = parsed.full;
+  } else {
+    const branch = (await git.status()).current;
+    const latestCommitMsg = await getLatestSubject(git);
+    const taskId = extractTaskId(branch, latestCommitMsg);
+    if (!taskId) {
+      log("未能从分支名或最新提交中提取任务号（如 DDKH-4169）");
+      process.exit(1);
+    }
+
+    const parsed = normalizeMessage(rawMsg);
+    if (!parsed) {
+      log('请传入提交说明，例如: dh commit "feat:我的提交信息"');
+      process.exit(1);
+    }
+
+    commitMsg = parsed.full || `-#${taskId} ${parsed.typePart}`;
+  }
+
+  const st = await git.status();
+  if (st.isClean()) {
+    log("没有可提交的改动");
+    process.exit(1);
+  }
+  await git.add(".");
+  await git.commit(commitMsg);
+  log(`commit 完成: ${commitMsg}`);
+  process.exit(0);
+}

package/lib/lightDeploy.mjs

@@ -0,0 +1,103 @@
+import fs from "fs";
+import path from "path";
+import { log } from "./util.mjs";
+import { getCache as getLoginCache } from "./login.mjs";
+import { genArchive } from "./project.mjs";
+
+const isDev = false;
+const apiHost = isDev ? "http://localhost:9000" : "https://fapi.tuwan.com";
+
+function getErrorMessage(resJson, fallback) {
+  const message = resJson?.message;
+  if (Array.isArray(message)) {
+    return message.join(", ");
+  }
+  if (message) {
+    return String(message);
+  }
+  return fallback;
+}
+
+async function apiCdnUpload({ distZipPath, prefix, mode, includeHtml, entryHtmlMap }, userCache) {
+  const formData = new FormData();
+  formData.append("prefix", prefix);
+  formData.append("mode", mode);
+  formData.append("includeHtml", includeHtml ? "true" : "false");
+  if (entryHtmlMap) {
+    const entryHtmlMapStr =
+      typeof entryHtmlMap === "string" ? entryHtmlMap : JSON.stringify(entryHtmlMap);
+    formData.append("entryHtmlMap", entryHtmlMapStr);
+  }
+  formData.append(
+    "file",
+    new Blob([fs.readFileSync(distZipPath)], { type: "application/zip" }),
+    "dist.zip"
+  );
+
+  const res = await fetch(`${apiHost}/cdn/upload`, {
+    method: "POST",
+    body: formData,
+    headers: {
+      Cookie: `Tuwan_Passport=${userCache.Tuwan_Passport}`,
+    },
+  });
+  const resJson = await res.json();
+  if (!res.ok) {
+    throw new Error(getErrorMessage(resJson, "CDN 上传失败"));
+  }
+  return resJson;
+}
+
+export async function lightDeploy(config, mode) {
+  log(`light模式, 开始部署`, { mode, prefix: config.prefix, includeHtml: config.includeHtml });
+
+  if (!mode || (mode !== "test" && mode !== "prod")) {
+    throw new Error("部署环境无效，仅支持 test 或 prod");
+  }
+
+  const prefix = config.prefix;
+  if (!prefix) {
+    throw new Error("配置缺少 prefix");
+  }
+
+  const userCache = await getLoginCache();
+  if (!userCache?.userInfo?.uid) {
+    throw new Error("请先登录");
+  }
+
+  const workDir = process.cwd();
+  const distDir = config.distDir || "dist";
+  const distPath = path.join(workDir, distDir);
+  if (!fs.existsSync(distPath)) {
+    throw new Error(`${distPath} 不存在，请先执行构建`);
+  }
+
+  const distZipPath = path.join(workDir, "dist.zip");
+  if (fs.existsSync(distZipPath)) {
+    fs.unlinkSync(distZipPath);
+  }
+
+  log(`开始打包 ${distPath}`);
+  await genArchive(distZipPath, distPath);
+  log(`打包完成: ${distZipPath}`);
+
+  const includeHtml = config.includeHtml === true;
+  log(`开始上传至 CDN，mode=${mode}, prefix=${prefix}, includeHtml=${includeHtml}`);
+  const result = await apiCdnUpload(
+    {
+      distZipPath,
+      prefix,
+      mode,
+      includeHtml,
+      entryHtmlMap: config.entryHtmlMap,
+      type: config.cdnType,
+    },
+    userCache
+  );
+
+  if (fs.existsSync(distZipPath)) {
+    fs.unlinkSync(distZipPath);
+  }
+
+  log(`CDN 上传成功`, result);
+}

package/lib/project.mjs

@@ -9,7 +9,7 @@ import { getCache as getLoginCache } from "./login.mjs";
 const isDev = false;
 const apiHost = isDev ? "http://localhost:9000" : "https://fapi.tuwan.com";
 
-function genArchive(outputPath, dir) {
+export function genArchive(outputPath, dir) {
   return new Promise((resolve, reject) => {
     const output = fs.createWriteStream(outputPath);
     const archive = archiver("zip", {

package/package.json

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