@cloudinary/environment-config-mcp 0.5.0 → 0.6.1

package/src/funcs/uploadPresetsListUploadPresets.ts

@@ -1,15 +1,16 @@
 /*
  * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ * @generated-id: 72eb9fe01a8b
  */
 
 import { CloudinaryEnvConfigCore } from "../core.js";
 import { encodeFormQuery, encodeSimple } from "../lib/encodings.js";
-import * as M from "../lib/matchers.js";
 import { compactMap } from "../lib/primitives.js";
 import { safeParse } from "../lib/schemas.js";
 import { RequestOptions } from "../lib/sdks.js";
 import { extractSecurity, resolveGlobalSecurity } from "../lib/security.js";
 import { pathToFunc } from "../lib/url.js";
+import { DirectionEnum } from "../models/directionenum.js";
 import { APIError } from "../models/errors/apierror.js";
 import {
   ConnectionError,
@@ -20,11 +21,8 @@ import {
 } from "../models/errors/httpclienterrors.js";
 import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
 import {
-  Direction,
   ListUploadPresetsRequest,
   ListUploadPresetsRequest$zodSchema,
-  ListUploadPresetsResponse,
-  ListUploadPresetsResponse$zodSchema,
   OrderBy,
 } from "../models/listuploadpresetsop.js";
 import { APICall, APIPromise } from "../types/async.js";
@@ -36,12 +34,13 @@ import { Result } from "../types/fp.js";
 export function uploadPresetsListUploadPresets(
   client$: CloudinaryEnvConfigCore,
   order_by?: OrderBy | undefined,
-  direction?: Direction | undefined,
+  direction?: DirectionEnum | undefined,
+  max_results?: number | undefined,
   next_cursor?: string | undefined,
   options?: RequestOptions,
 ): APIPromise<
   Result<
-    ListUploadPresetsResponse,
+    Response,
     | APIError
     | SDKValidationError
     | UnexpectedClientError
@@ -55,6 +54,7 @@ export function uploadPresetsListUploadPresets(
     client$,
     order_by,
     direction,
+    max_results,
     next_cursor,
     options,
   ));
