@push.rocks/smartacme 9.0.1 → 9.1.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/index.d.ts +1 -0
- package/dist_ts/plugins.d.ts +2 -1
- package/dist_ts/plugins.js +3 -2
- package/dist_ts/smartacme.classes.smartacme.d.ts +27 -3
- package/dist_ts/smartacme.classes.smartacme.js +113 -47
- package/package.json +2 -1
- package/readme.hints.md +15 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/index.ts +3 -0
- package/ts/plugins.ts +2 -0
- package/ts/smartacme.classes.smartacme.ts +167 -55
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartacme',
|
|
6
|
-
version: '9.0
|
|
6
|
+
version: '9.1.0',
|
|
7
7
|
description: 'A TypeScript-based ACME client for LetsEncrypt certificate management with a focus on simplicity and power.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx1QkFBdUI7SUFDN0IsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLDZHQUE2RztDQUMzSCxDQUFBIn0=
|
package/dist_ts/index.d.ts
CHANGED
package/dist_ts/plugins.d.ts
CHANGED
|
@@ -12,7 +12,8 @@ import * as smartnetwork from '@push.rocks/smartnetwork';
|
|
|
12
12
|
import * as smartunique from '@push.rocks/smartunique';
|
|
13
13
|
import * as smartstring from '@push.rocks/smartstring';
|
|
14
14
|
import * as smarttime from '@push.rocks/smarttime';
|
|
15
|
-
|
|
15
|
+
import * as taskbuffer from '@push.rocks/taskbuffer';
|
|
16
|
+
export { lik, smartdata, smartdelay, smartdnsClient, smartlog, smartnetwork, smartunique, smartstring, smarttime, taskbuffer, };
|
|
16
17
|
import * as tsclass from '@tsclass/tsclass';
|
|
17
18
|
export { tsclass };
|
|
18
19
|
import * as acme from './acme/index.js';
|
package/dist_ts/plugins.js
CHANGED
|
@@ -15,7 +15,8 @@ import * as smartnetwork from '@push.rocks/smartnetwork';
|
|
|
15
15
|
import * as smartunique from '@push.rocks/smartunique';
|
|
16
16
|
import * as smartstring from '@push.rocks/smartstring';
|
|
17
17
|
import * as smarttime from '@push.rocks/smarttime';
|
|
18
|
-
|
|
18
|
+
import * as taskbuffer from '@push.rocks/taskbuffer';
|
|
19
|
+
export { lik, smartdata, smartdelay, smartdnsClient, smartlog, smartnetwork, smartunique, smartstring, smarttime, taskbuffer, };
|
|
19
20
|
// @tsclass scope
|
|
20
21
|
import * as tsclass from '@tsclass/tsclass';
|
|
21
22
|
export { tsclass };
|
|
@@ -25,4 +26,4 @@ export { acme };
|
|
|
25
26
|
// local handlers for challenge types
|
|
26
27
|
import * as handlers from './handlers/index.js';
|
|
27
28
|
export { handlers };
|
|
28
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYztBQUNkLE9BQU8sS0FBSyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ3pCLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBRTdCLE9BQU8sRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLENBQUM7QUFFcEIsdUJBQXVCO0FBQ3ZCLE9BQU8sS0FBSyxVQUFVLE1BQU0sMkJBQTJCLENBQUM7QUFFeEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxDQUFDO0FBRXRCLG9CQUFvQjtBQUNwQixPQUFPLEtBQUssR0FBRyxNQUFNLGlCQUFpQixDQUFDO0FBQ3ZDLE9BQU8sS0FBSyxTQUFTLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxLQUFLLFVBQVUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEtBQUssY0FBYyxNQUFNLDZCQUE2QixDQUFDO0FBQzlELE9BQU8sS0FBSyxRQUFRLE1BQU0sc0JBQXNCLENBQUM7QUFDakQsT0FBTyxLQUFLLFlBQVksTUFBTSwwQkFBMEIsQ0FBQztBQUN6RCxPQUFPLEtBQUssV0FBVyxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxXQUFXLE1BQU0seUJBQXlCLENBQUM7QUFDdkQsT0FBTyxLQUFLLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssVUFBVSxNQUFNLHdCQUF3QixDQUFDO0FBRXJELE9BQU8sRUFDTCxHQUFHLEVBQ0gsU0FBUyxFQUNULFVBQVUsRUFDVixjQUFjLEVBQ2QsUUFBUSxFQUNSLFlBQVksRUFDWixXQUFXLEVBQ1gsV0FBVyxFQUNYLFNBQVMsRUFDVCxVQUFVLEdBQ1gsQ0FBQztBQUVGLGlCQUFpQjtBQUNqQixPQUFPLEtBQUssT0FBTyxNQUFNLGtCQUFrQixDQUFDO0FBRTVDLE9BQU8sRUFBRSxPQUFPLEVBQUUsQ0FBQztBQUVuQix3Q0FBd0M7QUFDeEMsT0FBTyxLQUFLLElBQUksTUFBTSxpQkFBaUIsQ0FBQztBQUV4QyxPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUM7QUFDaEIscUNBQXFDO0FBQ3JDLE9BQU8sS0FBSyxRQUFRLE1BQU0scUJBQXFCLENBQUM7QUFDaEQsT0FBTyxFQUFFLFFBQVEsRUFBRSxDQUFDIn0=
|
|
@@ -34,6 +34,21 @@ export interface ISmartAcmeOptions {
|
|
|
34
34
|
* Defaults to ['dns-01'] or first supported type from handlers.
|
|
35
35
|
*/
|
|
36
36
|
challengePriority?: string[];
|
|
37
|
+
/**
|
|
38
|
+
* Maximum number of concurrent ACME issuances across all domains.
|
|
39
|
+
* Defaults to 5.
|
|
40
|
+
*/
|
|
41
|
+
maxConcurrentIssuances?: number;
|
|
42
|
+
/**
|
|
43
|
+
* Maximum ACME orders allowed within the sliding window.
|
|
44
|
+
* Defaults to 250 (conservative limit under Let's Encrypt's 300/3h).
|
|
45
|
+
*/
|
|
46
|
+
maxOrdersPerWindow?: number;
|
|
47
|
+
/**
|
|
48
|
+
* Sliding window duration in milliseconds for rate limiting.
|
|
49
|
+
* Defaults to 3 hours (10_800_000 ms).
|
|
50
|
+
*/
|
|
51
|
+
orderWindowMs?: number;
|
|
37
52
|
}
|
|
38
53
|
/**
|
|
39
54
|
* class SmartAcme
|
|
@@ -57,9 +72,14 @@ export declare class SmartAcme {
|
|
|
57
72
|
private retryOptions;
|
|
58
73
|
private pendingChallenges;
|
|
59
74
|
private challengePriority;
|
|
60
|
-
private
|
|
75
|
+
private taskManager;
|
|
76
|
+
private certIssuanceTask;
|
|
61
77
|
private boundSigintHandler;
|
|
62
78
|
private boundSigtermHandler;
|
|
79
|
+
/**
|
|
80
|
+
* Exposes the aggregated task event stream for observing certificate issuance progress.
|
|
81
|
+
*/
|
|
82
|
+
get certIssuanceEvents(): plugins.taskbuffer.TaskManager['taskSubject'];
|
|
63
83
|
constructor(optionsArg: ISmartAcmeOptions);
|
|
64
84
|
/**
|
|
65
85
|
* starts the instance
|
|
@@ -87,8 +107,7 @@ export declare class SmartAcme {
|
|
|
87
107
|
* * if not in the database announce it
|
|
88
108
|
* * then get it from letsencrypt
|
|
89
109
|
* * store it
|
|
90
|
-
* *
|
|
91
|
-
* * retrieve it from the databse and return it
|
|
110
|
+
* * retrieve it from the database and return it
|
|
92
111
|
*
|
|
93
112
|
* @param domainArg
|
|
94
113
|
* @param options Optional configuration for certificate generation
|
|
@@ -96,4 +115,9 @@ export declare class SmartAcme {
|
|
|
96
115
|
getCertificateForDomain(domainArg: string, options?: {
|
|
97
116
|
includeWildcard?: boolean;
|
|
98
117
|
}): Promise<SmartacmeCert>;
|
|
118
|
+
/**
|
|
119
|
+
* Performs the actual ACME certificate issuance flow.
|
|
120
|
+
* Called by the certIssuanceTask's taskFunction.
|
|
121
|
+
*/
|
|
122
|
+
private performCertificateIssuance;
|
|
99
123
|
}
|
|
@@ -2,6 +2,12 @@ import * as plugins from './plugins.js';
|
|
|
2
2
|
import { SmartacmeCertMatcher } from './smartacme.classes.certmatcher.js';
|
|
3
3
|
import { commitinfo } from './00_commitinfo_data.js';
|
|
4
4
|
import { SmartacmeCert } from './smartacme.classes.cert.js';
|
|
5
|
+
const CERT_ISSUANCE_STEPS = [
|
|
6
|
+
{ name: 'prepare', description: 'Creating ACME order', percentage: 10 },
|
|
7
|
+
{ name: 'authorize', description: 'Solving ACME challenges', percentage: 40 },
|
|
8
|
+
{ name: 'finalize', description: 'Finalizing and getting cert', percentage: 30 },
|
|
9
|
+
{ name: 'store', description: 'Storing certificate', percentage: 20 },
|
|
10
|
+
];
|
|
5
11
|
/**
|
|
6
12
|
* class SmartAcme
|
|
7
13
|
* can be used for setting up communication with an ACME authority
|
|
@@ -13,6 +19,12 @@ import { SmartacmeCert } from './smartacme.classes.cert.js';
|
|
|
13
19
|
* ```
|
|
14
20
|
*/
|
|
15
21
|
export class SmartAcme {
|
|
22
|
+
/**
|
|
23
|
+
* Exposes the aggregated task event stream for observing certificate issuance progress.
|
|
24
|
+
*/
|
|
25
|
+
get certIssuanceEvents() {
|
|
26
|
+
return this.taskManager.taskSubject;
|
|
27
|
+
}
|
|
16
28
|
constructor(optionsArg) {
|
|
17
29
|
this.smartdns = new plugins.smartdnsClient.Smartdns({});
|
|
18
30
|
// track pending DNS challenges for graceful shutdown
|
|
@@ -41,8 +53,54 @@ export class SmartAcme {
|
|
|
41
53
|
optionsArg.challengePriority && optionsArg.challengePriority.length > 0
|
|
42
54
|
? optionsArg.challengePriority
|
|
43
55
|
: this.challengeHandlers.map((h) => h.getSupportedTypes()[0]);
|
|
44
|
-
//
|
|
45
|
-
this.
|
|
56
|
+
// ── TaskManager setup ──────────────────────────────────────────────────
|
|
57
|
+
this.taskManager = new plugins.taskbuffer.TaskManager();
|
|
58
|
+
// Constraint 1: Per-domain mutex — one issuance at a time per TLD, with result sharing
|
|
59
|
+
const certDomainMutex = new plugins.taskbuffer.TaskConstraintGroup({
|
|
60
|
+
name: 'cert-domain-mutex',
|
|
61
|
+
maxConcurrent: 1,
|
|
62
|
+
resultSharingMode: 'share-latest',
|
|
63
|
+
constraintKeyForExecution: (_task, input) => {
|
|
64
|
+
return input?.certDomainName ?? null;
|
|
65
|
+
},
|
|
66
|
+
shouldExecute: async (_task, input) => {
|
|
67
|
+
if (!input?.certDomainName || !this.certmanager)
|
|
68
|
+
return true;
|
|
69
|
+
// Safety net: if a valid cert is already cached, skip re-issuance
|
|
70
|
+
const existing = await this.certmanager.retrieveCertificate(input.certDomainName);
|
|
71
|
+
if (existing && !existing.shouldBeRenewed()) {
|
|
72
|
+
return false;
|
|
73
|
+
}
|
|
74
|
+
return true;
|
|
75
|
+
},
|
|
76
|
+
});
|
|
77
|
+
// Constraint 2: Global concurrency cap
|
|
78
|
+
const acmeGlobalConcurrency = new plugins.taskbuffer.TaskConstraintGroup({
|
|
79
|
+
name: 'acme-global-concurrency',
|
|
80
|
+
maxConcurrent: optionsArg.maxConcurrentIssuances ?? 5,
|
|
81
|
+
constraintKeyForExecution: () => 'global',
|
|
82
|
+
});
|
|
83
|
+
// Constraint 3: Account-level rate limiting
|
|
84
|
+
const acmeAccountRateLimit = new plugins.taskbuffer.TaskConstraintGroup({
|
|
85
|
+
name: 'acme-account-rate-limit',
|
|
86
|
+
rateLimit: {
|
|
87
|
+
maxPerWindow: optionsArg.maxOrdersPerWindow ?? 250,
|
|
88
|
+
windowMs: optionsArg.orderWindowMs ?? 10_800_000,
|
|
89
|
+
},
|
|
90
|
+
constraintKeyForExecution: () => 'account',
|
|
91
|
+
});
|
|
92
|
+
this.taskManager.addConstraintGroup(certDomainMutex);
|
|
93
|
+
this.taskManager.addConstraintGroup(acmeGlobalConcurrency);
|
|
94
|
+
this.taskManager.addConstraintGroup(acmeAccountRateLimit);
|
|
95
|
+
// Create the single reusable certificate issuance task
|
|
96
|
+
this.certIssuanceTask = new plugins.taskbuffer.Task({
|
|
97
|
+
name: 'cert-issuance',
|
|
98
|
+
steps: CERT_ISSUANCE_STEPS,
|
|
99
|
+
taskFunction: async (input) => {
|
|
100
|
+
return this.performCertificateIssuance(input);
|
|
101
|
+
},
|
|
102
|
+
});
|
|
103
|
+
this.taskManager.addTask(this.certIssuanceTask);
|
|
46
104
|
}
|
|
47
105
|
/**
|
|
48
106
|
* starts the instance
|
|
@@ -81,6 +139,8 @@ export class SmartAcme {
|
|
|
81
139
|
termsOfServiceAgreed: true,
|
|
82
140
|
contact: [`mailto:${this.options.accountEmail}`],
|
|
83
141
|
});
|
|
142
|
+
// Start the task manager
|
|
143
|
+
await this.taskManager.start();
|
|
84
144
|
// Setup graceful shutdown handlers (store references for removal in stop())
|
|
85
145
|
this.boundSigintHandler = () => this.handleSignal('SIGINT');
|
|
86
146
|
this.boundSigtermHandler = () => this.handleSignal('SIGTERM');
|
|
@@ -100,6 +160,8 @@ export class SmartAcme {
|
|
|
100
160
|
process.removeListener('SIGTERM', this.boundSigtermHandler);
|
|
101
161
|
this.boundSigtermHandler = null;
|
|
102
162
|
}
|
|
163
|
+
// Stop the task manager
|
|
164
|
+
await this.taskManager.stop();
|
|
103
165
|
// Destroy ACME HTTP transport (closes keep-alive sockets)
|
|
104
166
|
if (this.client) {
|
|
105
167
|
this.client.destroy();
|
|
@@ -183,8 +245,7 @@ export class SmartAcme {
|
|
|
183
245
|
* * if not in the database announce it
|
|
184
246
|
* * then get it from letsencrypt
|
|
185
247
|
* * store it
|
|
186
|
-
* *
|
|
187
|
-
* * retrieve it from the databse and return it
|
|
248
|
+
* * retrieve it from the database and return it
|
|
188
249
|
*
|
|
189
250
|
* @param domainArg
|
|
190
251
|
* @param options Optional configuration for certificate generation
|
|
@@ -206,32 +267,48 @@ export class SmartAcme {
|
|
|
206
267
|
}
|
|
207
268
|
// Retrieve any existing certificate record by base domain.
|
|
208
269
|
const retrievedCertificate = await this.certmanager.retrieveCertificate(certDomainName);
|
|
209
|
-
if (!retrievedCertificate
|
|
210
|
-
(await this.interestMap.checkInterest(certDomainName))) {
|
|
211
|
-
const existingCertificateInterest = this.interestMap.findInterest(certDomainName);
|
|
212
|
-
const certificate = existingCertificateInterest.interestFullfilled;
|
|
213
|
-
return certificate;
|
|
214
|
-
}
|
|
215
|
-
else if (retrievedCertificate && !retrievedCertificate.shouldBeRenewed()) {
|
|
270
|
+
if (retrievedCertificate && !retrievedCertificate.shouldBeRenewed()) {
|
|
216
271
|
return retrievedCertificate;
|
|
217
272
|
}
|
|
218
273
|
else if (retrievedCertificate && retrievedCertificate.shouldBeRenewed()) {
|
|
219
274
|
// Remove old certificate via certManager
|
|
220
275
|
await this.certmanager.deleteCertificate(certDomainName);
|
|
221
276
|
}
|
|
222
|
-
//
|
|
223
|
-
const
|
|
277
|
+
// Build issuance input and trigger the constrained task
|
|
278
|
+
const issuanceInput = {
|
|
279
|
+
certDomainName,
|
|
280
|
+
domainArg,
|
|
281
|
+
isWildcardRequest,
|
|
282
|
+
includeWildcard: options?.includeWildcard ?? false,
|
|
283
|
+
};
|
|
284
|
+
const result = await this.taskManager.triggerTaskConstrained(this.certIssuanceTask, issuanceInput);
|
|
285
|
+
// If we got a cert directly (either from execution or result sharing), return it
|
|
286
|
+
if (result != null) {
|
|
287
|
+
return result;
|
|
288
|
+
}
|
|
289
|
+
// If shouldExecute returned false (cert appeared in cache), read from cache
|
|
290
|
+
const cachedCert = await this.certmanager.retrieveCertificate(certDomainName);
|
|
291
|
+
if (cachedCert) {
|
|
292
|
+
return cachedCert;
|
|
293
|
+
}
|
|
294
|
+
throw new Error(`Certificate issuance failed for ${certDomainName}`);
|
|
295
|
+
}
|
|
296
|
+
/**
|
|
297
|
+
* Performs the actual ACME certificate issuance flow.
|
|
298
|
+
* Called by the certIssuanceTask's taskFunction.
|
|
299
|
+
*/
|
|
300
|
+
async performCertificateIssuance(input) {
|
|
301
|
+
const { certDomainName, isWildcardRequest, includeWildcard } = input;
|
|
302
|
+
// ── Step: prepare ─────────────────────────────────────────────────────
|
|
303
|
+
this.certIssuanceTask.notifyStep('prepare');
|
|
224
304
|
// Build identifiers array based on request
|
|
225
305
|
const identifiers = [];
|
|
226
306
|
if (isWildcardRequest) {
|
|
227
|
-
// If requesting a wildcard directly, only add the wildcard
|
|
228
307
|
identifiers.push({ type: 'dns', value: `*.${certDomainName}` });
|
|
229
308
|
}
|
|
230
309
|
else {
|
|
231
|
-
// Add the regular domain
|
|
232
310
|
identifiers.push({ type: 'dns', value: certDomainName });
|
|
233
|
-
|
|
234
|
-
if (options?.includeWildcard) {
|
|
311
|
+
if (includeWildcard) {
|
|
235
312
|
const hasDnsHandler = this.challengeHandlers.some((h) => h.getSupportedTypes().includes('dns-01'));
|
|
236
313
|
if (!hasDnsHandler) {
|
|
237
314
|
this.logger.log('warn', 'Wildcard certificate requested but no DNS-01 handler available. Skipping wildcard.');
|
|
@@ -245,6 +322,8 @@ export class SmartAcme {
|
|
|
245
322
|
const order = await this.retry(() => this.client.createOrder({
|
|
246
323
|
identifiers,
|
|
247
324
|
}), 'createOrder');
|
|
325
|
+
// ── Step: authorize ───────────────────────────────────────────────────
|
|
326
|
+
this.certIssuanceTask.notifyStep('authorize');
|
|
248
327
|
/* Get authorizations and select challenges */
|
|
249
328
|
const authorizations = await this.retry(() => this.client.getAuthorizations(order), 'getAuthorizations');
|
|
250
329
|
for (const authz of authorizations) {
|
|
@@ -268,15 +347,14 @@ export class SmartAcme {
|
|
|
268
347
|
}
|
|
269
348
|
const { type, handler } = selectedHandler;
|
|
270
349
|
// build handler input with keyAuthorization
|
|
271
|
-
let
|
|
350
|
+
let challengeInput;
|
|
272
351
|
// retrieve keyAuthorization for challenge
|
|
273
352
|
const keyAuth = await this.client.getChallengeKeyAuthorization(selectedChallengeArg);
|
|
274
353
|
if (type === 'dns-01') {
|
|
275
|
-
|
|
354
|
+
challengeInput = { type, hostName: `_acme-challenge.${authz.identifier.value}`, challenge: keyAuth };
|
|
276
355
|
}
|
|
277
356
|
else if (type === 'http-01') {
|
|
278
|
-
|
|
279
|
-
input = {
|
|
357
|
+
challengeInput = {
|
|
280
358
|
type,
|
|
281
359
|
token: selectedChallengeArg.token,
|
|
282
360
|
keyAuthorization: keyAuth,
|
|
@@ -284,25 +362,18 @@ export class SmartAcme {
|
|
|
284
362
|
};
|
|
285
363
|
}
|
|
286
364
|
else {
|
|
287
|
-
|
|
288
|
-
input = { type, keyAuthorization: keyAuth, ...selectedChallengeArg };
|
|
365
|
+
challengeInput = { type, keyAuthorization: keyAuth, ...selectedChallengeArg };
|
|
289
366
|
}
|
|
290
|
-
this.pendingChallenges.push(
|
|
367
|
+
this.pendingChallenges.push(challengeInput);
|
|
291
368
|
try {
|
|
292
|
-
|
|
293
|
-
await this.retry(() => handler.prepare(input), `${type}.prepare`);
|
|
294
|
-
// For DNS-01, wait for propagation before verification
|
|
369
|
+
await this.retry(() => handler.prepare(challengeInput), `${type}.prepare`);
|
|
295
370
|
if (type === 'dns-01') {
|
|
296
|
-
const dnsInput =
|
|
297
|
-
// Wait for authoritative DNS propagation before ACME verify
|
|
371
|
+
const dnsInput = challengeInput;
|
|
298
372
|
await this.retry(() => this.smartdns.checkUntilAvailable(dnsInput.hostName, 'TXT', dnsInput.challenge, 100, 5000), `${type}.propagation`);
|
|
299
|
-
// Extra cool-down to ensure ACME server sees the new TXT record
|
|
300
373
|
this.logger.log('info', 'Cooling down for 1 minute before ACME verification');
|
|
301
374
|
await plugins.smartdelay.delayFor(60000);
|
|
302
375
|
}
|
|
303
|
-
// Notify ACME server to complete the challenge
|
|
304
376
|
await this.retry(() => this.client.completeChallenge(selectedChallengeArg), `${type}.completeChallenge`);
|
|
305
|
-
// Wait for valid status (warnings on staging timeouts)
|
|
306
377
|
try {
|
|
307
378
|
await this.retry(() => this.client.waitForValidStatus(selectedChallengeArg), `${type}.waitForValidStatus`);
|
|
308
379
|
}
|
|
@@ -311,31 +382,28 @@ export class SmartAcme {
|
|
|
311
382
|
}
|
|
312
383
|
}
|
|
313
384
|
finally {
|
|
314
|
-
// Always cleanup resource
|
|
315
385
|
try {
|
|
316
|
-
await this.retry(() => handler.cleanup(
|
|
386
|
+
await this.retry(() => handler.cleanup(challengeInput), `${type}.cleanup`);
|
|
317
387
|
}
|
|
318
388
|
catch (err) {
|
|
319
389
|
await this.logger.log('error', `Error during ${type}.cleanup`, err);
|
|
320
390
|
}
|
|
321
391
|
finally {
|
|
322
|
-
this.pendingChallenges = this.pendingChallenges.filter((c) => c !==
|
|
392
|
+
this.pendingChallenges = this.pendingChallenges.filter((c) => c !== challengeInput);
|
|
323
393
|
}
|
|
324
394
|
}
|
|
325
395
|
}
|
|
326
|
-
|
|
396
|
+
// ── Step: finalize ────────────────────────────────────────────────────
|
|
397
|
+
this.certIssuanceTask.notifyStep('finalize');
|
|
327
398
|
const csrDomains = [];
|
|
328
399
|
let commonName;
|
|
329
400
|
if (isWildcardRequest) {
|
|
330
|
-
// For wildcard requests, use wildcard as common name
|
|
331
401
|
commonName = `*.${certDomainName}`;
|
|
332
|
-
csrDomains.push(certDomainName);
|
|
402
|
+
csrDomains.push(certDomainName);
|
|
333
403
|
}
|
|
334
404
|
else {
|
|
335
|
-
// For regular requests, use base domain as common name
|
|
336
405
|
commonName = certDomainName;
|
|
337
|
-
if (
|
|
338
|
-
// If wildcard was successfully added, include it as alt name
|
|
406
|
+
if (includeWildcard && identifiers.some(id => id.value === `*.${certDomainName}`)) {
|
|
339
407
|
csrDomains.push(`*.${certDomainName}`);
|
|
340
408
|
}
|
|
341
409
|
}
|
|
@@ -345,8 +413,8 @@ export class SmartAcme {
|
|
|
345
413
|
});
|
|
346
414
|
await this.retry(() => this.client.finalizeOrder(order, csr), 'finalizeOrder');
|
|
347
415
|
const cert = await this.retry(() => this.client.getCertificate(order), 'getCertificate');
|
|
348
|
-
|
|
349
|
-
|
|
416
|
+
// ── Step: store ───────────────────────────────────────────────────────
|
|
417
|
+
this.certIssuanceTask.notifyStep('store');
|
|
350
418
|
const certRecord = new SmartacmeCert({
|
|
351
419
|
id: plugins.smartunique.shortId(),
|
|
352
420
|
domainName: certDomainName,
|
|
@@ -358,9 +426,7 @@ export class SmartAcme {
|
|
|
358
426
|
});
|
|
359
427
|
await this.certmanager.storeCertificate(certRecord);
|
|
360
428
|
const newCertificate = await this.certmanager.retrieveCertificate(certDomainName);
|
|
361
|
-
|
|
362
|
-
currentDomainInterst.destroy();
|
|
363
|
-
return newCertificate;
|
|
429
|
+
return newCertificate ?? certRecord;
|
|
364
430
|
}
|
|
365
431
|
}
|
|
366
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartacme.classes.smartacme.js","sourceRoot":"","sources":["../ts/smartacme.classes.smartacme.ts"],"names":[],"mappings":"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"}
|
|
432
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartacme.classes.smartacme.js","sourceRoot":"","sources":["../ts/smartacme.classes.smartacme.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartacme",
|
|
3
|
-
"version": "9.0
|
|
3
|
+
"version": "9.1.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A TypeScript-based ACME client for LetsEncrypt certificate management with a focus on simplicity and power.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
@@ -43,6 +43,7 @@
|
|
|
43
43
|
"@peculiar/x509": "^1.14.3",
|
|
44
44
|
"@push.rocks/lik": "^6.2.2",
|
|
45
45
|
"@push.rocks/smartdata": "^7.0.15",
|
|
46
|
+
"@push.rocks/taskbuffer": "^6.1.0",
|
|
46
47
|
"@push.rocks/smartdelay": "^3.0.5",
|
|
47
48
|
"@push.rocks/smartdns": "^7.8.1",
|
|
48
49
|
"@push.rocks/smartlog": "^3.1.10",
|
package/readme.hints.md
CHANGED
|
@@ -28,6 +28,21 @@ Key files:
|
|
|
28
28
|
|
|
29
29
|
Usage in `ts/plugins.ts`: `import * as acme from './acme/index.js'` (replaces `acme-client`)
|
|
30
30
|
|
|
31
|
+
## Concurrency & Rate Limiting (taskbuffer integration)
|
|
32
|
+
|
|
33
|
+
As of v9.1.0, `@push.rocks/lik.InterestMap` was replaced with `@push.rocks/taskbuffer.TaskManager` for coordinating concurrent certificate requests. This provides:
|
|
34
|
+
|
|
35
|
+
- **Per-domain mutex** (`cert-domain-mutex`): Only one ACME issuance per TLD at a time, with `resultSharingMode: 'share-latest'` so queued callers get the same result without re-issuing.
|
|
36
|
+
- **Global concurrency cap** (`acme-global-concurrency`): Limits total parallel ACME operations (default 5, configurable via `maxConcurrentIssuances`).
|
|
37
|
+
- **Account-level rate limiting** (`acme-account-rate-limit`): Sliding-window rate limit (default 250 orders per 3 hours, configurable via `maxOrdersPerWindow`/`orderWindowMs`) to stay under Let's Encrypt limits.
|
|
38
|
+
- **Step-based progress**: The cert issuance task uses `notifyStep()` for prepare/authorize/finalize/store phases, observable via `smartAcme.certIssuanceEvents`.
|
|
39
|
+
|
|
40
|
+
Key implementation details:
|
|
41
|
+
- A single reusable `Task` named `cert-issuance` handles all domains via `triggerTaskConstrained()` with different inputs.
|
|
42
|
+
- The `shouldExecute` callback on the domain mutex checks the certmanager cache as a safety net.
|
|
43
|
+
- `TaskManager.start()` is called in `SmartAcme.start()` and `TaskManager.stop()` in `SmartAcme.stop()`.
|
|
44
|
+
- The "no cronjobs specified" log messages during tests come from taskbuffer's internal CronManager polling — harmless noise when no cron tasks are scheduled.
|
|
45
|
+
|
|
31
46
|
## Dependency Notes
|
|
32
47
|
|
|
33
48
|
- `acme-client` was replaced with custom implementation in `ts/acme/` + `@peculiar/x509` for CSR generation
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/index.ts
CHANGED
package/ts/plugins.ts
CHANGED
|
@@ -19,6 +19,7 @@ import * as smartnetwork from '@push.rocks/smartnetwork';
|
|
|
19
19
|
import * as smartunique from '@push.rocks/smartunique';
|
|
20
20
|
import * as smartstring from '@push.rocks/smartstring';
|
|
21
21
|
import * as smarttime from '@push.rocks/smarttime';
|
|
22
|
+
import * as taskbuffer from '@push.rocks/taskbuffer';
|
|
22
23
|
|
|
23
24
|
export {
|
|
24
25
|
lik,
|
|
@@ -30,6 +31,7 @@ export {
|
|
|
30
31
|
smartunique,
|
|
31
32
|
smartstring,
|
|
32
33
|
smarttime,
|
|
34
|
+
taskbuffer,
|
|
33
35
|
};
|
|
34
36
|
|
|
35
37
|
// @tsclass scope
|
|
@@ -4,6 +4,22 @@ import { SmartacmeCertMatcher } from './smartacme.classes.certmatcher.js';
|
|
|
4
4
|
import { commitinfo } from './00_commitinfo_data.js';
|
|
5
5
|
import { SmartacmeCert } from './smartacme.classes.cert.js';
|
|
6
6
|
|
|
7
|
+
// ── Types & constants for certificate issuance task ──────────────────────────
|
|
8
|
+
|
|
9
|
+
interface ICertIssuanceInput {
|
|
10
|
+
certDomainName: string;
|
|
11
|
+
domainArg: string;
|
|
12
|
+
isWildcardRequest: boolean;
|
|
13
|
+
includeWildcard: boolean;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
const CERT_ISSUANCE_STEPS = [
|
|
17
|
+
{ name: 'prepare', description: 'Creating ACME order', percentage: 10 },
|
|
18
|
+
{ name: 'authorize', description: 'Solving ACME challenges', percentage: 40 },
|
|
19
|
+
{ name: 'finalize', description: 'Finalizing and getting cert', percentage: 30 },
|
|
20
|
+
{ name: 'store', description: 'Storing certificate', percentage: 20 },
|
|
21
|
+
] as const;
|
|
22
|
+
|
|
7
23
|
/**
|
|
8
24
|
* the options for the class @see SmartAcme
|
|
9
25
|
*/
|
|
@@ -38,6 +54,21 @@ export interface ISmartAcmeOptions {
|
|
|
38
54
|
* Defaults to ['dns-01'] or first supported type from handlers.
|
|
39
55
|
*/
|
|
40
56
|
challengePriority?: string[];
|
|
57
|
+
/**
|
|
58
|
+
* Maximum number of concurrent ACME issuances across all domains.
|
|
59
|
+
* Defaults to 5.
|
|
60
|
+
*/
|
|
61
|
+
maxConcurrentIssuances?: number;
|
|
62
|
+
/**
|
|
63
|
+
* Maximum ACME orders allowed within the sliding window.
|
|
64
|
+
* Defaults to 250 (conservative limit under Let's Encrypt's 300/3h).
|
|
65
|
+
*/
|
|
66
|
+
maxOrdersPerWindow?: number;
|
|
67
|
+
/**
|
|
68
|
+
* Sliding window duration in milliseconds for rate limiting.
|
|
69
|
+
* Defaults to 3 hours (10_800_000 ms).
|
|
70
|
+
*/
|
|
71
|
+
orderWindowMs?: number;
|
|
41
72
|
}
|
|
42
73
|
|
|
43
74
|
/**
|
|
@@ -75,12 +106,21 @@ export class SmartAcme {
|
|
|
75
106
|
private pendingChallenges: plugins.tsclass.network.IDnsChallenge[] = [];
|
|
76
107
|
// priority order of challenge types
|
|
77
108
|
private challengePriority: string[];
|
|
78
|
-
//
|
|
79
|
-
private
|
|
109
|
+
// TaskManager for coordinating concurrent certificate requests
|
|
110
|
+
private taskManager: plugins.taskbuffer.TaskManager;
|
|
111
|
+
// Single reusable task for certificate issuance
|
|
112
|
+
private certIssuanceTask: plugins.taskbuffer.Task<undefined, typeof CERT_ISSUANCE_STEPS>;
|
|
80
113
|
// bound signal handlers so they can be removed on stop()
|
|
81
114
|
private boundSigintHandler: (() => void) | null = null;
|
|
82
115
|
private boundSigtermHandler: (() => void) | null = null;
|
|
83
116
|
|
|
117
|
+
/**
|
|
118
|
+
* Exposes the aggregated task event stream for observing certificate issuance progress.
|
|
119
|
+
*/
|
|
120
|
+
public get certIssuanceEvents(): plugins.taskbuffer.TaskManager['taskSubject'] {
|
|
121
|
+
return this.taskManager.taskSubject;
|
|
122
|
+
}
|
|
123
|
+
|
|
84
124
|
constructor(optionsArg: ISmartAcmeOptions) {
|
|
85
125
|
this.options = optionsArg;
|
|
86
126
|
this.logger = plugins.smartlog.Smartlog.createForCommitinfo(commitinfo);
|
|
@@ -105,8 +145,60 @@ export class SmartAcme {
|
|
|
105
145
|
optionsArg.challengePriority && optionsArg.challengePriority.length > 0
|
|
106
146
|
? optionsArg.challengePriority
|
|
107
147
|
: this.challengeHandlers.map((h) => h.getSupportedTypes()[0]);
|
|
108
|
-
|
|
109
|
-
|
|
148
|
+
|
|
149
|
+
// ── TaskManager setup ──────────────────────────────────────────────────
|
|
150
|
+
this.taskManager = new plugins.taskbuffer.TaskManager();
|
|
151
|
+
|
|
152
|
+
// Constraint 1: Per-domain mutex — one issuance at a time per TLD, with result sharing
|
|
153
|
+
const certDomainMutex = new plugins.taskbuffer.TaskConstraintGroup({
|
|
154
|
+
name: 'cert-domain-mutex',
|
|
155
|
+
maxConcurrent: 1,
|
|
156
|
+
resultSharingMode: 'share-latest',
|
|
157
|
+
constraintKeyForExecution: (_task, input?: ICertIssuanceInput) => {
|
|
158
|
+
return input?.certDomainName ?? null;
|
|
159
|
+
},
|
|
160
|
+
shouldExecute: async (_task, input?: ICertIssuanceInput) => {
|
|
161
|
+
if (!input?.certDomainName || !this.certmanager) return true;
|
|
162
|
+
// Safety net: if a valid cert is already cached, skip re-issuance
|
|
163
|
+
const existing = await this.certmanager.retrieveCertificate(input.certDomainName);
|
|
164
|
+
if (existing && !existing.shouldBeRenewed()) {
|
|
165
|
+
return false;
|
|
166
|
+
}
|
|
167
|
+
return true;
|
|
168
|
+
},
|
|
169
|
+
});
|
|
170
|
+
|
|
171
|
+
// Constraint 2: Global concurrency cap
|
|
172
|
+
const acmeGlobalConcurrency = new plugins.taskbuffer.TaskConstraintGroup({
|
|
173
|
+
name: 'acme-global-concurrency',
|
|
174
|
+
maxConcurrent: optionsArg.maxConcurrentIssuances ?? 5,
|
|
175
|
+
constraintKeyForExecution: () => 'global',
|
|
176
|
+
});
|
|
177
|
+
|
|
178
|
+
// Constraint 3: Account-level rate limiting
|
|
179
|
+
const acmeAccountRateLimit = new plugins.taskbuffer.TaskConstraintGroup({
|
|
180
|
+
name: 'acme-account-rate-limit',
|
|
181
|
+
rateLimit: {
|
|
182
|
+
maxPerWindow: optionsArg.maxOrdersPerWindow ?? 250,
|
|
183
|
+
windowMs: optionsArg.orderWindowMs ?? 10_800_000,
|
|
184
|
+
},
|
|
185
|
+
constraintKeyForExecution: () => 'account',
|
|
186
|
+
});
|
|
187
|
+
|
|
188
|
+
this.taskManager.addConstraintGroup(certDomainMutex);
|
|
189
|
+
this.taskManager.addConstraintGroup(acmeGlobalConcurrency);
|
|
190
|
+
this.taskManager.addConstraintGroup(acmeAccountRateLimit);
|
|
191
|
+
|
|
192
|
+
// Create the single reusable certificate issuance task
|
|
193
|
+
this.certIssuanceTask = new plugins.taskbuffer.Task({
|
|
194
|
+
name: 'cert-issuance',
|
|
195
|
+
steps: CERT_ISSUANCE_STEPS,
|
|
196
|
+
taskFunction: async (input: ICertIssuanceInput) => {
|
|
197
|
+
return this.performCertificateIssuance(input);
|
|
198
|
+
},
|
|
199
|
+
});
|
|
200
|
+
|
|
201
|
+
this.taskManager.addTask(this.certIssuanceTask);
|
|
110
202
|
}
|
|
111
203
|
|
|
112
204
|
/**
|
|
@@ -149,6 +241,10 @@ export class SmartAcme {
|
|
|
149
241
|
termsOfServiceAgreed: true,
|
|
150
242
|
contact: [`mailto:${this.options.accountEmail}`],
|
|
151
243
|
});
|
|
244
|
+
|
|
245
|
+
// Start the task manager
|
|
246
|
+
await this.taskManager.start();
|
|
247
|
+
|
|
152
248
|
// Setup graceful shutdown handlers (store references for removal in stop())
|
|
153
249
|
this.boundSigintHandler = () => this.handleSignal('SIGINT');
|
|
154
250
|
this.boundSigtermHandler = () => this.handleSignal('SIGTERM');
|
|
@@ -169,6 +265,8 @@ export class SmartAcme {
|
|
|
169
265
|
process.removeListener('SIGTERM', this.boundSigtermHandler);
|
|
170
266
|
this.boundSigtermHandler = null;
|
|
171
267
|
}
|
|
268
|
+
// Stop the task manager
|
|
269
|
+
await this.taskManager.stop();
|
|
172
270
|
// Destroy ACME HTTP transport (closes keep-alive sockets)
|
|
173
271
|
if (this.client) {
|
|
174
272
|
this.client.destroy();
|
|
@@ -255,8 +353,7 @@ export class SmartAcme {
|
|
|
255
353
|
* * if not in the database announce it
|
|
256
354
|
* * then get it from letsencrypt
|
|
257
355
|
* * store it
|
|
258
|
-
* *
|
|
259
|
-
* * retrieve it from the databse and return it
|
|
356
|
+
* * retrieve it from the database and return it
|
|
260
357
|
*
|
|
261
358
|
* @param domainArg
|
|
262
359
|
* @param options Optional configuration for certificate generation
|
|
@@ -284,35 +381,59 @@ export class SmartAcme {
|
|
|
284
381
|
// Retrieve any existing certificate record by base domain.
|
|
285
382
|
const retrievedCertificate = await this.certmanager.retrieveCertificate(certDomainName);
|
|
286
383
|
|
|
287
|
-
if (
|
|
288
|
-
!retrievedCertificate &&
|
|
289
|
-
(await this.interestMap.checkInterest(certDomainName))
|
|
290
|
-
) {
|
|
291
|
-
const existingCertificateInterest = this.interestMap.findInterest(certDomainName);
|
|
292
|
-
const certificate = existingCertificateInterest.interestFullfilled;
|
|
293
|
-
return certificate;
|
|
294
|
-
} else if (retrievedCertificate && !retrievedCertificate.shouldBeRenewed()) {
|
|
384
|
+
if (retrievedCertificate && !retrievedCertificate.shouldBeRenewed()) {
|
|
295
385
|
return retrievedCertificate;
|
|
296
386
|
} else if (retrievedCertificate && retrievedCertificate.shouldBeRenewed()) {
|
|
297
387
|
// Remove old certificate via certManager
|
|
298
388
|
await this.certmanager.deleteCertificate(certDomainName);
|
|
299
389
|
}
|
|
300
390
|
|
|
301
|
-
//
|
|
302
|
-
const
|
|
391
|
+
// Build issuance input and trigger the constrained task
|
|
392
|
+
const issuanceInput: ICertIssuanceInput = {
|
|
393
|
+
certDomainName,
|
|
394
|
+
domainArg,
|
|
395
|
+
isWildcardRequest,
|
|
396
|
+
includeWildcard: options?.includeWildcard ?? false,
|
|
397
|
+
};
|
|
398
|
+
|
|
399
|
+
const result = await this.taskManager.triggerTaskConstrained(
|
|
400
|
+
this.certIssuanceTask,
|
|
401
|
+
issuanceInput,
|
|
402
|
+
);
|
|
403
|
+
|
|
404
|
+
// If we got a cert directly (either from execution or result sharing), return it
|
|
405
|
+
if (result != null) {
|
|
406
|
+
return result;
|
|
407
|
+
}
|
|
408
|
+
|
|
409
|
+
// If shouldExecute returned false (cert appeared in cache), read from cache
|
|
410
|
+
const cachedCert = await this.certmanager.retrieveCertificate(certDomainName);
|
|
411
|
+
if (cachedCert) {
|
|
412
|
+
return cachedCert;
|
|
413
|
+
}
|
|
414
|
+
|
|
415
|
+
throw new Error(`Certificate issuance failed for ${certDomainName}`);
|
|
416
|
+
}
|
|
417
|
+
|
|
418
|
+
/**
|
|
419
|
+
* Performs the actual ACME certificate issuance flow.
|
|
420
|
+
* Called by the certIssuanceTask's taskFunction.
|
|
421
|
+
*/
|
|
422
|
+
private async performCertificateIssuance(input: ICertIssuanceInput): Promise<SmartacmeCert> {
|
|
423
|
+
const { certDomainName, isWildcardRequest, includeWildcard } = input;
|
|
424
|
+
|
|
425
|
+
// ── Step: prepare ─────────────────────────────────────────────────────
|
|
426
|
+
this.certIssuanceTask.notifyStep('prepare');
|
|
303
427
|
|
|
304
428
|
// Build identifiers array based on request
|
|
305
|
-
const identifiers = [];
|
|
306
|
-
|
|
429
|
+
const identifiers: Array<{ type: 'dns'; value: string }> = [];
|
|
430
|
+
|
|
307
431
|
if (isWildcardRequest) {
|
|
308
|
-
// If requesting a wildcard directly, only add the wildcard
|
|
309
432
|
identifiers.push({ type: 'dns', value: `*.${certDomainName}` });
|
|
310
433
|
} else {
|
|
311
|
-
// Add the regular domain
|
|
312
434
|
identifiers.push({ type: 'dns', value: certDomainName });
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
if (options?.includeWildcard) {
|
|
435
|
+
|
|
436
|
+
if (includeWildcard) {
|
|
316
437
|
const hasDnsHandler = this.challengeHandlers.some((h) =>
|
|
317
438
|
h.getSupportedTypes().includes('dns-01'),
|
|
318
439
|
);
|
|
@@ -329,6 +450,9 @@ export class SmartAcme {
|
|
|
329
450
|
identifiers,
|
|
330
451
|
}), 'createOrder');
|
|
331
452
|
|
|
453
|
+
// ── Step: authorize ───────────────────────────────────────────────────
|
|
454
|
+
this.certIssuanceTask.notifyStep('authorize');
|
|
455
|
+
|
|
332
456
|
/* Get authorizations and select challenges */
|
|
333
457
|
const authorizations = await this.retry(() => this.client.getAuthorizations(order), 'getAuthorizations');
|
|
334
458
|
|
|
@@ -352,45 +476,37 @@ export class SmartAcme {
|
|
|
352
476
|
}
|
|
353
477
|
const { type, handler } = selectedHandler;
|
|
354
478
|
// build handler input with keyAuthorization
|
|
355
|
-
let
|
|
479
|
+
let challengeInput: any;
|
|
356
480
|
// retrieve keyAuthorization for challenge
|
|
357
481
|
const keyAuth = await this.client.getChallengeKeyAuthorization(selectedChallengeArg);
|
|
358
482
|
if (type === 'dns-01') {
|
|
359
|
-
|
|
483
|
+
challengeInput = { type, hostName: `_acme-challenge.${authz.identifier.value}`, challenge: keyAuth };
|
|
360
484
|
} else if (type === 'http-01') {
|
|
361
|
-
|
|
362
|
-
input = {
|
|
485
|
+
challengeInput = {
|
|
363
486
|
type,
|
|
364
487
|
token: (selectedChallengeArg as any).token,
|
|
365
488
|
keyAuthorization: keyAuth,
|
|
366
489
|
webPath: `/.well-known/acme-challenge/${(selectedChallengeArg as any).token}`,
|
|
367
490
|
};
|
|
368
491
|
} else {
|
|
369
|
-
|
|
370
|
-
input = { type, keyAuthorization: keyAuth, ...selectedChallengeArg };
|
|
492
|
+
challengeInput = { type, keyAuthorization: keyAuth, ...selectedChallengeArg };
|
|
371
493
|
}
|
|
372
|
-
this.pendingChallenges.push(
|
|
494
|
+
this.pendingChallenges.push(challengeInput);
|
|
373
495
|
try {
|
|
374
|
-
|
|
375
|
-
await this.retry(() => handler.prepare(input), `${type}.prepare`);
|
|
376
|
-
// For DNS-01, wait for propagation before verification
|
|
496
|
+
await this.retry(() => handler.prepare(challengeInput), `${type}.prepare`);
|
|
377
497
|
if (type === 'dns-01') {
|
|
378
|
-
const dnsInput =
|
|
379
|
-
// Wait for authoritative DNS propagation before ACME verify
|
|
498
|
+
const dnsInput = challengeInput as { hostName: string; challenge: string };
|
|
380
499
|
await this.retry(
|
|
381
500
|
() => this.smartdns.checkUntilAvailable(dnsInput.hostName, 'TXT', dnsInput.challenge, 100, 5000),
|
|
382
501
|
`${type}.propagation`,
|
|
383
502
|
);
|
|
384
|
-
// Extra cool-down to ensure ACME server sees the new TXT record
|
|
385
503
|
this.logger.log('info', 'Cooling down for 1 minute before ACME verification');
|
|
386
504
|
await plugins.smartdelay.delayFor(60000);
|
|
387
505
|
}
|
|
388
|
-
// Notify ACME server to complete the challenge
|
|
389
506
|
await this.retry(
|
|
390
507
|
() => this.client.completeChallenge(selectedChallengeArg),
|
|
391
508
|
`${type}.completeChallenge`,
|
|
392
509
|
);
|
|
393
|
-
// Wait for valid status (warnings on staging timeouts)
|
|
394
510
|
try {
|
|
395
511
|
await this.retry(
|
|
396
512
|
() => this.client.waitForValidStatus(selectedChallengeArg),
|
|
@@ -404,34 +520,32 @@ export class SmartAcme {
|
|
|
404
520
|
);
|
|
405
521
|
}
|
|
406
522
|
} finally {
|
|
407
|
-
// Always cleanup resource
|
|
408
523
|
try {
|
|
409
|
-
await this.retry(() => handler.cleanup(
|
|
524
|
+
await this.retry(() => handler.cleanup(challengeInput), `${type}.cleanup`);
|
|
410
525
|
} catch (err) {
|
|
411
526
|
await this.logger.log('error', `Error during ${type}.cleanup`, err);
|
|
412
527
|
} finally {
|
|
413
|
-
this.pendingChallenges = this.pendingChallenges.filter((c) => c !==
|
|
528
|
+
this.pendingChallenges = this.pendingChallenges.filter((c) => c !== challengeInput);
|
|
414
529
|
}
|
|
415
530
|
}
|
|
416
531
|
}
|
|
417
532
|
|
|
418
|
-
|
|
419
|
-
|
|
533
|
+
// ── Step: finalize ────────────────────────────────────────────────────
|
|
534
|
+
this.certIssuanceTask.notifyStep('finalize');
|
|
535
|
+
|
|
536
|
+
const csrDomains: string[] = [];
|
|
420
537
|
let commonName: string;
|
|
421
|
-
|
|
538
|
+
|
|
422
539
|
if (isWildcardRequest) {
|
|
423
|
-
// For wildcard requests, use wildcard as common name
|
|
424
540
|
commonName = `*.${certDomainName}`;
|
|
425
|
-
csrDomains.push(certDomainName);
|
|
541
|
+
csrDomains.push(certDomainName);
|
|
426
542
|
} else {
|
|
427
|
-
// For regular requests, use base domain as common name
|
|
428
543
|
commonName = certDomainName;
|
|
429
|
-
if (
|
|
430
|
-
// If wildcard was successfully added, include it as alt name
|
|
544
|
+
if (includeWildcard && identifiers.some(id => id.value === `*.${certDomainName}`)) {
|
|
431
545
|
csrDomains.push(`*.${certDomainName}`);
|
|
432
546
|
}
|
|
433
547
|
}
|
|
434
|
-
|
|
548
|
+
|
|
435
549
|
const [key, csr] = await plugins.acme.AcmeCrypto.createCsr({
|
|
436
550
|
commonName,
|
|
437
551
|
altNames: csrDomains,
|
|
@@ -440,9 +554,9 @@ export class SmartAcme {
|
|
|
440
554
|
await this.retry(() => this.client.finalizeOrder(order, csr), 'finalizeOrder');
|
|
441
555
|
const cert = await this.retry(() => this.client.getCertificate(order), 'getCertificate');
|
|
442
556
|
|
|
443
|
-
|
|
557
|
+
// ── Step: store ───────────────────────────────────────────────────────
|
|
558
|
+
this.certIssuanceTask.notifyStep('store');
|
|
444
559
|
|
|
445
|
-
// Store the new certificate record
|
|
446
560
|
const certRecord = new SmartacmeCert({
|
|
447
561
|
id: plugins.smartunique.shortId(),
|
|
448
562
|
domainName: certDomainName,
|
|
@@ -455,9 +569,7 @@ export class SmartAcme {
|
|
|
455
569
|
await this.certmanager.storeCertificate(certRecord);
|
|
456
570
|
|
|
457
571
|
const newCertificate = await this.certmanager.retrieveCertificate(certDomainName);
|
|
458
|
-
|
|
459
|
-
currentDomainInterst.destroy();
|
|
460
|
-
return newCertificate;
|
|
572
|
+
return newCertificate ?? certRecord;
|
|
461
573
|
}
|
|
462
574
|
|
|
463
575
|
}
|