@k03mad/dns-leak 1.2.0 → 2.0.0

package/README.md

@@ -1,6 +1,8 @@
 # DNS leak test
 
-Based on: [ipleak.net](https://ipleak.net/) / [API](https://airvpn.org/forums/topic/14737-api/)
+Based on:\
+— [ipleak.net](https://ipleak.net) ([API](https://airvpn.org/forums/topic/14737-api))\
+— [ipwhois.io](https://ipwhois.io) ([API](https://ipwhois.io/documentation))
 
 ## Global
 
@@ -17,20 +19,21 @@ npm i @k03mad/dns-leak
 ```
 
 ```js
-import IPLeak from '@k03mad/dns-leak';
+import {IPLeak, IPWhois} from '@k03mad/dns-leak';
 
-// default params (details at the link below)
-const api = new IPLeak();
+// default params (details at the ./app/api folder)
+const LeakApi = new IPLeak();
+const WhoisApi = new IPWhois();
 
 // get current external ip info
-await api.getIpInfo();
+await WhoisApi.getIpInfo();
+await LeakApi.getIpInfo();
 // get other ip info
-await api.getIpInfo({ip: '8.8.8.8'});
+await WhoisApi.getIpInfo({ip: '8.8.8.8'});
+await LeakApi.getIpInfo({ip: '8.8.8.8'});
 
 // dns leak check with one request (one request — fewer dns ips)
-await api.getDnsInfoOnce();
+await LeakApi.getDnsInfoOnce();
 // dns leak check with multi requests
-await api.getDnsInfoMulti();
+await LeakApi.getDnsInfoMulti();
 ```
-
-[Options and parameters with their default values](/app/api/IPLeak.js#L8)

package/app/api/IPLeak.js

@@ -9,7 +9,6 @@ import * as spinner from '../helpers/spinner.js';
 export default class IPLeak {
 
     /**
-     * All args are not required, the default ones works fine
      * @param {object} [opts]
      * @param {number} [opts.dnsRequestsCount] dns leak multi requests count with one session
      * @param {number} [opts.dnsRequestsRps] dns leak requests rps

package/app/api/IPWhois.js

@@ -0,0 +1,44 @@
+import {requestCache} from '@k03mad/request';
+
+/** */
+export default class IPWhois {
+
+    /**
+     * @param {object} [opts]
+     * @param {number} [opts.ipRequestsCacheExpireMs] ip info requests cache ttl ms for same ip
+     * @param {number} [opts.ipRequestsRps] ip info requests rps
+     */
+    constructor({
+        ipRequestsCacheExpireMs = 3_600_000,
+        ipRequestsRps = 2,
+    } = {}) {
+        this._ipRequestsCacheExpireMs = ipRequestsCacheExpireMs;
+        this._ipRequestsRps = ipRequestsRps;
+    }
+
+    /** */
+    get _endpoints() {
+        return {
+
+            /** @param {string} ip */
+            ip: ip => `https://ipwho.is/${ip}`,
+        };
+    }
+
+    /**
+     * @param {object} [opts]
+     * @param {string} [opts.ip]
+     * @returns {Promise<object>}
+     */
+    async getIpInfo({ip = ''} = {}) {
+        const ipEndpoint = this._endpoints.ip(ip);
+
+        const {body} = await requestCache(ipEndpoint, {}, {
+            expire: this._ipRequestsCacheExpireMs,
+            rps: this._ipRequestsRps,
+        });
+
+        return body;
+    }
+
+}

package/app/api/index.js

@@ -0,0 +1,2 @@
+export {default as IPLeak} from './IPLeak.js';
+export {default as IPWhois} from './IPWhois.js';

package/app/helpers/text.js

@@ -1,9 +1,6 @@
-/* eslint-disable camelcase */
-
 import chalk from 'chalk';
-import clm from 'country-locale-map';
 
