@tool-bridge/server 0.20.0 → 0.21.0

package/dist/{airtable-ZNWHIJMO.js → airtable-DMJEEGJP.js}

@@ -1,6 +1,7 @@
 import {
-  createProviderHttpClient
-} from "./chunk-6X55ALDX.js";
+  createAuthedClient
+} from "./chunk-JEWFX6Z6.js";
+import "./chunk-Q74GLIDK.js";
 import {
   asJsonObject,
   booleanValue,
@@ -10,21 +11,19 @@ import {
 } from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
-  requireApiKey,
   upstreamError
-} from "./chunk-6ANLYNFB.js";
-import "./chunk-3WL6EXYX.js";
+} from "./chunk-QR4LK3HF.js";
+import "./chunk-ZTTN6AJG.js";
 import {
   TBError,
   external_exports
-} from "./chunk-WIGQCP6O.js";
+} from "./chunk-MZCIPUNQ.js";
 import "./chunk-U67V476Y.js";
 
 // ../plugins/src/airtable/api.ts
 var SERVICE = "airtable";
 var API_BASE = "https://api.airtable.com";
 var BASES_PATH = "/v0/meta/bases";
-var http = createProviderHttpClient({ baseUrl: API_BASE, service: SERVICE });
 var GET_URL_LENGTH_SOFT_LIMIT = 15e3;
 function requireText(value, field) {
   const result = trimmedText(value);
@@ -82,21 +81,25 @@ function mapAirtableError(context) {
     return upstreamError(502, "airtable response parsing failed: invalid JSON");
   }
 }
+var http = createAuthedClient({
+  baseUrl: API_BASE,
+  service: SERVICE,
+  auth: { kind: "bearer" },
+  headers: { accept: "application/json" },
+  mapError: mapAirtableError,
+  mapTransportError: ({ message }) => upstreamError(
+    502,
+    `airtable request failed: ${message ?? "unknown request error"}`
+  )
+});
 async function request(ctx, input) {
-  const apiKey = requireApiKey(ctx, SERVICE);
-  const result = await http.request({
+  const result = await http.request(ctx, {
     path: input.path,
     method: input.method ?? "GET",
     query: input.query,
-    headers: { accept: "application/json", authorization: `Bearer ${apiKey}` },
     ...input.body === void 0 ? {} : { json: input.body },
     invalidJson: "text",
-    responseType: "auto",
-    mapError: mapAirtableError,
-    mapTransportError: ({ message }) => upstreamError(
-      502,
-      `airtable request failed: ${message ?? "unknown request error"}`
-    )
+    responseType: "auto"
   });
   return responsePayload(result);
 }

package/dist/{alt_text_generator_ai-X7RMDDM5.js → alt_text_generator_ai-RELFQ5FV.js}

@@ -1,17 +1,17 @@
 import {
   createProviderHttpClient
-} from "./chunk-6X55ALDX.js";
+} from "./chunk-Q74GLIDK.js";
 import "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-6ANLYNFB.js";
-import "./chunk-3WL6EXYX.js";
+} from "./chunk-QR4LK3HF.js";
+import "./chunk-ZTTN6AJG.js";
 import {
   TBError,
   external_exports
-} from "./chunk-WIGQCP6O.js";
+} from "./chunk-MZCIPUNQ.js";
 import "./chunk-U67V476Y.js";
 
 // ../plugins/src/alt_text_generator_ai/schema.ts

package/dist/{amap-3VER75VH.js → amap-YSYEACKQ.js}

@@ -1,6 +1,6 @@
 import {
   createProviderHttpClient
-} from "./chunk-6X55ALDX.js";
+} from "./chunk-Q74GLIDK.js";
 import {
   asJsonObject,
   booleanValue,
@@ -10,12 +10,12 @@ import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-6ANLYNFB.js";
-import "./chunk-3WL6EXYX.js";
+} from "./chunk-QR4LK3HF.js";
+import "./chunk-ZTTN6AJG.js";
 import {
   TBError,
   external_exports
-} from "./chunk-WIGQCP6O.js";
+} from "./chunk-MZCIPUNQ.js";
 import "./chunk-U67V476Y.js";
 
 // ../plugins/src/amap/api.ts

