@xylex-group/athena 2.10.0 → 2.12.0

package/dist/react.d.cts

@@ -1,9 +1,10 @@
-import { O as AthenaGatewayHookConfig, P as AthenaGatewayHookResult } from './types-BeZIHduP.cjs';
-export { Q as AthenaDeletePayload, V as AthenaFetchPayload, a as AthenaGatewayCallOptions, d as AthenaGatewayErrorCode, e as AthenaGatewayErrorDetails, W as AthenaGatewayResponse, X as AthenaInsertPayload, f as AthenaJsonArray, g as AthenaJsonObject, h as AthenaJsonPrimitive, i as AthenaJsonValue, k as AthenaRpcCallOptions, l as AthenaRpcFilter, m as AthenaRpcFilterOperator, n as AthenaRpcOrder, o as AthenaRpcPayload, Y as AthenaUpdatePayload } from './types-BeZIHduP.cjs';
-export { A as AthenaGatewayError, M as ModelFormAdapter, a as ModelFormDefaults, b as ModelFormNullishMode, c as ModelFormValues, T as ToModelFormDefaultsOptions, d as ToModelPayloadOptions, e as createModelFormAdapter, i as isAthenaGatewayError, t as toModelFormDefaults, f as toModelPayload } from './model-form-DACdBLYG.cjs';
+import { q as AthenaGatewayHookConfig, r as AthenaGatewayHookResult } from './types-CwJCPpLD.cjs';
+export { s as AthenaDeletePayload, t as AthenaFetchPayload, a as AthenaGatewayCallOptions, d as AthenaGatewayErrorCode, e as AthenaGatewayErrorDetails, u as AthenaGatewayResponse, v as AthenaInsertPayload, f as AthenaJsonArray, g as AthenaJsonObject, h as AthenaJsonPrimitive, i as AthenaJsonValue, j as AthenaRpcCallOptions, k as AthenaRpcFilter, l as AthenaRpcFilterOperator, m as AthenaRpcOrder, n as AthenaRpcPayload, w as AthenaUpdatePayload } from './types-CwJCPpLD.cjs';
+export { A as AthenaGatewayError, M as ModelFormAdapter, a as ModelFormDefaults, b as ModelFormNullishMode, c as ModelFormValues, T as ToModelFormDefaultsOptions, d as ToModelPayloadOptions, e as createModelFormAdapter, i as isAthenaGatewayError, t as toModelFormDefaults, f as toModelPayload } from './model-form-CD1uhWSh.cjs';
 import * as react from 'react';
 import { ReactNode } from 'react';
-import { f5 as AthenaAuthFetchCompatibleInput, H as AthenaAuthCallOptions, an as AthenaAuthSessionResponse, U as AthenaAuthErrorDetails, ai as AthenaAuthResult, bI as AthenaClientSessionLike, bJ as AthenaClientSessionOptions, c$ as AthenaStorageFileUploadInput, dj as AthenaStorageUploadSource, d5 as AthenaStorageModule, di as AthenaStorageUploadProgressHandler, dh as AthenaStorageUploadProgress, d2 as AthenaStorageFileUploadResult, cL as AthenaStorageCallOptions } from './client-B7EQ_hPV.cjs';
+import { f5 as AthenaAuthFetchCompatibleInput, H as AthenaAuthCallOptions, an as AthenaAuthSessionResponse, U as AthenaAuthErrorDetails, ai as AthenaAuthResult, bI as AthenaClientSessionLike, bJ as AthenaClientSessionOptions, c$ as AthenaStorageFileUploadInput, dj as AthenaStorageUploadSource, d5 as AthenaStorageModule, di as AthenaStorageUploadProgressHandler, dh as AthenaStorageUploadProgress, d2 as AthenaStorageFileUploadResult, cL as AthenaStorageCallOptions } from './client-C3x75Zgn.cjs';
+import './types-Dr849HD6.cjs';
 
 declare function useAthenaGateway(config?: AthenaGatewayHookConfig): AthenaGatewayHookResult;
 

package/dist/react.d.ts

