fix(tests): make tests more robust and bump small dependencies
This commit is contained in:
@@ -6,42 +6,49 @@ import { SmartProxy } from '../ts/index.js';
|
||||
let testProxy: SmartProxy;
|
||||
let targetServer: net.Server;
|
||||
|
||||
const ECHO_PORT = 47200;
|
||||
const PROXY_PORT = 47201;
|
||||
|
||||
// Create a simple echo server as target
|
||||
tap.test('setup test environment', async () => {
|
||||
// Create target server that echoes data back
|
||||
targetServer = net.createServer((socket) => {
|
||||
console.log('Target server: client connected');
|
||||
|
||||
|
||||
// Echo data back
|
||||
socket.on('data', (data) => {
|
||||
console.log(`Target server received: ${data.toString().trim()}`);
|
||||
socket.write(data);
|
||||
});
|
||||
|
||||
|
||||
socket.on('close', () => {
|
||||
console.log('Target server: client disconnected');
|
||||
});
|
||||
});
|
||||
|
||||
await new Promise<void>((resolve) => {
|
||||
targetServer.listen(9876, () => {
|
||||
console.log('Target server listening on port 9876');
|
||||
|
||||
await new Promise<void>((resolve, reject) => {
|
||||
targetServer.on('error', (err) => {
|
||||
console.error(`Echo server error: ${err.message}`);
|
||||
reject(err);
|
||||
});
|
||||
targetServer.listen(ECHO_PORT, () => {
|
||||
console.log(`Target server listening on port ${ECHO_PORT}`);
|
||||
resolve();
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
// Create proxy with simple TCP forwarding (no TLS)
|
||||
testProxy = new SmartProxy({
|
||||
routes: [{
|
||||
name: 'tcp-forward-test',
|
||||
match: {
|
||||
ports: 8888 // Plain TCP port
|
||||
ports: PROXY_PORT // Plain TCP port
|
||||
},
|
||||
action: {
|
||||
type: 'forward',
|
||||
targets: [{
|
||||
host: 'localhost',
|
||||
port: 9876
|
||||
port: ECHO_PORT
|
||||
}]
|
||||
// No TLS configuration - just plain TCP forwarding
|
||||
}
|
||||
@@ -49,7 +56,7 @@ tap.test('setup test environment', async () => {
|
||||
defaults: {
|
||||
target: {
|
||||
host: 'localhost',
|
||||
port: 9876
|
||||
port: ECHO_PORT
|
||||
}
|
||||
},
|
||||
enableDetailedLogging: true,
|
||||
@@ -59,72 +66,72 @@ tap.test('setup test environment', async () => {
|
||||
keepAlive: true,
|
||||
keepAliveInitialDelay: 1000
|
||||
});
|
||||
|
||||
|
||||
await testProxy.start();
|
||||
});
|
||||
|
||||
tap.test('should keep WebSocket-like connection open for extended period', async (tools) => {
|
||||
tools.timeout(60000); // 60 second test timeout
|
||||
|
||||
tools.timeout(15000); // 15 second test timeout
|
||||
|
||||
const client = new net.Socket();
|
||||
let messagesReceived = 0;
|
||||
let connectionClosed = false;
|
||||
|
||||
|
||||
// Connect to proxy
|
||||
await new Promise<void>((resolve, reject) => {
|
||||
client.connect(8888, 'localhost', () => {
|
||||
client.connect(PROXY_PORT, 'localhost', () => {
|
||||
console.log('Client connected to proxy');
|
||||
resolve();
|
||||
});
|
||||
|
||||
|
||||
client.on('error', reject);
|
||||
});
|
||||
|
||||
|
||||
// Set up data handler
|
||||
client.on('data', (data) => {
|
||||
console.log(`Client received: ${data.toString().trim()}`);
|
||||
messagesReceived++;
|
||||
});
|
||||
|
||||
|
||||
client.on('close', () => {
|
||||
console.log('Client connection closed');
|
||||
connectionClosed = true;
|
||||
});
|
||||
|
||||
|
||||
// Send initial handshake-like data
|
||||
client.write('HELLO\n');
|
||||
|
||||
|
||||
// Wait for response
|
||||
await new Promise(resolve => setTimeout(resolve, 100));
|
||||
expect(messagesReceived).toEqual(1);
|
||||
|
||||
|
||||
// Simulate WebSocket-like keep-alive pattern
|
||||
// Send periodic messages over 60 seconds
|
||||
// Send periodic messages over 5 seconds
|
||||
const startTime = Date.now();
|
||||
const pingInterval = setInterval(() => {
|
||||
if (!connectionClosed && Date.now() - startTime < 60000) {
|
||||
if (!connectionClosed && Date.now() - startTime < 5000) {
|
||||
console.log('Sending ping...');
|
||||
client.write('PING\n');
|
||||
} else {
|
||||
clearInterval(pingInterval);
|
||||
}
|
||||
}, 10000); // Every 10 seconds
|
||||
|
||||
// Wait for 55 seconds (must complete within 60s runner timeout)
|
||||
await new Promise(resolve => setTimeout(resolve, 55000));
|
||||
|
||||
}, 1000); // Every 1 second
|
||||
|
||||
// Wait for 5 seconds — sufficient to verify the connection stays open
|
||||
await new Promise(resolve => setTimeout(resolve, 5000));
|
||||
|
||||
// Clean up interval
|
||||
clearInterval(pingInterval);
|
||||
|
||||
|
||||
// Connection should still be open
|
||||
expect(connectionClosed).toEqual(false);
|
||||
|
||||
// Should have received responses (1 hello + 6 pings)
|
||||
expect(messagesReceived).toBeGreaterThan(5);
|
||||
|
||||
|
||||
// Should have received responses (1 hello + ~5 pings)
|
||||
expect(messagesReceived).toBeGreaterThan(3);
|
||||
|
||||
// Close connection gracefully
|
||||
client.end();
|
||||
|
||||
|
||||
// Wait for close
|
||||
await new Promise(resolve => setTimeout(resolve, 100));
|
||||
expect(connectionClosed).toEqual(true);
|
||||
@@ -134,7 +141,7 @@ tap.test('should keep WebSocket-like connection open for extended period', async
|
||||
|
||||
tap.test('cleanup', async () => {
|
||||
await testProxy.stop();
|
||||
|
||||
|
||||
await new Promise<void>((resolve) => {
|
||||
targetServer.close(() => {
|
||||
console.log('Target server closed');
|
||||
|
||||
@@ -5,8 +5,8 @@ import * as net from 'net';
|
||||
|
||||
let smartProxyInstance: SmartProxy;
|
||||
let echoServer: net.Server;
|
||||
const echoServerPort = 9876;
|
||||
const proxyPort = 8080;
|
||||
const echoServerPort = 47300;
|
||||
const proxyPort = 47301;
|
||||
|
||||
// Create an echo server for testing
|
||||
tap.test('should create echo server for testing', async () => {
|
||||
@@ -16,7 +16,11 @@ tap.test('should create echo server for testing', async () => {
|
||||
});
|
||||
});
|
||||
|
||||
await new Promise<void>((resolve) => {
|
||||
await new Promise<void>((resolve, reject) => {
|
||||
echoServer.on('error', (err) => {
|
||||
console.error(`Echo server error: ${err.message}`);
|
||||
reject(err);
|
||||
});
|
||||
echoServer.listen(echoServerPort, () => {
|
||||
console.log(`Echo server listening on port ${echoServerPort}`);
|
||||
resolve();
|
||||
@@ -265,4 +269,4 @@ tap.test('should clean up resources', async () => {
|
||||
});
|
||||
});
|
||||
|
||||
export default tap.start();
|
||||
export default tap.start();
|
||||
@@ -5,19 +5,27 @@ import { SmartProxy } from '../ts/proxies/smart-proxy/smart-proxy.js';
|
||||
let echoServer: net.Server;
|
||||
let proxy: SmartProxy;
|
||||
|
||||
const ECHO_PORT = 47400;
|
||||
const PROXY_PORT_1 = 47401;
|
||||
const PROXY_PORT_2 = 47402;
|
||||
|
||||
tap.test('port forwarding should not immediately close connections', async (tools) => {
|
||||
// Set a timeout for this test
|
||||
tools.timeout(10000); // 10 seconds
|
||||
// Create an echo server
|
||||
echoServer = await new Promise<net.Server>((resolve) => {
|
||||
echoServer = await new Promise<net.Server>((resolve, reject) => {
|
||||
const server = net.createServer((socket) => {
|
||||
socket.on('data', (data) => {
|
||||
socket.write(`ECHO: ${data}`);
|
||||
});
|
||||
});
|
||||
|
||||
server.listen(8888, () => {
|
||||
console.log('Echo server listening on port 8888');
|
||||
|
||||
server.on('error', (err) => {
|
||||
console.error(`Echo server error: ${err.message}`);
|
||||
reject(err);
|
||||
});
|
||||
server.listen(ECHO_PORT, () => {
|
||||
console.log(`Echo server listening on port ${ECHO_PORT}`);
|
||||
resolve(server);
|
||||
});
|
||||
});
|
||||
@@ -26,10 +34,10 @@ tap.test('port forwarding should not immediately close connections', async (tool
|
||||
proxy = new SmartProxy({
|
||||
routes: [{
|
||||
name: 'test-forward',
|
||||
match: { ports: 9999 },
|
||||
match: { ports: PROXY_PORT_1 },
|
||||
action: {
|
||||
type: 'forward',
|
||||
targets: [{ host: 'localhost', port: 8888 }]
|
||||
targets: [{ host: 'localhost', port: ECHO_PORT }]
|
||||
}
|
||||
}]
|
||||
});
|
||||
@@ -37,21 +45,24 @@ tap.test('port forwarding should not immediately close connections', async (tool
|
||||
await proxy.start();
|
||||
|
||||
// Test connection through proxy
|
||||
const client = net.createConnection(9999, 'localhost');
|
||||
|
||||
const client = net.createConnection(PROXY_PORT_1, 'localhost');
|
||||
|
||||
const result = await new Promise<string>((resolve, reject) => {
|
||||
client.on('data', (data) => {
|
||||
const response = data.toString();
|
||||
client.end(); // Close the connection after receiving data
|
||||
resolve(response);
|
||||
});
|
||||
|
||||
|
||||
client.on('error', reject);
|
||||
|
||||
|
||||
client.write('Hello');
|
||||
});
|
||||
|
||||
expect(result).toEqual('ECHO: Hello');
|
||||
|
||||
// Stop proxy from test 1 before test 2 reassigns the variable
|
||||
await proxy.stop();
|
||||
});
|
||||
|
||||
tap.test('TLS passthrough should work correctly', async () => {
|
||||
@@ -59,7 +70,7 @@ tap.test('TLS passthrough should work correctly', async () => {
|
||||
proxy = new SmartProxy({
|
||||
routes: [{
|
||||
name: 'tls-test',
|
||||
match: { ports: 8443, domains: 'test.example.com' },
|
||||
match: { ports: PROXY_PORT_2, domains: 'test.example.com' },
|
||||
action: {
|
||||
type: 'forward',
|
||||
tls: { mode: 'passthrough' },
|
||||
@@ -85,16 +96,6 @@ tap.test('cleanup', async () => {
|
||||
});
|
||||
});
|
||||
}
|
||||
if (proxy) {
|
||||
await proxy.stop();
|
||||
console.log('Proxy stopped');
|
||||
}
|
||||
});
|
||||
|
||||
export default tap.start().then(() => {
|
||||
// Force exit after tests complete
|
||||
setTimeout(() => {
|
||||
console.log('Forcing process exit');
|
||||
process.exit(0);
|
||||
}, 1000);
|
||||
});
|
||||
export default tap.start();
|
||||
Reference in New Issue
Block a user