From 258b2f2747900cfe33d4c41f4ad6a0e9b6a39e7a Mon Sep 17 00:00:00 2001 From: Adhiraj Singh Date: Mon, 20 Dec 2021 12:37:18 +0530 Subject: [PATCH] chore: update legacy connection close msgs --- src/LegacySocket/auth.ts | 4 ++-- src/LegacySocket/socket.ts | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/LegacySocket/auth.ts b/src/LegacySocket/auth.ts index 5ab56d1..68b2516 100644 --- a/src/LegacySocket/auth.ts +++ b/src/LegacySocket/auth.ts @@ -34,11 +34,11 @@ const makeAuthSocket = (config: LegacySocketConfig) => { }) // add close listener ws.on('ws-close', (error: Boom | Error) => { - logger.info({ error }, 'Closed connection to WhatsApp') + logger.info({ error }, 'closed connection to WhatsApp') initTimeout && clearTimeout(initTimeout) // if no reconnects occur // send close event - updateState({ + updateState({ connection: 'close', qr: undefined, lastDisconnect: { diff --git a/src/LegacySocket/socket.ts b/src/LegacySocket/socket.ts index c4a761f..7cb9ccf 100644 --- a/src/LegacySocket/socket.ts +++ b/src/LegacySocket/socket.ts @@ -96,7 +96,7 @@ export const makeSocket = ({ return tag } const end = (error: Error | undefined) => { - logger.debug({ error }, 'connection closed') + logger.info({ error }, 'connection closed') ws.removeAllListeners('close') ws.removeAllListeners('error') @@ -213,7 +213,7 @@ export const makeSocket = ({ */ const waitForMessage = (tag: string, requiresPhoneConnection: boolean, timeoutMs?: number) => { if(ws.readyState !== ws.OPEN) { - throw new Boom('Connection Closed', { statusCode: DisconnectReason.connectionClosed }) + throw new Boom('Connection not open', { statusCode: DisconnectReason.connectionClosed }) } let cancelToken = () => { } @@ -228,7 +228,7 @@ export const makeSocket = ({ (resolve, reject) => { onRecv = resolve onErr = err => { - reject(err || new Boom('Connection Closed', { statusCode: DisconnectReason.connectionClosed })) + reject(err || new Boom('Intentional Close', { statusCode: DisconnectReason.connectionClosed })) } cancelToken = () => onErr(new Boom('Cancelled', { statusCode: 500 })) @@ -311,7 +311,7 @@ export const makeSocket = ({ const waitForSocketOpen = async() => { if(ws.readyState === ws.OPEN) return if(ws.readyState === ws.CLOSED || ws.readyState === ws.CLOSING) { - throw new Boom('Connection Closed', { statusCode: DisconnectReason.connectionClosed }) + throw new Boom('Connection Already Closed', { statusCode: DisconnectReason.connectionClosed }) } let onOpen: () => void let onClose: (err: Error) => void