Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-20 07:20:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Julian Lam
2017-02-24 12:46:40 -05:00
parent c09f994b0a 995f8296a4
commit 72e77772db
449 changed files with 9202 additions and 6984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/socket.io/index.js
View File

@@ -1,4 +1,4 @@
"use strict";
'use strict';
var async = require('async');
var nconf = require('nconf');
@@ -23,7 +23,7 @@ Sockets.init = function (server) {
var SocketIO = require('socket.io');
var socketioWildcard = require('socketio-wildcard')();
io = new SocketIO({
path: nconf.get('relative_path') + '/socket.io'
path: nconf.get('relative_path') + '/socket.io',
});
addRedisAdapter(io);
@@ -56,7 +56,7 @@ Sockets.init = function (server) {
}
io.listen(server, {
transports: nconf.get('socket.io:transports')
transports: nconf.get('socket.io:transports'),
});
Sockets.server = io;
@@ -105,16 +105,15 @@ function onMessage(socket, payload) {
var methodToCall = parts.reduce(function (prev, cur) {
if (prev !== null && prev[cur]) {
return prev[cur];
} else {
return null;
}
return null;
}, Namespaces);
if (!methodToCall) {
if (process.env.NODE_ENV === 'development') {
winston.warn('[socket.io] Unrecognized message: ' + eventName);
}
return callback({message: '[[error:invalid-event]]'});
return callback({ message: '[[error:invalid-event]]' });
}
socket.previousEvents = socket.previousEvents || [];
@@ -144,15 +143,15 @@ function onMessage(socket, payload) {
},
function (next) {
methodToCall(socket, params, next);
}
},
], function (err, result) {
callback(err ? {message: err.message} : null, result);
callback(err ? { message: err.message } : null, result);
});
}
function requireModules() {
var modules = ['admin', 'categories', 'groups', 'meta', 'modules',
'notifications', 'plugins', 'posts', 'topics', 'user', 'blacklist', 'flags'
'notifications', 'plugins', 'posts', 'topics', 'user', 'blacklist', 'flags',
];
modules.forEach(function (module) {
@@ -210,7 +209,7 @@ function authorize(socket, callback) {
}
next();
});
}
},
], callback);
}
@@ -220,7 +219,7 @@ function addRedisAdapter(io) {
var redis = require('../database/redis');
var pub = redis.connect();
var sub = redis.connect();
io.adapter(redisAdapter({pubClient: pub, subClient: sub}));
io.adapter(redisAdapter({ pubClient: pub, subClient: sub }));
} else if (nconf.get('isCluster') === 'true') {
winston.warn('[socket.io] Clustering detected, you are advised to configure Redis as a websocket store.');
}
@@ -262,8 +261,7 @@ Sockets.reqFromSocket = function (socket, payload, event) {
secure: encrypted,
url: referer,
path: referer.substr(referer.indexOf(host) + host.length),
headers: headers
headers: headers,
};
};