Dan Finlay
5 years ago
committed by
GitHub
commit
99209095d1
@ -0,0 +1,28 @@ |
||||
import { |
||||
loadLocalStorageData, |
||||
saveLocalStorageData, |
||||
} from '../../../lib/local-storage-helpers' |
||||
import http from './fetch' |
||||
|
||||
const fetch = http({ |
||||
timeout: 30000, |
||||
}) |
||||
|
||||
export default function fetchWithCache (url, opts, cacheRefreshTime = 360000) { |
||||
const currentTime = Date.now() |
||||
const cachedFetch = loadLocalStorageData('cachedFetch') || {} |
||||
const { cachedUrl, cachedTime } = cachedFetch[url] || {} |
||||
if (cachedUrl && currentTime - cachedTime < cacheRefreshTime) { |
||||
return cachedFetch[url] |
||||
} else { |
||||
cachedFetch[url] = { cachedUrl: url, cachedTime: currentTime } |
||||
saveLocalStorageData(cachedFetch, 'cachedFetch') |
||||
return fetch(url, { |
||||
referrerPolicy: 'no-referrer-when-downgrade', |
||||
body: null, |
||||
method: 'GET', |
||||
mode: 'cors', |
||||
...opts, |
||||
}) |
||||
} |
||||
} |
||||
@ -0,0 +1,25 @@ |
||||
/* global AbortController */ |
||||
|
||||
export default function ({ timeout = 120000 } = {}) { |
||||
return function _fetch (url, opts) { |
||||
return new Promise(async (resolve, reject) => { |
||||
const abortController = new AbortController() |
||||
const abortSignal = abortController.signal |
||||
const f = fetch(url, { |
||||
...opts, |
||||
signal: abortSignal, |
||||
}) |
||||
|
||||
const timer = setTimeout(() => abortController.abort(), timeout) |
||||
|
||||
try { |
||||
const res = await f |
||||
clearTimeout(timer) |
||||
return resolve(res) |
||||
} catch (e) { |
||||
clearTimeout(timer) |
||||
return reject(e) |
||||
} |
||||
}) |
||||
} |
||||
} |
||||
@ -0,0 +1,54 @@ |
||||
import assert from 'assert' |
||||
import nock from 'nock' |
||||
|
||||
import http from './fetch' |
||||
|
||||
describe('custom fetch fn', () => { |
||||
it('fetches a url', async () => { |
||||
nock('https://api.infura.io') |
||||
.get('/money') |
||||
.reply(200, '{"hodl": false}') |
||||
|
||||
const fetch = http() |
||||
const response = await (await fetch('https://api.infura.io/money')).json() |
||||
assert.deepEqual(response, { |
||||
hodl: false, |
||||
}) |
||||
}) |
||||
|
||||
it('throws when the request hits a custom timeout', async () => { |
||||
nock('https://api.infura.io') |
||||
.get('/moon') |
||||
.delay(2000) |
||||
.reply(200, '{"moon": "2012-12-21T11:11:11Z"}') |
||||
|
||||
const fetch = http({ |
||||
timeout: 123, |
||||
}) |
||||
|
||||
try { |
||||
await fetch('https://api.infura.io/moon').then(r => r.json()) |
||||
assert.fail('Request should throw') |
||||
} catch (e) { |
||||
assert.ok(e) |
||||
} |
||||
}) |
||||
|
||||
it('should abort the request when the custom timeout is hit', async () => { |
||||
nock('https://api.infura.io') |
||||
.get('/moon') |
||||
.delay(2000) |
||||
.reply(200, '{"moon": "2012-12-21T11:11:11Z"}') |
||||
|
||||
const fetch = http({ |
||||
timeout: 123, |
||||
}) |
||||
|
||||
try { |
||||
await fetch('https://api.infura.io/moon').then(r => r.json()) |
||||
assert.fail('Request should be aborted') |
||||
} catch (e) { |
||||
assert.deepEqual(e.message, 'Aborted') |
||||
} |
||||
}) |
||||
}) |
||||
Loading…
Reference in new issue