@forklaunch/core 0.17.0 → 0.17.2

package/lib/{apiDefinition.types--RSi8f6C.d.mts → apiDefinition.types-XZ0lrfFc.d.mts}

@@ -5,8 +5,8 @@ import { JWTPayload, JWK } from 'jose';
 import { ParsedQs } from 'qs';
 import { Readable } from 'stream';
 import { LevelWithSilentOrString, LevelWithSilent } from 'pino';
-import { FastMCP } from '@forklaunch/fastmcp-fork';
 import { CorsOptions } from 'cors';
+import { FastMCP } from 'fastmcp';
 import http from 'http';
 import { ApiReferenceConfiguration } from '@scalar/express-api-reference';
 

package/lib/{apiDefinition.types--RSi8f6C.d.ts → apiDefinition.types-XZ0lrfFc.d.ts}

@@ -5,8 +5,8 @@ import { JWTPayload, JWK } from 'jose';
 import { ParsedQs } from 'qs';
 import { Readable } from 'stream';
 import { LevelWithSilentOrString, LevelWithSilent } from 'pino';
-import { FastMCP } from '@forklaunch/fastmcp-fork';
 import { CorsOptions } from 'cors';
+import { FastMCP } from 'fastmcp';
 import http from 'http';
 import { ApiReferenceConfiguration } from '@scalar/express-api-reference';
 

package/lib/http/index.d.mts

@@ -3,11 +3,11 @@ export { ParsedQs } from 'qs';
 import { Prettify, SanitizePathSlashes, PrettyCamelCase, TypeSafeFunction, UnionToIntersection, EmptyObject } from '@forklaunch/common';
 import { AnySchemaValidator } from '@forklaunch/validator';
 import { ServerOptions, IncomingMessage, ServerResponse } from 'node:http';
