Merge pull request #45 from camptocamp/ogc-api-use-cache

Use sharedFetch in OGC API endpoint queries

src/ogc-api/endpoint.spec.ts

@@ -7,7 +7,7 @@ const FIXTURES_ROOT = path.join(__dirname, '../../fixtures/ogc-api');
 
 // setup fetch to read local fixtures
 beforeAll(() => {
- window.fetch = async (urlOrInfo) => {
+ window.fetch = jest.fn().mockImplementation(async (urlOrInfo) => {
  const url = new URL(
  urlOrInfo instanceof URL || typeof urlOrInfo === 'string'
  ? urlOrInfo
@@ -48,7 +48,7 @@ beforeAll(() => {
  resolve(JSON.parse(contents));
  }),
  } as Response;
- };
+ });
 });
 
 jest.useFakeTimers();
@@ -75,6 +75,14 @@ describe('OgcApiEndpoint', () => {
  'Contains OS data © Crown copyright and database right 2021.',
  });
  });
+ it('uses shared fetch', async () => {
+ jest.clearAllMocks();
+ // create the endpoint three times separately
+ new OgcApiEndpoint('http://local/sample-data/').info;
+ new OgcApiEndpoint('http://local/sample-data/').info;
+ new OgcApiEndpoint('http://local/sample-data/').info;
+ expect(window.fetch).toHaveBeenCalledTimes(1);
+ });
  });
  describe('#conformanceClasses', () => {
  it('returns conformance classes', async () => {

src/ogc-api/link-utils.ts

@@ -1,18 +1,13 @@
 import { OgcApiDocument, OgcApiDocumentLink } from './model.js';
 import { EndpointError } from '../shared/errors.js';
-import { getFetchOptions } from '../shared/http-utils.js';
+import { sharedFetch } from '../shared/http-utils.js';
 
 export function fetchDocument<T extends OgcApiDocument>(
  url: string
 ): Promise<T> {
  const urlObj = new URL(url, window.location.toString());
  urlObj.searchParams.set('f', 'json');
- const options = getFetchOptions();
- const optionsHeaders = 'headers' in options ? options.headers : {};
- return fetch(urlObj.toString(), {
- ...options,
- headers: { ...optionsHeaders, Accept: 'application/json' },
- }).then((resp) => {
+ return sharedFetch(urlObj.toString(), 'GET', true).then((resp) => {
  if (!resp.ok) {
  throw new Error(`The document at ${urlObj} could not be fetched.`);
  }

src/shared/http-utils.spec.ts

@@ -407,6 +407,7 @@ describe('HTTP utils', () => {
  'http://localhost/hello.json?f=json',
  {
  ...sampleOptions,
+ method: 'GET',
  headers: {
  ...sampleOptions.headers,
  Accept: 'application/json',

src/shared/http-utils.ts

@@ -43,14 +43,27 @@ export function setFetchOptionsUpdateCallback(
  * identical concurrent requests
  * Note: this should only be used for GET requests!
  */
-export function sharedFetch(url: string, method: 'GET' | 'HEAD' = 'GET') {
- const fetchKey = `${method}#${url}`;
+export function sharedFetch(
+ url: string,
+ method: 'GET' | 'HEAD' = 'GET',
+ asJson?: boolean
+) {
+ let fetchKey = `${method}#${url}`;
+ if (asJson) {
+ fetchKey = `${method}#asJson#${url}`;
+ }
  if (fetchPromises.has(fetchKey)) {
  return fetchPromises.get(fetchKey);
  }
+ const options: RequestInit = { ...getFetchOptions() };
+ options.method = method;
+ if (asJson) {
+ options.headers = 'headers' in options ? options.headers : {};
+ options.headers['Accept'] = 'application/json';
+ }
  // to avoid unhandled promise rejections this promise will never reject,
  // but only return errors as a normal value
- const promise = fetch(url, { ...getFetchOptions(), method })
+ const promise = fetch(url, options)
  .catch((e) => e)
  .then((resp) => {
  fetchPromises.delete(fetchKey);