@k03mad/dns-leak 3.0.0 → 3.1.0

package/README.md

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

package/app/helpers/log.js

@@ -2,4 +2,4 @@
  * @param {any} msg
  */
 // eslint-disable-next-line no-console
-export const log = (...msg) => msg.forEach(elem => console.log(elem));
+export const log = msg => console.log(msg);

package/app/run.js

@@ -9,7 +9,7 @@ const NextApi = new NextDNS();
 const WhoisApi = new IPWhois();
 const CloudPingApi = new CloudPing();
 
-const [leak, next, whois, location] = await Promise.all([
+const [leak, next, whois, location] = await Promise.allSettled([
     LeakApi.getDnsInfoMulti({isSpinnerEnabled: true}),
     NextApi.getTest(),
     WhoisApi.getIpInfo(),
@@ -19,43 +19,60 @@ const [leak, next, whois, location] = await Promise.all([
 const spinnerName = 'IP info';
 spinner.start(spinnerName, true);
 
-const dnsIps = [...new Set([...Object.keys(leak.ip), next.resolver])];
+const dnsIps = [
+    ...new Set([
+        ...Object.keys(leak.value?.ip || []),
+        next.value?.resolver || '',
+    ]),
+].filter(Boolean);
 
-const dnsData = await Promise.all(dnsIps.map(async ip => {
-    const data = await WhoisApi.getIpInfo({ip});
-    spinner.count(spinnerName, dnsIps.length);
-    return data;
+const dnsIpsInfo = await Promise.all(dnsIps.map(async ip => {
+    try {
+        const data = await WhoisApi.getIpInfo({ip});
+        spinner.count(spinnerName, dnsIps.length);
+        return data;
+    } catch {}
 }));
 
-spinner.stop(spinnerName);
+const dnsIpsInfoFormatted = dnsIpsInfo
+    .filter(Boolean)
+    .sort((a, b) => a?.ip?.localeCompare(b?.ip))
+    .flatMap(data => formatIpInfo(data));
+
+const output = [];
+
+if (whois.value) {
+    output.push(
+        header('IP'),
+        formatIpInfo(whois.value),
+    );
+}
+
+if (dnsIpsInfoFormatted.length > 0) {
+    output.push(
+        header('DNS'),
+        ...dnsIpsInfoFormatted,
+    );
+}
+
+if (next.value?.ecs) {
+    try {
+        const data = await WhoisApi.getIpInfo({ip: next.value.ecs.replace(/\/.+/, '')});
+        data.ip += ` (${next.value.ecs})`;
 
-log(
-    '',
-    header('IP'),
-    '',
-    formatIpInfo(whois),
-    '',
-    header('DNS'),
-    '',
-    ...dnsData
-        .sort((a, b) => a?.ip?.localeCompare(b?.ip))
-        .flatMap(data => [formatIpInfo(data), '']),
-);
-
-if (next.ecs) {
-    const data = await WhoisApi.getIpInfo({ip: next.ecs.replace(/\/.+/, '')});
-    data.ip += ` (${next.ecs})`;
-
-    log(
-        header('DNS ECS'),
-        '',
-        formatIpInfo(data),
-        '',
+        output.push(
+            header('DNS ECS'),
+            formatIpInfo(data),
+        );
+    } catch {}
+}
+
+if (location.value) {
+    output.push(
+        header('CLOUDFRONT CDN'),
+        formatLocationInfo(location.value),
     );
 }
 
-log(
-    header('CLOUDFRONT CDN'),
-    '',
-    formatLocationInfo(location),
-);
+spinner.stop(spinnerName);
+log(`\n${output.join('\n\n')}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k03mad/dns-leak",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "DNS leak test",
   "maintainers": [
     "Kirill Molchanov <k03.mad@gmail.com"