messed everything up .... :( 111

This commit is contained in:
logsol 2012-07-28 21:09:39 +02:00
parent 03678eb773
commit ec1bceb1b6
13 changed files with 145 additions and 117 deletions

View file

@ -1,10 +1,11 @@
define([
"Lobby/User",
"Game/Server/Channel",
"Lobby/PipeToChannel"
"child_process"
],
function (User, Channel, childProcess) {
function (User, Channel, PipeToChannel, childProcess) {
var fork = childProcess.fork;
@ -38,22 +39,22 @@ function (User, Channel, childProcess) {
var channel = this.channels[channelName];
if(!channel) {
try {
channel = fork('channel.js');
channel.send('CREATE');
channel.send({
channel: {
setName: channelName
}
});
} catch (err) {
throw 'Failed to fork channel ' + channelName + '! (' + err + ')';
}
channel = new PipeToChannel(channelName);
this.channels[channelName] = channel;
NotificationCenter.on('channel/' + channelName + '/message', function (data) {
channel.send('channel', data);
}, this);
NotificationCenter.on('user/joined', function (user) {
NotificationCenter.on('channel/' + channelName + '/user/' + user.id, function (recipient, data) {
channel.send(recipient, data);
}, this);
}, this);
NotificationCenter.on('user/left', function (user) {
}, this);
}
//channel.addUser(user);
@ -63,10 +64,11 @@ function (User, Channel, childProcess) {
}
Coordinator.prototype.removeUser = function (user) {
user.channel.send('user/' + user.id + '/left');
NotificationCenter.off('channel/' + user.channel.channelName + '/user/' + user.id);
delete this.lobbyUsers[user.id];
if(user.channelProcess) {
//user.channel.releaseUser(user); -> generate message
}
}
return Coordinator;

38
app/Lobby/PipeToChannel.js Executable file
View file

@ -0,0 +1,38 @@
define([
"Game/Core/NotificationCenter"
],
function (NotificationCenter) {
function PipeToChannel (channelName) {
this.channelProcess = null;
try {
this.channelProcess = fork('channel.js');
} catch (err) {
throw 'Failed to fork channel! (' + err + ')';
}
this.send('channel/' + channelName, 'CREATE');
this.channelProcess.on('message', this.onMessage.bind(this));
var self = this;
}
PipeToChannel.prototype.send = function (recipient, data) {
var message = {
recipient: recipient,
data: data
}
this.channelProcess.send(message);
}
PipeToChannel.prototype.onMessage = function (message) {
NotficationCenter.trigger(message.recipient + '/message', message.data);
}
return PipeToChannel;
});

View file

@ -10,6 +10,7 @@ function (Parent, ProtocolHelper) {
this.coordinator = coordinator;
this.channelProcess = null;
this.socketLink = socketLink;
var self = this;