@tool-bridge/server 0.16.0 → 0.19.0

package/dist/{confluence-SZE63S46.js → confluence-56QEKNQI.js}

@@ -1,43 +1,32 @@
+import {
+  createProviderHttpClient
+} from "./chunk-VLOIDU5U.js";
+import {
+  asJsonObject,
+  booleanValue,
+  compactDefined,
+  integerValue,
+  trimmedText
+} from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireCredential,
   upstreamError
-} from "./chunk-VK3V2WTY.js";
-import {
-  guardedFetch
-} from "./chunk-2O27H4Y2.js";
-import "./chunk-GKX72JMJ.js";
+} from "./chunk-B4P6YZFS.js";
+import "./chunk-SWBNHIO4.js";
 import {
   TBError,
   external_exports
-} from "./chunk-YB2FLNWI.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-OKRZPQ3R.js";
+import "./chunk-U67V476Y.js";
 
 // ../plugins/src/confluence/api.ts
 var SERVICE = "confluence";
 var REQUEST_TIMEOUT_MS = 3e4;
 var DEFAULT_LIMIT = 25;
-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 integer(value) {
-  return typeof value === "number" && Number.isInteger(value) ? value : void 0;
-}
-function boolean(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({ service: SERVICE });
 function requireRecord(value, message) {
-  const result = record(value);
+  const result = asJsonObject(value);
   if (result === void 0) throw upstreamError(502, message);
   return result;
 }
@@ -65,57 +54,32 @@ function basicAuthHeader(ctx) {
   for (const byte of bytes) binary += String.fromCharCode(byte);
   return `Basic ${btoa(binary)}`;
 }
-function errorMessage(payload, response) {
+function errorMessage(payload, context) {
   if (typeof payload === "string") {
     const trimmed = payload.trim();
     if (trimmed !== "") return trimmed;
   }
-  const body = record(payload);
-  const fromList = Array.isArray(body?.errors) ? body.errors.map((item) => text(record(item)?.message)).find((item) => item !== void 0) : void 0;
-  return text(body?.message) ?? text(body?.errorMessage) ?? text(body?.error) ?? fromList ?? text(response.statusText) ?? "Confluence request failed";
+  const body = asJsonObject(payload);
+  const fromList = Array.isArray(body?.errors) ? body.errors.map((item) => trimmedText(asJsonObject(item)?.message)).find((item) => item !== void 0) : void 0;
+  return trimmedText(body?.message) ?? trimmedText(body?.errorMessage) ?? trimmedText(body?.error) ?? fromList ?? trimmedText(context.statusText) ?? "Confluence request failed";
 }
 async function request(ctx, options) {
-  const headers = {
-    accept: "application/json",
-    authorization: basicAuthHeader(ctx)
-  };
-  if (options.body !== void 0) headers["content-type"] = "application/json";
-  const url = new URL(options.path.replace(/^\//, ""), `${siteBaseUrl(ctx)}/`);
-  for (const [key, value] of Object.entries(options.query ?? {})) {
-    if (value !== void 0) url.searchParams.set(key, String(value));
-  }
-  let response;
-  try {
-    response = await guardedFetch(url.toString(), {
-      method: options.method,
-      headers,
-      signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
-      ...options.body === void 0 ? {} : { body: JSON.stringify(options.body) }
-    });
-  } catch (error) {
-    if (error instanceof TBError) throw error;
-    if (error instanceof Error && error.name === "TimeoutError") {
-      throw upstreamError(504, `Confluence request timed out after ${REQUEST_TIMEOUT_MS / 1e3} seconds`);
-    }
-    throw upstreamError(
-      502,
-      error instanceof Error ? `Confluence request failed: ${error.message}` : "Confluence request failed"
-    );
-  }
-  const raw = await response.text().catch(() => "");
-  let payload = null;
-  if (raw.trim() !== "") {
-    try {
-      payload = JSON.parse(raw);
-    } catch {
-      payload = raw;
-    }
-  }
-  if (!response.ok) throw upstreamError(response.status, errorMessage(payload, response));
-  return payload;
+  const result = await http.request({
+    baseUrl: `${siteBaseUrl(ctx)}/`,
+    path: options.path,
+    method: options.method,
+    query: Object.entries(options.query ?? {}),
+    headers: { accept: "application/json", authorization: basicAuthHeader(ctx) },
+    ...options.body === void 0 ? {} : { json: options.body },
+    timeoutMs: REQUEST_TIMEOUT_MS,
+    invalidJson: "text",
+    mapError: (context) => upstreamError(context.status, errorMessage(context.data, context)),
+    mapTransportError: ({ kind, message }) => kind === "timeout" ? upstreamError(504, `Confluence request timed out after ${REQUEST_TIMEOUT_MS / 1e3} seconds`) : upstreamError(502, message === void 0 ? "Confluence request failed" : `Confluence request failed: ${message}`)
+  });
+  return result.data === void 0 ? null : result.data;
 }
 function nextCursor(payload) {
-  const link = text(record(payload._links)?.next);
+  const link = trimmedText(asJsonObject(payload._links)?.next);
   if (link === void 0) return null;
   const questionIndex = link.indexOf("?");
   const search = questionIndex >= 0 ? link.slice(questionIndex) : link;
@@ -127,46 +91,46 @@ function nextCursor(payload) {
 }
 function normalizeSpace(value) {
   const space = requireRecord(value, "Confluence space must be an object");
-  return compact({
-    id: text(space.id),
-    key: text(space.key),
-    name: text(space.name),
-    type: text(space.type),
-    status: text(space.status),
-    homepageId: text(space.homepageId ?? record(space.homepage)?.id) ?? null,
+  return compactDefined({
+    id: trimmedText(space.id),
+    key: trimmedText(space.key),
+    name: trimmedText(space.name),
+    type: trimmedText(space.type),
+    status: trimmedText(space.status),
+    homepageId: trimmedText(space.homepageId ?? asJsonObject(space.homepage)?.id) ?? null,
     raw: space
   });
 }
 function normalizePage(value) {
   const page = requireRecord(value, "Confluence page must be an object");
-  const version = record(page.version);
-  return compact({
-    id: text(page.id),
-    status: text(page.status),
-    title: text(page.title),
-    spaceId: text(page.spaceId),
-    parentId: text(page.parentId) ?? null,
-    createdAt: text(page.createdAt),
-    version: version === void 0 ? null : compact({
-      number: integer(version.number),
-      message: text(version.message),
-      minorEdit: boolean(version.minorEdit)
+  const version = asJsonObject(page.version);
+  return compactDefined({
+    id: trimmedText(page.id),
+    status: trimmedText(page.status),
+    title: trimmedText(page.title),
+    spaceId: trimmedText(page.spaceId),
+    parentId: trimmedText(page.parentId) ?? null,
+    createdAt: trimmedText(page.createdAt),
+    version: version === void 0 ? null : compactDefined({
+      number: integerValue(version.number),
+      message: trimmedText(version.message),
+      minorEdit: booleanValue(version.minorEdit)
     }),
-    body: record(page.body) ?? null,
+    body: asJsonObject(page.body) ?? null,
     raw: page
   });
 }
 function normalizeSearchResult(value) {
   const result = requireRecord(value, "Confluence search result must be an object");
-  const content = record(result.content);
-  return compact({
+  const content = asJsonObject(result.content);
+  return compactDefined({
     // 搜索结果的字段有时挂在顶层、有时挂在 content 下,两处都要看。
-    id: text(result.id ?? content?.id),
-    type: text(result.type ?? content?.type),
-    title: text(result.title ?? content?.title),
-    url: text(result.url ?? result.webUrl ?? result.link),
-    excerpt: text(result.excerpt),
-    containerTitle: text(record(result.resultGlobalContainer)?.title),
+    id: trimmedText(result.id ?? content?.id),
+    type: trimmedText(result.type ?? content?.type),
+    title: trimmedText(result.title ?? content?.title),
+    url: trimmedText(result.url ?? result.webUrl ?? result.link),
+    excerpt: trimmedText(result.excerpt),
+    containerTitle: trimmedText(asJsonObject(result.resultGlobalContainer)?.title),
     raw: result
   });
 }
@@ -175,10 +139,10 @@ async function searchContent(input, ctx) {
     await request(ctx, {
       method: "GET",
       path: "/search",
-      query: compact({
+      query: compactDefined({
         cql: input.cql,
         limit: input.limit ?? DEFAULT_LIMIT,
-        cursor: text(input.cursor)
+        cursor: trimmedText(input.cursor)
       })
     }),
     "Confluence search response must be an object"
@@ -191,11 +155,11 @@ async function listSpaces(input, ctx) {
     await request(ctx, {
       method: "GET",
       path: "/spaces",
-      query: compact({
+      query: compactDefined({
         limit: input.limit ?? DEFAULT_LIMIT,
-        cursor: text(input.cursor),
-        type: text(input.type),
-        status: text(input.status)
+        cursor: trimmedText(input.cursor),
+        type: trimmedText(input.type),
+        status: trimmedText(input.status)
       })
     }),
     "Confluence spaces response must be an object"
@@ -207,7 +171,7 @@ async function getPage(input, ctx) {
   const payload = await request(ctx, {
     method: "GET",
     path: `/pages/${encodeURIComponent(input.pageId)}`,
-    query: compact({ "body-format": text(input.bodyFormat) })
+    query: compactDefined({ "body-format": trimmedText(input.bodyFormat) })
   });
   return { page: normalizePage(payload) };
 }
@@ -215,31 +179,31 @@ async function createPage(input, ctx) {
   const payload = await request(ctx, {
     method: "POST",
     path: "/pages",
-    body: compact({
+    body: compactDefined({
       spaceId: input.spaceId,
-      status: text(input.status) ?? "current",
+      status: trimmedText(input.status) ?? "current",
       title: input.title,
-      parentId: text(input.parentId),
-      body: { representation: text(input.bodyRepresentation) ?? "storage", value: input.body }
+      parentId: trimmedText(input.parentId),
+      body: { representation: trimmedText(input.bodyRepresentation) ?? "storage", value: input.body }
     })
   });
   return { page: normalizePage(payload) };
 }
 async function updatePage(input, ctx) {
-  const body = text(input.body);
+  const body = trimmedText(input.body);
   const payload = await request(ctx, {
     method: "PUT",
     path: `/pages/${encodeURIComponent(input.pageId)}`,
-    body: compact({
+    body: compactDefined({
       // Confluence 的 PUT 要求 body 里再带一次 id,少了会 400。
       id: input.pageId,
-      status: text(input.status) ?? "current",
+      status: trimmedText(input.status) ?? "current",
       title: input.title,
       // 没给正文就整块省略 —— 发一个空 value 会把页面内容清空。
-      body: body === void 0 ? void 0 : { representation: text(input.bodyRepresentation) ?? "storage", value: body },
-      version: compact({
+      body: body === void 0 ? void 0 : { representation: trimmedText(input.bodyRepresentation) ?? "storage", value: body },
+      version: compactDefined({
         number: input.versionNumber,
-        message: text(input.versionMessage),
+        message: trimmedText(input.versionMessage),
         minorEdit: input.minorEdit
       })
     })

package/dist/{convertapi-QPG2JC5K.js → convertapi-3QRM5K5T.js}

@@ -1,18 +1,21 @@
+import {
+  asJsonObject,
+  integerValue
+} from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-VK3V2WTY.js";
+} from "./chunk-B4P6YZFS.js";
 import {
   assertPublicHttpUrl,
   guardedFetch
-} from "./chunk-2O27H4Y2.js";
-import "./chunk-GKX72JMJ.js";
+} from "./chunk-SWBNHIO4.js";
 import {
   TBError,
   external_exports
-} from "./chunk-YB2FLNWI.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-OKRZPQ3R.js";
+import "./chunk-U67V476Y.js";
 
 // ../plugins/src/convertapi/schema.ts
 var convertPdfToDocxInput = external_exports.strictObject({
@@ -58,17 +61,11 @@ var SERVICE = "convertapi";
 var API_BASE = "https://v2.convertapi.com";
 var CONVERT_PDF_TO_DOCX_PATH = "/convert/pdf/to/docx";
 var REQUEST_TIMEOUT_MS = 12e4;
-function toRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
-}
 function text(value) {
   return typeof value === "string" && value !== "" ? value : void 0;
 }
-function integer(value) {
-  return typeof value === "number" && Number.isInteger(value) ? value : void 0;
-}
 function errorMessage(payload, status) {
-  const record = toRecord(payload);
+  const record = asJsonObject(payload);
   return text(record?.Message) ?? text(record?.message) ?? `ConvertAPI \u8FD4\u56DE HTTP ${status}`;
 }
 function convertapiError(status, message) {
@@ -126,15 +123,15 @@ async function convertPdfToDocx(input, ctx) {
   }
   const payload = await readPayload(response);
   if (!response.ok) throw convertapiError(response.status, errorMessage(payload, response.status));
-  const record = toRecord(payload);
+  const record = asJsonObject(payload);
   const rawFiles = Array.isArray(record?.Files) ? record.Files : [];
   const files = rawFiles.map((value) => {
-    const file = toRecord(value);
+    const file = asJsonObject(value);
     if (file === void 0) return void 0;
     return Object.fromEntries(Object.entries({
       fileName: text(file.FileName),
       fileExt: text(file.FileExt),
-      fileSize: integer(file.FileSize),
+      fileSize: integerValue(file.FileSize),
       fileId: text(file.FileId),
       url: text(file.Url)
     }).filter(([, entry]) => entry !== void 0));
@@ -142,7 +139,7 @@ async function convertPdfToDocx(input, ctx) {
   if (files.length === 0) {
     throw upstreamError(502, "ConvertAPI \u7684\u6210\u529F\u54CD\u5E94\u91CC\u6CA1\u6709\u8F6C\u6362\u7ED3\u679C\u6587\u4EF6");
   }
-  const conversionCost = integer(record?.ConversionCost);
+  const conversionCost = integerValue(record?.ConversionCost);
   return conversionCost === void 0 ? { files } : { conversionCost, files };
 }
 

package/dist/{currencyapi-UO2APQRY.js → currencyapi-L6G4OND5.js}

@@ -1,75 +1,52 @@
+import {
+  createProviderHttpClient
+} from "./chunk-VLOIDU5U.js";
+import {
+  asJsonObject,
+  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-B4P6YZFS.js";
+import "./chunk-SWBNHIO4.js";
 import {
   external_exports
-} from "./chunk-YB2FLNWI.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-OKRZPQ3R.js";
+import "./chunk-U67V476Y.js";
 
 // ../plugins/src/currencyapi/api.ts
 var SERVICE = "currencyapi";
 var API_BASE = "https://api.currencyapi.com";
-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;
-}
+var http = createProviderHttpClient({ baseUrl: `${API_BASE}/`, service: SERVICE });
 function errorMessage(payload) {
-  if (typeof payload === "string") return text(payload);
-  const body = record(payload);
-  return text(body?.message) ?? text(record(body?.error)?.message);
-}
-async function readPayload(response) {
-  const body = await response.text().catch(() => "");
-  if (body.trim() === "") return null;
-  try {
-    return JSON.parse(body);
-  } catch {
-    return body;
-  }
+  if (typeof payload === "string") return trimmedText(payload);
+  const body = asJsonObject(payload);
+  return trimmedText(body?.message) ?? trimmedText(asJsonObject(body?.error)?.message);
 }
 function requireObject(value, field) {
-  const body = record(value);
+  const body = asJsonObject(value);
   if (body === void 0) throw upstreamError(502, `${field} must be an object`);
   return body;
 }
 async function request(ctx, path, query) {
   const apiKey = requireApiKey(ctx, SERVICE);
-  const url = new URL(path, API_BASE);
-  for (const [key, value] of Object.entries(query ?? {})) {
-    if (value !== void 0) url.searchParams.set(key, String(value));
-  }
-  let response;
-  let payload;
-  try {
-    response = await guardedFetch(url.toString(), {
-      method: "GET",
-      // 凭证走自定义 `apikey` 头,不是 Authorization。
-      headers: { accept: "application/json", apikey: apiKey }
-    });
-    payload = await readPayload(response);
-  } catch (error) {
-    throw upstreamError(
+  const { data } = await http.request({
+    path,
+    query: Object.entries(query ?? {}),
+    headers: { accept: "application/json", apikey: apiKey },
+    invalidJson: "text",
+    mapError: ({ data: payload, status }) => upstreamError(
+      status,
+      errorMessage(payload) ?? `currencyapi request failed with ${status || 500}`
+    ),
+    mapTransportError: ({ message }) => upstreamError(
       502,
-      error instanceof Error ? `currencyapi request failed: ${error.message}` : "currencyapi request failed"
-    );
-  }
-  if (!response.ok) {
-    throw upstreamError(
-      response.status,
-      errorMessage(payload) ?? `currencyapi request failed with ${response.status || 500}`
-    );
-  }
-  return requireObject(payload, "payload");
+      message === void 0 ? "currencyapi request failed" : `currencyapi request failed: ${message}`
+    )
+  });
+  return requireObject(data ?? null, "payload");
 }
 function requireString(value, field) {
   if (typeof value !== "string" || value.trim() === "") {

package/dist/{deepseek-LJELIMM3.js → deepseek-LGC6HBFG.js}

@@ -1,42 +1,33 @@
+import {
+  createProviderHttpClient
+} from "./chunk-VLOIDU5U.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-B4P6YZFS.js";
+import "./chunk-SWBNHIO4.js";
 import {
   TBError,
   external_exports
-} from "./chunk-YB2FLNWI.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-OKRZPQ3R.js";
+import "./chunk-U67V476Y.js";
 
 // ../plugins/src/deepseek/api.ts
 var SERVICE = "deepseek";
 var API_BASE = "https://api.deepseek.com";
-var ANTHROPIC_API_BASE = "https://api.deepseek.com/anthropic";
-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 compact(input) {
-  return Object.fromEntries(Object.entries(input).filter(([, value]) => value !== void 0));
-}
-function errorMessage(raw, status) {
+var ANTHROPIC_API_PREFIX = "/anthropic";
+var http = createProviderHttpClient({ baseUrl: API_BASE, service: SERVICE });
+function errorMessage(payload, bodyKind, status) {
   const fallback = `deepseek request failed with ${status}`;
-  try {
-    const payload = record(JSON.parse(raw));
-    const nested = record(payload?.error);
-    return text(nested?.message) ?? text(payload?.message) ?? text(raw) ?? fallback;
-  } catch {
-    return text(raw) ?? fallback;
-  }
+  const body = asJsonObject(payload);
+  const nested = asJsonObject(body?.error);
+  return trimmedText(nested?.message) ?? trimmedText(body?.message) ?? (bodyKind === "invalid-json" || bodyKind === "text" ? trimmedText(payload) : void 0) ?? fallback;
 }
 function assertStreamingDisabled(input) {
   if (input.stream === true) {
@@ -46,18 +37,19 @@ function assertStreamingDisabled(input) {
 async function request(ctx, options) {
   const apiKey = requireApiKey(ctx, SERVICE);
   const headers = options.anthropic === true ? { "content-type": "application/json", "x-api-key": apiKey } : { "authorization": `Bearer ${apiKey}`, "content-type": "application/json" };
-  const response = await guardedFetch(`${options.anthropic === true ? ANTHROPIC_API_BASE : API_BASE}${options.path}`, {
+  const { data } = await http.request({
+    path: `${options.anthropic === true ? ANTHROPIC_API_PREFIX : ""}${options.path}`,
     method: options.method ?? "GET",
     headers,
-    ...options.body === void 0 ? {} : { body: JSON.stringify(options.body) }
+    ...options.body === void 0 ? {} : { json: options.body },
+    invalidJsonMessage: "deepseek returned malformed JSON",
+    mapError: ({ bodyKind, data: payload, status }) => upstreamError(
+      status,
+      errorMessage(payload, bodyKind, status)
+    )
   });
-  const raw = await response.text().catch(() => "");
-  if (!response.ok) throw upstreamError(response.status, errorMessage(raw, response.status));
-  try {
-    return JSON.parse(raw);
-  } catch {
-    throw upstreamError(502, "deepseek returned malformed JSON");
-  }
+  if (data === void 0) throw upstreamError(502, "deepseek returned malformed JSON");
+  return data;
 }
 function listModels(_input, ctx) {
   return request(ctx, { path: "/models" });
@@ -67,11 +59,11 @@ function getUserBalance(_input, ctx) {
 }
 function createChatCompletion(input, ctx) {
   assertStreamingDisabled(input);
-  return request(ctx, { path: "/chat/completions", method: "POST", body: compact(input) });
+  return request(ctx, { path: "/chat/completions", method: "POST", body: compactDefined(input) });
 }
 function createAnthropicMessage(input, ctx) {
   assertStreamingDisabled(input);
-  return request(ctx, { path: "/v1/messages", method: "POST", body: compact(input), anthropic: true });
+  return request(ctx, { path: "/v1/messages", method: "POST", body: compactDefined(input), anthropic: true });
 }
 
 // ../plugins/src/deepseek/schema.ts