Fix e2e tests for MCP

Author: pimterry

src/api/api-server.ts

@@ -140,14 +140,17 @@ export class HttpToolkitServerApi extends events.EventEmitter {
         exposeGraphQLAPI(this.server, apiModel);
     }
 
-    start() {
-        return new Promise<void>((resolve, reject) => {
+    async start() {
+        const socketReady = this.startBridgeApiServer();
+
+        await new Promise<void>((resolve, reject) => {
             const httpServer: http.Server = this.server.listen(45457, '127.0.0.1', resolve);
             httpServer.once('error', reject);
 
             this.attachWebSocketBridge(httpServer);
-            this.startBridgeApiServer();
         });
+
+        await socketReady;
     }
 
     private attachWebSocketBridge(httpServer: http.Server) {
@@ -190,10 +193,10 @@ export class HttpToolkitServerApi extends events.EventEmitter {
         });
     }
 
-    private startBridgeApiServer() {
+    private async startBridgeApiServer(): Promise<void> {
         try {
             const socketPath = getSocketPath();
-            this.bridge.startApiServer(socketPath);
+            await this.bridge.startApiServer(socketPath);
         } catch (err: any) {
             console.warn(
                 `Failed to start UI Bridge socket server: ${err.message}. ` +

src/api/bridge-client.ts

@@ -17,7 +17,8 @@ export function apiRequest(
         socketPath: getSocketPath(),
         headers: {
             'Content-Type': 'application/json'
-        }
+        },
+        timeout: 5000
     }, (res) => {
         const chunks: Buffer[] = [];
         res.on('error', (err) => result.reject(err));
@@ -41,6 +42,10 @@ export function apiRequest(
         });
     });
 
+    req.on('timeout', () => {
+        req.destroy(new Error('Request timed out'));
+    });
+
     req.on('error', (err: any) => {
         if (err.code === 'ECONNREFUSED' || err.code === 'ENOENT') {
             result.reject(new Error('HTTP Toolkit is not running. Start HTTP Toolkit first.'));

src/api/ui-operation-bridge.ts

@@ -140,7 +140,7 @@ export class UiOperationBridge extends EventEmitter {
         });
     }
 
-    startApiServer(socketPath: string): http.Server {
+    startApiServer(socketPath: string): Promise<void> {
         // Clean up stale socket file if it exists (Unix only)
         if (process.platform !== 'win32') {
             try { fs.unlinkSync(socketPath); } catch {}
@@ -170,15 +170,22 @@ export class UiOperationBridge extends EventEmitter {
             }
         });
 
-        server.listen(socketPath, () => {
-            if (process.platform !== 'win32') {
-                fs.chmodSync(socketPath, 0o600);
-            }
-            console.log(`UI Bridge API server listening on ${socketPath}`);
-        });
-
         this.socketServer = server;
-        return server;
+
+        return new Promise<void>((resolve, reject) => {
+            server.once('error', reject);
+            server.listen(socketPath, () => {
+                server.removeListener('error', reject);
+                server.on('error', (err) => {
+                    console.warn(`UI Bridge socket server error: ${err.message}`);
+                });
+                if (process.platform !== 'win32') {
+                    fs.chmodSync(socketPath, 0o600);
+                }
+                console.log(`UI Bridge API server listening on ${socketPath}`);
+                resolve();
+            });
+        });
     }
 
     private handleApiStatus(res: http.ServerResponse): void {

test/integration/e2e-api-test.spec.ts

@@ -323,11 +323,13 @@ describe('End-to-end server API test', function () {
                 execFile(serverRunPath, ['ctl', ...args], {
                     timeout: 10000
                 }, (error, stdout, stderr) => {
-                    resolve({
+                    const result = {
                         stdout: stdout.toString(),
                         stderr: stderr.toString(),
                         exitCode: error ? (error as any).code ?? 1 : 0
-                    });
+                    };
+                    if (result.stderr) console.warn(`[ctl ${args.join(' ')}] stderr: ${result.stderr}`);
+                    resolve(result);
                 });
             });
         }
@@ -363,6 +365,13 @@ describe('End-to-end server API test', function () {
                 stdio: ['pipe', 'pipe', 'pipe']
             });
 
+            let mcpStderr = '';
+            mcpProcess.stderr!.on('data', (d) => { mcpStderr += d.toString(); });
+            mcpProcess.on('exit', (code) => {
+                if (mcpStderr) console.warn(`[mcp] stderr: ${mcpStderr}`);
+                if (code !== null && code !== 0) console.warn(`[mcp] exited with code ${code}`);
+            });
+
             const initMessage = JSON.stringify({
                 jsonrpc: '2.0',
                 id: 1,

test/integration/ui-operation-bridge.spec.ts

@@ -122,11 +122,10 @@ describe("UiOperationBridge", () => {
     let bridge: UiOperationBridge;
     const activePairs: { clientWs: WebSocket; wss: WebSocketServer }[] = [];
 
-    beforeEach((done) => {
+    beforeEach(async () => {
         bridge = new UiOperationBridge();
         testSocketPath = getTempSocketPath();
-        const server = bridge.startApiServer(testSocketPath);
-        server.on('listening', done);
+        await bridge.startApiServer(testSocketPath);
     });
 
     afterEach((done) => {