@push.rocks/smartproxy 23.1.6 → 24.0.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 CHANGED
@@ -1,5 +1,28 @@
1
1
  # Changelog
2
2
 
3
+ ## 2026-02-13 - 24.0.1 - fix(proxy)
4
+ improve proxy robustness: add connect timeouts, graceful shutdown, WebSocket watchdog, and metrics guard
5
+
6
+ - Add tokio-util CancellationToken to HTTP handlers to support graceful shutdown (stop accepting new requests while letting in-flight requests finish).
7
+ - Introduce configurable upstream connect timeout (DEFAULT_CONNECT_TIMEOUT) and return 504 Gateway Timeout on connect timeouts to avoid hanging connections.
8
+ - Add WebSocket watchdog with inactivity and max-lifetime checks, activity tracking via AtomicU64, and cancellation-driven tunnel aborts.
9
+ - Add ConnectionGuard RAII in passthrough listener to ensure metrics.connection_closed() is called on all exit paths and disarm the guard when handing off to the HTTP proxy.
10
+ - Expose HttpProxyService::with_connect_timeout and wire connection timeout from ConnectionConfig into listeners.
11
+ - Add tokio-util workspace dependency (CancellationToken) and related code changes across rustproxy-http and rustproxy-passthrough.
12
+
13
+ ## 2026-02-13 - 24.0.0 - BREAKING CHANGE(smart-proxy)
14
+ move certificate persistence to an in-memory store and introduce consumer-managed certStore API; add default self-signed fallback cert and change ACME account handling
15
+
16
+ - Cert persistence removed from Rust side: CertStore is now an in-memory cache (no filesystem reads/writes). Rust no longer persists or loads certs from disk.
17
+ - ACME account credentials are no longer persisted by the library; AcmeClient uses ephemeral accounts only and account persistence APIs were removed.
18
+ - TypeScript API changes: removed certificateStore option and added ISmartProxyCertStore + certStore option for consumer-provided persistence (loadAll, save, optional remove).
19
+ - Default self-signed fallback certificate added (generateDefaultCertificate) and loaded as '*' unless disableDefaultCert is set.
20
+ - SmartProxy now pre-loads certificates from consumer certStore on startup and persists certificates by calling certStore.save() after provisioning.
21
+ - provisionCertificatesViaCallback signature changed to accept preloaded domains (prevents re-provisioning), and ACME fallback behavior adjusted with clearer logging.
22
+ - Rust cert manager methods made infallible for cache-only operations (load_static/store no longer return errors for cache insertions); removed store-backed load_all/remove/base_dir APIs.
23
+ - TCP listener tls_configs concurrency improved: switched to ArcSwap<HashMap<...>> so accept loops see hot-reloads immediately.
24
+ - Removed dependencies related to filesystem cert persistence from the tls crate (serde_json, tempfile) and corresponding Cargo.lock changes and test updates.
25
+
3
26
  ## 2026-02-13 - 23.1.6 - fix(smart-proxy)
4
27
  disable built-in Rust ACME when a certProvisionFunction is provided and improve certificate provisioning flow
5
28
 
Binary file
Binary file
@@ -3,7 +3,7 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@push.rocks/smartproxy',
6
- version: '23.1.6',
6
+ version: '24.0.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=
@@ -76,7 +76,6 @@ export interface IAcmeOptions {
76
76
  renewThresholdDays?: number;
77
77
  renewCheckIntervalHours?: number;
78
78
  autoRenew?: boolean;
79
- certificateStore?: string;
80
79
  skipConfiguredCerts?: boolean;
81
80
  domainForwards?: IDomainForwardConfig[];
82
81
  }
@@ -1,6 +1,6 @@
1
1
  /**
2
2
  * SmartProxy models
3
3
  */
4
- export type { ISmartProxyOptions, IConnectionRecord, TSmartProxyCertProvisionObject } from './interfaces.js';
4
+ export type { ISmartProxyOptions, ISmartProxyCertStore, IConnectionRecord, TSmartProxyCertProvisionObject } from './interfaces.js';
5
5
  export * from './route-types.js';
6
6
  export * from './metrics-types.js';
@@ -9,11 +9,27 @@ export interface IAcmeOptions {
9
9
  useProduction?: boolean;
10
10
  renewThresholdDays?: number;
11
11
  autoRenew?: boolean;
12
- certificateStore?: string;
13
12
  skipConfiguredCerts?: boolean;
14
13
  renewCheckIntervalHours?: number;
15
14
  routeForwards?: any[];
16
15
  }
16
+ /**
17
+ * Consumer-provided certificate storage.
18
+ * SmartProxy never writes certs to disk — the consumer owns all persistence.
19
+ */
20
+ export interface ISmartProxyCertStore {
21
+ /** Load all stored certs on startup (called once before cert provisioning) */
22
+ loadAll: () => Promise<Array<{
23
+ domain: string;
24
+ publicKey: string;
25
+ privateKey: string;
26
+ ca?: string;
27
+ }>>;
28
+ /** Save a cert after successful provisioning */
29
+ save: (domain: string, publicKey: string, privateKey: string, ca?: string) => Promise<void>;
30
+ /** Remove a cert (optional) */
31
+ remove?: (domain: string) => Promise<void>;
32
+ }
17
33
  import type { IRouteConfig } from './route-types.js';
