@tool-bridge/server 0.15.0 → 0.17.0

package/dist/{ipgeolocation_io-YNTOLOFH.js → ipgeolocation_io-OAGR6PRF.js}

@@ -1,25 +1,25 @@
+import {
+  createProviderHttpClient
+} from "./chunk-WW2IMPQK.js";
+import {
+  asJsonObject
+} from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-NQ67PIIS.js";
-import {
-  guardedFetch
-} from "./chunk-KH663T3A.js";
-import "./chunk-UI4E4T5Q.js";
+} from "./chunk-YASUMV2K.js";
+import "./chunk-U5UHT7CX.js";
 import {
-  TBError,
   external_exports
-} from "./chunk-DXXYNIXV.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-RVWZN3CI.js";
+import "./chunk-U67V476Y.js";
 
 // ../plugins/src/ipgeolocation_io/api.ts
 var SERVICE = "ipgeolocation_io";
 var API_BASE = "https://api.ipgeolocation.io/";
 var REQUEST_TIMEOUT_MS = 3e4;
-function toRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
-}
+var http = createProviderHttpClient({ baseUrl: API_BASE, service: SERVICE });
 function nullableString(value) {
   if (typeof value === "string") return value;
   if (typeof value === "number" || typeof value === "boolean") return String(value);
@@ -39,47 +39,27 @@ function nullableInteger(value) {
 }
 function errorMessage(payload, status) {
   if (typeof payload === "string" && payload.trim() !== "") return payload;
-  const record = toRecord(payload);
+  const record = asJsonObject(payload);
   const message = record?.message ?? record?.error;
   if (typeof message === "string" && message.trim() !== "") return message;
   return `IPGeolocation.io request failed with status ${status}`;
 }
-async function readPayload(response) {
-  const body = await response.text();
-  if (body.trim() === "") return null;
-  try {
-    return JSON.parse(body);
-  } catch {
-    throw upstreamError(502, "IPGeolocation.io returned invalid JSON");
-  }
-}
 async function request(ctx, path, params) {
-  const url = new URL(path, API_BASE);
-  url.searchParams.set("apiKey", requireApiKey(ctx, SERVICE));
-  for (const [key, value] of Object.entries(params)) {
-    if (value !== void 0) url.searchParams.set(key, value);
-  }
-  let response;
-  try {
-    response = await guardedFetch(url.toString(), {
-      method: "GET",
-      headers: { accept: "application/json" },
-      signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS)
-    });
-  } catch (error) {
-    if (error instanceof TBError) throw error;
-    if (error instanceof Error && error.name === "TimeoutError") {
-      throw upstreamError(504, "IPGeolocation.io request timed out");
-    }
-    throw error;
-  }
-  const payload = await readPayload(response);
-  if (!response.ok) {
-    const status = response.status;
-    const normalized = status === 429 || status === 401 || status === 403 ? status : status >= 400 && status < 500 ? 400 : status || 500;
-    throw upstreamError(normalized, errorMessage(payload, status));
-  }
-  const record = toRecord(payload);
+  const { data: payload } = await http.request({
+    path,
+    method: "GET",
+    query: [["apiKey", requireApiKey(ctx, SERVICE)], ...Object.entries(params)],
+    headers: { accept: "application/json" },
+    timeoutMs: REQUEST_TIMEOUT_MS,
+    invalidJsonMessage: "IPGeolocation.io returned invalid JSON",
+    mapError: ({ bodyKind, data, status }) => {
+      if (bodyKind === "invalid-json") return upstreamError(502, "IPGeolocation.io returned invalid JSON");
+      const normalized = status === 429 || status === 401 || status === 403 ? status : status >= 400 && status < 500 ? 400 : status || 500;
+      return upstreamError(normalized, errorMessage(data, status));
+    },
+    mapTransportError: ({ kind }) => kind === "timeout" ? upstreamError(504, "IPGeolocation.io request timed out") : upstreamError(502, "IPGeolocation.io request failed")
+  });
+  const record = asJsonObject(payload);
   if (record === void 0) throw upstreamError(502, "IPGeolocation.io returned an invalid payload");
   return record;
 }
