@cmssy/core 12.9.0 → 12.11.0

package/dist/internal/locale.d.cts

@@ -1,6 +1,6 @@
-export { C as CMSSY_LOCALE_HEADER, a as localeForPath, b as localeForPathname, l as localizeHref, c as resolveSiteLocales, s as splitCmssyLocale, d as splitLocaleFromPath } from '../locale-BM2fwE3O.cjs';
+export { C as CMSSY_LOCALE_HEADER, a as localeForPath, b as localeForPathname, l as localizeHref, c as resolveSiteLocales, s as splitCmssyLocale, d as splitLocaleFromPath } from '../locale-JyBHqpAQ.cjs';
 export { CmssySiteLocales } from '@cmssy/types';
-import '../content-client-COeyYJl1.cjs';
+import '../content-client-65N8ZRq9.cjs';
 
 declare function localizedPath(slug: string, locale: string, defaultLocale: string): string;
 

package/dist/internal/locale.d.ts

@@ -1,6 +1,6 @@
-export { C as CMSSY_LOCALE_HEADER, a as localeForPath, b as localeForPathname, l as localizeHref, c as resolveSiteLocales, s as splitCmssyLocale, d as splitLocaleFromPath } from '../locale-jxsO_8YF.js';
+export { C as CMSSY_LOCALE_HEADER, a as localeForPath, b as localeForPathname, l as localizeHref, c as resolveSiteLocales, s as splitCmssyLocale, d as splitLocaleFromPath } from '../locale-D9KI4bND.js';
 export { CmssySiteLocales } from '@cmssy/types';
-import '../content-client-COeyYJl1.js';
+import '../content-client-65N8ZRq9.js';
 
 declare function localizedPath(slug: string, locale: string, defaultLocale: string): string;
 

package/dist/internal/locale.js

@@ -2,15 +2,64 @@
 var CmssyRequestError = class extends Error {
   status;
   retryAfterMs;
-  constructor(message, status, retryAfterMs2) {
+  waitedMs;
+  constructor(message, status, retryAfterMs2, waitedMs) {
     super(message);
     this.name = "CmssyRequestError";
     this.status = status;
     if (retryAfterMs2 !== void 0) this.retryAfterMs = retryAfterMs2;
+    if (waitedMs !== void 0) this.waitedMs = waitedMs;
   }
 };
-var DEFAULT_RETRY_STATUSES = [429, 503];
+var THROTTLE_STATUS = 429;
 var CMSSY_RATE_LIMIT_WINDOW_MS = 6e4;
+var CMSSY_RETRY_MODES = {
+  build: {
+    maxRetries: 4,
+    baseDelayMs: 300,
+    throttleBaseDelayMs: 1e3,
+    maxDelayMs: 2e4,
+    maxRetryAfterMs: CMSSY_RATE_LIMIT_WINDOW_MS,
+    maxTotalWaitMs: 18e4,
+    retryStatuses: Object.freeze([429, 503])
+  },
+  interactive: {
+    maxRetries: 2,
+    baseDelayMs: 50,
+    throttleBaseDelayMs: 500,
+    maxDelayMs: 1e3,
+    maxRetryAfterMs: 1e3,
+    maxTotalWaitMs: 2e3,
+    retryStatuses: Object.freeze([429, 503])
+  }
+};
+Object.freeze(CMSSY_RETRY_MODES.build);
+Object.freeze(CMSSY_RETRY_MODES.interactive);
+Object.freeze(CMSSY_RETRY_MODES);
+function resolveRetryPolicy(retry) {
+  if (retry === false || retry === void 0) return null;
+  if (typeof retry === "string") {
+    const mode = CMSSY_RETRY_MODES[retry];
+    if (!mode) {
+      throw new Error(
+        `cmssy: unknown retry mode "${retry}" - use ${Object.keys(
+          CMSSY_RETRY_MODES
+        ).map((name) => `"${name}"`).join(" or ")}, false, or a retry policy object`
+      );
+    }
+    return mode;
+  }
+  const base = CMSSY_RETRY_MODES.build;
+  return {
+    maxRetries: retry.maxRetries ?? base.maxRetries,
+    baseDelayMs: retry.baseDelayMs ?? base.baseDelayMs,
+    throttleBaseDelayMs: retry.throttleBaseDelayMs ?? base.throttleBaseDelayMs,
+    maxDelayMs: retry.maxDelayMs ?? base.maxDelayMs,
+    maxRetryAfterMs: retry.maxRetryAfterMs ?? base.maxRetryAfterMs,
+    maxTotalWaitMs: retry.maxTotalWaitMs ?? base.maxTotalWaitMs,
+    retryStatuses: retry.retryStatuses ?? base.retryStatuses
+  };
+}
 function retryAfterMs(response) {
   const raw = response.headers?.get("retry-after");
   if (!raw) return null;
@@ -37,28 +86,40 @@ function sleep(ms, signal) {
     signal?.addEventListener("abort", onAbort, { once: true });
   });
 }
