@forklaunch/express 0.5.34 → 0.6.1

package/lib/index.js

@@ -39,6 +39,8 @@ module.exports = __toCommonJS(index_exports);
 // src/expressApplication.ts
 var import_common3 = require("@forklaunch/common");
 var import_http3 = require("@forklaunch/core/http");
+var import_zod = require("@forklaunch/validator/zod");
+var import_streamableHttp = require("@modelcontextprotocol/sdk/server/streamableHttp.js");
 var import_express_api_reference = require("@scalar/express-api-reference");
 var import_crypto = __toESM(require("crypto"));
 var import_express2 = __toESM(require("express"));
@@ -75,7 +77,15 @@ function contentParse(options2) {
         case "text":
           return textParser(req, res, next);
         case "file":
-          return rawParser(req, res, next);
+          return rawParser(req, res, async (err) => {
+            if (err) {
+              return next(err);
+            }
+            if (req.body instanceof Buffer) {
+              req.body = req.body.toString("utf-8");
+            }
+            next();
+          });
         case "multipart": {
           const bb = (0, import_busboy.default)({
             headers: req.headers,
@@ -88,8 +98,8 @@ function contentParse(options2) {
               chunks.push(chunk);
             });
             file.on("end", () => {
-              const fileBuffer = Uint8Array.from(chunks.flat());
-              body[fieldname] = fileBuffer.toString();
+              const fileString = chunks.map((chunk) => chunk.toString()).join("");
+              body[fieldname] = fileString;
             });
           });
           bb.on("field", (fieldname, value) => {
@@ -175,11 +185,63 @@ var Application = class extends import_http3.ForklaunchExpressLikeApplication {
   }
   listen(...args) {
     const port = typeof args[0] === "number" ? args[0] : Number(process.env.PORT);
+    const host = typeof args[1] === "string" ? args[1] : process.env.HOST ?? "localhost";
+    const protocol = process.env.PROTOCOL ?? "http";
     const openApi = (0, import_http3.generateSwaggerDocument)(
       this.schemaValidator,
+      protocol,
+      host,
       port,
       this.routers
     );
+    if (this.schemaValidator instanceof import_zod.ZodSchemaValidator) {
+      const zodSchemaValidator = this.schemaValidator;
+      const routers = this.routers;
+      this.internal.get("/mcp", async (_req, res) => {
+        const server = (0, import_http3.generateMcpServer)(
+          zodSchemaValidator,
+          protocol,
+          host,
+          port,
+          "1.0.0",
+          routers
+        );
+        res.json(server);
+      });
+      this.internal.post("/mcp", async (req, res) => {
+        try {
+          const server = (0, import_http3.generateMcpServer)(
+            zodSchemaValidator,
+            protocol,
+            host,
+            port,
+            "1.0.0",
+            routers
+          );
+          const transport = new import_streamableHttp.StreamableHTTPServerTransport({
+            sessionIdGenerator: void 0
+          });
+          res.on("close", () => {
+            transport.close();
+            server.close();
+          });
+          await server.connect(transport);
+          await transport.handleRequest(req, res, req.body);
+        } catch (error) {
+          console.error("Error handling MCP request:", error);
+          if (!res.headersSent) {
+            res.status(500).json({
+              jsonrpc: "2.0",
+              error: {
+                code: -32603,
+                message: "Internal server error"
+              },
+              id: null
+            });
+          }
+        }
+      });
+    }
     if (this.docsConfiguration == null || this.docsConfiguration.type === "scalar") {
       this.internal.use(
         `/api/${process.env.VERSION ?? "v1"}${process.env.DOCS_PATH ?? "/docs"}`,
@@ -218,14 +280,14 @@ var Application = class extends import_http3.ForklaunchExpressLikeApplication {
     const errorHandler = (err, req, res, _next) => {
       const statusCode = Number(res.statusCode);
       res.locals.errorMessage = err.message;
-      console.log(err);
+      console.error(err);
       res.type("text/plain");
       res.status(statusCode >= 400 ? statusCode : 500).send(
         `Internal server error:
 
 Correlation id: ${(0, import_http3.isForklaunchRequest)(req) ? req.context.correlationId : "No correlation ID"}`
       );
-      (0, import_http3.logger)("error").error(
+      this.openTelemetryCollector.error(
         err.stack ?? err.message,
         (0, import_http3.meta)({
           [import_http3.ATTR_HTTP_RESPONSE_STATUS_CODE]: statusCode
@@ -240,8 +302,7 @@ Correlation id: ${(0, import_http3.isForklaunchRequest)(req) ? req.context.corre
 // src/expressRouter.ts
 var import_http4 = require("@forklaunch/core/http");
 var import_express3 = __toESM(require("express"));
-var Router = class extends import_http4.ForklaunchExpressLikeRouter {
-  // implements ForklaunchRouter<SV>
+var Router = class _Router extends import_http4.ForklaunchExpressLikeRouter {
   /**
    * Creates an instance of Router.
    *
@@ -260,7 +321,9 @@ var Router = class extends import_http4.ForklaunchExpressLikeRouter {
       openTelemetryCollector
     );
     this.basePath = basePath;
+    this.configOptions = options2;
   }
+  configOptions;
   route(path) {
     this.internal.route(path);
     return this;
@@ -429,6 +492,16 @@ var Router = class extends import_http4.ForklaunchExpressLikeRouter {
       ...middlewareOrMiddlewareWithTypedHandler
     );
   };
+  clone() {
+    const clone = new _Router(
+      this.basePath,
+      this.schemaValidator,
+      this.openTelemetryCollector,
+      this.configOptions
+    );
+    this.cloneInternals(clone);
+    return clone;
+  }
 };
 
 // src/handlers/checkout.ts

package/lib/index.mjs

@@ -3,11 +3,13 @@ import { safeStringify as safeStringify2 } from "@forklaunch/common";
 import {
   ATTR_HTTP_RESPONSE_STATUS_CODE,
   ForklaunchExpressLikeApplication,
+  generateMcpServer,
   generateSwaggerDocument,
   isForklaunchRequest,
-  logger,
   meta
 } from "@forklaunch/core/http";
+import { ZodSchemaValidator } from "@forklaunch/validator/zod";
+import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
 import { apiReference } from "@scalar/express-api-reference";
 import crypto from "crypto";
 import express2 from "express";
@@ -44,7 +46,15 @@ function contentParse(options2) {
         case "text":
           return textParser(req, res, next);
         case "file":
-          return rawParser(req, res, next);
+          return rawParser(req, res, async (err) => {
+            if (err) {
+              return next(err);
+            }
+            if (req.body instanceof Buffer) {
+              req.body = req.body.toString("utf-8");
+            }
+            next();
+          });
         case "multipart": {
           const bb = Busboy({
             headers: req.headers,
@@ -57,8 +67,8 @@ function contentParse(options2) {
               chunks.push(chunk);
             });
             file.on("end", () => {
-              const fileBuffer = Uint8Array.from(chunks.flat());
-              body[fieldname] = fileBuffer.toString();
+              const fileString = chunks.map((chunk) => chunk.toString()).join("");
+              body[fieldname] = fileString;
             });
           });
           bb.on("field", (fieldname, value) => {
@@ -146,11 +156,63 @@ var Application = class extends ForklaunchExpressLikeApplication {
   }
   listen(...args) {
     const port = typeof args[0] === "number" ? args[0] : Number(process.env.PORT);
+    const host = typeof args[1] === "string" ? args[1] : process.env.HOST ?? "localhost";
+    const protocol = process.env.PROTOCOL ?? "http";
     const openApi = generateSwaggerDocument(
       this.schemaValidator,
+      protocol,
+      host,
       port,
       this.routers
     );
+    if (this.schemaValidator instanceof ZodSchemaValidator) {
+      const zodSchemaValidator = this.schemaValidator;
+      const routers = this.routers;
+      this.internal.get("/mcp", async (_req, res) => {
+        const server = generateMcpServer(
+          zodSchemaValidator,
+          protocol,
+          host,
+          port,
+          "1.0.0",
+          routers
+        );
+        res.json(server);
+      });
+      this.internal.post("/mcp", async (req, res) => {
+        try {
+          const server = generateMcpServer(
+            zodSchemaValidator,
+            protocol,
+            host,
+            port,
+            "1.0.0",
+            routers
+          );
+          const transport = new StreamableHTTPServerTransport({
+            sessionIdGenerator: void 0
+          });
+          res.on("close", () => {
+            transport.close();
+            server.close();
+          });
+          await server.connect(transport);
+          await transport.handleRequest(req, res, req.body);
+        } catch (error) {
+          console.error("Error handling MCP request:", error);
+          if (!res.headersSent) {
+            res.status(500).json({
+              jsonrpc: "2.0",
+              error: {
+                code: -32603,
+                message: "Internal server error"
+              },
+              id: null
+            });
+          }
+        }
+      });
+    }
     if (this.docsConfiguration == null || this.docsConfiguration.type === "scalar") {
       this.internal.use(
         `/api/${process.env.VERSION ?? "v1"}${process.env.DOCS_PATH ?? "/docs"}`,
@@ -189,14 +251,14 @@ var Application = class extends ForklaunchExpressLikeApplication {
     const errorHandler = (err, req, res, _next) => {
       const statusCode = Number(res.statusCode);
       res.locals.errorMessage = err.message;
-      console.log(err);
+      console.error(err);
       res.type("text/plain");
       res.status(statusCode >= 400 ? statusCode : 500).send(
         `Internal server error:
 
 Correlation id: ${isForklaunchRequest(req) ? req.context.correlationId : "No correlation ID"}`
       );
-      logger("error").error(
+      this.openTelemetryCollector.error(
         err.stack ?? err.message,
         meta({
           [ATTR_HTTP_RESPONSE_STATUS_CODE]: statusCode
@@ -213,8 +275,7 @@ import {
   ForklaunchExpressLikeRouter
 } from "@forklaunch/core/http";
 import express3 from "express";
-var Router = class extends ForklaunchExpressLikeRouter {
-  // implements ForklaunchRouter<SV>
+var Router = class _Router extends ForklaunchExpressLikeRouter {
   /**
    * Creates an instance of Router.
    *
@@ -233,7 +294,9 @@ var Router = class extends ForklaunchExpressLikeRouter {
       openTelemetryCollector
     );
     this.basePath = basePath;
+    this.configOptions = options2;
   }
+  configOptions;
   route(path) {
     this.internal.route(path);
     return this;
@@ -402,6 +465,16 @@ var Router = class extends ForklaunchExpressLikeRouter {
       ...middlewareOrMiddlewareWithTypedHandler
     );
   };
+  clone() {
+    const clone = new _Router(
+      this.basePath,
+      this.schemaValidator,
+      this.openTelemetryCollector,
+      this.configOptions
+    );
+    this.cloneInternals(clone);
+    return clone;
+  }
 };
 
 // src/handlers/checkout.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forklaunch/express",
-  "version": "0.5.34",
+  "version": "0.6.1",
   "description": "Forklaunch framework for express.",
   "homepage": "https://github.com/forklaunch/forklaunch-js#readme",
   "bugs": {
@@ -25,8 +25,9 @@
     "lib/**"
   ],
   "dependencies": {
-    "@scalar/express-api-reference": "^0.8.5",
-    "@types/multer": "^1.4.13",
+    "@modelcontextprotocol/sdk": "^1.13.3",
+    "@scalar/express-api-reference": "^0.8.7",
+    "@types/multer": "^2.0.0",
     "body-parser": "^2.2.0",
     "busboy": "^1.6.0",
     "cors": "^2.8.5",
@@ -34,12 +35,12 @@
     "multer": "2.0.1",
     "qs": "^6.14.0",
     "swagger-ui-express": "^5.0.1",
-    "@forklaunch/common": "0.3.14",
-    "@forklaunch/core": "0.9.22",
-    "@forklaunch/validator": "0.6.16"
+    "@forklaunch/common": "0.4.1",
+    "@forklaunch/validator": "0.7.1",
+    "@forklaunch/core": "0.10.1"
   },
   "devDependencies": {
-    "@eslint/js": "^9.29.0",
+    "@eslint/js": "^9.30.1",
     "@types/body-parser": "^1.19.6",
     "@types/busboy": "^1.5.4",
     "@types/cors": "^2.8.19",
@@ -48,16 +49,16 @@
     "@types/jest": "^30.0.0",
     "@types/qs": "^6.14.0",
     "@types/swagger-ui-express": "^4.1.8",
-    "@typescript/native-preview": "7.0.0-dev.20250619.1",
-    "jest": "^30.0.2",
+    "@typescript/native-preview": "7.0.0-dev.20250702.1",
+    "jest": "^30.0.3",
     "kill-port-process": "^3.2.1",
-    "prettier": "^3.5.3",
+    "prettier": "^3.6.2",
     "ts-jest": "^29.4.0",
     "ts-node": "^10.9.2",
     "tsup": "^8.5.0",
-    "typedoc": "^0.28.5",
+    "typedoc": "^0.28.7",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.34.1"
+    "typescript-eslint": "^8.35.1"
   },
   "scripts": {
     "build": "tsgo --noEmit && tsup index.ts --format cjs,esm --no-splitting --tsconfig tsconfig.json --outDir lib --dts --clean",