@forklaunch/core 0.14.16 → 0.15.1-debug-hmac

package/lib/http/index.d.ts

@@ -1,6 +1,6 @@
 import { ParsedQs } from 'qs';
 export { ParsedQs } from 'qs';
-import { UnionToIntersection, TypeSafeFunction, StringWithoutSlash, Prettify, SanitizePathSlashes, MakePropertyOptionalIfChildrenOptional, PrettyCamelCase, EmptyObject } from '@forklaunch/common';
+import { UnionToIntersection, TypeSafeFunction, StringWithoutSlash, Prettify, MakePropertyOptionalIfChildrenOptional, SanitizePathSlashes, PrettyCamelCase, EmptyObject } from '@forklaunch/common';
 import { AnySchemaValidator, UnboxedObjectSchema, IdiomaticSchema, Schema } from '@forklaunch/validator';
 import { ServerOptions, IncomingMessage, ServerResponse } from 'node:http';
 import { Counter, Gauge, Histogram, UpDownCounter, ObservableCounter, ObservableGauge, ObservableUpDownCounter, Span } from '@opentelemetry/api';
@@ -1111,6 +1111,13 @@ interface ForklaunchRouter<SV extends AnySchemaValidator> {
     sdkPaths: Record<string, string>;
     /** Options for the router */
     routerOptions?: ExpressLikeRouterOptions<SV, SessionObject<SV>>;
+    /** Insert the SDK path into the router */
+    insertIntoRouterSdkPaths?: (params: {
+        sdkPath: string;
+        path: string;
+        method: string;
+        name: string;
+    }) => void;
 }
 /**
  * Interface representing a Forklaunch route.
@@ -1356,33 +1363,28 @@ type RouterMap<SV extends AnySchemaValidator> = {
     [K: string]: SdkRouter | RouterMap<SV>;
 };
 /**
- * Tail-recursive type that extracts SDK interfaces from a RouterMap structure.
- * This version uses an accumulator pattern to avoid deep recursion and improve performance.
- * Traverses the nested router map and collects all SDK interfaces into a flat structure.
+ * Recursive type representing a hierarchical map of SDK handlers.
+ * Each key can either be a leaf node containing a SdkHandler, or a nested SdkHandlerObject for deeper structures.
  *
- * @template SV - The schema validator type
- * @template T - The RouterMap to extract SDKs from
- * @template Acc - The accumulator type for collecting SDK interfaces (defaults to empty object)
- * @param SV - Must extend AnySchemaValidator
- * @param T - Must extend RouterMap<SV>
- * @param Acc - The accumulated SDK interfaces so far
- *
- * @returns A mapped type where each key corresponds to the original router structure,
- *         but values are the extracted SDK interfaces instead of the full router configuration
+ * @template SV - The schema validator type that constrains the handler structure.
  *
  * @example
  * ```typescript
- * // Given a RouterMap with nested structure
- * type ExtractedSdk = MapToSdk<ZodValidator, typeof routerMap>;
- * // Results in: { api: { users: { getUser: () => Promise<{}> }, posts: { getPosts: () => Promise<[]> } } }
+ * const handlers: SdkHandlerObject<ZodValidator> = {
+ *   users: {
+ *     getUser: someSdkHandler,
+ *     posts: {
+ *       getPosts: anotherSdkHandler
+ *     }
+ *   }
+ * };
  * ```
  */
