@flowselections/floriday-authenticatie-module 1.0.50 → 1.0.52

package/dist-lib/lib/floriday-auction-letters.functions.js

@@ -7,9 +7,31 @@
 import { createServerFn } from "@tanstack/react-start";
 import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
 import { SUPPLIERS_API_VERSION, florydayFetch, getActiveFlorydayCredentials, getActiveFlorydayEnvironment, } from "./floriday.functions.js";
+import { enqueueDocumentRetry, markDocumentDone } from "./floriday-document-queue.js";
 const BUCKET = "floriday-auction-letters";
 const SIGNED_URL_TTL_S = 60 * 60;
+/** Ophalen met automatische herhaalpoging bij mislukken (documentwachtrij). */
 async function ensureAuctionLetterInStorage(supabase, env, connectionId, clockSupplyId, auctionLetterCode) {
+    const documentKey = `${clockSupplyId}:${auctionLetterCode ?? ""}`;
+    try {
+        const out = await fetchAuctionLetterToStorage(supabase, env, connectionId, clockSupplyId, auctionLetterCode);
+        await markDocumentDone(supabase, connectionId, "auction-letter", documentKey);
+        return out;
+    }
+    catch (e) {
+        await enqueueDocumentRetry(supabase, {
+            connectionId,
+            environment: env,
+            kind: "auction-letter",
+            documentKey,
+            params: { clockSupplyId, auctionLetterCode },
+            orderRef: clockSupplyId,
+            error: e,
+        });
+        throw e;
+    }
+}
+async function fetchAuctionLetterToStorage(supabase, env, connectionId, clockSupplyId, auctionLetterCode) {
     let q = supabase
         .from("floriday_auction_letters_cache")
         .select("storage_path, auction_letter_code, content_type")

package/dist-lib/lib/floriday-document-queue.d.ts

@@ -0,0 +1,21 @@
+import type { SupabaseClient } from "@supabase/supabase-js";
+import type { FlorydayEnvironment } from "./floriday.functions.js";
+export type DocumentQueueKind = "customer-sticker" | "auction-letter" | "tray-stickers";
+export declare const DOCUMENT_QUEUE_TABLE = "floriday_document_fetch_queue";
+export declare const DOCUMENT_QUEUE_MAX_ATTEMPTS = 6;
+/** Wachttijd na poging n (1-based), in minuten. */
+export declare const DOCUMENT_QUEUE_BACKOFF_MIN: number[];
+export interface EnqueueInput {
+    connectionId: string;
+    environment: FlorydayEnvironment;
+    kind: DocumentQueueKind;
+    documentKey: string;
+    params: Record<string, unknown>;
+    orderRef?: string | null;
+    error: unknown;
+}
+/** HTTP-status uit een foutmelding als "Floriday … 404: …". */
+export declare function httpStatusFromError(e: unknown): number | null;
+export declare function enqueueDocumentRetry(supabase: SupabaseClient, input: EnqueueInput): Promise<void>;
+export declare function markDocumentDone(supabase: SupabaseClient, connectionId: string, kind: DocumentQueueKind, documentKey: string): Promise<void>;
+//# sourceMappingURL=floriday-document-queue.d.ts.map

package/dist-lib/lib/floriday-document-queue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"floriday-document-queue.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-document-queue.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAEnE,MAAM,MAAM,iBAAiB,GAAG,kBAAkB,GAAG,gBAAgB,GAAG,eAAe,CAAC;AAExF,eAAO,MAAM,oBAAoB,kCAAkC,CAAC;AACpE,eAAO,MAAM,2BAA2B,IAAI,CAAC;AAC7C,mDAAmD;AACnD,eAAO,MAAM,0BAA0B,UAA6B,CAAC;AAErE,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,mBAAmB,CAAC;IACjC,IAAI,EAAE,iBAAiB,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,+DAA+D;AAC/D,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAI7D;AA2BD,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,IAAI,CAAC,CAyBf;AAED,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,cAAc,EACxB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,iBAAiB,EACvB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CA4Bf"}

package/dist-lib/lib/floriday-document-queue.js