-import { M as Method, P as PathParamHttpContractDetails, H as HttpContractDetails, E as ExpressLikeRouterOptions, a as SessionObject, b as ParamsObject, R as ResponsesObject, B as Body, Q as QueryObject, c as HeadersObject, V as VersionSchema, d as SchemaAuthMethods, C as ContractDetails, e as ExpressLikeSchemaHandler, f as ResolvedSessionObject, g as PathMatch, L as LiveTypeFunction, h as LiveSdkFunction, A as AuthMethodsBase, O as OpenTelemetryCollector, i as MetricsDefinition, j as ExpressLikeApplicationOptions, k as ParamsDictionary, l as VersionedRequests, m as AuthMethods, D as DecodeResource, n as BasicAuthMethods, F as ForklaunchRequest, o as MiddlewareContractDetails, p as ExpressLikeSchemaAuthMapper, q as ForklaunchNextFunction, r as ForklaunchResponse, s as ForklaunchResHeaders, t as ForklaunchStatusResponse, u as ForklaunchSendableData, T as TelemetryOptions, v as LoggerMeta, w as LogFn } from '../apiDefinition.types--RSi8f6C.mjs';
-export { ac as BodyObject, ax as DocsConfiguration, a9 as ErrorContainer, a6 as ExpressLikeAuthMapper, ay as ExpressLikeGlobalAuthOptions, U as ExpressLikeHandler, az as ExpressLikeSchemaGlobalAuthOptions, _ as ExtractBody, X as ExtractContentType, Y as ExtractResponseBody, at as ExtractedParamsObject, ai as FileBody, G as ForklaunchBaseRequest, a8 as ForklaunchResErrors, ar as HmacMethods, av as HttpMethod, ag as JsonBody, aq as JwtAuthMethods, a7 as LiveTypeFunctionRequestInit, W as MapParamsSchema, $ as MapReqBodySchema, a1 as MapReqHeadersSchema, a0 as MapReqQuerySchema, Z as MapResBodyMapSchema, a2 as MapResHeadersSchema, as as MapSchema, a5 as MapSessionSchema, a3 as MapVersionedReqsSchema, a4 as MapVersionedRespsSchema, aA as MetricType, aj as MultipartForm, ab as NumberOnlyObject, au as PathParamMethod, ad as RawTypedResponseBody, z as RequestContext, J as ResolvedForklaunchAuthRequest, I as ResolvedForklaunchRequest, N as ResolvedForklaunchResponse, af as ResponseBody, aw as ResponseCompiledSchema, aa as ResponseShape, al as ServerSentEventBody, S as StringOnlyObject, ah as TextBody, ap as TypedBody, ao as TypedRequestBody, ae as TypedResponseBody, am as UnknownBody, an as UnknownResponseBody, ak as UrlEncodedForm, K as VersionedResponses, x as httpRequestsTotalCounter, y as httpServerDurationHistogram } from '../apiDefinition.types--RSi8f6C.mjs';
+import { M as Method, P as PathParamHttpContractDetails, H as HttpContractDetails, E as ExpressLikeRouterOptions, a as SessionObject, b as ParamsObject, R as ResponsesObject, B as Body, Q as QueryObject, c as HeadersObject, V as VersionSchema, d as SchemaAuthMethods, C as ContractDetails, e as ExpressLikeSchemaHandler, f as ResolvedSessionObject, g as PathMatch, L as LiveTypeFunction, h as LiveSdkFunction, A as AuthMethodsBase, O as OpenTelemetryCollector, i as MetricsDefinition, j as ExpressLikeApplicationOptions, k as ParamsDictionary, l as VersionedRequests, m as AuthMethods, D as DecodeResource, n as BasicAuthMethods, F as ForklaunchRequest, o as MiddlewareContractDetails, p as ExpressLikeSchemaAuthMapper, q as ForklaunchNextFunction, r as ForklaunchResponse, s as ForklaunchResHeaders, t as ForklaunchStatusResponse, u as ForklaunchSendableData, T as TelemetryOptions, v as LoggerMeta, w as LogFn } from '../apiDefinition.types-XZ0lrfFc.mjs';
+export { ac as BodyObject, ax as DocsConfiguration, a9 as ErrorContainer, a6 as ExpressLikeAuthMapper, ay as ExpressLikeGlobalAuthOptions, U as ExpressLikeHandler, az as ExpressLikeSchemaGlobalAuthOptions, _ as ExtractBody, X as ExtractContentType, Y as ExtractResponseBody, at as ExtractedParamsObject, ai as FileBody, G as ForklaunchBaseRequest, a8 as ForklaunchResErrors, ar as HmacMethods, av as HttpMethod, ag as JsonBody, aq as JwtAuthMethods, a7 as LiveTypeFunctionRequestInit, W as MapParamsSchema, $ as MapReqBodySchema, a1 as MapReqHeadersSchema, a0 as MapReqQuerySchema, Z as MapResBodyMapSchema, a2 as MapResHeadersSchema, as as MapSchema, a5 as MapSessionSchema, a3 as MapVersionedReqsSchema, a4 as MapVersionedRespsSchema, aA as MetricType, aj as MultipartForm, ab as NumberOnlyObject, au as PathParamMethod, ad as RawTypedResponseBody, z as RequestContext, J as ResolvedForklaunchAuthRequest, I as ResolvedForklaunchRequest, N as ResolvedForklaunchResponse, af as ResponseBody, aw as ResponseCompiledSchema, aa as ResponseShape, al as ServerSentEventBody, S as StringOnlyObject, ah as TextBody, ap as TypedBody, ao as TypedRequestBody, ae as TypedResponseBody, am as UnknownBody, an as UnknownResponseBody, ak as UrlEncodedForm, K as VersionedResponses, x as httpRequestsTotalCounter, y as httpServerDurationHistogram } from '../apiDefinition.types-XZ0lrfFc.mjs';
 import { JWK, JWTPayload } from 'jose';
-import { FastMCP } from '@forklaunch/fastmcp-fork';
 import { ZodSchemaValidator } from '@forklaunch/validator/zod';
+import { FastMCP } from 'fastmcp';
 import http from 'http';
 import { OpenAPIObject } from 'openapi3-ts/oas31';
 import pino, { LevelWithSilentOrString, LevelWithSilent } from 'pino';

