@k03mad/dns-leak 1.1.0 → 1.2.0

package/.github/workflows/eslint.yml

@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install NodeJS
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
 

package/app/api/IPLeak.js

@@ -3,6 +3,7 @@ import {customAlphabet} from 'nanoid';
 import {lowercase, numbers} from 'nanoid-dictionary';
 
 import {sleep} from '../helpers/promise.js';
+import * as spinner from '../helpers/spinner.js';
 
 /** */
 export default class IPLeak {
@@ -93,15 +94,25 @@ export default class IPLeak {
     /**
      * @param {object} [opts]
      * @param {string} [opts.session]
+     * @param {boolean} [opts.isSpinnerEnabled]
      * @returns {Promise<object>}
      */
-    async getDnsInfoMulti({session = this._dnsSessionString} = {}) {
-        const arrayFromLen = Array.from({length: this._dnsRequestsCount});
+    async getDnsInfoMulti({isSpinnerEnabled, session = this._dnsSessionString} = {}) {
+        const spinnerName = 'dnsReq';
+        const arrayFromLen = Array.from({length: this._dnsRequestsCount - 1});
 
-        await Promise.all(arrayFromLen.map(() => this.getDnsInfoOnce({session})));
-        await sleep(this._dnsRequestsWaitBeforeLastMs);
+        spinner.start(spinnerName, isSpinnerEnabled);
+
+        await Promise.all(arrayFromLen.map(async () => {
+            await this.getDnsInfoOnce({session});
+            spinner.count(spinnerName, this._dnsRequestsCount);
+        }));
 
+        spinner.text(spinnerName, 'Wait for last request');
+        await sleep(this._dnsRequestsWaitBeforeLastMs);
         const info = await this.getDnsInfoOnce({session});
+
+        spinner.stop(spinnerName);
         return info;
     }
 

package/app/helpers/log.js

@@ -1,14 +1,5 @@
-import chalk from 'chalk';
-
-const {bgBlackBright, magenta} = chalk;
-
 /**
  * @param {any} msg
  */
 // eslint-disable-next-line no-console
-export const log = (...msg) => console.log(...msg);
-
-/**
- * @param {any} header
- */
-export const logHeader = header => log(`\n${bgBlackBright(magenta(` ${header} `))}\n`);
+export const log = (...msg) => msg.forEach(elem => console.log(elem));

package/app/helpers/spinner.js

@@ -0,0 +1,49 @@
+import ora from 'ora';
+
+import {bar} from './text.js';
+
+export const spinner = {};
+
+/**
+ * @param {string} name
+ * @param {boolean} active
+ */
+export const start = (name, active) => {
+    if (active) {
+        spinner[name] = {
+            instance: ora().start(),
+            counter: 0,
+        };
+
+        return spinner[name].instance;
+    }
+
+    spinner[name] = {instance: {stop: () => ''}};
+};
+
+/**
+ * @param {string} name
+ * @param {string} msg
+ */
+export const text = (name, msg) => {
+    spinner[name].instance.text = bar(msg);
+};
+
+/**
+ * @param {string} name
+ * @param {number} total
+ */
+export const count = (name, total) => {
+    spinner[name].counter++;
+
+    const len = `${String(spinner[name].counter).padStart(String(total).length, '0')}/${total}`;
+    const percent = `${String((spinner[name].counter * 100 / total).toFixed(0)).padStart(2, '0')}%`;
+    text(name, `${len} [${percent}]`);
+};
+
+/**
+ * @param {string} name
+ */
+export const stop = name => {
+    spinner[name].instance.stop();
+};

package/app/helpers/{ip.js → text.js}

@@ -3,7 +3,17 @@
 import chalk from 'chalk';
 import clm from 'country-locale-map';
 
-const {blue, green} = chalk;
+const {bgBlackBright, blue, green, magenta, yellow} = chalk;
+
+/**
+ * @param {any} msg
+ */
+export const header = msg => bgBlackBright(magenta(` ${msg} `));
+
+/**
+ * @param {any} msg
+ */
+export const bar = msg => yellow(msg);
 
 /**
  * @param {object} [ipInfo]

package/app/index.js

@@ -1,22 +1,37 @@
 #!/usr/bin/env node
 
 import IPLeak from './api/IPLeak.js';
-import {formatIpInfo} from './helpers/ip.js';
-import {log, logHeader} from './helpers/log.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 currentIpInfo = await api.getIpInfo();
 
-logHeader('IP');
-log(formatIpInfo(currentIpInfo));
-logHeader('DNS');
+log(
+    '',
+    header('IP'),
+    '',
+    formatIpInfo(currentIpInfo),
+    '',
+    header('DNS'),
+    '',
+);
 
-const dnsInfo = await api.getDnsInfoMulti();
+const dnsInfo = await api.getDnsInfoMulti({isSpinnerEnabled: true});
 const dnsIps = [...new Set(Object.keys(dnsInfo.ip))];
 
-const dnsData = await Promise.all(dnsIps.map(ip => api.getIpInfo({ip})));
+spinner.start(currentIpInfo.ip, true);
+
+const dnsData = await Promise.all(dnsIps.map(async ip => {
+    const data = await api.getIpInfo({ip});
+    spinner.count(currentIpInfo.ip, dnsIps.length);
+    return data;
+}));
+
+spinner.stop(currentIpInfo.ip);
 
 dnsData
     .sort((a, b) => a?.ip?.localeCompare(b?.ip))
-    .forEach(data => log(formatIpInfo(data), '\n'));
+    .forEach(data => log(formatIpInfo(data), ''));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k03mad/dns-leak",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "DNS leak test",
   "maintainers": [
     "Kirill Molchanov <k03.mad@gmail.com"
@@ -18,7 +18,8 @@
     "chalk": "5.3.0",
     "country-locale-map": "1.8.15",
     "nanoid": "5.0.2",
-    "nanoid-dictionary": "5.0.0-beta.1"
+    "nanoid-dictionary": "5.0.0-beta.1",
+    "ora": "7.0.1"
   },
   "devDependencies": {
     "@k03mad/eslint-config": "13.3.1",