@taole/deploy-helper 1.1.4 → 1.1.5-beta.2

package/lib/archive.mjs

@@ -0,0 +1,61 @@
+import fs from "fs";
+import path from "path";
+import { PassThrough } from "stream";
+import archiver from "archiver";
+
+export function archiveToBuffer(setupArchive) {
+  return new Promise((resolve, reject) => {
+    const chunks = [];
+    const output = new PassThrough();
+    output.on("data", (chunk) => chunks.push(chunk));
+    output.on("end", () => resolve(Buffer.concat(chunks)));
+    output.on("error", reject);
+
+    const archive = archiver("zip", { zlib: { level: 1 } });
+    archive.on("error", reject);
+    archive.pipe(output);
+
+    setupArchive(archive);
+    archive.finalize();
+  });
+}
+
+function appendDirToArchive(archive, dir, zipPrefix) {
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    const fullPath = path.join(dir, entry.name);
+    const entryZipPath = zipPrefix
+      ? path.posix.join(zipPrefix, entry.name)
+      : entry.name;
+    if (entry.isDirectory()) {
+      appendDirToArchive(archive, fullPath, entryZipPath);
+    } else {
+      archive.file(fullPath, { name: entryZipPath });
+    }
+  }
+}
+
+export function genProjectArchiveBuffer(distPath) {
+  return archiveToBuffer((archive) => {
+    archive.directory(distPath, false);
+  });
+}
+
+/**
+ * lib 类型 CDN 打包：若 dist 内仅有名为 version 的子目录则原样打包；
+ * 若无子目录则为 zip 内所有文件加上 version 前缀。
+ */
+export function genLibArchiveBuffer(distPath, version) {
+  const subdirs = fs
+    .readdirSync(distPath, { withFileTypes: true })
+    .filter((entry) => entry.isDirectory());
+
+  return archiveToBuffer((archive) => {
+    if (subdirs.length === 1 && subdirs[0].name === version) {
+      archive.directory(distPath, false);
+    } else if (subdirs.length === 0) {
+      appendDirToArchive(archive, distPath, version);
+    } else {
+      archive.directory(distPath, false);
+    }
+  });
+}

package/lib/lightDeploy.mjs

@@ -2,7 +2,10 @@ 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";
+import {
+  genLibArchiveBuffer,
+  genProjectArchiveBuffer,
+} from "./archive.mjs";
 
 const isDev = false;
 const apiHost = isDev ? "http://localhost:9000" : "https://fapi.tuwan.com";
