@push.rocks/smartproxy 19.2.4 → 19.2.5
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.
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/proxies/smart-proxy/acme-state-manager.d.ts +42 -0
- package/dist_ts/proxies/smart-proxy/acme-state-manager.js +101 -0
- package/dist_ts/proxies/smart-proxy/certificate-manager.d.ts +15 -0
- package/dist_ts/proxies/smart-proxy/certificate-manager.js +46 -6
- package/dist_ts/proxies/smart-proxy/smart-proxy.d.ts +7 -0
- package/dist_ts/proxies/smart-proxy/smart-proxy.js +84 -44
- package/dist_ts/proxies/smart-proxy/utils/mutex.d.ts +19 -0
- package/dist_ts/proxies/smart-proxy/utils/mutex.js +47 -0
- package/package.json +1 -1
- package/readme.plan.md +166 -26
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/proxies/smart-proxy/acme-state-manager.ts +112 -0
- package/ts/proxies/smart-proxy/certificate-manager.ts +55 -4
- package/ts/proxies/smart-proxy/smart-proxy.ts +114 -57
- package/ts/proxies/smart-proxy/utils/mutex.ts +45 -0
- package/ts/common/port80-adapter.ts +0 -111
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartproxy',
|
|
6
|
-
version: '19.2.
|
|
6
|
+
version: '19.2.5',
|
|
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=
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import type { IRouteConfig } from './models/route-types.js';
|
|
2
|
+
/**
|
|
3
|
+
* Global state store for ACME operations
|
|
4
|
+
* Tracks active challenge routes and port allocations
|
|
5
|
+
*/
|
|
6
|
+
export declare class AcmeStateManager {
|
|
7
|
+
private activeChallengeRoutes;
|
|
8
|
+
private acmePortAllocations;
|
|
9
|
+
private primaryChallengeRoute;
|
|
10
|
+
/**
|
|
11
|
+
* Check if a challenge route is active
|
|
12
|
+
*/
|
|
13
|
+
isChallengeRouteActive(): boolean;
|
|
14
|
+
/**
|
|
15
|
+
* Register a challenge route as active
|
|
16
|
+
*/
|
|
17
|
+
addChallengeRoute(route: IRouteConfig): void;
|
|
18
|
+
/**
|
|
19
|
+
* Remove a challenge route
|
|
20
|
+
*/
|
|
21
|
+
removeChallengeRoute(routeName: string): void;
|
|
22
|
+
/**
|
|
23
|
+
* Get all active challenge routes
|
|
24
|
+
*/
|
|
25
|
+
getActiveChallengeRoutes(): IRouteConfig[];
|
|
26
|
+
/**
|
|
27
|
+
* Get the primary challenge route
|
|
28
|
+
*/
|
|
29
|
+
getPrimaryChallengeRoute(): IRouteConfig | null;
|
|
30
|
+
/**
|
|
31
|
+
* Check if a port is allocated for ACME
|
|
32
|
+
*/
|
|
33
|
+
isPortAllocatedForAcme(port: number): boolean;
|
|
34
|
+
/**
|
|
35
|
+
* Get all ACME ports
|
|
36
|
+
*/
|
|
37
|
+
getAcmePorts(): number[];
|
|
38
|
+
/**
|
|
39
|
+
* Clear all state (for shutdown or reset)
|
|
40
|
+
*/
|
|
41
|
+
clear(): void;
|
|
42
|
+
}
|
|
@@ -0,0 +1,101 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Global state store for ACME operations
|
|
3
|
+
* Tracks active challenge routes and port allocations
|
|
4
|
+
*/
|
|
5
|
+
export class AcmeStateManager {
|
|
6
|
+
constructor() {
|
|
7
|
+
this.activeChallengeRoutes = new Map();
|
|
8
|
+
this.acmePortAllocations = new Set();
|
|
9
|
+
this.primaryChallengeRoute = null;
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* Check if a challenge route is active
|
|
13
|
+
*/
|
|
14
|
+
isChallengeRouteActive() {
|
|
15
|
+
return this.activeChallengeRoutes.size > 0;
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* Register a challenge route as active
|
|
19
|
+
*/
|
|
20
|
+
addChallengeRoute(route) {
|
|
21
|
+
this.activeChallengeRoutes.set(route.name, route);
|
|
22
|
+
// Track the primary challenge route
|
|
23
|
+
if (!this.primaryChallengeRoute || route.priority > (this.primaryChallengeRoute.priority || 0)) {
|
|
24
|
+
this.primaryChallengeRoute = route;
|
|
25
|
+
}
|
|
26
|
+
// Track port allocations
|
|
27
|
+
const ports = Array.isArray(route.match.ports) ? route.match.ports : [route.match.ports];
|
|
28
|
+
ports.forEach(port => this.acmePortAllocations.add(port));
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* Remove a challenge route
|
|
32
|
+
*/
|
|
33
|
+
removeChallengeRoute(routeName) {
|
|
34
|
+
const route = this.activeChallengeRoutes.get(routeName);
|
|
35
|
+
if (!route)
|
|
36
|
+
return;
|
|
37
|
+
this.activeChallengeRoutes.delete(routeName);
|
|
38
|
+
// Update primary challenge route if needed
|
|
39
|
+
if (this.primaryChallengeRoute?.name === routeName) {
|
|
40
|
+
this.primaryChallengeRoute = null;
|
|
41
|
+
// Find new primary route with highest priority
|
|
42
|
+
let highestPriority = -1;
|
|
43
|
+
for (const [_, activeRoute] of this.activeChallengeRoutes) {
|
|
44
|
+
const priority = activeRoute.priority || 0;
|
|
45
|
+
if (priority > highestPriority) {
|
|
46
|
+
highestPriority = priority;
|
|
47
|
+
this.primaryChallengeRoute = activeRoute;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
// Update port allocations - only remove if no other routes use this port
|
|
52
|
+
const ports = Array.isArray(route.match.ports) ? route.match.ports : [route.match.ports];
|
|
53
|
+
ports.forEach(port => {
|
|
54
|
+
let portStillUsed = false;
|
|
55
|
+
for (const [_, activeRoute] of this.activeChallengeRoutes) {
|
|
56
|
+
const activePorts = Array.isArray(activeRoute.match.ports) ?
|
|
57
|
+
activeRoute.match.ports : [activeRoute.match.ports];
|
|
58
|
+
if (activePorts.includes(port)) {
|
|
59
|
+
portStillUsed = true;
|
|
60
|
+
break;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
if (!portStillUsed) {
|
|
64
|
+
this.acmePortAllocations.delete(port);
|
|
65
|
+
}
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
/**
|
|
69
|
+
* Get all active challenge routes
|
|
70
|
+
*/
|
|
71
|
+
getActiveChallengeRoutes() {
|
|
72
|
+
return Array.from(this.activeChallengeRoutes.values());
|
|
73
|
+
}
|
|
74
|
+
/**
|
|
75
|
+
* Get the primary challenge route
|
|
76
|
+
*/
|
|
77
|
+
getPrimaryChallengeRoute() {
|
|
78
|
+
return this.primaryChallengeRoute;
|
|
79
|
+
}
|
|
80
|
+
/**
|
|
81
|
+
* Check if a port is allocated for ACME
|
|
82
|
+
*/
|
|
83
|
+
isPortAllocatedForAcme(port) {
|
|
84
|
+
return this.acmePortAllocations.has(port);
|
|
85
|
+
}
|
|
86
|
+
/**
|
|
87
|
+
* Get all ACME ports
|
|
88
|
+
*/
|
|
89
|
+
getAcmePorts() {
|
|
90
|
+
return Array.from(this.acmePortAllocations);
|
|
91
|
+
}
|
|
92
|
+
/**
|
|
93
|
+
* Clear all state (for shutdown or reset)
|
|
94
|
+
*/
|
|
95
|
+
clear() {
|
|
96
|
+
this.activeChallengeRoutes.clear();
|
|
97
|
+
this.acmePortAllocations.clear();
|
|
98
|
+
this.primaryChallengeRoute = null;
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNtZS1zdGF0ZS1tYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vdHMvcHJveGllcy9zbWFydC1wcm94eS9hY21lLXN0YXRlLW1hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUE7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLGdCQUFnQjtJQUE3QjtRQUNVLDBCQUFxQixHQUE4QixJQUFJLEdBQUcsRUFBRSxDQUFDO1FBQzdELHdCQUFtQixHQUFnQixJQUFJLEdBQUcsRUFBRSxDQUFDO1FBQzdDLDBCQUFxQixHQUF3QixJQUFJLENBQUM7SUFzRzVELENBQUM7SUFwR0M7O09BRUc7SUFDSSxzQkFBc0I7UUFDM0IsT0FBTyxJQUFJLENBQUMscUJBQXFCLENBQUMsSUFBSSxHQUFHLENBQUMsQ0FBQztJQUM3QyxDQUFDO0lBRUQ7O09BRUc7SUFDSSxpQkFBaUIsQ0FBQyxLQUFtQjtRQUMxQyxJQUFJLENBQUMscUJBQXFCLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFFbEQsb0NBQW9DO1FBQ3BDLElBQUksQ0FBQyxJQUFJLENBQUMscUJBQXFCLElBQUksS0FBSyxDQUFDLFFBQVEsR0FBRyxDQUFDLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxRQUFRLElBQUksQ0FBQyxDQUFDLEVBQUUsQ0FBQztZQUMvRixJQUFJLENBQUMscUJBQXFCLEdBQUcsS0FBSyxDQUFDO1FBQ3JDLENBQUM7UUFFRCx5QkFBeUI7UUFDekIsTUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ3pGLEtBQUssQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUUs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
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { NetworkProxy } from '../network-proxy/index.js';
|
|
2
2
|
import type { IRouteConfig } from './models/route-types.js';
|
|
3
3
|
import type { IAcmeOptions } from './models/interfaces.js';
|
|
4
|
+
import type { AcmeStateManager } from './acme-state-manager.js';
|
|
4
5
|
export interface ICertStatus {
|
|
5
6
|
domain: string;
|
|
6
7
|
status: 'valid' | 'pending' | 'expired' | 'error';
|
|
@@ -20,6 +21,7 @@ export declare class SmartCertManager {
|
|
|
20
21
|
private routes;
|
|
21
22
|
private certDir;
|
|
22
23
|
private acmeOptions?;
|
|
24
|
+
private initialState?;
|
|
23
25
|
private certStore;
|
|
24
26
|
private smartAcme;
|
|
25
27
|
private networkProxy;
|
|
@@ -31,12 +33,25 @@ export declare class SmartCertManager {
|
|
|
31
33
|
private updateRoutesCallback?;
|
|
32
34
|
private challengeRouteActive;
|
|
33
35
|
private isProvisioning;
|
|
36
|
+
private acmeStateManager;
|
|
34
37
|
constructor(routes: IRouteConfig[], certDir?: string, acmeOptions?: {
|
|
35
38
|
email?: string;
|
|
36
39
|
useProduction?: boolean;
|
|
37
40
|
port?: number;
|
|
41
|
+
}, initialState?: {
|
|
42
|
+
challengeRouteActive?: boolean;
|
|
38
43
|
});
|
|
39
44
|
setNetworkProxy(networkProxy: NetworkProxy): void;
|
|
45
|
+
/**
|
|
46
|
+
* Get the current state of the certificate manager
|
|
47
|
+
*/
|
|
48
|
+
getState(): {
|
|
49
|
+
challengeRouteActive: boolean;
|
|
50
|
+
};
|
|
51
|
+
/**
|
|
52
|
+
* Set the ACME state manager
|
|
53
|
+
*/
|
|
54
|
+
setAcmeStateManager(stateManager: AcmeStateManager): void;
|
|
40
55
|
/**
|
|
41
56
|
* Set global ACME defaults from top-level configuration
|
|
42
57
|
*/
|
|
@@ -2,10 +2,11 @@ import * as plugins from '../../plugins.js';
|
|
|
2
2
|
import { NetworkProxy } from '../network-proxy/index.js';
|
|
3
3
|
import { CertStore } from './cert-store.js';
|
|
4
4
|
export class SmartCertManager {
|
|
5
|
-
constructor(routes, certDir = './certs', acmeOptions) {
|
|
5
|
+
constructor(routes, certDir = './certs', acmeOptions, initialState) {
|
|
6
6
|
this.routes = routes;
|
|
7
7
|
this.certDir = certDir;
|
|
8
8
|
this.acmeOptions = acmeOptions;
|
|
9
|
+
this.initialState = initialState;
|
|
9
10
|
this.smartAcme = null;
|
|
10
11
|
this.networkProxy = null;
|
|
11
12
|
this.renewalTimer = null;
|
|
@@ -19,11 +20,31 @@ export class SmartCertManager {
|
|
|
19
20
|
this.challengeRouteActive = false;
|
|
20
21
|
// Flag to track if provisioning is in progress
|
|
21
22
|
this.isProvisioning = false;
|
|
23
|
+
// ACME state manager reference
|
|
24
|
+
this.acmeStateManager = null;
|
|
22
25
|
this.certStore = new CertStore(certDir);
|
|
26
|
+
// Apply initial state if provided
|
|
27
|
+
if (initialState) {
|
|
28
|
+
this.challengeRouteActive = initialState.challengeRouteActive || false;
|
|
29
|
+
}
|
|
23
30
|
}
|
|
24
31
|
setNetworkProxy(networkProxy) {
|
|
25
32
|
this.networkProxy = networkProxy;
|
|
26
33
|
}
|
|
34
|
+
/**
|
|
35
|
+
* Get the current state of the certificate manager
|
|
36
|
+
*/
|
|
37
|
+
getState() {
|
|
38
|
+
return {
|
|
39
|
+
challengeRouteActive: this.challengeRouteActive
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
/**
|
|
43
|
+
* Set the ACME state manager
|
|
44
|
+
*/
|
|
45
|
+
setAcmeStateManager(stateManager) {
|
|
46
|
+
this.acmeStateManager = stateManager;
|
|
47
|
+
}
|
|
27
48
|
/**
|
|
28
49
|
* Set global ACME defaults from top-level configuration
|
|
29
50
|
*/
|
|
@@ -57,9 +78,14 @@ export class SmartCertManager {
|
|
|
57
78
|
challengeHandlers: [http01Handler]
|
|
58
79
|
});
|
|
59
80
|
await this.smartAcme.start();
|
|
60
|
-
// Add challenge route once at initialization
|
|
61
|
-
|
|
62
|
-
|
|
81
|
+
// Add challenge route once at initialization if not already active
|
|
82
|
+
if (!this.challengeRouteActive) {
|
|
83
|
+
console.log('Adding ACME challenge route during initialization');
|
|
84
|
+
await this.addChallengeRoute();
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
console.log('Challenge route already active from previous instance');
|
|
88
|
+
}
|
|
63
89
|
}
|
|
64
90
|
// Provision certificates for all routes
|
|
65
91
|
await this.provisionAllCertificates();
|
|
@@ -258,8 +284,14 @@ export class SmartCertManager {
|
|
|
258
284
|
* Add challenge route to SmartProxy
|
|
259
285
|
*/
|
|
260
286
|
async addChallengeRoute() {
|
|
287
|
+
// Check with state manager first
|
|
288
|
+
if (this.acmeStateManager && this.acmeStateManager.isChallengeRouteActive()) {
|
|
289
|
+
console.log('Challenge route already active in global state, skipping');
|
|
290
|
+
this.challengeRouteActive = true;
|
|
291
|
+
return;
|
|
292
|
+
}
|
|
261
293
|
if (this.challengeRouteActive) {
|
|
262
|
-
console.log('Challenge route already active, skipping');
|
|
294
|
+
console.log('Challenge route already active locally, skipping');
|
|
263
295
|
return;
|
|
264
296
|
}
|
|
265
297
|
if (!this.updateRoutesCallback) {
|
|
@@ -273,6 +305,10 @@ export class SmartCertManager {
|
|
|
273
305
|
const updatedRoutes = [...this.routes, challengeRoute];
|
|
274
306
|
await this.updateRoutesCallback(updatedRoutes);
|
|
275
307
|
this.challengeRouteActive = true;
|
|
308
|
+
// Register with state manager
|
|
309
|
+
if (this.acmeStateManager) {
|
|
310
|
+
this.acmeStateManager.addChallengeRoute(challengeRoute);
|
|
311
|
+
}
|
|
276
312
|
console.log('ACME challenge route successfully added');
|
|
277
313
|
}
|
|
278
314
|
catch (error) {
|
|
@@ -298,6 +334,10 @@ export class SmartCertManager {
|
|
|
298
334
|
const filteredRoutes = this.routes.filter(r => r.name !== 'acme-challenge');
|
|
299
335
|
await this.updateRoutesCallback(filteredRoutes);
|
|
300
336
|
this.challengeRouteActive = false;
|
|
337
|
+
// Remove from state manager
|
|
338
|
+
if (this.acmeStateManager) {
|
|
339
|
+
this.acmeStateManager.removeChallengeRoute('acme-challenge');
|
|
340
|
+
}
|
|
301
341
|
console.log('ACME challenge route successfully removed');
|
|
302
342
|
}
|
|
303
343
|
catch (error) {
|
|
@@ -457,4 +497,4 @@ export class SmartCertManager {
|
|
|
457
497
|
return this.acmeOptions;
|
|
458
498
|
}
|
|
459
499
|
}
|
|
460
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"certificate-manager.js","sourceRoot":"","sources":["../../../ts/proxies/smart-proxy/certificate-manager.ts"],"names":[],"mappings":"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"}
|
|
500
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"certificate-manager.js","sourceRoot":"","sources":["../../../ts/proxies/smart-proxy/certificate-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,6 +29,9 @@ export declare class SmartProxy extends plugins.EventEmitter {
|
|
|
29
29
|
private routeConnectionHandler;
|
|
30
30
|
private nftablesManager;
|
|
31
31
|
private certManager;
|
|
32
|
+
private globalChallengeRouteActive;
|
|
33
|
+
private routeUpdateLock;
|
|
34
|
+
private acmeStateManager;
|
|
32
35
|
/**
|
|
33
36
|
* Constructor for SmartProxy
|
|
34
37
|
*
|
|
@@ -97,6 +100,10 @@ export declare class SmartProxy extends plugins.EventEmitter {
|
|
|
97
100
|
* Note: This legacy method has been removed. Use updateRoutes instead.
|
|
98
101
|
*/
|
|
99
102
|
updateDomainConfigs(): Promise<void>;
|
|
103
|
+
/**
|
|
104
|
+
* Verify the challenge route has been properly removed from routes
|
|
105
|
+
*/
|
|
106
|
+
private verifyChallengeRouteRemoved;
|
|
100
107
|
/**
|
|
101
108
|
* Update routes with new configuration
|
|
102
109
|
*
|