v0.1.4 auto-retry fetches

Author: numtel

README.md

@@ -5,7 +5,7 @@ Deploy and verify your circuits to Circuitscan with a simple command.
 See also: [Circuitscan CLI Documentation](https://circuitscan.readthedocs.io/en/latest/usage.html)
 
 > [!NOTE]
-> Supports circom 2.0.8-2.1.9, snarkjs 0.6.11-0.7.4
+> Supports circom 2.0.8-2.1.9, snarkjs 0.6.11-0.7.5
 >
 > Supports noir 0.31.0-0.34.0
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "circuitscan",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "main": "cli.js",
   "type": "module",
   "author": "numtel <ben@latenightsketches.com>",

src/circuitscan.js

@@ -6,6 +6,7 @@ import {
   generateRandomString,
   delay,
   instanceSizes,
+  fetchWithRetry,
 } from './utils.js';
 import {StatusLogger} from './StatusLogger.js';
 
@@ -64,7 +65,7 @@ export async function invokeRemoteMachine(payload, options) {
   };
 
   const {curCompilerURL} = await determineCompilerUrl(options);
-  const response = await fetch(curCompilerURL, {
+  const response = await fetchWithRetry(curCompilerURL, {
     method: 'POST',
     headers: {
         'Content-Type': 'application/json',
@@ -87,7 +88,7 @@ export async function invokeRemoteMachine(payload, options) {
     const {stderr, stdout} = await watchInstance(options.config.blobUrl, requestId, apiKey, options, 8000);
     console.error(stderr);
     console.log(stdout);
-    const response = await fetch(`${options.config.blobUrl}instance-response/${requestId}.json`);
+    const response = await fetchWithRetry(`${options.config.blobUrl}instance-response/${requestId}.json`);
     try {
       const data = await response.json();
       body = JSON.parse(data.body);
@@ -103,7 +104,7 @@ export async function verifyCircuit(action, pkgName, chainId, contract, options)
   const event = {payload: {action, pkgName, chainId, contract}};
   console.log(`# Verifying circuit...`);
 
-  const response = await fetch(options.config.serverURL, {
+  const response = await fetchWithRetry(options.config.serverURL, {
     method: 'POST',
     headers: {
         'Content-Type': 'application/json',
@@ -228,13 +229,13 @@ function healthcheckFetch(ip, timeout) {
   const timeoutPromise = new Promise((_, reject) =>
     setTimeout(() => reject(new TimeoutError()), timeout)
   );
-  const fetchPromise = fetch(`http://${ip}:3000`);
+  const fetchPromise = fetchWithRetry(`http://${ip}:3000`);
   return Promise.race([fetchPromise, timeoutPromise]);
 }
 
 async function terminateInstance(requestId, apiKey, options) {
   const event = {payload: {requestId}, apiKey};
-  const response = await fetch(process.env.LOCAL_TERMINATOR || (options && options.config && options.config.terminatorURL), {
+  const response = await fetchWithRetry(process.env.LOCAL_TERMINATOR || (options && options.config && options.config.terminatorURL), {
     method: 'POST',
     headers: {
         'Content-Type': 'application/json',
@@ -250,7 +251,7 @@ async function terminateInstance(requestId, apiKey, options) {
 }
 
 async function fetchResult(blobUrl, requestId, pipename) {
-  const response = await fetch(`${blobUrl}instance/${requestId}/${pipename}.txt`);
+  const response = await fetchWithRetry(`${blobUrl}instance/${requestId}/${pipename}.txt`);
   if (!response.ok) {
     if (response.status === 404 || response.status === 403) {
       throw new NotFoundError;

src/utils.js

@@ -120,3 +120,23 @@ export function viemChain(nameOrId) {
     if(chain.id === Number(nameOrId)) return chain;
   }
 }
+
+export async function fetchWithRetry(url, options = {}, retries = 5, delay = 1000) {
+    for (let attempt = 0; attempt < retries; attempt++) {
+        try {
+            const response = await fetch(url, options);
+            return response;
+        } catch (error) {
+            if (error.message.includes('ETIMEDOUT') || error.message.includes('fetch failed')) {
+                if (attempt < retries - 1) {
+                    console.warn(`Retrying fetch (${attempt + 1}/${retries}) after timeout...`);
+                    await new Promise(res => setTimeout(res, delay * Math.pow(2, attempt))); // Exponential backoff
+                } else {
+                    throw new Error(`Fetch failed after ${retries} retries: ${error.message}`);
+                }
+            } else {
+                throw error; // If it's not a timeout error, rethrow it immediately
+            }
+        }
+    }
+}