@push.rocks/smartproxy 25.2.2 → 25.3.1
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/changelog.md +17 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/core/utils/logger.d.ts +1 -1
- package/dist_ts/plugins.d.ts +3 -18
- package/dist_ts/plugins.js +4 -19
- package/dist_ts/proxies/smart-proxy/models/interfaces.d.ts +13 -0
- package/dist_ts/proxies/smart-proxy/smart-proxy.d.ts +10 -0
- package/dist_ts/proxies/smart-proxy/smart-proxy.js +120 -74
- package/dist_ts/proxies/smart-proxy/utils/concurrency-semaphore.d.ts +11 -0
- package/dist_ts/proxies/smart-proxy/utils/concurrency-semaphore.js +29 -0
- package/dist_ts/proxies/smart-proxy/utils/index.d.ts +1 -0
- package/dist_ts/proxies/smart-proxy/utils/index.js +3 -1
- package/package.json +2 -16
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/plugins.ts +2 -28
- package/ts/proxies/smart-proxy/models/interfaces.ts +15 -0
- package/ts/proxies/smart-proxy/smart-proxy.ts +143 -81
- package/ts/proxies/smart-proxy/utils/concurrency-semaphore.ts +28 -0
- package/ts/proxies/smart-proxy/utils/index.ts +3 -0
package/changelog.md
CHANGED
|
@@ -1,5 +1,22 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-02-15 - 25.3.1 - fix(plugins)
|
|
4
|
+
remove unused dependencies and simplify plugin exports
|
|
5
|
+
|
|
6
|
+
- Removed multiple dependencies from package.json to reduce dependency footprint: @push.rocks/lik, @push.rocks/smartacme, @push.rocks/smartdelay, @push.rocks/smartfile, @push.rocks/smartnetwork, @push.rocks/smartpromise, @push.rocks/smartrequest, @push.rocks/smartrx, @push.rocks/smartstring, @push.rocks/taskbuffer, @types/minimatch, @types/ws, pretty-ms, ws
|
|
7
|
+
- ts/plugins.ts: stopped importing/exporting node:https and many push.rocks and third-party modules; plugins now only re-export core node modules (without https), tsclass, smartcrypto, smartlog (+ destination-local), smartrust, and minimatch
|
|
8
|
+
- Intended effect: trim surface area and remove unused/optional integrations; patch-level change (no feature/API additions)
|
|
9
|
+
|
|
10
|
+
## 2026-02-14 - 25.3.0 - feat(smart-proxy)
|
|
11
|
+
add background concurrent certificate provisioning with per-domain timeouts and concurrency control
|
|
12
|
+
|
|
13
|
+
- Add ISmartProxyOptions settings: certProvisionTimeout (ms) and certProvisionConcurrency (default 4)
|
|
14
|
+
- Run certProvisionFunction as fire-and-forget background tasks (stores promise on start/route-update and awaited on stop)
|
|
15
|
+
- Provision certificates in parallel with a concurrency limit using a new ConcurrencySemaphore utility
|
|
16
|
+
- Introduce per-domain timeout handling (default 300000ms) via withTimeout and surface timeout errors as certificate-failed events
|
|
17
|
+
- Refactor provisioning into provisionSingleDomain to isolate domain handling, ACME fallback preserved
|
|
18
|
+
- Run provisioning outside route update mutex so route updates are not blocked by slow provisioning
|
|
19
|
+
|
|
3
20
|
## 2026-02-14 - 25.2.2 - fix(smart-proxy)
|
|
4
21
|
start metrics polling before certificate provisioning to avoid blocking metrics collection
|
|
5
22
|
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartproxy',
|
|
6
|
-
version: '25.
|
|
6
|
+
version: '25.3.1',
|
|
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=
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import * as plugins from '../../plugins.js';
|
|
2
|
-
export declare const logger: plugins.
|
|
2
|
+
export declare const logger: plugins.smartlog.Smartlog;
|
package/dist_ts/plugins.d.ts
CHANGED
|
@@ -1,33 +1,18 @@
|
|
|
1
1
|
import { EventEmitter } from 'node:events';
|
|
2
2
|
import * as fs from 'node:fs';
|
|
3
3
|
import * as http from 'node:http';
|
|
4
|
-
import * as https from 'node:https';
|
|
5
4
|
import * as net from 'node:net';
|
|
6
5
|
import * as path from 'node:path';
|
|
7
6
|
import * as tls from 'node:tls';
|
|
8
7
|
import * as url from 'node:url';
|
|
9
8
|
import * as http2 from 'node:http2';
|
|
10
|
-
export { EventEmitter, fs, http,
|
|
9
|
+
export { EventEmitter, fs, http, net, path, tls, url, http2 };
|
|
11
10
|
import * as tsclass from '@tsclass/tsclass';
|
|
12
11
|
export { tsclass };
|
|
13
|
-
import * as lik from '@push.rocks/lik';
|
|
14
|
-
import * as smartdelay from '@push.rocks/smartdelay';
|
|
15
|
-
import * as smartpromise from '@push.rocks/smartpromise';
|
|
16
|
-
import * as smartrequest from '@push.rocks/smartrequest';
|
|
17
|
-
import * as smartstring from '@push.rocks/smartstring';
|
|
18
|
-
import * as smartfile from '@push.rocks/smartfile';
|
|
19
12
|
import * as smartcrypto from '@push.rocks/smartcrypto';
|
|
20
|
-
import * as smartacme from '@push.rocks/smartacme';
|
|
21
|
-
import * as smartacmePlugins from '@push.rocks/smartacme/dist_ts/smartacme.plugins.js';
|
|
22
|
-
import * as smartacmeHandlers from '@push.rocks/smartacme/dist_ts/handlers/index.js';
|
|
23
13
|
import * as smartlog from '@push.rocks/smartlog';
|
|
24
14
|
import * as smartlogDestinationLocal from '@push.rocks/smartlog/destination-local';
|
|
25
|
-
import * as taskbuffer from '@push.rocks/taskbuffer';
|
|
26
|
-
import * as smartrx from '@push.rocks/smartrx';
|
|
27
15
|
import * as smartrust from '@push.rocks/smartrust';
|
|
28
|
-
export {
|
|
29
|
-
import prettyMs from 'pretty-ms';
|
|
30
|
-
import * as ws from 'ws';
|
|
31
|
-
import wsDefault from 'ws';
|
|
16
|
+
export { smartcrypto, smartlog, smartlogDestinationLocal, smartrust, };
|
|
32
17
|
import { minimatch } from 'minimatch';
|
|
33
|
-
export {
|
|
18
|
+
export { minimatch };
|
package/dist_ts/plugins.js
CHANGED
|
@@ -2,37 +2,22 @@
|
|
|
2
2
|
import { EventEmitter } from 'node:events';
|
|
3
3
|
import * as fs from 'node:fs';
|
|
4
4
|
import * as http from 'node:http';
|
|
5
|
-
import * as https from 'node:https';
|
|
6
5
|
import * as net from 'node:net';
|
|
7
6
|
import * as path from 'node:path';
|
|
8
7
|
import * as tls from 'node:tls';
|
|
9
8
|
import * as url from 'node:url';
|
|
10
9
|
import * as http2 from 'node:http2';
|
|
11
|
-
export { EventEmitter, fs, http,
|
|
10
|
+
export { EventEmitter, fs, http, net, path, tls, url, http2 };
|
|
12
11
|
// tsclass scope
|
|
13
12
|
import * as tsclass from '@tsclass/tsclass';
|
|
14
13
|
export { tsclass };
|
|
15
14
|
// pushrocks scope
|
|
16
|
-
import * as lik from '@push.rocks/lik';
|
|
17
|
-
import * as smartdelay from '@push.rocks/smartdelay';
|
|
18
|
-
import * as smartpromise from '@push.rocks/smartpromise';
|
|
19
|
-
import * as smartrequest from '@push.rocks/smartrequest';
|
|
20
|
-
import * as smartstring from '@push.rocks/smartstring';
|
|
21
|
-
import * as smartfile from '@push.rocks/smartfile';
|
|
22
15
|
import * as smartcrypto from '@push.rocks/smartcrypto';
|
|
23
|
-
import * as smartacme from '@push.rocks/smartacme';
|
|
24
|
-
import * as smartacmePlugins from '@push.rocks/smartacme/dist_ts/smartacme.plugins.js';
|
|
25
|
-
import * as smartacmeHandlers from '@push.rocks/smartacme/dist_ts/handlers/index.js';
|
|
26
16
|
import * as smartlog from '@push.rocks/smartlog';
|
|
27
17
|
import * as smartlogDestinationLocal from '@push.rocks/smartlog/destination-local';
|
|
28
|
-
import * as taskbuffer from '@push.rocks/taskbuffer';
|
|
29
|
-
import * as smartrx from '@push.rocks/smartrx';
|
|
30
18
|
import * as smartrust from '@push.rocks/smartrust';
|
|
31
|
-
export {
|
|
19
|
+
export { smartcrypto, smartlog, smartlogDestinationLocal, smartrust, };
|
|
32
20
|
// third party scope
|
|
33
|
-
import prettyMs from 'pretty-ms';
|
|
34
|
-
import * as ws from 'ws';
|
|
35
|
-
import wsDefault from 'ws';
|
|
36
21
|
import { minimatch } from 'minimatch';
|
|
37
|
-
export {
|
|
38
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
22
|
+
export { minimatch };
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsb0JBQW9CO0FBQ3BCLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDM0MsT0FBTyxLQUFLLEVBQUUsTUFBTSxTQUFTLENBQUM7QUFDOUIsT0FBTyxLQUFLLElBQUksTUFBTSxXQUFXLENBQUM7QUFDbEMsT0FBTyxLQUFLLEdBQUcsTUFBTSxVQUFVLENBQUM7QUFDaEMsT0FBTyxLQUFLLElBQUksTUFBTSxXQUFXLENBQUM7QUFDbEMsT0FBTyxLQUFLLEdBQUcsTUFBTSxVQUFVLENBQUM7QUFDaEMsT0FBTyxLQUFLLEdBQUcsTUFBTSxVQUFVLENBQUM7QUFDaEMsT0FBTyxLQUFLLEtBQUssTUFBTSxZQUFZLENBQUM7QUFFcEMsT0FBTyxFQUFFLFlBQVksRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLEdBQUcsRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxLQUFLLEVBQUUsQ0FBQztBQUU5RCxnQkFBZ0I7QUFDaEIsT0FBTyxLQUFLLE9BQU8sTUFBTSxrQkFBa0IsQ0FBQztBQUU1QyxPQUFPLEVBQUUsT0FBTyxFQUFFLENBQUM7QUFFbkIsa0JBQWtCO0FBQ2xCLE9BQU8sS0FBSyxXQUFXLE1BQU0seUJBQXlCLENBQUM7QUFDdkQsT0FBTyxLQUFLLFFBQVEsTUFBTSxzQkFBc0IsQ0FBQztBQUNqRCxPQUFPLEtBQUssd0JBQXdCLE1BQU0sd0NBQXdDLENBQUM7QUFDbkYsT0FBTyxLQUFLLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUVuRCxPQUFPLEVBQ0wsV0FBVyxFQUNYLFFBQVEsRUFDUix3QkFBd0IsRUFDeEIsU0FBUyxHQUNWLENBQUM7QUFFRixvQkFBb0I7QUFDcEIsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUV0QyxPQUFPLEVBQUUsU0FBUyxFQUFFLENBQUMifQ==
|
|
@@ -150,6 +150,19 @@ export interface ISmartProxyOptions {
|
|
|
150
150
|
* Default: true
|
|
151
151
|
*/
|
|
152
152
|
certProvisionFallbackToAcme?: boolean;
|
|
153
|
+
/**
|
|
154
|
+
* Per-domain timeout in ms for certProvisionFunction calls.
|
|
155
|
+
* If a single domain's provisioning takes longer than this, it's aborted
|
|
156
|
+
* and a certificate-failed event is emitted.
|
|
157
|
+
* Default: 300000 (5 minutes)
|
|
158
|
+
*/
|
|
159
|
+
certProvisionTimeout?: number;
|
|
160
|
+
/**
|
|
161
|
+
* Maximum number of domains to provision certificates for concurrently.
|
|
162
|
+
* Prevents overwhelming ACME providers when many domains provision at once.
|
|
163
|
+
* Default: 4
|
|
164
|
+
*/
|
|
165
|
+
certProvisionConcurrency?: number;
|
|
153
166
|
/**
|
|
154
167
|
* Disable the default self-signed fallback certificate.
|
|
155
168
|
* When false (default), a self-signed cert is generated at startup and loaded
|
|
@@ -22,6 +22,7 @@ export declare class SmartProxy extends plugins.EventEmitter {
|
|
|
22
22
|
private metricsAdapter;
|
|
23
23
|
private routeUpdateLock;
|
|
24
24
|
private stopping;
|
|
25
|
+
private certProvisionPromise;
|
|
25
26
|
constructor(settingsArg: ISmartProxyOptions);
|
|
26
27
|
/**
|
|
27
28
|
* Start the proxy.
|
|
@@ -86,6 +87,15 @@ export declare class SmartProxy extends plugins.EventEmitter {
|
|
|
86
87
|
* If it returns 'http01', let Rust handle ACME.
|
|
87
88
|
*/
|
|
88
89
|
private provisionCertificatesViaCallback;
|
|
90
|
+
/**
|
|
91
|
+
* Provision a single domain's certificate via the callback.
|
|
92
|
+
* Includes per-domain timeout and shutdown checks.
|
|
93
|
+
*/
|
|
94
|
+
private provisionSingleDomain;
|
|
95
|
+
/**
|
|
96
|
+
* Race a promise against a timeout. Rejects with the given message if the timeout fires first.
|
|
97
|
+
*/
|
|
98
|
+
private withTimeout;
|
|
89
99
|
/**
|
|
90
100
|
* Normalize routing glob patterns into valid domain identifiers for cert provisioning.
|
|
91
101
|
* - `*nevermind.cloud` → `['nevermind.cloud', '*.nevermind.cloud']`
|
|
@@ -10,6 +10,7 @@ import { SharedRouteManager as RouteManager } from '../../core/routing/route-man
|
|
|
10
10
|
import { RouteValidator } from './utils/route-validator.js';
|
|
11
11
|
import { generateDefaultCertificate } from './utils/default-cert-generator.js';
|
|
12
12
|
import { Mutex } from './utils/mutex.js';
|
|
13
|
+
import { ConcurrencySemaphore } from './utils/concurrency-semaphore.js';
|
|
13
14
|
/**
|
|
14
15
|
* SmartProxy - Rust-backed proxy engine with TypeScript configuration API.
|
|
15
16
|
*
|
|
@@ -25,6 +26,7 @@ export class SmartProxy extends plugins.EventEmitter {
|
|
|
25
26
|
super();
|
|
26
27
|
this.socketHandlerServer = null;
|
|
27
28
|
this.stopping = false;
|
|
29
|
+
this.certProvisionPromise = null;
|
|
28
30
|
// Apply defaults
|
|
29
31
|
this.settings = {
|
|
30
32
|
...settingsArg,
|
|
@@ -158,8 +160,10 @@ export class SmartProxy extends plugins.EventEmitter {
|
|
|
158
160
|
// not block metrics collection.
|
|
159
161
|
this.metricsAdapter.startPolling();
|
|
160
162
|
logger.log('info', 'SmartProxy started (Rust engine)', { component: 'smart-proxy' });
|
|
161
|
-
//
|
|
162
|
-
|
|
163
|
+
// Fire-and-forget cert provisioning — Rust engine is already running and serving traffic.
|
|
164
|
+
// Events (certificate-issued / certificate-failed) fire independently per domain.
|
|
165
|
+
this.certProvisionPromise = this.provisionCertificatesViaCallback(preloadedDomains)
|
|
166
|
+
.catch((err) => logger.log('error', `Unexpected error in cert provisioning: ${err.message}`, { component: 'smart-proxy' }));
|
|
163
167
|
}
|
|
164
168
|
/**
|
|
165
169
|
* Stop the proxy.
|
|
@@ -167,6 +171,11 @@ export class SmartProxy extends plugins.EventEmitter {
|
|
|
167
171
|
async stop() {
|
|
168
172
|
logger.log('info', 'SmartProxy shutting down...', { component: 'smart-proxy' });
|
|
169
173
|
this.stopping = true;
|
|
174
|
+
// Wait for in-flight cert provisioning to bail out (it checks this.stopping)
|
|
175
|
+
if (this.certProvisionPromise) {
|
|
176
|
+
await this.certProvisionPromise;
|
|
177
|
+
this.certProvisionPromise = null;
|
|
178
|
+
}
|
|
170
179
|
// Stop metrics polling
|
|
171
180
|
this.metricsAdapter.stopPolling();
|
|
172
181
|
// Remove exit listener before killing to avoid spurious error events
|
|
@@ -190,7 +199,7 @@ export class SmartProxy extends plugins.EventEmitter {
|
|
|
190
199
|
* Update routes atomically.
|
|
191
200
|
*/
|
|
192
201
|
async updateRoutes(newRoutes) {
|
|
193
|
-
|
|
202
|
+
await this.routeUpdateLock.runExclusive(async () => {
|
|
194
203
|
// Validate
|
|
195
204
|
const validation = RouteValidator.validateRoutes(newRoutes);
|
|
196
205
|
if (!validation.valid) {
|
|
@@ -217,10 +226,12 @@ export class SmartProxy extends plugins.EventEmitter {
|
|
|
217
226
|
}
|
|
218
227
|
// Update stored routes
|
|
219
228
|
this.settings.routes = newRoutes;
|
|
220
|
-
// Handle cert provisioning for new routes
|
|
221
|
-
await this.provisionCertificatesViaCallback();
|
|
222
229
|
logger.log('info', `Routes updated (${newRoutes.length} routes)`, { component: 'smart-proxy' });
|
|
223
230
|
});
|
|
231
|
+
// Fire-and-forget cert provisioning outside the mutex — routes are already updated,
|
|
232
|
+
// cert provisioning doesn't need the route update lock and may be slow.
|
|
233
|
+
this.certProvisionPromise = this.provisionCertificatesViaCallback()
|
|
234
|
+
.catch((err) => logger.log('error', `Unexpected error in cert provisioning after route update: ${err.message}`, { component: 'smart-proxy' }));
|
|
224
235
|
}
|
|
225
236
|
/**
|
|
226
237
|
* Provision a certificate for a named route.
|
|
@@ -341,7 +352,9 @@ export class SmartProxy extends plugins.EventEmitter {
|
|
|
341
352
|
const provisionFn = this.settings.certProvisionFunction;
|
|
342
353
|
if (!provisionFn)
|
|
343
354
|
return;
|
|
344
|
-
|
|
355
|
+
// Phase 1: Collect all unique (domain, route) pairs that need provisioning
|
|
356
|
+
const seen = new Set(skipDomains);
|
|
357
|
+
const tasks = [];
|
|
345
358
|
for (const route of this.settings.routes) {
|
|
346
359
|
if (route.action.tls?.certificate !== 'auto')
|
|
347
360
|
continue;
|
|
@@ -350,82 +363,115 @@ export class SmartProxy extends plugins.EventEmitter {
|
|
|
350
363
|
const rawDomains = Array.isArray(route.match.domains) ? route.match.domains : [route.match.domains];
|
|
351
364
|
const certDomains = this.normalizeDomainsForCertProvisioning(rawDomains);
|
|
352
365
|
for (const domain of certDomains) {
|
|
353
|
-
if (
|
|
366
|
+
if (seen.has(domain))
|
|
354
367
|
continue;
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
368
|
+
seen.add(domain);
|
|
369
|
+
tasks.push({ domain, route });
|
|
370
|
+
}
|
|
371
|
+
}
|
|
372
|
+
if (tasks.length === 0)
|
|
373
|
+
return;
|
|
374
|
+
// Phase 2: Process all domains in parallel with concurrency limit
|
|
375
|
+
const concurrency = this.settings.certProvisionConcurrency ?? 4;
|
|
376
|
+
const semaphore = new ConcurrencySemaphore(concurrency);
|
|
377
|
+
const promises = tasks.map(async ({ domain, route }) => {
|
|
378
|
+
await semaphore.acquire();
|
|
379
|
+
try {
|
|
380
|
+
await this.provisionSingleDomain(domain, route, provisionFn);
|
|
381
|
+
}
|
|
382
|
+
finally {
|
|
383
|
+
semaphore.release();
|
|
384
|
+
}
|
|
385
|
+
});
|
|
386
|
+
await Promise.allSettled(promises);
|
|
387
|
+
}
|
|
388
|
+
/**
|
|
389
|
+
* Provision a single domain's certificate via the callback.
|
|
390
|
+
* Includes per-domain timeout and shutdown checks.
|
|
391
|
+
*/
|
|
392
|
+
async provisionSingleDomain(domain, route, provisionFn) {
|
|
393
|
+
if (this.stopping)
|
|
394
|
+
return;
|
|
395
|
+
let expiryDate;
|
|
396
|
+
let source = 'certProvisionFunction';
|
|
397
|
+
const eventComms = {
|
|
398
|
+
log: (msg) => logger.log('info', `[certProvision ${domain}] ${msg}`, { component: 'smart-proxy' }),
|
|
399
|
+
warn: (msg) => logger.log('warn', `[certProvision ${domain}] ${msg}`, { component: 'smart-proxy' }),
|
|
400
|
+
error: (msg) => logger.log('error', `[certProvision ${domain}] ${msg}`, { component: 'smart-proxy' }),
|
|
401
|
+
setExpiryDate: (date) => { expiryDate = date.toISOString(); },
|
|
402
|
+
setSource: (s) => { source = s; },
|
|
403
|
+
};
|
|
404
|
+
const timeoutMs = this.settings.certProvisionTimeout ?? 300_000; // 5 min default
|
|
405
|
+
try {
|
|
406
|
+
const result = await this.withTimeout(provisionFn(domain, eventComms), timeoutMs, `Certificate provisioning timed out for ${domain} after ${timeoutMs}ms`);
|
|
407
|
+
if (this.stopping)
|
|
408
|
+
return;
|
|
409
|
+
if (result === 'http01') {
|
|
410
|
+
if (route.name) {
|
|
411
|
+
try {
|
|
412
|
+
await this.bridge.provisionCertificate(route.name);
|
|
413
|
+
logger.log('info', `Triggered Rust ACME for ${domain} (route: ${route.name})`, { component: 'smart-proxy' });
|
|
381
414
|
}
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
await this.bridge.loadCertificate(domain, certObj.publicKey, certObj.privateKey);
|
|
386
|
-
logger.log('info', `Certificate loaded via provision function for ${domain}`, { component: 'smart-proxy' });
|
|
387
|
-
// Persist to consumer store
|
|
388
|
-
if (this.settings.certStore?.save) {
|
|
389
|
-
try {
|
|
390
|
-
await this.settings.certStore.save(domain, certObj.publicKey, certObj.privateKey);
|
|
391
|
-
}
|
|
392
|
-
catch (storeErr) {
|
|
393
|
-
logger.log('warn', `certStore.save() failed for ${domain}: ${storeErr.message}`, { component: 'smart-proxy' });
|
|
394
|
-
}
|
|
395
|
-
}
|
|
396
|
-
// Emit certificate-issued event
|
|
397
|
-
this.emit('certificate-issued', {
|
|
398
|
-
domain,
|
|
399
|
-
expiryDate: expiryDate || (certObj.validUntil ? new Date(certObj.validUntil).toISOString() : undefined),
|
|
400
|
-
source,
|
|
401
|
-
});
|
|
415
|
+
catch (provisionErr) {
|
|
416
|
+
logger.log('warn', `Cannot provision cert for ${domain} — callback returned 'http01' but Rust ACME failed: ${provisionErr.message}. ` +
|
|
417
|
+
'Note: Rust ACME is disabled when certProvisionFunction is set.', { component: 'smart-proxy' });
|
|
402
418
|
}
|
|
403
419
|
}
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
logger.log('info', `Falling back to Rust ACME for ${domain} (route: ${route.name})`, { component: 'smart-proxy' });
|
|
417
|
-
}
|
|
418
|
-
catch (acmeErr) {
|
|
419
|
-
logger.log('warn', `ACME fallback also failed for ${domain}: ${acmeErr.message}` +
|
|
420
|
-
(this.settings.disableDefaultCert
|
|
421
|
-
? ' — TLS will fail for this domain (disableDefaultCert is true)'
|
|
422
|
-
: ' — default self-signed fallback cert will be used'), { component: 'smart-proxy' });
|
|
423
|
-
}
|
|
420
|
+
return;
|
|
421
|
+
}
|
|
422
|
+
if (result && typeof result === 'object') {
|
|
423
|
+
if (this.stopping)
|
|
424
|
+
return;
|
|
425
|
+
const certObj = result;
|
|
426
|
+
await this.bridge.loadCertificate(domain, certObj.publicKey, certObj.privateKey);
|
|
427
|
+
logger.log('info', `Certificate loaded via provision function for ${domain}`, { component: 'smart-proxy' });
|
|
428
|
+
// Persist to consumer store
|
|
429
|
+
if (this.settings.certStore?.save) {
|
|
430
|
+
try {
|
|
431
|
+
await this.settings.certStore.save(domain, certObj.publicKey, certObj.privateKey);
|
|
424
432
|
}
|
|
433
|
+
catch (storeErr) {
|
|
434
|
+
logger.log('warn', `certStore.save() failed for ${domain}: ${storeErr.message}`, { component: 'smart-proxy' });
|
|
435
|
+
}
|
|
436
|
+
}
|
|
437
|
+
this.emit('certificate-issued', {
|
|
438
|
+
domain,
|
|
439
|
+
expiryDate: expiryDate || (certObj.validUntil ? new Date(certObj.validUntil).toISOString() : undefined),
|
|
440
|
+
source,
|
|
441
|
+
});
|
|
442
|
+
}
|
|
443
|
+
}
|
|
444
|
+
catch (err) {
|
|
445
|
+
logger.log('warn', `certProvisionFunction failed for ${domain}: ${err.message}`, { component: 'smart-proxy' });
|
|
446
|
+
this.emit('certificate-failed', {
|
|
447
|
+
domain,
|
|
448
|
+
error: err.message,
|
|
449
|
+
source,
|
|
450
|
+
});
|
|
451
|
+
// Fallback to ACME if enabled and route has a name
|
|
452
|
+
if (this.settings.certProvisionFallbackToAcme !== false && route.name) {
|
|
453
|
+
try {
|
|
454
|
+
await this.bridge.provisionCertificate(route.name);
|
|
455
|
+
logger.log('info', `Falling back to Rust ACME for ${domain} (route: ${route.name})`, { component: 'smart-proxy' });
|
|
456
|
+
}
|
|
457
|
+
catch (acmeErr) {
|
|
458
|
+
logger.log('warn', `ACME fallback also failed for ${domain}: ${acmeErr.message}` +
|
|
459
|
+
(this.settings.disableDefaultCert
|
|
460
|
+
? ' — TLS will fail for this domain (disableDefaultCert is true)'
|
|
461
|
+
: ' — default self-signed fallback cert will be used'), { component: 'smart-proxy' });
|
|
425
462
|
}
|
|
426
463
|
}
|
|
427
464
|
}
|
|
428
465
|
}
|
|
466
|
+
/**
|
|
467
|
+
* Race a promise against a timeout. Rejects with the given message if the timeout fires first.
|
|
468
|
+
*/
|
|
469
|
+
withTimeout(promise, ms, message) {
|
|
470
|
+
return new Promise((resolve, reject) => {
|
|
471
|
+
const timer = setTimeout(() => reject(new Error(message)), ms);
|
|
472
|
+
promise.then((val) => { clearTimeout(timer); resolve(val); }, (err) => { clearTimeout(timer); reject(err); });
|
|
473
|
+
});
|
|
474
|
+
}
|
|
429
475
|
/**
|
|
430
476
|
* Normalize routing glob patterns into valid domain identifiers for cert provisioning.
|
|
431
477
|
* - `*nevermind.cloud` → `['nevermind.cloud', '*.nevermind.cloud']`
|
|
@@ -468,4 +514,4 @@ export class SmartProxy extends plugins.EventEmitter {
|
|
|
468
514
|
return validDomainRegex.test(domain);
|
|
469
515
|
}
|
|
470
516
|
}
|
|
471
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smart-proxy.js","sourceRoot":"","sources":["../../../ts/proxies/smart-proxy/smart-proxy.ts"],"names":[],"mappings":"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"}
|
|
517
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smart-proxy.js","sourceRoot":"","sources":["../../../ts/proxies/smart-proxy/smart-proxy.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Async concurrency semaphore — limits the number of concurrent async operations.
|
|
3
|
+
*/
|
|
4
|
+
export declare class ConcurrencySemaphore {
|
|
5
|
+
private readonly maxConcurrency;
|
|
6
|
+
private running;
|
|
7
|
+
private waitQueue;
|
|
8
|
+
constructor(maxConcurrency: number);
|
|
9
|
+
acquire(): Promise<void>;
|
|
10
|
+
release(): void;
|
|
11
|
+
}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Async concurrency semaphore — limits the number of concurrent async operations.
|
|
3
|
+
*/
|
|
4
|
+
export class ConcurrencySemaphore {
|
|
5
|
+
constructor(maxConcurrency) {
|
|
6
|
+
this.maxConcurrency = maxConcurrency;
|
|
7
|
+
this.running = 0;
|
|
8
|
+
this.waitQueue = [];
|
|
9
|
+
}
|
|
10
|
+
async acquire() {
|
|
11
|
+
if (this.running < this.maxConcurrency) {
|
|
12
|
+
this.running++;
|
|
13
|
+
return;
|
|
14
|
+
}
|
|
15
|
+
return new Promise((resolve) => {
|
|
16
|
+
this.waitQueue.push(() => {
|
|
17
|
+
this.running++;
|
|
18
|
+
resolve();
|
|
19
|
+
});
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
release() {
|
|
23
|
+
this.running--;
|
|
24
|
+
const next = this.waitQueue.shift();
|
|
25
|
+
if (next)
|
|
26
|
+
next();
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uY3VycmVuY3ktc2VtYXBob3JlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vdHMvcHJveGllcy9zbWFydC1wcm94eS91dGlscy9jb25jdXJyZW5jeS1zZW1hcGhvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7O0dBRUc7QUFDSCxNQUFNLE9BQU8sb0JBQW9CO0lBSS9CLFlBQTZCLGNBQXNCO1FBQXRCLG1CQUFjLEdBQWQsY0FBYyxDQUFRO1FBSDNDLFlBQU8sR0FBRyxDQUFDLENBQUM7UUFDWixjQUFTLEdBQXNCLEVBQUUsQ0FBQztJQUVZLENBQUM7SUFFdkQsS0FBSyxDQUFDLE9BQU87UUFDWCxJQUFJLElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDLGNBQWMsRUFBRSxDQUFDO1lBQ3ZDLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNmLE9BQU87UUFDVCxDQUFDO1FBQ0QsT0FBTyxJQUFJLE9BQU8sQ0FBTyxDQUFDLE9BQU8sRUFBRSxFQUFFO1lBQ25DLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRTtnQkFDdkIsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO2dCQUNmLE9BQU8sRUFBRSxDQUFDO1lBQ1osQ0FBQyxDQUFDLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxPQUFPO1FBQ0wsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2YsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNwQyxJQUFJLElBQUk7WUFBRSxJQUFJLEVBQUUsQ0FBQztJQUNuQixDQUFDO0NBQ0YifQ==
|
|
@@ -8,4 +8,5 @@ export * from './route-helpers.js';
|
|
|
8
8
|
export * from './route-validator.js';
|
|
9
9
|
export * from './route-utils.js';
|
|
10
10
|
export { generateDefaultCertificate } from './default-cert-generator.js';
|
|
11
|
+
export { ConcurrencySemaphore } from './concurrency-semaphore.js';
|
|
11
12
|
export { createApiGatewayRoute, addRateLimiting, addBasicAuth, addJwtAuth } from './route-helpers.js';
|
|
@@ -12,6 +12,8 @@ export * from './route-validator.js';
|
|
|
12
12
|
export * from './route-utils.js';
|
|
13
13
|
// Export default certificate generator
|
|
14
14
|
export { generateDefaultCertificate } from './default-cert-generator.js';
|
|
15
|
+
// Export concurrency semaphore
|
|
16
|
+
export { ConcurrencySemaphore } from './concurrency-semaphore.js';
|
|
15
17
|
// Export additional functions from route-helpers that weren't already exported
|
|
16
18
|
export { createApiGatewayRoute, addRateLimiting, addBasicAuth, addJwtAuth } from './route-helpers.js';
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi90cy9wcm94aWVzL3NtYXJ0LXByb3h5L3V0aWxzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7OztHQUtHO0FBRUgseURBQXlEO0FBQ3pELGNBQWMsb0JBQW9CLENBQUM7QUFFbkMsMERBQTBEO0FBQzFELGNBQWMsc0JBQXNCLENBQUM7QUFFckMsOENBQThDO0FBQzlDLGNBQWMsa0JBQWtCLENBQUM7QUFFakMsdUNBQXVDO0FBQ3ZDLE9BQU8sRUFBRSwwQkFBMEIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRXpFLCtCQUErQjtBQUMvQixPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUVsRSwrRUFBK0U7QUFDL0UsT0FBTyxFQUNMLHFCQUFxQixFQUNyQixlQUFlLEVBQ2YsWUFBWSxFQUNaLFVBQVUsRUFDWCxNQUFNLG9CQUFvQixDQUFDIn0=
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartproxy",
|
|
3
|
-
"version": "25.
|
|
3
|
+
"version": "25.3.1",
|
|
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",
|
|
@@ -25,25 +25,11 @@
|
|
|
25
25
|
"why-is-node-running": "^3.2.2"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@push.rocks/lik": "^6.2.2",
|
|
29
|
-
"@push.rocks/smartacme": "^8.0.0",
|
|
30
28
|
"@push.rocks/smartcrypto": "^2.0.4",
|
|
31
|
-
"@push.rocks/smartdelay": "^3.0.5",
|
|
32
|
-
"@push.rocks/smartfile": "^13.1.2",
|
|
33
29
|
"@push.rocks/smartlog": "^3.1.10",
|
|
34
|
-
"@push.rocks/smartnetwork": "^4.4.0",
|
|
35
|
-
"@push.rocks/smartpromise": "^4.2.3",
|
|
36
|
-
"@push.rocks/smartrequest": "^5.0.1",
|
|
37
30
|
"@push.rocks/smartrust": "^1.2.1",
|
|
38
|
-
"@push.rocks/smartrx": "^3.0.10",
|
|
39
|
-
"@push.rocks/smartstring": "^4.1.0",
|
|
40
|
-
"@push.rocks/taskbuffer": "^4.2.0",
|
|
41
31
|
"@tsclass/tsclass": "^9.3.0",
|
|
42
|
-
"
|
|
43
|
-
"@types/ws": "^8.18.1",
|
|
44
|
-
"minimatch": "^10.2.0",
|
|
45
|
-
"pretty-ms": "^9.3.0",
|
|
46
|
-
"ws": "^8.19.0"
|
|
32
|
+
"minimatch": "^10.2.0"
|
|
47
33
|
},
|
|
48
34
|
"files": [
|
|
49
35
|
"ts/**/*",
|
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: '25.
|
|
6
|
+
version: '25.3.1',
|
|
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
|
}
|
package/ts/plugins.ts
CHANGED
|
@@ -2,14 +2,13 @@
|
|
|
2
2
|
import { EventEmitter } from 'node:events';
|
|
3
3
|
import * as fs from 'node:fs';
|
|
4
4
|
import * as http from 'node:http';
|
|
5
|
-
import * as https from 'node:https';
|
|
6
5
|
import * as net from 'node:net';
|
|
7
6
|
import * as path from 'node:path';
|
|
8
7
|
import * as tls from 'node:tls';
|
|
9
8
|
import * as url from 'node:url';
|
|
10
9
|
import * as http2 from 'node:http2';
|
|
11
10
|
|
|
12
|
-
export { EventEmitter, fs, http,
|
|
11
|
+
export { EventEmitter, fs, http, net, path, tls, url, http2 };
|
|
13
12
|
|
|
14
13
|
// tsclass scope
|
|
15
14
|
import * as tsclass from '@tsclass/tsclass';
|
|
@@ -17,44 +16,19 @@ import * as tsclass from '@tsclass/tsclass';
|
|
|
17
16
|
export { tsclass };
|
|
18
17
|
|
|
19
18
|
// pushrocks scope
|
|
20
|
-
import * as lik from '@push.rocks/lik';
|
|
21
|
-
import * as smartdelay from '@push.rocks/smartdelay';
|
|
22
|
-
import * as smartpromise from '@push.rocks/smartpromise';
|
|
23
|
-
import * as smartrequest from '@push.rocks/smartrequest';
|
|
24
|
-
import * as smartstring from '@push.rocks/smartstring';
|
|
25
|
-
import * as smartfile from '@push.rocks/smartfile';
|
|
26
19
|
import * as smartcrypto from '@push.rocks/smartcrypto';
|
|
27
|
-
import * as smartacme from '@push.rocks/smartacme';
|
|
28
|
-
import * as smartacmePlugins from '@push.rocks/smartacme/dist_ts/smartacme.plugins.js';
|
|
29
|
-
import * as smartacmeHandlers from '@push.rocks/smartacme/dist_ts/handlers/index.js';
|
|
30
20
|
import * as smartlog from '@push.rocks/smartlog';
|
|
31
21
|
import * as smartlogDestinationLocal from '@push.rocks/smartlog/destination-local';
|
|
32
|
-
import * as taskbuffer from '@push.rocks/taskbuffer';
|
|
33
|
-
import * as smartrx from '@push.rocks/smartrx';
|
|
34
22
|
import * as smartrust from '@push.rocks/smartrust';
|
|
35
23
|
|
|
36
24
|
export {
|
|
37
|
-
lik,
|
|
38
|
-
smartdelay,
|
|
39
|
-
smartrequest,
|
|
40
|
-
smartpromise,
|
|
41
|
-
smartstring,
|
|
42
|
-
smartfile,
|
|
43
25
|
smartcrypto,
|
|
44
|
-
smartacme,
|
|
45
|
-
smartacmePlugins,
|
|
46
|
-
smartacmeHandlers,
|
|
47
26
|
smartlog,
|
|
48
27
|
smartlogDestinationLocal,
|
|
49
|
-
taskbuffer,
|
|
50
|
-
smartrx,
|
|
51
28
|
smartrust,
|
|
52
29
|
};
|
|
53
30
|
|
|
54
31
|
// third party scope
|
|
55
|
-
import prettyMs from 'pretty-ms';
|
|
56
|
-
import * as ws from 'ws';
|
|
57
|
-
import wsDefault from 'ws';
|
|
58
32
|
import { minimatch } from 'minimatch';
|
|
59
33
|
|
|
60
|
-
export {
|
|
34
|
+
export { minimatch };
|
|
@@ -180,6 +180,21 @@ export interface ISmartProxyOptions {
|
|
|
180
180
|
*/
|
|
181
181
|
certProvisionFallbackToAcme?: boolean;
|
|
182
182
|
|
|
183
|
+
/**
|
|
184
|
+
* Per-domain timeout in ms for certProvisionFunction calls.
|
|
185
|
+
* If a single domain's provisioning takes longer than this, it's aborted
|
|
186
|
+
* and a certificate-failed event is emitted.
|
|
187
|
+
* Default: 300000 (5 minutes)
|
|
188
|
+
*/
|
|
189
|
+
certProvisionTimeout?: number;
|
|
190
|
+
|
|
191
|
+
/**
|
|
192
|
+
* Maximum number of domains to provision certificates for concurrently.
|
|
193
|
+
* Prevents overwhelming ACME providers when many domains provision at once.
|
|
194
|
+
* Default: 4
|
|
195
|
+
*/
|
|
196
|
+
certProvisionConcurrency?: number;
|
|
197
|
+
|
|
183
198
|
/**
|
|
184
199
|
* Disable the default self-signed fallback certificate.
|
|
185
200
|
* When false (default), a self-signed cert is generated at startup and loaded
|
|
@@ -12,6 +12,7 @@ import { SharedRouteManager as RouteManager } from '../../core/routing/route-man
|
|
|
12
12
|
import { RouteValidator } from './utils/route-validator.js';
|
|
13
13
|
import { generateDefaultCertificate } from './utils/default-cert-generator.js';
|
|
14
14
|
import { Mutex } from './utils/mutex.js';
|
|
15
|
+
import { ConcurrencySemaphore } from './utils/concurrency-semaphore.js';
|
|
15
16
|
|
|
16
17
|
// Types
|
|
17
18
|
import type { ISmartProxyOptions, TSmartProxyCertProvisionObject, IAcmeOptions, ICertProvisionEventComms, ICertificateIssuedEvent, ICertificateFailedEvent } from './models/interfaces.js';
|
|
@@ -38,6 +39,7 @@ export class SmartProxy extends plugins.EventEmitter {
|
|
|
38
39
|
private metricsAdapter: RustMetricsAdapter;
|
|
39
40
|
private routeUpdateLock: Mutex;
|
|
40
41
|
private stopping = false;
|
|
42
|
+
private certProvisionPromise: Promise<void> | null = null;
|
|
41
43
|
|
|
42
44
|
constructor(settingsArg: ISmartProxyOptions) {
|
|
43
45
|
super();
|
|
@@ -199,8 +201,10 @@ export class SmartProxy extends plugins.EventEmitter {
|
|
|
199
201
|
|
|
200
202
|
logger.log('info', 'SmartProxy started (Rust engine)', { component: 'smart-proxy' });
|
|
201
203
|
|
|
202
|
-
//
|
|
203
|
-
|
|
204
|
+
// Fire-and-forget cert provisioning — Rust engine is already running and serving traffic.
|
|
205
|
+
// Events (certificate-issued / certificate-failed) fire independently per domain.
|
|
206
|
+
this.certProvisionPromise = this.provisionCertificatesViaCallback(preloadedDomains)
|
|
207
|
+
.catch((err) => logger.log('error', `Unexpected error in cert provisioning: ${err.message}`, { component: 'smart-proxy' }));
|
|
204
208
|
}
|
|
205
209
|
|
|
206
210
|
/**
|
|
@@ -210,6 +214,12 @@ export class SmartProxy extends plugins.EventEmitter {
|
|
|
210
214
|
logger.log('info', 'SmartProxy shutting down...', { component: 'smart-proxy' });
|
|
211
215
|
this.stopping = true;
|
|
212
216
|
|
|
217
|
+
// Wait for in-flight cert provisioning to bail out (it checks this.stopping)
|
|
218
|
+
if (this.certProvisionPromise) {
|
|
219
|
+
await this.certProvisionPromise;
|
|
220
|
+
this.certProvisionPromise = null;
|
|
221
|
+
}
|
|
222
|
+
|
|
213
223
|
// Stop metrics polling
|
|
214
224
|
this.metricsAdapter.stopPolling();
|
|
215
225
|
|
|
@@ -237,7 +247,7 @@ export class SmartProxy extends plugins.EventEmitter {
|
|
|
237
247
|
* Update routes atomically.
|
|
238
248
|
*/
|
|
239
249
|
public async updateRoutes(newRoutes: IRouteConfig[]): Promise<void> {
|
|
240
|
-
|
|
250
|
+
await this.routeUpdateLock.runExclusive(async () => {
|
|
241
251
|
// Validate
|
|
242
252
|
const validation = RouteValidator.validateRoutes(newRoutes);
|
|
243
253
|
if (!validation.valid) {
|
|
@@ -273,11 +283,13 @@ export class SmartProxy extends plugins.EventEmitter {
|
|
|
273
283
|
// Update stored routes
|
|
274
284
|
this.settings.routes = newRoutes;
|
|
275
285
|
|
|
276
|
-
// Handle cert provisioning for new routes
|
|
277
|
-
await this.provisionCertificatesViaCallback();
|
|
278
|
-
|
|
279
286
|
logger.log('info', `Routes updated (${newRoutes.length} routes)`, { component: 'smart-proxy' });
|
|
280
287
|
});
|
|
288
|
+
|
|
289
|
+
// Fire-and-forget cert provisioning outside the mutex — routes are already updated,
|
|
290
|
+
// cert provisioning doesn't need the route update lock and may be slow.
|
|
291
|
+
this.certProvisionPromise = this.provisionCertificatesViaCallback()
|
|
292
|
+
.catch((err) => logger.log('error', `Unexpected error in cert provisioning after route update: ${err.message}`, { component: 'smart-proxy' }));
|
|
281
293
|
}
|
|
282
294
|
|
|
283
295
|
/**
|
|
@@ -412,7 +424,9 @@ export class SmartProxy extends plugins.EventEmitter {
|
|
|
412
424
|
const provisionFn = this.settings.certProvisionFunction;
|
|
413
425
|
if (!provisionFn) return;
|
|
414
426
|
|
|
415
|
-
|
|
427
|
+
// Phase 1: Collect all unique (domain, route) pairs that need provisioning
|
|
428
|
+
const seen = new Set<string>(skipDomains);
|
|
429
|
+
const tasks: Array<{ domain: string; route: IRouteConfig }> = [];
|
|
416
430
|
|
|
417
431
|
for (const route of this.settings.routes) {
|
|
418
432
|
if (route.action.tls?.certificate !== 'auto') continue;
|
|
@@ -422,91 +436,139 @@ export class SmartProxy extends plugins.EventEmitter {
|
|
|
422
436
|
const certDomains = this.normalizeDomainsForCertProvisioning(rawDomains);
|
|
423
437
|
|
|
424
438
|
for (const domain of certDomains) {
|
|
425
|
-
if (
|
|
426
|
-
|
|
439
|
+
if (seen.has(domain)) continue;
|
|
440
|
+
seen.add(domain);
|
|
441
|
+
tasks.push({ domain, route });
|
|
442
|
+
}
|
|
443
|
+
}
|
|
427
444
|
|
|
428
|
-
|
|
429
|
-
let expiryDate: string | undefined;
|
|
430
|
-
let source = 'certProvisionFunction';
|
|
445
|
+
if (tasks.length === 0) return;
|
|
431
446
|
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
error: (msg) => logger.log('error', `[certProvision ${domain}] ${msg}`, { component: 'smart-proxy' }),
|
|
436
|
-
setExpiryDate: (date) => { expiryDate = date.toISOString(); },
|
|
437
|
-
setSource: (s) => { source = s; },
|
|
438
|
-
};
|
|
447
|
+
// Phase 2: Process all domains in parallel with concurrency limit
|
|
448
|
+
const concurrency = this.settings.certProvisionConcurrency ?? 4;
|
|
449
|
+
const semaphore = new ConcurrencySemaphore(concurrency);
|
|
439
450
|
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
451
|
+
const promises = tasks.map(async ({ domain, route }) => {
|
|
452
|
+
await semaphore.acquire();
|
|
453
|
+
try {
|
|
454
|
+
await this.provisionSingleDomain(domain, route, provisionFn);
|
|
455
|
+
} finally {
|
|
456
|
+
semaphore.release();
|
|
457
|
+
}
|
|
458
|
+
});
|
|
459
|
+
|
|
460
|
+
await Promise.allSettled(promises);
|
|
461
|
+
}
|
|
462
|
+
|
|
463
|
+
/**
|
|
464
|
+
* Provision a single domain's certificate via the callback.
|
|
465
|
+
* Includes per-domain timeout and shutdown checks.
|
|
466
|
+
*/
|
|
467
|
+
private async provisionSingleDomain(
|
|
468
|
+
domain: string,
|
|
469
|
+
route: IRouteConfig,
|
|
470
|
+
provisionFn: (domain: string, eventComms: ICertProvisionEventComms) => Promise<TSmartProxyCertProvisionObject>,
|
|
471
|
+
): Promise<void> {
|
|
472
|
+
if (this.stopping) return;
|
|
473
|
+
|
|
474
|
+
let expiryDate: string | undefined;
|
|
475
|
+
let source = 'certProvisionFunction';
|
|
476
|
+
|
|
477
|
+
const eventComms: ICertProvisionEventComms = {
|
|
478
|
+
log: (msg) => logger.log('info', `[certProvision ${domain}] ${msg}`, { component: 'smart-proxy' }),
|
|
479
|
+
warn: (msg) => logger.log('warn', `[certProvision ${domain}] ${msg}`, { component: 'smart-proxy' }),
|
|
480
|
+
error: (msg) => logger.log('error', `[certProvision ${domain}] ${msg}`, { component: 'smart-proxy' }),
|
|
481
|
+
setExpiryDate: (date) => { expiryDate = date.toISOString(); },
|
|
482
|
+
setSource: (s) => { source = s; },
|
|
483
|
+
};
|
|
484
|
+
|
|
485
|
+
const timeoutMs = this.settings.certProvisionTimeout ?? 300_000; // 5 min default
|
|
486
|
+
|
|
487
|
+
try {
|
|
488
|
+
const result: TSmartProxyCertProvisionObject = await this.withTimeout(
|
|
489
|
+
provisionFn(domain, eventComms),
|
|
490
|
+
timeoutMs,
|
|
491
|
+
`Certificate provisioning timed out for ${domain} after ${timeoutMs}ms`,
|
|
492
|
+
);
|
|
456
493
|
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
logger.log('
|
|
466
|
-
|
|
467
|
-
// Persist to consumer store
|
|
468
|
-
if (this.settings.certStore?.save) {
|
|
469
|
-
try {
|
|
470
|
-
await this.settings.certStore.save(domain, certObj.publicKey, certObj.privateKey);
|
|
471
|
-
} catch (storeErr: any) {
|
|
472
|
-
logger.log('warn', `certStore.save() failed for ${domain}: ${storeErr.message}`, { component: 'smart-proxy' });
|
|
473
|
-
}
|
|
474
|
-
}
|
|
475
|
-
|
|
476
|
-
// Emit certificate-issued event
|
|
477
|
-
this.emit('certificate-issued', {
|
|
478
|
-
domain,
|
|
479
|
-
expiryDate: expiryDate || (certObj.validUntil ? new Date(certObj.validUntil).toISOString() : undefined),
|
|
480
|
-
source,
|
|
481
|
-
} satisfies ICertificateIssuedEvent);
|
|
494
|
+
if (this.stopping) return;
|
|
495
|
+
|
|
496
|
+
if (result === 'http01') {
|
|
497
|
+
if (route.name) {
|
|
498
|
+
try {
|
|
499
|
+
await this.bridge.provisionCertificate(route.name);
|
|
500
|
+
logger.log('info', `Triggered Rust ACME for ${domain} (route: ${route.name})`, { component: 'smart-proxy' });
|
|
501
|
+
} catch (provisionErr: any) {
|
|
502
|
+
logger.log('warn', `Cannot provision cert for ${domain} — callback returned 'http01' but Rust ACME failed: ${provisionErr.message}. ` +
|
|
503
|
+
'Note: Rust ACME is disabled when certProvisionFunction is set.', { component: 'smart-proxy' });
|
|
482
504
|
}
|
|
483
|
-
}
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
}
|
|
505
|
+
}
|
|
506
|
+
return;
|
|
507
|
+
}
|
|
508
|
+
|
|
509
|
+
if (result && typeof result === 'object') {
|
|
510
|
+
if (this.stopping) return;
|
|
511
|
+
|
|
512
|
+
const certObj = result as plugins.tsclass.network.ICert;
|
|
513
|
+
await this.bridge.loadCertificate(
|
|
514
|
+
domain,
|
|
515
|
+
certObj.publicKey,
|
|
516
|
+
certObj.privateKey,
|
|
517
|
+
);
|
|
518
|
+
logger.log('info', `Certificate loaded via provision function for ${domain}`, { component: 'smart-proxy' });
|
|
519
|
+
|
|
520
|
+
// Persist to consumer store
|
|
521
|
+
if (this.settings.certStore?.save) {
|
|
522
|
+
try {
|
|
523
|
+
await this.settings.certStore.save(domain, certObj.publicKey, certObj.privateKey);
|
|
524
|
+
} catch (storeErr: any) {
|
|
525
|
+
logger.log('warn', `certStore.save() failed for ${domain}: ${storeErr.message}`, { component: 'smart-proxy' });
|
|
504
526
|
}
|
|
505
527
|
}
|
|
528
|
+
|
|
529
|
+
this.emit('certificate-issued', {
|
|
530
|
+
domain,
|
|
531
|
+
expiryDate: expiryDate || (certObj.validUntil ? new Date(certObj.validUntil).toISOString() : undefined),
|
|
532
|
+
source,
|
|
533
|
+
} satisfies ICertificateIssuedEvent);
|
|
534
|
+
}
|
|
535
|
+
} catch (err: any) {
|
|
536
|
+
logger.log('warn', `certProvisionFunction failed for ${domain}: ${err.message}`, { component: 'smart-proxy' });
|
|
537
|
+
|
|
538
|
+
this.emit('certificate-failed', {
|
|
539
|
+
domain,
|
|
540
|
+
error: err.message,
|
|
541
|
+
source,
|
|
542
|
+
} satisfies ICertificateFailedEvent);
|
|
543
|
+
|
|
544
|
+
// Fallback to ACME if enabled and route has a name
|
|
545
|
+
if (this.settings.certProvisionFallbackToAcme !== false && route.name) {
|
|
546
|
+
try {
|
|
547
|
+
await this.bridge.provisionCertificate(route.name);
|
|
548
|
+
logger.log('info', `Falling back to Rust ACME for ${domain} (route: ${route.name})`, { component: 'smart-proxy' });
|
|
549
|
+
} catch (acmeErr: any) {
|
|
550
|
+
logger.log('warn', `ACME fallback also failed for ${domain}: ${acmeErr.message}` +
|
|
551
|
+
(this.settings.disableDefaultCert
|
|
552
|
+
? ' — TLS will fail for this domain (disableDefaultCert is true)'
|
|
553
|
+
: ' — default self-signed fallback cert will be used'), { component: 'smart-proxy' });
|
|
554
|
+
}
|
|
506
555
|
}
|
|
507
556
|
}
|
|
508
557
|
}
|
|
509
558
|
|
|
559
|
+
/**
|
|
560
|
+
* Race a promise against a timeout. Rejects with the given message if the timeout fires first.
|
|
561
|
+
*/
|
|
562
|
+
private withTimeout<T>(promise: Promise<T>, ms: number, message: string): Promise<T> {
|
|
563
|
+
return new Promise<T>((resolve, reject) => {
|
|
564
|
+
const timer = setTimeout(() => reject(new Error(message)), ms);
|
|
565
|
+
promise.then(
|
|
566
|
+
(val) => { clearTimeout(timer); resolve(val); },
|
|
567
|
+
(err) => { clearTimeout(timer); reject(err); },
|
|
568
|
+
);
|
|
569
|
+
});
|
|
570
|
+
}
|
|
571
|
+
|
|
510
572
|
/**
|
|
511
573
|
* Normalize routing glob patterns into valid domain identifiers for cert provisioning.
|
|
512
574
|
* - `*nevermind.cloud` → `['nevermind.cloud', '*.nevermind.cloud']`
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Async concurrency semaphore — limits the number of concurrent async operations.
|
|
3
|
+
*/
|
|
4
|
+
export class ConcurrencySemaphore {
|
|
5
|
+
private running = 0;
|
|
6
|
+
private waitQueue: Array<() => void> = [];
|
|
7
|
+
|
|
8
|
+
constructor(private readonly maxConcurrency: number) {}
|
|
9
|
+
|
|
10
|
+
async acquire(): Promise<void> {
|
|
11
|
+
if (this.running < this.maxConcurrency) {
|
|
12
|
+
this.running++;
|
|
13
|
+
return;
|
|
14
|
+
}
|
|
15
|
+
return new Promise<void>((resolve) => {
|
|
16
|
+
this.waitQueue.push(() => {
|
|
17
|
+
this.running++;
|
|
18
|
+
resolve();
|
|
19
|
+
});
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
release(): void {
|
|
24
|
+
this.running--;
|
|
25
|
+
const next = this.waitQueue.shift();
|
|
26
|
+
if (next) next();
|
|
27
|
+
}
|
|
28
|
+
}
|
|
@@ -17,6 +17,9 @@ export * from './route-utils.js';
|
|
|
17
17
|
// Export default certificate generator
|
|
18
18
|
export { generateDefaultCertificate } from './default-cert-generator.js';
|
|
19
19
|
|
|
20
|
+
// Export concurrency semaphore
|
|
21
|
+
export { ConcurrencySemaphore } from './concurrency-semaphore.js';
|
|
22
|
+
|
|
20
23
|
// Export additional functions from route-helpers that weren't already exported
|
|
21
24
|
export {
|
|
22
25
|
createApiGatewayRoute,
|