vonpay-medusa 1.0.2 → 1.0.3

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vonpay-medusa",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Vonpay payment provider for Medusa v2",
   "author": "Von Payments",
   "license": "MIT",
@@ -60,6 +60,7 @@
     "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: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 +184,7 @@
     }
   },
   "dependencies": {
-    "@vonpay/checkout-node": "^3.11.0",
+    "@vonpay/checkout-node": "^4.2.0",
     "bignumber.js": "^9.3.1"
   },
   "bin": {