roster-server 2.1.26 → 2.1.28

package/index.js

@@ -392,7 +392,7 @@ class Roster {
             };
             if (shouldCombineWildcard) {
                 const dns01 = { ...this.dnsChallenge };
-                if (dns01.propagationDelay === undefined) dns01.propagationDelay = 120000;
+                if (dns01.propagationDelay === undefined) dns01.propagationDelay = 60000;
                 if (dns01.autoContinue === undefined) dns01.autoContinue = false;
                 if (dns01.dryRunDelay === undefined) dns01.dryRunDelay = dns01.propagationDelay;
                 primarySite.challenges = { 'dns-01': dns01 };
@@ -408,7 +408,7 @@ class Roster {
                 const wildcardSubject = `*.${domain}`;
                 const dns01 = { ...this.dnsChallenge };
                 if (dns01.propagationDelay === undefined) {
-                    dns01.propagationDelay = 120000; // 120s default for manual DNS (acme-dns-01-cli)
+                    dns01.propagationDelay = 60000; // 120s default for manual DNS (acme-dns-01-cli)
                 }
                 if (dns01.autoContinue === undefined) {
                     dns01.autoContinue = false;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "roster-server",
-    "version": "2.1.26",
+    "version": "2.1.28",
     "description": "👾 RosterServer - A domain host router to host multiple HTTPS.",
     "main": "index.js",
     "scripts": {

package/vendor/acme-dns-01-cli-wrapper.js

@@ -44,7 +44,7 @@ module.exports.create = function create(config = {}) {
     const challenger = legacyCli.create(config);
     const propagationDelay = Number.isFinite(config.propagationDelay)
         ? config.propagationDelay
-        : 120000;
+        : 60000;
     const envAutoContinue = process.env.ROSTER_DNS_AUTO_CONTINUE;
     const parseAutoContinue = (value, fallback) => {
         if (value === undefined || value === null || value === '') return fallback;
@@ -81,6 +81,11 @@ module.exports.create = function create(config = {}) {
         : Number.isFinite(Number(process.env.ROSTER_DNS_POLL_TIMEOUT_MS))
             ? Number(process.env.ROSTER_DNS_POLL_TIMEOUT_MS)
             : null;
+    const dryRunPollTimeoutMs = Number.isFinite(config.dryRunPollTimeoutMs)
+        ? config.dryRunPollTimeoutMs
+        : Number.isFinite(Number(process.env.ROSTER_DNS_DRYRUN_POLL_TIMEOUT_MS))
+            ? Number(process.env.ROSTER_DNS_DRYRUN_POLL_TIMEOUT_MS)
+            : null;
 
     function sleep(ms) {
         return new Promise((resolve) => setTimeout(resolve, ms));
@@ -111,10 +116,9 @@ module.exports.create = function create(config = {}) {
 
     async function waitForDnsTxtPropagation(dnsHost, expectedToken, timeoutMs) {
         const started = Date.now();
-        const maxWait = Math.max(0, Number.isFinite(timeoutMs) ? timeoutMs : 0);
-        if (maxWait === 0) return hasDnsTxtToken(dnsHost, expectedToken);
-
-        while ((Date.now() - started) <= maxWait) {
+        const hasFiniteTimeout = Number.isFinite(timeoutMs) && timeoutMs >= 0;
+        const maxWait = hasFiniteTimeout ? timeoutMs : null;
+        while (maxWait === null || (Date.now() - started) <= maxWait) {
             if (await hasDnsTxtToken(dnsHost, expectedToken)) return true;
             await sleep(Math.max(1000, dnsPollIntervalMs));
         }
@@ -142,7 +146,9 @@ module.exports.create = function create(config = {}) {
         const effectiveDelay = isDryRunChallenge
             ? Math.max(0, dryRunDelay)
             : propagationDelay;
-        const effectiveTimeoutMs = dnsPollTimeoutMs === null ? effectiveDelay : dnsPollTimeoutMs;
+        const effectiveTimeoutMs = isDryRunChallenge
+            ? dryRunPollTimeoutMs
+            : (dnsPollTimeoutMs === null ? effectiveDelay : dnsPollTimeoutMs);
         const expectedToken = resolveExpectedToken(opts, ch);
 
         log.info('DNS-01 ' + altname);
@@ -152,7 +158,7 @@ module.exports.create = function create(config = {}) {
                 'DNS verification enabled. Continuing automatically when TXT appears at ' +
                 dnsHost +
                 ' (timeout ' +
-                effectiveTimeoutMs +
+                (effectiveTimeoutMs === null ? 'infinite' : effectiveTimeoutMs) +
                 'ms, poll ' +
                 dnsPollIntervalMs +
                 'ms).'
@@ -163,7 +169,7 @@ module.exports.create = function create(config = {}) {
                 return null;
             }
             log.warn(
-                `DNS TXT not detected for ${dnsHost} within ${effectiveTimeoutMs}ms; ` +
+                `DNS TXT not detected for ${dnsHost} within ${effectiveTimeoutMs}; ` +
                 'continuing anyway (ACME preflight may still fail).'
             );
             return null;