-type MapToSdk<SV extends AnySchemaValidator, T extends RouterMap<SV>, Acc extends Record<string, unknown> = Record<string, never>> = Prettify<{
-    [K in keyof T]: T[K] extends {
-        sdk: unknown;
-    } ? T[K]['sdk'] : T[K] extends RouterMap<SV> ? MapToSdk<SV, T[K], Acc> : never;
-}>;
+type SdkHandlerObject<SV extends AnySchemaValidator> = {
+    [K: string]: SdkHandler | SdkHandlerObject<SV>;
+};
 /**
+ * @deprecated
  * Tail-recursive type that extracts and flattens fetch map interfaces from a RouterMap structure.
  * This version uses an accumulator pattern to avoid deep recursion and improve performance.
  * Similar to MapToSdk but focuses on _fetchMap properties and merges all fetch maps into a single intersection type.
@@ -1409,7 +1411,6 @@ type MapToFetch<SV extends AnySchemaValidator, T extends RouterMap<SV>> = UnionT
         _fetchMap: unknown;
     } ? T[K]['_fetchMap'] extends Record<string, unknown> ? T[K]['_fetchMap'] : never : never;
 }[keyof T]>>;
-type CollectionOptimized<T> = T extends infer U ? U : never;
 /**
  * Base interface for controller entries that defines the structure
  * of each controller method with its path, HTTP method, and contract details.
@@ -1458,10 +1459,25 @@ type SdkHandler = {
         versions?: unknown;
     };
 };
-type MapControllerToSdk<SV extends AnySchemaValidator, T extends Record<string, SdkHandler>> = CollectionOptimized<{
-    [K in keyof T]: LiveSdkFunction<SV, T[K]['contractDetails']['params'] extends infer Params | undefined ? Params extends ParamsObject<SV> ? Params : ParamsObject<SV> : ParamsObject<SV>, T[K]['contractDetails']['responses'] extends infer Responses | undefined ? Responses extends ResponsesObject<SV> ? Responses : ResponsesObject<SV> : ResponsesObject<SV>, T[K]['contractDetails']['body'] extends infer B | undefined ? B extends Body<SV> ? B : Body<SV> : Body<SV>, T[K]['contractDetails']['query'] extends infer Q | undefined ? Q extends QueryObject<SV> ? Q : QueryObject<SV> : QueryObject<SV>, T[K]['contractDetails']['requestHeaders'] extends infer RequestHeaders | undefined ? RequestHeaders extends HeadersObject<SV> ? RequestHeaders : HeadersObject<SV> : HeadersObject<SV>, T[K]['contractDetails']['responseHeaders'] extends infer ResponseHeaders | undefined ? ResponseHeaders extends HeadersObject<SV> ? ResponseHeaders : HeadersObject<SV> : HeadersObject<SV>, T[K]['contractDetails']['versions'] extends infer Versions | undefined ? Versions extends VersionSchema<SV, Method> ? Versions : VersionSchema<SV, Method> : VersionSchema<SV, Method>, T[K]['contractDetails']['auth'] extends infer Auth | undefined ? Auth extends AuthMethodsBase ? Auth : AuthMethodsBase : AuthMethodsBase>;
-}>;
 /**
+ * Recursively maps a client controller definition to its corresponding live SDK function types.
+ *
+ * This utility type traverses the structure of a client controller object, replacing each
+ * {@link SdkHandler} with its corresponding {@link MapHandlerToLiveSdk} type, while recursively
+ * processing nested objects. This enables type-safe SDK generation for complex controller hierarchies.
+ *
+ * @template SV - The schema validator type (e.g., zod, typebox).
+ * @template Client - The client controller object to map.
+ *
+ * @example
+ * type MySdk = MapToSdk<typeof z, typeof myController>;
+ */
+type MapToSdk<SV extends AnySchemaValidator, Client> = {
+    [K in keyof Client]: Client[K] extends SdkHandler ? MapHandlerToLiveSdk<SV, Client[K]> : MapToSdk<SV, Client[K]>;
+};
+type MapHandlerToLiveSdk<SV extends AnySchemaValidator, T extends SdkHandler> = LiveSdkFunction<SV, T['contractDetails']['params'] extends infer Params | undefined ? Params extends ParamsObject<SV> ? Params : ParamsObject<SV> : ParamsObject<SV>, T['contractDetails']['responses'] extends infer Responses | undefined ? Responses extends ResponsesObject<SV> ? Responses : ResponsesObject<SV> : ResponsesObject<SV>, T['contractDetails']['body'] extends infer B | undefined ? B extends Body<SV> ? B : Body<SV> : Body<SV>, T['contractDetails']['query'] extends infer Q | undefined ? Q extends QueryObject<SV> ? Q : QueryObject<SV> : QueryObject<SV>, T['contractDetails']['requestHeaders'] extends infer RequestHeaders | undefined ? RequestHeaders extends HeadersObject<SV> ? RequestHeaders : HeadersObject<SV> : HeadersObject<SV>, T['contractDetails']['responseHeaders'] extends infer ResponseHeaders | undefined ? ResponseHeaders extends HeadersObject<SV> ? ResponseHeaders : HeadersObject<SV> : HeadersObject<SV>, T['contractDetails']['versions'] extends infer Versions | undefined ? Versions extends VersionSchema<SV, Method> ? Versions : VersionSchema<SV, Method> : VersionSchema<SV, Method>, T['contractDetails']['auth'] extends infer Auth | undefined ? Auth extends AuthMethodsBase ? Auth : AuthMethodsBase : AuthMethodsBase>;
+/**
+ * @deprecated
  * Extracts and constructs a LiveTypeFunction from an SdkHandler object.
  * This optimized version reduces redundant type inference while maintaining type safety.
  *
@@ -1480,6 +1496,7 @@ type MapControllerToSdk<SV extends AnySchemaValidator, T extends Record<string,
  */
 type ExtractLiveTypeFn<Entry extends SdkHandler, SV extends AnySchemaValidator, BasePath extends `/${string}`> = LiveTypeFunction<SV, Entry['_path'] extends infer Path | undefined ? Path extends `/${string}` ? `${BasePath}${Path}` : never : never, Entry['contractDetails']['params'] extends infer Params | undefined ? Params extends ParamsObject<SV> ? Params : ParamsObject<SV> : ParamsObject<SV>, Entry['contractDetails']['responses'] extends infer Responses | undefined ? Responses extends ResponsesObject<SV> ? Responses : ResponsesObject<SV> : ResponsesObject<SV>, Entry['contractDetails']['body'] extends infer B | undefined ? B extends Body<SV> ? B : Body<SV> : Body<SV>, Entry['contractDetails']['query'] extends infer Q | undefined ? Q extends QueryObject<SV> ? Q : QueryObject<SV> : QueryObject<SV>, Entry['contractDetails']['requestHeaders'] extends infer RequestHeaders | undefined ? RequestHeaders extends HeadersObject<SV> ? RequestHeaders : HeadersObject<SV> : HeadersObject<SV>, Entry['contractDetails']['responseHeaders'] extends infer ResponseHeaders | undefined ? ResponseHeaders extends HeadersObject<SV> ? ResponseHeaders : HeadersObject<SV> : HeadersObject<SV>, Entry['_method'] extends Method ? Entry['_method'] : never, Entry['contractDetails']['versions'] extends infer Versions | undefined ? Versions extends VersionSchema<SV, Method> ? Versions : VersionSchema<SV, Method> : VersionSchema<SV, Method>, Entry['contractDetails']['auth'] extends infer Auth | undefined ? Auth extends AuthMethodsBase ? Auth : AuthMethodsBase : AuthMethodsBase>;
 /**
+ * @deprecated
  * Transforms a controller object into a fetch map structure that provides
  * type-safe access to HTTP endpoints. This optimized version reduces complexity
  * while maintaining full type safety and discriminated union behavior.
@@ -1657,6 +1674,14 @@ declare class ForklaunchExpressLikeRouter<SV extends AnySchemaValidator, BasePat
      * @returns {ExpressRouter} - The Express router.
      */
     trace: LiveTypeRouteDefinition<SV, BasePath, 'trace', RouterHandler, Internal, RouterSession, BaseRequest, BaseResponse, NextFunction, this>;
