roster-server 2.2.6 → 2.2.8

package/package.json

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

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

@@ -3,6 +3,7 @@
 const legacyCli = require('acme-dns-01-cli');
 const log = require('lemonlog')('acme-dns-01');
 const dns = require('node:dns').promises;
+const { execFileSync } = require('node:child_process');
 let envFileLoadAttempted = false;
 
 function loadEnvFileSafely() {
@@ -115,11 +116,12 @@ module.exports.create = function create(config = {}) {
         ? config.dnsResolvers.map((s) => String(s).trim()).filter(Boolean)
         : parseResolvers(process.env.ROSTER_DNS_RESOLVERS);
     const effectiveResolvers = configuredResolvers.length > 0 ? configuredResolvers : ['1.1.1.1', '8.8.8.8'];
-    const resolverClients = effectiveResolvers.map((server) => {
+    const staticResolverClients = effectiveResolvers.map((server) => {
         const resolver = new dns.Resolver();
         resolver.setServers([server]);
         return { server, resolver };
     });
+    const authoritativeResolverClientsByHost = new Map();
     const normalizeProvider = (value) => String(value || '').trim().toLowerCase();
     const configuredProvider = normalizeProvider(
         config.provider
@@ -149,18 +151,118 @@ module.exports.create = function create(config = {}) {
         return candidate ? String(candidate).trim() : '';
     }
 
+    function zoneCandidatesFromDnsHost(dnsHost) {
+        const normalized = String(dnsHost || '')
+            .replace(/^_acme-challenge\./, '')
+            .replace(/^_greenlock-[^.]+\./, '')
+            .replace(/\.$/, '')
+            .toLowerCase();
+        if (!normalized) return [];
+
+        const labels = normalized.split('.').filter(Boolean);
+        const candidates = [];
+        for (let i = 0; i <= labels.length - 2; i += 1) {
+            candidates.push(labels.slice(i).join('.'));
+        }
+        return candidates;
+    }
+
+    async function resolveAuthoritativeResolverClients(dnsHost) {
+        const cached = authoritativeResolverClientsByHost.get(dnsHost);
+        if (cached) return cached;
+
+        const candidates = zoneCandidatesFromDnsHost(dnsHost);
+        for (const zone of candidates) {
+            let nsRecords = [];
+            try {
+                nsRecords = await dns.resolveNs(zone);
+            } catch {
+                continue;
+            }
+            if (!Array.isArray(nsRecords) || nsRecords.length === 0) continue;
+
+            const clients = [];
+            for (const nsNameRaw of nsRecords) {
+                const nsName = String(nsNameRaw || '').replace(/\.$/, '');
+                if (!nsName) continue;
+                let ips = [];
+                try {
+                    ips = await dns.resolve4(nsName);
+                } catch {}
+                if (ips.length === 0) {
+                    try {
+                        ips = await dns.resolve6(nsName);
+                    } catch {}
+                }
+                for (const ip of ips) {
+                    try {
+                        const resolver = new dns.Resolver();
+                        resolver.setServers([ip]);
+                        clients.push({ server: `${nsName}/${ip}`, resolver });
+                    } catch {}
+                }
+            }
+
+            if (clients.length > 0) {
+                authoritativeResolverClientsByHost.set(dnsHost, clients);
+                return clients;
+            }
+        }
+
+        authoritativeResolverClientsByHost.set(dnsHost, []);
+        return [];
+    }
+
     async function resolveTxtRecords(dnsHost) {
         const records = [];
         const errors = [];
+        const authClients = await resolveAuthoritativeResolverClients(dnsHost);
+        const resolverClients = [...staticResolverClients, ...authClients];
+        const seenServers = new Set();
 
         for (const { server, resolver } of resolverClients) {
-            try {
-                const result = await resolver.resolveTxt(dnsHost);
-                if (Array.isArray(result)) {
-                    records.push(...result);
+            if (seenServers.has(server)) continue;
+            seenServers.add(server);
+
+            // Primary path: query with dig directly (more reliable under Bun).
+            const serverTarget = String(server || '').includes('/') ? String(server).split('/').pop() : String(server || '');
+            let digAttempted = false;
+            if (typeof execFileSync === 'function' && serverTarget) {
+                digAttempted = true;
+                try {
+                    const output = execFileSync('dig', ['+short', 'TXT', dnsHost, `@${serverTarget}`], {
+                        encoding: 'utf8',
+                        stdio: ['ignore', 'pipe', 'ignore'],
+                        timeout: 4000
+                    });
+                    const lines = String(output || '')
+                        .split('\n')
+                        .map((line) => line.trim())
+                        .filter(Boolean);
+                    if (lines.length > 0) {
+                        for (const line of lines) {
+                            const normalized = normalizeTxtChunk(line);
+                            if (normalized) records.push([normalized]);
+                        }
+                    } else {
+                        errors.push(`${server}:ENOTFOUND`);
+                    }
+                    continue;
+                } catch (error) {
+                    errors.push(`${server}:DIG_${error?.code || error?.signal || 'ERROR'}`);
+                }
+            }
+
+            // Fallback path only if dig is unavailable/failed unexpectedly.
+            if (!digAttempted || records.length === 0) {
+                try {
+                    const result = await resolver.resolveTxt(dnsHost);
+                    if (Array.isArray(result)) {
+                        records.push(...result);
+                    }
+                } catch (error) {
+                    errors.push(`${server}:${error?.code || error?.message || error}`);
                 }
-            } catch (error) {
-                errors.push(`${server}:${error?.code || error?.message || error}`);
             }
         }
         return { records, errors };