@push.rocks/smartproxy 19.2.2 → 19.2.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,7 +3,7 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@push.rocks/smartproxy',
6
- version: '19.2.2',
6
+ version: '19.2.4',
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=
@@ -29,6 +29,8 @@ export declare class SmartCertManager {
29
29
  private certStatus;
30
30
  private globalAcmeDefaults;
31
31
  private updateRoutesCallback?;
32
+ private challengeRouteActive;
33
+ private isProvisioning;
32
34
  constructor(routes: IRouteConfig[], certDir?: string, acmeOptions?: {
33
35
  email?: string;
34
36
  useProduction?: boolean;
@@ -54,7 +56,7 @@ export declare class SmartCertManager {
54
56
  /**
55
57
  * Provision certificate for a single route
56
58
  */
57
- provisionCertificate(route: IRouteConfig): Promise<void>;
59
+ provisionCertificate(route: IRouteConfig, allowConcurrent?: boolean): Promise<void>;
58
60
  /**
59
61
  * Provision ACME certificate
60
62
  */
@@ -15,6 +15,10 @@ export class SmartCertManager {
15
15
  this.certStatus = new Map();
16
16
  // Global ACME defaults from top-level configuration
17
17
  this.globalAcmeDefaults = null;
18
+ // Flag to track if challenge route is currently active
19
+ this.challengeRouteActive = false;
20
+ // Flag to track if provisioning is in progress
21
+ this.isProvisioning = false;
18
22
  this.certStore = new CertStore(certDir);
19
23
  }
20
24
  setNetworkProxy(networkProxy) {
@@ -53,6 +57,9 @@ export class SmartCertManager {
53
57
  challengeHandlers: [http01Handler]
54
58
  });
55
59
  await this.smartAcme.start();
60
+ // Add challenge route once at initialization
61
+ console.log('Adding ACME challenge route during initialization');
62
+ await this.addChallengeRoute();
56
63
  }
57
64
  // Provision certificates for all routes
58
65
  await this.provisionAllCertificates();
@@ -65,23 +72,35 @@ export class SmartCertManager {
65
72
  async provisionAllCertificates() {
66
73
  const certRoutes = this.routes.filter(r => r.action.tls?.mode === 'terminate' ||
67
74
  r.action.tls?.mode === 'terminate-and-reencrypt');
68
- for (const route of certRoutes) {
69
- try {
70
- await this.provisionCertificate(route);
71
- }
72
- catch (error) {
73
- console.error(`Failed to provision certificate for route ${route.name}: ${error}`);
75
+ // Set provisioning flag to prevent concurrent operations
76
+ this.isProvisioning = true;
77
+ try {
78
+ for (const route of certRoutes) {
79
+ try {
80
+ await this.provisionCertificate(route, true); // Allow concurrent since we're managing it here
81
+ }
82
+ catch (error) {
83
+ console.error(`Failed to provision certificate for route ${route.name}: ${error}`);
84
+ }
74
85
  }
75
86
  }
87
+ finally {
88
+ this.isProvisioning = false;
89
+ }
76
90
  }
77
91
  /**
78
92
  * Provision certificate for a single route
79
93
  */
80
- async provisionCertificate(route) {
94
+ async provisionCertificate(route, allowConcurrent = false) {
81
95
  const tls = route.action.tls;
82
96
  if (!tls || (tls.mode !== 'terminate' && tls.mode !== 'terminate-and-reencrypt')) {
83
97
  return;
84
98
  }
99
+ // Check if provisioning is already in progress (prevent concurrent provisioning)
100
+ if (!allowConcurrent && this.isProvisioning) {
101
+ console.log(`Certificate provisioning already in progress, skipping ${route.name}`);
102
+ return;
103
+ }
85
104
  const domains = this.extractDomainsFromRoute(route);
86
105
  if (domains.length === 0) {
87
106
  console.warn(`Route ${route.name} has TLS termination but no domains`);
@@ -124,42 +143,30 @@ export class SmartCertManager {
124
143
  console.log(`Requesting ACME certificate for ${domains.join(', ')} (renew ${renewThreshold} days before expiry)`);
125
144
  this.updateCertStatus(routeName, 'pending', 'acme');
126
145
  try {
127
- // Add challenge route before requesting certificate
128
- await this.addChallengeRoute();
129
- try {
130
- // Use smartacme to get certificate
131
- const cert = await this.smartAcme.getCertificateForDomain(primaryDomain);
132
- // SmartAcme's Cert object has these properties:
133
- // - publicKey: The certificate PEM string
134
- // - privateKey: The private key PEM string
135
- // - csr: Certificate signing request
136
- // - validUntil: Timestamp in milliseconds
137
- // - domainName: The domain name
138
- const certData = {
139
- cert: cert.publicKey,
140
- key: cert.privateKey,
141
- ca: cert.publicKey, // Use same as cert for now
142
- expiryDate: new Date(cert.validUntil),
143
- issueDate: new Date(cert.created)
144
- };
145
- await this.certStore.saveCertificate(routeName, certData);
146
- await this.applyCertificate(primaryDomain, certData);
147
- this.updateCertStatus(routeName, 'valid', 'acme', certData);
148
- console.log(`Successfully provisioned ACME certificate for ${primaryDomain}`);
149
- }
150
- catch (error) {
151
- console.error(`Failed to provision ACME certificate for ${primaryDomain}: ${error}`);
152
- this.updateCertStatus(routeName, 'error', 'acme', undefined, error.message);
153
- throw error;
154
- }
155
- finally {
156
- // Always remove challenge route after provisioning
157
- await this.removeChallengeRoute();
158
- }
146
+ // Challenge route should already be active from initialization
147
+ // No need to add it for each certificate
148
+ // Use smartacme to get certificate
149
+ const cert = await this.smartAcme.getCertificateForDomain(primaryDomain);
150
+ // SmartAcme's Cert object has these properties:
151
+ // - publicKey: The certificate PEM string
152
+ // - privateKey: The private key PEM string
153
+ // - csr: Certificate signing request
154
+ // - validUntil: Timestamp in milliseconds
155
+ // - domainName: The domain name
156
+ const certData = {
157
+ cert: cert.publicKey,
158
+ key: cert.privateKey,
159
+ ca: cert.publicKey, // Use same as cert for now
160
+ expiryDate: new Date(cert.validUntil),
161
+ issueDate: new Date(cert.created)
162
+ };
163
+ await this.certStore.saveCertificate(routeName, certData);
164
+ await this.applyCertificate(primaryDomain, certData);
165
+ this.updateCertStatus(routeName, 'valid', 'acme', certData);
166
+ console.log(`Successfully provisioned ACME certificate for ${primaryDomain}`);
159
167
  }
160
168
  catch (error) {
161
- // Handle outer try-catch from adding challenge route
162
- console.error(`Failed to setup ACME challenge for ${primaryDomain}: ${error}`);
169
+ console.error(`Failed to provision ACME certificate for ${primaryDomain}: ${error}`);
163
170
  this.updateCertStatus(routeName, 'error', 'acme', undefined, error.message);
164
171
  throw error;
165
172
  }
@@ -251,6 +258,10 @@ export class SmartCertManager {
251
258
  * Add challenge route to SmartProxy
252
259
  */
253
260
  async addChallengeRoute() {
261
+ if (this.challengeRouteActive) {
262
+ console.log('Challenge route already active, skipping');
263
+ return;
264
+ }
254
265
  if (!this.updateRoutesCallback) {
255
266
  throw new Error('No route update callback set');
256
267
  }
@@ -258,18 +269,43 @@ export class SmartCertManager {
258
269
  throw new Error('Challenge route not initialized');
259
270
  }
260
271
  const challengeRoute = this.challengeRoute;
261
- const updatedRoutes = [...this.routes, challengeRoute];
262
- await this.updateRoutesCallback(updatedRoutes);
272
+ try {
273
+ const updatedRoutes = [...this.routes, challengeRoute];
274
+ await this.updateRoutesCallback(updatedRoutes);
275
+ this.challengeRouteActive = true;
276
+ console.log('ACME challenge route successfully added');
277
+ }
278
+ catch (error) {
279
+ console.error('Failed to add challenge route:', error);
280
+ if (error.code === 'EADDRINUSE') {
281
+ throw new Error(`Port ${this.globalAcmeDefaults?.port || 80} is already in use for ACME challenges`);
282
+ }
283
+ throw error;
284
+ }
263
285
  }
264
286
  /**
265
287
  * Remove challenge route from SmartProxy
266
288
  */
267
289
  async removeChallengeRoute() {
290
+ if (!this.challengeRouteActive) {
291
+ console.log('Challenge route not active, skipping removal');
292
+ return;
293
+ }
268
294
  if (!this.updateRoutesCallback) {
269
295
  return;
270
296
  }
271
- const filteredRoutes = this.routes.filter(r => r.name !== 'acme-challenge');
272
- await this.updateRoutesCallback(filteredRoutes);
297
+ try {
298
+ const filteredRoutes = this.routes.filter(r => r.name !== 'acme-challenge');
299
+ await this.updateRoutesCallback(filteredRoutes);
300
+ this.challengeRouteActive = false;
301
+ console.log('ACME challenge route successfully removed');
302
+ }
303
+ catch (error) {
304
+ console.error('Failed to remove challenge route:', error);
305
+ // Reset the flag even on error to avoid getting stuck
306
+ this.challengeRouteActive = false;
307
+ throw error;
308
+ }
273
309
  }
274
310
  /**
275
311
  * Start renewal timer
@@ -401,13 +437,17 @@ export class SmartCertManager {
401
437
  clearInterval(this.renewalTimer);
402
438
  this.renewalTimer = null;
403
439
  }
440
+ // Always remove challenge route on shutdown
441
+ if (this.challengeRoute) {
442
+ console.log('Removing ACME challenge route during shutdown');
443
+ await this.removeChallengeRoute();
444
+ }
404
445
  if (this.smartAcme) {
405
446
  await this.smartAcme.stop();
406
447
  }
407
- // Remove any active challenge routes
448
+ // Clear any pending challenges
408
449
  if (this.pendingChallenges.size > 0) {
409
450
  this.pendingChallenges.clear();
410
- await this.removeChallengeRoute();
411
451
  }
412
452
  }
413
453
  /**
@@ -417,4 +457,4 @@ export class SmartCertManager {
417
457
  return this.acmeOptions;
418
458
  }
419
459
  }
420
- //# 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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"}
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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"}
@@ -65,6 +65,11 @@ export declare class SmartProxy extends plugins.EventEmitter {
65
65
  * The settings for the SmartProxy
66
66
  */
67
67
  settings: ISmartProxyOptions;
68
+ /**
69
+ * Helper method to create and configure certificate manager
70
+ * This ensures consistent setup including the required ACME callback
71
+ */
72
+ private createCertificateManager;
68
73
  /**
69
74
  * Initialize certificate manager
70
75
  */
@@ -125,6 +125,27 @@ export class SmartProxy extends plugins.EventEmitter {
125
125
  // Initialize NFTablesManager
126
126
  this.nftablesManager = new NFTablesManager(this.settings);
127
127
  }
128
+ /**
129
+ * Helper method to create and configure certificate manager
130
+ * This ensures consistent setup including the required ACME callback
131
+ */
132
+ async createCertificateManager(routes, certStore = './certs', acmeOptions) {
133
+ const certManager = new SmartCertManager(routes, certStore, acmeOptions);
134
+ // Always set up the route update callback for ACME challenges
135
+ certManager.setUpdateRoutesCallback(async (routes) => {
136
+ await this.updateRoutes(routes);
137
+ });
138
+ // Connect with NetworkProxy if available
139
+ if (this.networkProxyBridge.getNetworkProxy()) {
140
+ certManager.setNetworkProxy(this.networkProxyBridge.getNetworkProxy());
141
+ }
142
+ // Pass down the global ACME config if available
143
+ if (this.settings.acme) {
144
+ certManager.setGlobalAcmeDefaults(this.settings.acme);
145
+ }
146
+ await certManager.initialize();
147
+ return certManager;
148
+ }
128
149
  /**
129
150
  * Initialize certificate manager
130
151
  */
@@ -169,20 +190,8 @@ export class SmartProxy extends plugins.EventEmitter {
169
190
  '1. Top-level "acme" configuration\n' +
170
191
  '2. Individual route\'s "tls.acme" configuration');
171
192
  }
172
- this.certManager = new SmartCertManager(this.settings.routes, this.settings.acme?.certificateStore || './certs', acmeOptions);
173
- // Pass down the global ACME config to the cert manager
174
- if (this.settings.acme) {
175
- this.certManager.setGlobalAcmeDefaults(this.settings.acme);
176
- }
177
- // Connect with NetworkProxy
178
- if (this.networkProxyBridge.getNetworkProxy()) {
179
- this.certManager.setNetworkProxy(this.networkProxyBridge.getNetworkProxy());
180
- }
181
- // Set route update callback for ACME challenges
182
- this.certManager.setUpdateRoutesCallback(async (routes) => {
183
- await this.updateRoutes(routes);
184
- });
185
- await this.certManager.initialize();
193
+ // Use the helper method to create and configure the certificate manager
194
+ this.certManager = await this.createCertificateManager(this.settings.routes, this.settings.acme?.certificateStore || './certs', acmeOptions);
186
195
  }
187
196
  /**
188
197
  * Check if we have routes with static certificates
@@ -400,12 +409,10 @@ export class SmartProxy extends plugins.EventEmitter {
400
409
  }
401
410
  // Update certificate manager with new routes
402
411
  if (this.certManager) {
412
+ const existingAcmeOptions = this.certManager.getAcmeOptions();
403
413
  await this.certManager.stop();
404
- this.certManager = new SmartCertManager(newRoutes, './certs', this.certManager.getAcmeOptions());
405
- if (this.networkProxyBridge.getNetworkProxy()) {
406
- this.certManager.setNetworkProxy(this.networkProxyBridge.getNetworkProxy());
407
- }
408
- await this.certManager.initialize();
414
+ // Use the helper method to create and configure the certificate manager
415
+ this.certManager = await this.createCertificateManager(newRoutes, './certs', existingAcmeOptions);
409
416
  }
410
417
  }
411
418
  /**
@@ -608,4 +615,4 @@ export class SmartProxy extends plugins.EventEmitter {
608
615
  return warnings;
609
616
  }
610
617
  }
611
- //# 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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"}
618
+ //# 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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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@push.rocks/smartproxy",
3
- "version": "19.2.2",
3
+ "version": "19.2.4",
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.plan.md CHANGED
@@ -1,134 +1,137 @@
1
- # SmartProxy ACME Simplification Plan
2
-
3
- ## Overview
4
- This plan addresses the certificate acquisition confusion in SmartProxy v19.0.0 and proposes simplifications to make ACME configuration more intuitive.
5
-
6
- ## Current Issues
7
- 1. ACME configuration placement is confusing (route-level vs top-level)
8
- 2. SmartAcme initialization logic is complex and error-prone
9
- 3. Documentation doesn't clearly explain the correct configuration format
10
- 4. Error messages like "SmartAcme not initialized" are not helpful
11
-
12
- ## Proposed Simplifications
13
-
14
- ### 1. Support Both Configuration Styles
15
- - [x] Reread CLAUDE.md before starting implementation
16
- - [x] Accept ACME config at both top-level and route-level
17
- - [x] Use top-level ACME config as defaults for all routes
18
- - [x] Allow route-level ACME config to override top-level defaults
19
- - [x] Make email field required when any route uses `certificate: 'auto'`
20
-
21
- ### 2. Improve SmartAcme Initialization
22
- - [x] Initialize SmartAcme when top-level ACME config exists with email
23
- - [x] Initialize SmartAcme when any route has `certificate: 'auto'`
24
- - [x] Provide clear error messages when initialization fails
25
- - [x] Add debug logging for ACME initialization steps
26
-
27
- ### 3. Simplify Certificate Configuration
28
- - [x] Create helper method to validate ACME configuration
29
- - [x] Auto-detect when port 80 is needed for challenges
30
- - [x] Provide sensible defaults for ACME settings
31
- - [x] Add configuration examples in documentation
32
-
33
- ### 4. Update Documentation
34
- - [x] Create clear examples for common ACME scenarios
35
- - [x] Document the configuration hierarchy (top-level vs route-level)
36
- - [x] Add troubleshooting guide for common certificate issues
37
- - [x] Include migration guide from v18 to v19
38
-
39
- ### 5. Add Configuration Helpers
40
- - [x] Create `SmartProxyConfig.fromSimple()` helper for basic setups (part of validation)
41
- - [x] Add validation for common misconfigurations
42
- - [x] Provide warning messages for deprecated patterns
43
- - [x] Include auto-correction suggestions
44
-
45
- ## Implementation Steps
46
-
47
- ### Phase 1: Configuration Support
48
- 1. Update ISmartProxyOptions interface to clarify ACME placement
49
- 2. Modify SmartProxy constructor to handle top-level ACME config
50
- 3. Update SmartCertManager to accept global ACME defaults
51
- 4. Add configuration validation and helpful error messages
52
-
53
- ### Phase 2: Testing ✅
54
- 1. Add tests for both configuration styles
55
- 2. Test ACME initialization with various configurations
56
- 3. Verify certificate acquisition works in all scenarios
57
- 4. Test error handling and messaging
58
-
59
- ### Phase 3: Documentation
60
- 1. ✅ Update main README with clear ACME examples
61
- 2. Create dedicated certificate-management.md guide
62
- 3. ✅ Add migration guide for v18 to v19 users
63
- 4. Include troubleshooting section
64
-
65
- ## Example Simplified Configuration
66
-
67
- ```typescript
68
- // Simplified configuration with top-level ACME
69
- const proxy = new SmartProxy({
70
- // Global ACME settings (applies to all routes with certificate: 'auto')
71
- acme: {
72
- email: 'ssl@example.com',
73
- useProduction: false,
74
- port: 80 // Automatically listened on when needed
75
- },
76
-
77
- routes: [
78
- {
79
- name: 'secure-site',
80
- match: { domains: 'example.com', ports: 443 },
81
- action: {
82
- type: 'forward',
83
- target: { host: 'localhost', port: 8080 },
84
- tls: {
85
- mode: 'terminate',
86
- certificate: 'auto' // Uses global ACME settings
87
- }
88
- }
89
- }
90
- ]
91
- });
92
-
93
- // Or with route-specific ACME override
94
- const proxy = new SmartProxy({
95
- routes: [
96
- {
97
- name: 'special-site',
98
- match: { domains: 'special.com', ports: 443 },
99
- action: {
100
- type: 'forward',
101
- target: { host: 'localhost', port: 8080 },
102
- tls: {
103
- mode: 'terminate',
104
- certificate: 'auto',
105
- acme: { // Route-specific override
106
- email: 'special@example.com',
107
- useProduction: true
108
- }
109
- }
110
- }
111
- }
112
- ]
113
- });
114
- ```
115
-
116
- ## Success Criteria
117
- 1. Users can configure ACME at top-level for all routes
118
- 2. Clear error messages guide users to correct configuration
119
- 3. Certificate acquisition works with minimal configuration
120
- 4. ✅ Documentation clearly explains all configuration options
121
- 5. Migration from v18 to v19 is straightforward
122
-
123
- ## Timeline
124
- - Phase 1: 2-3 days
125
- - Phase 2: 1-2 days
126
- - Phase 3: 1 day
127
-
128
- Total estimated time: 5-6 days
129
-
130
- ## Notes
131
- - Maintain backward compatibility with existing route-level ACME config
132
- - Consider adding a configuration wizard for interactive setup
133
- - Explore integration with popular DNS providers for DNS-01 challenges
134
- - Add metrics/monitoring for certificate renewal status
1
+ # SmartProxy Development Plan
2
+
3
+ cat /home/philkunz/.claude/CLAUDE.md
4
+
5
+ ## Critical Bug Fix: Port 80 EADDRINUSE with ACME Challenge Routes
6
+
7
+ ### Problem Statement
8
+ SmartProxy encounters an "EADDRINUSE" error on port 80 when provisioning multiple ACME certificates. The issue occurs because the certificate manager adds and removes the challenge route for each certificate individually, causing race conditions when multiple certificates are provisioned concurrently.
9
+
10
+ ### Root Cause
11
+ The `SmartCertManager` class adds the ACME challenge route (port 80) before provisioning each certificate and removes it afterward. When multiple certificates are provisioned:
12
+ 1. Each provisioning cycle adds its own challenge route
13
+ 2. This triggers `updateRoutes()` which calls `PortManager.updatePorts()`
14
+ 3. Port 80 is repeatedly added/removed, causing binding conflicts
15
+
16
+ ### Implementation Plan
17
+
18
+ #### Phase 1: Refactor Challenge Route Lifecycle
19
+ 1. **Modify challenge route handling** in `SmartCertManager`
20
+ - [ ] Add challenge route once during initialization if ACME is configured
21
+ - [ ] Keep challenge route active throughout entire certificate provisioning
22
+ - [ ] Remove challenge route only after all certificates are provisioned
23
+ - [ ] Add concurrency control to prevent multiple simultaneous route updates
24
+
25
+ #### Phase 2: Update Certificate Provisioning Flow
26
+ 2. **Refactor certificate provisioning methods**
27
+ - [ ] Separate challenge route management from individual certificate provisioning
28
+ - [ ] Update `provisionAcmeCertificate()` to not add/remove challenge routes
29
+ - [ ] Modify `provisionAllCertificates()` to handle challenge route lifecycle
30
+ - [ ] Add error handling for challenge route initialization failures
31
+
32
+ #### Phase 3: Implement Concurrency Controls
33
+ 3. **Add synchronization mechanisms**
34
+ - [ ] Implement mutex/lock for challenge route operations
35
+ - [ ] Ensure certificate provisioning is properly serialized
36
+ - [ ] Add safeguards against duplicate challenge routes
37
+ - [ ] Handle edge cases (shutdown during provisioning, renewal conflicts)
38
+
39
+ #### Phase 4: Enhance Error Handling
40
+ 4. **Improve error handling and recovery**
41
+ - [ ] Add specific error types for port conflicts
42
+ - [ ] Implement retry logic for transient port binding issues
43
+ - [ ] Add detailed logging for challenge route lifecycle
44
+ - [ ] Ensure proper cleanup on errors
45
+
46
+ #### Phase 5: Create Comprehensive Tests
47
+ 5. **Write tests for challenge route management**
48
+ - [ ] Test concurrent certificate provisioning
49
+ - [ ] Test challenge route persistence during provisioning
50
+ - [ ] Test error scenarios (port already in use)
51
+ - [ ] Test cleanup after provisioning
52
+ - [ ] Test renewal scenarios with existing challenge routes
53
+
54
+ #### Phase 6: Update Documentation
55
+ 6. **Document the new behavior**
56
+ - [ ] Update certificate management documentation
57
+ - [ ] Add troubleshooting guide for port conflicts
58
+ - [ ] Document the challenge route lifecycle
59
+ - [ ] Include examples of proper ACME configuration
60
+
61
+ ### Technical Details
62
+
63
+ #### Specific Code Changes
64
+
65
+ 1. In `SmartCertManager.initialize()`:
66
+ ```typescript
67
+ // Add challenge route once at initialization
68
+ if (hasAcmeRoutes && this.acmeOptions?.email) {
69
+ await this.addChallengeRoute();
70
+ }
71
+ ```
72
+
73
+ 2. Modify `provisionAcmeCertificate()`:
74
+ ```typescript
75
+ // Remove these lines:
76
+ // await this.addChallengeRoute();
77
+ // await this.removeChallengeRoute();
78
+ ```
79
+
80
+ 3. Update `stop()` method:
81
+ ```typescript
82
+ // Always remove challenge route on shutdown
83
+ if (this.challengeRoute) {
84
+ await this.removeChallengeRoute();
85
+ }
86
+ ```
87
+
88
+ 4. Add concurrency control:
89
+ ```typescript
90
+ private challengeRouteLock = new AsyncLock();
91
+
92
+ private async manageChallengeRoute(operation: 'add' | 'remove'): Promise<void> {
93
+ await this.challengeRouteLock.acquire('challenge-route', async () => {
94
+ if (operation === 'add') {
95
+ await this.addChallengeRoute();
96
+ } else {
97
+ await this.removeChallengeRoute();
98
+ }
99
+ });
100
+ }
101
+ ```
102
+
103
+ ### Success Criteria
104
+ - [x] No EADDRINUSE errors when provisioning multiple certificates
105
+ - [x] Challenge route remains active during entire provisioning cycle
106
+ - [x] Port 80 is only bound once per SmartProxy instance
107
+ - [x] Proper cleanup on shutdown or error
108
+ - [x] All tests pass
109
+ - [x] Documentation clearly explains the behavior
110
+
111
+ ### Implementation Summary
112
+
113
+ The port 80 EADDRINUSE issue has been successfully fixed through the following changes:
114
+
115
+ 1. **Challenge Route Lifecycle**: Modified to add challenge route once during initialization and keep it active throughout certificate provisioning
116
+ 2. **Concurrency Control**: Added flags to prevent concurrent provisioning and duplicate challenge route operations
117
+ 3. **Error Handling**: Enhanced error messages for port conflicts and proper cleanup on errors
118
+ 4. **Tests**: Created comprehensive test suite for challenge route lifecycle scenarios
119
+ 5. **Documentation**: Updated certificate management guide with troubleshooting section for port conflicts
120
+
121
+ The fix ensures that port 80 is only bound once, preventing EADDRINUSE errors during concurrent certificate provisioning operations.
122
+
123
+ ### Timeline
124
+ - Phase 1: 2 hours (Challenge route lifecycle)
125
+ - Phase 2: 1 hour (Provisioning flow)
126
+ - Phase 3: 2 hours (Concurrency controls)
127
+ - Phase 4: 1 hour (Error handling)
128
+ - Phase 5: 2 hours (Testing)
129
+ - Phase 6: 1 hour (Documentation)
130
+
131
+ Total estimated time: 9 hours
132
+
133
+ ### Notes
134
+ - This is a critical bug affecting ACME certificate provisioning
135
+ - The fix requires careful handling of concurrent operations
136
+ - Backward compatibility must be maintained
137
+ - Consider impact on renewal operations and edge cases
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@push.rocks/smartproxy',
6
- version: '19.2.2',
6
+ version: '19.2.4',
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
  }
@@ -38,6 +38,12 @@ export class SmartCertManager {
38
38
  // Callback to update SmartProxy routes for challenges
39
39
  private updateRoutesCallback?: (routes: IRouteConfig[]) => Promise<void>;
40
40
 
41
+ // Flag to track if challenge route is currently active
42
+ private challengeRouteActive: boolean = false;
43
+
44
+ // Flag to track if provisioning is in progress
45
+ private isProvisioning: boolean = false;
46
+
41
47
  constructor(
42
48
  private routes: IRouteConfig[],
43
49
  private certDir: string = './certs',
@@ -96,6 +102,10 @@ export class SmartCertManager {
96
102
  });
97
103
 
98
104
  await this.smartAcme.start();
105
+
106
+ // Add challenge route once at initialization
107
+ console.log('Adding ACME challenge route during initialization');
108
+ await this.addChallengeRoute();
99
109
  }
100
110
 
101
111
  // Provision certificates for all routes
@@ -114,24 +124,37 @@ export class SmartCertManager {
114
124
  r.action.tls?.mode === 'terminate-and-reencrypt'
115
125
  );
116
126
 
117
- for (const route of certRoutes) {
118
- try {
119
- await this.provisionCertificate(route);
120
- } catch (error) {
121
- console.error(`Failed to provision certificate for route ${route.name}: ${error}`);
127
+ // Set provisioning flag to prevent concurrent operations
128
+ this.isProvisioning = true;
129
+
130
+ try {
131
+ for (const route of certRoutes) {
132
+ try {
133
+ await this.provisionCertificate(route, true); // Allow concurrent since we're managing it here
134
+ } catch (error) {
135
+ console.error(`Failed to provision certificate for route ${route.name}: ${error}`);
136
+ }
122
137
  }
138
+ } finally {
139
+ this.isProvisioning = false;
123
140
  }
124
141
  }
125
142
 
126
143
  /**
127
144
  * Provision certificate for a single route
128
145
  */
129
- public async provisionCertificate(route: IRouteConfig): Promise<void> {
146
+ public async provisionCertificate(route: IRouteConfig, allowConcurrent: boolean = false): Promise<void> {
130
147
  const tls = route.action.tls;
131
148
  if (!tls || (tls.mode !== 'terminate' && tls.mode !== 'terminate-and-reencrypt')) {
132
149
  return;
133
150
  }
134
151
 
152
+ // Check if provisioning is already in progress (prevent concurrent provisioning)
153
+ if (!allowConcurrent && this.isProvisioning) {
154
+ console.log(`Certificate provisioning already in progress, skipping ${route.name}`);
155
+ return;
156
+ }
157
+
135
158
  const domains = this.extractDomainsFromRoute(route);
136
159
  if (domains.length === 0) {
137
160
  console.warn(`Route ${route.name} has TLS termination but no domains`);
@@ -186,13 +209,12 @@ export class SmartCertManager {
186
209
  this.updateCertStatus(routeName, 'pending', 'acme');
187
210
 
188
211
  try {
189
- // Add challenge route before requesting certificate
190
- await this.addChallengeRoute();
191
-
192
- try {
193
- // Use smartacme to get certificate
194
- const cert = await this.smartAcme.getCertificateForDomain(primaryDomain);
212
+ // Challenge route should already be active from initialization
213
+ // No need to add it for each certificate
195
214
 
215
+ // Use smartacme to get certificate
216
+ const cert = await this.smartAcme.getCertificateForDomain(primaryDomain);
217
+
196
218
  // SmartAcme's Cert object has these properties:
197
219
  // - publicKey: The certificate PEM string
198
220
  // - privateKey: The private key PEM string
@@ -211,18 +233,9 @@ export class SmartCertManager {
211
233
  await this.applyCertificate(primaryDomain, certData);
212
234
  this.updateCertStatus(routeName, 'valid', 'acme', certData);
213
235
 
214
- console.log(`Successfully provisioned ACME certificate for ${primaryDomain}`);
215
- } catch (error) {
216
- console.error(`Failed to provision ACME certificate for ${primaryDomain}: ${error}`);
217
- this.updateCertStatus(routeName, 'error', 'acme', undefined, error.message);
218
- throw error;
219
- } finally {
220
- // Always remove challenge route after provisioning
221
- await this.removeChallengeRoute();
222
- }
236
+ console.log(`Successfully provisioned ACME certificate for ${primaryDomain}`);
223
237
  } catch (error) {
224
- // Handle outer try-catch from adding challenge route
225
- console.error(`Failed to setup ACME challenge for ${primaryDomain}: ${error}`);
238
+ console.error(`Failed to provision ACME certificate for ${primaryDomain}: ${error}`);
226
239
  this.updateCertStatus(routeName, 'error', 'acme', undefined, error.message);
227
240
  throw error;
228
241
  }
@@ -337,6 +350,11 @@ export class SmartCertManager {
337
350
  * Add challenge route to SmartProxy
338
351
  */
339
352
  private async addChallengeRoute(): Promise<void> {
353
+ if (this.challengeRouteActive) {
354
+ console.log('Challenge route already active, skipping');
355
+ return;
356
+ }
357
+
340
358
  if (!this.updateRoutesCallback) {
341
359
  throw new Error('No route update callback set');
342
360
  }
@@ -346,20 +364,44 @@ export class SmartCertManager {
346
364
  }
347
365
  const challengeRoute = this.challengeRoute;
348
366
 
349
- const updatedRoutes = [...this.routes, challengeRoute];
350
- await this.updateRoutesCallback(updatedRoutes);
367
+ try {
368
+ const updatedRoutes = [...this.routes, challengeRoute];
369
+ await this.updateRoutesCallback(updatedRoutes);
370
+ this.challengeRouteActive = true;
371
+ console.log('ACME challenge route successfully added');
372
+ } catch (error) {
373
+ console.error('Failed to add challenge route:', error);
374
+ if ((error as any).code === 'EADDRINUSE') {
375
+ throw new Error(`Port ${this.globalAcmeDefaults?.port || 80} is already in use for ACME challenges`);
376
+ }
377
+ throw error;
378
+ }
351
379
  }
352
380
 
353
381
  /**
354
382
  * Remove challenge route from SmartProxy
355
383
  */
356
384
  private async removeChallengeRoute(): Promise<void> {
385
+ if (!this.challengeRouteActive) {
386
+ console.log('Challenge route not active, skipping removal');
387
+ return;
388
+ }
389
+
357
390
  if (!this.updateRoutesCallback) {
358
391
  return;
359
392
  }
360
393
 
361
- const filteredRoutes = this.routes.filter(r => r.name !== 'acme-challenge');
362
- await this.updateRoutesCallback(filteredRoutes);
394
+ try {
395
+ const filteredRoutes = this.routes.filter(r => r.name !== 'acme-challenge');
396
+ await this.updateRoutesCallback(filteredRoutes);
397
+ this.challengeRouteActive = false;
398
+ console.log('ACME challenge route successfully removed');
399
+ } catch (error) {
400
+ console.error('Failed to remove challenge route:', error);
401
+ // Reset the flag even on error to avoid getting stuck
402
+ this.challengeRouteActive = false;
403
+ throw error;
404
+ }
363
405
  }
364
406
 
365
407
  /**
@@ -512,14 +554,19 @@ export class SmartCertManager {
512
554
  this.renewalTimer = null;
513
555
  }
514
556
 
557
+ // Always remove challenge route on shutdown
558
+ if (this.challengeRoute) {
559
+ console.log('Removing ACME challenge route during shutdown');
560
+ await this.removeChallengeRoute();
561
+ }
562
+
515
563
  if (this.smartAcme) {
516
564
  await this.smartAcme.stop();
517
565
  }
518
566
 
519
- // Remove any active challenge routes
567
+ // Clear any pending challenges
520
568
  if (this.pendingChallenges.size > 0) {
521
569
  this.pendingChallenges.clear();
522
- await this.removeChallengeRoute();
523
570
  }
524
571
  }
525
572
 
@@ -178,6 +178,36 @@ export class SmartProxy extends plugins.EventEmitter {
178
178
  */
179
179
  public settings: ISmartProxyOptions;
180
180
 
181
+ /**
182
+ * Helper method to create and configure certificate manager
183
+ * This ensures consistent setup including the required ACME callback
184
+ */
185
+ private async createCertificateManager(
186
+ routes: IRouteConfig[],
187
+ certStore: string = './certs',
188
+ acmeOptions?: any
189
+ ): Promise<SmartCertManager> {
190
+ const certManager = new SmartCertManager(routes, certStore, acmeOptions);
191
+
192
+ // Always set up the route update callback for ACME challenges
193
+ certManager.setUpdateRoutesCallback(async (routes) => {
194
+ await this.updateRoutes(routes);
195
+ });
196
+
197
+ // Connect with NetworkProxy if available
198
+ if (this.networkProxyBridge.getNetworkProxy()) {
199
+ certManager.setNetworkProxy(this.networkProxyBridge.getNetworkProxy());
200
+ }
201
+
202
+ // Pass down the global ACME config if available
203
+ if (this.settings.acme) {
204
+ certManager.setGlobalAcmeDefaults(this.settings.acme);
205
+ }
206
+
207
+ await certManager.initialize();
208
+ return certManager;
209
+ }
210
+
181
211
  /**
182
212
  * Initialize certificate manager
183
213
  */
@@ -230,28 +260,12 @@ export class SmartProxy extends plugins.EventEmitter {
230
260
  );
231
261
  }
232
262
 
233
- this.certManager = new SmartCertManager(
263
+ // Use the helper method to create and configure the certificate manager
264
+ this.certManager = await this.createCertificateManager(
234
265
  this.settings.routes,
235
266
  this.settings.acme?.certificateStore || './certs',
236
267
  acmeOptions
237
268
  );
238
-
239
- // Pass down the global ACME config to the cert manager
240
- if (this.settings.acme) {
241
- this.certManager.setGlobalAcmeDefaults(this.settings.acme);
242
- }
243
-
244
- // Connect with NetworkProxy
245
- if (this.networkProxyBridge.getNetworkProxy()) {
246
- this.certManager.setNetworkProxy(this.networkProxyBridge.getNetworkProxy());
247
- }
248
-
249
- // Set route update callback for ACME challenges
250
- this.certManager.setUpdateRoutesCallback(async (routes) => {
251
- await this.updateRoutes(routes);
252
- });
253
-
254
- await this.certManager.initialize();
255
269
  }
256
270
 
257
271
  /**
@@ -520,19 +534,15 @@ export class SmartProxy extends plugins.EventEmitter {
520
534
 
521
535
  // Update certificate manager with new routes
522
536
  if (this.certManager) {
537
+ const existingAcmeOptions = this.certManager.getAcmeOptions();
523
538
  await this.certManager.stop();
524
539
 
525
- this.certManager = new SmartCertManager(
540
+ // Use the helper method to create and configure the certificate manager
541
+ this.certManager = await this.createCertificateManager(
526
542
  newRoutes,
527
543
  './certs',
528
- this.certManager.getAcmeOptions()
544
+ existingAcmeOptions
529
545
  );
530
-
531
- if (this.networkProxyBridge.getNetworkProxy()) {
532
- this.certManager.setNetworkProxy(this.networkProxyBridge.getNetworkProxy());
533
- }
534
-
535
- await this.certManager.initialize();
536
546
  }
537
547
  }
538
548