evan/rats-search
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

исправление распределния соединений

Browse Source
This commit is contained in:
Alexey Kasyanchuk
2017-01-02 03:33:23 +03:00
parent e71cf5f1bf
commit 92a68abafe
1 changed files with 88 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
index.js
View File

@ -7,14 +7,17 @@ var app = express();
var server = require('http').Server(app); var server = require('http').Server(app);
var io = require('socket.io')(server); var io = require('socket.io')(server);
// Start server const mysqlSettings = {
server.listen(8099);
var connection = mysql.createConnection({
host : 'localhost', host : 'localhost',
user : 'root', user : 'root',
password : 'degitisi', password : 'degitisi',
database : 'btsearch' database : 'btsearch'
}); };
// Start server
server.listen(8099);
let listenerMysql = mysql.createConnection(mysqlSettings);
let socketMysql = mysql.createConnection(mysqlSettings);
app.get('/', function(req, res) app.get('/', function(req, res)
@ -24,6 +27,12 @@ app.get('/', function(req, res)
app.use(express.static('build')); app.use(express.static('build'));
socketMysql.connect(function(mysqlError) {
if (mysqlError) {
console.error('error connecting: ' + mysqlError.stack);
return;
}
io.on('connection', function(socket) io.on('connection', function(socket)
{ {
function baseRowData(row) function baseRowData(row)
@ -40,7 +49,7 @@ io.on('connection', function(socket)
socket.on('recentTorrents', function(callback) socket.on('recentTorrents', function(callback)
{ {
connection.query('SELECT * FROM `torrents` ORDER BY added DESC LIMIT 0,10', function (error, rows, fields) { socketMysql.query('SELECT * FROM `torrents` ORDER BY added DESC LIMIT 0,10', function (error, rows, fields) {
let torrents = []; let torrents = [];
rows.forEach((row) => { rows.forEach((row) => {
torrents.push(baseRowData(row)); torrents.push(baseRowData(row));
@ -52,7 +61,7 @@ io.on('connection', function(socket)
socket.on('torrent', function(hash, options, callback) socket.on('torrent', function(hash, options, callback)
{ {
connection.query('SELECT * FROM `torrents` WHERE `hash` = ?', hash, function (error, rows, fields) { socketMysql.query('SELECT * FROM `torrents` WHERE `hash` = ?', hash, function (error, rows, fields) {
if(rows.length == 0) { if(rows.length == 0) {
callback(undefined); callback(undefined);
return; return;
@ -61,7 +70,7 @@ io.on('connection', function(socket)
if(options.files) if(options.files)
{ {
connection.query('SELECT * FROM `files` WHERE `hash` = ?', hash, function (error, rows, fields) { socketMysql.query('SELECT * FROM `files` WHERE `hash` = ?', hash, function (error, rows, fields) {
torrent.filesList = rows; torrent.filesList = rows;
callback(baseRowData(torrent)) callback(baseRowData(torrent))
}); });
@ -79,7 +88,7 @@ io.on('connection', function(socket)
console.log(text); console.log(text);
let q = 2; let q = 2;
connection.query('SELECT * FROM `torrents` WHERE MATCH(`name`) AGAINST(?)', text, function (error, rows, fields) { socketMysql.query('SELECT * FROM `torrents` WHERE MATCH(`name`) AGAINST(?)', text, function (error, rows, fields) {
rows.forEach((row) => { rows.forEach((row) => {
search[row.hash] = baseRowData(row); search[row.hash] = baseRowData(row);
}); });
@ -88,7 +97,7 @@ io.on('connection', function(socket)
return search[key]; return search[key];
})); }));
}); });
connection.query('SELECT * FROM `files` INNER JOIN torrents ON(torrents.hash = files.hash) WHERE MATCH(`path`) AGAINST(?)', text, function (error, rows, fields) { socketMysql.query('SELECT * FROM `files` INNER JOIN torrents ON(torrents.hash = files.hash) WHERE MATCH(`path`) AGAINST(?)', text, function (error, rows, fields) {
rows.forEach((row) => { rows.forEach((row) => {
search[row.hash] = baseRowData(row); search[row.hash] = baseRowData(row);
search[row.hash].path = row.path; search[row.hash].path = row.path;
@ -101,7 +110,9 @@ io.on('connection', function(socket)
}); });
}); });
connection.connect(function(err) { });
listenerMysql.connect(function(err) {
if (err) { if (err) {
console.error('error connecting: ' + err.stack); console.error('error connecting: ' + err.stack);
return; return;
@ -121,7 +132,7 @@ connection.connect(function(err) {
filesCount = metadata.info.files.length; filesCount = metadata.info.files.length;
size = 0; size = 0;
connection.query('DELETE FROM files WHERE hash = ?', hash, function (err, result) { listenerMysql.query('DELETE FROM files WHERE hash = ?', hash, function (err, result) {
}) })
for(let i = 0; i < metadata.info.files.length; i++) for(let i = 0; i < metadata.info.files.length; i++)
@ -133,7 +144,7 @@ connection.connect(function(err) {
path: filePath, path: filePath,
size: file.length, size: file.length,
}; };
let query = connection.query('INSERT INTO files SET ?', fileQ, function(err, result) { let query = listenerMysql.query('INSERT INTO files SET ?', fileQ, function(err, result) {
if(!result) { if(!result) {
console.log(fileQ); console.log(fileQ);
console.error(err); console.error(err);
@ -150,7 +161,7 @@ connection.connect(function(err) {
path: metadata.info.name, path: metadata.info.name,
size: size, size: size,
}; };
let query = connection.query('INSERT INTO files SET ?', fileQ, function(err, result) { let query = listenerMysql.query('INSERT INTO files SET ?', fileQ, function(err, result) {
if(!result) { if(!result) {
console.log(fileQ); console.log(fileQ);
console.error(err); console.error(err);
@ -167,7 +178,7 @@ connection.connect(function(err) {
ipv4: rinfo.address, ipv4: rinfo.address,
port: rinfo.port port: rinfo.port
}; };
var query = connection.query('INSERT INTO torrents SET ? ON DUPLICATE KEY UPDATE hash=hash', torrentQ, function(err, result) { var query = listenerMysql.query('INSERT INTO torrents SET ? ON DUPLICATE KEY UPDATE hash=hash', torrentQ, function(err, result) {
if(result) { if(result) {
io.sockets.emit('newTorrent', { io.sockets.emit('newTorrent', {
hash: hash, hash: hash,
@ -187,5 +198,5 @@ connection.connect(function(err) {
// spider.on('nodes', (nodes)=>console.log('foundNodes')) // spider.on('nodes', (nodes)=>console.log('foundNodes'))
//spider.listen(4445) spider.listen(4445)
}); });