Merge pull request #14 from EnCiv/stream-err

catch the stream error and reset

Author: ddfridley

app/server/socket-api.js

@@ -16,6 +16,14 @@ function handlerWrapper(handler, handle, ...args) {
   }
 }
 
+function handlerStreamWrapper(handler, handle, ...args) {
+  try {
+    handler.call(this, ...args)
+  } catch (error) {
+    logger.error('caught error from stream api handler', handle, error.message, 'continuing', error)
+  }
+}
+
 class API {
   constructor() {
     this.users = []
@@ -65,6 +73,7 @@ class API {
           .on('connect_timeout', error => {
             logger.error('socket io connection_timeout', error, this)
           })
+          .on('error', err => logger.error('socketAPI server caught error', err))
       } catch (error) {
         logger.error('API start caught error', error)
       }
@@ -144,17 +153,19 @@ class API {
         socket.emit('OK ' + event, ...responses)
       }
 
-      socket.error = error => {
-        logger.error('api connected socket.error caught error', error)
-      }
       var ssSocket
 
       for (let handle in this.handlers) {
         if (handle.endsWith('development') && process.env.NODE_ENV !== 'development') continue // ignore handlers that end with "development" in production
         if (handle.startsWith('stream')) {
-          if (!ssSocket) ssSocket = ss(socket)
+          if (!ssSocket) {
+            ssSocket = ss(socket)
+            ssSocket.on('error', err => logger.error('socket-api ssSocket error', err))
+            ssSocket.on('uncaughtException', err => logger.error('socket uncaught', err))
+            ssSocket.on('close', () => console.error('got close'))
+          }
           // handlers that use streams need to start with 'stream' and they are wrapped differently to work
-          ssSocket.on(handle, handlerWrapper.bind(ssSocket, this.handlers[handle], handle))
+          ssSocket.on(handle, handlerStreamWrapper.bind(ssSocket, this.handlers[handle], handle))
         } else socket.on(handle, handlerWrapper.bind(socket, this.handlers[handle], handle))
       }
       // thanks to https://stackoverflow.com/questions/41751141/socket-io-how-to-access-unhandled-messages

app/server/the-civil-server.js

@@ -45,6 +45,11 @@ class HttpServer {
     this.App = App
     this.setUserCookie = setUserCookie.bind(this) // user cookie needs this context so it doesn't have to lookup users in the DB every time
     this.socketAPI = new SocketAPI()
+    if (process.listeners('uncaughtException') === 0) {
+      process.on('uncaughtException', err => {
+        logger.error('theCivliServer: Uncaught Exception thrown\n', err, '\ncontinuing')
+      })
+    }
   }
 
   addRoutesDirectory(dirPath) {

app/socket-apis/stream-test-development.js

@@ -2,10 +2,12 @@
 const { pipeline } = require('stream')
 
 export default function streamTest(stream) {
-  try {
-    console.info('stream test on server', stream)
-    pipeline(stream, process.stdout, err => err && console.log(err))
-  } catch (err) {
-    console.info('streamTest caught error', err)
-  }
+  console.info('stream test on server', stream)
+  let self = this // is an ss(socket)
+  pipeline(stream, process.stdout, err => {
+    process.stdout.end()
+    self._ondisconnect()
+    self.sio.disconnect(true)
+    err && console.error(err)
+  })
 }

app/tools/stream-test.js

@@ -2,9 +2,12 @@
 const { pipeline } = require('stream')
 const ss = require('@sap_oss/node-socketio-stream')
 
+var host = process.argv[2] || 'http://localhost:3011'
+console.info('target is', host)
+
 // client side
 const client = require('socket.io-client')
-const socket = client.connect('http://localhost:3011')
+const socket = client.connect(host)
 
 socket.on('connect', () => {
   var stream = ss.createStream()

test-socket-error.js

@@ -0,0 +1,44 @@
+const express = require('express')
+const socketio = require('socket.io')
+const http = require('http')
+
+const PORT = process.env.PORT || 8000
+
+const app = express()
+const server = http.createServer(app)
+const io = socketio(server)
+
+server.listen(PORT, () => {
+  console.log(`Listening on port ${PORT}`)
+})
+
+const checkLength = bar => {
+  console.info('bar', bar)
+  if (bar.length > 14) {
+    console.info('throwing error')
+    throw Error('word is too long!')
+  }
+  // ...
+}
+
+io.on('connection', socket => {
+  console.log('new socket connection')
+
+  socket.on('foo', bar => {
+    try {
+      checkLength(bar)
+    } catch (e) {
+      console.info('caught error', e)
+      socket.emit('oops', e.message)
+      return
+    }
+    console.log('app did not crash!')
+  })
+})
+
+const client = require('socket.io-client')
+const socket = client.connect('http://localhost:8000')
+socket.on('connect', () => {
+  socket.emit('foo', '123456789012345')
+  console.info('emitted')
+})