From b45fdf9088c428e75d3eb95f03df53a6b5e7959a Mon Sep 17 00:00:00 2001 From: Jess Date: Mon, 24 Mar 2025 12:24:41 -0400 Subject: [PATCH 1/3] Fix anonymous function syntax in forEach calls Added parens to arguments of anonymous functions in `forEach()` calls --- dnsconfig.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dnsconfig.js b/dnsconfig.js index 91edf7fe..1bc65392 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -12,7 +12,7 @@ function getDomainsList(filesPath) { var result = []; var files = glob.apply(null, [filesPath, true, '.json']); - files.forEach(file => { + files.forEach((file) => { try { const basename = file.split('/').pop(); const name = basename.split('.')[0]; @@ -45,7 +45,7 @@ function addRecord(domain, record) { } // Process each domain -domains.forEach(domainEntry => { +domains.forEach((domainEntry) => { const domainData = domainEntry.data; let proxyState = proxy.on; // Default to enabled @@ -58,14 +58,14 @@ domains.forEach(domainEntry => { // Handle A records if (domainData.record.A) { - domainData.record.A.forEach(ipAddress => { + domainData.record.A.forEach((ipAddress) => { addRecord(domainData.domain, A(domainData.subdomain, IP(ipAddress), proxyState)); }); } // Handle AAAA records if (domainData.record.AAAA) { - domainData.record.AAAA.forEach(ipv6 => { + domainData.record.AAAA.forEach((ipv6) => { addRecord(domainData.domain, AAAA(domainData.subdomain, ipv6, proxyState)); }); } @@ -77,48 +77,48 @@ domains.forEach(domainEntry => { // Handle MX records if (domainData.record.MX) { - domainData.record.MX.forEach(mx => { + domainData.record.MX.forEach((mx) => { addRecord(domainData.domain, MX(domainData.subdomain, 10, mx + ".")); }); } // Handle NS records if (domainData.record.NS) { - domainData.record.NS.forEach(ns => { + domainData.record.NS.forEach((ns) => { addRecord(domainData.domain, NS(domainData.subdomain, ns + ".")); }); } // Handle TXT records if (domainData.record.TXT) { - domainData.record.TXT.forEach(txt => { + domainData.record.TXT.forEach((txt) => { addRecord(domainData.domain, TXT(domainData.subdomain, txt)); }); } // Handle CAA records if (domainData.record.CAA) { - domainData.record.CAA.forEach(caaRecord => { + domainData.record.CAA.forEach((caaRecord) => { addRecord(domainData.domain, CAA(domainData.subdomain, caaRecord.flags, caaRecord.tag, caaRecord.value)); }); } // Handle SRV records if (domainData.record.SRV) { - domainData.record.SRV.forEach(srvRecord => { + domainData.record.SRV.forEach((srvRecord) => { addRecord(domainData.domain, SRV(domainData.subdomain, srvRecord.priority, srvRecord.weight, srvRecord.port, srvRecord.target + ".")); }); } // Handle PTR records if (domainData.record.PTR) { - domainData.record.PTR.forEach(ptr => { + domainData.record.PTR.forEach((ptr) => { addRecord(domainData.domain, PTR(domainData.subdomain, ptr + ".")); }); } }); // Commit all DNS records for each domain -Object.keys(recordsByDomain).forEach(domainName => { +Object.keys(recordsByDomain).forEach((domainName) => { D(domainName, regNone, providerCf, recordsByDomain[domainName]); }); From 33cb69f10da13eea45e62d07471d626a068ecb90 Mon Sep 17 00:00:00 2001 From: andrewstech Date: Mon, 31 Mar 2025 08:25:59 +0100 Subject: [PATCH 2/3] Update dnsconfig.js --- dnsconfig.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dnsconfig.js b/dnsconfig.js index 1bc65392..91edf7fe 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -12,7 +12,7 @@ function getDomainsList(filesPath) { var result = []; var files = glob.apply(null, [filesPath, true, '.json']); - files.forEach((file) => { + files.forEach(file => { try { const basename = file.split('/').pop(); const name = basename.split('.')[0]; @@ -45,7 +45,7 @@ function addRecord(domain, record) { } // Process each domain -domains.forEach((domainEntry) => { +domains.forEach(domainEntry => { const domainData = domainEntry.data; let proxyState = proxy.on; // Default to enabled @@ -58,14 +58,14 @@ domains.forEach((domainEntry) => { // Handle A records if (domainData.record.A) { - domainData.record.A.forEach((ipAddress) => { + domainData.record.A.forEach(ipAddress => { addRecord(domainData.domain, A(domainData.subdomain, IP(ipAddress), proxyState)); }); } // Handle AAAA records if (domainData.record.AAAA) { - domainData.record.AAAA.forEach((ipv6) => { + domainData.record.AAAA.forEach(ipv6 => { addRecord(domainData.domain, AAAA(domainData.subdomain, ipv6, proxyState)); }); } @@ -77,48 +77,48 @@ domains.forEach((domainEntry) => { // Handle MX records if (domainData.record.MX) { - domainData.record.MX.forEach((mx) => { + domainData.record.MX.forEach(mx => { addRecord(domainData.domain, MX(domainData.subdomain, 10, mx + ".")); }); } // Handle NS records if (domainData.record.NS) { - domainData.record.NS.forEach((ns) => { + domainData.record.NS.forEach(ns => { addRecord(domainData.domain, NS(domainData.subdomain, ns + ".")); }); } // Handle TXT records if (domainData.record.TXT) { - domainData.record.TXT.forEach((txt) => { + domainData.record.TXT.forEach(txt => { addRecord(domainData.domain, TXT(domainData.subdomain, txt)); }); } // Handle CAA records if (domainData.record.CAA) { - domainData.record.CAA.forEach((caaRecord) => { + domainData.record.CAA.forEach(caaRecord => { addRecord(domainData.domain, CAA(domainData.subdomain, caaRecord.flags, caaRecord.tag, caaRecord.value)); }); } // Handle SRV records if (domainData.record.SRV) { - domainData.record.SRV.forEach((srvRecord) => { + domainData.record.SRV.forEach(srvRecord => { addRecord(domainData.domain, SRV(domainData.subdomain, srvRecord.priority, srvRecord.weight, srvRecord.port, srvRecord.target + ".")); }); } // Handle PTR records if (domainData.record.PTR) { - domainData.record.PTR.forEach((ptr) => { + domainData.record.PTR.forEach(ptr => { addRecord(domainData.domain, PTR(domainData.subdomain, ptr + ".")); }); } }); // Commit all DNS records for each domain -Object.keys(recordsByDomain).forEach((domainName) => { +Object.keys(recordsByDomain).forEach(domainName => { D(domainName, regNone, providerCf, recordsByDomain[domainName]); }); From 567ee7f9a96b0771b48511790f643788d58da2ff Mon Sep 17 00:00:00 2001 From: andrewstech Date: Mon, 31 Mar 2025 08:30:36 +0100 Subject: [PATCH 3/3] Update dnsconfig.js --- dnsconfig.js | 188 +++++++++++++++++++++++---------------------------- 1 file changed, 86 insertions(+), 102 deletions(-) diff --git a/dnsconfig.js b/dnsconfig.js index 91edf7fe..c993b1b4 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -1,124 +1,108 @@ -// Setup registrar and DNS provider var regNone = NewRegistrar("none"); var providerCf = DnsProvider(NewDnsProvider("cloudflare")); var proxy = { - on: { "cloudflare_proxy": "on" }, - off: { "cloudflare_proxy": "off" } + off: { cloudflare_proxy: "off" }, + on: { cloudflare_proxy: "on" } }; -// Load all domain configurations from JSON files function getDomainsList(filesPath) { - var result = []; - var files = glob.apply(null, [filesPath, true, '.json']); + var result = []; + var files = glob.apply(null, [filesPath, true, ".json"]); - files.forEach(file => { - try { - const basename = file.split('/').pop(); - const name = basename.split('.')[0]; - const data = require(file); - - // Validate required fields - if (!data.domain || !data.record) { - console.error(`Missing required fields in ${file}`); - return; - } - - result.push({ name, data }); - } catch (error) { - console.error(`Error loading ${file}:`, error); + for (var i = 0; i < files.length; i++) { + var basename = files[i].split("/").reverse()[0]; + var name = basename.split(".")[0]; + + result.push({ name: name, data: require(files[i]) }); } - }); - return result; + return result; } -var domains = getDomainsList('./domains'); -var recordsByDomain = {}; +var domains = getDomainsList("./domains"); -// Helper to add records to a domain entry -function addRecord(domain, record) { - if (!recordsByDomain[domain]) { - recordsByDomain[domain] = []; - } - recordsByDomain[domain].push(record); -} +var commit = {}; -// Process each domain -domains.forEach(domainEntry => { - const domainData = domainEntry.data; - let proxyState = proxy.on; // Default to enabled +for (var idx in domains) { + var domainData = domains[idx].data; + var proxyState = domainData.proxied ? proxy.on : proxy.off; - if (domainData.proxied === false) { - proxyState = proxy.off; + if (!commit[domainData.domain]) commit[domainData.domain] = []; + + var owner = domainData.owner; + var ownerInfo = owner ? (owner.username ? owner.username : '') + ' ' + (owner.email ? '<' + owner.email + '>' : '') : ''; + + console.log("Configuring domain: " + domainData.subdomain + "." + domainData.domain + ", Owner: " + ownerInfo); + + if (domainData.records.A) { + for (var a in domainData.records.A) { + commit[domainData.domain].push(A(domainData.subdomain, IP(domainData.records.A[a]), proxyState)); + } + } + + if (domainData.records.AAAA) { + for (var aaaa in domainData.records.AAAA) { + commit[domainData.domain].push(AAAA(domainData.subdomain, domainData.records.AAAA[aaaa], proxyState)); + } + } + + if (domainData.records.CNAME) { + commit[domainData.domain].push(CNAME(domainData.subdomain, domainData.records.CNAME + ".", proxyState)); + } + + if (domainData.records.MX) { + for (var mx in domainData.records.MX) { + commit[domainData.domain].push(MX(domainData.subdomain, domainData.records.MX[mx].priority, domainData.records.MX[mx].value + ".")); + } + } + + if (domainData.records.NS) { + for (var ns in domainData.records.NS) { + commit[domainData.domain].push(NS(domainData.subdomain, domainData.records.NS[ns] + ".")); + } + } + + if (domainData.records.TXT) { + for (var txt in domainData.records.TXT) { + if (domainData.records.TXT[txt].name === "@") { + commit[domainData.domain].push(TXT(domainData.subdomain, domainData.records.TXT[txt].value)); + } else if (domainData.subdomain === "@") { + commit[domainData.domain].push(TXT(domainData.records.TXT[txt].name, domainData.records.TXT[txt].value)); + } else { + commit[domainData.domain].push(TXT(domainData.records.TXT[txt].name + "." + domainData.subdomain, domainData.records.TXT[txt].value)); + } + } + } + + if (domainData.records.CAA) { + for (var caa in domainData.records.CAA) { + var caaRecord = domainData.records.CAA[caa]; + commit[domainData.domain].push( + CAA(domainData.subdomain, caaRecord.flags, caaRecord.tag, caaRecord.value) + ); + } } - // Initialize records array for this domain - recordsByDomain[domainData.domain] = recordsByDomain[domainData.domain] || []; - - // Handle A records - if (domainData.record.A) { - domainData.record.A.forEach(ipAddress => { - addRecord(domainData.domain, A(domainData.subdomain, IP(ipAddress), proxyState)); - }); - } - - // Handle AAAA records - if (domainData.record.AAAA) { - domainData.record.AAAA.forEach(ipv6 => { - addRecord(domainData.domain, AAAA(domainData.subdomain, ipv6, proxyState)); - }); - } - - // Handle CNAME records - if (domainData.record.CNAME) { - addRecord(domainData.domain, CNAME(domainData.subdomain, domainData.record.CNAME + ".", proxyState)); - } - - // Handle MX records - if (domainData.record.MX) { - domainData.record.MX.forEach(mx => { - addRecord(domainData.domain, MX(domainData.subdomain, 10, mx + ".")); - }); - } - - // Handle NS records - if (domainData.record.NS) { - domainData.record.NS.forEach(ns => { - addRecord(domainData.domain, NS(domainData.subdomain, ns + ".")); - }); - } - - // Handle TXT records - if (domainData.record.TXT) { - domainData.record.TXT.forEach(txt => { - addRecord(domainData.domain, TXT(domainData.subdomain, txt)); - }); - } - - // Handle CAA records - if (domainData.record.CAA) { - domainData.record.CAA.forEach(caaRecord => { - addRecord(domainData.domain, CAA(domainData.subdomain, caaRecord.flags, caaRecord.tag, caaRecord.value)); - }); - } - - // Handle SRV records - if (domainData.record.SRV) { - domainData.record.SRV.forEach(srvRecord => { - addRecord(domainData.domain, SRV(domainData.subdomain, srvRecord.priority, srvRecord.weight, srvRecord.port, srvRecord.target + ".")); - }); + if (domainData.records.SRV) { + for (var srv in domainData.records.SRV) { + var srvRecord = domainData.records.SRV[srv]; + commit[domainData.domain].push( + SRV(domainData.subdomain, srvRecord.priority, srvRecord.weight, srvRecord.port, srvRecord.target + ".") + ); + } } // Handle PTR records - if (domainData.record.PTR) { - domainData.record.PTR.forEach(ptr => { - addRecord(domainData.domain, PTR(domainData.subdomain, ptr + ".")); - }); + if (domainData.records.PTR) { + for (var ptr in domainData.records.PTR) { + commit[domainData.domain].push( + PTR(domainData.subdomain, domainData.records.PTR[ptr] + ".") + ); + } } -}); +} -// Commit all DNS records for each domain -Object.keys(recordsByDomain).forEach(domainName => { - D(domainName, regNone, providerCf, recordsByDomain[domainName]); -}); +for (var domainName in commit) { + D(domainName, regNone, providerCf, commit[domainName]); + }