fix(tests): make tests more robust and bump small dependencies
This commit is contained in:
10
changelog.md
10
changelog.md
@@ -1,5 +1,15 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 2026-02-12 - 23.1.4 - fix(tests)
|
||||||
|
make tests more robust and bump small dependencies
|
||||||
|
|
||||||
|
- Bump dependencies: @push.rocks/smartrust ^1.2.1 and minimatch ^10.2.0
|
||||||
|
- Replace hardcoded ports with named constants (ECHO_PORT, PROXY_PORT, PROXY_PORT_1/2) to avoid collisions between tests
|
||||||
|
- Add server 'error' handlers and reject listen promises on server errors to prevent silent hangs
|
||||||
|
- Reduce test timeouts and intervals (shorter test durations, more frequent pings) to speed up test runs
|
||||||
|
- Ensure proxy is stopped between tests and remove forced process.exit; export tap.start() consistently
|
||||||
|
- Adjust assertions to match the new shorter ping/response counts
|
||||||
|
|
||||||
## 2026-02-12 - 23.1.3 - fix(rustproxy)
|
## 2026-02-12 - 23.1.3 - fix(rustproxy)
|
||||||
install default rustls crypto provider early; detect and skip raw fast-path for HTTP connections and return proper HTTP 502 when no route matches
|
install default rustls crypto provider early; detect and skip raw fast-path for HTTP connections and return proper HTTP 502 when no route matches
|
||||||
|
|
||||||
|
|||||||
@@ -34,14 +34,14 @@
|
|||||||
"@push.rocks/smartnetwork": "^4.4.0",
|
"@push.rocks/smartnetwork": "^4.4.0",
|
||||||
"@push.rocks/smartpromise": "^4.2.3",
|
"@push.rocks/smartpromise": "^4.2.3",
|
||||||
"@push.rocks/smartrequest": "^5.0.1",
|
"@push.rocks/smartrequest": "^5.0.1",
|
||||||
"@push.rocks/smartrust": "^1.2.0",
|
"@push.rocks/smartrust": "^1.2.1",
|
||||||
"@push.rocks/smartrx": "^3.0.10",
|
"@push.rocks/smartrx": "^3.0.10",
|
||||||
"@push.rocks/smartstring": "^4.1.0",
|
"@push.rocks/smartstring": "^4.1.0",
|
||||||
"@push.rocks/taskbuffer": "^4.2.0",
|
"@push.rocks/taskbuffer": "^4.2.0",
|
||||||
"@tsclass/tsclass": "^9.3.0",
|
"@tsclass/tsclass": "^9.3.0",
|
||||||
"@types/minimatch": "^6.0.0",
|
"@types/minimatch": "^6.0.0",
|
||||||
"@types/ws": "^8.18.1",
|
"@types/ws": "^8.18.1",
|
||||||
"minimatch": "^10.1.2",
|
"minimatch": "^10.2.0",
|
||||||
"pretty-ms": "^9.3.0",
|
"pretty-ms": "^9.3.0",
|
||||||
"ws": "^8.19.0"
|
"ws": "^8.19.0"
|
||||||
},
|
},
|
||||||
|
|||||||
62
pnpm-lock.yaml
generated
62
pnpm-lock.yaml
generated
@@ -36,8 +36,8 @@ importers:
|
|||||||
specifier: ^5.0.1
|
specifier: ^5.0.1
|
||||||
version: 5.0.1
|
version: 5.0.1
|
||||||
'@push.rocks/smartrust':
|
'@push.rocks/smartrust':
|
||||||
specifier: ^1.2.0
|
specifier: ^1.2.1
|
||||||
version: 1.2.0
|
version: 1.2.1
|
||||||
'@push.rocks/smartrx':
|
'@push.rocks/smartrx':
|
||||||
specifier: ^3.0.10
|
specifier: ^3.0.10
|
||||||
version: 3.0.10
|
version: 3.0.10
|
||||||
@@ -57,8 +57,8 @@ importers:
|
|||||||
specifier: ^8.18.1
|
specifier: ^8.18.1
|
||||||
version: 8.18.1
|
version: 8.18.1
|
||||||
minimatch:
|
minimatch:
|
||||||
specifier: ^10.1.2
|
specifier: ^10.2.0
|
||||||
version: 10.1.2
|
version: 10.2.0
|
||||||
pretty-ms:
|
pretty-ms:
|
||||||
specifier: ^9.3.0
|
specifier: ^9.3.0
|
||||||
version: 9.3.0
|
version: 9.3.0
|
||||||
@@ -570,14 +570,6 @@ packages:
|
|||||||
resolution: {integrity: sha512-XvJRx+2KR3YXyYtPUUy+qd9i7p+GO9Ko6VIIpWlBrpWwXDv8WLFeHTxz35CfQFUiBMLXlGHhGzys7lqit9gWag==}
|
resolution: {integrity: sha512-XvJRx+2KR3YXyYtPUUy+qd9i7p+GO9Ko6VIIpWlBrpWwXDv8WLFeHTxz35CfQFUiBMLXlGHhGzys7lqit9gWag==}
|
||||||
engines: {node: '>=18'}
|
engines: {node: '>=18'}
|
||||||
|
|
||||||
'@isaacs/balanced-match@4.0.1':
|
|
||||||
resolution: {integrity: sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==}
|
|
||||||
engines: {node: 20 || >=22}
|
|
||||||
|
|
||||||
'@isaacs/brace-expansion@5.0.1':
|
|
||||||
resolution: {integrity: sha512-WMz71T1JS624nWj2n2fnYAuPovhv7EUhk69R6i9dsVyzxt5eM3bjwvgk9L+APE1TRscGysAVMANkB0jh0LQZrQ==}
|
|
||||||
engines: {node: 20 || >=22}
|
|
||||||
|
|
||||||
'@isaacs/cliui@9.0.0':
|
'@isaacs/cliui@9.0.0':
|
||||||
resolution: {integrity: sha512-AokJm4tuBHillT+FpMtxQ60n8ObyXBatq7jD2/JA9dxbDDokKQm8KMht5ibGzLVU9IJDIKK4TPKgMHEYMn3lMg==}
|
resolution: {integrity: sha512-AokJm4tuBHillT+FpMtxQ60n8ObyXBatq7jD2/JA9dxbDDokKQm8KMht5ibGzLVU9IJDIKK4TPKgMHEYMn3lMg==}
|
||||||
engines: {node: '>=18'}
|
engines: {node: '>=18'}
|
||||||
@@ -883,8 +875,8 @@ packages:
|
|||||||
'@push.rocks/smartrouter@1.3.3':
|
'@push.rocks/smartrouter@1.3.3':
|
||||||
resolution: {integrity: sha512-1+xZEnWlhzqLWAaJ1zFNhQ0zgbfCWQl1DBT72LygLxTs+P0K8AwJKgqo/IX6CT55kGCFnPAZIYSbVJlGsgrB0w==}
|
resolution: {integrity: sha512-1+xZEnWlhzqLWAaJ1zFNhQ0zgbfCWQl1DBT72LygLxTs+P0K8AwJKgqo/IX6CT55kGCFnPAZIYSbVJlGsgrB0w==}
|
||||||
|
|
||||||
'@push.rocks/smartrust@1.2.0':
|
'@push.rocks/smartrust@1.2.1':
|
||||||
resolution: {integrity: sha512-JlaALselIHoP6C3ceQbrvz424G21cND/QsH/KI3E/JrO4XphJiGZwM6f4yJWrijdPYR/YYMoaIiYN7ybZp0C4w==}
|
resolution: {integrity: sha512-ANwXXibUwoHNWF1hhXhXVVrfzYlhgHYRa2205Jkd/s/wXzcWHftYZthilJj+52B7nkzSB76umfxKfK5eBYY2Ug==}
|
||||||
|
|
||||||
'@push.rocks/smartrx@3.0.10':
|
'@push.rocks/smartrx@3.0.10':
|
||||||
resolution: {integrity: sha512-USjIYcsSfzn14cwOsxgq/bBmWDTTzy3ouWAnW5NdMyRRzEbmeNrvmy6TRqNeDlJ2PsYNTt1rr/zGUqvIy72ITg==}
|
resolution: {integrity: sha512-USjIYcsSfzn14cwOsxgq/bBmWDTTzy3ouWAnW5NdMyRRzEbmeNrvmy6TRqNeDlJ2PsYNTt1rr/zGUqvIy72ITg==}
|
||||||
@@ -1649,6 +1641,10 @@ packages:
|
|||||||
balanced-match@1.0.2:
|
balanced-match@1.0.2:
|
||||||
resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
|
resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
|
||||||
|
|
||||||
|
balanced-match@4.0.2:
|
||||||
|
resolution: {integrity: sha512-x0K50QvKQ97fdEz2kPehIerj+YTeptKF9hyYkKf6egnwmMWAkADiO0QCzSp0R5xN8FTZgYaBfSaue46Ej62nMg==}
|
||||||
|
engines: {node: 20 || >=22}
|
||||||
|
|
||||||
bare-events@2.8.2:
|
bare-events@2.8.2:
|
||||||
resolution: {integrity: sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==}
|
resolution: {integrity: sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
@@ -1714,6 +1710,10 @@ packages:
|
|||||||
brace-expansion@2.0.2:
|
brace-expansion@2.0.2:
|
||||||
resolution: {integrity: sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==}
|
resolution: {integrity: sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==}
|
||||||
|
|
||||||
|
brace-expansion@5.0.2:
|
||||||
|
resolution: {integrity: sha512-Pdk8c9poy+YhOgVWw1JNN22/HcivgKWwpxKq04M/jTmHyCZn12WPJebZxdjSa5TmBqISrUSgNYU3eRORljfCCw==}
|
||||||
|
engines: {node: 20 || >=22}
|
||||||
|
|
||||||
broadcast-channel@7.2.0:
|
broadcast-channel@7.2.0:
|
||||||
resolution: {integrity: sha512-JgraikEriG/TxBUi2W/w2O0jhHjXZUtXAvCZH0Yr3whjxYVgAg0hSe6r/teM+I5H5Q/q6RhyuKdC2pHNlFyepQ==}
|
resolution: {integrity: sha512-JgraikEriG/TxBUi2W/w2O0jhHjXZUtXAvCZH0Yr3whjxYVgAg0hSe6r/teM+I5H5Q/q6RhyuKdC2pHNlFyepQ==}
|
||||||
|
|
||||||
@@ -2750,8 +2750,8 @@ packages:
|
|||||||
minimalistic-crypto-utils@1.0.1:
|
minimalistic-crypto-utils@1.0.1:
|
||||||
resolution: {integrity: sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=}
|
resolution: {integrity: sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=}
|
||||||
|
|
||||||
minimatch@10.1.2:
|
minimatch@10.2.0:
|
||||||
resolution: {integrity: sha512-fu656aJ0n2kcXwsnwnv9g24tkU5uSmOlTjd6WyyaKm2Z+h1qmY6bAjrcaIxF/BslFqbZ8UBtbJi7KgQOZD2PTw==}
|
resolution: {integrity: sha512-ugkC31VaVg9cF0DFVoADH12k6061zNZkZON+aX8AWsR9GhPcErkcMBceb6znR8wLERM2AkkOxy2nWRLpT9Jq5w==}
|
||||||
engines: {node: 20 || >=22}
|
engines: {node: 20 || >=22}
|
||||||
|
|
||||||
minimatch@3.1.2:
|
minimatch@3.1.2:
|
||||||
@@ -4654,12 +4654,6 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
mute-stream: 1.0.0
|
mute-stream: 1.0.0
|
||||||
|
|
||||||
'@isaacs/balanced-match@4.0.1': {}
|
|
||||||
|
|
||||||
'@isaacs/brace-expansion@5.0.1':
|
|
||||||
dependencies:
|
|
||||||
'@isaacs/balanced-match': 4.0.1
|
|
||||||
|
|
||||||
'@isaacs/cliui@9.0.0': {}
|
'@isaacs/cliui@9.0.0': {}
|
||||||
|
|
||||||
'@leichtgewicht/ip-codec@2.0.5': {}
|
'@leichtgewicht/ip-codec@2.0.5': {}
|
||||||
@@ -5034,7 +5028,7 @@ snapshots:
|
|||||||
'@push.rocks/smartstring': 4.1.0
|
'@push.rocks/smartstring': 4.1.0
|
||||||
'@push.rocks/smartunique': 3.0.9
|
'@push.rocks/smartunique': 3.0.9
|
||||||
'@tsclass/tsclass': 9.3.0
|
'@tsclass/tsclass': 9.3.0
|
||||||
minimatch: 10.1.2
|
minimatch: 10.2.0
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- aws-crt
|
- aws-crt
|
||||||
|
|
||||||
@@ -5127,7 +5121,7 @@ snapshots:
|
|||||||
acme-client: 5.4.0
|
acme-client: 5.4.0
|
||||||
dns-packet: 5.6.1
|
dns-packet: 5.6.1
|
||||||
elliptic: 6.6.1
|
elliptic: 6.6.1
|
||||||
minimatch: 10.1.2
|
minimatch: 10.2.0
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
@@ -5143,7 +5137,7 @@ snapshots:
|
|||||||
acme-client: 5.4.0
|
acme-client: 5.4.0
|
||||||
dns-packet: 5.6.1
|
dns-packet: 5.6.1
|
||||||
elliptic: 6.6.1
|
elliptic: 6.6.1
|
||||||
minimatch: 10.1.2
|
minimatch: 10.2.0
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
@@ -5497,7 +5491,7 @@ snapshots:
|
|||||||
'@push.rocks/smartrx': 3.0.10
|
'@push.rocks/smartrx': 3.0.10
|
||||||
path-to-regexp: 8.3.0
|
path-to-regexp: 8.3.0
|
||||||
|
|
||||||
'@push.rocks/smartrust@1.2.0':
|
'@push.rocks/smartrust@1.2.1':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@push.rocks/smartpath': 6.0.0
|
'@push.rocks/smartpath': 6.0.0
|
||||||
|
|
||||||
@@ -6323,7 +6317,7 @@ snapshots:
|
|||||||
|
|
||||||
'@types/minimatch@6.0.0':
|
'@types/minimatch@6.0.0':
|
||||||
dependencies:
|
dependencies:
|
||||||
minimatch: 10.1.2
|
minimatch: 10.2.0
|
||||||
|
|
||||||
'@types/ms@2.1.0': {}
|
'@types/ms@2.1.0': {}
|
||||||
|
|
||||||
@@ -6494,6 +6488,10 @@ snapshots:
|
|||||||
|
|
||||||
balanced-match@1.0.2: {}
|
balanced-match@1.0.2: {}
|
||||||
|
|
||||||
|
balanced-match@4.0.2:
|
||||||
|
dependencies:
|
||||||
|
jackspeak: 4.2.3
|
||||||
|
|
||||||
bare-events@2.8.2: {}
|
bare-events@2.8.2: {}
|
||||||
|
|
||||||
bare-fs@4.5.3:
|
bare-fs@4.5.3:
|
||||||
@@ -6564,6 +6562,10 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
balanced-match: 1.0.2
|
balanced-match: 1.0.2
|
||||||
|
|
||||||
|
brace-expansion@5.0.2:
|
||||||
|
dependencies:
|
||||||
|
balanced-match: 4.0.2
|
||||||
|
|
||||||
broadcast-channel@7.2.0:
|
broadcast-channel@7.2.0:
|
||||||
dependencies:
|
dependencies:
|
||||||
'@babel/runtime': 7.28.4
|
'@babel/runtime': 7.28.4
|
||||||
@@ -7157,7 +7159,7 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
foreground-child: 3.3.1
|
foreground-child: 3.3.1
|
||||||
jackspeak: 4.2.3
|
jackspeak: 4.2.3
|
||||||
minimatch: 10.1.2
|
minimatch: 10.2.0
|
||||||
minipass: 7.1.2
|
minipass: 7.1.2
|
||||||
package-json-from-dist: 1.0.1
|
package-json-from-dist: 1.0.1
|
||||||
path-scurry: 2.0.1
|
path-scurry: 2.0.1
|
||||||
@@ -7862,9 +7864,9 @@ snapshots:
|
|||||||
|
|
||||||
minimalistic-crypto-utils@1.0.1: {}
|
minimalistic-crypto-utils@1.0.1: {}
|
||||||
|
|
||||||
minimatch@10.1.2:
|
minimatch@10.2.0:
|
||||||
dependencies:
|
dependencies:
|
||||||
'@isaacs/brace-expansion': 5.0.1
|
brace-expansion: 5.0.2
|
||||||
|
|
||||||
minimatch@3.1.2:
|
minimatch@3.1.2:
|
||||||
dependencies:
|
dependencies:
|
||||||
|
|||||||
@@ -6,6 +6,9 @@ import { SmartProxy } from '../ts/index.js';
|
|||||||
let testProxy: SmartProxy;
|
let testProxy: SmartProxy;
|
||||||
let targetServer: net.Server;
|
let targetServer: net.Server;
|
||||||
|
|
||||||
|
const ECHO_PORT = 47200;
|
||||||
|
const PROXY_PORT = 47201;
|
||||||
|
|
||||||
// Create a simple echo server as target
|
// Create a simple echo server as target
|
||||||
tap.test('setup test environment', async () => {
|
tap.test('setup test environment', async () => {
|
||||||
// Create target server that echoes data back
|
// Create target server that echoes data back
|
||||||
@@ -23,9 +26,13 @@ tap.test('setup test environment', async () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
await new Promise<void>((resolve) => {
|
await new Promise<void>((resolve, reject) => {
|
||||||
targetServer.listen(9876, () => {
|
targetServer.on('error', (err) => {
|
||||||
console.log('Target server listening on port 9876');
|
console.error(`Echo server error: ${err.message}`);
|
||||||
|
reject(err);
|
||||||
|
});
|
||||||
|
targetServer.listen(ECHO_PORT, () => {
|
||||||
|
console.log(`Target server listening on port ${ECHO_PORT}`);
|
||||||
resolve();
|
resolve();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -35,13 +42,13 @@ tap.test('setup test environment', async () => {
|
|||||||
routes: [{
|
routes: [{
|
||||||
name: 'tcp-forward-test',
|
name: 'tcp-forward-test',
|
||||||
match: {
|
match: {
|
||||||
ports: 8888 // Plain TCP port
|
ports: PROXY_PORT // Plain TCP port
|
||||||
},
|
},
|
||||||
action: {
|
action: {
|
||||||
type: 'forward',
|
type: 'forward',
|
||||||
targets: [{
|
targets: [{
|
||||||
host: 'localhost',
|
host: 'localhost',
|
||||||
port: 9876
|
port: ECHO_PORT
|
||||||
}]
|
}]
|
||||||
// No TLS configuration - just plain TCP forwarding
|
// No TLS configuration - just plain TCP forwarding
|
||||||
}
|
}
|
||||||
@@ -49,7 +56,7 @@ tap.test('setup test environment', async () => {
|
|||||||
defaults: {
|
defaults: {
|
||||||
target: {
|
target: {
|
||||||
host: 'localhost',
|
host: 'localhost',
|
||||||
port: 9876
|
port: ECHO_PORT
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
enableDetailedLogging: true,
|
enableDetailedLogging: true,
|
||||||
@@ -64,7 +71,7 @@ tap.test('setup test environment', async () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
tap.test('should keep WebSocket-like connection open for extended period', async (tools) => {
|
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();
|
const client = new net.Socket();
|
||||||
let messagesReceived = 0;
|
let messagesReceived = 0;
|
||||||
@@ -72,7 +79,7 @@ tap.test('should keep WebSocket-like connection open for extended period', async
|
|||||||
|
|
||||||
// Connect to proxy
|
// Connect to proxy
|
||||||
await new Promise<void>((resolve, reject) => {
|
await new Promise<void>((resolve, reject) => {
|
||||||
client.connect(8888, 'localhost', () => {
|
client.connect(PROXY_PORT, 'localhost', () => {
|
||||||
console.log('Client connected to proxy');
|
console.log('Client connected to proxy');
|
||||||
resolve();
|
resolve();
|
||||||
});
|
});
|
||||||
@@ -99,19 +106,19 @@ tap.test('should keep WebSocket-like connection open for extended period', async
|
|||||||
expect(messagesReceived).toEqual(1);
|
expect(messagesReceived).toEqual(1);
|
||||||
|
|
||||||
// Simulate WebSocket-like keep-alive pattern
|
// Simulate WebSocket-like keep-alive pattern
|
||||||
// Send periodic messages over 60 seconds
|
// Send periodic messages over 5 seconds
|
||||||
const startTime = Date.now();
|
const startTime = Date.now();
|
||||||
const pingInterval = setInterval(() => {
|
const pingInterval = setInterval(() => {
|
||||||
if (!connectionClosed && Date.now() - startTime < 60000) {
|
if (!connectionClosed && Date.now() - startTime < 5000) {
|
||||||
console.log('Sending ping...');
|
console.log('Sending ping...');
|
||||||
client.write('PING\n');
|
client.write('PING\n');
|
||||||
} else {
|
} else {
|
||||||
clearInterval(pingInterval);
|
clearInterval(pingInterval);
|
||||||
}
|
}
|
||||||
}, 10000); // Every 10 seconds
|
}, 1000); // Every 1 second
|
||||||
|
|
||||||
// Wait for 55 seconds (must complete within 60s runner timeout)
|
// Wait for 5 seconds — sufficient to verify the connection stays open
|
||||||
await new Promise(resolve => setTimeout(resolve, 55000));
|
await new Promise(resolve => setTimeout(resolve, 5000));
|
||||||
|
|
||||||
// Clean up interval
|
// Clean up interval
|
||||||
clearInterval(pingInterval);
|
clearInterval(pingInterval);
|
||||||
@@ -119,8 +126,8 @@ tap.test('should keep WebSocket-like connection open for extended period', async
|
|||||||
// Connection should still be open
|
// Connection should still be open
|
||||||
expect(connectionClosed).toEqual(false);
|
expect(connectionClosed).toEqual(false);
|
||||||
|
|
||||||
// Should have received responses (1 hello + 6 pings)
|
// Should have received responses (1 hello + ~5 pings)
|
||||||
expect(messagesReceived).toBeGreaterThan(5);
|
expect(messagesReceived).toBeGreaterThan(3);
|
||||||
|
|
||||||
// Close connection gracefully
|
// Close connection gracefully
|
||||||
client.end();
|
client.end();
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ import * as net from 'net';
|
|||||||
|
|
||||||
let smartProxyInstance: SmartProxy;
|
let smartProxyInstance: SmartProxy;
|
||||||
let echoServer: net.Server;
|
let echoServer: net.Server;
|
||||||
const echoServerPort = 9876;
|
const echoServerPort = 47300;
|
||||||
const proxyPort = 8080;
|
const proxyPort = 47301;
|
||||||
|
|
||||||
// Create an echo server for testing
|
// Create an echo server for testing
|
||||||
tap.test('should create echo server for testing', async () => {
|
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, () => {
|
echoServer.listen(echoServerPort, () => {
|
||||||
console.log(`Echo server listening on port ${echoServerPort}`);
|
console.log(`Echo server listening on port ${echoServerPort}`);
|
||||||
resolve();
|
resolve();
|
||||||
|
|||||||
@@ -5,19 +5,27 @@ import { SmartProxy } from '../ts/proxies/smart-proxy/smart-proxy.js';
|
|||||||
let echoServer: net.Server;
|
let echoServer: net.Server;
|
||||||
let proxy: SmartProxy;
|
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) => {
|
tap.test('port forwarding should not immediately close connections', async (tools) => {
|
||||||
// Set a timeout for this test
|
// Set a timeout for this test
|
||||||
tools.timeout(10000); // 10 seconds
|
tools.timeout(10000); // 10 seconds
|
||||||
// Create an echo server
|
// Create an echo server
|
||||||
echoServer = await new Promise<net.Server>((resolve) => {
|
echoServer = await new Promise<net.Server>((resolve, reject) => {
|
||||||
const server = net.createServer((socket) => {
|
const server = net.createServer((socket) => {
|
||||||
socket.on('data', (data) => {
|
socket.on('data', (data) => {
|
||||||
socket.write(`ECHO: ${data}`);
|
socket.write(`ECHO: ${data}`);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
server.listen(8888, () => {
|
server.on('error', (err) => {
|
||||||
console.log('Echo server listening on port 8888');
|
console.error(`Echo server error: ${err.message}`);
|
||||||
|
reject(err);
|
||||||
|
});
|
||||||
|
server.listen(ECHO_PORT, () => {
|
||||||
|
console.log(`Echo server listening on port ${ECHO_PORT}`);
|
||||||
resolve(server);
|
resolve(server);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -26,10 +34,10 @@ tap.test('port forwarding should not immediately close connections', async (tool
|
|||||||
proxy = new SmartProxy({
|
proxy = new SmartProxy({
|
||||||
routes: [{
|
routes: [{
|
||||||
name: 'test-forward',
|
name: 'test-forward',
|
||||||
match: { ports: 9999 },
|
match: { ports: PROXY_PORT_1 },
|
||||||
action: {
|
action: {
|
||||||
type: 'forward',
|
type: 'forward',
|
||||||
targets: [{ host: 'localhost', port: 8888 }]
|
targets: [{ host: 'localhost', port: ECHO_PORT }]
|
||||||
}
|
}
|
||||||
}]
|
}]
|
||||||
});
|
});
|
||||||
@@ -37,7 +45,7 @@ tap.test('port forwarding should not immediately close connections', async (tool
|
|||||||
await proxy.start();
|
await proxy.start();
|
||||||
|
|
||||||
// Test connection through proxy
|
// 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) => {
|
const result = await new Promise<string>((resolve, reject) => {
|
||||||
client.on('data', (data) => {
|
client.on('data', (data) => {
|
||||||
@@ -52,6 +60,9 @@ tap.test('port forwarding should not immediately close connections', async (tool
|
|||||||
});
|
});
|
||||||
|
|
||||||
expect(result).toEqual('ECHO: 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 () => {
|
tap.test('TLS passthrough should work correctly', async () => {
|
||||||
@@ -59,7 +70,7 @@ tap.test('TLS passthrough should work correctly', async () => {
|
|||||||
proxy = new SmartProxy({
|
proxy = new SmartProxy({
|
||||||
routes: [{
|
routes: [{
|
||||||
name: 'tls-test',
|
name: 'tls-test',
|
||||||
match: { ports: 8443, domains: 'test.example.com' },
|
match: { ports: PROXY_PORT_2, domains: 'test.example.com' },
|
||||||
action: {
|
action: {
|
||||||
type: 'forward',
|
type: 'forward',
|
||||||
tls: { mode: 'passthrough' },
|
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(() => {
|
export default tap.start();
|
||||||
// Force exit after tests complete
|
|
||||||
setTimeout(() => {
|
|
||||||
console.log('Forcing process exit');
|
|
||||||
process.exit(0);
|
|
||||||
}, 1000);
|
|
||||||
});
|
|
||||||
@@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@push.rocks/smartproxy',
|
name: '@push.rocks/smartproxy',
|
||||||
version: '23.1.3',
|
version: '23.1.4',
|
||||||
description: 'A powerful proxy package with unified route-based configuration for high traffic management. Features include SSL/TLS support, flexible routing patterns, WebSocket handling, advanced security options, and automatic ACME certificate management.'
|
description: 'A powerful proxy package with unified route-based configuration for high traffic management. Features include SSL/TLS support, flexible routing patterns, WebSocket handling, advanced security options, and automatic ACME certificate management.'
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user