feat(node-ws): allow custom http exception status code for node-ws (#1583)

* fix(1573): allow custom http exception status code for node-ws

* update the changeset

* chore: fix the lint errors

---------

Co-authored-by: Yusuke Wada <yusuke@kamawada.com>

Author: krzysztofciombor-solidstudio

.changeset/lazy-wasps-ask.md

@@ -0,0 +1,5 @@
+---
+'@hono/node-ws': minor
+---
+
+Allow custom HTTPException in node-ws upgrade

packages/node-ws/src/index.test.ts

@@ -4,6 +4,7 @@ import { serve } from '@hono/node-server'
 import type { ServerType } from '@hono/node-server/dist/types'
 import { Hono } from 'hono'
 import { cors } from 'hono/cors'
+import { HTTPException } from 'hono/http-exception'
 import type { WSMessageReceive } from 'hono/ws'
 import { WebSocket } from 'ws'
 import { createNodeWebSocket } from '.'
@@ -312,4 +313,20 @@ describe('WebSocket helper', () => {
     expect(clientWs).toBeTruthy()
     expect(wss.clients.size).toBe(1)
   })
+
+  it('Should allow for custom HTTPException status code', async () => {
+    app.get(
+      '/',
+      upgradeWebSocket(() => {
+        throw new HTTPException(401)
+      })
+    )
+    const ws = new WebSocket('ws://localhost:3030/')
+    await new Promise<void>((resolve) =>
+      ws.on('unexpected-response', (_, response) => {
+        expect(response.statusCode).toEqual(401)
+        resolve()
+      })
+    )
+  })
 })

packages/node-ws/src/index.ts

@@ -1,8 +1,9 @@
 import type { Hono } from 'hono'
 import { defineWebSocketHelper } from 'hono/ws'
-import type { UpgradeWebSocket, WSContext, WSEvents } from 'hono/ws'
+import type { UpgradeWebSocket, WSContext } from 'hono/ws'
 import type { WebSocket } from 'ws'
 import { WebSocketServer } from 'ws'
+import { STATUS_CODES } from 'node:http'
 import type { IncomingMessage, Server } from 'node:http'
 import type { Http2SecureServer, Http2Server } from 'node:http2'
 import type { Duplex } from 'node:stream'
@@ -77,12 +78,12 @@ export const createNodeWebSocket = (init: NodeWebSocketInit): NodeWebSocket => {
           incoming: request,
           outgoing: undefined,
         }
-        await init.app.request(url, { headers: headers }, env)
+        const response = await init.app.request(url, { headers: headers }, env)
         const waiter = waiterMap.get(request)
 
         if (!waiter || waiter.connectionSymbol !== env[CONNECTION_SYMBOL_KEY]) {
           socket.end(
-            'HTTP/1.1 400 Bad Request\r\n' +
+            `HTTP/1.1 ${response.status.toString()} ${STATUS_CODES[response.status] ?? ''}\r\n` +
               'Connection: close\r\n' +
               'Content-Length: 0\r\n' +
               '\r\n'

packages/ua-blocker/src/escape.ts

@@ -60,7 +60,10 @@ function $escape(S: string): string {
     if (i === 0 && FIRST_DIGIT_OR_ASCII.exec(chr)) {
       result[i] = _escapeChar(chr)
     } else if (Object.prototype.hasOwnProperty.call(ControlEscape, chr)) {
-      result[i] = '\\' + ControlEscape[chr]
+      const escaped = ControlEscape[chr]
+      if (escaped) {
+        result[i] = '\\' + escaped
+      }
     } else if (SYNTAX_SOLIDUS.exec(chr)) {
       result[i] = '\\' + chr
     } else if (OTHER_PUNCTUATORS_AND_WHITESPACES.exec(chr)) {