@lark-apaas/fullstack-cli 1.1.16-beta.10 → 1.1.16-beta.12

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();
 }
 
@@ -7351,6 +7365,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,21 +7424,30 @@ 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 });
     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`);
@@ -7448,29 +7472,29 @@ 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;
 }
-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" }
   );
 }
@@ -7500,15 +7524,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.16-beta.10",
+  "version": "1.1.16-beta.12",
   "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"