package/dist/{anthropic-N7NTB3UC.js → anthropic-D5X5GSYE.js}

@@ -1,57 +1,55 @@
 import {
-  createProviderHttpClient
-} from "./chunk-6X55ALDX.js";
+  createAuthedClient
+} from "./chunk-JEWFX6Z6.js";
+import "./chunk-Q74GLIDK.js";
 import {
-  asJsonObject,
   compactDefined,
   trimmedText
 } from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
-  requireApiKey,
   upstreamError
-} from "./chunk-6ANLYNFB.js";
-import "./chunk-3WL6EXYX.js";
+} from "./chunk-QR4LK3HF.js";
+import "./chunk-ZTTN6AJG.js";
 import {
   TBError,
   external_exports
-} from "./chunk-WIGQCP6O.js";
+} from "./chunk-MZCIPUNQ.js";
 import "./chunk-U67V476Y.js";
 
 // ../plugins/src/anthropic/api.ts
 var SERVICE = "anthropic";
 var API_BASE = "https://api.anthropic.com";
 var API_VERSION = "2023-06-01";
-var http = createProviderHttpClient({ baseUrl: `${API_BASE}/`, service: SERVICE });
+var http = createAuthedClient({
+  baseUrl: `${API_BASE}/`,
+  service: SERVICE,
+  auth: { kind: "header", name: "x-api-key" },
+  // content-type 不分 method 全量带,与迁移前的头集合一致(GET 也发)。
+  headers: {
+    "accept": "application/json",
+    "anthropic-version": API_VERSION,
+    "content-type": "application/json"
+  },
+  // Anthropic 的错误体是 `{type, error:{type, message}}`;网关层的错误可能是纯文本。
+  errorMessage: {
+    keys: ["error.message"],
+    fallback: (status) => `anthropic request failed with ${status}`
+  }
+});
 function requireText(value, field) {
   const result = trimmedText(value);
   if (result === void 0) throw new TBError("invalid_argument", `${field} \u4E0D\u80FD\u4E3A\u7A7A`);
   return result;
 }