@@ -19,7 +22,7 @@ function getErrorMessage(resJson, fallback) {
 }
 
 async function apiCdnUpload(
-  { distZipPath, prefix, mode, includeHtml, entryHtmlMap, type, version },
+  { distZipBuffer, prefix, mode, includeHtml, entryHtmlMap, type, version },
   userCache
 ) {
   const formData = new FormData();
@@ -41,7 +44,7 @@ async function apiCdnUpload(
   }
   formData.append(
     "file",
-    new Blob([fs.readFileSync(distZipPath)], { type: "application/zip" }),
+    new Blob([distZipBuffer], { type: "application/zip" }),
     "dist.zip"
   );
 
@@ -69,6 +72,11 @@ export async function lightDeploy(config, mode) {
     fs.readFileSync(path.join(process.cwd(), "package.json"), "utf-8")
   );
   const version = projectJson.version;
+  // 校验cdnType只能是lib或者project
+  const cdnType = config.cdnType;
+  if (cdnType !== "lib" && cdnType !== "project") {
+    throw new Error("配置项 cdnType 仅支持 'lib' 或 'project'");
+  }
   log(`light模式, 开始部署`, {
     mode,
     prefix: config.prefix,
@@ -98,14 +106,12 @@ export async function lightDeploy(config, mode) {
     throw new Error(`${distPath} 不存在，请先执行构建`);
   }
 
-  const distZipPath = path.join(workDir, "cdnDist.zip");
-  if (fs.existsSync(distZipPath)) {
-    fs.unlinkSync(distZipPath);
-  }
-
   log(`开始打包 ${distPath}`);
-  await genArchive(distZipPath, distPath);
-  log(`打包完成: ${distZipPath}`);
+  const distZipBuffer =
+    cdnType === "lib"
+      ? await genLibArchiveBuffer(distPath, version)
+      : await genProjectArchiveBuffer(distPath);
+  log(`打包完成，大小 ${distZipBuffer.length} 字节`);
 
   const includeHtml = config.includeHtml === true;
   log(
@@ -113,25 +119,17 @@ export async function lightDeploy(config, mode) {
       config.cdnType || "project"
     }, version=${version}, includeHtml=${includeHtml}`
   );
-  try {
-    const result = await apiCdnUpload(
-      {
-        distZipPath,
-        prefix,
-        mode,
-        includeHtml,
-        entryHtmlMap: config.entryHtmlMap,
-        type: config.cdnType,
-        version,
-      },
-      userCache
-    );
-    log(`CDN 上传成功`, result);
-  } catch (error) {
-    throw error;
-  } finally {
-    if (fs.existsSync(distZipPath)) {
-      fs.unlinkSync(distZipPath);
-    }
-  }
+  const result = await apiCdnUpload(
+    {
+      distZipBuffer,
+      prefix,
+      mode,
+      includeHtml,
+      entryHtmlMap: config.entryHtmlMap,
+      type: config.cdnType,
+      version,
+    },
+    userCache
+  );
+  log(`CDN 上传成功`, result);
 }

package/lib/project.mjs

@@ -2,31 +2,30 @@
 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";
+import { genProjectArchiveBuffer } from "./archive.mjs";
 
 const isDev = false;
 const apiHost = isDev ? "http://localhost:9000" : "https://fapi.tuwan.com";
+const WEB_ACT_REPO_PATH = "69b3821af7b43e00d420cb32/Web-Act";
 
-export 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();
-  });
+function extractWebActProjectNameFromRemote(remoteUrl) {
+  if (!remoteUrl) {
+    return null;
+  }
+  const match = remoteUrl.match(new RegExp(`${WEB_ACT_REPO_PATH}/([^/.]+)(?:\\.git)?/?$`));
+  return match ? match[1] : null;
+}
+
+async function checkPackageNameWithGitRemote(git, packageName) {
+  const remotes = await git.getRemotes(true);
+  const remoteUrls = remotes.flatMap((remote) => [remote.refs.fetch, remote.refs.push]).filter(Boolean);
+  const gitProjectName = remoteUrls.map(extractWebActProjectNameFromRemote).find(Boolean);
+
+  if (gitProjectName && gitProjectName !== packageName) {
+    throw new Error(`项目名称不匹配: git仓库项目名称为${gitProjectName}, package.json name为${packageName}`);
+  }
 }
 
 async function apiDeployProject(name, version, env, userCache) {
@@ -84,14 +83,14 @@ async function apiCreateProject(name, userCache) {
   }
 }
 
-async function apiPublishProject(name, version, distZipPath, userCache) {
+async function apiPublishProject(name, version, distZipBuffer, 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" }),
+    new Blob([distZipBuffer], { type: "application/zip" }),
     "dist.zip"
   );
   const res = await fetch(`${apiHost}${urlPath}`, {
@@ -240,6 +239,7 @@ export const cmdProjectPublish = async () => {
     log("package.json或者其version字段或name字段不存在");
     process.exit(1);
   }
+  await checkPackageNameWithGitRemote(git, packageJson.name);
 
   const newVersion = await apiGetProjectVersion(packageJson.name, userCache);
   packageJson.version = newVersion;
@@ -257,21 +257,17 @@ export const cmdProjectPublish = async () => {
   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}, 开始推送构建产物`);
+  log(`开始打包 ${distPath}`);
+  const distZipBuffer = await genProjectArchiveBuffer(distPath);
+  log(`打包完成，大小 ${distZipBuffer.length} 字节，开始推送构建产物`);
   const _publishResult = await apiPublishProject(
     packageJson.name,
     packageJson.version,
-    distZipPath,
+    distZipBuffer,
     userCache
   );
   log(`构建产物推送成功, 开始部署项目至${env}环境`);

package/package.json

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