-async function fetchWithRetry(doFetch, url, init, retry) {
-  if (retry === false || retry === void 0) {
-    return doFetch(url, init);
+async function fetchWithRetry(doFetch, url, init, retry, label) {
+  const policy = resolveRetryPolicy(retry);
+  if (policy === null) {
+    return { response: await doFetch(url, init), waitedMs: 0 };
   }
-  const maxRetries = retry.maxRetries ?? 3;
-  const baseDelayMs = retry.baseDelayMs ?? 300;
-  const maxDelayMs = retry.maxDelayMs ?? 3e3;
-  const maxRetryAfterMs = retry.maxRetryAfterMs ?? CMSSY_RATE_LIMIT_WINDOW_MS;
-  const retryStatuses = retry.retryStatuses ?? DEFAULT_RETRY_STATUSES;
   let response = await doFetch(url, init);
-  for (let attempt = 0; attempt < maxRetries; attempt++) {
-    if (response.ok || !retryStatuses.includes(response.status)) {
-      return response;
+  let waitedMs = 0;
+  for (let attempt = 0; attempt < policy.maxRetries; attempt++) {
+    if (response.ok || !policy.retryStatuses.includes(response.status)) {
+      return { response, waitedMs };
     }
+    const throttled = response.status === THROTTLE_STATUS;
     const asked = retryAfterMs(response);
-    if (asked !== null && asked > maxRetryAfterMs) return response;
-    const backoff = baseDelayMs * 2 ** attempt;
-    const wait = asked !== null ? asked : Math.min(backoff, maxDelayMs);
+    if (asked !== null && asked > policy.maxRetryAfterMs) {
+      return { response, waitedMs };
+    }
+    const base = throttled ? policy.throttleBaseDelayMs : policy.baseDelayMs;
+    const wait = Math.round(
+      asked !== null ? Math.min(
+        asked + Math.random() * policy.throttleBaseDelayMs,
+        policy.maxRetryAfterMs
+      ) : Math.random() * Math.min(base * 2 ** attempt, policy.maxDelayMs)
+    );
+    if (waitedMs + wait > policy.maxTotalWaitMs) {
+      return { response, waitedMs };
+    }
+    console.warn(
+      `[cmssy] ${label} got ${response.status}, retrying in ${wait}ms (attempt ${attempt + 1}/${policy.maxRetries})`
+    );
     await sleep(wait, init.signal);
+    waitedMs += wait;
     response = await doFetch(url, init);
   }
-  return response;
+  return { response, waitedMs };
 }
 async function postGraphql(url, query, variables, options) {
   const doFetch = options.fetch ?? globalThis.fetch;
@@ -67,7 +128,7 @@ async function postGraphql(url, query, variables, options) {
       "cmssy: no fetch implementation available - pass options.fetch"
     );
   }
-  const response = await fetchWithRetry(
+  const { response, waitedMs } = await fetchWithRetry(
     doFetch,
     url,
     {
@@ -76,7 +137,8 @@ async function postGraphql(url, query, variables, options) {
       body: JSON.stringify({ query, variables }),
       signal: options.signal
     },
-    options.retry
+    options.retry,
+    options.label
   );
   if (!response.ok) {
     let detail = "";
@@ -90,10 +152,12 @@ async function postGraphql(url, query, variables, options) {
     }
     const asked = retryAfterMs(response);
     const wait = asked !== null ? ` - retry after ${Math.ceil(asked / 1e3)}s` : "";
+    const spent = waitedMs > 0 ? ` - gave up after waiting ${waitedMs}ms` : "";
     throw new CmssyRequestError(
-      `cmssy: ${options.label} failed (${response.status})${detail}${wait}`,
+      `cmssy: ${options.label} failed (${response.status})${detail}${wait}${spent}`,
       response.status,
-      asked ?? void 0
+      asked ?? void 0,
+      waitedMs > 0 ? waitedMs : void 0
     );
   }
   let json;
@@ -182,7 +246,7 @@ async function loadSiteLocales(config, options) {
       config,
       SITE_CONFIG_QUERY,
       { workspaceSlug: config.workspaceSlug },
-      { ...options, public: true, retry: options?.retry ?? {} },
+      { ...options, public: true, retry: options?.retry ?? "build" },
       "site config"
     );
     value = localesFromSiteConfig(data.public?.siteConfig ?? null);

package/dist/internal.cjs

@@ -4,15 +4,64 @@
 var CmssyRequestError = class extends Error {
   status;
   retryAfterMs;
-  constructor(message, status, retryAfterMs2) {
+  waitedMs;
+  constructor(message, status, retryAfterMs2, waitedMs) {
     super(message);
     this.name = "CmssyRequestError";
     this.status = status;
     if (retryAfterMs2 !== void 0) this.retryAfterMs = retryAfterMs2;
+    if (waitedMs !== void 0) this.waitedMs = waitedMs;
   }
 };
-var DEFAULT_RETRY_STATUSES = [429, 503];
+var THROTTLE_STATUS = 429;
 var CMSSY_RATE_LIMIT_WINDOW_MS = 6e4;
+var CMSSY_RETRY_MODES = {
+  build: {
+    maxRetries: 4,
+    baseDelayMs: 300,
+    throttleBaseDelayMs: 1e3,
+    maxDelayMs: 2e4,
+    maxRetryAfterMs: CMSSY_RATE_LIMIT_WINDOW_MS,
+    maxTotalWaitMs: 18e4,
+    retryStatuses: Object.freeze([429, 503])
+  },
+  interactive: {
+    maxRetries: 2,
+    baseDelayMs: 50,
+    throttleBaseDelayMs: 500,
+    maxDelayMs: 1e3,
+    maxRetryAfterMs: 1e3,
+    maxTotalWaitMs: 2e3,
+    retryStatuses: Object.freeze([429, 503])
+  }
+};
+Object.freeze(CMSSY_RETRY_MODES.build);
+Object.freeze(CMSSY_RETRY_MODES.interactive);
+Object.freeze(CMSSY_RETRY_MODES);
+function resolveRetryPolicy(retry) {
+  if (retry === false || retry === void 0) return null;
+  if (typeof retry === "string") {
+    const mode = CMSSY_RETRY_MODES[retry];
+    if (!mode) {
+      throw new Error(
+        `cmssy: unknown retry mode "${retry}" - use ${Object.keys(
+          CMSSY_RETRY_MODES
+        ).map((name2) => `"${name2}"`).join(" or ")}, false, or a retry policy object`
+      );
+    }
+    return mode;
+  }
+  const base = CMSSY_RETRY_MODES.build;
+  return {
+    maxRetries: retry.maxRetries ?? base.maxRetries,
+    baseDelayMs: retry.baseDelayMs ?? base.baseDelayMs,
+    throttleBaseDelayMs: retry.throttleBaseDelayMs ?? base.throttleBaseDelayMs,
+    maxDelayMs: retry.maxDelayMs ?? base.maxDelayMs,
+    maxRetryAfterMs: retry.maxRetryAfterMs ?? base.maxRetryAfterMs,
+    maxTotalWaitMs: retry.maxTotalWaitMs ?? base.maxTotalWaitMs,
+    retryStatuses: retry.retryStatuses ?? base.retryStatuses
+  };
+}
 function retryAfterMs(response) {
   const raw = response.headers?.get("retry-after");
   if (!raw) return null;
@@ -39,28 +88,40 @@ function sleep(ms, signal) {
     signal?.addEventListener("abort", onAbort, { once: true });
   });
 }
-async function fetchWithRetry(doFetch, url, init, retry) {
-  if (retry === false || retry === void 0) {
-    return doFetch(url, init);
+async function fetchWithRetry(doFetch, url, init, retry, label) {
+  const policy = resolveRetryPolicy(retry);
+  if (policy === null) {
+    return { response: await doFetch(url, init), waitedMs: 0 };
   }
-  const maxRetries = retry.maxRetries ?? 3;
-  const baseDelayMs = retry.baseDelayMs ?? 300;
-  const maxDelayMs = retry.maxDelayMs ?? 3e3;
-  const maxRetryAfterMs = retry.maxRetryAfterMs ?? CMSSY_RATE_LIMIT_WINDOW_MS;
-  const retryStatuses = retry.retryStatuses ?? DEFAULT_RETRY_STATUSES;
   let response = await doFetch(url, init);
-  for (let attempt = 0; attempt < maxRetries; attempt++) {
-    if (response.ok || !retryStatuses.includes(response.status)) {
-      return response;
+  let waitedMs = 0;
+  for (let attempt = 0; attempt < policy.maxRetries; attempt++) {
+    if (response.ok || !policy.retryStatuses.includes(response.status)) {
+      return { response, waitedMs };
     }
+    const throttled = response.status === THROTTLE_STATUS;
     const asked = retryAfterMs(response);
-    if (asked !== null && asked > maxRetryAfterMs) return response;
-    const backoff = baseDelayMs * 2 ** attempt;
-    const wait = asked !== null ? asked : Math.min(backoff, maxDelayMs);
+    if (asked !== null && asked > policy.maxRetryAfterMs) {
+      return { response, waitedMs };
+    }
+    const base = throttled ? policy.throttleBaseDelayMs : policy.baseDelayMs;
+    const wait = Math.round(
+      asked !== null ? Math.min(
+        asked + Math.random() * policy.throttleBaseDelayMs,
+        policy.maxRetryAfterMs
+      ) : Math.random() * Math.min(base * 2 ** attempt, policy.maxDelayMs)
+    );
+    if (waitedMs + wait > policy.maxTotalWaitMs) {
+      return { response, waitedMs };
+    }
+    console.warn(
+      `[cmssy] ${label} got ${response.status}, retrying in ${wait}ms (attempt ${attempt + 1}/${policy.maxRetries})`
+    );
     await sleep(wait, init.signal);
+    waitedMs += wait;
     response = await doFetch(url, init);
   }
-  return response;
+  return { response, waitedMs };
 }
 async function postGraphql(url, query, variables, options) {
   const doFetch = options.fetch ?? globalThis.fetch;
@@ -69,7 +130,7 @@ async function postGraphql(url, query, variables, options) {
       "cmssy: no fetch implementation available - pass options.fetch"
     );
   }
-  const response = await fetchWithRetry(
+  const { response, waitedMs } = await fetchWithRetry(
     doFetch,
     url,
     {
@@ -78,7 +139,8 @@ async function postGraphql(url, query, variables, options) {
       body: JSON.stringify({ query, variables }),
       signal: options.signal
     },
-    options.retry
+    options.retry,
+    options.label
   );
   if (!response.ok) {
     let detail = "";
@@ -92,10 +154,12 @@ async function postGraphql(url, query, variables, options) {
     }
     const asked = retryAfterMs(response);
     const wait = asked !== null ? ` - retry after ${Math.ceil(asked / 1e3)}s` : "";
+    const spent = waitedMs > 0 ? ` - gave up after waiting ${waitedMs}ms` : "";
     throw new CmssyRequestError(
-      `cmssy: ${options.label} failed (${response.status})${detail}${wait}`,
+      `cmssy: ${options.label} failed (${response.status})${detail}${wait}${spent}`,
       response.status,
-      asked ?? void 0
+      asked ?? void 0,
+      waitedMs > 0 ? waitedMs : void 0
     );
   }
   let json;
@@ -232,7 +296,7 @@ async function fetchPage(config, path, options = {}) {
       fetch: options.fetch,
       signal: options.signal,
       headers,
-      retry: options.retry ?? {},
+      retry: options.retry ?? "build",
       label: "page fetch"
     }
   );
@@ -255,7 +319,7 @@ async function fetchPageById(config, pageId, options = {}) {
     {
       fetch: options.fetch,
       signal: options.signal,
-      retry: options.retry ?? {},
+      retry: options.retry ?? "build",
       label: "page-by-id fetch"
     }
   );
@@ -276,7 +340,7 @@ async function fetchPages(config, options = {}) {
     {
       fetch: options.fetch,
       signal: options.signal,
-      retry: options.retry ?? {},
+      retry: options.retry ?? "build",
       label: "pages fetch"
     }
   );
@@ -291,7 +355,7 @@ async function fetchPageMeta(config, path, options = {}) {
     {
       fetch: options.fetch,
       signal: options.signal,
-      retry: options.retry ?? {},
+      retry: options.retry ?? "build",
       label: "page meta fetch"
     }
   );
@@ -308,7 +372,7 @@ async function fetchLayouts(config, path, options = {}) {
     {
       fetch: options.fetch,
       signal: options.signal,
-      retry: options.retry ?? {},
+      retry: options.retry ?? "build",
       label: "layouts fetch"
     }
   );
@@ -434,7 +498,7 @@ async function fetchSiteConfig(config, options = {}) {
     config,
     SITE_CONFIG_QUERY,
     { workspaceSlug: config.workspaceSlug },
-    { ...options, public: true, retry: options.retry ?? {} },
+    { ...options, public: true, retry: options.retry ?? "build" },
     "site config query"
   );
   return data.public?.siteConfig ?? null;
@@ -972,7 +1036,7 @@ async function loadSiteLocales(config, options) {
       config,
       SITE_CONFIG_QUERY,
       { workspaceSlug: config.workspaceSlug },
-      { ...options, public: true, retry: options?.retry ?? {} },
+      { ...options, public: true, retry: options?.retry ?? "build" },
       "site config"
     );
     value = localesFromSiteConfig(data.public?.siteConfig ?? null);

package/dist/internal.d.cts

@@ -1,10 +1,10 @@
-export { f as fetchLayouts, d as fetchPage, e as fetchPageById, g as fetchPageMeta, h as fetchPages, r as resolveApiUrl } from './content-client-COeyYJl1.cjs';
+export { g as fetchLayouts, h as fetchPage, i as fetchPageById, j as fetchPageMeta, k as fetchPages, r as resolveApiUrl } from './content-client-65N8ZRq9.cjs';
 import { CmssyFormDefinition, BuildBlockContextExtra, CmssyBlockContext, CmssyClientConfig, CmssySiteConfig, FieldDefinition, RawBlock } from '@cmssy/types';
 export { CmssySiteLocales } from '@cmssy/types';
-import { G as GraphqlRequestOptions } from './locale-BM2fwE3O.cjs';
-export { C as CMSSY_LOCALE_HEADER, a as localeForPath, b as localeForPathname, l as localizeHref, c as resolveSiteLocales, s as splitCmssyLocale, d as splitLocaleFromPath } from './locale-BM2fwE3O.cjs';
-import { Q as QueryScopedOptions } from './csp-BMP9bAZ9.cjs';
-export { u as cmssyCspHeaders, v as isDevelopment, w as resolveInitialTarget, x as toCspOrigin } from './csp-BMP9bAZ9.cjs';
+import { G as GraphqlRequestOptions } from './locale-JyBHqpAQ.cjs';
+export { C as CMSSY_LOCALE_HEADER, a as localeForPath, b as localeForPathname, l as localizeHref, c as resolveSiteLocales, s as splitCmssyLocale, d as splitLocaleFromPath } from './locale-JyBHqpAQ.cjs';
+import { Q as QueryScopedOptions } from './csp-RaStdD2i.cjs';
+export { u as cmssyCspHeaders, v as isDevelopment, w as resolveInitialTarget, x as toCspOrigin } from './csp-RaStdD2i.cjs';
 export { localizedPath } from './internal/locale.cjs';
 
 declare const SITE_CONFIG_QUERY = "query PublicSiteConfig($workspaceSlug: String!) {\n  public {\n    siteConfig(workspaceSlug: $workspaceSlug) {\n      id\n      workspaceId\n      siteName\n      defaultLanguage\n      enabledLanguages\n      enabledFeatures\n      notFoundPageId\n      previewUrl\n      branding {\n        brandName\n        logoUrl\n        logoDarkUrl\n        faviconUrl\n        ogImageUrl\n      }\n    }\n  }\n}";

package/dist/internal.d.ts

@@ -1,10 +1,10 @@
-export { f as fetchLayouts, d as fetchPage, e as fetchPageById, g as fetchPageMeta, h as fetchPages, r as resolveApiUrl } from './content-client-COeyYJl1.js';
+export { g as fetchLayouts, h as fetchPage, i as fetchPageById, j as fetchPageMeta, k as fetchPages, r as resolveApiUrl } from './content-client-65N8ZRq9.js';
 import { CmssyFormDefinition, BuildBlockContextExtra, CmssyBlockContext, CmssyClientConfig, CmssySiteConfig, FieldDefinition, RawBlock } from '@cmssy/types';
 export { CmssySiteLocales } from '@cmssy/types';
-import { G as GraphqlRequestOptions } from './locale-jxsO_8YF.js';
-export { C as CMSSY_LOCALE_HEADER, a as localeForPath, b as localeForPathname, l as localizeHref, c as resolveSiteLocales, s as splitCmssyLocale, d as splitLocaleFromPath } from './locale-jxsO_8YF.js';
-import { Q as QueryScopedOptions } from './csp-BDE0cAZL.js';
-export { u as cmssyCspHeaders, v as isDevelopment, w as resolveInitialTarget, x as toCspOrigin } from './csp-BDE0cAZL.js';
+import { G as GraphqlRequestOptions } from './locale-D9KI4bND.js';
+export { C as CMSSY_LOCALE_HEADER, a as localeForPath, b as localeForPathname, l as localizeHref, c as resolveSiteLocales, s as splitCmssyLocale, d as splitLocaleFromPath } from './locale-D9KI4bND.js';
+import { Q as QueryScopedOptions } from './csp-BnOiGUhR.js';
+export { u as cmssyCspHeaders, v as isDevelopment, w as resolveInitialTarget, x as toCspOrigin } from './csp-BnOiGUhR.js';
 export { localizedPath } from './internal/locale.js';
 
 declare const SITE_CONFIG_QUERY = "query PublicSiteConfig($workspaceSlug: String!) {\n  public {\n    siteConfig(workspaceSlug: $workspaceSlug) {\n      id\n      workspaceId\n      siteName\n      defaultLanguage\n      enabledLanguages\n      enabledFeatures\n      notFoundPageId\n      previewUrl\n      branding {\n        brandName\n        logoUrl\n        logoDarkUrl\n        faviconUrl\n        ogImageUrl\n      }\n    }\n  }\n}";

package/dist/internal.js

@@ -2,15 +2,64 @@
 var CmssyRequestError = class extends Error {
   status;
   retryAfterMs;
-  constructor(message, status, retryAfterMs2) {
+  waitedMs;
+  constructor(message, status, retryAfterMs2, waitedMs) {
     super(message);
     this.name = "CmssyRequestError";
     this.status = status;
     if (retryAfterMs2 !== void 0) this.retryAfterMs = retryAfterMs2;
+    if (waitedMs !== void 0) this.waitedMs = waitedMs;
   }
 };
-var DEFAULT_RETRY_STATUSES = [429, 503];
+var THROTTLE_STATUS = 429;
 var CMSSY_RATE_LIMIT_WINDOW_MS = 6e4;
+var CMSSY_RETRY_MODES = {
+  build: {
+    maxRetries: 4,
+    baseDelayMs: 300,
+    throttleBaseDelayMs: 1e3,
+    maxDelayMs: 2e4,
+    maxRetryAfterMs: CMSSY_RATE_LIMIT_WINDOW_MS,
+    maxTotalWaitMs: 18e4,
+    retryStatuses: Object.freeze([429, 503])
+  },
+  interactive: {
+    maxRetries: 2,
+    baseDelayMs: 50,
+    throttleBaseDelayMs: 500,
+    maxDelayMs: 1e3,
+    maxRetryAfterMs: 1e3,
+    maxTotalWaitMs: 2e3,
+    retryStatuses: Object.freeze([429, 503])
+  }
+};
+Object.freeze(CMSSY_RETRY_MODES.build);
+Object.freeze(CMSSY_RETRY_MODES.interactive);
+Object.freeze(CMSSY_RETRY_MODES);
+function resolveRetryPolicy(retry) {
+  if (retry === false || retry === void 0) return null;
+  if (typeof retry === "string") {
+    const mode = CMSSY_RETRY_MODES[retry];
+    if (!mode) {
+      throw new Error(
+        `cmssy: unknown retry mode "${retry}" - use ${Object.keys(
+          CMSSY_RETRY_MODES
+        ).map((name2) => `"${name2}"`).join(" or ")}, false, or a retry policy object`
+      );
+    }
+    return mode;
+  }
+  const base = CMSSY_RETRY_MODES.build;
+  return {
+    maxRetries: retry.maxRetries ?? base.maxRetries,
+    baseDelayMs: retry.baseDelayMs ?? base.baseDelayMs,
+    throttleBaseDelayMs: retry.throttleBaseDelayMs ?? base.throttleBaseDelayMs,
+    maxDelayMs: retry.maxDelayMs ?? base.maxDelayMs,
+    maxRetryAfterMs: retry.maxRetryAfterMs ?? base.maxRetryAfterMs,
+    maxTotalWaitMs: retry.maxTotalWaitMs ?? base.maxTotalWaitMs,
+    retryStatuses: retry.retryStatuses ?? base.retryStatuses
+  };
+}
 function retryAfterMs(response) {
   const raw = response.headers?.get("retry-after");
   if (!raw) return null;
@@ -37,28 +86,40 @@ function sleep(ms, signal) {
     signal?.addEventListener("abort", onAbort, { once: true });
   });
 }
-async function fetchWithRetry(doFetch, url, init, retry) {
-  if (retry === false || retry === void 0) {
-    return doFetch(url, init);
+async function fetchWithRetry(doFetch, url, init, retry, label) {
+  const policy = resolveRetryPolicy(retry);
+  if (policy === null) {
+    return { response: await doFetch(url, init), waitedMs: 0 };
   }
-  const maxRetries = retry.maxRetries ?? 3;
-  const baseDelayMs = retry.baseDelayMs ?? 300;
-  const maxDelayMs = retry.maxDelayMs ?? 3e3;
-  const maxRetryAfterMs = retry.maxRetryAfterMs ?? CMSSY_RATE_LIMIT_WINDOW_MS;
-  const retryStatuses = retry.retryStatuses ?? DEFAULT_RETRY_STATUSES;
   let response = await doFetch(url, init);
-  for (let attempt = 0; attempt < maxRetries; attempt++) {
-    if (response.ok || !retryStatuses.includes(response.status)) {
-      return response;
+  let waitedMs = 0;
+  for (let attempt = 0; attempt < policy.maxRetries; attempt++) {
+    if (response.ok || !policy.retryStatuses.includes(response.status)) {
+      return { response, waitedMs };
     }
+    const throttled = response.status === THROTTLE_STATUS;
     const asked = retryAfterMs(response);
-    if (asked !== null && asked > maxRetryAfterMs) return response;
-    const backoff = baseDelayMs * 2 ** attempt;
-    const wait = asked !== null ? asked : Math.min(backoff, maxDelayMs);
+    if (asked !== null && asked > policy.maxRetryAfterMs) {
+      return { response, waitedMs };
+    }
+    const base = throttled ? policy.throttleBaseDelayMs : policy.baseDelayMs;
+    const wait = Math.round(
+      asked !== null ? Math.min(
+        asked + Math.random() * policy.throttleBaseDelayMs,
+        policy.maxRetryAfterMs
+      ) : Math.random() * Math.min(base * 2 ** attempt, policy.maxDelayMs)
+    );
+    if (waitedMs + wait > policy.maxTotalWaitMs) {
+      return { response, waitedMs };
+    }
+    console.warn(
+      `[cmssy] ${label} got ${response.status}, retrying in ${wait}ms (attempt ${attempt + 1}/${policy.maxRetries})`
+    );
     await sleep(wait, init.signal);
+    waitedMs += wait;
     response = await doFetch(url, init);
   }
-  return response;
+  return { response, waitedMs };
 }
 async function postGraphql(url, query, variables, options) {
   const doFetch = options.fetch ?? globalThis.fetch;
@@ -67,7 +128,7 @@ async function postGraphql(url, query, variables, options) {
       "cmssy: no fetch implementation available - pass options.fetch"
     );
   }
-  const response = await fetchWithRetry(
+  const { response, waitedMs } = await fetchWithRetry(
     doFetch,
     url,
     {
@@ -76,7 +137,8 @@ async function postGraphql(url, query, variables, options) {
       body: JSON.stringify({ query, variables }),
       signal: options.signal
     },
-    options.retry
+    options.retry,
+    options.label
   );
   if (!response.ok) {
     let detail = "";
@@ -90,10 +152,12 @@ async function postGraphql(url, query, variables, options) {
     }
     const asked = retryAfterMs(response);
     const wait = asked !== null ? ` - retry after ${Math.ceil(asked / 1e3)}s` : "";
+    const spent = waitedMs > 0 ? ` - gave up after waiting ${waitedMs}ms` : "";
     throw new CmssyRequestError(
-      `cmssy: ${options.label} failed (${response.status})${detail}${wait}`,
+      `cmssy: ${options.label} failed (${response.status})${detail}${wait}${spent}`,
       response.status,
-      asked ?? void 0
+      asked ?? void 0,
+      waitedMs > 0 ? waitedMs : void 0
     );
   }
   let json;
@@ -230,7 +294,7 @@ async function fetchPage(config, path, options = {}) {
       fetch: options.fetch,
       signal: options.signal,
       headers,
-      retry: options.retry ?? {},
+      retry: options.retry ?? "build",
       label: "page fetch"
     }
   );
@@ -253,7 +317,7 @@ async function fetchPageById(config, pageId, options = {}) {
     {
       fetch: options.fetch,
       signal: options.signal,
-      retry: options.retry ?? {},
+      retry: options.retry ?? "build",
       label: "page-by-id fetch"
     }
   );
@@ -274,7 +338,7 @@ async function fetchPages(config, options = {}) {
     {
       fetch: options.fetch,
       signal: options.signal,
-      retry: options.retry ?? {},
+      retry: options.retry ?? "build",
       label: "pages fetch"
     }
   );
@@ -289,7 +353,7 @@ async function fetchPageMeta(config, path, options = {}) {
     {
       fetch: options.fetch,
       signal: options.signal,
-      retry: options.retry ?? {},
+      retry: options.retry ?? "build",
       label: "page meta fetch"
     }
   );
@@ -306,7 +370,7 @@ async function fetchLayouts(config, path, options = {}) {
     {
       fetch: options.fetch,
       signal: options.signal,
-      retry: options.retry ?? {},
+      retry: options.retry ?? "build",
       label: "layouts fetch"
     }
   );
@@ -432,7 +496,7 @@ async function fetchSiteConfig(config, options = {}) {
     config,
     SITE_CONFIG_QUERY,
     { workspaceSlug: config.workspaceSlug },
-    { ...options, public: true, retry: options.retry ?? {} },
+    { ...options, public: true, retry: options.retry ?? "build" },
     "site config query"
   );
   return data.public?.siteConfig ?? null;
@@ -970,7 +1034,7 @@ async function loadSiteLocales(config, options) {
       config,
       SITE_CONFIG_QUERY,
       { workspaceSlug: config.workspaceSlug },
-      { ...options, public: true, retry: options?.retry ?? {} },
+      { ...options, public: true, retry: options?.retry ?? "build" },
       "site config"
     );
     value = localesFromSiteConfig(data.public?.siteConfig ?? null);

package/dist/{locale-jxsO_8YF.d.ts → locale-D9KI4bND.d.ts}

@@ -1,12 +1,12 @@
 import { CmssyClientConfig, CmssyLocaleContext, CmssySiteLocales } from '@cmssy/types';
-import { F as FetchLike, R as RetryPolicy } from './content-client-COeyYJl1.js';
+import { F as FetchLike, R as RetryOption } from './content-client-65N8ZRq9.js';
 
 interface GraphqlRequestOptions {
     fetch?: FetchLike;
     signal?: AbortSignal;
     headers?: Record<string, string>;
     public?: boolean;
-    retry?: RetryPolicy | false;
+    retry?: RetryOption;
 }
 declare function graphqlRequest<T>(config: CmssyClientConfig, query: string, variables: Record<string, unknown>, options?: GraphqlRequestOptions, label?: string): Promise<T>;