+    insertIntoRouterSdkPaths({ sdkPath, path, method, name }: {
+        sdkPath: string;
+        name: string;
+        path: string;
+        method: string;
+    }): void;
+    private unpackSdks;
+    registerSdks(sdks: SdkHandlerObject<SV>): void;
     protected cloneInternals(clone: this): void;
     clone(): this;
 }
@@ -2038,202 +2063,6 @@ declare function discriminateResponseBodies<SV extends AnySchemaValidator>(schem
     schema: SV["_ValidSchemaObject"];
 }>;
 
-/**
- * Creates a complete SDK client from a RouterMap configuration.
- * This is the main entry point for creating type-safe SDK clients that combine
- * both SDK interfaces and fetch functionality from router configurations.
- *
- * @template SV - The schema validator type that constrains the router structure
- * @template T - The RouterMap type to create the SDK client from
- * @param schemaValidator - The schema validator instance used for validation and type constraints
- * @param routerMap - The router map containing the complete API configuration
- *
- * @returns An object containing both the SDK interface and fetch function:
- *          - `sdk`: The extracted SDK interfaces for direct method calls
- *          - `fetch`: The unified fetch function for making HTTP requests
- *
- * @example
- * ```typescript
- * const routerMap = {
- *   api: {
- *     users: {
- *       sdk: { getUser: (id: string) => Promise.resolve({ id, name: 'John' }) },
- *       _fetchMap: { getUser: { get: (id: string) => fetch(`/api/users/${id}`) } }
- *     },
- *     posts: {
- *       sdk: { getPosts: () => Promise.resolve([]) },
- *       _fetchMap: { getPosts: { get: () => fetch('/api/posts') } }
- *     }
- *   }
- * };
- *
- * const client = sdkClient(zodValidator, routerMap);
- *
- * // Use SDK methods directly
- * const user = await client.sdk.api.users.getUser('123');
- *
- * // Use fetch function for custom requests
- * const response = await client.fetch('getUser', { params: { id: '123' } });
- * ```
- */
-declare function sdkClient<SV extends AnySchemaValidator, T extends RouterMap<SV>>(schemaValidator: SV, routerMap: T): {
-    _finalizedSdk: true;
-    sdk: MapToSdk<SV, T>;
-    fetch: FetchFunction<MapToFetch<SV, T>>;
-};
-
-/**
- * Creates a type-safe SDK router by mapping controller definitions to router SDK functions.
- * This function takes a controller object with contract details and maps each controller method
- * to the corresponding SDK function from the router, ensuring type safety throughout the process.
- * The function now uses `const` template parameters for better type inference and includes
- * a comprehensive fetch map for enhanced type safety.
- *
- * @template SV - The schema validator type that constrains the router and controller structure
- * @template T - The controller type containing contract details for each endpoint (const parameter)
- * @template Router - The router type that provides SDK functions, fetch, and _fetchMap capabilities (const parameter)
- * @param SV - Must extend AnySchemaValidator to ensure type safety
- * @param T - Must be a const record where each key maps to a controller method with contract details
- * @param Router - Must be a const object with optional sdk, fetch, and _fetchMap properties
- *
- * @param schemaValidator - The schema validator instance used for validation and type constraints
- * @param controller - The controller object containing contract details for each endpoint
- * @param router - The router instance that provides SDK functions, fetch, and _fetchMap capabilities
- *
- * @returns An object containing:
- *          - `sdk`: Type-safe SDK functions mapped from controller methods using LiveSdkFunction
- *          - `fetch`: The router's fetch function cast to FetchFunction with proper typing
- *          - `_fetchMap`: A comprehensive fetch map with LiveTypeFunction for each endpoint and method
- *
- * @example
- * ```typescript
- * const controller = {
- *   createAgent: {
- *     _path: '/agents',
- *     _method: 'POST',
- *     contractDetails: {
- *       name: 'createAgent',
- *       body: { name: 'string', organizationId: 'string' },
- *       responses: { 200: { id: 'string', name: 'string' } }
- *     }
- *   },
- *   getAgent: {
- *     _path: '/agents/:id',
- *     _method: 'GET',
- *     contractDetails: {
- *       name: 'getAgent',
- *       params: { id: 'string' },
- *       responses: { 200: { id: 'string', name: 'string' } }
- *     }
- *   }
- * } as const;
- *
- * const router = {
- *   sdk: { createAgent: () => Promise.resolve({}), getAgent: () => Promise.resolve({}) },
- *   fetch: (path: string, options: any) => fetch(path, options),
- *   _fetchMap: { '/agents': { POST: () => fetch('/agents', { method: 'POST' }) } }
- * } as const;
- *
- * const sdkRouter = sdkRouter(zodValidator, controller, router);
- *
- * // Use SDK functions with full type safety
- * const agent = await sdkRouter.sdk.createAgent({
- *   body: { name: 'My Agent', organizationId: 'org123' }
- * });
- *
- * const agentData = await sdkRouter.sdk.getAgent({
- *   params: { id: 'agent123' }
- * });
- *
- * // Use fetch function with enhanced type safety
- * const response = await sdkRouter.fetch('/agents', {
- *   method: 'POST',
- *   body: { name: 'Custom Agent', organizationId: 'org456' }
- * });
- *
- * // Access the fetch map for advanced usage
- * const _fetchMap = sdkRouter._fetchMap;
- * ```
- */
-declare function sdkRouter<SV extends AnySchemaValidator, const T extends Record<string, SdkHandler>, const Router extends {
-    sdk?: unknown;
-    fetch?: unknown;
-    _fetchMap?: unknown;
-    basePath?: string;
-    sdkPaths: Record<string, string>;
-}>(schemaValidator: SV, controller: T, router: Router): {
-    sdk: MapControllerToSdk<SV, T>;
-    fetch: FetchFunction<{ [K_1 in keyof T as T[K_1]["_path"] extends infer P | undefined ? P extends `/${string}` ? `${Router["basePath"] extends `/${string}` ? Router["basePath"] : "/"}${P}` : never : never]: { [M in T[K_1]["_method"] as M extends Method ? Uppercase<M> : never]: LiveTypeFunction<SV, Extract<T[K_1], {
-        _path: T[K_1]["_path"];
-        _method: M;
-    }>["_path"] extends infer Path | undefined ? Path extends `/${string}` ? `${Router["basePath"] extends `/${string}` ? Router["basePath"] : "/"}${Path}` : never : never, Extract<T[K_1], {
-        _path: T[K_1]["_path"];
-        _method: M;
-    }>["contractDetails"]["params"] extends infer Params | undefined ? Params extends ParamsObject<SV> ? Params : ParamsObject<SV> : ParamsObject<SV>, Extract<T[K_1], {
-        _path: T[K_1]["_path"];
-        _method: M;
-    }>["contractDetails"]["responses"] extends infer Responses | undefined ? Responses extends ResponsesObject<SV> ? Responses : ResponsesObject<SV> : ResponsesObject<SV>, Extract<T[K_1], {
-        _path: T[K_1]["_path"];
-        _method: M;
-    }>["contractDetails"]["body"] extends infer B | undefined ? B extends Body<SV> ? B : Body<SV> : Body<SV>, Extract<T[K_1], {
-        _path: T[K_1]["_path"];
-        _method: M;
-    }>["contractDetails"]["query"] extends infer Q | undefined ? Q extends QueryObject<SV> ? Q : QueryObject<SV> : QueryObject<SV>, Extract<T[K_1], {
-        _path: T[K_1]["_path"];
-        _method: M;
-    }>["contractDetails"]["requestHeaders"] extends infer RequestHeaders | undefined ? RequestHeaders extends HeadersObject<SV> ? RequestHeaders : HeadersObject<SV> : HeadersObject<SV>, Extract<T[K_1], {
-        _path: T[K_1]["_path"];
-        _method: M;
-    }>["contractDetails"]["responseHeaders"] extends infer ResponseHeaders | undefined ? ResponseHeaders extends HeadersObject<SV> ? ResponseHeaders : HeadersObject<SV> : HeadersObject<SV>, Extract<T[K_1], {
-        _path: T[K_1]["_path"];
-        _method: M;
-    }>["_method"] extends Method ? Extract<T[K_1], {
-        _path: T[K_1]["_path"];
-        _method: M;
-    }>["_method"] : never, Extract<T[K_1], {
-        _path: T[K_1]["_path"];
-        _method: M;
-    }>["contractDetails"]["versions"] extends infer Versions | undefined ? Versions extends VersionSchema<SV, Method> ? Versions : VersionSchema<SV, Method> : VersionSchema<SV, Method>, Extract<T[K_1], {
-        _path: T[K_1]["_path"];
-        _method: M;
-    }>["contractDetails"]["auth"] extends infer Auth | undefined ? Auth extends AuthMethodsBase ? Auth : AuthMethodsBase : AuthMethodsBase>; }; } extends infer T_1 ? { [K in keyof T_1]: T_1[K]; } : never>;
-    _fetchMap: { [K_1 in keyof T as T[K_1]["_path"] extends infer P | undefined ? P extends `/${string}` ? `${Router["basePath"] extends `/${string}` ? Router["basePath"] : "/"}${P}` : never : never]: { [M in T[K_1]["_method"] as M extends Method ? Uppercase<M> : never]: LiveTypeFunction<SV, Extract<T[K_1], {
-        _path: T[K_1]["_path"];
-        _method: M;
-    }>["_path"] extends infer Path | undefined ? Path extends `/${string}` ? `${Router["basePath"] extends `/${string}` ? Router["basePath"] : "/"}${Path}` : never : never, Extract<T[K_1], {
-        _path: T[K_1]["_path"];
-        _method: M;
-    }>["contractDetails"]["params"] extends infer Params | undefined ? Params extends ParamsObject<SV> ? Params : ParamsObject<SV> : ParamsObject<SV>, Extract<T[K_1], {
-        _path: T[K_1]["_path"];
-        _method: M;
-    }>["contractDetails"]["responses"] extends infer Responses | undefined ? Responses extends ResponsesObject<SV> ? Responses : ResponsesObject<SV> : ResponsesObject<SV>, Extract<T[K_1], {
-        _path: T[K_1]["_path"];
-        _method: M;
-    }>["contractDetails"]["body"] extends infer B | undefined ? B extends Body<SV> ? B : Body<SV> : Body<SV>, Extract<T[K_1], {
-        _path: T[K_1]["_path"];
-        _method: M;
-    }>["contractDetails"]["query"] extends infer Q | undefined ? Q extends QueryObject<SV> ? Q : QueryObject<SV> : QueryObject<SV>, Extract<T[K_1], {
-        _path: T[K_1]["_path"];
-        _method: M;
-    }>["contractDetails"]["requestHeaders"] extends infer RequestHeaders | undefined ? RequestHeaders extends HeadersObject<SV> ? RequestHeaders : HeadersObject<SV> : HeadersObject<SV>, Extract<T[K_1], {
-        _path: T[K_1]["_path"];
-        _method: M;
-    }>["contractDetails"]["responseHeaders"] extends infer ResponseHeaders | undefined ? ResponseHeaders extends HeadersObject<SV> ? ResponseHeaders : HeadersObject<SV> : HeadersObject<SV>, Extract<T[K_1], {
-        _path: T[K_1]["_path"];
-        _method: M;
-    }>["_method"] extends Method ? Extract<T[K_1], {
-        _path: T[K_1]["_path"];
-        _method: M;
-    }>["_method"] : never, Extract<T[K_1], {
-        _path: T[K_1]["_path"];
-        _method: M;
-    }>["contractDetails"]["versions"] extends infer Versions | undefined ? Versions extends VersionSchema<SV, Method> ? Versions : VersionSchema<SV, Method> : VersionSchema<SV, Method>, Extract<T[K_1], {
-        _path: T[K_1]["_path"];
-        _method: M;
-    }>["contractDetails"]["auth"] extends infer Auth | undefined ? Auth extends AuthMethodsBase ? Auth : AuthMethodsBase : AuthMethodsBase>; }; } extends infer T_2 ? { [K in keyof T_2]: T_2[K]; } : never;
-    sdkPaths: Router["sdkPaths"];
-};
-
 declare const ATTR_API_NAME = "api.name";
 declare const ATTR_CORRELATION_ID = "correlation.id";
 
