@flowselections/logistiek-engine 1.0.34 → 1.0.89

package/dist-lib/lib/logisticsRecalcJob.functions.js

@@ -2,13 +2,13 @@
 // src/lib/logisticsRecalcJob.functions.ts — server functions (thin wrappers)
 // ============================================================================
 import { createServerFn } from "@tanstack/react-start";
-import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware";
-import { readableServerErrors } from "../lib/readableServerErrors";
+import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
+import { readableServerErrors } from "./readableServerErrors.js";
 export const startRecalcJob = createServerFn({ method: "POST" })
     .middleware([readableServerErrors, requireSupabaseAuth])
     .inputValidator((data) => data ?? {})
     .handler(async ({ data, context }) => {
-    const { supabaseAdmin } = await import("../integrations/supabase/client.server");
+    const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
     const { startJob } = await import("./logisticsRecalcJob.server");
     const job = await startJob(supabaseAdmin, context.userId ?? null, data.strategyId ?? null);
     return { id: job.id, status: job.status, phase: job.phase };
@@ -16,7 +16,7 @@ export const startRecalcJob = createServerFn({ method: "POST" })
 export const tickRecalcJob = createServerFn({ method: "POST" })
     .middleware([readableServerErrors, requireSupabaseAuth])
     .handler(async () => {
-    const { supabaseAdmin } = await import("../integrations/supabase/client.server");
+    const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
     const { tickJob } = await import("./logisticsRecalcJob.server");
     const job = await tickJob(supabaseAdmin);
     return job

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

@@ -1 +1 @@
-{"version":3,"file":"logisticsRecalcJob.server.d.ts","sourceRoot":"","sources":["../../src/lib/logisticsRecalcJob.server.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAM5D,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC;IACrC,KAAK,EAAE,SAAS,GAAG,QAAQ,GAAG,UAAU,CAAC;IACzC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5D,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,aAAa,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAGjF;AAED,wBAAsB,YAAY,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAOhF;AAED,8DAA8D;AAC9D,wBAAsB,QAAQ,CAC5B,EAAE,EAAE,cAAc,EAClB,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,UAAU,EAAE,MAAM,GAAG,IAAI,GACxB,OAAO,CAAC,SAAS,CAAC,CAsBpB;AAED,6EAA6E;AAC7E,wBAAsB,OAAO,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CA2C3E;AAED,iFAAiF;AACjF,wBAAsB,aAAa,CAAC,EAAE,EAAE,cAAc,EAAE,IAAI,SAAK;UAkBpC,MAAM;QAAM,OAAO;YAAU,MAAM;KAM/D"}
+{"version":3,"file":"logisticsRecalcJob.server.d.ts","sourceRoot":"","sources":["../../src/lib/logisticsRecalcJob.server.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAM5D,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC;IACrC,KAAK,EAAE,SAAS,GAAG,QAAQ,GAAG,UAAU,CAAC;IACzC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5D,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,aAAa,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAGjF;AAED,wBAAsB,YAAY,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAOhF;AAED,8DAA8D;AAC9D,wBAAsB,QAAQ,CAC5B,EAAE,EAAE,cAAc,EAClB,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,UAAU,EAAE,MAAM,GAAG,IAAI,GACxB,OAAO,CAAC,SAAS,CAAC,CAsBpB;AAED,6EAA6E;AAC7E,wBAAsB,OAAO,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CA2D3E;AAED,iFAAiF;AACjF,wBAAsB,aAAa,CAAC,EAAE,EAAE,cAAc,EAAE,IAAI,SAAK;UAkBpC,MAAM;QAAM,OAAO;YAAU,MAAM;KAM/D"}

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

@@ -86,8 +86,23 @@ export async function tickJob(sb) {
         patch['status'] = "error";
         patch['finished_at'] = new Date().toISOString();
     }
-    const { data } = await sb.from(TABLE).update(patch).eq("id", job.id).select("*").single();
-    return (data ?? null);
+    // Auditpunt 2: optimistic concurrency. De browser-poller en de cron-tick
+    // draaien tegelijk; zonder deze controle overschrijft de traagste de telling
+    // van de ander. Schrijven mag alleen als de rij sinds het lezen niet is
+    // veranderd. Lukt dat niet, dan heeft een ander proces deze batch al verwerkt
+    // en geven we de actuele stand terug zonder iets te overschrijven.
+    patch['updated_at'] = new Date().toISOString();
+    const { data } = await sb
+        .from(TABLE)
+        .update(patch)
+        .eq("id", job.id)
+        .eq("updated_at", job.updated_at)
+        .select("*")
+        .maybeSingle();
+    if (data)
+        return data;
+    const { data: current } = await sb.from(TABLE).select("*").eq("id", job.id).maybeSingle();
+    return (current ?? null);
 }
 /** Draait de afsluitende herberekenstappen (planning, tellingen, capaciteit). */
 export async function runFinalSteps(sb, days = 21) {