Messing with validation of messages. I have a bit more to do, but thi…

…s is the first step

lib/agent.coffee

@@ -72,11 +72,21 @@ module.exports = class Agent
 
   forward: (message, data) ->
     logger.verbose "<<<<<forwarding", message, " - ", data
-    @connectionState.handle "forward", message, data
+    if @validator
+      @validator.validate message, data, (err, d) =>
+        if !err
+          @connectionState.handle "forward", message, d
+        else
+          #TODO: Broadcast error
+          logger.error "EERRRRRORRORORRR", err.toString()
+    else
+      @connectionState.handle "forward", message, data
 
   send: (message, data) ->
     logger.verbose ">>>>>>>sending", message, " - ", data
     @connectionState.handle "send", message, data
 
+  validateWith: (@validator) ->
+
   # end: (message, data)
 

lib/arena.coffee

@@ -23,9 +23,11 @@ module.exports = class Arena extends EventEmitter
 
     availablePositions = @builder.positions(agents.length)
     game = @builder.createGame(availablePositions.slice(0))
+    messageValidator = @builder.validator()
 
     for agent in und.shuffle(agents)
       position = availablePositions.shift()
+      agent.validateWith(messageValidator)
       do (game, position, agent) =>
         logger.info "wiring up #{agent} to #{position}"
 

lib/cardPile.coffee

@@ -51,4 +51,4 @@ module.exports = class CardPile
     @cards.length == 0
 
   toJSON: ->
-    @cards
+    @cards.map (card) -> card.toJSON()

lib/entrance.coffee

@@ -9,7 +9,7 @@ module.exports = class Entrance
       agent.send("entryGranted", message: "How ya doing?")
       if arena = @arenas[data.game]
         agent.in.once 'requestingGame', (data) =>
-          console.log "game requested", data
+          logger.info "game requested", data
           arena.addAgent(agent)
       else
         agent.send("error", foo: "What?")

lib/fireworks/builder.coffee

@@ -14,3 +14,4 @@ module.exports = class FireworksBuilder
   createGame: (positions) ->
     new FireworksGame(positions: positions)
 
+  validator: ->

lib/hearts/actions.coffee

@@ -4,10 +4,6 @@ Rank = require './rank'
 Suit = require './suit'
 logger = require '../logger'
 
-# I'm happy with the way this logic is separated, but I am not happy with
-# the fact that messages to the agents are in this async callback world,
-# but messages from the agent to the game are going through the handleAction path
-
 exports.PassCards = class PassCards
   @build: (data) ->
     new PassCards(data.cards.map (jsonCard) -> Card.fromJSON(jsonCard))

lib/hearts/builder.coffee

@@ -1,4 +1,5 @@
 HeartsGame = require './game'
+Validator = require './validator'
 
 module.exports = class HeartsBuilder
   minAgents: 4
@@ -14,3 +15,5 @@ module.exports = class HeartsBuilder
   createGame: ->
     new HeartsGame({heartsMaxPoints: @gameOptions.heartsMaxPoints})
 
+  validator: ->
+    new Validator()

lib/hearts/validator.coffee

@@ -0,0 +1,23 @@
+Joi = require 'joi'
+
+module.exports = class Validator
+  constructor: ->
+    @schemas =
+      readyForRound: Joi.object().keys({})
+      passCards:
+        Joi.object().keys
+          cards: Joi.array().length(3)
+      readyForTrick: Joi.object().keys({})
+      playCard:
+        Joi.object().keys
+          card: Joi.object()
+      finishedRound: Joi.object().keys({})
+      finishedGame: Joi.object().keys({})
+
+  validate: (message, data, callback) ->
+    schema = @schemas[message]
+    if schema
+      schema.validate data, (args...) ->
+        callback(args...)
+    else
+      callback "Unknown message, #{message}"

package.json

@@ -19,7 +19,8 @@
     "connect-assets": "2.4.3",
     "less": "1.3.x",
     "machina": "0.3.4",
-    "socket.io": "1.0.3"
+    "socket.io": "1.0.3",
+    "joi": "4.6.0"
   },
   "devDependencies": {
     "mocha": "1.12.0",

test/lib/arenaTest.coffee

@@ -8,6 +8,7 @@ describe "Arena", ->
         start: ->
         on: ->
       Game: {}
+      validator: -> null
     @arena = new Arena(builder, [])
 
   describe "#addAgent", ->

test/lib/hearts/validatorTest.coffee

@@ -0,0 +1,26 @@
+Validator = require "../../../lib/hearts/validator"
+Pile = require "../../../lib/hearts/pile"
+Builder = require "../../../lib/hearts/builder"
+
+describe "Validator", ->
+  beforeEach ->
+    @validator = new Validator()
+
+  it "maps to the builder", ->
+    expect(new Builder().agentEvents).to.eql(Object.keys(@validator.schemas))
+
+  describe "#validate", ->
+    describe "passCards", ->
+      it "does not allow foo", (done) ->
+        @validator.validate "passCards", foo: 123, (err) ->
+          expect(err).to.not.be.empty
+          done()
+
+      it "allows cards", (done) ->
+        deck = Pile.createDeck()
+        cards = new Pile()
+        deck.moveCardsTo(3, cards)
+        @validator.validate "passCards", cards: cards.toJSON(), (err) ->
+          expect(err).to.be.null
+          done()
+