@openmrs/esm-api 10.0.1-pre.5630 → 10.0.1-pre.5642

package/.turbo/turbo-build.log

@@ -1,3 +1,3 @@
-[0] Successfully compiled: 14 files with swc (109.47ms)
+[0] Successfully compiled: 14 files with swc (93.02ms)
 [0] swc --strip-leading-paths src -d dist exited with code 0
 [1] tsc --project tsconfig.build.json exited with code 0

package/dist/current-user.d.ts

@@ -9,6 +9,12 @@ export type UnloadedSessionStore = {
     session: null;
     /** Set when fetching the session failed before any session had loaded. */
     error?: Error;
+    /**
+     * Set alongside `error`. `true` when the backend appears to be still starting up rather than broken:
+     * it redirected the session request to its initial setup page, or its gateway answered with a 502
+     * shortly after the page loaded.
+     */
+    initializing?: boolean;
 };
 /** @internal */
 export declare const sessionStore: import("zustand").StoreApi<SessionStore>;

package/dist/current-user.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"current-user.d.ts","sourceRoot":"","sources":["../src/current-user.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAiB,MAAM,SAAS,CAAC;AAEtG,MAAM,MAAM,YAAY,GAAG,kBAAkB,GAAG,oBAAoB,CAAC;AAErE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,EAAE,IAAI,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,EAAE,KAAK,CAAC;IACd,OAAO,EAAE,IAAI,CAAC;IACd,0EAA0E;IAC1E,KAAK,CAAC,EAAE,KAAK,CAAC;CACf,CAAC;AAEF,gBAAgB;AAChB,eAAO,MAAM,YAAY,0CAGvB,CAAC;AAoCH;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,iBAAS,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;AAC5C;;;;;GAKG;AACH,iBAAS,cAAc,CAAC,IAAI,EAAE;IAAE,iBAAiB,EAAE,IAAI,CAAA;CAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAC7E;;;;;GAKG;AACH,iBAAS,cAAc,CAAC,IAAI,EAAE;IAAE,iBAAiB,EAAE,KAAK,CAAA;CAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAyBnF,OAAO,EAAE,cAAc,EAAE,CAAC;AAE1B;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,eAAe,6CAG9B;AAiBD;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,OAAO,QAc5C;AAwBD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,yBAyBtE;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,SAQ/B;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,aAAa,CAC3B,iBAAiB,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,EACzC,IAAI,EAAE;IAAE,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;CAAE,WAa3D;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,eAAe,0BAmB9B;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAG/E;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,kBAAkB,CAAC,YAAY,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,CAY9G;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC,CAW/G;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE;IACd,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACrB,EACD,eAAe,CAAC,EAAE,eAAe,GAChC,OAAO,CAAC,YAAY,CAAC,CAcvB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,UAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,CAiB3F;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAY5C"}
+{"version":3,"file":"current-user.d.ts","sourceRoot":"","sources":["../src/current-user.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAiB,MAAM,SAAS,CAAC;AAEtG,MAAM,MAAM,YAAY,GAAG,kBAAkB,GAAG,oBAAoB,CAAC;AAErE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,EAAE,IAAI,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,EAAE,KAAK,CAAC;IACd,OAAO,EAAE,IAAI,CAAC;IACd,0EAA0E;IAC1E,KAAK,CAAC,EAAE,KAAK,CAAC;IACd;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,gBAAgB;AAChB,eAAO,MAAM,YAAY,0CAGvB,CAAC;AA4CH;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,iBAAS,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;AAC5C;;;;;GAKG;AACH,iBAAS,cAAc,CAAC,IAAI,EAAE;IAAE,iBAAiB,EAAE,IAAI,CAAA;CAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAC7E;;;;;GAKG;AACH,iBAAS,cAAc,CAAC,IAAI,EAAE;IAAE,iBAAiB,EAAE,KAAK,CAAA;CAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAyBnF,OAAO,EAAE,cAAc,EAAE,CAAC;AAE1B;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,eAAe,6CAG9B;AAiBD;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,OAAO,QAc5C;AAwBD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,yBA0BtE;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,SAQ/B;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,aAAa,CAC3B,iBAAiB,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,EACzC,IAAI,EAAE;IAAE,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;CAAE,WAa3D;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,eAAe,0BAmB9B;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAG/E;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,kBAAkB,CAAC,YAAY,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,CAY9G;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC,CAW/G;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE;IACd,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACrB,EACD,eAAe,CAAC,EAAE,eAAe,GAChC,OAAO,CAAC,YAAY,CAAC,CAcvB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,UAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,CAiB3F;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAY5C"}

package/dist/current-user.js

@@ -12,6 +12,11 @@ import { OpenmrsFetchError, openmrsFetch, restBaseUrl, sessionEndpoint } from ".
  * strictly newer than this.
  */ const sessionMaxAgeMillis = 60 * 1000;
 let lastFetchTimeMillis = 0;
+/**
+ * How long after the first session fetch a 502 is taken to mean that the backend is still starting up. A
+ * gateway answers with a 502 until the backend has deployed, which can take a few minutes after a restart.
+ */ const startupGracePeriodMillis = 3 * 60 * 1000;
+let firstFetchTimeMillis;
 let inFlightRefresh = null;
 /**
  * Fetches the session if the store is unloaded or its session is older than `sessionMaxAgeMillis`.
@@ -148,6 +153,7 @@ function isSuperUser(user) {
  * ```
  */ export function refetchCurrentUser(username, password) {
     lastFetchTimeMillis = Date.now();
+    firstFetchTimeMillis ?? (firstFetchTimeMillis = lastFetchTimeMillis);
     let headers = {};
     if (username && password) {
         headers['Authorization'] = `Basic ${window.btoa(`${username}:${password}`)}`;
@@ -434,6 +440,8 @@ function handleSessionResponse(result) {
                 };
                 sessionStore.setState(nextState, true);
                 resolve(nextState);
+            } else if (isInitialSetupRedirect(res)) {
+                reject(recordSessionFailure(Error('The server is still starting up'), true));
             } else {
                 reject(recordSessionFailure(Error('The session endpoint did not respond with a session')));
             }
@@ -451,6 +459,10 @@ function handleSessionResponse(result) {
                 resolve(sessionStore.getState());
                 return;
             }
+            if (isGatewayErrorDuringStartup(err)) {
+                reject(recordSessionFailure(err, true));
+                return;
+            }
             reportError(`Failed to fetch new session information: ${err}`);
             reject(recordSessionFailure(err));
         });
