From cc1fd1d49d5fd1a621813b79ffa858c5055c6e28 Mon Sep 17 00:00:00 2001 From: Alexey Kasyanchuk Date: Sat, 17 Mar 2018 22:10:36 +0300 Subject: [PATCH] fix(ssh): fix closing ssh on exit --- src/background/p2p.js | 11 ++++++++++- src/background/spider.js | 3 +++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/background/p2p.js b/src/background/p2p.js index ad1e6aa..286264e 100644 --- a/src/background/p2p.js +++ b/src/background/p2p.js @@ -127,7 +127,7 @@ class p2p { let remoteHost = '03de848286b8fbe6e775e6601c3bcfb9b71dfddcacb861b061458ce5e4020a15a649aabef88234d2af01ead4276a6de1YlqiJBlXCmoA7TpnbRuSRHNDsIBLlZ9McbovKJXHtAA=' - ssh(config.spiderPort, this.encryptor.decrypt(remoteHost), 'relay', 'relaymytrf', (selfPeer) => { + this.ssh = ssh(config.spiderPort, this.encryptor.decrypt(remoteHost), 'relay', 'relaymytrf', (selfPeer) => { if(!selfPeer) { this.p2pStatus = 0 @@ -147,6 +147,15 @@ class p2p { }) } + close() + { + if(this.ssh) + { + console.log('closing ssh...') + this.ssh.kill() + } + } + on(type, callback) { this.messageHandlers[type] = callback } diff --git a/src/background/spider.js b/src/background/spider.js index d275ef3..cd4c6d9 100644 --- a/src/background/spider.js +++ b/src/background/spider.js @@ -1361,6 +1361,9 @@ this.stop = (callback) => { if(upnp) upnp.ratsUnmap() + console.log('closing p2p...') + p2p.close() + const close = () => { torrentClient.destroy(() => { sphinx.end(() => spider.close(() => {