@serve.zone/dcrouter 13.7.1 → 13.8.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_serve/bundle.js +707 -563
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/acme/index.d.ts +1 -0
- package/dist_ts/acme/index.js +2 -0
- package/dist_ts/acme/manager.acme-config.d.ts +48 -0
- package/dist_ts/acme/manager.acme-config.js +156 -0
- package/dist_ts/classes.dcrouter.d.ts +2 -0
- package/dist_ts/classes.dcrouter.js +58 -20
- package/dist_ts/db/documents/classes.acme-config.doc.d.ts +22 -0
- package/dist_ts/db/documents/classes.acme-config.doc.js +121 -0
- package/dist_ts/db/documents/index.d.ts +1 -0
- package/dist_ts/db/documents/index.js +3 -1
- package/dist_ts/opsserver/classes.opsserver.d.ts +1 -0
- package/dist_ts/opsserver/classes.opsserver.js +3 -1
- package/dist_ts/opsserver/handlers/acme-config.handler.d.ts +16 -0
- package/dist_ts/opsserver/handlers/acme-config.handler.js +77 -0
- package/dist_ts/opsserver/handlers/index.d.ts +1 -0
- package/dist_ts/opsserver/handlers/index.js +2 -1
- package/dist_ts_interfaces/data/acme-config.d.ts +25 -0
- package/dist_ts_interfaces/data/acme-config.js +2 -0
- package/dist_ts_interfaces/data/index.d.ts +1 -0
- package/dist_ts_interfaces/data/index.js +2 -1
- package/dist_ts_interfaces/data/route-management.d.ts +1 -1
- package/dist_ts_interfaces/requests/acme-config.d.ts +42 -0
- package/dist_ts_interfaces/requests/acme-config.js +2 -0
- package/dist_ts_interfaces/requests/index.d.ts +1 -0
- package/dist_ts_interfaces/requests/index.js +2 -1
- package/dist_ts_web/00_commitinfo_data.js +1 -1
- package/dist_ts_web/appstate.d.ts +15 -0
- package/dist_ts_web/appstate.js +60 -1
- package/dist_ts_web/elements/domains/ops-view-certificates.d.ts +3 -0
- package/dist_ts_web/elements/domains/ops-view-certificates.js +208 -4
- package/package.json +1 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/acme/index.ts +1 -0
- package/ts/acme/manager.acme-config.ts +182 -0
- package/ts/classes.dcrouter.ts +72 -25
- package/ts/db/documents/classes.acme-config.doc.ts +49 -0
- package/ts/db/documents/index.ts +3 -0
- package/ts/opsserver/classes.opsserver.ts +2 -0
- package/ts/opsserver/handlers/acme-config.handler.ts +94 -0
- package/ts/opsserver/handlers/index.ts +2 -1
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/appstate.ts +88 -0
- package/ts_web/elements/domains/ops-view-certificates.ts +205 -2
|
@@ -46,12 +46,17 @@ let OpsViewCertificates = (() => {
|
|
|
46
46
|
let _certState_decorators;
|
|
47
47
|
let _certState_initializers = [];
|
|
48
48
|
let _certState_extraInitializers = [];
|
|
49
|
+
let _acmeState_decorators;
|
|
50
|
+
let _acmeState_initializers = [];
|
|
51
|
+
let _acmeState_extraInitializers = [];
|
|
49
52
|
var OpsViewCertificates = class extends _classSuper {
|
|
50
53
|
static { _classThis = this; }
|
|
51
54
|
static {
|
|
52
55
|
const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
|
|
53
56
|
_certState_decorators = [state()];
|
|
57
|
+
_acmeState_decorators = [state()];
|
|
54
58
|
__esDecorate(this, null, _certState_decorators, { kind: "accessor", name: "certState", static: false, private: false, access: { has: obj => "certState" in obj, get: obj => obj.certState, set: (obj, value) => { obj.certState = value; } }, metadata: _metadata }, _certState_initializers, _certState_extraInitializers);
|
|
59
|
+
__esDecorate(this, null, _acmeState_decorators, { kind: "accessor", name: "acmeState", static: false, private: false, access: { has: obj => "acmeState" in obj, get: obj => obj.acmeState, set: (obj, value) => { obj.acmeState = value; } }, metadata: _metadata }, _acmeState_initializers, _acmeState_extraInitializers);
|
|
55
60
|
__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
|
|
56
61
|
OpsViewCertificates = _classThis = _classDescriptor.value;
|
|
57
62
|
if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
|
|
@@ -59,17 +64,25 @@ let OpsViewCertificates = (() => {
|
|
|
59
64
|
#certState_accessor_storage = __runInitializers(this, _certState_initializers, appstate.certificateStatePart.getState());
|
|
60
65
|
get certState() { return this.#certState_accessor_storage; }
|
|
61
66
|
set certState(value) { this.#certState_accessor_storage = value; }
|
|
67
|
+
#acmeState_accessor_storage = (__runInitializers(this, _certState_extraInitializers), __runInitializers(this, _acmeState_initializers, appstate.acmeConfigStatePart.getState()));
|
|
68
|
+
get acmeState() { return this.#acmeState_accessor_storage; }
|
|
69
|
+
set acmeState(value) { this.#acmeState_accessor_storage = value; }
|
|
62
70
|
constructor() {
|
|
63
71
|
super();
|
|
64
|
-
__runInitializers(this,
|
|
65
|
-
const
|
|
72
|
+
__runInitializers(this, _acmeState_extraInitializers);
|
|
73
|
+
const certSub = appstate.certificateStatePart.select().subscribe((newState) => {
|
|
66
74
|
this.certState = newState;
|
|
67
75
|
});
|
|
68
|
-
this.rxSubscriptions.push(
|
|
76
|
+
this.rxSubscriptions.push(certSub);
|
|
77
|
+
const acmeSub = appstate.acmeConfigStatePart.select().subscribe((newState) => {
|
|
78
|
+
this.acmeState = newState;
|
|
79
|
+
});
|
|
80
|
+
this.rxSubscriptions.push(acmeSub);
|
|
69
81
|
}
|
|
70
82
|
async connectedCallback() {
|
|
71
83
|
await super.connectedCallback();
|
|
72
84
|
await appstate.certificateStatePart.dispatchAction(appstate.fetchCertificateOverviewAction, null);
|
|
85
|
+
await appstate.acmeConfigStatePart.dispatchAction(appstate.fetchAcmeConfigAction, null);
|
|
73
86
|
}
|
|
74
87
|
static styles = [
|
|
75
88
|
cssManager.defaultStyles,
|
|
@@ -81,6 +94,62 @@ let OpsViewCertificates = (() => {
|
|
|
81
94
|
gap: 24px;
|
|
82
95
|
}
|
|
83
96
|
|
|
97
|
+
.acmeCard {
|
|
98
|
+
padding: 16px 20px;
|
|
99
|
+
background: ${cssManager.bdTheme('#f9fafb', '#111827')};
|
|
100
|
+
border: 1px solid ${cssManager.bdTheme('#e5e7eb', '#374151')};
|
|
101
|
+
border-radius: 8px;
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
.acmeCard.acmeCardEmpty {
|
|
105
|
+
background: ${cssManager.bdTheme('#fffbeb', '#1c1917')};
|
|
106
|
+
border-color: ${cssManager.bdTheme('#fde68a', '#78350f')};
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
.acmeCardHeader {
|
|
110
|
+
display: flex;
|
|
111
|
+
justify-content: space-between;
|
|
112
|
+
align-items: center;
|
|
113
|
+
margin-bottom: 12px;
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
.acmeCardTitle {
|
|
117
|
+
font-size: 14px;
|
|
118
|
+
font-weight: 600;
|
|
119
|
+
color: ${cssManager.bdTheme('#111827', '#f3f4f6')};
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
.acmeGrid {
|
|
123
|
+
display: grid;
|
|
124
|
+
grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
|
|
125
|
+
gap: 12px 24px;
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
.acmeField {
|
|
129
|
+
display: flex;
|
|
130
|
+
flex-direction: column;
|
|
131
|
+
gap: 2px;
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
.acmeLabel {
|
|
135
|
+
font-size: 11px;
|
|
136
|
+
text-transform: uppercase;
|
|
137
|
+
letter-spacing: 0.03em;
|
|
138
|
+
color: ${cssManager.bdTheme('#6b7280', '#9ca3af')};
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
.acmeValue {
|
|
142
|
+
font-size: 13px;
|
|
143
|
+
color: ${cssManager.bdTheme('#111827', '#f3f4f6')};
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
.acmeEmptyHint {
|
|
147
|
+
margin: 0;
|
|
148
|
+
font-size: 13px;
|
|
149
|
+
line-height: 1.5;
|
|
150
|
+
color: ${cssManager.bdTheme('#78350f', '#fde68a')};
|
|
151
|
+
}
|
|
152
|
+
|
|
84
153
|
.statusBadge {
|
|
85
154
|
display: inline-flex;
|
|
86
155
|
align-items: center;
|
|
@@ -195,11 +264,146 @@ let OpsViewCertificates = (() => {
|
|
|
195
264
|
<dees-heading level="3">Certificates</dees-heading>
|
|
196
265
|
|
|
197
266
|
<div class="certificatesContainer">
|
|
267
|
+
${this.renderAcmeSettingsCard()}
|
|
198
268
|
${this.renderStatsTiles(summary)}
|
|
199
269
|
${this.renderCertificateTable()}
|
|
200
270
|
</div>
|
|
201
271
|
`;
|
|
202
272
|
}
|
|
273
|
+
renderAcmeSettingsCard() {
|
|
274
|
+
const config = this.acmeState.config;
|
|
275
|
+
if (!config) {
|
|
276
|
+
return html `
|
|
277
|
+
<div class="acmeCard acmeCardEmpty">
|
|
278
|
+
<div class="acmeCardHeader">
|
|
279
|
+
<span class="acmeCardTitle">ACME Settings</span>
|
|
280
|
+
<dees-button
|
|
281
|
+
eventName="edit-acme"
|
|
282
|
+
@click=${() => this.showEditAcmeDialog()}
|
|
283
|
+
.type=${'highlighted'}
|
|
284
|
+
>Configure</dees-button>
|
|
285
|
+
</div>
|
|
286
|
+
<p class="acmeEmptyHint">
|
|
287
|
+
No ACME configuration yet. Click <strong>Configure</strong> to set up automated TLS
|
|
288
|
+
certificate issuance via Let's Encrypt. You'll also need at least one DNS provider
|
|
289
|
+
under <strong>Domains > Providers</strong>.
|
|
290
|
+
</p>
|
|
291
|
+
</div>
|
|
292
|
+
`;
|
|
293
|
+
}
|
|
294
|
+
return html `
|
|
295
|
+
<div class="acmeCard">
|
|
296
|
+
<div class="acmeCardHeader">
|
|
297
|
+
<span class="acmeCardTitle">ACME Settings</span>
|
|
298
|
+
<dees-button eventName="edit-acme" @click=${() => this.showEditAcmeDialog()}>Edit</dees-button>
|
|
299
|
+
</div>
|
|
300
|
+
<div class="acmeGrid">
|
|
301
|
+
<div class="acmeField">
|
|
302
|
+
<span class="acmeLabel">Account email</span>
|
|
303
|
+
<span class="acmeValue">${config.accountEmail || '(not set)'}</span>
|
|
304
|
+
</div>
|
|
305
|
+
<div class="acmeField">
|
|
306
|
+
<span class="acmeLabel">Status</span>
|
|
307
|
+
<span class="acmeValue">
|
|
308
|
+
<span class="statusBadge ${config.enabled ? 'valid' : 'unknown'}">
|
|
309
|
+
${config.enabled ? 'enabled' : 'disabled'}
|
|
310
|
+
</span>
|
|
311
|
+
</span>
|
|
312
|
+
</div>
|
|
313
|
+
<div class="acmeField">
|
|
314
|
+
<span class="acmeLabel">Mode</span>
|
|
315
|
+
<span class="acmeValue">
|
|
316
|
+
<span class="statusBadge ${config.useProduction ? 'valid' : 'provisioning'}">
|
|
317
|
+
${config.useProduction ? 'production' : 'staging'}
|
|
318
|
+
</span>
|
|
319
|
+
</span>
|
|
320
|
+
</div>
|
|
321
|
+
<div class="acmeField">
|
|
322
|
+
<span class="acmeLabel">Auto-renew</span>
|
|
323
|
+
<span class="acmeValue">${config.autoRenew ? 'on' : 'off'}</span>
|
|
324
|
+
</div>
|
|
325
|
+
<div class="acmeField">
|
|
326
|
+
<span class="acmeLabel">Renewal threshold</span>
|
|
327
|
+
<span class="acmeValue">${config.renewThresholdDays} days</span>
|
|
328
|
+
</div>
|
|
329
|
+
</div>
|
|
330
|
+
</div>
|
|
331
|
+
`;
|
|
332
|
+
}
|
|
333
|
+
async showEditAcmeDialog() {
|
|
334
|
+
const { DeesModal, DeesToast } = await import('@design.estate/dees-catalog');
|
|
335
|
+
const current = this.acmeState.config;
|
|
336
|
+
DeesModal.createAndShow({
|
|
337
|
+
heading: current ? 'Edit ACME Settings' : 'Configure ACME',
|
|
338
|
+
content: html `
|
|
339
|
+
<dees-form>
|
|
340
|
+
<dees-input-text
|
|
341
|
+
.key=${'accountEmail'}
|
|
342
|
+
.label=${'Account email'}
|
|
343
|
+
.value=${current?.accountEmail ?? ''}
|
|
344
|
+
.required=${true}
|
|
345
|
+
></dees-input-text>
|
|
346
|
+
<dees-input-checkbox
|
|
347
|
+
.key=${'enabled'}
|
|
348
|
+
.label=${'Enabled'}
|
|
349
|
+
.value=${current?.enabled ?? true}
|
|
350
|
+
></dees-input-checkbox>
|
|
351
|
+
<dees-input-checkbox
|
|
352
|
+
.key=${'useProduction'}
|
|
353
|
+
.label=${"Use Let's Encrypt production (uncheck for staging)"}
|
|
354
|
+
.value=${current?.useProduction ?? true}
|
|
355
|
+
></dees-input-checkbox>
|
|
356
|
+
<dees-input-checkbox
|
|
357
|
+
.key=${'autoRenew'}
|
|
358
|
+
.label=${'Auto-renew certificates'}
|
|
359
|
+
.value=${current?.autoRenew ?? true}
|
|
360
|
+
></dees-input-checkbox>
|
|
361
|
+
<dees-input-text
|
|
362
|
+
.key=${'renewThresholdDays'}
|
|
363
|
+
.label=${'Renewal threshold (days)'}
|
|
364
|
+
.value=${String(current?.renewThresholdDays ?? 30)}
|
|
365
|
+
></dees-input-text>
|
|
366
|
+
</dees-form>
|
|
367
|
+
<p style="margin-top: 12px; font-size: 12px; opacity: 0.7;">
|
|
368
|
+
Most fields take effect on the next dcrouter restart (SmartAcme is instantiated once at
|
|
369
|
+
startup). Changing the account email creates a new Let's Encrypt account — only do this
|
|
370
|
+
if you know what you're doing.
|
|
371
|
+
</p>
|
|
372
|
+
`,
|
|
373
|
+
menuOptions: [
|
|
374
|
+
{ name: 'Cancel', action: async (modalArg) => modalArg.destroy() },
|
|
375
|
+
{
|
|
376
|
+
name: 'Save',
|
|
377
|
+
action: async (modalArg) => {
|
|
378
|
+
const form = modalArg.shadowRoot
|
|
379
|
+
?.querySelector('.content')
|
|
380
|
+
?.querySelector('dees-form');
|
|
381
|
+
if (!form)
|
|
382
|
+
return;
|
|
383
|
+
const data = await form.collectFormData();
|
|
384
|
+
const email = String(data.accountEmail ?? '').trim();
|
|
385
|
+
if (!email) {
|
|
386
|
+
DeesToast.show({
|
|
387
|
+
message: 'Account email is required',
|
|
388
|
+
type: 'warning',
|
|
389
|
+
duration: 2500,
|
|
390
|
+
});
|
|
391
|
+
return;
|
|
392
|
+
}
|
|
393
|
+
const threshold = parseInt(String(data.renewThresholdDays ?? '30'), 10);
|
|
394
|
+
await appstate.acmeConfigStatePart.dispatchAction(appstate.updateAcmeConfigAction, {
|
|
395
|
+
accountEmail: email,
|
|
396
|
+
enabled: Boolean(data.enabled),
|
|
397
|
+
useProduction: Boolean(data.useProduction),
|
|
398
|
+
autoRenew: Boolean(data.autoRenew),
|
|
399
|
+
renewThresholdDays: Number.isFinite(threshold) ? threshold : 30,
|
|
400
|
+
});
|
|
401
|
+
modalArg.destroy();
|
|
402
|
+
},
|
|
403
|
+
},
|
|
404
|
+
],
|
|
405
|
+
});
|
|
406
|
+
}
|
|
203
407
|
renderStatsTiles(summary) {
|
|
204
408
|
const tiles = [
|
|
205
409
|
{
|
|
@@ -550,4 +754,4 @@ let OpsViewCertificates = (() => {
|
|
|
550
754
|
return OpsViewCertificates = _classThis;
|
|
551
755
|
})();
|
|
552
756
|
export { OpsViewCertificates };
|
|
553
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-certificates.js","sourceRoot":"","sources":["../../../../ts_web/elements/domains/ops-view-certificates.ts"],"names":[],"mappings":"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"}
|
|
757
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-certificates.js","sourceRoot":"","sources":["../../../../ts_web/elements/domains/ops-view-certificates.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/acme/index.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './manager.acme-config.js';
|
|
@@ -0,0 +1,182 @@
|
|
|
1
|
+
import { logger } from '../logger.js';
|
|
2
|
+
import { AcmeConfigDoc } from '../db/documents/index.js';
|
|
3
|
+
import type { IDcRouterOptions } from '../classes.dcrouter.js';
|
|
4
|
+
import type { IAcmeConfig } from '../../ts_interfaces/data/acme-config.js';
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* AcmeConfigManager — owns the singleton ACME configuration in the DB.
|
|
8
|
+
*
|
|
9
|
+
* Lifecycle:
|
|
10
|
+
* - `start()` — loads from the DB; if empty, seeds from legacy constructor
|
|
11
|
+
* fields (`tls.contactEmail`, `smartProxyConfig.acme.*`) on first boot.
|
|
12
|
+
* - `getConfig()` — returns the in-memory cached `IAcmeConfig` (or null)
|
|
13
|
+
* - `updateConfig(args, updatedBy)` — upserts and refreshes the cache
|
|
14
|
+
*
|
|
15
|
+
* Reload semantics: updates take effect on the next dcrouter restart because
|
|
16
|
+
* `SmartAcme` is instantiated once in `setupSmartProxy()`. `renewThresholdDays`
|
|
17
|
+
* applies immediately to the next renewal check. See
|
|
18
|
+
* `ts_web/elements/domains/ops-view-certificates.ts` for the UI warning.
|
|
19
|
+
*/
|
|
20
|
+
export class AcmeConfigManager {
|
|
21
|
+
private cached: IAcmeConfig | null = null;
|
|
22
|
+
|
|
23
|
+
constructor(private options: IDcRouterOptions) {}
|
|
24
|
+
|
|
25
|
+
public async start(): Promise<void> {
|
|
26
|
+
logger.log('info', 'AcmeConfigManager: starting');
|
|
27
|
+
let doc = await AcmeConfigDoc.load();
|
|
28
|
+
|
|
29
|
+
if (!doc) {
|
|
30
|
+
// First-boot path: seed from legacy constructor fields if present.
|
|
31
|
+
const seed = this.deriveSeedFromOptions();
|
|
32
|
+
if (seed) {
|
|
33
|
+
doc = await this.createSeedDoc(seed);
|
|
34
|
+
logger.log(
|
|
35
|
+
'info',
|
|
36
|
+
`AcmeConfigManager: seeded from constructor legacy fields (accountEmail=${seed.accountEmail}, useProduction=${seed.useProduction})`,
|
|
37
|
+
);
|
|
38
|
+
} else {
|
|
39
|
+
logger.log(
|
|
40
|
+
'info',
|
|
41
|
+
'AcmeConfigManager: no AcmeConfig in DB and no legacy constructor fields — ACME disabled until configured via Domains > Certificates > Settings.',
|
|
42
|
+
);
|
|
43
|
+
}
|
|
44
|
+
} else if (this.deriveSeedFromOptions()) {
|
|
45
|
+
logger.log(
|
|
46
|
+
'warn',
|
|
47
|
+
'AcmeConfigManager: ignoring constructor tls.contactEmail / smartProxyConfig.acme — DB already has AcmeConfigDoc. Manage via Domains > Certificates > Settings.',
|
|
48
|
+
);
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
this.cached = doc ? this.toPlain(doc) : null;
|
|
52
|
+
if (this.cached) {
|
|
53
|
+
logger.log(
|
|
54
|
+
'info',
|
|
55
|
+
`AcmeConfigManager: loaded ACME config (accountEmail=${this.cached.accountEmail}, enabled=${this.cached.enabled}, useProduction=${this.cached.useProduction})`,
|
|
56
|
+
);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
public async stop(): Promise<void> {
|
|
61
|
+
this.cached = null;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
/**
|
|
65
|
+
* Returns the current ACME config, or null if not configured.
|
|
66
|
+
* In-memory — does not hit the DB.
|
|
67
|
+
*/
|
|
68
|
+
public getConfig(): IAcmeConfig | null {
|
|
69
|
+
return this.cached;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
/**
|
|
73
|
+
* True if there is an enabled ACME config. Used by `setupSmartProxy()` to
|
|
74
|
+
* decide whether to instantiate SmartAcme.
|
|
75
|
+
*/
|
|
76
|
+
public hasEnabledConfig(): boolean {
|
|
77
|
+
return this.cached !== null && this.cached.enabled;
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
/**
|
|
81
|
+
* Upsert the ACME config. All fields are optional; missing fields are
|
|
82
|
+
* preserved from the existing row (or defaulted if there is no row yet).
|
|
83
|
+
*/
|
|
84
|
+
public async updateConfig(
|
|
85
|
+
args: Partial<Omit<IAcmeConfig, 'updatedAt' | 'updatedBy'>>,
|
|
86
|
+
updatedBy: string,
|
|
87
|
+
): Promise<IAcmeConfig> {
|
|
88
|
+
let doc = await AcmeConfigDoc.load();
|
|
89
|
+
const now = Date.now();
|
|
90
|
+
|
|
91
|
+
if (!doc) {
|
|
92
|
+
doc = new AcmeConfigDoc();
|
|
93
|
+
doc.configId = 'acme-config';
|
|
94
|
+
doc.accountEmail = args.accountEmail ?? '';
|
|
95
|
+
doc.enabled = args.enabled ?? true;
|
|
96
|
+
doc.useProduction = args.useProduction ?? true;
|
|
97
|
+
doc.autoRenew = args.autoRenew ?? true;
|
|
98
|
+
doc.renewThresholdDays = args.renewThresholdDays ?? 30;
|
|
99
|
+
} else {
|
|
100
|
+
if (args.accountEmail !== undefined) doc.accountEmail = args.accountEmail;
|
|
101
|
+
if (args.enabled !== undefined) doc.enabled = args.enabled;
|
|
102
|
+
if (args.useProduction !== undefined) doc.useProduction = args.useProduction;
|
|
103
|
+
if (args.autoRenew !== undefined) doc.autoRenew = args.autoRenew;
|
|
104
|
+
if (args.renewThresholdDays !== undefined) doc.renewThresholdDays = args.renewThresholdDays;
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
doc.updatedAt = now;
|
|
108
|
+
doc.updatedBy = updatedBy;
|
|
109
|
+
await doc.save();
|
|
110
|
+
|
|
111
|
+
this.cached = this.toPlain(doc);
|
|
112
|
+
return this.cached;
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
// ==========================================================================
|
|
116
|
+
// Internal helpers
|
|
117
|
+
// ==========================================================================
|
|
118
|
+
|
|
119
|
+
/**
|
|
120
|
+
* Build a seed object from the legacy constructor fields. Returns null
|
|
121
|
+
* if the user has not provided any of them.
|
|
122
|
+
*
|
|
123
|
+
* Supports BOTH `tls.contactEmail` (short form) and `smartProxyConfig.acme`
|
|
124
|
+
* (full form). `smartProxyConfig.acme` wins when both are present.
|
|
125
|
+
*/
|
|
126
|
+
private deriveSeedFromOptions(): Omit<IAcmeConfig, 'updatedAt' | 'updatedBy'> | null {
|
|
127
|
+
const acme = this.options.smartProxyConfig?.acme;
|
|
128
|
+
const tls = this.options.tls;
|
|
129
|
+
|
|
130
|
+
// Prefer the explicit smartProxyConfig.acme block if present.
|
|
131
|
+
if (acme?.accountEmail) {
|
|
132
|
+
return {
|
|
133
|
+
accountEmail: acme.accountEmail,
|
|
134
|
+
enabled: acme.enabled !== false,
|
|
135
|
+
useProduction: acme.useProduction !== false,
|
|
136
|
+
autoRenew: acme.autoRenew !== false,
|
|
137
|
+
renewThresholdDays: acme.renewThresholdDays ?? 30,
|
|
138
|
+
};
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
// Fall back to the short tls.contactEmail form.
|
|
142
|
+
if (tls?.contactEmail) {
|
|
143
|
+
return {
|
|
144
|
+
accountEmail: tls.contactEmail,
|
|
145
|
+
enabled: true,
|
|
146
|
+
useProduction: true,
|
|
147
|
+
autoRenew: true,
|
|
148
|
+
renewThresholdDays: 30,
|
|
149
|
+
};
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
return null;
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
private async createSeedDoc(
|
|
156
|
+
seed: Omit<IAcmeConfig, 'updatedAt' | 'updatedBy'>,
|
|
157
|
+
): Promise<AcmeConfigDoc> {
|
|
158
|
+
const doc = new AcmeConfigDoc();
|
|
159
|
+
doc.configId = 'acme-config';
|
|
160
|
+
doc.accountEmail = seed.accountEmail;
|
|
161
|
+
doc.enabled = seed.enabled;
|
|
162
|
+
doc.useProduction = seed.useProduction;
|
|
163
|
+
doc.autoRenew = seed.autoRenew;
|
|
164
|
+
doc.renewThresholdDays = seed.renewThresholdDays;
|
|
165
|
+
doc.updatedAt = Date.now();
|
|
166
|
+
doc.updatedBy = 'seed';
|
|
167
|
+
await doc.save();
|
|
168
|
+
return doc;
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
private toPlain(doc: AcmeConfigDoc): IAcmeConfig {
|
|
172
|
+
return {
|
|
173
|
+
accountEmail: doc.accountEmail,
|
|
174
|
+
enabled: doc.enabled,
|
|
175
|
+
useProduction: doc.useProduction,
|
|
176
|
+
autoRenew: doc.autoRenew,
|
|
177
|
+
renewThresholdDays: doc.renewThresholdDays,
|
|
178
|
+
updatedAt: doc.updatedAt,
|
|
179
|
+
updatedBy: doc.updatedBy,
|
|
180
|
+
};
|
|
181
|
+
}
|
|
182
|
+
}
|