caa 9.0.3 → 9.2.0

package/dist/index.d.ts

@@ -0,0 +1,11 @@
+type CaaOpts = {
+    ignoreTLDs?: boolean;
+    recursions?: number;
+    retries?: number;
+    port?: number;
+    servers?: string[];
+    dnsSocket?: any;
+};
+export declare function caa(name: any, opts?: CaaOpts): Promise<any>;
+export declare function caaMatches(name: any, ca: any, opts?: {}): Promise<any>;
+export {};

package/dist/index.js

@@ -0,0 +1,126 @@
+import { getServers } from "node:dns";
+import { promisify } from "node:util";
+import dnsSocket from "dns-socket";
+import tlds from "tlds";
+const defaults = {
+  ignoreTLDs: false,
+  recursions: 50,
+  retries: 12,
+  port: 53,
+  servers: ["8.8.8.8", "8.8.4.4"],
+  // these are only used as fallback to system's servers
+  dnsSocket: void 0
+};
+const tldSet = new Set(tlds);
+const isTLD = (name) => tldSet.has(name);
+const isWildcard = (name) => /\*/.test(name);
+const parent = (name) => name.split(".").splice(1).join(".");
+const selectServer = (servers, retries, tries) => servers[(tries - retries) % servers.length];
+function normalizeName(name = "") {
+  name = name.toLowerCase();
+  return name.endsWith(".") && name.length > 1 ? name.substring(0, name.length - 1) : name;
+}
+const resolve = async ({ name, query, servers, port, recursions, retries, tries, ignoreTLDs }) => {
+  var _a, _b, _c, _d, _e;
+  name = normalizeName(name);
+  if (!name)
+    return [];
+  if (ignoreTLDs && isTLD(name))
+    return [];
+  if (recursions <= 0 || retries <= 0)
+    return [];
+  name = name.replace(/^\*\./, "");
+  let res;
+  try {
+    res = await query({ questions: [{ name, type: "CAA" }] }, port, selectServer(servers, retries, tries));
+  } catch {
+    if (retries <= 0)
+      return [];
+    retries -= 1;
+    return await resolve({ name, query, servers, port, recursions, retries, tries, ignoreTLDs });
+  }
+  if (!res || !res.answers && !["NXDOMAIN", "NOERROR"].includes(res.rcode)) {
+    if (retries <= 0)
+      return [];
+    retries -= 1;
+    return await resolve({ name, query, servers, port, recursions, retries, tries, ignoreTLDs });
+  }
+  const records = {};
+  if ((_a = res == null ? void 0 : res.answers) == null ? void 0 : _a.length) {
+    for (const { name: name2, type, data } of res.answers || {}) {
+      if (!name2 || !type || !data)
+        continue;
+      if (!records[type])
+        records[type] = [];
+      records[type].push({ name: name2, data });
+    }
+  }
+  if ((_b = records.CAA) == null ? void 0 : _b.length) {
+    const caas = records.CAA.filter((record) => record.name === name).map((record) => record.data);
+    if (caas.length)
+      return caas;
+  }
+  let alias;
+  if ((_c = records.CNAME) == null ? void 0 : _c.length) {
+    const dest = records.CNAME.find((record) => record.name === name);
+    alias = dest.data;
+  } else if ((_d = records.DNAME) == null ? void 0 : _d.length) {
+    const dest = records.DNAME.find((record) => record.name === name);
+    alias = name.replace(dest.name, dest.data);
+  }
+  if (alias && ((_e = records.CAA) == null ? void 0 : _e.length)) {
+    return records.CAA.filter((record) => record.name === alias && record.data).map((record) => record.data);
+  }
+  if (!isTLD(name)) {
+    recursions -= 1;
+    return await resolve({ name: parent(name), query, servers, port, recursions, retries, tries, ignoreTLDs });
+  } else {
+    return [];
+  }
+};
+async function caa(name, opts = {}) {
+  if (typeof name !== "string")
+    throw new Error(`Expected a string for 'name', got ${name}`);
+  name = normalizeName(name);
+  if (!opts.servers) {
+    const systemServers = getServers();
+    opts.servers = (systemServers == null ? void 0 : systemServers.length) ? systemServers : defaults.servers;
+  }
+  opts = { ...defaults, ...opts };
+  const socket = opts.dnsSocket || dnsSocket();
+  const query = promisify(socket.query.bind(socket));
+  const caa2 = await resolve({
+    name,
+    query,
+    servers: opts.servers,
+    port: opts.port,
+    recursions: opts.recursions,
+    retries: opts.retries,
+    tries: opts.retries,
+    ignoreTLDs: opts.ignoreTLDs
+  });
+  if (!opts.dnsSocket)
+    socket.destroy();
+  return caa2 || [];
+}
+async function caaMatches(name, ca, opts = {}) {
+  if (typeof name !== "string")
+    throw new Error(`Expected a string for 'name', got ${name}`);
+  if (typeof ca !== "string")
+    throw new Error(`Expected a string for 'ca', got ${ca}`);
+  name = normalizeName(name);
+  ca = normalizeName(ca);
+  const caas = await caa(name, opts);
+  if (!caas.length)
+    return true;
+  const issueNames = caas.filter((caa2) => (caa2 == null ? void 0 : caa2.tag) === "issue").map((name2) => normalizeName(name2.value.split(";")[0].trim()));
+  const issueWildNames = caas.filter((caa2) => (caa2 == null ? void 0 : caa2.tag) === "issuewild").map((name2) => normalizeName(name2.value.split(";")[0].trim()));
+  const names = isWildcard(name) ? issueWildNames.length ? issueWildNames : issueNames : issueNames;
+  if (names.includes(";"))
+    return false;
+  return !names.length || names.includes(ca);
+}
+export {
+  caa,
+  caaMatches
+};