-function headers(apiKey) {
-  return {
-    "accept": "application/json",
-    "anthropic-version": API_VERSION,
-    "content-type": "application/json",
-    "x-api-key": apiKey
-  };
-}
-function errorMessage(status, payload) {
-  const fallback = `anthropic request failed with ${status}`;
-  const nested = asJsonObject(asJsonObject(payload)?.error);
-  return trimmedText(nested?.message) ?? trimmedText(payload) ?? fallback;
-}
 async function request(ctx, input) {
-  const apiKey = requireApiKey(ctx, SERVICE);
   const method = input.method ?? "GET";
-  const { data } = await http.request({
+  const { data } = await http.request(ctx, {
     path: input.path,
     method,
     query: Object.entries(input.query ?? {}),
-    headers: headers(apiKey),
     ...input.body === void 0 ? {} : { json: input.body },
     invalidJsonMessage: "anthropic returned malformed JSON",
-    mapError: ({ data: payload, status }) => upstreamError(status, errorMessage(status, payload)),
     mapTransportError: ({ message }) => upstreamError(
       502,
       `anthropic ${method} ${input.path} failed before receiving response: ${message ?? "unknown network error"}`

package/dist/{apify-JB5P5AJI.js → apify-5NVFU3IZ.js}

@@ -1,26 +1,25 @@
 import {
-  createProviderHttpClient
-} from "./chunk-6X55ALDX.js";
+  createAuthedClient
+} from "./chunk-JEWFX6Z6.js";
+import "./chunk-Q74GLIDK.js";
 import {
   asJsonObject
 } from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
-  requireApiKey,
   upstreamError
-} from "./chunk-6ANLYNFB.js";
-import "./chunk-3WL6EXYX.js";
+} from "./chunk-QR4LK3HF.js";
+import "./chunk-ZTTN6AJG.js";
 import {
   TBError,
   external_exports
-} from "./chunk-WIGQCP6O.js";
+} from "./chunk-MZCIPUNQ.js";
 import "./chunk-U67V476Y.js";
 
 // ../plugins/src/apify/api.ts
 var SERVICE = "apify";
 var API_BASE = "https://api.apify.com";
 var CURRENT_USER_PATH = "/v2/users/me";
-var http = createProviderHttpClient({ baseUrl: `${API_BASE}/`, service: SERVICE });
 function nonEmpty(value) {
   return typeof value === "string" && value !== "" ? value : void 0;
 }
@@ -29,6 +28,18 @@ function errorMessage(payload, status) {
   const error = asJsonObject(record?.error);
   return nonEmpty(error?.message) ?? nonEmpty(record?.message) ?? nonEmpty(error?.type) ?? `Apify request failed with status ${status}`;
 }
+var http = createAuthedClient({
+  baseUrl: `${API_BASE}/`,
+  service: SERVICE,
+  auth: { kind: "bearer" },
+  headers: { accept: "application/json" },
+  mapError: ({ bodyKind, data: payload, status }) => bodyKind === "invalid-json" ? new TBError("unavailable", "Apify \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94", { retryable: true }) : upstreamError(status, errorMessage(payload, status)),
+  mapTransportError: ({ message }) => new TBError(
+    "unavailable",
+    message === void 0 ? "Apify \u8BF7\u6C42\u5931\u8D25" : `Apify \u8BF7\u6C42\u5931\u8D25: ${message}`,
+    { retryable: true }
+  )
+});
 function requiredId(value, field) {
   if (value === void 0 || value === "") {
     throw new TBError("invalid_argument", `${field} \u4E0D\u80FD\u4E3A\u7A7A`);
@@ -36,22 +47,12 @@ function requiredId(value, field) {
   return encodeURIComponent(value);
 }
 async function request(ctx, path, init = {}) {
-  const { data } = await http.request({
+  const { data } = await http.request(ctx, {
     path,
     method: init.method ?? "GET",
     query: Object.entries(init.query ?? {}),
-    headers: {
-      accept: "application/json",
-      authorization: `Bearer ${requireApiKey(ctx, SERVICE)}`
-    },
     ...init.body === void 0 ? {} : { json: init.body },
-    invalidJsonMessage: "Apify \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94",
-    mapError: ({ bodyKind, data: payload, status }) => bodyKind === "invalid-json" ? new TBError("unavailable", "Apify \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94", { retryable: true }) : upstreamError(status, errorMessage(payload, status)),
-    mapTransportError: ({ message }) => new TBError(
-      "unavailable",
-      message === void 0 ? "Apify \u8BF7\u6C42\u5931\u8D25" : `Apify \u8BF7\u6C42\u5931\u8D25: ${message}`,
-      { retryable: true }
-    )
+    invalidJsonMessage: "Apify \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94"
   });
   return data ?? null;
 }

package/dist/{brave_search-USL5OOBS.js → brave_search-X557FMGO.js}

@@ -1,6 +1,7 @@
 import {
-  createProviderHttpClient
-} from "./chunk-6X55ALDX.js";
+  createAuthedClient
+} from "./chunk-JEWFX6Z6.js";
+import "./chunk-Q74GLIDK.js";
 import {
   asJsonObject,
   compactDefined,
@@ -8,20 +9,18 @@ import {
 } from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
-  requireApiKey,
   upstreamError
-} from "./chunk-6ANLYNFB.js";
-import "./chunk-3WL6EXYX.js";
+} from "./chunk-QR4LK3HF.js";
+import "./chunk-ZTTN6AJG.js";
 import {
   TBError,
   external_exports
-} from "./chunk-WIGQCP6O.js";
+} from "./chunk-MZCIPUNQ.js";
 import "./chunk-U67V476Y.js";
 
 // ../plugins/src/brave_search/api.ts
 var SERVICE = "brave_search";
 var API_BASE = "https://api.search.brave.com";
-var http = createProviderHttpClient({ baseUrl: `${API_BASE}/`, service: SERVICE });
 var RATE_LIMIT_CODES = /* @__PURE__ */ new Set(["QUOTA_LIMITED", "RATE_LIMITED", "USAGE_LIMIT_EXCEEDED"]);
 var AUTH_CODES = /* @__PURE__ */ new Set(["SUBSCRIPTION_TOKEN_INVALID", "SUBSCRIPTION_NOT_FOUND"]);
 var INVALID_CODES = /* @__PURE__ */ new Set(["RESOURCE_NOT_ALLOWED", "OPTION_NOT_IN_PLAN", "INVALID_URL"]);
@@ -60,17 +59,20 @@ function braveSearchError(status, payload) {
   }
   return upstreamError(status, message);
 }
+var http = createAuthedClient({
+  baseUrl: `${API_BASE}/`,
+  service: SERVICE,
+  auth: { kind: "header", name: "x-subscription-token" },
+  headers: { accept: "application/json" },
+  // 稳定错误码码表比 HTTP 状态准,整段覆写而不用标准键序提取。
+  mapError: ({ data: payload, status }) => braveSearchError(status, payload)
+});
 async function request(ctx, path, query) {
-  const { data } = await http.request({
+  const { data } = await http.request(ctx, {
     path,
     method: "GET",
     query: Object.entries(query),
-    headers: {
-      "accept": "application/json",
-      "x-subscription-token": requireApiKey(ctx, SERVICE)
-    },
-    invalidJsonMessage: "Brave Search \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94",
-    mapError: ({ data: payload, status }) => braveSearchError(status, payload)
+    invalidJsonMessage: "Brave Search \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94"
   });
   return data ?? null;
 }

package/dist/chunk-JEWFX6Z6.js

@@ -0,0 +1,71 @@
+import {
+  createProviderHttpClient
+} from "./chunk-Q74GLIDK.js";
+import {
+  asJsonObject,
+  trimmedText
+} from "./chunk-JXHMDBAY.js";
+import {
+  requireApiKey,
+  upstreamError
+} from "./chunk-QR4LK3HF.js";
+import {
+  TBError
+} from "./chunk-MZCIPUNQ.js";
+
+// ../plugins/src/_runtime/authedClient.ts
+function extractErrorMessage(payload, keys) {
+  const direct = trimmedText(payload);
+  if (direct !== void 0) return direct;
+  if (asJsonObject(payload) === void 0) return void 0;
+  for (const key of keys) {
+    let value = payload;
+    for (const segment of key.split(".")) {
+      value = asJsonObject(value)?.[segment];
+    }
+    const candidate = trimmedText(value);
+    if (candidate !== void 0) return candidate;
+  }
+  return void 0;
+}
+function createAuthedClient(options) {
+  const { auth, errorMessage, headers: staticHeaders, mapError, mapTransportError, ...clientOptions } = options;
+  if (errorMessage !== void 0 && mapError !== void 0) {
+    throw new TBError("invalid_argument", `${options.service} \u4E0D\u80FD\u540C\u65F6\u58F0\u660E errorMessage \u4E0E mapError`);
+  }
+  const http = createProviderHttpClient(clientOptions);
+  const defaultMapError = mapError ?? (errorMessage === void 0 ? void 0 : ({ data, status, statusText }) => upstreamError(
+    status,
+    extractErrorMessage(data, errorMessage.keys) ?? errorMessage.fallback(status, statusText)
+  ));
+  function authHeaders(ctx) {
+    switch (auth.kind) {
+      case "bearer":
+        return { authorization: `Bearer ${requireApiKey(ctx, options.service)}` };
+      case "token":
+        return { authorization: `Token ${requireApiKey(ctx, options.service)}` };
+      case "header":
+        return { [auth.name]: requireApiKey(ctx, options.service) };
+      case "custom":
+        return auth.headers(ctx);
+    }
+  }
+  return {
+    async request(ctx, request) {
+      const resolvedAuth = authHeaders(ctx);
+      const headers = new Headers(staticHeaders);
+      for (const [name, value] of new Headers(request.headers)) headers.set(name, value);
+      for (const [name, value] of new Headers(resolvedAuth)) headers.set(name, value);
+      return await http.request({
+        ...request,
+        headers,
+        mapError: request.mapError ?? defaultMapError,
+        mapTransportError: request.mapTransportError ?? mapTransportError
+      });
+    }
+  };
+}
+
+export {
+  createAuthedClient
+};