push.rocks/smartproxy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(smartproxy): Improve port binding intelligence and ACME challenge route management; update route configuration tests and dependency versions.

Browse Source
This commit is contained in:
Philipp Kunz 2025-05-28 19:58:28 +00:00
parent 4ebaf6c061
commit 742adc2bd9
17 changed files with 948 additions and 1258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
changelog.md
View File

@ -1,5 +1,15 @@
# Changelog
## 2025-05-28 - 19.4.3 - fix(smartproxy)
Improve port binding intelligence and ACME challenge route management; update route configuration tests and dependency versions.
- Bumped dev dependency versions in package.json (tsbuild from ^2.5.1 to ^2.6.4, tstest from ^1.9.0 to ^2.3.1, @types/node updated, smartfile from ^11.2.0 to ^11.2.5, smartlog from ^3.1.7 to ^3.1.8)
- Removed readme.plan.md containing legacy development plan information
- Normalized route configuration properties across tests (using 'ports' and 'domains' instead of legacy 'port' or 'domain')
- Enhanced PortManager with reference counting and smarter port conflict detection to avoid redundant bindings
- Refined ACME challenge route integration to merge with existing port bindings and improve error handling
- Adjusted test expectations (e.g. using toEqual instead of toBe, and improved timeout handling) to align with current API changes
## 2025-05-20 - 19.4.2 - fix(dependencies)
Update dependency versions: upgrade @types/node to ^22.15.20 and @push.rocks/smartlog to ^3.1.7 in package.json

10
package.json
View File

