From ecb5b490e3bcbc518e797611c76f64335d4dedad Mon Sep 17 00:00:00 2001 From: "fryorcraken.eth" Date: Wed, 17 Aug 2022 22:39:19 +1000 Subject: [PATCH 1/2] fix: do not throw on lack of response Expected proto3 behaviour, just no message returned. --- src/lib/waku_store/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/waku_store/index.ts b/src/lib/waku_store/index.ts index 2d09c4c911..6c8b902571 100644 --- a/src/lib/waku_store/index.ts +++ b/src/lib/waku_store/index.ts @@ -216,7 +216,7 @@ export class WakuStore { const reply = historyRpcQuery.decode(bytes); if (!reply.response) { - throw "History response misses response field"; + dbg("No message returned from store: `response` field missing"); } const response = reply.response as protoV2Beta4.HistoryResponse; From 28f77ec0831aebacb6ac3ebc92a90e083cae00be Mon Sep 17 00:00:00 2001 From: "fryorcraken.eth" Date: Wed, 17 Aug 2022 22:39:42 +1000 Subject: [PATCH 2/2] fix: use debug instead of console.log --- src/lib/waku_store/index.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/waku_store/index.ts b/src/lib/waku_store/index.ts index 6c8b902571..4a67dc70ee 100644 --- a/src/lib/waku_store/index.ts +++ b/src/lib/waku_store/index.ts @@ -227,7 +227,7 @@ export class WakuStore { if (!response.messages || !response.messages.length) { // No messages left (or stored) - console.log("No messages present in HistoryRPC response"); + dbg("No message returned from store: `messages` array empty"); return messages; } @@ -265,8 +265,8 @@ export class WakuStore { cursor = response.pagingInfo?.cursor; if (cursor === undefined) { // If the server does not return cursor then there is an issue, - // Need to abort or we end up in an infinite loop - console.log("No cursor returned by peer."); + // Need to abort, or we end up in an infinite loop + dbg("Store response does not contain a cursor, stopping pagination"); return messages; } }