@lark-apaas/fullstack-cli 1.1.16-beta.8 → 1.1.16-beta.9

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;
 }
@@ -7360,10 +7370,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 +7384,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;
@@ -7399,7 +7410,7 @@ async function uploadStatic(options) {
     }
     console.error(`${LOG_PREFIX} \u4E0A\u4F20\u76EE\u6807: ${uploadPrefix}`);
     console.error(`${LOG_PREFIX} \u914D\u7F6E tosutil...`);
-    configureTosutil(tosutilPath, {
+    configureTosutil(resolvedTosutil, {
       endpoint,
       region,
       accessKeyID,
@@ -7407,7 +7418,7 @@ async function uploadStatic(options) {
       sessionToken
     });
     console.error(`${LOG_PREFIX} \u4E0A\u4F20 ${resolvedStaticDir} -> ${uploadPrefix}`);
-    uploadToTos(tosutilPath, resolvedStaticDir, uploadPrefix);
+    uploadToTos(resolvedTosutil, resolvedStaticDir, uploadPrefix);
     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 +7434,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") {
@@ -7517,7 +7539,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.16-beta.8",
+  "version": "1.1.16-beta.9",
   "description": "CLI tool for fullstack template management",
   "type": "module",
   "main": "dist/index.js",