feat: add timeouts to spark-api requests (#42)

Signed-off-by: Miroslav Bajtoš <[email protected]>
CheckerNetwork · Nov 20, 2023 · 3357243 · 3357243
1 parent 4c27d6b
commit 3357243
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/lib/spark.js b/lib/spark.js
@@ -15,10 +15,11 @@ export default class Spark {
   }
 
   async getRetrieval () {
-    console.log('Getting retrieval...')
+    console.log('Getting current SPARK round details...')
     const res = await this.#fetch('https://api.filspark.com/rounds/current', {
       method: 'GET',
-      headers: { 'Content-Type': 'application/json' }
+      headers: { 'Content-Type': 'application/json' },
+      signal: AbortSignal.timeout(10_000)
     })
     await assertOkResponse(res, 'Failed to fetch the current SPARK round')
     this.#activity.onHealthy()
@@ -116,7 +117,8 @@ export default class Spark {
       body: JSON.stringify(payload),
       headers: {
         'Content-Type': 'application/json'
-      }
+      },
+      signal: AbortSignal.timeout(10_000)
     })
     await assertOkResponse(res, 'Failed to submit measurement')
     const { id } = await res.json()

diff --git a/test/spark.js b/test/spark.js
@@ -22,7 +22,8 @@ test('getRetrieval', async () => {
     ]
   }
   const requests = []
-  const fetch = async (url, opts) => {
+  const fetch = async (url, allOpts) => {
+    const { signal, ...opts } = allOpts
     requests.push({ url, opts })
     return {
       status: 200,
@@ -112,7 +113,8 @@ test('fetchCAR exceeding MAX_CAR_SIZE', async () => {
 
 test('submitRetrieval', async () => {
   const requests = []
-  const fetch = async (url, opts) => {
+  const fetch = async (url, allOpts) => {
+    const { signal, ...opts } = allOpts
     requests.push({ url, opts })
     return { status: 200, ok: true, async json () { return { id: 123 } } }
   }