@taole/deploy-helper 1.1.8-beta.3 → 1.2.1

package/index.mjs

@@ -289,7 +289,7 @@ async function main() {
 
         const needHandleLight = config.type === "ddfe:cdn";
         if(needHandleLight){
-            await lightDeploy(config, mode);
+            await lightDeploy(config, mode, configFileName || 'deploy.config.json');
         }
         const needHandleAssets = config.assets && config.assets.dest;
 

package/lib/lightDeploy.mjs

@@ -1,5 +1,6 @@
 import fs from "fs";
 import path from "path";
+import inquirer from "inquirer";
 import { log } from "./util.mjs";
 import { getCache as getLoginCache } from "./login.mjs";
 import {
@@ -22,11 +23,100 @@ function getErrorMessage(resJson, fallback) {
   return fallback;
 }
 
+function getAuthHeaders(userCache) {
+  return {
+    Cookie: `Tuwan_Passport=${userCache.Tuwan_Passport}`,
+  };
+}
+
+async function apiCdnRegister({ prefix, type }, userCache) {
+  const res = await fetch(`${apiHost}/cdn/projects/register`, {
+    method: "POST",
+    headers: {
+      ...getAuthHeaders(userCache),
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({ prefix, type }),
+  });
+  const resJson = await res.json();
+  return { ok: res.ok, status: res.status, data: resJson };
+}
+
+async function apiCdnBind({ prefix, type }, userCache) {
+  const res = await fetch(`${apiHost}/cdn/projects/bind`, {
+    method: "POST",
+    headers: {
+      ...getAuthHeaders(userCache),
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({ prefix, type }),
+  });
+  const resJson = await res.json();
+  if (!res.ok) {
+    throw new Error(getErrorMessage(resJson, "CDN 项目绑定失败"));
+  }
+  return resJson;
+}
+
+function writeCdnProjectId(config, configFileName, projectId) {
+  const configPath = path.join(process.cwd(), configFileName);
+  const currentConfig = JSON.parse(fs.readFileSync(configPath, "utf-8"));
+  currentConfig.cdnProjectId = projectId;
+  fs.writeFileSync(configPath, `${JSON.stringify(currentConfig, null, 4)}\n`);
+  config.cdnProjectId = projectId;
+  log(
+    `已将 cdnProjectId=${projectId} 写入 ${configFileName}，请提交该配置变更。`
+  );
+}
+
+async function ensureProjectId(config, configFileName, userCache) {
+  const existingId = Number(config.cdnProjectId);
+  if (Number.isInteger(existingId) && existingId > 0) {
+    return existingId;
+  }
+
+  const prefix = config.prefix;
+  const type = config.cdnType || "project";
+  const registerResult = await apiCdnRegister({ prefix, type }, userCache);
+
+  if (registerResult.ok) {
+    const projectId = registerResult.data.projectId;
+    writeCdnProjectId(config, configFileName, projectId);
+    return projectId;
+  }
+
+  if (registerResult.status !== 409) {
+    throw new Error(
+      getErrorMessage(registerResult.data, "CDN 项目注册失败")
+    );
+  }
+
+  const { confirm } = await inquirer.prompt([
+    {
+      type: "confirm",
+      name: "confirm",
+      message: `prefix "${prefix}" 已在服务端存在。若这是已有项目的首次补 id，确认绑定？`,
+      default: false,
+    },
+  ]);
+
+  if (!confirm) {
+    throw new Error(
+      `prefix "${prefix}" 已被占用，请修改 prefix 后重试`
+    );
+  }
+
+  const bindResult = await apiCdnBind({ prefix, type }, userCache);
+  writeCdnProjectId(config, configFileName, bindResult.projectId);
+  return bindResult.projectId;
+}
+
 async function apiCdnUpload(
-  { distZipBuffer, prefix, mode, includeHtml, entryHtmlMap, type, version },
+  { distZipBuffer, prefix, projectId, mode, includeHtml, type, version },
   userCache
 ) {
   const formData = new FormData();
+  formData.append("projectId", String(projectId));
   formData.append("prefix", prefix);
   formData.append("mode", mode);
   formData.append("includeHtml", includeHtml ? "true" : "false");
@@ -36,13 +126,6 @@ async function apiCdnUpload(
   if (version) {
     formData.append("version", version);
   }
-  if (entryHtmlMap) {
-    const entryHtmlMapStr =
-      typeof entryHtmlMap === "string"
-        ? entryHtmlMap
-        : JSON.stringify(entryHtmlMap);
-    formData.append("entryHtmlMap", entryHtmlMapStr);
-  }
   formData.append(
     "file",
     new Blob([distZipBuffer], { type: "application/zip" }),
@@ -52,9 +135,7 @@ async function apiCdnUpload(
   const res = await fetch(`${apiHost}/cdn/upload`, {
     method: "POST",
     body: formData,
-    headers: {
-      Cookie: `Tuwan_Passport=${userCache.Tuwan_Passport}`,
-    },
+    headers: getAuthHeaders(userCache),
   });
   const resJson = await res.json();
   if (!res.ok) {
@@ -67,14 +148,15 @@ async function apiCdnUpload(
  * light模式部署
  * @param {*} config 配置
  * @param {*} mode 部署环境
+ * @param {string} configFileName 配置文件名
  */
-export async function lightDeploy(config, mode) {
+export async function lightDeploy(config, mode, configFileName = "deploy.config.json") {
   const projectJson = JSON.parse(
     fs.readFileSync(path.join(process.cwd(), "package.json"), "utf-8")
   );
   const version = projectJson.version;
-  // 校验cdnType只能是lib或者project
-  const cdnType = config.cdnType || 'project';
+  config.includeHtml = config.includeHtml || false;
+  const cdnType = config.cdnType || "project";
   if (cdnType !== "lib" && cdnType !== "project") {
     throw new Error("配置项 cdnType 仅支持 'lib' 或 'project'");
   }
@@ -100,6 +182,8 @@ export async function lightDeploy(config, mode) {
     throw new Error("请先登录");
   }
 
+  const projectId = await ensureProjectId(config, configFileName, userCache);
+
   const workDir = process.cwd();
   const distDir = config.distDir || "dist";
   const distPath = path.join(workDir, distDir);
@@ -118,7 +202,7 @@ export async function lightDeploy(config, mode) {
 
   const includeHtml = config.includeHtml === true;
   log(
-    `开始上传至 CDN，mode=${mode}, prefix=${prefix}, type=${
+    `开始上传至 CDN，mode=${mode}, prefix=${prefix}, projectId=${projectId}, type=${
       config.cdnType || "project"
     }, version=${version}, includeHtml=${includeHtml}`
   );
@@ -126,9 +210,9 @@ export async function lightDeploy(config, mode) {
     {
       distZipBuffer,
       prefix,
+      projectId,
       mode,
       includeHtml,
-      entryHtmlMap: config.entryHtmlMap,
       type: config.cdnType,
       version,
     },

package/package.json

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