@@ -1,9 +1,10 @@
-import { O as AthenaGatewayHookConfig, P as AthenaGatewayHookResult } from './types-BeZIHduP.js';
-export { Q as AthenaDeletePayload, V as AthenaFetchPayload, a as AthenaGatewayCallOptions, d as AthenaGatewayErrorCode, e as AthenaGatewayErrorDetails, W as AthenaGatewayResponse, X as AthenaInsertPayload, f as AthenaJsonArray, g as AthenaJsonObject, h as AthenaJsonPrimitive, i as AthenaJsonValue, k as AthenaRpcCallOptions, l as AthenaRpcFilter, m as AthenaRpcFilterOperator, n as AthenaRpcOrder, o as AthenaRpcPayload, Y as AthenaUpdatePayload } from './types-BeZIHduP.js';
-export { A as AthenaGatewayError, M as ModelFormAdapter, a as ModelFormDefaults, b as ModelFormNullishMode, c as ModelFormValues, T as ToModelFormDefaultsOptions, d as ToModelPayloadOptions, e as createModelFormAdapter, i as isAthenaGatewayError, t as toModelFormDefaults, f as toModelPayload } from './model-form-ByvyyvxB.js';
+import { q as AthenaGatewayHookConfig, r as AthenaGatewayHookResult } from './types-CwJCPpLD.js';
+export { s as AthenaDeletePayload, t as AthenaFetchPayload, a as AthenaGatewayCallOptions, d as AthenaGatewayErrorCode, e as AthenaGatewayErrorDetails, u as AthenaGatewayResponse, v as AthenaInsertPayload, f as AthenaJsonArray, g as AthenaJsonObject, h as AthenaJsonPrimitive, i as AthenaJsonValue, j as AthenaRpcCallOptions, k as AthenaRpcFilter, l as AthenaRpcFilterOperator, m as AthenaRpcOrder, n as AthenaRpcPayload, w as AthenaUpdatePayload } from './types-CwJCPpLD.js';
+export { A as AthenaGatewayError, M as ModelFormAdapter, a as ModelFormDefaults, b as ModelFormNullishMode, c as ModelFormValues, T as ToModelFormDefaultsOptions, d as ToModelPayloadOptions, e as createModelFormAdapter, i as isAthenaGatewayError, t as toModelFormDefaults, f as toModelPayload } from './model-form-Dm69I-oO.js';
 import * as react from 'react';
 import { ReactNode } from 'react';
-import { f5 as AthenaAuthFetchCompatibleInput, H as AthenaAuthCallOptions, an as AthenaAuthSessionResponse, U as AthenaAuthErrorDetails, ai as AthenaAuthResult, bI as AthenaClientSessionLike, bJ as AthenaClientSessionOptions, c$ as AthenaStorageFileUploadInput, dj as AthenaStorageUploadSource, d5 as AthenaStorageModule, di as AthenaStorageUploadProgressHandler, dh as AthenaStorageUploadProgress, d2 as AthenaStorageFileUploadResult, cL as AthenaStorageCallOptions } from './client-BYii6dU9.js';
+import { f5 as AthenaAuthFetchCompatibleInput, H as AthenaAuthCallOptions, an as AthenaAuthSessionResponse, U as AthenaAuthErrorDetails, ai as AthenaAuthResult, bI as AthenaClientSessionLike, bJ as AthenaClientSessionOptions, c$ as AthenaStorageFileUploadInput, dj as AthenaStorageUploadSource, d5 as AthenaStorageModule, di as AthenaStorageUploadProgressHandler, dh as AthenaStorageUploadProgress, d2 as AthenaStorageFileUploadResult, cL as AthenaStorageCallOptions } from './client-QUbAs7E8.js';
+import './types-Cq4-NoB4.js';
 
 declare function useAthenaGateway(config?: AthenaGatewayHookConfig): AthenaGatewayHookResult;
 

package/dist/react.js

@@ -164,42 +164,31 @@ var getSessionCookie = (request, config) => {
   return null;
 };
 
-// package.json
-var package_default = {
-  version: "2.10.0"
-};
-
-// src/sdk-version.ts
-var PACKAGE_VERSION = package_default.version;
-function buildSdkHeaderValue(sdkName) {
-  return `${sdkName} ${PACKAGE_VERSION}`;
-}
-
-// src/gateway/client.ts
-var DEFAULT_CLIENT = "railway_direct";
-var SDK_NAME = "xylex-group/athena";
-var SDK_HEADER_VALUE = buildSdkHeaderValue(SDK_NAME);
+// src/utils/athena-request-headers.ts
 var NO_CACHE_HEADER_VALUE = "no-cache";
