Clean up Redis client test - remove timeouts, expect proper functionality

Author: bobymicroby

src/app.test.ts

@@ -237,65 +237,59 @@ describe('Redis Proxy API', () => {
     });
   });
 
-  test('Redis client connection with graceful timeout', async () => {
-    // Test with Redis client but with better timeout handling for CI
+  test('Redis client connection and command execution', async () => {
+    // Test with real Redis client - this should work properly
     const client = createClient({
       socket: {
         host: '127.0.0.1',
-        port: proxy.config.listenPort,
-        connectTimeout: 1000,
-        commandTimeout: 1000
+        port: proxy.config.listenPort
       }
     });
 
-    let connected = false;
-    
-    try {
-      // Wrap the entire test in a timeout
-      await Promise.race([
-        (async () => {
-          await client.connect();
-          connected = true;
-          console.log('Redis client connected successfully');
+    await client.connect();
+    console.log('Redis client connected successfully');
 
-          // Give the connection a moment to be registered
-          await new Promise(resolve => setTimeout(resolve, 100));
+    // Give the connection a moment to be registered
+    await new Promise(resolve => setTimeout(resolve, 100));
 
-          // Verify connection is tracked
-          const statsRes = await app.request('/stats');
-          const stats = await statsRes.json();
-          expect(stats.activeConnections).toBe(1);
+    // Verify connection is tracked
+    const statsRes = await app.request('/stats');
+    const stats = await statsRes.json();
+    expect(stats.activeConnections).toBe(1);
+    expect(stats.totalConnections).toBeGreaterThanOrEqual(1);
+    expect(stats.connections.length).toBe(1);
 
-          // Try to send a command with timeout
-          try {
-            const result = await Promise.race([
-              client.sendCommand(['PING']),
-              new Promise((_, reject) => setTimeout(() => reject(new Error('Command timeout')), 500))
-            ]);
-            console.log('Redis command result:', result);
-          } catch (cmdErr) {
-            console.log('Redis command failed (expected):', cmdErr);
-            // This is expected with our mock server
-          }
-        })(),
-        new Promise((_, reject) => setTimeout(() => reject(new Error('Test timeout')), 2000))
-      ]);
-    } catch (err) {
-      console.log('Redis client test failed (may be expected in CI):', err);
-      // In CI, this test might fail due to Redis client issues, which is okay
-      // The important thing is that we don't hang
-    } finally {
-      if (connected) {
-        try {
-          await client.disconnect();
-        } catch (err) {
-          console.log('Disconnect error (expected):', err);
-        }
-      }
-    }
+    // Get connection ID
+    const connectionsRes = await app.request('/connections');
+    const connectionsResult = await connectionsRes.json();
+    expect(connectionsResult.connectionIds.length).toBe(1);
+    const connectionId = connectionsResult.connectionIds[0];
+
+    // Test sending a command through Redis client
+    const result = await client.sendCommand(['FOO']);
+    expect(result).toBe('BAR');
+
+    // Test API endpoint to send data to this connection
+    const pingCommand = Buffer.from('*1\r\n$4\r\nPING\r\n').toString('base64');
+    const sendRes = await app.request(`/send-to-client/${connectionId}?encoding=base64`, {
+      method: 'POST',
+      body: pingCommand,
+    });
+
+    expect(sendRes.status).toBe(200);
+    const sendResult = await sendRes.json();
+    expect(sendResult.success).toBe(true);
+    expect(sendResult.connectionId).toBe(connectionId);
+
+    // Clean up
+    await client.disconnect();
+
+    // Give the proxy a moment to detect the disconnection
+    await new Promise(resolve => setTimeout(resolve, 100));
 
-    // Always verify we can still query stats after test
+    // Verify the connection is no longer active
     const finalStatsRes = await app.request('/stats');
-    expect(finalStatsRes.status).toBe(200);
+    const finalStats = await finalStatsRes.json();
+    expect(finalStats.activeConnections).toBe(0);
   });
 });