fix(useWebsocket): reset pongTimeout on close (#3324)

Co-authored-by: Anthony Fu <anthonyfu117@hotmail.com>
vueuse · Aug 25, 2023 · aea27f8 · aea27f8
1 parent 72cc6e4
commit aea27f8
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/packages/core/useWebSocket/index.ts b/packages/core/useWebSocket/index.ts
@@ -171,15 +171,6 @@ export function useWebSocket<Data = any>(
 
   let pongTimeoutWait: ReturnType<typeof setTimeout> | undefined
 
-  // Status code 1000 -> Normal Closure https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent/code
-  const close: WebSocket['close'] = (code = 1000, reason) => {
-    if (!wsRef.value)
-      return
-    explicitlyClosed = true
-    heartbeatPause?.()
-    wsRef.value.close(code, reason)
-  }
-
   const _sendBuffer = () => {
     if (bufferedData.length && wsRef.value && status.value === 'OPEN') {
       for (const buffer of bufferedData)
@@ -193,6 +184,16 @@ export function useWebSocket<Data = any>(
     pongTimeoutWait = undefined
   }
 
+  // Status code 1000 -> Normal Closure https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent/code
+  const close: WebSocket['close'] = (code = 1000, reason) => {
+    if (!wsRef.value)
+      return
+    explicitlyClosed = true
+    resetHeartbeat()
+    heartbeatPause?.()
+    wsRef.value.close(code, reason)
+  }
+
   const send = (data: string | ArrayBuffer | Blob, useBuffer = true) => {
     if (!wsRef.value || status.value !== 'OPEN') {
       if (useBuffer)