Migrate to ofetch

package.json

@@ -19,9 +19,9 @@
     "@ethersproject/wallet": "^5.6.2",
     "ajv": "^8.11.0",
     "ajv-formats": "^2.1.1",
-    "cross-fetch": "^3.1.6",
     "json-to-graphql-query": "^2.2.4",
-    "lodash.set": "^4.3.2"
+    "lodash.set": "^4.3.2",
+    "ofetch": "^1.3.3"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^18.1.0",

src/sign/index.ts

@@ -1,4 +1,4 @@
-import fetch from 'cross-fetch';
+import { ofetch as fetch } from 'ofetch';
 import { Web3Provider } from '@ethersproject/providers';
 import { Wallet } from '@ethersproject/wallet';
 import { getAddress } from '@ethersproject/address';
@@ -87,16 +87,18 @@ export default class Client {
         Accept: 'application/json',
         'Content-Type': 'application/json'
       },
-      body: JSON.stringify(envelop)
+      timeout: 20e3,
+      body: envelop
     };
-    return new Promise((resolve, reject) => {
-      fetch(address, init)
-        .then((res) => {
-          if (res.ok) return resolve(res.json());
-          throw res;
-        })
-        .catch((e) => e.json().then((json) => reject(json)));
-    });
+
+    try {
+      return await fetch(address, init);
+    } catch (e) {
+      const isSequencerError =
+        e.data?.hasOwnProperty('error') &&
+        e.data?.hasOwnProperty('error_description');
+      return Promise.reject(isSequencerError ? e.data : e);
+    }
   }
 
   async space(web3: Web3Provider | Wallet, address: string, message: Space) {

src/utils.ts

@@ -1,4 +1,4 @@
-import fetch from 'cross-fetch';
+import { ofetch as fetch } from 'ofetch';
 import { Interface } from '@ethersproject/abi';
 import { Contract } from '@ethersproject/contracts';
 import { isAddress } from '@ethersproject/address';
@@ -136,34 +136,29 @@ export async function multicall(
 }
 
 export async function subgraphRequest(url: string, query, options: any = {}) {
-  const res = await fetch(url, {
-    method: 'POST',
-    headers: {
-      Accept: 'application/json',
-      'Content-Type': 'application/json',
-      ...options?.headers
-    },
-    body: JSON.stringify({ query: jsonToGraphQLQuery({ query }) })
-  });
-  let responseData: any = await res.text();
   try {
-    responseData = JSON.parse(responseData);
+    const init = {
+      method: 'POST',
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+        ...options?.headers
+      },
+      timeout: 20e3,
+      body: { query: jsonToGraphQLQuery({ query }) }
+    };
+
+    const body = await fetch(url, init);
+    return body.data;
   } catch (e) {
-    throw new Error(
-      `Errors found in subgraphRequest: URL: ${url}, Status: ${
-        res.status
-      }, Response: ${responseData.substring(0, 400)}`
-    );
-  }
-  if (responseData.errors) {
-    throw new Error(
-      `Errors found in subgraphRequest: URL: ${url}, Status: ${
-        res.status
-      },  Response: ${JSON.stringify(responseData.errors).substring(0, 400)}`
+    return Promise.reject(
+      e.data?.error || {
+        code: e.status || 0,
+        message: e.statusText || e.toString(),
+        data: e.data || ''
+      }
     );
   }
-  const { data } = responseData;
-  return data || {};
 }
 
 export function getUrl(uri, gateway = gateways[0]) {
@@ -186,7 +181,15 @@ export function getUrl(uri, gateway = gateways[0]) {
 
 export async function getJSON(uri, options: any = {}) {
   const url = getUrl(uri, options.gateways);
-  return fetch(url).then((res) => res.json());
+  return fetch(url, {
+    timeout: 30e3,
+    parseResponse: JSON.parse,
+    headers: {
+      Accept: 'application/json',
+      'Content-Type': 'application/json',
+      ...options?.headers
+    }
+  });
 }
 
 export async function ipfsGet(
@@ -195,7 +198,14 @@ export async function ipfsGet(
   protocolType = 'ipfs'
 ) {
   const url = `https://${gateway}/${protocolType}/${ipfsHash}`;
-  return fetch(url).then((res) => res.json());
+  return fetch(url, {
+    timeout: 20e3,
+    parseResponse: JSON.parse,
+    headers: {
+      Accept: 'application/json',
+      'Content-Type': 'application/json'
+    }
+  });
 }
 
 export async function sendTransaction(
@@ -234,25 +244,25 @@ export async function getScores(
       strategies,
       addresses
     };
-    const res = await fetch(scoreApiUrl, {
+
+    const body = await fetch(scoreApiUrl, {
       method: 'POST',
       headers: scoreApiHeaders,
-      body: JSON.stringify({ params })
+      timeout: 60e3,
+      body: { params }
     });
-    const obj = await res.json();
-
-    if (obj.error) {
-      return Promise.reject(obj.error);
-    }
 
     return options.returnValue === 'all'
-      ? obj.result
-      : obj.result[options.returnValue || 'scores'];
+      ? body.result
+      : body.result[options.returnValue || 'scores'];
   } catch (e) {
-    if (e.errno) {
-      return Promise.reject({ code: e.errno, message: e.toString(), data: '' });
-    }
-    return Promise.reject(e);
+    return Promise.reject(
+      e.data?.error || {
+        code: e.status || 0,
+        message: e.statusText || e.toString(),
+        data: e.data || ''
+      }
+    );
   }
 }
 
@@ -270,7 +280,8 @@ export async function getVp(
   const init = {
     method: 'POST',
     headers: scoreApiHeaders,
-    body: JSON.stringify({
+    timeout: 60e3,
+    body: {
       jsonrpc: '2.0',
       method: 'get_vp',
       params: {
@@ -281,19 +292,20 @@ export async function getVp(
         space,
         delegation
       }
-    })
+    }
   };
 
   try {
-    const res = await fetch(options.url, init);
-    const json = await res.json();
-    if (json.error) return Promise.reject(json.error);
-    if (json.result) return json.result;
+    const body = await fetch(options.url, init);
+    return body.result;
   } catch (e) {
-    if (e.errno) {
-      return Promise.reject({ code: e.errno, message: e.toString(), data: '' });
-    }
-    return Promise.reject(e);
+    return Promise.reject(
+      e.data?.error || {
+        code: e.status || 0,
+        message: e.statusText || e.toString(),
+        data: e.data || ''
+      }
+    );
   }
 }
 
@@ -311,7 +323,8 @@ export async function validate(
   const init = {
     method: 'POST',
     headers: scoreApiHeaders,
-    body: JSON.stringify({
+    timeout: 30e3,
+    body: {
       jsonrpc: '2.0',
       method: 'validate',
       params: {
@@ -322,19 +335,20 @@ export async function validate(
         snapshot,
         params
       }
-    })
+    }
   };
 
   try {
-    const res = await fetch(options.url, init);
-    const json = await res.json();
-    if (json.error) return Promise.reject(json.error);
-    return json.result;
+    const body = await fetch(options.url, init);
+    return body.result;
   } catch (e) {
-    if (e.errno) {
-      return Promise.reject({ code: e.errno, message: e.toString(), data: '' });
-    }
-    return Promise.reject(e);
+    return Promise.reject(
+      e.data?.error || {
+        code: e.status || 0,
+        message: e.statusText || e.toString(),
+        data: e.data || ''
+      }
+    );
   }
 }
 

test/e2e/sign/index.spec.ts

@@ -0,0 +1,31 @@
+import { describe, test, expect } from 'vitest';
+import Client from '../../../src/sign/';
+
+describe('Client', () => {
+  describe('send()', () => {
+    describe('on error', () => {
+      const payload = { address: '', sig: '', data: '' };
+
+      test('should return the error from sequencer as a Promise rejection', async () => {
+        expect.assertions(1);
+        const client = new Client();
+        await expect(client.send(payload)).to.rejects.toEqual({
+          error: 'client_error',
+          error_description: 'wrong envelope format'
+        });
+      });
+
+      test.each([
+        ['ENOTFOUND', 'https://unknown.snapshot.org'],
+        ['404 Not Found', 'https://httpstat.us/404']
+      ])(
+        'should return the network error (%s) as Promise rejection',
+        async (code, url) => {
+          expect.assertions(1);
+          const client = new Client(url);
+          await expect(() => client.send(payload)).rejects.toThrowError(code);
+        }
+      );
+    });
+  });
+});