Rebase from SecKatie/FalkorDB-MCPServer

src/services/falkordb.service.ts

@@ -108,8 +108,10 @@ class FalkorDBService {
         `Failed to execute ${readOnly ? 'read-only ' : ''}query on graph '${graphName}': ${error instanceof Error ? error.message : String(error)}`,
         true
       );
-
-      logger.error('Query execution failed', appError, { graphName, query, readOnly });
+
+      // Sanitize query for error logging using same truncation as debug logs
+      const safeQuery = query.substring(0, 100) + (query.length > 100 ? '...' : '');
+      logger.error('Query execution failed', appError, { graphName, query: safeQuery, readOnly });
       throw appError;
     }
   }

src/services/logger.service.ts

@@ -85,12 +85,15 @@ export class Logger {
     try {
       // Format log data for MCP client
       const logData = context ? `${message} | ${JSON.stringify(context)}` : message;
-
+
+      // Map WARN to warning for MCP spec compliance
+      const mcpLevel = level === 'WARN' ? 'warning' : level.toLowerCase();
+
       // Send notification to MCP client
       await this.mcpServer.server.notification({
         method: 'notifications/message',
         params: {
-          level: level.toLowerCase(),
+          level: mcpLevel,
           data: logData,
           logger: 'falkordb-mcp'
         }

src/services/redis.service.ts

@@ -46,7 +46,16 @@ class RedisService {
       logger.info('Successfully connected to Redis');
       this.retryCount = 0;
     } catch (error) {
-
+      // Clean up failed client before retrying or throwing
+      if (this.client) {
+        try {
+          await this.client.disconnect();
+        } catch {
+          // Ignore disconnect errors
+        }
+        this.client = null;
+      }
+
       if (this.retryCount < this.maxRetries) {
         this.retryCount++;
         logger.warn('Failed to connect to Redis, retrying...', {
@@ -63,7 +72,7 @@ class RedisService {
           `Failed to connect to Redis after ${this.maxRetries} attempts: ${error instanceof Error ? error.message : String(error)}`,
           true
         );
-        
+
         logger.error('Redis connection failed permanently', appError);
         throw appError;
       }

src/utils/connection-parser.test.ts

@@ -251,26 +251,26 @@ describe('Connection Parser Utility', () => {
     it('should handle edge case with multiple @ symbols', () => {
       // Act
       const result = parseFalkorDBConnectionString('falkordb://user@domain:pass@host:1234');
-      
-      // Assert - implementation takes first @ as auth separator, but subsequent @ affects parsing
+
+      // Assert - after fixing parser to use lastIndexOf('@')
       expect(result).toEqual({
-        host: 'domain',
-        port: 6379,
-        username: undefined,
-        password: 'user'
+        host: 'host',
+        port: 1234,
+        username: 'user@domain',
+        password: 'pass'
       });
     });
 
     it('should handle edge case with multiple : in auth', () => {
       // Act
       const result = parseFalkorDBConnectionString('falkordb://user:pass:extra@host:1234');
-      
-      // Assert - implementation takes first : as separator between user and pass
+
+      // Assert - after fixing parser to properly rejoin password with multiple ':'
       expect(result).toEqual({
         host: 'host',
         port: 1234,
         username: 'user',
-        password: 'pass'
+        password: 'pass:extra'
       });
     });
   });

src/utils/connection-parser.ts

@@ -23,52 +23,52 @@ interface FalkorDBConnectionOptions {
         host: 'localhost',
         port: 6379
       };
-      
+
       // Handle empty or undefined input
       if (!connectionString) {
         return defaultOptions;
       }
-      
+
       // Remove protocol prefix if present
       let cleanString = connectionString;
       if (cleanString.startsWith('falkordb://')) {
         cleanString = cleanString.substring('falkordb://'.length);
       }
-      
-      // Parse authentication if present
+
+      // Parse authentication if present - use lastIndexOf to handle '@' in password
       let auth = '';
       let hostPort = cleanString;
-      
-      if (cleanString.includes('@')) {
-        const parts = cleanString.split('@');
-        auth = parts[0];
-        hostPort = parts[1];
+
+      const lastAtIndex = cleanString.lastIndexOf('@');
+      if (lastAtIndex !== -1) {
+        auth = cleanString.slice(0, lastAtIndex);
+        hostPort = cleanString.slice(lastAtIndex + 1);
       }
-      
+
       // Parse host and port
       let host = 'localhost';
       let port = 6379;
-      
+
       if (hostPort.includes(':')) {
         const parts = hostPort.split(':');
         host = parts[0] || 'localhost';
         port = parseInt(parts[1], 10) || 6379;
       } else {
         host = hostPort || 'localhost';
       }
-      
-      // Parse username and password
+
+      // Parse username and password - handle multiple ':' in password
       let username = undefined;
       let password = undefined;
-      
+
       if (auth && auth.includes(':')) {
-        const parts = auth.split(':');
-        username = parts[0] || undefined;
-        password = parts[1] || undefined;
+        const firstColonIndex = auth.indexOf(':');
+        username = auth.slice(0, firstColonIndex) || undefined;
+        password = auth.slice(firstColonIndex + 1) || undefined;
       } else if (auth) {
         password = auth;
       }
-      
+
       return {
         host,
         port,