Merge branch 'RasPhilCo-surface-error-msg'

lib/eventsource.js

@@ -46,10 +46,10 @@ function EventSource (url, eventSourceInitDict) {
   var self = this
   self.reconnectInterval = 1000
 
-  function onConnectionClosed () {
+  function onConnectionClosed (message) {
     if (readyState === EventSource.CLOSED) return
     readyState = EventSource.CONNECTING
-    _emit('error', new Event('error'))
+    _emit('error', new Event('error', {message: message}))
 
     // The url may have been changed by a temporary
     // redirect. If that's the case, revert it now.
@@ -133,7 +133,7 @@ function EventSource (url, eventSourceInitDict) {
     req = (isSecure ? https : http).request(options, function (res) {
       // Handle HTTP errors
       if (res.statusCode === 500 || res.statusCode === 502 || res.statusCode === 503 || res.statusCode === 504) {
-        _emit('error', new Event('error', {status: res.statusCode}))
+        _emit('error', new Event('error', {status: res.statusCode, message: res.statusMessage}))
         onConnectionClosed()
         return
       }
@@ -142,7 +142,7 @@ function EventSource (url, eventSourceInitDict) {
       if (res.statusCode === 301 || res.statusCode === 307) {
         if (!res.headers.location) {
           // Server sent redirect response without Location header.
-          _emit('error', new Event('error', {status: res.statusCode}))
+          _emit('error', new Event('error', {status: res.statusCode, message: res.statusMessage}))
           return
         }
         if (res.statusCode === 307) reconnectUrl = url
@@ -152,7 +152,7 @@ function EventSource (url, eventSourceInitDict) {
       }
 
       if (res.statusCode !== 200) {
-        _emit('error', new Event('error', {status: res.statusCode}))
+        _emit('error', new Event('error', {status: res.statusCode, message: res.statusMessage}))
         return self.close()
       }
 
@@ -227,7 +227,10 @@ function EventSource (url, eventSourceInitDict) {
       })
     })
 
-    req.on('error', onConnectionClosed)
+    req.on('error', function(err) {
+      onConnectionClosed(err.message)
+    })
+
     if (req.setNoDelay) req.setNoDelay(true)
     req.end()
   }

test/eventsource_test.js

@@ -564,7 +564,7 @@ describe('HTTP Request', function () {
         if (err) return done(err)
 
         server.on('request', function (req, res) {
-          res.writeHead(status, {
+          res.writeHead(status, 'status message', {
             'Connection': 'Close'
           })
           res.end()
@@ -573,6 +573,7 @@ describe('HTTP Request', function () {
         var es = new EventSource(server.url)
         es.onerror = function (err) {
           assert.equal(err.status, status)
+          assert.equal(err.message, 'status message')
           server.close(done)
         }
       })
@@ -585,13 +586,14 @@ describe('HTTP Request', function () {
         if (err) return done(err)
 
         server.on('request', function (req, res) {
-          res.writeHead(status, {'Content-Type': 'text/html'})
+          res.writeHead(status, 'status message', {'Content-Type': 'text/html'})
           res.end()
         })
 
         var es = new EventSource(server.url)
         es.onerror = function (err) {
           assert.equal(err.status, status)
+          assert.equal(err.message, 'status message')
           server.close(done)
         }
       })
@@ -770,7 +772,7 @@ describe('Reconnection', function () {
       if (err) return done(err)
 
       server.on('request', function (req, res) {
-        res.writeHead(204)
+        res.writeHead(204, 'status message')
         res.end()
       })
 
@@ -779,6 +781,7 @@ describe('Reconnection', function () {
 
       es.onerror = function (e) {
         assert.equal(e.status, 204)
+        assert.equal(e.message, 'status message')
         server.close(function (err) {
           if (err) return done(err)