diff --git a/app/Bootstrap/Channel.js b/app/Bootstrap/Channel.js index 0e5ce99..6403951 100755 --- a/app/Bootstrap/Channel.js +++ b/app/Bootstrap/Channel.js @@ -1,8 +1,9 @@ define([ - "Game/Server/Channel" + "Game/Server/Channel", + "Game/Server/CoordinatorLink" ], -function(Channel) { +function(Channel, CoordinatorLink) { function ChannelBootstrap(process) { diff --git a/app/Game/Server/Channel.js b/app/Game/Server/Channel.js index 7ff2559..97a2621 100755 --- a/app/Game/Server/Channel.js +++ b/app/Game/Server/Channel.js @@ -8,14 +8,13 @@ function(GameController, NotificationCenter) { function Channel(coordinatorLink) { this.coordinatorLink = coordinatorLink; - - console.log('A CHANNEL WAS CREATED'); - /* + this.coordinatorLink.receive = this.onMessage; + this.users = {}; + this.gameController = new GameController(); this.gameController.loadLevel("default.json"); -*/ -/* + /* var self = this; NotificationCenter.on("processGameCommandFromUser", function(topic, args) { self.processGameCommandFromUser.apply(self, args); @@ -26,6 +25,23 @@ function(GameController, NotificationCenter) { Channel.validateName = function(name){ return true; } + + Channel.prototype.onMessage = function(message) { + for(var recipient in message) { + switch(recipient) { + + case 'user': + this.users[message.id].onMessage(message.user); + break; + case 'channel': + this.onMessage(message.channel); + break; + default: + throw 'unknown recipient'; + break; + } + } + }; /* Channel.prototype.addUser = function(user){ var userIds = Object.keys(this.users); diff --git a/app/Lobby/Coordinator.js b/app/Lobby/Coordinator.js index 65d5339..8322726 100755 --- a/app/Lobby/Coordinator.js +++ b/app/Lobby/Coordinator.js @@ -40,10 +40,15 @@ function(User, Channel, nodeFork) { if(!channel) { try { - console.log('try'); - channel = fork('app/Bootstrap/Channel.js'); + channel = fork('channel.js'); channel.send('CREATE'); - channel.send('{setName:"' + channelName + '"}'); + + channel.send({ + channel: { + setName: channelName + } + }); + } catch (err) { throw 'Failed to fork channel ' + channelName + '! (' + err + ')'; } diff --git a/channel.js b/channel.js index 183fe7a..0c6ac7d 100755 --- a/channel.js +++ b/channel.js @@ -1,9 +1,4 @@ -console.log(requirejs); - - -var ree = require('requirejs'); - -console.log(ree); +var requirejs = require('requirejs'); requirejs.config({ baseUrl: 'app'