@tool-bridge/server 0.16.0 → 0.19.0

package/dist/{cloudflare_dns-2RK5ASBJ.js → cloudflare_dns-KEZABKUT.js}

@@ -1,52 +1,43 @@
+import {
+  createProviderHttpClient
+} from "./chunk-VLOIDU5U.js";
+import {
+  asJsonObject,
+  booleanValue,
+  compactDefined,
+  integerValue,
+  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/cloudflare_dns/api.ts
 var SERVICE = "cloudflare_dns";
 var API_BASE = "https://api.cloudflare.com/client/v4";
+var http = createProviderHttpClient({ baseUrl: `${API_BASE}/`, service: SERVICE });
 var DEFAULT_ACCOUNTS_PAGE = 1;
 var DEFAULT_ACCOUNTS_PER_PAGE = 50;
-function text(value) {
-  if (typeof value !== "string") return void 0;
-  const trimmed = value.trim();
-  return trimmed === "" ? void 0 : trimmed;
-}
 function rawText(value) {
   return typeof value === "string" ? value : void 0;
 }
-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 nullableText(value) {
-  return value === null ? null : text(value);
+  return value === null ? null : trimmedText(value);
 }
 function textArray(value) {
   if (!Array.isArray(value)) return void 0;
   return value.filter((item) => typeof item === "string");
 }
-function compact(input) {
-  return Object.fromEntries(Object.entries(input).filter(([, value]) => value !== void 0));
-}
 function requireRecord(value, label) {
-  const result = record(value);
+  const result = asJsonObject(value);
   if (result === void 0) throw new TBError("unavailable", `${label}\u4E0D\u662F\u5BF9\u8C61`, { retryable: true });
   return result;
 }
@@ -55,24 +46,16 @@ function requireArray(value, label) {
   return value;
 }
 function requireText(source, field, label) {
-  const value = text(source[field]);
+  const value = trimmedText(source[field]);
   if (value === void 0) {
     throw new TBError("unavailable", `${label}\u7F3A\u5C11 ${field}`, { retryable: true });
   }
   return value;
 }
-function buildUrl(path, query) {
-  const url = new URL(`${API_BASE}${path}`);
-  for (const [key, value] of Object.entries(query ?? {})) {
-    if (value === void 0 || value === "") continue;
-    url.searchParams.set(key, String(value));
-  }
-  return url.toString();
-}
 function errorMessage(envelope, status) {
   for (const source of [envelope.errors, envelope.messages]) {
     for (const entry of Array.isArray(source) ? source : []) {
-      const message = text(record(entry)?.message);
+      const message = trimmedText(asJsonObject(entry)?.message);
       if (message !== void 0) return message;
     }
   }
@@ -80,115 +63,109 @@ function errorMessage(envelope, status) {
 }
 async function request(ctx, input) {
   const hasBody = input.body !== void 0;
-  const headers = {
-    accept: "application/json",
-    authorization: `Bearer ${requireApiKey(ctx, SERVICE)}`
-  };
-  if (hasBody) headers["content-type"] = "application/json";
-  const response = await guardedFetch(buildUrl(input.path, input.query), {
+  const result = await http.request({
+    path: input.path,
     method: input.method ?? "GET",
-    headers,
-    body: hasBody ? JSON.stringify(input.body) : void 0
-  });
-  const body = await response.text().catch(() => "");
-  let envelope;
-  if (body !== "") {
-    try {
-      envelope = requireRecord(JSON.parse(body), "Cloudflare \u54CD\u5E94");
-    } catch (error) {
-      if (error instanceof TBError) throw error;
-      if (response.ok) {
-        throw new TBError("unavailable", "Cloudflare \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94", { retryable: true });
+    // 上游 `queryParams`:undefined / null / 空串一律不发。
+    query: Object.entries(input.query ?? {}).filter(([, value]) => value !== void 0 && value !== ""),
+    headers: { accept: "application/json", authorization: `Bearer ${requireApiKey(ctx, SERVICE)}` },
+    ...hasBody ? { json: input.body } : {},
+    invalidJsonMessage: "Cloudflare \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94",
+    mapError: ({ bodyKind, data, status }) => {
+      if (bodyKind === "json" && asJsonObject(data) === void 0) {
+        return new TBError("unavailable", "Cloudflare \u54CD\u5E94\u4E0D\u662F\u5BF9\u8C61", { retryable: true });
       }
+      const envelope2 = bodyKind === "json" ? data : {};
+      return upstreamError(status, errorMessage(envelope2, status));
     }
+  });
+  const envelope = result.data === void 0 ? {} : requireRecord(result.data, "Cloudflare \u54CD\u5E94");
+  if (envelope.success === false) {
+    throw upstreamError(result.status, errorMessage(envelope, result.status));
   }
-  const result = envelope ?? {};
-  if (!response.ok || result.success === false) {
-    throw upstreamError(response.status, errorMessage(result, response.status));
-  }
-  return result;
+  return envelope;
 }
 function normalizeAccount(value) {
   const account = requireRecord(value, "Cloudflare \u8D26\u6237");
-  return compact({
+  return compactDefined({
     id: requireText(account, "id", "Cloudflare \u8D26\u6237"),
-    name: text(account.name),
-    type: text(account.type)
+    name: trimmedText(account.name),
+    type: trimmedText(account.type)
   });
 }
 function normalizeZoneAccount(value) {
-  const account = record(value);
+  const account = asJsonObject(value);
   if (account === void 0) return void 0;
-  return compact({
-    id: text(account.id),
-    name: text(account.name),
-    type: text(account.type)
+  return compactDefined({
+    id: trimmedText(account.id),
+    name: trimmedText(account.name),
+    type: trimmedText(account.type)
   });
 }
 function normalizeZone(value) {
   const zone = requireRecord(value, "Cloudflare zone");
-  return compact({
+  return compactDefined({
     id: requireText(zone, "id", "Cloudflare zone"),
     name: requireText(zone, "name", "Cloudflare zone"),
-    status: text(zone.status),
-    type: text(zone.type),
-    paused: boolean(zone.paused),
-    createdOn: text(zone.created_on),
-    modifiedOn: text(zone.modified_on),
+    status: trimmedText(zone.status),
+    type: trimmedText(zone.type),
+    paused: booleanValue(zone.paused),
+    createdOn: trimmedText(zone.created_on),
+    modifiedOn: trimmedText(zone.modified_on),
     nameServers: textArray(zone.name_servers),
     originalNameServers: textArray(zone.original_name_servers),
     account: normalizeZoneAccount(zone.account),
-    meta: record(zone.meta)
+    meta: asJsonObject(zone.meta)
   });
 }
 function normalizeDnsRecord(value) {
   const dns = requireRecord(value, "Cloudflare DNS \u8BB0\u5F55");
-  return compact({
+  return compactDefined({
     id: requireText(dns, "id", "Cloudflare DNS \u8BB0\u5F55"),
-    zoneId: text(dns.zone_id),
-    zoneName: text(dns.zone_name),
+    zoneId: trimmedText(dns.zone_id),
+    zoneName: trimmedText(dns.zone_name),
     type: requireText(dns, "type", "Cloudflare DNS \u8BB0\u5F55"),
     name: requireText(dns, "name", "Cloudflare DNS \u8BB0\u5F55"),
     content: nullableText(dns.content),
-    ttl: integer(dns.ttl),
-    proxied: boolean(dns.proxied),
-    proxiable: boolean(dns.proxiable),
-    priority: integer(dns.priority),
+    ttl: integerValue(dns.ttl),
+    proxied: booleanValue(dns.proxied),
+    proxiable: booleanValue(dns.proxiable),
+    priority: integerValue(dns.priority),
     comment: nullableText(dns.comment),
     tags: textArray(dns.tags),
-    createdOn: text(dns.created_on),
-    modifiedOn: text(dns.modified_on),
-    commentModifiedOn: text(dns.comment_modified_on),
-    tagsModifiedOn: text(dns.tags_modified_on),
-    data: record(dns.data),
-    meta: record(dns.meta),
-    settings: record(dns.settings)
+    createdOn: trimmedText(dns.created_on),
+    modifiedOn: trimmedText(dns.modified_on),
+    commentModifiedOn: trimmedText(dns.comment_modified_on),
+    tagsModifiedOn: trimmedText(dns.tags_modified_on),
+    data: asJsonObject(dns.data),
+    meta: asJsonObject(dns.meta),
+    settings: asJsonObject(dns.settings)
   });
 }
 function normalizeResultInfo(value) {
-  const info = record(value);
+  const info = asJsonObject(value);
   if (info === void 0) return void 0;
-  return compact({
-    page: integer(info.page),
-    perPage: integer(info.per_page),
-    count: integer(info.count),
-    totalCount: integer(info.total_count),
-    totalPages: integer(info.total_pages)
+  return compactDefined({
+    page: integerValue(info.page),
+    perPage: integerValue(info.per_page),
+    count: integerValue(info.count),
+    totalCount: integerValue(info.total_count),
+    totalPages: integerValue(info.total_pages)
   });
 }
 function mutationBody(input) {
-  return compact({
-    type: text(input.type),
-    name: text(input.name),
+  return compactDefined({
+    type: trimmedText(input.type),
+    name: trimmedText(input.name),
     // content / comment 原样发:清空一个字段靠的就是发空串,trim 掉就没法表达"清空"。
     content: rawText(input.content),
-    data: record(input.data),
-    ttl: integer(input.ttl),
-    proxied: boolean(input.proxied),
-    priority: integer(input.priority),
+    data: asJsonObject(input.data),
+    ttl: integerValue(input.ttl),
+    proxied: booleanValue(input.proxied),
+    priority: integerValue(input.priority),
     comment: rawText(input.comment),
     tags: input.tags,
-    settings: record(input.settings)
+    settings: asJsonObject(input.settings)
   });
 }
 async function listAccounts(input, ctx) {
@@ -200,7 +177,7 @@ async function listAccounts(input, ctx) {
       per_page: input.perPage ?? DEFAULT_ACCOUNTS_PER_PAGE
     }
   });
-  return compact({
+  return compactDefined({
     accounts: requireArray(envelope.result, "Cloudflare \u8D26\u6237\u5217\u8868").map((item) => normalizeAccount(item)),
     resultInfo: normalizeResultInfo(envelope.result_info)
   });
@@ -211,16 +188,16 @@ async function listZones(input, ctx) {
     query: {
       "page": input.page,
       "per_page": input.perPage,
-      "name": text(input.name),
-      "status": text(input.status),
+      "name": trimmedText(input.name),
+      "status": trimmedText(input.status),
       // 上游的过滤键就叫 `account.id`,带点,不是笔误。
-      "account.id": text(input.accountId),
+      "account.id": trimmedText(input.accountId),
       "match": input.match,
-      "order": text(input.order),
+      "order": trimmedText(input.order),
       "direction": input.direction
     }
   });
-  return compact({
+  return compactDefined({
     zones: requireArray(envelope.result, "Cloudflare zone \u5217\u8868").map((item) => normalizeZone(item)),
     resultInfo: normalizeResultInfo(envelope.result_info)
   });
@@ -236,15 +213,15 @@ async function listDnsRecords(input, ctx) {
       page: input.page,
       per_page: input.perPage,
       type: input.type,
-      name: text(input.name),
-      content: text(input.content),
+      name: trimmedText(input.name),
+      content: trimmedText(input.content),
       proxied: input.proxied,
       match: input.match,
-      order: text(input.order),
+      order: trimmedText(input.order),
       direction: input.direction
     }
   });
-  return compact({
+  return compactDefined({
     records: requireArray(envelope.result, "Cloudflare DNS \u8BB0\u5F55\u5217\u8868").map((item) => normalizeDnsRecord(item)),
     resultInfo: normalizeResultInfo(envelope.result_info)
   });

package/dist/{cohere-5KEW7LWT.js → cohere-4IPJADXP.js}

@@ -1,72 +1,56 @@
+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/cohere/api.ts
 var SERVICE = "cohere";
-var API_BASE = "https://api.cohere.com";
-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 errorMessage(body, status) {
-  const fallback = text(body) ?? `cohere request failed with ${status}`;
-  let payload;
-  try {
-    payload = JSON.parse(body);
-  } catch {
-    return fallback;
-  }
-  const root = record(payload);
-  return text(record(root?.error)?.message) ?? text(root?.message) ?? fallback;
-}
-function cohereError(status, body) {
-  return upstreamError(status === 498 ? 401 : status, errorMessage(body, status));
+var http = createProviderHttpClient({ baseUrl: "https://api.cohere.com/", service: SERVICE });
+function errorMessage(payload, status) {
+  const fallback = trimmedText(payload) ?? `cohere request failed with ${status}`;
+  const root = asJsonObject(payload);
+  return trimmedText(asJsonObject(root?.error)?.message) ?? trimmedText(root?.message) ?? fallback;
 }
 async function post(ctx, path, body) {
-  const response = await guardedFetch(`${API_BASE}${path}`, {
+  const { data } = await http.request({
+    path,
     method: "POST",
     headers: {
-      "accept": "application/json",
-      "authorization": `Bearer ${requireApiKey(ctx, SERVICE)}`,
-      "content-type": "application/json"
+      accept: "application/json",
+      authorization: `Bearer ${requireApiKey(ctx, SERVICE)}`
     },
-    body: JSON.stringify(body)
+    json: body,
+    invalidJsonMessage: "cohere returned an invalid JSON response",
+    mapError: ({ data: payload, status }) => upstreamError(
+      status === 498 ? 401 : status,
+      errorMessage(payload, status)
+    )
   });
-  const raw = await response.text().catch(() => "");
-  if (!response.ok) throw cohereError(response.status, raw);
-  let payload;
-  try {
-    payload = JSON.parse(raw);
-  } catch {
-    throw upstreamError(502, "cohere returned an invalid JSON response");
-  }
-  const result = record(payload);
+  const result = asJsonObject(data);
   if (result === void 0) throw upstreamError(502, "cohere returned an invalid JSON response");
   return result;
 }
-async function chat(input, ctx) {
-  return post(ctx, "/v2/chat", input);
+function chat(input, ctx) {
+  return post(ctx, "v2/chat", input);
 }
-async function embedTexts(input, ctx) {
-  return post(ctx, "/v2/embed", input);
+function embedTexts(input, ctx) {
+  return post(ctx, "v2/embed", input);
 }
-async function rerankDocuments(input, ctx) {
-  return post(ctx, "/v2/rerank", input);
+function rerankDocuments(input, ctx) {
+  return post(ctx, "v2/rerank", input);
 }
 
 // ../plugins/src/cohere/schema.ts