upgraded deps, switched requests timeout to AbortSignal.timeout()

.github/workflows/build.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 18.x]
+        node-version: [16.x, 18.x, 20.x]
     steps:
     - uses: actions/checkout@v2
     - name: Run tests with ${{ matrix.node-version }}

.github/workflows/publish.yml

@@ -9,7 +9,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 16
+          node-version: 18
       - run: npm i -g npm@latest
       - run: npm ci
       - run: npm ddp

README.md

@@ -446,7 +446,13 @@ const Client = require('spreadable').Client;
 })();
 ```
 
-In both cases the network is closed, but not completely secure. If we use http protocol the data transferred is not encrypted. In some cases this is a suitable option, otherwise you need to use https.
+## Ban system
+
+By default, nodes are configured to check each other's behavior. And if a node commits malicious actions for a significant time, then it will be banned by others for some time, depending on the severity of the crime. This system is not perfect, since it is not completely free from undeserved bans rerated to problems with the Internet provider, DNS cache, etc. Therefore, if you notice that some of your servers have stopped working with others, then first of all check the banlists and remove it if you are sure that these are technical problems. Access to these actions occurs through terminal commands. You should pause the server and run the necessary commands, for example: 
+
+``` spreadable -a getBanlist --no-s ```
+
+``` spreadable -a emptyBanlist --no-s ```
 
 ## Versioning
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "spreadable",
-  "version": "0.2.28",
+  "version": "0.2.29",
   "description": "Decentralized network mechanism",
   "bin": {
     "spreadable": "./bin/index.js"
@@ -76,8 +76,7 @@
     "lokijs": "^1.5.10",
     "ms": "^2.1.3",
     "node-fetch": "^2.6.0",
-    "qiao-get-ip": "^0.2.5",
-    "sharp": "^0.30.7",
+    "sharp": "^0.33.2",
     "signal-exit": "^3.0.3",
     "tcp-port-used": "^1.0.2",
     "text-to-svg": "^3.1.5",

src/approval/transports/captcha/index.js

@@ -109,8 +109,9 @@ module.exports = (Parent) => {
       for(let i = 0; i < approvers.length; i++) {
         const address = approvers[i];
         const count = Math.floor(length / (approvers.length - i));
-        const from = String(answer).substr(this.captchaLength - length, count).toLowerCase();
-        const to = String(approver.answer).substr(0, count).toLowerCase();
+        const cLength = this.captchaLength - length;
+        const from = String(answer).slice(cLength, cLength + count).toLowerCase();
+        const to = String(approver.answer).slice(0, count).toLowerCase();
 
         if(address == this.node.address) {
           return from === to;

src/client.js

@@ -284,7 +284,7 @@ module.exports = (Parent) => {
      * Make a group request
      * 
      * @async
-     * @param {aray} arr 
+     * @param {array} arr 
      * @param {string} action
      * @param {object} [options]
      * @returns {object}
@@ -354,12 +354,17 @@ module.exports = (Parent) => {
         options.headers['content-type'] = 'application/json';
         options.body = JSON.stringify(body);
       } 
+
+      if(options.timeout && !options.signal) {
+        options.signal = AbortSignal.timeout(options.timeout);
+      }
 
       options.url = this.createRequestUrl(endpoint, options);
       const start = Date.now();
+      let response = {};
 
       try {        
-        const response = await fetch(options.url, options);    
+        response = await fetch(options.url, options);    
         this.logger.info(`Request to "${options.url}": ${ms(Date.now() - start)}`);
 
         if(response.ok) {
@@ -380,8 +385,10 @@ module.exports = (Parent) => {
         throw new errors.WorkError(body.message, body.code);
       }
       catch(err) {
+        options.timeout && err.type == 'aborted' && (err.type = 'request-timeout');        
         //eslint-disable-next-line no-ex-assign
         utils.isRequestTimeoutError(err) && (err = utils.createRequestTimeoutError());
+        err.response = response;
         err.requestOptions = options;
         throw err;
       }

src/node.js

@@ -1217,6 +1217,10 @@ module.exports = (Parent) => {
         options.headers['content-type'] = 'application/json';
         options.body = Object.keys(body).length? JSON.stringify(body): undefined;
       }
+
+      if(options.timeout && !options.signal) {
+        options.signal = AbortSignal.timeout(options.timeout);
+      }
 
       const start = Date.now();  
       let response = {};
@@ -1242,7 +1246,8 @@ module.exports = (Parent) => {
 
         throw new errors.WorkError(body.message, body.code);
       }
-      catch(err) {        
+      catch(err) {
+        options.timeout && err.type == 'aborted' && (err.type = 'request-timeout'); 
         //eslint-disable-next-line no-ex-assign
         utils.isRequestTimeoutError(err) && (err = utils.createRequestTimeoutError());
         err.response = response;
@@ -1314,7 +1319,7 @@ module.exports = (Parent) => {
      * Group request to the node
      * 
      * @async
-     * @param {aray} arr 
+     * @param {array} arr 
      * @param {string} url
      * @param {object} [options]
      * @returns {object}

src/utils.js

@@ -7,7 +7,7 @@ const path = require('path');
 const uniqBy = require('lodash/uniqBy');
 const dns = require('dns');
 const tcpPortUsed = require('tcp-port-used');
-const publicIp = require('qiao-get-ip');
+const fetch = require('node-fetch');
 const crypto = require('crypto');
 const ip6addr = require('ip6addr');
 const errors = require('./errors');
@@ -16,7 +16,13 @@ const utils = {
   domainValidationRegex: /^localhost|[\p{L}\p{N}-][\p{L}\p{N}-]{1,61}[\p{L}\p{N}](?:\.[\p{L}]{2,})+$/iu,
   dnsCache: new Map(),
   dnsCacheLimit: 10000,
-  dnsCachePeriod: 1000 * 60 * 10
+  dnsCachePeriod: 1000 * 60 * 10,
+  ipLookupPoints: [
+    'https://api.ipify.org/',
+    'https://ipinfo.io/ip',
+    'https://ifconfig.me/ip',
+    'https://checkip.amazonaws.com/'
+  ]
 };
 
 /**
@@ -348,12 +354,24 @@ utils.getRequestTimer = function (timeout, options = {}) {
  * @returns {string}
  */
 utils.getExternalIp = async function () {
-  try {
-    return await publicIp.getIp();
-  }
-  catch(err) {
-    return null;
-  }
+  let ip = null;
+
+  for(let url of this.ipLookupPoints) {
+    try {
+      const res = await fetch(url, { signal: AbortSignal.timeout(1000) });
+      const text = await res.text();
+
+      if(this.isValidIp(text)) {
+        ip = text;
+        break;
+      }
+    }
+    catch(err) {
+      continue;
+    }
+  } 
+
+  return ip;
 }
 
 /**
@@ -627,7 +645,7 @@ utils.getRandomHexColor = function () {
  * @return {string}
  */
 utils.invertHexColor = function (color) {
-  return '#'+ (Number(`0x1${ color.substr(1) }`) ^ 0xFFFFFF).toString(16).substr(1).toUpperCase();
+  return '#'+ (Number(`0x1${ color.slice(1) }`) ^ 0xFFFFFF).toString(16).slice(1).toUpperCase();
 }
 
 /**

test/approval/captcha.js

@@ -4,7 +4,7 @@ const isPng = require('is-png');
 const ApprovalCaptcha = require('../../src/approval/transports/captcha')();
 const utils = require('../../src/utils');
 
-describe('Approval', () => {
+describe('ApprovalCaptcha', () => {
   let approval;
 
   describe('instance creation', function () {

test/group.js

@@ -177,7 +177,7 @@ describe('group communication', () => {
     for(let i = 0; i < approvers.length; i++) {
       const address = approvers[i];
       const count = Math.floor(length / (approvers.length - i));
-      answer += answers[address].substr(0, count);
+      answer += answers[address].slice(0, count);
       length -= count;
     }
 

webpack.client.js

@@ -10,7 +10,6 @@ module.exports = (options = {}, wp) => {
       "fs-extra": true,
       "chalk": true,
       "ip6addr": true,
-      "qiao-get-ip": true,
       "tcp-port-used": true,
       "validate-ip-node": true,    
       "crypto": true,