@push.rocks/smartproxy 18.0.2 → 18.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartproxy',
|
|
6
|
-
version: '18.0
|
|
6
|
+
version: '18.1.0',
|
|
7
7
|
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.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLHFQQUFxUDtDQUNuUSxDQUFBIn0=
|
|
@@ -95,6 +95,7 @@ export class WebSocketHandler {
|
|
|
95
95
|
* Handle a new WebSocket connection
|
|
96
96
|
*/
|
|
97
97
|
handleWebSocketConnection(wsIncoming, req) {
|
|
98
|
+
this.logger.debug(`WebSocket connection initiated from ${req.headers.host}`);
|
|
98
99
|
try {
|
|
99
100
|
// Initialize heartbeat tracking
|
|
100
101
|
wsIncoming.isAlive = true;
|
|
@@ -185,6 +186,7 @@ export class WebSocketHandler {
|
|
|
185
186
|
host: selectedHost,
|
|
186
187
|
port: targetPort
|
|
187
188
|
};
|
|
189
|
+
this.logger.debug(`WebSocket destination resolved: ${selectedHost}:${targetPort}`);
|
|
188
190
|
}
|
|
189
191
|
catch (err) {
|
|
190
192
|
this.logger.error(`Error evaluating function-based target for WebSocket: ${err}`);
|
|
@@ -204,7 +206,10 @@ export class WebSocketHandler {
|
|
|
204
206
|
destination = this.connectionPool.getNextTarget(proxyConfig.destinationIps, proxyConfig.destinationPorts[0]);
|
|
205
207
|
}
|
|
206
208
|
// Build target URL with potential path rewriting
|
|
207
|
-
|
|
209
|
+
// Determine protocol based on the target's configuration
|
|
210
|
+
// For WebSocket connections, we use ws for HTTP backends and wss for HTTPS backends
|
|
211
|
+
const isTargetSecure = destination.port === 443;
|
|
212
|
+
const protocol = isTargetSecure ? 'wss' : 'ws';
|
|
208
213
|
let targetPath = req.url || '/';
|
|
209
214
|
// Apply path rewriting if configured
|
|
210
215
|
if (route?.action.websocket?.rewritePath) {
|
|
@@ -269,7 +274,12 @@ export class WebSocketHandler {
|
|
|
269
274
|
wsOptions.protocols = req.headers['sec-websocket-protocol'].split(',').map(p => p.trim());
|
|
270
275
|
}
|
|
271
276
|
// Create outgoing WebSocket connection
|
|
277
|
+
this.logger.debug(`Creating WebSocket connection to ${targetUrl} with options:`, {
|
|
278
|
+
headers: wsOptions.headers,
|
|
279
|
+
protocols: wsOptions.protocols
|
|
280
|
+
});
|
|
272
281
|
const wsOutgoing = new plugins.wsDefault(targetUrl, wsOptions);
|
|
282
|
+
this.logger.debug(`WebSocket instance created, waiting for connection...`);
|
|
273
283
|
// Handle connection errors
|
|
274
284
|
wsOutgoing.on('error', (err) => {
|
|
275
285
|
this.logger.error(`WebSocket target connection error: ${err.message}`);
|
|
@@ -279,6 +289,7 @@ export class WebSocketHandler {
|
|
|
279
289
|
});
|
|
280
290
|
// Handle outgoing connection open
|
|
281
291
|
wsOutgoing.on('open', () => {
|
|
292
|
+
this.logger.debug(`WebSocket target connection opened to ${targetUrl}`);
|
|
282
293
|
// Set up custom ping interval if configured
|
|
283
294
|
let pingInterval = null;
|
|
284
295
|
if (route?.action.websocket?.pingInterval && route.action.websocket.pingInterval > 0) {
|
|
@@ -319,6 +330,7 @@ export class WebSocketHandler {
|
|
|
319
330
|
const maxSize = route?.action.websocket?.maxPayloadSize || 0;
|
|
320
331
|
// Forward incoming messages to outgoing connection
|
|
321
332
|
wsIncoming.on('message', (data, isBinary) => {
|
|
333
|
+
this.logger.debug(`WebSocket forwarding message from client to target: ${data.toString()}`);
|
|
322
334
|
if (wsOutgoing.readyState === wsOutgoing.OPEN) {
|
|
323
335
|
// Check message size if limit is set
|
|
324
336
|
const messageSize = getMessageSize(data);
|
|
@@ -329,18 +341,27 @@ export class WebSocketHandler {
|
|
|
329
341
|
}
|
|
330
342
|
wsOutgoing.send(data, { binary: isBinary });
|
|
331
343
|
}
|
|
344
|
+
else {
|
|
345
|
+
this.logger.warn(`WebSocket target connection not open (state: ${wsOutgoing.readyState})`);
|
|
346
|
+
}
|
|
332
347
|
});
|
|
333
348
|
// Forward outgoing messages to incoming connection
|
|
334
349
|
wsOutgoing.on('message', (data, isBinary) => {
|
|
350
|
+
this.logger.debug(`WebSocket forwarding message from target to client: ${data.toString()}`);
|
|
335
351
|
if (wsIncoming.readyState === wsIncoming.OPEN) {
|
|
336
352
|
wsIncoming.send(data, { binary: isBinary });
|
|
337
353
|
}
|
|
354
|
+
else {
|
|
355
|
+
this.logger.warn(`WebSocket client connection not open (state: ${wsIncoming.readyState})`);
|
|
356
|
+
}
|
|
338
357
|
});
|
|
339
358
|
// Handle closing of connections
|
|
340
359
|
wsIncoming.on('close', (code, reason) => {
|
|
341
360
|
this.logger.debug(`WebSocket client connection closed: ${code} ${reason}`);
|
|
342
361
|
if (wsOutgoing.readyState === wsOutgoing.OPEN) {
|
|
343
|
-
|
|
362
|
+
const validCode = code || 1000;
|
|
363
|
+
const reasonString = toBuffer(reason).toString();
|
|
364
|
+
wsOutgoing.close(validCode, reasonString);
|
|
344
365
|
}
|
|
345
366
|
// Clean up timers
|
|
346
367
|
if (pingInterval)
|
|
@@ -351,7 +372,9 @@ export class WebSocketHandler {
|
|
|
351
372
|
wsOutgoing.on('close', (code, reason) => {
|
|
352
373
|
this.logger.debug(`WebSocket target connection closed: ${code} ${reason}`);
|
|
353
374
|
if (wsIncoming.readyState === wsIncoming.OPEN) {
|
|
354
|
-
|
|
375
|
+
const validCode = code || 1000;
|
|
376
|
+
const reasonString = toBuffer(reason).toString();
|
|
377
|
+
wsIncoming.close(validCode, reasonString);
|
|
355
378
|
}
|
|
356
379
|
// Clean up timers
|
|
357
380
|
if (pingInterval)
|
|
@@ -403,4 +426,4 @@ export class WebSocketHandler {
|
|
|
403
426
|
}
|
|
404
427
|
}
|
|
405
428
|
}
|
|
406
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"websocket-handler.js","sourceRoot":"","sources":["../../../ts/proxies/network-proxy/websocket-handler.ts"],"names":[],"mappings":"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"}
|
|
429
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"websocket-handler.js","sourceRoot":"","sources":["../../../ts/proxies/network-proxy/websocket-handler.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartproxy",
|
|
3
|
-
"version": "18.0
|
|
3
|
+
"version": "18.1.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"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.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
@@ -9,9 +9,9 @@
|
|
|
9
9
|
"author": "Lossless GmbH",
|
|
10
10
|
"license": "MIT",
|
|
11
11
|
"devDependencies": {
|
|
12
|
-
"@git.zone/tsbuild": "^2.5.
|
|
12
|
+
"@git.zone/tsbuild": "^2.5.1",
|
|
13
13
|
"@git.zone/tsrun": "^1.2.44",
|
|
14
|
-
"@git.zone/tstest": "^1.0
|
|
14
|
+
"@git.zone/tstest": "^1.2.0",
|
|
15
15
|
"@push.rocks/tapbundle": "^6.0.3",
|
|
16
16
|
"@types/node": "^22.15.18",
|
|
17
17
|
"typescript": "^5.8.3"
|
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
"url": "https://code.foss.global/push.rocks/smartproxy/issues"
|
|
74
74
|
},
|
|
75
75
|
"scripts": {
|
|
76
|
-
"test": "(tstest test
|
|
76
|
+
"test": "(tstest test/**/test*.ts --verbose)",
|
|
77
77
|
"build": "(tsbuild tsfolders --allowimplicitany)",
|
|
78
78
|
"format": "(gitzone format)",
|
|
79
79
|
"buildDocs": "tsdoc"
|
package/readme.md
CHANGED
|
@@ -9,6 +9,7 @@ A unified high-performance proxy toolkit for Node.js, with **SmartProxy** as the
|
|
|
9
9
|
- **Multiple Action Types**: Forward (with TLS modes), redirect, or block traffic
|
|
10
10
|
- **Dynamic Port Management**: Add or remove listening ports at runtime without restart
|
|
11
11
|
- **Security Features**: IP allowlists, connection limits, timeouts, and more
|
|
12
|
+
- **NFTables Integration**: High-performance kernel-level packet forwarding with Linux NFTables
|
|
12
13
|
|
|
13
14
|
## Project Architecture Overview
|
|
14
15
|
|
|
@@ -71,6 +72,8 @@ SmartProxy has been restructured using a modern, modular architecture with a uni
|
|
|
71
72
|
Helper functions for common redirect and security configurations
|
|
72
73
|
- **createLoadBalancerRoute**, **createHttpsServer**
|
|
73
74
|
Helper functions for complex configurations
|
|
75
|
+
- **createNfTablesRoute**, **createNfTablesTerminateRoute**
|
|
76
|
+
Helper functions for NFTables-based high-performance kernel-level routing
|
|
74
77
|
|
|
75
78
|
### Specialized Components
|
|
76
79
|
|
|
@@ -108,7 +111,7 @@ npm install @push.rocks/smartproxy
|
|
|
108
111
|
|
|
109
112
|
## Quick Start with SmartProxy
|
|
110
113
|
|
|
111
|
-
SmartProxy
|
|
114
|
+
SmartProxy v18.0.0 continues the evolution of the unified route-based configuration system making your proxy setup more flexible and intuitive with improved helper functions and NFTables integration for high-performance kernel-level routing.
|
|
112
115
|
|
|
113
116
|
```typescript
|
|
114
117
|
import {
|
|
@@ -122,7 +125,9 @@ import {
|
|
|
122
125
|
createStaticFileRoute,
|
|
123
126
|
createApiRoute,
|
|
124
127
|
createWebSocketRoute,
|
|
125
|
-
createSecurityConfig
|
|
128
|
+
createSecurityConfig,
|
|
129
|
+
createNfTablesRoute,
|
|
130
|
+
createNfTablesTerminateRoute
|
|
126
131
|
} from '@push.rocks/smartproxy';
|
|
127
132
|
|
|
128
133
|
// Create a new SmartProxy instance with route-based configuration
|
|
@@ -185,7 +190,22 @@ const proxy = new SmartProxy({
|
|
|
185
190
|
maxConnections: 1000
|
|
186
191
|
})
|
|
187
192
|
}
|
|
188
|
-
)
|
|
193
|
+
),
|
|
194
|
+
|
|
195
|
+
// High-performance NFTables route (requires root/sudo)
|
|
196
|
+
createNfTablesRoute('fast.example.com', { host: 'backend-server', port: 8080 }, {
|
|
197
|
+
ports: 80,
|
|
198
|
+
protocol: 'tcp',
|
|
199
|
+
preserveSourceIP: true,
|
|
200
|
+
ipAllowList: ['10.0.0.*']
|
|
201
|
+
}),
|
|
202
|
+
|
|
203
|
+
// NFTables HTTPS termination for ultra-fast TLS handling
|
|
204
|
+
createNfTablesTerminateRoute('secure-fast.example.com', { host: 'backend-ssl', port: 443 }, {
|
|
205
|
+
ports: 443,
|
|
206
|
+
certificate: 'auto',
|
|
207
|
+
maxRate: '100mbps'
|
|
208
|
+
})
|
|
189
209
|
],
|
|
190
210
|
|
|
191
211
|
// Global settings that apply to all routes
|
|
@@ -319,6 +339,12 @@ interface IRouteAction {
|
|
|
319
339
|
|
|
320
340
|
// Advanced options
|
|
321
341
|
advanced?: IRouteAdvanced;
|
|
342
|
+
|
|
343
|
+
// Forwarding engine selection
|
|
344
|
+
forwardingEngine?: 'node' | 'nftables';
|
|
345
|
+
|
|
346
|
+
// NFTables-specific options
|
|
347
|
+
nftables?: INfTablesOptions;
|
|
322
348
|
}
|
|
323
349
|
```
|
|
324
350
|
|
|
@@ -349,6 +375,25 @@ interface IRouteTls {
|
|
|
349
375
|
- **terminate:** Terminate TLS and forward as HTTP
|
|
350
376
|
- **terminate-and-reencrypt:** Terminate TLS and create a new TLS connection to the backend
|
|
351
377
|
|
|
378
|
+
**Forwarding Engine:**
|
|
379
|
+
When `forwardingEngine` is specified, it determines how packets are forwarded:
|
|
380
|
+
- **node:** (default) Application-level forwarding using Node.js
|
|
381
|
+
- **nftables:** Kernel-level forwarding using Linux NFTables (requires root privileges)
|
|
382
|
+
|
|
383
|
+
**NFTables Options:**
|
|
384
|
+
When using `forwardingEngine: 'nftables'`, you can configure:
|
|
385
|
+
```typescript
|
|
386
|
+
interface INfTablesOptions {
|
|
387
|
+
protocol?: 'tcp' | 'udp' | 'all';
|
|
388
|
+
preserveSourceIP?: boolean;
|
|
389
|
+
maxRate?: string; // Rate limiting (e.g., '100mbps')
|
|
390
|
+
priority?: number; // QoS priority
|
|
391
|
+
tableName?: string; // Custom NFTables table name
|
|
392
|
+
useIPSets?: boolean; // Use IP sets for performance
|
|
393
|
+
useAdvancedNAT?: boolean; // Use connection tracking
|
|
394
|
+
}
|
|
395
|
+
```
|
|
396
|
+
|
|
352
397
|
**Redirect Action:**
|
|
353
398
|
When `type: 'redirect'`, the client is redirected:
|
|
354
399
|
```typescript
|
|
@@ -459,6 +504,35 @@ Routes with higher priority values are matched first, allowing you to create spe
|
|
|
459
504
|
priority: 100,
|
|
460
505
|
tags: ['api', 'secure', 'internal']
|
|
461
506
|
}
|
|
507
|
+
|
|
508
|
+
// Example with NFTables forwarding engine
|
|
509
|
+
{
|
|
510
|
+
match: {
|
|
511
|
+
ports: [80, 443],
|
|
512
|
+
domains: 'high-traffic.example.com'
|
|
513
|
+
},
|
|
514
|
+
action: {
|
|
515
|
+
type: 'forward',
|
|
516
|
+
target: {
|
|
517
|
+
host: 'backend-server',
|
|
518
|
+
port: 8080
|
|
519
|
+
},
|
|
520
|
+
forwardingEngine: 'nftables', // Use kernel-level forwarding
|
|
521
|
+
nftables: {
|
|
522
|
+
protocol: 'tcp',
|
|
523
|
+
preserveSourceIP: true,
|
|
524
|
+
maxRate: '1gbps',
|
|
525
|
+
useIPSets: true
|
|
526
|
+
},
|
|
527
|
+
security: {
|
|
528
|
+
ipAllowList: ['10.0.0.*'],
|
|
529
|
+
blockedIps: ['malicious.ip.range.*']
|
|
530
|
+
}
|
|
531
|
+
},
|
|
532
|
+
name: 'High Performance NFTables Route',
|
|
533
|
+
description: 'Kernel-level forwarding for maximum performance',
|
|
534
|
+
priority: 150
|
|
535
|
+
}
|
|
462
536
|
```
|
|
463
537
|
|
|
464
538
|
### Using Helper Functions
|
|
@@ -489,6 +563,8 @@ Available helper functions:
|
|
|
489
563
|
- `createStaticFileRoute()` - Create a route for serving static files
|
|
490
564
|
- `createApiRoute()` - Create an API route with path matching and CORS support
|
|
491
565
|
- `createWebSocketRoute()` - Create a route for WebSocket connections
|
|
566
|
+
- `createNfTablesRoute()` - Create a high-performance NFTables route
|
|
567
|
+
- `createNfTablesTerminateRoute()` - Create an NFTables route with TLS termination
|
|
492
568
|
- `createPortRange()` - Helper to create port range configurations
|
|
493
569
|
- `createSecurityConfig()` - Helper to create security configuration objects
|
|
494
570
|
- `createBlockRoute()` - Create a route to block specific traffic
|
|
@@ -589,6 +665,16 @@ Available helper functions:
|
|
|
589
665
|
await proxy.removeListeningPort(8081);
|
|
590
666
|
```
|
|
591
667
|
|
|
668
|
+
9. **High-Performance NFTables Routing**
|
|
669
|
+
```typescript
|
|
670
|
+
// Use kernel-level packet forwarding for maximum performance
|
|
671
|
+
createNfTablesRoute('high-traffic.example.com', { host: 'backend', port: 8080 }, {
|
|
672
|
+
ports: 80,
|
|
673
|
+
preserveSourceIP: true,
|
|
674
|
+
maxRate: '1gbps'
|
|
675
|
+
})
|
|
676
|
+
```
|
|
677
|
+
|
|
592
678
|
## Other Components
|
|
593
679
|
|
|
594
680
|
While SmartProxy provides a unified API for most needs, you can also use individual components:
|
|
@@ -694,16 +780,137 @@ const redirect = new SslRedirect(80);
|
|
|
694
780
|
await redirect.start();
|
|
695
781
|
```
|
|
696
782
|
|
|
697
|
-
##
|
|
783
|
+
## NFTables Integration
|
|
784
|
+
|
|
785
|
+
SmartProxy v18.0.0 includes full integration with Linux NFTables for high-performance kernel-level packet forwarding. NFTables operates directly in the Linux kernel, providing much better performance than user-space proxying for high-traffic scenarios.
|
|
786
|
+
|
|
787
|
+
### When to Use NFTables
|
|
788
|
+
|
|
789
|
+
NFTables routing is ideal for:
|
|
790
|
+
- High-traffic TCP/UDP forwarding where performance is critical
|
|
791
|
+
- Port forwarding scenarios where you need minimal latency
|
|
792
|
+
- Load balancing across multiple backend servers
|
|
793
|
+
- Security filtering with IP allowlists/blocklists at kernel level
|
|
794
|
+
|
|
795
|
+
### Requirements
|
|
796
|
+
|
|
797
|
+
NFTables support requires:
|
|
798
|
+
- Linux operating system with NFTables installed
|
|
799
|
+
- Root or sudo permissions to configure NFTables rules
|
|
800
|
+
- NFTables kernel modules loaded
|
|
801
|
+
|
|
802
|
+
### NFTables Route Configuration
|
|
803
|
+
|
|
804
|
+
Use the NFTables helper functions to create high-performance routes:
|
|
805
|
+
|
|
806
|
+
```typescript
|
|
807
|
+
import { SmartProxy, createNfTablesRoute, createNfTablesTerminateRoute } from '@push.rocks/smartproxy';
|
|
808
|
+
|
|
809
|
+
const proxy = new SmartProxy({
|
|
810
|
+
routes: [
|
|
811
|
+
// Basic TCP forwarding with NFTables
|
|
812
|
+
createNfTablesRoute('tcp-forward', {
|
|
813
|
+
host: 'backend-server',
|
|
814
|
+
port: 8080
|
|
815
|
+
}, {
|
|
816
|
+
ports: 80,
|
|
817
|
+
protocol: 'tcp'
|
|
818
|
+
}),
|
|
819
|
+
|
|
820
|
+
// NFTables with IP filtering
|
|
821
|
+
createNfTablesRoute('secure-tcp', {
|
|
822
|
+
host: 'secure-backend',
|
|
823
|
+
port: 8443
|
|
824
|
+
}, {
|
|
825
|
+
ports: 443,
|
|
826
|
+
ipAllowList: ['10.0.0.*', '192.168.1.*'],
|
|
827
|
+
preserveSourceIP: true
|
|
828
|
+
}),
|
|
829
|
+
|
|
830
|
+
// NFTables with QoS (rate limiting)
|
|
831
|
+
createNfTablesRoute('limited-service', {
|
|
832
|
+
host: 'api-server',
|
|
833
|
+
port: 3000
|
|
834
|
+
}, {
|
|
835
|
+
ports: 8080,
|
|
836
|
+
maxRate: '50mbps',
|
|
837
|
+
priority: 1
|
|
838
|
+
}),
|
|
839
|
+
|
|
840
|
+
// NFTables TLS termination
|
|
841
|
+
createNfTablesTerminateRoute('https-nftables', {
|
|
842
|
+
host: 'backend',
|
|
843
|
+
port: 8080
|
|
844
|
+
}, {
|
|
845
|
+
ports: 443,
|
|
846
|
+
certificate: 'auto',
|
|
847
|
+
useAdvancedNAT: true
|
|
848
|
+
})
|
|
849
|
+
]
|
|
850
|
+
});
|
|
851
|
+
|
|
852
|
+
await proxy.start();
|
|
853
|
+
```
|
|
854
|
+
|
|
855
|
+
### NFTables Route Options
|
|
856
|
+
|
|
857
|
+
The NFTables integration supports these options:
|
|
858
|
+
|
|
859
|
+
- `protocol`: 'tcp' | 'udp' | 'all' - Protocol to forward
|
|
860
|
+
- `preserveSourceIP`: boolean - Preserve client IP for backend
|
|
861
|
+
- `ipAllowList`: string[] - Allow only these IPs (glob patterns)
|
|
862
|
+
- `ipBlockList`: string[] - Block these IPs (glob patterns)
|
|
863
|
+
- `maxRate`: string - Rate limit (e.g., '100mbps', '1gbps')
|
|
864
|
+
- `priority`: number - QoS priority level
|
|
865
|
+
- `tableName`: string - Custom NFTables table name
|
|
866
|
+
- `useIPSets`: boolean - Use IP sets for better performance
|
|
867
|
+
- `useAdvancedNAT`: boolean - Enable connection tracking
|
|
868
|
+
|
|
869
|
+
### NFTables Status Monitoring
|
|
870
|
+
|
|
871
|
+
You can monitor the status of NFTables rules:
|
|
872
|
+
|
|
873
|
+
```typescript
|
|
874
|
+
// Get status of all NFTables rules
|
|
875
|
+
const nftStatus = await proxy.getNfTablesStatus();
|
|
876
|
+
|
|
877
|
+
// Status includes:
|
|
878
|
+
// - active: boolean
|
|
879
|
+
// - ruleCount: { total, added, removed }
|
|
880
|
+
// - packetStats: { forwarded, dropped }
|
|
881
|
+
// - lastUpdate: Date
|
|
882
|
+
```
|
|
883
|
+
|
|
884
|
+
### Performance Considerations
|
|
885
|
+
|
|
886
|
+
NFTables provides significantly better performance than application-level proxying:
|
|
887
|
+
- Operates at kernel level with minimal overhead
|
|
888
|
+
- Can handle millions of packets per second
|
|
889
|
+
- Direct packet forwarding without copying to userspace
|
|
890
|
+
- Hardware offload support on compatible network cards
|
|
891
|
+
|
|
892
|
+
### Limitations
|
|
698
893
|
|
|
699
|
-
|
|
894
|
+
NFTables routing has some limitations:
|
|
895
|
+
- Cannot modify HTTP headers or content
|
|
896
|
+
- Limited to basic NAT and forwarding operations
|
|
897
|
+
- Requires root permissions
|
|
898
|
+
- Linux-only (not available on Windows/macOS)
|
|
899
|
+
- No WebSocket message inspection
|
|
900
|
+
|
|
901
|
+
For scenarios requiring application-level features (header manipulation, WebSocket handling, etc.), use the standard SmartProxy routes without NFTables.
|
|
902
|
+
|
|
903
|
+
## Migration to v18.0.0
|
|
904
|
+
|
|
905
|
+
Version 18.0.0 continues the evolution with NFTables integration while maintaining the unified route-based configuration system:
|
|
700
906
|
|
|
701
907
|
### Key Changes
|
|
702
908
|
|
|
703
|
-
1. **
|
|
704
|
-
2. **
|
|
705
|
-
3. **
|
|
706
|
-
4. **
|
|
909
|
+
1. **NFTables Integration**: High-performance kernel-level packet forwarding for Linux systems
|
|
910
|
+
2. **Pure Route-Based API**: The configuration now exclusively uses the match/action pattern with no legacy interfaces
|
|
911
|
+
3. **Improved Helper Functions**: Enhanced helper functions with cleaner parameter signatures
|
|
912
|
+
4. **Removed Legacy Support**: Legacy domain-based APIs have been completely removed
|
|
913
|
+
5. **More Route Pattern Helpers**: Additional helper functions for common routing patterns including NFTables routes
|
|
707
914
|
|
|
708
915
|
### Migration Example
|
|
709
916
|
|
|
@@ -723,7 +930,7 @@ const proxy = new SmartProxy({
|
|
|
723
930
|
});
|
|
724
931
|
```
|
|
725
932
|
|
|
726
|
-
**Current Configuration (
|
|
933
|
+
**Current Configuration (v18.0.0)**:
|
|
727
934
|
```typescript
|
|
728
935
|
import { SmartProxy, createHttpsTerminateRoute } from '@push.rocks/smartproxy';
|
|
729
936
|
|
|
@@ -1212,6 +1419,13 @@ NetworkProxy now supports full route-based configuration including:
|
|
|
1212
1419
|
- Use higher priority for block routes to ensure they take precedence
|
|
1213
1420
|
- Enable `enableDetailedLogging` or `enableTlsDebugLogging` for debugging
|
|
1214
1421
|
|
|
1422
|
+
### NFTables Integration
|
|
1423
|
+
- Ensure NFTables is installed: `apt install nftables` or `yum install nftables`
|
|
1424
|
+
- Verify root/sudo permissions for NFTables operations
|
|
1425
|
+
- Check NFTables service is running: `systemctl status nftables`
|
|
1426
|
+
- For debugging, check the NFTables rules: `nft list ruleset`
|
|
1427
|
+
- Monitor NFTables rule status: `await proxy.getNfTablesStatus()`
|
|
1428
|
+
|
|
1215
1429
|
### TLS/Certificates
|
|
1216
1430
|
- For certificate issues, check the ACME settings and domain validation
|
|
1217
1431
|
- Ensure domains are publicly accessible for Let's Encrypt validation
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartproxy',
|
|
6
|
-
version: '18.0
|
|
6
|
+
version: '18.1.0',
|
|
7
7
|
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.'
|
|
8
8
|
}
|
|
@@ -115,6 +115,8 @@ export class WebSocketHandler {
|
|
|
115
115
|
* Handle a new WebSocket connection
|
|
116
116
|
*/
|
|
117
117
|
private handleWebSocketConnection(wsIncoming: IWebSocketWithHeartbeat, req: plugins.http.IncomingMessage): void {
|
|
118
|
+
this.logger.debug(`WebSocket connection initiated from ${req.headers.host}`);
|
|
119
|
+
|
|
118
120
|
try {
|
|
119
121
|
// Initialize heartbeat tracking
|
|
120
122
|
wsIncoming.isAlive = true;
|
|
@@ -217,6 +219,8 @@ export class WebSocketHandler {
|
|
|
217
219
|
host: selectedHost,
|
|
218
220
|
port: targetPort
|
|
219
221
|
};
|
|
222
|
+
|
|
223
|
+
this.logger.debug(`WebSocket destination resolved: ${selectedHost}:${targetPort}`);
|
|
220
224
|
} catch (err) {
|
|
221
225
|
this.logger.error(`Error evaluating function-based target for WebSocket: ${err}`);
|
|
222
226
|
wsIncoming.close(1011, 'Internal server error');
|
|
@@ -240,7 +244,10 @@ export class WebSocketHandler {
|
|
|
240
244
|
}
|
|
241
245
|
|
|
242
246
|
// Build target URL with potential path rewriting
|
|
243
|
-
|
|
247
|
+
// Determine protocol based on the target's configuration
|
|
248
|
+
// For WebSocket connections, we use ws for HTTP backends and wss for HTTPS backends
|
|
249
|
+
const isTargetSecure = destination.port === 443;
|
|
250
|
+
const protocol = isTargetSecure ? 'wss' : 'ws';
|
|
244
251
|
let targetPath = req.url || '/';
|
|
245
252
|
|
|
246
253
|
// Apply path rewriting if configured
|
|
@@ -319,7 +326,12 @@ export class WebSocketHandler {
|
|
|
319
326
|
}
|
|
320
327
|
|
|
321
328
|
// Create outgoing WebSocket connection
|
|
329
|
+
this.logger.debug(`Creating WebSocket connection to ${targetUrl} with options:`, {
|
|
330
|
+
headers: wsOptions.headers,
|
|
331
|
+
protocols: wsOptions.protocols
|
|
332
|
+
});
|
|
322
333
|
const wsOutgoing = new plugins.wsDefault(targetUrl, wsOptions);
|
|
334
|
+
this.logger.debug(`WebSocket instance created, waiting for connection...`);
|
|
323
335
|
|
|
324
336
|
// Handle connection errors
|
|
325
337
|
wsOutgoing.on('error', (err) => {
|
|
@@ -331,6 +343,7 @@ export class WebSocketHandler {
|
|
|
331
343
|
|
|
332
344
|
// Handle outgoing connection open
|
|
333
345
|
wsOutgoing.on('open', () => {
|
|
346
|
+
this.logger.debug(`WebSocket target connection opened to ${targetUrl}`);
|
|
334
347
|
// Set up custom ping interval if configured
|
|
335
348
|
let pingInterval: NodeJS.Timeout | null = null;
|
|
336
349
|
if (route?.action.websocket?.pingInterval && route.action.websocket.pingInterval > 0) {
|
|
@@ -376,6 +389,7 @@ export class WebSocketHandler {
|
|
|
376
389
|
|
|
377
390
|
// Forward incoming messages to outgoing connection
|
|
378
391
|
wsIncoming.on('message', (data, isBinary) => {
|
|
392
|
+
this.logger.debug(`WebSocket forwarding message from client to target: ${data.toString()}`);
|
|
379
393
|
if (wsOutgoing.readyState === wsOutgoing.OPEN) {
|
|
380
394
|
// Check message size if limit is set
|
|
381
395
|
const messageSize = getMessageSize(data);
|
|
@@ -386,13 +400,18 @@ export class WebSocketHandler {
|
|
|
386
400
|
}
|
|
387
401
|
|
|
388
402
|
wsOutgoing.send(data, { binary: isBinary });
|
|
403
|
+
} else {
|
|
404
|
+
this.logger.warn(`WebSocket target connection not open (state: ${wsOutgoing.readyState})`);
|
|
389
405
|
}
|
|
390
406
|
});
|
|
391
407
|
|
|
392
408
|
// Forward outgoing messages to incoming connection
|
|
393
409
|
wsOutgoing.on('message', (data, isBinary) => {
|
|
410
|
+
this.logger.debug(`WebSocket forwarding message from target to client: ${data.toString()}`);
|
|
394
411
|
if (wsIncoming.readyState === wsIncoming.OPEN) {
|
|
395
412
|
wsIncoming.send(data, { binary: isBinary });
|
|
413
|
+
} else {
|
|
414
|
+
this.logger.warn(`WebSocket client connection not open (state: ${wsIncoming.readyState})`);
|
|
396
415
|
}
|
|
397
416
|
});
|
|
398
417
|
|
|
@@ -400,7 +419,9 @@ export class WebSocketHandler {
|
|
|
400
419
|
wsIncoming.on('close', (code, reason) => {
|
|
401
420
|
this.logger.debug(`WebSocket client connection closed: ${code} ${reason}`);
|
|
402
421
|
if (wsOutgoing.readyState === wsOutgoing.OPEN) {
|
|
403
|
-
|
|
422
|
+
const validCode = code || 1000;
|
|
423
|
+
const reasonString = toBuffer(reason).toString();
|
|
424
|
+
wsOutgoing.close(validCode, reasonString);
|
|
404
425
|
}
|
|
405
426
|
|
|
406
427
|
// Clean up timers
|
|
@@ -411,7 +432,9 @@ export class WebSocketHandler {
|
|
|
411
432
|
wsOutgoing.on('close', (code, reason) => {
|
|
412
433
|
this.logger.debug(`WebSocket target connection closed: ${code} ${reason}`);
|
|
413
434
|
if (wsIncoming.readyState === wsIncoming.OPEN) {
|
|
414
|
-
|
|
435
|
+
const validCode = code || 1000;
|
|
436
|
+
const reasonString = toBuffer(reason).toString();
|
|
437
|
+
wsIncoming.close(validCode, reasonString);
|
|
415
438
|
}
|
|
416
439
|
|
|
417
440
|
// Clean up timers
|