18
34
  /**
19
35
  * Provision object for static or HTTP-01 certificate
@@ -105,6 +121,18 @@ export interface ISmartProxyOptions {
105
121
  * Default: true
106
122
  */
107
123
  certProvisionFallbackToAcme?: boolean;
124
+ /**
125
+ * Disable the default self-signed fallback certificate.
126
+ * When false (default), a self-signed cert is generated at startup and loaded
127
+ * as '*' so TLS handshakes never fail due to missing certs.
128
+ */
129
+ disableDefaultCert?: boolean;
130
+ /**
131
+ * Consumer-provided cert storage. SmartProxy never writes certs to disk.
132
+ * On startup, loadAll() is called to pre-load persisted certs.
133
+ * After each successful cert provision, save() is called.
134
+ */
135
+ certStore?: ISmartProxyCertStore;
108
136
  /**
109
137
  * Path to the RustProxy binary. If not set, the binary is located
110
138
  * automatically via env var, platform package, local build, or PATH.
@@ -8,6 +8,7 @@ import { RustMetricsAdapter } from './rust-metrics-adapter.js';
8
8
  // Route management
9
9
  import { SharedRouteManager as RouteManager } from '../../core/routing/route-manager.js';
10
10
  import { RouteValidator } from './utils/route-validator.js';
11
+ import { generateDefaultCertificate } from './utils/default-cert-generator.js';
11
12
  import { Mutex } from './utils/mutex.js';
12
13
  /**
13
14
  * SmartProxy - Rust-backed proxy engine with TypeScript configuration API.
@@ -50,7 +51,6 @@ export class SmartProxy extends plugins.EventEmitter {
50
51
  useProduction: this.settings.acme.useProduction || false,
51
52
  renewThresholdDays: this.settings.acme.renewThresholdDays || 30,
52
53
  autoRenew: this.settings.acme.autoRenew !== false,
53
- certificateStore: this.settings.acme.certificateStore || './certs',
54
54
  skipConfiguredCerts: this.settings.acme.skipConfiguredCerts || false,
55
55
  renewCheckIntervalHours: this.settings.acme.renewCheckIntervalHours || 24,
56
56
  routeForwards: this.settings.acme.routeForwards || [],
@@ -126,8 +126,34 @@ export class SmartProxy extends plugins.EventEmitter {
126
126
  if (this.socketHandlerServer) {
127
127
  await this.bridge.setSocketHandlerRelay(this.socketHandlerServer.getSocketPath());
128
128
  }
129
+ // Load default self-signed fallback certificate (domain: '*')
130
+ if (!this.settings.disableDefaultCert) {
131
+ try {
132
+ const defaultCert = generateDefaultCertificate();
133
+ await this.bridge.loadCertificate('*', defaultCert.cert, defaultCert.key);
134
+ logger.log('info', 'Default self-signed fallback certificate loaded', { component: 'smart-proxy' });
135
+ }
136
+ catch (err) {
137
+ logger.log('warn', `Failed to generate default certificate: ${err.message}`, { component: 'smart-proxy' });
138
+ }
139
+ }
140
+ // Load consumer-stored certificates
141
+ const preloadedDomains = new Set();
142
+ if (this.settings.certStore) {
143
+ try {
144
+ const stored = await this.settings.certStore.loadAll();
145
+ for (const entry of stored) {
146
+ await this.bridge.loadCertificate(entry.domain, entry.publicKey, entry.privateKey, entry.ca);
147
+ preloadedDomains.add(entry.domain);
148
+ }
149
+ logger.log('info', `Loaded ${stored.length} certificate(s) from consumer store`, { component: 'smart-proxy' });
150
+ }
151
+ catch (err) {
152
+ logger.log('warn', `Failed to load certificates from consumer store: ${err.message}`, { component: 'smart-proxy' });
153
+ }
154
+ }
129
155
  // Handle certProvisionFunction
130
- await this.provisionCertificatesViaCallback();
156
+ await this.provisionCertificatesViaCallback(preloadedDomains);
131
157
  // Start metrics polling
132
158
  this.metricsAdapter.startPolling();
133
159
  logger.log('info', 'SmartProxy started (Rust engine)', { component: 'smart-proxy' });
@@ -285,7 +311,6 @@ export class SmartProxy extends plugins.EventEmitter {
285
311
  port: acme.port,
286
312
  renewThresholdDays: acme.renewThresholdDays,
287
313
  autoRenew: acme.autoRenew,
288
- certificateStore: acme.certificateStore,
289
314
  renewCheckIntervalHours: acme.renewCheckIntervalHours,
290
315
  }
291
316
  : undefined,
@@ -308,11 +333,11 @@ export class SmartProxy extends plugins.EventEmitter {
308
333
  * If the callback returns a cert object, load it into Rust.
309
334
  * If it returns 'http01', let Rust handle ACME.
310
335
  */
