@lark-apaas/fullstack-cli 1.1.66-alpha.20260908191831 → 1.1.66-beta.0

package/dist/index.js

@@ -3058,6 +3058,105 @@ var syncCommand = {
   }
 };
 
+// src/utils/api-error.ts
+var LOGID_HEADER = "x-tt-logid";
+var ERROR_RESPONSE_PREVIEW_LIMIT = 2e3;
+var InnerApiError = class _InnerApiError extends Error {
+  constructor(message, detail = {}) {
+    super(message);
+    this.name = "InnerApiError";
+    this.logId = detail.logId ?? "";
+    this.status = detail.status;
+    this.body = detail.body;
+    if (detail.cause !== void 0) {
+      this.cause = detail.cause;
+    }
+    Object.setPrototypeOf(this, _InnerApiError.prototype);
+  }
+};
+function getLogId(response) {
+  const headers = response?.headers;
+  if (!headers || typeof headers !== "object") {
+    return "";
+  }
+  try {
+    const getter = headers.get;
+    if (typeof getter === "function") {
+      return getter.call(headers, LOGID_HEADER) ?? "";
+    }
+    const value = headers[LOGID_HEADER];
+    return typeof value === "string" ? value : "";
+  } catch {
+    return "";
+  }
+}
+function formatLogId(response) {
+  const logId = getLogId(response);
+  return logId ? `, logid: ${logId}` : "";
+}
+async function readErrorBody(response) {
+  try {
+    if (typeof response.text === "function") {
+      const text = await response.text();
+      return text ? text.slice(0, ERROR_RESPONSE_PREVIEW_LIMIT) : "";
+    }
+    if (typeof response.json === "function") {
+      const serialized = JSON.stringify(await response.json());
+      return serialized ? serialized.slice(0, ERROR_RESPONSE_PREVIEW_LIMIT) : "";
+    }
+  } catch {
+    return "";
+  }
+  return "";
+}
+function asHttpErrorResponse(error) {
+  if (!error || typeof error !== "object") {
+    return void 0;
+  }
+  const response = error.response;
+  return response && typeof response === "object" ? response : void 0;
+}
+async function buildError(message, response, cause) {
+  if (!response) {
+    const reason = cause instanceof Error ? cause.message : String(cause);
+    return new InnerApiError(`${message}: ${reason}`, { cause });
+  }
+  const logId = getLogId(response);
+  const body = await readErrorBody(response);
+  const parts = [`${message}: ${response.status ?? "unknown"}`];
+  if (response.statusText) {
+    parts.push(` ${response.statusText}`);
+  }
+  if (logId) {
+    parts.push(`, logid: ${logId}`);
+  }
+  if (body) {
+    parts.push(`, response: ${body}`);
+  }
+  return new InnerApiError(parts.join(""), {
+    logId,
+    status: response.status,
+    body,
+    cause
+  });
+}
+async function requestWithLogId(send, message, options = {}) {
+  let response;
+  try {
+    response = await send();
+  } catch (error) {
+    throw await buildError(message, asHttpErrorResponse(error), error);
+  }
+  if (!response) {
+    throw new InnerApiError(`${message}: \u672A\u62FF\u5230\u54CD\u5E94\u5BF9\u8C61`);
+  }
+  const isOk = options.expectStatus200 ? response.ok !== false && response.status === 200 : response.ok === true;
+  if (!isOk) {
+    throw await buildError(message, response, void 0);
+  }
+  return response;
+}
+
 // src/utils/telemetry.ts
 async function reportEvents(events) {
   if (events.length === 0) {
@@ -3065,14 +3164,13 @@ async function reportEvents(events) {
   }
   try {
     const client = getHttpClient();
-    const response = await client.post("/api/v1/studio/innerapi/resource_events", { events });
-    if (!response.ok) {
-      console.warn(`[telemetry] Failed to report events: ${response.status} ${response.statusText}`);
-      return false;
-    }
+    const response = await requestWithLogId(
+      () => client.post("/api/v1/studio/innerapi/resource_events", { events }),
+      "resource_events \u8BF7\u6C42\u5931\u8D25"
+    );
     const result = await response.json();
     if (result.status_code !== "0") {
-      console.warn(`[telemetry] API error: ${result.message}`);
+      console.warn(`[telemetry] API error: ${result.message}${formatLogId(response)}`);
       return false;
     }
     return true;
@@ -4008,14 +4106,15 @@ import path12 from "path";
 var PLUGIN_CACHE_DIR = "node_modules/.cache/fullstack-cli/plugins";
 async function getPluginVersions(keys, latestOnly = true) {
   const client = getHttpClient();
-  const response = await client.post(`/api/v1/studio/innerapi/plugins/-/versions/batch_get?keys=${keys.join(",")}&latest_only=${latestOnly}`);
-  if (!response.ok || response.status !== 200) {
-    throw new Error(`Failed to get plugin versions: ${response.status} ${response.statusText}`);
-  }
+  const response = await requestWithLogId(
+    () => client.post(`/api/v1/studio/innerapi/plugins/-/versions/batch_get?keys=${keys.join(",")}&latest_only=${latestOnly}`),
+    "Failed to get plugin versions",
+    { expectStatus200: true }
+  );
   const result = await response.json();
   console.log("getPluginVersions response:", result);
   if (result.status_code !== "0") {
-    throw new Error(`API error: ${result.message}`);
+    throw new Error(`API error: ${result.message}${formatLogId(response)}`);
   }
   return result.data.pluginVersions;
 }
@@ -4049,10 +4148,10 @@ async function downloadFromInner(pluginKey, version) {
   const { scope, name } = parsePluginKey(pluginKey);
   const url = `/api/v1/studio/innerapi/plugins/${scope}/${name}/versions/${version}/package`;
   console.log(`[action-plugin] Downloading plugin from inner API: ${url}`);
-  const response = await client.get(url);
-  if (!response.ok) {
-    throw new Error(`Failed to download plugin: ${response.status} ${response.statusText}`);
-  }
+  const response = await requestWithLogId(
+    () => client.get(url),
+    "Failed to download plugin"
+  );
   const arrayBuffer = await response.arrayBuffer();
   return Buffer.from(arrayBuffer);
 }
@@ -4060,10 +4159,10 @@ async function downloadFromPublic(downloadURL) {
   const client = new HttpClient2({
     timeout: 6e4
   });
-  const response = await client.get(downloadURL);
-  if (!response.ok) {
-    throw new Error(`Failed to download plugin from public URL: ${response.status} ${response.statusText}`);
-  }
+  const response = await requestWithLogId(
+    () => client.get(downloadURL),
+    "Failed to download plugin from public URL"
+  );
   const arrayBuffer = await response.arrayBuffer();
   return Buffer.from(arrayBuffer);
 }
@@ -4884,45 +4983,49 @@ var debug = createDebug("component");
 async function getComponents(keys) {
   const client = getHttpClient();
   debug("\u8C03\u7528 /components/batch_get %o", keys);
-  const response = await client.post(
-    `/api/v1/studio/innerapi/components/batch_get?keys=${keys.join(",")}`
+  const response = await requestWithLogId(
+    () => client.post(
+      `/api/v1/studio/innerapi/components/batch_get?keys=${keys.join(",")}`
+    ),
+    "\u83B7\u53D6\u7EC4\u4EF6\u4FE1\u606F\u5931\u8D25",
+    { expectStatus200: true }
   );
-  if (response.status !== 200) {
-    throw new Error(
-      `\u83B7\u53D6\u7EC4\u4EF6\u4FE1\u606F\u5931\u8D25\uFF1A${response.status} ${response.statusText}`
-    );
-  }
   const result = await response.json();
   if (result.status_code !== "0") {
     debug("\u63A5\u53E3\u8FD4\u56DE\u9519\u8BEF\uFF1A%o", result);
-    throw new Error(`\u83B7\u53D6\u7EC4\u4EF6\u4FE1\u606F\u5931\u8D25\uFF1A${result.error_msg}`);
+    throw new Error(`\u83B7\u53D6\u7EC4\u4EF6\u4FE1\u606F\u5931\u8D25\uFF1A${result.error_msg}${formatLogId(response)}`);
   }
   return mapValues(result.data.components, ([component]) => component);
 }
 async function getRegistryItem(url) {
   const client = getHttpClient();
   debug("\u4E0B\u8F7D registry-item.json\uFF1A%s", url);
-  const response = await client.get(url);
-  if (!response.ok) {
-    throw new Error(
-      `\u4E0B\u8F7D registry-item.json \u5931\u8D25\uFF1A${response.status} ${response.statusText}`
-    );
-  }
+  const response = await requestWithLogId(
+    () => client.get(url),
+    "\u4E0B\u8F7D registry-item.json \u5931\u8D25"
+  );
   const item = await response.json();
   return item;
 }
 async function sendInstallEvent(key) {
   const client = getHttpClient();
-  await client.post("/api/v1/studio/innerapi/resource_events", {
-    events: [
-      {
-        resourceType: "component",
-        resourceKey: key,
-        eventType: "install",
-        details: {}
-      }
-    ]
-  });
+  try {
+    await requestWithLogId(
+      () => client.post("/api/v1/studio/innerapi/resource_events", {
+        events: [
+          {
+            resourceType: "component",
+            resourceKey: key,
+            eventType: "install",
+            details: {}
+          }
+        ]
+      }),
+      "\u4E0A\u62A5\u7EC4\u4EF6\u5B89\u88C5\u4E8B\u4EF6\u5931\u8D25"
+    );
+  } catch (error) {
+    console.warn(`[component] ${error instanceof Error ? error.message : error}`);
+  }
 }
 
 // src/commands/component/registry-preparer.ts
@@ -6009,7 +6112,7 @@ function addInjection(sourceFile) {
       type: PARAM_TYPE,
       scope: Scope.Private,
       isReadonly: true,
-      decorators: [{ name: "Inject", arguments: ["CapabilityService"] }]
+      decorators: [{ name: "Inject", arguments: [] }]
     });
   } else {
     classDecl.addConstructor({
@@ -6018,7 +6121,7 @@ function addInjection(sourceFile) {
         type: PARAM_TYPE,
         scope: Scope.Private,
         isReadonly: true,
-        decorators: [{ name: "Inject", arguments: ["CapabilityService"] }]
+        decorators: [{ name: "Inject", arguments: [] }]
       }]
     });
   }
@@ -7972,70 +8075,54 @@ 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);
-  await throwIfResponseNotOk(response, "gen_artifact_upload_credential \u8BF7\u6C42\u5931\u8D25");
+  const response = await requestWithLogId(
+    () => client.post(url, body),
+    "gen_artifact_upload_credential \u8BF7\u6C42\u5931\u8D25",
+    { expectStatus200: true }
+  );
   return response.json();
 }
 async function getDefaultBucketId(appId) {
   const client = getHttpClient();
   const url = `/v1/app/${appId}/storage/inner/staticBucket`;
-  const response = await client.post(url, {});
-  await throwIfResponseNotOk(response, "getOrCreateStaticBucket \u8BF7\u6C42\u5931\u8D25");
+  const response = await requestWithLogId(
+    () => client.post(url, {}),
+    "getOrCreateStaticBucket \u8BF7\u6C42\u5931\u8D25",
+    { expectStatus200: true }
+  );
   const data = await response.json();
   if (data.status_code !== "0") {
-    throw new Error(`getOrCreateStaticBucket \u8FD4\u56DE\u5F02\u5E38, status_code: ${data.status_code}`);
+    throw new Error(
+      `getOrCreateStaticBucket \u8FD4\u56DE\u5F02\u5E38, status_code: ${data.status_code}${formatLogId(response)}`
+    );
   }
   const bucketId = data?.data?.bucketID;
   if (!bucketId) {
-    throw new Error(`\u672A\u627E\u5230\u5E94\u7528 ${appId} \u7684\u9759\u6001\u8D44\u6E90\u5B58\u50A8\u6876`);
+    throw new Error(`\u672A\u627E\u5230\u5E94\u7528 ${appId} \u7684\u9759\u6001\u8D44\u6E90\u5B58\u50A8\u6876${formatLogId(response)}`);
   }
   return bucketId;
 }
 async function preUploadStaticAttachment(appId, bucketId) {
   const client = getHttpClient();
   const url = `/v1/app/${appId}/storage/bucket/${bucketId}/preUploadStatic`;
-  const response = await client.post(url, {});
-  await throwIfResponseNotOk(response, "preUploadStatic \u8BF7\u6C42\u5931\u8D25");
+  const response = await requestWithLogId(
+    () => client.post(url, {}),
+    "preUploadStatic \u8BF7\u6C42\u5931\u8D25",
+    { expectStatus200: true }
+  );
   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);
-  await throwIfResponseNotOk(response, "callbackStatic \u8BF7\u6C42\u5931\u8D25");
+  const response = await requestWithLogId(
+    () => client.post(url, body),
+    "callbackStatic \u8BF7\u6C42\u5931\u8D25",
+    { expectStatus200: true }
+  );
   return response.json();
 }
 

package/package.json

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