@lark-apaas/fullstack-cli 1.1.28-alpha.24 → 1.1.28-alpha.25

package/dist/index.js

@@ -1414,15 +1414,14 @@ 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=${dbBranch}) appId=${appId ? "set" : "unset"} workspace=${workspace ? "set" : "unset"}`
+      `[fetchSyncedTables] \u2192 GET listTableView (dbBranch=main) 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 }, headers: { "x-supaas-bizsource": "miaoda" } }
+        { params: { dbBranch: "main" }, headers: { "x-supaas-bizsource": "miaoda" } }
       ),
       timeoutPromise
     ]);
@@ -7351,6 +7350,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() {
@@ -7409,16 +7409,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(resolvedTosutil, {
-      endpoint,
-      region,
-      accessKeyID,
-      secretAccessKey,
-      sessionToken
-    });
-    console.error(`${LOG_PREFIX} \u4E0A\u4F20 ${resolvedStaticDir} -> ${uploadPrefix}`);
-    uploadToTos(resolvedTosutil, 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 });
@@ -7459,18 +7468,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" }
   );
 }

package/package.json

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