package/package.json

@@ -1,28 +1,38 @@
 {
   "name": "caa",
-  "version": "9.0.3",
+  "version": "9.2.0",
   "description": "rfc6844-conform CAA record lookup and validation",
   "author": "silverwind <me@silverwind.io>",
   "repository": "silverwind/caa",
   "license": "BSD-2-Clause",
   "type": "module",
-  "exports": "./index.js",
+  "sideEffects": false,
+  "main": "./dist/index.js",
+  "exports": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "files": [
+    "dist"
+  ],
   "engines": {
     "node": ">=18"
   },
-  "files": [
-    "index.js"
-  ],
   "dependencies": {
     "dns-socket": "^4.2.2",
     "tlds": "^1.252.0"
   },
   "devDependencies": {
+    "@babel/eslint-parser": "7.24.5",
+    "@babel/plugin-syntax-import-assertions": "7.24.1",
+    "@types/node": "20.12.12",
     "eslint": "8.57.0",
-    "eslint-config-silverwind": "83.0.2",
-    "updates": "16.0.1",
-    "versions": "12.0.1",
-    "vitest": "1.5.0",
-    "vitest-config-silverwind": "8.0.4"
+    "eslint-config-silverwind": "85.1.3",
+    "eslint-config-silverwind-typescript": "3.2.5",
+    "typescript-config-silverwind": "4.3.1",
+    "updates": "16.1.1",
+    "versions": "12.0.2",
+    "vite": "5.2.11",
+    "vite-plugin-dts": "3.9.1",
+    "vitest": "1.6.0",
+    "vitest-config-silverwind": "9.0.6"
   }
 }

package/index.js

