@nimbus-dev/connectors 0.2.1 → 0.2.2

package/connectors/dataprofile/src/profile.ts

@@ -1,6 +1,6 @@
 import type { FileHandle } from "node:fs/promises";
-import { open, readdir } from "node:fs/promises";
-import { isAbsolute, join, relative, resolve, sep } from "node:path";
+import { open } from "node:fs/promises";
+import { relative, resolve } from "node:path";
 import {
   type DataColumn,
   firstLineAndRows,
@@ -10,6 +10,8 @@ import {
   parseJsonColumns,
   parseJsonlColumns,
 } from "@nimbus-dev/sdk";
+import { requiredEnv } from "../../../shared/env-json-api.ts";
+import { assertWithinDir, walkFiles } from "../../../shared/walk-files.ts";
 
 /**
  * Local data profiling reader (Tier-5, no-row-data). The MCP-server-side
@@ -53,21 +55,11 @@ export interface DataModel {
 }
 
 export function dataDir(): string {
-  const dir = process.env["DATAPROFILE_DIR"]?.trim();
-  if (dir === undefined || dir === "") {
-    throw new Error("DATAPROFILE_DIR is not set");
-  }
-  return resolve(dir);
+  return resolve(requiredEnv("DATAPROFILE_DIR"));
 }
 
 export function assertWithinDataDir(candidate: string, root: string): void {
-  const rel = relative(root, candidate);
-  if (rel === "") {
-    return;
-  }
-  if (rel.startsWith("..") || rel.startsWith(`..${sep}`) || isAbsolute(rel)) {
-    throw new Error("path escapes the configured data-profile dir");
-  }
+  assertWithinDir(candidate, root, "the configured data-profile dir");
 }
 
 function extOf(name: string): string {
@@ -218,37 +210,15 @@ async function profileFile(
   };
 }
 
-async function collectDataFiles(
-  root: string,
-): Promise<Array<{ path: string; format: DataFileFormat }>> {
-  const found: Array<{ path: string; format: DataFileFormat }> = [];
-  async function walk(dir: string, depth: number): Promise<void> {
-    if (depth > MAX_WALK_DEPTH || found.length >= MAX_FILES) {
-      return;
-    }
-    let entries: import("node:fs").Dirent[];
-    try {
-      entries = await readdir(dir, { withFileTypes: true });
-    } catch {
-      return;
-    }
-    for (const entry of entries) {
-      if (found.length >= MAX_FILES) {
-        return;
-      }
-      const full = join(dir, entry.name);
-      if (entry.isDirectory()) {
-        await walk(full, depth + 1);
-      } else if (entry.isFile()) {
-        const format = EXT_FORMAT[extOf(entry.name)];
-        if (format !== undefined) {
-          found.push({ path: full, format });
-        }
-      }
-    }
-  }
-  await walk(root, 0);
-  return found;
+function collectDataFiles(root: string): Promise<Array<{ path: string; format: DataFileFormat }>> {
+  return walkFiles(root, {
+    maxFiles: MAX_FILES,
+    maxDepth: MAX_WALK_DEPTH,
+    select: (entry, full) => {
+      const format = EXT_FORMAT[extOf(entry.name)];
+      return format === undefined ? undefined : { path: full, format };
+    },
+  });
 }
 
 /** Profile all data files under the configured dir into schema-only `DataModel` views. */
@@ -260,7 +230,7 @@ export async function listDataModels(
   const out: DataModel[] = [];
   for (const { path, format } of files) {
     assertWithinDataDir(path, root);
-    const model = await profileFile(path, root, format, readParquet);
+    const model = await profileFile(path, root, format, readParquet); // NOSONAR S9382: one file at a time on purpose — up to MAX_FILES (2000) files, a text file read whole up to 64 MiB, so a fan-out could hold gigabytes and thousands of open handles at once.
     if (model !== null) {
       out.push(model);
     }

package/connectors/dbt/src/server.ts

@@ -1,96 +1,6 @@
-import { z } from "zod";
-import { mcpJsonResult as jsonResult } from "../../../shared/mcp-tool-kit.ts";
 import { runReadOnlyMcpConnector } from "../../../shared/run-read-only-mcp-connector.ts";
-import { filterDbtJobs } from "./search-filter.ts";
-
-const DEFAULT_API_BASE = "https://cloud.getdbt.com";
-
-function trimTrailingSlash(s: string): string {
-  return s.endsWith("/") ? s.slice(0, -1) : s;
-}
-
-function apiBase(): string {
-  const v = process.env["DBT_API_BASE"]?.trim();
-  return v === undefined || v === "" ? DEFAULT_API_BASE : trimTrailingSlash(v);
-}
-
-function authHeader(): Record<string, string> {
-  const t = process.env["DBT_TOKEN"]?.trim();
-  if (t === undefined || t === "") {
-    throw new Error("DBT_TOKEN is not set");
-  }
-  return { Authorization: `Token ${t}`, Accept: "application/json" };
-}
-
-async function dbtGet(path: string): Promise<unknown> {
-  const res = await fetch(`${apiBase()}/api/v2${path}`, { headers: authHeader() });
-  const text = await res.text();
-  if (!res.ok) {
-    throw new Error(`dbt Cloud ${String(res.status)}: ${text.slice(0, 400)}`);
-  }
-  return JSON.parse(text) as unknown;
-}
-
-function dataFrom(root: unknown): unknown[] {
-  if (Array.isArray(root)) {
-    return root;
-  }
-  const data = (root as { data?: unknown } | null)?.data;
-  return Array.isArray(data) ? data : [];
-}
+import { registerDbtTools } from "./tools.ts";
 
 await runReadOnlyMcpConnector("nimbus-dbt", (reg) => {
-  reg(
-    "dbt_list",
-    "List dbt Cloud accounts, or jobs for an account. Without `accountId`, returns the account's accounts (`/accounts/`). With `accountId`, returns that account's jobs (`/accounts/{accountId}/jobs/`), capped at `limit` (default 100). Returns the raw dbt Cloud envelope (`{ data: [...] }`).",
-    z.object({
-      accountId: z.number().int().optional(),
-      limit: z.number().int().min(1).max(500).optional(),
-    }),
-    async (p) => {
-      if (p.accountId === undefined) {
-        return jsonResult(await dbtGet("/accounts/"));
-      }
-      const search = new URLSearchParams({ limit: String(p.limit ?? 100) });
-      return jsonResult(
-        await dbtGet(
-          `/accounts/${encodeURIComponent(String(p.accountId))}/jobs/?${search.toString()}`,
-        ),
-      );
-    },
-  );
-
-  reg(
-    "dbt_get",
-    "Fetch one dbt Cloud job by `accountId` + `jobId` (`/accounts/{accountId}/jobs/{jobId}/`). Returns the raw dbt Cloud envelope. Throws when no such job exists.",
-    z.object({
-      accountId: z.number().int(),
-      jobId: z.number().int(),
-    }),
-    async (p) => {
-      return jsonResult(
-        await dbtGet(
-          `/accounts/${encodeURIComponent(String(p.accountId))}/jobs/${encodeURIComponent(String(p.jobId))}/`,
-        ),
-      );
-    },
-  );
-
-  reg(
-    "dbt_search",
-    "Substring search across an account's dbt Cloud jobs. Matches the query against job name, dbt version, and id (case-insensitive). Returns a `{ matches: [...] }` envelope.",
-    z.object({
-      accountId: z.number().int(),
-      query: z.string().min(1),
-      limit: z.number().int().min(1).max(200).optional(),
-    }),
-    async (p) => {
-      const search = new URLSearchParams({ limit: "500" });
-      const root = await dbtGet(
-        `/accounts/${encodeURIComponent(String(p.accountId))}/jobs/?${search.toString()}`,
-      );
-      const matches = filterDbtJobs(dataFrom(root), { query: p.query, limit: p.limit });
-      return jsonResult({ matches });
-    },
-  );
+  registerDbtTools(reg);
 });

package/connectors/dbt/src/tools.ts

@@ -0,0 +1,80 @@
+import { z } from "zod";
+import { createJsonGetter, envAuthHeaders, optionalBaseUrl } from "../../../shared/env-json-api.ts";
+import { mcpJsonResult as jsonResult } from "../../../shared/mcp-tool-kit.ts";
+import type { ZodToolRegistrar } from "../../../shared/run-read-only-mcp-connector.ts";
+import { filterDbtJobs } from "./search-filter.ts";
+
+const DEFAULT_API_BASE = "https://cloud.getdbt.com";
+
+const dbtGet = createJsonGetter({
+  base: () => `${optionalBaseUrl("DBT_API_BASE", DEFAULT_API_BASE)}/api/v2`,
+  label: "dbt Cloud",
+  headers: envAuthHeaders({ env: "DBT_TOKEN", scheme: "Token" }),
+});
+
+function dataFrom(root: unknown): unknown[] {
+  if (Array.isArray(root)) {
+    return root;
+  }
+  const data = (root as { data?: unknown } | null)?.data;
+  return Array.isArray(data) ? data : [];
+}
+
+/** Tool names exposed by this connector — for contract/introspection tests. */
+export const DBT_TOOL_NAMES = ["dbt_get", "dbt_list", "dbt_search"] as const;
+
+export function registerDbtTools(reg: ZodToolRegistrar): void {
+  reg(
+    "dbt_list",
+    "List dbt Cloud accounts, or jobs for an account. Without `accountId`, returns the account's accounts (`/accounts/`). With `accountId`, returns that account's jobs (`/accounts/{accountId}/jobs/`), capped at `limit` (default 100). Returns the raw dbt Cloud envelope (`{ data: [...] }`).",
+    z.object({
+      accountId: z.number().int().optional(),
+      limit: z.number().int().min(1).max(500).optional(),
+    }),
+    async (p) => {
+      if (p.accountId === undefined) {
+        return jsonResult(await dbtGet("/accounts/"));
+      }
+      const search = new URLSearchParams({ limit: String(p.limit ?? 100) });
+      return jsonResult(
+        await dbtGet(
+          `/accounts/${encodeURIComponent(String(p.accountId))}/jobs/?${search.toString()}`,
+        ),
+      );
+    },
+  );
+
+  reg(
+    "dbt_get",
+    "Fetch one dbt Cloud job by `accountId` + `jobId` (`/accounts/{accountId}/jobs/{jobId}/`). Returns the raw dbt Cloud envelope. Throws when no such job exists.",
+    z.object({
+      accountId: z.number().int(),
+      jobId: z.number().int(),
+    }),
+    async (p) => {
+      return jsonResult(
+        await dbtGet(
+          `/accounts/${encodeURIComponent(String(p.accountId))}/jobs/${encodeURIComponent(String(p.jobId))}/`,
+        ),
+      );
+    },
+  );
+
+  reg(
+    "dbt_search",
+    "Substring search across an account's dbt Cloud jobs. Matches the query against job name, dbt version, and id (case-insensitive). Returns a `{ matches: [...] }` envelope.",
+    z.object({
+      accountId: z.number().int(),
+      query: z.string().min(1),
+      limit: z.number().int().min(1).max(200).optional(),
+    }),
+    async (p) => {
+      const search = new URLSearchParams({ limit: "500" });
+      const root = await dbtGet(
+        `/accounts/${encodeURIComponent(String(p.accountId))}/jobs/?${search.toString()}`,
+      );
+      const matches = filterDbtJobs(dataFrom(root), { query: p.query, limit: p.limit });
+      return jsonResult({ matches });
+    },
+  );
+}

package/connectors/dependencytrack/src/server.ts

@@ -1,80 +1,6 @@
-import { z } from "zod";
-import { searchToolInputSchema } from "../../../shared/mcp-search-tool.ts";
-import { mcpJsonResult as jsonResult } from "../../../shared/mcp-tool-kit.ts";
 import { runReadOnlyMcpConnector } from "../../../shared/run-read-only-mcp-connector.ts";
-import { filterDependencyTrackProjects } from "./search-filter.ts";
-
-function trimTrailingSlash(s: string): string {
-  return s.endsWith("/") ? s.slice(0, -1) : s;
-}
-
-function apiBase(): string {
-  const v = process.env["DEPENDENCYTRACK_URL"]?.trim();
-  if (v === undefined || v === "") {
-    throw new Error("DEPENDENCYTRACK_URL is not set");
-  }
-  return trimTrailingSlash(v);
-}
-
-function authHeader(): Record<string, string> {
-  const k = process.env["DEPENDENCYTRACK_API_KEY"]?.trim();
-  if (k === undefined || k === "") {
-    throw new Error("DEPENDENCYTRACK_API_KEY is not set");
-  }
-  return { "X-Api-Key": k, Accept: "application/json" };
-}
-
-async function dtGet(path: string): Promise<unknown> {
-  const res = await fetch(`${apiBase()}${path}`, { headers: authHeader() });
-  const text = await res.text();
-  if (!res.ok) {
-    throw new Error(`Dependency-Track ${String(res.status)}: ${text.slice(0, 400)}`);
-  }
-  return JSON.parse(text) as unknown;
-}
-
-function projectsFrom(root: unknown): unknown[] {
-  return Array.isArray(root) ? root : [];
-}
+import { registerDependencytrackTools } from "./tools.ts";
 
 await runReadOnlyMcpConnector("nimbus-dependencytrack", (reg) => {
-  reg(
-    "dependencytrack_list",
-    "List Dependency-Track projects (GET /api/v1/project?pageSize=100&pageNumber=1&excludeInactive=false). Dependency-Track returns a JSON array of project objects, each embedding its current vulnerability metrics. The optional pageNumber arg (default 1) selects the page; pageSize is fixed at 100.",
-    z.object({
-      pageNumber: z.number().int().min(1).optional(),
-    }),
-    async (p) => {
-      const page = p.pageNumber ?? 1;
-      const root = await dtGet(
-        `/api/v1/project?pageSize=100&pageNumber=${encodeURIComponent(String(page))}&excludeInactive=false`,
-      );
-      return jsonResult({ items: projectsFrom(root) });
-    },
-  );
-
-  reg(
-    "dependencytrack_get",
-    "Fetch one Dependency-Track project by its UUID (GET /api/v1/project/{uuid}). Returns the project object directly (NOT wrapped in an array). Throws when no project with that UUID exists.",
-    z.object({
-      uuid: z.string().min(1),
-    }),
-    async (p) => {
-      return jsonResult(await dtGet(`/api/v1/project/${encodeURIComponent(p.uuid)}`));
-    },
-  );
-
-  reg(
-    "dependencytrack_search",
-    "Substring search across the first page of Dependency-Track projects. Matches the query (case-insensitive) against the project name, version, classifier, and tag names. Returns a matches envelope.",
-    searchToolInputSchema(100),
-    async (p) => {
-      const root = await dtGet("/api/v1/project?pageSize=100&pageNumber=1&excludeInactive=false");
-      const matches = filterDependencyTrackProjects(projectsFrom(root), {
-        query: p.query,
-        limit: p.limit,
-      });
-      return jsonResult({ matches });
-    },
-  );
+  registerDependencytrackTools(reg);
 });

package/connectors/dependencytrack/src/tools.ts

@@ -0,0 +1,65 @@
+import { z } from "zod";
+import { createJsonGetter, envAuthHeaders, requiredBaseUrl } from "../../../shared/env-json-api.ts";
+import { searchToolInputSchema } from "../../../shared/mcp-search-tool.ts";
+import { mcpJsonResult as jsonResult } from "../../../shared/mcp-tool-kit.ts";
+import type { ZodToolRegistrar } from "../../../shared/run-read-only-mcp-connector.ts";
+import { filterDependencyTrackProjects } from "./search-filter.ts";
+
+const dtGet = createJsonGetter({
+  base: () => requiredBaseUrl("DEPENDENCYTRACK_URL"),
+  label: "Dependency-Track",
+  headers: envAuthHeaders({ env: "DEPENDENCYTRACK_API_KEY", scheme: "", header: "X-Api-Key" }),
+});
+
+function projectsFrom(root: unknown): unknown[] {
+  return Array.isArray(root) ? root : [];
+}
+
+/** Tool names exposed by this connector — for contract/introspection tests. */
+export const DEPENDENCYTRACK_TOOL_NAMES = [
+  "dependencytrack_list",
+  "dependencytrack_get",
+  "dependencytrack_search",
+] as const;
+
+export function registerDependencytrackTools(reg: ZodToolRegistrar): void {
+  reg(
+    "dependencytrack_list",
+    "List Dependency-Track projects (GET /api/v1/project?pageSize=100&pageNumber=1&excludeInactive=false). Dependency-Track returns a JSON array of project objects, each embedding its current vulnerability metrics. The optional pageNumber arg (default 1) selects the page; pageSize is fixed at 100.",
+    z.object({
+      pageNumber: z.number().int().min(1).optional(),
+    }),
+    async (p) => {
+      const page = p.pageNumber ?? 1;
+      const root = await dtGet(
+        `/api/v1/project?pageSize=100&pageNumber=${encodeURIComponent(String(page))}&excludeInactive=false`,
+      );
+      return jsonResult({ items: projectsFrom(root) });
+    },
+  );
+
+  reg(
+    "dependencytrack_get",
+    "Fetch one Dependency-Track project by its UUID (GET /api/v1/project/{uuid}). Returns the project object directly (NOT wrapped in an array). Throws when no project with that UUID exists.",
+    z.object({
+      uuid: z.string().min(1),
+    }),
+    async (p) => {
+      return jsonResult(await dtGet(`/api/v1/project/${encodeURIComponent(p.uuid)}`));
+    },
+  );
+
+  reg(
+    "dependencytrack_search",
+    "Substring search across the first page of Dependency-Track projects. Matches the query (case-insensitive) against the project name, version, classifier, and tag names. Returns a matches envelope.",
+    searchToolInputSchema(100),
+    async (p) => {
+      const root = await dtGet("/api/v1/project?pageSize=100&pageNumber=1&excludeInactive=false");
+      const matches = filterDependencyTrackProjects(projectsFrom(root), {
+        query: p.query,
+        limit: p.limit,
+      });
+      return jsonResult({ matches });
+    },
+  );
+}

package/connectors/discord/src/server.ts

@@ -1,93 +1,10 @@
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { z } from "zod";
-
-import { createRegisterSimpleTool, createZodToolRegistrar } from "../../../shared/mcp-tool-kit.ts";
-import { makeRestToolRegistrar } from "../../../shared/rest-tool-kit.ts";
-
-const DISCORD_API = "https://discord.com/api/v10";
-
-async function discordFetch(
-  token: string,
-  path: string,
-  init?: RequestInit,
-): Promise<{
-  ok: boolean;
-  status: number;
-  json: unknown;
-  text: string;
-}> {
-  const url = path.startsWith("http") ? path : `${DISCORD_API}${path}`;
-  const res = await fetch(url, {
-    ...init,
-    headers: {
-      Authorization: `Bot ${token}`,
-      "User-Agent": "NimbusMCP (https://github.com/nimbus-dev/nimbus)",
-      ...(init?.headers as Record<string, string> | undefined),
-    },
-  });
-  const text = await res.text();
-  let json: unknown;
-  try {
-    json = JSON.parse(text) as unknown;
-  } catch {
-    json = null;
-  }
-  return { ok: res.ok, status: res.status, json, text };
-}
+import { registerDiscordTools } from "./tools.ts";
 
 const server = new McpServer({ name: "nimbus-discord", version: "0.1.0" });
 
-const registerSimpleTool = createRegisterSimpleTool(server);
-const reg = createZodToolRegistrar(registerSimpleTool);
-
-/** Standard Discord read tool: token → discordFetch(buildPath) → mcpJsonResultIfOk("Discord"). */
-const registerDiscordTool = makeRestToolRegistrar({
-  registrar: reg,
-  tokenEnv: "DISCORD_BOT_TOKEN",
-  serviceLabel: "Discord",
-  fetch: discordFetch,
-});
-
-registerDiscordTool(
-  "discord_guild_list",
-  "List guilds the bot is a member of.",
-  z.object({}),
-  () => "/users/@me/guilds",
-);
-
-registerDiscordTool(
-  "discord_channel_list",
-  "List channels in a guild (id, type, name).",
-  z.object({ guildId: z.string().min(1) }),
-  (parsed) => `/guilds/${encodeURIComponent(parsed.guildId)}/channels`,
-);
-
-registerDiscordTool(
-  "discord_channel_messages",
-  "List recent messages in a channel (newest first). Optional `after` snowflake for incremental fetch.",
-  z.object({
-    channelId: z.string().min(1),
-    limit: z.number().int().min(1).max(100).optional(),
-    after: z.string().optional(),
-  }),
-  (parsed) => {
-    const lim = parsed.limit ?? 50;
-    const u = new URL(`${DISCORD_API}/channels/${encodeURIComponent(parsed.channelId)}/messages`);
-    u.searchParams.set("limit", String(lim));
-    if (parsed.after !== undefined && parsed.after !== "") {
-      u.searchParams.set("after", parsed.after);
-    }
-    return `${u.pathname}${u.search}`;
-  },
-);
-
-registerDiscordTool(
-  "discord_thread_list",
-  "List active threads in a guild (includes public threads the bot can see).",
-  z.object({ guildId: z.string().min(1) }),
-  (parsed) => `/guilds/${encodeURIComponent(parsed.guildId)}/threads/active`,
-);
+registerDiscordTools(server);
 
 const transport = new StdioServerTransport();
 await server.connect(transport);

package/connectors/discord/src/tools.ts

@@ -0,0 +1,82 @@
+import { z } from "zod";
+import { createRegisterSimpleTool, createZodToolRegistrar } from "../../../shared/mcp-tool-kit.ts";
+import {
+  makeRestToolRegistrar,
+  type RestFetchResult,
+  toRestFetchResult,
+} from "../../../shared/rest-tool-kit.ts";
+
+const DISCORD_API = "https://discord.com/api/v10";
+
+async function discordFetch(
+  token: string,
+  path: string,
+  init?: RequestInit,
+): Promise<RestFetchResult> {
+  const url = path.startsWith("http") ? path : `${DISCORD_API}${path}`;
+  const res = await fetch(url, {
+    ...init,
+    headers: {
+      Authorization: `Bot ${token}`,
+      "User-Agent": "NimbusMCP (https://github.com/nimbus-dev/nimbus)",
+      ...(init?.headers as Record<string, string> | undefined),
+    },
+  });
+  return toRestFetchResult(res);
+}
+
+export function registerDiscordTools(server: { tool: (...args: never) => unknown }): void {
+  const registerSimpleTool = createRegisterSimpleTool(server);
+  const reg = createZodToolRegistrar(registerSimpleTool);
+
+  /** Standard Discord read tool: token → discordFetch(buildPath) → mcpJsonResultIfOk("Discord"). */
+  const registerDiscordTool = makeRestToolRegistrar({
+    registrar: reg,
+    tokenEnv: "DISCORD_BOT_TOKEN",
+    serviceLabel: "Discord",
+    fetch: discordFetch,
+  });
+
+  registerDiscordTool(
+    "discord_guild_list",
+    "List guilds the bot is a member of.",
+    z.object({}),
+    () => "/users/@me/guilds",
+  );
+
+  registerDiscordTool(
+    "discord_channel_list",
+    "List channels in a guild (id, type, name).",
+    z.object({ guildId: z.string().min(1) }),
+    (parsed) => `/guilds/${encodeURIComponent(parsed.guildId)}/channels`,
+  );
+
+  registerDiscordTool(
+    "discord_channel_messages",
+    "List recent messages in a channel (newest first). Optional `after` snowflake for incremental fetch.",
+    z.object({
+      channelId: z.string().min(1),
+      limit: z.number().int().min(1).max(100).optional(),
+      after: z.string().optional(),
+    }),
+    (parsed) => {
+      const lim = parsed.limit ?? 50;
+      const path = `/channels/${encodeURIComponent(parsed.channelId)}/messages`;
+      const u = new URL(`${DISCORD_API}${path}`);
+      u.searchParams.set("limit", String(lim));
+      if (parsed.after !== undefined && parsed.after !== "") {
+        u.searchParams.set("after", parsed.after);
+      }
+      // Relative to DISCORD_API, like every other tool here: the fetcher prefixes the base, which
+      // already ends in /api/v10, so returning `u.pathname` requested /api/v10/api/v10/….
+      return `${path}${u.search}`;
+    },
+  );
+
+  registerDiscordTool(
+    "discord_thread_list",
+    "List active threads in a guild (includes public threads the bot can see).",
+    z.object({ guildId: z.string().min(1) }),
+    (parsed) => `/guilds/${encodeURIComponent(parsed.guildId)}/threads/active`,
+  );
+}

package/connectors/elasticsearch/src/tools.ts

@@ -1,4 +1,6 @@
 import { z } from "zod";
+import { isRecord, strField } from "../../../shared/cli-json-kit.ts";
+import { createJsonGetter, envAuthHeaders, requiredBaseUrl } from "../../../shared/env-json-api.ts";
 import { mcpJsonResult as jsonResult } from "../../../shared/mcp-tool-kit.ts";
 import type { ZodToolRegistrar } from "../../../shared/run-read-only-mcp-connector.ts";
 
@@ -18,43 +20,11 @@ export const ELASTICSEARCH_TOOL_NAMES = [
   "elasticsearch_search",
 ] as const;
 
-function trimTrailingSlash(s: string): string {
-  return s.endsWith("/") ? s.slice(0, -1) : s;
-}
-
-function baseUrl(): string {
-  const v = process.env["ELASTICSEARCH_URL"]?.trim();
-  if (v === undefined || v === "") {
-    throw new Error("ELASTICSEARCH_URL is not set");
-  }
-  return trimTrailingSlash(v);
-}
-
-function authHeaders(): Record<string, string> {
-  const k = process.env["ELASTICSEARCH_API_KEY"]?.trim();
-  if (k === undefined || k === "") {
-    throw new Error("ELASTICSEARCH_API_KEY is not set");
-  }
-  return { Authorization: `ApiKey ${k}`, Accept: "application/json" };
-}
-
-async function esGet(path: string): Promise<unknown> {
-  const res = await fetch(`${baseUrl()}${path}`, { headers: authHeaders() });
-  const text = await res.text();
-  if (!res.ok) {
-    throw new Error(`Elasticsearch ${String(res.status)}: ${text.slice(0, 400)}`);
-  }
-  return JSON.parse(text) as unknown;
-}
-
-function isRecord(v: unknown): v is Record<string, unknown> {
-  return v !== null && typeof v === "object" && !Array.isArray(v);
-}
-
-function strField(r: Record<string, unknown>, key: string): string {
-  const v = r[key];
-  return typeof v === "string" ? v : "";
-}
+const esGet = createJsonGetter({
+  base: () => requiredBaseUrl("ELASTICSEARCH_URL"),
+  label: "Elasticsearch",
+  headers: envAuthHeaders({ env: "ELASTICSEARCH_API_KEY", scheme: "ApiKey" }),
+});
 
 function indexEntries(parsed: unknown): unknown[] {
   return Array.isArray(parsed) ? parsed : [];