Merge pull request #7 from synonymdev/update-peer-disconnect

Update Peer Disconnect

helpers/index.js

@@ -245,9 +245,6 @@ const stop = async ({ network = "" } = {}) => {
 };
 
 const disconnectFromPeer = async ({ id = Math.random(), network = "" } = {}) => {
-	const failure = (data = {}) => {
-		return { error: true, id, method: "disconnectFromPeer", data };
-	};
 	try {
 		if (clients.mainClient[network] === false) {
 			//No peer to disconnect from...
@@ -261,12 +258,18 @@ const disconnectFromPeer = async ({ id = Math.random(), network = "" } = {}) =>
 		}
 		//Attempt to disconnect from peer...
 		clients.mainClient[network].close();
+		await pauseExecution();
+		//Reset the client.
 		clients.mainClient[network] = false;
+		clients.peer[network] = { port: 0, host: "", protocol: "" };
+		clients.peers[network] = [];
+		clients.subscribedAddresses[network] = [];
+		clients.subscribedHeaders[network] = false;
+		clients.onAddressReceive[network] = undefined;
 		clients.network = "";
-		await pauseExecution();
 		return { error: false, id, method: "disconnectFromPeer", network, data: "Disconnected..." };
 	} catch (e) {
-		failure(e);
+		return { error: true, id, method: "disconnectFromPeer", data: e };
 	}
 };
 

lib/client.js

@@ -34,7 +34,7 @@ class Client {
             return;
         }
         this.conn.end();
-        this.conn.destroy();
+        //this.conn.destroy();
         this.status = 0;
     }
 

lib/electrum_client.js

@@ -12,7 +12,9 @@ class ElectrumClient extends Client{
             'blockchain.headers.subscribe',
             'blockchain.address.subscribe'
         ]
-        list.forEach(event => this.subscribe.removeAllListeners(event))
+        list.forEach(event => {
+			if (this.subscribe) this.subscribe.removeAllListeners(event);
+		})
     }
     server_version(client_name, protocol_version){
         try {