@tool-bridge/server 0.16.0 → 0.19.0

package/dist/{wolfram_alpha_api-2KOLO5DC.js → wolfram_alpha_api-TRGU2MDG.js}

@@ -1,33 +1,30 @@
+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 {
   TBError,
   external_exports
-} from "./chunk-YB2FLNWI.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-OKRZPQ3R.js";
+import "./chunk-U67V476Y.js";
 
 // ../plugins/src/wolfram_alpha_api/api.ts
 var SERVICE = "wolfram_alpha_api";
 var API_BASE = "https://api.wolframalpha.com";
 var RECOGNIZER_URL = "https://www.wolframalpha.com/queryrecognizer/query.jsp";
 var REQUEST_TIMEOUT_MS = 3e4;
-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;
-}
+var http = createProviderHttpClient({ service: SERVICE });
 function nullableText(value) {
-  return text(value) ?? null;
+  return trimmedText(value) ?? null;
 }
 function nullableNumber(value) {
   if (typeof value === "number") return Number.isFinite(value) ? value : null;
@@ -43,7 +40,7 @@ function booleanLike(value) {
   return false;
 }
 function searchTerm(value) {
-  const query = text(value);
+  const query = trimmedText(value);
   if (query === void 0) throw new TBError("invalid_argument", "query \u4E0D\u80FD\u662F\u7A7A\u767D");
   return query;
 }
@@ -58,20 +55,15 @@ function wolframError(status, body) {
   return upstreamError(status, message);
 }
 async function requestText(url) {
-  let response;
-  try {
-    response = await guardedFetch(url, {
-      method: "GET",
-      signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS)
-    });
-  } catch (error) {
-    if (error instanceof Error && error.name === "TimeoutError") {
-      throw upstreamError(504, `Wolfram|Alpha ${REQUEST_TIMEOUT_MS / 1e3} \u79D2\u5185\u6CA1\u6709\u8FD4\u56DE`);
-    }
-    throw error;
-  }
-  const body = await response.text();
-  if (!response.ok) throw wolframError(response.status, body);
+  const result = await http.request({
+    baseUrl: url.origin,
+    path: url.toString(),
+    responseType: "text",
+    timeoutMs: REQUEST_TIMEOUT_MS,
+    mapError: ({ data, status }) => wolframError(status, typeof data === "string" ? data : ""),
+    mapTransportError: ({ kind }) => kind === "timeout" ? upstreamError(504, `Wolfram|Alpha ${REQUEST_TIMEOUT_MS / 1e3} \u79D2\u5185\u6CA1\u6709\u8FD4\u56DE`) : upstreamError(502, "Wolfram|Alpha request failed")
+  });
+  const body = result.data ?? "";
   if (looksLikeCredentialError(body)) throw upstreamError(401, body.trim());
   return body;
 }
@@ -101,9 +93,9 @@ async function validateQuery(input, ctx) {
   } catch {
     throw new TBError("unavailable", "Wolfram|Alpha \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94", { retryable: true });
   }
-  const result = record(payload);
+  const result = asJsonObject(payload);
   const queries = result?.query;
-  const first = Array.isArray(queries) ? record(queries[0]) : void 0;
+  const first = Array.isArray(queries) ? asJsonObject(queries[0]) : void 0;
   if (first === void 0) {
     throw new TBError("unavailable", "Wolfram|Alpha recognizer \u6CA1\u6709\u8FD4\u56DE\u67E5\u8BE2\u7ED3\u679C", { retryable: true });
   }