311
- async provisionCertificatesViaCallback() {
336
+ async provisionCertificatesViaCallback(skipDomains = new Set()) {
312
337
  const provisionFn = this.settings.certProvisionFunction;
313
338
  if (!provisionFn)
314
339
  return;
315
- const provisionedDomains = new Set();
340
+ const provisionedDomains = new Set(skipDomains);
316
341
  for (const route of this.settings.routes) {
317
342
  if (route.action.tls?.certificate !== 'auto')
318
343
  continue;
@@ -334,7 +359,8 @@ export class SmartProxy extends plugins.EventEmitter {
334
359
  logger.log('info', `Triggered Rust ACME for ${domain} (route: ${route.name})`, { component: 'smart-proxy' });
335
360
  }
336
361
  catch (provisionErr) {
337
- logger.log('warn', `Cannot provision cert for ${domain} — callback returned 'http01' but Rust ACME failed: ${provisionErr.message}`, { component: 'smart-proxy' });
362
+ logger.log('warn', `Cannot provision cert for ${domain} — callback returned 'http01' but Rust ACME failed: ${provisionErr.message}. ` +
363
+ 'Note: Rust ACME is disabled when certProvisionFunction is set.', { component: 'smart-proxy' });
338
364
  }
339
365
  }
340
366
  continue;
@@ -344,13 +370,31 @@ export class SmartProxy extends plugins.EventEmitter {
344
370
  const certObj = result;
345
371
  await this.bridge.loadCertificate(domain, certObj.publicKey, certObj.privateKey);
346
372
  logger.log('info', `Certificate loaded via provision function for ${domain}`, { component: 'smart-proxy' });
373
+ // Persist to consumer store
374
+ if (this.settings.certStore?.save) {
375
+ try {
376
+ await this.settings.certStore.save(domain, certObj.publicKey, certObj.privateKey);
377
+ }
378
+ catch (storeErr) {
379
+ logger.log('warn', `certStore.save() failed for ${domain}: ${storeErr.message}`, { component: 'smart-proxy' });
380
+ }
381
+ }
347
382
  }
348
383
  }
349
384
  catch (err) {
350
385
  logger.log('warn', `certProvisionFunction failed for ${domain}: ${err.message}`, { component: 'smart-proxy' });
351
- // Fallback to ACME if enabled
352
- if (this.settings.certProvisionFallbackToAcme !== false) {
353
- logger.log('info', `Falling back to ACME for ${domain}`, { component: 'smart-proxy' });
386
+ // Fallback to ACME if enabled and route has a name
387
+ if (this.settings.certProvisionFallbackToAcme !== false && route.name) {
388
+ try {
389
+ await this.bridge.provisionCertificate(route.name);
390
+ logger.log('info', `Falling back to Rust ACME for ${domain} (route: ${route.name})`, { component: 'smart-proxy' });
391
+ }
392
+ catch (acmeErr) {
393
+ logger.log('warn', `ACME fallback also failed for ${domain}: ${acmeErr.message}` +
394
+ (this.settings.disableDefaultCert
395
+ ? ' — TLS will fail for this domain (disableDefaultCert is true)'
396
+ : ' — default self-signed fallback cert will be used'), { component: 'smart-proxy' });
397
+ }
354
398
  }
355
399
  }
356
400
  }
@@ -398,4 +442,4 @@ export class SmartProxy extends plugins.EventEmitter {
398
442
  return validDomainRegex.test(domain);
399
443
  }
400
444
  }
401
- //# 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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"}
445
+ //# 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,8 @@
1
+ /**
2
+ * Generate a self-signed fallback certificate (CN=SmartProxy Default Certificate, SAN=*).
3
+ * Used as the '*' wildcard fallback so TLS handshakes never reset due to missing certs.
4
+ */
5
+ export declare function generateDefaultCertificate(): {
6
+ cert: string;
7
+ key: string;
8
+ };
@@ -0,0 +1,30 @@
1
+ import * as plugins from '../../../plugins.js';
2
+ /**
3
+ * Generate a self-signed fallback certificate (CN=SmartProxy Default Certificate, SAN=*).
4
+ * Used as the '*' wildcard fallback so TLS handshakes never reset due to missing certs.
5
+ */
6
+ export function generateDefaultCertificate() {
7
+ const forge = plugins.smartcrypto.nodeForge;
8
+ // Generate 2048-bit RSA keypair
9
+ const keypair = forge.pki.rsa.generateKeyPair({ bits: 2048 });
10
+ // Create self-signed X.509 certificate
11
+ const cert = forge.pki.createCertificate();
12
+ cert.publicKey = keypair.publicKey;
13
+ cert.serialNumber = '01';
14
+ cert.validity.notBefore = new Date();
15
+ cert.validity.notAfter = new Date();
16
+ cert.validity.notAfter.setFullYear(cert.validity.notBefore.getFullYear() + 1);
17
+ const attrs = [{ name: 'commonName', value: 'SmartProxy Default Certificate' }];
18
+ cert.setSubject(attrs);
19
+ cert.setIssuer(attrs);
20
+ // Add wildcard SAN
21
+ cert.setExtensions([
22
+ { name: 'subjectAltName', altNames: [{ type: 2 /* DNS */, value: '*' }] },
23
+ ]);
24
+ cert.sign(keypair.privateKey, forge.md.sha256.create());
25
+ return {
26
+ cert: forge.pki.certificateToPem(cert),
27
+ key: forge.pki.privateKeyToPem(keypair.privateKey),
28
+ };
29
+ }
30
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmYXVsdC1jZXJ0LWdlbmVyYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3RzL3Byb3hpZXMvc21hcnQtcHJveHkvdXRpbHMvZGVmYXVsdC1jZXJ0LWdlbmVyYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLHFCQUFxQixDQUFDO0FBRS9DOzs7R0FHRztBQUNILE1BQU0sVUFBVSwwQkFBMEI7SUFDeEMsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxTQUFTLENBQUM7SUFFNUMsZ0NBQWdDO0lBQ2hDLE1BQU0sT0FBTyxHQUFHLEtBQUssQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBRTlELHVDQUF1QztJQUN2QyxNQUFNLElBQUksR0FBRyxLQUFLLENBQUMsR0FBRyxDQUFDLGlCQUFpQixFQUFFLENBQUM7SUFDM0MsSUFBSSxDQUFDLFNBQVMsR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDO0lBQ25DLElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSxDQUFDO0lBQ3pCLElBQUksQ0FBQyxRQUFRLENBQUMsU0FBUyxHQUFHLElBQUksSUFBSSxFQUFFLENBQUM7SUFDckMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxRQUFRLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQztJQUNwQyxJQUFJLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsV0FBVyxFQUFFLEdBQUcsQ0FBQyxDQUFDLENBQUM7SUFFOUUsTUFBTSxLQUFLLEdBQUcsQ0FBQyxFQUFFLElBQUksRUFBRSxZQUFZLEVBQUUsS0FBSyxFQUFFLGdDQUFnQyxFQUFFLENBQUMsQ0FBQztJQUNoRixJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3ZCLElBQUksQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLENBQUM7SUFFdEIsbUJBQW1CO0lBQ25CLElBQUksQ0FBQyxhQUFhLENBQUM7UUFDakIsRUFBRSxJQUFJLEVBQUUsZ0JBQWdCLEVBQUUsUUFBUSxFQUFFLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLFNBQVMsRUFBRSxLQUFLLEVBQUUsR0FBRyxFQUFFLENBQUMsRUFBRTtLQUMxRSxDQUFDLENBQUM7SUFFSCxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVLEVBQUUsS0FBSyxDQUFDLEVBQUUsQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztJQUV4RCxPQUFPO1FBQ0wsSUFBSSxFQUFFLEtBQUssQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDO1FBQ3RDLEdBQUcsRUFBRSxLQUFLLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDO0tBQ25ELENBQUM7QUFDSixDQUFDIn0=
@@ -7,4 +7,5 @@
7
7
  export * from './route-helpers.js';
