@tool-bridge/server 0.16.0 → 0.17.0

package/dist/{googledocs-HPCNQXYJ.js → googledocs-R5VA6CKD.js}

@@ -1,17 +1,23 @@
+import {
+  bytesToBase64
+} from "./chunk-LMLX3DJF.js";
+import {
+  asJsonObject,
+  compactDefined
+} from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-VK3V2WTY.js";
+} from "./chunk-YASUMV2K.js";
 import {
   guardedFetch
-} from "./chunk-2O27H4Y2.js";
-import "./chunk-GKX72JMJ.js";
+} from "./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/googledocs/api/shared.ts
 var SERVICE = "googledocs";
@@ -20,7 +26,6 @@ var DRIVE_API_BASE = "https://www.googleapis.com/drive/v3";
 var SHEETS_API_BASE = "https://sheets.googleapis.com/v4";
 var REQUEST_TIMEOUT_MS = 3e4;
 var MAX_ERROR_MESSAGE_LENGTH = 500;
-var BASE64_CHUNK = 8192;
 var RATE_LIMIT_REASONS = /* @__PURE__ */ new Set([
   "rateLimitExceeded",
   "userRateLimitExceeded",
@@ -41,17 +46,11 @@ var DRIVE_FILE_FIELDS = [
   "starred",
   "trashed"
 ].join(",");
-function record(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
-}
+var record = asJsonObject;
 function optionalText(value) {
   return value === void 0 || value === "" ? void 0 : value;
 }
-function compact(input) {
-  return Object.fromEntries(
-    Object.entries(input).filter((entry) => entry[1] !== void 0)
-  );
-}
+var compact = compactDefined;
 function requireRecord(value, label) {
   const result = record(value);
   if (result === void 0) throw new TBError("unavailable", `${label}\u4E0D\u662F\u5BF9\u8C61`, { retryable: true });
@@ -183,13 +182,6 @@ async function requestJson(ctx, input) {
 async function requestRecord(ctx, input) {
   return requireRecord(await requestJson(ctx, input), "Google Docs \u54CD\u5E94");
 }
-function base64(bytes) {
-  let binary = "";
-  for (let offset = 0; offset < bytes.length; offset += BASE64_CHUNK) {
-    binary += String.fromCharCode(...bytes.subarray(offset, offset + BASE64_CHUNK));
-  }
-  return btoa(binary);
-}
 async function runBatch(ctx, documentId, requests, writeControl) {
   const payload = await requestRecord(ctx, {
     url: `${DOCS_API_BASE}/documents/${documentId}:batchUpdate`,
@@ -617,7 +609,7 @@ async function exportDocumentAsPdf(input, ctx) {
     fileId,
     filename: filename === void 0 ? `${fileId}.pdf` : filename.endsWith(".pdf") ? filename : `${filename}.pdf`,
     mimeType: "application/pdf",
-    dataBase64: base64(bytes),
+    dataBase64: bytesToBase64(bytes),
     sizeBytes: bytes.byteLength
   };
 }

package/dist/{grafana-VOV24FIC.js → grafana-IT6DWIVB.js}

@@ -1,18 +1,26 @@
+import {
+  createProviderHttpClient
+} from "./chunk-WW2IMPQK.js";
+import {
+  asJsonObject,
+  booleanValue,
+  compactDefined,
+  integerValue,
+  trimmedText
+} from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-VK3V2WTY.js";
+} from "./chunk-YASUMV2K.js";
 import {
-  assertPublicHttpUrl,
-  guardedFetch
-} from "./chunk-2O27H4Y2.js";
-import "./chunk-GKX72JMJ.js";
+  assertPublicHttpUrl
+} from "./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/grafana/api.ts
 var SERVICE = "grafana";
@@ -25,47 +33,29 @@ var API_GROUPS = {
   folders: "folder.grafana.app"
 };
 var API_VERSION_CACHE_MAX = 256;
+var http = createProviderHttpClient({ service: SERVICE });
 var apiVersionCache = /* @__PURE__ */ new Map();
-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 integer(value) {
-  return typeof value === "number" && Number.isInteger(value) ? value : void 0;
-}
-function boolean(value) {
-  return typeof value === "boolean" ? value : void 0;
-}
-function compact(input) {
-  return Object.fromEntries(
-    Object.entries(input).filter(([, 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 requireObject(value, field) {
-  const object = record(value);
+  const object = asJsonObject(value);
   if (object === void 0) throw new TBError("invalid_argument", `${field} object is required`);
   return object;
 }
 function objectArray(value) {
   if (!Array.isArray(value)) return [];
   return value.flatMap((item) => {
-    const fields = record(item);
+    const fields = asJsonObject(item);
     return fields === void 0 ? [] : [fields];
   });
 }
 function stringArray(value) {
   if (value === void 0) return void 0;
   return value.flatMap((item) => {
-    const trimmed = text(item);
+    const trimmed = trimmedText(item);
     return trimmed === void 0 ? [] : [trimmed];
   });
 }
@@ -75,7 +65,7 @@ function configError(message) {
 function resolveBaseUrl(ctx) {
   const configured = ctx.config?.baseUrl;
   if (configured !== void 0 && typeof configured !== "string") throw configError("\u5FC5\u987B\u662F\u5B57\u7B26\u4E32");
-  const candidate = text(configured);
+  const candidate = trimmedText(configured);
   if (candidate === void 0) {
     throw configError(
       "\u662F\u5FC5\u914D\u9879:\u7ED9\u6302\u8F7D\u8282\u70B9\u914D providerConfig.baseUrl \u6307\u5411\u4F60\u7684 Grafana \u5B9E\u4F8B(\u5982 https://your-stack.grafana.net)\u3002Grafana \u6CA1\u6709\u516C\u5171\u7F3A\u7701\u5730\u5740,\u62FF\u4E0D\u5230\u5B83\u65E0\u6CD5\u51FA\u7AD9"
@@ -99,53 +89,36 @@ function resolveTarget(ctx) {
   return { apiKey: requireApiKey(ctx, SERVICE), baseUrl: resolveBaseUrl(ctx) };
 }
 function errorMessage(payload, status, statusText) {
-  const direct = text(payload);
+  const direct = trimmedText(payload);
   if (direct !== void 0) return direct;
-  const fields = record(payload);
-  const message = text(fields?.message) ?? text(fields?.error) ?? text(fields?.detail) ?? text(fields?.title);
-  return message ?? text(statusText) ?? `Grafana request failed with ${status}`;
-}
-function buildUrl(baseUrl, input) {
-  const url = new URL(input.path.replace(/^\/+/, ""), `${baseUrl}/`);
-  for (const [key, value] of Object.entries(input.query ?? {})) {
-    if (value !== void 0) url.searchParams.set(key, String(value));
-  }
-  for (const [key, values] of Object.entries(input.multiValueQuery ?? {})) {
-    for (const value of values ?? []) url.searchParams.append(key, value);
-  }
-  return url.toString();
-}
-function readPayload(body) {
-  if (body.trim() === "") return null;
-  try {
-    return JSON.parse(body);
-  } catch {
-    return body;
-  }
+  const fields = asJsonObject(payload);
+  const message = trimmedText(fields?.message) ?? trimmedText(fields?.error) ?? trimmedText(fields?.detail) ?? trimmedText(fields?.title);
+  return message ?? trimmedText(statusText) ?? `Grafana request failed with ${status}`;
 }
 async function request(target, input) {
-  let response;
-  let payload;
-  try {
-    response = await guardedFetch(buildUrl(target.baseUrl, input), {
-      method: input.method,
-      headers: {
-        accept: "application/json",
-        authorization: `Bearer ${target.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;
-    const detail = error instanceof Error ? error.message : "unknown network error";
-    throw upstreamError(502, `Grafana request failed: ${detail}`);
-  }
-  if (!response.ok) {
-    throw upstreamError(response.status, errorMessage(payload, response.status, response.statusText));
-  }
-  return payload;
+  const query = [
+    ...Object.entries(input.query ?? {}),
+    ...Object.entries(input.multiValueQuery ?? {})
+  ];
+  const result = await http.request({
+    // 尾斜杠保住实例部署上下文路径(`/grafana`)；薄层再强制 path 不得换 origin。
+    baseUrl: `${target.baseUrl}/`,
+    path: input.path,
+    method: input.method,
+    query,
+    headers: { accept: "application/json", authorization: `Bearer ${target.apiKey}` },
+    ...input.body === void 0 ? {} : { json: input.body },
+    invalidJson: "text",
+    mapError: ({ data, status, statusText }) => upstreamError(
+      status,
+      errorMessage(data, status, statusText)
+    ),
+    mapTransportError: ({ message }) => upstreamError(
+      502,
+      `Grafana request failed: ${message ?? "unknown network error"}`
+    )
+  });
+  return result.data === void 0 ? null : result.data;
 }
 function cacheApiVersion(key, version) {
   apiVersionCache.delete(key);
@@ -161,7 +134,7 @@ async function resolveApiVersion(target, group) {
   if (cached !== void 0) return cached;
   try {
     const payload = await request(target, { method: "GET", path: `/apis/${group}` });
-    const served = new Set(objectArray(record(payload)?.versions).map((entry) => text(entry.version)).filter((version) => version !== void 0));
+    const served = new Set(objectArray(asJsonObject(payload)?.versions).map((entry) => trimmedText(entry.version)).filter((version) => version !== void 0));
     const match = API_VERSION_PREFERENCE.find((version) => served.has(version));
     if (match !== void 0) {
       cacheApiVersion(key, match);
@@ -174,7 +147,7 @@ async function resolveApiVersion(target, group) {
 async function appPath(target, resource, namespace) {
   const group = API_GROUPS[resource];
   const version = await resolveApiVersion(target, group);
-  const ns = encodeURIComponent(text(namespace) ?? DEFAULT_NAMESPACE);
+  const ns = encodeURIComponent(trimmedText(namespace) ?? DEFAULT_NAMESPACE);
   return `/apis/${group}/${version}/namespaces/${ns}/${resource}`;
 }
 async function appResourcePath(target, resource, namespace, uid) {
@@ -183,56 +156,56 @@ async function appResourcePath(target, resource, namespace, uid) {
 }
 function resourceBody(input) {
   return {
-    metadata: compact({
-      name: text(input.uid),
-      generateName: text(input.generateName),
-      resourceVersion: text(input.resourceVersion),
+    metadata: compactDefined({
+      name: trimmedText(input.uid),
+      generateName: trimmedText(input.generateName),
+      resourceVersion: trimmedText(input.resourceVersion),
       annotations: input.parent === void 0 ? void 0 : { [FOLDER_PARENT_ANNOTATION]: input.parent }
     }),
     spec: input.spec
   };
 }
 function normalizeAppResource(value, parentKey) {
-  const fields = record(value) ?? {};
-  const metadata = record(fields.metadata) ?? {};
-  const spec = record(fields.spec) ?? {};
-  const annotations = record(metadata.annotations) ?? {};
+  const fields = asJsonObject(value) ?? {};
+  const metadata = asJsonObject(fields.metadata) ?? {};
+  const spec = asJsonObject(fields.spec) ?? {};
+  const annotations = asJsonObject(metadata.annotations) ?? {};
   return {
-    uid: text(metadata.name) ?? text(metadata.uid) ?? null,
-    title: text(spec.title) ?? null,
-    namespace: text(metadata.namespace) ?? null,
-    resourceVersion: text(metadata.resourceVersion) ?? null,
-    [parentKey]: text(annotations[FOLDER_PARENT_ANNOTATION]) ?? null,
+    uid: trimmedText(metadata.name) ?? trimmedText(metadata.uid) ?? null,
+    title: trimmedText(spec.title) ?? null,
+    namespace: trimmedText(metadata.namespace) ?? null,
+    resourceVersion: trimmedText(metadata.resourceVersion) ?? null,
+    [parentKey]: trimmedText(annotations[FOLDER_PARENT_ANNOTATION]) ?? null,
     raw: fields
   };
 }
 function normalizeSearchItem(value) {
   return {
     ...value,
-    id: integer(value.id) ?? null,
-    uid: text(value.uid) ?? null,
-    title: text(value.title) ?? null,
-    type: text(value.type) ?? null,
-    url: text(value.url) ?? null,
-    isStarred: boolean(value.isStarred) ?? null
+    id: integerValue(value.id) ?? null,
+    uid: trimmedText(value.uid) ?? null,
+    title: trimmedText(value.title) ?? null,
+    type: trimmedText(value.type) ?? null,
+    url: trimmedText(value.url) ?? null,
+    isStarred: booleanValue(value.isStarred) ?? null
   };
 }
 function normalizeDataSource(value) {
-  const fields = record(value) ?? {};
+  const fields = asJsonObject(value) ?? {};
   return {
     ...fields,
-    id: integer(fields.id) ?? null,
-    uid: text(fields.uid) ?? null,
-    name: text(fields.name) ?? null,
-    type: text(fields.type) ?? null,
-    access: text(fields.access) ?? null,
-    url: text(fields.url) ?? null,
-    isDefault: boolean(fields.isDefault) ?? null,
-    readOnly: boolean(fields.readOnly) ?? null
+    id: integerValue(fields.id) ?? null,
+    uid: trimmedText(fields.uid) ?? null,
+    name: trimmedText(fields.name) ?? null,
+    type: trimmedText(fields.type) ?? null,
+    access: trimmedText(fields.access) ?? null,
+    url: trimmedText(fields.url) ?? null,
+    isDefault: booleanValue(fields.isDefault) ?? null,
+    readOnly: booleanValue(fields.readOnly) ?? null
   };
 }
 function deleted(payload) {
-  return { deleted: true, raw: record(payload) ?? null };
+  return { deleted: true, raw: asJsonObject(payload) ?? null };
 }
 function dataSourcePath(uid) {
   return `/api/datasources/uid/${encodeURIComponent(requireText(uid, "uid"))}`;
@@ -243,12 +216,12 @@ async function listFolders(input, ctx) {
     method: "GET",
     path: await appPath(target, "folders", input.namespace),
     // Kubernetes 风格的分页:游标叫 `continue`,入参里叫 `continueToken`。
-    query: compact({ limit: input.limit, continue: text(input.continueToken) })
+    query: compactDefined({ limit: input.limit, continue: trimmedText(input.continueToken) })
   });
-  const fields = record(payload) ?? {};
+  const fields = asJsonObject(payload) ?? {};
   return {
     folders: objectArray(fields.items).map((item) => normalizeAppResource(item, "parentUid")),
-    continueToken: text(record(fields.metadata)?.continue) ?? null,
+    continueToken: trimmedText(asJsonObject(fields.metadata)?.continue) ?? null,
     raw: fields
   };
 }
@@ -268,7 +241,7 @@ async function createFolder(input, ctx) {
     body: resourceBody({
       uid: input.uid,
       generateName: input.generateName,
-      parent: text(input.parentUid),
+      parent: trimmedText(input.parentUid),
       spec: { title: requireText(input.title, "title") }
     })
   });
@@ -284,7 +257,7 @@ async function updateFolder(input, ctx) {
     body: resourceBody({
       uid,
       resourceVersion: input.resourceVersion,
-      parent: text(input.parentUid),
+      parent: trimmedText(input.parentUid),
       spec: { title: requireText(input.title, "title") }
     })
   });
@@ -302,9 +275,9 @@ async function searchDashboards(input, ctx) {
   const payload = await request(resolveTarget(ctx), {
     method: "GET",
     path: "/api/search",
-    query: compact({
-      query: text(input.query),
-      type: text(input.type),
+    query: compactDefined({
+      query: trimmedText(input.query),
+      type: trimmedText(input.type),
       starred: input.starred,
       limit: input.limit,
       page: input.page
@@ -334,7 +307,7 @@ async function createDashboard(input, ctx) {
     body: resourceBody({
       uid: input.uid,
       generateName: input.generateName,
-      parent: text(input.folderUid),
+      parent: trimmedText(input.folderUid),
       spec: requireObject(input.spec, "spec")
     })
   });
@@ -349,7 +322,7 @@ async function updateDashboard(input, ctx) {
     body: resourceBody({
       uid,
       resourceVersion: input.resourceVersion,
-      parent: text(input.folderUid),
+      parent: trimmedText(input.folderUid),
       spec: requireObject(input.spec, "spec")
     })
   });
@@ -379,8 +352,8 @@ async function createDataSource(input, ctx) {
     body: requireObject(input.dataSource, "dataSource")
   });
   return {
-    dataSource: normalizeDataSource(record(payload)?.datasource ?? payload),
-    raw: record(payload) ?? {}
+    dataSource: normalizeDataSource(asJsonObject(payload)?.datasource ?? payload),
+    raw: asJsonObject(payload) ?? {}
   };
 }
 async function updateDataSource(input, ctx) {
@@ -390,8 +363,8 @@ async function updateDataSource(input, ctx) {
     body: requireObject(input.dataSource, "dataSource")
   });
   return {
-    dataSource: normalizeDataSource(record(payload)?.datasource ?? payload),
-    raw: record(payload) ?? {}
+    dataSource: normalizeDataSource(asJsonObject(payload)?.datasource ?? payload),
+    raw: asJsonObject(payload) ?? {}
   };
 }
 async function deleteDataSource(input, ctx) {
@@ -408,14 +381,14 @@ async function getAlertRule(input, ctx) {
     method: "GET",
     path: `/api/v1/provisioning/alert-rules/${uid}`
   });
-  return { alertRule: record(payload) ?? {} };
+  return { alertRule: asJsonObject(payload) ?? {} };
 }
 async function listAlertInstances(input, ctx) {
   const payload = await request(resolveTarget(ctx), {
     method: "GET",
     // 内置 Alertmanager 的 v2 端点,与 App Platform 的版本协商无关。
     path: "/api/alertmanager/grafana/api/v2/alerts",
-    query: compact({ active: input.active, silenced: input.silenced, inhibited: input.inhibited })
+    query: compactDefined({ active: input.active, silenced: input.silenced, inhibited: input.inhibited })
   });
   return { alertInstances: objectArray(payload) };
 }

package/dist/{graphhopper-D5RXW6AP.js → graphhopper-TYFDJZWC.js}

@@ -1,75 +1,61 @@
+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/graphhopper/api.ts
 var SERVICE = "graphhopper";
 var API_BASE = "https://graphhopper.com";
 var API_PREFIX = "/api/1";
-function record(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
-}
+var http = createProviderHttpClient({ baseUrl: `${API_BASE}${API_PREFIX}/`, service: SERVICE });
 function text(value) {
   return typeof value === "string" && value.trim() !== "" ? value : void 0;
 }
-function errorMessage(payload, response) {
+function errorMessage(payload, context) {
   if (typeof payload === "string" && payload.trim() !== "") return payload;
-  const body = record(payload);
+  const body = asJsonObject(payload);
   if (body !== void 0) {
     const direct = text(body.message) ?? text(body.error) ?? text(body.details);
     if (direct !== void 0) return direct;
     if (Array.isArray(body.hints)) {
       for (const hint of body.hints) {
-        const message = text(record(hint)?.message);
+        const message = text(asJsonObject(hint)?.message);
         if (message !== void 0) return message;
       }
     }
   }
-  return text(response.statusText) ?? "GraphHopper request failed";
+  return text(context.statusText) ?? "GraphHopper request failed";
 }
 async function request(ctx, path, query) {
-  const url = new URL(`${API_PREFIX}${path}`, API_BASE);
-  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, String(item));
-      continue;
-    }
-    url.searchParams.set(key, String(value));
-  }
-  url.searchParams.set("key", requireApiKey(ctx, SERVICE));
-  let response;
-  let payload = null;
-  try {
-    response = await guardedFetch(url.toString(), {
-      method: "GET",
-      headers: { accept: "application/json" }
-    });
-    const raw = await response.text();
-    if (raw.trim() !== "") {
-      try {
-        payload = JSON.parse(raw);
-      } catch {
-        payload = raw;
-      }
-    }
-  } catch (error) {
-    const message = error instanceof Error ? `GraphHopper request failed: ${error.message}` : "GraphHopper request failed";
-    throw upstreamError(502, message);
-  }
-  if (!response.ok) throw upstreamError(response.status, errorMessage(payload, response));
-  return payload;
+  const result = await http.request({
+    path,
+    method: "GET",
+    query: [
+      ...Object.entries(query),
+      ["key", requireApiKey(ctx, SERVICE)]
+    ],
+    headers: { accept: "application/json" },
+    invalidJson: "text",
+    mapError: (context) => upstreamError(context.status, errorMessage(context.data, context)),
+    mapTransportError: ({ message }) => upstreamError(
+      502,
+      message === void 0 ? "GraphHopper request failed" : `GraphHopper request failed: ${message}`
+    )
+  });
+  return result.bodyKind === "empty" ? null : result.data;
 }
 async function calculateRoute(input, ctx) {
   return request(ctx, "/route", {
@@ -159,7 +145,7 @@ async function computeIsochrone(input, ctx) {
 async function listProfiles(_input, ctx) {
   const payload = await request(ctx, "/profiles", {});
   if (Array.isArray(payload)) return { profiles: payload };
-  const profiles = record(payload)?.profiles;
+  const profiles = asJsonObject(payload)?.profiles;
   return { profiles: Array.isArray(profiles) ? profiles : [] };
 }