From 39bc35bee1b7e8cb809dc6088a03498764c30256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Huan=20LI=20=28=E6=9D=8E=E5=8D=93=E6=A1=93=29?= Date: Tue, 26 May 2020 00:21:42 +0800 Subject: [PATCH] fix type guard for json rpc peer (#1984) --- src/io-peer/io-peer.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/io-peer/io-peer.ts b/src/io-peer/io-peer.ts index 4761186e..bacc9460 100644 --- a/src/io-peer/io-peer.ts +++ b/src/io-peer/io-peer.ts @@ -14,10 +14,10 @@ import Peer, { // type UnknownJsonRpcPayload = Partial> -const isJsonRpcRequest = (payload: JsonRpcPayload): payload is JsonRpcPayloadRequest => payload.type === 'request' -const isJsonRpcNotification = (payload: JsonRpcPayload): payload is JsonRpcPayloadNotification => payload.type === 'notification' -const isJsonRpcResponse = (payload: JsonRpcPayload): payload is JsonRpcPayloadResponse => payload.type === 'response' -const isJsonRpcError = (payload: JsonRpcPayload): payload is JsonRpcPayloadError => payload.type === 'error' +const isJsonRpcRequest = (payload: JsonRpcPayload): payload is JsonRpcPayloadRequest => ('method' in payload) +const isJsonRpcNotification = (payload: JsonRpcPayload): payload is JsonRpcPayloadNotification => isJsonRpcRequest(payload) && (!('id' in payload)) +const isJsonRpcResponse = (payload: JsonRpcPayload): payload is JsonRpcPayloadResponse => ('result' in payload) +const isJsonRpcError = (payload: JsonRpcPayload): payload is JsonRpcPayloadError => ('error' in payload) interface IoPeerOptions { hostieGrpcPort: number, -- GitLab