@push.rocks/smartproxy 3.25.4 → 3.28.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.port80handler.d.ts +96 -14
- package/dist_ts/classes.port80handler.js +330 -61
- package/dist_ts/classes.router.d.ts +85 -7
- package/dist_ts/classes.router.js +241 -15
- package/dist_ts/plugins.d.ts +4 -2
- package/dist_ts/plugins.js +5 -3
- package/package.json +1 -1
- package/readme.md +108 -18
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.port80handler.ts +413 -68
- package/ts/classes.router.ts +335 -17
- package/ts/plugins.ts +5 -2
|
@@ -1,19 +1,109 @@
|
|
|
1
|
-
import * as
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
import * as plugins from './plugins.js';
|
|
2
|
+
/**
|
|
3
|
+
* Events emitted by the ACME Certificate Manager
|
|
4
|
+
*/
|
|
5
|
+
export var CertManagerEvents;
|
|
6
|
+
(function (CertManagerEvents) {
|
|
7
|
+
CertManagerEvents["CERTIFICATE_ISSUED"] = "certificate-issued";
|
|
8
|
+
CertManagerEvents["CERTIFICATE_RENEWED"] = "certificate-renewed";
|
|
9
|
+
CertManagerEvents["CERTIFICATE_FAILED"] = "certificate-failed";
|
|
10
|
+
CertManagerEvents["CERTIFICATE_EXPIRING"] = "certificate-expiring";
|
|
11
|
+
CertManagerEvents["MANAGER_STARTED"] = "manager-started";
|
|
12
|
+
CertManagerEvents["MANAGER_STOPPED"] = "manager-stopped";
|
|
13
|
+
})(CertManagerEvents || (CertManagerEvents = {}));
|
|
14
|
+
/**
|
|
15
|
+
* Improved ACME Certificate Manager with event emission and external certificate management
|
|
16
|
+
*/
|
|
17
|
+
export class AcmeCertManager extends plugins.EventEmitter {
|
|
18
|
+
/**
|
|
19
|
+
* Creates a new ACME Certificate Manager
|
|
20
|
+
* @param options Configuration options
|
|
21
|
+
*/
|
|
22
|
+
constructor(options = {}) {
|
|
23
|
+
super();
|
|
24
|
+
this.server = null;
|
|
5
25
|
this.acmeClient = null;
|
|
6
26
|
this.accountKey = null;
|
|
27
|
+
this.renewalTimer = null;
|
|
28
|
+
this.isShuttingDown = false;
|
|
7
29
|
this.domainCertificates = new Map();
|
|
8
|
-
//
|
|
9
|
-
this.
|
|
10
|
-
|
|
11
|
-
|
|
30
|
+
// Default options
|
|
31
|
+
this.options = {
|
|
32
|
+
port: options.port ?? 80,
|
|
33
|
+
contactEmail: options.contactEmail ?? 'admin@example.com',
|
|
34
|
+
useProduction: options.useProduction ?? false, // Safer default: staging
|
|
35
|
+
renewThresholdDays: options.renewThresholdDays ?? 30,
|
|
36
|
+
httpsRedirectPort: options.httpsRedirectPort ?? 443,
|
|
37
|
+
renewCheckIntervalHours: options.renewCheckIntervalHours ?? 24,
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* Starts the HTTP server for ACME challenges
|
|
42
|
+
*/
|
|
43
|
+
async start() {
|
|
44
|
+
if (this.server) {
|
|
45
|
+
throw new Error('Server is already running');
|
|
46
|
+
}
|
|
47
|
+
if (this.isShuttingDown) {
|
|
48
|
+
throw new Error('Server is shutting down');
|
|
49
|
+
}
|
|
50
|
+
return new Promise((resolve, reject) => {
|
|
51
|
+
try {
|
|
52
|
+
this.server = plugins.http.createServer((req, res) => this.handleRequest(req, res));
|
|
53
|
+
this.server.on('error', (error) => {
|
|
54
|
+
if (error.code === 'EACCES') {
|
|
55
|
+
reject(new Error(`Permission denied to bind to port ${this.options.port}. Try running with elevated privileges or use a port > 1024.`));
|
|
56
|
+
}
|
|
57
|
+
else if (error.code === 'EADDRINUSE') {
|
|
58
|
+
reject(new Error(`Port ${this.options.port} is already in use.`));
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
reject(error);
|
|
62
|
+
}
|
|
63
|
+
});
|
|
64
|
+
this.server.listen(this.options.port, () => {
|
|
65
|
+
console.log(`AcmeCertManager is listening on port ${this.options.port}`);
|
|
66
|
+
this.startRenewalTimer();
|
|
67
|
+
this.emit(CertManagerEvents.MANAGER_STARTED, this.options.port);
|
|
68
|
+
resolve();
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
catch (error) {
|
|
72
|
+
reject(error);
|
|
73
|
+
}
|
|
12
74
|
});
|
|
13
75
|
}
|
|
14
76
|
/**
|
|
15
|
-
*
|
|
16
|
-
|
|
77
|
+
* Stops the HTTP server and renewal timer
|
|
78
|
+
*/
|
|
79
|
+
async stop() {
|
|
80
|
+
if (!this.server) {
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
83
|
+
this.isShuttingDown = true;
|
|
84
|
+
// Stop the renewal timer
|
|
85
|
+
if (this.renewalTimer) {
|
|
86
|
+
clearInterval(this.renewalTimer);
|
|
87
|
+
this.renewalTimer = null;
|
|
88
|
+
}
|
|
89
|
+
return new Promise((resolve) => {
|
|
90
|
+
if (this.server) {
|
|
91
|
+
this.server.close(() => {
|
|
92
|
+
this.server = null;
|
|
93
|
+
this.isShuttingDown = false;
|
|
94
|
+
this.emit(CertManagerEvents.MANAGER_STOPPED);
|
|
95
|
+
resolve();
|
|
96
|
+
});
|
|
97
|
+
}
|
|
98
|
+
else {
|
|
99
|
+
this.isShuttingDown = false;
|
|
100
|
+
resolve();
|
|
101
|
+
}
|
|
102
|
+
});
|
|
103
|
+
}
|
|
104
|
+
/**
|
|
105
|
+
* Adds a domain to be managed for certificates
|
|
106
|
+
* @param domain The domain to add
|
|
17
107
|
*/
|
|
18
108
|
addDomain(domain) {
|
|
19
109
|
if (!this.domainCertificates.has(domain)) {
|
|
@@ -22,8 +112,8 @@ export class Port80Handler {
|
|
|
22
112
|
}
|
|
23
113
|
}
|
|
24
114
|
/**
|
|
25
|
-
* Removes a domain from management
|
|
26
|
-
* @param domain The domain to remove
|
|
115
|
+
* Removes a domain from management
|
|
116
|
+
* @param domain The domain to remove
|
|
27
117
|
*/
|
|
28
118
|
removeDomain(domain) {
|
|
29
119
|
if (this.domainCertificates.delete(domain)) {
|
|
@@ -31,32 +121,91 @@ export class Port80Handler {
|
|
|
31
121
|
}
|
|
32
122
|
}
|
|
33
123
|
/**
|
|
34
|
-
*
|
|
35
|
-
*
|
|
124
|
+
* Sets a certificate for a domain directly (for externally obtained certificates)
|
|
125
|
+
* @param domain The domain for the certificate
|
|
126
|
+
* @param certificate The certificate (PEM format)
|
|
127
|
+
* @param privateKey The private key (PEM format)
|
|
128
|
+
* @param expiryDate Optional expiry date
|
|
129
|
+
*/
|
|
130
|
+
setCertificate(domain, certificate, privateKey, expiryDate) {
|
|
131
|
+
let domainInfo = this.domainCertificates.get(domain);
|
|
132
|
+
if (!domainInfo) {
|
|
133
|
+
domainInfo = { certObtained: false, obtainingInProgress: false };
|
|
134
|
+
this.domainCertificates.set(domain, domainInfo);
|
|
135
|
+
}
|
|
136
|
+
domainInfo.certificate = certificate;
|
|
137
|
+
domainInfo.privateKey = privateKey;
|
|
138
|
+
domainInfo.certObtained = true;
|
|
139
|
+
domainInfo.obtainingInProgress = false;
|
|
140
|
+
if (expiryDate) {
|
|
141
|
+
domainInfo.expiryDate = expiryDate;
|
|
142
|
+
}
|
|
143
|
+
else {
|
|
144
|
+
// Try to extract expiry date from certificate
|
|
145
|
+
try {
|
|
146
|
+
// This is a simplistic approach - in a real implementation, use a proper
|
|
147
|
+
// certificate parsing library like node-forge or x509
|
|
148
|
+
const matches = certificate.match(/Not After\s*:\s*(.*?)(?:\n|$)/i);
|
|
149
|
+
if (matches && matches[1]) {
|
|
150
|
+
domainInfo.expiryDate = new Date(matches[1]);
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
catch (error) {
|
|
154
|
+
console.warn(`Failed to extract expiry date from certificate for ${domain}`);
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
console.log(`Certificate set for ${domain}`);
|
|
158
|
+
// Emit certificate event
|
|
159
|
+
this.emitCertificateEvent(CertManagerEvents.CERTIFICATE_ISSUED, {
|
|
160
|
+
domain,
|
|
161
|
+
certificate,
|
|
162
|
+
privateKey,
|
|
163
|
+
expiryDate: domainInfo.expiryDate || new Date(Date.now() + 90 * 24 * 60 * 60 * 1000) // 90 days default
|
|
164
|
+
});
|
|
165
|
+
}
|
|
166
|
+
/**
|
|
167
|
+
* Gets the certificate for a domain if it exists
|
|
168
|
+
* @param domain The domain to get the certificate for
|
|
169
|
+
*/
|
|
170
|
+
getCertificate(domain) {
|
|
171
|
+
const domainInfo = this.domainCertificates.get(domain);
|
|
172
|
+
if (!domainInfo || !domainInfo.certObtained || !domainInfo.certificate || !domainInfo.privateKey) {
|
|
173
|
+
return null;
|
|
174
|
+
}
|
|
175
|
+
return {
|
|
176
|
+
domain,
|
|
177
|
+
certificate: domainInfo.certificate,
|
|
178
|
+
privateKey: domainInfo.privateKey,
|
|
179
|
+
expiryDate: domainInfo.expiryDate || new Date(Date.now() + 90 * 24 * 60 * 60 * 1000) // 90 days default
|
|
180
|
+
};
|
|
181
|
+
}
|
|
182
|
+
/**
|
|
183
|
+
* Lazy initialization of the ACME client
|
|
184
|
+
* @returns An ACME client instance
|
|
36
185
|
*/
|
|
37
186
|
async getAcmeClient() {
|
|
38
187
|
if (this.acmeClient) {
|
|
39
188
|
return this.acmeClient;
|
|
40
189
|
}
|
|
41
|
-
// Generate a new account key
|
|
42
|
-
this.accountKey = (await acme.forge.createPrivateKey()).toString();
|
|
43
|
-
this.acmeClient = new acme.Client({
|
|
44
|
-
directoryUrl:
|
|
45
|
-
|
|
46
|
-
|
|
190
|
+
// Generate a new account key
|
|
191
|
+
this.accountKey = (await plugins.acme.forge.createPrivateKey()).toString();
|
|
192
|
+
this.acmeClient = new plugins.acme.Client({
|
|
193
|
+
directoryUrl: this.options.useProduction
|
|
194
|
+
? plugins.acme.directory.letsencrypt.production
|
|
195
|
+
: plugins.acme.directory.letsencrypt.staging,
|
|
47
196
|
accountKey: this.accountKey,
|
|
48
197
|
});
|
|
49
|
-
// Create a new account
|
|
198
|
+
// Create a new account
|
|
50
199
|
await this.acmeClient.createAccount({
|
|
51
200
|
termsOfServiceAgreed: true,
|
|
52
|
-
contact: [
|
|
201
|
+
contact: [`mailto:${this.options.contactEmail}`],
|
|
53
202
|
});
|
|
54
203
|
return this.acmeClient;
|
|
55
204
|
}
|
|
56
205
|
/**
|
|
57
|
-
* Handles incoming HTTP requests
|
|
58
|
-
*
|
|
59
|
-
*
|
|
206
|
+
* Handles incoming HTTP requests
|
|
207
|
+
* @param req The HTTP request
|
|
208
|
+
* @param res The HTTP response
|
|
60
209
|
*/
|
|
61
210
|
handleRequest(req, res) {
|
|
62
211
|
const hostHeader = req.headers.host;
|
|
@@ -67,7 +216,7 @@ export class Port80Handler {
|
|
|
67
216
|
}
|
|
68
217
|
// Extract domain (ignoring any port in the Host header)
|
|
69
218
|
const domain = hostHeader.split(':')[0];
|
|
70
|
-
// If the request is for an ACME HTTP-01 challenge, handle it
|
|
219
|
+
// If the request is for an ACME HTTP-01 challenge, handle it
|
|
71
220
|
if (req.url && req.url.startsWith('/.well-known/acme-challenge/')) {
|
|
72
221
|
this.handleAcmeChallenge(req, res, domain);
|
|
73
222
|
return;
|
|
@@ -78,18 +227,20 @@ export class Port80Handler {
|
|
|
78
227
|
return;
|
|
79
228
|
}
|
|
80
229
|
const domainInfo = this.domainCertificates.get(domain);
|
|
81
|
-
// If certificate exists, redirect to HTTPS
|
|
230
|
+
// If certificate exists, redirect to HTTPS
|
|
82
231
|
if (domainInfo.certObtained) {
|
|
83
|
-
const
|
|
232
|
+
const httpsPort = this.options.httpsRedirectPort;
|
|
233
|
+
const portSuffix = httpsPort === 443 ? '' : `:${httpsPort}`;
|
|
234
|
+
const redirectUrl = `https://${domain}${portSuffix}${req.url || '/'}`;
|
|
84
235
|
res.statusCode = 301;
|
|
85
236
|
res.setHeader('Location', redirectUrl);
|
|
86
237
|
res.end(`Redirecting to ${redirectUrl}`);
|
|
87
238
|
}
|
|
88
239
|
else {
|
|
89
|
-
// Trigger certificate issuance if not already running
|
|
240
|
+
// Trigger certificate issuance if not already running
|
|
90
241
|
if (!domainInfo.obtainingInProgress) {
|
|
91
|
-
domainInfo.obtainingInProgress = true;
|
|
92
242
|
this.obtainCertificate(domain).catch(err => {
|
|
243
|
+
this.emit(CertManagerEvents.CERTIFICATE_FAILED, { domain, error: err.message });
|
|
93
244
|
console.error(`Error obtaining certificate for ${domain}:`, err);
|
|
94
245
|
});
|
|
95
246
|
}
|
|
@@ -98,7 +249,10 @@ export class Port80Handler {
|
|
|
98
249
|
}
|
|
99
250
|
}
|
|
100
251
|
/**
|
|
101
|
-
* Serves the ACME HTTP-01 challenge response
|
|
252
|
+
* Serves the ACME HTTP-01 challenge response
|
|
253
|
+
* @param req The HTTP request
|
|
254
|
+
* @param res The HTTP response
|
|
255
|
+
* @param domain The domain for the challenge
|
|
102
256
|
*/
|
|
103
257
|
handleAcmeChallenge(req, res, domain) {
|
|
104
258
|
const domainInfo = this.domainCertificates.get(domain);
|
|
@@ -107,7 +261,7 @@ export class Port80Handler {
|
|
|
107
261
|
res.end('Domain not configured');
|
|
108
262
|
return;
|
|
109
263
|
}
|
|
110
|
-
// The token is the last part of the URL
|
|
264
|
+
// The token is the last part of the URL
|
|
111
265
|
const urlParts = req.url?.split('/');
|
|
112
266
|
const token = urlParts ? urlParts[urlParts.length - 1] : '';
|
|
113
267
|
if (domainInfo.challengeToken === token && domainInfo.challengeKeyAuthorization) {
|
|
@@ -122,65 +276,180 @@ export class Port80Handler {
|
|
|
122
276
|
}
|
|
123
277
|
}
|
|
124
278
|
/**
|
|
125
|
-
*
|
|
126
|
-
*
|
|
279
|
+
* Obtains a certificate for a domain using ACME HTTP-01 challenge
|
|
280
|
+
* @param domain The domain to obtain a certificate for
|
|
281
|
+
* @param isRenewal Whether this is a renewal attempt
|
|
127
282
|
*/
|
|
128
|
-
async obtainCertificate(domain) {
|
|
283
|
+
async obtainCertificate(domain, isRenewal = false) {
|
|
284
|
+
// Get the domain info
|
|
285
|
+
const domainInfo = this.domainCertificates.get(domain);
|
|
286
|
+
if (!domainInfo) {
|
|
287
|
+
throw new Error(`Domain not found: ${domain}`);
|
|
288
|
+
}
|
|
289
|
+
// Prevent concurrent certificate issuance
|
|
290
|
+
if (domainInfo.obtainingInProgress) {
|
|
291
|
+
console.log(`Certificate issuance already in progress for ${domain}`);
|
|
292
|
+
return;
|
|
293
|
+
}
|
|
294
|
+
domainInfo.obtainingInProgress = true;
|
|
295
|
+
domainInfo.lastRenewalAttempt = new Date();
|
|
129
296
|
try {
|
|
130
297
|
const client = await this.getAcmeClient();
|
|
131
|
-
// Create a new order for the domain
|
|
298
|
+
// Create a new order for the domain
|
|
132
299
|
const order = await client.createOrder({
|
|
133
300
|
identifiers: [{ type: 'dns', value: domain }],
|
|
134
301
|
});
|
|
135
|
-
// Get the authorizations for the order
|
|
302
|
+
// Get the authorizations for the order
|
|
136
303
|
const authorizations = await client.getAuthorizations(order);
|
|
137
304
|
for (const authz of authorizations) {
|
|
138
305
|
const challenge = authz.challenges.find(ch => ch.type === 'http-01');
|
|
139
306
|
if (!challenge) {
|
|
140
307
|
throw new Error('HTTP-01 challenge not found');
|
|
141
308
|
}
|
|
142
|
-
// Get the key authorization for the challenge
|
|
309
|
+
// Get the key authorization for the challenge
|
|
143
310
|
const keyAuthorization = await client.getChallengeKeyAuthorization(challenge);
|
|
144
|
-
|
|
311
|
+
// Store the challenge data
|
|
145
312
|
domainInfo.challengeToken = challenge.token;
|
|
146
313
|
domainInfo.challengeKeyAuthorization = keyAuthorization;
|
|
147
|
-
//
|
|
148
|
-
//
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
314
|
+
// ACME client type definition workaround - use compatible approach
|
|
315
|
+
// First check if challenge verification is needed
|
|
316
|
+
const authzUrl = authz.url;
|
|
317
|
+
try {
|
|
318
|
+
// Check if authzUrl exists and perform verification
|
|
319
|
+
if (authzUrl) {
|
|
320
|
+
await client.verifyChallenge(authz, challenge);
|
|
321
|
+
}
|
|
322
|
+
// Complete the challenge
|
|
323
|
+
await client.completeChallenge(challenge);
|
|
324
|
+
// Wait for validation
|
|
325
|
+
await client.waitForValidStatus(challenge);
|
|
326
|
+
console.log(`HTTP-01 challenge completed for ${domain}`);
|
|
327
|
+
}
|
|
328
|
+
catch (error) {
|
|
329
|
+
console.error(`Challenge error for ${domain}:`, error);
|
|
330
|
+
throw error;
|
|
331
|
+
}
|
|
156
332
|
}
|
|
157
|
-
// Generate a CSR and
|
|
158
|
-
|
|
159
|
-
const [csrBuffer, privateKeyBuffer] = await acme.forge.createCsr({
|
|
333
|
+
// Generate a CSR and private key
|
|
334
|
+
const [csrBuffer, privateKeyBuffer] = await plugins.acme.forge.createCsr({
|
|
160
335
|
commonName: domain,
|
|
161
336
|
});
|
|
162
337
|
const csr = csrBuffer.toString();
|
|
163
338
|
const privateKey = privateKeyBuffer.toString();
|
|
164
|
-
// Finalize the order
|
|
339
|
+
// Finalize the order with our CSR
|
|
165
340
|
await client.finalizeOrder(order, csr);
|
|
341
|
+
// Get the certificate with the full chain
|
|
166
342
|
const certificate = await client.getCertificate(order);
|
|
167
|
-
|
|
343
|
+
// Store the certificate and key
|
|
168
344
|
domainInfo.certificate = certificate;
|
|
169
345
|
domainInfo.privateKey = privateKey;
|
|
170
346
|
domainInfo.certObtained = true;
|
|
171
|
-
|
|
347
|
+
// Clear challenge data
|
|
172
348
|
delete domainInfo.challengeToken;
|
|
173
349
|
delete domainInfo.challengeKeyAuthorization;
|
|
174
|
-
|
|
175
|
-
|
|
350
|
+
// Extract expiry date from certificate
|
|
351
|
+
try {
|
|
352
|
+
const matches = certificate.match(/Not After\s*:\s*(.*?)(?:\n|$)/i);
|
|
353
|
+
if (matches && matches[1]) {
|
|
354
|
+
domainInfo.expiryDate = new Date(matches[1]);
|
|
355
|
+
console.log(`Certificate for ${domain} will expire on ${domainInfo.expiryDate.toISOString()}`);
|
|
356
|
+
}
|
|
357
|
+
}
|
|
358
|
+
catch (error) {
|
|
359
|
+
console.warn(`Failed to extract expiry date from certificate for ${domain}`);
|
|
360
|
+
}
|
|
361
|
+
console.log(`Certificate ${isRenewal ? 'renewed' : 'obtained'} for ${domain}`);
|
|
362
|
+
// Emit the appropriate event
|
|
363
|
+
const eventType = isRenewal
|
|
364
|
+
? CertManagerEvents.CERTIFICATE_RENEWED
|
|
365
|
+
: CertManagerEvents.CERTIFICATE_ISSUED;
|
|
366
|
+
this.emitCertificateEvent(eventType, {
|
|
367
|
+
domain,
|
|
368
|
+
certificate,
|
|
369
|
+
privateKey,
|
|
370
|
+
expiryDate: domainInfo.expiryDate || new Date(Date.now() + 90 * 24 * 60 * 60 * 1000) // 90 days default
|
|
371
|
+
});
|
|
176
372
|
}
|
|
177
373
|
catch (error) {
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
374
|
+
// Check for rate limit errors
|
|
375
|
+
if (error.message && (error.message.includes('rateLimited') ||
|
|
376
|
+
error.message.includes('too many certificates') ||
|
|
377
|
+
error.message.includes('rate limit'))) {
|
|
378
|
+
console.error(`Rate limit reached for ${domain}. Waiting before retry.`);
|
|
379
|
+
}
|
|
380
|
+
else {
|
|
381
|
+
console.error(`Error during certificate issuance for ${domain}:`, error);
|
|
382
|
+
}
|
|
383
|
+
// Emit failure event
|
|
384
|
+
this.emit(CertManagerEvents.CERTIFICATE_FAILED, {
|
|
385
|
+
domain,
|
|
386
|
+
error: error.message || 'Unknown error',
|
|
387
|
+
isRenewal
|
|
388
|
+
});
|
|
389
|
+
}
|
|
390
|
+
finally {
|
|
391
|
+
// Reset flag whether successful or not
|
|
392
|
+
domainInfo.obtainingInProgress = false;
|
|
393
|
+
}
|
|
394
|
+
}
|
|
395
|
+
/**
|
|
396
|
+
* Starts the certificate renewal timer
|
|
397
|
+
*/
|
|
398
|
+
startRenewalTimer() {
|
|
399
|
+
if (this.renewalTimer) {
|
|
400
|
+
clearInterval(this.renewalTimer);
|
|
401
|
+
}
|
|
402
|
+
// Convert hours to milliseconds
|
|
403
|
+
const checkInterval = this.options.renewCheckIntervalHours * 60 * 60 * 1000;
|
|
404
|
+
this.renewalTimer = setInterval(() => this.checkForRenewals(), checkInterval);
|
|
405
|
+
// Prevent the timer from keeping the process alive
|
|
406
|
+
if (this.renewalTimer.unref) {
|
|
407
|
+
this.renewalTimer.unref();
|
|
408
|
+
}
|
|
409
|
+
console.log(`Certificate renewal check scheduled every ${this.options.renewCheckIntervalHours} hours`);
|
|
410
|
+
}
|
|
411
|
+
/**
|
|
412
|
+
* Checks for certificates that need renewal
|
|
413
|
+
*/
|
|
414
|
+
checkForRenewals() {
|
|
415
|
+
if (this.isShuttingDown) {
|
|
416
|
+
return;
|
|
417
|
+
}
|
|
418
|
+
console.log('Checking for certificates that need renewal...');
|
|
419
|
+
const now = new Date();
|
|
420
|
+
const renewThresholdMs = this.options.renewThresholdDays * 24 * 60 * 60 * 1000;
|
|
421
|
+
for (const [domain, domainInfo] of this.domainCertificates.entries()) {
|
|
422
|
+
// Skip domains without certificates or already in renewal
|
|
423
|
+
if (!domainInfo.certObtained || domainInfo.obtainingInProgress) {
|
|
424
|
+
continue;
|
|
425
|
+
}
|
|
426
|
+
// Skip domains without expiry dates
|
|
427
|
+
if (!domainInfo.expiryDate) {
|
|
428
|
+
continue;
|
|
429
|
+
}
|
|
430
|
+
const timeUntilExpiry = domainInfo.expiryDate.getTime() - now.getTime();
|
|
431
|
+
// Check if certificate is near expiry
|
|
432
|
+
if (timeUntilExpiry <= renewThresholdMs) {
|
|
433
|
+
console.log(`Certificate for ${domain} expires soon, renewing...`);
|
|
434
|
+
this.emit(CertManagerEvents.CERTIFICATE_EXPIRING, {
|
|
435
|
+
domain,
|
|
436
|
+
expiryDate: domainInfo.expiryDate,
|
|
437
|
+
daysRemaining: Math.ceil(timeUntilExpiry / (24 * 60 * 60 * 1000))
|
|
438
|
+
});
|
|
439
|
+
// Start renewal process
|
|
440
|
+
this.obtainCertificate(domain, true).catch(err => {
|
|
441
|
+
console.error(`Error renewing certificate for ${domain}:`, err);
|
|
442
|
+
});
|
|
182
443
|
}
|
|
183
444
|
}
|
|
184
445
|
}
|
|
446
|
+
/**
|
|
447
|
+
* Emits a certificate event with the certificate data
|
|
448
|
+
* @param eventType The event type to emit
|
|
449
|
+
* @param data The certificate data
|
|
450
|
+
*/
|
|
451
|
+
emitCertificateEvent(eventType, data) {
|
|
452
|
+
this.emit(eventType, data);
|
|
453
|
+
}
|
|
185
454
|
}
|
|
186
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5wb3J0ODBoYW5kbGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvY2xhc3Nlcy5wb3J0ODBoYW5kbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQzdCLE9BQU8sS0FBSyxJQUFJLE1BQU0sYUFBYSxDQUFDO0FBV3BDLE1BQU0sT0FBTyxhQUFhO0lBTXhCO1FBSFEsZUFBVSxHQUF1QixJQUFJLENBQUM7UUFDdEMsZUFBVSxHQUFrQixJQUFJLENBQUM7UUFHdkMsSUFBSSxDQUFDLGtCQUFrQixHQUFHLElBQUksR0FBRyxFQUE4QixDQUFDO1FBRWhFLDhDQUE4QztRQUM5QyxJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsQ0FBQyxHQUFHLEVBQUUsR0FBRyxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLEdBQUcsRUFBRSxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBQzVFLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsRUFBRSxHQUFHLEVBQUU7WUFDMUIsT0FBTyxDQUFDLEdBQUcsQ0FBQyx1Q0FBdUMsQ0FBQyxDQUFDO1FBQ3ZELENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVEOzs7T0FHRztJQUNJLFNBQVMsQ0FBQyxNQUFjO1FBQzdCLElBQUksQ0FBQyxJQUFJLENBQUMsa0JBQWtCLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUM7WUFDekMsSUFBSSxDQUFDLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsRUFBRSxZQUFZLEVBQUUsS0FBSyxFQUFFLG1CQUFtQixFQUFFLEtBQUssRUFBRSxDQUFDLENBQUM7WUFDekYsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsTUFBTSxFQUFFLENBQUMsQ0FBQztRQUN6QyxDQUFDO0lBQ0gsQ0FBQztJQUVEOzs7T0FHRztJQUNJ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
|
|
455
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.port80handler.js","sourceRoot":"","sources":["../ts/classes.port80handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,91 @@
|
|
|
1
|
-
import * as
|
|
1
|
+
import * as http from 'http';
|
|
2
|
+
import * as tsclass from '@tsclass/tsclass';
|
|
3
|
+
/**
|
|
4
|
+
* Optional path pattern configuration that can be added to proxy configs
|
|
5
|
+
*/
|
|
6
|
+
export interface IPathPatternConfig {
|
|
7
|
+
pathPattern?: string;
|
|
8
|
+
}
|
|
9
|
+
/**
|
|
10
|
+
* Interface for router result with additional metadata
|
|
11
|
+
*/
|
|
12
|
+
export interface IRouterResult {
|
|
13
|
+
config: tsclass.network.IReverseProxyConfig;
|
|
14
|
+
pathMatch?: string;
|
|
15
|
+
pathParams?: Record<string, string>;
|
|
16
|
+
pathRemainder?: string;
|
|
17
|
+
}
|
|
2
18
|
export declare class ProxyRouter {
|
|
3
|
-
reverseProxyConfigs
|
|
19
|
+
private reverseProxyConfigs;
|
|
20
|
+
private defaultConfig?;
|
|
21
|
+
private pathPatterns;
|
|
22
|
+
private logger;
|
|
23
|
+
constructor(configs?: tsclass.network.IReverseProxyConfig[], logger?: {
|
|
24
|
+
error: (message: string, data?: any) => void;
|
|
25
|
+
warn: (message: string, data?: any) => void;
|
|
26
|
+
info: (message: string, data?: any) => void;
|
|
27
|
+
debug: (message: string, data?: any) => void;
|
|
28
|
+
});
|
|
29
|
+
/**
|
|
30
|
+
* Sets a new set of reverse configs to be routed to
|
|
31
|
+
* @param reverseCandidatesArg Array of reverse proxy configurations
|
|
32
|
+
*/
|
|
33
|
+
setNewProxyConfigs(reverseCandidatesArg: tsclass.network.IReverseProxyConfig[]): void;
|
|
34
|
+
/**
|
|
35
|
+
* Routes a request based on hostname and path
|
|
36
|
+
* @param req The incoming HTTP request
|
|
37
|
+
* @returns The matching proxy config or undefined if no match found
|
|
38
|
+
*/
|
|
39
|
+
routeReq(req: http.IncomingMessage): tsclass.network.IReverseProxyConfig;
|
|
40
|
+
/**
|
|
41
|
+
* Routes a request with detailed matching information
|
|
42
|
+
* @param req The incoming HTTP request
|
|
43
|
+
* @returns Detailed routing result including matched config and path information
|
|
44
|
+
*/
|
|
45
|
+
routeReqWithDetails(req: http.IncomingMessage): IRouterResult | undefined;
|
|
46
|
+
/**
|
|
47
|
+
* Find a config for a specific host and path
|
|
48
|
+
*/
|
|
49
|
+
private findConfigForHost;
|
|
50
|
+
/**
|
|
51
|
+
* Matches a URL path against a pattern
|
|
52
|
+
* Supports:
|
|
53
|
+
* - Exact matches: /users/profile
|
|
54
|
+
* - Wildcards: /api/* (matches any path starting with /api/)
|
|
55
|
+
* - Path parameters: /users/:id (captures id as a parameter)
|
|
56
|
+
*
|
|
57
|
+
* @param path The URL path to match
|
|
58
|
+
* @param pattern The pattern to match against
|
|
59
|
+
* @returns Match result with params and remainder, or null if no match
|
|
60
|
+
*/
|
|
61
|
+
private matchPath;
|
|
62
|
+
/**
|
|
63
|
+
* Gets all currently active proxy configurations
|
|
64
|
+
* @returns Array of all active configurations
|
|
65
|
+
*/
|
|
66
|
+
getProxyConfigs(): tsclass.network.IReverseProxyConfig[];
|
|
67
|
+
/**
|
|
68
|
+
* Gets all hostnames that this router is configured to handle
|
|
69
|
+
* @returns Array of hostnames
|
|
70
|
+
*/
|
|
71
|
+
getHostnames(): string[];
|
|
72
|
+
/**
|
|
73
|
+
* Adds a single new proxy configuration
|
|
74
|
+
* @param config The configuration to add
|
|
75
|
+
* @param pathPattern Optional path pattern for route matching
|
|
76
|
+
*/
|
|
77
|
+
addProxyConfig(config: tsclass.network.IReverseProxyConfig, pathPattern?: string): void;
|
|
4
78
|
/**
|
|
5
|
-
*
|
|
6
|
-
* @param
|
|
79
|
+
* Sets a path pattern for an existing config
|
|
80
|
+
* @param config The existing configuration
|
|
81
|
+
* @param pathPattern The path pattern to set
|
|
82
|
+
* @returns Boolean indicating if the config was found and updated
|
|
7
83
|
*/
|
|
8
|
-
|
|
84
|
+
setPathPattern(config: tsclass.network.IReverseProxyConfig, pathPattern: string): boolean;
|
|
9
85
|
/**
|
|
10
|
-
*
|
|
86
|
+
* Removes a proxy configuration by hostname
|
|
87
|
+
* @param hostname The hostname to remove
|
|
88
|
+
* @returns Boolean indicating whether any configs were removed
|
|
11
89
|
*/
|
|
12
|
-
|
|
90
|
+
removeProxyConfig(hostname: string): boolean;
|
|
13
91
|
}
|