lint/format/tests

Author: BlankParticle

src/server.ts

@@ -16,7 +16,7 @@ export const createAdaptorServer = (options: Options): ServerType => {
   const createServer: any = options.createServer || createServerHTTP
   const server: ServerType = createServer(options.serverOptions || {}, requestListener)
   if (options.websocket && options.websocket.server) {
-    if (options.websocket.server.options.noServer !== true) 
+    if (options.websocket.server.options.noServer !== true)
       throw new Error('WebSocket server must be created with { noServer: true } option')
     setupWebSocket({ server, fetchCallback, wss: options.websocket.server })
   }

src/types.ts

@@ -1,3 +1,4 @@
+import type { WebSocketServer } from 'ws'
 import type {
   createServer,
   IncomingMessage,
@@ -19,7 +20,6 @@ import type {
   createServer as createHttpsServer,
   ServerOptions as HttpsServerOptions,
 } from 'node:https'
-import type { WebSocketServer } from 'ws'
 
 export type HttpBindings = {
   incoming: IncomingMessage

src/url.ts

@@ -41,7 +41,6 @@ for (let c = 0x61; c <= 0x7a; c++) {
   allowedRequestUrlChar[c] = 1
 }
 ;(() => {
-  // eslint-disable-next-line quotes
   const chars = "-./:?#[]@!$&'()*+,;=~_"
   for (let i = 0; i < chars.length; i++) {
     allowedRequestUrlChar[chars.charCodeAt(i)] = 1

src/websocket.ts

@@ -1,5 +1,5 @@
-import type { UpgradeWebSocket } from 'hono/ws'
-import { defineWebSocketHelper, WSContext } from 'hono/ws'
+import type { UpgradeWebSocket, WSContext } from 'hono/ws'
+import { defineWebSocketHelper } from 'hono/ws'
 import type { RawData, WebSocket, WebSocketServer } from 'ws'
 import type { IncomingMessage } from 'node:http'
 import { STATUS_CODES } from 'node:http'
@@ -83,8 +83,8 @@ const createUpgradeRequest = (request: IncomingMessage): Request => {
 }
 
 export const setupWebSocket = (options: {
-  server: ServerType,
-  fetchCallback: FetchCallback,
+  server: ServerType
+  fetchCallback: FetchCallback
   wss: WebSocketServer
 }): void => {
   const { server, fetchCallback, wss } = options
@@ -93,7 +93,7 @@ export const setupWebSocket = (options: {
     IncomingMessage,
     { resolve: (ws: WebSocket) => void; connectionSymbol: symbol }
   >()
-  
+
   wss.on('connection', (ws, request) => {
     const waiter = waiterMap.get(request)
     if (waiter) {

test/websocket.test.ts

@@ -5,7 +5,8 @@ import { createAdaptorServer, upgradeWebSocket } from '../src'
 
 describe('WebSocket', () => {
   const startServer = (app: Hono) => {
-    const server = createAdaptorServer({ fetch: app.fetch, websocket: true })
+    const wss = new WebSocketServer({ noServer: true })
+    const server = createAdaptorServer({ fetch: app.fetch, websocket: { server: wss } })
     return new Promise<{ server: ReturnType<typeof createAdaptorServer>; address: AddressInfo }>(
       (resolve) => {
         server.listen(0, () => {