@lark-apaas/fullstack-cli 1.1.34-alpha.5 → 1.1.35

package/dist/index.js

@@ -7264,26 +7264,48 @@ var UPLOAD_STATIC_DEFAULTS = {
 };
 
 // src/commands/build/api-client.ts
+var ERROR_RESPONSE_PREVIEW_LIMIT = 2e3;
+async function getErrorResponseDetails(response) {
+  try {
+    if (typeof response.text === "function") {
+      const text = await response.text();
+      if (!text) {
+        return "";
+      }
+      return `, response: ${text.slice(0, ERROR_RESPONSE_PREVIEW_LIMIT)}`;
+    }
+    if (typeof response.json === "function") {
+      const data = await response.json();
+      const serialized = JSON.stringify(data);
+      if (!serialized) {
+        return "";
+      }
+      return `, response: ${serialized.slice(0, ERROR_RESPONSE_PREVIEW_LIMIT)}`;
+    }
+  } catch {
+    return "";
+  }
+  return "";
+}
+async function throwIfResponseNotOk(response, message) {
+  if (response.ok && response.status === 200) {
+    return;
+  }
+  const details = await getErrorResponseDetails(response);
+  throw new Error(`${message}: ${response.status} ${response.statusText}${details}`);
+}
 async function genArtifactUploadCredential(appId, body) {
   const client = getHttpClient();
   const url = `/v1/app/${appId}/pipeline/gen_artifact_upload_credential`;
   const response = await client.post(url, body);
-  if (!response.ok || response.status !== 200) {
-    throw new Error(
-      `gen_artifact_upload_credential \u8BF7\u6C42\u5931\u8D25: ${response.status} ${response.statusText}`
-    );
-  }
+  await throwIfResponseNotOk(response, "gen_artifact_upload_credential \u8BF7\u6C42\u5931\u8D25");
   return response.json();
 }
 async function getDefaultBucketId(appId) {
   const client = getHttpClient();
   const url = `/v1/app/${appId}/storage/inner/staticBucket`;
   const response = await client.post(url, {});
-  if (!response.ok || response.status !== 200) {
-    throw new Error(
-      `getOrCreateStaticBucket \u8BF7\u6C42\u5931\u8D25: ${response.status} ${response.statusText}`
-    );
-  }
+  await throwIfResponseNotOk(response, "getOrCreateStaticBucket \u8BF7\u6C42\u5931\u8D25");
   const data = await response.json();
   if (data.status_code !== "0") {
     throw new Error(`getOrCreateStaticBucket \u8FD4\u56DE\u5F02\u5E38, status_code: ${data.status_code}`);
@@ -7298,22 +7320,14 @@ async function preUploadStaticAttachment(appId, bucketId) {
   const client = getHttpClient();
   const url = `/v1/app/${appId}/storage/bucket/${bucketId}/preUploadStatic`;
   const response = await client.post(url, {});
-  if (!response.ok || response.status !== 200) {
-    throw new Error(
-      `preUploadStatic \u8BF7\u6C42\u5931\u8D25: ${response.status} ${response.statusText}`
-    );
-  }
+  await throwIfResponseNotOk(response, "preUploadStatic \u8BF7\u6C42\u5931\u8D25");
   return response.json();
 }
 async function uploadStaticAttachmentCallback(appId, bucketId, body) {
   const client = getHttpClient();
   const url = `/v1/app/${appId}/storage/bucket/${bucketId}/object/callbackStatic`;
   const response = await client.post(url, body);
-  if (!response.ok || response.status !== 200) {
-    throw new Error(
-      `callbackStatic \u8BF7\u6C42\u5931\u8D25: ${response.status} ${response.statusText}`
-    );
-  }
+  await throwIfResponseNotOk(response, "callbackStatic \u8BF7\u6C42\u5931\u8D25");
   return response.json();
 }
 
@@ -7354,6 +7368,7 @@ import * as fs25 from "fs";
 import * as os2 from "os";
 import * as path21 from "path";
 import { execFileSync } from "child_process";
+import { HttpError } from "@lark-apaas/http-client";
 function readCredentialsFromEnv() {
   const uploadPrefix = process.env.STATIC_UPLOAD_PREFIX;
   const uploadID = process.env.STATIC_UPLOAD_ID;
@@ -7433,7 +7448,7 @@ async function uploadStatic(options) {
     console.error(`${LOG_PREFIX} \u8C03\u7528 callbackStatic (uploadID: ${uploadID})...`);
     const callbackResp = await uploadStaticAttachmentCallback(appId, bucketId, { uploadID });
     if (callbackResp.status_code !== "0") {
-      throw new Error(`callbackStatic \u8FD4\u56DE\u5F02\u5E38, status_code: ${callbackResp.status_code}`);
+      throw new Error(`callbackStatic \u8FD4\u56DE\u5F02\u5E38, status_code: ${callbackResp.status_code}, response: ${JSON.stringify(callbackResp)}`);
     }
     const attachments = callbackResp.data?.attachments || [];
     console.error(`${LOG_PREFIX} \u4E0A\u4F20\u5B8C\u6210\uFF0C\u5171 ${attachments.length} \u4E2A\u6587\u4EF6`);
@@ -7441,7 +7456,23 @@ async function uploadStatic(options) {
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     console.error(`${LOG_PREFIX} Error: ${message}`);
-    process.exit(1);
+    if (error instanceof HttpError && error.response) {
+      const logId = error.response.headers.get("x-tt-logid") || error.response.headers.get("X-Tt-Logid");
+      if (logId) {
+        console.error(`${LOG_PREFIX} logid: ${logId}`);
+      }
+      try {
+        const responseText = await error.response.text();
+        if (responseText) {
+          console.error(`${LOG_PREFIX} response: ${responseText}`);
+        }
+      } catch {
+      }
+      if (error.config?.url) {
+        console.error(`${LOG_PREFIX} request url: ${error.config.url}`);
+      }
+    }
+    process.exitCode = 1;
   }
 }
 function resolveTosutilPath(tosutilPath) {
@@ -7458,14 +7489,14 @@ function resolveTosutilPath(tosutilPath) {
 async function fetchPreUpload(appId, bucketId) {
   const response = await preUploadStaticAttachment(appId, bucketId);
   if (response.status_code !== "0") {
-    throw new Error(`preUploadStatic \u8FD4\u56DE\u5F02\u5E38, status_code: ${response.status_code}`);
+    throw new Error(`preUploadStatic \u8FD4\u56DE\u5F02\u5E38, status_code: ${response.status_code}, response: ${JSON.stringify(response)}`);
   }
   const { uploadPrefix, uploadID, uploadCredential } = response.data || {};
   if (!uploadPrefix || !uploadID) {
-    throw new Error("preUploadStatic \u8FD4\u56DE\u6570\u636E\u4E0D\u5B8C\u6574\uFF0C\u7F3A\u5C11 uploadPrefix \u6216 uploadID");
+    throw new Error(`preUploadStatic \u8FD4\u56DE\u6570\u636E\u4E0D\u5B8C\u6574\uFF0C\u7F3A\u5C11 uploadPrefix \u6216 uploadID, response: ${JSON.stringify(response)}`);
   }
   if (!uploadCredential?.AccessKeyID || !uploadCredential?.SecretAccessKey || !uploadCredential?.SessionToken) {
-    throw new Error("preUploadStatic \u8FD4\u56DE\u7684\u51ED\u8BC1\u5B57\u6BB5\u4E0D\u5B8C\u6574");
+    throw new Error(`preUploadStatic \u8FD4\u56DE\u7684\u51ED\u8BC1\u5B57\u6BB5\u4E0D\u5B8C\u6574, response: ${JSON.stringify(response)}`);
   }
   return response;
 }
@@ -7510,15 +7541,18 @@ async function preUploadStatic(options) {
     const response = await preUploadStaticAttachment(appId, bucketId);
     if (response.status_code !== "0") {
       console.error(`${LOG_PREFIX2} preUploadStatic \u8FD4\u56DE\u5F02\u5E38, status_code: ${response.status_code}`);
+      console.error(`${LOG_PREFIX2} preUploadStatic \u54CD\u5E94: ${JSON.stringify(response)}`);
       return;
     }
     const { downloadURLPrefix, uploadPrefix, uploadID, uploadCredential } = response.data || {};
     if (!downloadURLPrefix || !uploadPrefix || !uploadID) {
       console.error(`${LOG_PREFIX2} preUploadStatic \u8FD4\u56DE\u6570\u636E\u4E0D\u5B8C\u6574`);
+      console.error(`${LOG_PREFIX2} preUploadStatic \u54CD\u5E94: ${JSON.stringify(response)}`);
       return;
     }
     if (!uploadCredential?.AccessKeyID || !uploadCredential?.SecretAccessKey || !uploadCredential?.SessionToken) {
       console.error(`${LOG_PREFIX2} preUploadStatic \u8FD4\u56DE\u7684\u51ED\u8BC1\u5B57\u6BB5\u4E0D\u5B8C\u6574`);
+      console.error(`${LOG_PREFIX2} preUploadStatic \u54CD\u5E94: ${JSON.stringify(response)}`);
       return;
     }
     console.log(`export STATIC_ASSETS_BASE_URL="${shellEscape(downloadURLPrefix)}"`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-cli",
-  "version": "1.1.34-alpha.5",
+  "version": "1.1.35",
   "description": "CLI tool for fullstack template management",
   "type": "module",
   "main": "dist/index.js",

package/templates/scripts/build.sh

@@ -40,59 +40,40 @@ print_time $STEP_START
 echo ""
 
 # ==================== 步骤 3 ====================
+echo "🔨 [3/5] 并行构建 server 和 client"
 STEP_START=$(node -e "console.log(Date.now())")
 
-# 根据 only_frontend_change 决定是否构建 server
-if [[ "${only_frontend_change:-false}" == "true" ]]; then
-  echo "🔨 [3/5] 仅构建 client (only_frontend_change=true)"
-
-  echo "   ├─ 启动 client 构建..."
-  npm run build:client > /tmp/build-client.log 2>&1
-  CLIENT_EXIT=$?
-
-  if [ $CLIENT_EXIT -ne 0 ]; then
-    echo "   ❌ Client 构建失败"
-    cat /tmp/build-client.log
-    exit 1
-  fi
-
-  echo "   ✅ Client 构建完成"
-else
-  echo "🔨 [3/5] 并行构建 server 和 client"
-
-  # 并行构建
-  echo "   ├─ 启动 server 构建..."
-  npm run build:server > /tmp/build-server.log 2>&1 &
-  SERVER_PID=$!
-
-  echo "   ├─ 启动 client 构建..."
-  npm run build:client > /tmp/build-client.log 2>&1 &
-  CLIENT_PID=$!
-
-  # 等待两个构建完成
-  SERVER_EXIT=0
-  CLIENT_EXIT=0
-
-  wait $SERVER_PID || SERVER_EXIT=$?
-  wait $CLIENT_PID || CLIENT_EXIT=$?
-
-  # 检查构建结果
-  if [ $SERVER_EXIT -ne 0 ]; then
-    echo "   ❌ Server 构建失败"
-    cat /tmp/build-server.log
-    exit 1
-  fi
-
-  if [ $CLIENT_EXIT -ne 0 ]; then
-    echo "   ❌ Client 构建失败"
-    cat /tmp/build-client.log
-    exit 1
-  fi
-
-  echo "   ✅ Server 构建完成"
-  echo "   ✅ Client 构建完成"
+# 并行构建
+echo "   ├─ 启动 server 构建..."
+npm run build:server > /tmp/build-server.log 2>&1 &
+SERVER_PID=$!
+
+echo "   ├─ 启动 client 构建..."
+npm run build:client > /tmp/build-client.log 2>&1 &
+CLIENT_PID=$!
+
+# 等待两个构建完成
+SERVER_EXIT=0
+CLIENT_EXIT=0
+
+wait $SERVER_PID || SERVER_EXIT=$?
+wait $CLIENT_PID || CLIENT_EXIT=$?
+
+# 检查构建结果
+if [ $SERVER_EXIT -ne 0 ]; then
+  echo "   ❌ Server 构建失败"
+  cat /tmp/build-server.log
+  exit 1
 fi
 
+if [ $CLIENT_EXIT -ne 0 ]; then
+  echo "   ❌ Client 构建失败"
+  cat /tmp/build-client.log
+  exit 1
+fi
+
+echo "   ✅ Server 构建完成"
+echo "   ✅ Client 构建完成"
 print_time $STEP_START
 echo ""
 
@@ -100,24 +81,18 @@ echo ""
 echo "📦 [4/5] 准备产物"
 STEP_START=$(node -e "console.log(Date.now())")
 
+# 拷贝 run.sh 到 dist/（prod 从 dist/ 启动，确保 cwd 一致性）
+cp "$ROOT_DIR/scripts/run.sh" "$DIST_DIR/"
+
+# 拷贝 .env 文件（如果存在）
+if [ -f "$ROOT_DIR/.env" ]; then
+  cp "$ROOT_DIR/.env" "$DIST_DIR/"
+fi
+
 # 移动 client 下的 HTML 文件到 dist/dist/client，保证 views 路径在 dev/prod 下一致
-# HTML 文件属于前端产物，始终执行
 if [ -d "$DIST_DIR/client" ]; then
   mkdir -p "$DIST_DIR/dist/client"
-  find "$DIST_DIR/client" -maxdepth 1 -name "*.html" -exec cp {} "$DIST_DIR/dist/client/" \;
-fi
-
-# server 相关产物准备（only_frontend_change=true 时跳过）
-if [[ "${only_frontend_change:-false}" == "true" ]]; then
-  echo "   [skip] 跳过 run.sh/.env 复制 (only_frontend_change=true)"
-else
-  # 拷贝 run.sh 到 dist/（prod 从 dist/ 启动，确保 cwd 一致性）
-  cp "$ROOT_DIR/scripts/run.sh" "$DIST_DIR/"
-
-  # 拷贝 .env 文件（如果存在）
-  if [ -f "$ROOT_DIR/.env" ]; then
-    cp "$ROOT_DIR/.env" "$DIST_DIR/"
-  fi
+  find "$DIST_DIR/client" -maxdepth 1 -name "*.html" -exec mv {} "$DIST_DIR/dist/client/" \;
 fi
 
 # 清理无用文件
@@ -128,17 +103,11 @@ print_time $STEP_START
 echo ""
 
 # ==================== 步骤 5 ====================
+echo "✂️  [5/5] 智能依赖裁剪"
 STEP_START=$(node -e "console.log(Date.now())")
 
-# 智能依赖裁剪（仅全量构建时执行，纯前端场景不打包 server，无需裁剪）
-if [[ "${only_frontend_change:-false}" == "true" ]]; then
-  echo "✂️  [5/5] 跳过智能依赖裁剪 (only_frontend_change=true)"
-else
-  echo "✂️  [5/5] 智能依赖裁剪"
-
-  # 分析实际依赖、复制并裁剪 node_modules、生成精简的 package.json
-  node "$ROOT_DIR/scripts/prune-smart.js"
-fi
+# 分析实际依赖、复制并裁剪 node_modules、生成精简的 package.json
+node "$ROOT_DIR/scripts/prune-smart.js"
 
 print_time $STEP_START
 echo ""
@@ -149,16 +118,9 @@ print_time $TOTAL_START
 
 # 输出产物信息
 DIST_SIZE=$(du -sh "$DIST_DIR" | cut -f1)
-if [[ "${only_frontend_change:-false}" == "true" ]]; then
-  echo ""
-  echo "📊 构建产物统计:"
-  echo "   产物大小:        $DIST_SIZE"
-  echo ""
-else
-  NODE_MODULES_SIZE=$(du -sh "$DIST_DIR/node_modules" | cut -f1)
-  echo ""
-  echo "📊 构建产物统计:"
-  echo "   产物大小:        $DIST_SIZE"
-  echo "   node_modules: $NODE_MODULES_SIZE"
-  echo ""
-fi
+NODE_MODULES_SIZE=$(du -sh "$DIST_DIR/node_modules" | cut -f1)
+echo ""
+echo "📊 构建产物统计:"
+echo "   产物大小:        $DIST_SIZE"
+echo "   node_modules: $NODE_MODULES_SIZE"
+echo ""