优化代码，修改方法命名错误

app/client/api.ts

@@ -280,12 +280,10 @@ export function getHeaders(ignoreHeaders: boolean = false) {
         accessStore.awsAccessKey &&
         accessStore.awsSecretKey
         ? accessStore.awsRegion +
-          "," +
+          ":" +
           accessStore.awsAccessKey +
-          "," +
-          accessStore.awsSecretKey +
-          "," +
-          modelConfig.model
+          ":" +
+          accessStore.awsSecretKey
         : ""
       : accessStore.openaiApiKey;
     return {
@@ -316,6 +314,7 @@ export function getHeaders(ignoreHeaders: boolean = false) {
   }
 
   const {
+    isBedrock,
     isGoogle,
     isAzure,
     isAnthropic,
@@ -328,23 +327,23 @@ export function getHeaders(ignoreHeaders: boolean = false) {
 
   const authHeader = getAuthHeader();
 
-  // if (isBedrock) {
-  //   // Secure encryption of AWS credentials using the new encryption utility
-  //   headers["X-Region"] = encrypt(accessStore.awsRegion);
-  //   headers["X-Access-Key"] = encrypt(accessStore.awsAccessKey);
-  //   headers["X-Secret-Key"] = encrypt(accessStore.awsSecretKey);
-  // } else {
-  const bearerToken = getBearerToken(
-    apiKey,
-    isAzure || isAnthropic || isGoogle,
-  );
-
-  if (bearerToken) {
-    headers[authHeader] = bearerToken;
-  } else if (isEnabledAccessControl && validString(accessStore.accessCode)) {
-    headers["Authorization"] = getBearerToken(
-      ACCESS_CODE_PREFIX + accessStore.accessCode,
+  if (isBedrock) {
+    if (apiKey) {
+      headers[authHeader] = getBearerToken(apiKey);
+    }
+  } else {
+    const bearerToken = getBearerToken(
+      apiKey,
+      isAzure || isAnthropic || isGoogle,
     );
+
+    if (bearerToken) {
+      headers[authHeader] = bearerToken;
+    } else if (isEnabledAccessControl && validString(accessStore.accessCode)) {
+      headers["Authorization"] = getBearerToken(
+        ACCESS_CODE_PREFIX + accessStore.accessCode,
+      );
+    }
   }
 
   return headers;

app/client/platforms/bedrock.ts

@@ -1,3 +1,4 @@
+"use client";
 import {
   ChatOptions,
   getHeaders,
@@ -16,6 +17,8 @@ import {
 } from "../../store";
 import { preProcessImageContent, stream } from "../../utils/chat";
 import { getMessageTextContent, isVisionModel } from "../../utils";
+import { ApiPath, BEDROCK_BASE_URL } from "../../constant";
+import { getClientConfig } from "../../config/client";
 
 const ClaudeMapper = {
   assistant: "assistant",
@@ -34,6 +37,35 @@ interface ToolDefinition {
 }
 
 export class BedrockApi implements LLMApi {
+  private disableListModels = true;
+
+  path(path: string): string {
+    const accessStore = useAccessStore.getState();
+
+    let baseUrl = "";
+
+    if (accessStore.useCustomConfig) {
+      baseUrl = accessStore.bedrockUrl;
+    }
+
+    if (baseUrl.length === 0) {
+      const isApp = !!getClientConfig()?.isApp;
+      const apiPath = ApiPath.Bedrock;
+      baseUrl = isApp ? BEDROCK_BASE_URL : apiPath;
+    }
+
+    if (baseUrl.endsWith("/")) {
+      baseUrl = baseUrl.slice(0, baseUrl.length - 1);
+    }
+    if (!baseUrl.startsWith("http") && !baseUrl.startsWith(ApiPath.Bedrock)) {
+      baseUrl = "https://" + baseUrl;
+    }
+
+    console.log("[Proxy Endpoint] ", baseUrl, path);
+
+    return [baseUrl, path].join("/");
+  }
+
   speech(options: SpeechOptions): Promise<ArrayBuffer> {
     throw new Error("Speech not implemented for Bedrock.");
   }
@@ -239,17 +271,9 @@ export class BedrockApi implements LLMApi {
     }
 
     try {
-      const apiEndpoint = "/api/bedrock/chat";
-      // const headers = {
-      //   "Content-Type": requestBody.contentType || "application/json",
-      //   Accept: requestBody.accept || "application/json",
-      //   "X-Region": accessStore.awsRegion,
-      //   "X-Access-Key": accessStore.awsAccessKey,
-      //   "X-Secret-Key": accessStore.awsSecretKey,
-      //   "X-Model-Id": modelConfig.model,
-      //   "X-Encryption-Key": accessStore.bedrockEncryptionKey,
-      // };
+      const chatPath = this.path("chat");
       const headers = getHeaders();
+      headers.ModelID = modelConfig.model;
 
       if (options.config.stream) {
         let index = -1;
@@ -261,7 +285,7 @@ export class BedrockApi implements LLMApi {
           );
 
         return stream(
-          apiEndpoint,
+          chatPath,
           requestBody,
           headers,
           (tools as ToolDefinition[]).map((tool) => ({
@@ -367,7 +391,7 @@ export class BedrockApi implements LLMApi {
           options,
         );
       } else {
-        const res = await fetch(apiEndpoint, {
+        const res = await fetch(chatPath, {
           method: "POST",
           headers,
           body: JSON.stringify(requestBody),
@@ -375,7 +399,6 @@ export class BedrockApi implements LLMApi {
 
         const resJson = await res.json();
         const message = this.extractMessage(resJson, modelConfig.model);
-        // console.log("Extracted message:", message);
         options.onFinish(message, res);
       }
     } catch (e) {