1.0.15

npmextra.json

@@ -3,10 +3,10 @@
     "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
-      "gitscope": "pushrocks",
+      "gitscope": "push.rocks",
       "gitrepo": "smartwhois",
       "description": "a package for dealing with whois requests",
-      "npmPackagename": "@pushrocks/smartwhois",
+      "npmPackagename": "@push.rocks/smartwhois",
       "license": "MIT",
       "projectDomain": "push.rocks"
     }

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@pushrocks/smartwhois",
-  "version": "1.0.5",
+  "name": "@push.rocks/smartwhois",
+  "version": "1.0.15",
   "private": false,
   "description": "a package for dealing with whois requests",
   "main": "dist_ts/index.js",
@@ -10,19 +10,20 @@
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/ --web)",
-    "build": "(tsbuild --web --allowimplicitany)",
-    "buildDocs": "(tsdoc)"
+    "build": "(tsbuild --web --allowimplicitany)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.65",
-    "@gitzone/tsbundle": "^2.0.7",
-    "@gitzone/tsdoc": "^1.1.12",
-    "@gitzone/tsrun": "^1.2.39",
-    "@gitzone/tstest": "^1.0.74",
-    "@pushrocks/tapbundle": "^5.0.4",
+    "@git.zone/tsbuild": "^2.1.65",
+    "@git.zone/tsbundle": "^2.0.7",
+    "@git.zone/tsrun": "^1.2.39",
+    "@git.zone/tstest": "^1.0.74",
+    "@push.rocks/tapbundle": "^5.0.4",
     "@types/node": "^18.15.11"
   },
   "dependencies": {
+    "@push.rocks/smartrequest": "^2.0.15",
+    "@push.rocks/smarturl": "^3.0.6",
+    "@tsclass/tsclass": "^4.0.38",
     "tldts": "^6.0.3",
     "whoiser": "^1.16.0"
   },

readme.md

@@ -1,8 +1,8 @@
-# @pushrocks/smartwhois
+# @push.rocks/smartwhois
 a package for dealing with whois requests
 
 ## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartwhois)
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@push.rocks/smartwhois)
 * [gitlab.com (source)](https://gitlab.com/pushrocks/smartwhois)
 * [github.com (source mirror)](https://github.com/pushrocks/smartwhois)
 * [docs (typedoc)](https://pushrocks.gitlab.io/smartwhois/)
@@ -13,14 +13,14 @@ Status Category | Status Badge
 -- | --
 GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/smartwhois/badges/master/pipeline.svg)](https://lossless.cloud)
 GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/smartwhois/badges/master/coverage.svg)](https://lossless.cloud)
-npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/smartwhois)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@push.rocks/smartwhois)](https://lossless.cloud)
 Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/smartwhois)](https://lossless.cloud)
 TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
 node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
 Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
-PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/smartwhois)](https://lossless.cloud)
-PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartwhois)](https://lossless.cloud)
-BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smartwhois)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@push.rocks/smartwhois)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@push.rocks/smartwhois)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@push.rocks/smartwhois)](https://lossless.cloud)
 
 ## Usage
 

test/test.ts

@@ -1,4 +1,4 @@
-import { expect, expectAsync, tap } from '@pushrocks/tapbundle';
+import { expect, expectAsync, tap } from '@push.rocks/tapbundle';
 import * as smartwhois from '../ts/index.js';
 
 let testSmartWhois: smartwhois.SmartWhois;
@@ -6,12 +6,33 @@ let testSmartWhois: smartwhois.SmartWhois;
 tap.test('should create a valid instance of SmartWhois', async () => {
   testSmartWhois = new smartwhois.SmartWhois();
   expect(testSmartWhois).toBeInstanceOf(smartwhois.SmartWhois);
-})
+});
+
+tap.test('should get a parsed url result for whois', async () => {
+  const domainDelegation = await testSmartWhois.getDomainDelegation('https://coffee.link/understanding-gen-z/');
+  console.log(domainDelegation);
+  const parsedUrlResult2 = await testSmartWhois.getDomainDelegation('task.vc');
+  console.log(parsedUrlResult2);
+});
+
+tap.test('should get additional data', async () => {
+  const parsedUrlResult = await testSmartWhois.getAdditionalWhoisDataForDomain('https://coffee.link/understanding-gen-z/');
+  console.log(parsedUrlResult);
+});
 
 tap.test('should get whois info for domain', async () => {
   const whoisInfo = await testSmartWhois.getWhoisForDomain('task.vc');
   console.log(whoisInfo);
 });
