@tool-bridge/server 0.15.0 → 0.17.0

package/dist/{airtable-QYTOPRFV.js → airtable-NOSOMOVB.js}

@@ -1,47 +1,38 @@
+import {
+  createProviderHttpClient
+} from "./chunk-WW2IMPQK.js";
+import {
+  asJsonObject,
+  booleanValue,
+  compactDefined,
+  integerValue,
+  trimmedText
+} from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-NQ67PIIS.js";
-import {
-  guardedFetch
-} from "./chunk-KH663T3A.js";
-import "./chunk-UI4E4T5Q.js";
+} from "./chunk-YASUMV2K.js";
+import "./chunk-U5UHT7CX.js";
 import {
   TBError,
   external_exports
-} from "./chunk-DXXYNIXV.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-RVWZN3CI.js";
+import "./chunk-U67V476Y.js";
 
 // ../plugins/src/airtable/api.ts
 var SERVICE = "airtable";
 var API_BASE = "https://api.airtable.com";
 var BASES_PATH = "/v0/meta/bases";
+var http = createProviderHttpClient({ baseUrl: API_BASE, service: SERVICE });
 var GET_URL_LENGTH_SOFT_LIMIT = 15e3;
-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;
-}
-function boolean(value) {
-  return typeof value === "boolean" ? value : void 0;
-}
-function integer(value) {
-  return typeof value === "number" && Number.isInteger(value) ? value : void 0;
-}
 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 requireObject(value, label) {
-  const fields = record(value);
+  const fields = asJsonObject(value);
   if (fields === void 0) throw upstreamError(502, `${label} must be a plain object`);
   return fields;
 }
@@ -50,7 +41,7 @@ function objectArray(value, label) {
   return value.map((item, index) => requireObject(item, `${label}[${index}]`));
 }
 function inputObject(value, label) {
-  const fields = record(value);
+  const fields = asJsonObject(value);
   if (fields === void 0) throw new TBError("invalid_argument", `${label} must be an object`);
   return fields;
 }
@@ -59,54 +50,55 @@ function buildUrl(path, query) {
   for (const [key, value] of query ?? []) url.searchParams.append(key, value);
   return url.toString();
 }
-function headers(apiKey, hasBody) {
-  return {
-    accept: "application/json",
-    authorization: `Bearer ${apiKey}`,
-    ...hasBody ? { "content-type": "application/json" } : {}
-  };
-}
 function errorMessage(payload, status) {
   if (typeof payload === "string" && payload !== "") return payload;
-  const error = record(record(payload)?.error);
-  const message = text(error?.message);
-  const type = text(error?.type);
+  const error = asJsonObject(asJsonObject(payload)?.error);
+  const message = trimmedText(error?.message);
+  const type = trimmedText(error?.type);
   if (message !== void 0 && type !== void 0) return `${message} (${type})`;
   return message ?? type ?? `airtable request failed with ${status}`;
 }
