Merge branch 'main' into main

dnsconfig.js

@@ -111,7 +111,7 @@ for (var subdomain in domains) {
                     subdomainName,
                     tlsaRecord.usage,
                     tlsaRecord.selector,
-                    tlsaRecord.matchingType,
+                    tlsaRecord.matching_type,
                     tlsaRecord.certificate
                 )
             );
@@ -136,6 +136,10 @@ for (var subdomain in domains) {
 
     // Manage service records
     if (data.services) {
+        if (data.services.bluesky) {
+            records.push(TXT("_atproto." + subdomainName, "\"" + data.services.bluesky + "\""));
+        }
+
         if (data.services.discord) {
             if (Array.isArray(data.services.discord)) {
                 for (var txt in data.services.discord) {
@@ -146,20 +150,6 @@ for (var subdomain in domains) {
             }
         }
 
-        if (data.services.vercel) {
-            if (Array.isArray(data.services.vercel)) {
-                for (var txt in data.services.vercel) {
-                    records.push(TXT("_vercel." + subdomainName, "\"" + data.services.vercel[txt] + "\""));
-                }
-            } else {
-                records.push(TXT("_vercel." + subdomainName, "\"" + data.services.vercel + "\""));
-            }
-        }
-
-        if (data.services.bluesky) {
-            records.push(TXT("_atproto." + subdomainName, "\"" + data.services.bluesky + "\""));
-        }
-
         if (data.services.gitlab) {
             if (Array.isArray(data.services.gitlab)) {
                 for (var txt in data.services.gitlab) {
@@ -169,6 +159,16 @@ for (var subdomain in domains) {
                 records.push(TXT("_gitlab-pages-verification-code." + subdomainName, "\"" + data.services.gitlab + "\""));
             }
         }
+
+        if (data.services.vercel) {
+            if (Array.isArray(data.services.vercel)) {
+                for (var txt in data.services.vercel) {
+                    records.push(TXT("_vercel." + subdomainName, "\"" + data.services.vercel[txt] + "\""));
+                }
+            } else {
+                records.push(TXT("_vercel." + subdomainName, "\"" + data.services.vercel + "\""));
+            }
+        }
     }
 }
 

domains/_github-pages-challenge-roxithereal.roxi.json

@@ -0,0 +1,9 @@
+{
+  "owner": {
+    "username": "roxiTheReal",
+    "email": "aetheron.inc@proton.me"
+  },
+  "records": {
+    "TXT": "b4a63d8475ddf68f5f1a907cb04fff"
+  }
+}

domains/roxi.json

@@ -0,0 +1,9 @@
+{
+  "owner": {
+    "username": "roxiTheReal",
+    "email": "aetheron.inc@proton.me"
+  },
+  "records": {
+    "CNAME": "roxiTheReal.github.io"
+  }
+}

domains/tg.json

@@ -4,7 +4,8 @@
     "email": "tothgergoci2@gmail.com"
   },
   "records": {
-    "CNAME": "tggamesyt.github.io"
+    "CNAME": "tggamesyt.github.io",
+    "TXT": "google-site-verification=MqP9uuv-eJnnCBGFcD2xK5ux6S1YZpLm2aySQQNiAWI"
   },
   "proxied": true
 }

tests/records.test.js

@@ -212,8 +212,8 @@ function validateRecordValues(t, data, file) {
                         `${file}: Invalid selector for ${key} at index ${idx}`
                     );
                     t.true(
-                        Number.isInteger(record.matchingType) && record.matchingType >= 0 && record.matchingType <= 255,
+                        Number.isInteger(record.matching_type) && record.matching_type >= 0 && record.matching_type <= 255,
-                        `${file}: Invalid matchingType for ${key} at index ${idx}`
+                        `${file}: Invalid matching_type for ${key} at index ${idx}`
                     );
                     t.true(
                         isValidHexadecimal(record.certificate),

util/raw-api.js

@@ -160,6 +160,9 @@ fs.readdir(directoryPath, function (err, files) {
 
             processedCount++;
             if (processedCount === files.length) {
+                v1.sort((a, b) => a.domain.localeCompare(b.subdomain));
+                v2.sort((a, b) => a.domain.localeCompare(b.subdomain));
+
                 fs.writeFile("raw-api/index.json", JSON.stringify(v1), (err) => {
                     if (err) throw err;
                 });