@@ -0,0 +1,96 @@
+// ============================================================================
+// Wachtrij voor automatische herhaalpogingen van Floriday-documenten.
+// ----------------------------------------------------------------------------
+// Alleen klantstickers, veilingbrieven en fuststickers. Verzendbrief en
+// logistiek label horen bij de Logistiek Engine (daar zit een eigen
+// herhaalpoging) — die worden hier bewust NIET in de wachtrij gezet.
+//
+// Mislukt een ophaalpoging, dan komt het document in
+// `floriday_document_fetch_queue`. Een bestaande regel wordt NIET gereset
+// (een mislukte handmatige poging start de teller dus niet opnieuw).
+// De cron `retry-floriday-documents` pakt de regels op.
+// ============================================================================
+export const DOCUMENT_QUEUE_TABLE = "floriday_document_fetch_queue";
+export const DOCUMENT_QUEUE_MAX_ATTEMPTS = 6;
+/** Wachttijd na poging n (1-based), in minuten. */
+export const DOCUMENT_QUEUE_BACKOFF_MIN = [5, 15, 60, 180, 360, 720];
+/** HTTP-status uit een foutmelding als "Floriday … 404: …". */
+export function httpStatusFromError(e) {
+    const msg = String(e?.message ?? e ?? "");
+    const m = msg.match(/\b([1-5]\d\d):/);
+    return m ? Number(m[1]) : null;
+}
+async function adminClient() {
+    try {
+        const mod = await import("../integrations/supabase/client.server.js");
+        return mod.supabaseAdmin;
+    }
+    catch {
+        return null;
+    }
+}
+/** Schrijfacties lopen via de service-role (gebruikers mogen alleen lezen). */
+async function writeWith(supabase, op) {
+    const first = await op(supabase);
+    if (!first.error)
+        return;
+    const admin = await adminClient();
+    if (!admin || admin === supabase) {
+        console.warn(`[document-queue] schrijven mislukt: ${first.error.message}`);
+        return;
+    }
+    const second = await op(admin);
+    if (second.error)
+        console.warn(`[document-queue] schrijven mislukt: ${second.error.message}`);
+}
+export async function enqueueDocumentRetry(supabase, input) {
+    try {
+        const msg = String(input.error?.message ?? input.error ?? "Onbekende fout");
+        await writeWith(supabase, (sb) => sb.from(DOCUMENT_QUEUE_TABLE).upsert({
+            connection_id: input.connectionId,
+            environment: input.environment,
+            kind: input.kind,
+            document_key: input.documentKey,
+            params: input.params,
+            order_ref: input.orderRef ?? null,
+            status: "pending",
+            attempts: 0,
+            max_attempts: DOCUMENT_QUEUE_MAX_ATTEMPTS,
+            next_attempt_at: new Date(Date.now() + DOCUMENT_QUEUE_BACKOFF_MIN[0] * 60000).toISOString(),
+            last_error: msg.slice(0, 1000),
+            last_http_status: httpStatusFromError(input.error),
+        }, { onConflict: "connection_id,kind,document_key", ignoreDuplicates: true }));
+    }
+    catch (e) {
+        console.warn(`[document-queue] enqueue mislukt: ${e?.message ?? e}`);
+    }
+}
+export async function markDocumentDone(supabase, connectionId, kind, documentKey) {
+    try {
+        // Snel pad: niets te doen als er geen open regel is (lezen mag iedereen).
+        const { data } = await supabase
+            .from(DOCUMENT_QUEUE_TABLE)
+            .select("id")
+            .eq("connection_id", connectionId)
+            .eq("kind", kind)
+            .eq("document_key", documentKey)
+            .neq("status", "done")
+            .limit(1);
+        if (!data || data.length === 0)
+            return;
+        await writeWith(supabase, (sb) => sb
+            .from(DOCUMENT_QUEUE_TABLE)
+            .update({
+            status: "done",
+            completed_at: new Date().toISOString(),
+            locked_at: null,
+            locked_by: null,
+        })
+            .eq("connection_id", connectionId)
+            .eq("kind", kind)
+            .eq("document_key", documentKey));
+    }
+    catch (e) {
+        console.warn(`[document-queue] markDone mislukt: ${e?.message ?? e}`);
+    }
+}