@flowselections/floriday-authenticatie-module 1.0.89 → 1.0.91

package/dist-lib/lib/cron/sync-floricode-all.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync-floricode-all.d.ts","sourceRoot":"","sources":["../../../src/lib/cron/sync-floricode-all.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAG5D,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,cAAc,GACvB,OAAO,CAAC,QAAQ,CAAC,CAuBnB"}
+{"version":3,"file":"sync-floricode-all.d.ts","sourceRoot":"","sources":["../../../src/lib/cron/sync-floricode-all.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAG5D,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,cAAc,GACvB,OAAO,CAAC,QAAQ,CAAC,CAqBnB"}

package/dist-lib/lib/cron/sync-floricode-all.js

@@ -10,11 +10,9 @@ export async function handleSyncFloricodeAll(request, supabase) {
         return await withJobLock(supabase, "floricode-sync:all", async () => {
             const url = new URL(request.url);
             const batchSize = Number(url.searchParams.get("batchSize") ?? "5000");
-            const maxBatches = Number(url.searchParams.get("maxBatchesPerResource") ?? "2");
             const { syncAllFloricodeResources } = await import("../floricode-sync.server.js");
             const result = await syncAllFloricodeResources({
                 batchSize: Number.isFinite(batchSize) ? batchSize : 5000,
-                maxBatchesPerResource: Number.isFinite(maxBatches) ? maxBatches : 2,
             });
             return Response.json(result);
         });

package/dist-lib/lib/floricode-regulatory-features.d.ts

@@ -29,6 +29,7 @@ export declare function syncFloricodeRegulatoryFeatures(supabase: SupabaseClient
     batchSize?: number;
     maxBatches?: number;
     resume?: boolean;
+    deadline?: number;
 }): Promise<{
     ok: true;
     resource: string;

package/dist-lib/lib/floricode-regulatory-features.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"floricode-regulatory-features.d.ts","sourceRoot":"","sources":["../../src/lib/floricode-regulatory-features.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAY5D,UAAU,cAAc;IACtB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IACpC,kBAAkB,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC5C,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC;AAED,UAAU,cAAc;IACtB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC;AAYD,wBAAsB,0CAA0C,CAC9D,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,EAAE,CAAC,CAgB3B;AAiDD,wBAAsB,8BAA8B,CAClD,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,cAAc,EAAE,GACtB,OAAO,CAAC,MAAM,CAAC,CAqBjB;AAED,wBAAsB,2BAA2B,CAC/C,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,cAAc,EAAE,GACtB,OAAO,CAAC,MAAM,CAAC,CAqBjB;AAiBD,wBAAsB,4BAA4B,CAAC,QAAQ,EAAE,cAAc;;;;;;GA2B1E;AAED,wBAAsB,+BAA+B,CACnD,QAAQ,EAAE,cAAc,EACxB,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO;;;;;;;;;;;;;;;;;;;;;;GAoK5E"}
+{"version":3,"file":"floricode-regulatory-features.d.ts","sourceRoot":"","sources":["../../src/lib/floricode-regulatory-features.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAa5D,UAAU,cAAc;IACtB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IACpC,kBAAkB,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC5C,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC;AAED,UAAU,cAAc;IACtB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC;AAYD,wBAAsB,0CAA0C,CAC9D,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,EAAE,CAAC,CAgB3B;AAiDD,wBAAsB,8BAA8B,CAClD,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,cAAc,EAAE,GACtB,OAAO,CAAC,MAAM,CAAC,CAqBjB;AAED,wBAAsB,2BAA2B,CAC/C,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,cAAc,EAAE,GACtB,OAAO,CAAC,MAAM,CAAC,CAqBjB;AAiBD,wBAAsB,4BAA4B,CAAC,QAAQ,EAAE,cAAc;;;;;;GA6B1E;AAED,wBAAsB,+BAA+B,CACnD,QAAQ,EAAE,cAAc,EACxB,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAO;;;;;;;;;;;;;;;;;;;;;;GAgL/F"}

package/dist-lib/lib/floricode-regulatory-features.js

@@ -1,4 +1,5 @@
 import { getFloricodeAccessToken } from "./floricode-credentials.server.js";
+import { FLORICODE_ROUND_BUDGET_MS, laterIso, stateAfterPage } from "./floricode-sync-plan.js";
 const REG_FEATURE_TYPE_URL = "https://api.floricode.com/v2/VBN/RegulatoryFeatureType";
 const REGULATION_TYPE_URL = "https://api.floricode.com/v2/VBN/RegulationType";
 const REG_FEATURE_TYPE_RESOURCE = "RegulatoryFeatureType";
@@ -127,6 +128,8 @@ export async function syncFloricodeRegulationTypes(supabase) {
             error_message: null,
             last_sequence_number: upserted,
             last_sync_at: new Date().toISOString(),
+            completed_at: new Date().toISOString(),
+            total_count: items.length,
         });
         return { ok: true, resource: REGULATION_TYPE_RESOURCE, fetched: items.length, upserted, durationMs: Date.now() - startedAt };
     }
@@ -145,6 +148,9 @@ export async function syncFloricodeRegulatoryFeatures(supabase, options = {}) {
     const batchSize = Math.min(Math.max(options.batchSize ?? 5000, 1), 5000);
     const maxBatches = options.maxBatches && options.maxBatches > 0 ? options.maxBatches : Infinity;
     const resume = options.resume !== false;
+    const deadline = options.deadline ?? Date.now() + FLORICODE_ROUND_BUDGET_MS;
+    // Datum waarmee een lopende ronde verdergaat; pas bij compleet het nieuwe watermerk.
+    let pending = null;
     // Read cursor from state so we can resume where the previous invocation stopped.
     let skip = 0;
     let maxChangeDateTime = null;
@@ -157,14 +163,15 @@ export async function syncFloricodeRegulatoryFeatures(supabase, options = {}) {
     if (resume) {
         const { data: state } = await supabase
             .from("floricode_sync_state")
-            .select("cursor_skip,last_change_date_time,status")
+            .select("cursor_skip,last_change_date_time,pending_change_date_time,status")
             .eq("resource", REG_FEATURE_TYPE_RESOURCE)
             .maybeSingle();
         const s = state;
-        if (s?.status === "running") {
+        if (s?.status === "running" || s?.status === "error") {
             skip = Number(s.cursor_skip ?? 0) || 0;
             maxChangeDateTime = s.last_change_date_time ?? null;
             sinceIso = s.last_change_date_time ?? null;
+            pending = s.pending_change_date_time ?? null;
         }
         else if (s?.status === "ok" && s.last_change_date_time) {
             sinceIso = s.last_change_date_time;
@@ -181,12 +188,13 @@ export async function syncFloricodeRegulatoryFeatures(supabase, options = {}) {
         status: "running",
         error_message: null,
         cursor_skip: skip,
-        last_change_date_time: maxChangeDateTime,
+        last_change_date_time: sinceIso,
+        pending_change_date_time: pending,
         last_sync_at: new Date().toISOString(),
     });
     try {
         const token = await getFloricodeToken(REG_FEATURE_TYPE_SCOPE);
-        while (batches < maxBatches) {
+        while (batches < maxBatches && Date.now() < deadline) {
             const items = await fetchRegFeatureTypePage(token, skip, batchSize, sinceIso);
             if (items.length === 0) {
                 completed = true;
@@ -194,19 +202,22 @@ export async function syncFloricodeRegulatoryFeatures(supabase, options = {}) {
             }
             fetched += items.length;
             upserted += await upsertRegulatoryFeatureRecords(supabase, items);
-            for (const item of items) {
-                const changed = item.change_date_time ?? null;
-                if (changed && (!maxChangeDateTime || changed > maxChangeDateTime))
-                    maxChangeDateTime = changed;
-            }
+            let pageMax = null;
+            for (const item of items)
+                pageMax = laterIso(pageMax, item.change_date_time ?? null);
             batches += 1;
+            const next = stateAfterPage({ startWatermark: sinceIso, pending, pageMax, skipBefore: skip, pageSize: items.length, batchSize });
             skip += items.length;
-            // Persist cursor after each batch so a crash mid-run resumes correctly.
+            pending = next.pending_change_date_time ?? laterIso(pending, pageMax);
+            maxChangeDateTime = laterIso(sinceIso, pending);
+            // Alleen positie + voorlopige datum; het filter (sinceIso) blijft gelijk
+            // tot de bron compleet is — anders sloeg hervatten regels over (lus).
             await setSyncState(supabase, REG_FEATURE_TYPE_RESOURCE, {
                 status: "running",
                 error_message: null,
                 cursor_skip: skip,
-                last_change_date_time: maxChangeDateTime,
+                last_change_date_time: sinceIso,
+                pending_change_date_time: pending,
                 last_sync_at: new Date().toISOString(),
             });
             // Lichte per-product projectie: alleen de zojuist geraakte producten
@@ -250,7 +261,10 @@ export async function syncFloricodeRegulatoryFeatures(supabase, options = {}) {
                 cursor_skip: 0,
                 last_sequence_number: skip,
                 last_change_date_time: maxChangeDateTime,
+                pending_change_date_time: null,
                 last_sync_at: new Date().toISOString(),
+                completed_at: new Date().toISOString(),
+                ...(incremental ? {} : { total_count: skip }),
             });
             return {
                 ok: true,
@@ -284,7 +298,8 @@ export async function syncFloricodeRegulatoryFeatures(supabase, options = {}) {
             status: "error",
             error_message: msg,
             cursor_skip: skip,
-            last_change_date_time: maxChangeDateTime,
+            last_change_date_time: sinceIso,
+            pending_change_date_time: pending,
             last_sync_at: new Date().toISOString(),
         });
         throw e;

package/dist-lib/lib/floricode-sync-plan.d.ts

@@ -0,0 +1,64 @@
+export declare const FLORICODE_CRON_BUSY = "*/10 * * * *";
+export declare const FLORICODE_CRON_NIGHTLY = "0 2 * * *";
+/** Tijdsbudget per aanroep (Worker); daarna gaat de volgende ronde verder. */
+export declare const FLORICODE_ROUND_BUDGET_MS = 25000;
+export declare const FLORICODE_STALE_MS: number;
+/** Nachtelijke wijzigingenronde: niet vaker dan eens per 20 uur. */
+export declare const FLORICODE_NIGHTLY_MIN_MS: number;
+export declare function laterIso(a: string | null | undefined, b: string | null | undefined): string | null;
+/**
+ * Staat na een pagina. De watermerkdatum ("bijgewerkt tot") verschuift alleen
+ * als de bron compleet is; tijdens de ronde blijft hij gelijk aan het begin,
+ * zodat filter + positie bij hervatten consistent blijven.
+ */
+export declare function stateAfterPage(input: {
+    startWatermark: string | null;
+    pending: string | null;
+    pageMax: string | null;
+    skipBefore: number;
+    pageSize: number;
+    batchSize: number;
+}): {
+    finished: true;
+    status: "ok";
+    cursor_skip: number;
+    last_change_date_time: string | null;
+    pending_change_date_time: null;
+} | {
+    finished: false;
+    status: "running";
+    cursor_skip: number;
+    last_change_date_time: string | null;
+    pending_change_date_time: string | null;
+};
+export declare function floricodeCronSchedule(anyIncomplete: boolean): string;
+export declare function isIncomplete(status: string | null | undefined): boolean;
+export declare function nightlyDue(lastCompletedAt: string | null, now: number): boolean;
+export type FloricodeSourceView = {
+    kind: "complete";
+    stale: boolean;
+} | {
+    kind: "busy";
+    done: number;
+    total: number | null;
+    stale: boolean;
+} | {
+    kind: "stalled";
+    since: string | null;
+    stale: boolean;
+} | {
+    kind: "error";
+    stale: boolean;
+} | {
+    kind: "never";
+    stale: boolean;
+};
+/** "Compleet" / "Bezig (x van y)" / "Staat stil sinds …"; stale = ouder dan 7 dagen. */
+export declare function classifyFloricodeSource(row: {
+    status: string | null;
+    lastSyncAt: string | null;
+    completedAt?: string | null;
+    rowCount: number;
+    totalCount?: number | null;
+}, now: number): FloricodeSourceView;
+//# sourceMappingURL=floricode-sync-plan.d.ts.map

package/dist-lib/lib/floricode-sync-plan.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"floricode-sync-plan.d.ts","sourceRoot":"","sources":["../../src/lib/floricode-sync-plan.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,mBAAmB,iBAAiB,CAAC;AAClD,eAAO,MAAM,sBAAsB,cAAc,CAAC;AAClD,8EAA8E;AAC9E,eAAO,MAAM,yBAAyB,QAAS,CAAC;AAChD,eAAO,MAAM,kBAAkB,QAAuB,CAAC;AACvD,oEAAoE;AACpE,eAAO,MAAM,wBAAwB,QAAmB,CAAC;AAEzD,wBAAgB,QAAQ,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAIlG;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE;IACpC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;;;;;;;;;;;;EAOA;AAED,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,OAAO,GAAG,MAAM,CAEpE;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAEvE;AAED,wBAAgB,UAAU,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAG/E;AAED,MAAM,MAAM,mBAAmB,GAC3B;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,GACpC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,GACpE;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,GACzD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC;AAEtC,wFAAwF;AACxF,wBAAgB,uBAAuB,CAAC,GAAG,EAAE;IAC3C,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B,EAAE,GAAG,EAAE,MAAM,GAAG,mBAAmB,CASnC"}

package/dist-lib/lib/floricode-sync-plan.js

@@ -0,0 +1,54 @@
+// Pure beslisregels voor de Floricode-ronde (testbaar, geen I/O).
+export const FLORICODE_CRON_BUSY = "*/10 * * * *";
+export const FLORICODE_CRON_NIGHTLY = "0 2 * * *";
+/** Tijdsbudget per aanroep (Worker); daarna gaat de volgende ronde verder. */
+export const FLORICODE_ROUND_BUDGET_MS = 25000;
+export const FLORICODE_STALE_MS = 7 * 24 * 60 * 60000;
+/** Nachtelijke wijzigingenronde: niet vaker dan eens per 20 uur. */
+export const FLORICODE_NIGHTLY_MIN_MS = 20 * 60 * 60000;
+export function laterIso(a, b) {
+    if (!a)
+        return b ?? null;
+    if (!b)
+        return a;
+    return new Date(b).getTime() > new Date(a).getTime() ? b : a;
+}
+/**
+ * Staat na een pagina. De watermerkdatum ("bijgewerkt tot") verschuift alleen
+ * als de bron compleet is; tijdens de ronde blijft hij gelijk aan het begin,
+ * zodat filter + positie bij hervatten consistent blijven.
+ */
+export function stateAfterPage(input) {
+    const pending = laterIso(input.pending, input.pageMax);
+    const skip = input.skipBefore + input.pageSize;
+    const finished = input.pageSize < input.batchSize;
+    return finished
+        ? { finished, status: "ok", cursor_skip: 0, last_change_date_time: laterIso(input.startWatermark, pending), pending_change_date_time: null }
+        : { finished, status: "running", cursor_skip: skip, last_change_date_time: input.startWatermark, pending_change_date_time: pending };
+}
+export function floricodeCronSchedule(anyIncomplete) {
+    return anyIncomplete ? FLORICODE_CRON_BUSY : FLORICODE_CRON_NIGHTLY;
+}
+export function isIncomplete(status) {
+    return status !== "ok" && status !== "success";
+}
+export function nightlyDue(lastCompletedAt, now) {
+    if (!lastCompletedAt)
+        return true;
+    return now - new Date(lastCompletedAt).getTime() >= FLORICODE_NIGHTLY_MIN_MS;
+}
+/** "Compleet" / "Bezig (x van y)" / "Staat stil sinds …"; stale = ouder dan 7 dagen. */
+export function classifyFloricodeSource(row, now) {
+    const ref = row.completedAt ?? row.lastSyncAt;
+    const stale = !ref || now - new Date(ref).getTime() > FLORICODE_STALE_MS;
+    if (!row.lastSyncAt && !row.status)
+        return { kind: "never", stale: true };
+    if (row.status === "error")
+        return { kind: "error", stale };
+    if (!isIncomplete(row.status))
+        return { kind: "complete", stale };
+    const idle = !row.lastSyncAt || now - new Date(row.lastSyncAt).getTime() > 60 * 60000;
+    if (idle)
+        return { kind: "stalled", since: row.lastSyncAt, stale };
+    return { kind: "busy", done: row.rowCount, total: row.totalCount ?? null, stale };
+}

package/dist-lib/lib/floricode-sync.server.d.ts

@@ -16,20 +16,52 @@ export interface FloricodeSyncResult {
     nextWatermark: string | null;
     durationMs: number;
 }
+/**
+ * Haalt pagina's op tot de bron compleet is of het tijdsbudget op is.
+ * Positie (cursor_skip) gaat alleen vooruit na een opgeslagen pagina; de
+ * watermerkdatum verschuift pas als de bron compleet is (zie stateAfterPage).
+ */
 export declare function syncFloricodeResource(resource: string, opts?: {
     batchSize?: number;
     maxBatches?: number;
     resume?: boolean;
+    deadline?: number;
 }): Promise<FloricodeSyncResult>;
-export declare function syncAllFloricodeResources(opts: {
+type AllResult = FloricodeSyncResult | {
+    resource: string;
+    ok: false;
+    error: string;
+} | {
+    resource: string;
+    ok: true;
+    skipped: true;
+};
+/**
+ * Eén cron-tik: eerst onvolledige bronnen afmaken binnen het tijdsbudget;
+ * zijn alle bronnen compleet, dan hooguit eens per 20 uur alleen wijzigingen.
+ * Stelt daarna het cron-schema in (elke 10 min zolang iets bezig is, anders 's nachts).
+ */
+export declare function syncAllFloricodeResources(opts?: {
     batchSize?: number;
-    maxBatchesPerResource?: number;
+    budgetMs?: number;
 }): Promise<{
     ok: true;
-    results: Array<FloricodeSyncResult | {
-        resource: string;
-        ok: false;
-        error: string;
-    }>;
+    results: AllResult[];
+    incomplete: string[];
+    schedule: string | null;
+}>;
+/**
+ * Plant de Floricode-ronde in als die nog niet bestaat (uurlijks aangeroepen).
+ * Adres via resolveVerifiedFlorydayCronUrl; ontbreekt het Shell-adres, dan
+ * niet inplannen (fail closed) — de stilstand-melding wordt daar vastgelegd.
+ */
+export declare function ensureFloricodeSyncCron(opts?: {
+    force?: boolean;
+}): Promise<{
+    ok: boolean;
+    scheduled: boolean;
+    schedule: string | null;
+    error?: string;
 }>;
+export {};
 //# sourceMappingURL=floricode-sync.server.d.ts.map

package/dist-lib/lib/floricode-sync.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"floricode-sync.server.d.ts","sourceRoot":"","sources":["../../src/lib/floricode-sync.server.ts"],"names":[],"mappings":"AAiBA,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,4EAA4E;IAC5E,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,eAAO,MAAM,mBAAmB,EAAE,oBAAoB,EAkBrD,CAAC;AA6EF,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,IAAI,CAAC;IACT,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAClB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,GACvE,OAAO,CAAC,mBAAmB,CAAC,CAmH9B;AAED,wBAAsB,yBAAyB,CAAC,IAAI,EAAE;IACpD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,GAAG,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,KAAK,CAAC,mBAAmB,GAAG;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,KAAK,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAAE,CAAC,CAc9G"}
+{"version":3,"file":"floricode-sync.server.d.ts","sourceRoot":"","sources":["../../src/lib/floricode-sync.server.ts"],"names":[],"mappings":"AAyBA,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,4EAA4E;IAC5E,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,eAAO,MAAM,mBAAmB,EAAE,oBAAoB,EAkBrD,CAAC;AAoFF,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,IAAI,CAAC;IACT,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAClB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAO,GAC1F,OAAO,CAAC,mBAAmB,CAAC,CAuE9B;AAED,KAAK,SAAS,GAAG,mBAAmB,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,IAAI,CAAA;CAAE,CAAC;AAEtI;;;;GAIG;AACH,wBAAsB,yBAAyB,CAAC,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,OAAO,CAAC;IAC7G,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,SAAS,EAAE,CAAC;IAAC,UAAU,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/E,CAAC,CAuCD;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,CAAC,IAAI,GAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,OAAO,CAAC;IACrF,EAAE,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CAC1E,CAAC,CAkBD"}

package/dist-lib/lib/floricode-sync.server.js

@@ -13,6 +13,7 @@
 // ============================================================================
 import { supabaseAdmin } from "../integrations/supabase/client.server.js";
 import { getFloricodeAccessToken } from "./floricode-credentials.server.js";
+import { FLORICODE_ROUND_BUDGET_MS, floricodeCronSchedule, isIncomplete, laterIso, nightlyDue, stateAfterPage, } from "./floricode-sync-plan.js";
 export const FLORICODE_RESOURCES = [
     // VBN
     { resource: "FeatureType", endpoint: "/v2/VBN/FeatureType", scope: "vbn_featuretype:read", keyColumns: ["id"] },
@@ -38,14 +39,23 @@ function buildRecordId(def, row) {
     return def.keyColumns.map((k) => String(row[k] ?? "")).join("|");
 }
 async function fetchPage(def, token, opts) {
-    const url = new URL(BASE_URL + def.endpoint);
-    url.searchParams.set("$top", String(opts.top));
-    url.searchParams.set("$skip", String(opts.skip));
-    url.searchParams.set("$orderby", ["change_date_time", ...def.keyColumns].join(","));
-    if (opts.sinceIso) {
-        url.searchParams.set("$filter", `change_date_time gt ${opts.sinceIso}`);
+    const build = (withCount) => {
+        const url = new URL(BASE_URL + def.endpoint);
+        url.searchParams.set("$top", String(opts.top));
+        url.searchParams.set("$skip", String(opts.skip));
+        url.searchParams.set("$orderby", ["change_date_time", ...def.keyColumns].join(","));
+        if (opts.sinceIso)
+            url.searchParams.set("$filter", `change_date_time gt ${opts.sinceIso}`);
+        if (withCount)
+            url.searchParams.set("$count", "true");
+        return url.toString();
+    };
+    // Totaal alleen op de eerste pagina vragen; ondersteunt de API $count niet, dan zonder.
+    const wantCount = opts.skip === 0;
+    let res = await fetch(build(wantCount), { headers: { authorization: `Bearer ${token}` } });
+    if (wantCount && res.status === 400) {
+        res = await fetch(build(false), { headers: { authorization: `Bearer ${token}` } });
     }
-    const res = await fetch(url.toString(), { headers: { authorization: `Bearer ${token}` } });
     const json = await res.json().catch(() => ({}));
     if (!res.ok) {
         const upstream = json?.error?.message ?? json?.error ?? res.statusText;
@@ -57,7 +67,8 @@ async function fetchPage(def, token, opts) {
         }
         throw new Error(`Floricode ${def.resource} pagina mislukt (${res.status}): ${upstream}`);
     }
-    return Array.isArray(json?.value) ? json.value : [];
+    const c = Number(json?.["@odata.count"]);
+    return { rows: Array.isArray(json?.value) ? json.value : [], total: Number.isFinite(c) ? c : null };
 }
 async function upsertRows(def, rows) {
     if (rows.length === 0)
@@ -95,117 +106,151 @@ async function upsertRows(def, rows) {
     }
     return done;
 }
+/**
+ * Haalt pagina's op tot de bron compleet is of het tijdsbudget op is.
+ * Positie (cursor_skip) gaat alleen vooruit na een opgeslagen pagina; de
+ * watermerkdatum verschuift pas als de bron compleet is (zie stateAfterPage).
+ */
 export async function syncFloricodeResource(resource, opts = {}) {
     const def = FLORICODE_RESOURCES.find((r) => r.resource === resource);
     if (!def)
         throw new Error(`Onbekende Floricode-resource: ${resource}`);
     const batchSize = opts.batchSize ?? DEFAULT_BATCH;
-    const maxBatches = Math.max(1, opts.maxBatches ?? 3);
+    const maxBatches = opts.maxBatches && opts.maxBatches > 0 ? opts.maxBatches : Infinity;
+    const deadline = opts.deadline ?? Date.now() + FLORICODE_ROUND_BUDGET_MS;
     const resume = opts.resume ?? true;
     const startedAt = Date.now();
     const { data: state } = await supabaseAdmin
         .from("floricode_sync_state")
-        .select("cursor_skip, last_change_date_time")
+        .select("cursor_skip, last_change_date_time, pending_change_date_time, status")
         .eq("resource", def.resource)
         .maybeSingle();
-    let skip = resume ? Number(state?.cursor_skip ?? 0) : 0;
-    const sinceIso = state?.last_change_date_time ?? null;
-    await supabaseAdmin
-        .from("floricode_sync_state")
-        .upsert({
-        resource: def.resource,
-        status: "running",
-        error_message: null,
-        updated_at: new Date().toISOString(),
-    }, { onConflict: "resource" });
-    const token = await getFloricodeAccessToken(def.scope);
+    const s = state;
+    const resuming = resume && (s?.status === "running" || s?.status === "error");
+    let skip = resuming ? Number(s?.cursor_skip ?? 0) : 0;
+    const sinceIso = s?.last_change_date_time ?? null;
+    let pending = resuming ? s?.pending_change_date_time ?? null : null;
+    const save = async (patch) => {
+        const { error } = await supabaseAdmin.from("floricode_sync_state").upsert({ resource: def.resource, updated_at: new Date().toISOString(), ...patch }, { onConflict: "resource" });
+        if (error)
+            throw new Error(`Status ${def.resource} opslaan mislukt: ${error.message}`);
+    };
+    await save({ status: "running", error_message: null, cursor_skip: skip, pending_change_date_time: pending });
     let fetched = 0;
     let upserted = 0;
     let batches = 0;
-    let latestChange = sinceIso;
     let finished = false;
+    let watermark = sinceIso;
     try {
-        for (let i = 0; i < maxBatches; i++) {
-            const page = await fetchPage(def, token, { skip, top: batchSize, sinceIso });
+        const token = await getFloricodeAccessToken(def.scope);
+        while (batches < maxBatches && Date.now() < deadline) {
+            const { rows: page, total } = await fetchPage(def, token, { skip, top: batchSize, sinceIso });
             batches++;
-            if (page.length === 0) {
-                finished = true;
-                break;
-            }
             fetched += page.length;
             upserted += await upsertRows(def, page);
-            for (const row of page) {
-                const cd = row?.change_date_time;
-                if (cd && (!latestChange || cd > latestChange))
-                    latestChange = cd;
-            }
-            skip += page.length;
-            // Cursor + watermark per batch persistent maken zodat een crash of
-            // Worker-timeout hervat vanaf de laatste geslaagde pagina.
-            await supabaseAdmin
-                .from("floricode_sync_state")
-                .upsert({
-                resource: def.resource,
-                status: "running",
+            let pageMax = null;
+            for (const row of page)
+                pageMax = laterIso(pageMax, row?.change_date_time ?? null);
+            const next = stateAfterPage({ startWatermark: sinceIso, pending, pageMax, skipBefore: skip, pageSize: page.length, batchSize });
+            const now = new Date().toISOString();
+            await save({
+                status: next.status,
                 error_message: null,
-                cursor_skip: skip,
-                last_change_date_time: latestChange,
-                last_sync_at: new Date().toISOString(),
-                updated_at: new Date().toISOString(),
-            }, { onConflict: "resource" });
-            if (page.length < batchSize) {
+                cursor_skip: next.cursor_skip,
+                last_change_date_time: next.last_change_date_time,
+                pending_change_date_time: next.pending_change_date_time,
+                last_sync_at: now,
+                ...(total != null && !sinceIso ? { total_count: total } : {}),
+                ...(next.finished ? { completed_at: now } : {}),
+            });
+            skip = next.cursor_skip;
+            pending = next.pending_change_date_time;
+            watermark = next.last_change_date_time;
+            if (next.finished) {
                 finished = true;
                 break;
             }
         }
-        await supabaseAdmin
-            .from("floricode_sync_state")
-            .upsert({
-            resource: def.resource,
-            status: "ok",
-            error_message: null,
-            last_sync_at: new Date().toISOString(),
-            cursor_skip: finished ? 0 : skip,
-            last_change_date_time: finished ? latestChange : sinceIso,
-            updated_at: new Date().toISOString(),
-        }, { onConflict: "resource" });
     }
     catch (e) {
-        await supabaseAdmin
-            .from("floricode_sync_state")
-            .upsert({
-            resource: def.resource,
-            status: "error",
-            error_message: String(e?.message ?? e),
-            cursor_skip: skip,
-            updated_at: new Date().toISOString(),
-        }, { onConflict: "resource" });
+        // Positie blijft op de laatste gelukte pagina; status 'error', volgende ronde hervat.
+        await save({ status: "error", error_message: String(e?.message ?? e) }).catch(() => { });
         throw e;
     }
-    return {
-        ok: true,
-        resource: def.resource,
-        fetched,
-        upserted,
-        batches,
-        finished,
-        nextWatermark: latestChange,
-        durationMs: Date.now() - startedAt,
-    };
+    return { ok: true, resource: def.resource, fetched, upserted, batches, finished, nextWatermark: watermark, durationMs: Date.now() - startedAt };
 }
-export async function syncAllFloricodeResources(opts) {
+/**
+ * Eén cron-tik: eerst onvolledige bronnen afmaken binnen het tijdsbudget;
+ * zijn alle bronnen compleet, dan hooguit eens per 20 uur alleen wijzigingen.
+ * Stelt daarna het cron-schema in (elke 10 min zolang iets bezig is, anders 's nachts).
+ */
+export async function syncAllFloricodeResources(opts = {}) {
+    const deadline = Date.now() + (opts.budgetMs ?? FLORICODE_ROUND_BUDGET_MS);
+    const all = [...FLORICODE_RESOURCES.map((r) => r.resource), "RegulatoryFeatureType", "RegulationType"];
+    const readStates = async () => {
+        const { data } = await supabaseAdmin.from("floricode_sync_state").select("resource,status,completed_at,last_sync_at").in("resource", all);
+        return new Map((data ?? []).map((r) => [r.resource, r]));
+    };
+    const states = await readStates();
+    const incompleteBefore = all.filter((r) => isIncomplete(states.get(r)?.status));
+    const nightly = incompleteBefore.length === 0 &&
+        all.some((r) => nightlyDue(states.get(r)?.completed_at ?? states.get(r)?.last_sync_at ?? null, Date.now()));
+    const todo = incompleteBefore.length > 0 ? incompleteBefore : nightly ? all : [];
     const results = [];
-    for (const def of FLORICODE_RESOURCES) {
+    const sb = supabaseAdmin;
+    for (const resource of todo) {
+        if (Date.now() >= deadline)
+            break;
         try {
-            const r = await syncFloricodeResource(def.resource, {
-                batchSize: opts.batchSize,
-                maxBatches: opts.maxBatchesPerResource ?? 2,
-            });
-            results.push(r);
+            if (resource === "RegulationType") {
+                const { syncFloricodeRegulationTypes } = await import("./floricode-regulatory-features.js");
+                const r = await syncFloricodeRegulationTypes(sb);
+                results.push({ resource, ok: true, fetched: r?.upserted ?? 0, upserted: r?.upserted ?? 0, batches: 1, finished: true, nextWatermark: null, durationMs: 0 });
+            }
+            else if (resource === "RegulatoryFeatureType") {
+                const { syncFloricodeRegulatoryFeatures } = await import("./floricode-regulatory-features.js");
+                const r = await syncFloricodeRegulatoryFeatures(sb, { deadline });
+                results.push({ resource, ok: true, fetched: r.fetched, upserted: r.upserted, batches: r.batches, finished: r.completed, nextWatermark: null, durationMs: r.durationMs });
+            }
+            else {
+                results.push(await syncFloricodeResource(resource, { batchSize: opts.batchSize, deadline }));
+            }
         }
         catch (e) {
-            results.push({ resource: def.resource, ok: false, error: String(e?.message ?? e) });
+            results.push({ resource, ok: false, error: String(e?.message ?? e) });
         }
     }
-    return { ok: true, results };
+    const after = await readStates();
+    const incomplete = all.filter((r) => isIncomplete(after.get(r)?.status));
+    const schedule = floricodeCronSchedule(incomplete.length > 0);
+    const { error } = await supabaseAdmin.rpc("floricode_sync_cron_set_schedule", { p_schedule: schedule });
+    return { ok: true, results, incomplete, schedule: error ? null : schedule };
+}
+/**
+ * Plant de Floricode-ronde in als die nog niet bestaat (uurlijks aangeroepen).
+ * Adres via resolveVerifiedFlorydayCronUrl; ontbreekt het Shell-adres, dan
+ * niet inplannen (fail closed) — de stilstand-melding wordt daar vastgelegd.
+ */
+export async function ensureFloricodeSyncCron(opts = {}) {
+    const { data } = await supabaseAdmin.rpc("floricode_sync_cron_status");
+    const row = Array.isArray(data) ? data[0] : data;
+    if (row?.scheduled && !opts.force)
+        return { ok: true, scheduled: true, schedule: row.schedule ?? null };
+    const apikey = process.env.SUPABASE_PUBLISHABLE_KEY;
+    if (!apikey)
+        return { ok: false, scheduled: false, schedule: null, error: "SUPABASE_PUBLISHABLE_KEY ontbreekt" };
+    try {
+        const { resolveVerifiedFlorydayCronUrl } = await import("./floriday.functions.js");
+        const url = await resolveVerifiedFlorydayCronUrl("/api/public/cron/sync-floricode-all");
+        const { data: st } = await supabaseAdmin.from("floricode_sync_state").select("status");
+        const anyIncomplete = (st ?? []).length === 0 || (st ?? []).some((r) => isIncomplete(r.status));
+        const schedule = floricodeCronSchedule(anyIncomplete);
+        const { error } = await supabaseAdmin.rpc("floricode_sync_cron_schedule", { p_url: url, p_apikey: apikey, p_schedule: schedule });
+        if (error)
+            return { ok: false, scheduled: false, schedule: null, error: error.message };
+        return { ok: true, scheduled: true, schedule };
+    }
+    catch (e) {
+        return { ok: false, scheduled: false, schedule: null, error: String(e?.message ?? e) };
+    }
 }

package/dist-lib/lib/floricode.functions.d.ts

@@ -46,6 +46,8 @@ export interface FloricodeResourceStatus {
     cursorSkip: number | null;
     errorMessage: string | null;
     rowCount: number;
+    completedAt: string | null;
+    totalCount: number | null;
 }
 export declare const getFloricodeSyncStatus: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
     supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
@@ -69,4 +71,16 @@ export declare const resetFloricodeResourceCursor: import("@tanstack/start-clien
     ok: true;
     resource: string;
 }>>;
+/** Stand van de automatische Floricode-ronde (ingepland? Shell-adres?). */
+export declare const getFloricodeCronStatus: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
+    supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
+    userId: string;
+    claims: import("@supabase/auth-js").JwtPayload;
+}, undefined, undefined, undefined>], undefined, Promise<{
+    scheduled: boolean;
+    schedule: string | null;
+    lastRunAt: string | null;
+    lastRunStatus: string | null;
+    shellAddressMissing: boolean;
+}>>;
 //# sourceMappingURL=floricode.functions.d.ts.map