@lark-apaas/fullstack-cli 1.1.32 → 1.1.34-alpha.0

package/dist/index.js

@@ -1414,14 +1414,15 @@ async function fetchSyncedTables(appId, workspace) {
         DEFAULT_TIMEOUT_MS2
       );
     });
+    const dbBranch = process.env.FORCE_DB_BRANCH || "main";
     const start = Date.now();
     console.log(
-      `[fetchSyncedTables] \u2192 GET listTableView (dbBranch=main) appId=${appId ? "set" : "unset"} workspace=${workspace ? "set" : "unset"}`
+      `[fetchSyncedTables] \u2192 GET listTableView (dbBranch=${dbBranch}) appId=${appId ? "set" : "unset"} workspace=${workspace ? "set" : "unset"}`
     );
     const response = await Promise.race([
       client.get(
         `/api/v1/dataloom/inner/app/${appId}/workspaces/${workspace}/listTableView`,
-        { params: { dbBranch: "main" }, headers: { "x-supaas-bizsource": "miaoda" } }
+        { params: { dbBranch }, headers: { "x-supaas-bizsource": "miaoda" } }
       ),
       timeoutPromise
     ]);
@@ -7255,6 +7256,12 @@ var SCENE_CONFIGS = {
     buildRequestBody: () => ({ commitID: "" })
   }
 };
