@funnelsgrove/runtime 0.7.18 → 0.7.20

package/dist/runtime/offer-set-runtime.d.ts

@@ -19,7 +19,6 @@ export type GeneratedOfferSetPlanModeConfig = {
 export type GeneratedOfferSetPlanItem = {
     readonly funnelPlanKey: string;
     readonly runtimePlanKey?: string | null;
-    readonly projectBillingPlanId?: string | null;
     readonly testProvider?: 'stripe' | 'solidgate' | null;
     readonly liveProvider?: 'stripe' | 'solidgate' | null;
     readonly testProviderPlanId?: string | null;
@@ -82,7 +81,6 @@ export type OfferSetRuntimePlanOverrides = {
     offerSetId?: string;
     offerSetKey?: string;
     funnelPlanKey?: string;
-    projectPlanId?: string;
     providerPlanId?: string;
     paymentMode?: 'one_time';
     analyticsPurchaseValue?: number;

package/dist/runtime/offer-set-runtime.js

@@ -155,12 +155,11 @@ const readGeneratedPlanNumberValue = (item, mode, itemKeys, metadataKeys = itemK
     return ((_c = (_b = (_a = readFiniteNumberField(modeConfig, metadataKeys)) !== null && _a !== void 0 ? _a : readFiniteNumberField(fallbackModeConfig, metadataKeys)) !== null && _b !== void 0 ? _b : itemValue) !== null && _c !== void 0 ? _c : readFiniteNumberField(metadata, metadataKeys));
 };
 const buildGeneratedPlanOverrides = (item, mode, isDefault) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
     const metadata = readOfferItemMetadata(item);
     const providerPlanId = readProviderPlanId(item, mode);
     const followUpProviderPlanId = readFollowUpProviderPlanId(item, mode);
-    const projectPlanId = (_a = readString(item.projectBillingPlanId)) !== null && _a !== void 0 ? _a : readStringField(metadata, ['projectBillingPlanId', 'projectPlanId', 'project_billing_plan_id']);
-    const title = (_c = (_b = readString(item.title)) !== null && _b !== void 0 ? _b : readString(item.displayNameOverride)) !== null && _c !== void 0 ? _c : readStringField(metadata, ['title', 'displayName', 'publicPlanName', 'public_plan_name']);
+    const title = (_b = (_a = readString(item.title)) !== null && _a !== void 0 ? _a : readString(item.displayNameOverride)) !== null && _b !== void 0 ? _b : readStringField(metadata, ['title', 'displayName', 'publicPlanName', 'public_plan_name']);
     const description = readGeneratedPlanStringValue(item, mode, ['description']);
     const priceDisplayFallbackMode = mode === 'live' ? 'test' : undefined;
     const readPriceString = (key) => (readGeneratedPlanStringValue(item, mode, [key], [String(key)], priceDisplayFallbackMode));
@@ -171,17 +170,17 @@ const buildGeneratedPlanOverrides = (item, mode, isDefault) => {
     const checkoutSummaryLabel = readPriceString('checkoutSummaryLabel');
     const billingInterval = readPriceString('billingInterval');
     const billingIntervalCount = readPriceNumber('billingIntervalCount');
-    const followUpPlanTitle = (_e = (_d = readString(item.followUpPlanTitle)) !== null && _d !== void 0 ? _d : readString(item.followUpTitle)) !== null && _e !== void 0 ? _e : readStringField(metadata, ['followUpPlanTitle', 'followUpTitle', 'follow_up_plan_title']);
+    const followUpPlanTitle = (_d = (_c = readString(item.followUpPlanTitle)) !== null && _c !== void 0 ? _c : readString(item.followUpTitle)) !== null && _d !== void 0 ? _d : readStringField(metadata, ['followUpPlanTitle', 'followUpTitle', 'follow_up_plan_title']);
     const followUpBillingInterval = readGeneratedPlanStringValue(item, mode, ['followUpBillingInterval'], ['followUpBillingInterval', 'follow_up_billing_interval']);
     const followUpBillingIntervalCount = readGeneratedPlanNumberValue(item, mode, ['followUpBillingIntervalCount'], ['followUpBillingIntervalCount', 'follow_up_billing_interval_count']);
     const introIterations = readGeneratedPlanNumberValue(item, mode, ['introIterations'], ['introIterations', 'intro_iterations']);
     const amountCents = readPriceNumber('amountCents');
     const modeConfig = readGeneratedModeConfig(item, mode);
-    const paymentMode = (_m = (_l = (_k = (_j = (_h = (_g = (_f = readOneTimePaymentMode(modeConfig.paymentMode)) !== null && _f !== void 0 ? _f : readOneTimePaymentMode(modeConfig.payment_mode)) !== null && _g !== void 0 ? _g : readOneTimePaymentMode(modeConfig.checkoutMode)) !== null && _h !== void 0 ? _h : readOneTimePaymentMode(modeConfig.checkout_mode)) !== null && _j !== void 0 ? _j : readOneTimePaymentMode(metadata.paymentMode)) !== null && _k !== void 0 ? _k : readOneTimePaymentMode(metadata.payment_mode)) !== null && _l !== void 0 ? _l : readOneTimePaymentMode(metadata.checkoutMode)) !== null && _m !== void 0 ? _m : readOneTimePaymentMode(metadata.checkout_mode);
-    const analyticsPurchaseValue = (_o = readFiniteNumber(item.analyticsPurchaseValue)) !== null && _o !== void 0 ? _o : readFiniteNumberField(metadata, ['analyticsPurchaseValue']);
-    const featuredTag = (_p = readString(item.featuredTag)) !== null && _p !== void 0 ? _p : readStringField(metadata, ['featuredTag']);
-    const oldPriceLabel = (_q = readString(item.oldPriceLabel)) !== null && _q !== void 0 ? _q : readStringField(metadata, ['oldPriceLabel']);
-    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ funnelPlanKey: item.funnelPlanKey }, (projectPlanId ? { projectPlanId } : {})), (providerPlanId ? { providerPlanId } : {})), (paymentMode ? { paymentMode } : {})), (analyticsPurchaseValue !== null ? { analyticsPurchaseValue } : {})), (title ? { title } : {})), (description ? { description } : {})), (priceLabel ? { priceLabel } : {})), (perDayAmount ? { perDayAmount } : {})), (perDayLabel ? { perDayLabel } : {})), (amountCents !== null ? { amountCents: Math.max(0, Math.round(amountCents)) } : {})), (checkoutSummaryLabel ? { checkoutSummaryLabel } : {})), (billingInterval ? { billingInterval } : {})), (billingIntervalCount !== null ? { billingIntervalCount: Math.max(1, Math.round(billingIntervalCount)) } : {})), (followUpProviderPlanId ? { followUpProviderPlanId } : {})), (followUpPlanTitle ? { followUpPlanTitle } : {})), (followUpBillingInterval ? { followUpBillingInterval } : {})), (followUpBillingIntervalCount !== null ? { followUpBillingIntervalCount: Math.max(1, Math.round(followUpBillingIntervalCount)) } : {})), (introIterations !== null ? { introIterations: Math.max(1, Math.round(introIterations)) } : {})), (featuredTag ? { featuredTag } : {})), (oldPriceLabel ? { oldPriceLabel } : {})), (isDefault ? { isDefault: true } : {}));
+    const paymentMode = (_l = (_k = (_j = (_h = (_g = (_f = (_e = readOneTimePaymentMode(modeConfig.paymentMode)) !== null && _e !== void 0 ? _e : readOneTimePaymentMode(modeConfig.payment_mode)) !== null && _f !== void 0 ? _f : readOneTimePaymentMode(modeConfig.checkoutMode)) !== null && _g !== void 0 ? _g : readOneTimePaymentMode(modeConfig.checkout_mode)) !== null && _h !== void 0 ? _h : readOneTimePaymentMode(metadata.paymentMode)) !== null && _j !== void 0 ? _j : readOneTimePaymentMode(metadata.payment_mode)) !== null && _k !== void 0 ? _k : readOneTimePaymentMode(metadata.checkoutMode)) !== null && _l !== void 0 ? _l : readOneTimePaymentMode(metadata.checkout_mode);
+    const analyticsPurchaseValue = (_m = readFiniteNumber(item.analyticsPurchaseValue)) !== null && _m !== void 0 ? _m : readFiniteNumberField(metadata, ['analyticsPurchaseValue']);
+    const featuredTag = (_o = readString(item.featuredTag)) !== null && _o !== void 0 ? _o : readStringField(metadata, ['featuredTag']);
+    const oldPriceLabel = (_p = readString(item.oldPriceLabel)) !== null && _p !== void 0 ? _p : readStringField(metadata, ['oldPriceLabel']);
+    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ funnelPlanKey: item.funnelPlanKey }, (providerPlanId ? { providerPlanId } : {})), (paymentMode ? { paymentMode } : {})), (analyticsPurchaseValue !== null ? { analyticsPurchaseValue } : {})), (title ? { title } : {})), (description ? { description } : {})), (priceLabel ? { priceLabel } : {})), (perDayAmount ? { perDayAmount } : {})), (perDayLabel ? { perDayLabel } : {})), (amountCents !== null ? { amountCents: Math.max(0, Math.round(amountCents)) } : {})), (checkoutSummaryLabel ? { checkoutSummaryLabel } : {})), (billingInterval ? { billingInterval } : {})), (billingIntervalCount !== null ? { billingIntervalCount: Math.max(1, Math.round(billingIntervalCount)) } : {})), (followUpProviderPlanId ? { followUpProviderPlanId } : {})), (followUpPlanTitle ? { followUpPlanTitle } : {})), (followUpBillingInterval ? { followUpBillingInterval } : {})), (followUpBillingIntervalCount !== null ? { followUpBillingIntervalCount: Math.max(1, Math.round(followUpBillingIntervalCount)) } : {})), (introIterations !== null ? { introIterations: Math.max(1, Math.round(introIterations)) } : {})), (featuredTag ? { featuredTag } : {})), (oldPriceLabel ? { oldPriceLabel } : {})), (isDefault ? { isDefault: true } : {}));
 };
 export const applyGeneratedOfferSetToPlanCatalog = (baseCatalog, mode, offerSet) => {
     var _a, _b, _c, _d;
@@ -204,7 +203,9 @@ export const applyGeneratedOfferSetToPlanCatalog = (baseCatalog, mode, offerSet)
         if (!key) {
             continue;
         }
-        nextCatalog[key] = Object.assign(Object.assign(Object.assign(Object.assign({}, ((_c = nextCatalog[key]) !== null && _c !== void 0 ? _c : {})), (((_d = offerSet.id) === null || _d === void 0 ? void 0 : _d.trim()) ? { offerSetId: offerSet.id.trim() } : {})), { offerSetKey: offerSet.key }), buildGeneratedPlanOverrides(item, mode, getOfferSetItemKind(item) === 'plan' && key === defaultPlanKey));
+        const basePlan = Object.assign({}, ((_c = nextCatalog[key]) !== null && _c !== void 0 ? _c : {}));
+        delete basePlan.projectPlanId;
+        nextCatalog[key] = Object.assign(Object.assign(Object.assign(Object.assign({}, basePlan), (((_d = offerSet.id) === null || _d === void 0 ? void 0 : _d.trim()) ? { offerSetId: offerSet.id.trim() } : {})), { offerSetKey: offerSet.key }), buildGeneratedPlanOverrides(item, mode, getOfferSetItemKind(item) === 'plan' && key === defaultPlanKey));
     }
     return nextCatalog;
 };