@@ -459,18 +471,35 @@ function handleSessionResponse(result) {
 function isAuthFailure(err) {
     return err instanceof OpenmrsFetchError && (err.response.status === 401 || err.response.status === 403);
 }
+/**
+ * Until the backend has finished its initial setup, it answers every request with a redirect to its
+ * setup page, which `fetch()` follows, so the session request resolves with that page's HTML.
+ */ function isInitialSetupRedirect(res) {
+    if (!res?.redirected || !res.url) {
+        return false;
+    }
+    try {
+        return new URL(res.url, window.location.href).pathname.replace(/\/+$/, '').endsWith('/initialsetup');
+    } catch  {
+        return false;
+    }
+}
+function isGatewayErrorDuringStartup(err) {
+    return err instanceof OpenmrsFetchError && err.response.status === 502 && !sessionStore.getState().loaded && firstFetchTimeMillis !== undefined && Date.now() - firstFetchTimeMillis < startupGracePeriodMillis;
+}
 function isUnauthenticatedSession(body) {
     return typeof body === 'object' && body !== null && body.authenticated === false;
 }
 /**
  * A session that has already loaded is kept when a later fetch fails, since it is still the best answer
  * available. With nothing to fall back on, the error is recorded so the app shell can show an error page.
- */ function recordSessionFailure(err) {
+ */ function recordSessionFailure(err, initializing = false) {
     if (!sessionStore.getState().loaded) {
         sessionStore.setState({
             loaded: false,
             session: null,
-            error: err instanceof Error ? err : Error(String(err))
+            error: err instanceof Error ? err : Error(String(err)),
+            initializing
         }, true);
     }
     return sessionStore.getState();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-api",
-  "version": "10.0.1-pre.5630",
+  "version": "10.0.1-pre.5642",
   "license": "MPL-2.0",
   "description": "The javascript module for interacting with the OpenMRS API",
   "type": "module",
@@ -57,16 +57,16 @@
     "lodash-es": "^4.17.21"
   },
   "peerDependencies": {
-    "@openmrs/esm-config": "^10.0.1-pre.5630",
-    "@openmrs/esm-error-handling": "^10.0.1-pre.5630",
-    "@openmrs/esm-globals": "^10.0.1-pre.5630",
-    "@openmrs/esm-navigation": "^10.0.1-pre.5630"
+    "@openmrs/esm-config": "^10.0.1-pre.5642",
+    "@openmrs/esm-error-handling": "^10.0.1-pre.5642",
+    "@openmrs/esm-globals": "^10.0.1-pre.5642",
+    "@openmrs/esm-navigation": "^10.0.1-pre.5642"
   },
   "devDependencies": {
-    "@openmrs/esm-config": "10.0.1-pre.5630",
-    "@openmrs/esm-error-handling": "10.0.1-pre.5630",
-    "@openmrs/esm-globals": "10.0.1-pre.5630",
-    "@openmrs/esm-navigation": "10.0.1-pre.5630",
+    "@openmrs/esm-config": "10.0.1-pre.5642",
+    "@openmrs/esm-error-handling": "10.0.1-pre.5642",
+    "@openmrs/esm-globals": "10.0.1-pre.5642",
+    "@openmrs/esm-navigation": "10.0.1-pre.5642",
     "@swc/cli": "0.8.1",
     "@swc/core": "1.15.21",
     "@vitest/coverage-v8": "^4.1.2",

package/src/current-user.test.ts

@@ -35,7 +35,7 @@ vi.mock('@openmrs/esm-error-handling', () => ({
 const mockOpenmrsFetch = vi.mocked(openmrsFetch);
 const mockReportError = vi.mocked(reportError);
 
-function createAuthFailure(status: number, responseBody: unknown = null) {
+function createFetchError(status: number, responseBody: unknown = null) {
   return new OpenmrsFetchError('/openmrs/ws/rest/v1/session', { status } as Response, responseBody as any, Error());
 }
 
@@ -592,8 +592,8 @@ describe('refetchCurrentUser', () => {
     const error = new Error('Bad gateway');
     mockOpenmrsFetch.mockRejectedValue(error);
 
-    await expect(refetchCurrentUser()).rejects.toEqual({ loaded: false, session: null, error });
-    expect(sessionStore.getState()).toEqual({ loaded: false, session: null, error });
+    await expect(refetchCurrentUser()).rejects.toEqual({ loaded: false, session: null, error, initializing: false });
+    expect(sessionStore.getState()).toEqual({ loaded: false, session: null, error, initializing: false });
   });
 
   it('should keep an already-loaded session when a later fetch fails', async () => {
@@ -615,11 +615,62 @@ describe('refetchCurrentUser', () => {
       loaded: false,
       error: new Error('The session endpoint did not respond with a session'),
     });
+    expect(sessionStore.getState()).toMatchObject({ initializing: false });
+  });
+
+  it('should record that the server is starting up when the session request is redirected to initial setup', async () => {
+    mockOpenmrsFetch.mockResolvedValue({
+      ...createMockFetchResponse(undefined),
+      redirected: true,
+      url: 'http://localhost/openmrs/initialsetup',
+    });
+
+    await expect(refetchCurrentUser()).rejects.toMatchObject({ loaded: false, session: null, initializing: true });
+    expect(sessionStore.getState()).toMatchObject({
+      loaded: false,
+      initializing: true,
+      error: new Error('The server is still starting up'),
+    });
+  });
+
+  it('should record that the server is starting up when the gateway responds with a 502 soon after the first fetch', async () => {
+    mockReportError.mockClear();
+    mockOpenmrsFetch.mockRejectedValue(createFetchError(502));
+
+    await expect(refetchCurrentUser()).rejects.toMatchObject({ loaded: false, initializing: true });
+    expect(mockReportError).not.toHaveBeenCalled();
+  });
+
+  it('should record an ordinary error when the gateway still responds with a 502 minutes after the first fetch', async () => {
+    vi.useFakeTimers();
+
+    try {
+      mockOpenmrsFetch.mockRejectedValue(createFetchError(502));
+      await refetchCurrentUser().catch(() => {});
+
+      vi.setSystemTime(Date.now() + 3 * 60 * 1000);
+      mockReportError.mockClear();
+
+      await expect(refetchCurrentUser()).rejects.toMatchObject({ loaded: false, initializing: false });
+      expect(mockReportError).toHaveBeenCalled();
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+
+  it('should keep an already-loaded session and report the error when the gateway responds with a 502', async () => {
+    const mockSession: Session = { authenticated: true, sessionId: 'test-session', user: {} as LoggedInUser };
+    sessionStore.setState({ loaded: true, session: mockSession }, true);
+    mockReportError.mockClear();
+    mockOpenmrsFetch.mockRejectedValue(createFetchError(502));
+
+    await expect(refetchCurrentUser()).rejects.toEqual({ loaded: true, session: mockSession });
+    expect(mockReportError).toHaveBeenCalled();
   });
 
   it('should use the unauthenticated session in the body of a 401 response', async () => {
     const unauthenticated = { authenticated: false, sessionId: 'abc', allowedLocales: ['en', 'fr'] };
-    mockOpenmrsFetch.mockRejectedValue(createAuthFailure(401, unauthenticated));
+    mockOpenmrsFetch.mockRejectedValue(createFetchError(401, unauthenticated));
 
     await expect(refetchCurrentUser()).resolves.toEqual({ loaded: true, session: unauthenticated });
   });
@@ -628,7 +679,7 @@ describe('refetchCurrentUser', () => {
     'should record a logged-out session when the session endpoint responds with %i',
     async (status) => {
       mockReportError.mockClear();
-      mockOpenmrsFetch.mockRejectedValue(createAuthFailure(status));
+      mockOpenmrsFetch.mockRejectedValue(createFetchError(status));
 
       await expect(refetchCurrentUser()).resolves.toEqual({
         loaded: true,
@@ -644,7 +695,7 @@ describe('refetchCurrentUser', () => {
   );
 
   it('should not leave readers waiting on the failed request after an auth failure', async () => {
-    mockOpenmrsFetch.mockRejectedValueOnce(createAuthFailure(401));
+    mockOpenmrsFetch.mockRejectedValueOnce(createFetchError(401));
     await refetchCurrentUser();
 
     await expect(getCurrentUser()).resolves.toEqual({ authenticated: false, sessionId: '' });
@@ -901,7 +952,7 @@ describe('logout', () => {
   });
 
   it('should treat a session the server has already ended as logged out', async () => {
-    mockOpenmrsFetch.mockRejectedValue(createAuthFailure(401));
+    mockOpenmrsFetch.mockRejectedValue(createFetchError(401));
 
     await expect(logout()).resolves.toBeUndefined();
     expect(sessionStore.getState()).toEqual(loggedOut);

package/src/current-user.ts

@@ -17,6 +17,12 @@ export type UnloadedSessionStore = {
   session: null;
   /** Set when fetching the session failed before any session had loaded. */
   error?: Error;
+  /**
+   * Set alongside `error`. `true` when the backend appears to be still starting up rather than broken:
+   * it redirected the session request to its initial setup page, or its gateway answered with a 502
+   * shortly after the page loaded.
+   */
+  initializing?: boolean;
 };
 
 /** @internal */
@@ -33,6 +39,14 @@ export const sessionStore = createGlobalStore<SessionStore>('session', {
 const sessionMaxAgeMillis = 60 * 1000;
 
 let lastFetchTimeMillis = 0;
+
+/**
+ * How long after the first session fetch a 502 is taken to mean that the backend is still starting up. A
+ * gateway answers with a 502 until the backend has deployed, which can take a few minutes after a restart.
+ */
+const startupGracePeriodMillis = 3 * 60 * 1000;
+
+let firstFetchTimeMillis: number | undefined;
 let inFlightRefresh: Promise<SessionStore> | null = null;
 
 /**
@@ -236,6 +250,7 @@ function isSuperUser(user: { roles: Array<Role> }) {
  */
 export function refetchCurrentUser(username?: string, password?: string) {
   lastFetchTimeMillis = Date.now();
+  firstFetchTimeMillis ??= lastFetchTimeMillis;
   let headers = {};
   if (username && password) {
     headers['Authorization'] = `Basic ${window.btoa(`${username}:${password}`)}`;
@@ -557,6 +572,8 @@ function handleSessionResponse(result: Promise<FetchResponse<Session>>) {
           const nextState: SessionStore = { loaded: true, session: res.data };
           sessionStore.setState(nextState, true);
           resolve(nextState);
+        } else if (isInitialSetupRedirect(res)) {
+          reject(recordSessionFailure(Error('The server is still starting up'), true));
         } else {
           reject(recordSessionFailure(Error('The session endpoint did not respond with a session')));
         }
@@ -573,6 +590,11 @@ function handleSessionResponse(result: Promise<FetchResponse<Session>>) {
           return;
         }
 
+        if (isGatewayErrorDuringStartup(err)) {
+          reject(recordSessionFailure(err, true));
+          return;
+        }
+
         reportError(`Failed to fetch new session information: ${err}`);
         reject(recordSessionFailure(err));
       });
@@ -583,6 +605,32 @@ function isAuthFailure(err: unknown): err is OpenmrsFetchError {
   return err instanceof OpenmrsFetchError && (err.response.status === 401 || err.response.status === 403);
 }
 
+/**
+ * Until the backend has finished its initial setup, it answers every request with a redirect to its
+ * setup page, which `fetch()` follows, so the session request resolves with that page's HTML.
+ */
+function isInitialSetupRedirect(res: FetchResponse | undefined) {
+  if (!res?.redirected || !res.url) {
+    return false;
+  }
+
+  try {
+    return new URL(res.url, window.location.href).pathname.replace(/\/+$/, '').endsWith('/initialsetup');
+  } catch {
+    return false;
+  }
+}
+
+function isGatewayErrorDuringStartup(err: unknown) {
+  return (
+    err instanceof OpenmrsFetchError &&
+    err.response.status === 502 &&
+    !sessionStore.getState().loaded &&
+    firstFetchTimeMillis !== undefined &&
+    Date.now() - firstFetchTimeMillis < startupGracePeriodMillis
+  );
+}
+
 function isUnauthenticatedSession(body: unknown): body is Session {
   return typeof body === 'object' && body !== null && (body as Session).authenticated === false;
 }
@@ -591,13 +639,14 @@ function isUnauthenticatedSession(body: unknown): body is Session {
  * A session that has already loaded is kept when a later fetch fails, since it is still the best answer
  * available. With nothing to fall back on, the error is recorded so the app shell can show an error page.
  */
-function recordSessionFailure(err: unknown): SessionStore {
+function recordSessionFailure(err: unknown, initializing = false): SessionStore {
   if (!sessionStore.getState().loaded) {
     sessionStore.setState(
       {
         loaded: false,
         session: null,
         error: err instanceof Error ? err : Error(String(err)),
+        initializing,
       },
       true,
     );