fix(adapter): escape reply message, reconnect datafeed on error

xml characters in a reply are escaped to avoid creating invalid messageML
if an error is encountered polling a datafeed a new one will be created

package.json

@@ -26,6 +26,7 @@
   "homepage": "https://github.com/symphonyoss/hubot-symphony",
   "dependencies": {
     "fs": "0.0.2",
+    "html-entities": "^1.2.0",
     "log": "^1.4.0",
     "memoizee": "^0.4.1",
     "q": "^1.4.1",

src/adapter.coffee

@@ -19,6 +19,8 @@
 Symphony = require './symphony'
 {V2Message} = require './message'
 memoize = require 'memoizee'
+Entities = require('html-entities').XmlEntities
+entities = new Entities()
 
 class SymphonyAdapter extends Adapter
 
@@ -39,7 +41,7 @@ class SymphonyAdapter extends Adapter
   reply: (envelope, messages...) ->
     @robot.logger.debug "Reply"
     for message in messages
-      @symphony.sendMessage(envelope.room, "<messageML><mention email=\"#{envelope.user.emailAddress}\"/> #{message}</messageML>", 'MESSAGEML')
+      @symphony.sendMessage(envelope.room, "<messageML><mention email=\"#{envelope.user.emailAddress}\"/> #{entities.encode(message)}</messageML>", 'MESSAGEML')
 
   run: =>
     @robot.logger.info "Initialising..."
@@ -91,6 +93,7 @@ class SymphonyAdapter extends Adapter
           @emit 'poll', id
         .fail (err) =>
           @robot.emit 'error', new Error("Unable to read datafeed #{id}: #{err}")
+          @_createDatafeed()
 
   _receiveMessage: (message) =>
     if message.fromUserId != @robot.userId

src/symphony.coffee

@@ -104,10 +104,10 @@ class Symphony
 
     request(options, (err, res, data) =>
       if err?
-        logger.warning "received error response from #{path}: #{err}"
+        logger.warning "received #{res?.statusCode} error response from #{path}: #{err}"
         deferred.reject(new Error(err))
       else
-        logger.debug "received #{res.statusCode} response from #{path}: #{JSON.stringify(data)}"
+        logger.debug "received #{res?.statusCode} response from #{path}: #{JSON.stringify(data)}"
         deferred.resolve data
     )
     deferred.promise

test/adapter-test.coffee

@@ -101,3 +101,21 @@ describe 'Adapter test suite', () ->
       assert.isAtLeast((m for m in nock.messages when m.message is "<messageML><mention email=\"[email protected]\"/> foo bar baz</messageML>").length, 1)
       done()
     adapter.run()
+
+  it 'should escape xml chars in reply', (done) ->
+    robot = new FakeRobot
+    adapter = SymphonyAdapter.use(robot)
+    adapter.on 'connected', () ->
+      assert.isDefined(adapter.symphony)
+      envelope = {
+        room: nock.streamId
+        user: {
+          emailAddress: '[email protected]'
+        }
+      }
+      adapter.reply(envelope, '<&>')
+      adapter.close()
+    nock.on 'received', () ->
+      assert.isAtLeast((m for m in nock.messages when m.message is "<messageML><mention email=\"[email protected]\"/> &lt;&amp;&gt;</messageML>").length, 1)
+      done()
+    adapter.run()