@tool-bridge/server 0.16.0 → 0.17.0

package/dist/{opengraph_io-SQRAUSV5.js → opengraph_io-EOI5UJKT.js}

@@ -1,113 +1,95 @@
+import {
+  createProviderHttpClient
+} from "./chunk-WW2IMPQK.js";
+import {
+  asJsonObject,
+  booleanValue,
+  compactDefined,
+  integerValue,
+  trimmedText
+} from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-VK3V2WTY.js";
+} from "./chunk-YASUMV2K.js";
 import {
-  assertPublicHttpUrl,
-  guardedFetch
-} from "./chunk-2O27H4Y2.js";
-import "./chunk-GKX72JMJ.js";
+  assertPublicHttpUrl
+} from "./chunk-U5UHT7CX.js";
 import {
   TBError,
   external_exports
-} from "./chunk-YB2FLNWI.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-RVWZN3CI.js";
+import "./chunk-U67V476Y.js";
 
 // ../plugins/src/opengraph_io/api.ts
 var SERVICE = "opengraph_io";
 var API_BASE = "https://opengraph.io";
-function record(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
-}
-function text(value) {
-  return typeof value === "string" && value.trim() !== "" ? value.trim() : void 0;
-}
-function count(value) {
-  return typeof value === "number" && Number.isInteger(value) ? value : void 0;
-}
-function flag(value) {
-  return typeof value === "boolean" ? value : void 0;
-}
-function compact(input) {
-  return Object.fromEntries(Object.entries(input).filter(([, value]) => value !== void 0));
-}
+var http = createProviderHttpClient({ baseUrl: `${API_BASE}/`, service: SERVICE });
 function errorMessage(payload) {
   if (typeof payload === "string" && payload.trim() !== "") return payload;
-  const body = record(payload);
+  const body = asJsonObject(payload);
   if (body === void 0) return "OpenGraph.io request failed";
   for (const key of ["error_description", "error_message", "error", "message", "detail"]) {
-    const found = text(body[key]);
+    const found = trimmedText(body[key]);
     if (found !== void 0) return found;
   }
   return "OpenGraph.io request failed";
 }
 async function request(ctx, path, query) {
-  const url = new URL(path, API_BASE);
-  url.searchParams.set("app_id", requireApiKey(ctx, SERVICE));
-  for (const [key, value] of Object.entries(query)) {
-    if (value !== void 0) url.searchParams.set(key, String(value));
-  }
-  let response;
-  let payload = null;
-  try {
-    response = await guardedFetch(url.toString(), {
-      method: "GET",
-      headers: { accept: "application/json" }
-    });
-    const raw = await response.text();
-    if (raw !== "") {
-      try {
-        payload = JSON.parse(raw);
-      } catch {
-        payload = raw;
-      }
-    }
-  } catch (error) {
-    const message = error instanceof Error ? `OpenGraph.io request failed: ${error.message}` : "OpenGraph.io request failed";
-    throw upstreamError(502, message);
-  }
-  if (!response.ok) throw upstreamError(response.status, errorMessage(payload));
-  return payload;
+  const apiKey = requireApiKey(ctx, SERVICE);
+  const requestQuery = [["app_id", apiKey], ...Object.entries(query)];
+  const { data } = await http.request({
+    path,
+    query: requestQuery,
+    headers: { accept: "application/json" },
+    invalidJson: "text",
+    mapError: ({ data: payload, status }) => upstreamError(status, errorMessage(payload)),
+    mapTransportError: ({ message }) => upstreamError(
+      502,
+      message === void 0 ? "OpenGraph.io request failed" : `OpenGraph.io request failed: ${message}`
+    )
+  });
+  return data ?? null;
 }
 function unwrap(payload) {
-  const body = record(payload);
+  const body = asJsonObject(payload);
   if (body === void 0) return payload;
   return typeof body.successful === "boolean" && body.data !== void 0 ? body.data : payload;
 }
 function requireObject(payload, context) {
-  const body = record(unwrap(payload));
+  const body = asJsonObject(unwrap(payload));
   if (body === void 0) throw upstreamError(502, `OpenGraph.io ${context} response was not a JSON object`);
   return body;
 }
 function normalizeRequestInfo(payload) {
-  const body = record(payload);
+  const body = asJsonObject(payload);
   if (body === void 0) return void 0;
-  const normalized = compact({
-    host: text(body.host),
-    redirects: count(body.redirects),
-    responseCode: count(body.responseCode ?? body.response_code),
-    responseContentType: text(body.responseContentType ?? body.response_content_type)
+  const normalized = compactDefined({
+    host: trimmedText(body.host),
+    redirects: integerValue(body.redirects),
+    responseCode: integerValue(body.responseCode ?? body.response_code),
+    responseContentType: trimmedText(body.responseContentType ?? body.response_content_type)
   });
   return Object.keys(normalized).length > 0 ? normalized : void 0;
 }
 function normalizeSiteResult(payload) {
   const body = requireObject(payload, "site");
-  const tags = Array.isArray(body.tags) ? body.tags.map((item) => record(item)).filter((item) => item !== void 0) : void 0;
-  return compact({
-    hybridGraph: record(body.hybridGraph ?? body.hybrid_graph),
-    openGraph: record(body.openGraph ?? body.open_graph),
-    twitterCard: record(body.twitterCard ?? body.twitter_card),
-    htmlInferred: record(body.htmlInferred ?? body.html_inferred),
-    oEmbed: record(body.oEmbed ?? body.oembed),
-    requestUrl: text(body.requestUrl ?? body.request_url),
+  const tags = Array.isArray(body.tags) ? body.tags.map((item) => asJsonObject(item)).filter((item) => item !== void 0) : void 0;
+  return compactDefined({
+    hybridGraph: asJsonObject(body.hybridGraph ?? body.hybrid_graph),
+    openGraph: asJsonObject(body.openGraph ?? body.open_graph),
+    twitterCard: asJsonObject(body.twitterCard ?? body.twitter_card),
+    htmlInferred: asJsonObject(body.htmlInferred ?? body.html_inferred),
+    oEmbed: asJsonObject(body.oEmbed ?? body.oembed),
+    requestUrl: trimmedText(body.requestUrl ?? body.request_url),
     requestInfo: normalizeRequestInfo(body.requestInfo ?? body.request_info),
-    cached: flag(body.cached),
+    cached: booleanValue(body.cached),
     // createdAt 的 null 是有信息的("非缓存结果"),不能被 compact 当缺失丢掉。
-    createdAt: (body.createdAt ?? body.created_at) === null ? null : text(body.createdAt ?? body.created_at),
-    retryInfo: record(body.retryInfo ?? body.retry_info),
-    aiSafety: record(body.aiSafety ?? body.ai_safety ?? body.AI_SAFETY),
-    domain: text(body.domain),
+    createdAt: (body.createdAt ?? body.created_at) === null ? null : trimmedText(body.createdAt ?? body.created_at),
+    retryInfo: asJsonObject(body.retryInfo ?? body.retry_info),
+    aiSafety: asJsonObject(body.aiSafety ?? body.ai_safety ?? body.AI_SAFETY),
+    domain: trimmedText(body.domain),
     tags: tags !== void 0 && tags.length > 0 ? tags : void 0
   });
 }
@@ -163,14 +145,14 @@ async function scrapeUrl(input, ctx) {
   const unwrapped = unwrap(payload);
   if (typeof unwrapped === "string") return { htmlContent: unwrapped };
   const body = requireObject(unwrapped, "scrape");
-  const htmlContent = text(body.htmlContent ?? body.html_content ?? body.html);
+  const htmlContent = trimmedText(body.htmlContent ?? body.html_content ?? body.html);
   if (htmlContent === void 0) {
     throw upstreamError(502, "OpenGraph.io scrape response did not include html content");
   }
-  return compact({
+  return compactDefined({
     htmlContent,
     requestInfo: normalizeRequestInfo(body.requestInfo ?? body.request_info),
-    retryInfo: record(body.retryInfo ?? body.retry_info)
+    retryInfo: asJsonObject(body.retryInfo ?? body.retry_info)
   });
 }
 async function captureScreenshot(input, ctx) {
@@ -189,17 +171,17 @@ async function captureScreenshot(input, ctx) {
     block_cookie_banner: input.blockCookieBanner
   });
   const body = requireObject(payload, "screenshot");
-  const screenshotUrl = text(body.screenshotUrl ?? body.screenshot_url);
+  const screenshotUrl = trimmedText(body.screenshotUrl ?? body.screenshot_url);
   if (screenshotUrl === void 0) {
     throw upstreamError(502, "OpenGraph.io screenshot response did not include screenshotUrl");
   }
-  const dimensions = record(body.dimensions);
-  const width = count(dimensions?.width);
-  const height = count(dimensions?.height);
+  const dimensions = asJsonObject(body.dimensions);
+  const width = integerValue(dimensions?.width);
+  const height = integerValue(dimensions?.height);
   if (width === void 0 || height === void 0) {
     throw upstreamError(502, "OpenGraph.io screenshot response did not include dimensions");
   }
-  return compact({
+  return compactDefined({
     screenshotUrl,
     dimensions: { width, height },
     requestInfo: normalizeRequestInfo(body.requestInfo ?? body.request_info)

package/dist/{openrouter-Q5XXEJZ7.js → openrouter-BUWLF3BG.js}

@@ -1,40 +1,35 @@
+import {
+  createProviderHttpClient
+} from "./chunk-WW2IMPQK.js";
+import {
+  asJsonObject,
+  compactDefined,
+  trimmedText
+} from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-VK3V2WTY.js";
-import {
-  guardedFetch
-} from "./chunk-2O27H4Y2.js";
-import "./chunk-GKX72JMJ.js";
+} from "./chunk-YASUMV2K.js";
+import "./chunk-U5UHT7CX.js";
 import {
   TBError,
   external_exports
-} from "./chunk-YB2FLNWI.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-RVWZN3CI.js";
+import "./chunk-U67V476Y.js";
 
 // ../plugins/src/openrouter/api.ts
 var SERVICE = "openrouter";
 var API_BASE = "https://openrouter.ai/api/v1";
+var http = createProviderHttpClient({ baseUrl: `${API_BASE}/`, service: SERVICE });
 var HEADER_INPUT_KEYS = ["httpReferer", "xTitle"];
-function text(value) {
-  if (typeof value !== "string") return void 0;
-  const trimmed = value.trim();
-  return trimmed === "" ? void 0 : trimmed;
-}
-function record(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
-}
 function requireRecord(value, label) {
-  const result = record(value);
+  const result = asJsonObject(value);
   if (result === void 0) {
     throw new TBError("unavailable", `OpenRouter \u7684${label}\u4E0D\u662F\u5BF9\u8C61`, { retryable: true });
   }
   return result;
 }
-function compact(input) {
-  return Object.fromEntries(Object.entries(input).filter(([, value]) => value !== void 0));
-}
 function stripHeaderInputs(input) {
   return Object.fromEntries(
     Object.entries(input).filter(([key, value]) => !HEADER_INPUT_KEYS.includes(key) && value !== void 0)
@@ -51,53 +46,44 @@ function legacyTools(value) {
 }
 function legacyToolChoice(value) {
   if (value === "none" || value === "auto") return value;
-  const name = text(record(value)?.name);
+  const name = trimmedText(asJsonObject(value)?.name);
   if (name === void 0) return void 0;
   return { type: "function", function: { name } };
 }
-function buildUrl(path, query) {
-  const url = new URL(`${API_BASE}${path}`);
-  for (const [key, value] of Object.entries(query)) {
-    if (value !== void 0) url.searchParams.set(key, String(value));
-  }
-  return url.toString();
-}
 function errorMessage(payload) {
-  const body = record(payload);
+  const body = asJsonObject(payload);
   if (body === void 0) return void 0;
-  return text(record(body.error)?.message) ?? text(body.message);
+  return trimmedText(asJsonObject(body.error)?.message) ?? trimmedText(body.message);
 }
 async function request(ctx, input) {
   const hasBody = input.body !== void 0;
   const headers = new Headers({ authorization: `Bearer ${requireApiKey(ctx, SERVICE)}` });
-  if (hasBody) headers.set("content-type", "application/json");
-  const referer = text(input.headerSource?.httpReferer);
-  const title = text(input.headerSource?.xTitle);
+  const referer = trimmedText(input.headerSource?.httpReferer);
+  const title = trimmedText(input.headerSource?.xTitle);
   if (referer !== void 0) headers.set("HTTP-Referer", referer);
   if (title !== void 0) headers.set("X-Title", title);
-  const response = await guardedFetch(buildUrl(input.path, input.query ?? {}), {
+  const response = await http.request({
     method: input.method ?? "GET",
+    path: input.path,
+    query: Object.entries(input.query ?? {}),
     headers,
-    ...hasBody ? { body: JSON.stringify(compact(input.body ?? {})) } : {}
+    ...hasBody ? { json: compactDefined(input.body ?? {}) } : {},
+    responseType: "json",
+    invalidJson: "text",
+    mapError: ({ bodyKind, data, status }) => upstreamError(
+      status,
+      bodyKind === "json" ? errorMessage(data) ?? `OpenRouter \u8FD4\u56DE HTTP ${status}` : `OpenRouter \u8FD4\u56DE HTTP ${status}`
+    )
   });
-  const body = await response.text();
-  if (response.ok) {
-    const contentType = response.headers.get("content-type") ?? "";
-    const isText = contentType.includes("xml") || contentType.includes("rss") || contentType.startsWith("text/");
-    if (input.allowText === true && isText) return { rss: body };
-    try {
-      return requireRecord(JSON.parse(body), "\u54CD\u5E94");
-    } catch (error) {
-      if (error instanceof TBError) throw error;
-      throw new TBError("unavailable", "OpenRouter \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94", { retryable: true });
-    }
+  const contentType = response.headers.get("content-type") ?? "";
+  const isText = contentType.includes("xml") || contentType.includes("rss") || contentType.startsWith("text/");
+  if (input.allowText === true && response.bodyKind === "invalid-json" && isText) {
+    return { rss: String(response.data) };
   }
-  let payload = null;
-  try {
-    payload = JSON.parse(body);
-  } catch {
+  if (response.bodyKind !== "json") {
+    throw new TBError("unavailable", "OpenRouter \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94", { retryable: true });
   }
-  throw upstreamError(response.status, errorMessage(payload) ?? `OpenRouter \u8FD4\u56DE HTTP ${response.status}`);
+  return requireRecord(response.data, "\u54CD\u5E94");
 }
 function createChatCompletion(input, ctx) {
   assertStreamingDisabled(input);
@@ -106,7 +92,7 @@ function createChatCompletion(input, ctx) {
     method: "POST",
     path: "/chat/completions",
     headerSource: input,
-    body: compact({
+    body: compactDefined({
       ...body,
       // 给了新字段就不翻译 legacy 的那两个(新的优先),翻完旧字段一律不发。
       tools: body.tools ?? legacyTools(input.functions),
@@ -146,7 +132,7 @@ function getModelsCount(input, ctx) {
   return request(ctx, {
     path: "/models/count",
     headerSource: input,
-    query: { output_modalities: text(input.outputModalities) }
+    query: { output_modalities: trimmedText(input.outputModalities) }
   });
 }
 function listAvailableModels(input, ctx) {
@@ -154,9 +140,9 @@ function listAvailableModels(input, ctx) {
     path: "/models",
     // 入参名是驼峰,query 名是下划线 —— 这一层改名是上游的,不是笔误。
     query: {
-      category: text(input.category),
-      supported_parameters: text(input.supportedParameters),
-      output_modalities: text(input.outputModalities),
+      category: trimmedText(input.category),
+      supported_parameters: trimmedText(input.supportedParameters),
+      output_modalities: trimmedText(input.outputModalities),
       use_rss: input.useRss,
       use_rss_chat_links: input.useRssChatLinks
     },