@tool-bridge/server 0.16.0 → 0.17.0

package/dist/{telnyx-POOSBBR4.js → telnyx-MI32XZUG.js}

@@ -1,77 +1,57 @@
+import {
+  createProviderHttpClient
+} from "./chunk-WW2IMPQK.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-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/telnyx/api.ts
 var SERVICE = "telnyx";
 var API_BASE = "https://api.telnyx.com/v2";
-function toRecord(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;
-}
-function errorMessage(payload, response) {
+var http = createProviderHttpClient({ baseUrl: `${API_BASE}/`, service: SERVICE });
+function errorMessage(payload, status, statusText) {
   if (typeof payload === "string" && payload.trim() !== "") return payload;
-  const record = toRecord(payload);
+  const record = asJsonObject(payload);
   const errors = Array.isArray(record?.errors) ? record.errors : [];
-  const first = errors.map(toRecord).find(Boolean);
-  const message = first === void 0 ? text(record?.detail) ?? text(record?.message) ?? text(record?.error) ?? text(record?.title) : text(first.detail) ?? text(first.title) ?? text(first.code);
-  return message ?? (response.statusText || `Telnyx \u8FD4\u56DE HTTP ${response.status}`);
-}
-async function readPayload(response) {
-  const body = await response.text().catch(() => "");
-  if (body.trim() === "") return null;
-  try {
-    return JSON.parse(body);
-  } catch {
-    throw upstreamError(response.status === 429 ? 429 : 502, "Telnyx \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94");
-  }
-}
-async function send(url, init) {
-  try {
-    return await guardedFetch(url.toString(), init);
-  } catch (error) {
-    if (error instanceof TypeError) {
-      throw upstreamError(502, `telnyx request failed: ${error.message}`);
-    }
-    throw error;
-  }
+  const first = errors.map(asJsonObject).find(Boolean);
+  const message = first === void 0 ? trimmedText(record?.detail) ?? trimmedText(record?.message) ?? trimmedText(record?.error) ?? trimmedText(record?.title) : trimmedText(first.detail) ?? trimmedText(first.title) ?? trimmedText(first.code);
+  return message ?? (statusText || `Telnyx \u8FD4\u56DE HTTP ${status}`);
 }
 async function request(ctx, path, input = {}) {
-  const url = new URL(`${API_BASE}${path}`);
-  for (const [name, value] of input.query ?? []) {
-    if (value === void 0 || value === null || value === "") continue;
-    url.searchParams.set(name, String(value));
-  }
   const headers = {
     accept: "application/json",
     authorization: `Bearer ${requireApiKey(ctx, SERVICE)}`
   };
-  if (input.body !== void 0) headers["content-type"] = "application/json";
-  const response = await send(url, {
+  const response = await http.request({
     method: input.method ?? "GET",
+    path,
+    // 空串不进 query:Telnyx 会把 `filter[name]=` 读成"匹配空名字",而调用方省略一个
+    // 可选筛选时想要的是"不筛选"。
+    query: (input.query ?? []).filter(([, value]) => value !== void 0 && value !== null && value !== ""),
     headers,
     // JSON.stringify 自己会丢掉值为 undefined 的键,故不必复制上游的 removeUndefined;
     // 但 null 必须留住 —— schema 允许 sendAt 显式传 null,那是要发给 Telnyx 的值。
-    ...input.body === void 0 ? {} : { body: JSON.stringify(input.body) }
+    ...input.body === void 0 ? {} : { json: input.body },
+    invalidJsonMessage: "Telnyx \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94",
+    mapError: ({ bodyKind, data, status, statusText }) => bodyKind === "invalid-json" ? upstreamError(status === 429 ? 429 : 502, "Telnyx \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94") : upstreamError(status, errorMessage(bodyKind === "empty" ? null : data, status, statusText)),
+    mapTransportError: ({ message }) => upstreamError(
+      502,
+      message === void 0 ? "telnyx request failed" : `telnyx request failed: ${message}`
+    )
   });
-  const payload = await readPayload(response);
-  if (!response.ok) throw upstreamError(response.status, errorMessage(payload, response));
-  const record = toRecord(payload);
+  const record = asJsonObject(response.bodyKind === "empty" ? null : response.data);
   if (record === void 0) {
     throw upstreamError(502, "Telnyx \u7684\u6210\u529F\u54CD\u5E94\u4E0D\u662F\u4E00\u4E2A\u5BF9\u8C61");
   }

package/dist/{todoist-M7YD6YSS.js → todoist-4ZFJKZC6.js}

@@ -1,118 +1,106 @@
+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/todoist/api.ts
 var SERVICE = "todoist";
 var API_BASE = "https://api.todoist.com/api/v1";
 var USER_PATH = "/user";
-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({ 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 stringArray(value) {
   if (!Array.isArray(value)) return void 0;
-  const items = value.map((item) => text(item)).filter((item) => item !== void 0);
+  const items = value.map((item) => trimmedText(item)).filter((item) => item !== void 0);
   return items.length > 0 ? items : 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;
 }
 function errorMessage(status, payload) {
-  const body = record(payload);
-  const direct = text(body?.error) ?? text(body?.error_description) ?? text(body?.message) ?? text(body?.detail);
+  const body = asJsonObject(payload);
+  const direct = trimmedText(body?.error) ?? trimmedText(body?.error_description) ?? trimmedText(body?.message) ?? trimmedText(body?.detail);
   if (direct !== void 0) return direct;
   if (Array.isArray(body?.errors)) {
-    const first = body.errors.find((item) => text(item) !== void 0);
+    const first = body.errors.find((item) => trimmedText(item) !== void 0);
     if (first !== void 0) return first;
   }
   return `todoist request failed with ${status}`;
 }
 async function request(ctx, input) {
-  const url = new URL(input.path.replace(/^\/+/, ""), `${API_BASE}/`);
-  for (const [key, value] of Object.entries(input.query ?? {})) {
-    if (value === void 0) continue;
-    url.searchParams.set(key, Array.isArray(value) ? value.join(",") : String(value));
-  }
   const hasBody = input.body !== void 0;
-  const response = await guardedFetch(url.toString(), {
+  const query = Object.entries(input.query ?? {}).map(([key, value]) => [
+    key,
+    // 多值参数(list_tasks 的 ids)是**逗号串**,不是重复的同名参数。
+    Array.isArray(value) ? value.join(",") : value
+  ]);
+  const { data } = await http.request({
+    path: input.path,
     method: input.method ?? "GET",
+    query,
     headers: {
       accept: "application/json",
-      authorization: `Bearer ${requireApiKey(ctx, SERVICE)}`,
-      ...hasBody ? { "content-type": "application/json" } : {}
+      authorization: `Bearer ${requireApiKey(ctx, SERVICE)}`
     },
-    body: hasBody ? JSON.stringify(input.body) : void 0
+    ...hasBody ? { json: input.body } : {},
+    invalidJsonMessage: "Todoist \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94",
+    mapError: ({ data: data2, status }) => upstreamError(
+      status,
+      errorMessage(status, typeof data2 === "string" ? { message: data2 } : data2)
+    )
   });
-  const raw = await response.text();
-  let payload = {};
-  if (raw !== "") {
-    try {
-      payload = JSON.parse(raw);
-    } catch {
-      if (response.ok) {
-        throw new TBError("unavailable", "Todoist \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94", { retryable: true });
-      }
-      payload = { message: raw };
-    }
-  }
-  if (!response.ok) throw upstreamError(response.status, errorMessage(response.status, payload));
-  return payload;
+  return data ?? {};
 }
 function results(payload, label) {
   const body = requireRecord(payload, `${label} \u54CD\u5E94`);
   if (!Array.isArray(body.results)) {
     throw new TBError("unavailable", `${label} \u54CD\u5E94\u7F3A\u5C11 results`, { retryable: true });
   }
-  return body.results.map((item) => record(item)).filter((item) => item !== void 0);
+  return body.results.map((item) => asJsonObject(item)).filter((item) => item !== void 0);
 }
 function nextCursor(payload) {
-  return text(record(payload)?.next_cursor) ?? null;
+  return trimmedText(asJsonObject(payload)?.next_cursor) ?? null;
 }
 function idValue(value) {
   if (typeof value === "number" && Number.isInteger(value)) return value;
-  return text(value);
+  return trimmedText(value);
 }
 function normalizeComment(payload) {
   const comment = requireRecord(payload, "todoist comment");
-  return compact({
+  return compactDefined({
     ...comment,
-    attachment: record(comment.attachment) ?? record(comment.file_attachment)
+    attachment: asJsonObject(comment.attachment) ?? asJsonObject(comment.file_attachment)
   });
 }
 function commentAttachment(value) {
-  const attachment = record(value);
+  const attachment = asJsonObject(value);
   if (attachment === void 0) return void 0;
-  return compact({
-    file_url: text(attachment.fileUrl),
-    file_name: text(attachment.fileName),
-    file_type: text(attachment.fileType),
-    resource_type: text(attachment.resourceType)
+  return compactDefined({
+    file_url: trimmedText(attachment.fileUrl),
+    file_name: trimmedText(attachment.fileName),
+    file_type: trimmedText(attachment.fileType),
+    resource_type: trimmedText(attachment.resourceType)
   });
 }
 function notifyUserIds(value) {
@@ -121,20 +109,20 @@ function notifyUserIds(value) {
   return ids.length > 0 ? ids : void 0;
 }
 function taskBody(input, isCreate) {
-  return compact({
-    content: isCreate ? requireText(input.content, "content") : text(input.content),
+  return compactDefined({
+    content: isCreate ? requireText(input.content, "content") : trimmedText(input.content),
     description: input.description,
-    project_id: text(input.projectId),
-    section_id: text(input.sectionId),
-    parent_id: text(input.parentId),
+    project_id: trimmedText(input.projectId),
+    section_id: trimmedText(input.sectionId),
+    parent_id: trimmedText(input.parentId),
     order: input.order,
     labels: stringArray(input.labels),
     priority: input.priority,
     assignee_id: input.assigneeId,
-    due_string: text(input.dueString),
-    due_date: text(input.dueDate),
-    due_datetime: text(input.dueDatetime),
-    due_lang: text(input.dueLang),
+    due_string: trimmedText(input.dueString),
+    due_date: trimmedText(input.dueDate),
+    due_datetime: trimmedText(input.dueDatetime),
+    due_lang: trimmedText(input.dueLang),
     duration: input.duration,
     duration_unit: input.durationUnit,
     deadline_date: input.deadlineDate,
@@ -152,7 +140,7 @@ async function listProjects(input, ctx) {
     query: {
       folder_id: idValue(input.folderId),
       workspace_id: idValue(input.workspaceId),
-      cursor: text(input.cursor),
+      cursor: trimmedText(input.cursor),
       limit: input.limit
     }
   });
@@ -166,14 +154,14 @@ async function createProject(input, ctx) {
   const payload = await request(ctx, {
     path: "/projects",
     method: "POST",
-    body: compact({
+    body: compactDefined({
       name: requireText(input.name, "name"),
-      description: text(input.description),
+      description: trimmedText(input.description),
       // 上游显式区分 null(建成顶层项目)与"未给"(不带这个键)。
-      parent_id: input.parentId === null ? null : text(input.parentId),
+      parent_id: input.parentId === null ? null : trimmedText(input.parentId),
       color: input.color,
       is_favorite: input.isFavorite,
-      view_style: text(input.viewStyle),
+      view_style: trimmedText(input.viewStyle),
       workspace_id: idValue(input.workspaceId)
     })
   });
@@ -184,7 +172,7 @@ async function updateProject(input, ctx) {
     path: `/projects/${encodeURIComponent(requireText(input.projectId, "projectId"))}`,
     method: "POST",
     // 更新是三态字段:未给不改、null 清空、有值改成它 —— 故原样透传。
-    body: compact({
+    body: compactDefined({
       name: input.name,
       description: input.description,
       color: input.color,
@@ -200,7 +188,7 @@ async function updateProject(input, ctx) {
 async function listSections(input, ctx) {
   const payload = await request(ctx, {
     path: "/sections",
-    query: { project_id: text(input.projectId), cursor: text(input.cursor), limit: input.limit }
+    query: { project_id: trimmedText(input.projectId), cursor: trimmedText(input.cursor), limit: input.limit }
   });
   return { sections: results(payload, "todoist sections"), nextCursor: nextCursor(payload) };
 }
@@ -212,7 +200,7 @@ async function createSection(input, ctx) {
   const payload = await request(ctx, {
     path: "/sections",
     method: "POST",
-    body: compact({
+    body: compactDefined({
       name: requireText(input.name, "name"),
       project_id: requireText(input.projectId, "projectId"),
       order: input.order
@@ -224,7 +212,7 @@ async function updateSection(input, ctx) {
   const payload = await request(ctx, {
     path: `/sections/${encodeURIComponent(requireText(input.sectionId, "sectionId"))}`,
     method: "POST",
-    body: compact({
+    body: compactDefined({
       name: input.name,
       section_order: input.sectionOrder,
       is_collapsed: input.isCollapsed
@@ -236,13 +224,13 @@ async function listTasks(input, ctx) {
   const payload = await request(ctx, {
     path: "/tasks",
     query: {
-      project_id: text(input.projectId),
-      section_id: text(input.sectionId),
-      parent_id: text(input.parentId),
-      label: text(input.label),
+      project_id: trimmedText(input.projectId),
+      section_id: trimmedText(input.sectionId),
+      parent_id: trimmedText(input.parentId),
+      label: trimmedText(input.label),
       ids: stringArray(input.ids),
-      goal_id: text(input.goalId),
-      cursor: text(input.cursor),
+      goal_id: trimmedText(input.goalId),
+      cursor: trimmedText(input.cursor),
       limit: input.limit
     }
   });
@@ -275,9 +263,9 @@ async function listComments(input, ctx) {
   const payload = await request(ctx, {
     path: "/comments",
     query: {
-      task_id: text(input.taskId),
-      project_id: text(input.projectId),
-      cursor: text(input.cursor),
+      task_id: trimmedText(input.taskId),
+      project_id: trimmedText(input.projectId),
+      cursor: trimmedText(input.cursor),
       limit: input.limit
     }
   });
@@ -294,10 +282,10 @@ async function createComment(input, ctx) {
   const payload = await request(ctx, {
     path: "/comments",
     method: "POST",
-    body: compact({
+    body: compactDefined({
       content: requireText(input.content, "content"),
-      task_id: text(input.taskId),
-      project_id: text(input.projectId),
+      task_id: trimmedText(input.taskId),
+      project_id: trimmedText(input.projectId),
       attachment: commentAttachment(input.attachment),
       uids_to_notify: notifyUserIds(input.uidsToNotify)
     })
@@ -316,7 +304,7 @@ async function updateComment(input, ctx) {
 async function listLabels(input, ctx) {
   const payload = await request(ctx, {
     path: "/labels",
-    query: { cursor: text(input.cursor), limit: input.limit }
+    query: { cursor: trimmedText(input.cursor), limit: input.limit }
   });
   return { labels: results(payload, "todoist labels"), nextCursor: nextCursor(payload) };
 }