fetcher

Author: stephenwf

src/vault/utility/create-fetch-helper.ts

@@ -1,24 +1,27 @@
-import { actionListFromResource, type ActionListFromResource } from './action-list-from-resource';
-import { resolveIfExists } from './resolve-if-exists';
-import { NormalizedEntity } from '../types';
 import {
   batchActions,
-  requestError,
-  requestResource,
   RESOURCE_ERROR,
   RESOURCE_LOADING,
   RESOURCE_READY,
+  requestError,
+  requestResource,
 } from '../actions';
+import type { NormalizedEntity } from '../types';
 import type { Vault } from '../vault';
+import { type ActionListFromResource, actionListFromResource } from './action-list-from-resource';
 import { isPromise } from './is-promise';
+import { resolveIfExists } from './resolve-if-exists';
 
 export function createFetchHelper<T>(
   vault: Vault,
   fetcher: (url: string, options?: T) => any | Promise<any>,
   {
     waitTimeout = 30,
     actionListFromResource: actionListFromResourceFn = actionListFromResource,
-  }: { waitTimeout?: number; actionListFromResource?: ActionListFromResource } = {}
+  }: {
+    waitTimeout?: number;
+    actionListFromResource?: ActionListFromResource;
+  } = {}
 ) {
   return (
     url: string,

src/vault/utility/default-fetcher.ts

@@ -1,11 +1,9 @@
-export const defaultFetcher = (url: string) => {
-  return fetch(url).then((r) => {
-    if (r.status === 200) {
-      return r.json();
-    }
-
-    const err = new Error(`${r.status} ${r.statusText}`);
-    err.name = 'HTTPError';
-    throw err;
-  });
+export const defaultFetcher = async (url: string) => {
+  const r = await fetch(url);
+  if (r.status === 200) {
+    return r.json();
+  }
+  const err = new Error(`${r.status} ${r.statusText}`);
+  err.name = 'HTTPError';
+  throw err;
 };

src/vault/vault-auto.ts

@@ -22,6 +22,7 @@ import type {
   RefToNormalized,
   RequestState,
 } from './types';
+import { defaultFetcher } from './utility/default-fetcher';
 import type { ReactiveWrapped } from './utility/objects';
 import { type GetObjectOptions, type GetOptions, Vault, type VaultOptions } from './vault';
 import { Vault4 } from './vault4';
@@ -58,7 +59,10 @@ function cloneForReplay<T>(value: T): T {
   return JSON.parse(JSON.stringify(value));
 }
 
-function splitIdFragment(id: string): { idWithoutFragment: string; fragment?: string } {
+function splitIdFragment(id: string): {
+  idWithoutFragment: string;
+  fragment?: string;
+} {
   const hashIndex = id.indexOf('#');
   if (hashIndex === -1) {
     return { idWithoutFragment: id };
@@ -107,7 +111,7 @@ export class VaultAuto {
       enableDevtools,
     };
 
-    this.fetcher = customFetcher || this.defaultFetcher;
+    this.fetcher = customFetcher || defaultFetcher;
     this.baseVault = new Vault(this.vaultOptions);
     this.activeVault = this.baseVault;
   }
@@ -128,17 +132,6 @@ export class VaultAuto {
     return this.activeVault;
   }
 
-  private defaultFetcher = (url: string) => {
-    return fetch(url).then((r) => {
-      if (r.status === 200) {
-        return r.json();
-      }
-      const err = new Error(`${r.status} ${r.statusText}`);
-      err.name = `HTTPError`;
-      throw err;
-    });
-  };
-
   private shouldUseAutoLoadPath(): boolean {
     return this.options.enablePresentation4 && !this.vault4Internal;
   }
@@ -362,7 +355,9 @@ export class VaultAuto {
   }
 
   resolveAnnotationTargets(annotation: unknown): CanonicalSpecificResource[] {
-    const fullAnnotation = this.get(annotation as any, { skipSelfReturn: false }) as any;
+    const fullAnnotation = this.get(annotation as any, {
+      skipSelfReturn: false,
+    }) as any;
     if (!fullAnnotation || typeof fullAnnotation !== 'object') {
       return [];
     }
@@ -373,7 +368,9 @@ export class VaultAuto {
   }
 
   resolveAnnotationBodies(annotation: unknown): any[] {
-    const fullAnnotation = this.get(annotation as any, { skipSelfReturn: false }) as any;
+    const fullAnnotation = this.get(annotation as any, {
+      skipSelfReturn: false,
+    }) as any;
     if (!fullAnnotation || typeof fullAnnotation !== 'object') {
       return [];
     }
@@ -383,7 +380,9 @@ export class VaultAuto {
       .filter((body) => body !== null && typeof body !== 'undefined')
       .map((body) => {
         if (body?.type === 'SpecificResource' && body?.source) {
-          const unwrapped = this.get(body.source, { skipSelfReturn: false }) as any;
+          const unwrapped = this.get(body.source, {
+            skipSelfReturn: false,
+          }) as any;
           return unwrapped ?? body.source;
         }
         return body;

src/vault/vault.ts

@@ -1,6 +1,21 @@
 /// <reference types="geojson" />
 
 import {
+  frameResource,
+  HAS_PART,
+  isSpecificResource,
+  PART_OF,
+  type SerializeConfig,
+  serialize,
+  serializeConfigPresentation2,
+  serializeConfigPresentation3,
+} from '@iiif/parser';
+import type { Collection, Manifest, Reference, SpecificResource } from '@iiif/parser/presentation-3/types';
+import type { CollectionNormalized, ManifestNormalized } from '@iiif/parser/presentation-3-normalized/types';
+import mitt, { type Emitter } from 'mitt';
+import { BATCH_ACTIONS, type BatchAction, batchActions, entityActions, metaActions } from './actions';
+import { createStore, type VaultZustandStore } from './store';
+import type {
   ActionFromType,
   AllActions,
   Entities,
@@ -10,26 +25,11 @@ import {
   RefToNormalized,
   RequestState,
 } from './types';
-import { Collection, Manifest, Reference, SpecificResource } from '@iiif/parser/presentation-3/types';
-import {
-  frameResource,
-  HAS_PART,
-  isSpecificResource,
-  PART_OF,
-  serialize,
-  SerializeConfig,
-  serializeConfigPresentation2,
-  serializeConfigPresentation3,
-} from '@iiif/parser';
-import { BATCH_ACTIONS, BatchAction, batchActions, entityActions, metaActions } from './actions';
-import { createFetchHelper, areInputsEqual } from './utility';
-import { createStore, VaultZustandStore } from './store';
-import mitt, { Emitter } from 'mitt';
-import { CollectionNormalized, ManifestNormalized } from '@iiif/parser/presentation-3-normalized/types';
-import { isWrapped, ReactiveWrapped, wrapObject } from './utility/objects';
+import { areInputsEqual, createFetchHelper } from './utility';
+import { type ActionListFromResource, actionListFromResourceV3 } from './utility/action-list-from-resource';
+import { defaultFetcher } from './utility/default-fetcher';
+import { isWrapped, type ReactiveWrapped, wrapObject } from './utility/objects';
 import { resolveType } from './utility/resolve-type';
-import { actionListFromResourceV3, type ActionListFromResource } from './utility/action-list-from-resource';
-import { defaultFetcher as defaultVaultFetcher } from './utility/default-fetcher';
 
 export type VaultOptions = {
   reducers: Record<string, any>;
@@ -67,7 +67,7 @@ export class Vault {
     this.options = Object.assign(
       {
         reducers: {},
-        customFetcher: this.defaultFetcher,
+        customFetcher: defaultFetcher,
         enableDevtools: true,
       },
       options || {}
@@ -92,7 +92,7 @@ export class Vault {
     return actionListFromResourceV3;
   }
 
-  defaultFetcher = defaultVaultFetcher;
+  defaultFetcher = defaultFetcher;
 
   batch(cb: (vault: this) => void) {
     this.isBatching = true;
@@ -141,12 +141,18 @@ export class Vault {
     if (!this.isBatching) {
       if (action.type === BATCH_ACTIONS) {
         for (const realAction of action.payload.actions) {
-          this.emitter.emit(realAction.type, { action: realAction, state: this.store.getState() });
+          this.emitter.emit(realAction.type, {
+            action: realAction,
+            state: this.store.getState(),
+          });
         }
         this.store.dispatch(action);
         const state = this.getState();
         for (const realAction of action.payload.actions) {
-          this.emitter.emit(`after:${realAction.type}`, { action: realAction, state });
+          this.emitter.emit(`after:${realAction.type}`, {
+            action: realAction,
+            state,
+          });
         }
         return;
       }
@@ -198,7 +204,10 @@ export class Vault {
     type?: string | GetOptions,
     options: GetOptions = {}
   ): RefToNormalized<R> | RefToNormalized<R>[] {
-    return this.get<R>(reference as any, type as any, { ...options, skipSelfReturn: false });
+    return this.get<R>(reference as any, type as any, {
+      ...options,
+      skipSelfReturn: false,
+    });
   }
 
   get<R extends { type?: string }>(