@@ -116,7 +108,7 @@ async function validateQuery(input, ctx) {
     timingMs: nullableNumber(result?.timing),
     resultSignificanceScore: nullableNumber(first.resultsignificancescore),
     spellingCorrection: nullableText(first.spellingCorrection),
-    summaryBoxPath: nullableText(record(first.summarybox)?.path)
+    summaryBoxPath: nullableText(asJsonObject(first.summarybox)?.path)
   };
 }
 async function getShortAnswer(input, ctx) {

package/dist/{wordpress-XRWGO6LG.js → wordpress-WRUKLCZR.js}

@@ -1,39 +1,33 @@
+import {
+  createProviderHttpClient
+} from "./chunk-VLOIDU5U.js";
+import {
+  asJsonObject,
+  compactDefined,
+  trimmedText
+} from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireCredential,
   upstreamError
-} from "./chunk-VK3V2WTY.js";
+} from "./chunk-B4P6YZFS.js";
 import {
-  assertPublicHttpUrl,
-  guardedFetch
-} from "./chunk-2O27H4Y2.js";
-import "./chunk-GKX72JMJ.js";
+  assertPublicHttpUrl
+} 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/wordpress/api.ts
 var SERVICE = "wordpress";
 var API_PATH = "wp-json/wp/v2";
 var REST_ROOT_SUFFIXES = ["/wp-json/wp/v2", "/wp-json"];
 var CURRENT_USER_PATH = "/users/me";
-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)
-  );
-}
+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;
 }
@@ -84,52 +78,41 @@ function basicAuthHeader(ctx) {
   for (const byte of bytes) binary += String.fromCharCode(byte);
   return `Basic ${btoa(binary)}`;
 }
