@bytebase/dbhub 0.5.0 → 0.6.1

package/README.md

@@ -28,9 +28,9 @@ DBHub is a universal database gateway implementing the Model Context Protocol (M
       MCP Clients           MCP Server             Databases
 ```
 
-## Demo SSE Endpoint
+## Demo HTTP Endpoint
 
-https://demo.dbhub.ai/sse connects a [sample employee database](https://github.com/bytebase/employee-sample-database). You can point Cursor or MCP Inspector to it to see it in action.
+https://demo.dbhub.ai/message connects a [sample employee database](https://github.com/bytebase/employee-sample-database). You can point Cursor or MCP Inspector to it to see it in action.
 
 ![mcp-inspector](https://raw.githubusercontent.com/bytebase/dbhub/main/resources/images/mcp-inspector.webp)
 
@@ -71,7 +71,7 @@ docker run --rm --init \
    --name dbhub \
    --publish 8080:8080 \
    bytebase/dbhub \
-   --transport sse \
+   --transport http \
    --port 8080 \
    --dsn "postgres://user:password@localhost:5432/dbname?sslmode=disable"
 ```
@@ -82,7 +82,7 @@ docker run --rm --init \
    --name dbhub \
    --publish 8080:8080 \
    bytebase/dbhub \
-   --transport sse \
+   --transport http \
    --port 8080 \
    --demo
 ```
@@ -93,7 +93,7 @@ docker run --rm --init \
    --name dbhub \
    --publish 8080:8080 \
    bytebase/dbhub \
-   --transport sse \
+   --transport http \
    --port 8080 \
    --dsn "oracle://username:password@localhost:1521/service_name"
 ```
@@ -104,7 +104,7 @@ docker run --rm --init \
    --name dbhub \
    --publish 8080:8080 \
    bytebase/dbhub-oracle-thick \
-   --transport sse \
+   --transport http \
    --port 8080 \
    --dsn "oracle://username:password@localhost:1521/service_name"
 ```
@@ -113,12 +113,12 @@ docker run --rm --init \
 
 ```bash
 # PostgreSQL example
-npx @bytebase/dbhub --transport sse --port 8080 --dsn "postgres://user:password@localhost:5432/dbname?sslmode=disable"
+npx @bytebase/dbhub --transport http --port 8080 --dsn "postgres://user:password@localhost:5432/dbname?sslmode=disable"
 ```
 
 ```bash
 # Demo mode with sample employee database
-npx @bytebase/dbhub --transport sse --port 8080 --demo
+npx @bytebase/dbhub --transport http --port 8080 --demo
 ```
 
 > Note: The demo mode includes a bundled SQLite sample "employee" database with tables for employees, departments, salaries, and more.
@@ -170,7 +170,7 @@ npx @bytebase/dbhub --transport sse --port 8080 --demo
 
 ![cursor](https://raw.githubusercontent.com/bytebase/dbhub/main/resources/images/cursor.webp)
 
-- Cursor supports both `stdio` and `sse`.
+- Cursor supports both `stdio` and `http`.
 - Follow [Cursor MCP guide](https://docs.cursor.com/context/model-context-protocol) and make sure to use [Agent](https://docs.cursor.com/chat/agent) mode.
 
 ## Usage
@@ -302,9 +302,9 @@ Extra query parameters:
   npx @bytebase/dbhub --transport stdio --dsn "postgres://user:password@localhost:5432/dbname?sslmode=disable"
   ```
 
-- **sse** - for browser and network clients:
+- **http** - for browser and network clients:
   ```bash
-  npx @bytebase/dbhub --transport sse --port 5678 --dsn "postgres://user:password@localhost:5432/dbname?sslmode=disable"
+  npx @bytebase/dbhub --transport http --port 5678 --dsn "postgres://user:password@localhost:5432/dbname?sslmode=disable"
   ```
 
 ### Command line options
@@ -313,8 +313,8 @@ Extra query parameters:
 | --------- | --------------------------------------------------------------- | ---------------------------- |
 | demo      | Run in demo mode with sample employee database                  | `false`                      |
 | dsn       | Database connection string                                      | Required if not in demo mode |
-| transport | Transport mode: `stdio` or `sse`                                | `stdio`                      |
-| port      | HTTP server port (only applicable when using `--transport=sse`) | `8080`                       |
+| transport | Transport mode: `stdio` or `http`                               | `stdio`                      |
+| port      | HTTP server port (only applicable when using `--transport=http`) | `8080`                       |
 | readonly  | Restrict SQL execution to read-only operations                  | `false`                      |
 
 The demo mode uses an in-memory SQLite database loaded with the [sample employee database](https://github.com/bytebase/dbhub/tree/main/resources/employee-sqlite) that includes tables for employees, departments, titles, salaries, department employees, and department managers. The sample database includes SQL scripts for table creation, data loading, and testing.
@@ -367,17 +367,17 @@ The project includes pre-commit hooks to run tests automatically before each com
 TRANSPORT=stdio DSN="postgres://user:password@localhost:5432/dbname?sslmode=disable" npx @modelcontextprotocol/inspector node /path/to/dbhub/dist/index.js
 ```
 
-#### SSE
+#### HTTP
 
 ```bash
-# Start DBHub with SSE transport
-pnpm dev --transport=sse --port=8080
+# Start DBHub with HTTP transport
+pnpm dev --transport=http --port=8080
 
 # Start the MCP Inspector in another terminal
 npx @modelcontextprotocol/inspector
 ```
 
-Connect to the DBHub server `/sse` endpoint
+Connect to the DBHub server `/message` endpoint
 
 ## Contributors
 

package/dist/index.js

@@ -1404,17 +1404,17 @@ var MySQLConnector = class {
     }
     try {
       const results = await this.pool.query(sql2);
-      if (Array.isArray(results[0])) {
+      const [firstResult] = results;
+      if (Array.isArray(firstResult) && firstResult.length > 0 && Array.isArray(firstResult[0]) && firstResult[0].length === 2) {
         let allRows = [];
-        for (const result of results[0]) {
-          if (Array.isArray(result) && result.length > 0) {
-            allRows.push(...result);
+        for (const [rows, _fields] of firstResult) {
+          if (Array.isArray(rows)) {
+            allRows.push(...rows);
           }
         }
         return { rows: allRows };
       } else {
-        const [rows, fields] = results;
-        return { rows, fields };
+        return { rows: Array.isArray(firstResult) ? firstResult : [] };
       }
     } catch (error) {
       console.error("Error executing query:", error);
@@ -1774,21 +1774,17 @@ var MariaDBConnector = class {
     }
     try {
       const results = await this.pool.query(sql2);
-      if (Array.isArray(results)) {
-        if (results.length > 1 || results[0] && Array.isArray(results[0])) {
-          let allRows = [];
-          for (const result of results) {
-            if (Array.isArray(result) && result.length > 0) {
-              allRows.push(...result);
-            }
+      const [firstResult] = results;
+      if (Array.isArray(firstResult) && firstResult.length > 0 && Array.isArray(firstResult[0]) && firstResult[0].length === 2) {
+        let allRows = [];
+        for (const [rows, _fields] of firstResult) {
+          if (Array.isArray(rows)) {
+            allRows.push(...rows);
           }
-          return { rows: allRows };
-        } else {
-          const [rows, fields] = results;
-          return { rows, fields };
         }
+        return { rows: allRows };
       } else {
-        return { rows: results };
+        return { rows: Array.isArray(firstResult) ? firstResult : [] };
       }
     } catch (error) {
       console.error("Error executing query:", error);
@@ -2300,7 +2296,7 @@ ConnectorRegistry.register(new OracleConnector());
 
 // src/server.ts
 import { McpServer as McpServer2 } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { SSEServerTransport } from "@modelcontextprotocol/sdk/server/sse.js";
+import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import express from "express";
 import path3 from "path";
@@ -2477,11 +2473,11 @@ function resolveDSN() {
 function resolveTransport() {
   const args = parseCommandLineArgs();
   if (args.transport) {
-    const type = args.transport === "sse" ? "sse" : "stdio";
+    const type = args.transport === "http" ? "http" : "stdio";
     return { type, source: "command line argument" };
   }
   if (process.env.TRANSPORT) {
-    const type = process.env.TRANSPORT === "sse" ? "sse" : "stdio";
+    const type = process.env.TRANSPORT === "http" ? "http" : "stdio";
     return { type, source: "environment variable" };
   }
   return { type: "stdio", source: "default" };
@@ -3444,13 +3440,16 @@ See documentation for more details on configuring database connections.
 `);
       process.exit(1);
     }
