From 6a63bc626df473de512422f16878df0dea640368 Mon Sep 17 00:00:00 2001 From: Alexey Kasyanchuk Date: Wed, 28 Mar 2018 23:35:58 +0300 Subject: [PATCH] feat(p2p): app version on p2p --- src/background/background.js | 2 +- src/background/p2p.js | 3 +++ src/background/spider.js | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/background/background.js b/src/background/background.js index a2dd758..3257711 100644 --- a/src/background/background.js +++ b/src/background/background.js @@ -362,7 +362,7 @@ app.on("ready", () => { } callback.apply(null, arg) }) - }, app.getPath("userData")) + }, app.getPath("userData"), app.getVersion()) }) }); diff --git a/src/background/p2p.js b/src/background/p2p.js index 4517b4a..b53440c 100644 --- a/src/background/p2p.js +++ b/src/background/p2p.js @@ -12,6 +12,7 @@ class p2p { externalPeers = [] size = 0 p2pStatus = 0 + version = '0' constructor(send = () => {}) { @@ -53,6 +54,7 @@ class p2p { callback({ protocol: 'rats', + version: this.version, peers: this.peersList().slice(0, 4).map(peer => ({address: peer.address, port: peer.port})) }) @@ -224,6 +226,7 @@ class p2p { emit('protocol', { protocol: 'rats', port: config.spiderPort, + version: this.version, peers: this.peersList().slice(0, 4).map(peer => ({address: peer.address, port: peer.port})).concat(this.externalPeers) // also add external peers }, (data) => { if(!data || data.protocol != 'rats') diff --git a/src/background/spider.js b/src/background/spider.js index eb89c2f..c27a5fa 100644 --- a/src/background/spider.js +++ b/src/background/spider.js @@ -37,7 +37,7 @@ const torrentClient = require('./torrentClient') //server.listen(config.httpPort); //console.log('Listening web server on', config.httpPort, 'port') -module.exports = function (send, recive, dataDirectory) +module.exports = function (send, recive, dataDirectory, version) { let torrentsId = 1; @@ -253,6 +253,7 @@ function baseRowData(row) } const p2p = new P2PServer(send) +p2p.version = version p2p.encryptor = encryptor p2p.listen() // load initial peers