-function parseResponseBody(rawText, contentType) {
-  if (!rawText) {
-    return { parsed: null, parseFailed: false };
-  }
-  const contentTypeSuggestsJson = contentType?.toLowerCase().includes("application/json") ?? false;
-  const looksJson = contentTypeSuggestsJson || rawText.startsWith("{") || rawText.startsWith("[");
-  if (!looksJson) {
-    return { parsed: rawText, parseFailed: false };
-  }
-  try {
-    return { parsed: JSON.parse(rawText), parseFailed: false };
-  } catch {
-    return { parsed: rawText, parseFailed: true };
-  }
-}
+var API_KEY_HEADER_CANDIDATES = ["x-api-key", "apikey"];
+var ATHENA_KEY_HEADER_CANDIDATES = ["X-Athena-Key", "x-athena-key"];
+var SESSION_TOKEN_HEADER_CANDIDATES = ["X-Athena-Auth-Session-Token"];
+var BEARER_MIRROR_HEADER_CANDIDATES = ["X-Athena-Auth-Bearer-Token"];
+var CLIENT_HEADER_CANDIDATES = ["X-Athena-Client", "x-athena-client"];
+var PG_URI_HEADER_CANDIDATES = ["x-pg-uri"];
+var JDBC_URI_HEADER_CANDIDATES = ["x-athena-jdbc-url", "x-jdbc-url"];
+var PROFILE_RULES = {
+  gateway: { apiKeys: true, routing: true, authMirror: true, authBearer: false, contentType: true, stripNullsDefault: true },
+  chat: { apiKeys: true, routing: true, authMirror: true, authBearer: true, accept: true },
+  storage: { apiKeys: true, routing: true, authMirror: true, authBearer: false, contentType: true },
+  auth: { apiKeys: true, routing: false, authMirror: false, authBearer: true, contentType: true },
+  minimal: { apiKeys: false, routing: false, authMirror: false, authBearer: false }
+};
 function normalizeHeaderValue(value) {
   return value ? value : void 0;
 }
