Add type for websocket error handler

Author: code-asher

src/node/routes/index.ts

@@ -16,6 +16,7 @@ import { redirect, replaceTemplates } from "../http"
 import { PluginAPI } from "../plugin"
 import { getMediaMime, paths } from "../util"
 import { wrapper } from "../wrapper"
+import { WebsocketErrorRequestHandler } from "../wsRouter"
 import * as apps from "./apps"
 import * as domainProxy from "./domainProxy"
 import * as health from "./health"
@@ -180,9 +181,9 @@ export const register = async (
 
   app.use(errorHandler)
 
-  const wsErrorHandler: express.ErrorRequestHandler = async (err, req, res, next) => {
+  const wsErrorHandler: WebsocketErrorRequestHandler = async (err, req, res, next) => {
     logger.error(`${err.message} ${err.stack}`)
-    ;(req as pluginapi.WebsocketRequest).ws.end()
+    req.ws.end()
   }
 
   wsApp.use(wsErrorHandler)

src/node/wsRouter.ts

@@ -21,6 +21,20 @@ export const handleUpgrade = (app: express.Express, server: http.Server): void =
   })
 }
 
+// This is a version of expressCore.ErrorRequestHandler with the websocket on
+// the request.
+export type WebsocketErrorRequestHandler<
+  P = expressCore.ParamsDictionary,
+  ResBody = any,
+  ReqBody = any,
+  ReqQuery = expressCore.Query
+> = (
+  err: any,
+  req: pluginapi.WebsocketRequest<P, ResBody, ReqBody, ReqQuery>,
+  res: Response<ResBody>,
+  next: express.Core.NextFunction,
+) => any
+
 interface InternalWebsocketRequest extends pluginapi.WebsocketRequest {
   _ws_handled: boolean
 }