@tool-bridge/server 0.16.0 → 0.17.0

package/dist/{trello-IS6V5W3E.js → trello-UOGFNMK4.js}

@@ -1,55 +1,49 @@
+import {
+  createProviderHttpClient
+} from "./chunk-WW2IMPQK.js";
+import {
+  asJsonObject,
+  booleanValue,
+  compactDefined,
+  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-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/trello/api.ts
 var SERVICE = "trello";
 var API_BASE = "https://api.trello.com/1";
+var http = createProviderHttpClient({ baseUrl: `${API_BASE}/`, service: SERVICE });
 var DEFAULT_MEMBER_FIELDS = ["id", "username", "fullName"];
 var DEFAULT_BOARD_FIELDS = ["name", "desc", "url", "shortUrl", "closed"];
 var DEFAULT_CARD_FIELDS = ["name", "desc", "url", "shortUrl", "closed", "due", "dueComplete", "idBoard", "idList"];
 var AUTH_HINTS = {
-  "invalid key": "Trello API key \u65E0\u6548:\u7528 https://trello.com/power-ups/admin \u4E0A Key \u4E00\u680F\u7684\u503C,\u4E0D\u662F API Secret,\u4E5F\u4E0D\u662F Atlassian API token",
-  "invalid token": "Trello API token \u65E0\u6548:\u5728 https://trello.com/power-ups/admin \u4E0A API Key \u65C1\u8FB9\u7684 Token \u94FE\u63A5\u91CC\u751F\u6210"
+  // 不带 scheme：provider HTTP 边界会统一抹掉错误里的完整 URL，避免上游响应携密 URL 泄漏。
+  "invalid key": "Trello API key \u65E0\u6548:\u7528 trello.com/power-ups/admin \u4E0A Key \u4E00\u680F\u7684\u503C,\u4E0D\u662F API Secret,\u4E5F\u4E0D\u662F Atlassian API token",
+  "invalid token": "Trello API token \u65E0\u6548:\u5728 trello.com/power-ups/admin \u4E0A API Key \u65C1\u8FB9\u7684 Token \u94FE\u63A5\u91CC\u751F\u6210"
 };
-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 number(value) {
   return typeof value === "number" ? value : void 0;
 }
-function boolean(value) {
-  return typeof value === "boolean" ? value : void 0;
-}
 function nullableText(value) {
-  return value === null ? null : text(value);
-}
-function compact(input) {
-  return Object.fromEntries(Object.entries(input).filter(([, value]) => value !== void 0));
+  return value === null ? null : trimmedText(value);
 }
 function requireInput(value, field) {
-  const result = text(value);
+  const result = trimmedText(value);
   if (result === void 0) throw new TBError("invalid_argument", `${field} \u662F\u5FC5\u586B\u7684`);
   return result;
 }
 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;
 }
@@ -68,140 +62,132 @@ function idList(value, field) {
   if (value === void 0) return void 0;
   return value.map((item) => requireInput(item, field)).join(",");
 }
