@tool-bridge/server 0.16.0 → 0.17.0

package/dist/{apify-6WLYAIAS.js → apify-3CCYTQVK.js}

@@ -1,42 +1,34 @@
+import {
+  createProviderHttpClient
+} from "./chunk-WW2IMPQK.js";
+import {
+  asJsonObject
+} 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/apify/api.ts
 var SERVICE = "apify";
 var API_BASE = "https://api.apify.com";
 var CURRENT_USER_PATH = "/v2/users/me";
-function asRecord(value) {
-  return value !== null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
-}
+var http = createProviderHttpClient({ baseUrl: `${API_BASE}/`, service: SERVICE });
 function nonEmpty(value) {
   return typeof value === "string" && value !== "" ? value : void 0;
 }
 function errorMessage(payload, status) {
-  const record = asRecord(payload);
-  const error = asRecord(record?.error);
+  const record = asJsonObject(payload);
+  const error = asJsonObject(record?.error);
   return nonEmpty(error?.message) ?? nonEmpty(record?.message) ?? nonEmpty(error?.type) ?? `Apify request failed with status ${status}`;
 }
-async function readPayload(response) {
-  const text = await response.text().catch(() => "");
-  if (text === "") return null;
-  try {
-    return JSON.parse(text);
-  } catch {
-    throw new TBError("unavailable", "Apify \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94", { retryable: true });
-  }
-}
 function requiredId(value, field) {
   if (value === void 0 || value === "") {
     throw new TBError("invalid_argument", `${field} \u4E0D\u80FD\u4E3A\u7A7A`);
@@ -44,42 +36,32 @@ function requiredId(value, field) {
   return encodeURIComponent(value);
 }
 async function request(ctx, path, init = {}) {
-  const url = new URL(path, API_BASE);
-  for (const [key, value] of Object.entries(init.query ?? {})) {
-    if (value !== void 0) url.searchParams.set(key, String(value));
-  }
-  const headers = {
-    accept: "application/json",
-    authorization: `Bearer ${requireApiKey(ctx, SERVICE)}`
-  };
-  if (init.body !== void 0) headers["content-type"] = "application/json";
-  let response;
-  let payload;
-  try {
-    response = await guardedFetch(url.toString(), {
-      method: init.method ?? "GET",
-      headers,
-      ...init.body === void 0 ? {} : { body: JSON.stringify(init.body) }
-    });
-    payload = await readPayload(response);
-  } catch (error) {
-    if (error instanceof TBError) throw error;
-    throw new TBError(
+  const { data } = await http.request({
+    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",
-      error instanceof Error ? `Apify \u8BF7\u6C42\u5931\u8D25: ${error.message}` : "Apify \u8BF7\u6C42\u5931\u8D25",
+      message === void 0 ? "Apify \u8BF7\u6C42\u5931\u8D25" : `Apify \u8BF7\u6C42\u5931\u8D25: ${message}`,
       { retryable: true }
-    );
-  }
-  if (!response.ok) throw upstreamError(response.status, errorMessage(payload, response.status));
-  return payload;
+    )
+  });
+  return data ?? null;
 }
 function unwrap(payload, label) {
-  const record = asRecord(payload);
+  const record = asJsonObject(payload);
   if (record === void 0) {
     throw new TBError("unavailable", `Apify \u7684${label}\u54CD\u5E94\u4E0D\u662F\u5BF9\u8C61`, { retryable: true });
   }
   if (!Object.prototype.hasOwnProperty.call(record, "data")) return record;
-  const data = asRecord(record.data);
+  const data = asJsonObject(record.data);
   if (data === void 0) {
     throw new TBError("unavailable", `Apify \u7684${label}\u54CD\u5E94 data \u4E0D\u662F\u5BF9\u8C61`, { retryable: true });
   }

package/dist/{brave_search-K2SVJ66F.js → brave_search-PZNYDQG7.js}

@@ -1,37 +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/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"]);
-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 nullableRecord(value) {
-  return value === null ? null : record(value);
+  return value === null ? null : asJsonObject(value);
 }
 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 });
   }
@@ -41,35 +39,20 @@ function objectArray(value) {
   if (!Array.isArray(value)) return void 0;
   return value.map((item) => requireRecord(item, "Brave Search \u7ED3\u679C\u9879"));
 }
-function compact(input) {
-  return Object.fromEntries(Object.entries(input).filter(([, value]) => value !== void 0));
-}
 function searchTerm(value) {
-  const term = text(value);
+  const term = trimmedText(value);
   if (term === void 0) throw new TBError("invalid_argument", "q \u4E0D\u80FD\u662F\u7A7A\u767D");
   return term;
 }
 function goggles(value) {
-  if (value === void 0 || typeof value === "string") return text(value);
-  const items = value.map((item) => text(item)).filter((item) => item !== void 0);
+  if (value === void 0 || typeof value === "string") return trimmedText(value);
+  const items = value.map((item) => trimmedText(item)).filter((item) => item !== void 0);
   return items.length > 0 ? items : void 0;
 }
