From 126a1ecf113d7fca8232281185f7a8723f6a9da5 Mon Sep 17 00:00:00 2001 From: Mehul Mohan Date: Sat, 28 Mar 2020 02:42:38 +0530 Subject: [PATCH] Squash commit --- src/connection.ts | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/connection.ts b/src/connection.ts index 69389a4..3a2f1e4 100644 --- a/src/connection.ts +++ b/src/connection.ts @@ -13,11 +13,19 @@ export function listen(options: { }) { const { webSocket, onConnection } = options; const logger = options.logger || new ConsoleLogger(); - webSocket.onopen = () => { - const socket = toSocket(webSocket); + + const socket = toSocket(webSocket); + + + if (webSocket.readyState === WebSocket.OPEN) { const connection = createWebSocketConnection(socket, logger); - onConnection(connection); - }; + onConnection(connection); + } else { + webSocket.onopen = () => { + const connection = createWebSocketConnection(socket, logger); + onConnection(connection); + }; + } } export function toSocket(webSocket: WebSocket): IWebSocket { @@ -32,4 +40,4 @@ export function toSocket(webSocket: WebSocket): IWebSocket { onClose: cb => webSocket.onclose = event => cb(event.code, event.reason), dispose: () => webSocket.close() } -} \ No newline at end of file +}