rdapper 0.4.0 → 0.5.0

package/README.md

@@ -35,6 +35,16 @@ await isRegistered("example.com"); // => true
 await isAvailable("likely-unregistered-thing-320485230458.com"); // => false
 ```
 
+Normalize arbitrary input (domain or URL) to its registrable domain (eTLD+1):
+
+```ts
+import { toRegistrableDomain } from "rdapper";
+
+toRegistrableDomain("https://sub.example.co.uk/page"); // => "example.co.uk"
+toRegistrableDomain("spark-public.s3.amazonaws.com");   // => "amazonaws.com" (ICANN-only default)
+toRegistrableDomain("192.168.0.1");                      // => null
+```
+
 ## API
 
 - `lookupDomain(domain, options?) => Promise<LookupResult>`
@@ -123,7 +133,6 @@ interface DomainRecord {
   rawRdap?: unknown;          // raw RDAP JSON (only when options.includeRaw)
   rawWhois?: string;          // raw WHOIS text (only when options.includeRaw)
   source: "rdap" | "whois";   // which path produced data
-  fetchedAt: string;          // ISO 8601 timestamp
   warnings?: string[];
 }
 ```
@@ -139,8 +148,7 @@ interface DomainRecord {
   "statuses": [{ "status": "clientTransferProhibited" }],
   "nameservers": [{ "host": "a.iana-servers.net" }, { "host": "b.iana-servers.net" }],
   "dnssec": { "enabled": true },
-  "source": "rdap",
-  "fetchedAt": "2025-01-01T00:00:00Z"
+  "source": "rdap"
 }
 ```
 
@@ -183,6 +191,7 @@ Project layout:
 - Some TLDs provide no RDAP service; `rdapOnly: true` will fail for them.
 - Registries may throttle or block WHOIS; respect rate limits and usage policies.
 - Field presence depends on source and privacy policies (e.g., redaction/withholding).
+- Public suffix detection uses `tldts` with ICANN‑only defaults (Private section is ignored). If you need behavior closer to `psl` that considers private suffixes, see the `allowPrivateDomains` option in the `tldts` docs (rdapper currently sticks to ICANN‑only by default). See: [tldts migration notes](https://github.com/remusao/tldts#migrating-from-other-libraries).
 
 ## License
 

package/dist/index.d.ts

@@ -88,8 +88,6 @@ interface DomainRecord {
   rawWhois?: string;
   /** Which source produced data */
   source: LookupSource;
-  /** ISO 8601 timestamp at time of lookup */
-  fetchedAt: string;
   /** Warnings generated during lookup */
   warnings?: string[];
 }
@@ -126,6 +124,13 @@ interface LookupResult {
 }
 type FetchLike = (input: RequestInfo | URL, init?: RequestInit) => Promise<Response>;
 //#endregion
+//#region src/lib/domain.d.ts
+/**
+ * Normalize arbitrary input (domain or URL) to its registrable domain (eTLD+1).
+ * Returns null when the input is not a valid ICANN domain (e.g., invalid TLD, IPs).
+ */
+declare function toRegistrableDomain(input: string): string | null;
+//#endregion
 //#region src/index.d.ts
 /**
  * High-level lookup that prefers RDAP and falls back to WHOIS.
@@ -139,4 +144,4 @@ declare function isAvailable(domain: string, opts?: LookupOptions): Promise<bool
  * Performs a lookup and resolves to a boolean. Rejects on lookup error. */
 declare function isRegistered(domain: string, opts?: LookupOptions): Promise<boolean>;
 //#endregion
-export { Contact, DomainRecord, FetchLike, LookupOptions, LookupResult, LookupSource, Nameserver, RegistrarInfo, StatusEvent, isAvailable, isRegistered, lookupDomain };
+export { Contact, DomainRecord, FetchLike, LookupOptions, LookupResult, LookupSource, Nameserver, RegistrarInfo, StatusEvent, isAvailable, isRegistered, lookupDomain, toRegistrableDomain };

package/dist/index.js

@@ -1,94 +1,33 @@
-import psl from "psl";
+import { parse } from "tldts";
 import { createConnection } from "node:net";
 
-//#region src/lib/dates.ts
-function toISO(dateLike) {
-	if (dateLike == null) return void 0;
-	if (dateLike instanceof Date) return toIsoFromDate(dateLike);
-	if (typeof dateLike === "number") return toIsoFromDate(new Date(dateLike));
-	const raw = String(dateLike).trim();
-	if (!raw) return void 0;
-	for (const re of [
-		/^(\d{4})-(\d{2})-(\d{2})[ T](\d{2}):(\d{2}):(\d{2})(?:Z|([+-]\d{2})(?::?(\d{2}))?)?$/,
-		/^(\d{4})\/(\d{2})\/(\d{2})[ T](\d{2}):(\d{2}):(\d{2})(?:Z|([+-]\d{2})(?::?(\d{2}))?)?$/,
-		/^(\d{2})-([A-Za-z]{3})-(\d{4})$/,
-		/^([A-Za-z]{3})\s+(\d{1,2})\s+(\d{4})$/
-	]) {
-		const m = raw.match(re);
-		if (!m) continue;
-		const d = parseDateWithRegex(m, re);
-		if (d) return toIsoFromDate(d);
-	}
-	const native = new Date(raw);
-	if (!Number.isNaN(native.getTime())) return toIsoFromDate(native);
-}
-function toIsoFromDate(d) {
-	try {
-		return new Date(Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate(), d.getUTCHours(), d.getUTCMinutes(), d.getUTCSeconds(), 0)).toISOString().replace(/\.\d{3}Z$/, "Z");
-	} catch {
-		return;
-	}
-}
-function parseDateWithRegex(m, _re) {
-	const monthMap = {
-		jan: 0,
-		feb: 1,
-		mar: 2,
-		apr: 3,
-		may: 4,
-		jun: 5,
-		jul: 6,
-		aug: 7,
-		sep: 8,
-		oct: 9,
-		nov: 10,
-		dec: 11
-	};
-	try {
-		if (m[0].includes(":")) {
-			const [_$1, y, mo, d, hh, mm, ss, offH, offM] = m;
-			let dt = Date.UTC(Number(y), Number(mo) - 1, Number(d), Number(hh), Number(mm), Number(ss));
-			if (offH) {
-				const sign = offH.startsWith("-") ? -1 : 1;
-				const hours = Math.abs(Number(offH));
-				const minutes = offM ? Number(offM) : 0;
-				const offsetMs = sign * (hours * 60 + minutes) * 60 * 1e3;
-				dt -= offsetMs;
-			}
-			return new Date(dt);
-		}
-		if (m[0].includes("-")) {
-			const [_$1, dd$1, monStr$1, yyyy$1] = m;
-			const mon$1 = monthMap[monStr$1.toLowerCase()];
-			return new Date(Date.UTC(Number(yyyy$1), mon$1, Number(dd$1)));
-		}
-		const [_, monStr, dd, yyyy] = m;
-		const mon = monthMap[monStr.toLowerCase()];
-		return new Date(Date.UTC(Number(yyyy), mon, Number(dd)));
-	} catch {}
-}
-
-//#endregion
 //#region src/lib/domain.ts
+/**
+* Parse a domain into its parts.
+*/
 function getDomainParts(domain) {
-	const lower = domain.toLowerCase().trim();
-	let publicSuffix;
-	try {
-		publicSuffix = (psl.parse?.(lower))?.tld;
-	} catch {}
-	if (!publicSuffix) {
-		const parts = lower.split(".").filter(Boolean);
-		publicSuffix = parts.length ? parts[parts.length - 1] : lower;
-	}
-	const labels = publicSuffix.split(".").filter(Boolean);
-	const tld = labels.length ? labels[labels.length - 1] : publicSuffix;
-	return {
-		publicSuffix,
-		tld
-	};
+	return parse(domain);
+}
+/**
+* Basic domain validity check (hostname-like), not performing DNS or RDAP.
+*/
+function isLikelyDomain(value) {
+	const v = (value ?? "").trim();
+	return /^(?=.{1,253}$)(?:(?!-)[a-z0-9-]{1,63}(?<!-)\.)+(?!-)[a-z0-9-]{2,63}(?<!-)$/.test(v.toLowerCase());
 }
-function isLikelyDomain(input) {
-	return /^[a-z0-9.-]+$/i.test(input) && input.includes(".");
+/**
+* Normalize arbitrary input (domain or URL) to its registrable domain (eTLD+1).
+* Returns null when the input is not a valid ICANN domain (e.g., invalid TLD, IPs).
+*/
+function toRegistrableDomain(input) {
+	const raw = (input ?? "").trim();
+	if (raw === "") return null;
+	const result = parse(raw);
+	if (result.isIp) return null;
+	if (!result.isIcann) return null;
+	const domain = result.domain ?? "";
+	if (domain === "") return null;
+	return domain.toLowerCase();
 }
 const WHOIS_AVAILABLE_PATTERNS = [
 	/\bno match\b/i,
@@ -302,6 +241,74 @@ function sameDomain(a, b) {
 	return a.toLowerCase() === b.toLowerCase();
 }
 
+//#endregion
+//#region src/lib/dates.ts
+function toISO(dateLike) {
+	if (dateLike == null) return void 0;
+	if (dateLike instanceof Date) return toIsoFromDate(dateLike);
+	if (typeof dateLike === "number") return toIsoFromDate(new Date(dateLike));
+	const raw = String(dateLike).trim();
+	if (!raw) return void 0;
+	for (const re of [
+		/^(\d{4})-(\d{2})-(\d{2})[ T](\d{2}):(\d{2}):(\d{2})(?:Z|([+-]\d{2})(?::?(\d{2}))?)?$/,
+		/^(\d{4})\/(\d{2})\/(\d{2})[ T](\d{2}):(\d{2}):(\d{2})(?:Z|([+-]\d{2})(?::?(\d{2}))?)?$/,
+		/^(\d{2})-([A-Za-z]{3})-(\d{4})$/,
+		/^([A-Za-z]{3})\s+(\d{1,2})\s+(\d{4})$/
+	]) {
+		const m = raw.match(re);
+		if (!m) continue;
+		const d = parseDateWithRegex(m, re);
+		if (d) return toIsoFromDate(d);
+	}
+	const native = new Date(raw);
+	if (!Number.isNaN(native.getTime())) return toIsoFromDate(native);
+}
+function toIsoFromDate(d) {
+	try {
+		return new Date(Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate(), d.getUTCHours(), d.getUTCMinutes(), d.getUTCSeconds(), 0)).toISOString().replace(/\.\d{3}Z$/, "Z");
+	} catch {
+		return;
+	}
+}
+function parseDateWithRegex(m, _re) {
+	const monthMap = {
+		jan: 0,
+		feb: 1,
+		mar: 2,
+		apr: 3,
+		may: 4,
+		jun: 5,
+		jul: 6,
+		aug: 7,
+		sep: 8,
+		oct: 9,
+		nov: 10,
+		dec: 11
+	};
+	try {
+		if (m[0].includes(":")) {
+			const [_$1, y, mo, d, hh, mm, ss, offH, offM] = m;
+			let dt = Date.UTC(Number(y), Number(mo) - 1, Number(d), Number(hh), Number(mm), Number(ss));
+			if (offH) {
+				const sign = offH.startsWith("-") ? -1 : 1;
+				const hours = Math.abs(Number(offH));
+				const minutes = offM ? Number(offM) : 0;
+				const offsetMs = sign * (hours * 60 + minutes) * 60 * 1e3;
+				dt -= offsetMs;
+			}
+			return new Date(dt);
+		}
+		if (m[0].includes("-")) {
+			const [_$1, dd$1, monStr$1, yyyy$1] = m;
+			const mon$1 = monthMap[monStr$1.toLowerCase()];
+			return new Date(Date.UTC(Number(yyyy$1), mon$1, Number(dd$1)));
+		}
+		const [_, monStr, dd, yyyy] = m;
+		const mon = monthMap[monStr.toLowerCase()];
+		return new Date(Date.UTC(Number(yyyy), mon, Number(dd)));
+	} catch {}
+}
+
 //#endregion
 //#region src/lib/privacy.ts
 const PRIVACY_NAME_KEYWORDS = [
@@ -382,7 +389,7 @@ function asDateLike(value) {
 * Convert RDAP JSON into our normalized DomainRecord.
 * This function is defensive: RDAP servers vary in completeness and field naming.
 */
-function normalizeRdap(inputDomain, tld, rdap, rdapServersTried, fetchedAtISO, includeRaw = false) {
+function normalizeRdap(inputDomain, tld, rdap, rdapServersTried, includeRaw = false) {
 	const doc = rdap ?? {};
 	const ldhName = asString(doc.ldhName) || asString(doc.handle);
 	const unicodeName = asString(doc.unicodeName);
@@ -450,7 +457,6 @@ function normalizeRdap(inputDomain, tld, rdap, rdapServersTried, fetchedAtISO, i
 		rawRdap: includeRaw ? rdap : void 0,
 		rawWhois: void 0,
 		source: "rdap",
-		fetchedAt: fetchedAtISO,
 		warnings: void 0
 	};
 }
@@ -737,7 +743,7 @@ function normalizeServer(server) {
 * Convert raw WHOIS text into our normalized DomainRecord.
 * Heuristics cover many gTLD and ccTLD formats; exact fields vary per registry.
 */
-function normalizeWhois(domain, tld, whoisText, whoisServer, fetchedAtISO, includeRaw = false) {
+function normalizeWhois(domain, tld, whoisText, whoisServer, includeRaw = false) {
 	const map = parseKeyValueLines(whoisText);
 	const creationDate = anyValue(map, [
 		"creation date",
@@ -848,7 +854,6 @@ function normalizeWhois(domain, tld, whoisText, whoisServer, fetchedAtISO, inclu
 		rawRdap: void 0,
 		rawWhois: includeRaw ? whoisText : void 0,
 		source: "whois",
-		fetchedAt: fetchedAtISO,
 		warnings: void 0
 	};
 }
@@ -979,8 +984,11 @@ async function lookupDomain(domain, opts) {
 			ok: false,
 			error: "Input does not look like a domain"
 		};
-		const { publicSuffix, tld } = getDomainParts(domain);
-		const now = toISO(/* @__PURE__ */ new Date()) ?? (/* @__PURE__ */ new Date()).toISOString().replace(/\.\d{3}Z$/, "Z");
+		const { publicSuffix: tld } = getDomainParts(domain);
+		if (!tld) return {
+			ok: false,
+			error: "Invalid TLD"
+		};
 		if (!opts?.whoisOnly) {
 			const bases = await getRdapBaseUrlsForTld(tld, opts);
 			const tried = [];
@@ -991,7 +999,7 @@ async function lookupDomain(domain, opts) {
 					const rdapEnriched = await fetchAndMergeRdapRelated(domain, json, opts);
 					return {
 						ok: true,
-						record: normalizeRdap(domain, tld, rdapEnriched.merged, [...tried, ...rdapEnriched.serversTried], now, !!opts?.includeRaw)
+						record: normalizeRdap(domain, tld, rdapEnriched.merged, [...tried, ...rdapEnriched.serversTried], !!opts?.includeRaw)
 					};
 				} catch {}
 			}
@@ -1011,22 +1019,9 @@ async function lookupDomain(domain, opts) {
 			};
 		}
 		const res = await followWhoisReferrals(whoisServer, domain, opts);
-		if (publicSuffix.includes(".") && /no match|not found/i.test(res.text) && opts?.followWhoisReferral !== false) {
-			const candidates = [];
-			const ps = publicSuffix.toLowerCase();
-			const exception = WHOIS_TLD_EXCEPTIONS[ps];
-			if (exception) candidates.push(exception);
-			for (const server of candidates) try {
-				const alt = await whoisQuery(server, domain, opts);
-				if (alt.text && !/error/i.test(alt.text)) return {
-					ok: true,
-					record: normalizeWhois(domain, tld, alt.text, alt.serverQueried, now, !!opts?.includeRaw)
-				};
-			} catch {}
-		}
 		return {
 			ok: true,
-			record: normalizeWhois(domain, tld, res.text, res.serverQueried, now, !!opts?.includeRaw)
+			record: normalizeWhois(domain, tld, res.text, res.serverQueried, !!opts?.includeRaw)
 		};
 	} catch (err) {
 		return {
@@ -1051,4 +1046,4 @@ async function isRegistered(domain, opts) {
 }
 
 //#endregion
-export { isAvailable, isRegistered, lookupDomain };
+export { isAvailable, isRegistered, lookupDomain, toRegistrableDomain };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rdapper",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "license": "MIT",
   "description": "🎩 RDAP/WHOIS fetcher, parser, and normalizer for Node",
   "repository": {
@@ -39,14 +39,13 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "psl": "1.15.0"
+    "tldts": "7.0.17"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.2.4",
-    "@types/node": "24.5.2",
-    "@types/psl": "1.1.3",
-    "tsdown": "0.15.5",
-    "typescript": "5.9.2",
+    "@biomejs/biome": "2.2.5",
+    "@types/node": "24.7.1",
+    "tsdown": "0.15.6",
+    "typescript": "5.9.3",
     "vitest": "^3.2.4"
   },
   "engines": {