@sanity/client 7.11.0 → 7.11.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/client",
-  "version": "7.11.0",
+  "version": "7.11.1",
   "description": "Client for retrieving, creating and patching data from Sanity.io",
   "keywords": [
     "sanity",

package/src/data/live.ts

@@ -1,4 +1,4 @@
-import {catchError, concat, EMPTY, mergeMap, Observable, of} from 'rxjs'
+import {catchError, mergeMap, Observable, of} from 'rxjs'
 import {finalize, map} from 'rxjs/operators'
 
 import {CorsOriginError} from '../http/errors'
@@ -113,37 +113,53 @@ export class LiveClient {
       'welcome',
       'reconnect',
       'goaway',
-    ]).pipe(
-      reconnectOnConnectionFailure(),
-      map((event) => {
-        if (event.type === 'message') {
-          const {data, ...rest} = event
-          // Splat data properties from the eventsource message onto the returned event
-          return {...rest, tags: (data as {tags: SyncTag[]}).tags} as LiveEventMessage
-        }
-        return event as LiveEventRestart | LiveEventReconnect | LiveEventWelcome | LiveEventGoAway
-      }),
-    )
+    ])
 
-    // Detect if CORS is allowed, the way the CORS is checked supports preflight caching, so when the EventSource boots up it knows it sees the preflight was already made and we're good to go
     const checkCors = fetchObservable(url, {
       method: 'OPTIONS',
       mode: 'cors',
       credentials: esOptions.withCredentials ? 'include' : 'omit',
       headers: esOptions.headers,
     }).pipe(
-      mergeMap(() => EMPTY),
       catchError(() => {
         // If the request fails, then we assume it was due to CORS, and we rethrow a special error that allows special handling in userland
         throw new CorsOriginError({projectId: projectId!})
       }),
     )
-    const observable = concat(checkCors, events).pipe(
-      finalize(() => eventsCache.delete(key)),
-      shareReplayLatest({
-        predicate: (event) => event.type === 'welcome',
-      }),
-    )
+
+    const observable = events
+      .pipe(
+        reconnectOnConnectionFailure(),
+        mergeMap((event) => {
+          if (event.type === 'reconnect') {
+            // Check for CORS on reconnect events (which happen on 403s)
+            return checkCors.pipe(mergeMap(() => of(event)))
+          }
+          return of(event)
+        }),
+        catchError((err) => {
+          return checkCors.pipe(
+            mergeMap(() => {
+              // rethrow the original error if checkCors passed
+              throw err
+            }),
+          )
+        }),
+        map((event) => {
+          if (event.type === 'message') {
+            const {data, ...rest} = event
+            // Splat data properties from the eventsource message onto the returned event
+            return {...rest, tags: (data as {tags: SyncTag[]}).tags} as LiveEventMessage
+          }
+          return event as LiveEventRestart | LiveEventReconnect | LiveEventWelcome | LiveEventGoAway
+        }),
+      )
+      .pipe(
+        finalize(() => eventsCache.delete(key)),
+        shareReplayLatest({
+          predicate: (event) => event.type === 'welcome',
+        }),
+      )
     eventsCache.set(key, observable)
     return observable
   }

package/umd/sanityClient.js

@@ -3439,26 +3439,31 @@ ${selectionOpts}`);
         "welcome",
         "reconnect",
         "goaway"
-      ]).pipe(
-        reconnectOnConnectionFailure(),
-        map((event) => {
-          if (event.type === "message") {
-            const { data, ...rest } = event;
-            return { ...rest, tags: data.tags };
-          }
-          return event;
-        })
-      ), checkCors = fetchObservable(url, {
+      ]), checkCors = fetchObservable(url, {
         method: "OPTIONS",
         mode: "cors",
         credentials: esOptions.withCredentials ? "include" : "omit",
         headers: esOptions.headers
       }).pipe(
-        mergeMap(() => EMPTY),
         catchError(() => {
           throw new CorsOriginError({ projectId: projectId2 });
         })
-      ), observable2 = concat(checkCors, events).pipe(
+      ), observable2 = events.pipe(
+        reconnectOnConnectionFailure(),
+        mergeMap((event) => event.type === "reconnect" ? checkCors.pipe(mergeMap(() => of(event))) : of(event)),
+        catchError((err) => checkCors.pipe(
+          mergeMap(() => {
+            throw err;
+          })
+        )),
+        map((event) => {
+          if (event.type === "message") {
+            const { data, ...rest } = event;
+            return { ...rest, tags: data.tags };
+          }
+          return event;
+        })
+      ).pipe(
         finalize(() => eventsCache.delete(key)),
         shareReplayLatest({
           predicate: (event) => event.type === "welcome"