Close sockets correctly

code-asher · code-asher · commit f8cef4d6f66e · 2020-11-10T17:52:12.000-06:00
diff --git a/src/node/routes/index.ts b/src/node/routes/index.ts
@@ -155,7 +155,7 @@ export const register = async (
 
   const wsErrorHandler: express.ErrorRequestHandler = async (err, req) => {
     logger.error(`${err.message} ${err.stack}`)
-    ;(req as WebsocketRequest).ws.destroy(err)
+    ;(req as WebsocketRequest).ws.end()
   }
 
   wsApp.use(wsErrorHandler)
diff --git a/src/node/wsRouter.ts b/src/node/wsRouter.ts
@@ -5,16 +5,14 @@ import * as net from "net"
 
 export const handleUpgrade = (app: express.Express, server: http.Server): void => {
   server.on("upgrade", (req, socket, head) => {
-    socket.on("error", () => socket.destroy())
-
     req.ws = socket
     req.head = head
     req._ws_handled = false
 
     // Send the request off to be handled by Express.
     ;(app as any).handle(req, new http.ServerResponse(req), () => {
       if (!req._ws_handled) {
-        socket.destroy(new Error("Not found"))
+        socket.end("HTTP/1.1 404 Not Found\r\n\r\n")
       }
     })
   })

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ export const register = async (`
`155`	`155`
`156`	`156`	`const wsErrorHandler: express.ErrorRequestHandler = async (err, req) => {`
`157`	`157`	logger.error(`${err.message} ${err.stack}`)
`158`		`- ;(req as WebsocketRequest).ws.destroy(err)`
	`158`	`+ ;(req as WebsocketRequest).ws.end()`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`wsApp.use(wsErrorHandler)`