@@ -106,7 +86,7 @@ async function lookupIp(input, ctx) {
     excludes: joinList(input.excludes),
     include: includes.length > 0 ? includes.join(",") : void 0
   });
-  const location = toRecord(payload.location) ?? payload;
+  const location = asJsonObject(payload.location) ?? payload;
   return {
     geolocation: {
       ip: nullableString(payload.ip),
@@ -122,17 +102,17 @@ async function lookupIp(input, ctx) {
       zipcode: nullableString(location.zipcode),
       latitude: nullableNumber(location.latitude),
       longitude: nullableNumber(location.longitude),
-      callingCode: nullableString(toRecord(payload.country_metadata)?.calling_code),
+      callingCode: nullableString(asJsonObject(payload.country_metadata)?.calling_code),
       countryFlag: nullableString(location.country_flag),
-      countryMetadata: toRecord(payload.country_metadata) ?? null,
-      network: toRecord(payload.network) ?? null,
-      asn: toRecord(payload.asn) ?? null,
-      company: toRecord(payload.company) ?? null,
-      timeZone: toRecord(payload.time_zone) ?? null,
-      currency: toRecord(payload.currency) ?? null,
-      security: toRecord(payload.security) ?? null,
-      abuse: toRecord(payload.abuse) ?? null,
-      userAgent: toRecord(payload.user_agent) ?? null,
+      countryMetadata: asJsonObject(payload.country_metadata) ?? null,
+      network: asJsonObject(payload.network) ?? null,
+      asn: asJsonObject(payload.asn) ?? null,
+      company: asJsonObject(payload.company) ?? null,
+      timeZone: asJsonObject(payload.time_zone) ?? null,
+      currency: asJsonObject(payload.currency) ?? null,
+      security: asJsonObject(payload.security) ?? null,
+      abuse: asJsonObject(payload.abuse) ?? null,
+      userAgent: asJsonObject(payload.user_agent) ?? null,
       raw: payload
     }
   };
@@ -163,7 +143,7 @@ async function getTimezone(input, ctx) {
       yearAbbr: nullableString(payload.year_abbr),
       isDst: typeof payload.is_dst === "boolean" ? payload.is_dst : null,
       dstSavings: nullableInteger(payload.dst_savings),
-      geo: toRecord(payload.geo) ?? null,
+      geo: asJsonObject(payload.geo) ?? null,
       raw: payload
     }
   };
