vonpay-medusa 1.0.2 → 1.0.4

package/.medusa/server/src/admin/index.js

@@ -134,6 +134,10 @@ const REASON_COPY = {
     label: "Late offer charge — refund failed",
     what: "The buyer was charged for an offer whose item was NOT added to the order — the bank approved it after the offer had ended, the item could not be added, or an earlier declined attempt was approved after all — so the plugin tried to refund that charge in full, but the refund did not go through (refused, or not settled within 48 hours). Refund the payment in Vonpay by the order id. Do not add the item."
   },
+  upsell_refund_unclear: {
+    label: "Late offer charge — refund unclear",
+    what: "The buyer was charged for an offer whose item was NOT added to the order, and the plugin's automatic refund got an unclear answer: Vonpay reported an error, then recorded that refund as failed, but the money may have gone back anyway. The plugin will not send another refund. First check the payment in Vonpay by the order id: refund it there ONLY if no refund went through. Do not add the item."
+  },
   upsell_refund_pending: {
     label: "Late offer charge — refund in progress",
     what: "The buyer's bank approved an offer after the offer had ended, so nothing was added and the plugin is refunding the charge in full. It keeps retrying. If this row stays for a day, refund the payment in Vonpay by the order id."
@@ -1164,17 +1168,17 @@ const routeModule = {
 const menuItemModule = {
   menuItems: [
     {
-      label: config.label,
-      icon: config.icon,
-      path: "/vonpay-subscriptions",
+      label: config$1.label,
+      icon: config$1.icon,
+      path: "/vonpay-holds",
       nested: "/orders",
       rank: void 0,
       translationNs: void 0
     },
     {
-      label: config$1.label,
-      icon: config$1.icon,
-      path: "/vonpay-holds",
+      label: config.label,
+      icon: config.icon,
+      path: "/vonpay-subscriptions",
       nested: "/orders",
       rank: void 0,
       translationNs: void 0

package/.medusa/server/src/admin/index.mjs

@@ -131,6 +131,10 @@ const REASON_COPY = {
     label: "Late offer charge — refund failed",
     what: "The buyer was charged for an offer whose item was NOT added to the order — the bank approved it after the offer had ended, the item could not be added, or an earlier declined attempt was approved after all — so the plugin tried to refund that charge in full, but the refund did not go through (refused, or not settled within 48 hours). Refund the payment in Vonpay by the order id. Do not add the item."
   },
+  upsell_refund_unclear: {
+    label: "Late offer charge — refund unclear",
+    what: "The buyer was charged for an offer whose item was NOT added to the order, and the plugin's automatic refund got an unclear answer: Vonpay reported an error, then recorded that refund as failed, but the money may have gone back anyway. The plugin will not send another refund. First check the payment in Vonpay by the order id: refund it there ONLY if no refund went through. Do not add the item."
+  },
   upsell_refund_pending: {
     label: "Late offer charge — refund in progress",
     what: "The buyer's bank approved an offer after the offer had ended, so nothing was added and the plugin is refunding the charge in full. It keeps retrying. If this row stays for a day, refund the payment in Vonpay by the order id."
@@ -1161,17 +1165,17 @@ const routeModule = {
 const menuItemModule = {
   menuItems: [
     {
-      label: config.label,
-      icon: config.icon,
-      path: "/vonpay-subscriptions",
+      label: config$1.label,
+      icon: config$1.icon,
+      path: "/vonpay-holds",
       nested: "/orders",
       rank: void 0,
       translationNs: void 0
     },
     {
-      label: config$1.label,
-      icon: config$1.icon,
-      path: "/vonpay-holds",
+      label: config.label,
+      icon: config.icon,
+      path: "/vonpay-subscriptions",
       nested: "/orders",
       rank: void 0,
       translationNs: void 0

package/.medusa/server/src/providers/vonpay/held-list.js

@@ -180,7 +180,7 @@ function upsellsFromCollection(c, now = Date.now()) {
                 vp_session_id: null,
                 medusa_payment_session_id: null,
                 payment_collection_id: c.id,
-                reason: p.stuck === "amount_mismatch" ? "amount_mismatch" : "upsell_refund_failed",
+                reason: p.stuck === "amount_mismatch" ? "amount_mismatch" : p.stuck === "refund_unclear" ? "upsell_refund_unclear" : "upsell_refund_failed",
                 source: "upsell",
                 held_at: isoOrNull(p.at),
                 order_id: medusaId(r.order_id),

package/.medusa/server/src/providers/vonpay/service.js

@@ -952,6 +952,34 @@ class VonpayProviderService extends utils_1.AbstractPaymentProvider {
         if (!Number.isInteger(step) || step < 0)
             return "retry";
         const ids = { vp_payment_intent_id: pi, step };
+        const ours = `vpm_upsell_late_rf_${pi}`;
+        if (step > 0) {
+            try {
+                const list = await this.vonpay((c) => c.refunds.list({ paymentIntent: pi }, { limit: 100 }));
+                const rows = Array.isArray(list.data) ? list.data : [];
+                const done = typeof list.amountRefunded === "number" ? list.amountRefunded : NaN;
+                if (!Number.isFinite(done))
+                    return "unread";
+                const mine = (r) => typeof r.idempotencyKey === "string" && r.idempotencyKey.startsWith(ours);
+                if (rows.some((r) => mine(r) && REFUND_CONFIRMED.has(String(r.status)))) {
+                    this.log("info", "refund_transport", { ...ids, outcome: "already_refunded" });
+                    return "refunded";
+                }
+                if (done > 0) {
+                    this.log("warn", "refund_transport", { ...ids, outcome: "refunded_elsewhere" });
+                    return "failed";
+                }
+                if (list.refundable === false) {
+                    this.log("info", "refund_transport", { ...ids, outcome: "not_refundable_yet" });
+                    return "unsettled";
+                }
+            }
+            catch (err) {
+                const reading = readRefundError(err);
+                this.log("warn", "refund_transport", { ...ids, outcome: "list_unreadable", ...errorFields(err) });
+                return reading.kind === "unknown" ? "unread" : "failed";
+            }
+        }
         const key = `vpm_upsell_late_rf_${pi}${step === 0 ? "" : `_s${step}`}`;
         try {
             const refund = await this.vonpay((c) => c.refunds.create({ paymentIntent: pi, amount: amountMinor, currency }, { idempotencyKey: key }));
@@ -962,7 +990,7 @@ class VonpayProviderService extends utils_1.AbstractPaymentProvider {
             if (REFUND_DEFINITELY_NOT_MADE.has(status)) {
                 if (replay) {
                     this.log("info", "refund_transport", { ...ids, outcome: "key_spent" });
-                    return "unsettled";
+                    return "spent";
                 }
                 return "failed";
             }
@@ -1934,7 +1962,7 @@ class VonpayProviderService extends utils_1.AbstractPaymentProvider {
             return { sent: true, delivered: out.delivered === true, response_status: typeof out.responseStatus === "number" ? out.responseStatus : null };
         }
         catch (err) {
-            if (err instanceof checkout_node_1.VonPayError && err.status === 502)
+            if (err instanceof checkout_node_1.VonPayError && (err.code === "webhook_test_delivery_failed" || err.status === 502))
                 return { sent: true, delivered: false, response_status: null, unreachable: true };
             return { sent: false, why: "failed" };
         }
@@ -3403,7 +3431,8 @@ class VonpayProviderService extends utils_1.AbstractPaymentProvider {
         };
         let updated;
         try {
-            updated = await this.vonpay((c) => c.sessions.update(vpSessionId, { amount: amountMinor, currency }));
+            const meta = await descriptor();
+            updated = await this.vonpay((c) => c.sessions.update(vpSessionId, { amount: amountMinor, currency, ...(Object.keys(meta).length > 0 ? { metadata: meta } : {}) }));
         }
         catch (err) {
             if (!(err instanceof checkout_node_1.SessionNotModifiableError))

package/.medusa/server/src/providers/vonpay/session-data.js

@@ -95,6 +95,7 @@ const HOLD_REASONS = [
     "upsell_hold_unsettled",
     "upsell_bank_check_open",
     "upsell_refund_failed",
+    "upsell_refund_unclear",
     "upsell_refund_pending",
     "upsell_refunded_late",
 ];
@@ -547,6 +548,7 @@ exports.UPSELL_HOLD_REASONS = new Set([
     "upsell_hold_not_released",
     "upsell_take_unconfirmed",
     "upsell_refund_failed",
+    "upsell_refund_unclear",
 ]);
 exports.SEALED_HOLD_SESSION = /^[A-Za-z0-9_-]{16}\.[A-Za-z0-9_-]{24,400}$/;
 exports.UPSELL_WALLET_ONLY_STATES = new Set(["tap", "authorized", "taking", "released"]);
@@ -611,6 +613,8 @@ function isUpsellRecord(v) {
     }
     if (r.rechecked === true && (wallet || !["declined", "skipped", "refunding", "refunded"].includes(r.state)))
         return false;
+    if (r.refund_unseen_step !== undefined && (r.state !== "refunding" || !Number.isInteger(r.refund_unseen_step) || r.refund_unseen_step < 0))
+        return false;
     if (r.prior_intents !== undefined) {
         const list = r.prior_intents;
         if (wallet || !Array.isArray(list) || list.length < 1 || list.length > exports.UPSELL_MAX_ATTEMPTS - 1)
@@ -621,7 +625,9 @@ function isUpsellRecord(v) {
                 return false;
             if (typeof x.currency !== "string" || !CURRENCY.test(x.currency) || typeof x.at !== "string" || !Number.isFinite(Date.parse(x.at)))
                 return false;
-            if (!(x.stuck === undefined || x.stuck === "refund_failed" || x.stuck === "amount_mismatch"))
+            if (!(x.stuck === undefined || x.stuck === "refund_failed" || x.stuck === "amount_mismatch" || x.stuck === "refund_unclear"))
+                return false;
+            if (!(x.unseen_step === undefined || (Number.isInteger(x.unseen_step) && x.unseen_step >= 0)))
                 return false;
         }
     }

package/.medusa/server/src/providers/vonpay/upsell-accept.js

@@ -503,7 +503,7 @@ async function latestOutcome(host, input, orderId, latest) {
         case "released":
             return { outcome: "released", why: latest.release_reason ?? "abandoned", retryable: (0, session_data_1.upsellMayRetry)(latest) };
         case "held":
-            return latest.hold_reason === "upsell_refund_failed" ? { outcome: "refunded", amount_minor: latest.amount_minor, currency: latest.currency, pending: true } : { outcome: "unknown" };
+            return latest.hold_reason === "upsell_refund_failed" || latest.hold_reason === "upsell_refund_unclear" ? { outcome: "refunded", amount_minor: latest.amount_minor, currency: latest.currency, pending: true } : { outcome: "unknown" };
         case "stopped":
             return { outcome: "declined", retryable: false, decline_kind: "bank_check_unfinished" };
         case "refunding":
@@ -908,6 +908,8 @@ async function advance(ctx, from, next) {
     for (const k of Object.keys(value))
         if (value[k] === undefined)
             delete value[k];
+    if (value.state !== "refunding")
+        delete value.refund_unseen_step;
     if (!(0, session_data_1.isUpsellRecord)(value)) {
         ctx.host.log("error", "upsell_record_failed", { ...ctx.ids, state: next.state, why: "invalid_record", vp_payment_intent_id: from.vp_payment_intent_id });
         return undefined;
@@ -1019,24 +1021,53 @@ async function refundLate(ctx, r0, extra = {}) {
         await advance(ctx, r, { state: "held", hold_reason: "upsell_paid_unrecorded", decline_kind: null, rechecked: undefined });
         return { outcome: "unknown" };
     }
-    const res = await host.refundLate(r.vp_payment_intent_id, r.amount_minor, r.currency, lateRefundStep(host.now(), r0.state === "refunding" ? r0.at : null));
+    if (!refundFitsLock(ctx)) {
+        host.log("warn", "upsell_late_refund", { ...ids, result: "lock_time" });
+        return answer(false);
+    }
+    const step = r.refund_unseen_step ?? lateRefundStep(host.now(), r0.state === "refunding" ? r0.at : null);
+    const res = await host.refundLate(r.vp_payment_intent_id, r.amount_minor, r.currency, step);
     if (res === "refunded") {
         host.log("info", "upsell_late_refund", { ...ids, result: "refunded" });
         return answer(!!(await advance(ctx, r, { state: "refunded" })));
     }
-    const waitedOut = res === "unsettled" && r0.state === "refunding" && host.now() - Date.parse(r0.at) >= exports.UPSELL_UNSETTLED_REFUND_MS;
+    if (res === "spent" && r.refund_unseen_step !== undefined) {
+        host.log("error", "upsell_late_refund", { ...ids, result: "unclear", step });
+        await advance(ctx, r, { state: "held", hold_reason: "upsell_refund_unclear", decline_kind: null, rechecked: undefined, refund_unseen_step: undefined });
+        return answer(false);
+    }
+    const waiting = res === "unsettled" || res === "spent";
+    const waitedOut = waiting && r0.state === "refunding" && host.now() - Date.parse(r0.at) >= exports.UPSELL_UNSETTLED_REFUND_MS;
     if (res === "failed" || waitedOut) {
         host.log("error", "upsell_late_refund", { ...ids, result: res === "failed" ? "failed" : "not_settled" });
-        await advance(ctx, r, { state: "held", hold_reason: "upsell_refund_failed", decline_kind: null, rechecked: undefined });
+        await advance(ctx, r, { state: "held", hold_reason: r.refund_unseen_step !== undefined ? "upsell_refund_unclear" : "upsell_refund_failed", decline_kind: null, rechecked: undefined, refund_unseen_step: undefined });
+    }
+    else if (waiting) {
+        host.log("info", "upsell_late_refund", { ...ids, result: "not_settled_yet" });
+    }
+    else if (res === "unread") {
+        host.log(stuck ? "error" : "warn", "upsell_late_refund", { ...ids, result: "list_unreadable", step });
     }
     else {
-        if (res === "unsettled")
-            host.log("info", "upsell_late_refund", { ...ids, result: "not_settled_yet" });
-        else
-            host.log(stuck ? "error" : "warn", "upsell_late_refund", { ...ids, result: stuck ? "still_pending" : "retry" });
+        if (r.refund_unseen_step === undefined)
+            await writeSameAt(ctx, r, { refund_unseen_step: step });
+        host.log(stuck ? "error" : "warn", "upsell_late_refund", { ...ids, result: stuck ? "still_pending" : "retry", step });
     }
     return answer(false);
 }
+function refundFitsLock(ctx) {
+    const t = ctx.host.timing();
+    return ctx.lockRemainingMs() >= 2 * t.vonpayMs + t.sendMarginMs;
+}
+async function writeSameAt(ctx, r, patch) {
+    const value = { ...r, ...patch };
+    for (const k of Object.keys(value))
+        if (value[k] === undefined)
+            delete value[k];
+    if (!(0, session_data_1.isUpsellRecord)(value))
+        return r;
+    return (await ctx.host.writeUpsell(ctx.collectionId, value, { expect: "at", at: r.at })) ? value : r;
+}
 async function stopOpenCheck(ctx, r) {
     if (!(await cancelOwnEdit(ctx, r)))
         return "waiting";
@@ -1052,7 +1083,7 @@ async function readStoppedIntent(ctx, r) {
             return { kind: "mismatch", declineKind: null, pi };
         return { kind: "charged", declineKind: null, pi };
     }
-    if (pi.status === "failed" || pi.status === "voided") {
+    if (pi.status === "failed" || pi.status === "voided" || pi.status === "cancelled") {
         const code = pi.declineCode;
         return { kind: "ended", declineKind: code === "authentication_not_completed" ? "bank_check_unfinished" : null, pi };
     }
@@ -1083,7 +1114,7 @@ async function recheckPrior(ctx, r) {
             next.push(p);
             continue;
         }
-        if (pi.status === "failed" || pi.status === "voided") {
+        if (pi.status === "failed" || pi.status === "voided" || pi.status === "cancelled") {
             host.log("info", "upsell_rechecked", { ...ids, result: "ended" });
             changed = true;
             continue;
@@ -1097,21 +1128,42 @@ async function recheckPrior(ctx, r) {
             stuck("amount_mismatch");
             continue;
         }
+        if (!refundFitsLock(ctx)) {
+            host.log("warn", "upsell_late_refund", { ...ids, result: "lock_time" });
+            next.push(p);
+            continue;
+        }
         host.log("warn", "upsell_charged_after_stop", ids);
-        const res = await host.refundLate(p.id, p.amount_minor, p.currency, lateRefundStep(host.now(), p.at));
-        const waitedOut = res === "unsettled" && age >= exports.UPSELL_UNSETTLED_REFUND_MS;
+        const step = p.unseen_step ?? lateRefundStep(host.now(), p.at);
+        const res = await host.refundLate(p.id, p.amount_minor, p.currency, step);
+        const waiting = res === "unsettled" || (res === "spent" && p.unseen_step === undefined);
+        const waitedOut = waiting && age >= exports.UPSELL_UNSETTLED_REFUND_MS;
         if (res === "refunded") {
             host.log("info", "upsell_late_refund", { ...ids, result: "refunded" });
             changed = true;
         }
+        else if (res === "spent" && p.unseen_step !== undefined) {
+            host.log("error", "upsell_late_refund", { ...ids, result: "unclear", step });
+            stuck("refund_unclear");
+        }
         else if (res === "failed" || waitedOut) {
             host.log("error", "upsell_late_refund", { ...ids, result: res === "failed" ? "failed" : "not_settled" });
-            stuck("refund_failed");
+            stuck(p.unseen_step !== undefined ? "refund_unclear" : "refund_failed");
         }
-        else {
-            host.log(res === "unsettled" ? "info" : "warn", "upsell_late_refund", { ...ids, result: res === "unsettled" ? "not_settled_yet" : "retry" });
+        else if (waiting) {
+            host.log("info", "upsell_late_refund", { ...ids, result: "not_settled_yet" });
+            next.push(p);
+        }
+        else if (res === "unread") {
+            host.log("warn", "upsell_late_refund", { ...ids, result: "list_unreadable", step });
             next.push(p);
         }
+        else {
+            host.log("warn", "upsell_late_refund", { ...ids, result: "retry", step });
+            if (p.unseen_step === undefined)
+                changed = true;
+            next.push({ ...p, unseen_step: step });
+        }
     }
     if (!changed)
         return r;

package/README.md

@@ -504,6 +504,18 @@ charges carry no address (the setup check WARNs; the store logs `shopper_ip_sig_
 it cannot believe). **Upgrading from 1.0.1:** 1.0.1 sent the address unsigned; from 1.0.2 it is used only once
 `VONPAY_SHOPPER_IP_SECRET` is set on both sides. The address is never logged or stored by the plugin.
 
+**A repeated return from the bank still gets the offer (1.0.4).** The offer page needs a pass the storefront
+gets while the cart is still open. From 1.0.4 the card step also gets it when the shopper presses Pay, before
+they can leave for their bank's check, so a return that is repeated (a lost answer, a reload) still finds the
+offer. **Upgrading a storefront set up before 1.0.4:** add this to `src/lib/vonpay/actions.ts` (the setup
+command leaves an existing file as it is); without it the checkout works exactly as before.
+
+```ts
+export async function prepareVonpayOffer() {
+  return vonpay.prepareVonpayOffer()
+}
+```
+
 Guest shoppers get offers too, by default: the checkout names them by the email they type, and their
 card is kept for that purchase's offers only, then removed once the offer ends. A guest's card is never
 added to an existing customer's account because the guest typed that customer's email. `guests: false`

package/bin/vonpay-medusa.cjs

@@ -50,6 +50,11 @@ export async function startVonpayPayment() {
   return vonpay.startVonpayPayment()
 }
 
+// The offer pass, fetched at Pay (before the shopper can leave for the bank) and kept in an httpOnly cookie.
+export async function prepareVonpayOffer() {
+  return vonpay.prepareVonpayOffer()
+}
+
 // "My saved cards": the signed-in customer's cards. Remove takes the card id; the store's server checks
 // the card is this customer's before anything is removed.
 export async function listVonpaySavedCards() {
@@ -476,7 +481,7 @@ function setupStorefront(root, opts = {}) {
       note(step, "failed", err && err.message ? err.message : String(err))
     }
   }
-  const write = (file, content, step) =>
+  const write = (file, content, step, hint) =>
     guarded(step, () => {
       const rel = path.relative(root, file)
       if (!insideRoot(file)) return note(step, "manual", `${rel} resolves outside this project (a symlinked folder) — create it yourself`)
@@ -486,8 +491,10 @@ function setupStorefront(root, opts = {}) {
       } catch {}
       if (isLink) return note(step, "manual", `${rel} is a symlink — left alone`)
       if (fs.existsSync(file) && !force) {
-        const same = fs.readFileSync(file, "utf8") === content
-        return note(step, same ? "present" : "manual", same ? rel : `${rel} exists and differs — left as is (re-run with --force to replace it)`)
+        const existing = fs.readFileSync(file, "utf8")
+        const same = existing === content
+        const extra = !same && hint ? hint(existing) : null
+        return note(step, same ? "present" : "manual", same ? rel : `${rel} exists and differs — left as is (re-run with --force to replace it)${extra ? `; ${extra}` : ""}`)
       }
       if (!dryRun) {
         fs.mkdirSync(path.dirname(file), { recursive: true })
@@ -523,7 +530,11 @@ function setupStorefront(root, opts = {}) {
     if (!fs.existsSync(path.join(root, f))) throw new Error(`${f} not found — this command expects Medusa's Next.js starter layout (src/lib/config.ts exporting \`sdk\`, src/lib/data/cookies.ts and cart.ts)`)
   }
 
-  write(path.join(root, "src/lib/vonpay/actions.ts"), actionsFile(), "server actions (src/lib/vonpay/actions.ts)")
+  write(path.join(root, "src/lib/vonpay/actions.ts"), actionsFile(), "server actions (src/lib/vonpay/actions.ts)", (existing) =>
+    existing.includes("prepareVonpayOffer")
+      ? null
+      : "it has no prepareVonpayOffer (1.0.4): add `export async function prepareVonpayOffer() { return vonpay.prepareVonpayOffer() }` so a repeated return from the bank still gets the offer (package README, upsells)"
+  )
   const thumbnail = fs.existsSync(path.join(root, "src/modules/products/components/thumbnail/index.tsx")) ? "@modules/products/components/thumbnail" : null
   write(path.join(root, "src/lib/vonpay/index.tsx"), componentsFile(detectUiImport(root, pkg), thumbnail), "card step + return page (src/lib/vonpay/index.tsx)")
   const checkoutGroup = path.join(root, "src/app/[countryCode]/(checkout)")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vonpay-medusa",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Vonpay payment provider for Medusa v2",
   "author": "Von Payments",
   "license": "MIT",
@@ -60,6 +60,8 @@
     "typecheck": "tsc --noEmit && tsc --noEmit -p tsconfig.test.json && tsc --noEmit -p tests/contract/tsconfig.json && tsc --noEmit -p src/admin/tsconfig.json && tsc --noEmit -p tests/integration/tsconfig.json && tsc --noEmit -p tests/admin/tsconfig.json",
     "check:money": "node scripts/ci/check-money-arithmetic.mjs src && node scripts/ci/check-money-arithmetic.mjs --self-test",
     "check:release-install": "node scripts/ci/check-release-install.mjs && node scripts/ci/check-release-install.mjs --self-test",
+    "check:ci-scope": "node scripts/ci/check-ci-scope.mjs && node scripts/ci/check-ci-scope.mjs --self-test",
+    "check:bridge-alert": "node scripts/ci/bridge-alert.mjs --self-test",
     "check:harness-isolation": "node scripts/ci/check-harness-isolation.mjs src apps && node scripts/ci/check-harness-isolation.mjs --self-test",
     "check:pack": "node scripts/ci/check-pack.mjs && node scripts/ci/check-pack.mjs --self-test",
     "check:pan-canary": "node scripts/ci/check-pan-canary.mjs && node scripts/ci/check-pan-canary.mjs --self-test",
@@ -183,7 +185,7 @@
     }
   },
   "dependencies": {
-    "@vonpay/checkout-node": "^3.11.0",
+    "@vonpay/checkout-node": "^4.2.0",
     "bignumber.js": "^9.3.1"
   },
   "bin": {

package/storefront/src/context.tsx

@@ -4,7 +4,8 @@ import { type ReactNode, createContext, useContext } from "react"
 import type { VonpayStorefrontServer } from "./server"
 import { DEFAULT_UI, type VonpayUi } from "./ui"
 
-export type VonpayActions = Pick<VonpayStorefrontServer, "completeVonpayCheckout" | "refreshVonpayPayment" | "reportStuckVonpayPayment" | "startVonpayPayment">
+export type VonpayActions = Pick<VonpayStorefrontServer, "completeVonpayCheckout" | "refreshVonpayPayment" | "reportStuckVonpayPayment" | "startVonpayPayment"> &
+  Partial<Pick<VonpayStorefrontServer, "prepareVonpayOffer">>
 
 interface VonpayContextValue {
   actions: VonpayActions

package/storefront/src/csp.ts

@@ -2,7 +2,7 @@ import list from "./vora-csp.json"
 import { VORA_JS_URL, type VonpayBrowserConfig } from "./config"
 
 export const VORA_CSP_VERSION = list.version
-export const VORA_CSP_SHA384 = "sha384-iqprMTN9Eh03U8wTGDw6iSGVdot0G7Se0lYYslVuZkUZmn9BC0TOgXB+zb5TpqaP"
+export const VORA_CSP_SHA384 = "sha384-i1//4S+DUC1heRzIqlkwPggQhcxx/zzDp3RbtJrfKW721JphljXobflGiqV5VL99"
 
 export const VONPAY_DEFAULT_API_ORIGIN = "https://checkout.vonpay.com"
 

package/storefront/src/offer-pass.ts

@@ -0,0 +1,10 @@
+export function offerPassCartId(token: string): string | null {
+  const parts = token.split(".")
+  if (parts.length !== 3 || parts[0] !== "v2" || !/^[A-Za-z0-9_-]+$/.test(parts[1])) return null
+  try {
+    const claims = JSON.parse(Buffer.from(parts[1], "base64url").toString("utf8")) as { cart_id?: unknown } | null
+    return typeof claims?.cart_id === "string" && claims.cart_id.length > 0 ? claims.cart_id : null
+  } catch {
+    return null
+  }
+}

package/storefront/src/offer-prepare.ts

@@ -0,0 +1,21 @@
+import { sleep } from "./sleep"
+
+export const OFFER_PREPARE_WAIT_MS = 3_500
+
+export function startOfferPrepare(actions: object): () => Promise<void> {
+  let prepare: unknown
+  try {
+    prepare = (actions as { prepareVonpayOffer?: unknown }).prepareVonpayOffer
+  } catch {
+    prepare = undefined
+  }
+  if (typeof prepare !== "function") return () => Promise.resolve()
+  let started: Promise<unknown>
+  try {
+    started = Promise.resolve((prepare as () => unknown)()).catch(() => undefined)
+  } catch {
+    started = Promise.resolve()
+  }
+  const done = started.then(() => undefined)
+  return () => Promise.race([done, sleep(OFFER_PREPARE_WAIT_MS)])
+}

package/storefront/src/server.ts

@@ -6,6 +6,7 @@ import { type CompletionResult, type VonpaySessionView, buyerReferenceOf, vonpay
 import { STUCK_REPORT_GLOBAL_MAX, STUCK_REPORT_WINDOW_MS, stuckReportLimiter } from "./report-limit"
 import { SAVED_CARDS_COPY, SAVED_CARD_ID, readSavedCards, type VonpayRemoveCardResult, type VonpaySavedCardsResult } from "./saved-cards"
 import { SHOPPER_IP_SECRET_MIN, SHOPPER_IP_SIG_HEADER, signShopperIp } from "./shopper-ip"
+import { offerPassCartId } from "./offer-pass"
 import { sleep } from "./sleep"
 import { withDeadline } from "./deadline"
 import { readOfferAnswer, readOutcome, readWalletSession, type VonpayOffer, type VonpayOfferOutcome, type VonpayWalletSession } from "./upsell"
@@ -29,6 +30,7 @@ export interface VonpayStorefrontServer {
   refreshVonpayPayment(): Promise<{ vpSessionId: string | null; status: string } | null>
   reportStuckVonpayPayment(): Promise<{ reference: string | null }>
   startVonpayPayment(): Promise<{ started: boolean }>
+  prepareVonpayOffer(): Promise<{ prepared: boolean }>
   listSavedCards(): Promise<VonpaySavedCardsResult>
   removeSavedCard(id: string): Promise<VonpayRemoveCardResult>
   upsellOffer(orderId: string): Promise<VonpayOffer | null>
@@ -41,6 +43,7 @@ export interface VonpayStorefrontServer {
 }
 
 export const OFFER_PASS_COOKIE = "_vonpay_offer_pass"
+export { offerPassCartId }
 const passCookieName = () => (process.env.NODE_ENV === "production" ? `__Host-${OFFER_PASS_COOKIE}` : OFFER_PASS_COOKIE)
 export const OFFER_PASS_MAX_AGE_S = 90 * 60
 export const OFFER_PASS_REQUEST_MS = 3_000
@@ -61,7 +64,7 @@ async function completeVonpayCheckout(): Promise<CompletionResult> {
 
   const headers = { ...(await getAuthHeaders()) }
 
-  const pass = await requestOfferPass(cartId, headers)
+  const pass = (await requestOfferPass(cartId, headers)) ?? (await keptOfferPass(cartId))
   if (!pass) await endUpsellOffer()
 
   let response: HttpTypes.StoreCompleteCartResponse
@@ -159,6 +162,19 @@ async function readSavedStatus(cartId: string, headers: Record<string, string>):
   }
 }
 
+  async function prepareVonpayOffer(): Promise<{ prepared: boolean }> {
+    try {
+      const cartId = await getCartId()
+      if (!cartId) return { prepared: false }
+      const pass = await requestOfferPass(cartId, { ...(await getAuthHeaders()) })
+      if (pass) await setOfferPass(pass)
+      else if (!(await keptOfferPass(cartId))) await endUpsellOffer()
+      return { prepared: pass !== null }
+    } catch {
+      return { prepared: false }
+    }
+  }
+
   async function startVonpayPayment(): Promise<{ started: boolean }> {
     const cartId = await getCartId()
     if (!cartId) return { started: false }
@@ -216,6 +232,16 @@ async function readSavedStatus(cartId: string, headers: Record<string, string>):
     }
   }
 
+  async function keptOfferPass(cartId: string): Promise<string | null> {
+    let token: string | undefined
+    try {
+      token = (await cookies()).get(passCookieName())?.value
+    } catch {
+      return null
+    }
+    return token && offerPassCartId(token) === cartId ? token : null
+  }
+
   async function setOfferPass(token: string): Promise<void> {
     try {
       ;(await cookies()).set(passCookieName(), token, { httpOnly: true, sameSite: "lax", secure: process.env.NODE_ENV === "production", path: "/", maxAge: OFFER_PASS_MAX_AGE_S })
@@ -363,6 +389,7 @@ async function readSavedStatus(cartId: string, headers: Record<string, string>):
     refreshVonpayPayment,
     reportStuckVonpayPayment,
     startVonpayPayment,
+    prepareVonpayOffer,
     listSavedCards,
     removeSavedCard,
     upsellOffer,

package/storefront/src/vonpay-card-payment.tsx

@@ -37,6 +37,7 @@ import {
   takeDeclineNote,
 } from "./reload-once"
 import type { SaveUnavailable } from "./vonpay-payment-view"
+import { startOfferPrepare } from "./offer-prepare"
 import { sleep } from "./sleep"
 import { useContactStore } from "./use-contact-store"
 import VonpayPaymentView from "./vonpay-payment-view"
@@ -494,10 +495,12 @@ function CardPayment({
     }
     inFlight.current = true
     setWalletNote(undefined)
-    void confirm().finally(() => {
-      inFlight.current = false
-    })
-  }, [confirm])
+    void startOfferPrepare(actions)()
+      .then(() => confirm())
+      .finally(() => {
+        inFlight.current = false
+      })
+  }, [confirm, actions])
   const afterAction = useCallback(() => {
     if (!walletTapPending.current) return
     walletTapPending.current = false
@@ -509,7 +512,7 @@ function CardPayment({
     if (action.kind === "redirect" && !inFlight.current) {
       inFlight.current = true
       setPhase("redirecting")
-      window.location.assign(action.url)
+      void startOfferPrepare(actions)().then(() => window.location.assign(action.url))
       return
     }
     askServerForWallet()
@@ -555,6 +558,7 @@ function CardPayment({
     const collection = collectionRef.current
     if (!collection) return false
     if (saveUnavailableNow.current || (saveRequiredNow.current && !termsActiveNow.current && saveTickedNow.current === false)) return false
+    const offerReady = startOfferPrepare(actions)
     setPhase("submitting")
     let result: VoraSubmitResult | undefined
     try {
@@ -577,14 +581,16 @@ function CardPayment({
         return false
       case "redirect":
         setPhase("redirecting")
+        await offerReady()
         window.location.assign(action.url)
         return true
       case "declined_ask_server":
       case "complete":
+        await offerReady()
         await confirm()
         return false
     }
-  }, [confirm])
+  }, [confirm, actions])
 
   const startNewPayment = useCallback(async () => {
     setPhase("loading")

package/storefront/src/vora-csp.json

@@ -1,8 +1,8 @@
 {
-  "version": "1.39.1",
+  "version": "1.44.1",
   "modes": {
     "test": {
-      "version": "1.39.1",
+      "version": "1.44.1",
       "mode": "test",
       "directives": {
         "script-src": [
@@ -18,9 +18,11 @@
           "https://embed.sandbox.portal.vonpay.com",
           "https://applepay.cdn-apple.com",
           "https://pay.sandbox.google.com",
+          "https://checkout.vonpay.com",
+          "https://hooks.stripe.com",
+          "'self'",
           "https://js.stripe.com",
           "https://*.js.stripe.com",
-          "https://hooks.stripe.com",
           "https://link.com",
           "https://*.link.com"
         ],
@@ -134,6 +136,36 @@
           "feature": "google-pay",
           "why": "Google Pay JS adds a <style> element for its button."
         },
+        {
+          "directive": "frame-src",
+          "source": "https://embed.sandbox.vonpay.gr4vy.app",
+          "feature": "wallet-modal",
+          "why": "The bank check for a wallet payment, in a modal on your page."
+        },
+        {
+          "directive": "frame-src",
+          "source": "https://checkout.vonpay.com",
+          "feature": "wallet-modal",
+          "why": "The page that reports the wallet bank check's result back to vora.js."
+        },
+        {
+          "directive": "frame-src",
+          "source": "https://embed.sandbox.vonpay.gr4vy.app",
+          "feature": "bank-check",
+          "why": "The card-update bank check pop-up."
+        },
+        {
+          "directive": "frame-src",
+          "source": "https://hooks.stripe.com",
+          "feature": "bank-check",
+          "why": "The same, on Stripe."
+        },
+        {
+          "directive": "frame-src",
+          "source": "'self'",
+          "feature": "bank-check",
+          "why": "Your return page."
+        },
         {
           "directive": "script-src",
           "source": "https://js.stripe.com",
@@ -200,10 +232,18 @@
           "feature": "stripe-link",
           "why": "Link artwork."
         }
+      ],
+      "ifNoUnsafeInline": [
+        {
+          "directive": "style-src",
+          "source": "'sha256-OuajJxe804doBGkJvwnBjnP1cpvNWFjHltumC6RbkcA='",
+          "feature": "default-look",
+          "why": "A one-line style element (@layer vora-defaults;) that puts the built-in default look below your own CSS layers. Without it the look still works, but your layered CSS (Tailwind v4 and similar) does not override it."
+        }
       ]
     },
     "live": {
-      "version": "1.39.1",
+      "version": "1.44.1",
       "mode": "live",
       "directives": {
         "script-src": [
@@ -219,9 +259,11 @@
           "https://embed.portal.vonpay.com",
           "https://applepay.cdn-apple.com",
           "https://pay.google.com",
+          "https://checkout.vonpay.com",
+          "https://hooks.stripe.com",
+          "'self'",
           "https://js.stripe.com",
           "https://*.js.stripe.com",
-          "https://hooks.stripe.com",
           "https://link.com",
           "https://*.link.com"
         ],
@@ -335,6 +377,36 @@
           "feature": "google-pay",
           "why": "Google Pay JS adds a <style> element for its button."
         },
+        {
+          "directive": "frame-src",
+          "source": "https://embed.vonpay.gr4vy.app",
+          "feature": "wallet-modal",
+          "why": "The bank check for a wallet payment, in a modal on your page."
+        },
+        {
+          "directive": "frame-src",
+          "source": "https://checkout.vonpay.com",
+          "feature": "wallet-modal",
+          "why": "The page that reports the wallet bank check's result back to vora.js."
+        },
+        {
+          "directive": "frame-src",
+          "source": "https://embed.vonpay.gr4vy.app",
+          "feature": "bank-check",
+          "why": "The card-update bank check pop-up."
+        },
+        {
+          "directive": "frame-src",
+          "source": "https://hooks.stripe.com",
+          "feature": "bank-check",
+          "why": "The same, on Stripe."
+        },
+        {
+          "directive": "frame-src",
+          "source": "'self'",
+          "feature": "bank-check",
+          "why": "Your return page."
+        },
         {
           "directive": "script-src",
           "source": "https://js.stripe.com",
@@ -401,6 +473,14 @@
           "feature": "stripe-link",
           "why": "Link artwork."
         }
+      ],
+      "ifNoUnsafeInline": [
+        {
+          "directive": "style-src",
+          "source": "'sha256-OuajJxe804doBGkJvwnBjnP1cpvNWFjHltumC6RbkcA='",
+          "feature": "default-look",
+          "why": "A one-line style element (@layer vora-defaults;) that puts the built-in default look below your own CSS layers. Without it the look still works, but your layered CSS (Tailwind v4 and similar) does not override it."
+        }
       ]
     }
   }