+var UPLOAD_STATIC_DEFAULTS = {
+  staticDir: "shared/static",
+  tosutilPath: "tosutil",
+  endpoint: "tos-cn-beijing.volces.com",
+  region: "cn-beijing"
+};
 
 // src/commands/build/api-client.ts
 async function genArtifactUploadCredential(appId, body) {
@@ -7270,17 +7277,20 @@ async function genArtifactUploadCredential(appId, body) {
 }
 async function getDefaultBucketId(appId) {
   const client = getHttpClient();
-  const url = `/b/${appId}/get_published_v2`;
-  const response = await client.get(url);
+  const url = `/v1/app/${appId}/storage/inner/staticBucket`;
+  const response = await client.post(url, {});
   if (!response.ok || response.status !== 200) {
     throw new Error(
-      `get_published_v2 \u8BF7\u6C42\u5931\u8D25: ${response.status} ${response.statusText}`
+      `getOrCreateStaticBucket \u8BF7\u6C42\u5931\u8D25: ${response.status} ${response.statusText}`
     );
   }
   const data = await response.json();
-  const bucketId = data?.data?.app_runtime_extra?.bucket?.default_bucket_id;
+  if (data.status_code !== "0") {
+    throw new Error(`getOrCreateStaticBucket \u8FD4\u56DE\u5F02\u5E38, status_code: ${data.status_code}`);
+  }
+  const bucketId = data?.data?.bucketID;
   if (!bucketId) {
-    throw new Error(`\u672A\u627E\u5230\u5E94\u7528 ${appId} \u7684\u9ED8\u8BA4\u5B58\u50A8\u6876`);
+    throw new Error(`\u672A\u627E\u5230\u5E94\u7528 ${appId} \u7684\u9759\u6001\u8D44\u6E90\u5B58\u50A8\u6876`);
   }
   return bucketId;
 }
@@ -7341,6 +7351,7 @@ function camelToKebab(str) {
 
 // src/commands/build/upload-static.handler.ts
 import * as fs25 from "fs";
+import * as os2 from "os";
 import * as path21 from "path";
 import { execFileSync } from "child_process";
 function readCredentialsFromEnv() {
@@ -7360,10 +7371,10 @@ async function uploadStatic(options) {
   try {
     const {
       appId,
-      staticDir = "shared/static",
-      tosutilPath = "/workspace/tosutil",
-      endpoint = "tos-cn-beijing.volces.com",
-      region = "cn-beijing"
+      staticDir = UPLOAD_STATIC_DEFAULTS.staticDir,
+      tosutilPath = UPLOAD_STATIC_DEFAULTS.tosutilPath,
+      endpoint = UPLOAD_STATIC_DEFAULTS.endpoint,
+      region = UPLOAD_STATIC_DEFAULTS.region
     } = options;
     const resolvedStaticDir = path21.resolve(staticDir);
     if (!fs25.existsSync(resolvedStaticDir)) {
@@ -7374,9 +7385,10 @@ async function uploadStatic(options) {
       console.error(`${LOG_PREFIX} \u76EE\u5F55\u4E3A\u7A7A: ${resolvedStaticDir}\uFF0C\u8DF3\u8FC7\u4E0A\u4F20`);
       return;
     }
-    if (!fs25.existsSync(tosutilPath)) {
+    const resolvedTosutil = resolveTosutilPath(tosutilPath);
+    if (!resolvedTosutil) {
       throw new Error(
-        `tosutil \u4E0D\u5B58\u5728: ${tosutilPath}\u3002\u8BF7\u786E\u4FDD\u6D41\u6C34\u7EBF\u5DF2\u5728"\u4EA7\u7269\u6253\u5305\u4E0A\u4F20"\u6B65\u9AA4\u4E2D\u4E0B\u8F7D tosutil\u3002`
+        `tosutil \u4E0D\u5B58\u5728: ${tosutilPath}\u3002\u8BF7\u786E\u4FDD tosutil \u5DF2\u5B89\u88C5\u5728\u7CFB\u7EDF PATH \u4E2D\u6216\u901A\u8FC7 --tosutil-path \u6307\u5B9A\u8DEF\u5F84\u3002`
       );
     }
     let uploadPrefix;
@@ -7398,16 +7410,25 @@ async function uploadStatic(options) {
       ({ AccessKeyID: accessKeyID, SecretAccessKey: secretAccessKey, SessionToken: sessionToken } = uploadCredential);
     }
     console.error(`${LOG_PREFIX} \u4E0A\u4F20\u76EE\u6807: ${uploadPrefix}`);
-    console.error(`${LOG_PREFIX} \u914D\u7F6E tosutil...`);
-    configureTosutil(tosutilPath, {
-      endpoint,
-      region,
-      accessKeyID,
-      secretAccessKey,
-      sessionToken
-    });
-    console.error(`${LOG_PREFIX} \u4E0A\u4F20 ${resolvedStaticDir} -> ${uploadPrefix}`);
-    uploadToTos(tosutilPath, resolvedStaticDir, uploadPrefix);
+    const confPath = path21.join(os2.tmpdir(), `.tosutilconfig-static-${process.pid}`);
+    fs25.writeFileSync(confPath, "");
+    try {
+      console.error(`${LOG_PREFIX} \u914D\u7F6E tosutil...`);
+      configureTosutil(resolvedTosutil, confPath, {
+        endpoint,
+        region,
+        accessKeyID,
+        secretAccessKey,
+        sessionToken
+      });
+      console.error(`${LOG_PREFIX} \u4E0A\u4F20 ${resolvedStaticDir} -> ${uploadPrefix}`);
+      uploadToTos(resolvedTosutil, confPath, resolvedStaticDir, uploadPrefix);
+    } finally {
+      try {
+        fs25.unlinkSync(confPath);
+      } catch {
+      }
+    }
     console.error(`${LOG_PREFIX} tosutil \u4E0A\u4F20\u5B8C\u6210`);
     console.error(`${LOG_PREFIX} \u8C03\u7528 callbackStatic (uploadID: ${uploadID})...`);
     const callbackResp = await uploadStaticAttachmentCallback(appId, bucketId, { uploadID });
@@ -7423,6 +7444,17 @@ async function uploadStatic(options) {
     process.exit(1);
   }
 }
+function resolveTosutilPath(tosutilPath) {
+  if (path21.isAbsolute(tosutilPath)) {
+    return fs25.existsSync(tosutilPath) ? tosutilPath : null;
+  }
+  try {
+    const resolved = execFileSync("which", [tosutilPath], { encoding: "utf-8" }).trim();
+    return resolved || null;
+  } catch {
+    return null;
+  }
+}
 async function fetchPreUpload(appId, bucketId) {
   const response = await preUploadStaticAttachment(appId, bucketId);
   if (response.status_code !== "0") {
@@ -7437,18 +7469,18 @@ async function fetchPreUpload(appId, bucketId) {
   }
   return response;
 }
-function configureTosutil(tosutilPath, config) {
+function configureTosutil(tosutilPath, confPath, config) {
   const { endpoint, region, accessKeyID, secretAccessKey, sessionToken } = config;
   execFileSync(
     tosutilPath,
-    ["config", "-e", endpoint, "-i", accessKeyID, "-k", secretAccessKey, "-t", sessionToken, "-re", region],
+    ["config", "-conf", confPath, "-e", endpoint, "-i", accessKeyID, "-k", secretAccessKey, "-t", sessionToken, "-re", region],
     { stdio: "pipe" }
   );
 }
-function uploadToTos(tosutilPath, sourceDir, destUrl) {
+function uploadToTos(tosutilPath, confPath, sourceDir, destUrl) {
   execFileSync(
     tosutilPath,
-    ["cp", sourceDir, destUrl, "-r", "-flat", "-j", "5", "-p", "3", "-ps", "10485760", "-f"],
+    ["cp", "-conf", confPath, sourceDir, destUrl, "-r", "-flat", "-j", "5", "-p", "3", "-ps", "10485760", "-f"],
     { stdio: "inherit" }
   );
 }
@@ -7517,7 +7549,7 @@ var uploadStaticCommand = {
   name: "upload-static",
   description: "Upload shared/static files to TOS",
   register(program) {
-    program.command(this.name).description(this.description).requiredOption("--app-id <id>", "Application ID").option("--static-dir <dir>", "Static files directory", "shared/static").option("--tosutil-path <path>", "Path to tosutil binary", "/workspace/tosutil").option("--endpoint <endpoint>", "TOS endpoint", "tos-cn-beijing.volces.com").option("--region <region>", "TOS region", "cn-beijing").action(async (options) => {
+    program.command(this.name).description(this.description).requiredOption("--app-id <id>", "Application ID").option("--static-dir <dir>", "Static files directory", UPLOAD_STATIC_DEFAULTS.staticDir).option("--tosutil-path <path>", "Path to tosutil binary", UPLOAD_STATIC_DEFAULTS.tosutilPath).option("--endpoint <endpoint>", "TOS endpoint", UPLOAD_STATIC_DEFAULTS.endpoint).option("--region <region>", "TOS region", UPLOAD_STATIC_DEFAULTS.region).action(async (options) => {
       await uploadStatic(options);
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-cli",
-  "version": "1.1.32",
+  "version": "1.1.34-alpha.0",
   "description": "CLI tool for fullstack template management",
   "type": "module",
   "main": "dist/index.js",
@@ -52,7 +52,7 @@
     "@types/node": "^22.0.0",
     "tsup": "^8.3.5",
     "typescript": "^5.9.2",
-    "vitest": "^2.1.8"
+    "vitest": "^3.2.4"
   },
   "peerDependencies": {
     "typescript": "^5.9.2"

package/templates/scripts/build.sh

@@ -40,40 +40,59 @@ print_time $STEP_START
 echo ""
 
 # ==================== 步骤 3 ====================
-echo "🔨 [3/5] 并行构建 server 和 client"
 STEP_START=$(node -e "console.log(Date.now())")
 
-# 并行构建
-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
+# 根据 deploy_faas 决定是否构建 server
+if [[ "${deploy_faas:-true}" == "false" ]]; then
+  echo "🔨 [3/5] 仅构建 client (deploy_faas=false)"
+
+  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 构建完成"
 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 ""
 
@@ -81,20 +100,26 @@ 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 mv {} "$DIST_DIR/dist/client/" \;
 fi
 
+# server 相关产物准备（deploy_faas=false 时跳过）
+if [[ "${deploy_faas:-true}" == "false" ]]; then
+  echo "   [skip] 跳过 run.sh/.env 复制 (deploy_faas=false)"
+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
+fi
+
 # 清理无用文件
 rm -rf "$DIST_DIR/scripts"
 rm -rf "$DIST_DIR/tsconfig.node.tsbuildinfo"
@@ -103,11 +128,17 @@ print_time $STEP_START
 echo ""
 
 # ==================== 步骤 5 ====================
-echo "✂️  [5/5] 智能依赖裁剪"
 STEP_START=$(node -e "console.log(Date.now())")
 
-# 分析实际依赖、复制并裁剪 node_modules、生成精简的 package.json
-node "$ROOT_DIR/scripts/prune-smart.js"
+# 智能依赖裁剪（仅全量构建时执行，纯前端场景不打包 server，无需裁剪）
+if [[ "${deploy_faas:-true}" == "false" ]]; then
+  echo "✂️  [5/5] 跳过智能依赖裁剪 (deploy_faas=false)"
+else
+  echo "✂️  [5/5] 智能依赖裁剪"
+
+  # 分析实际依赖、复制并裁剪 node_modules、生成精简的 package.json
+  node "$ROOT_DIR/scripts/prune-smart.js"
+fi
 
 print_time $STEP_START
 echo ""
@@ -118,9 +149,16 @@ print_time $TOTAL_START
 
 # 输出产物信息
 DIST_SIZE=$(du -sh "$DIST_DIR" | cut -f1)
-NODE_MODULES_SIZE=$(du -sh "$DIST_DIR/node_modules" | cut -f1)
-echo ""
-echo "📊 构建产物统计:"
-echo "   产物大小:        $DIST_SIZE"
-echo "   node_modules: $NODE_MODULES_SIZE"
-echo ""
+if [[ "${deploy_faas:-true}" == "false" ]]; 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