@flowselections/logistiek-engine 1.0.11 → 1.0.12

package/dist-lib/lib/floridayPush.server.js

@@ -116,6 +116,21 @@ function isPermanent(status, message) {
         return true;
     return /validat|ongeldig|invalid|schema|not found|bestaat niet/i.test(message);
 }
+/** Korte, stabiele foutcode om later op te kunnen filteren. */
+function gatewayErrorCode(status, payloadOk) {
+    if (status === null)
+        return "unknown";
+    if (status >= 200 && status < 300)
+        return payloadOk === true ? "unknown" : "gateway_ok_unreadable";
+    if (status >= 500)
+        return "gateway_5xx";
+    if (status === 400 || status === 401 || status === 404 || status === 429) {
+        return `gateway_${status}`;
+    }
+    if (status >= 400)
+        return "gateway_4xx";
+    return "unknown";
+}
 export async function runFloridayPushQueue(sb, opts = {}) {
     const limit = opts.limit ?? FLORIDAY_PUSH_BATCH;
     const deadlineAt = opts.deadlineAt ?? Date.now() + 10000;
@@ -148,6 +163,9 @@ export async function runFloridayPushQueue(sb, opts = {}) {
         let error = null;
         let sentHash = null;
         let fulfillmentOrderId = null;
+        let gatewayStatus = null;
+        let errorCode = null;
+        let response = null;
         try {
             const built = await buildFloridayPayload(sb, orderRef);
             if (!built) {
@@ -155,6 +173,7 @@ export async function runFloridayPushQueue(sb, opts = {}) {
                 ok = false;
                 permanent = true;
                 error = "Order niet gevonden in de Engine.";
+                errorCode = "order_missing";
             }
             else if (built.hash === lastSentHash) {
                 // Identieke stand: niets versturen, wel als geslaagd afronden.
@@ -163,22 +182,42 @@ export async function runFloridayPushQueue(sb, opts = {}) {
                 out.skipped++;
             }
             else {
-                const res = (await sendFlorydayFulfillmentOrder(sb, built.payload));
-                ok = res?.ok === true;
+                const res = await sendFlorydayFulfillmentOrder(sb, built.payload);
+                gatewayStatus = typeof res?.status === "number" ? res.status : null;
+                // Nieuw contract: { status, payload: { ok, error, fulfillmentOrderId } }.
+                // Defensief: een oudere gatewayversie gaf ok/error op het hoogste niveau.
+                const payload = (res?.payload ?? null);
+                if (!payload && res && ("ok" in res || "error" in res)) {
+                    console.warn("[floridayPush] gateway gaf de oude responsvorm terug (ok/error op hoofdniveau)");
+                }
+                const payloadOk = payload?.ok ?? res?.ok;
+                const payloadError = payload?.error ?? res?.error;
+                ok = payloadOk === true;
                 sentHash = built.hash;
-                fulfillmentOrderId = built.payload.fulfillmentOrderId;
+                fulfillmentOrderId =
+                    payload?.fulfillmentOrderId ?? built.payload.fulfillmentOrderId ?? null;
+                response = {
+                    ok: payloadOk ?? null,
+                    error: payloadError ?? null,
+                    fulfillmentOrderId: payload?.fulfillmentOrderId ?? null,
+                };
                 if (!ok) {
-                    error = res?.error ?? "Floriday gaf geen bevestiging.";
-                    permanent = isPermanent(res?.status ?? null, error);
+                    error =
+                        payloadError && String(payloadError).length > 0
+                            ? String(payloadError)
+                            : `Floriday gaf geen bevestiging. (gatewaystatus ${gatewayStatus ?? "onbekend"})`;
+                    errorCode = gatewayErrorCode(gatewayStatus, payloadOk);
+                    permanent = isPermanent(gatewayStatus, error);
                 }
             }
         }
         catch (e) {
             error = String(e?.message ?? e);
+            errorCode = errorCode ?? "unknown";
             permanent = isPermanent(null, error);
         }
         try {
-            const { data: outcome } = await sb.rpc("logistics_floriday_finish_push", {
+            const { data: outcome } = await sb.rpc("logistics_floriday_finish_push_v2", {
                 _id: id,
                 _revision: revision,
                 _ok: ok,
@@ -186,6 +225,9 @@ export async function runFloridayPushQueue(sb, opts = {}) {
                 _fulfillment_order_id: fulfillmentOrderId,
                 _sent_hash: sentHash,
                 _permanent: permanent,
+                _gateway_status: gatewayStatus,
+                _error_code: errorCode,
+                _response: response,
             });
             const status = String(outcome ?? "");
             if (status === "sent")