@serve.zone/dcrouter 13.45.0 → 14.0.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/deno.json +1 -1
- package/dist_ts/00_commitinfo_data.js +2 -2
- package/dist_ts/acme/manager.acme-config.d.ts +1 -14
- package/dist_ts/acme/manager.acme-config.js +4 -65
- package/dist_ts/classes.dcrouter.d.ts +2 -2
- package/dist_ts/classes.dcrouter.js +7 -26
- package/dist_ts/config/classes.api-token-manager.js +3 -3
- package/dist_ts/db/documents/classes.acme-config.doc.d.ts +1 -3
- package/dist_ts/db/documents/classes.acme-config.doc.js +2 -4
- package/dist_ts/dns/manager.dns.d.ts +0 -13
- package/dist_ts/dns/manager.dns.js +1 -81
- package/dist_ts/opsserver/handlers/certificate.handler.d.ts +0 -9
- package/dist_ts/opsserver/handlers/certificate.handler.js +1 -40
- package/dist_ts/opsserver/handlers/config.handler.js +11 -12
- package/dist_ts/opsserver/handlers/email-settings.handler.js +2 -2
- package/dist_ts_interfaces/data/acme-config.d.ts +1 -3
- package/dist_ts_interfaces/requests/certificate.d.ts +0 -12
- package/dist_ts_migrations/index.js +2 -2
- package/dist_ts_web/00_commitinfo_data.js +2 -2
- package/package.json +2 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/acme/manager.acme-config.ts +3 -77
- package/ts/classes.dcrouter.ts +7 -27
- package/ts/config/classes.api-token-manager.ts +2 -2
- package/ts/db/documents/classes.acme-config.doc.ts +1 -3
- package/ts/dns/manager.dns.ts +0 -103
- package/ts/opsserver/handlers/certificate.handler.ts +0 -47
- package/ts/opsserver/handlers/config.handler.ts +10 -11
- package/ts/opsserver/handlers/email-settings.handler.ts +1 -1
- package/ts_web/00_commitinfo_data.ts +1 -1
|
@@ -59,15 +59,15 @@ export class ConfigHandler {
|
|
|
59
59
|
};
|
|
60
60
|
|
|
61
61
|
// --- SmartProxy ---
|
|
62
|
+
const acmeConfig = dcRouter.acmeConfigManager?.getConfig();
|
|
62
63
|
let acmeInfo: interfaces.requests.IConfigData['smartProxy']['acme'] = null;
|
|
63
|
-
if (
|
|
64
|
-
const acme = opts.smartProxyConfig.acme;
|
|
64
|
+
if (acmeConfig) {
|
|
65
65
|
acmeInfo = {
|
|
66
|
-
enabled:
|
|
67
|
-
accountEmail:
|
|
68
|
-
useProduction:
|
|
69
|
-
autoRenew:
|
|
70
|
-
renewThresholdDays:
|
|
66
|
+
enabled: acmeConfig.enabled,
|
|
67
|
+
accountEmail: acmeConfig.accountEmail,
|
|
68
|
+
useProduction: acmeConfig.useProduction,
|
|
69
|
+
autoRenew: acmeConfig.autoRenew,
|
|
70
|
+
renewThresholdDays: acmeConfig.renewThresholdDays,
|
|
71
71
|
};
|
|
72
72
|
}
|
|
73
73
|
|
|
@@ -127,8 +127,7 @@ export class ConfigHandler {
|
|
|
127
127
|
ttl: r.ttl,
|
|
128
128
|
}));
|
|
129
129
|
|
|
130
|
-
// dnsChallenge: true when at least one DnsProviderDoc exists in the DB
|
|
131
|
-
// (replaces the legacy `dnsChallenge.cloudflareApiKey` constructor field).
|
|
130
|
+
// dnsChallenge: true when at least one DnsProviderDoc exists in the DB.
|
|
132
131
|
let dnsChallengeEnabled = false;
|
|
133
132
|
try {
|
|
134
133
|
dnsChallengeEnabled = (await dcRouter.dnsManager?.hasAnyManagedDomain()) ?? false;
|
|
@@ -150,12 +149,12 @@ export class ConfigHandler {
|
|
|
150
149
|
let tlsSource: 'acme' | 'static' | 'none' = 'none';
|
|
151
150
|
if (opts.tls?.certPath && opts.tls?.keyPath) {
|
|
152
151
|
tlsSource = 'static';
|
|
153
|
-
} else if (
|
|
152
|
+
} else if (acmeConfig?.enabled) {
|
|
154
153
|
tlsSource = 'acme';
|
|
155
154
|
}
|
|
156
155
|
|
|
157
156
|
const tls: interfaces.requests.IConfigData['tls'] = {
|
|
158
|
-
contactEmail:
|
|
157
|
+
contactEmail: acmeConfig?.accountEmail || null,
|
|
159
158
|
domain: opts.tls?.domain || null,
|
|
160
159
|
source: tlsSource,
|
|
161
160
|
certPath: opts.tls?.certPath || null,
|