rdapper 0.10.1 → 0.10.3

package/dist/index.js

@@ -316,10 +316,33 @@ const PRIVACY_NAME_KEYWORDS = [
 	"withheld",
 	"not disclosed",
 	"protected",
-	"protection"
+	"protection",
+	"privado",
+	"datos privados",
+	"data protected",
+	"data redacted",
+	"gdpr redacted",
+	"gdpr masked",
+	"non-public data",
+	"statutory masking",
+	"redacted.forprivacy",
+	"registration private",
+	"hidden upon user request",
+	"not available from registry"
+];
+const NO_DATA_VALUES = [
+	"-",
+	".",
+	"n/a",
+	"na",
+	"no data",
+	"not available",
+	"not applicable",
+	"none"
 ];
 function isPrivacyName(value) {
-	const v = value.toLowerCase();
+	const v = value.toLowerCase().trim();
+	if (NO_DATA_VALUES.includes(v)) return true;
 	return PRIVACY_NAME_KEYWORDS.some((k) => v.includes(k));
 }
 
@@ -547,14 +570,25 @@ function parseVcard(vcardArray) {
 //#endregion
 //#region src/whois/client.ts
 /**
+* Some WHOIS servers default to non-English responses. This mapping allows automatic
+* query transformation to request English-only output for easier parsing.
+*
+* To add new servers: Add an entry with the hostname and transformation function:
+*   "whois.example.org": (query) => `${query}/english`,
+*/
+const WHOIS_QUERY_TRANSFORMERS = { "whois.jprs.jp": (query) => `${query}/e` };
+/**
 * Perform a WHOIS query against an RFC 3912 server over TCP 43.
 * Returns the raw text and the server used.
 */
 async function whoisQuery(server, query, options) {
 	const timeoutMs = options?.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+	const port = 43;
+	const host = server.replace(/^whois:\/\//i, "");
+	const transformer = WHOIS_QUERY_TRANSFORMERS[host];
 	return {
 		serverQueried: server,
-		text: await withTimeout(queryTcp(server.replace(/^whois:\/\//i, ""), 43, query, options), timeoutMs, "WHOIS timeout")
+		text: await withTimeout(queryTcp(host, port, transformer ? transformer(query) : query, options), timeoutMs, "WHOIS timeout")
 	};
 }
 async function queryTcp(host, port, query, options) {
@@ -834,6 +868,8 @@ const WHOIS_AVAILABLE_PATTERNS = [
 	/\bdomain status[:\s]+available\b/i,
 	/\bobject does not exist\b/i,
 	/\bthe queried object does not exist\b/i,
+	/\bqueried object does not exist\b/i,
+	/\breturned 0 objects\b/i,
 	/\bstatus:\s*free\b/i,
 	/\bstatus:\s*available\b/i,
 	/\bno object found\b/i,
@@ -856,52 +892,73 @@ function normalizeWhois(domain, tld, whoisText, whoisServer, includeRaw = false)
 	const creationDate = anyValue(map, [
 		"creation date",
 		"created on",
+		"created",
 		"registered on",
+		"registered",
+		"registration date",
 		"domain registration date",
 		"domain create date",
-		"created",
-		"registered",
 		"domain name commencement date",
 		"registration time",
 		"domain record activated",
+		"domain registered",
+		"registered date",
 		"assigned"
 	]);
 	const updatedDate = anyValue(map, [
 		"updated date",
+		"updated",
 		"last updated",
+		"last updated on",
 		"last update",
+		"last-update",
 		"last modified",
 		"modified",
+		"changed",
+		"modification date",
 		"domain record last updated"
 	]);
 	const expirationDate = anyValue(map, [
 		"registry expiry date",
 		"registry expiration date",
-		"expiry date",
-		"expiration date",
-		"expire date",
-		"expiration time",
 		"registrar registration expiration date",
 		"registrar registration expiry date",
 		"registrar expiration date",
 		"registrar expiry date",
-		"domain expires",
-		"paid-till",
+		"expiry date",
+		"expiration date",
+		"expiry",
+		"expire date",
+		"expire",
+		"expired",
 		"expires on",
 		"expires",
-		"expire",
+		"expiration time",
+		"domain expires",
+		"paid-till",
 		"renewal date",
-		"validity"
+		"validity",
+		"record will expire on"
 	]);
 	const registrar = (() => {
 		const name = anyValue(map, [
 			"registrar",
+			"registrar name",
+			"registrar organization",
+			"registrar organization name",
 			"sponsoring registrar",
-			"registrar name"
+			"organisation",
+			"record maintained by"
+		]);
+		const ianaId = anyValue(map, [
+			"registrar iana id",
+			"sponsoring registrar iana id",
+			"iana id"
 		]);
-		const ianaId = anyValue(map, ["registrar iana id", "iana id"]);
 		const url = anyValue(map, [
 			"registrar url",
+			"registrar website",
+			"registrar web",
 			"url of the registrar",
 			"referrer"
 		]);
@@ -916,7 +973,7 @@ function normalizeWhois(domain, tld, whoisText, whoisServer, includeRaw = false)
 			phone: abusePhone || void 0
 		};
 	})();
-	const statusLines = map["domain status"] || map.status || [];
+	const statusLines = map["domain status"] || map.status || map.flags || map.state || map["registration status"] || map.eppstatus || [];
 	const statuses = statusLines.length ? statusLines.map((line) => ({
 		status: line.split(/\s+/)[0],
 		raw: line
@@ -925,7 +982,18 @@ function normalizeWhois(domain, tld, whoisText, whoisServer, includeRaw = false)
 		...map["name server"] || [],
 		...map.nameserver || [],
 		...map["name servers"] || [],
-		...map.nserver || []
+		...map.nserver || [],
+		...map["name server information"] || [],
+		...map.dns || [],
+		...map.hostname || [],
+		...map["domain nameservers"] || [],
+		...map["domain servers in listed order"] || [],
+		...map["domain servers"] || [],
+		...map["name servers dns"] || [],
+		...map["ns 1"] || [],
+		...map["ns 2"] || [],
+		...map["ns 3"] || [],
+		...map["ns 4"] || []
 	];
 	const nameservers = nsLines.length ? uniq(nsLines.map((line) => line.trim()).filter(Boolean).map((line) => {
 		const parts = line.split(/\s+/);
@@ -984,57 +1052,71 @@ function collectContacts(map) {
 	const roles = [
 		{
 			role: "registrant",
-			prefix: "registrant"
+			prefixes: [
+				"registrant",
+				"owner",
+				"holder"
+			]
 		},
 		{
 			role: "admin",
-			prefix: "admin"
+			prefixes: ["admin", "administrative"]
 		},
 		{
 			role: "tech",
-			prefix: "tech"
+			prefixes: ["tech", "technical"]
 		},
 		{
 			role: "billing",
-			prefix: "billing"
+			prefixes: ["billing"]
 		},
 		{
 			role: "abuse",
-			prefix: "abuse"
+			prefixes: ["abuse"]
 		}
 	];
 	const contacts = [];
 	for (const r of roles) {
-		const name = anyValue(map, [
-			`${r.prefix} name`,
-			`${r.prefix} contact name`,
-			`${r.prefix}`
-		]);
-		const org = anyValue(map, [`${r.prefix} organization`, `${r.prefix} org`]);
-		const email = anyValue(map, [
-			`${r.prefix} email`,
-			`${r.prefix} contact email`,
-			`${r.prefix} e-mail`
-		]);
-		const phone = anyValue(map, [
-			`${r.prefix} phone`,
-			`${r.prefix} contact phone`,
-			`${r.prefix} telephone`
-		]);
-		const fax = anyValue(map, [`${r.prefix} fax`, `${r.prefix} facsimile`]);
-		const street = multi(map, [`${r.prefix} street`, `${r.prefix} address`]);
-		const city = anyValue(map, [`${r.prefix} city`]);
-		const state = anyValue(map, [
-			`${r.prefix} state`,
-			`${r.prefix} province`,
-			`${r.prefix} state/province`
-		]);
-		const postalCode = anyValue(map, [
-			`${r.prefix} postal code`,
-			`${r.prefix} postcode`,
-			`${r.prefix} zip`
-		]);
-		const country = anyValue(map, [`${r.prefix} country`]);
+		const nameKeys = [];
+		const orgKeys = [];
+		const emailKeys = [];
+		const phoneKeys = [];
+		const faxKeys = [];
+		const streetKeys = [];
+		const cityKeys = [];
+		const stateKeys = [];
+		const postalCodeKeys = [];
+		const countryKeys = [];
+		for (const prefix of r.prefixes) {
+			nameKeys.push(`${prefix} name`, `${prefix} contact name`, `${prefix}`);
+			if (prefix === "registrant") nameKeys.push("registrant person");
+			if (prefix === "owner") nameKeys.push("owner name");
+			orgKeys.push(`${prefix} organization`, `${prefix} organisation`, `${prefix} org`);
+			if (prefix === "registrant") {
+				orgKeys.push("trading as");
+				orgKeys.push("org");
+			}
+			if (prefix === "owner") orgKeys.push("owner orgname");
+			emailKeys.push(`${prefix} email`, `${prefix} contact email`, `${prefix} e-mail`);
+			phoneKeys.push(`${prefix} phone`, `${prefix} contact phone`, `${prefix} telephone`);
+			faxKeys.push(`${prefix} fax`, `${prefix} facsimile`);
+			streetKeys.push(`${prefix} street`, `${prefix} address`, `${prefix}'s address`);
+			if (prefix === "owner") streetKeys.push("owner addr");
+			cityKeys.push(`${prefix} city`);
+			stateKeys.push(`${prefix} state`, `${prefix} province`, `${prefix} state/province`);
+			postalCodeKeys.push(`${prefix} postal code`, `${prefix} postcode`, `${prefix} zip`);
+			countryKeys.push(`${prefix} country`);
+		}
+		const name = anyValue(map, nameKeys);
+		const org = anyValue(map, orgKeys);
+		const email = anyValue(map, emailKeys);
+		const phone = anyValue(map, phoneKeys);
+		const fax = anyValue(map, faxKeys);
+		const street = multi(map, streetKeys);
+		const city = anyValue(map, cityKeys);
+		const state = anyValue(map, stateKeys);
+		const postalCode = anyValue(map, postalCodeKeys);
+		const country = anyValue(map, countryKeys);
 		if (name || org || email || phone || street?.length) contacts.push({
 			type: r.role,
 			name: name || void 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rdapper",
-  "version": "0.10.1",
+  "version": "0.10.3",
   "license": "MIT",
   "description": "🎩 RDAP/WHOIS fetcher, parser, and normalizer for Node",
   "repository": {