-function buildUrl(base, path, query = {}) {
-  const url = new URL(path.replace(/^\/+/, ""), `${base}/`);
-  for (const [key, value] of Object.entries(query)) {
-    if (value === void 0) continue;
-    url.searchParams.set(key, Array.isArray(value) ? value.map(String).join(",") : String(value));
-  }
-  return url.toString();
+function queryPairs(query = {}) {
+  return Object.entries(query).map(([key, value]) => [
+    key,
+    Array.isArray(value) ? value.map(String).join(",") : value
+  ]);
 }
-function errorMessage(payload, response) {
-  return text(record(payload)?.message) ?? (text(response.statusText) === void 0 ? "WordPress request failed" : `WordPress request failed: ${response.statusText}`);
+function errorMessage(payload, context) {
+  return trimmedText(asJsonObject(payload)?.message) ?? (trimmedText(context.statusText) === void 0 ? "WordPress request failed" : `WordPress request failed: ${context.statusText}`);
+}
+function jsonPayload(data, bodyKind) {
+  return bodyKind === "json" ? data : null;
 }
 async function requestResponse(ctx, options) {
-  const headers = {
-    accept: "application/json",
-    authorization: basicAuthHeader(ctx)
-  };
-  if (options.body !== void 0) headers["content-type"] = "application/json";
-  try {
-    return await guardedFetch(buildUrl(apiBaseUrl(ctx), options.path, options.query), {
-      method: options.method ?? "GET",
-      headers,
-      ...options.body === void 0 ? {} : { body: JSON.stringify(options.body) }
-    });
-  } catch (error) {
-    if (error instanceof TBError) throw error;
-    throw upstreamError(
+  return http.request({
+    baseUrl: `${apiBaseUrl(ctx)}/`,
+    path: options.path,
+    method: options.method ?? "GET",
+    query: queryPairs(options.query),
+    headers: { accept: "application/json", authorization: basicAuthHeader(ctx) },
+    ...options.body === void 0 ? {} : { json: options.body },
+    // 上游 response.json().catch(() => null)：成功或错误上的非 JSON 都按 null。
+    invalidJson: "text",
+    mapError: (context) => upstreamError(
+      context.status || 502,
+      errorMessage(jsonPayload(context.data, context.bodyKind), context)
+    ),
+    mapTransportError: ({ message }) => upstreamError(
       502,
-      error instanceof Error ? `WordPress request failed: ${error.message}` : "WordPress request failed"
-    );
-  }
-}
-async function readJson(response) {
-  const raw = await response.text().catch(() => "");
-  let payload = null;
-  if (raw.trim() !== "") {
-    try {
-      payload = JSON.parse(raw);
-    } catch {
-      payload = null;
-    }
-  }
-  if (!response.ok) throw upstreamError(response.status || 502, errorMessage(payload, response));
-  return payload;
+      message === void 0 ? "WordPress request failed" : `WordPress request failed: ${message}`
+    )
+  });
 }
 async function requestObject(ctx, options) {
-  const payload = await readJson(await requestResponse(ctx, options));
+  const result = await requestResponse(ctx, options);
+  const payload = jsonPayload(result.data, result.bodyKind);
   return requireRecord(payload, "WordPress response must be a JSON object");
 }
 function headerInteger(headers, name) {
@@ -159,7 +142,7 @@ function assertNoIncludeExcludeOverlap(input) {
 async function listCollection(ctx, input, path, outputKey, query) {
   assertNoIncludeExcludeOverlap(input);
   const response = await requestResponse(ctx, { path, query });
-  const payload = await readJson(response);
+  const payload = jsonPayload(response.data, response.bodyKind);
   if (!Array.isArray(payload)) {
     throw upstreamError(502, "WordPress list response must be an array");
   }
@@ -194,15 +177,15 @@ async function deleteResource(ctx, input, collectionPath) {
   return {
     // 上游只认 `deleted === true`:少了这一步,"移入回收站"会被当成删除成功。
     deleted: payload.deleted === true,
-    previous: record(payload.previous) ?? null
+    previous: asJsonObject(payload.previous) ?? null
   };
 }
 function getCurrentUser(_input, ctx) {
   return requestObject(ctx, { path: CURRENT_USER_PATH, query: { context: "edit" } }).then((user) => ({ user }));
 }
 function listPosts(input, ctx) {
-  return listCollection(ctx, input, "/posts", "posts", compact({
-    search: text(input.search),
+  return listCollection(ctx, input, "/posts", "posts", compactDefined({
+    search: trimmedText(input.search),
     status: list(input.status),
     categories: list(input.categories),
     tags: list(input.tags),
@@ -212,24 +195,24 @@ function listPosts(input, ctx) {
     slug: list(input.slug),
     per_page: input.perPage,
     page: input.page,
-    order: text(input.order),
-    orderby: text(input.orderby)
+    order: trimmedText(input.order),
+    orderby: trimmedText(input.orderby)
   }));
 }
 function getPost(input, ctx) {
   return getResource(ctx, input, "/posts", "post");
 }
 function postBody(input) {
-  return compact({
-    title: text(input.title),
-    content: text(input.content),
-    excerpt: text(input.excerpt),
-    slug: text(input.slug),
-    status: text(input.status),
+  return compactDefined({
+    title: trimmedText(input.title),
+    content: trimmedText(input.content),
+    excerpt: trimmedText(input.excerpt),
+    slug: trimmedText(input.slug),
+    status: trimmedText(input.status),
     categories: list(input.categories),
     tags: list(input.tags),
     featured_media: input.featuredMedia,
-    meta: record(input.meta)
+    meta: asJsonObject(input.meta)
   });
 }
 function createPost(input, ctx) {
@@ -242,8 +225,8 @@ function deletePost(input, ctx) {
   return deleteResource(ctx, input, "/posts");
 }
 function listPages(input, ctx) {
-  return listCollection(ctx, input, "/pages", "pages", compact({
-    search: text(input.search),
+  return listCollection(ctx, input, "/pages", "pages", compactDefined({
+    search: trimmedText(input.search),
     status: list(input.status),
     include: list(input.include),
     exclude: list(input.exclude),
@@ -252,24 +235,24 @@ function listPages(input, ctx) {
     slug: list(input.slug),
     per_page: input.perPage,
     page: input.page,
-    order: text(input.order),
-    orderby: text(input.orderby)
+    order: trimmedText(input.order),
+    orderby: trimmedText(input.orderby)
   }));
 }
 function getPage(input, ctx) {
   return getResource(ctx, input, "/pages", "page");
 }
 function pageBody(input) {
-  return compact({
-    title: text(input.title),
-    content: text(input.content),
-    excerpt: text(input.excerpt),
-    slug: text(input.slug),
-    status: text(input.status),
+  return compactDefined({
+    title: trimmedText(input.title),
+    content: trimmedText(input.content),
+    excerpt: trimmedText(input.excerpt),
+    slug: trimmedText(input.slug),
+    status: trimmedText(input.status),
     parent: input.parent,
     featured_media: input.featuredMedia,
     menu_order: input.menuOrder,
-    meta: record(input.meta)
+    meta: asJsonObject(input.meta)
   });
 }
 function createPage(input, ctx) {
@@ -282,8 +265,8 @@ function deletePage(input, ctx) {
   return deleteResource(ctx, input, "/pages");
 }
 function termListQuery(input) {
-  return compact({
-    search: text(input.search),
+  return compactDefined({
+    search: trimmedText(input.search),
     include: list(input.include),
     exclude: list(input.exclude),
     // term 的 parent 是**单个** ID(post/page/comment 那边才是数组)。
@@ -292,17 +275,17 @@ function termListQuery(input) {
     hide_empty: input.hideEmpty,
     per_page: input.perPage,
     page: input.page,
-    order: text(input.order),
-    orderby: text(input.orderby)
+    order: trimmedText(input.order),
+    orderby: trimmedText(input.orderby)
   });
 }
 function termBody(input) {
-  return compact({
-    name: text(input.name),
-    slug: text(input.slug),
-    description: text(input.description),
+  return compactDefined({
+    name: trimmedText(input.name),
+    slug: trimmedText(input.slug),
+    description: trimmedText(input.description),
     parent: input.parent,
-    meta: record(input.meta)
+    meta: asJsonObject(input.meta)
   });
 }
 function listCategories(input, ctx) {
@@ -318,8 +301,8 @@ function createTag(input, ctx) {
   return createResource(ctx, "/tags", "tag", termBody(input));
 }
 function listComments(input, ctx) {
-  return listCollection(ctx, input, "/comments", "comments", compact({
-    search: text(input.search),
+  return listCollection(ctx, input, "/comments", "comments", compactDefined({
+    search: trimmedText(input.search),
     status: list(input.status),
     post: list(input.post),
     author: list(input.author),
@@ -328,17 +311,17 @@ function listComments(input, ctx) {
     exclude: list(input.exclude),
     per_page: input.perPage,
     page: input.page,
-    order: text(input.order),
-    orderby: text(input.orderby)
+    order: trimmedText(input.order),
+    orderby: trimmedText(input.orderby)
   }));
 }
 function updateComment(input, ctx) {
-  return updateResource(ctx, input, "/comments", "comment", compact({
-    content: text(input.content),
-    status: text(input.status),
-    author_name: text(input.authorName),
-    author_email: text(input.authorEmail),
-    author_url: text(input.authorUrl)
+  return updateResource(ctx, input, "/comments", "comment", compactDefined({
+    content: trimmedText(input.content),
+    status: trimmedText(input.status),
+    author_name: trimmedText(input.authorName),
+    author_email: trimmedText(input.authorEmail),
+    author_url: trimmedText(input.authorUrl)
   }));
 }
 function deleteComment(input, ctx) {

package/dist/{workos-WR4NKOYL.js → workos-ZDW4EHS4.js}

@@ -1,21 +1,25 @@
+import {
+  createProviderHttpClient
+} from "./chunk-VLOIDU5U.js";
+import {
+  compactDefined
+} 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/workos/api.ts
 var SERVICE = "workos";
 var API_BASE = "https://api.workos.com";
+var http = createProviderHttpClient({ baseUrl: `${API_BASE}/`, service: SERVICE });
 function errorMessage(payload, status) {
   const error = payload.error;
   if (error !== null && typeof error === "object" && !Array.isArray(error)) {
@@ -29,51 +33,35 @@ function errorMessage(payload, status) {
 }
 async function request(ctx, input) {
   const apiKey = requireApiKey(ctx, SERVICE);
-  const url = new URL(input.path, API_BASE);
-  for (const [key, value] of Object.entries(input.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));
-  }
   const headers = {
     accept: "application/json",
     authorization: `Bearer ${apiKey}`
   };
-  if (input.body !== void 0) headers["content-type"] = "application/json";
-  let response;
-  let text;
-  try {
-    response = await guardedFetch(url.toString(), {
-      method: input.method,
-      headers,
-      body: input.body === void 0 ? void 0 : JSON.stringify(input.body)
-    });
-    text = await response.text();
-  } catch (error) {
-    if (error instanceof TBError) throw error;
-    throw new TBError(
+  const response = await http.request({
+    method: input.method,
+    path: input.path,
+    // 多值过滤是重复同名键(与 Render 的逗号拼接不同)。
+    query: Object.entries(input.query ?? {}),
+    headers,
+    ...input.body === void 0 ? {} : { json: input.body },
+    invalidJsonMessage: "WorkOS \u8FD4\u56DE\u4E86\u975E\u6CD5 JSON",
+    mapError: ({ bodyKind, data, status }) => {
+      if (bodyKind === "invalid-json") {
+        return new TBError("unavailable", "WorkOS \u8FD4\u56DE\u4E86\u975E\u6CD5 JSON", { retryable: true });
+      }
+      const payload2 = bodyKind === "empty" ? {} : data !== null && typeof data === "object" && !Array.isArray(data) ? data : void 0;
+      return payload2 === void 0 ? new TBError("unavailable", "WorkOS \u8FD4\u56DE\u7684\u4E0D\u662F JSON \u5BF9\u8C61", { retryable: true }) : upstreamError(status, errorMessage(payload2, status));
+    },
+    mapTransportError: ({ message }) => new TBError(
       "unavailable",
-      error instanceof Error ? `WorkOS \u8BF7\u6C42\u5931\u8D25: ${error.message}` : "WorkOS \u8BF7\u6C42\u5931\u8D25",
+      message === void 0 ? "WorkOS \u8BF7\u6C42\u5931\u8D25" : `WorkOS \u8BF7\u6C42\u5931\u8D25: ${message}`,
       { retryable: true }
-    );
-  }
-  let payload = {};
-  if (text.trim() !== "") {
-    let parsed;
-    try {
-      parsed = JSON.parse(text);
-    } catch {
-      throw new TBError("unavailable", "WorkOS \u8FD4\u56DE\u4E86\u975E\u6CD5 JSON", { retryable: true });
-    }
-    if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
-      throw new TBError("unavailable", "WorkOS \u8FD4\u56DE\u7684\u4E0D\u662F JSON \u5BF9\u8C61", { retryable: true });
-    }
-    payload = parsed;
+    )
+  });
+  const payload = response.bodyKind === "empty" ? {} : response.data !== null && typeof response.data === "object" && !Array.isArray(response.data) ? response.data : void 0;
+  if (payload === void 0) {
+    throw new TBError("unavailable", "WorkOS \u8FD4\u56DE\u7684\u4E0D\u662F JSON \u5BF9\u8C61", { retryable: true });
   }
-  if (!response.ok) throw upstreamError(response.status, errorMessage(payload, response.status));
   return payload;
 }
 function unwrap(payload, key) {
@@ -97,15 +85,8 @@ async function wrappedAction(ctx, input, wrapperKey) {
   const payload = await request(ctx, input);
   return { [wrapperKey]: unwrap(payload, wrapperKey), raw: payload };
 }
-function compact(input) {
-  const output = {};
-  for (const [key, value] of Object.entries(input)) {
-    if (value !== void 0) output[key] = value;
-  }
-  return output;
-}
 function userBody(input) {
-  return compact({
+  return compactDefined({
     email: input.email,
     first_name: input.first_name,
     last_name: input.last_name,
@@ -117,7 +98,7 @@ function userBody(input) {
   });
 }
 function organizationBody(input) {
-  return compact({
+  return compactDefined({
     name: input.name,
     allow_profiles_outside_organization: input.allow_profiles_outside_organization,
     domain_data: input.domain_data,
@@ -222,7 +203,7 @@ async function createOrganizationMembership(input, ctx) {
     {
       method: "POST",
       path: "/user_management/organization_memberships",
-      body: compact({
+      body: compactDefined({
         user_id: input.user_id,
         organization_id: input.organization_id,
         role_slug: input.role_slug,
@@ -238,7 +219,7 @@ async function updateOrganizationMembership(input, ctx) {
     {
       method: "PUT",
       path: `/user_management/organization_memberships/${encodeURIComponent(input.id)}`,
-      body: compact({ role_slug: input.role_slug, role_slugs: input.role_slugs })
+      body: compactDefined({ role_slug: input.role_slug, role_slugs: input.role_slugs })
     },
     "organization_membership"
   );