feat(bun): WebSocket helper supports that env be { server: server } (…

…#2812)

* feat: WebSocket helper supports `{ server }`

* test: add test

* chore: format code

* fix: test

* chore: format code

* fix: format code with new rule

* chore: format code

Fixes #2645
Fixes #2696

src/adapter/bun/conninfo.ts

@@ -1,21 +1,14 @@
 import type { Context } from '../..'
 import type { GetConnInfo } from '../../helper/conninfo'
+import { getBunServer } from './server'
 
 /**
  * Get ConnInfo with Bun
  * @param c Context
  * @returns ConnInfo
  */
 export const getConnInfo: GetConnInfo = (c: Context) => {
-  const server = ('server' in c.env ? c.env.server : c.env) as
-    | {
-        requestIP?: (req: Request) => {
-          address: string
-          family: string
-          port: number
-        }
-      }
-    | undefined
+  const server = getBunServer(c)
 
   if (!server) {
     throw new TypeError('env has to include the 2nd argument of fetch.')

src/adapter/bun/server.test.ts

@@ -0,0 +1,19 @@
+import { Context } from '../../context'
+import { HonoRequest } from '../../request'
+import { getBunServer } from './server'
+import type { BunServer } from './server'
+
+describe('getBunServer', () => {
+  it('Should success to pick Server', () => {
+    const server = {} as BunServer
+
+    expect(
+      getBunServer(new Context(new HonoRequest(new Request('http://localhost/')), { env: server }))
+    ).toBe(server)
+    expect(
+      getBunServer(
+        new Context(new HonoRequest(new Request('http://localhost/')), { env: { server } })
+      )
+    ).toBe(server)
+  })
+})

src/adapter/bun/server.ts

@@ -0,0 +1,30 @@
+/**
+ * Getting Bun Server Object for Bun adapters
+ * @module
+ */
+import type { Context } from '../../context'
+
+/**
+ * Bun Server Object
+ */
+export interface BunServer {
+  requestIP?: (req: Request) => {
+    address: string
+    family: string
+    port: number
+  }
+  upgrade<T>(
+    req: Request,
+    options?: {
+      data: T
+    }
+  ): boolean
+}
+
+/**
+ * Get Bun Server Object from Context
+ * @param c Context
+ * @returns Bun Server
+ */
+export const getBunServer = (c: Context): BunServer | undefined =>
+  ('server' in c.env ? c.env.server : c.env) as BunServer | undefined

src/adapter/bun/websocket.ts

@@ -5,21 +5,15 @@ import type {
   WSEvents,
   WSMessageReceive,
 } from '../../helper/websocket'
+import { getBunServer } from './server'
 
 interface BunServerWebSocket<T> {
   send(data: string | ArrayBufferLike, compress?: boolean): void
   close(code?: number, reason?: string): void
   data: T
   readyState: 0 | 1 | 2 | 3
 }
-interface BunServer {
-  upgrade<T>(
-    req: Request,
-    options?: {
-      data: T
-    }
-  ): boolean
-}
+
 interface BunWebSocketHandler<T> {
   open(ws: BunServerWebSocket<T>): void
   close(ws: BunServerWebSocket<T>, code?: number, reason?: string): void
@@ -60,7 +54,10 @@ export const createBunWebSocket: CreateWebSocket = () => {
 
   const upgradeWebSocket: UpgradeWebSocket = (createEvents) => {
     return async (c, next) => {
-      const server = c.env as BunServer
+      const server = getBunServer(c)
+      if (!server) {
+        throw new TypeError('env has to include the 2nd argument of fetch.')
+      }
       const connId = websocketConns.push(await createEvents(c)) - 1
       const upgradeResult = server.upgrade<BunWebSocketData>(c.req.raw, {
         data: {