Removed unresponsive peers in peers.json.

Improved peer connection handling in helpers/index.js.

helpers/index.js

@@ -4,11 +4,11 @@ const clients = require("./clients");
 let electrumKeepAlive = () => null;
 let electrumKeepAliveInterval = 60000;
 
-const _getTimeout = ({ arr = [], timeout = 1000 } = {}) => {
+const _getTimeout = ({ arr = [], timeout = 2000 } = {}) => {
 	try {
 		if (!Array.isArray(arr)) arr = _attemptToGetArray(arr);
-		if (arr && Array.isArray(arr)) return (arr.length * timeout)/2;
-		return timeout || 1000;
+		if (arr && Array.isArray(arr) && arr.length > 0) return (arr.length * timeout)/2 | timeout;
+		return timeout;
 	} catch {
 		return timeout;
 	}
@@ -137,11 +137,20 @@ const connectToPeer = ({ port = 50002, host = "", protocol = "ssl", network = "b
 				clients.mainClient[network] = new ElectrumClient(port, host, protocol);
 				connectionResponse = await promiseTimeout(1000, clients.mainClient[network].connect());
 				if (connectionResponse.error) {
-					resolve(connectionResponse);
-					return;
+					return resolve(connectionResponse);
+				}
+				/*
+				 * The scripthash doesn't have to be valid.
+				 * We're simply testing if the server will respond to a batch request.
+				 */
+				const scriptHash = "77ca78f9a84b48041ad71f7cc6ff6c33460c25f0cb99f558f9813ed9e63727dd";
+				const testResponses = await Promise.all([
+					pingServer(),
+					getAddressScriptHashBalances({ network, scriptHashes: [scriptHash] }),
+				])
+				if (testResponses[0].error || testResponses[1].error) {
+					return resolve({ error: true, data: "" });
 				}
-				const pingResponse = await pingServer();
-				if (!pingResponse.error) {
 				try {
 					//Clear/Remove Electrum's keep-alive message.
 					clearInterval(electrumKeepAlive);
@@ -152,7 +161,6 @@ const connectToPeer = ({ port = 50002, host = "", protocol = "ssl", network = "b
 				} catch (e) {}
 				clients.peer[network] = { port, host, protocol };
 			}
-			}
 			resolve(connectionResponse);
 		} catch (e) {resolve({ error: true, data: e });}
 	});
@@ -240,7 +248,6 @@ const disconnectFromPeer = async ({ id = Math.random(), network = "" } = {}) =>
 		return { error: true, id, method: "disconnectFromPeer", data };
 	};
 	try {
-		//console.log("Disconnecting from any previous peer...");
 		if (clients.mainClient[network] === false) {
 			//No peer to disconnect from...
 			return {

helpers/peers.json

@@ -2,28 +2,14 @@
   "bitcoin": [
     {"host": "electrum.aantonop.com", "ssl": 50002, "tcp": 50001},
     {"host": "bitcoin.lukechilds.co", "ssl": 50002, "tcp": 50001},
-    {"host": "electrumx.nmdps", "ssl": 50002, "tcp": 50001},
-    {"host": "oneweek.duckdns.org", "ssl": 50002, "tcp": 50001},
-    {"host": "electrum.vom-stausee.de", "ssl": 50002, "tcp": 50001},
-    {"host": "electrum.hsmiths.com", "ssl": 50002, "tcp": 50001},
     {"host": "electrum.hodlister.co", "ssl": 50002, "tcp": 50001},
     {"host": "electrum3.hodlister.co", "ssl": 50002, "tcp": 50001},
-    {"host": "btc.usebsv.com", "ssl": 50006, "tcp": 50001},
-    {"host": "fortress.qtornado.com", "ssl": 443, "tcp": 50001},
     {"host": "ecdsa.net", "ssl": 110, "tcp": 50001},
-    {"host": "electrum.be", "ssl": 50002, "tcp": 50001},
-    {"host": "elex01.blackpole.online", "ssl": 50002, "tcp": 50001},
-    {"host": "kirsche.emzy.de", "ssl": 50002, "tcp": 50001},
-    {"host": "Electrum.hsmiths.com", "ssl": 50002, "tcp": 50001},
-    {"host": "elec.luggs.co", "ssl": 443, "tcp": 50001},
-    {"host": "btc.smsys.me", "ssl": 995, "tcp": 110}
+    {"host": "kirsche.emzy.de", "ssl": 50002, "tcp": 50001}
   ],
   "bitcoinTestnet": [
     {"host": "testnet.hsmiths.com", "ssl": 53012, "tcp": 53011},
-    {"host": "testnet1.bauerj.eu", "ssl": 50002, "tcp": 50001},
     {"host": "tn.not.fyi", "ssl": 55002, "tcp": 55001},
-    {"host": "bitcoin.cluelessperson.com", "ssl": 51002, "tcp": 51001},
-    {"host": "electrum.blockstream.info", "ssl": 60002, "tcp": 60001},
     {"host": "testnet.aranguren.org", "ssl": 51002, "tcp": 51001}
   ]
 }