package/dist/services/funnel-runtime-config.js

@@ -1,4 +1,7 @@
 const inflightByFunnelId = new Map();
+const TRANSIENT_RUNTIME_CONFIG_STATUSES = new Set([408, 429, 500, 502, 503, 504]);
+const RUNTIME_CONFIG_RETRY_DELAYS_MS = [250, 750];
+const wait = (delayMs) => (new Promise((resolve) => setTimeout(resolve, delayMs)));
 const isRecord = (value) => (value !== null && typeof value === 'object' && !Array.isArray(value));
 const readString = (value) => (typeof value === 'string' && value.trim() ? value.trim() : null);
 const readNumber = (value) => (typeof value === 'number' && Number.isFinite(value) ? value : null);
@@ -112,7 +115,6 @@ const normalizePublishedOfferSets = (config) => {
             if (!funnelPlanKey) {
                 throw new Error(`Published runtime offer set "${key}" has an item without a plan key`);
             }
-            const projectBillingPlanId = pickString(item, 'projectBillingPlanId', 'project_billing_plan_id');
             const testProvider = parsePaymentProvider(pick(item, 'testProvider', 'test_provider'), `Published runtime offer set "${key}"`);
             const liveProvider = parsePaymentProvider(pick(item, 'liveProvider', 'live_provider'), `Published runtime offer set "${key}"`);
             const testMapping = buildPlanModeConfig(item, 'test');
@@ -121,9 +123,9 @@ const normalizePublishedOfferSets = (config) => {
                 || pickString(metadata, 'title', 'publicPlanName', 'public_plan_name');
             const description = pickString(item, 'description')
                 || pickString(metadata, 'description');
-            return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ funnelPlanKey }, (pickString(metadata, 'runtimePlanKey', 'planKey', 'billingPlanKey')
+            return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ funnelPlanKey }, (pickString(metadata, 'runtimePlanKey', 'planKey', 'billingPlanKey')
                 ? { runtimePlanKey: pickString(metadata, 'runtimePlanKey', 'planKey', 'billingPlanKey') }
-                : {})), (projectBillingPlanId ? { projectBillingPlanId } : {})), (testProvider ? { testProvider } : {})), (liveProvider ? { liveProvider } : {})), (pickString(item, 'testProviderPlanId', 'test_provider_plan_id')
+                : {})), (testProvider ? { testProvider } : {})), (liveProvider ? { liveProvider } : {})), (pickString(item, 'testProviderPlanId', 'test_provider_plan_id')
                 ? { testProviderPlanId: pickString(item, 'testProviderPlanId', 'test_provider_plan_id') }
                 : {})), (pickString(item, 'liveProviderPlanId', 'live_provider_plan_id')
                 ? { liveProviderPlanId: pickString(item, 'liveProviderPlanId', 'live_provider_plan_id') }
@@ -298,19 +300,38 @@ export const loadFunnelRuntimeConfig = (funnelId, options = {}) => {
     }
     const fetcher = options.fetcher || globalThis.fetch;
     const basePath = (options.basePath || '/api/funnel-config').replace(/\/$/, '');
-    const request = fetcher(`${basePath}/${encodeURIComponent(normalizedFunnelId)}?versionId=${encodeURIComponent(versionId)}`, {
-        cache: 'no-store',
-        headers: { accept: 'application/json', 'cache-control': 'no-cache' },
-    }).then(async (response) => {
-        if (!response.ok) {
-            throw new Error(`Unable to load funnel runtime config (${response.status})`);
-        }
-        const published = parsePublishedRuntimeConfig(await response.json());
-        if (published.config.funnelId !== normalizedFunnelId) {
-            throw new Error('Funnel runtime config belongs to a different funnel');
+    const requestUrl = `${basePath}/${encodeURIComponent(normalizedFunnelId)}?versionId=${encodeURIComponent(versionId)}`;
+    const request = (async () => {
+        for (let attempt = 0;; attempt += 1) {
+            let response;
+            try {
+                response = await fetcher(requestUrl, {
+                    cache: 'no-store',
+                    headers: { accept: 'application/json', 'cache-control': 'no-cache' },
+                });
+            }
+            catch (error) {
+                const retryDelay = RUNTIME_CONFIG_RETRY_DELAYS_MS[attempt];
+                if (retryDelay === undefined)
+                    throw error;
+                await wait(retryDelay);
+                continue;
+            }
+            if (!response.ok) {
+                const retryDelay = RUNTIME_CONFIG_RETRY_DELAYS_MS[attempt];
+                if (retryDelay !== undefined && TRANSIENT_RUNTIME_CONFIG_STATUSES.has(response.status)) {
+                    await wait(retryDelay);
+                    continue;
+                }
+                throw new Error(`Unable to load funnel runtime config (${response.status})`);
+            }
+            const published = parsePublishedRuntimeConfig(await response.json());
+            if (published.config.funnelId !== normalizedFunnelId) {
+                throw new Error('Funnel runtime config belongs to a different funnel');
+            }
+            return published;
         }
-        return published;
-    }).finally(() => {
+    })().finally(() => {
         inflightByFunnelId.delete(cacheKey);
     });
     inflightByFunnelId.set(cacheKey, request);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@funnelsgrove/runtime",
-  "version": "0.7.18",
+  "version": "0.7.20",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/The-Solid-Grove/funnelsgrove.git",