@@ -1,140 +0,0 @@
-import {getServers} from "node:dns";
-import {promisify} from "node:util";
-import dnsSocket from "dns-socket";
-import tlds from "tlds";
-
-const defaults = {
-  ignoreTLDs: false,
-  recursions: 50,
-  retries: 12,
-  port: 53,
-  servers: ["8.8.8.8", "8.8.4.4"], // these are only used as fallback to system's servers
-  dnsSocket: undefined,
-};
-
-const tldSet = new Set(tlds);
-const isTLD = name => tldSet.has(name);
-const isWildcard = name => /\*/.test(name);
-const parent = name => name.split(".").splice(1).join(".");
-const selectServer = (servers, retries, tries) => servers[(tries - retries) % servers.length];
-
-function normalizeName(name = "") {
-  name = name.toLowerCase();
-  return (name.endsWith(".") && name.length > 1) ? name.substring(0, name.length - 1) : name;
-}
-
-// resolve a CAA record, possibly via recursion
-const resolve = async ({name, query, servers, port, recursions, retries, tries, ignoreTLDs}) => {
-  name = normalizeName(name);
-  if (!name) return [];
-  if (ignoreTLDs && isTLD(name)) return [];
-  if (recursions <= 0 || retries <= 0) return [];
-
-  // Given a request for a specific domain X, or a request for a wildcard
-  // domain *.X, the relevant record set R(X) is determined ...
-  name = name.replace(/^\*\./, "");
-
-  let res;
-  try {
-    res = await query({questions: [{name, type: "CAA"}]}, port, selectServer(servers, retries, tries));
-  } catch {
-    if (retries <= 0) return [];
-    retries -= 1;
-    return await resolve({name, query, servers, port, recursions, retries, tries, ignoreTLDs});
-  }
-
-  if (!res || (!res.answers && !["NXDOMAIN", "NOERROR"].includes(res.rcode))) {
-    if (retries <= 0) return [];
-    retries -= 1;
-    return await resolve({name, query, servers, port, recursions, retries, tries, ignoreTLDs});
-  }
-
-  // parse DNS answers to {type: [{name, data}]}
-  const records = {};
-  if (res?.answers?.length) {
-    for (const {name, type, data} of res.answers || {}) {
-      if (!name || !type || !data) continue;
-      if (!records[type]) records[type] = [];
-      records[type].push({name, data});
-    }
-  }
-
-  // If CAA(X) is not empty, R(X) = CAA (X)
-  if (records.CAA?.length) {
-    const caas = records.CAA.filter(record => record.name === name).map(record => record.data);
-    if (caas.length) return caas;
-  }
-
-  let alias;
-  if (records.CNAME?.length) {
-    const dest = records.CNAME.find(record => record.name === name);
-    alias = dest.data;
-  } else if (records.DNAME?.length) {
-    const dest = records.DNAME.find(record => record.name === name);
-    alias = name.replace(dest.name, dest.data);
-  }
-
-  // If A(X) is not null, and CAA(A(X)) is not empty, then R(X) = CAA(A(X)), otherwise
-  if (alias && records.CAA?.length) {
-    return records.CAA.filter(record => record.name === alias && record.data).map(record => record.data);
-  }
-
-  // If X is not a top-level domain, then R(X) = R(P(X)
-  if (!isTLD(name)) {
-    recursions -= 1;
-    return await resolve({name: parent(name), query, servers, port, recursions, retries, tries, ignoreTLDs});
-  } else {
-    return [];
-  }
-};
-
-export async function caa(name, opts = {}) {
-  if (typeof name !== "string") throw new Error(`Expected a string for 'name', got ${name}`);
-  name = normalizeName(name);
-
-  if (!opts.servers) {
-    const systemServers = getServers();
-    opts.servers = systemServers?.length ? systemServers : defaults.servers;
-  }
-
-  opts = {...defaults, ...opts};
-
-  const socket = opts.dnsSocket || dnsSocket();
-  const query = promisify(socket.query.bind(socket));
-
-  const caa = await resolve({
-    name, query,
-    servers: opts.servers,
-    port: opts.port,
-    recursions: opts.recursions,
-    retries: opts.retries,
-    tries: opts.retries,
-    ignoreTLDs: opts.ignoreTLDs,
-  });
-
-  if (!opts.dnsSocket) socket.destroy();
-  return caa || [];
-}
-
-export async function caaMatches(name, ca, opts = {}) {
-  if (typeof name !== "string") throw new Error(`Expected a string for 'name', got ${name}`);
-  if (typeof ca !== "string") throw new Error(`Expected a string for 'ca', got ${ca}`);
-
-  name = normalizeName(name);
-  ca = normalizeName(ca);
-
-  const caas = await caa(name, opts);
-  if (!caas.length) return true;
-
-  const issueNames = caas
-    .filter(caa => caa?.tag === "issue")
-    .map(name => normalizeName(name.value.split(";")[0].trim()));
-  const issueWildNames = caas
-    .filter(caa => caa?.tag === "issuewild")
-    .map(name => normalizeName(name.value.split(";")[0].trim()));
-
-  const names = isWildcard(name) ? (issueWildNames.length ? issueWildNames : issueNames) : issueNames;
-
-  if (names.includes(";")) return false;
-  return !names.length || names.includes(ca);
-}