mcp-searxng 1.0.2 → 1.0.3

package/dist/http-server.d.ts

@@ -1,3 +1,3 @@
 import express from "express";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-export declare function createHttpServer(mcpServer: McpServer): Promise<express.Application>;
+export declare function createHttpServer(createMcpServer: () => McpServer): Promise<express.Application>;

package/dist/http-server.js

@@ -6,7 +6,7 @@ import { isInitializeRequest } from "@modelcontextprotocol/sdk/types.js";
 import { logMessage } from "./logging.js";
 import { packageVersion } from "./index.js";
 import { getHttpSecurityConfig, isOriginAllowed, isRequestAuthorized, validateHttpSecurityConfig, } from "./http-security.js";
-export async function createHttpServer(mcpServer) {
+export async function createHttpServer(createMcpServer) {
     const app = express();
     const security = getHttpSecurityConfig();
     validateHttpSecurityConfig(security);
@@ -33,8 +33,8 @@ export async function createHttpServer(mcpServer) {
             id: null,
         });
     }
-    // Map to store transports by session ID  
-    const transports = {};
+    // Map to store sessions by session ID
+    const sessions = new Map();
     // Handle POST requests for client-to-server communication
     app.post('/mcp', async (req, res) => {
         if (!isRequestAuthorized(req.headers.authorization, security)) {
@@ -43,32 +43,34 @@ export async function createHttpServer(mcpServer) {
         }
         const sessionId = req.headers['mcp-session-id'];
         let transport;
-        if (sessionId && transports[sessionId]) {
-            // Reuse existing transport
-            transport = transports[sessionId];
+        let mcpServer;
+        if (sessionId && sessions.has(sessionId)) {
+            // Reuse existing session
+            const session = sessions.get(sessionId);
+            transport = session.transport;
+            mcpServer = session.mcpServer;
             logMessage(mcpServer, "debug", `Reusing session: ${sessionId}`);
         }
         else if (!sessionId && isInitializeRequest(req.body)) {
-            // New initialization request
-            logMessage(mcpServer, "info", "Creating new HTTP session");
+            // New initialization request — create fresh McpServer and transport
+            mcpServer = createMcpServer();
             transport = new StreamableHTTPServerTransport({
                 sessionIdGenerator: () => randomUUID(),
                 onsessioninitialized: (sessionId) => {
-                    transports[sessionId] = transport;
+                    sessions.set(sessionId, { transport, mcpServer });
                     logMessage(mcpServer, "debug", `Session initialized: ${sessionId}`);
                 },
                 enableDnsRebindingProtection: security.enableDnsRebindingProtection,
                 allowedHosts: security.allowedHosts,
                 allowedOrigins: security.allowedOrigins,
             });
-            // Clean up transport when closed
+            // Clean up session when transport closes
             transport.onclose = () => {
                 if (transport.sessionId) {
-                    logMessage(mcpServer, "debug", `Session closed: ${transport.sessionId}`);
-                    delete transports[transport.sessionId];
+                    sessions.delete(transport.sessionId);
                 }
             };
-            // Connect the existing server to the new transport
+            // Connect this session's McpServer to its transport
             await mcpServer.connect(transport);
         }
         else {
@@ -116,7 +118,7 @@ export async function createHttpServer(mcpServer) {
             return;
         }
         const sessionId = req.headers['mcp-session-id'];
-        if (!sessionId || !transports[sessionId]) {
+        if (!sessionId || !sessions.has(sessionId)) {
             console.warn(`⚠️  GET request rejected - missing or invalid session ID:`, {
                 clientIP: req.ip || req.socket.remoteAddress,
                 sessionId: sessionId || 'undefined',
@@ -125,9 +127,9 @@ export async function createHttpServer(mcpServer) {
             res.status(400).send('Invalid or missing session ID');
             return;
         }
-        const transport = transports[sessionId];
+        const session = sessions.get(sessionId);
         try {
-            await transport.handleRequest(req, res);
+            await session.transport.handleRequest(req, res);
         }
         catch (error) {
             console.warn(`⚠️  GET request failed:`, {
@@ -145,7 +147,7 @@ export async function createHttpServer(mcpServer) {
             return;
         }
         const sessionId = req.headers['mcp-session-id'];
-        if (!sessionId || !transports[sessionId]) {
+        if (!sessionId || !sessions.has(sessionId)) {
             console.warn(`⚠️  DELETE request rejected - missing or invalid session ID:`, {
                 clientIP: req.ip || req.socket.remoteAddress,
                 sessionId: sessionId || 'undefined',
@@ -154,9 +156,9 @@ export async function createHttpServer(mcpServer) {
             res.status(400).send('Invalid or missing session ID');
             return;
         }
-        const transport = transports[sessionId];
+        const session = sessions.get(sessionId);
         try {
-            await transport.handleRequest(req, res);
+            await session.transport.handleRequest(req, res);
         }
         catch (error) {
             console.warn(`⚠️  DELETE request failed:`, {
@@ -166,6 +168,9 @@ export async function createHttpServer(mcpServer) {
             });
             throw error;
         }
+        finally {
+            sessions.delete(sessionId);
+        }
     });
     // Health check endpoint
     app.get('/health', (_req, res) => {

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
-declare const packageVersion = "1.0.2";
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+declare const packageVersion = "1.0.3";
 export { packageVersion };
 export declare function isWebUrlReadArgs(args: unknown): args is {
     url: string;
@@ -9,3 +10,8 @@ export declare function isWebUrlReadArgs(args: unknown): args is {
     paragraphRange?: string;
     readHeadings?: boolean;
 };
+/**
+ * Creates and configures a new McpServer with all handlers registered.
+ * Called once per HTTP session, or once for STDIO mode.
+ */
+export declare function createMcpServer(): McpServer;

package/dist/index.js

@@ -4,17 +4,15 @@ import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"
 import { CallToolRequestSchema, ListToolsRequestSchema, SetLevelRequestSchema, ListResourcesRequestSchema, ListResourceTemplatesRequestSchema, ReadResourceRequestSchema, } from "@modelcontextprotocol/sdk/types.js";
 // Import modularized functionality
 import { WEB_SEARCH_TOOL, READ_URL_TOOL, isSearXNGWebSearchArgs } from "./types.js";
-import { logMessage, setLogLevel } from "./logging.js";
+import { logMessage, setLogLevel, getCurrentLogLevel } from "./logging.js";
 import { performWebSearch } from "./search.js";
 import { fetchAndConvertToMarkdown } from "./url-reader.js";
 import { createConfigResource, createHelpResource } from "./resources.js";
 import { createHttpServer } from "./http-server.js";
 // Use a static version string that will be updated by the version script
-const packageVersion = "1.0.2";
+const packageVersion = "1.0.3";
 // Export the version for use in other modules
 export { packageVersion };
-// Global state for logging level
-let currentLogLevel = "info";
 // Type guard for URL reading args
 export function isWebUrlReadArgs(args) {
     if (typeof args !== "object" ||
@@ -47,142 +45,146 @@ export function isWebUrlReadArgs(args) {
     }
     return true;
 }
-// Server implementation
-const mcpServer = new McpServer({
-    name: "ihor-sokoliuk/mcp-searxng",
-    version: packageVersion,
-}, {
-    capabilities: {
-        logging: {},
-        resources: {},
-        tools: {},
-    },
-});
-// Underlying low-level server for handler registration and passing to modules
-const server = mcpServer.server;
-// List tools handler
-server.setRequestHandler(ListToolsRequestSchema, async () => {
-    logMessage(mcpServer, "debug", "Handling list_tools request");
-    return {
-        tools: [WEB_SEARCH_TOOL, READ_URL_TOOL],
-    };
-});
-// Call tool handler
-server.setRequestHandler(CallToolRequestSchema, async (request) => {
-    const { name, arguments: args } = request.params;
-    logMessage(mcpServer, "debug", `Handling call_tool request: ${name}`);
-    try {
-        if (name === "searxng_web_search") {
-            if (!isSearXNGWebSearchArgs(args)) {
-                throw new Error("Invalid arguments for web search");
+/**
+ * Creates and configures a new McpServer with all handlers registered.
+ * Called once per HTTP session, or once for STDIO mode.
+ */
+export function createMcpServer() {
+    const mcpServer = new McpServer({
+        name: "ihor-sokoliuk/mcp-searxng",
+        version: packageVersion,
+    }, {
+        capabilities: {
+            logging: {},
+            resources: {},
+            tools: {},
+        },
+    });
+    const server = mcpServer.server;
+    // List tools handler
+    server.setRequestHandler(ListToolsRequestSchema, async () => {
+        logMessage(mcpServer, "debug", "Handling list_tools request");
+        return {
+            tools: [WEB_SEARCH_TOOL, READ_URL_TOOL],
+        };
+    });
+    // Call tool handler
+    server.setRequestHandler(CallToolRequestSchema, async (request) => {
+        const { name, arguments: args } = request.params;
+        logMessage(mcpServer, "debug", `Handling call_tool request: ${name}`);
+        try {
+            if (name === "searxng_web_search") {
+                if (!isSearXNGWebSearchArgs(args)) {
+                    throw new Error("Invalid arguments for web search");
+                }
+                const result = await performWebSearch(mcpServer, args.query, args.pageno, args.time_range, args.language, args.safesearch);
+                return {
+                    content: [
+                        {
+                            type: "text",
+                            text: result,
+                        },
+                    ],
+                };
             }
-            const result = await performWebSearch(mcpServer, args.query, args.pageno, args.time_range, args.language, args.safesearch);
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: result,
-                    },
-                ],
-            };
-        }
-        else if (name === "web_url_read") {
-            if (!isWebUrlReadArgs(args)) {
-                throw new Error("Invalid arguments for URL reading");
+            else if (name === "web_url_read") {
+                if (!isWebUrlReadArgs(args)) {
+                    throw new Error("Invalid arguments for URL reading");
+                }
+                const paginationOptions = {
+                    startChar: args.startChar,
+                    maxLength: args.maxLength,
+                    section: args.section,
+                    paragraphRange: args.paragraphRange,
+                    readHeadings: args.readHeadings,
+                };
+                const result = await fetchAndConvertToMarkdown(mcpServer, args.url, 10000, paginationOptions);
+                return {
+                    content: [
+                        {
+                            type: "text",
+                            text: result,
+                        },
+                    ],
+                };
+            }
+            else {
+                throw new Error(`Unknown tool: ${name}`);
             }
-            const paginationOptions = {
-                startChar: args.startChar,
-                maxLength: args.maxLength,
-                section: args.section,
-                paragraphRange: args.paragraphRange,
-                readHeadings: args.readHeadings,
-            };
-            const result = await fetchAndConvertToMarkdown(mcpServer, args.url, 10000, paginationOptions);
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: result,
-                    },
-                ],
-            };
         }
-        else {
-            throw new Error(`Unknown tool: ${name}`);
+        catch (error) {
+            logMessage(mcpServer, "error", `Tool execution error: ${error instanceof Error ? error.message : String(error)}`, {
+                tool: name,
+                args: args,
+                error: error instanceof Error ? error.stack : String(error)
+            });
+            throw error;
         }
-    }
-    catch (error) {
-        logMessage(mcpServer, "error", `Tool execution error: ${error instanceof Error ? error.message : String(error)}`, {
-            tool: name,
-            args: args,
-            error: error instanceof Error ? error.stack : String(error)
-        });
-        throw error;
-    }
-});
-// Logging level handler
-server.setRequestHandler(SetLevelRequestSchema, async (request) => {
-    const { level } = request.params;
-    logMessage(mcpServer, "info", `Setting log level to: ${level}`);
-    currentLogLevel = level;
-    setLogLevel(level);
-    return {};
-});
-// List resources handler
-server.setRequestHandler(ListResourcesRequestSchema, async () => {
-    logMessage(mcpServer, "debug", "Handling list_resources request");
-    return {
-        resources: [
-            {
-                uri: "config://server-config",
-                mimeType: "application/json",
-                name: "Server Configuration",
-                description: "Current server configuration and environment variables"
-            },
-            {
-                uri: "help://usage-guide",
-                mimeType: "text/markdown",
-                name: "Usage Guide",
-                description: "How to use the MCP SearXNG server effectively"
-            }
-        ]
-    };
-});
-// List resource templates handler
-// Returns empty list — required by MCP spec even when no templates exist
-server.setRequestHandler(ListResourceTemplatesRequestSchema, async () => {
-    logMessage(mcpServer, "debug", "Handling list_resource_templates request");
-    return { resourceTemplates: [] };
-});
-// Read resource handler
-server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
-    const { uri } = request.params;
-    logMessage(mcpServer, "debug", `Handling read_resource request for: ${uri}`);
-    switch (uri) {
-        case "config://server-config":
-            return {
-                contents: [
-                    {
-                        uri: uri,
-                        mimeType: "application/json",
-                        text: createConfigResource()
-                    }
-                ]
-            };
-        case "help://usage-guide":
-            return {
-                contents: [
-                    {
-                        uri: uri,
-                        mimeType: "text/markdown",
-                        text: createHelpResource()
-                    }
-                ]
-            };
-        default:
-            throw new Error(`Unknown resource: ${uri}`);
-    }
-});
+    });
+    // Logging level handler
+    server.setRequestHandler(SetLevelRequestSchema, async (request) => {
+        const { level } = request.params;
+        logMessage(mcpServer, "info", `Setting log level to: ${level}`);
+        setLogLevel(level);
+        return {};
+    });
+    // List resources handler
+    server.setRequestHandler(ListResourcesRequestSchema, async () => {
+        logMessage(mcpServer, "debug", "Handling list_resources request");
+        return {
+            resources: [
+                {
+                    uri: "config://server-config",
+                    mimeType: "application/json",
+                    name: "Server Configuration",
+                    description: "Current server configuration and environment variables"
+                },
+                {
+                    uri: "help://usage-guide",
+                    mimeType: "text/markdown",
+                    name: "Usage Guide",
+                    description: "How to use the MCP SearXNG server effectively"
+                }
+            ]
+        };
+    });
+    // List resource templates handler
+    // Returns empty list — required by MCP spec even when no templates exist
+    server.setRequestHandler(ListResourceTemplatesRequestSchema, async () => {
+        logMessage(mcpServer, "debug", "Handling list_resource_templates request");
+        return { resourceTemplates: [] };
+    });
+    // Read resource handler
+    server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
+        const { uri } = request.params;
+        logMessage(mcpServer, "debug", `Handling read_resource request for: ${uri}`);
+        switch (uri) {
+            case "config://server-config":
+                return {
+                    contents: [
+                        {
+                            uri: uri,
+                            mimeType: "application/json",
+                            text: createConfigResource()
+                        }
+                    ]
+                };
+            case "help://usage-guide":
+                return {
+                    contents: [
+                        {
+                            uri: uri,
+                            mimeType: "text/markdown",
+                            text: createHelpResource()
+                        }
+                    ]
+                };
+            default:
+                throw new Error(`Unknown resource: ${uri}`);
+        }
+    });
+    return mcpServer;
+}
 // Main function
 async function main() {
     // Check for HTTP transport mode
@@ -194,7 +196,7 @@ async function main() {
             process.exit(1);
         }
         console.log(`Starting HTTP transport on port ${port}`);
-        const app = await createHttpServer(mcpServer);
+        const app = await createHttpServer(createMcpServer);
         const httpServer = app.listen(port, () => {
             console.log(`HTTP server listening on port ${port}`);
             console.log(`Health check: http://localhost:${port}/health`);
@@ -212,7 +214,8 @@ async function main() {
         process.on('SIGTERM', () => shutdown('SIGTERM'));
     }
     else {
-        // Default STDIO transport
+        // Default STDIO transport — single session, single server
+        const mcpServer = createMcpServer();
         // Show helpful message when running in terminal
         if (process.stdin.isTTY) {
             console.error(`🔍 MCP SearXNG Server v${packageVersion} - Ready`);
@@ -228,7 +231,7 @@ async function main() {
         await mcpServer.connect(transport);
         // Log after connection is established
         logMessage(mcpServer, "info", `MCP SearXNG Server v${packageVersion} connected via STDIO`);
-        logMessage(mcpServer, "info", `Log level: ${currentLogLevel}`);
+        logMessage(mcpServer, "info", `Log level: ${getCurrentLogLevel()}`);
         logMessage(mcpServer, "info", `Environment: ${process.env.NODE_ENV || 'development'}`);
         logMessage(mcpServer, "info", `SearXNG URL: ${process.env.SEARXNG_URL || 'not configured'}`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mcp-searxng",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "mcpName": "io.github.ihor-sokoliuk/mcp-searxng",
     "description": "MCP server for SearXNG integration",
     "license": "MIT",