8
8
  export * from './route-validator.js';
9
9
  export * from './route-utils.js';
10
+ export { generateDefaultCertificate } from './default-cert-generator.js';
10
11
  export { createApiGatewayRoute, addRateLimiting, addBasicAuth, addJwtAuth } from './route-helpers.js';
@@ -10,6 +10,8 @@ export * from './route-helpers.js';
10
10
  export * from './route-validator.js';
11
11
  // Export route utilities for route operations
12
12
  export * from './route-utils.js';
13
+ // Export default certificate generator
14
+ export { generateDefaultCertificate } from './default-cert-generator.js';
13
15
  // Export additional functions from route-helpers that weren't already exported
14
16
  export { createApiGatewayRoute, addRateLimiting, addBasicAuth, addJwtAuth } from './route-helpers.js';
15
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi90cy9wcm94aWVzL3NtYXJ0LXByb3h5L3V0aWxzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7OztHQUtHO0FBRUgseURBQXlEO0FBQ3pELGNBQWMsb0JBQW9CLENBQUM7QUFFbkMsMERBQTBEO0FBQzFELGNBQWMsc0JBQXNCLENBQUM7QUFFckMsOENBQThDO0FBQzlDLGNBQWMsa0JBQWtCLENBQUM7QUFFakMsK0VBQStFO0FBQy9FLE9BQU8sRUFDTCxxQkFBcUIsRUFDckIsZUFBZSxFQUNmLFlBQVksRUFDWixVQUFVLEVBQ1gsTUFBTSxvQkFBb0IsQ0FBQyJ9
17
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi90cy9wcm94aWVzL3NtYXJ0LXByb3h5L3V0aWxzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7OztHQUtHO0FBRUgseURBQXlEO0FBQ3pELGNBQWMsb0JBQW9CLENBQUM7QUFFbkMsMERBQTBEO0FBQzFELGNBQWMsc0JBQXNCLENBQUM7QUFFckMsOENBQThDO0FBQzlDLGNBQWMsa0JBQWtCLENBQUM7QUFFakMsdUNBQXVDO0FBQ3ZDLE9BQU8sRUFBRSwwQkFBMEIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRXpFLCtFQUErRTtBQUMvRSxPQUFPLEVBQ0wscUJBQXFCLEVBQ3JCLGVBQWUsRUFDZixZQUFZLEVBQ1osVUFBVSxFQUNYLE1BQU0sb0JBQW9CLENBQUMifQ==
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@push.rocks/smartproxy",
3
- "version": "23.1.6",
3
+ "version": "24.0.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",
package/readme.md CHANGED
@@ -36,6 +36,7 @@ Whether you're building microservices, deploying edge infrastructure, or need a
36
36
  | 📊 **Live Metrics** | Real-time throughput, connection counts, and performance data |
37
37
  | 🔧 **Dynamic Management** | Add/remove ports and routes at runtime without restarts |
38
38
  | 🔄 **PROXY Protocol** | Full PROXY protocol v1/v2 support for preserving client information |
39
+ | 💾 **Consumer Cert Storage** | Bring your own persistence — SmartProxy never writes certs to disk |
39
40
 
40
41
  ## 🚀 Quick Start
