refactor(tests): enhance server startup handling with error catching and retry logic

Author: quanru

packages/android-mcp/tests/http-server.test.ts

@@ -21,45 +21,61 @@ describe('AndroidMCPServer HTTP mode', () => {
     }) as any);
 
     try {
-      // Start server in background
+      // Start server in background and handle potential errors
       const serverPromise = server.launchHttp({
         port: testPort,
         host: testHost,
       });
 
-      // Give server time to start
-      await new Promise((resolve) => setTimeout(resolve, 1500));
+      // Catch any errors from server startup without blocking
+      serverPromise.catch((error) => {
+        console.error('Server startup error:', error);
+      });
 
-      // Simply verify the server is listening by trying to connect
-      const response = await fetch(`http://${testHost}:${testPort}/mcp`, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          jsonrpc: '2.0',
-          method: 'initialize',
-          params: {
-            protocolVersion: '2024-11-05',
-            capabilities: {},
-            clientInfo: {
-              name: 'test-client',
-              version: '1.0.0',
+      // Wait for server to start with retries (up to 5 seconds)
+      let connected = false;
+      for (let i = 0; i < 10; i++) {
+        await new Promise((resolve) => setTimeout(resolve, 500));
+        try {
+          const response = await fetch(`http://${testHost}:${testPort}/mcp`, {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json',
             },
-          },
-          id: 1,
-        }),
-      });
+            body: JSON.stringify({
+              jsonrpc: '2.0',
+              method: 'initialize',
+              params: {
+                protocolVersion: '2024-11-05',
+                capabilities: {},
+                clientInfo: {
+                  name: 'test-client',
+                  version: '1.0.0',
+                },
+              },
+              id: 1,
+            }),
+          });
 
-      // Server should respond (even if initialization fails without device)
-      expect(response.status).toBeGreaterThanOrEqual(200);
-      expect(response.status).toBeLessThan(600);
+          // Server should respond (even if initialization fails without device)
+          expect(response.status).toBeGreaterThanOrEqual(200);
+          expect(response.status).toBeLessThan(600);
+          connected = true;
+          console.log(`✓ Android MCP server started and responding (attempt ${i + 1})`);
+          break;
+        } catch (error) {
+          if (i === 9) {
+            throw error; // Throw on last attempt
+          }
+          // Otherwise continue retrying
+        }
+      }
 
-      console.log('✓ Android MCP server started and responding');
+      expect(connected).toBe(true);
     } finally {
       exitSpy.mockRestore();
     }
-  }, 10000);
+  }, 15000); // Increase timeout for CI
 
   it('should reject invalid port numbers', async () => {
     const invalidServer = new AndroidMCPServer();

packages/ios-mcp/tests/http-server.test.ts

@@ -21,45 +21,61 @@ describe('IOSMCPServer HTTP mode', () => {
     }) as any);
 
     try {
-      // Start server in background
+      // Start server in background and handle potential errors
       const serverPromise = server.launchHttp({
         port: testPort,
         host: testHost,
       });
 
-      // Give server time to start
-      await new Promise((resolve) => setTimeout(resolve, 1500));
+      // Catch any errors from server startup without blocking
+      serverPromise.catch((error) => {
+        console.error('Server startup error:', error);
+      });
 
-      // Simply verify the server is listening by trying to connect
-      const response = await fetch(`http://${testHost}:${testPort}/mcp`, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          jsonrpc: '2.0',
-          method: 'initialize',
-          params: {
-            protocolVersion: '2024-11-05',
-            capabilities: {},
-            clientInfo: {
-              name: 'test-client',
-              version: '1.0.0',
+      // Wait for server to start with retries (up to 5 seconds)
+      let connected = false;
+      for (let i = 0; i < 10; i++) {
+        await new Promise((resolve) => setTimeout(resolve, 500));
+        try {
+          const response = await fetch(`http://${testHost}:${testPort}/mcp`, {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json',
             },
-          },
-          id: 1,
-        }),
-      });
+            body: JSON.stringify({
+              jsonrpc: '2.0',
+              method: 'initialize',
+              params: {
+                protocolVersion: '2024-11-05',
+                capabilities: {},
+                clientInfo: {
+                  name: 'test-client',
+                  version: '1.0.0',
+                },
+              },
+              id: 1,
+            }),
+          });
 
-      // Server should respond (even if initialization fails without device)
-      expect(response.status).toBeGreaterThanOrEqual(200);
-      expect(response.status).toBeLessThan(600);
+          // Server should respond (even if initialization fails without device)
+          expect(response.status).toBeGreaterThanOrEqual(200);
+          expect(response.status).toBeLessThan(600);
+          connected = true;
+          console.log(`✓ iOS MCP server started and responding (attempt ${i + 1})`);
+          break;
+        } catch (error) {
+          if (i === 9) {
+            throw error; // Throw on last attempt
+          }
+          // Otherwise continue retrying
+        }
+      }
 
-      console.log('✓ iOS MCP server started and responding');
+      expect(connected).toBe(true);
     } finally {
       exitSpy.mockRestore();
     }
-  }, 10000);
+  }, 15000); // Increase timeout for CI
 
   it('should reject invalid port numbers', async () => {
     const invalidServer = new IOSMCPServer();