@funnelsgrove/payments 0.1.47 → 0.1.48

package/README.md

@@ -5,7 +5,7 @@ Shared billing and checkout helpers for funnels.
 Read this file before editing checkout code. Deeper implementation docs:
 
 - [Shared Payments](../../docs/funnel-sdk/shared-payments.md)
-- [Funnel API payment endpoints](../../docs/funnel-sdk/funnel-api.md#checkout-endpoints)
+- [Funnel SDK runtime service](../../docs/funnel-sdk/funnel-api.md)
 
 ## Owns provider-backed checkout primitives
 
@@ -22,7 +22,7 @@ Use these for new subscription paywalls:
 - `WalletSubscriptionCheckoutSlot`
 - `trackPaidStripeSubscriptionCheckoutCompleted`
 
-Use `chargeStripeOneClickPayment` for post-checkout one-click upsells when the shared client helper fits the funnel. The API endpoint is `/sdk/public/payments/one-click`.
+Use `chargeStripeOneClickPayment` for post-checkout one-click upsells when the shared client helper fits the funnel. It delegates to `funnelSdkService.chargeOneClickPayment`.
 
 ## Compatibility-Only Surfaces
 

package/dist/services/stripe.service.d.ts

@@ -1,6 +1,6 @@
 import { type Stripe } from '@stripe/stripe-js';
 import { type BillingFallbackPlanConfig, type BillingPlanCatalog, type BillingPlanInterval, type BillingPlanInputCatalog } from '../config/billing.config.js';
-import { type ResolvedCountryPricing } from '@funnelsgrove/runtime';
+import { type FunnelSdkRuntimeConfigOverrides, type ResolvedCountryPricing } from '@funnelsgrove/runtime';
 import type { RuntimeMode } from '@funnelsgrove/runtime';
 import { type RemoteProjectBillingPlan } from './planCatalog.service.js';
 export type PaywallPlan = {
@@ -22,12 +22,7 @@ export type PaywallPlan = {
     billingIntervalCount?: number;
     source: 'stripe' | 'config';
 };
-export type StripeRuntimeConfigOverrides = {
-    apiBaseUrl?: string | null;
-    funnelId?: string | null;
-    funnelVersionId?: string | null;
-    funnelSdkPublishableKey?: string | null;
-};
+export type StripeRuntimeConfigOverrides = FunnelSdkRuntimeConfigOverrides;
 export type PaywallPlanResolutionOptions = {
     locale?: string | null;
     pricing?: ResolvedCountryPricing<string> | null;

package/dist/services/stripe.service.js

@@ -1,7 +1,7 @@
 var _a, _b, _c, _d;
 import { loadStripe } from '@stripe/stripe-js';
 import { billingPlanList, } from '../config/billing.config.js';
-import { buildMainApiUrl, buildSdkHeaders, FUNNEL_ID, FUNNEL_SDK_PUBLISHABLE_KEY, resolvePreviewPaymentPublishableKey, runtimeEnvConfig, } from '@funnelsgrove/runtime';
+import { FUNNEL_ID, FUNNEL_SDK_PUBLISHABLE_KEY, funnelSdkService, runtimeEnvConfig, } from '@funnelsgrove/runtime';
 import { isBillingPlanMappingCatalog, resolveMappedProjectPlans, } from './planCatalog.service.js';
 const STRIPE_TEST_PUBLISHABLE_KEY = ((_b = (_a = runtimeEnvConfig.stripeTestPublishableKey) !== null && _a !== void 0 ? _a : runtimeEnvConfig.stripePublishableKey) !== null && _b !== void 0 ? _b : '').trim();
 const STRIPE_LIVE_PUBLISHABLE_KEY = ((_d = (_c = runtimeEnvConfig.stripeLivePublishableKey) !== null && _c !== void 0 ? _c : runtimeEnvConfig.stripePublishableKey) !== null && _d !== void 0 ? _d : '').trim();
@@ -26,35 +26,6 @@ const asTrimmedStringOrNull = (value) => {
     const trimmed = value.trim();
     return trimmed || null;
 };
-const trimTrailingSlash = (value) => {
-    return value.replace(/\/+$/, '');
-};
-const toNormalizedPath = (path) => {
-    return path.startsWith('/') ? path : `/${path}`;
-};
-const resolveStripeRuntimeConfig = (runtimeConfig) => {
-    var _a, _b, _c;
-    return {
-        apiBaseUrl: asTrimmedStringOrNull(runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.apiBaseUrl),
-        funnelId: (_a = asTrimmedStringOrNull(runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.funnelId)) !== null && _a !== void 0 ? _a : asTrimmedStringOrNull(FUNNEL_ID),
-        funnelVersionId: (_b = asTrimmedStringOrNull(runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.funnelVersionId)) !== null && _b !== void 0 ? _b : asTrimmedStringOrNull(runtimeEnvConfig.funnelVersionId),
-        funnelSdkPublishableKey: resolvePreviewPaymentPublishableKey((_c = asTrimmedStringOrNull(runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.funnelSdkPublishableKey)) !== null && _c !== void 0 ? _c : asTrimmedStringOrNull(FUNNEL_SDK_PUBLISHABLE_KEY)) || null,
-    };
-};
-const buildStripeRuntimeApiUrl = (path, runtimeConfig) => {
-    const { apiBaseUrl } = resolveStripeRuntimeConfig(runtimeConfig);
-    if (!apiBaseUrl) {
-        return buildMainApiUrl(path);
-    }
-    return `${trimTrailingSlash(apiBaseUrl)}${toNormalizedPath(path)}`;
-};
-const buildStripeRuntimeHeaders = (runtimeConfig, headers) => {
-    const { funnelSdkPublishableKey } = resolveStripeRuntimeConfig(runtimeConfig);
-    if (!funnelSdkPublishableKey) {
-        return Object.assign({}, (headers !== null && headers !== void 0 ? headers : {}));
-    }
-    return Object.assign({ 'x-sdk-publishable-key': funnelSdkPublishableKey }, (headers !== null && headers !== void 0 ? headers : {}));
-};
 const asFiniteNumberOrNull = (value) => {
     if (typeof value !== 'number' || !Number.isFinite(value)) {
         return null;
@@ -329,28 +300,6 @@ const toFallbackPaywallPlans = (planCatalog, options) => {
 const isFallbackBillingPlanCatalog = (planCatalog) => {
     return Array.isArray(planCatalog) || !isBillingPlanMappingCatalog(planCatalog);
 };
-const parseErrorMessage = async (response, fallbackMessage) => {
-    try {
-        const payload = (await response.json());
-        const apiError = asTrimmedStringOrNull(payload.error);
-        if (apiError) {
-            return apiError;
-        }
-    }
-    catch (_a) {
-        // ignore JSON parsing errors
-    }
-    try {
-        const errorText = await response.text();
-        if (errorText.trim()) {
-            return errorText;
-        }
-    }
-    catch (_b) {
-        // ignore text parsing errors
-    }
-    return fallbackMessage;
-};
 export function getFallbackPlans(planCatalog, options) {
     if (!planCatalog) {
         return reorderPlans(fallbackPaywallPlans, options === null || options === void 0 ? void 0 : options.pricing);
@@ -431,20 +380,9 @@ const getStripeSyncedPlanRecords = async (mode) => {
         return cachedPromise;
     }
     const nextPromise = (async () => {
-        const url = new URL(buildMainApiUrl('/sdk/public/payments/plans'));
-        url.searchParams.set('environment', mode);
-        if (FUNNEL_ID) {
-            url.searchParams.set('funnelId', FUNNEL_ID);
-        }
-        const response = await fetch(url.toString(), {
-            method: 'GET',
-            headers: buildSdkHeaders(),
+        const payload = await funnelSdkService.listPaymentPlans({
+            environment: mode,
         });
-        if (!response.ok) {
-            const errorMessage = await parseErrorMessage(response, 'Unable to load Stripe plans');
-            throw new Error(errorMessage);
-        }
-        const payload = (await response.json());
         const rawPlans = Array.isArray(payload.plans) ? payload.plans : [];
         return rawPlans
             .filter((rawPlan) => isRecord(rawPlan))
@@ -595,58 +533,30 @@ const normalizeCheckoutAnalyticsMetadata = (metadata, plan) => {
 };
 export async function createStripePaymentIntent(input) {
     var _a, _b;
-    const runtimeConfig = resolveStripeRuntimeConfig(input.runtimeConfig);
-    const response = await fetch(buildStripeRuntimeApiUrl('/sdk/public/payments/intents', runtimeConfig), {
-        method: 'POST',
-        headers: buildStripeRuntimeHeaders(runtimeConfig, {
-            'Content-Type': 'application/json',
-        }),
-        body: JSON.stringify({
-            publishableKey: runtimeConfig.funnelSdkPublishableKey || undefined,
-            funnelId: runtimeConfig.funnelId || undefined,
-            funnelVersionId: runtimeConfig.funnelVersionId || undefined,
-            planId: input.planId,
-            amountCents: input.amountCents,
-            couponId: ((_a = input.couponId) === null || _a === void 0 ? void 0 : _a.trim()) || undefined,
-            analyticsMetadata: normalizeAnalyticsMetadata(input.analyticsMetadata),
-            user_id: ((_b = input.user_id) === null || _b === void 0 ? void 0 : _b.trim()) || undefined,
-            environment: input.environment || undefined,
-        }),
+    return funnelSdkService.createOneTimePaymentIntent({
+        planId: input.planId,
+        amountCents: input.amountCents,
+        couponId: ((_a = input.couponId) === null || _a === void 0 ? void 0 : _a.trim()) || undefined,
+        analyticsMetadata: normalizeAnalyticsMetadata(input.analyticsMetadata),
+        userId: ((_b = input.user_id) === null || _b === void 0 ? void 0 : _b.trim()) || undefined,
+        environment: input.environment,
+        runtimeConfig: input.runtimeConfig,
     });
-    if (!response.ok) {
-        const errorMessage = await parseErrorMessage(response, 'Unable to create payment intent');
-        throw new Error(errorMessage);
-    }
-    return (await response.json());
 }
 export async function chargeStripeOneClickPayment(input) {
     var _a, _b, _c, _d, _e;
-    const runtimeConfig = resolveStripeRuntimeConfig(input.runtimeConfig);
-    const response = await fetch(buildStripeRuntimeApiUrl('/sdk/public/payments/one-click', runtimeConfig), {
-        method: 'POST',
-        headers: buildStripeRuntimeHeaders(runtimeConfig, {
-            'Content-Type': 'application/json',
-        }),
-        body: JSON.stringify({
-            publishableKey: runtimeConfig.funnelSdkPublishableKey || undefined,
-            funnelId: runtimeConfig.funnelId || undefined,
-            funnelVersionId: runtimeConfig.funnelVersionId || undefined,
-            planId: input.planId,
-            amountCents: input.amountCents,
-            currency: ((_a = input.currency) === null || _a === void 0 ? void 0 : _a.trim()) || undefined,
-            analyticsMetadata: normalizeAnalyticsMetadata(input.analyticsMetadata),
-            user_id: ((_b = input.user_id) === null || _b === void 0 ? void 0 : _b.trim()) || undefined,
-            stripe_customer_id: ((_c = input.stripe_customer_id) === null || _c === void 0 ? void 0 : _c.trim()) || undefined,
-            checkoutSessionId: ((_d = input.checkoutSessionId) === null || _d === void 0 ? void 0 : _d.trim()) || undefined,
-            idempotencyKey: ((_e = input.idempotencyKey) === null || _e === void 0 ? void 0 : _e.trim()) || undefined,
-            environment: input.environment || undefined,
-        }),
+    return funnelSdkService.chargeOneClickPayment({
+        planId: input.planId,
+        amountCents: input.amountCents,
+        currency: ((_a = input.currency) === null || _a === void 0 ? void 0 : _a.trim()) || undefined,
+        analyticsMetadata: normalizeAnalyticsMetadata(input.analyticsMetadata),
+        userId: ((_b = input.user_id) === null || _b === void 0 ? void 0 : _b.trim()) || undefined,
+        stripeCustomerId: ((_c = input.stripe_customer_id) === null || _c === void 0 ? void 0 : _c.trim()) || undefined,
+        checkoutSessionId: ((_d = input.checkoutSessionId) === null || _d === void 0 ? void 0 : _d.trim()) || undefined,
+        idempotencyKey: ((_e = input.idempotencyKey) === null || _e === void 0 ? void 0 : _e.trim()) || undefined,
+        environment: input.environment,
+        runtimeConfig: input.runtimeConfig,
     });
-    if (!response.ok) {
-        const errorMessage = await parseErrorMessage(response, 'Unable to charge one-click payment');
-        throw new Error(errorMessage);
-    }
-    return (await response.json());
 }
 export async function createStripeSubscriptionCheckout(input) {
     var _a, _b, _c, _d, _e;
@@ -654,36 +564,22 @@ export async function createStripeSubscriptionCheckout(input) {
     if (!recurring) {
         throw new Error('Unable to resolve the recurring interval for the selected plan');
     }
-    const runtimeConfig = resolveStripeRuntimeConfig(input.runtimeConfig);
-    const response = await fetch(buildStripeRuntimeApiUrl('/sdk/public/payments/subscriptions', runtimeConfig), {
-        method: 'POST',
-        headers: buildStripeRuntimeHeaders(runtimeConfig, {
-            'Content-Type': 'application/json',
-        }),
-        body: JSON.stringify({
-            publishableKey: runtimeConfig.funnelSdkPublishableKey || undefined,
-            funnelId: runtimeConfig.funnelId || undefined,
-            funnelVersionId: runtimeConfig.funnelVersionId || undefined,
-            planId: getPaywallPlanSelectionValue(input.plan),
-            providerPlanId: ((_a = input.plan.providerPlanId) === null || _a === void 0 ? void 0 : _a.trim()) || undefined,
-            title: input.plan.title,
-            description: ((_b = input.plan.description) === null || _b === void 0 ? void 0 : _b.trim()) || undefined,
-            amountCents: input.plan.amountCents,
-            billingInterval: recurring.interval,
-            billingIntervalCount: recurring.intervalCount,
-            couponId: ((_c = input.couponId) === null || _c === void 0 ? void 0 : _c.trim()) || undefined,
-            analyticsMetadata: normalizeCheckoutAnalyticsMetadata(input.analyticsMetadata, input.plan),
-            customerEmail: ((_d = input.customerEmail) === null || _d === void 0 ? void 0 : _d.trim()) || undefined,
-            returnUrl: input.returnUrl,
-            user_id: ((_e = input.user_id) === null || _e === void 0 ? void 0 : _e.trim()) || undefined,
-            environment: input.environment || undefined,
-        }),
+    return funnelSdkService.createSubscriptionCheckout({
+        planId: getPaywallPlanSelectionValue(input.plan),
+        providerPlanId: ((_a = input.plan.providerPlanId) === null || _a === void 0 ? void 0 : _a.trim()) || undefined,
+        title: input.plan.title,
+        description: ((_b = input.plan.description) === null || _b === void 0 ? void 0 : _b.trim()) || undefined,
+        amountCents: input.plan.amountCents,
+        billingInterval: recurring.interval,
+        billingIntervalCount: recurring.intervalCount,
+        couponId: ((_c = input.couponId) === null || _c === void 0 ? void 0 : _c.trim()) || undefined,
+        analyticsMetadata: normalizeCheckoutAnalyticsMetadata(input.analyticsMetadata, input.plan),
+        customerEmail: ((_d = input.customerEmail) === null || _d === void 0 ? void 0 : _d.trim()) || undefined,
+        returnUrl: input.returnUrl,
+        userId: ((_e = input.user_id) === null || _e === void 0 ? void 0 : _e.trim()) || undefined,
+        environment: input.environment,
+        runtimeConfig: input.runtimeConfig,
     });
-    if (!response.ok) {
-        const errorMessage = await parseErrorMessage(response, 'Unable to create subscription checkout');
-        throw new Error(errorMessage);
-    }
-    return (await response.json());
 }
 export async function updateStripeSubscriptionCheckoutPlan(input) {
     var _a, _b, _c, _d, _e;
@@ -691,61 +587,33 @@ export async function updateStripeSubscriptionCheckoutPlan(input) {
     if (!recurring) {
         throw new Error('Unable to resolve the recurring interval for the selected plan');
     }
-    const runtimeConfig = resolveStripeRuntimeConfig(input.runtimeConfig);
-    const response = await fetch(buildStripeRuntimeApiUrl('/sdk/public/payments/subscriptions/update-plan', runtimeConfig), {
-        method: 'POST',
-        headers: buildStripeRuntimeHeaders(runtimeConfig, {
-            'Content-Type': 'application/json',
-        }),
-        body: JSON.stringify({
-            publishableKey: runtimeConfig.funnelSdkPublishableKey || undefined,
-            funnelId: runtimeConfig.funnelId || undefined,
-            funnelVersionId: runtimeConfig.funnelVersionId || undefined,
-            checkoutSessionId: input.checkoutSessionId.trim(),
-            planId: getPaywallPlanSelectionValue(input.plan),
-            providerPlanId: ((_a = input.plan.providerPlanId) === null || _a === void 0 ? void 0 : _a.trim()) || undefined,
-            title: input.plan.title,
-            description: ((_b = input.plan.description) === null || _b === void 0 ? void 0 : _b.trim()) || undefined,
-            amountCents: input.plan.amountCents,
-            billingInterval: recurring.interval,
-            billingIntervalCount: recurring.intervalCount,
-            couponId: ((_c = input.couponId) === null || _c === void 0 ? void 0 : _c.trim()) || undefined,
-            analyticsMetadata: normalizeCheckoutAnalyticsMetadata(input.analyticsMetadata, input.plan),
-            customerEmail: ((_d = input.customerEmail) === null || _d === void 0 ? void 0 : _d.trim()) || undefined,
-            user_id: ((_e = input.user_id) === null || _e === void 0 ? void 0 : _e.trim()) || undefined,
-            environment: input.environment || undefined,
-        }),
+    return funnelSdkService.updateSubscriptionCheckoutPlan({
+        checkoutSessionId: input.checkoutSessionId.trim(),
+        planId: getPaywallPlanSelectionValue(input.plan),
+        providerPlanId: ((_a = input.plan.providerPlanId) === null || _a === void 0 ? void 0 : _a.trim()) || undefined,
+        title: input.plan.title,
+        description: ((_b = input.plan.description) === null || _b === void 0 ? void 0 : _b.trim()) || undefined,
+        amountCents: input.plan.amountCents,
+        billingInterval: recurring.interval,
+        billingIntervalCount: recurring.intervalCount,
+        couponId: ((_c = input.couponId) === null || _c === void 0 ? void 0 : _c.trim()) || undefined,
+        analyticsMetadata: normalizeCheckoutAnalyticsMetadata(input.analyticsMetadata, input.plan),
+        customerEmail: ((_d = input.customerEmail) === null || _d === void 0 ? void 0 : _d.trim()) || undefined,
+        userId: ((_e = input.user_id) === null || _e === void 0 ? void 0 : _e.trim()) || undefined,
+        environment: input.environment,
+        runtimeConfig: input.runtimeConfig,
     });
-    if (!response.ok) {
-        const errorMessage = await parseErrorMessage(response, 'Unable to update subscription checkout');
-        throw new Error(errorMessage);
-    }
-    return (await response.json());
 }
 export async function verifyStripeSubscriptionCheckoutPayment(input) {
     const checkoutSessionId = input.checkoutSessionId.trim();
     if (!checkoutSessionId) {
         throw new Error('checkoutSessionId is required');
     }
-    const runtimeConfig = resolveStripeRuntimeConfig(input.runtimeConfig);
-    const response = await fetch(buildStripeRuntimeApiUrl('/sdk/public/payments/subscriptions/checkout-session-status', runtimeConfig), {
-        method: 'POST',
-        headers: buildStripeRuntimeHeaders(runtimeConfig, {
-            'Content-Type': 'application/json',
-        }),
-        body: JSON.stringify({
-            publishableKey: runtimeConfig.funnelSdkPublishableKey || undefined,
-            funnelId: runtimeConfig.funnelId || undefined,
-            funnelVersionId: runtimeConfig.funnelVersionId || undefined,
-            checkoutSessionId,
-            environment: input.environment || undefined,
-        }),
+    return funnelSdkService.verifySubscriptionCheckout({
+        checkoutSessionId,
+        environment: input.environment,
+        runtimeConfig: input.runtimeConfig,
     });
-    if (!response.ok) {
-        const errorMessage = await parseErrorMessage(response, 'Unable to verify subscription checkout');
-        throw new Error(errorMessage);
-    }
-    return (await response.json());
 }
 export async function createStripeCheckoutSession(input) {
     var _a, _b, _c, _d, _e;
@@ -753,37 +621,23 @@ export async function createStripeCheckoutSession(input) {
     if (!recurring) {
         throw new Error('Unable to resolve the recurring interval for the selected plan');
     }
-    const runtimeConfig = resolveStripeRuntimeConfig(input.runtimeConfig);
-    const response = await fetch(buildStripeRuntimeApiUrl('/sdk/public/payments/checkout-session', runtimeConfig), {
-        method: 'POST',
-        headers: buildStripeRuntimeHeaders(runtimeConfig, {
-            'Content-Type': 'application/json',
-        }),
-        body: JSON.stringify({
-            publishableKey: runtimeConfig.funnelSdkPublishableKey || undefined,
-            funnelId: runtimeConfig.funnelId || undefined,
-            funnelVersionId: runtimeConfig.funnelVersionId || undefined,
-            planId: getPaywallPlanSelectionValue(input.plan),
-            providerPlanId: ((_a = input.plan.providerPlanId) === null || _a === void 0 ? void 0 : _a.trim()) || undefined,
-            title: input.plan.title,
-            description: ((_b = input.plan.description) === null || _b === void 0 ? void 0 : _b.trim()) || undefined,
-            amountCents: input.plan.amountCents,
-            billingInterval: recurring.interval,
-            billingIntervalCount: recurring.intervalCount,
-            couponId: ((_c = input.couponId) === null || _c === void 0 ? void 0 : _c.trim()) || undefined,
-            analyticsMetadata: normalizeCheckoutAnalyticsMetadata(input.analyticsMetadata, input.plan),
-            successUrl: input.successUrl,
-            cancelUrl: input.cancelUrl,
-            customerEmail: ((_d = input.customerEmail) === null || _d === void 0 ? void 0 : _d.trim()) || undefined,
-            user_id: ((_e = input.user_id) === null || _e === void 0 ? void 0 : _e.trim()) || undefined,
-            environment: input.environment || undefined,
-        }),
+    return funnelSdkService.createHostedCheckoutSession({
+        planId: getPaywallPlanSelectionValue(input.plan),
+        providerPlanId: ((_a = input.plan.providerPlanId) === null || _a === void 0 ? void 0 : _a.trim()) || undefined,
+        title: input.plan.title,
+        description: ((_b = input.plan.description) === null || _b === void 0 ? void 0 : _b.trim()) || undefined,
+        amountCents: input.plan.amountCents,
+        billingInterval: recurring.interval,
+        billingIntervalCount: recurring.intervalCount,
+        couponId: ((_c = input.couponId) === null || _c === void 0 ? void 0 : _c.trim()) || undefined,
+        analyticsMetadata: normalizeCheckoutAnalyticsMetadata(input.analyticsMetadata, input.plan),
+        successUrl: input.successUrl,
+        cancelUrl: input.cancelUrl,
+        customerEmail: ((_d = input.customerEmail) === null || _d === void 0 ? void 0 : _d.trim()) || undefined,
+        userId: ((_e = input.user_id) === null || _e === void 0 ? void 0 : _e.trim()) || undefined,
+        environment: input.environment,
+        runtimeConfig: input.runtimeConfig,
     });
-    if (!response.ok) {
-        const errorMessage = await parseErrorMessage(response, 'Unable to create checkout session');
-        throw new Error(errorMessage);
-    }
-    return (await response.json());
 }
 export async function redirectToStripeCheckout(input) {
     var _a;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@funnelsgrove/payments",
-  "version": "0.1.47",
+  "version": "0.1.48",
   "type": "module",
   "private": false,
   "main": "./dist/index.js",
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@funnelsgrove/analytics": "^0.1.28",
-    "@funnelsgrove/runtime": "^0.1.45",
+    "@funnelsgrove/runtime": "^0.1.46",
     "@stripe/react-stripe-js": "^5.6.0",
     "@stripe/stripe-js": "^8.7.0",
     "react": "19.2.3",