@@ -2267,4 +2096,4 @@ declare function logger(level: LevelWithSilentOrString, meta?: AnyValueMap): Pin
 
 declare function recordMetric<SV extends AnySchemaValidator, P extends ParamsDictionary, ReqBody extends Record<string, unknown>, ReqQuery extends ParsedQs, ResBodyMap extends Record<string, unknown>, ReqHeaders extends Record<string, string>, ResHeaders extends Record<string, unknown>, LocalsObj extends Record<string, unknown>, VersionedReqs extends VersionedRequests, SessionSchema extends Record<string, unknown>>(req: ForklaunchRequest<SV, P, ReqBody, ReqQuery, ReqHeaders, Extract<keyof VersionedReqs, string>, SessionSchema>, res: ForklaunchResponse<unknown, ResBodyMap, ResHeaders, LocalsObj, Extract<keyof VersionedReqs, string>>): void;
 
-export { ATTR_API_NAME, ATTR_CORRELATION_ID, type AuthMethods, type AuthMethodsBase, type BasicAuthMethods, type Body, type BodyObject, type ClusterConfig, type ConstrainedForklaunchRouter, type ContractDetails, type ContractDetailsExpressLikeSchemaHandler, type ContractDetailsOrMiddlewareOrTypedHandler, type DecodeResource, type DocsConfiguration, type ErrorContainer, type ExpressLikeApplicationOptions, type ExpressLikeAuthMapper, type ExpressLikeGlobalAuthOptions, type ExpressLikeHandler, type ExpressLikeRouter, type ExpressLikeRouterOptions, type ExpressLikeSchemaAuthMapper, type ExpressLikeSchemaGlobalAuthOptions, type ExpressLikeSchemaHandler, type ExpressLikeTypedHandler, type ExtractBody, type ExtractContentType, type ExtractLiveTypeFn, type ExtractResponseBody, type ExtractedParamsObject, type FetchFunction, type FileBody, type ForklaunchBaseRequest, ForklaunchExpressLikeApplication, ForklaunchExpressLikeRouter, type ForklaunchNextFunction, type ForklaunchRequest, type ForklaunchResErrors, type ForklaunchResHeaders, type ForklaunchResponse, type ForklaunchRoute, type ForklaunchRouter, type ForklaunchSendableData, type ForklaunchStatusResponse, HTTPStatuses, type HeadersObject, type HmacMethods, type HttpContractDetails, type HttpMethod, type JsonBody, type JwtAuthMethods, type LiveSdkFunction, type LiveTypeFunction, type LiveTypeFunctionRequestInit, type LiveTypeRouteDefinition, type LogFn, type LoggerMeta, type MapControllerToSdk, type MapParamsSchema, type MapReqBodySchema, type MapReqHeadersSchema, type MapReqQuerySchema, type MapResBodyMapSchema, type MapResHeadersSchema, type MapSchema, type MapSessionSchema, type MapToFetch, type MapToSdk, type MapVersionedReqsSchema, type MapVersionedRespsSchema, type Method, type MetricType, type MetricsDefinition, type MiddlewareContractDetails, type MiddlewareOrMiddlewareWithTypedHandler, type MultipartForm, type NestableRouterBasedHandler, type NumberOnlyObject, OPENAPI_DEFAULT_VERSION, OpenTelemetryCollector, type ParamsDictionary, type ParamsObject, type PathBasedHandler, type PathMatch, type PathOrMiddlewareBasedHandler, type PathParamHttpContractDetails, type PathParamMethod, type QueryObject, type RawTypedResponseBody, type RequestContext, type ResolvedForklaunchAuthRequest, type ResolvedForklaunchRequest, type ResolvedForklaunchResponse, type ResolvedSessionObject, type ResponseBody, type ResponseCompiledSchema, type ResponseShape, type ResponsesObject, type RouterMap, type RoutingStrategy, type SchemaAuthMethods, type SdkHandler, type SdkRouter, type ServerSentEventBody, type SessionObject, type StatusCode, type StringOnlyObject, type TelemetryOptions, type TextBody, type ToFetchMap, type TypedBody, type TypedHandler, type TypedMiddlewareDefinition, type TypedNestableMiddlewareDefinition, type TypedRequestBody, type TypedResponseBody, type UnknownBody, type UnknownResponseBody, type UrlEncodedForm, type VersionSchema, type VersionedRequests, type VersionedResponses, createHmacToken, delete_, discriminateAuthMethod, discriminateBody, discriminateResponseBodies, enrichExpressLikeSend, evaluateTelemetryOptions, generateMcpServer, generateOpenApiSpecs, get, getCachedJwks, getCodeForStatus, head, httpRequestsTotalCounter, httpServerDurationHistogram, isClientError, isForklaunchRequest, isForklaunchRouter, isInformational, isPortBound, isRedirection, isServerError, isSuccessful, isValidStatusCode, logger, meta, metricsDefinitions, middleware, options, patch, post, put, recordMetric, sdkClient, sdkRouter, trace, typedAuthHandler, typedHandler };
+export { ATTR_API_NAME, ATTR_CORRELATION_ID, type AuthMethods, type AuthMethodsBase, type BasicAuthMethods, type Body, type BodyObject, type ClusterConfig, type ConstrainedForklaunchRouter, type ContractDetails, type ContractDetailsExpressLikeSchemaHandler, type ContractDetailsOrMiddlewareOrTypedHandler, type DecodeResource, type DocsConfiguration, type ErrorContainer, type ExpressLikeApplicationOptions, type ExpressLikeAuthMapper, type ExpressLikeGlobalAuthOptions, type ExpressLikeHandler, type ExpressLikeRouter, type ExpressLikeRouterOptions, type ExpressLikeSchemaAuthMapper, type ExpressLikeSchemaGlobalAuthOptions, type ExpressLikeSchemaHandler, type ExpressLikeTypedHandler, type ExtractBody, type ExtractContentType, type ExtractLiveTypeFn, type ExtractResponseBody, type ExtractedParamsObject, type FetchFunction, type FileBody, type ForklaunchBaseRequest, ForklaunchExpressLikeApplication, ForklaunchExpressLikeRouter, type ForklaunchNextFunction, type ForklaunchRequest, type ForklaunchResErrors, type ForklaunchResHeaders, type ForklaunchResponse, type ForklaunchRoute, type ForklaunchRouter, type ForklaunchSendableData, type ForklaunchStatusResponse, HTTPStatuses, type HeadersObject, type HmacMethods, type HttpContractDetails, type HttpMethod, type JsonBody, type JwtAuthMethods, type LiveSdkFunction, type LiveTypeFunction, type LiveTypeFunctionRequestInit, type LiveTypeRouteDefinition, type LogFn, type LoggerMeta, type MapHandlerToLiveSdk, type MapParamsSchema, type MapReqBodySchema, type MapReqHeadersSchema, type MapReqQuerySchema, type MapResBodyMapSchema, type MapResHeadersSchema, type MapSchema, type MapSessionSchema, type MapToFetch, type MapToSdk, type MapVersionedReqsSchema, type MapVersionedRespsSchema, type Method, type MetricType, type MetricsDefinition, type MiddlewareContractDetails, type MiddlewareOrMiddlewareWithTypedHandler, type MultipartForm, type NestableRouterBasedHandler, type NumberOnlyObject, OPENAPI_DEFAULT_VERSION, OpenTelemetryCollector, type ParamsDictionary, type ParamsObject, type PathBasedHandler, type PathMatch, type PathOrMiddlewareBasedHandler, type PathParamHttpContractDetails, type PathParamMethod, type QueryObject, type RawTypedResponseBody, type RequestContext, type ResolvedForklaunchAuthRequest, type ResolvedForklaunchRequest, type ResolvedForklaunchResponse, type ResolvedSessionObject, type ResponseBody, type ResponseCompiledSchema, type ResponseShape, type ResponsesObject, type RouterMap, type RoutingStrategy, type SchemaAuthMethods, type SdkHandler, type SdkHandlerObject, type SdkRouter, type ServerSentEventBody, type SessionObject, type StatusCode, type StringOnlyObject, type TelemetryOptions, type TextBody, type ToFetchMap, type TypedBody, type TypedHandler, type TypedMiddlewareDefinition, type TypedNestableMiddlewareDefinition, type TypedRequestBody, type TypedResponseBody, type UnknownBody, type UnknownResponseBody, type UrlEncodedForm, type VersionSchema, type VersionedRequests, type VersionedResponses, createHmacToken, delete_, discriminateAuthMethod, discriminateBody, discriminateResponseBodies, enrichExpressLikeSend, evaluateTelemetryOptions, generateMcpServer, generateOpenApiSpecs, get, getCachedJwks, getCodeForStatus, head, httpRequestsTotalCounter, httpServerDurationHistogram, isClientError, isForklaunchRequest, isForklaunchRouter, isInformational, isPortBound, isRedirection, isServerError, isSuccessful, isValidStatusCode, logger, meta, metricsDefinitions, middleware, options, patch, post, put, recordMetric, trace, typedAuthHandler, typedHandler };

