From bf63ae494dbba876826b224eb09138cce6546378 Mon Sep 17 00:00:00 2001 From: shuse2 Date: Wed, 22 Apr 2020 10:13:29 +0200 Subject: [PATCH] :bug: Fix invalid nullish check --- elements/lisk-p2p/src/peer/base.ts | 2 +- elements/lisk-p2p/src/peer/inbound.ts | 6 +++--- elements/lisk-p2p/src/peer/outbound.ts | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/elements/lisk-p2p/src/peer/base.ts b/elements/lisk-p2p/src/peer/base.ts index 9e73d84d764..87ce511cab4 100644 --- a/elements/lisk-p2p/src/peer/base.ts +++ b/elements/lisk-p2p/src/peer/base.ts @@ -68,7 +68,7 @@ import { } from '../utils'; // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment -export const socketErrorStatusCodes = { +export const socketErrorStatusCodes: { [key: number]: string | undefined } = { // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-explicit-any ...(socketClusterClient.SCClientSocket as any).errorStatuses, 1000: 'Intentionally disconnected', diff --git a/elements/lisk-p2p/src/peer/inbound.ts b/elements/lisk-p2p/src/peer/inbound.ts index 03e1c1259d4..e8da77326d1 100644 --- a/elements/lisk-p2p/src/peer/inbound.ts +++ b/elements/lisk-p2p/src/peer/inbound.ts @@ -60,10 +60,10 @@ export class InboundPeer extends Peer { this.emit(EVENT_INBOUND_SOCKET_ERROR, error); }; this._handleInboundSocketClose = (code, reasonMessage) => { - // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment const reason = - // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access - reasonMessage ?? socketErrorStatusCodes[code] ?? 'Unknown reason'; + reasonMessage !== undefined && reasonMessage !== '' + ? reasonMessage + : socketErrorStatusCodes[code] ?? 'Unknown reason'; // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition if (this._pingTimeoutId) { clearTimeout(this._pingTimeoutId); diff --git a/elements/lisk-p2p/src/peer/outbound.ts b/elements/lisk-p2p/src/peer/outbound.ts index 0b1fb7f20e0..e69f2184bbb 100644 --- a/elements/lisk-p2p/src/peer/outbound.ts +++ b/elements/lisk-p2p/src/peer/outbound.ts @@ -172,10 +172,10 @@ export class OutboundPeer extends Peer { outboundSocket.on( 'close', (code: number, reasonMessage: string | undefined) => { - // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment - const reason = - // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access - reasonMessage ?? socketErrorStatusCodes[code] ?? 'Unknown reason'; + const reason: string = + reasonMessage !== undefined && reasonMessage !== '' + ? reasonMessage + : socketErrorStatusCodes[code] ?? 'Unknown reason'; this.emit(EVENT_CLOSE_OUTBOUND, { peerInfo: this._peerInfo, code,