@@ -63,13 +63,14 @@ export function uploadPresetsListUploadPresets(
 async function $do(
   client$: CloudinaryEnvConfigCore,
   order_by?: OrderBy | undefined,
-  direction?: Direction | undefined,
+  direction?: DirectionEnum | undefined,
+  max_results?: number | undefined,
   next_cursor?: string | undefined,
   options?: RequestOptions,
 ): Promise<
   [
     Result<
-      ListUploadPresetsResponse,
+      Response,
       | APIError
       | SDKValidationError
       | UnexpectedClientError
@@ -84,6 +85,7 @@ async function $do(
   const input$: ListUploadPresetsRequest | undefined = {
     order_by: order_by,
     direction: direction,
+    max_results: max_results,
     next_cursor: next_cursor,
   };
 
@@ -109,6 +111,7 @@ async function $do(
   );
   const query$ = encodeFormQuery({
     "direction": payload$?.direction,
+    "max_results": payload$?.max_results,
     "next_cursor": payload$?.next_cursor,
     "order_by": payload$?.order_by,
   });
@@ -164,26 +167,9 @@ async function $do(
   if (!doResult.ok) {
     return [doResult, { status: "request-error", request: req$ }];
   }
-  const response = doResult.value;
-  const responseFields$ = {
-    HttpMeta: { Response: response, Request: req$ },
-  };
-
-  const [result$] = await M.match<
-    ListUploadPresetsResponse,
-    | APIError
-    | SDKValidationError
-    | UnexpectedClientError
-    | InvalidRequestError
-    | RequestAbortedError
-    | RequestTimeoutError
-    | ConnectionError
-  >(
-    M.json(200, ListUploadPresetsResponse$zodSchema, { key: "object" }),
-    M.json([400, 401], ListUploadPresetsResponse$zodSchema, {
-      key: "api_error",
-    }),
-  )(response, req$, { extraFields: responseFields$ });
-
-  return [result$, { status: "complete", request: req$, response }];
+  return [doResult, {
+    status: "complete",
+    "request": req$,
+    response: doResult.value,
+  }];
 }

package/src/funcs/uploadPresetsUpdateUploadPreset.ts

@@ -1,10 +1,10 @@
 /*
  * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ * @generated-id: fd0de75c67bd
  */
 
 import { CloudinaryEnvConfigCore } from "../core.js";
 import { encodeJSON, encodeSimple } from "../lib/encodings.js";
-import * as M from "../lib/matchers.js";
 import { compactMap } from "../lib/primitives.js";
 import { safeParse } from "../lib/schemas.js";
 import { RequestOptions } from "../lib/sdks.js";
@@ -22,10 +22,8 @@ import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
 import {
   UpdateUploadPresetRequest,
   UpdateUploadPresetRequest$zodSchema,
-  UpdateUploadPresetResponse,
-  UpdateUploadPresetResponse$zodSchema,
 } from "../models/updateuploadpresetop.js";
-import { UploadPreset } from "../models/uploadpreset.js";
+import { UploadPresetInput } from "../models/uploadpresetinput.js";
 import { APICall, APIPromise } from "../types/async.js";
 import { Result } from "../types/fp.js";
 
@@ -35,11 +33,11 @@ import { Result } from "../types/fp.js";
 export function uploadPresetsUpdateUploadPreset(
   client$: CloudinaryEnvConfigCore,
   name: string,
-  upload_preset: UploadPreset,
+  upload_preset_input: UploadPresetInput,
   options?: RequestOptions,
 ): APIPromise<
   Result<
-    UpdateUploadPresetResponse,
+    Response,
     | APIError
     | SDKValidationError
     | UnexpectedClientError
@@ -52,7 +50,7 @@ export function uploadPresetsUpdateUploadPreset(
   return new APIPromise($do(
     client$,
     name,
-    upload_preset,
+    upload_preset_input,
     options,
   ));
 }
@@ -60,12 +58,12 @@ export function uploadPresetsUpdateUploadPreset(
 async function $do(
   client$: CloudinaryEnvConfigCore,
   name: string,
-  upload_preset: UploadPreset,
+  upload_preset_input: UploadPresetInput,
   options?: RequestOptions,
 ): Promise<
   [
     Result<
-      UpdateUploadPresetResponse,
+      Response,
       | APIError
       | SDKValidationError
       | UnexpectedClientError
@@ -79,7 +77,7 @@ async function $do(
 > {
   const input$: UpdateUploadPresetRequest = {
     name: name,
-    upload_preset: upload_preset,
+    upload_preset_input: upload_preset_input,
   };
 
   const parsed$ = safeParse(
@@ -91,7 +89,9 @@ async function $do(
     return [parsed$, { status: "invalid" }];
   }
   const payload$ = parsed$.value;
-  const body$ = encodeJSON("body", payload$.upload_preset, { explode: true });
+  const body$ = encodeJSON("body", payload$.upload_preset_input, {
+    explode: true,
+  });
 
   const pathParams$ = {
     cloud_name: encodeSimple("cloud_name", client$._options.cloud_name, {
@@ -158,26 +158,9 @@ async function $do(
   if (!doResult.ok) {
     return [doResult, { status: "request-error", request: req$ }];
   }
-  const response = doResult.value;
-  const responseFields$ = {
-    HttpMeta: { Response: response, Request: req$ },
-  };
-
-  const [result$] = await M.match<
-    UpdateUploadPresetResponse,
-    | APIError
-    | SDKValidationError
-    | UnexpectedClientError
-    | InvalidRequestError
-    | RequestAbortedError
-    | RequestTimeoutError
-    | ConnectionError
-  >(
-    M.json(200, UpdateUploadPresetResponse$zodSchema, { key: "object" }),
-    M.json([400, 401, 404], UpdateUploadPresetResponse$zodSchema, {
-      key: "api_error",
-    }),
-  )(response, req$, { extraFields: responseFields$ });
-
-  return [result$, { status: "complete", request: req$, response }];
+  return [doResult, {
+    status: "complete",
+    "request": req$,
+    response: doResult.value,
+  }];
 }

package/src/hooks/cloudConfig.ts

@@ -1,12 +1,22 @@
+/**
+ * Parsed value for the collect_headers option.
+ *   - `true`  → collect ALL response headers
+ *   - `string[]` → collect only the listed header names (lowercased)
+ *   - `[]`    → disabled (default)
+ */
+export type CollectHeaders = true | string[];
+
 export class CloudConfig {
     cloudName: string;
     apiKey: string;
     apiSecret: string;
+    collectHeaders: CollectHeaders;
 
     constructor() {
         this.cloudName = "";
         this.apiKey = "";
         this.apiSecret = "";
+        this.collectHeaders = [];
 
         // Access process through globalThis
         const process = (globalThis as any)?.process;
@@ -24,6 +34,12 @@ export class CloudConfig {
                 this.cloudName = url.host;
                 this.apiKey = url.username || "";
                 this.apiSecret = url.password || "";
+
+                // Parse collect_headers from CLOUDINARY_URL query params
+                const collectParam = url.searchParams.get("collect_headers");
+                if (collectParam) {
+                    this.collectHeaders = CloudConfig.parseCollectHeaders(collectParam);
+                }
             } catch (error) {
                 throw new Error(`Invalid CLOUDINARY_URL: '${envVar}'`);
             }
@@ -40,6 +56,13 @@ export class CloudConfig {
             if (process.env.CLOUDINARY_API_SECRET) {
                 this.apiSecret = process.env.CLOUDINARY_API_SECRET;
             }
+
+            // CLOUDINARY_COLLECT_HEADERS takes precedence over CLOUDINARY_URL query param
+            if (process.env.CLOUDINARY_COLLECT_HEADERS) {
+                this.collectHeaders = CloudConfig.parseCollectHeaders(
+                    process.env.CLOUDINARY_COLLECT_HEADERS,
+                );
+            }
         }
 
         // Automatically set CLOUDINARY_CLOUD_NAME if not already set
@@ -48,4 +71,22 @@ export class CloudConfig {
             process.env.CLOUDINARY_CLOUD_NAME = this.cloudName;
         }
     }
+
+    /**
+     * Parses a collect_headers value.
+     *   "true" | "all" → `true` (collect every header)
+     *   "x-request-id,cf-ray" → `["x-request-id", "cf-ray"]`
+     *   "" → `[]` (disabled)
+     */
+    private static parseCollectHeaders(value: string): CollectHeaders {
+        const trimmed = value.trim().toLowerCase();
+        if (trimmed === "true" || trimmed === "all") {
+            return true;
+        }
+        const names = trimmed
+            .split(",")
+            .map((h) => h.trim())
+            .filter(Boolean);
+        return names;
+    }
 }

package/src/hooks/cloudinaryAuthHook.ts

@@ -1,239 +1,86 @@
-import {CloudConfig} from "./cloudConfig.js";
-import {BeforeRequestContext, BeforeRequestHook} from "./types.js";
-
-export class CloudinaryAuthHook
-    implements BeforeRequestHook {
-
-    private readonly cloudConfig: CloudConfig;
-
-    constructor() {
-        this.cloudConfig = new CloudConfig();
+import { CloudConfig } from "./cloudConfig.js";
+import { BeforeRequestContext, BeforeRequestHook } from "./types.js";
+
+/**
+ * Attaches Cloudinary authentication to every outgoing request.
+ *
+ * Priority:
+ *   1. OAuth2 Bearer token (if provided via security source)
+ *   2. Basic auth (apiKey:apiSecret)
+ */
+export class CloudinaryAuthHook implements BeforeRequestHook {
+    private readonly config: CloudConfig;
+
+    constructor(config: CloudConfig) {
+        this.config = config;
     }
 
-    async beforeRequest(hookCtx: BeforeRequestContext, request: Request): Promise<Request> {
-        let security = hookCtx.securitySource;
-        // Resolve the security source if it's a function (for dynamic token refresh)
-        if (typeof security === 'function') {
-            security = await security();
-        }
-
-        // Prioritize OAuth2 bearer token if it's provided.
-        if (security && typeof security === 'object' && 'oauth2' in security && typeof security.oauth2 === 'string') {
-            const token = security.oauth2;
-            if (token) {
-                request.headers.set("Authorization", `Bearer ${token}`);
-                return request;
-            }
-        }
-
-        // Fallback to API key/secret signing if no OAuth token is present.
-        let { apiKey, apiSecret } = this.cloudConfig;
+    async beforeRequest(
+        hookCtx: BeforeRequestContext,
+        request: Request,
+    ): Promise<Request> {
+        const security = await this.resolveSecurity(hookCtx.securitySource);
 
-        // Optionally merge user-supplied security overrides
-        if (security) {
-            // Handle custom cloudinaryAuth format
-            if ('cloudinaryAuth' in security && security.cloudinaryAuth) {
-                // Support both camelCase and snake_case for compatibility
-                if (security.cloudinaryAuth.apiKey || security.cloudinaryAuth.api_key) {
-                    apiKey = security.cloudinaryAuth.apiKey || security.cloudinaryAuth.api_key;
-                }
-                if (security.cloudinaryAuth.apiSecret || security.cloudinaryAuth.api_secret) {
-                    apiSecret = security.cloudinaryAuth.apiSecret || security.cloudinaryAuth.api_secret;
-                }
-            }
-            // Handle standard SDK security format (used by MCP server)
-            else if ('apiKey' in security || 'apiSecret' in security) {
-                if ('apiKey' in security && security.apiKey) {
-                    apiKey = security.apiKey;
-                }
-                if ('apiSecret' in security && security.apiSecret) {
-                    apiSecret = security.apiSecret;
-                }
-            }
-        }
-
-        if (!apiKey || !apiSecret) {
+        // 1. OAuth2 Bearer token takes priority
+        if (this.isOAuth2Token(security)) {
+            request.headers.set("Authorization", `Bearer ${security.oauth2}`);
             return request;
         }
 
-        if (this.SIGNED_PATHS.every(path => request.url.indexOf(path) === -1)) {
-            // generate  Authorization header using basic auth where apiKey:apiSecret is encoded in base64
-            const authHeader = `Basic ${Buffer.from(`${apiKey}:${apiSecret}`).toString("base64")}`;
-            request.headers.set("Authorization", authHeader);
+        // 2. Resolve API key / secret (env → security overrides)
+        const { apiKey, apiSecret } = this.resolveCredentials(security);
+        if (!apiKey || !apiSecret) {
             return request;
         }
 
-        // Extract query parameters regardless of body existence
-        const url = new URL(request.url);
-        const queryParams = this.paramsFromQuery(url.searchParams);
-
-        // Handle case with only query parameters (no body)
-        if (!request.body) {
-            return this.signQueryOnlyRequest(request, apiKey, apiSecret, queryParams);
-        }
-
-        // if content-type is application/json, parse the body as json and add the signature, timestamp and apiKey to the body
-        if (request.headers.get("Content-Type") === "application/json") {
-            const preprocessedBody = await this.preprocessJsonRequest(request);
-            return this.signJsonRequest(request, apiKey, apiSecret, queryParams, preprocessedBody);
-        }
-
-        // if content-type is multipart/form-data, parse the body as form data and add the signature, timestamp and apiKey to the body
-        if (request.headers.get("Content-Type")?.startsWith("multipart/form-data")) {
-            return this.signFormDataRequest(request, apiKey, apiSecret, queryParams);
-        }
-
-        // Default case - just sign query parameters if any exist
-        if (queryParams.length > 0) {
-            return this.signQueryOnlyRequest(request, apiKey, apiSecret, queryParams);
-        }
+        const encoded = Buffer.from(`${apiKey}:${apiSecret}`).toString("base64");
+        request.headers.set("Authorization", `Basic ${encoded}`);
 
         return request;
     }
 
-    paramsFromQuery(searchParams: URLSearchParams): string[] {
-        const params = [];
-        for (const [key, value] of searchParams.entries()) {
-            if (key !== "file" && key !== "cloud_name" && key !== "resource_type" && key !== "api_key" && key !== "signature" && key !== "timestamp") {
-                params.push(`${key}=${value}`);
-            }
-        }
-        return params;
-    }
+    // --- Security resolution ---
 
-    async signQueryOnlyRequest(request: Request, apiKey: string, apiSecret: string, queryParams: string[]): Promise<Request> {
-        const url = new URL(request.url);
-        // Check if already signed
-        if (url.searchParams.has("signature")) {
-            return request;
-        }
-
-        const { signature, timestamp } = await this.computeSignature(queryParams, apiSecret);
-        url.searchParams.set("signature", signature);
-        url.searchParams.set("timestamp", timestamp.toString());
-        url.searchParams.set("api_key", apiKey);
-
-        return new Request(url.toString(), request);
+    private async resolveSecurity(source: unknown): Promise<unknown> {
+        return typeof source === "function" ? source() : source;
     }
 
-    async computeSignature(params: string[], apiSecret: string) {
-        const crypto = await import('node:crypto');
-        // Create a string with the parameters used in the POST request to Cloudinary:
-        //     All parameters added to the method call should be included except: file, cloud_name, resource_type and your api_key.
-        //     Sort all the parameters in alphabetical order.
-        //     Separate the parameter names from their values with an = and join the parameter/value pairs together with an &.
-        // Append your API secret to the end of the string.
-        // Create a hexadecimal message digest (hash value) of the string using an SHA cryptographic function.
-        const timestamp = Math.floor(Date.now() / 1000);
-        params.push(`timestamp=${timestamp}`);
-        params.sort();
-        const paramsString = params.join("&");
-        const signature = crypto.createHash('sha256').update(`${paramsString}${apiSecret}`).digest('hex');
-
-        return { signature, timestamp };
+    private isOAuth2Token(
+        security: unknown,
+    ): security is { oauth2: string } {
+        return (
+            typeof security === "object"
+            && security !== null
+            && "oauth2" in security
+            && typeof (security as any).oauth2 === "string"
+            && (security as any).oauth2.length > 0
+        );
     }
 
-    paramsToSignFormData(form: FormData) {
-        const params = [];
-        for (const [key, value] of form.entries()) {
-            if (key !== "file" && key !== "cloud_name" && key !== "resource_type" && key !== "api_key" && key !== "signature") {
-                params.push(`${key}=${value}`);
-            }
-        }
-        return params;
-    }
+    private resolveCredentials(security: unknown): {
+        apiKey: string;
+        apiSecret: string;
+    } {
+        let { apiKey, apiSecret } = this.config;
 
-    paramsToSignJson(json: Record<string, string>) {
-        const params = [];
-        for (const [key, value] of Object.entries(json)) {
-            if (key !== "file" && key !== "cloud_name" && key !== "resource_type" && key !== "api_key" && key !== "signature") {
-                params.push(`${key}=${value}`);
-            }
+        if (!security || typeof security !== "object") {
+            return { apiKey, apiSecret };
         }
-        return params;
-    }
-
-    async preprocessJsonRequest(request: Request): Promise<any> {
-        const body = await request.json();
-
-        // Handle file:// URLs by converting to base64 data URIs
-        if (body.file && typeof body.file === 'string' && body.file.startsWith('file://')) {
-            body.file = await this.convertFileToDataUri(body.file);
-        }
-
-        return body;
-    }
-
-    async signJsonRequest(request: Request, apiKey: string, apiSecret: string, queryParams: string[] = [], preprocessedBody?: any) {
-        const body = preprocessedBody || await request.json();
-        if (body.signature) {
-            return request;
-        }
-
-        const bodyParams = this.paramsToSignJson(body);
-        const allParams = [...bodyParams, ...queryParams];
-        const { signature, timestamp } = await this.computeSignature(allParams, apiSecret);
-        body.signature = signature;
-        body.timestamp = timestamp;
-        body.api_key = apiKey;
-        return new Request(request, { body: JSON.stringify(body) });
-    }
-
-    private async convertFileToDataUri(fileUrl: string): Promise<string> {
-        // Remove 'file://' prefix to get the actual file path
-        const filePath = fileUrl.replace(/^file:\/\//, '');
 
-        try {
-            // Import required Node.js modules
-            const { readFile } = await import('node:fs/promises');
+        const sec = security as Record<string, any>;
 
-            // Read the file as a buffer
-            const fileBuffer = await readFile(filePath);
-
-            // Convert to base64
-            const base64Data = fileBuffer.toString('base64');
-
-            // Use generic MIME type for all files
-            const mimeType = 'application/octet-stream';
-
-            // Return as data URI
-            return `data:${mimeType};base64,${base64Data}`;
-
-        } catch (error) {
-            // If file reading fails, log error and return original URL
-            console.error(`Failed to read file: ${filePath}`, error);
-            throw new Error(`Failed to read file: ${filePath}. ${error instanceof Error ? error.message : String(error)}`);
+        // cloudinaryAuth format (camelCase and snake_case)
+        if (sec["cloudinaryAuth"]) {
+            const auth = sec["cloudinaryAuth"];
+            apiKey = auth.apiKey || auth.api_key || apiKey;
+            apiSecret = auth.apiSecret || auth.api_secret || apiSecret;
         }
-    }
-
-    async signFormDataRequest(request: Request, apiKey: string, apiSecret: string, queryParams: string[] = []) {
-        const form = await request.clone().formData();
-        if (form.get("signature")) {
-            return request;
+        // Standard SDK security format (used by MCP server)
+        else if ("apiKey" in sec || "apiSecret" in sec) {
+            apiKey = sec["apiKey"] || apiKey;
+            apiSecret = sec["apiSecret"] || apiSecret;
         }
 
-        const bodyParams = this.paramsToSignFormData(form);
-        const allParams = [...bodyParams, ...queryParams];
-        const { signature, timestamp } = await this.computeSignature(allParams, apiSecret);
-
-        // add the signature, timestamp and apiKey to the URL as query parameters
-        const url = new URL(request.url);
-        url.searchParams.set("signature", signature);
-        url.searchParams.set("timestamp", timestamp.toString());
-        url.searchParams.set("api_key", apiKey);
-
-        // construct a new request with the same URL and the same form data and the same method
-        // remove the basic authentication header
-        const newHeaders = new Headers(request.headers);
-        newHeaders.delete("Authorization");
-        return new Request(url.toString(), request);
+        return { apiKey, apiSecret };
     }
-
-    SIGNED_ACTIONS = [
-        'explicit', 'upload', 'download', 'destroy', 'sprite', 'tags', 'context', 'metadata_update', 'text', 'multi', 'explode',
-        'rename', 'create_slideshow', 'create_video', 'create_collage', 'generate_archive'];
-
-    SIGNED_PATHS = ["image", "video", "raw", "auto", "asset"].flatMap(resourceType => this.SIGNED_ACTIONS.map(action => `${resourceType}/${action}`));
-
-
 }

package/src/hooks/customHeadersHook.ts

@@ -0,0 +1,30 @@
+import { BeforeRequestContext, BeforeRequestHook } from "./types.js";
+
+/**
+ * Injects custom headers into every outgoing request to the Cloudinary API.
+ *
+ * Headers are read from `hookCtx.options.customHeaders` (a Record<string, string>),
+ * which is set by mcp-service when constructing the SDK via getSDK.
+ *
+ * When no custom headers are configured, this hook is a no-op.
+ */
+export class CustomHeadersHook implements BeforeRequestHook {
+    async beforeRequest(
+        hookCtx: BeforeRequestContext,
+        request: Request,
+    ): Promise<Request> {
+        const customHeaders = (hookCtx.options as any)?.customHeaders as
+            | Record<string, string>
+            | undefined;
+
+        if (!customHeaders) {
+            return request;
+        }
+
+        for (const [name, value] of Object.entries(customHeaders)) {
+            request.headers.set(name, value);
+        }
+
+        return request;
+    }
+}

package/src/hooks/hooks.ts

@@ -1,5 +1,6 @@
 /*
  * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ * @generated-id: a2463fc6f69b
  */
 
 import { initHooks } from "./registration.js";

package/src/hooks/oauth2scopes.ts

@@ -1,9 +1,10 @@
 /*
  * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ * @generated-id: a709b8ce2ddb
  */
 
 /**
- * Available scopes for the  OAuth 2.0 scheme (authorizationCode flow).
+ * Available scopes for the oauth2 OAuth 2.0 scheme (authorizationCode flow).
  *
  * @remarks
  * OAuth2 Authorization Code flow for user authentication