@cmssy/core 12.10.0 → 12.11.0

package/dist/{content-client-COeyYJl1.d.cts → content-client-65N8ZRq9.d.cts}

@@ -3,16 +3,23 @@ import { CmssyClientConfig, CmssyLayoutGroup, CmssyPageData, CmssyPageMeta, Cmss
 declare class CmssyRequestError extends Error {
     readonly status: number;
     readonly retryAfterMs?: number;
-    constructor(message: string, status: number, retryAfterMs?: number);
+    readonly waitedMs?: number;
+    constructor(message: string, status: number, retryAfterMs?: number, waitedMs?: number);
 }
 interface RetryPolicy {
     maxRetries?: number;
     baseDelayMs?: number;
+    throttleBaseDelayMs?: number;
     maxDelayMs?: number;
     maxRetryAfterMs?: number;
-    retryStatuses?: number[];
+    maxTotalWaitMs?: number;
+    retryStatuses?: readonly number[];
 }
+type CmssyRetryMode = "build" | "interactive";
+type RetryOption = CmssyRetryMode | RetryPolicy | false;
 declare const CMSSY_RATE_LIMIT_WINDOW_MS = 60000;
+type ResolvedRetryPolicy = Readonly<Required<RetryPolicy>>;
+declare const CMSSY_RETRY_MODES: Record<CmssyRetryMode, ResolvedRetryPolicy>;
 
 declare const DEFAULT_CMSSY_API_URL = "https://api.cmssy.io/graphql";
 declare function resolveApiUrl(apiUrl: string | undefined): string;
@@ -37,7 +44,7 @@ interface FetchPageOptions {
     workspaceId?: string;
     fetch?: FetchLike;
     signal?: AbortSignal;
-    retry?: RetryPolicy | false;
+    retry?: RetryOption;
 }
 declare function fetchPage(config: CmssyClientConfig, path: string | string[] | undefined, options?: FetchPageOptions): Promise<CmssyPageData | null>;
 declare function fetchPageById(config: CmssyClientConfig, pageId: string, options?: Pick<FetchPageOptions, "fetch" | "signal" | "retry">): Promise<CmssyPageData | null>;
@@ -45,4 +52,4 @@ declare function fetchPages(config: CmssyClientConfig, options?: Pick<FetchPageO
 declare function fetchPageMeta(config: CmssyClientConfig, path: string | string[] | undefined, options?: Pick<FetchPageOptions, "fetch" | "signal" | "retry">): Promise<CmssyPageMeta | null>;
 declare function fetchLayouts(config: CmssyClientConfig, path: string | string[] | undefined, options?: FetchPageOptions): Promise<CmssyLayoutGroup[]>;
 
-export { CMSSY_RATE_LIMIT_WINDOW_MS as C, DEFAULT_CMSSY_API_URL as D, type FetchLike as F, type RetryPolicy as R, CmssyRequestError as a, type FetchLikeResponse as b, type FetchPageOptions as c, fetchPage as d, fetchPageById as e, fetchLayouts as f, fetchPageMeta as g, fetchPages as h, resolveApiUrl as r };
+export { CMSSY_RATE_LIMIT_WINDOW_MS as C, DEFAULT_CMSSY_API_URL as D, type FetchLike as F, type RetryOption as R, CMSSY_RETRY_MODES as a, CmssyRequestError as b, type CmssyRetryMode as c, type FetchLikeResponse as d, type FetchPageOptions as e, type RetryPolicy as f, fetchLayouts as g, fetchPage as h, fetchPageById as i, fetchPageMeta as j, fetchPages as k, resolveApiUrl as r };

package/dist/{content-client-COeyYJl1.d.ts → content-client-65N8ZRq9.d.ts}

@@ -3,16 +3,23 @@ import { CmssyClientConfig, CmssyLayoutGroup, CmssyPageData, CmssyPageMeta, Cmss
 declare class CmssyRequestError extends Error {
     readonly status: number;
     readonly retryAfterMs?: number;
-    constructor(message: string, status: number, retryAfterMs?: number);
+    readonly waitedMs?: number;
+    constructor(message: string, status: number, retryAfterMs?: number, waitedMs?: number);
 }
 interface RetryPolicy {
     maxRetries?: number;
     baseDelayMs?: number;
+    throttleBaseDelayMs?: number;
     maxDelayMs?: number;
     maxRetryAfterMs?: number;
-    retryStatuses?: number[];
+    maxTotalWaitMs?: number;
+    retryStatuses?: readonly number[];
 }
+type CmssyRetryMode = "build" | "interactive";
+type RetryOption = CmssyRetryMode | RetryPolicy | false;
 declare const CMSSY_RATE_LIMIT_WINDOW_MS = 60000;
+type ResolvedRetryPolicy = Readonly<Required<RetryPolicy>>;
+declare const CMSSY_RETRY_MODES: Record<CmssyRetryMode, ResolvedRetryPolicy>;
 
 declare const DEFAULT_CMSSY_API_URL = "https://api.cmssy.io/graphql";
 declare function resolveApiUrl(apiUrl: string | undefined): string;
@@ -37,7 +44,7 @@ interface FetchPageOptions {
     workspaceId?: string;
     fetch?: FetchLike;
     signal?: AbortSignal;
-    retry?: RetryPolicy | false;
+    retry?: RetryOption;
 }
 declare function fetchPage(config: CmssyClientConfig, path: string | string[] | undefined, options?: FetchPageOptions): Promise<CmssyPageData | null>;
 declare function fetchPageById(config: CmssyClientConfig, pageId: string, options?: Pick<FetchPageOptions, "fetch" | "signal" | "retry">): Promise<CmssyPageData | null>;
@@ -45,4 +52,4 @@ declare function fetchPages(config: CmssyClientConfig, options?: Pick<FetchPageO
 declare function fetchPageMeta(config: CmssyClientConfig, path: string | string[] | undefined, options?: Pick<FetchPageOptions, "fetch" | "signal" | "retry">): Promise<CmssyPageMeta | null>;
 declare function fetchLayouts(config: CmssyClientConfig, path: string | string[] | undefined, options?: FetchPageOptions): Promise<CmssyLayoutGroup[]>;
 
-export { CMSSY_RATE_LIMIT_WINDOW_MS as C, DEFAULT_CMSSY_API_URL as D, type FetchLike as F, type RetryPolicy as R, CmssyRequestError as a, type FetchLikeResponse as b, type FetchPageOptions as c, fetchPage as d, fetchPageById as e, fetchLayouts as f, fetchPageMeta as g, fetchPages as h, resolveApiUrl as r };
+export { CMSSY_RATE_LIMIT_WINDOW_MS as C, DEFAULT_CMSSY_API_URL as D, type FetchLike as F, type RetryOption as R, CMSSY_RETRY_MODES as a, CmssyRequestError as b, type CmssyRetryMode as c, type FetchLikeResponse as d, type FetchPageOptions as e, type RetryPolicy as f, fetchLayouts as g, fetchPage as h, fetchPageById as i, fetchPageMeta as j, fetchPages as k, resolveApiUrl as r };

package/dist/{csp-BDE0cAZL.d.ts → csp-BnOiGUhR.d.ts}

@@ -1,5 +1,5 @@
 import { CmssyClientConfig, BlockRect, BlockSchema, BlockMeta } from '@cmssy/types';
-import { G as GraphqlRequestOptions } from './locale-jxsO_8YF.js';
+import { G as GraphqlRequestOptions } from './locale-D9KI4bND.js';
 
 declare const DEFAULT_CMSSY_EDITOR_ORIGINS: string[];
 declare function isDevelopment(): boolean;

package/dist/{csp-BMP9bAZ9.d.cts → csp-RaStdD2i.d.cts}

@@ -1,5 +1,5 @@
 import { CmssyClientConfig, BlockRect, BlockSchema, BlockMeta } from '@cmssy/types';
-import { G as GraphqlRequestOptions } from './locale-BM2fwE3O.cjs';
+import { G as GraphqlRequestOptions } from './locale-JyBHqpAQ.cjs';
 
 declare const DEFAULT_CMSSY_EDITOR_ORIGINS: string[];
 declare function isDevelopment(): boolean;

package/dist/index.cjs

@@ -77,15 +77,64 @@ Set the listed environment variables (e.g. in .env.local) and restart the dev se
 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;
@@ -112,28 +161,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;
@@ -142,7 +203,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,
     {
@@ -151,7 +212,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 = "";
@@ -165,10 +227,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;
@@ -387,7 +451,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;
@@ -575,7 +639,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);
@@ -902,6 +966,7 @@ exports.CMSSY_EDIT_HEADER = CMSSY_EDIT_HEADER;
 exports.CMSSY_EDIT_QUERY_PARAM = CMSSY_EDIT_QUERY_PARAM;
 exports.CMSSY_LOCALE_HEADER = CMSSY_LOCALE_HEADER;
 exports.CMSSY_RATE_LIMIT_WINDOW_MS = CMSSY_RATE_LIMIT_WINDOW_MS;
+exports.CMSSY_RETRY_MODES = CMSSY_RETRY_MODES;
 exports.CMSSY_SECRET_QUERY_PARAM = CMSSY_SECRET_QUERY_PARAM;
 exports.CmssyRequestError = CmssyRequestError;
 exports.CmssyWebhookError = CmssyWebhookError;

package/dist/index.d.cts

@@ -1,6 +1,6 @@
-export { A as AppToEditorMessage, B as BoundsMessage, C as ClickMessage, a as CmssyClient, b as CmssyConfig, c as CmssyCspOptions, d as CmssyEnvConfig, e as CmssyTypedDocument, D as DEFAULT_CMSSY_EDITOR_ORIGINS, E as EditorToAppMessage, I as InvisibleBlock, f as InvisibleBlocksMessage, P as PROTOCOL_VERSION, g as ParentReadyMessage, h as PatchMessage, i as PostTarget, Q as QueryScopedOptions, R as ReadyMessage, S as SHORTCUT_ACTIONS, j as SelectMessage, k as ShortcutAction, l as ShortcutMessage, V as ViewportMessage, m as applyCmssyCsp, n as createCmssyClient, o as defineCmssyConfig, p as isProtocolCompatible, q as normalizeOrigin, r as parseEditorMessage, s as postToEditor, t as resolveEditorOrigin } from './csp-BMP9bAZ9.cjs';
-export { C as CMSSY_LOCALE_HEADER, G as GraphqlRequestOptions, g as graphqlRequest, l as localizeHref, r as resolveCmssyLocale } from './locale-BM2fwE3O.cjs';
-export { C as CMSSY_RATE_LIMIT_WINDOW_MS, a as CmssyRequestError, D as DEFAULT_CMSSY_API_URL, F as FetchLike, b as FetchLikeResponse, c as FetchPageOptions, R as RetryPolicy } from './content-client-COeyYJl1.cjs';
+export { A as AppToEditorMessage, B as BoundsMessage, C as ClickMessage, a as CmssyClient, b as CmssyConfig, c as CmssyCspOptions, d as CmssyEnvConfig, e as CmssyTypedDocument, D as DEFAULT_CMSSY_EDITOR_ORIGINS, E as EditorToAppMessage, I as InvisibleBlock, f as InvisibleBlocksMessage, P as PROTOCOL_VERSION, g as ParentReadyMessage, h as PatchMessage, i as PostTarget, Q as QueryScopedOptions, R as ReadyMessage, S as SHORTCUT_ACTIONS, j as SelectMessage, k as ShortcutAction, l as ShortcutMessage, V as ViewportMessage, m as applyCmssyCsp, n as createCmssyClient, o as defineCmssyConfig, p as isProtocolCompatible, q as normalizeOrigin, r as parseEditorMessage, s as postToEditor, t as resolveEditorOrigin } from './csp-RaStdD2i.cjs';
+export { C as CMSSY_LOCALE_HEADER, G as GraphqlRequestOptions, g as graphqlRequest, l as localizeHref, r as resolveCmssyLocale } from './locale-JyBHqpAQ.cjs';
+export { C as CMSSY_RATE_LIMIT_WINDOW_MS, a as CMSSY_RETRY_MODES, b as CmssyRequestError, c as CmssyRetryMode, D as DEFAULT_CMSSY_API_URL, F as FetchLike, d as FetchLikeResponse, e as FetchPageOptions, R as RetryOption, f as RetryPolicy } from './content-client-65N8ZRq9.cjs';
 import * as _cmssy_types from '@cmssy/types';
 import { FieldOptions, TypedField, ResolvedMediaValue, PageRef, BlockPropsSchema, InferBlockContent, RelationMode, CmssyModelRecord, ResolvedMedia, VerifyCmssyWebhookOptions, CmssyWebhookEvent } from '@cmssy/types';
 export { BlockMeta, BlockPropsSchema, BlockRect, BlockSchema, BuildBlockContextExtra, CmssyBlockAuthContext, CmssyBlockContext, CmssyBlockMember, CmssyBlockPage, CmssyBlockWorkspace, CmssyBranding, CmssyClientConfig, CmssyFormDefinition, CmssyFormField, CmssyFormSettings, CmssyFormSubmitResponse, CmssyLayoutGroup, CmssyLayoutSettings, CmssyLocaleContext, CmssyLocalizedValue, CmssyModelDefinition, CmssyModelRecord, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRecordList, CmssySiteConfig, CmssyWebhookEvent, CmssyWebhookOrder, FieldCondition, FieldConditionGroup, FieldConditionLogic, FieldControl, FieldDefinition, FieldOptions, FieldType, InferBlockContent, LayoutPosition, RawBlock, RawLayoutBlock, SubmitFormInput, TypedField, VerifyCmssyWebhookOptions, evaluateFieldConditionGroup, layoutPositionValues } from '@cmssy/types';

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-export { A as AppToEditorMessage, B as BoundsMessage, C as ClickMessage, a as CmssyClient, b as CmssyConfig, c as CmssyCspOptions, d as CmssyEnvConfig, e as CmssyTypedDocument, D as DEFAULT_CMSSY_EDITOR_ORIGINS, E as EditorToAppMessage, I as InvisibleBlock, f as InvisibleBlocksMessage, P as PROTOCOL_VERSION, g as ParentReadyMessage, h as PatchMessage, i as PostTarget, Q as QueryScopedOptions, R as ReadyMessage, S as SHORTCUT_ACTIONS, j as SelectMessage, k as ShortcutAction, l as ShortcutMessage, V as ViewportMessage, m as applyCmssyCsp, n as createCmssyClient, o as defineCmssyConfig, p as isProtocolCompatible, q as normalizeOrigin, r as parseEditorMessage, s as postToEditor, t as resolveEditorOrigin } from './csp-BDE0cAZL.js';
-export { C as CMSSY_LOCALE_HEADER, G as GraphqlRequestOptions, g as graphqlRequest, l as localizeHref, r as resolveCmssyLocale } from './locale-jxsO_8YF.js';
-export { C as CMSSY_RATE_LIMIT_WINDOW_MS, a as CmssyRequestError, D as DEFAULT_CMSSY_API_URL, F as FetchLike, b as FetchLikeResponse, c as FetchPageOptions, R as RetryPolicy } from './content-client-COeyYJl1.js';
+export { A as AppToEditorMessage, B as BoundsMessage, C as ClickMessage, a as CmssyClient, b as CmssyConfig, c as CmssyCspOptions, d as CmssyEnvConfig, e as CmssyTypedDocument, D as DEFAULT_CMSSY_EDITOR_ORIGINS, E as EditorToAppMessage, I as InvisibleBlock, f as InvisibleBlocksMessage, P as PROTOCOL_VERSION, g as ParentReadyMessage, h as PatchMessage, i as PostTarget, Q as QueryScopedOptions, R as ReadyMessage, S as SHORTCUT_ACTIONS, j as SelectMessage, k as ShortcutAction, l as ShortcutMessage, V as ViewportMessage, m as applyCmssyCsp, n as createCmssyClient, o as defineCmssyConfig, p as isProtocolCompatible, q as normalizeOrigin, r as parseEditorMessage, s as postToEditor, t as resolveEditorOrigin } from './csp-BnOiGUhR.js';
+export { C as CMSSY_LOCALE_HEADER, G as GraphqlRequestOptions, g as graphqlRequest, l as localizeHref, r as resolveCmssyLocale } from './locale-D9KI4bND.js';
+export { C as CMSSY_RATE_LIMIT_WINDOW_MS, a as CMSSY_RETRY_MODES, b as CmssyRequestError, c as CmssyRetryMode, D as DEFAULT_CMSSY_API_URL, F as FetchLike, d as FetchLikeResponse, e as FetchPageOptions, R as RetryOption, f as RetryPolicy } from './content-client-65N8ZRq9.js';
 import * as _cmssy_types from '@cmssy/types';
 import { FieldOptions, TypedField, ResolvedMediaValue, PageRef, BlockPropsSchema, InferBlockContent, RelationMode, CmssyModelRecord, ResolvedMedia, VerifyCmssyWebhookOptions, CmssyWebhookEvent } from '@cmssy/types';
 export { BlockMeta, BlockPropsSchema, BlockRect, BlockSchema, BuildBlockContextExtra, CmssyBlockAuthContext, CmssyBlockContext, CmssyBlockMember, CmssyBlockPage, CmssyBlockWorkspace, CmssyBranding, CmssyClientConfig, CmssyFormDefinition, CmssyFormField, CmssyFormSettings, CmssyFormSubmitResponse, CmssyLayoutGroup, CmssyLayoutSettings, CmssyLocaleContext, CmssyLocalizedValue, CmssyModelDefinition, CmssyModelRecord, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRecordList, CmssySiteConfig, CmssyWebhookEvent, CmssyWebhookOrder, FieldCondition, FieldConditionGroup, FieldConditionLogic, FieldControl, FieldDefinition, FieldOptions, FieldType, InferBlockContent, LayoutPosition, RawBlock, RawLayoutBlock, SubmitFormInput, TypedField, VerifyCmssyWebhookOptions, evaluateFieldConditionGroup, layoutPositionValues } from '@cmssy/types';

package/dist/index.js

@@ -75,15 +75,64 @@ Set the listed environment variables (e.g. in .env.local) and restart the dev se
 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;
@@ -110,28 +159,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;
@@ -140,7 +201,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,
     {
@@ -149,7 +210,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 = "";
@@ -163,10 +225,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;
@@ -385,7 +449,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;
@@ -573,7 +637,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);
@@ -888,4 +952,4 @@ async function verifyCmssyWebhook(options) {
   return parsed;
 }
 
-export { CMSSY_EDIT_HEADER, CMSSY_EDIT_QUERY_PARAM, CMSSY_LOCALE_HEADER, CMSSY_RATE_LIMIT_WINDOW_MS, CMSSY_SECRET_QUERY_PARAM, CmssyRequestError, CmssyWebhookError, DEFAULT_CMSSY_API_URL, DEFAULT_CMSSY_EDITOR_ORIGINS, PROTOCOL_VERSION, SHORTCUT_ACTIONS, applyCmssyCsp, createCmssyClient, defineCmssyConfig, fields, graphqlRequest, isProtocolCompatible, isVerifiedEditUrl, localizeHref, mediaAlt, mediaUrl, mediaUrls, normalizeOrigin, parseEditorMessage, postToEditor, resolveCmssyLocale, resolveEditorOrigin, verifyCmssyWebhook };
+export { CMSSY_EDIT_HEADER, CMSSY_EDIT_QUERY_PARAM, CMSSY_LOCALE_HEADER, CMSSY_RATE_LIMIT_WINDOW_MS, CMSSY_RETRY_MODES, CMSSY_SECRET_QUERY_PARAM, CmssyRequestError, CmssyWebhookError, DEFAULT_CMSSY_API_URL, DEFAULT_CMSSY_EDITOR_ORIGINS, PROTOCOL_VERSION, SHORTCUT_ACTIONS, applyCmssyCsp, createCmssyClient, defineCmssyConfig, fields, graphqlRequest, isProtocolCompatible, isVerifiedEditUrl, localizeHref, mediaAlt, mediaUrl, mediaUrls, normalizeOrigin, parseEditorMessage, postToEditor, resolveCmssyLocale, resolveEditorOrigin, verifyCmssyWebhook };

package/dist/internal/locale.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((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;
@@ -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;
@@ -184,7 +248,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);