Implement BlockNotFoundError

packages/extended-sdk/src/client/index.ts

@@ -1,6 +1,7 @@
 import {
   ChainAPI,
   ElectionAPI,
+  ErrAPI,
   IChainBlockInfoResponse,
   IElectionListFilter,
   VocdoniSDKClient,
@@ -36,14 +37,37 @@ export class ExtendedSDKClient extends VocdoniSDKClient {
       ...filters,
     })
   blockTransactions = (height: number, page?: number) => ChainAPI.blockTransactions(this.url, height, page)
+
+  // blockByHeight = async (height: number): Promise<IChainBlockInfoResponse | BlockNotFoundError> => {
+  //   try {
+  //     return await ChainAPI.blockByHeight(this.url, height)
+  //   } catch (error) {
+  //     if (error instanceof ErrAPI && error.raw?.response?.status === 404) {
+  //       return { height } as BlockNotFoundError
+  //     }
+  //     throw error // re-throw other errors
+  //   }
+  // }
   blockByHeight = (height: number) => ChainAPI.blockByHeight(this.url, height)
-  // todo: this method will be fixed backend side, see https://github.com/vocdoni/interoperability/issues/33
-  blockList = (from: number, listSize: number = 10): Promise<IChainBlockInfoResponse[]> => {
-    const promises: Promise<IChainBlockInfoResponse>[] = []
+
+  blockList = (from: number, listSize: number = 10): Promise<Array<IChainBlockInfoResponse | BlockNotFoundError>> => {
+    const promises: Promise<IChainBlockInfoResponse | BlockNotFoundError>[] = []
     // If is not a number bigger than 0
     if (isNaN(from)) return Promise.all(promises)
     for (let i = 0; i < listSize; i++) {
-      if (from + i > 0) promises.push(this.blockByHeight(from + i))
+      if (from + i > 0)
+        promises.push(
+          (async () => {
+            try {
+              return await this.blockByHeight(from + i)
+            } catch (error) {
+              if (error instanceof ErrAPI && error.raw?.response?.status === 404) {
+                return { height: from + i } as BlockNotFoundError
+              }
+              throw error // re-throw other errors
+            }
+          })()
+        )
     }
     return Promise.all(promises).then((blockInfo) => {
       // flatten the array[][] into array[]
@@ -56,3 +80,7 @@ export class ExtendedSDKClient extends VocdoniSDKClient {
     return ChainAPI.blockToDate(this.url, height)
   }
 }
+
+export type BlockNotFoundError = {
+  height: number
+}