41
42
 
@@ -456,6 +457,51 @@ const proxy = new SmartProxy({
456
457
  });
457
458
  ```
458
459
 
460
+ ### 💾 Consumer-Managed Certificate Storage
461
+
462
+ SmartProxy **never writes certificates to disk**. Instead, you own all persistence through the `certStore` interface. This gives you full control — store certs in a database, cloud KMS, encrypted vault, or wherever makes sense for your infrastructure:
463
+
464
+ ```typescript
465
+ const proxy = new SmartProxy({
466
+ routes: [...],
467
+
468
+ certProvisionFunction: async (domain) => myAcme.provision(domain),
469
+
470
+ // Your persistence layer — SmartProxy calls these hooks
471
+ certStore: {
472
+ // Called once on startup to pre-load persisted certs
473
+ loadAll: async () => {
474
+ const certs = await myDb.getAllCerts();
475
+ return certs.map(c => ({
476
+ domain: c.domain,
477
+ publicKey: c.certPem,
478
+ privateKey: c.keyPem,
479
+ ca: c.caPem, // optional
480
+ }));
481
+ },
482
+
483
+ // Called after each successful cert provision
484
+ save: async (domain, publicKey, privateKey, ca) => {
485
+ await myDb.upsertCert({ domain, certPem: publicKey, keyPem: privateKey, caPem: ca });
486
+ },
487
+
488
+ // Optional: called when a cert should be removed
489
+ remove: async (domain) => {
490
+ await myDb.deleteCert(domain);
491
+ },
492
+ },
493
+ });
494
+ ```
495
+
496
+ **Startup flow:**
497
+ 1. Rust engine starts
498
+ 2. Default self-signed `*` fallback cert is loaded (unless `disableDefaultCert: true`)
499
+ 3. `certStore.loadAll()` is called → all returned certs are loaded into the Rust TLS stack
500
+ 4. `certProvisionFunction` runs for any remaining `certificate: 'auto'` routes (skipping domains already loaded from the store)
501
+ 5. After each successful provision, `certStore.save()` is called
502
+
503
+ This means your second startup is instant — no re-provisioning needed for domains that already have valid certs in your store.
504
+
459
505
  ## 🏛️ Architecture
460
506
 
461
507
  SmartProxy uses a hybrid **Rust + TypeScript** architecture:
@@ -488,7 +534,7 @@ SmartProxy uses a hybrid **Rust + TypeScript** architecture:
488
534
 
489
535
  - **Rust Engine** handles all networking, TLS, HTTP proxying, connection management, security, and metrics
490
536
  - **TypeScript** provides the npm API, configuration types, route helpers, validation, and socket handler callbacks
491
- - **IPC** — The TypeScript wrapper uses [`@push.rocks/smartrust`](https://code.foss.global/push.rocks/smartrust) for type-safe JSON commands/events over stdin/stdout
537
+ - **IPC** — The TypeScript wrapper uses JSON commands/events over stdin/stdout to communicate with the Rust binary
492
538
  - **Socket Relay** — A Unix domain socket server for routes requiring TypeScript-side handling (socket handlers, dynamic host/port functions)
493
539
 
494
540
  ## 🎯 Route Configuration Reference
@@ -497,7 +543,7 @@ SmartProxy uses a hybrid **Rust + TypeScript** architecture:
497
543
 
498
544
  ```typescript
