fix: resolve connect Promise on close before open (AnWeber/httpbook#96)

AnWeber · Sep 10, 2023 · 2b42690 · 2b42690
1 parent 868cd9e
commit 2b42690
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [unreleased]
+
+- resolve connect Promise in Websocket Requests on close before open Connection ()
+
 ## [6.6.5]  (2023-09-06)
 
 ### Fixes

diff --git a/src/plugins/websocket/websocketRequestClient.ts b/src/plugins/websocket/websocketRequestClient.ts
@@ -46,9 +46,13 @@ export class WebsocketRequestClient extends models.AbstractRequestClient<WebSock
       if (this.closeOnFinish) {
         this.registerEvents(this._nativeClient);
         await new Promise<void>(resolve => {
-          this._nativeClient?.on('open', () => {
+          const resolveListener = () => {
             resolve();
-          });
+            this.nativeClient?.off('open', resolveListener);
+            this.nativeClient?.off('close', resolveListener);
+          };
+          this._nativeClient?.on('open', resolveListener);
+          this._nativeClient?.on('close', resolveListener);
         });
       }
     }
@@ -134,7 +138,7 @@ export class WebsocketRequestClient extends models.AbstractRequestClient<WebSock
           date: new Date(),
         },
         request: this.request,
-        body: utils.toString(reason),
+        body: utils.toString(reason) || 'close',
         rawBody: Buffer.isBuffer(reason) ? reason : undefined,
       });
       this.removeWebsocketSession();