-function isCacheControlHeaderName(name) {
-  return name.toLowerCase() === "cache-control";
+function mergeExtraHeaders(configHeaders, callHeaders) {
+  return { ...configHeaders ?? {}, ...callHeaders ?? {} };
+}
+function hasHeaderIgnoreCase(headers, targetKey) {
+  const normalizedTargetKey = targetKey.toLowerCase();
+  return Object.keys(headers).some((key) => key.toLowerCase() === normalizedTargetKey);
 }
 function resolveHeaderValue(headers, candidates) {
   for (const candidate of candidates) {
@@ -216,13 +205,20 @@ function resolveHeaderValue(headers, candidates) {
   }
   return void 0;
 }
+function isCacheControlHeaderName(name) {
+  return name.toLowerCase() === "cache-control";
+}
+function normalizeBearerToken(value) {
+  const trimmed = value.trim();
+  const match = trimmed.match(/^Bearer\s+(.+)$/i);
+  return match?.[1]?.trim() ?? trimmed;
+}
 function resolveBearerTokenFromAuthorizationHeader(headers) {
   const authorization = resolveHeaderValue(headers, ["Authorization"]);
   if (!authorization) {
     return void 0;
   }
-  const match = authorization.match(/^Bearer\s+(.+)$/i);
-  const token = match?.[1]?.trim();
+  const token = normalizeBearerToken(authorization);
   return token ? token : void 0;
 }
 function resolveSessionTokenFromCookieHeader(headers) {
@@ -232,6 +228,207 @@ function resolveSessionTokenFromCookieHeader(headers) {
   }
   return getSessionCookie(new Headers({ cookie })) ?? void 0;
 }
+function resolveBackendType(backend) {
+  if (!backend) {
+    return void 0;
+  }
+  return typeof backend === "string" ? backend : backend.type;
+}
+function resolveRequestHeaderOverrides(config, options, defaults) {
+  return {
+    apiKey: options?.apiKey ?? config.apiKey,
+    athenaKey: options?.athenaKey ?? config.athenaKey,
+    client: options?.client ?? config.client ?? defaults?.client,
+    userId: options?.userId ?? config.userId,
+    organizationId: options?.organizationId ?? config.organizationId,
+    backend: options?.backend ?? config.backend,
+    publishEvent: options?.publishEvent ?? config.publishEvent,
+    stripNulls: options?.stripNulls ?? config.stripNulls ?? defaults?.stripNulls,
+    bearerToken: options?.bearerToken ?? config.bearerToken,
+    cookie: options?.cookie ?? config.cookie,
+    sessionToken: options?.sessionToken ?? config.sessionToken,
+    pgUri: options?.pgUri ?? config.pgUri,
+    jdbcUrl: options?.jdbcUrl ?? config.jdbcUrl,
+    forceNoCache: Boolean(config.forceNoCache || options?.forceNoCache),
+    configHeaders: config.headers,
+    callHeaders: options?.headers
+  };
+}
+function buildServiceRequestHeaders(profile, sdkHeaderValue, config, options, extras) {
+  const rules = PROFILE_RULES[profile];
+  return buildAthenaRequestHeaders({
+    profile,
+    sdkHeaderValue,
+    ...resolveRequestHeaderOverrides(config, options, {
+      client: extras?.client ?? void 0,
+      stripNulls: extras?.stripNulls ?? (true )
+    }),
+    contentType: extras?.contentType ?? ("application/json" ),
+    accept: extras?.accept ?? (rules.accept ? "application/json" : void 0)
+  });
+}
+function applyAthenaApiKeyHeaders(headers, apiKey, athenaKey) {
+  if (apiKey) {
+    if (!hasHeaderIgnoreCase(headers, "apikey")) {
+      headers.apikey = apiKey;
+    }
+    if (!hasHeaderIgnoreCase(headers, "x-api-key")) {
+      headers["x-api-key"] = apiKey;
+    }
+  }
+  const resolvedAthenaKey = normalizeHeaderValue(athenaKey) ?? normalizeHeaderValue(apiKey);
+  if (resolvedAthenaKey && !hasHeaderIgnoreCase(headers, "X-Athena-Key")) {
+    headers["X-Athena-Key"] = resolvedAthenaKey;
+  }
+}
+function applyAthenaAuthContextHeaders(headers, input) {
+  const mergedExtraHeaders = mergeExtraHeaders(input.configHeaders, input.callHeaders);
+  const rules = PROFILE_RULES[input.profile];
+  const explicitCookie = normalizeHeaderValue(input.cookie);
+  if (explicitCookie) {
+    mergedExtraHeaders.Cookie = explicitCookie;
+  }
+  const explicitSessionToken = normalizeHeaderValue(input.sessionToken) ?? resolveHeaderValue(mergedExtraHeaders, SESSION_TOKEN_HEADER_CANDIDATES);
+  const derivedSessionToken = explicitSessionToken ?? resolveSessionTokenFromCookieHeader(mergedExtraHeaders);
+  const cookieFromHeaders = resolveHeaderValue(mergedExtraHeaders, ["Cookie"]);
+  if (explicitCookie && !hasHeaderIgnoreCase(headers, "Cookie")) {
+    headers.Cookie = explicitCookie;
+  } else if (cookieFromHeaders && !hasHeaderIgnoreCase(headers, "Cookie")) {
+    headers.Cookie = cookieFromHeaders;
+  }
+  const explicitBearerToken = (() => {
+    const configured = normalizeHeaderValue(input.bearerToken);
+    if (configured) {
+      return normalizeBearerToken(configured);
+    }
+    const mirrored = resolveHeaderValue(mergedExtraHeaders, BEARER_MIRROR_HEADER_CANDIDATES);
+    return mirrored ? normalizeBearerToken(mirrored) : void 0;
+  })();
+  const derivedBearerToken = explicitBearerToken ?? resolveBearerTokenFromAuthorizationHeader(mergedExtraHeaders);
+  if (rules.authBearer && derivedBearerToken && !hasHeaderIgnoreCase(headers, "Authorization")) {
+    headers.Authorization = `Bearer ${derivedBearerToken}`;
+  }
+  if (rules.authMirror) {
+    if (derivedSessionToken && !hasHeaderIgnoreCase(headers, "X-Athena-Auth-Session-Token")) {
+      headers["X-Athena-Auth-Session-Token"] = derivedSessionToken;
+    }
+    if (derivedBearerToken && !hasHeaderIgnoreCase(headers, "X-Athena-Auth-Bearer-Token")) {
+      headers["X-Athena-Auth-Bearer-Token"] = derivedBearerToken;
+    }
+  } else if (derivedSessionToken && !hasHeaderIgnoreCase(headers, "X-Athena-Auth-Session-Token")) {
+    headers["X-Athena-Auth-Session-Token"] = derivedSessionToken;
+  }
+}
+function applyAthenaPgUriHeaders(headers, input) {
+  const mergedExtraHeaders = mergeExtraHeaders(input.configHeaders, input.callHeaders);
+  const pgUri = normalizeHeaderValue(input.pgUri) ?? resolveHeaderValue(mergedExtraHeaders, PG_URI_HEADER_CANDIDATES);
+  if (pgUri && !hasHeaderIgnoreCase(headers, "x-pg-uri")) {
+    headers["x-pg-uri"] = pgUri;
+  }
+  const jdbcUrl = normalizeHeaderValue(input.jdbcUrl) ?? resolveHeaderValue(mergedExtraHeaders, JDBC_URI_HEADER_CANDIDATES);
+  if (jdbcUrl) {
+    if (!hasHeaderIgnoreCase(headers, "x-athena-jdbc-url")) {
+      headers["x-athena-jdbc-url"] = jdbcUrl;
+    }
+    if (!hasHeaderIgnoreCase(headers, "x-jdbc-url")) {
+      headers["x-jdbc-url"] = jdbcUrl;
+    }
+  }
+}
+function buildAthenaRequestHeaders(input) {
+  const forceNoCache = Boolean(input.forceNoCache);
+  const mergedExtraHeaders = mergeExtraHeaders(input.configHeaders, input.callHeaders);
+  const rules = PROFILE_RULES[input.profile];
+  const headerClient = resolveHeaderValue(mergedExtraHeaders, CLIENT_HEADER_CANDIDATES);
+  const finalClient = normalizeHeaderValue(input.client) ?? headerClient;
+  const finalApiKey = normalizeHeaderValue(input.apiKey) ?? resolveHeaderValue(mergedExtraHeaders, API_KEY_HEADER_CANDIDATES);
+  const finalAthenaKey = normalizeHeaderValue(input.athenaKey) ?? resolveHeaderValue(mergedExtraHeaders, ATHENA_KEY_HEADER_CANDIDATES) ?? finalApiKey;
+  const headers = {
+    "X-Athena-Sdk": input.sdkHeaderValue
+  };
+  if (rules.contentType) {
+    headers["Content-Type"] = input.contentType ?? "application/json";
+  }
+  if (input.accept ?? rules.accept) {
+    headers.Accept = input.accept ?? "application/json";
+  }
+  if (rules.routing) {
+    if (normalizeHeaderValue(input.userId)) {
+      headers["X-User-Id"] = input.userId ?? "";
+    }
+    if (normalizeHeaderValue(input.organizationId)) {
+      headers["X-Organization-Id"] = input.organizationId ?? "";
+    }
+    if (finalClient) {
+      headers["X-Athena-Client"] = finalClient;
+    }
+    const backendType = resolveBackendType(input.backend);
+    if (backendType) {
+      headers["X-Backend-Type"] = backendType;
+    }
+    if (typeof input.stripNulls === "boolean") {
+      headers["X-Strip-Nulls"] = input.stripNulls ? "true" : "false";
+    } else if (rules.stripNullsDefault) {
+      headers["X-Strip-Nulls"] = "true";
+    }
+    if (normalizeHeaderValue(input.publishEvent)) {
+      headers["X-Publish-Event"] = input.publishEvent ?? "";
+    }
+  }
+  if (rules.apiKeys && (finalApiKey || finalAthenaKey)) {
+    applyAthenaApiKeyHeaders(headers, finalApiKey, finalAthenaKey);
+  }
+  applyAthenaAuthContextHeaders(headers, input);
+  applyAthenaPgUriHeaders(headers, input);
+  const reservedClientHeaderKeys = new Set(CLIENT_HEADER_CANDIDATES.map((key) => key.toLowerCase()));
+  Object.entries(mergedExtraHeaders).forEach(([key, value]) => {
+    if (reservedClientHeaderKeys.has(key.toLowerCase())) {
+      return;
+    }
+    if (forceNoCache && isCacheControlHeaderName(key)) {
+      return;
+    }
+    const normalized = normalizeHeaderValue(value);
+    if (normalized) {
+      headers[key] = normalized;
+    }
+  });
+  if (forceNoCache) {
+    headers["Cache-Control"] = NO_CACHE_HEADER_VALUE;
+  }
+  return headers;
+}
+
+// package.json
+var package_default = {
+  version: "2.12.0"
+};
+
+// src/sdk-version.ts
+var PACKAGE_VERSION = package_default.version;
+function buildSdkHeaderValue(sdkName) {
+  return `${sdkName} ${PACKAGE_VERSION}`;
+}
+
+// src/gateway/client.ts
+var DEFAULT_CLIENT = "railway_direct";
+var SDK_NAME = "xylex-group/athena";
+var SDK_HEADER_VALUE = buildSdkHeaderValue(SDK_NAME);
+function parseResponseBody(rawText, contentType) {
+  if (!rawText) {
+    return { parsed: null, parseFailed: false };
+  }
+  const contentTypeSuggestsJson = contentType?.toLowerCase().includes("application/json") ?? false;
+  const looksJson = contentTypeSuggestsJson || rawText.startsWith("{") || rawText.startsWith("[");
+  if (!looksJson) {
+    return { parsed: rawText, parseFailed: false };
+  }
+  try {
+    return { parsed: JSON.parse(rawText), parseFailed: false };
+  } catch {
+    return { parsed: rawText, parseFailed: true };
+  }
+}
 function isRecord(value) {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
@@ -358,71 +555,10 @@ function buildRpcGetEndpoint(payload) {
   return withQuery;
 }
 function buildHeaders(config, options) {
-  const mergedStripNulls = options?.stripNulls ?? true;
-  const forceNoCache = Boolean(config.forceNoCache || options?.forceNoCache);
-  const extraHeaders = {
-    ...config.headers ?? {},
-    ...options?.headers ?? {}
-  };
-  const headerClient = extraHeaders["x-athena-client"] ?? extraHeaders["X-Athena-Client"];
-  const finalClient = options?.client ?? config.client ?? (typeof headerClient === "string" ? headerClient : void 0) ?? DEFAULT_CLIENT;
-  const finalApiKey = options?.apiKey ?? config.apiKey;
-  const finalPublishEvent = options?.publishEvent ?? config.publishEvent;
-  const headers = {
-    "Content-Type": "application/json",
-    "X-Athena-Sdk": SDK_HEADER_VALUE
-  };
-  if (options?.userId ?? config.userId) {
-    headers["X-User-Id"] = options?.userId ?? config.userId ?? "";
-  }
-  if (options?.organizationId ?? config.organizationId) {
-    headers["X-Organization-Id"] = options?.organizationId ?? config.organizationId ?? "";
-  }
-  if (finalClient) {
-    headers["X-Athena-Client"] = finalClient;
-  }
-  const finalBackend = options?.backend ?? config.backend;
-  if (finalBackend) {
-    const type = typeof finalBackend === "string" ? finalBackend : finalBackend.type;
-    if (type) headers["X-Backend-Type"] = type;
-  }
-  if (typeof mergedStripNulls === "boolean") {
-    headers["X-Strip-Nulls"] = mergedStripNulls ? "true" : "false";
-  }
-  if (finalPublishEvent) {
-    headers["X-Publish-Event"] = finalPublishEvent;
-  }
-  if (finalApiKey) {
-    headers["apikey"] = finalApiKey;
-    headers["x-api-key"] = headers["x-api-key"] ?? finalApiKey;
-  }
-  const explicitSessionToken = resolveHeaderValue(extraHeaders, [
-    "X-Athena-Auth-Session-Token"
-  ]);
-  const derivedSessionToken = explicitSessionToken ?? resolveSessionTokenFromCookieHeader(extraHeaders);
-  if (derivedSessionToken) {
-    headers["X-Athena-Auth-Session-Token"] = derivedSessionToken;
-  }
-  const explicitBearerToken = resolveHeaderValue(extraHeaders, [
-    "X-Athena-Auth-Bearer-Token"
-  ]);
-  const derivedBearerToken = explicitBearerToken ?? resolveBearerTokenFromAuthorizationHeader(extraHeaders);
-  if (derivedBearerToken) {
-    headers["X-Athena-Auth-Bearer-Token"] = derivedBearerToken;
-  }
-  const athenaClientKeys = ["x-athena-client", "X-Athena-Client"];
-  Object.entries(extraHeaders).forEach(([key, value]) => {
-    if (athenaClientKeys.includes(key)) return;
-    if (forceNoCache && isCacheControlHeaderName(key)) return;
-    const normalized = normalizeHeaderValue(value);
-    if (normalized) {
-      headers[key] = normalized;
-    }
+  return buildServiceRequestHeaders("gateway", SDK_HEADER_VALUE, config, options, {
+    client: options?.client ?? config.client ?? DEFAULT_CLIENT,
+    stripNulls: options?.stripNulls ?? true
   });
-  if (forceNoCache) {
-    headers["Cache-Control"] = NO_CACHE_HEADER_VALUE;
-  }
-  return headers;
 }
 function toInvalidUrlResponse(error, endpoint, method) {
   const message = error instanceof Error ? error.message : String(error);