package/lib/http/index.d.ts

@@ -3,11 +3,11 @@ export { ParsedQs } from 'qs';
 import { Prettify, SanitizePathSlashes, PrettyCamelCase, TypeSafeFunction, UnionToIntersection, EmptyObject } from '@forklaunch/common';
 import { AnySchemaValidator } from '@forklaunch/validator';
 import { ServerOptions, IncomingMessage, ServerResponse } from 'node:http';
-import { M as Method, P as PathParamHttpContractDetails, H as HttpContractDetails, E as ExpressLikeRouterOptions, a as SessionObject, b as ParamsObject, R as ResponsesObject, B as Body, Q as QueryObject, c as HeadersObject, V as VersionSchema, d as SchemaAuthMethods, C as ContractDetails, e as ExpressLikeSchemaHandler, f as ResolvedSessionObject, g as PathMatch, L as LiveTypeFunction, h as LiveSdkFunction, A as AuthMethodsBase, O as OpenTelemetryCollector, i as MetricsDefinition, j as ExpressLikeApplicationOptions, k as ParamsDictionary, l as VersionedRequests, m as AuthMethods, D as DecodeResource, n as BasicAuthMethods, F as ForklaunchRequest, o as MiddlewareContractDetails, p as ExpressLikeSchemaAuthMapper, q as ForklaunchNextFunction, r as ForklaunchResponse, s as ForklaunchResHeaders, t as ForklaunchStatusResponse, u as ForklaunchSendableData, T as TelemetryOptions, v as LoggerMeta, w as LogFn } from '../apiDefinition.types--RSi8f6C.js';
-export { ac as BodyObject, ax as DocsConfiguration, a9 as ErrorContainer, a6 as ExpressLikeAuthMapper, ay as ExpressLikeGlobalAuthOptions, U as ExpressLikeHandler, az as ExpressLikeSchemaGlobalAuthOptions, _ as ExtractBody, X as ExtractContentType, Y as ExtractResponseBody, at as ExtractedParamsObject, ai as FileBody, G as ForklaunchBaseRequest, a8 as ForklaunchResErrors, ar as HmacMethods, av as HttpMethod, ag as JsonBody, aq as JwtAuthMethods, a7 as LiveTypeFunctionRequestInit, W as MapParamsSchema, $ as MapReqBodySchema, a1 as MapReqHeadersSchema, a0 as MapReqQuerySchema, Z as MapResBodyMapSchema, a2 as MapResHeadersSchema, as as MapSchema, a5 as MapSessionSchema, a3 as MapVersionedReqsSchema, a4 as MapVersionedRespsSchema, aA as MetricType, aj as MultipartForm, ab as NumberOnlyObject, au as PathParamMethod, ad as RawTypedResponseBody, z as RequestContext, J as ResolvedForklaunchAuthRequest, I as ResolvedForklaunchRequest, N as ResolvedForklaunchResponse, af as ResponseBody, aw as ResponseCompiledSchema, aa as ResponseShape, al as ServerSentEventBody, S as StringOnlyObject, ah as TextBody, ap as TypedBody, ao as TypedRequestBody, ae as TypedResponseBody, am as UnknownBody, an as UnknownResponseBody, ak as UrlEncodedForm, K as VersionedResponses, x as httpRequestsTotalCounter, y as httpServerDurationHistogram } from '../apiDefinition.types--RSi8f6C.js';
+import { M as Method, P as PathParamHttpContractDetails, H as HttpContractDetails, E as ExpressLikeRouterOptions, a as SessionObject, b as ParamsObject, R as ResponsesObject, B as Body, Q as QueryObject, c as HeadersObject, V as VersionSchema, d as SchemaAuthMethods, C as ContractDetails, e as ExpressLikeSchemaHandler, f as ResolvedSessionObject, g as PathMatch, L as LiveTypeFunction, h as LiveSdkFunction, A as AuthMethodsBase, O as OpenTelemetryCollector, i as MetricsDefinition, j as ExpressLikeApplicationOptions, k as ParamsDictionary, l as VersionedRequests, m as AuthMethods, D as DecodeResource, n as BasicAuthMethods, F as ForklaunchRequest, o as MiddlewareContractDetails, p as ExpressLikeSchemaAuthMapper, q as ForklaunchNextFunction, r as ForklaunchResponse, s as ForklaunchResHeaders, t as ForklaunchStatusResponse, u as ForklaunchSendableData, T as TelemetryOptions, v as LoggerMeta, w as LogFn } from '../apiDefinition.types-XZ0lrfFc.js';
+export { ac as BodyObject, ax as DocsConfiguration, a9 as ErrorContainer, a6 as ExpressLikeAuthMapper, ay as ExpressLikeGlobalAuthOptions, U as ExpressLikeHandler, az as ExpressLikeSchemaGlobalAuthOptions, _ as ExtractBody, X as ExtractContentType, Y as ExtractResponseBody, at as ExtractedParamsObject, ai as FileBody, G as ForklaunchBaseRequest, a8 as ForklaunchResErrors, ar as HmacMethods, av as HttpMethod, ag as JsonBody, aq as JwtAuthMethods, a7 as LiveTypeFunctionRequestInit, W as MapParamsSchema, $ as MapReqBodySchema, a1 as MapReqHeadersSchema, a0 as MapReqQuerySchema, Z as MapResBodyMapSchema, a2 as MapResHeadersSchema, as as MapSchema, a5 as MapSessionSchema, a3 as MapVersionedReqsSchema, a4 as MapVersionedRespsSchema, aA as MetricType, aj as MultipartForm, ab as NumberOnlyObject, au as PathParamMethod, ad as RawTypedResponseBody, z as RequestContext, J as ResolvedForklaunchAuthRequest, I as ResolvedForklaunchRequest, N as ResolvedForklaunchResponse, af as ResponseBody, aw as ResponseCompiledSchema, aa as ResponseShape, al as ServerSentEventBody, S as StringOnlyObject, ah as TextBody, ap as TypedBody, ao as TypedRequestBody, ae as TypedResponseBody, am as UnknownBody, an as UnknownResponseBody, ak as UrlEncodedForm, K as VersionedResponses, x as httpRequestsTotalCounter, y as httpServerDurationHistogram } from '../apiDefinition.types-XZ0lrfFc.js';
 import { JWK, JWTPayload } from 'jose';