-const {bgBlackBright, blue, green, magenta, yellow} = chalk;
+const {bgBlackBright, blue, gray, green, magenta, yellow} = chalk;
 
 /**
  * @param {any} msg
@@ -17,39 +14,47 @@ export const bar = msg => yellow(msg);
 
 /**
  * @param {object} [ipInfo]
- * @param {string} [ipInfo.city_name]
- * @param {string} [ipInfo.country_code]
- * @param {string} [ipInfo.country_name]
+ * @param {string} [ipInfo.city]
+ * @param {string} [ipInfo.country]
  * @param {string} [ipInfo.ip]
- * @param {string} [ipInfo.isp_name]
- * @param {string} [ipInfo.region_name]
+ * @param {string} [ipInfo.region]
+ * @param {object} [ipInfo.flag]
+ * @param {object} [ipInfo.connection]
  */
-export const formatIpInfo = ({city_name, country_code, country_name, ip, isp_name, region_name} = {}) => {
+export const formatIpInfo = ({city, connection, country, flag, ip, region} = {}) => {
     let output = '';
 
     if (ip) {
-        output += `${blue(ip)} `;
+        output += `${blue(ip)}\n`;
     }
 
-    if (isp_name) {
-        output += green(isp_name);
+    if (connection?.org) {
+        output += `${green(connection.org)} `;
     }
 
-    output += '\n';
+    if (connection?.isp && !connection?.org?.includes(connection?.isp)) {
+        if (connection?.org) {
+            output += green('/ ');
+        }
 
-    if (country_code) {
-        const {emoji} = clm.getCountryByAlpha2(country_code);
+        output += `${green(connection.isp)} `;
+    }
 
-        if (emoji) {
-            output += `${emoji}  `;
-        }
+    if (connection?.domain) {
+        output += gray(`(${connection.domain})`);
+    }
+
+    output += '\n';
+
+    if (flag?.emoji) {
+        output += `${flag.emoji}  `;
     }
 
     output += [
         ...new Set([
-            country_name,
-            region_name,
-            city_name,
+            country,
+            region,
+            city,
         ]),
     ].filter(Boolean).join(' :: ');
 

package/app/{index.js → run.js}

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
-
-import IPLeak from './api/IPLeak.js';
+import {IPLeak, IPWhois} from './api/index.js';
 import {log} from './helpers/log.js';
 import * as spinner from './helpers/spinner.js';
 import {formatIpInfo, header} from './helpers/text.js';
 
-const api = new IPLeak();
+const LeakApi = new IPLeak();
+const WhoisApi = new IPWhois();
 
-const currentIpInfo = await api.getIpInfo();
+const currentIpInfo = await WhoisApi.getIpInfo();
 
 log(
     '',
@@ -19,13 +19,13 @@ log(
     '',
 );
 
-const dnsInfo = await api.getDnsInfoMulti({isSpinnerEnabled: true});
+const dnsInfo = await LeakApi.getDnsInfoMulti({isSpinnerEnabled: true});
 const dnsIps = [...new Set(Object.keys(dnsInfo.ip))];
 
 spinner.start(currentIpInfo.ip, true);
 
 const dnsData = await Promise.all(dnsIps.map(async ip => {
-    const data = await api.getIpInfo({ip});
+    const data = await WhoisApi.getIpInfo({ip});
     spinner.count(currentIpInfo.ip, dnsIps.length);
     return data;
 }));

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@k03mad/dns-leak",
-  "version": "1.2.0",
+  "version": "2.0.0",
   "description": "DNS leak test",
   "maintainers": [
     "Kirill Molchanov <k03.mad@gmail.com"
   ],
-  "main": "app/api/IPLeak.js",
-  "bin": "app/index.js",
+  "main": "app/api/index.js",
+  "bin": "app/run.js",
   "repository": "k03mad/dns-leak",
   "license": "MIT",
   "type": "module",
@@ -16,7 +16,6 @@
   "dependencies": {
     "@k03mad/request": "3.2.0",
     "chalk": "5.3.0",
-    "country-locale-map": "1.8.15",
     "nanoid": "5.0.2",
     "nanoid-dictionary": "5.0.0-beta.1",
     "ora": "7.0.1"