499
545
  interface IRouteMatch {
500
- ports: number | number[] | Array<{ from: number; to: number }>; // Port(s) to listen on
546
+ ports: number | number[] | Array<{ from: number; to: number }>; // Required — port(s) to listen on
501
547
  domains?: string | string[]; // 'example.com', '*.example.com'
502
548
  path?: string; // '/api/*', '/users/:id'
503
549
  clientIp?: string[]; // ['10.0.0.0/8', '192.168.*']
@@ -517,11 +563,16 @@ interface IRouteMatch {
517
563
 
518
564
  ```typescript
519
565
  interface IRouteTarget {
520
- host: string | string[] | ((context: IRouteContext) => string);
566
+ host: string | string[] | ((context: IRouteContext) => string | string[]);
521
567
  port: number | 'preserve' | ((context: IRouteContext) => number);
522
- tls?: { ... }; // Per-target TLS override
523
- priority?: number; // Target priority
524
- match?: ITargetMatch; // Sub-match within a route (by port, path, headers, method)
568
+ tls?: IRouteTls; // Per-target TLS override
569
+ priority?: number; // Target priority
570
+ match?: ITargetMatch; // Sub-match within a route (by port, path, headers, method)
571
+ websocket?: IRouteWebSocket;
572
+ loadBalancing?: IRouteLoadBalancing;
573
+ sendProxyProtocol?: boolean;
574
+ headers?: IRouteHeaders;
575
+ advanced?: IRouteAdvanced;
525
576
  }
526
577
  ```
527
578
 
@@ -613,6 +664,7 @@ import {
613
664
  createPortMappingRoute, // Port mapping with context
614
665
  createOffsetPortMappingRoute, // Simple port offset
615
666
  createDynamicRoute, // Dynamic host/port via functions
667
+ createPortOffset, // Port offset factory
616
668
 
617
669
  // Security Modifiers
618
670
  addRateLimiting, // Add rate limiting to any route
@@ -680,7 +732,6 @@ interface ISmartProxyOptions {
680
732
  port?: number; // HTTP-01 challenge port (default: 80)
681
733
  renewThresholdDays?: number; // Days before expiry to renew (default: 30)
682
734
  autoRenew?: boolean; // Enable auto-renewal (default: true)
683
- certificateStore?: string; // Directory to store certs (default: './certs')
684
735
  renewCheckIntervalHours?: number; // Renewal check interval (default: 24)
685
736
  };
686
737
 
@@ -688,6 +739,12 @@ interface ISmartProxyOptions {
688
739
  certProvisionFunction?: (domain: string) => Promise<ICert | 'http01'>;
689
740
  certProvisionFallbackToAcme?: boolean; // Fall back to ACME on failure (default: true)
690
741
 
742
+ // Consumer-managed certificate persistence (see "Consumer-Managed Certificate Storage")
743
+ certStore?: ISmartProxyCertStore;
744
+
745
+ // Self-signed fallback
746
+ disableDefaultCert?: boolean; // Disable '*' self-signed fallback (default: false)
747
+
691
748
  // Global defaults
692
749
  defaults?: {
693
750
  target?: { host: string; port: number };
@@ -729,6 +786,26 @@ interface ISmartProxyOptions {
729
786
  }
730
787
  ```
731
788
 
789
+ ### ISmartProxyCertStore Interface
790
+
791
+ ```typescript
792
+ interface ISmartProxyCertStore {
793
+ /** Called once on startup to pre-load persisted certs */
794
+ loadAll: () => Promise<Array<{
795
+ domain: string;
796
+ publicKey: string;
797
+ privateKey: string;
798
+ ca?: string;
799
+ }>>;
800
+
801
+ /** Called after each successful cert provision */
802
+ save: (domain: string, publicKey: string, privateKey: string, ca?: string) => Promise<void>;
803
+
804
+ /** Optional: remove a cert from storage */
805
+ remove?: (domain: string) => Promise<void>;
806
+ }
807
+ ```
808
+
732
809
  ### IMetrics Interface
733
810
 
734
811
  The `getMetrics()` method returns a cached metrics adapter that polls the Rust engine:
@@ -758,6 +835,10 @@ metrics.requests.total(); // Total requests
758
835
  metrics.totals.bytesIn(); // Total bytes received
759
836
  metrics.totals.bytesOut(); // Total bytes sent
760
837
  metrics.totals.connections(); // Total connections
838
+
839
+ // Percentiles
840
+ metrics.percentiles.connectionDuration(); // { p50, p95, p99 }
841
+ metrics.percentiles.bytesTransferred(); // { in: { p50, p95, p99 }, out: { p50, p95, p99 } }
761
842
  ```
762
843
 
763
844
  ## 🐛 Troubleshooting
@@ -802,6 +883,7 @@ SmartProxy searches for the Rust binary in this order:
802
883
  7. **✅ Validate Routes** — Use `RouteValidator.validateRoutes()` to catch config errors before deployment
803
884
  8. **🔀 Atomic Updates** — Use `updateRoutes()` for hot-reloading routes (mutex-locked, no downtime)
804
885
  9. **🎮 Use Socket Handlers** — For protocols beyond HTTP, implement custom socket handlers instead of fighting the proxy model
886
+ 10. **💾 Use `certStore`** — Persist certs in your own storage to avoid re-provisioning on every restart
805
887
 
806
888
  ## License and Legal Information
807
889
 
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@push.rocks/smartproxy',
6
- version: '23.1.6',
6
+ version: '24.0.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
  }
@@ -85,7 +85,6 @@ export interface IAcmeOptions {
85
85
  renewThresholdDays?: number; // Days before expiry to renew certificates
86
86
  renewCheckIntervalHours?: number; // How often to check for renewals (in hours)
87
87
  autoRenew?: boolean; // Whether to automatically renew certificates
88
- certificateStore?: string; // Directory to store certificates
89
88
  skipConfiguredCerts?: boolean; // Skip domains with existing certificates
90
89
  domainForwards?: IDomainForwardConfig[]; // Domain-specific forwarding configs
91
90
  }
@@ -2,6 +2,6 @@
2
2
  * SmartProxy models
3
3
  */
4
4
  // Export everything except IAcmeOptions from interfaces
5
- export type { ISmartProxyOptions, IConnectionRecord, TSmartProxyCertProvisionObject } from './interfaces.js';
5
+ export type { ISmartProxyOptions, ISmartProxyCertStore, IConnectionRecord, TSmartProxyCertProvisionObject } from './interfaces.js';
6
6
  export * from './route-types.js';
7
7
  export * from './metrics-types.js';
@@ -10,11 +10,23 @@ export interface IAcmeOptions {
10
10
  useProduction?: boolean; // Use Let's Encrypt production (default: false)
11
11
  renewThresholdDays?: number; // Days before expiry to renew (default: 30)
12
12
  autoRenew?: boolean; // Enable automatic renewal (default: true)
13
- certificateStore?: string; // Directory to store certificates (default: './certs')
14
13
  skipConfiguredCerts?: boolean;
15
14
  renewCheckIntervalHours?: number; // How often to check for renewals (default: 24)
16
15
  routeForwards?: any[];
17
16
  }
17
+
18
+ /**
19
+ * Consumer-provided certificate storage.
20
+ * SmartProxy never writes certs to disk — the consumer owns all persistence.
21
+ */
22
+ export interface ISmartProxyCertStore {
23
+ /** Load all stored certs on startup (called once before cert provisioning) */
24
+ loadAll: () => Promise<Array<{ domain: string; publicKey: string; privateKey: string; ca?: string }>>;
25
+ /** Save a cert after successful provisioning */
26
+ save: (domain: string, publicKey: string, privateKey: string, ca?: string) => Promise<void>;
27
+ /** Remove a cert (optional) */
28
+ remove?: (domain: string) => Promise<void>;
29
+ }
18
30
  import type { IRouteConfig } from './route-types.js';
19
31
 
20
32
  /**
@@ -136,6 +148,20 @@ export interface ISmartProxyOptions {
136
148
  */
137
149
  certProvisionFallbackToAcme?: boolean;
138
150
 
151
+ /**
152
+ * Disable the default self-signed fallback certificate.
153
+ * When false (default), a self-signed cert is generated at startup and loaded
154
+ * as '*' so TLS handshakes never fail due to missing certs.
155
+ */
156
+ disableDefaultCert?: boolean;
157
+
158
+ /**
159
+ * Consumer-provided cert storage. SmartProxy never writes certs to disk.
160
+ * On startup, loadAll() is called to pre-load persisted certs.
161
+ * After each successful cert provision, save() is called.
162
+ */
163
+ certStore?: ISmartProxyCertStore;
164
+
139
165
  /**
140
166
  * Path to the RustProxy binary. If not set, the binary is located
141
167
  * automatically via env var, platform package, local build, or PATH.
@@ -10,6 +10,7 @@ import { RustMetricsAdapter } from './rust-metrics-adapter.js';
10
10
  // Route management
11
11
  import { SharedRouteManager as RouteManager } from '../../core/routing/route-manager.js';
12
12
  import { RouteValidator } from './utils/route-validator.js';
13
+ import { generateDefaultCertificate } from './utils/default-cert-generator.js';
13
14
  import { Mutex } from './utils/mutex.js';
14
15
 
15
16
  // Types
@@ -68,7 +69,6 @@ export class SmartProxy extends plugins.EventEmitter {
68
69
  useProduction: this.settings.acme.useProduction || false,
69
70
  renewThresholdDays: this.settings.acme.renewThresholdDays || 30,
70
71
  autoRenew: this.settings.acme.autoRenew !== false,
71
- certificateStore: this.settings.acme.certificateStore || './certs',
72
72
  skipConfiguredCerts: this.settings.acme.skipConfiguredCerts || false,
73
73
  renewCheckIntervalHours: this.settings.acme.renewCheckIntervalHours || 24,
74
74
  routeForwards: this.settings.acme.routeForwards || [],
@@ -165,8 +165,34 @@ export class SmartProxy extends plugins.EventEmitter {
165
165
  await this.bridge.setSocketHandlerRelay(this.socketHandlerServer.getSocketPath());
166
166
  }
167
167
 
168
+ // Load default self-signed fallback certificate (domain: '*')
169
+ if (!this.settings.disableDefaultCert) {
170
+ try {
171
+ const defaultCert = generateDefaultCertificate();
172
+ await this.bridge.loadCertificate('*', defaultCert.cert, defaultCert.key);
173
+ logger.log('info', 'Default self-signed fallback certificate loaded', { component: 'smart-proxy' });
174
+ } catch (err: any) {
175
+ logger.log('warn', `Failed to generate default certificate: ${err.message}`, { component: 'smart-proxy' });
176
+ }
177
+ }
178
+
179
+ // Load consumer-stored certificates
180
+ const preloadedDomains = new Set<string>();
181
+ if (this.settings.certStore) {
182
+ try {
183
+ const stored = await this.settings.certStore.loadAll();
184
+ for (const entry of stored) {
185
+ await this.bridge.loadCertificate(entry.domain, entry.publicKey, entry.privateKey, entry.ca);
186
+ preloadedDomains.add(entry.domain);
187
+ }
188
+ logger.log('info', `Loaded ${stored.length} certificate(s) from consumer store`, { component: 'smart-proxy' });
189
+ } catch (err: any) {
190
+ logger.log('warn', `Failed to load certificates from consumer store: ${err.message}`, { component: 'smart-proxy' });
191
+ }
192
+ }
193
+
168
194
  // Handle certProvisionFunction
169
- await this.provisionCertificatesViaCallback();
195
+ await this.provisionCertificatesViaCallback(preloadedDomains);
170
196
 
171
197
  // Start metrics polling
172
198
  this.metricsAdapter.startPolling();
@@ -355,7 +381,6 @@ export class SmartProxy extends plugins.EventEmitter {
355
381
  port: acme.port,
356
382
  renewThresholdDays: acme.renewThresholdDays,
357
383
  autoRenew: acme.autoRenew,
358
- certificateStore: acme.certificateStore,
359
384
  renewCheckIntervalHours: acme.renewCheckIntervalHours,
360
385
  }
361
386
  : undefined,
@@ -379,11 +404,11 @@ export class SmartProxy extends plugins.EventEmitter {
379
404
  * If the callback returns a cert object, load it into Rust.
380
405
  * If it returns 'http01', let Rust handle ACME.
381
406
  */
382
- private async provisionCertificatesViaCallback(): Promise<void> {
407
+ private async provisionCertificatesViaCallback(skipDomains: Set<string> = new Set()): Promise<void> {
383
408
  const provisionFn = this.settings.certProvisionFunction;
384
409
  if (!provisionFn) return;
385
410
 
386
- const provisionedDomains = new Set<string>();
411
+ const provisionedDomains = new Set<string>(skipDomains);
387
412
 
388
413
  for (const route of this.settings.routes) {
389
414
  if (route.action.tls?.certificate !== 'auto') continue;
@@ -405,7 +430,8 @@ export class SmartProxy extends plugins.EventEmitter {
405
430
  await this.bridge.provisionCertificate(route.name);
406
431
  logger.log('info', `Triggered Rust ACME for ${domain} (route: ${route.name})`, { component: 'smart-proxy' });
407
432
  } catch (provisionErr: any) {
408
- logger.log('warn', `Cannot provision cert for ${domain} — callback returned 'http01' but Rust ACME failed: ${provisionErr.message}`, { component: 'smart-proxy' });
433
+ logger.log('warn', `Cannot provision cert for ${domain} — callback returned 'http01' but Rust ACME failed: ${provisionErr.message}. ` +
434
+ 'Note: Rust ACME is disabled when certProvisionFunction is set.', { component: 'smart-proxy' });
409
435
  }
410
436
  }
411
437
  continue;
@@ -420,13 +446,30 @@ export class SmartProxy extends plugins.EventEmitter {
420
446
  certObj.privateKey,
421
447
  );
422
448
  logger.log('info', `Certificate loaded via provision function for ${domain}`, { component: 'smart-proxy' });
449
+
450
+ // Persist to consumer store
451
+ if (this.settings.certStore?.save) {
452
+ try {
453
+ await this.settings.certStore.save(domain, certObj.publicKey, certObj.privateKey);
454
+ } catch (storeErr: any) {
455
+ logger.log('warn', `certStore.save() failed for ${domain}: ${storeErr.message}`, { component: 'smart-proxy' });
456
+ }
457
+ }
423
458
  }
424
459
  } catch (err: any) {
425
460
  logger.log('warn', `certProvisionFunction failed for ${domain}: ${err.message}`, { component: 'smart-proxy' });
426
461
 
427
- // Fallback to ACME if enabled
428
- if (this.settings.certProvisionFallbackToAcme !== false) {
429
- logger.log('info', `Falling back to ACME for ${domain}`, { component: 'smart-proxy' });
462
+ // Fallback to ACME if enabled and route has a name
463
+ if (this.settings.certProvisionFallbackToAcme !== false && route.name) {
464
+ try {
465
+ await this.bridge.provisionCertificate(route.name);
466
+ logger.log('info', `Falling back to Rust ACME for ${domain} (route: ${route.name})`, { component: 'smart-proxy' });
467
+ } catch (acmeErr: any) {
468
+ logger.log('warn', `ACME fallback also failed for ${domain}: ${acmeErr.message}` +
469
+ (this.settings.disableDefaultCert
470
+ ? ' — TLS will fail for this domain (disableDefaultCert is true)'
471
+ : ' — default self-signed fallback cert will be used'), { component: 'smart-proxy' });
472
+ }
430
473
  }
431
474
  }
432
475
  }
@@ -0,0 +1,36 @@
1
+ import * as plugins from '../../../plugins.js';
2
+
3
+ /**
4
+ * Generate a self-signed fallback certificate (CN=SmartProxy Default Certificate, SAN=*).
5
+ * Used as the '*' wildcard fallback so TLS handshakes never reset due to missing certs.
6
+ */
7
+ export function generateDefaultCertificate(): { cert: string; key: string } {
8
+ const forge = plugins.smartcrypto.nodeForge;
9
+
10
+ // Generate 2048-bit RSA keypair
11
+ const keypair = forge.pki.rsa.generateKeyPair({ bits: 2048 });
12
+
13
+ // Create self-signed X.509 certificate
14
+ const cert = forge.pki.createCertificate();
15
+ cert.publicKey = keypair.publicKey;
16
+ cert.serialNumber = '01';
17
+ cert.validity.notBefore = new Date();
18
+ cert.validity.notAfter = new Date();
19
+ cert.validity.notAfter.setFullYear(cert.validity.notBefore.getFullYear() + 1);
20
+
21
+ const attrs = [{ name: 'commonName', value: 'SmartProxy Default Certificate' }];
22
+ cert.setSubject(attrs);
23
+ cert.setIssuer(attrs);
24
+
25
+ // Add wildcard SAN
26
+ cert.setExtensions([
27
+ { name: 'subjectAltName', altNames: [{ type: 2 /* DNS */, value: '*' }] },
28
+ ]);
29
+
30
+ cert.sign(keypair.privateKey, forge.md.sha256.create());
31
+
32
+ return {
33
+ cert: forge.pki.certificateToPem(cert),
34
+ key: forge.pki.privateKeyToPem(keypair.privateKey),
35
+ };
36
+ }
@@ -14,6 +14,9 @@ export * from './route-validator.js';
14
14
  // Export route utilities for route operations
15
15
  export * from './route-utils.js';
16
16
 
17
+ // Export default certificate generator
18
+ export { generateDefaultCertificate } from './default-cert-generator.js';
19
+
17
20
  // Export additional functions from route-helpers that weren't already exported
18
21
  export {
19
22
  createApiGatewayRoute,