@cloudinary/asset-management-mcp 0.6.3 → 0.8.0

package/src/hooks/registration.ts

@@ -1,5 +1,8 @@
-import { Hooks } from "./types.js";
+import { CloudConfig } from "./cloudConfig.js";
 import { CloudinaryAuthHook } from "./cloudinaryAuthHook.js";
+import { CustomHeadersHook } from "./customHeadersHook.js";
+import { ResponseHeadersHook } from "./responseHeadersHook.js";
+import { Hooks } from "./types.js";
 import { UserAgentHook } from "./userAgentHook.js";
 /*
  * This file is only ever generated once on the first generation and then is free to be modified.
@@ -8,12 +11,11 @@ import { UserAgentHook } from "./userAgentHook.js";
  */
 
 export function initHooks(hooks: Hooks) {
-  // Add hooks by calling hooks.register{ClientInit/BeforeCreateRequest/BeforeRequest/AfterSuccess/AfterError}Hook
-  // with an instance of a hook that implements that specific Hook interface
-  // Hooks are registered per SDK instance, and are valid for the lifetime of the SDK instance
-    const cloudinaryAuthHook = new CloudinaryAuthHook();
-    hooks.registerBeforeRequestHook(cloudinaryAuthHook);
+  // Shared config — parsed once from CLOUDINARY_URL and env vars
+  const config = new CloudConfig();
 
-    const userAgentHook = new UserAgentHook();
-    hooks.registerSDKInitHook(userAgentHook);
+  hooks.registerBeforeRequestHook(new CloudinaryAuthHook(config));
+  hooks.registerBeforeRequestHook(new CustomHeadersHook());
+  hooks.registerSDKInitHook(new UserAgentHook());
+  hooks.registerAfterSuccessHook(new ResponseHeadersHook(config.collectHeaders));
 }

package/src/hooks/responseHeadersHook.ts

@@ -0,0 +1,98 @@
+import { CollectHeaders } from "./cloudConfig.js";
+import { AfterSuccessContext, AfterSuccessHook } from "./types.js";
+
+/**
+ * Checks whether a lowercased header name matches a single collect spec.
+ *
+ * Supported spec formats:
+ *   - `"prefix:<value>"`  → headerName.startsWith(value)
+ *   - `"regex:<pattern>"` → new RegExp(pattern).test(headerName)
+ *   - any other string    → exact match
+ *
+ * Both headerName and spec are expected to be lowercased already.
+ */
+function matchesSpec(headerName: string, spec: string): boolean {
+  if (spec.startsWith("prefix:")) {
+    return headerName.startsWith(spec.slice(7));
+  }
+  if (spec.startsWith("regex:")) {
+    try {
+      return new RegExp(spec.slice(6)).test(headerName);
+    } catch {
+      return false; // invalid regex — skip
+    }
+  }
+  return headerName === spec;
+}
+
+/**
+ * Captures response headers and injects them into the JSON body as `_headers`
+ * so they survive through the generated formatResult() and surface in MCP tool
+ * output. The set of headers to collect is driven by configuration:
+ *   - `true`      → collect every response header
+ *   - `string[]`  → collect only matching headers (exact name, prefix:, or regex:)
+ */
+export class ResponseHeadersHook implements AfterSuccessHook {
+  private readonly collectHeaders: CollectHeaders;
+
+  constructor(collectHeaders: CollectHeaders) {
+    this.collectHeaders = collectHeaders;
+  }
+
+  async afterSuccess(
+    hookCtx: AfterSuccessContext,
+    response: Response,
+  ): Promise<Response> {
+    // Per-request SDK options override the constructor config (used by mcp-service)
+    const optCollect = (hookCtx.options as any)?.collectHeaders as
+      | CollectHeaders
+      | undefined;
+    const effective = optCollect ?? this.collectHeaders;
+
+    // Not configured — exit early
+    if (effective !== true && effective.length === 0) {
+      return response;
+    }
+
+    const contentType = response.headers.get("content-type") ?? "";
+    if (!contentType.includes("json")) {
+      return response;
+    }
+
+    const hdrs: Record<string, string> = {};
+    let found = false;
+
+    if (effective === true) {
+      // Collect all response headers
+      for (const [name, value] of response.headers.entries()) {
+        hdrs[name] = value;
+        found = true;
+      }
+    } else {
+      // Match each response header against the specs (exact, prefix:, regex:)
+      for (const [name, value] of response.headers.entries()) {
+        for (const spec of effective) {
+          if (matchesSpec(name, spec)) {
+            hdrs[name] = value;
+            found = true;
+            break;
+          }
+        }
+      }
+    }
+
+    if (!found) {
+      return response;
+    }
+
+    // Read body, inject headers, return a new Response so the stream is fresh.
+    const body = await response.json();
+    body._headers = hdrs;
+
+    return new Response(JSON.stringify(body), {
+      status: response.status,
+      statusText: response.statusText,
+      headers: response.headers,
+    });
+  }
+}

package/src/hooks/userAgentHook.ts

@@ -45,16 +45,28 @@ function getEnvDetails(): string {
     return isRemoteMCP() ? '; RemoteMCP' : '';
 }
 
-function buildUserAgent(sdkVersion: string, genVersion: string, openapiDocVersion: string, packageName: string, runtime: string): string {
+function buildUserAgent(
+    sdkVersion: string,
+    genVersion: string,
+    openapiDocVersion: string,
+    packageName: string,
+    runtime: string,
+    callerUserAgent?: string,
+): string {
     const productName = getProductName(packageName);
     const systemInfo = getSystemInfo();
     const envDetails = getEnvDetails();
+    const origin = callerUserAgent ? `; origin ${callerUserAgent}` : '';
 
-    return `Cloudinary/${productName} ${runtime}/${sdkVersion} Gen/${genVersion} Schema/${openapiDocVersion} (${systemInfo}${envDetails})`;
+    return `Cloudinary/${productName} ${runtime}/${sdkVersion} Gen/${genVersion} Schema/${openapiDocVersion} (${systemInfo}${envDetails}${origin})`;
 }
 
 export class UserAgentHook implements SDKInitHook {
     sdkInit(opts: SDKOptions): SDKOptions {
+        // If opts.userAgent is pre-set (e.g. by mcp-service via getSDK),
+        // treat it as the caller's User-Agent to embed in the combined string.
+        const callerUserAgent = opts.userAgent || undefined;
+
         const originalUserAgent = SDK_METADATA.userAgent;
 
         if (originalUserAgent && originalUserAgent.startsWith("speakeasy-sdk/")) {
@@ -69,7 +81,10 @@ export class UserAgentHook implements SDKInitHook {
                 // Ensure all parts are defined before proceeding
                 if (sdkVersion && genVersion && openapiDocVersion && packageName) {
                     const runtime = getRuntime();
-                    opts.userAgent = buildUserAgent(sdkVersion, genVersion, openapiDocVersion, packageName, runtime);
+                    opts.userAgent = buildUserAgent(
+                        sdkVersion, genVersion, openapiDocVersion,
+                        packageName, runtime, callerUserAgent,
+                    );
                 }
             }
         }