@k03mad/dns-leak 4.2.0 → 5.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,7 +10,7 @@ Using API/tools:\
 ## Global
 
 ```bash
-pnpm i @k03mad/dns-leak -g
+npm i @k03mad/dns-leak -g
 ```
 
 ```bash
@@ -20,7 +20,7 @@ dns-leak
 ## API
 
 ```bash
-pnpm i @k03mad/dns-leak
+npm i @k03mad/dns-leak
 ```
 
 ```js

package/app/api/cloud-ping.js

@@ -26,29 +26,29 @@ export default class CloudPing {
     }
 
     /**
-     * @returns {Promise<string>}
+     * @returns {Promise<object>}
      */
-    async getCurrentIataCode() {
-        const testEndpoint = CloudPing.endpoints.edge();
+    async getAllLocations() {
+        const locationsEndpoint = CloudPing.endpoints.locations();
 
-        const {headers} = await request(testEndpoint, {}, {
+        const {body} = await request(locationsEndpoint, {}, {
             rps: this._requestsRps,
         });
 
-        return headers['x-amz-cf-pop'];
+        return body.nodes;
     }
 
     /**
-     * @returns {Promise<object>}
+     * @returns {Promise<string>}
      */
-    async getAllLocations() {
-        const locationsEndpoint = CloudPing.endpoints.locations();
+    async getCurrentIataCode() {
+        const testEndpoint = CloudPing.endpoints.edge();
 
-        const {body} = await request(locationsEndpoint, {}, {
+        const {headers} = await request(testEndpoint, {}, {
             rps: this._requestsRps,
         });
 
-        return body.nodes;
+        return headers['x-amz-cf-pop'];
     }
 
     /**

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;
     }
 
@@ -37,14 +37,14 @@ export default class IPLeak {
     static get endpoints() {
         return {
 
-            /** @param {string} ip */
-            ip: ip => `https://ipleak.net/json/${ip}`,
-
             /**
              * @param {string} session
              * @param {string} uniq
              */
             dns: (session, uniq) => `https://${session}-${uniq}.ipleak.net/dnsdetection/`,
+
+            /** @param {string} ip */
+            ip: ip => `https://ipleak.net/json/${ip}`,
         };
     }
 
@@ -60,18 +60,26 @@ export default class IPLeak {
 
     /**
      * @param {object} [opts]
-     * @param {string} [opts.ip]
+     * @param {string} [opts.session]
+     * @param {boolean} [opts.isSpinnerEnabled]
      * @returns {Promise<object>}
      */
-    async getIpInfo({ip = ''} = {}) {
-        const ipEndpoint = IPLeak.endpoints.ip(ip);
+    async getDnsInfoMulti({isSpinnerEnabled, session = this._dnsSessionString} = {}) {
+        const spinnerName = 'DNS info';
+        const arrayFromLen = Array.from({length: this._dnsRequestsCount - 1});
 
-        const {body} = await requestCache(ipEndpoint, {}, {
-            expire: this._ipRequestsCacheExpireMs,
-            rps: this._requestsRps,
-        });
+        spinner.start(spinnerName, isSpinnerEnabled);
 
-        return body;
+        await Promise.all(arrayFromLen.map(async () => {
+            await this.getDnsInfoOnce({session});
+            spinner.count(spinnerName, this._dnsRequestsCount);
+        }));
+
+        await sleep(this._dnsRequestsWaitBeforeLastMs);
+        const info = await this.getDnsInfoOnce({session});
+
+        spinner.stop(spinnerName);
+        return info;
     }
 
     /**
@@ -93,26 +101,18 @@ export default class IPLeak {
 
     /**
      * @param {object} [opts]
-     * @param {string} [opts.session]
-     * @param {boolean} [opts.isSpinnerEnabled]
+     * @param {string} [opts.ip]
      * @returns {Promise<object>}
      */
-    async getDnsInfoMulti({isSpinnerEnabled, session = this._dnsSessionString} = {}) {
-        const spinnerName = 'DNS info';
-        const arrayFromLen = Array.from({length: this._dnsRequestsCount - 1});
-
-        spinner.start(spinnerName, isSpinnerEnabled);
-
-        await Promise.all(arrayFromLen.map(async () => {
-            await this.getDnsInfoOnce({session});
-            spinner.count(spinnerName, this._dnsRequestsCount);
-        }));
+    async getIpInfo({ip = ''} = {}) {
+        const ipEndpoint = IPLeak.endpoints.ip(ip);
 
-        await sleep(this._dnsRequestsWaitBeforeLastMs);
-        const info = await this.getDnsInfoOnce({session});
+        const {body} = await requestCache(ipEndpoint, {}, {
+            expire: this._ipRequestsCacheExpireSec,
+            rps: this._requestsRps,
+        });
 
-        spinner.stop(spinnerName);
-        return info;
+        return body;
     }
 
 }

package/app/api/ip-whois.js

@@ -5,14 +5,14 @@ export default class IPWhois {
 
     /**
      * @param {object} [opts]
-     * @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({
-        ipRequestsCacheExpireMs = 3_600_000,
+        ipRequestsCacheExpireSec = 3600,
         requestsRps = 2,
     } = {}) {
-        this._ipRequestsCacheExpireMs = ipRequestsCacheExpireMs;
+        this._ipRequestsCacheExpireSec = ipRequestsCacheExpireSec;
         this._requestsRps = requestsRps;
     }
 
@@ -34,7 +34,7 @@ export default class IPWhois {
         const ipEndpoint = IPWhois.endpoints.ip(ip);
 
         const {body} = await requestCache(ipEndpoint, {}, {
-            expire: this._ipRequestsCacheExpireMs,
+            expire: this._ipRequestsCacheExpireSec,
             rps: this._requestsRps,
         });
 

package/app/api/wander.js

@@ -36,13 +36,13 @@ export default class Wander {
                 rps: this._requestsRps,
             });
 
-            return {name: 'OFF', code: 0, color: red};
+            return {code: 0, color: red, name: 'OFF'};
         } catch (err) {
             if (err.code === 'ESERVFAIL') {
-                return {name: 'ON', code: 1, color: green};
+                return {code: 1, color: green, name: 'ON'};
             }
 
-            return {name: 'unknown', code: -1, color: yellow};
+            return {code: -1, color: yellow, name: 'unknown'};
         }
     }
 

package/app/helpers/spinner.js

@@ -11,8 +11,8 @@ export const spinner = {};
 export const start = (name, active) => {
     if (active) {
         spinner[name] = {
-            instance: ora().start(),
             counter: 0,
+            instance: ora().start(),
         };
 
         return spinner[name].instance;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k03mad/dns-leak",
-  "version": "4.2.0",
+  "version": "5.0.0",
   "description": "DNS leak test",
   "maintainers": [
     "Kirill Molchanov <k03.mad@gmail.com"
@@ -19,7 +19,7 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@k03mad/request": "5.4.0",
+    "@k03mad/request": "5.4.1",
     "chalk": "5.3.0",
     "country-locale-map": "1.9.0",
     "nanoid": "5.0.4",
@@ -27,17 +27,17 @@
     "ora": "8.0.1"
   },
   "devDependencies": {
-    "@k03mad/eslint-config": "17.14.0",
+    "@k03mad/eslint-config": "18.1.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"
   }
 }