mcp-searxng 0.10.0 → 0.10.2

package/dist/http-server.d.ts

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

package/dist/http-server.js

@@ -5,7 +5,7 @@ import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/
 import { isInitializeRequest } from "@modelcontextprotocol/sdk/types.js";
 import { logMessage } from "./logging.js";
 import { packageVersion } from "./index.js";
-export async function createHttpServer(server) {
+export async function createHttpServer(mcpServer) {
     const app = express();
     app.use(express.json());
     // Add CORS support for web clients
@@ -23,16 +23,16 @@ export async function createHttpServer(server) {
         if (sessionId && transports[sessionId]) {
             // Reuse existing transport
             transport = transports[sessionId];
-            logMessage(server, "debug", `Reusing session: ${sessionId}`);
+            logMessage(mcpServer, "debug", `Reusing session: ${sessionId}`);
         }
         else if (!sessionId && isInitializeRequest(req.body)) {
             // New initialization request
-            logMessage(server, "info", "Creating new HTTP session");
+            logMessage(mcpServer, "info", "Creating new HTTP session");
             transport = new StreamableHTTPServerTransport({
                 sessionIdGenerator: () => randomUUID(),
                 onsessioninitialized: (sessionId) => {
                     transports[sessionId] = transport;
-                    logMessage(server, "debug", `Session initialized: ${sessionId}`);
+                    logMessage(mcpServer, "debug", `Session initialized: ${sessionId}`);
                 },
                 // DNS rebinding protection disabled by default for backwards compatibility
                 // For production, consider enabling:
@@ -42,17 +42,17 @@ export async function createHttpServer(server) {
             // Clean up transport when closed
             transport.onclose = () => {
                 if (transport.sessionId) {
-                    logMessage(server, "debug", `Session closed: ${transport.sessionId}`);
+                    logMessage(mcpServer, "debug", `Session closed: ${transport.sessionId}`);
                     delete transports[transport.sessionId];
                 }
             };
             // Connect the existing server to the new transport
-            await server.connect(transport);
+            await mcpServer.connect(transport);
         }
         else {
             // Invalid request
             console.warn(`⚠️  POST request rejected - invalid request:`, {
-                clientIP: req.ip || req.connection.remoteAddress,
+                clientIP: req.ip || req.socket.remoteAddress,
                 sessionId: sessionId || 'undefined',
                 hasInitializeRequest: isInitializeRequest(req.body),
                 userAgent: req.headers['user-agent'],
@@ -77,7 +77,7 @@ export async function createHttpServer(server) {
             // Log header-related rejections for debugging
             if (error instanceof Error && error.message.includes('accept')) {
                 console.warn(`⚠️  Connection rejected due to missing headers:`, {
-                    clientIP: req.ip || req.connection.remoteAddress,
+                    clientIP: req.ip || req.socket.remoteAddress,
                     userAgent: req.headers['user-agent'],
                     contentType: req.headers['content-type'],
                     accept: req.headers['accept'],
@@ -92,7 +92,7 @@ export async function createHttpServer(server) {
         const sessionId = req.headers['mcp-session-id'];
         if (!sessionId || !transports[sessionId]) {
             console.warn(`⚠️  GET request rejected - missing or invalid session ID:`, {
-                clientIP: req.ip || req.connection.remoteAddress,
+                clientIP: req.ip || req.socket.remoteAddress,
                 sessionId: sessionId || 'undefined',
                 userAgent: req.headers['user-agent']
             });
@@ -105,7 +105,7 @@ export async function createHttpServer(server) {
         }
         catch (error) {
             console.warn(`⚠️  GET request failed:`, {
-                clientIP: req.ip || req.connection.remoteAddress,
+                clientIP: req.ip || req.socket.remoteAddress,
                 sessionId,
                 error: error instanceof Error ? error.message : String(error)
             });
@@ -117,7 +117,7 @@ export async function createHttpServer(server) {
         const sessionId = req.headers['mcp-session-id'];
         if (!sessionId || !transports[sessionId]) {
             console.warn(`⚠️  DELETE request rejected - missing or invalid session ID:`, {
-                clientIP: req.ip || req.connection.remoteAddress,
+                clientIP: req.ip || req.socket.remoteAddress,
                 sessionId: sessionId || 'undefined',
                 userAgent: req.headers['user-agent']
             });
@@ -130,7 +130,7 @@ export async function createHttpServer(server) {
         }
         catch (error) {
             console.warn(`⚠️  DELETE request failed:`, {
-                clientIP: req.ip || req.connection.remoteAddress,
+                clientIP: req.ip || req.socket.remoteAddress,
                 sessionId,
                 error: error instanceof Error ? error.message : String(error)
             });

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-declare const packageVersion = "0.10.0";
+declare const packageVersion = "0.10.2";
 export { packageVersion };
 export declare function isWebUrlReadArgs(args: unknown): args is {
     url: string;

package/dist/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { Server } from "@modelcontextprotocol/sdk/server/index.js";
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { CallToolRequestSchema, ListToolsRequestSchema, SetLevelRequestSchema, ListResourcesRequestSchema, ListResourceTemplatesRequestSchema, ReadResourceRequestSchema, } from "@modelcontextprotocol/sdk/types.js";
 // Import modularized functionality
@@ -11,7 +11,7 @@ import { createConfigResource, createHelpResource } from "./resources.js";
 import { createHttpServer } from "./http-server.js";
 import { validateEnvironment as validateEnv } from "./error-handler.js";
 // Use a static version string that will be updated by the version script
-const packageVersion = "0.10.0";
+const packageVersion = "0.10.2";
 // Export the version for use in other modules
 export { packageVersion };
 // Global state for logging level
@@ -49,28 +49,21 @@ export function isWebUrlReadArgs(args) {
     return true;
 }
 // Server implementation
-const server = new Server({
+const mcpServer = new McpServer({
     name: "ihor-sokoliuk/mcp-searxng",
     version: packageVersion,
 }, {
     capabilities: {
         logging: {},
         resources: {},
-        tools: {
-            searxng_web_search: {
-                description: WEB_SEARCH_TOOL.description,
-                schema: WEB_SEARCH_TOOL.inputSchema,
-            },
-            web_url_read: {
-                description: READ_URL_TOOL.description,
-                schema: READ_URL_TOOL.inputSchema,
-            },
-        },
+        tools: {},
     },
 });
+// Underlying low-level server for handler registration and passing to modules
+const server = mcpServer.server;
 // List tools handler
 server.setRequestHandler(ListToolsRequestSchema, async () => {
-    logMessage(server, "debug", "Handling list_tools request");
+    logMessage(mcpServer, "debug", "Handling list_tools request");
     return {
         tools: [WEB_SEARCH_TOOL, READ_URL_TOOL],
     };
@@ -78,13 +71,13 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
 // Call tool handler
 server.setRequestHandler(CallToolRequestSchema, async (request) => {
     const { name, arguments: args } = request.params;
-    logMessage(server, "debug", `Handling call_tool request: ${name}`);
+    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(server, args.query, args.pageno, args.time_range, args.language, args.safesearch);
+            const result = await performWebSearch(mcpServer, args.query, args.pageno, args.time_range, args.language, args.safesearch);
             return {
                 content: [
                     {
@@ -105,7 +98,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 paragraphRange: args.paragraphRange,
                 readHeadings: args.readHeadings,
             };
-            const result = await fetchAndConvertToMarkdown(server, args.url, 10000, paginationOptions);
+            const result = await fetchAndConvertToMarkdown(mcpServer, args.url, 10000, paginationOptions);
             return {
                 content: [
                     {
@@ -120,7 +113,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         }
     }
     catch (error) {
-        logMessage(server, "error", `Tool execution error: ${error instanceof Error ? error.message : String(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)
@@ -131,14 +124,14 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
 // Logging level handler
 server.setRequestHandler(SetLevelRequestSchema, async (request) => {
     const { level } = request.params;
-    logMessage(server, "info", `Setting log level to: ${level}`);
+    logMessage(mcpServer, "info", `Setting log level to: ${level}`);
     currentLogLevel = level;
     setLogLevel(level);
     return {};
 });
 // List resources handler
 server.setRequestHandler(ListResourcesRequestSchema, async () => {
-    logMessage(server, "debug", "Handling list_resources request");
+    logMessage(mcpServer, "debug", "Handling list_resources request");
     return {
         resources: [
             {
@@ -158,13 +151,13 @@ server.setRequestHandler(ListResourcesRequestSchema, async () => {
 });
 // List resource templates handler
 server.setRequestHandler(ListResourceTemplatesRequestSchema, async () => {
-    logMessage(server, "debug", "Handling list_resource_templates request");
+    logMessage(mcpServer, "debug", "Handling list_resource_templates request");
     return { resourceTemplates: [] };
 });
 // Read resource handler
 server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
     const { uri } = request.params;
-    logMessage(server, "debug", `Handling read_resource request for: ${uri}`);
+    logMessage(mcpServer, "debug", `Handling read_resource request for: ${uri}`);
     switch (uri) {
         case "config://server-config":
             return {
@@ -207,7 +200,7 @@ async function main() {
             process.exit(1);
         }
         console.log(`Starting HTTP transport on port ${port}`);
-        const app = await createHttpServer(server);
+        const app = await createHttpServer(mcpServer);
         const httpServer = app.listen(port, () => {
             console.log(`HTTP server listening on port ${port}`);
             console.log(`Health check: http://localhost:${port}/health`);
@@ -234,12 +227,12 @@ async function main() {
             console.error("📡 Waiting for MCP client connection via STDIO...\n");
         }
         const transport = new StdioServerTransport();
-        await server.connect(transport);
+        await mcpServer.connect(transport);
         // Log after connection is established
-        logMessage(server, "info", `MCP SearXNG Server v${packageVersion} connected via STDIO`);
-        logMessage(server, "info", `Log level: ${currentLogLevel}`);
-        logMessage(server, "info", `Environment: ${process.env.NODE_ENV || 'development'}`);
-        logMessage(server, "info", `SearXNG URL: ${process.env.SEARXNG_URL || 'not configured'}`);
+        logMessage(mcpServer, "info", `MCP SearXNG Server v${packageVersion} connected via STDIO`);
+        logMessage(mcpServer, "info", `Log level: ${currentLogLevel}`);
+        logMessage(mcpServer, "info", `Environment: ${process.env.NODE_ENV || 'development'}`);
+        logMessage(mcpServer, "info", `SearXNG URL: ${process.env.SEARXNG_URL || 'not configured'}`);
     }
 }
 // Handle uncaught errors

package/dist/logging.d.ts

@@ -1,6 +1,6 @@
-import { Server } from "@modelcontextprotocol/sdk/server/index.js";
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { LoggingLevel } from "@modelcontextprotocol/sdk/types.js";
-export declare function logMessage(server: Server, level: LoggingLevel, message: string, data?: unknown): void;
+export declare function logMessage(mcpServer: McpServer, level: LoggingLevel, message: string, data?: unknown): void;
 export declare function shouldLog(level: LoggingLevel): boolean;
 export declare function setLogLevel(level: LoggingLevel): void;
 export declare function getCurrentLogLevel(): LoggingLevel;

package/dist/logging.js

@@ -1,19 +1,16 @@
 // Logging state
 let currentLogLevel = "info";
 // Logging helper function
-export function logMessage(server, level, message, data) {
+export function logMessage(mcpServer, level, message, data) {
     if (shouldLog(level)) {
         try {
             // Merge message and data together for the notification body
             const notificationData = data !== undefined
                 ? (typeof data === 'object' && data !== null ? { message, ...data } : { message, data })
                 : { message };
-            server.notification({
-                method: "notifications/message",
-                params: {
-                    level,
-                    data: notificationData
-                }
+            mcpServer.sendLoggingMessage({
+                level,
+                data: notificationData
             }).catch((error) => {
                 // Silently ignore "Not connected" errors during server startup
                 // This can happen when logging occurs before the transport is fully connected

package/dist/search.d.ts

@@ -1,2 +1,2 @@
-import { Server } from "@modelcontextprotocol/sdk/server/index.js";
-export declare function performWebSearch(server: Server, query: string, pageno?: number, time_range?: string, language?: string, safesearch?: number): Promise<string>;
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+export declare function performWebSearch(mcpServer: McpServer, query: string, pageno?: number, time_range?: string, language?: string, safesearch?: number): Promise<string>;

package/dist/search.js

@@ -1,7 +1,7 @@
 import { createProxyAgent, ProxyType } from "./proxy.js";
 import { logMessage } from "./logging.js";
 import { createConfigurationError, createNetworkError, createServerError, createJSONError, createDataError, createNoResultsMessage } from "./error-handler.js";
-export async function performWebSearch(server, query, pageno = 1, time_range, language = "all", safesearch) {
+export async function performWebSearch(mcpServer, query, pageno = 1, time_range, language = "all", safesearch) {
     const startTime = Date.now();
     // Build detailed log message with all parameters
     const searchParams = [
@@ -10,10 +10,10 @@ export async function performWebSearch(server, query, pageno = 1, time_range, la
         time_range ? `time: ${time_range}` : null,
         safesearch ? `safesearch: ${safesearch}` : null
     ].filter(Boolean).join(", ");
-    logMessage(server, "info", `Starting web search: "${query}" (${searchParams})`);
+    logMessage(mcpServer, "info", `Starting web search: "${query}" (${searchParams})`);
     const searxngUrl = process.env.SEARXNG_URL;
     if (!searxngUrl) {
-        logMessage(server, "error", "SEARXNG_URL not configured");
+        logMessage(mcpServer, "error", "SEARXNG_URL not configured");
         throw createConfigurationError("SEARXNG_URL not set. Set it to your SearXNG instance (e.g., http://localhost:8080 or https://search.example.com)");
     }
     // Validate that searxngUrl is a valid URL
@@ -69,11 +69,11 @@ export async function performWebSearch(server, query, pageno = 1, time_range, la
     // Fetch with enhanced error handling
     let response;
     try {
-        logMessage(server, "info", `Making request to: ${url.toString()}`);
+        logMessage(mcpServer, "info", `Making request to: ${url.toString()}`);
         response = await fetch(url.toString(), requestOptions);
     }
     catch (error) {
-        logMessage(server, "error", `Network error during search request: ${error.message}`, { query, url: url.toString() });
+        logMessage(mcpServer, "error", `Network error during search request: ${error.message}`, { query, url: url.toString() });
         const context = {
             url: url.toString(),
             searxngUrl,
@@ -123,11 +123,11 @@ export async function performWebSearch(server, query, pageno = 1, time_range, la
         score: result.score || 0,
     }));
     if (results.length === 0) {
-        logMessage(server, "info", `No results found for query: "${query}"`);
+        logMessage(mcpServer, "info", `No results found for query: "${query}"`);
         return createNoResultsMessage(query);
     }
     const duration = Date.now() - startTime;
-    logMessage(server, "info", `Search completed: "${query}" (${searchParams}) - ${results.length} results in ${duration}ms`);
+    logMessage(mcpServer, "info", `Search completed: "${query}" (${searchParams}) - ${results.length} results in ${duration}ms`);
     return results
         .map((r) => `Title: ${r.title}\nDescription: ${r.content}\nURL: ${r.url}\nRelevance Score: ${r.score.toFixed(3)}`)
         .join("\n\n");

package/dist/url-reader.d.ts

@@ -1,4 +1,4 @@
-import { Server } from "@modelcontextprotocol/sdk/server/index.js";
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 interface PaginationOptions {
     startChar?: number;
     maxLength?: number;
@@ -6,5 +6,5 @@ interface PaginationOptions {
     paragraphRange?: string;
     readHeadings?: boolean;
 }
-export declare function fetchAndConvertToMarkdown(server: Server, url: string, timeoutMs?: number, paginationOptions?: PaginationOptions): Promise<string>;
+export declare function fetchAndConvertToMarkdown(mcpServer: McpServer, url: string, timeoutMs?: number, paginationOptions?: PaginationOptions): Promise<string>;
 export {};

package/dist/url-reader.js

@@ -100,16 +100,16 @@ function applyPaginationOptions(markdownContent, options) {
     }
     return result;
 }
-export async function fetchAndConvertToMarkdown(server, url, timeoutMs = 10000, paginationOptions = {}) {
+export async function fetchAndConvertToMarkdown(mcpServer, url, timeoutMs = 10000, paginationOptions = {}) {
     const startTime = Date.now();
-    logMessage(server, "info", `Fetching URL: ${url}`);
+    logMessage(mcpServer, "info", `Fetching URL: ${url}`);
     // Check cache first
     const cachedEntry = urlCache.get(url);
     if (cachedEntry) {
-        logMessage(server, "info", `Using cached content for URL: ${url}`);
+        logMessage(mcpServer, "info", `Using cached content for URL: ${url}`);
         const result = applyPaginationOptions(cachedEntry.markdownContent, paginationOptions);
         const duration = Date.now() - startTime;
-        logMessage(server, "info", `Processed cached URL: ${url} (${result.length} chars in ${duration}ms)`);
+        logMessage(mcpServer, "info", `Processed cached URL: ${url} (${result.length} chars in ${duration}ms)`);
         return result;
     }
     // Validate URL format
@@ -118,7 +118,7 @@ export async function fetchAndConvertToMarkdown(server, url, timeoutMs = 10000,
         parsedUrl = new URL(url);
     }
     catch (error) {
-        logMessage(server, "error", `Invalid URL format: ${url}`);
+        logMessage(mcpServer, "error", `Invalid URL format: ${url}`);
         throw createURLFormatError(url);
     }
     // Create an AbortController instance
@@ -187,7 +187,7 @@ export async function fetchAndConvertToMarkdown(server, url, timeoutMs = 10000,
             throw createConversionError(error, url, htmlContent);
         }
         if (!markdownContent || markdownContent.trim().length === 0) {
-            logMessage(server, "warning", `Empty content after conversion: ${url}`);
+            logMessage(mcpServer, "warning", `Empty content after conversion: ${url}`);
             // DON'T cache empty/failed conversions - return warning directly
             return createEmptyContentWarning(url, htmlContent.length, htmlContent);
         }
@@ -196,21 +196,21 @@ export async function fetchAndConvertToMarkdown(server, url, timeoutMs = 10000,
         // Apply pagination options
         const result = applyPaginationOptions(markdownContent, paginationOptions);
         const duration = Date.now() - startTime;
-        logMessage(server, "info", `Successfully fetched and converted URL: ${url} (${result.length} chars in ${duration}ms)`);
+        logMessage(mcpServer, "info", `Successfully fetched and converted URL: ${url} (${result.length} chars in ${duration}ms)`);
         return result;
     }
     catch (error) {
         if (error.name === "AbortError") {
-            logMessage(server, "error", `Timeout fetching URL: ${url} (${timeoutMs}ms)`);
+            logMessage(mcpServer, "error", `Timeout fetching URL: ${url} (${timeoutMs}ms)`);
             throw createTimeoutError(timeoutMs, url);
         }
         // Re-throw our enhanced errors
         if (error.name === 'MCPSearXNGError') {
-            logMessage(server, "error", `Error fetching URL: ${url} - ${error.message}`);
+            logMessage(mcpServer, "error", `Error fetching URL: ${url} - ${error.message}`);
             throw error;
         }
         // Catch any unexpected errors
-        logMessage(server, "error", `Unexpected error fetching URL: ${url}`, error);
+        logMessage(mcpServer, "error", `Unexpected error fetching URL: ${url}`, error);
         const context = { url };
         throw createUnexpectedError(error, context);
     }

package/package.json

@@ -1,6 +1,7 @@
 {
     "name": "mcp-searxng",
-    "version": "0.10.0",
+    "version": "0.10.2",
+    "mcpName": "io.github.ihor-sokoliuk/mcp-searxng",
     "description": "MCP server for SearXNG integration",
     "license": "MIT",
     "author": "Ihor Sokoliuk (https://github.com/ihor-sokoliuk)",
@@ -40,26 +41,29 @@
         "test:coverage": "cross-env SEARXNG_URL=https://test-searx.example.com c8 --reporter=text tsx __tests__/run-all.ts",
         "bootstrap": "npm install && npm run build",
         "inspector": "DANGEROUSLY_OMIT_AUTH=true npx @modelcontextprotocol/inspector node dist/index.js",
-        "postversion": "TAG=$(node scripts/update-version.js | tail -1) && git add src/index.ts && git commit --amend --no-edit && git tag -f $TAG"
+        "lint": "eslint src __tests__",
+        "postversion": "TAG=$(node scripts/update-version.js | tail -1) && git add src/index.ts .mcp/server.json && git commit --amend --no-edit && git tag -f $TAG"
     },
     "dependencies": {
-        "@modelcontextprotocol/sdk": "1.17.4",
+        "@modelcontextprotocol/sdk": "1.29.0",
         "@types/cors": "^2.8.19",
-        "@types/express": "^5.0.3",
-        "cors": "^2.8.5",
-        "express": "^5.1.0",
-        "node-html-markdown": "^1.3.0",
-        "undici": "^6.20.1"
+        "@types/express": "^5.0.6",
+        "cors": "^2.8.6",
+        "express": "^5.2.1",
+        "node-html-markdown": "^2.0.0",
+        "undici": "^7.0.0"
     },
     "devDependencies": {
         "@types/node": "^22.17.2",
-        "@types/supertest": "^6.0.3",
-        "c8": "^10.1.3",
+        "@types/supertest": "^7.2.0",
+        "@typescript-eslint/eslint-plugin": "^8.58.0",
+        "@typescript-eslint/parser": "^8.58.0",
+        "c8": "^11.0.0",
         "cross-env": "^10.1.0",
-        "mcp-evals": "^1.0.18",
+        "eslint": "^10.1.0",
         "shx": "^0.4.0",
-        "supertest": "^7.1.4",
-        "tsx": "^4.20.5",
+        "supertest": "^7.2.2",
+        "tsx": "^4.21.0",
         "typescript": "^5.8.3"
     }
 }