@sanity/client 7.11.0-live-cors → 7.11.0

package/package.json

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

package/src/data/live.ts

@@ -1,5 +1,5 @@
-import {catchError, mergeMap, Observable, of} from 'rxjs'
-import {finalize, map, shareReplay} from 'rxjs/operators'
+import {catchError, concat, EMPTY, mergeMap, Observable, of} from 'rxjs'
+import {finalize, map} from 'rxjs/operators'
 
 import {CorsOriginError} from '../http/errors'
 import type {ObservableSanityClient, SanityClient} from '../SanityClient'
@@ -113,47 +113,32 @@ 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 CORS only if the initial connection fails. 
-    const checkCors$ = fetchObservable(url, {
+    // 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!})
       }),
-      shareReplay(1), // run only once
     )
-
-    const observable = events.pipe(
-      catchError((err) => {
-        console.log('[live] err from catchError', err)
-        return checkCors$.pipe(
-          mergeMap(() => {
-            console.log('[live] err from checkCors$', err)
-            return of(err)
-          }),
-          mergeMap(() => {
-            console.log('[live] throwing err from checkCors$', err)
-            throw err
-          })
-        )
-      }),
-      reconnectOnConnectionFailure(),
-      map((event) => {
-        console.log('event', 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(
+    const observable = concat(checkCors, events).pipe(
       finalize(() => eventsCache.delete(key)),
       shareReplayLatest({
         predicate: (event) => event.type === 'welcome',

package/umd/sanityClient.js

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