-function buildUrl(path, query) {
-  const url = new URL(`${API_BASE}${path}`);
-  for (const [key, value] of Object.entries(query)) {
-    if (value === void 0) continue;
-    if (Array.isArray(value)) {
-      for (const item of value) url.searchParams.append(key, item);
-      continue;
-    }
-    url.searchParams.set(key, String(value));
-  }
-  return url.toString();
-}
 function braveSearchError(status, payload) {
-  const error = record(record(payload)?.error);
-  const message = text(error?.detail) ?? text(error?.code) ?? `Brave Search \u8FD4\u56DE HTTP ${status}`;
-  const code = text(error?.code);
+  const error = asJsonObject(asJsonObject(payload)?.error);
+  const message = trimmedText(error?.detail) ?? trimmedText(error?.code) ?? `Brave Search \u8FD4\u56DE HTTP ${status}`;
+  const code = trimmedText(error?.code);
   if (code !== void 0) {
     if (RATE_LIMIT_CODES.has(code)) return upstreamError(429, message);
     if (AUTH_CODES.has(code)) return upstreamError(401, message);
@@ -78,31 +61,23 @@ function braveSearchError(status, payload) {
   return upstreamError(status, message);
 }
 async function request(ctx, path, query) {
-  const response = await guardedFetch(buildUrl(path, query), {
+  const { data } = await http.request({
+    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)
   });
-  const body = await response.text();
-  let payload = null;
-  if (body !== "") {
-    try {
-      payload = JSON.parse(body);
-    } catch {
-      if (response.ok) {
-        throw new TBError("unavailable", "Brave Search \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94", { retryable: true });
-      }
-    }
-  }
-  if (!response.ok) throw braveSearchError(response.status, payload);
-  return payload;
+  return data ?? null;
 }
 function normalizeWebSearch(payload) {
   const result = requireRecord(payload, "Brave Search \u54CD\u5E94");
-  return compact({
-    type: text(result.type) ?? "search",
+  return compactDefined({
+    type: trimmedText(result.type) ?? "search",
     query: nullableRecord(result.query),
     web: nullableRecord(result.web),
     news: nullableRecord(result.news),
@@ -118,8 +93,8 @@ function normalizeWebSearch(payload) {
 }
 function normalizeCollection(payload, withExtra) {
   const result = requireRecord(payload, "Brave Search \u54CD\u5E94");
-  return compact({
-    type: text(result.type) ?? "search",
+  return compactDefined({
+    type: trimmedText(result.type) ?? "search",
     query: nullableRecord(result.query),
     results: objectArray(result.results),
     extra: withExtra ? nullableRecord(result.extra) : void 0
@@ -128,19 +103,19 @@ function normalizeCollection(payload, withExtra) {
 async function webSearch(input, ctx) {
   return normalizeWebSearch(await request(ctx, "/res/v1/web/search", {
     q: searchTerm(input.q),
-    search_lang: text(input.search_lang),
-    ui_lang: text(input.ui_lang),
-    country: text(input.country),
-    safesearch: text(input.safesearch),
+    search_lang: trimmedText(input.search_lang),
+    ui_lang: trimmedText(input.ui_lang),
+    country: trimmedText(input.country),
+    safesearch: trimmedText(input.safesearch),
     count: input.count,
     offset: input.offset,
     spellcheck: input.spellcheck,
-    freshness: text(input.freshness),
-    result_filter: text(input.result_filter),
+    freshness: trimmedText(input.freshness),
+    result_filter: trimmedText(input.result_filter),
     extra_snippets: input.extra_snippets,
     goggles: goggles(input.goggles),
     text_decorations: input.text_decorations,
-    units: text(input.units),
+    units: trimmedText(input.units),
     operators: input.operators,
     include_fetch_metadata: input.include_fetch_metadata
   }));
@@ -148,14 +123,14 @@ async function webSearch(input, ctx) {
 async function newsSearch(input, ctx) {
   const payload = await request(ctx, "/res/v1/news/search", {
     q: searchTerm(input.q),
-    search_lang: text(input.search_lang),
-    ui_lang: text(input.ui_lang),
-    country: text(input.country),
-    safesearch: text(input.safesearch),
+    search_lang: trimmedText(input.search_lang),
+    ui_lang: trimmedText(input.ui_lang),
+    country: trimmedText(input.country),
+    safesearch: trimmedText(input.safesearch),
     count: input.count,
     offset: input.offset,
     spellcheck: input.spellcheck,
-    freshness: text(input.freshness),
+    freshness: trimmedText(input.freshness),
     extra_snippets: input.extra_snippets,
     goggles: goggles(input.goggles),
     operators: input.operators,
@@ -166,14 +141,14 @@ async function newsSearch(input, ctx) {
 async function videoSearch(input, ctx) {
   const payload = await request(ctx, "/res/v1/videos/search", {
     q: searchTerm(input.q),
-    search_lang: text(input.search_lang),
-    ui_lang: text(input.ui_lang),
-    country: text(input.country),
-    safesearch: text(input.safesearch),
+    search_lang: trimmedText(input.search_lang),
+    ui_lang: trimmedText(input.ui_lang),
+    country: trimmedText(input.country),
+    safesearch: trimmedText(input.safesearch),
     count: input.count,
     offset: input.offset,
     spellcheck: input.spellcheck,
-    freshness: text(input.freshness),
+    freshness: trimmedText(input.freshness),
     operators: input.operators,
     include_fetch_metadata: input.include_fetch_metadata
   });
@@ -182,9 +157,9 @@ async function videoSearch(input, ctx) {
 async function imageSearch(input, ctx) {
   const payload = await request(ctx, "/res/v1/images/search", {
     q: searchTerm(input.q),
-    search_lang: text(input.search_lang),
-    country: text(input.country),
-    safesearch: text(input.safesearch),
+    search_lang: trimmedText(input.search_lang),
+    country: trimmedText(input.country),
+    safesearch: trimmedText(input.safesearch),
     count: input.count,
     spellcheck: input.spellcheck
   });

package/dist/chunk-JXHMDBAY.js

@@ -0,0 +1,45 @@
+// ../plugins/src/_runtime/jsonValue.ts
+function asJsonObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
+}
+function trimmedText(value) {
+  if (typeof value !== "string") return void 0;
+  const trimmed = value.trim();
+  return trimmed === "" ? void 0 : trimmed;
+}
+function finiteNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
+function integerValue(value) {
+  return typeof value === "number" && Number.isInteger(value) ? value : void 0;
+}
+function booleanValue(value) {
+  return typeof value === "boolean" ? value : void 0;
+}
+function compactDefined(input) {
+  return Object.fromEntries(
+    Object.entries(input).filter((entry) => entry[1] !== void 0)
+  );
+}
+function messageFrom(value, fields, fallback) {
+  const direct = trimmedText(value);
+  if (direct !== void 0) return direct;
+  const object = asJsonObject(value);
+  if (object !== void 0) {
+    for (const field of fields) {
+      const candidate = trimmedText(object[field]);
+      if (candidate !== void 0) return candidate;
+    }
+  }
+  return fallback;
+}
+
+export {
+  asJsonObject,
+  trimmedText,
+  finiteNumber,
+  integerValue,
+  booleanValue,
+  compactDefined,
+  messageFrom
+};

package/dist/chunk-LMLX3DJF.js

@@ -0,0 +1,50 @@
+// ../plugins/src/_runtime/responseBytes.ts
+var BASE64_CHUNK_BYTES = 32768;
+async function readBoundedResponseBytes(response, options) {
+  const declared = Number(response.headers.get("content-length"));
+  if (options.checkContentLength !== false && Number.isFinite(declared) && declared > options.maxBytes) {
+    await response.body?.cancel().catch(() => void 0);
+    throw options.tooLarge();
+  }
+  if (response.body === null) {
+    const bytes2 = new Uint8Array(await response.arrayBuffer());
+    if (bytes2.byteLength > options.maxBytes) throw options.tooLarge();
+    return bytes2;
+  }
+  const reader = response.body.getReader();
+  const chunks = [];
+  let total = 0;
+  try {
+    for (; ; ) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      total += value.byteLength;
+      if (total > options.maxBytes) {
+        await reader.cancel().catch(() => void 0);
+        throw options.tooLarge();
+      }
+      chunks.push(value);
+    }
+  } finally {
+    reader.releaseLock();
+  }
+  const bytes = new Uint8Array(total);
+  let offset = 0;
+  for (const chunk of chunks) {
+    bytes.set(chunk, offset);
+    offset += chunk.byteLength;
+  }
+  return bytes;
+}
+function bytesToBase64(bytes) {
+  let binary = "";
+  for (let offset = 0; offset < bytes.length; offset += BASE64_CHUNK_BYTES) {
+    binary += String.fromCharCode(...bytes.subarray(offset, offset + BASE64_CHUNK_BYTES));
+  }
+  return btoa(binary);
+}
+
+export {
+  readBoundedResponseBytes,
+  bytesToBase64
+};