mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-01-31 19:02:59 +01:00
Authordata is now saved to the database
This commit is contained in:
Peter 'Pita' Martischka
parent
fa6641a368
commit
b1997a11c9
2 changed files with 290 additions and 232 deletions
|
|
@ -19,103 +19,88 @@
|
||||||
* The AuthorManager controlls all information about the Pad authors
|
* The AuthorManager controlls all information about the Pad authors
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
var db = require("./db").db;
|
||||||
* Saves all Authors as a assoative Array. The Key is the author id.
|
var async = require("async");
|
||||||
* Authors can have the following attributes:
|
|
||||||
* -name The Name of the Author as shown on the Pad
|
|
||||||
* -colorId The Id of Usercolor. A number between 0 and 31
|
|
||||||
* -timestamp The timestamp on which the user was last seen
|
|
||||||
*/
|
|
||||||
var globalAuthors = {};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A easy key value pair. The Key is the token, the value is the authorid
|
|
||||||
*/
|
|
||||||
var token2author = {};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the Author Id for a token. If the token is unkown,
|
* Returns the Author Id for a token. If the token is unkown,
|
||||||
* it creates a author for the token
|
* it creates a author for the token
|
||||||
* @param token The token
|
* @param token The token
|
||||||
*/
|
*/
|
||||||
exports.getAuthor4Token = function (token)
|
exports.getAuthor4Token = function (token, callback)
|
||||||
{
|
{
|
||||||
var author;
|
var author;
|
||||||
|
|
||||||
if(token2author[token] == null)
|
async.waterfall([
|
||||||
{
|
//try to get the author for this token
|
||||||
author = "g." + _randomString(16);
|
function(callback)
|
||||||
|
|
||||||
while(globalAuthors[author] != null)
|
|
||||||
{
|
{
|
||||||
author = "g." + _randomString(16);
|
db.get("token2author:" + token, callback);
|
||||||
|
},
|
||||||
|
function(value, callback)
|
||||||
|
{
|
||||||
|
//there is no author with this token, so create one
|
||||||
|
if(value == null)
|
||||||
|
{
|
||||||
|
//create the new author name
|
||||||
|
author = "g." + _randomString(16);
|
||||||
|
|
||||||
|
//set the token2author db entry
|
||||||
|
db.set("token2author:" + token, author);
|
||||||
|
|
||||||
|
//set the globalAuthors db entry
|
||||||
|
var authorObj = {colorId : Math.floor(Math.random()*32), name: null, timestamp: new Date().getTime()};
|
||||||
|
db.set("globalAuthor:" + author, authorObj);
|
||||||
|
|
||||||
|
callback(null);
|
||||||
|
}
|
||||||
|
//there is a author with this token
|
||||||
|
else
|
||||||
|
{
|
||||||
|
author = value;
|
||||||
|
|
||||||
|
//update the author time
|
||||||
|
db.setSub("globalAuthor:" + author, ["timestamp"], new Date().getTime());
|
||||||
|
|
||||||
|
callback(null);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
], function(err)
|
||||||
token2author[token]=author;
|
|
||||||
|
|
||||||
globalAuthors[author] = {};
|
|
||||||
globalAuthors[author].colorId = Math.floor(Math.random()*32);
|
|
||||||
globalAuthors[author].name = null;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
author = token2author[token];
|
callback(err, author);
|
||||||
}
|
});
|
||||||
|
|
||||||
globalAuthors[author].timestamp = new Date().getTime();
|
|
||||||
|
|
||||||
return author;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the color Id of the author
|
* Returns the color Id of the author
|
||||||
*/
|
*/
|
||||||
exports.getAuthorColorId = function (author)
|
exports.getAuthorColorId = function (author, callback)
|
||||||
{
|
{
|
||||||
throwExceptionIfAuthorNotExist(author);
|
db.getSub("globalAuthor:" + author, ["colorId"], callback);
|
||||||
|
|
||||||
return globalAuthors[author].colorId;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the color Id of the author
|
* Sets the color Id of the author
|
||||||
*/
|
*/
|
||||||
exports.setAuthorColorId = function (author, colorId)
|
exports.setAuthorColorId = function (author, colorId, callback)
|
||||||
{
|
{
|
||||||
throwExceptionIfAuthorNotExist(author);
|
db.setSub("globalAuthor:" + author, ["colorId"], colorId, callback);
|
||||||
|
|
||||||
globalAuthors[author].colorId = colorId;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the name of the author
|
* Returns the name of the author
|
||||||
*/
|
*/
|
||||||
exports.getAuthorName = function (author)
|
exports.getAuthorName = function (author, callback)
|
||||||
{
|
{
|
||||||
throwExceptionIfAuthorNotExist(author);
|
db.getSub("globalAuthor:" + author, ["name"], callback);
|
||||||
|
|
||||||
return globalAuthors[author].name;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the name of the author
|
* Sets the name of the author
|
||||||
*/
|
*/
|
||||||
exports.setAuthorName = function (author, name)
|
exports.setAuthorName = function (author, name, callback)
|
||||||
{
|
{
|
||||||
throwExceptionIfAuthorNotExist(author);
|
db.setSub("globalAuthor:" + author, ["name"], name, callback);
|
||||||
|
|
||||||
globalAuthors[author].name = name;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A internal function that checks if the Author exist and throws a exception if not
|
|
||||||
*/
|
|
||||||
function throwExceptionIfAuthorNotExist(author)
|
|
||||||
{
|
|
||||||
if(globalAuthors[author] == null)
|
|
||||||
{
|
|
||||||
throw "Author '" + author + "' is unkown!";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
var async = require("async");
|
||||||
var padManager = require("./PadManager");
|
var padManager = require("./PadManager");
|
||||||
var Changeset = require("./Changeset");
|
var Changeset = require("./Changeset");
|
||||||
var AttributePoolFactory = require("./AttributePoolFactory");
|
var AttributePoolFactory = require("./AttributePoolFactory");
|
||||||
|
|
@ -79,39 +80,45 @@ exports.handleDisconnect = function(client)
|
||||||
|
|
||||||
var author = sessioninfos[client.sessionId].author;
|
var author = sessioninfos[client.sessionId].author;
|
||||||
|
|
||||||
//prepare the notification for the other users on the pad, that this user joined
|
//get the author color out of the db
|
||||||
var messageToTheOtherUsers = {
|
authorManager.getAuthorColorId(author, function(err, color)
|
||||||
"type": "COLLABROOM",
|
{
|
||||||
"data": {
|
if(err) throw err;
|
||||||
type: "USER_LEAVE",
|
|
||||||
userInfo: {
|
//prepare the notification for the other users on the pad, that this user left
|
||||||
"ip": "127.0.0.1",
|
var messageToTheOtherUsers = {
|
||||||
"colorId": authorManager.getAuthorColorId(author),
|
"type": "COLLABROOM",
|
||||||
"userAgent": "Anonymous",
|
"data": {
|
||||||
"userId": author
|
type: "USER_LEAVE",
|
||||||
|
userInfo: {
|
||||||
|
"ip": "127.0.0.1",
|
||||||
|
"colorId": color,
|
||||||
|
"userAgent": "Anonymous",
|
||||||
|
"userId": author
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
//Go trough all sessions of this pad, search and destroy the entry of this client
|
||||||
|
for(i in pad2sessions[sessionPad])
|
||||||
|
{
|
||||||
|
if(pad2sessions[sessionPad][i] == client.sessionId)
|
||||||
|
{
|
||||||
|
delete pad2sessions[sessionPad][i];
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
//Go trough all sessions of this pad, search and destroy the entry of this client
|
//Go trough all user that are still on the pad, and send them the USER_LEAVE message
|
||||||
for(i in pad2sessions[sessionPad])
|
for(i in pad2sessions[sessionPad])
|
||||||
{
|
|
||||||
if(pad2sessions[sessionPad][i] == client.sessionId)
|
|
||||||
{
|
{
|
||||||
delete pad2sessions[sessionPad][i];
|
socketio.clients[pad2sessions[sessionPad][i]].send(messageToTheOtherUsers);
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
//Go trough all user that are still on the pad, and send them the USER_LEAVE message
|
//Delete the session2pad and sessioninfos entrys of this session
|
||||||
for(i in pad2sessions[sessionPad])
|
delete session2pad[client.sessionId];
|
||||||
{
|
delete sessioninfos[client.sessionId];
|
||||||
socketio.clients[pad2sessions[sessionPad][i]].send(messageToTheOtherUsers);
|
});
|
||||||
}
|
|
||||||
|
|
||||||
//Delete the session2pad and sessioninfos entrys of this session
|
|
||||||
delete session2pad[client.sessionId];
|
|
||||||
delete sessioninfos[client.sessionId];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -385,161 +392,227 @@ function handleClientReady(client, message)
|
||||||
throw "CLIENT_READY Message have a unkown protocolVersion '" + protocolVersion + "'!";
|
throw "CLIENT_READY Message have a unkown protocolVersion '" + protocolVersion + "'!";
|
||||||
}
|
}
|
||||||
|
|
||||||
//Ask the author Manager for a authorname of this token.
|
var author;
|
||||||
var author = authorManager.getAuthor4Token(message.token);
|
var authorName;
|
||||||
|
var authorColorId;
|
||||||
|
|
||||||
//Check if this author is already on the pad, if yes, kick him!
|
async.waterfall([
|
||||||
if(pad2sessions[message.padId])
|
//get all authordata of this new user
|
||||||
{
|
function(callback)
|
||||||
for(var i in pad2sessions[message.padId])
|
|
||||||
{
|
{
|
||||||
if(sessioninfos[pad2sessions[message.padId][i]].author == author)
|
//Ask the author Manager for a author of this token.
|
||||||
|
authorManager.getAuthor4Token(message.token, function(err,value)
|
||||||
{
|
{
|
||||||
client.send({disconnect:"doublelogin"});
|
author = value;
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//Save in session2pad that this session belonges to this pad
|
async.parallel([
|
||||||
var sessionId=String(client.sessionId);
|
//get colorId
|
||||||
session2pad[sessionId] = message.padId;
|
function(callback)
|
||||||
|
{
|
||||||
//check if there is already a pad2sessions entry, if not, create one
|
authorManager.getAuthorColorId(author, function(err, value)
|
||||||
if(!pad2sessions[message.padId])
|
{
|
||||||
{
|
authorColorId = value;
|
||||||
pad2sessions[message.padId] = [];
|
callback(err);
|
||||||
}
|
});
|
||||||
|
},
|
||||||
//Saves in pad2sessions that this session belongs to this pad
|
//get author name
|
||||||
pad2sessions[message.padId].push(sessionId);
|
function(callback)
|
||||||
|
{
|
||||||
//Tell the PadManager that it should ensure that this Pad exist
|
authorManager.getAuthorName(author, function(err, value)
|
||||||
padManager.ensurePadExists(message.padId);
|
{
|
||||||
|
authorName = value;
|
||||||
//Ask the PadManager for a function Wrapper for this Pad
|
callback(err);
|
||||||
var pad = padManager.getPad(message.padId, false);
|
});
|
||||||
|
}
|
||||||
//prepare all values for the wire
|
], callback);
|
||||||
atext = pad.atext();
|
});
|
||||||
var attribsForWire = Changeset.prepareForWire(atext.attribs, pad.pool());
|
|
||||||
var apool = attribsForWire.pool.toJsonable();
|
|
||||||
atext.attribs = attribsForWire.translated;
|
|
||||||
|
|
||||||
var clientVars = {
|
|
||||||
"accountPrivs": {
|
|
||||||
"maxRevisions": 100
|
|
||||||
},
|
},
|
||||||
"initialRevisionList": [],
|
function(callback)
|
||||||
"initialOptions": {
|
|
||||||
"guestPolicy": "deny"
|
|
||||||
},
|
|
||||||
"collab_client_vars": {
|
|
||||||
"initialAttributedText": atext,
|
|
||||||
"clientIp": (client.request && client.request.connection) ? client.request.connection.remoteAddress : "127.0.0.1",
|
|
||||||
//"clientAgent": "Anonymous Agent",
|
|
||||||
"padId": message.padId,
|
|
||||||
"historicalAuthorData": {},
|
|
||||||
"apool": apool,
|
|
||||||
"rev": pad.getHeadRevisionNumber(),
|
|
||||||
"globalPadId": message.padId
|
|
||||||
},
|
|
||||||
"colorPalette": ["#ffc7c7", "#fff1c7", "#e3ffc7", "#c7ffd5", "#c7ffff", "#c7d5ff", "#e3c7ff", "#ffc7f1", "#ff8f8f", "#ffe38f", "#c7ff8f", "#8fffab", "#8fffff", "#8fabff", "#c78fff", "#ff8fe3", "#d97979", "#d9c179", "#a9d979", "#79d991", "#79d9d9", "#7991d9", "#a979d9", "#d979c1", "#d9a9a9", "#d9cda9", "#c1d9a9", "#a9d9b5", "#a9d9d9", "#a9b5d9", "#c1a9d9", "#d9a9cd"],
|
|
||||||
"clientIp": (client.request && client.request.connection) ? client.request.connection.remoteAddress : "127.0.0.1",
|
|
||||||
"userIsGuest": true,
|
|
||||||
"userColor": authorManager.getAuthorColorId(author),
|
|
||||||
"padId": message.padId,
|
|
||||||
"initialTitle": "Pad: " + message.padId,
|
|
||||||
"opts": {},
|
|
||||||
"chatHistory": {
|
|
||||||
"start": 0,
|
|
||||||
"historicalAuthorData": {},
|
|
||||||
"end": 0,
|
|
||||||
"lines": []
|
|
||||||
},
|
|
||||||
"numConnectedUsers": pad2sessions[message.padId].length,
|
|
||||||
"isProPad": false,
|
|
||||||
"serverTimestamp": new Date().getTime(),
|
|
||||||
"globalPadId": message.padId,
|
|
||||||
"userId": author,
|
|
||||||
"cookiePrefsToSet": {
|
|
||||||
"fullWidth": false,
|
|
||||||
"hideSidebar": false
|
|
||||||
},
|
|
||||||
"hooks": {}
|
|
||||||
}
|
|
||||||
|
|
||||||
//Add a username to the clientVars if one avaiable
|
|
||||||
if(authorManager.getAuthorName(author) != null)
|
|
||||||
{
|
|
||||||
clientVars.userName = authorManager.getAuthorName(author);
|
|
||||||
}
|
|
||||||
|
|
||||||
//Add all authors that worked on this pad, to the historicalAuthorData on clientVars
|
|
||||||
var allAuthors = pad.getAllAuthors();
|
|
||||||
for(i in allAuthors)
|
|
||||||
{
|
|
||||||
clientVars.collab_client_vars.historicalAuthorData[allAuthors[i]] = {};
|
|
||||||
if(authorManager.getAuthorName(author) != null)
|
|
||||||
clientVars.collab_client_vars.historicalAuthorData[allAuthors[i]].name = authorManager.getAuthorName(author);
|
|
||||||
clientVars.collab_client_vars.historicalAuthorData[allAuthors[i]].colorId = authorManager.getAuthorColorId(author);
|
|
||||||
}
|
|
||||||
|
|
||||||
//Send the clientVars to the Client
|
|
||||||
client.send(clientVars);
|
|
||||||
|
|
||||||
//Save the revision and the author id in sessioninfos
|
|
||||||
sessioninfos[client.sessionId].rev = pad.getHeadRevisionNumber();
|
|
||||||
sessioninfos[client.sessionId].author = author;
|
|
||||||
|
|
||||||
//prepare the notification for the other users on the pad, that this user joined
|
|
||||||
var messageToTheOtherUsers = {
|
|
||||||
"type": "COLLABROOM",
|
|
||||||
"data": {
|
|
||||||
type: "USER_NEWINFO",
|
|
||||||
userInfo: {
|
|
||||||
"ip": "127.0.0.1",
|
|
||||||
"colorId": authorManager.getAuthorColorId(author),
|
|
||||||
"userAgent": "Anonymous",
|
|
||||||
"userId": author
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
//Add the authorname of this new User, if avaiable
|
|
||||||
if(authorManager.getAuthorName(author) != null)
|
|
||||||
{
|
|
||||||
messageToTheOtherUsers.data.userInfo.name = authorManager.getAuthorName(author);
|
|
||||||
}
|
|
||||||
|
|
||||||
//Run trough all sessions of this pad
|
|
||||||
for(i in pad2sessions[message.padId])
|
|
||||||
{
|
|
||||||
//Jump over, if this session is the connection session
|
|
||||||
if(pad2sessions[message.padId][i] != client.sessionId)
|
|
||||||
{
|
{
|
||||||
//Send this Session the Notification about the new user
|
//Check if this author is already on the pad, if yes, kick him!
|
||||||
socketio.clients[pad2sessions[message.padId][i]].send(messageToTheOtherUsers);
|
if(pad2sessions[message.padId])
|
||||||
|
{
|
||||||
|
for(var i in pad2sessions[message.padId])
|
||||||
|
{
|
||||||
|
if(sessioninfos[pad2sessions[message.padId][i]].author == author)
|
||||||
|
{
|
||||||
|
client.send({disconnect:"doublelogin"});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//Send the new User a Notification about this other user
|
//Save in session2pad that this session belonges to this pad
|
||||||
var messageToNotifyTheClientAboutTheOthers = {
|
var sessionId=String(client.sessionId);
|
||||||
|
session2pad[sessionId] = message.padId;
|
||||||
|
|
||||||
|
//check if there is already a pad2sessions entry, if not, create one
|
||||||
|
if(!pad2sessions[message.padId])
|
||||||
|
{
|
||||||
|
pad2sessions[message.padId] = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
//Saves in pad2sessions that this session belongs to this pad
|
||||||
|
pad2sessions[message.padId].push(sessionId);
|
||||||
|
|
||||||
|
//Tell the PadManager that it should ensure that this Pad exist
|
||||||
|
padManager.ensurePadExists(message.padId);
|
||||||
|
|
||||||
|
//Ask the PadManager for a function Wrapper for this Pad
|
||||||
|
var pad = padManager.getPad(message.padId, false);
|
||||||
|
|
||||||
|
//prepare all values for the wire
|
||||||
|
atext = pad.atext();
|
||||||
|
var attribsForWire = Changeset.prepareForWire(atext.attribs, pad.pool());
|
||||||
|
var apool = attribsForWire.pool.toJsonable();
|
||||||
|
atext.attribs = attribsForWire.translated;
|
||||||
|
|
||||||
|
var clientVars = {
|
||||||
|
"accountPrivs": {
|
||||||
|
"maxRevisions": 100
|
||||||
|
},
|
||||||
|
"initialRevisionList": [],
|
||||||
|
"initialOptions": {
|
||||||
|
"guestPolicy": "deny"
|
||||||
|
},
|
||||||
|
"collab_client_vars": {
|
||||||
|
"initialAttributedText": atext,
|
||||||
|
"clientIp": (client.request && client.request.connection) ? client.request.connection.remoteAddress : "127.0.0.1",
|
||||||
|
//"clientAgent": "Anonymous Agent",
|
||||||
|
"padId": message.padId,
|
||||||
|
"historicalAuthorData": {},
|
||||||
|
"apool": apool,
|
||||||
|
"rev": pad.getHeadRevisionNumber(),
|
||||||
|
"globalPadId": message.padId
|
||||||
|
},
|
||||||
|
"colorPalette": ["#ffc7c7", "#fff1c7", "#e3ffc7", "#c7ffd5", "#c7ffff", "#c7d5ff", "#e3c7ff", "#ffc7f1", "#ff8f8f", "#ffe38f", "#c7ff8f", "#8fffab", "#8fffff", "#8fabff", "#c78fff", "#ff8fe3", "#d97979", "#d9c179", "#a9d979", "#79d991", "#79d9d9", "#7991d9", "#a979d9", "#d979c1", "#d9a9a9", "#d9cda9", "#c1d9a9", "#a9d9b5", "#a9d9d9", "#a9b5d9", "#c1a9d9", "#d9a9cd"],
|
||||||
|
"clientIp": (client.request && client.request.connection) ? client.request.connection.remoteAddress : "127.0.0.1",
|
||||||
|
"userIsGuest": true,
|
||||||
|
"userColor": authorColorId,
|
||||||
|
"padId": message.padId,
|
||||||
|
"initialTitle": "Pad: " + message.padId,
|
||||||
|
"opts": {},
|
||||||
|
"chatHistory": {
|
||||||
|
"start": 0,
|
||||||
|
"historicalAuthorData": {},
|
||||||
|
"end": 0,
|
||||||
|
"lines": []
|
||||||
|
},
|
||||||
|
"numConnectedUsers": pad2sessions[message.padId].length,
|
||||||
|
"isProPad": false,
|
||||||
|
"serverTimestamp": new Date().getTime(),
|
||||||
|
"globalPadId": message.padId,
|
||||||
|
"userId": author,
|
||||||
|
"cookiePrefsToSet": {
|
||||||
|
"fullWidth": false,
|
||||||
|
"hideSidebar": false
|
||||||
|
},
|
||||||
|
"hooks": {}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Add a username to the clientVars if one avaiable
|
||||||
|
if(authorName != null)
|
||||||
|
{
|
||||||
|
clientVars.userName = authorName;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Add all authors that worked on this pad, to the historicalAuthorData on clientVars
|
||||||
|
var allAuthors = pad.getAllAuthors();
|
||||||
|
for(i in allAuthors)
|
||||||
|
{
|
||||||
|
clientVars.collab_client_vars.historicalAuthorData[allAuthors[i]] = {};
|
||||||
|
if(authorName != null)
|
||||||
|
clientVars.collab_client_vars.historicalAuthorData[allAuthors[i]].name = authorName;
|
||||||
|
clientVars.collab_client_vars.historicalAuthorData[allAuthors[i]].colorId = authorColorId;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Send the clientVars to the Client
|
||||||
|
client.send(clientVars);
|
||||||
|
|
||||||
|
//Save the revision and the author id in sessioninfos
|
||||||
|
sessioninfos[client.sessionId].rev = pad.getHeadRevisionNumber();
|
||||||
|
sessioninfos[client.sessionId].author = author;
|
||||||
|
|
||||||
|
//prepare the notification for the other users on the pad, that this user joined
|
||||||
|
var messageToTheOtherUsers = {
|
||||||
"type": "COLLABROOM",
|
"type": "COLLABROOM",
|
||||||
"data": {
|
"data": {
|
||||||
type: "USER_NEWINFO",
|
type: "USER_NEWINFO",
|
||||||
userInfo: {
|
userInfo: {
|
||||||
"ip": "127.0.0.1",
|
"ip": "127.0.0.1",
|
||||||
"colorId": authorManager.getAuthorColorId(sessioninfos[pad2sessions[message.padId][i]].author),
|
"colorId": authorColorId,
|
||||||
"name": authorManager.getAuthorName(sessioninfos[pad2sessions[message.padId][i]].author),
|
|
||||||
"userAgent": "Anonymous",
|
"userAgent": "Anonymous",
|
||||||
"userId": sessioninfos[pad2sessions[message.padId][i]].author
|
"userId": author
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
client.send(messageToNotifyTheClientAboutTheOthers);
|
|
||||||
|
//Add the authorname of this new User, if avaiable
|
||||||
|
if(authorName != null)
|
||||||
|
{
|
||||||
|
messageToTheOtherUsers.data.userInfo.name = authorName;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Run trough all sessions of this pad
|
||||||
|
async.forEach(pad2sessions[message.padId], function(sessionID, callback)
|
||||||
|
{
|
||||||
|
var sessionAuthorName, sessionAuthorColorId;
|
||||||
|
|
||||||
|
async.series([
|
||||||
|
//get the authorname & colorId
|
||||||
|
function(callback)
|
||||||
|
{
|
||||||
|
async.parallel([
|
||||||
|
function(callback)
|
||||||
|
{
|
||||||
|
authorManager.getAuthorColorId(sessioninfos[sessionID].author, function(err, value)
|
||||||
|
{
|
||||||
|
sessionAuthorColorId = value;
|
||||||
|
callback(err);
|
||||||
|
})
|
||||||
|
},
|
||||||
|
function(callback)
|
||||||
|
{
|
||||||
|
authorManager.getAuthorName(sessioninfos[sessionID].author, function(err, value)
|
||||||
|
{
|
||||||
|
sessionAuthorName = value;
|
||||||
|
callback(err);
|
||||||
|
})
|
||||||
|
}
|
||||||
|
],callback);
|
||||||
|
},
|
||||||
|
function (callback)
|
||||||
|
{
|
||||||
|
//Jump over, if this session is the connection session
|
||||||
|
if(sessionID != client.sessionId)
|
||||||
|
{
|
||||||
|
//Send this Session the Notification about the new user
|
||||||
|
socketio.clients[sessionID].send(messageToTheOtherUsers);
|
||||||
|
|
||||||
|
//Send the new User a Notification about this other user
|
||||||
|
var messageToNotifyTheClientAboutTheOthers = {
|
||||||
|
"type": "COLLABROOM",
|
||||||
|
"data": {
|
||||||
|
type: "USER_NEWINFO",
|
||||||
|
userInfo: {
|
||||||
|
"ip": "127.0.0.1",
|
||||||
|
"colorId": sessionAuthorColorId,
|
||||||
|
"name": sessionAuthorName,
|
||||||
|
"userAgent": "Anonymous",
|
||||||
|
"userId": sessioninfos[sessionID].author
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
client.send(messageToNotifyTheClientAboutTheOthers);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
], callback);
|
||||||
|
}, callback);
|
||||||
}
|
}
|
||||||
}
|
],function(err)
|
||||||
|
{
|
||||||
|
if(err) throw err;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue