@flowselections/logistiek-engine 1.0.90 → 1.0.98

package/dist-lib/lib/controlScan.server.d.ts

@@ -6,6 +6,8 @@ export interface ControlScanRun {
     failed: number;
     errors: string[];
 }
+/** Maximaal aantal wachtrondes op Floriday voordat de controle als mislukt stopt. */
+export declare const CONTROL_SCAN_MAX_ATTEMPTS = 60;
 export declare function runControlScanQueue(sb: SupabaseClient, options?: {
     limit?: number;
 }): Promise<ControlScanRun>;

package/dist-lib/lib/controlScan.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controlScan.server.d.ts","sourceRoot":"","sources":["../../src/lib/controlScan.server.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAmCD,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,cAAc,EAClB,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/B,OAAO,CAAC,cAAc,CAAC,CAoLzB"}
+{"version":3,"file":"controlScan.server.d.ts","sourceRoot":"","sources":["../../src/lib/controlScan.server.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAG5D,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAcD,qFAAqF;AACrF,eAAO,MAAM,yBAAyB,KAAK,CAAC;AAwC5C,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,cAAc,EAClB,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/B,OAAO,CAAC,cAAc,CAAC,CAmKzB"}

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

@@ -14,6 +14,9 @@
 // en dubbele scans worden al in de database geblokkeerd. Geen omgevings- of
 // klantwaarden in deze code; de printer komt uit de werkwijze in de database.
 // ============================================================================
+import { printViaLayout } from "./layoutPrint.server.js";
+/** Maximaal aantal wachtrondes op Floriday voordat de controle als mislukt stopt. */
+export const CONTROL_SCAN_MAX_ATTEMPTS = 60;
 function pickPdf(result) {
     const base64 = result["pdfBase64"] ??
         result["base64"] ??
@@ -25,12 +28,28 @@ function pickPdf(result) {
         null;
     return { base64: base64 ?? null, url: url ?? null };
 }
-/** Zet de wachtende controle terug in de wachtrij zonder pogingen op te tellen. */
-async function keepWaiting(sb, id) {
+/**
+ * Laat de controle wachten op Floriday. Pogingen blijven meetellen; na het
+ * maximum eindigt de controle als mislukt in plaats van eeuwig te wachten.
+ * Geeft true terug als de controle nu terminaal is afgesloten.
+ */
+async function keepWaiting(sb, row) {
+    const attempts = Number(row.attempts ?? 0);
+    if (attempts >= CONTROL_SCAN_MAX_ATTEMPTS) {
+        await sb.rpc("logistics_control_scan_finish", {
+            _id: row.id,
+            _ok: false,
+            _status: "mislukt",
+            _error_code: "wachtlimiet",
+            _error: `Na ${attempts} pogingen kende Floriday deze order nog steeds niet; de controle is gestopt. Controleer de order in Floriday en scan opnieuw.`,
+        });
+        return true;
+    }
     await sb
         .from("logistics_control_scan")
-        .update({ locked_until: null, attempts: 0, updated_at: new Date().toISOString() })
-        .eq("id", id);
+        .update({ locked_until: null, updated_at: new Date().toISOString() })
+        .eq("id", row.id);
+    return false;
 }
 export async function runControlScanQueue(sb, options = {}) {
     const run = { claimed: 0, printed: 0, waiting: 0, failed: 0, errors: [] };
@@ -88,8 +107,10 @@ export async function runControlScanQueue(sb, options = {}) {
                 continue;
             }
             if (!fulfillmentOrderId) {
-                await keepWaiting(sb, row.id);
-                run.waiting++;
+                if (await keepWaiting(sb, row))
+                    run.failed++;
+                else
+                    run.waiting++;
                 continue;
             }
             const doc = (await getFlorydayDocument(sb, {
@@ -122,54 +143,39 @@ export async function runControlScanQueue(sb, options = {}) {
                 run.failed++;
                 continue;
             }
-            // Idempotent: per controle hooguit een printjob.
-            const idempotentie = `controle-scan:${row.id}`;
-            const { data: bestaand } = await sb
-                .from("print_jobs")
-                .select("id")
-                .eq("idempotentie_sleutel", idempotentie)
-                .maybeSingle();
-            let jobId = bestaand?.["id"] ?? null;
-            if (!jobId) {
-                const { data: job, error: jobError } = await sb
-                    .from("print_jobs")
-                    .insert({
-                    printer_id: row.printer_id,
-                    documenttype: "afleverbrief",
-                    documentnaam: `Afleverbrief ${row.order_number}`,
-                    status: "wachtend",
-                    idempotentie_sleutel: idempotentie,
-                    pdf_base64: base64,
-                    pdf_url: url,
-                    herkomst: "logistiek-engine",
-                    gebruiker_naam: "Controle scan",
-                    payload: {
-                        source: "controle_scan",
-                        is_floriday: true,
-                        order_id: row.order_id,
-                        order_number: row.order_number,
-                        cart_id: row.cart_id,
-                        fulfillment_order_id: fulfillmentOrderId,
-                        printer_id: row.printer_id,
-                        control_scan_id: row.id,
-                    },
-                })
-                    .select("id")
-                    .maybeSingle();
-                if (jobError) {
-                    await sb.rpc("logistics_control_scan_finish", {
-                        _id: row.id,
-                        _ok: false,
-                        _status: "mislukt",
-                        _fulfillment_order_id: fulfillmentOrderId,
-                        _error_code: "printjob",
-                        _error: `De afleverbrief kon niet worden klaargezet om te printen: ${jobError.message}`,
-                    });
-                    run.failed++;
-                    continue;
-                }
-                jobId = job?.["id"] ?? null;
+            // Via de Layout maker; idempotent per controle.
+            const printed = await printViaLayout(sb, {
+                documenttype: "afleverbrief",
+                documentnaam: `Afleverbrief ${row.order_number}`,
+                pdfBase64: base64,
+                pdfUrl: url,
+                printPlekId: null,
+                herkomst: "floriday",
+                idempotentieSleutel: `controle-scan:${row.id}`,
+                payload: {
+                    source: "controle_scan",
+                    is_floriday: true,
+                    order_id: row.order_id,
+                    ordernummer: row.order_number,
+                    order_number: row.order_number,
+                    cart_id: row.cart_id,
+                    fulfillment_order_id: fulfillmentOrderId,
+                    control_scan_id: row.id,
+                },
+            });
+            if (!printed.ok) {
+                await sb.rpc("logistics_control_scan_finish", {
+                    _id: row.id,
+                    _ok: false,
+                    _status: "mislukt",
+                    _fulfillment_order_id: fulfillmentOrderId,
+                    _error_code: printed.errorCode.toLowerCase(),
+                    _error: printed.error,
+                });
+                run.failed++;
+                continue;
             }
+            const jobId = printed.jobId;
             await sb.rpc("logistics_control_scan_finish", {
                 _id: row.id,
                 _ok: true,