@ -15,10 +15,10 @@
"buildDocs": "tsdoc"
},
"devDependencies": {
"@git.zone/tsbuild": "^2.5.1",
"@git.zone/tsbuild": "^2.6.4",
"@git.zone/tsrun": "^1.2.44",
"@git.zone/tstest": "^1.9.0",
"@types/node": "^22.15.20",
"@git.zone/tstest": "^2.3.1",
"@types/node": "^22.15.24",
"typescript": "^5.8.3"
},
"dependencies": {
@ -26,8 +26,8 @@
"@push.rocks/smartacme": "^8.0.0",
"@push.rocks/smartcrypto": "^2.0.4",
"@push.rocks/smartdelay": "^3.0.5",
"@push.rocks/smartfile": "^11.2.0",
"@push.rocks/smartlog": "^3.1.7",
"@push.rocks/smartfile": "^11.2.5",
"@push.rocks/smartlog": "^3.1.8",
"@push.rocks/smartnetwork": "^4.0.2",
"@push.rocks/smartpromise": "^4.2.3",
"@push.rocks/smartrequest": "^2.1.0",

1617
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff

384
readme.plan.md
View File

@ -1,384 +0,0 @@
# SmartProxy Development Plan
## ACME Route Port Binding Intelligence Improvement
### Problem Statement
Currently, SmartProxy has an issue with port binding conflicts between regular routes and ACME challenge routes. While SmartProxy is designed to support multiple routes sharing the same port (differentiated by host, path, etc.), there's a specific conflict when adding ACME challenge routes to a port that is already in use by other routes.
This results in the error: `Port 80 is already in use for ACME challenges` when SmartProxy tries to bind the ACME challenge route to a port that it's already using.
### Root Cause Analysis
1. **Double Binding Attempt**: SmartProxy tries to bind to port 80 twice - once for application routes and once for ACME challenge routes.
2. **Overlapping Route Updates**: When adding a challenge route, it triggers a port binding operation without checking if the port is already bound.
3. **Naive Error Handling**: The code detects EADDRINUSE but doesn't distinguish between external conflicts and internal conflicts.
4. **Port Binding Semantics**: The port manager doesn't recognize that a port already bound by SmartProxy can be reused for additional routes.
### Solution Architecture
We need a more intelligent approach to port binding that understands when a port can be shared between routes vs. when a new binding is needed:
1. **Port Binding Awareness**: Track what ports are already bound by SmartProxy itself.
2. **Smart Route Updates**: Only attempt to bind to ports that aren't already bound by SmartProxy.
3. **Route Merging Logic**: When adding ACME challenge routes, merge them with existing routes on the same ports.
4. **Dynamic Port Management**: Release port bindings when no routes are using them and rebind when needed.
5. **Improved Error Recovery**: Handle port conflicts gracefully, with distinct handling for internal vs. external conflicts.
### Implementation Plan
#### Phase 1: Improve Port Manager Intelligence
- [x] Enhance `PortManager` to distinguish between ports that need new bindings vs ports that can reuse existing bindings
- [x] Add an internal tracking mechanism to detect when a requested port is already bound internally
- [x] Modify port addition logic to skip binding operations for ports already bound by SmartProxy
- [x] Implement reference counting for port bindings to track how many routes use each port
- [x] Add logic to release port bindings when no routes are using them anymore
- [x] Update error handling to provide more context for port binding failures
#### Phase 2: Refine ACME Challenge Route Integration
- [x] Modify `addChallengeRoute()` to check if the port is already in use by SmartProxy
- [x] Ensure route updates don't trigger unnecessary port binding operations
- [x] Implement a merging strategy for ACME routes with existing routes on the same port
- [x] Add diagnostic logging to track route and port binding relationships
#### Phase 3: Enhance Proxy Route Management
- [x] Restructure route update process to group routes by port
- [x] Implement a more efficient route update mechanism that minimizes port binding operations
- [x] Develop port lifecycle management to track usage across route changes
- [x] Add validation to detect potential binding conflicts before attempting operations
- [ ] Create a proper route dependency graph to understand the relationships between routes
- [x] Implement efficient detection of "orphaned" ports that no longer have associated routes
#### Phase 4: Improve Error Handling and Recovery
- [x] Enhance error messages to be more specific about the nature of port conflicts
- [x] Add recovery mechanisms for common port binding scenarios
- [ ] Implement a fallback port selection strategy for ACME challenges
- [x] Create a more robust validation system to catch issues before they cause runtime errors
### Detailed Technical Tasks
#### Phase 1: Improve Port Manager Intelligence
1. Modify `/ts/proxies/smart-proxy/port-manager.ts`:
- Add a new method `isPortBoundBySmartProxy(port: number): boolean`
- Refactor `addPort()` to check if the port is already bound
- Update `updatePorts()` to be more intelligent about which ports need binding
- Add reference counting for port usage
2. Implement Port Reference Counting:
```typescript
// Add to PortManager class
private portRefCounts: Map<number, number> = new Map();
public incrementPortRefCount(port: number): void {
const currentCount = this.portRefCounts.get(port) || 0;
this.portRefCounts.set(port, currentCount + 1);
logger.log('debug', `Port ${port} reference count increased to ${currentCount + 1}`, { port, refCount: currentCount + 1 });
}
public decrementPortRefCount(port: number): number {
const currentCount = this.portRefCounts.get(port) || 0;
if (currentCount <= 0) {
logger.log('warn', `Attempted to decrement reference count for port ${port} below zero`, { port });
return 0;
}
const newCount = currentCount - 1;
this.portRefCounts.set(port, newCount);
logger.log('debug', `Port ${port} reference count decreased to ${newCount}`, { port, refCount: newCount });
return newCount;
}
public getPortRefCount(port: number): number {
return this.portRefCounts.get(port) || 0;
}
```
3. Port Binding Logic Enhancements:
```typescript
public async addPort(port: number): Promise<void> {
// If already bound by this instance, just increment ref count and return
if (this.servers.has(port)) {
this.incrementPortRefCount(port);
logger.log('debug', `Port ${port} is already bound by SmartProxy, reusing binding`, { port });
return;
}
// Initialize ref count for new port
this.portRefCounts.set(port, 1);
// Continue with normal binding...
}
public async removePort(port: number): Promise<void> {
// Decrement reference count
const newCount = this.decrementPortRefCount(port);
// If port is still in use by other routes, keep it
if (newCount > 0) {
logger.log('debug', `Port ${port} still in use by ${newCount} routes, keeping binding open`, { port, refCount: newCount });
return;
}
// No more references, can actually close the port
const server = this.servers.get(port);
if (!server) {
logger.log('warn', `Port ${port} not found in servers map`, { port });
return;
}
// Continue with normal unbinding logic...
}
```
4. Add Smarter Port Conflict Detection:
```typescript
private isPortConflict(error: any): { isConflict: boolean; isExternal: boolean } {
if (error.code !== 'EADDRINUSE') {
return { isConflict: false, isExternal: false };
}
// Check if we already have this port
const isBoundInternally = this.servers.has(Number(error.port));
return { isConflict: true, isExternal: !isBoundInternally };
}
```
#### Phase 2: Refine ACME Challenge Route Integration
1. Modify `/ts/proxies/smart-proxy/certificate-manager.ts`:
- Enhance `addChallengeRoute()` to be aware of existing port bindings
- Add port verification before attempting to add challenge routes
2. Smart Route Merging Logic:
```typescript
private async addChallengeRoute(): Promise<void> {
// Check if route is already active
if (this.challengeRouteActive) {
return;
}
// Create challenge route
const challengeRoute = this.challengeRoute;
const challengePort = this.globalAcmeDefaults?.port || 80;
// Check if port is already in use by another route
const portAlreadyUsed = this.routes.some(r =>
Array.isArray(r.match.ports)
? r.match.ports.includes(challengePort)
: r.match.ports === challengePort
);
if (portAlreadyUsed) {
logger.log('info', `Port ${challengePort} is already used by an existing route, merging ACME challenge route`);
}
// Continue with route update...
}
```
3. Update Route Manager Communication:
```typescript
// Add this method to smart-proxy.ts
private async addRouteWithoutRebinding(route: IRouteConfig): Promise<void> {
// Add route to configuration without triggering a port rebind
this.settings.routes.push(route);
this.routeManager.updateRoutes(this.settings.routes);
// Update HttpProxy if needed, but skip port binding updates
if (this.httpProxyBridge.getHttpProxy()) {
await this.httpProxyBridge.syncRoutesToHttpProxy(this.settings.routes);
}
}
```
#### Phase 3: Enhance Proxy Route Management
1. Modify `/ts/proxies/smart-proxy/smart-proxy.ts`:
- Refactor `updateRoutes()` to group routes by port
- Implement incremental updates that preserve port bindings
- Add orphaned port detection and cleanup
2. Group Routes by Port:
```typescript
private groupRoutesByPort(routes: IRouteConfig[]): Map<number, IRouteConfig[]> {
const portMap = new Map<number, IRouteConfig[]>();
for (const route of routes) {
const ports = Array.isArray(route.match.ports)
? route.match.ports
: [route.match.ports];
for (const port of ports) {
if (!portMap.has(port)) {
portMap.set(port, []);
}
portMap.get(port)!.push(route);
}
}
return portMap;
}
```
3. Implement Port Usage Tracking:
```typescript
private updatePortUsageMap(routes: IRouteConfig[]): Map<number, Set<string>> {
// Map of port -> Set of route names using that port
const portUsage = new Map<number, Set<string>>();
for (const route of routes) {
const ports = Array.isArray(route.match.ports)
? route.match.ports
: [route.match.ports];
const routeName = route.name || `unnamed_${Math.random().toString(36).substring(2, 9)}`;
for (const port of ports) {
if (!portUsage.has(port)) {
portUsage.set(port, new Set());
}
portUsage.get(port)!.add(routeName);
}
}
return portUsage;
}
private findOrphanedPorts(oldUsage: Map<number, Set<string>>, newUsage: Map<number, Set<string>>): number[] {
// Find ports that have no routes in new configuration
const orphanedPorts: number[] = [];
for (const [port, routes] of oldUsage.entries()) {
if (!newUsage.has(port) || newUsage.get(port)!.size === 0) {
orphanedPorts.push(port);
logger.log('info', `Port ${port} no longer has any associated routes, will be released`, { port });
}
}
return orphanedPorts;
}
```
4. Implement Incremental Update Logic:
```typescript
public async updateRoutesIncremental(newRoutes: IRouteConfig[]): Promise<void> {
// Track port usage before and after update
const oldPortUsage = this.updatePortUsageMap(this.settings.routes);
const newPortUsage = this.updatePortUsageMap(newRoutes);
// Find orphaned ports - ports that no longer have any routes
const orphanedPorts = this.findOrphanedPorts(oldPortUsage, newPortUsage);
// Ports that need new bindings - not in old configuration
const newBindingPorts = [...newPortUsage.keys()].filter(p => !oldPortUsage.has(p));
// Close orphaned ports
if (orphanedPorts.length > 0) {
logger.log('info', `Releasing ${orphanedPorts.length} orphaned ports: ${orphanedPorts.join(', ')}`, { ports: orphanedPorts });
await this.portManager.removePorts(orphanedPorts);
}
// Bind to new ports
if (newBindingPorts.length > 0) {
logger.log('info', `Binding to ${newBindingPorts.length} new ports: ${newBindingPorts.join(', ')}`, { ports: newBindingPorts });
await this.portManager.addPorts(newBindingPorts);
}
// Update route configuration
this.settings.routes = newRoutes;
this.routeManager.updateRoutes(newRoutes);
// Update other components...
}
```
#### Phase 4: Improve Error Handling and Recovery
1. Enhance Error Reporting:
```typescript
private handlePortBindingError(port: number, error: any): void {
if (error.code === 'EADDRINUSE') {
const isInternalConflict = this.portManager.isPortBoundBySmartProxy(port);
if (isInternalConflict) {
logger.log('warn', `Port ${port} is already bound by SmartProxy. This is likely a route configuration issue.`, { port });
} else {
logger.log('error', `Port ${port} is in use by another application. Please choose a different port.`, { port });
}
} else {
logger.log('error', `Failed to bind to port ${port}: ${error.message}`, { port, error });
}
}
```
2. Implement ACME Port Fallback Strategy:
```typescript
private async selectAcmePort(): Promise<number> {
const preferredPort = this.globalAcmeDefaults?.port || 80;
// Check if preferred port is already bound internally
if (this.portManager.isPortBoundBySmartProxy(preferredPort)) {
// We can use it without a new binding
return preferredPort;
}
// Try to bind to preferred port
try {
// Temporary test binding
const server = plugins.net.createServer();
await new Promise<void>((resolve, reject) => {
server.listen(preferredPort, () => {
server.close();
resolve();
}).on('error', reject);
});
// If we get here, port is available
return preferredPort;
} catch (error) {
if (error.code === 'EADDRINUSE') {
// Port is unavailable, try fallback ports
for (const fallbackPort of [8080, 8081, 8082, 8083, 8084]) {
try {
// Test if we can bind to fallback
const server = plugins.net.createServer();
await new Promise<void>((resolve, reject) => {
server.listen(fallbackPort, () => {
server.close();
resolve();
}).on('error', reject);
});
logger.log('warn', `Primary ACME port ${preferredPort} is unavailable, using fallback port ${fallbackPort}`);
return fallbackPort;
} catch {
// Try next fallback
}
}
}
// All attempts failed
throw new Error(`Could not find an available port for ACME challenges`);
}
}
```
### Testing Strategy
1. **Unit Tests**:
- Test port binding intelligence
- Test route merging logic
- Test error handling mechanisms
- Test port reference counting
- Test orphaned port detection and cleanup
2. **Integration Tests**:
- Test multiple routes on the same port
- Test ACME challenges on ports with existing routes
- Test dynamic route addition and removal
- Test port lifecycle (bind → share → release)
- Test various recovery scenarios
3. **Stress Tests**:
- Test rapid route updates
- Test concurrent operations
- Test large scale route changes (add/remove many at once)
- Test frequent changes to see if ports are properly released
- Test recovery from port conflicts
### Release Plan
1. **19.4.0** - Phase 1 & 2: Port Manager and ACME Route Improvements
2. **19.5.0** - Phase 3: Enhanced Route Management
3. **19.6.0** - Phase 4: Improved Error Handling and Recovery

8
test/test.acme-http01-challenge.ts
View File

@ -10,7 +10,7 @@ tap.test('should correctly handle HTTP-01 challenge requests with initial data c
const challengePath = `/.well-known/acme-challenge/${challengeToken}`;
// Create a handler function that responds to ACME challenges
const acmeHandler = (context: any) => {
const acmeHandler = async (context: any) => {
// Log request details for debugging
console.log(`Received request: ${context.method} ${context.path}`);
@ -46,7 +46,7 @@ tap.test('should correctly handle HTTP-01 challenge requests with initial data c
name: 'acme-challenge-route',
match: {
ports: 8080,
paths: ['/.well-known/acme-challenge/*']
path: '/.well-known/acme-challenge/*'
},
action: {
type: 'static',
@ -99,7 +99,7 @@ tap.test('should correctly handle HTTP-01 challenge requests with initial data c
// Test that non-existent challenge tokens return 404
tap.test('should return 404 for non-existent challenge tokens', async (tapTest) => {
// Create a handler function that behaves like a real ACME handler
const acmeHandler = (context: any) => {
const acmeHandler = async (context: any) => {
if (context.path.startsWith('/.well-known/acme-challenge/')) {
const token = context.path.substring('/.well-known/acme-challenge/'.length);
// In this test, we only recognize one specific token
@ -126,7 +126,7 @@ tap.test('should return 404 for non-existent challenge tokens', async (tapTest)
name: 'acme-challenge-route',
match: {
ports: 8081,
paths: ['/.well-known/acme-challenge/*']
path: '/.well-known/acme-challenge/*'
},
action: {
type: 'static',

23
test/test.acme-timing-simple.ts
View File

@ -37,6 +37,18 @@ tap.test('should defer certificate provisioning until ports are ready', async (t
console.log('Creating mock cert manager');
operationOrder.push('create-cert-manager');
const mockCertManager = {
certStore: null,
smartAcme: null,
httpProxy: null,
renewalTimer: null,
pendingChallenges: new Map(),
challengeRoute: null,
certStatus: new Map(),
globalAcmeDefaults: null,
updateRoutesCallback: undefined,
challengeRouteActive: false,
isProvisioning: false,
acmeStateManager: null,
initialize: async () => {
operationOrder.push('cert-manager-init');
console.log('Mock cert manager initialized');
@ -56,8 +68,15 @@ tap.test('should defer certificate provisioning until ports are ready', async (t
setAcmeStateManager: () => {},
setUpdateRoutesCallback: () => {},
getAcmeOptions: () => ({}),
getState: () => ({ challengeRouteActive: false })
};
getState: () => ({ challengeRouteActive: false }),
getCertStatus: () => new Map(),
checkAndRenewCertificates: async () => {},
addChallengeRoute: async () => {},
removeChallengeRoute: async () => {},
getCertificate: async () => null,
isValidCertificate: () => false,
waitForProvisioning: async () => {}
} as any;
// Call initialize immediately as the real createCertificateManager does
await mockCertManager.initialize();

16
test/test.connection-forwarding.ts
View File

@ -1,4 +1,4 @@
import { expect, tap } from '@git.zone/tapbundle';
import { expect, tap } from '@git.zone/tstest/tapbundle';
import * as net from 'net';
import * as tls from 'tls';
import * as fs from 'fs';
@ -61,7 +61,7 @@ tap.test('should forward TCP connections correctly', async () => {
id: 'tcp-forward',
name: 'TCP Forward Route',
match: {
port: 8080,
ports: 8080,
},
action: {
type: 'forward',
@ -110,8 +110,8 @@ tap.test('should handle TLS passthrough correctly', async () => {
id: 'tls-passthrough',
name: 'TLS Passthrough Route',
match: {
port: 8443,
domain: 'test.example.com',
ports: 8443,
domains: 'test.example.com',
},
action: {
type: 'forward',
@ -171,8 +171,8 @@ tap.test('should handle SNI-based forwarding', async () => {
id: 'domain-a',
name: 'Domain A Route',
match: {
port: 8443,
domain: 'a.example.com',
ports: 8443,
domains: 'a.example.com',
},
action: {
type: 'forward',
@ -189,8 +189,8 @@ tap.test('should handle SNI-based forwarding', async () => {
id: 'domain-b',
name: 'Domain B Route',
match: {
port: 8443,
domain: 'b.example.com',
ports: 8443,
domains: 'b.example.com',
},
action: {
type: 'forward',

2
test/test.forwarding-fix-verification.ts
View File

@ -112,7 +112,7 @@ tap.test('NFTables forward route should not terminate connections', async () =>
// Wait a bit to ensure connection isn't immediately closed
await new Promise(resolve => setTimeout(resolve, 1000));
expect(connectionClosed).toBe(false);
expect(connectionClosed).toEqual(false);
console.log('NFTables connection stayed open as expected');
client.end();

18
test/test.forwarding-regression.ts
View File

@ -1,4 +1,4 @@
import { expect, tap } from '@git.zone/tapbundle';
import { expect, tap } from '@git.zone/tstest/tapbundle';
import * as net from 'net';
import { SmartProxy } from '../ts/proxies/smart-proxy/smart-proxy.js';
@ -35,7 +35,7 @@ tap.test('forward connections should not be immediately closed', async (t) => {
id: 'forward-test',
name: 'Forward Test Route',
match: {
port: 8080,
ports: 8080,
},
action: {
type: 'forward',
@ -80,9 +80,15 @@ tap.test('forward connections should not be immediately closed', async (t) => {
});
// Wait for the welcome message
await t.waitForExpect(() => {
return dataReceived;
}, 'Data should be received from the server', 2000);
let waitTime = 0;
while (!dataReceived && waitTime < 2000) {
await new Promise(resolve => setTimeout(resolve, 100));
waitTime += 100;
}
if (!dataReceived) {
throw new Error('Data should be received from the server');
}
// Verify we got the welcome message
expect(welcomeMessage).toContain('Welcome from test server');
@ -94,7 +100,7 @@ tap.test('forward connections should not be immediately closed', async (t) => {
await new Promise(resolve => setTimeout(resolve, 100));
// Connection should still be open
expect(connectionClosed).toBe(false);
expect(connectionClosed).toEqual(false);
// Clean up
client.end();

6
test/test.http-fix-unit.ts
View File

@ -43,7 +43,7 @@ tap.test('should forward non-TLS connections on HttpProxy ports', async (tapTest
// Test the logic from handleForwardAction
const route = mockSettings.routes[0];
const action = route.action;
const action = route.action as any;
// Simulate the fixed logic
if (!action.tls) {
@ -101,7 +101,7 @@ tap.test('should use direct connection for non-HttpProxy ports', async (tapTest)
};
const route = mockSettings.routes[0];
const action = route.action;
const action = route.action as any;
// Test the logic
if (!action.tls) {
@ -162,7 +162,7 @@ tap.test('should handle ACME HTTP-01 challenges on port 80 with HttpProxy', asyn
};
const route = mockSettings.routes[0];
const action = route.action;
const action = route.action as any;
// Test the fix for ACME HTTP-01 challenges
if (!action.tls) {

14
test/test.http-fix-verification.ts
View File

@ -1,6 +1,6 @@
import { tap, expect } from '@git.zone/tstest/tapbundle';
import { RouteConnectionHandler } from '../ts/proxies/smart-proxy/route-connection-handler.js';
import { ISmartProxyOptions } from '../ts/proxies/smart-proxy/models/interfaces.js';
import type { ISmartProxyOptions } from '../ts/proxies/smart-proxy/models/interfaces.js';
import * as net from 'net';
// Direct test of the fix in RouteConnectionHandler
@ -68,9 +68,9 @@ tap.test('should detect and forward non-TLS connections on useHttpProxy ports',
};
// Test: Create a mock socket representing non-TLS connection on port 8080
const mockSocket = new net.Socket();
mockSocket.localPort = 8080;
mockSocket.remoteAddress = '127.0.0.1';
const mockSocket = Object.create(net.Socket.prototype) as net.Socket;
Object.defineProperty(mockSocket, 'localPort', { value: 8080, writable: false });
Object.defineProperty(mockSocket, 'remoteAddress', { value: '127.0.0.1', writable: false });
// Simulate the handler processing the connection
handler.handleConnection(mockSocket);
@ -147,9 +147,9 @@ tap.test('should handle TLS connections normally', async (tapTest) => {
mockRouteManager as any
);
const mockSocket = new net.Socket();
mockSocket.localPort = 443;
mockSocket.remoteAddress = '127.0.0.1';
const mockSocket = Object.create(net.Socket.prototype) as net.Socket;
Object.defineProperty(mockSocket, 'localPort', { value: 443, writable: false });
Object.defineProperty(mockSocket, 'remoteAddress', { value: '127.0.0.1', writable: false });
handler.handleConnection(mockSocket);

41
test/test.http-forwarding-fix.ts
View File

@ -8,9 +8,23 @@ tap.test('should detect and forward non-TLS connections on HttpProxy ports', asy
let forwardedToHttpProxy = false;
let connectionPath = '';
// Mock the HttpProxy forwarding
const originalForward = SmartProxy.prototype['httpProxyBridge'].prototype.forwardToHttpProxy;
SmartProxy.prototype['httpProxyBridge'].prototype.forwardToHttpProxy = function(...args: any[]) {
// Create a SmartProxy instance first
const proxy = new SmartProxy({
useHttpProxy: [8080],
httpProxyPort: 8844,
routes: [{
name: 'test-http-forward',
match: { ports: 8080 },
action: {
type: 'forward',
target: { host: 'localhost', port: 8181 }
}
}]
});
// Mock the HttpProxy forwarding on the instance
const originalForward = (proxy as any).httpProxyBridge.forwardToHttpProxy;
(proxy as any).httpProxyBridge.forwardToHttpProxy = async function(...args: any[]) {
forwardedToHttpProxy = true;
connectionPath = 'httpproxy';
console.log('Mock: Connection forwarded to HttpProxy');
@ -18,22 +32,8 @@ tap.test('should detect and forward non-TLS connections on HttpProxy ports', asy
args[1].end(); // socket.end()
};
// Create a SmartProxy with useHttpProxy configured
const proxy = new SmartProxy({
useHttpProxy: [8080],
httpProxyPort: 8844,
enableDetailedLogging: true,
routes: [{
name: 'test-route',
match: {
ports: 8080
},
action: {
type: 'forward',
target: { host: 'localhost', port: 8181 }
}
}]
});
// Add detailed logging to the existing proxy instance
proxy.settings.enableDetailedLogging = true;
// Override the HttpProxy initialization to avoid actual HttpProxy setup
proxy['httpProxyBridge'].getHttpProxy = () => ({} as any);
@ -65,7 +65,8 @@ tap.test('should detect and forward non-TLS connections on HttpProxy ports', asy
await proxy.stop();
// Restore original method
SmartProxy.prototype['httpProxyBridge'].prototype.forwardToHttpProxy = originalForward;
// Restore original method
(proxy as any).httpProxyBridge.forwardToHttpProxy = originalForward;
});
// Test that verifies the fix detects non-TLS connections

37
test/test.http-port8080-simple.ts
View File

@ -51,7 +51,7 @@ tap.test('should handle ACME challenges on port 8080 with improved port binding
const tempCertDir = './temp-certs';
try {
await plugins.smartfile.SmartFile.createDirectory(tempCertDir);
await plugins.smartfile.fs.ensureDir(tempCertDir);
} catch (error) {
// Directory may already exist, that's ok
}
@ -156,8 +156,10 @@ tap.test('should handle ACME challenges on port 8080 with improved port binding
console.log('Port binding attempts:', portBindAttempts);
// Check that we tried to bind to port 9009
expect(portBindAttempts.includes(9009)).toEqual(true, 'Should attempt to bind to port 9009');
expect(portBindAttempts.includes(9003)).toEqual(true, 'Should attempt to bind to port 9003');
// Should attempt to bind to port 9009
expect(portBindAttempts.includes(9009)).toEqual(true);
// Should attempt to bind to port 9003
expect(portBindAttempts.includes(9003)).toEqual(true);
// Get actual bound ports
const boundPorts = proxy.getListeningPorts();
@ -165,10 +167,12 @@ tap.test('should handle ACME challenges on port 8080 with improved port binding
// If port 9009 was available, we should be bound to it
if (acmePortAvailable) {
expect(boundPorts.includes(9009)).toEqual(true, 'Should be bound to port 9009 if available');
// Should be bound to port 9009 if available
expect(boundPorts.includes(9009)).toEqual(true);
}
expect(boundPorts.includes(9003)).toEqual(true, 'Should be bound to port 9003');
// Should be bound to port 9003
expect(boundPorts.includes(9003)).toEqual(true);
// Test adding a new route on port 8080
console.log('Testing route update with port reuse...');
@ -186,7 +190,7 @@ tap.test('should handle ACME challenges on port 8080 with improved port binding
path: '/additional'
},
action: {
type: 'forward',
type: 'forward' as const,
target: { host: 'localhost', port: targetPort }
}
}
@ -198,16 +202,19 @@ tap.test('should handle ACME challenges on port 8080 with improved port binding
console.log('Port binding attempts after update:', portBindAttempts);
// We should not try to rebind port 9009 since it's already bound
expect(portBindAttempts.includes(9009)).toEqual(false, 'Should not attempt to rebind port 9009');
// Should not attempt to rebind port 9009
expect(portBindAttempts.includes(9009)).toEqual(false);
// We should still be listening on both ports
const portsAfterUpdate = proxy.getListeningPorts();
console.log('Bound ports after update:', portsAfterUpdate);
if (acmePortAvailable) {
expect(portsAfterUpdate.includes(9009)).toEqual(true, 'Should still be bound to port 9009');
// Should still be bound to port 9009
expect(portsAfterUpdate.includes(9009)).toEqual(true);
}
expect(portsAfterUpdate.includes(9003)).toEqual(true, 'Should still be bound to port 9003');
// Should still be bound to port 9003
expect(portsAfterUpdate.includes(9003)).toEqual(true);
// The test is successful at this point - we've verified the port binding intelligence
console.log('Port binding intelligence verified successfully!');
@ -227,16 +234,8 @@ tap.test('should handle ACME challenges on port 8080 with improved port binding
// Clean up temp directory
try {
// Try different removal methods
if (typeof plugins.smartfile.fs.removeManySync === 'function') {
plugins.smartfile.fs.removeManySync([tempCertDir]);
} else if (typeof plugins.smartfile.fs.removeDirectory === 'function') {
await plugins.smartfile.fs.removeDirectory(tempCertDir);
} else if (typeof plugins.smartfile.removeDirectory === 'function') {
await plugins.smartfile.removeDirectory(tempCertDir);
} else {
console.log('Unable to find appropriate directory removal method');
}
// Remove temp directory
await plugins.smartfile.fs.remove(tempCertDir);
} catch (error) {
console.error('Failed to remove temp directory:', error);
}

6
test/test.nftables-forwarding.ts
View File

@ -29,7 +29,7 @@ tap.test('NFTables forwarding should not terminate connections', async () => {
id: 'nftables-test',
name: 'NFTables Test Route',
match: {
port: 8080,
ports: 8080,
},
action: {
type: 'forward',
@ -45,7 +45,7 @@ tap.test('NFTables forwarding should not terminate connections', async () => {
id: 'regular-test',
name: 'Regular Forward Route',
match: {
port: 8081,
ports: 8081,
},
action: {
type: 'forward',
@ -83,7 +83,7 @@ tap.test('NFTables forwarding should not terminate connections', async () => {
// Check connection after 100ms
setTimeout(() => {
// Connection should still be alive even if app doesn't handle it
expect(nftablesConnection.destroyed).toBe(false);
expect(nftablesConnection.destroyed).toEqual(false);
nftablesConnection.end();
resolve();
}, 100);

6
test/test.route-callback-simple.ts
View File

@ -45,9 +45,9 @@ tap.test('should set update routes callback on certificate manager', async () =>
setUpdateRoutesCallback: function(callback: any) {
callbackSet = true;
},
setHttpProxy: function() {},
setGlobalAcmeDefaults: function() {},
setAcmeStateManager: function() {},
setHttpProxy: function(proxy: any) {},
setGlobalAcmeDefaults: function(defaults: any) {},
setAcmeStateManager: function(manager: any) {},
initialize: async function() {},
provisionAllCertificates: async function() {},
stop: async function() {},

6
test/test.route-update-logger-errors.ts
View File

@ -55,7 +55,8 @@ tap.test('should have error handling around logger calls in route update callbac
expect(true).toEqual(true);
} catch (error) {
// This shouldn't happen if our error handling is working
expect(false).toEqual(true, 'Error handling failed in addChallengeRoute');
// Error handling failed in addChallengeRoute
expect(false).toEqual(true);
}
// Verify that we handle errors in removeChallengeRoute
@ -69,7 +70,8 @@ tap.test('should have error handling around logger calls in route update callbac
expect(true).toEqual(true);
} catch (error) {
// This shouldn't happen if our error handling is working
expect(false).toEqual(true, 'Error handling failed in removeChallengeRoute');
// Error handling failed in removeChallengeRoute
expect(false).toEqual(true);
}
});

2
ts/00_commitinfo_data.ts
View File

@ -3,6 +3,6 @@
*/
export const commitinfo = {
name: '@push.rocks/smartproxy',
version: '19.4.2',
version: '19.4.3',
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.'
}