-function errorMessage(response, body) {
-  const fallback = response.statusText !== "" ? response.statusText : `HTTP ${response.status}`;
-  if (!(response.headers.get("content-type") ?? "").includes("application/json")) {
-    return body === "" ? fallback : body;
-  }
-  let payload;
-  try {
-    payload = JSON.parse(body);
-  } catch {
-    return fallback;
+function errorMessage(context) {
+  const fallback = context.statusText !== "" ? context.statusText : `HTTP ${context.status}`;
+  if (!(context.headers.get("content-type") ?? "").includes("application/json")) {
+    if (context.bodyKind === "empty") return fallback;
+    if (context.bodyKind === "invalid-json" || context.bodyKind === "text") {
+      return trimmedText(context.data) ?? fallback;
+    }
+    return JSON.stringify(context.data) ?? fallback;
   }
-  if (typeof payload === "string") return text(payload) ?? fallback;
-  const error = record(payload);
-  return text(error?.message) ?? text(error?.error) ?? text(error?.detail) ?? fallback;
+  if (context.bodyKind !== "json") return fallback;
+  if (typeof context.data === "string") return trimmedText(context.data) ?? fallback;
+  const error = asJsonObject(context.data);
+  return trimmedText(error?.message) ?? trimmedText(error?.error) ?? trimmedText(error?.detail) ?? fallback;
 }
 async function request(ctx, input) {
-  const url = new URL(`${API_BASE}${input.path}`);
-  url.searchParams.set("key", requireCredential(ctx, SERVICE, "apiKey"));
-  url.searchParams.set("token", requireCredential(ctx, SERVICE, "apiToken"));
-  for (const [key, value] of input.query ?? []) {
-    if (value === void 0 || value === null) continue;
-    url.searchParams.set(key, String(value));
-  }
+  const query = [
+    ["key", requireCredential(ctx, SERVICE, "apiKey")],
+    ["token", requireCredential(ctx, SERVICE, "apiToken")],
+    ...input.query ?? []
+  ];
   const hasBody = input.body !== void 0;
-  const headers = { accept: "application/json" };
-  if (hasBody) headers["content-type"] = "application/json";
-  const response = await guardedFetch(url.toString(), {
+  const { data } = await http.request({
+    path: input.path,
     method: input.method ?? "GET",
-    headers,
-    body: hasBody ? JSON.stringify(input.body) : void 0
+    query,
+    headers: { accept: "application/json" },
+    ...hasBody ? { json: input.body } : {},
+    invalidJsonMessage: "Trello \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94",
+    mapError: (context) => {
+      const message = errorMessage(context);
+      return upstreamError(context.status, AUTH_HINTS[message] ?? message);
+    }
   });
-  const body = await response.text().catch(() => "");
-  if (!response.ok) {
-    const message = errorMessage(response, body);
-    throw upstreamError(response.status, AUTH_HINTS[message] ?? message);
-  }
-  if (response.status === 204 || body === "") return void 0;
-  try {
-    return JSON.parse(body);
-  } catch {
-    throw new TBError("unavailable", "Trello \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94", { retryable: true });
-  }
+  return data;
 }
 function normalizeMember(payload) {
   const member = requireRecord(payload, "Trello \u6210\u5458");
-  return compact({
-    id: text(member.id),
-    username: text(member.username),
-    fullName: text(member.fullName)
+  return compactDefined({
+    id: trimmedText(member.id),
+    username: trimmedText(member.username),
+    fullName: trimmedText(member.fullName)
   });
 }
 function normalizeBoard(payload) {
   const board = requireRecord(payload, "Trello \u770B\u677F");
-  return compact({
-    id: text(board.id),
-    name: text(board.name),
-    description: text(board.desc),
-    url: text(board.url),
-    shortUrl: text(board.shortUrl),
-    closed: boolean(board.closed)
+  return compactDefined({
+    id: trimmedText(board.id),
+    name: trimmedText(board.name),
+    description: trimmedText(board.desc),
+    url: trimmedText(board.url),
+    shortUrl: trimmedText(board.shortUrl),
+    closed: booleanValue(board.closed)
   });
 }
 function normalizeList(payload) {
   const list = requireRecord(payload, "Trello \u5217\u8868");
-  return compact({
-    id: text(list.id),
-    boardId: text(list.idBoard),
-    name: text(list.name),
-    closed: boolean(list.closed),
+  return compactDefined({
+    id: trimmedText(list.id),
+    boardId: trimmedText(list.idBoard),
+    name: trimmedText(list.name),
+    closed: booleanValue(list.closed),
     position: number(list.pos)
   });
 }
 function normalizeCard(payload) {
   const card = requireRecord(payload, "Trello \u5361\u7247");
-  return compact({
-    id: text(card.id),
-    boardId: text(card.idBoard),
-    listId: text(card.idList),
-    name: text(card.name),
-    description: text(card.desc),
-    url: text(card.url),
-    shortUrl: text(card.shortUrl),
-    closed: boolean(card.closed),
+  return compactDefined({
+    id: trimmedText(card.id),
+    boardId: trimmedText(card.idBoard),
+    listId: trimmedText(card.idList),
+    name: trimmedText(card.name),
+    description: trimmedText(card.desc),
+    url: trimmedText(card.url),
+    shortUrl: trimmedText(card.shortUrl),
+    closed: booleanValue(card.closed),
     due: nullableText(card.due),
-    dueComplete: boolean(card.dueComplete)
+    dueComplete: booleanValue(card.dueComplete)
   });
 }
 function normalizeAction(payload) {
   const action = requireRecord(payload, "Trello \u52A8\u4F5C");
-  return compact({
-    id: text(action.id),
-    type: text(action.type),
-    data: record(action.data),
-    date: text(action.date)
+  return compactDefined({
+    id: trimmedText(action.id),
+    type: trimmedText(action.type),
+    data: asJsonObject(action.data),
+    date: trimmedText(action.date)
   });
 }
 function normalizeCheckItem(payload) {
   const item = requireRecord(payload, "Trello \u68C0\u67E5\u9879");
-  return compact({
-    id: text(item.id),
-    name: text(item.name),
-    state: text(item.state),
+  return compactDefined({
+    id: trimmedText(item.id),
+    name: trimmedText(item.name),
+    state: trimmedText(item.state),
     position: number(item.pos)
   });
 }
 function normalizeChecklist(payload) {
   const checklist = requireRecord(payload, "Trello \u6E05\u5355");
   const items = checklist.checkItems;
-  return compact({
-    id: text(checklist.id),
-    cardId: text(checklist.idCard),
-    name: text(checklist.name),
+  return compactDefined({
+    id: trimmedText(checklist.id),
+    cardId: trimmedText(checklist.idCard),
+    name: trimmedText(checklist.name),
     checkItems: Array.isArray(items) ? items.map((item) => normalizeCheckItem(item)) : void 0
   });
 }
 function normalizeAttachment(payload) {
   const attachment = requireRecord(payload, "Trello \u9644\u4EF6");
-  return compact({
-    id: text(attachment.id),
-    name: text(attachment.name),
-    url: text(attachment.url),
+  return compactDefined({
+    id: trimmedText(attachment.id),
+    name: trimmedText(attachment.name),
+    url: trimmedText(attachment.url),
     // bytes 的 null 是"未知大小",与字段缺席不同。
     bytes: attachment.bytes === null ? null : number(attachment.bytes),
-    date: text(attachment.date)
+    date: trimmedText(attachment.date)
   });
 }
 function cardBody(input, mode) {
   const updates = input;
-  const body = compact({
-    idList: mode === "create" ? requireInput(input.listId, "listId") : text(input.listId),
-    name: text(input.name),
-    desc: text(input.description),
+  const body = compactDefined({
+    idList: mode === "create" ? requireInput(input.listId, "listId") : trimmedText(input.listId),
+    name: trimmedText(input.name),
+    desc: trimmedText(input.description),
     // due 的 null 要原样发下去:那是"清掉截止日期"的表达。
-    due: input.due === null ? null : text(input.due),
+    due: input.due === null ? null : trimmedText(input.due),
     pos: position(input.position),
     idMembers: idList(input.memberIds, "memberIds"),
     idLabels: idList(input.labelIds, "labelIds"),
@@ -214,7 +200,7 @@ function cardBody(input, mode) {
   return body;
 }
 async function getMember(input, ctx) {
-  const memberId = text(input.memberId) ?? "me";
+  const memberId = trimmedText(input.memberId) ?? "me";
   const payload = await request(ctx, {
     path: `/members/${encodeURIComponent(memberId)}`,
     query: [["fields", fields(input.fields, DEFAULT_MEMBER_FIELDS)]]
@@ -222,7 +208,7 @@ async function getMember(input, ctx) {
   return { member: normalizeMember(payload) };
 }
 async function listMemberBoards(input, ctx) {
-  const memberId = text(input.memberId) ?? "me";
+  const memberId = trimmedText(input.memberId) ?? "me";
   const payload = await request(ctx, {
     path: `/members/${encodeURIComponent(memberId)}/boards`,
     query: [
@@ -243,9 +229,9 @@ async function createBoard(input, ctx) {
   const payload = await request(ctx, {
     method: "POST",
     path: "/boards",
-    body: compact({
+    body: compactDefined({
       name: requireInput(input.name, "name"),
-      desc: text(input.description),
+      desc: trimmedText(input.description),
       defaultLists: input.defaultLists,
       // 可见性在 Trello 的建板接口里叫 prefs_permissionLevel,不是 permissionLevel。
       prefs_permissionLevel: input.permissionLevel
@@ -264,7 +250,7 @@ async function createList(input, ctx) {
   const payload = await request(ctx, {
     method: "POST",
     path: "/lists",
-    body: compact({
+    body: compactDefined({
       idBoard: requireInput(input.boardId, "boardId"),
       name: requireInput(input.name, "name"),
       pos: position(input.position)
@@ -273,8 +259,8 @@ async function createList(input, ctx) {
   return { list: normalizeList(payload) };
 }
 async function updateList(input, ctx) {
-  const body = compact({
-    name: text(input.name),
+  const body = compactDefined({
+    name: trimmedText(input.name),
     pos: position(input.position)
   });
   if (Object.keys(body).length === 0) {
@@ -332,7 +318,7 @@ async function moveCard(input, ctx) {
   const payload = await request(ctx, {
     method: "PUT",
     path: `/cards/${encodeURIComponent(requireInput(input.cardId, "cardId"))}`,
-    body: compact({
+    body: compactDefined({
       idList: requireInput(input.listId, "listId"),
       pos: position(input.position)
     })
@@ -426,7 +412,7 @@ async function addCheckitem(input, ctx) {
   const payload = await request(ctx, {
     method: "POST",
     path: `/checklists/${encodeURIComponent(requireInput(input.checklistId, "checklistId"))}/checkItems`,
-    body: compact({
+    body: compactDefined({
       name: requireInput(input.name, "name"),
       pos: position(input.position),
       checked: input.checked
@@ -449,9 +435,9 @@ async function addCardAttachmentUrl(input, ctx) {
   const payload = await request(ctx, {
     method: "POST",
     path: `/cards/${encodeURIComponent(requireInput(input.cardId, "cardId"))}/attachments`,
-    body: compact({
+    body: compactDefined({
       url: requireInput(input.url, "url"),
-      name: text(input.name)
+      name: trimmedText(input.name)
     })
   });
   return { attachment: normalizeAttachment(payload) };

package/dist/{turso-RCFHUFVH.js → turso-YTSTW3ZS.js}

@@ -1,62 +1,57 @@
+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/turso/api.ts
 var SERVICE = "turso";
 var API_BASE = "https://api.turso.tech";
-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 requireText(value, field) {
-  const result = text(value);
+  const result = trimmedText(value);
   if (result === void 0) throw new TBError("invalid_argument", `${field} is required.`);
   return result;
 }
-function compact(input) {
-  return Object.fromEntries(Object.entries(input).filter(([, value]) => value !== void 0));
-}
 function responseError(message) {
   return new TBError("unavailable", message, { retryable: true });
 }
 function normalizeResource(raw) {
-  return compact({
-    slug: text(raw.slug),
-    name: text(raw.name),
-    type: text(raw.type),
-    location: text(raw.location),
-    uuid: text(raw.uuid),
-    group: text(raw.group),
-    hostname: text(raw.hostname),
-    code: text(raw.code),
+  return compactDefined({
+    slug: trimmedText(raw.slug),
+    name: trimmedText(raw.name),
+    type: trimmedText(raw.type),
+    location: trimmedText(raw.location),
+    uuid: trimmedText(raw.uuid),
+    group: trimmedText(raw.group),
+    hostname: trimmedText(raw.hostname),
+    code: trimmedText(raw.code),
     raw
   });
 }
 function normalizeItems(items) {
   return items.flatMap((item) => {
-    const fields = record(item);
+    const fields = asJsonObject(item);
     return fields === void 0 ? [] : [normalizeResource(fields)];
   });
 }
 function resourceList(payload, keys) {
   if (Array.isArray(payload)) return normalizeItems(payload);
-  const fields = record(payload);
+  const fields = asJsonObject(payload);
   if (fields === void 0) throw responseError("Turso returned an invalid list response");
   for (const key of [...keys, "data"]) {
     const value = fields[key];
@@ -65,51 +60,44 @@ function resourceList(payload, keys) {
   throw responseError("Turso list response is missing items");
 }
 function singleResource(payload, keys) {
-  const fields = record(payload);
+  const fields = asJsonObject(payload);
   if (fields === void 0) throw responseError("Turso returned an invalid resource response");
   for (const key of [...keys, "data"]) {
-    const value = record(fields[key]);
+    const value = asJsonObject(fields[key]);
     if (value !== void 0) return normalizeResource(value);
   }
   return normalizeResource(fields);
 }
-function readPayload(body) {
-  if (body.trim() === "") return {};
-  try {
-    return JSON.parse(body);
-  } catch {
-    return { message: body };
-  }
-}
 function errorMessage(payload, status) {
-  const direct = text(payload);
+  const direct = trimmedText(payload);
   if (direct !== void 0) return direct;
-  const fields = record(payload);
-  const nested = record(fields?.error);
-  const message = text(fields?.message) ?? text(fields?.error) ?? text(fields?.detail) ?? text(fields?.title) ?? text(nested?.message) ?? text(nested?.detail);
+  const fields = asJsonObject(payload);
+  const nested = asJsonObject(fields?.error);
+  const message = trimmedText(fields?.message) ?? trimmedText(fields?.error) ?? trimmedText(fields?.detail) ?? trimmedText(fields?.title) ?? trimmedText(nested?.message) ?? trimmedText(nested?.detail);
   return message ?? `Turso request failed with ${status}`;
 }
 async function request(ctx, input) {
   const apiKey = requireApiKey(ctx, SERVICE);
-  let response;
-  let payload;
-  try {
-    response = await guardedFetch(`${API_BASE}${input.path}`, {
-      method: input.method,
-      headers: {
-        accept: "application/json",
-        authorization: `Bearer ${apiKey}`,
-        ...input.body === void 0 ? {} : { "content-type": "application/json" }
-      },
-      body: input.body === void 0 ? void 0 : JSON.stringify(input.body)
-    });
-    payload = readPayload(await response.text());
-  } catch (error) {
-    if (error instanceof TBError) throw error;
-    throw upstreamError(502, error instanceof Error ? `Turso request failed: ${error.message}` : "Turso request failed");
-  }
-  if (!response.ok) throw upstreamError(response.status, errorMessage(payload, response.status));
-  return payload;
+  const response = await http.request({
+    method: input.method,
+    path: input.path,
+    headers: {
+      accept: "application/json",
+      authorization: `Bearer ${apiKey}`
+    },
+    ...input.body === void 0 ? {} : { json: input.body },
+    invalidJson: "text",
+    mapError: ({ bodyKind, data, status }) => upstreamError(
+      status,
+      errorMessage(bodyKind === "empty" ? {} : bodyKind === "json" ? data : { message: data }, status)
+    ),
+    mapTransportError: ({ message }) => upstreamError(
+      502,
+      message === void 0 ? "Turso request failed" : `Turso request failed: ${message}`
+    )
+  });
+  if (response.bodyKind === "empty") return {};
+  return response.bodyKind === "json" ? response.data : { message: response.data };
 }
 function organizationPath(organizationSlug) {
   return `/v1/organizations/${encodeURIComponent(requireText(organizationSlug, "organizationSlug"))}`;
@@ -146,7 +134,7 @@ async function createGroup(input, ctx) {
   const payload = await request(ctx, {
     method: "POST",
     path: `${organizationPath(input.organizationSlug)}/groups`,
-    body: compact({
+    body: compactDefined({
       name: requireText(input.name, "name"),
       location: requireText(input.location, "location"),
       extensions: extensions(input.extensions)