From 2efa916d01048790e4eca6b8619f226fa35887da Mon Sep 17 00:00:00 2001
From: fzn0x <fncolon@pm.me>
Date: Tue, 28 May 2024 17:38:46 +0700
Subject: [PATCH] refactor(websocket): remove unused condition

---
 .../cloudflare-workers/websocket.test.ts      |  1 -
 src/adapter/cloudflare-workers/websocket.ts   | 25 ++++++-------------
 src/adapter/deno/websocket.ts                 |  8 +++---
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/adapter/cloudflare-workers/websocket.test.ts b/src/adapter/cloudflare-workers/websocket.test.ts
index d848dc431..47aa0cc9b 100644
--- a/src/adapter/cloudflare-workers/websocket.test.ts
+++ b/src/adapter/cloudflare-workers/websocket.test.ts
@@ -22,7 +22,6 @@ describe('upgradeWebSocket middleware', () => {
       upgradeWebSocket(() => ({
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         onMessage(evt, ws) {
-          console.log('evt')
           resolve(evt.data)
         },
       }))
diff --git a/src/adapter/cloudflare-workers/websocket.ts b/src/adapter/cloudflare-workers/websocket.ts
index 39a14dab7..d4a9f1218 100644
--- a/src/adapter/cloudflare-workers/websocket.ts
+++ b/src/adapter/cloudflare-workers/websocket.ts
@@ -28,31 +28,22 @@ export const upgradeWebSocket: UpgradeWebSocket = (createEvents) => async (c, ne
     send: (source) => server.send(source),
   }
   if (events.onOpen) {
-    server.addEventListener('open', (evt: Event) => events.onOpen && events.onOpen(evt, wsContext))
+    server.addEventListener('open', (evt: Event) => events.onOpen?.(evt, wsContext))
   }
   if (events.onClose) {
-    server.addEventListener(
-      'close',
-      (evt: CloseEvent) => events.onClose && events.onClose(evt, wsContext)
-    )
+    server.addEventListener('close', (evt: CloseEvent) => events.onClose?.(evt, wsContext))
   }
   if (events.onMessage) {
-    server.addEventListener(
-      'message',
-      (evt: MessageEvent) => events.onMessage && events.onMessage(evt, wsContext)
-    )
+    server.addEventListener('message', (evt: MessageEvent) => events.onMessage?.(evt, wsContext))
   }
   if (events.onError) {
-    server.addEventListener(
-      'error',
-      (evt: Event) => events.onError && events.onError(evt, wsContext)
-    )
+    server.addEventListener('error', (evt: Event) => events.onError?.(evt, wsContext))
   }
-  // @ts-expect-error server.accept is not typed
-  server.accept()
+
+  // @ts-expect-error - server.accept is not typed
+  server.accept?.()
   return new Response(null, {
-    status: 101,
-    // @ts-expect-error type not typed
+    // @ts-expect-error - webSocket is not typed
     webSocket: client,
   })
 }
diff --git a/src/adapter/deno/websocket.ts b/src/adapter/deno/websocket.ts
index f523ef150..c531bb051 100644
--- a/src/adapter/deno/websocket.ts
+++ b/src/adapter/deno/websocket.ts
@@ -21,10 +21,10 @@ export const upgradeWebSocket: UpgradeWebSocket = (createEvents) => async (c, ne
     url: socket.url ? new URL(socket.url) : null,
     send: (source) => socket.send(source),
   }
-  socket.onopen = (evt) => events.onOpen && events.onOpen(evt, wsContext)
-  socket.onmessage = (evt) => events.onMessage && events.onMessage(evt, wsContext)
-  socket.onclose = (evt) => events.onClose && events.onClose(evt, wsContext)
-  socket.onerror = (evt) => events.onError && events.onError(evt, wsContext)
+  socket.onopen = (evt) => events.onOpen?.(evt, wsContext)
+  socket.onmessage = (evt) => events.onMessage?.(evt, wsContext)
+  socket.onclose = (evt) => events.onClose?.(evt, wsContext)
+  socket.onerror = (evt) => events.onError?.(evt, wsContext)
 
   return response
 }