-import { FastMCP } from '@forklaunch/fastmcp-fork';
 import { ZodSchemaValidator } from '@forklaunch/validator/zod';
+import { FastMCP } from 'fastmcp';
 import http from 'http';
 import { OpenAPIObject } from 'openapi3-ts/oas31';
 import pino, { LevelWithSilentOrString, LevelWithSilent } from 'pino';

package/lib/http/index.js

@@ -1539,56 +1539,94 @@ var ForklaunchExpressLikeRouter = class _ForklaunchExpressLikeRouter {
    * @param controllerHandler
    * @returns
    */
-  #localParamRequest(handlers, controllerHandler, version) {
+  #localParamRequest(middlewares, controllerHandler, contractDetails, requestSchema, responseSchemas, version) {
     return async (route, request) => {
       let statusCode;
       let responseMessage;
       const responseHeaders = {};
+      const resEventHandlers = {};
       const req = {
         params: request?.params ?? {},
         query: request?.query ?? {},
         headers: request?.headers ?? {},
         body: discriminateBody(this.schemaValidator, request?.body)?.schema ?? {},
         path: route,
-        version
+        originalPath: route,
+        method: "GET",
+        version,
+        // Properties needed by middlewares
+        schemaValidator: this.schemaValidator,
+        contractDetails,
+        requestSchema,
+        openTelemetryCollector: this.openTelemetryCollector,
+        _globalOptions: () => this.routerOptions,
+        context: {
+          correlationId: "local-fetch-" + Date.now(),
+          span: void 0
+        },
+        _rawBody: void 0,
+        _parsedVersions: void 0
       };
       const res = {
+        statusCode: 200,
         status: (code) => {
           statusCode = code;
+          res.statusCode = code;
           return res;
         },
         send: (message) => {
           responseMessage = message;
+          resEventHandlers["finish"]?.forEach((handler) => handler());
         },
         json: (body) => {
           responseMessage = body;
+          resEventHandlers["finish"]?.forEach((handler) => handler());
         },
         jsonp: (body) => {
           responseMessage = body;
+          resEventHandlers["finish"]?.forEach((handler) => handler());
         },
         setHeader: (key, value) => {
           responseHeaders[key] = value;
+          return res;
+        },
+        getHeader: (key) => responseHeaders[key],
+        type: (contentType) => {
+          responseHeaders["content-type"] = contentType;
+          return res;
         },
         sseEmitter: (generator) => {
           responseMessage = generator();
         },
+        on: (event, handler) => {
+          if (!resEventHandlers[event]) {
+            resEventHandlers[event] = [];
+          }
+          resEventHandlers[event].push(handler);
+          return res;
+        },
+        responseSchemas,
         version
       };
-      let cursor = handlers.shift();
-      if (cursor) {
-        for (const fn of handlers) {
-          await cursor(req, res, (err) => {
+      const executeMiddlewares = request?.executeMiddlewares ?? false;
+      if (executeMiddlewares && middlewares.length > 0) {
+        const allHandlers = [...middlewares];
+        let cursor = allHandlers.shift();
+        if (cursor) {
+          for (const fn of allHandlers) {
+            await cursor(req, res, (err) => {
+              if (err) {
+                throw err;
+              }
+              cursor = fn;
+            });
+          }
+          await cursor(req, res, async (err) => {
             if (err) {
               throw err;
             }
-            cursor = fn;
           });
         }
-        await cursor(req, res, async (err) => {
-          if (err) {
-            throw err;
-          }
-        });
       }
       const cHandler = controllerHandler;
       await cHandler(req, res, (err) => {
@@ -1644,12 +1682,18 @@ var ForklaunchExpressLikeRouter = class _ForklaunchExpressLikeRouter {
           this.#localParamRequest(
             middlewares,
             controllerHandler,
+            contractDetails,
+            requestSchema,
+            responseSchemas,
             version
           )
         ])
       ) : this.#localParamRequest(
         middlewares,
-        controllerHandler
+        controllerHandler,
+        contractDetails,
+        requestSchema,
+        responseSchemas
       )
     };
     const contractDetailsName = contractDetails.name;
@@ -1660,12 +1704,18 @@ var ForklaunchExpressLikeRouter = class _ForklaunchExpressLikeRouter {
           (req) => this.#localParamRequest(
             middlewares,
             controllerHandler,
+            contractDetails,
+            requestSchema,
+            responseSchemas,
             version
           )(`${this.basePath}${path}`, req)
         ])
       ) : (req) => this.#localParamRequest(
         middlewares,
-        controllerHandler
+        controllerHandler,
+        contractDetails,
+        requestSchema,
+        responseSchemas
       )(`${this.basePath}${path}`, req);
     }
     return this;
@@ -3236,8 +3286,8 @@ var httpStatusCodes_default = HTTPStatuses;
 
 // src/http/mcpGenerator/mcpGenerator.ts
 var import_common12 = require("@forklaunch/common");
-var import_fastmcp_fork = require("@forklaunch/fastmcp-fork");
 var import_zod = require("@forklaunch/validator/zod");
+var import_fastmcp = require("fastmcp");
 
 // src/http/router/unpackRouters.ts
 function unpackRouters(routers, recursiveBasePath = []) {
@@ -3292,7 +3342,7 @@ function generateMcpServer(schemaValidator, protocol, host, port, version, appli
       "Schema validator must be an instance of ZodSchemaValidator"
     );
   }
-  const mcpServer = new import_fastmcp_fork.FastMCP({
+  const mcpServer = new import_fastmcp.FastMCP({
     ...options2,
     name: options2?.name ?? "mcp-server",
     version,