+tap.test('should get whois info for domain', async () => {
+  const whoisInfo = await testSmartWhois.getWhoisForDomain('https://lossless.com');
+  console.log(whoisInfo);
+});
+
+tap.test('should get whois info for domain', async () => {
+  const whoisInfo = await testSmartWhois.getWhoisForDomain('https://coffee.link/understanding-gen-z/');
+  console.log(whoisInfo);
+});
 
 tap.test('should check for a valid tld', async () => {
   const comIsValid = await testSmartWhois.isValidTld('.com');

ts/00_commitinfo_data.ts

@@ -2,7 +2,7 @@
  * autocreated commitinfo by @pushrocks/commitinfo
  */
 export const commitinfo = {
-  name: '@pushrocks/smartwhois',
-  version: '1.0.5',
+  name: '@push.rocks/smartwhois',
+  version: '1.0.15',
   description: 'a package for dealing with whois requests'
 }

ts/index.ts

@@ -2,6 +2,22 @@ import * as plugins from './smartwhois.plugins.js';
 
 export interface IWhoisInfo {
   domain: string;
+  isRegistered: boolean;
+  domainStatus: Array<
+    | 'clientTransferProhibited'
+    | 'clientUpdateProhibited'
+    | 'clientDeleteProhibited'
+    | 'clientHold'
+    | 'serverTransferProhibited'
+    | 'serverUpdateProhibited'
+    | 'serverDeleteProhibited'
+    | 'serverHold'
+    | 'inactive'
+    | 'pendingDelete'
+    | 'pendingRenew'
+    | 'pendingTransfer'
+    | 'pendingUpdate'
+    | 'ok'>;
   domainWithoutSuffix: string;
   hostname: string;
   isIcann: boolean;
@@ -9,7 +25,6 @@ export interface IWhoisInfo {
   isPrivate: boolean;
   publicSuffix: string;
   subdomain: string;
-  isRegistered: boolean;
   dnsSec: 'signedDelegation' | 'unsigned';
   originalWhoisInfo: {
     [key: string]: any;
@@ -22,9 +37,54 @@ export interface IWhoisInfo {
   expiryDate: string;
 }
 
-
 export class SmartWhois {
-  public async getWhoisForDomain(domainArg: string) {
+  /**
+   * can be used to prepare an input for the whois command
+   */
+  public async getDomainDelegation(urlArg: string): Promise<plugins.tsclass.network.IDomainDelegation> {
+    if (!urlArg.includes('//')) {
+      urlArg = `https://${urlArg}`;
+    }
+    const smarturlInstance = plugins.smarturl.Smarturl.createFromUrl(urlArg);
+    const tldtsData = plugins.tldts.parse(urlArg);
+    return {
+      fullUrl: smarturlInstance.toString(),
+      fullDomain: smarturlInstance.hostname,
+      domain: tldtsData.domain,
+      publicSuffix: tldtsData.publicSuffix,
+      subdomain: tldtsData.subdomain,
+      domainWithoutSuffix: tldtsData.domainWithoutSuffix,
+      isIcann: tldtsData.isIcann,
+    }
+  }
+
+  public async getAdditionalWhoisDataForDomain(domainArg: string) {
+    if (domainArg.includes('//')) {
+      const parsedUrlResult = await this.getDomainDelegation(domainArg);
+      domainArg = parsedUrlResult.fullDomain;
+    }
+
+    // lets test http response
+    const httpResult = await plugins.smartrequest.safeGet(`http://${domainArg}/`);
+
+    // lets test https response
+    const httpsResult = await plugins.smartrequest.safeGet(`https://${domainArg}/`);
+
+    return {
+      httpStatus: httpResult.statusCode,
+      httpsStatus: httpsResult.statusCode,
+      httpHeaders: httpResult.headers,
+      httpsHeaders: httpsResult.headers,
+    }
+    
+  }
+
+
+  public async getWhoisForDomain(domainArg: string): Promise<IWhoisInfo> {
+    if (domainArg.includes('//')) {
+      const parsedUrlResult = await this.getDomainDelegation(domainArg);
+      domainArg = parsedUrlResult.fullDomain;
+    }
     const whoisInfo = await plugins.whoiser.domain(domainArg);
     const whoisServers = Object.keys(whoisInfo);
     const selectedWhoisInfo: any = whoisInfo[whoisServers[0]];
@@ -39,6 +99,7 @@ export class SmartWhois {
     return {
       ...tldtsData,
       isRegistered: true,
+      domainStatus: selectedWhoisInfo['Domain Status'].map((statusArg: string) => statusArg.split(' ')[0]),
       dnsSec: selectedWhoisInfo['DNSSEC'],
       originalWhoisInfo: whoisInfo,
       whoisServers,

ts/smartwhois.plugins.ts

@@ -1,3 +1,19 @@
+// @tsclass scope
+import * as tsclass from '@tsclass/tsclass';
+
+export {
+  tsclass,
+}
+
+// pushrocks scope
+import * as smarturl from '@push.rocks/smarturl';
+import * as smartrequest from '@push.rocks/smartrequest';
+
+export {
+  smarturl,
+  smartrequest,
+}
+
 // third party
 import * as whoiser from 'whoiser';
 import tldts from 'tldts';