@serve.zone/dcrouter 13.7.1 → 13.9.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 +1763 -1519
- 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 +60 -21
- 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/dns/manager.dns.d.ts +17 -15
- package/dist_ts/dns/manager.dns.js +33 -27
- package/dist_ts/dns/providers/factory.js +10 -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/dns-provider.handler.js +42 -5
- package/dist_ts/opsserver/handlers/domain.handler.js +3 -3
- 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/dns-provider.d.ts +28 -4
- package/dist_ts_interfaces/data/dns-provider.js +15 -1
- package/dist_ts_interfaces/data/dns-record.d.ts +9 -7
- package/dist_ts_interfaces/data/domain.d.ts +8 -7
- 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/dns-records.d.ts +1 -1
- package/dist_ts_interfaces/requests/domains.d.ts +3 -3
- package/dist_ts_interfaces/requests/index.d.ts +1 -0
- package/dist_ts_interfaces/requests/index.js +2 -1
- package/dist_ts_migrations/index.js +17 -1
- package/dist_ts_web/00_commitinfo_data.js +1 -1
- package/dist_ts_web/appstate.d.ts +16 -1
- package/dist_ts_web/appstate.js +61 -2
- package/dist_ts_web/elements/domains/dns-provider-form.d.ts +4 -2
- package/dist_ts_web/elements/domains/dns-provider-form.js +11 -5
- 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/dist_ts_web/elements/domains/ops-view-dns.js +3 -3
- package/dist_ts_web/elements/domains/ops-view-domains.d.ts +1 -1
- package/dist_ts_web/elements/domains/ops-view-domains.js +10 -10
- package/dist_ts_web/elements/domains/ops-view-providers.js +19 -5
- package/package.json +3 -3
- 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 +74 -26
- package/ts/db/documents/classes.acme-config.doc.ts +49 -0
- package/ts/db/documents/index.ts +3 -0
- package/ts/dns/manager.dns.ts +38 -27
- package/ts/dns/providers/factory.ts +11 -0
- package/ts/opsserver/classes.opsserver.ts +2 -0
- package/ts/opsserver/handlers/acme-config.handler.ts +94 -0
- package/ts/opsserver/handlers/dns-provider.handler.ts +41 -3
- package/ts/opsserver/handlers/domain.handler.ts +2 -2
- package/ts/opsserver/handlers/index.ts +2 -1
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/appstate.ts +89 -1
- package/ts_web/elements/domains/dns-provider-form.ts +12 -4
- package/ts_web/elements/domains/ops-view-certificates.ts +205 -2
- package/ts_web/elements/domains/ops-view-dns.ts +2 -2
- package/ts_web/elements/domains/ops-view-domains.ts +9 -9
- package/ts_web/elements/domains/ops-view-providers.ts +18 -4
|
@@ -105,6 +105,11 @@ let OpsViewProviders = (() => {
|
|
|
105
105
|
background: ${cssManager.bdTheme('#f3f4f6', '#1f2937')};
|
|
106
106
|
color: ${cssManager.bdTheme('#4b5563', '#9ca3af')};
|
|
107
107
|
}
|
|
108
|
+
|
|
109
|
+
.statusBadge.builtin {
|
|
110
|
+
background: ${cssManager.bdTheme('#e0e7ff', '#1e1b4b')};
|
|
111
|
+
color: ${cssManager.bdTheme('#3730a3', '#a5b4fc')};
|
|
112
|
+
}
|
|
108
113
|
`,
|
|
109
114
|
];
|
|
110
115
|
render() {
|
|
@@ -114,15 +119,21 @@ let OpsViewProviders = (() => {
|
|
|
114
119
|
<div class="providersContainer">
|
|
115
120
|
<dees-table
|
|
116
121
|
.heading1=${'Providers'}
|
|
117
|
-
.heading2=${'
|
|
122
|
+
.heading2=${'Built-in dcrouter + external DNS provider accounts'}
|
|
118
123
|
.data=${providers}
|
|
119
124
|
.showColumnFilters=${true}
|
|
120
125
|
.displayFunction=${(p) => ({
|
|
121
126
|
Name: p.name,
|
|
122
127
|
Type: this.providerTypeLabel(p.type),
|
|
123
|
-
Status:
|
|
124
|
-
|
|
125
|
-
|
|
128
|
+
Status: p.builtIn
|
|
129
|
+
? html `<span class="statusBadge builtin">built-in</span>`
|
|
130
|
+
: this.renderStatusBadge(p.status),
|
|
131
|
+
'Last Tested': p.builtIn
|
|
132
|
+
? '—'
|
|
133
|
+
: p.lastTestedAt
|
|
134
|
+
? new Date(p.lastTestedAt).toLocaleString()
|
|
135
|
+
: 'never',
|
|
136
|
+
Error: p.builtIn ? '—' : p.lastError || '-',
|
|
126
137
|
})}
|
|
127
138
|
.dataActions=${[
|
|
128
139
|
{
|
|
@@ -145,6 +156,7 @@ let OpsViewProviders = (() => {
|
|
|
145
156
|
name: 'Test Connection',
|
|
146
157
|
iconName: 'lucide:plug',
|
|
147
158
|
type: ['inRow', 'contextmenu'],
|
|
159
|
+
actionRelevancyCheckFunc: (p) => !p.builtIn,
|
|
148
160
|
actionFunc: async (actionData) => {
|
|
149
161
|
const provider = actionData.item;
|
|
150
162
|
await this.testProvider(provider);
|
|
@@ -154,6 +166,7 @@ let OpsViewProviders = (() => {
|
|
|
154
166
|
name: 'Edit',
|
|
155
167
|
iconName: 'lucide:pencil',
|
|
156
168
|
type: ['inRow', 'contextmenu'],
|
|
169
|
+
actionRelevancyCheckFunc: (p) => !p.builtIn,
|
|
157
170
|
actionFunc: async (actionData) => {
|
|
158
171
|
const provider = actionData.item;
|
|
159
172
|
await this.showEditDialog(provider);
|
|
@@ -163,6 +176,7 @@ let OpsViewProviders = (() => {
|
|
|
163
176
|
name: 'Delete',
|
|
164
177
|
iconName: 'lucide:trash2',
|
|
165
178
|
type: ['inRow', 'contextmenu'],
|
|
179
|
+
actionRelevancyCheckFunc: (p) => !p.builtIn,
|
|
166
180
|
actionFunc: async (actionData) => {
|
|
167
181
|
const provider = actionData.item;
|
|
168
182
|
await this.deleteProvider(provider);
|
|
@@ -313,4 +327,4 @@ let OpsViewProviders = (() => {
|
|
|
313
327
|
return OpsViewProviders = _classThis;
|
|
314
328
|
})();
|
|
315
329
|
export { OpsViewProviders };
|
|
316
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-providers.js","sourceRoot":"","sources":["../../../../ts_web/elements/domains/ops-view-providers.ts"],"names":[],"mappings":"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"}
|
|
330
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-providers.js","sourceRoot":"","sources":["../../../../ts_web/elements/domains/ops-view-providers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EACL,WAAW,EACX,IAAI,EACJ,aAAa,EAEb,GAAG,EACH,KAAK,EACL,UAAU,GACX,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC;AAC9C,OAAO,KAAK,UAAU,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,wBAAwB,CAAC;IAUnB,gBAAgB;4BAD5B,aAAa,CAAC,oBAAoB,CAAC;;;;sBACE,WAAW;;;;gCAAnB,SAAQ,WAAW;;;;wCAC9C,KAAK,EAAE;YACR,yLAAS,YAAY,6BAAZ,YAAY,mGAAiE;YAFxF,6KAmRC;;;;QAjRC,qFAAgD,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,EAAG,EAAC;QAAtF,IAAS,YAAY,kDAAiE;QAAtF,IAAS,YAAY,wDAAiE;QAEtF;YACE,KAAK,EAAE,CAAC;;YACR,MAAM,GAAG,GAAG,QAAQ,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACpE,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC;YAC/B,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAChC;QAED,KAAK,CAAC,iBAAiB;YACrB,MAAM,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAChC,MAAM,QAAQ,CAAC,gBAAgB,CAAC,cAAc,CAAC,QAAQ,CAAC,8BAA8B,EAAE,IAAI,CAAC,CAAC;QAChG,CAAC;QAEM,MAAM,CAAC,MAAM,GAAG;YACrB,UAAU,CAAC,aAAa;YACxB,WAAW;YACX,GAAG,CAAA;;;;;;;;;;;;;;;;;;sBAkBe,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;sBAInC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;sBAInC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;sBAInC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;KAEpD;SACF,CAAC;QAEK,MAAM;YACX,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC;YAE9C,OAAO,IAAI,CAAA;;;;sBAIO,WAAW;sBACX,oDAAoD;kBACxD,SAAS;+BACI,IAAI;6BACN,CAAC,CAAqC,EAAE,EAAE,CAAC,CAAC;gBAC7D,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,IAAI,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC;gBACpC,MAAM,EAAE,CAAC,CAAC,OAAO;oBACf,CAAC,CAAC,IAAI,CAAA,mDAAmD;oBACzD,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,CAAC;gBACpC,aAAa,EAAE,CAAC,CAAC,OAAO;oBACtB,CAAC,CAAC,GAAG;oBACL,CAAC,CAAC,CAAC,CAAC,YAAY;wBACd,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,cAAc,EAAE;wBAC3C,CAAC,CAAC,OAAO;gBACb,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,GAAG;aAC5C,CAAC;yBACa;gBACb;oBACE,IAAI,EAAE,cAAc;oBACpB,QAAQ,EAAE,aAAa;oBACvB,IAAI,EAAE,CAAC,QAAiB,CAAC;oBACzB,UAAU,EAAE,KAAK,IAAI,EAAE;wBACrB,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;oBAChC,CAAC;iBACF;gBACD;oBACE,IAAI,EAAE,SAAS;oBACf,QAAQ,EAAE,iBAAiB;oBAC3B,IAAI,EAAE,CAAC,QAAiB,CAAC;oBACzB,UAAU,EAAE,KAAK,IAAI,EAAE;wBACrB,MAAM,QAAQ,CAAC,gBAAgB,CAAC,cAAc,CAC5C,QAAQ,CAAC,8BAA8B,EACvC,IAAI,CACL,CAAC;oBACJ,CAAC;iBACF;gBACD;oBACE,IAAI,EAAE,iBAAiB;oBACvB,QAAQ,EAAE,aAAa;oBACvB,IAAI,EAAE,CAAC,OAAO,EAAE,aAAa,CAAQ;oBACrC,wBAAwB,EAAE,CAAC,CAAqC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO;oBAC/E,UAAU,EAAE,KAAK,EAAE,UAAe,EAAE,EAAE;wBACpC,MAAM,QAAQ,GAAG,UAAU,CAAC,IAA0C,CAAC;wBACvE,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;oBACpC,CAAC;iBACF;gBACD;oBACE,IAAI,EAAE,MAAM;oBACZ,QAAQ,EAAE,eAAe;oBACzB,IAAI,EAAE,CAAC,OAAO,EAAE,aAAa,CAAQ;oBACrC,wBAAwB,EAAE,CAAC,CAAqC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO;oBAC/E,UAAU,EAAE,KAAK,EAAE,UAAe,EAAE,EAAE;wBACpC,MAAM,QAAQ,GAAG,UAAU,CAAC,IAA0C,CAAC;wBACvE,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;oBACtC,CAAC;iBACF;gBACD;oBACE,IAAI,EAAE,QAAQ;oBACd,QAAQ,EAAE,eAAe;oBACzB,IAAI,EAAE,CAAC,OAAO,EAAE,aAAa,CAAQ;oBACrC,wBAAwB,EAAE,CAAC,CAAqC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO;oBAC/E,UAAU,EAAE,KAAK,EAAE,UAAe,EAAE,EAAE;wBACpC,MAAM,QAAQ,GAAG,UAAU,CAAC,IAA0C,CAAC;wBACvE,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;oBACtC,CAAC;iBACF;aACF;;;KAGN,CAAC;QACJ,CAAC;QAEO,iBAAiB,CAAC,MAA0C;YAClE,OAAO,IAAI,CAAA,4BAA4B,MAAM,KAAK,MAAM,SAAS,CAAC;QACpE,CAAC;QAEO,iBAAiB,CAAC,IAAsC;YAC9D,OAAO,UAAU,CAAC,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,EAAE,WAAW,IAAI,IAAI,CAAC;QACjF,CAAC;QAEO,KAAK,CAAC,gBAAgB;YAC5B,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;YAC7E,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,mBAAmB,CAAoB,CAAC;YAC9E,SAAS,CAAC,aAAa,CAAC;gBACtB,OAAO,EAAE,kBAAkB;gBAC3B,OAAO,EAAE,IAAI,CAAA,GAAG,MAAM,EAAE;gBACxB,WAAW,EAAE;oBACX,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE;oBACvE;wBACE,IAAI,EAAE,QAAQ;wBACd,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE;4BAC9B,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,WAAW,EAAE,CAAC;4BACxC,IAAI,CAAC,IAAI;gCAAE,OAAO;4BAClB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gCACf,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;gCACjF,OAAO;4BACT,CAAC;4BACD,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;gCAC7B,SAAS,CAAC,IAAI,CAAC;oCACb,OAAO,EAAE,kCAAkC;oCAC3C,IAAI,EAAE,SAAS;oCACf,QAAQ,EAAE,IAAI;iCACf,CAAC,CAAC;gCACH,OAAO;4BACT,CAAC;4BACD,MAAM,QAAQ,CAAC,gBAAgB,CAAC,cAAc,CAAC,QAAQ,CAAC,uBAAuB,EAAE;gCAC/E,IAAI,EAAE,IAAI,CAAC,IAAI;gCACf,IAAI,EAAE,IAAI,CAAC,IAAI;gCACf,WAAW,EAAE,IAAI,CAAC,WAAW;6BAC9B,CAAC,CAAC;4BACH,QAAQ,CAAC,OAAO,EAAE,CAAC;wBACrB,CAAC;qBACF;iBACF;aACF,CAAC,CAAC;QACL,CAAC;QAEO,KAAK,CAAC,cAAc,CAAC,QAA4C;YACvE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;YAClE,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,mBAAmB,CAAoB,CAAC;YAC9E,MAAM,CAAC,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAC;YACpC,MAAM,CAAC,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAC;YACpC,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC;YACvB,MAAM,CAAC,eAAe;gBACpB,gFAAgF,CAAC;YACnF,SAAS,CAAC,aAAa,CAAC;gBACtB,OAAO,EAAE,kBAAkB,QAAQ,CAAC,IAAI,EAAE;gBAC1C,OAAO,EAAE,IAAI,CAAA,GAAG,MAAM,EAAE;gBACxB,WAAW,EAAE;oBACX,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE;oBACvE;wBACE,IAAI,EAAE,MAAM;wBACZ,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE;4BAC9B,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,WAAW,EAAE,CAAC;4BACxC,IAAI,CAAC,IAAI;gCAAE,OAAO;4BAClB,MAAM,QAAQ,CAAC,gBAAgB,CAAC,cAAc,CAAC,QAAQ,CAAC,uBAAuB,EAAE;gCAC/E,EAAE,EAAE,QAAQ,CAAC,EAAE;gCACf,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI;gCAChC,iEAAiE;gCACjE,kDAAkD;gCAClD,WAAW,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;6BACpE,CAAC,CAAC;4BACH,QAAQ,CAAC,OAAO,EAAE,CAAC;wBACrB,CAAC;qBACF;iBACF;aACF,CAAC,CAAC;QACL,CAAC;QAEO,KAAK,CAAC,YAAY,CAAC,QAA4C;YACrE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;YAClE,MAAM,QAAQ,CAAC,gBAAgB,CAAC,cAAc,CAAC,QAAQ,CAAC,qBAAqB,EAAE;gBAC7E,EAAE,EAAE,QAAQ,CAAC,EAAE;aAChB,CAAC,CAAC;YACH,MAAM,OAAO,GAAG,QAAQ,CAAC,gBAAgB;iBACtC,QAAQ,EAAG;iBACX,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC/C,IAAI,OAAO,EAAE,MAAM,KAAK,IAAI,EAAE,CAAC;gBAC7B,SAAS,CAAC,IAAI,CAAC;oBACb,OAAO,EAAE,GAAG,QAAQ,CAAC,IAAI,iBAAiB;oBAC1C,IAAI,EAAE,SAAS;oBACf,QAAQ,EAAE,IAAI;iBACf,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,SAAS,CAAC,IAAI,CAAC;oBACb,OAAO,EAAE,GAAG,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE,SAAS,IAAI,mBAAmB,EAAE;oBACzE,IAAI,EAAE,OAAO;oBACb,QAAQ,EAAE,IAAI;iBACf,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAEO,KAAK,CAAC,cAAc,CAAC,QAA4C;YACvE,MAAM,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC5F,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;YAElE,MAAM,QAAQ,GAAG,KAAK,EAAE,KAAc,EAAE,EAAE;gBACxC,MAAM,QAAQ,CAAC,gBAAgB,CAAC,cAAc,CAAC,QAAQ,CAAC,uBAAuB,EAAE;oBAC/E,EAAE,EAAE,QAAQ,CAAC,EAAE;oBACf,KAAK;iBACN,CAAC,CAAC;YACL,CAAC,CAAC;YAEF,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7B,SAAS,CAAC,aAAa,CAAC;oBACtB,OAAO,EAAE,iBAAiB;oBAC1B,OAAO,EAAE,IAAI,CAAA;;+BAEU,QAAQ,CAAC,IAAI,8BAA8B,aAAa,CAAC,MAAM;;sCAExD,QAAQ,CAAC,IAAI;;SAE1C;oBACD,WAAW,EAAE;wBACX,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE;wBACvE;4BACE,IAAI,EAAE,cAAc;4BACpB,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE;gCAC9B,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;gCACrB,QAAQ,CAAC,OAAO,EAAE,CAAC;4BACrB,CAAC;yBACF;qBACF;iBACF,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,MAAM,QAAQ,CAAC,KAAK,CAAC,CAAC;YACxB,CAAC;QACH,CAAC;;YAlRU,uDAAgB;;;;;SAAhB,gBAAgB"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serve.zone/dcrouter",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "13.
|
|
4
|
+
"version": "13.9.0",
|
|
5
5
|
"description": "A multifaceted routing service handling mail and SMS delivery functions.",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"exports": {
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"@api.global/typedserver": "^8.4.6",
|
|
36
36
|
"@api.global/typedsocket": "^4.1.2",
|
|
37
37
|
"@apiclient.xyz/cloudflare": "^7.1.0",
|
|
38
|
-
"@design.estate/dees-catalog": "^3.
|
|
38
|
+
"@design.estate/dees-catalog": "^3.70.0",
|
|
39
39
|
"@design.estate/dees-element": "^2.2.4",
|
|
40
40
|
"@push.rocks/lik": "^6.4.0",
|
|
41
41
|
"@push.rocks/projectinfo": "^5.1.0",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"@push.rocks/smartjwt": "^2.2.1",
|
|
50
50
|
"@push.rocks/smartlog": "^3.2.2",
|
|
51
51
|
"@push.rocks/smartmetrics": "^3.0.3",
|
|
52
|
-
"@push.rocks/smartmigration": "1.
|
|
52
|
+
"@push.rocks/smartmigration": "1.2.0",
|
|
53
53
|
"@push.rocks/smartmta": "^5.3.1",
|
|
54
54
|
"@push.rocks/smartnetwork": "^4.5.2",
|
|
55
55
|
"@push.rocks/smartpath": "^6.0.0",
|
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
|
+
}
|
package/ts/classes.dcrouter.ts
CHANGED
|
@@ -28,6 +28,7 @@ import { RouteConfigManager, ApiTokenManager, ReferenceResolver, DbSeeder, Targe
|
|
|
28
28
|
import { SecurityLogger, ContentScanner, IPReputationChecker } from './security/index.js';
|
|
29
29
|
import { type IHttp3Config, augmentRoutesWithHttp3 } from './http3/index.js';
|
|
30
30
|
import { DnsManager } from './dns/manager.dns.js';
|
|
31
|
+
import { AcmeConfigManager } from './acme/manager.acme-config.js';
|
|
31
32
|
|
|
32
33
|
export interface IDcRouterOptions {
|
|
33
34
|
/** Base directory for all dcrouter data. Defaults to ~/.serve.zone/dcrouter */
|
|
@@ -276,6 +277,9 @@ export class DcRouter {
|
|
|
276
277
|
// Domain / DNS management (DB-backed providers, domains, records)
|
|
277
278
|
public dnsManager?: DnsManager;
|
|
278
279
|
|
|
280
|
+
// ACME configuration (DB-backed singleton, replaces tls.contactEmail)
|
|
281
|
+
public acmeConfigManager?: AcmeConfigManager;
|
|
282
|
+
|
|
279
283
|
// Auto-discovered public IP (populated by generateAuthoritativeRecords)
|
|
280
284
|
public detectedPublicIp: string | null = null;
|
|
281
285
|
|
|
@@ -412,11 +416,35 @@ export class DcRouter {
|
|
|
412
416
|
);
|
|
413
417
|
}
|
|
414
418
|
|
|
415
|
-
//
|
|
419
|
+
// AcmeConfigManager: optional, depends on DcRouterDb — owns the singleton
|
|
420
|
+
// ACME configuration (accountEmail, useProduction, etc.). Must run before
|
|
421
|
+
// SmartProxy so setupSmartProxy() can read the ACME config from the DB.
|
|
422
|
+
// On first boot, seeds from legacy `tls.contactEmail` / `smartProxyConfig.acme`.
|
|
423
|
+
if (this.options.dbConfig?.enabled !== false) {
|
|
424
|
+
this.serviceManager.addService(
|
|
425
|
+
new plugins.taskbuffer.Service('AcmeConfigManager')
|
|
426
|
+
.optional()
|
|
427
|
+
.dependsOn('DcRouterDb')
|
|
428
|
+
.withStart(async () => {
|
|
429
|
+
this.acmeConfigManager = new AcmeConfigManager(this.options);
|
|
430
|
+
await this.acmeConfigManager.start();
|
|
431
|
+
})
|
|
432
|
+
.withStop(async () => {
|
|
433
|
+
if (this.acmeConfigManager) {
|
|
434
|
+
await this.acmeConfigManager.stop();
|
|
435
|
+
this.acmeConfigManager = undefined;
|
|
436
|
+
}
|
|
437
|
+
})
|
|
438
|
+
.withRetry({ maxRetries: 1, baseDelayMs: 500 }),
|
|
439
|
+
);
|
|
440
|
+
}
|
|
441
|
+
|
|
442
|
+
// SmartProxy: critical, depends on DcRouterDb + DnsManager + AcmeConfigManager (if enabled)
|
|
416
443
|
const smartProxyDeps: string[] = [];
|
|
417
444
|
if (this.options.dbConfig?.enabled !== false) {
|
|
418
445
|
smartProxyDeps.push('DcRouterDb');
|
|
419
446
|
smartProxyDeps.push('DnsManager');
|
|
447
|
+
smartProxyDeps.push('AcmeConfigManager');
|
|
420
448
|
}
|
|
421
449
|
this.serviceManager.addService(
|
|
422
450
|
new plugins.taskbuffer.Service('SmartProxy')
|
|
@@ -837,45 +865,62 @@ export class DcRouter {
|
|
|
837
865
|
}
|
|
838
866
|
|
|
839
867
|
let routes: plugins.smartproxy.IRouteConfig[] = [];
|
|
840
|
-
|
|
841
|
-
|
|
842
|
-
//
|
|
868
|
+
|
|
869
|
+
// If user provides full SmartProxy config, use its routes.
|
|
870
|
+
// NOTE: `smartProxyConfig.acme` is now seed-only — consumed by
|
|
871
|
+
// AcmeConfigManager on first boot. The live ACME config always comes
|
|
872
|
+
// from the DB via `this.acmeConfigManager.getConfig()`.
|
|
843
873
|
if (this.options.smartProxyConfig) {
|
|
844
874
|
routes = this.options.smartProxyConfig.routes || [];
|
|
845
|
-
|
|
846
|
-
logger.log('info', `Found ${routes.length} routes in config, ACME config present: ${!!acmeConfig}`);
|
|
875
|
+
logger.log('info', `Found ${routes.length} routes in config`);
|
|
847
876
|
}
|
|
848
|
-
|
|
877
|
+
|
|
849
878
|
// If email config exists, automatically add email routes
|
|
850
879
|
if (this.options.emailConfig) {
|
|
851
880
|
const emailRoutes = this.generateEmailRoutes(this.options.emailConfig);
|
|
852
881
|
logger.log('debug', 'Email routes generated', { routes: JSON.stringify(emailRoutes) });
|
|
853
882
|
routes = [...routes, ...emailRoutes]; // Enable email routing through SmartProxy
|
|
854
883
|
}
|
|
855
|
-
|
|
884
|
+
|
|
856
885
|
// If DNS is configured, add DNS routes
|
|
857
886
|
if (this.options.dnsNsDomains && this.options.dnsNsDomains.length > 0) {
|
|
858
887
|
const dnsRoutes = this.generateDnsRoutes();
|
|
859
888
|
logger.log('debug', `DNS routes for nameservers ${this.options.dnsNsDomains.join(', ')}`, { routes: JSON.stringify(dnsRoutes) });
|
|
860
889
|
routes = [...routes, ...dnsRoutes];
|
|
861
890
|
}
|
|
862
|
-
|
|
863
|
-
//
|
|
864
|
-
|
|
865
|
-
|
|
866
|
-
|
|
867
|
-
|
|
868
|
-
|
|
869
|
-
|
|
870
|
-
|
|
871
|
-
|
|
891
|
+
|
|
892
|
+
// Build the ACME options for SmartProxy from the DB-backed AcmeConfigManager.
|
|
893
|
+
// If no config exists or it's disabled, SmartProxy's own ACME is turned off
|
|
894
|
+
// and dcrouter's SmartAcme / certProvisionFunction are not wired.
|
|
895
|
+
const dbAcme = this.acmeConfigManager?.getConfig();
|
|
896
|
+
const acmeConfig: plugins.smartproxy.IAcmeOptions | undefined =
|
|
897
|
+
dbAcme && dbAcme.enabled
|
|
898
|
+
? {
|
|
899
|
+
accountEmail: dbAcme.accountEmail,
|
|
900
|
+
enabled: true,
|
|
901
|
+
useProduction: dbAcme.useProduction,
|
|
902
|
+
autoRenew: dbAcme.autoRenew,
|
|
903
|
+
renewThresholdDays: dbAcme.renewThresholdDays,
|
|
904
|
+
}
|
|
905
|
+
: undefined;
|
|
906
|
+
if (acmeConfig) {
|
|
907
|
+
logger.log(
|
|
908
|
+
'info',
|
|
909
|
+
`ACME config: accountEmail=${acmeConfig.accountEmail}, useProduction=${acmeConfig.useProduction}, autoRenew=${acmeConfig.autoRenew}`,
|
|
910
|
+
);
|
|
911
|
+
} else {
|
|
912
|
+
logger.log('info', 'ACME config: disabled or not yet configured in DB');
|
|
872
913
|
}
|
|
873
|
-
|
|
874
|
-
// Configure DNS-01 challenge if any DnsProviderDoc exists in the DB
|
|
875
|
-
// The DnsManager dispatches each challenge to the right
|
|
876
|
-
// based on the FQDN being certificated.
|
|
914
|
+
|
|
915
|
+
// Configure DNS-01 challenge if any DnsProviderDoc exists in the DB AND
|
|
916
|
+
// ACME is enabled. The DnsManager dispatches each challenge to the right
|
|
917
|
+
// provider client based on the FQDN being certificated.
|
|
877
918
|
let challengeHandlers: any[] = [];
|
|
878
|
-
if (
|
|
919
|
+
if (
|
|
920
|
+
acmeConfig &&
|
|
921
|
+
this.dnsManager &&
|
|
922
|
+
(await this.dnsManager.hasAcmeCapableProvider())
|
|
923
|
+
) {
|
|
879
924
|
logger.log('info', 'Configuring DNS-01 challenge for ACME via DnsManager (DB providers)');
|
|
880
925
|
const convenientDnsProvider = this.dnsManager.buildAcmeConvenientDnsProvider();
|
|
881
926
|
const dns01Handler = new plugins.smartacme.handlers.Dns01Handler(convenientDnsProvider);
|
|
@@ -977,10 +1022,12 @@ export class DcRouter {
|
|
|
977
1022
|
logger.log('error', 'Error stopping old SmartAcme', { error: String(err) })
|
|
978
1023
|
);
|
|
979
1024
|
}
|
|
1025
|
+
// Safe non-null: challengeHandlers.length > 0 implies both dnsManager
|
|
1026
|
+
// and acmeConfig exist (enforced above).
|
|
980
1027
|
this.smartAcme = new plugins.smartacme.SmartAcme({
|
|
981
|
-
accountEmail:
|
|
1028
|
+
accountEmail: dbAcme!.accountEmail,
|
|
982
1029
|
certManager: new StorageBackedCertManager(),
|
|
983
|
-
environment: 'production',
|
|
1030
|
+
environment: dbAcme!.useProduction ? 'production' : 'integration',
|
|
984
1031
|
challengeHandlers: challengeHandlers,
|
|
985
1032
|
challengePriority: ['dns-01'],
|
|
986
1033
|
});
|
|
@@ -1745,7 +1792,8 @@ export class DcRouter {
|
|
|
1745
1792
|
logger.log('info', `Registered ${allRecords.length} DNS records (${authoritativeRecords.length} authoritative, ${emailDnsRecords.length} email, ${dkimRecords.length} DKIM, ${this.options.dnsRecords?.length || 0} user-defined)`);
|
|
1746
1793
|
}
|
|
1747
1794
|
|
|
1748
|
-
// Hand the DnsServer to DnsManager so DB-backed
|
|
1795
|
+
// Hand the DnsServer to DnsManager so DB-backed local records on
|
|
1796
|
+
// dcrouter-hosted domains get registered too.
|
|
1749
1797
|
if (this.dnsManager && this.dnsServer) {
|
|
1750
1798
|
await this.dnsManager.attachDnsServer(this.dnsServer);
|
|
1751
1799
|
}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import * as plugins from '../../plugins.js';
|
|
2
|
+
import { DcRouterDb } from '../classes.dcrouter-db.js';
|
|
3
|
+
|
|
4
|
+
const getDb = () => DcRouterDb.getInstance().getDb();
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Singleton ACME configuration document. One row per dcrouter instance,
|
|
8
|
+
* keyed on the fixed `configId = 'acme-config'` following the
|
|
9
|
+
* `VpnServerKeysDoc` pattern.
|
|
10
|
+
*
|
|
11
|
+
* Replaces the legacy `tls.contactEmail` and `smartProxyConfig.acme.*`
|
|
12
|
+
* constructor fields. Managed via the OpsServer UI at
|
|
13
|
+
* **Domains > Certificates > Settings**.
|
|
14
|
+
*/
|
|
15
|
+
@plugins.smartdata.Collection(() => getDb())
|
|
16
|
+
export class AcmeConfigDoc extends plugins.smartdata.SmartDataDbDoc<AcmeConfigDoc, AcmeConfigDoc> {
|
|
17
|
+
@plugins.smartdata.unI()
|
|
18
|
+
@plugins.smartdata.svDb()
|
|
19
|
+
public configId: string = 'acme-config';
|
|
20
|
+
|
|
21
|
+
@plugins.smartdata.svDb()
|
|
22
|
+
public accountEmail: string = '';
|
|
23
|
+
|
|
24
|
+
@plugins.smartdata.svDb()
|
|
25
|
+
public enabled: boolean = true;
|
|
26
|
+
|
|
27
|
+
@plugins.smartdata.svDb()
|
|
28
|
+
public useProduction: boolean = true;
|
|
29
|
+
|
|
30
|
+
@plugins.smartdata.svDb()
|
|
31
|
+
public autoRenew: boolean = true;
|
|
32
|
+
|
|
33
|
+
@plugins.smartdata.svDb()
|
|
34
|
+
public renewThresholdDays: number = 30;
|
|
35
|
+
|
|
36
|
+
@plugins.smartdata.svDb()
|
|
37
|
+
public updatedAt: number = 0;
|
|
38
|
+
|
|
39
|
+
@plugins.smartdata.svDb()
|
|
40
|
+
public updatedBy: string = '';
|
|
41
|
+
|
|
42
|
+
constructor() {
|
|
43
|
+
super();
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
public static async load(): Promise<AcmeConfigDoc | null> {
|
|
47
|
+
return await AcmeConfigDoc.getInstance({ configId: 'acme-config' });
|
|
48
|
+
}
|
|
49
|
+
}
|
package/ts/db/documents/index.ts
CHANGED
|
@@ -30,3 +30,6 @@ export * from './classes.accounting-session.doc.js';
|
|
|
30
30
|
export * from './classes.dns-provider.doc.js';
|
|
31
31
|
export * from './classes.domain.doc.js';
|
|
32
32
|
export * from './classes.dns-record.doc.js';
|
|
33
|
+
|
|
34
|
+
// ACME configuration (singleton)
|
|
35
|
+
export * from './classes.acme-config.doc.js';
|