refactor: add runtime validation of batch requests

nervosnetwork · Oct 30, 2023 · fdd88dc · fdd88dc · github-actions · Oct 30, 2023
1 parent 7ba4b97
commit fdd88dc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/packages/neuron-wallet/src/utils/ckb-rpc.ts b/packages/neuron-wallet/src/utils/ckb-rpc.ts
@@ -335,6 +335,10 @@ export class LightRPC extends Base {
           })
           const batchRes = await res.body.json()
 
+          if (!Array.isArray(batchRes)) {
+            return []
+          }
+
           return batchRes.map((res: any, i: number) => {
             if (res.id !== payload[i].id) {
               return new IdNotMatchedInBatchException(i, payload[i].id, res.id)

diff --git a/packages/neuron-wallet/src/utils/rpc-request.ts b/packages/neuron-wallet/src/utils/rpc-request.ts
@@ -23,7 +23,10 @@ export const rpcRequest = async <T = any>(
     throw new Error(`indexer request failed with HTTP code ${res.statusCode}`)
   }
   const body = await res.body.json()
-  return body?.result as T
+  if (body !== null && typeof body === 'object' && 'result' in body) {
+    return body?.result as T
+  }
+  return [] as T
 }
 
 export const rpcBatchRequest = async (
@@ -50,8 +53,12 @@ export const rpcBatchRequest = async (
   if (res.statusCode !== 200) {
     throw new Error(`indexer request failed with HTTP code ${res.statusCode}`)
   }
-  const responseBody: { id: number; error?: any; result: any }[] = await res.body.json()
-  return responseBody.sort((a, b) => a.id - b.id)
+  // const responseBody: { id: number; error?: any; result: any }[] = await res.body.json()
+  const responseBody = await res.body.json()
+  if (Array.isArray(responseBody) && responseBody.every(i => 'id' in i)) {
+    return responseBody.sort((a, b) => a.id - b.id)
+  }
+  return []
 }
 
 export default {