@@ -178,7 +158,7 @@ async function getAstronomy(input, ctx) {
   });
   return {
     astronomy: {
-      location: toRecord(payload.location) ?? null,
+      location: asJsonObject(payload.location) ?? null,
       date: nullableString(payload.date),
       currentTime: nullableString(payload.current_time),
       sunrise: nullableString(payload.sunrise),

package/dist/{ipqualityscore-CZLQUAQ7.js → ipqualityscore-BCKAMDGL.js}

@@ -1,21 +1,23 @@
+import {
+  createProviderHttpClient
+} from "./chunk-WW2IMPQK.js";
+import "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-NQ67PIIS.js";
-import {
-  guardedFetch
-} from "./chunk-KH663T3A.js";
-import "./chunk-UI4E4T5Q.js";
+} from "./chunk-YASUMV2K.js";
+import "./chunk-U5UHT7CX.js";
 import {
   TBError,
   external_exports
-} from "./chunk-DXXYNIXV.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-RVWZN3CI.js";
+import "./chunk-U67V476Y.js";
 
 // ../plugins/src/ipqualityscore/api.ts
 var SERVICE = "ipqualityscore";
 var API_BASE = "https://www.ipqualityscore.com";
+var http = createProviderHttpClient({ baseUrl: API_BASE, service: SERVICE });
 var IP_LITERAL = external_exports.union([external_exports.ipv4(), external_exports.ipv6()]);
 function optionalText(value) {
   return value?.trim() || void 0;
@@ -32,55 +34,41 @@ function messageOf(payload) {
   const pick = (value) => typeof value === "string" ? optionalText(value) : void 0;
   return pick(record.message) ?? pick(record.error);
 }
-function ipqsError(response, payload) {
-  const message = messageOf(payload) ?? optionalText(response.statusText) ?? `IPQualityScore request failed with ${response.status}`;
+function ipqsError(status, statusText, payload) {
+  const message = messageOf(payload) ?? optionalText(statusText) ?? `IPQualityScore request failed with ${status}`;
   const lower = message.toLowerCase();
-  if (response.status === 429 || response.status === 402 || lower.includes("insufficient credits")) {
+  if (status === 429 || status === 402 || lower.includes("insufficient credits")) {
     return upstreamError(429, message);
   }
-  if (lower.includes("invalid api key") || lower.includes("api key") || response.status === 401 || response.status === 403) {
+  if (lower.includes("invalid api key") || lower.includes("api key") || status === 401 || status === 403) {
     return upstreamError(401, message);
   }
-  if (response.status === 400 || lower.includes("invalid ip") || lower.includes("invalid email") || lower.includes("invalid phone") || lower.includes("invalid url")) {
+  if (status === 400 || lower.includes("invalid ip") || lower.includes("invalid email") || lower.includes("invalid phone") || lower.includes("invalid url")) {
     return upstreamError(400, message);
   }
-  return upstreamError(response.status >= 400 ? response.status : 502, message);
-}
-async function readPayload(response) {
-  const body = await response.text();
-  if (body === "") return null;
-  try {
-    return JSON.parse(body);
-  } catch {
-    return body;
-  }
+  return upstreamError(status >= 400 ? status : 502, message);
 }
 async function request(ctx, family, value, query = []) {
-  const path = `/api/json/${family}/${encodeURIComponent(requireApiKey(ctx, SERVICE))}/${encodeURIComponent(value)}`;
-  const url = new URL(path, API_BASE);
-  for (const [key, queryValue] of query) {
-    if (queryValue !== void 0) url.searchParams.append(key, queryValue);
-  }
-  let response;
-  let payload;
-  try {
-    response = await guardedFetch(url.toString(), {
-      method: "GET",
-      headers: { accept: "application/json" }
-    });
-    payload = await readPayload(response);
-  } catch (error) {
-    throw new TBError(
+  const apiKey = requireApiKey(ctx, SERVICE);
+  const result = await http.request({
+    path: `/api/json/${family}/${encodeURIComponent(apiKey)}/${encodeURIComponent(value)}`,
+    method: "GET",
+    query,
+    headers: { accept: "application/json" },
+    invalidJson: "text",
+    sensitiveValues: [apiKey],
+    mapError: ({ data, status, statusText }) => ipqsError(status, statusText, data),
+    mapTransportError: ({ message }) => new TBError(
       "unavailable",
-      error instanceof Error ? `IPQualityScore \u8BF7\u6C42\u5931\u8D25: ${error.message}` : "IPQualityScore \u8BF7\u6C42\u5931\u8D25",
+      message === void 0 ? "IPQualityScore \u8BF7\u6C42\u5931\u8D25" : `IPQualityScore \u8BF7\u6C42\u5931\u8D25: ${message}`,
       { retryable: true }
-    );
-  }
-  if (!response.ok) throw ipqsError(response, payload);
+    )
+  });
+  const payload = result.bodyKind === "empty" ? null : result.data;
   if (payload === null || typeof payload !== "object" || Array.isArray(payload)) {
     throw new TBError("unavailable", `IPQualityScore \u5BF9 ${family} \u7684\u54CD\u5E94\u4E0D\u662F JSON \u5BF9\u8C61`, { retryable: true });
   }
-  if (payload.success === false) throw ipqsError(response, payload);
+  if (payload.success === false) throw ipqsError(result.status, result.statusText, payload);
   return payload;
 }
 async function checkIpReputation(input, ctx) {

package/dist/{jina_ai-JIFEYH5C.js → jina_ai-N3NXRVIZ.js}

@@ -1,74 +1,48 @@
+import {
+  createProviderHttpClient
+} from "./chunk-WW2IMPQK.js";
+import {
+  messageFrom
+} from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-NQ67PIIS.js";
-import {
-  guardedFetch
-} from "./chunk-KH663T3A.js";
-import "./chunk-UI4E4T5Q.js";
+} from "./chunk-YASUMV2K.js";
+import "./chunk-U5UHT7CX.js";
 import {
-  TBError,
   external_exports
-} from "./chunk-DXXYNIXV.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-RVWZN3CI.js";
+import "./chunk-U67V476Y.js";
 
 // ../plugins/src/jina_ai/api.ts
 var SERVICE = "jina_ai";
-var API_BASE = "https://api.jina.ai";
 var REQUEST_TIMEOUT_MS = 3e4;
-function record(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
-}
-function text(value) {
-  if (typeof value !== "string") return void 0;
-  const trimmed = value.trim();
-  return trimmed === "" ? void 0 : trimmed;
-}
-function errorMessage(status, body, payload) {
-  const top = record(payload);
-  return text(top?.detail) ?? text(top?.message) ?? text(body) ?? `Jina AI request failed with ${status}`;
-}
+var http = createProviderHttpClient({ baseUrl: "https://api.jina.ai/", service: SERVICE });
 async function request(ctx, path, body) {
-  const apiKey = requireApiKey(ctx, SERVICE);
-  const timeoutSignal = AbortSignal.timeout(REQUEST_TIMEOUT_MS);
-  let response;
-  try {
-    response = await guardedFetch(`${API_BASE}${path}`, {
-      method: "POST",
-      headers: {
-        "accept": "application/json",
-        "authorization": `Bearer ${apiKey}`,
-        "content-type": "application/json"
-      },
-      body: JSON.stringify(body),
-      signal: timeoutSignal
-    });
-  } catch (error) {
-    if (error instanceof TBError) throw error;
-    if (timeoutSignal.aborted) throw upstreamError(504, `Jina AI ${REQUEST_TIMEOUT_MS / 1e3}s \u5185\u6CA1\u6709\u8FD4\u56DE`);
-    const message = error instanceof Error ? error.message : "unknown network error";
-    throw upstreamError(502, `Jina AI \u8BF7\u6C42\u5931\u8D25: ${message}`);
-  }
-  const raw = await response.text();
-  let payload = null;
-  if (raw !== "") {
-    try {
-      payload = JSON.parse(raw);
-    } catch {
-      if (response.ok) {
-        throw new TBError("unavailable", "Jina AI \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94", { retryable: true });
-      }
-    }
-  }
-  if (!response.ok) throw upstreamError(response.status, errorMessage(response.status, raw, payload));
-  return payload;
+  const { data } = await http.request({
+    path,
+    method: "POST",
+    headers: {
+      accept: "application/json",
+      authorization: `Bearer ${requireApiKey(ctx, SERVICE)}`
+    },
+    json: body,
+    timeoutMs: REQUEST_TIMEOUT_MS,
+    invalidJsonMessage: "Jina AI \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94",
+    mapError: ({ data: payload, status }) => upstreamError(
+      status,
+      messageFrom(payload, ["detail", "message"], `Jina AI request failed with ${status}`)
+    ),
+    mapTransportError: ({ kind, message }) => kind === "timeout" ? upstreamError(504, `Jina AI ${REQUEST_TIMEOUT_MS / 1e3}s \u5185\u6CA1\u6709\u8FD4\u56DE`) : upstreamError(502, `Jina AI \u8BF7\u6C42\u5931\u8D25: ${message ?? "unknown network error"}`)
+  });
+  return data ?? null;
 }
-async function createEmbeddings(input, ctx) {
-  return request(ctx, "/v1/embeddings", input);
+function createEmbeddings(input, ctx) {
+  return request(ctx, "v1/embeddings", input);
 }
-async function rerankDocuments(input, ctx) {
-  return request(ctx, "/v1/rerank", input);
+function rerankDocuments(input, ctx) {
+  return request(ctx, "v1/rerank", input);
 }
 
 // ../plugins/src/jina_ai/schema.ts