@sanity/client 7.22.0 → 7.22.1

package/dist/index.cjs

@@ -188,14 +188,11 @@ function sliceWithEllipsis(str, max) {
 class CorsOriginError extends Error {
   projectId;
   addOriginUrl;
-  constructor({ projectId }) {
-    super("CorsOriginError"), this.name = "CorsOriginError", this.projectId = projectId;
-    const url = new URL(`https://sanity.io/manage/project/${projectId}/api`);
-    if (typeof location < "u") {
-      const { origin } = location;
-      url.searchParams.set("cors", "add"), url.searchParams.set("origin", origin), this.addOriginUrl = url, this.message = `The current origin is not allowed to connect to the Live Content API. Add it here: ${url}`;
-    } else
-      this.message = `The current origin is not allowed to connect to the Live Content API. Change your configuration here: ${url}`;
+  constructor({ projectId, credentials } = {}) {
+    if (super("CorsOriginError"), this.name = "CorsOriginError", this.projectId = projectId, projectId && typeof location < "u") {
+      const url = new URL(`https://sanity.io/manage/project/${projectId}/api`), { origin } = location;
+      url.searchParams.set("cors", "add"), url.searchParams.set("origin", origin), credentials && url.searchParams.set("credentials", ""), this.addOriginUrl = url, this.message = `The current origin is not allowed to connect to the Live Content API. Add it here: ${url}`;
+    } else projectId ? this.message = `The current origin is not allowed to connect to the Live Content API. Change your configuration here: https://sanity.io/manage/project/${projectId}/api` : this.message = "The current origin is not allowed to connect to the Live Content API.";
   }
 }
 const httpError = {
@@ -1330,19 +1327,14 @@ class LiveClient {
       "welcome",
       "reconnect",
       "goaway"
-    ]), checkCors = fetchObservable(url, {
-      method: "OPTIONS",
-      mode: "cors",
-      credentials: esOptions.withCredentials ? "include" : "omit",
-      headers: esOptions.headers
-    }).pipe(
-      rxjs.catchError(() => {
-        throw new CorsOriginError({ projectId });
-      })
+    ]), checkCors = checkCorsObservable(
+      new URL(this.#client.getUrl("/check/cors", !1)),
+      projectId,
+      esOptions.withCredentials === !0
     ), observable = events.pipe(
       reconnectOnConnectionFailure(),
       rxjs.mergeMap((event) => event.type === "reconnect" ? checkCors.pipe(rxjs.mergeMap(() => rxjs.of(event))) : rxjs.of(event)),
-      rxjs.catchError((err) => checkCors.pipe(
+      rxjs.catchError((err) => err instanceof CorsOriginError ? rxjs.throwError(() => err) : checkCors.pipe(
         rxjs.mergeMap(() => {
           throw err;
         })
@@ -1363,17 +1355,27 @@ class LiveClient {
     return eventsCache.set(key, observable), observable;
   }
 }
-function fetchObservable(url, init) {
+function checkCorsObservable(url, projectId, requireCredentials) {
   return new rxjs.Observable((observer) => {
-    const controller = new AbortController(), signal = controller.signal;
-    return fetch(url, { ...init, signal: controller.signal }).then(
-      (response) => {
-        observer.next(response), observer.complete();
-      },
-      (err) => {
-        signal.aborted || observer.error(err);
+    const controller = new AbortController(), { signal } = controller;
+    return fetch(url, { method: "GET", mode: "cors", credentials: "omit", signal }).then((response) => {
+      if (!(signal.aborted || !response.ok))
+        return response.json();
+    }).then((body) => {
+      if (!signal.aborted) {
+        if (requireCredentials && body?.result?.withCredentials === !1) {
+          observer.error(new CorsOriginError({ projectId, credentials: !0 }));
+          return;
+        }
+        if (body?.result?.allowed === !1) {
+          observer.error(new CorsOriginError({ projectId, credentials: requireCredentials }));
+          return;
+        }
+        observer.next(), observer.complete();
       }
-    ), () => controller.abort();
+    }).catch(() => {
+      signal.aborted || observer.closed || (observer.next(), observer.complete());
+    }), () => controller.abort();
   });
 }
 const eventsCache = /* @__PURE__ */ new Map();
@@ -2800,7 +2802,7 @@ function defineDeprecatedCreateClient(createClient2) {
     return config.printNoDefaultExport(), createClient2(config$1);
   };
 }
-var name = "@sanity/client", version = "7.22.0";
+var name = "@sanity/client", version = "7.22.1";
 const middleware = [
   middleware$1.debug({ verbose: !0, namespace: "sanity:client" }),
   middleware$1.headers({ "User-Agent": `${name} ${version}` }),