mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-12-20 15:30:39 +01:00
fix reqFromSocket for socket.io 1.x
This commit is contained in:
@@ -87,6 +87,8 @@ Sockets.init = function(server) {
|
|||||||
io.on('connection', function(socket) {
|
io.on('connection', function(socket) {
|
||||||
console.log('CONNECTED', socket.uid, socket.id);
|
console.log('CONNECTED', socket.uid, socket.id);
|
||||||
|
|
||||||
|
socket.ip = socket.request.connection.remoteAddress;
|
||||||
|
|
||||||
logger.io_one(socket, socket.uid);
|
logger.io_one(socket, socket.uid);
|
||||||
|
|
||||||
if (socket.uid) {
|
if (socket.uid) {
|
||||||
@@ -306,21 +308,19 @@ Sockets.getUserRooms = function(uid) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
Sockets.reqFromSocket = function(socket) {
|
Sockets.reqFromSocket = function(socket) {
|
||||||
console.log('socket.request', socket.request);
|
var headers = socket.request.headers,
|
||||||
return socket.request;
|
host = headers.host,
|
||||||
// var headers = socket.handshake.headers,
|
referer = headers.referer || '';
|
||||||
// host = headers.host,
|
|
||||||
// referer = headers.referer || '';
|
|
||||||
|
|
||||||
// return {
|
return {
|
||||||
// ip: headers['x-forwarded-for'] || (socket.handshake.address || {}).address,
|
ip: socket.ip,
|
||||||
// host: host,
|
host: host,
|
||||||
// protocol: headers.secure ? 'https' : 'http',
|
protocol: socket.request.connection.encrypted ? 'https' : 'http',
|
||||||
// secure: !!headers.secure,
|
secure: !!socket.request.connection.encrypted,
|
||||||
// url: referer,
|
url: referer,
|
||||||
// path: referer.substr(referer.indexOf(host) + host.length),
|
path: referer.substr(referer.indexOf(host) + host.length),
|
||||||
// headers: headers
|
headers: headers
|
||||||
// };
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
Sockets.isUserOnline = function(uid) {
|
Sockets.isUserOnline = function(uid) {
|
||||||
|
|||||||
Reference in New Issue
Block a user