-async function request(ctx, input) {
-  const apiKey = requireApiKey(ctx, SERVICE);
-  let response;
-  try {
-    response = await guardedFetch(buildUrl(input.path, input.query), {
-      method: input.method ?? "GET",
-      headers: headers(apiKey, input.body !== void 0),
-      body: input.body === void 0 ? void 0 : JSON.stringify(input.body)
-    });
-  } catch (error) {
-    if (error instanceof TBError) throw error;
-    const detail = error instanceof Error && error.message !== "" ? error.message : "unknown request error";
-    throw upstreamError(502, `airtable request failed: ${detail}`);
-  }
-  const contentType = response.headers.get("content-type") ?? "";
-  const raw = await response.text().catch(() => "");
-  let payload = null;
+function responsePayload(result) {
+  const contentType = result.headers.get("content-type") ?? "";
   if (contentType.includes("application/json")) {
+    if (result.bodyKind === "json") return result.data;
+    if (result.bodyKind === "empty" && (result.status === 204 || result.status === 205)) return null;
+    throw upstreamError(502, "airtable response parsing failed: invalid JSON");
+  }
+  if (result.bodyKind === "empty") return null;
+  if (result.bodyKind === "text") {
     try {
-      payload = JSON.parse(raw);
-    } catch (error) {
-      const detail = error instanceof Error && error.message !== "" ? error.message : "unknown parsing error";
-      throw upstreamError(502, `airtable response parsing failed: ${detail}`);
-    }
-  } else if (raw !== "") {
-    try {
-      payload = JSON.parse(raw);
+      return JSON.parse(String(result.data));
     } catch {
-      payload = raw;
+      return result.data;
     }
   }
-  if (!response.ok) throw upstreamError(response.status, errorMessage(payload, response.status));
-  return payload;
+  return result.data;
+}
+function mapAirtableError(context) {
+  try {
+    return upstreamError(context.status, errorMessage(responsePayload(context), context.status));
+  } catch {
+    return upstreamError(502, "airtable response parsing failed: invalid JSON");
+  }
+}
+async function request(ctx, input) {
+  const apiKey = requireApiKey(ctx, SERVICE);
+  const result = await http.request({
+    path: input.path,
+    method: input.method ?? "GET",
+    query: input.query,
+    headers: { accept: "application/json", authorization: `Bearer ${apiKey}` },
+    ...input.body === void 0 ? {} : { json: input.body },
+    invalidJson: "text",
+    responseType: "auto",
+    mapError: mapAirtableError,
+    mapTransportError: ({ message }) => upstreamError(
+      502,
+      `airtable request failed: ${message ?? "unknown request error"}`
+    )
+  });
+  return responsePayload(result);
 }
 function recordCollectionPath(input) {
   const baseId = encodeURIComponent(requireText(input.baseId, "baseId"));
@@ -119,11 +111,11 @@ function includeQuery(include) {
 function commonReadQuery(input) {
   const query = [];
   for (const field of input.fields ?? []) query.push(["fields[]", requireText(field, "fields item")]);
-  const cellFormat = text(input.cellFormat);
-  const timeZone = text(input.timeZone);
-  const userLocale = text(input.userLocale);
-  const returnFieldsByFieldId = boolean(input.returnFieldsByFieldId);
-  const includeDateDependencyMetadata = boolean(input.includeDateDependencyMetadata);
+  const cellFormat = trimmedText(input.cellFormat);
+  const timeZone = trimmedText(input.timeZone);
+  const userLocale = trimmedText(input.userLocale);
+  const returnFieldsByFieldId = booleanValue(input.returnFieldsByFieldId);
+  const includeDateDependencyMetadata = booleanValue(input.includeDateDependencyMetadata);
   if (cellFormat !== void 0) query.push(["cellFormat", cellFormat]);
   if (timeZone !== void 0) query.push(["timeZone", timeZone]);
   if (userLocale !== void 0) query.push(["userLocale", userLocale]);
@@ -135,11 +127,11 @@ function commonReadQuery(input) {
 }
 function listRecordsQuery(input) {
   const query = commonReadQuery(input);
-  const offset = text(input.offset);
-  const pageSize = integer(input.pageSize);
-  const maxRecords = integer(input.maxRecords);
-  const view = text(input.view);
-  const filterByFormula = text(input.filterByFormula);
+  const offset = trimmedText(input.offset);
+  const pageSize = integerValue(input.pageSize);
+  const maxRecords = integerValue(input.maxRecords);
+  const view = trimmedText(input.view);
+  const filterByFormula = trimmedText(input.filterByFormula);
   if (offset !== void 0) query.push(["offset", offset]);
   if (pageSize !== void 0) query.push(["pageSize", String(pageSize)]);
   if (maxRecords !== void 0) query.push(["maxRecords", String(maxRecords)]);
@@ -148,7 +140,7 @@ function listRecordsQuery(input) {
   for (const [index, item] of (input.sort ?? []).entries()) {
     const rule = inputObject(item, `sort[${index}]`);
     query.push([`sort[${index}][field]`, requireText(rule.field, `sort[${index}].field`)]);
-    const direction = text(rule.direction);
+    const direction = trimmedText(rule.direction);
     if (direction !== void 0) query.push([`sort[${index}][direction]`, direction]);
   }
   for (const item of input.recordMetadata ?? []) {
@@ -157,25 +149,25 @@ function listRecordsQuery(input) {
   return query;
 }
 function listRecordsPostBody(input) {
-  return compact({
-    view: text(input.view),
+  return compactDefined({
+    view: trimmedText(input.view),
     fields: input.fields === void 0 ? void 0 : input.fields.map((field) => requireText(field, "fields item")),
     sort: input.sort === void 0 ? void 0 : input.sort.map((item, index) => {
       const rule = inputObject(item, `sort[${index}]`);
-      return compact({
+      return compactDefined({
         field: requireText(rule.field, `sort[${index}].field`),
-        direction: text(rule.direction)
+        direction: trimmedText(rule.direction)
       });
     }),
-    filterByFormula: text(input.filterByFormula),
-    maxRecords: integer(input.maxRecords),
-    pageSize: integer(input.pageSize),
-    offset: text(input.offset),
-    cellFormat: text(input.cellFormat),
-    timeZone: text(input.timeZone),
-    userLocale: text(input.userLocale),
-    returnFieldsByFieldId: boolean(input.returnFieldsByFieldId),
-    includeDateDependencyMetadata: boolean(input.includeDateDependencyMetadata),
+    filterByFormula: trimmedText(input.filterByFormula),
+    maxRecords: integerValue(input.maxRecords),
+    pageSize: integerValue(input.pageSize),
+    offset: trimmedText(input.offset),
+    cellFormat: trimmedText(input.cellFormat),
+    timeZone: trimmedText(input.timeZone),
+    userLocale: trimmedText(input.userLocale),
+    returnFieldsByFieldId: booleanValue(input.returnFieldsByFieldId),
+    includeDateDependencyMetadata: booleanValue(input.includeDateDependencyMetadata),
     recordMetadata: input.recordMetadata === void 0 ? void 0 : input.recordMetadata.map((item) => requireText(item, "recordMetadata item"))
   });
 }
@@ -184,12 +176,12 @@ function fieldConfig(value, label) {
   delete field.baseId;
   delete field.tableId;
   delete field.columnId;
-  return compact({
+  return compactDefined({
     ...field,
     name: requireText(field.name, `${label}.name`),
     type: requireText(field.type, `${label}.type`),
-    description: text(field.description),
-    options: record(field.options)
+    description: trimmedText(field.description),
+    options: asJsonObject(field.options)
   });
 }
 function fieldConfigs(value, label) {
@@ -202,21 +194,21 @@ function tableConfigs(value) {
   if (tables.length === 0) throw new TBError("invalid_argument", "tables is required");
   return tables.map((table, index) => {
     const config = inputObject(table, `tables[${index}]`);
-    return compact({
+    return compactDefined({
       ...config,
       name: requireText(config.name, `tables[${index}].name`),
-      description: text(config.description),
+      description: trimmedText(config.description),
       fields: fieldConfigs(config.fields, `tables[${index}].fields`)
     });
   });
 }
 function recordFields(value, label) {
-  const fields = record(value);
+  const fields = asJsonObject(value);
   if (fields === void 0) throw new TBError("invalid_argument", `${label} must be an object`);
   return fields;
 }
 async function listBases(input, ctx) {
-  const offset = text(input.offset);
+  const offset = trimmedText(input.offset);
   const payload = requireObject(
     await request(ctx, { path: BASES_PATH, query: offset === void 0 ? [] : [["offset", offset]] }),
     "airtable list bases response"
@@ -224,7 +216,7 @@ async function listBases(input, ctx) {
   return {
     bases: objectArray(payload.bases, "bases"),
     // 翻页靠它:没有下一页时给 null,压成 undefined 会让调用方分不清"到底了"。
-    offset: text(payload.offset) ?? null
+    offset: trimmedText(payload.offset) ?? null
   };
 }
 async function getBaseCollaborators(input, ctx) {
@@ -267,9 +259,9 @@ async function createTable(input, ctx) {
   const payload = await request(ctx, {
     method: "POST",
     path: `${BASES_PATH}/${encodeURIComponent(requireText(input.baseId, "baseId"))}/tables`,
-    body: compact({
+    body: compactDefined({
       name: requireText(input.name, "name"),
-      description: text(input.description),
+      description: trimmedText(input.description),
       fields: fieldConfigs(input.fields, "fields")
     })
   });
@@ -281,10 +273,10 @@ async function updateTable(input, ctx) {
   const payload = await request(ctx, {
     method: "PATCH",
     path: `${BASES_PATH}/${baseId}/tables/${table}`,
-    body: compact({
-      name: text(input.name),
-      description: text(input.description),
-      dateDependencySettings: record(input.dateDependencySettings)
+    body: compactDefined({
+      name: trimmedText(input.name),
+      description: trimmedText(input.description),
+      dateDependencySettings: asJsonObject(input.dateDependencySettings)
     })
   });
   return requireObject(payload, "airtable update table response");
@@ -306,10 +298,10 @@ async function updateField(input, ctx) {
   const payload = await request(ctx, {
     method: "PATCH",
     path: `${BASES_PATH}/${baseId}/tables/${tableId}/fields/${columnId}`,
-    body: compact({
-      name: text(input.name),
-      description: text(input.description),
-      options: record(input.options)
+    body: compactDefined({
+      name: trimmedText(input.name),
+      description: trimmedText(input.description),
+      options: asJsonObject(input.options)
     })
   });
   return requireObject(payload, "airtable update field response");
@@ -324,7 +316,7 @@ async function listRecords(input, ctx) {
   );
   return {
     records: objectArray(payload.records, "records"),
-    offset: text(payload.offset) ?? null
+    offset: trimmedText(payload.offset) ?? null
   };
 }
 async function getRecord(input, ctx) {
@@ -341,13 +333,13 @@ async function createRecords(input, ctx) {
     await request(ctx, {
       method: "POST",
       path: recordCollectionPath(input),
-      body: compact({
+      body: compactDefined({
         // 创建时只发 fields:带上 id 会被 Airtable 当成非法字段。
         records: records.map((item, index) => ({
           fields: recordFields(inputObject(item, `records[${index}]`).fields, `records[${index}].fields`)
         })),
-        typecast: boolean(input.typecast),
-        returnFieldsByFieldId: boolean(input.returnFieldsByFieldId)
+        typecast: booleanValue(input.typecast),
+        returnFieldsByFieldId: booleanValue(input.returnFieldsByFieldId)
       })
     }),
     "airtable create records response"
@@ -361,7 +353,7 @@ async function updateRecords(input, ctx) {
     await request(ctx, {
       method: "PATCH",
       path: recordCollectionPath(input),
-      body: compact({
+      body: compactDefined({
         records: records.map((item, index) => {
           const entry = inputObject(item, `records[${index}]`);
           return {
@@ -369,8 +361,8 @@ async function updateRecords(input, ctx) {
             fields: recordFields(entry.fields, `records[${index}].fields`)
           };
         }),
-        typecast: boolean(input.typecast),
-        returnFieldsByFieldId: boolean(input.returnFieldsByFieldId)
+        typecast: booleanValue(input.typecast),
+        returnFieldsByFieldId: booleanValue(input.returnFieldsByFieldId)
       })
     }),
     "airtable update records response"

package/dist/{alt_text_generator_ai-2CFYNSZV.js → alt_text_generator_ai-BHIJ4LW5.js}

@@ -1,17 +1,18 @@
+import {
+  createProviderHttpClient
+} from "./chunk-WW2IMPQK.js";
+import "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-NQ67PIIS.js";
-import {
-  guardedFetch
-} from "./chunk-KH663T3A.js";
-import "./chunk-UI4E4T5Q.js";
+} from "./chunk-YASUMV2K.js";
+import "./chunk-U5UHT7CX.js";
 import {
   TBError,
   external_exports
-} from "./chunk-DXXYNIXV.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-RVWZN3CI.js";
+import "./chunk-U67V476Y.js";
 
 // ../plugins/src/alt_text_generator_ai/schema.ts
 var generateAltTextInput = external_exports.strictObject({
@@ -31,7 +32,11 @@ var altTextGeneratorAiActions = {
 
 // ../plugins/src/alt_text_generator_ai/api.ts
 var SERVICE = "alt_text_generator_ai";
-var BASE_URL = "https://alttextgeneratorai.com";
+var http = createProviderHttpClient({
+  baseUrl: "https://alttextgeneratorai.com/",
+  crossOriginRedirect: "error",
+  service: SERVICE
+});
 function unwrapText(body) {
   const trimmed = body.trim();
   if (trimmed === "") return void 0;
@@ -43,16 +48,20 @@ function unwrapText(body) {
   return trimmed;
 }
 async function generateAltText(input, ctx) {
-  const response = await guardedFetch(`${BASE_URL}/api/wp`, {
+  const apiKey = requireApiKey(ctx, SERVICE);
+  const { data } = await http.request({
+    path: "api/wp",
     method: "POST",
-    headers: { "accept": "text/plain", "content-type": "application/json" },
-    body: JSON.stringify({ image: input.imageUrl ?? "", wpkey: requireApiKey(ctx, SERVICE) })
+    headers: { accept: "text/plain" },
+    json: { image: input.imageUrl ?? "", wpkey: apiKey },
+    responseType: "text",
+    sensitiveValues: [apiKey],
+    mapError: ({ data: body, status }) => upstreamError(
+      status,
+      typeof body === "string" && body.trim() !== "" ? body.trim() : `Alt Text Generator AI \u8FD4\u56DE HTTP ${status}`
+    )
   });
-  const body = await response.text();
-  if (!response.ok) {
-    throw upstreamError(response.status, body.trim() || `Alt Text Generator AI \u8FD4\u56DE HTTP ${response.status}`);
-  }
-  const altText = unwrapText(body);
+  const altText = unwrapText(data ?? "");
   if (altText === void 0) {
     throw new TBError("unavailable", "Alt Text Generator AI \u8FD4\u56DE\u4E86\u7A7A\u7ED3\u679C", { retryable: true });
   }