@k03mad/dns-leak 4.2.1 → 6.0.0

package/.github/workflows/lint.yml

@@ -25,9 +25,6 @@ jobs:
         with:
           node-version-file: '.nvmrc'
 
-      - name: Install PNPM
-        run: npm i pnpm -g
-
       - name: Run setup
         run: npm run setup
 

package/README.md

@@ -10,21 +10,9 @@ Using API/tools:\
 ## Global
 
 ```bash
-pnpm i @k03mad/dns-leak -g
+npm i @k03mad/dns-leak -g
 ```
 
 ```bash
 dns-leak
 ```
-
-## API
-
-```bash
-pnpm i @k03mad/dns-leak
-```
-
-```js
-import {CloudPing, IPLeak, IPWhois, NextDNS} from '@k03mad/dns-leak';
-```
-
-Details at [./app/api](/app/api) folder

package/app/api/_index.js

@@ -1,5 +1,4 @@
 export {default as CloudPing} from './cloud-ping.js';
 export {default as IPLeak} from './ip-leak.js';
-export {default as IPWhois} from './ip-whois.js';
 export {default as NextDNS} from './next-dns.js';
 export {default as Wander} from './wander.js';

package/app/api/ip-leak.js

@@ -14,7 +14,7 @@ export default class IPLeak {
      * @param {number} [opts.dnsRequestsWaitBeforeLastMs] dns leak multi requests wait before the last request (with all ips gathered)
      * @param {number} [opts.dnsSessionStringLength] dns leak session string length, only works with 40 characters for now
      * @param {number} [opts.dnsUniqStringLength] dns leak unique string length for subdomain
-     * @param {number} [opts.ipRequestsCacheExpireMs] ip info requests cache ttl ms for same ip
+     * @param {number} [opts.ipRequestsCacheExpireSec] ip info requests cache ttl ms for same ip
      * @param {number} [opts.requestsRps] parallel requests rps
      */
     constructor({
@@ -22,14 +22,14 @@ export default class IPLeak {
         dnsRequestsWaitBeforeLastMs = 2000,
         dnsSessionStringLength = 40,
         dnsUniqStringLength = 20,
-        ipRequestsCacheExpireMs = 3_600_000,
+        ipRequestsCacheExpireSec = 3600,
         requestsRps = 2,
     } = {}) {
         this._dnsRequestsCount = dnsRequestsCount;
         this._dnsRequestsWaitBeforeLastMs = dnsRequestsWaitBeforeLastMs;
         this._dnsSessionStringLength = dnsSessionStringLength;
         this._dnsUniqStringLength = dnsUniqStringLength;
-        this._ipRequestsCacheExpireMs = ipRequestsCacheExpireMs;
+        this._ipRequestsCacheExpireSec = ipRequestsCacheExpireSec;
         this._requestsRps = requestsRps;
     }
 
@@ -108,7 +108,7 @@ export default class IPLeak {
         const ipEndpoint = IPLeak.endpoints.ip(ip);
 
         const {body} = await requestCache(ipEndpoint, {}, {
-            expire: this._ipRequestsCacheExpireMs,
+            expire: this._ipRequestsCacheExpireSec,
             rps: this._requestsRps,
         });
 

package/app/helpers/text.js

@@ -22,7 +22,7 @@ export const info = msg => gray(msg);
 /**
  * @param {string} msg
  */
-export const org = msg => green(msg);
+export const orgIsp = msg => green(msg);
 
 /**
  * @param {string} msg
@@ -31,19 +31,23 @@ export const address = msg => blue(msg);
 
 /**
  * @param {object} [ipInfo]
- * @param {object} [ipInfo.connection]
- * @param {object} [ipInfo.flag]
  * @param {string} [ipInfo.city]
  * @param {string} [ipInfo.country]
+ * @param {string} [ipInfo.emoji]
  * @param {string} [ipInfo.ip]
+ * @param {string} [ipInfo.isp]
+ * @param {string} [ipInfo.ispDomain]
+ * @param {string} [ipInfo.org]
  * @param {string} [ipInfo.region]
  */
 export const formatIpInfo = ({
     city,
-    connection,
     country,
-    flag,
+    emoji,
     ip,
+    isp,
+    ispDomain,
+    org,
     region,
 } = {}) => {
     let output = '';
@@ -52,26 +56,26 @@ export const formatIpInfo = ({
         output += `${address(ip)}\n`;
     }
 
-    if (connection?.org) {
-        output += `${org(connection.org)} `;
+    if (org) {
+        output += `${orgIsp(org)} `;
     }
 
-    if (connection?.isp && !connection?.org?.includes(connection?.isp)) {
-        if (connection?.org) {
-            output += org('/ ');
+    if (isp && !org?.includes(isp)) {
+        if (org) {
+            output += orgIsp('/ ');
         }
 
-        output += `${org(connection.isp)} `;
+        output += `${orgIsp(isp)} `;
     }
 
-    if (connection?.domain) {
-        output += info(`(${connection.domain})`);
+    if (ispDomain) {
+        output += info(`(${ispDomain})`);
     }
 
     output += '\n';
 
-    if (flag?.emoji) {
-        output += `${flag.emoji}  `;
+    if (emoji) {
+        output += `${emoji}  `;
     }
 
     output += [
@@ -95,7 +99,7 @@ export const formatLocationInfo = ({city, country, iata}) => {
     let output = '';
 
     if (iata) {
-        output += `${org(iata)}\n`;
+        output += `${orgIsp(iata)}\n`;
     }
 
     if (country) {

package/app/run.js

@@ -1,20 +1,21 @@
 #!/usr/bin/env node
 
-import {CloudPing, IPLeak, IPWhois, NextDNS, Wander} from './api/_index.js';
+import {ip2geo} from '@k03mad/ip2geo';
+
+import {CloudPing, IPLeak, NextDNS, Wander} from './api/_index.js';
 import {log} from './helpers/log.js';
 import * as spinner from './helpers/spinner.js';
 import {formatIpInfo, formatLocationInfo, header} from './helpers/text.js';
 
 const LeakApi = new IPLeak();
 const NextApi = new NextDNS();
-const WhoisApi = new IPWhois();
 const CloudPingApi = new CloudPing();
 const WanderApi = new Wander();
 
-const [leak, next, whois, location, dnssec] = await Promise.allSettled([
+const [leak, next, geoip, location, dnssec] = await Promise.allSettled([
     LeakApi.getDnsInfoMulti({isSpinnerEnabled: true}),
     NextApi.getTest(),
-    WhoisApi.getIpInfo(),
+    ip2geo(),
     CloudPingApi.getCurrentLocation(),
     WanderApi.checkDNSSEC(),
 ]);
@@ -31,7 +32,7 @@ const dnsIps = [
 
 const dnsIpsInfo = await Promise.all(dnsIps.map(async ip => {
     try {
-        const data = await WhoisApi.getIpInfo({ip});
+        const data = await ip2geo(ip);
         spinner.count(spinnerName, dnsIps.length);
         return data;
     } catch {}
@@ -44,10 +45,10 @@ const dnsIpsInfoFormatted = dnsIpsInfo
 
 const output = [];
 
-if (whois.value) {
+if (geoip.value) {
     output.push(
         header('IP'),
-        formatIpInfo(whois.value),
+        formatIpInfo(geoip.value),
     );
 }
 
@@ -60,7 +61,7 @@ if (dnsIpsInfoFormatted.length > 0) {
 
 if (next.value?.ecs) {
     try {
-        const data = await WhoisApi.getIpInfo({ip: next.value.ecs.replace(/\/.+/, '')});
+        const data = await ip2geo(next.value.ecs.replace(/\/.+/, ''));
         data.ip += ` (${next.value.ecs})`;
 
         output.push(

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "@k03mad/dns-leak",
-  "version": "4.2.1",
+  "version": "6.0.0",
   "description": "DNS leak test",
   "maintainers": [
     "Kirill Molchanov <k03.mad@gmail.com"
   ],
-  "main": "app/api/_index.js",
   "bin": {
     "dns-leak": "app/run.js"
   },
@@ -19,6 +18,7 @@
     "node": ">=20"
   },
   "dependencies": {
+    "@k03mad/ip2geo": "2.1.0",
     "@k03mad/request": "5.4.1",
     "chalk": "5.3.0",
     "country-locale-map": "1.9.0",
@@ -27,17 +27,17 @@
     "ora": "8.0.1"
   },
   "devDependencies": {
-    "@k03mad/eslint-config": "18.0.0",
+    "@k03mad/eslint-config": "19.2.0",
     "eslint": "8.56.0",
     "husky": "8.0.3"
   },
   "scripts": {
-    "lint": "pnpm run lint:eslint",
+    "lint": "npm run lint:eslint",
     "lint:eslint": "eslint ./ --cache",
-    "clean": "pnpm run clean:modules && pnpm run clean:eslint:cache",
+    "clean": "npm run clean:modules && npm run clean:eslint:cache",
     "clean:modules": "rm -rf ./node_modules || true",
     "clean:eslint:cache": "rm -rf .eslintcache || true",
-    "setup": "pnpm run clean && pnpm i",
+    "setup": "npm run clean && npm i",
     "prepare": "husky install || true"
   }
 }

package/app/api/ip-whois.js

@@ -1,44 +0,0 @@
-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.requestsRps] parallel requests rps
-     */
-    constructor({
-        ipRequestsCacheExpireMs = 3_600_000,
-        requestsRps = 2,
-    } = {}) {
-        this._ipRequestsCacheExpireMs = ipRequestsCacheExpireMs;
-        this._requestsRps = requestsRps;
-    }
-
-    /** */
-    static 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 = IPWhois.endpoints.ip(ip);
-
-        const {body} = await requestCache(ipEndpoint, {}, {
-            expire: this._ipRequestsCacheExpireMs,
-            rps: this._requestsRps,
-        });
-
-        return body;
-    }
-
-}