-    const server = new McpServer2({
-      name: SERVER_NAME,
-      version: SERVER_VERSION
-    });
-    registerResources(server);
-    registerTools(server);
-    registerPrompts(server);
+    const createServer = () => {
+      const server = new McpServer2({
+        name: SERVER_NAME,
+        version: SERVER_VERSION
+      });
+      registerResources(server);
+      registerTools(server);
+      registerPrompts(server);
+      return server;
+    };
     const connectorManager = new ConnectorManager();
     console.error(`Connecting with DSN: ${redactDSN(dsnData.dsn)}`);
     console.error(`DSN source: ${dsnData.source}`);
@@ -3478,29 +3477,50 @@ See documentation for more details on configuring database connections.
       console.error(`Running in ${activeModes.join(" and ")} mode - ${modeDescriptions.join(", ")}`);
     }
     console.error(generateBanner(SERVER_VERSION, activeModes));
-    if (transportData.type === "sse") {
+    if (transportData.type === "http") {
       const app = express();
-      let transport;
-      app.get("/sse", async (req, res) => {
-        transport = new SSEServerTransport("/message", res);
-        console.error("Client connected", transport?.["_sessionId"]);
-        await server.connect(transport);
-        res.on("close", () => {
-          console.error("Client Disconnected", transport?.["_sessionId"]);
-        });
+      app.use(express.json());
+      app.use((req, res, next) => {
+        const origin = req.headers.origin;
+        if (origin && !origin.startsWith("http://localhost") && !origin.startsWith("https://localhost")) {
+          return res.status(403).json({ error: "Forbidden origin" });
+        }
+        res.header("Access-Control-Allow-Origin", origin || "http://localhost");
+        res.header("Access-Control-Allow-Methods", "GET, POST, OPTIONS");
+        res.header("Access-Control-Allow-Headers", "Content-Type, Mcp-Session-Id");
+        res.header("Access-Control-Allow-Credentials", "true");
+        if (req.method === "OPTIONS") {
+          return res.sendStatus(200);
+        }
+        next();
       });
       app.post("/message", async (req, res) => {
-        console.error("Client Message", transport?.["_sessionId"]);
-        await transport.handlePostMessage(req, res, req.body);
+        try {
+          const transport = new StreamableHTTPServerTransport({
+            sessionIdGenerator: void 0,
+            // Disable session management for stateless mode
+            enableJsonResponse: false
+            // Use SSE streaming
+          });
+          const server = createServer();
+          await server.connect(transport);
+          await transport.handleRequest(req, res, req.body);
+        } catch (error) {
+          console.error("Error handling request:", error);
+          if (!res.headersSent) {
+            res.status(500).json({ error: "Internal server error" });
+          }
+        }
       });
       const portData = resolvePort();
       const port = portData.port;
       console.error(`Port source: ${portData.source}`);
-      app.listen(port, () => {
+      app.listen(port, "localhost", () => {
         console.error(`DBHub server listening at http://localhost:${port}`);
-        console.error(`Connect to MCP server at http://localhost:${port}/sse`);
+        console.error(`Connect to MCP server at http://localhost:${port}/message`);
       });
     } else {
+      const server = createServer();
       const transport = new StdioServerTransport();
       console.error("Starting with STDIO transport");
       await server.connect(transport);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebase/dbhub",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "description": "Universal Database MCP Server",
   "main": "dist/index.js",
   "type": "module",
@@ -17,7 +17,7 @@
   "license": "MIT",
   "dependencies": {
     "@azure/identity": "^4.8.0",
-    "@modelcontextprotocol/sdk": "^1.6.1",
+    "@modelcontextprotocol/sdk": "^1.12.1",
     "better-sqlite3": "^11.9.0",
     "dotenv": "^16.4.7",
     "express": "^4.18.2",