package/lib/http/index.js

@@ -74,8 +74,6 @@ __export(http_exports, {
   post: () => post,
   put: () => put,
   recordMetric: () => recordMetric,
-  sdkClient: () => sdkClient,
-  sdkRouter: () => sdkRouter,
   trace: () => trace3,
   typedAuthHandler: () => typedAuthHandler,
   typedHandler: () => typedHandler
@@ -153,6 +151,11 @@ function isHttpContractDetails(maybeContractDetails) {
   ));
 }
 
+// src/http/guards/isSdkHandler.ts
+function isSdkHandler(handler) {
+  return typeof handler === "object" && handler !== null && "_path" in handler && "_method" in handler && "contractDetails" in handler;
+}
+
 // src/http/guards/isTypedHandler.ts
 function isTypedHandler(maybeTypedHandler) {
   return maybeTypedHandler != null && typeof maybeTypedHandler === "object" && "_typedHandler" in maybeTypedHandler && maybeTypedHandler._typedHandler === true;
@@ -396,6 +399,13 @@ async function checkAuthorizationToken(req, authorizationMethod, authorizationTo
       const parsedTimestamp = parseHmacTokenPart(timestamp, "ts");
       const parsedNonce = parseHmacTokenPart(nonce, "nonce");
       const parsedSignature = parseHmacTokenPart(signature, "signature");
+      console.log(
+        "parseditems",
+        parsedKeyId,
+        parsedTimestamp,
+        parsedNonce,
+        parsedSignature
+      );
       if (!parsedKeyId || !parsedTimestamp || !parsedNonce || !parsedSignature) {
         return invalidAuthorizationTokenFormat;
       }
@@ -1895,6 +1905,53 @@ var ForklaunchExpressLikeRouter = class _ForklaunchExpressLikeRouter {
       ...middlewareOrMiddlewareWithTypedHandler
     );
   };
+  insertIntoRouterSdkPaths({
+    sdkPath,
+    path,
+    method,
+    name
+  }) {
+    const routePath = [method, path].join(".");
+    for (const route of this.routes) {
+      if (route.path === path && route.method === method && route.contractDetails.name === name) {
+        this.sdkPaths[routePath] = sdkPath;
+      }
+    }
+    for (const router of this.routers) {
+      router.insertIntoRouterSdkPaths?.({
+        sdkPath,
+        path,
+        method,
+        name
+      });
+    }
+  }
+  unpackSdks(sdks, path, routerUniquenessCache) {
+    Object.entries(sdks).forEach(([key, maybeHandler]) => {
+      if (isSdkHandler(maybeHandler)) {
+        const cacheKey = (0, import_common9.hashString)((0, import_common9.safeStringify)(maybeHandler));
+        if (routerUniquenessCache.has(cacheKey)) {
+          throw new Error(`SDK handler ${key} is already registered`);
+        }
+        routerUniquenessCache.add(cacheKey);
+        if (!maybeHandler._method || !maybeHandler._path) {
+          throw new Error(`SDK handler ${key} is missing method or path`);
+        }
+        this.insertIntoRouterSdkPaths({
+          sdkPath: [...path, key].join("."),
+          path: maybeHandler._path,
+          method: maybeHandler._method,
+          name: maybeHandler.contractDetails.name
+        });
+        routerUniquenessCache.add(cacheKey);
+      } else {
+        this.unpackSdks(maybeHandler, [...path, key], routerUniquenessCache);
+      }
+    });
+  }
+  registerSdks(sdks) {
+    this.unpackSdks(sdks, [], /* @__PURE__ */ new Set());
+  }
   cloneInternals(clone) {
     clone.routers = [...this.routers];
     clone.routes = [...this.routes];
@@ -3912,109 +3969,6 @@ function generateOpenApiSpecs(schemaValidator, serverUrls, serverDescriptions, a
   );
 }
 
-// src/http/sdk/sdkClient.ts
-var import_common14 = require("@forklaunch/common");
-
-// src/http/guards/isSdkRouter.ts
-function isSdkRouter(value) {
-  return typeof value === "object" && value !== null && "sdk" in value && "_fetchMap" in value && "sdkPaths" in value;
-}
-
-// src/http/sdk/sdkClient.ts
-function mapToSdk(schemaValidator, routerMap, runningPath = void 0) {
-  const routerUniquenessCache = /* @__PURE__ */ new Set();
-  return Object.fromEntries(
-    Object.entries(routerMap).map(([key, value]) => {
-      if (routerUniquenessCache.has((0, import_common14.hashString)((0, import_common14.safeStringify)(value)))) {
-        throw new Error(
-          `SdkClient: Cannot use the same router pointer twice. Please clone the duplicate router with .clone() or only use the router once.`
-        );
-      }
-      routerUniquenessCache.add((0, import_common14.hashString)((0, import_common14.safeStringify)(value)));
-      const currentPath = runningPath ? [runningPath, key].join(".") : key;
-      if (isSdkRouter(value)) {
-        Object.entries(value.sdkPaths).forEach(([routePath, sdkKey]) => {
-          if ("controllerSdkPaths" in value && Array.isArray(value.controllerSdkPaths) && value.controllerSdkPaths.includes(routePath)) {
-            value.sdkPaths[routePath] = [currentPath, sdkKey].join(".");
-          }
-        });
-        return [key, value.sdk];
-      } else {
-        return [
-          key,
-          mapToSdk(
-            schemaValidator,
-            value,
-            runningPath ? [runningPath, key].join(".") : key
-          )
-        ];
-      }
-    })
-  );
-}
-function flattenFetchMap(schemaValidator, routerMap) {
-  const _fetchMap = Object.entries(routerMap).reduce(
-    (acc, [, value]) => {
-      if ("_fetchMap" in value) {
-        return {
-          ...acc,
-          ...value._fetchMap
-        };
-      } else {
-        return {
-          ...acc,
-          ...flattenFetchMap(schemaValidator, value)
-        };
-      }
-    },
-    {}
-  );
-  return _fetchMap;
-}
-function mapToFetch(schemaValidator, routerMap) {
-  const flattenedFetchMap = flattenFetchMap(
-    schemaValidator,
-    routerMap
-  );
-  return ((path, ...reqInit) => {
-    const method = reqInit[0]?.method;
-    const version = reqInit[0] != null && "version" in reqInit[0] ? reqInit[0].version : void 0;
-    return (version ? (0, import_common14.toRecord)((0, import_common14.toRecord)(flattenedFetchMap[path])[method ?? "GET"])[version] : (0, import_common14.toRecord)(flattenedFetchMap[path])[method ?? "GET"])(path, reqInit[0]);
-  });
-}
-function sdkClient(schemaValidator, routerMap) {
-  return {
-    _finalizedSdk: true,
-    sdk: mapToSdk(schemaValidator, routerMap),
-    fetch: mapToFetch(schemaValidator, routerMap)
-  };
-}
-
-// src/http/sdk/sdkRouter.ts
-var import_common15 = require("@forklaunch/common");
-function sdkRouter(schemaValidator, controller, router) {
-  const controllerSdkPaths = [];
-  const mappedSdk = Object.fromEntries(
-    Object.entries(controller).map(([key, value]) => {
-      const sdkPath = [value._method, value._path].join(".");
-      controllerSdkPaths.push(sdkPath);
-      router.sdkPaths[sdkPath] = key;
-      return [
-        key,
-        router.sdk[(0, import_common15.toPrettyCamelCase)(value.contractDetails.name)]
-      ];
-    })
-  );
-  const _fetchMap = router._fetchMap;
-  return {
-    sdk: mappedSdk,
-    fetch: router.fetch,
-    _fetchMap,
-    sdkPaths: router.sdkPaths,
-    controllerSdkPaths
-  };
-}
-
 // src/http/telemetry/evaluateTelemetryOptions.ts
 function evaluateTelemetryOptions(telemetryOptions) {
   return {
@@ -4081,8 +4035,6 @@ function metricsDefinitions(metrics2) {
   post,
   put,
   recordMetric,
-  sdkClient,
-  sdkRouter,
   trace,
   typedAuthHandler,
   typedHandler