@push.rocks/smartacme 9.0.0 → 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/acme/acme.classes.client.d.ts +4 -0
- package/dist_ts/acme/acme.classes.client.js +7 -1
- package/dist_ts/acme/acme.classes.http-client.d.ts +6 -0
- package/dist_ts/acme/acme.classes.http-client.js +11 -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 +121 -47
- package/package.json +2 -1
- package/readme.hints.md +15 -0
- package/readme.md +77 -37
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/acme/acme.classes.client.ts +7 -0
- package/ts/acme/acme.classes.http-client.ts +13 -0
- package/ts/index.ts +3 -0
- package/ts/plugins.ts +2 -0
- package/ts/smartacme.classes.smartacme.ts +175 -55
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartacme',
|
|
6
|
-
version: '9.
|
|
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=
|
|
@@ -67,5 +67,11 @@ export class AcmeClient {
|
|
|
67
67
|
async getCertificate(order) {
|
|
68
68
|
return this.orderManager.getCertificate(order);
|
|
69
69
|
}
|
|
70
|
+
/**
|
|
71
|
+
* Destroy HTTP transport to release sockets and allow process exit.
|
|
72
|
+
*/
|
|
73
|
+
destroy() {
|
|
74
|
+
this.httpClient.destroy();
|
|
75
|
+
}
|
|
70
76
|
}
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
77
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNtZS5jbGFzc2VzLmNsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL2FjbWUvYWNtZS5jbGFzc2VzLmNsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDdEQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDbEUsT0FBTyxFQUFFLGNBQWMsRUFBb0IsTUFBTSwrQkFBK0IsQ0FBQztBQUNqRixPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDeEQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDM0QsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFnQm5FOzs7R0FHRztBQUNILE1BQU0sT0FBTyxVQUFVO0lBTXJCLG1DQUFtQzthQUM1QixjQUFTLEdBQUcsbUJBQW1CLENBQUM7SUFDdkMsdUJBQXVCO2FBQ2hCLFdBQU0sR0FBRyxVQUFVLENBQUM7SUFFM0IsWUFBWSxPQUEyQjtRQUNyQyxJQUFJLENBQUMsVUFBVSxHQUFHLElBQUksY0FBYyxDQUFDLE9BQU8sQ0FBQyxZQUFZLEVBQUUsT0FBTyxDQUFDLGFBQWEsRUFBRSxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDbEcsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLFdBQVcsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDaEQsSUFBSSxDQUFDLFlBQVksR0FBRyxJQUFJLGdCQUFnQixDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUMxRCxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsSUFBSSxvQkFBb0IsQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLE9BQU8sQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUMzRixDQUFDO0lBRUQ7O09BRUc7SUFDSCxLQUFLLENBQUMsYUFBYSxDQUFDLE9BQWtDO1FBQ3BELE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDdEMsQ0FBQztJQUVEOztPQUVHO0lBQ0gsS0FBSyxDQUFDLFdBQVcsQ0FBQyxJQUF3QztRQUN4RCxPQUFPLElBQUksQ0FBQyxZQUFZLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3hDLENBQUM7SUFFRDs7T0FFRztJQUNILEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxLQUFpQjtRQUN2QyxPQUFPLElBQUksQ0FBQyxZQUFZLENBQUMsaUJBQWlCLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDcEQsQ0FBQztJQUVEOztPQUVHO0lBQ0gsNEJBQTRCLENBQUMsU0FBeUI7UUFDcEQsT0FBTyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsbUJBQW1CLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDOUQsQ0FBQztJQUVEOztPQUVHO0lBQ0gsS0FBSyxDQUFDLGlCQUFpQixDQUFDLFNBQXlCO1FBQy9DLE9BQU8sSUFBSSxDQUFDLGdCQUFnQixDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNuRCxDQUFDO0lBRUQ7O09BRUc7SUFDSCxLQUFLLENBQUMsa0JBQWtCLENBQUMsSUFBcUI7UUFDNUMsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLGtCQUFrQixDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3BELENBQUM7SUFFRDs7T0FFRztJQUNILEtBQUssQ0FBQyxhQUFhLENBQUMsS0FBaUIsRUFBRSxNQUFjO1FBQ25ELE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQyxRQUFRLENBQUMsS0FBSyxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ25ELENBQUM7SUFFRDs7T0FFRztJQUNILEtBQUssQ0FBQyxjQUFjLENBQUMsS0FBaUI7UUFDcEMsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUNqRCxDQUFDO0lBRUQ7O09BRUc7SUFDSCxPQUFPO1FBQ0wsSUFBSSxDQUFDLFVBQVUsQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUM1QixDQUFDIn0=
|
|
@@ -11,7 +11,13 @@ export declare class AcmeHttpClient {
|
|
|
11
11
|
private nonce;
|
|
12
12
|
kid: string | null;
|
|
13
13
|
private logger?;
|
|
14
|
+
private httpsAgent;
|
|
15
|
+
private httpAgent;
|
|
14
16
|
constructor(directoryUrl: string, accountKeyPem: string, logger?: TAcmeLogger);
|
|
17
|
+
/**
|
|
18
|
+
* Destroy HTTP agents to release sockets and allow process exit.
|
|
19
|
+
*/
|
|
20
|
+
destroy(): void;
|
|
15
21
|
private log;
|
|
16
22
|
/**
|
|
17
23
|
* GET the ACME directory (cached after first call)
|
|
@@ -14,6 +14,15 @@ export class AcmeHttpClient {
|
|
|
14
14
|
this.directoryUrl = directoryUrl;
|
|
15
15
|
this.accountKeyPem = accountKeyPem;
|
|
16
16
|
this.logger = logger;
|
|
17
|
+
this.httpsAgent = new https.Agent({ keepAlive: false });
|
|
18
|
+
this.httpAgent = new http.Agent({ keepAlive: false });
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* Destroy HTTP agents to release sockets and allow process exit.
|
|
22
|
+
*/
|
|
23
|
+
destroy() {
|
|
24
|
+
this.httpsAgent.destroy();
|
|
25
|
+
this.httpAgent.destroy();
|
|
17
26
|
}
|
|
18
27
|
log(level, message, data) {
|
|
19
28
|
if (this.logger) {
|
|
@@ -151,6 +160,7 @@ export class AcmeHttpClient {
|
|
|
151
160
|
path: urlObj.pathname + urlObj.search,
|
|
152
161
|
method,
|
|
153
162
|
headers: requestHeaders,
|
|
163
|
+
agent: isHttps ? this.httpsAgent : this.httpAgent,
|
|
154
164
|
};
|
|
155
165
|
const req = lib.request(options, (res) => {
|
|
156
166
|
const chunks = [];
|
|
@@ -198,4 +208,4 @@ export class AcmeHttpClient {
|
|
|
198
208
|
});
|
|
199
209
|
}
|
|
200
210
|
}
|
|
201
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
211
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"acme.classes.http-client.js","sourceRoot":"","sources":["../../ts/acme/acme.classes.http-client.ts"],"names":[],"mappings":"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"}
|
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,16 @@ 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();
|
|
165
|
+
// Destroy ACME HTTP transport (closes keep-alive sockets)
|
|
166
|
+
if (this.client) {
|
|
167
|
+
this.client.destroy();
|
|
168
|
+
}
|
|
169
|
+
// Destroy DNS client (kills Rust bridge child process if spawned)
|
|
170
|
+
if (this.smartdns) {
|
|
171
|
+
this.smartdns.destroy();
|
|
172
|
+
}
|
|
103
173
|
if (this.certmanager && typeof this.certmanager.close === 'function') {
|
|
104
174
|
await this.certmanager.close();
|
|
105
175
|
}
|
|
@@ -175,8 +245,7 @@ export class SmartAcme {
|
|
|
175
245
|
* * if not in the database announce it
|
|
176
246
|
* * then get it from letsencrypt
|
|
177
247
|
* * store it
|
|
178
|
-
* *
|
|
179
|
-
* * retrieve it from the databse and return it
|
|
248
|
+
* * retrieve it from the database and return it
|
|
180
249
|
*
|
|
181
250
|
* @param domainArg
|
|
182
251
|
* @param options Optional configuration for certificate generation
|
|
@@ -198,32 +267,48 @@ export class SmartAcme {
|
|
|
198
267
|
}
|
|
199
268
|
// Retrieve any existing certificate record by base domain.
|
|
200
269
|
const retrievedCertificate = await this.certmanager.retrieveCertificate(certDomainName);
|
|
201
|
-
if (!retrievedCertificate
|
|
202
|
-
(await this.interestMap.checkInterest(certDomainName))) {
|
|
203
|
-
const existingCertificateInterest = this.interestMap.findInterest(certDomainName);
|
|
204
|
-
const certificate = existingCertificateInterest.interestFullfilled;
|
|
205
|
-
return certificate;
|
|
206
|
-
}
|
|
207
|
-
else if (retrievedCertificate && !retrievedCertificate.shouldBeRenewed()) {
|
|
270
|
+
if (retrievedCertificate && !retrievedCertificate.shouldBeRenewed()) {
|
|
208
271
|
return retrievedCertificate;
|
|
209
272
|
}
|
|
210
273
|
else if (retrievedCertificate && retrievedCertificate.shouldBeRenewed()) {
|
|
211
274
|
// Remove old certificate via certManager
|
|
212
275
|
await this.certmanager.deleteCertificate(certDomainName);
|
|
213
276
|
}
|
|
214
|
-
//
|
|
215
|
-
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');
|
|
216
304
|
// Build identifiers array based on request
|
|
217
305
|
const identifiers = [];
|
|
218
306
|
if (isWildcardRequest) {
|
|
219
|
-
// If requesting a wildcard directly, only add the wildcard
|
|
220
307
|
identifiers.push({ type: 'dns', value: `*.${certDomainName}` });
|
|
221
308
|
}
|
|
222
309
|
else {
|
|
223
|
-
// Add the regular domain
|
|
224
310
|
identifiers.push({ type: 'dns', value: certDomainName });
|
|
225
|
-
|
|
226
|
-
if (options?.includeWildcard) {
|
|
311
|
+
if (includeWildcard) {
|
|
227
312
|
const hasDnsHandler = this.challengeHandlers.some((h) => h.getSupportedTypes().includes('dns-01'));
|
|
228
313
|
if (!hasDnsHandler) {
|
|
229
314
|
this.logger.log('warn', 'Wildcard certificate requested but no DNS-01 handler available. Skipping wildcard.');
|
|
@@ -237,6 +322,8 @@ export class SmartAcme {
|
|
|
237
322
|
const order = await this.retry(() => this.client.createOrder({
|
|
238
323
|
identifiers,
|
|
239
324
|
}), 'createOrder');
|
|
325
|
+
// ── Step: authorize ───────────────────────────────────────────────────
|
|
326
|
+
this.certIssuanceTask.notifyStep('authorize');
|
|
240
327
|
/* Get authorizations and select challenges */
|
|
241
328
|
const authorizations = await this.retry(() => this.client.getAuthorizations(order), 'getAuthorizations');
|
|
242
329
|
for (const authz of authorizations) {
|
|
@@ -260,15 +347,14 @@ export class SmartAcme {
|
|
|
260
347
|
}
|
|
261
348
|
const { type, handler } = selectedHandler;
|
|
262
349
|
// build handler input with keyAuthorization
|
|
263
|
-
let
|
|
350
|
+
let challengeInput;
|
|
264
351
|
// retrieve keyAuthorization for challenge
|
|
265
352
|
const keyAuth = await this.client.getChallengeKeyAuthorization(selectedChallengeArg);
|
|
266
353
|
if (type === 'dns-01') {
|
|
267
|
-
|
|
354
|
+
challengeInput = { type, hostName: `_acme-challenge.${authz.identifier.value}`, challenge: keyAuth };
|
|
268
355
|
}
|
|
269
356
|
else if (type === 'http-01') {
|
|
270
|
-
|
|
271
|
-
input = {
|
|
357
|
+
challengeInput = {
|
|
272
358
|
type,
|
|
273
359
|
token: selectedChallengeArg.token,
|
|
274
360
|
keyAuthorization: keyAuth,
|
|
@@ -276,25 +362,18 @@ export class SmartAcme {
|
|
|
276
362
|
};
|
|
277
363
|
}
|
|
278
364
|
else {
|
|
279
|
-
|
|
280
|
-
input = { type, keyAuthorization: keyAuth, ...selectedChallengeArg };
|
|
365
|
+
challengeInput = { type, keyAuthorization: keyAuth, ...selectedChallengeArg };
|
|
281
366
|
}
|
|
282
|
-
this.pendingChallenges.push(
|
|
367
|
+
this.pendingChallenges.push(challengeInput);
|
|
283
368
|
try {
|
|
284
|
-
|
|
285
|
-
await this.retry(() => handler.prepare(input), `${type}.prepare`);
|
|
286
|
-
// For DNS-01, wait for propagation before verification
|
|
369
|
+
await this.retry(() => handler.prepare(challengeInput), `${type}.prepare`);
|
|
287
370
|
if (type === 'dns-01') {
|
|
288
|
-
const dnsInput =
|
|
289
|
-
// Wait for authoritative DNS propagation before ACME verify
|
|
371
|
+
const dnsInput = challengeInput;
|
|
290
372
|
await this.retry(() => this.smartdns.checkUntilAvailable(dnsInput.hostName, 'TXT', dnsInput.challenge, 100, 5000), `${type}.propagation`);
|
|
291
|
-
// Extra cool-down to ensure ACME server sees the new TXT record
|
|
292
373
|
this.logger.log('info', 'Cooling down for 1 minute before ACME verification');
|
|
293
374
|
await plugins.smartdelay.delayFor(60000);
|
|
294
375
|
}
|
|
295
|
-
// Notify ACME server to complete the challenge
|
|
296
376
|
await this.retry(() => this.client.completeChallenge(selectedChallengeArg), `${type}.completeChallenge`);
|
|
297
|
-
// Wait for valid status (warnings on staging timeouts)
|
|
298
377
|
try {
|
|
299
378
|
await this.retry(() => this.client.waitForValidStatus(selectedChallengeArg), `${type}.waitForValidStatus`);
|
|
300
379
|
}
|
|
@@ -303,31 +382,28 @@ export class SmartAcme {
|
|
|
303
382
|
}
|
|
304
383
|
}
|
|
305
384
|
finally {
|
|
306
|
-
// Always cleanup resource
|
|
307
385
|
try {
|
|
308
|
-
await this.retry(() => handler.cleanup(
|
|
386
|
+
await this.retry(() => handler.cleanup(challengeInput), `${type}.cleanup`);
|
|
309
387
|
}
|
|
310
388
|
catch (err) {
|
|
311
389
|
await this.logger.log('error', `Error during ${type}.cleanup`, err);
|
|
312
390
|
}
|
|
313
391
|
finally {
|
|
314
|
-
this.pendingChallenges = this.pendingChallenges.filter((c) => c !==
|
|
392
|
+
this.pendingChallenges = this.pendingChallenges.filter((c) => c !== challengeInput);
|
|
315
393
|
}
|
|
316
394
|
}
|
|
317
395
|
}
|
|
318
|
-
|
|
396
|
+
// ── Step: finalize ────────────────────────────────────────────────────
|
|
397
|
+
this.certIssuanceTask.notifyStep('finalize');
|
|
319
398
|
const csrDomains = [];
|
|
320
399
|
let commonName;
|
|
321
400
|
if (isWildcardRequest) {
|
|
322
|
-
// For wildcard requests, use wildcard as common name
|
|
323
401
|
commonName = `*.${certDomainName}`;
|
|
324
|
-
csrDomains.push(certDomainName);
|
|
402
|
+
csrDomains.push(certDomainName);
|
|
325
403
|
}
|
|
326
404
|
else {
|
|
327
|
-
// For regular requests, use base domain as common name
|
|
328
405
|
commonName = certDomainName;
|
|
329
|
-
if (
|
|
330
|
-
// If wildcard was successfully added, include it as alt name
|
|
406
|
+
if (includeWildcard && identifiers.some(id => id.value === `*.${certDomainName}`)) {
|
|
331
407
|
csrDomains.push(`*.${certDomainName}`);
|
|
332
408
|
}
|
|
333
409
|
}
|
|
@@ -337,8 +413,8 @@ export class SmartAcme {
|
|
|
337
413
|
});
|
|
338
414
|
await this.retry(() => this.client.finalizeOrder(order, csr), 'finalizeOrder');
|
|
339
415
|
const cert = await this.retry(() => this.client.getCertificate(order), 'getCertificate');
|
|
340
|
-
|
|
341
|
-
|
|
416
|
+
// ── Step: store ───────────────────────────────────────────────────────
|
|
417
|
+
this.certIssuanceTask.notifyStep('store');
|
|
342
418
|
const certRecord = new SmartacmeCert({
|
|
343
419
|
id: plugins.smartunique.shortId(),
|
|
344
420
|
domainName: certDomainName,
|
|
@@ -350,9 +426,7 @@ export class SmartAcme {
|
|
|
350
426
|
});
|
|
351
427
|
await this.certmanager.storeCertificate(certRecord);
|
|
352
428
|
const newCertificate = await this.certmanager.retrieveCertificate(certDomainName);
|
|
353
|
-
|
|
354
|
-
currentDomainInterst.destroy();
|
|
355
|
-
return newCertificate;
|
|
429
|
+
return newCertificate ?? certRecord;
|
|
356
430
|
}
|
|
357
431
|
}
|
|
358
|
-
//# 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.
|
|
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",
|