Updated - group more fields to same label

LayeredStudio · Sep 3, 2019 · 8a445e3 · 8a445e3
1 parent 73f4196
commit 8a445e3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "whoiser",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Whois info for TLDs, domains and IPs",
   "keywords": [
     "whois",

diff --git a/parsers.js b/parsers.js
@@ -117,9 +117,13 @@ const parseSimpleWhois = whois => {
 const parseDomainWhois = whois => {
 	const renameLabels = {
 		'domain name':	'Domain Name',
+		'domain':		'Domain Name',
 		'nameserver':	'Name Server',
+		'nameservers':	'Name Server',
 		'nserver':		'Name Server',
-		'name servers':	'Name Server'
+		'name servers':	'Name Server',
+		'flags':		'Domain Status',
+		'status':		'Domain Status'
 	}
 	const ignoreLabels = ['note', 'notes', 'please note', 'important', 'notice', 'terms of use', 'web-based whois', 'https', 'to', 'registration service provider']
 	const ignoreTexts = [
@@ -192,6 +196,7 @@ const parseDomainWhois = whois => {
 
 	// remove invalid Name Servers (not valid hostname)
 	data['Name Server'] = data['Name Server'].map(nameServer => nameServer.split(' ')[0]).filter(isDomain)
+	data['Domain Status'] = data['Domain Status'].filter(status => Boolean(status))
 
 	// remove multiple empty lines
 	text = text.join("\n").trim()

diff --git a/test/test.js b/test/test.js
@@ -100,7 +100,7 @@ describe('Whoiser', function() {
 
 		it('should return WHOIS for "google.eu" when whois data is "label:_EOL_value"', async function() {
 			let whois = await whoiser.domain('google.eu', {follow: 1})
-			assert.equal(whois['whois.eu']['Domain'], 'google.eu', 'Domain name doesn\'t match')
+			assert.equal(whois['whois.eu']['Domain Name'], 'google.eu', 'Domain name doesn\'t match')
 			assert.notStrictEqual(whois['whois.eu']['Name Server'].length, 0, 'Does not return NS')
 		});