@flowselections/floriday-authenticatie-module 1.0.14 → 1.0.16

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

@@ -1 +1 @@
-{"version":3,"file":"floricode-product-features.d.ts","sourceRoot":"","sources":["../../src/lib/floricode-product-features.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAShE,QAAA,MAAM,yBAAyB,+BAA+B,CAAC;AAY/D,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,QAAQ,EAAE,OAAO,CAAC;IAClB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,aAAa,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC,CAAC;IAC7D,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AA0OD,wBAAsB,mCAAmC,CACvD,QAAQ,EAAE,cAAc,EACxB,WAAW,EAAE,mBAAmB,EAChC,gBAAgB,EAAE,MAAM,GAAG,MAAM,EACjC,OAAO,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAO,GACvC,OAAO,CAAC;IACT,EAAE,EAAE,IAAI,CAAC;IACT,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE,OAAO,GAAG,gBAAgB,CAAC;IACnC,YAAY,EAAE,OAAO,yBAAyB,CAAC;IAC/C,eAAe,EAAE,qBAAqB,EAAE,CAAC;CAC1C,CAAC,CAuDD;AAED,wBAAsB,4BAA4B,CAChD,QAAQ,EAAE,cAAc,EACxB,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAO;;;;;;;;GAiF1D"}
+{"version":3,"file":"floricode-product-features.d.ts","sourceRoot":"","sources":["../../src/lib/floricode-product-features.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAShE,QAAA,MAAM,yBAAyB,+BAA+B,CAAC;AAc/D,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,QAAQ,EAAE,OAAO,CAAC;IAClB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,aAAa,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC,CAAC;IAC7D,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAuRD,wBAAsB,mCAAmC,CACvD,QAAQ,EAAE,cAAc,EACxB,WAAW,EAAE,mBAAmB,EAChC,gBAAgB,EAAE,MAAM,GAAG,MAAM,EACjC,OAAO,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAO,GACvC,OAAO,CAAC;IACT,EAAE,EAAE,IAAI,CAAC;IACT,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE,OAAO,GAAG,gBAAgB,CAAC;IACnC,YAAY,EAAE,OAAO,yBAAyB,CAAC;IAC/C,eAAe,EAAE,qBAAqB,EAAE,CAAC;CAC1C,CAAC,CAiFD;AAED,wBAAsB,4BAA4B,CAChD,QAAQ,EAAE,cAAc,EACxB,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAO;;;;;;;;GAiF1D"}

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

@@ -4,6 +4,8 @@ const FLORICODE_PRODUCT_FEATURE_URL = "https://api.floricode.com/v2/VBN/ProductF
 const PRODUCT_FEATURE_SCOPE = "vbn_productfeature:read";
 const PRODUCT_FEATURE_LIST_NAME = "vbn-product-characteristic";
 const PRODUCT_FEATURE_RESOURCE = "ProductFeature";
+const REG_FEATURE_TYPE_RESOURCE = "RegulatoryFeatureType";
+const SENTINEL_NONE_MARKER = "__none__";
 function normalizeProductCode(input) {
     const value = String(input).trim();
     if (!/^\d+$/.test(value)) {
@@ -191,11 +193,41 @@ async function readCachedProductCharacteristics(supabase, environment, productCo
     });
     return rows;
 }
+function cacheIsComplete(cached) {
+    // Volledige cache-hit = er staat minimaal één regulatory-feature (S-code) in.
+    // Puur B*/T*-rijen zonder regulation_type_id betekent dat de RegulatoryFeatureType-
+    // sync dit product nog niet heeft geraakt (bulk-sync nog niet klaar of nieuwe koppeling).
+    return cached.some((row) => row.regulationTypeId != null ||
+        String(row.payload?.source ?? "") === "Floricode RegulatoryFeatureType");
+}
+async function hasSentinelForProduct(supabase, productCode) {
+    const { data } = await supabase
+        .from("floricode_records")
+        .select("record_id")
+        .eq("resource", REG_FEATURE_TYPE_RESOURCE)
+        .eq("record_id", `${productCode}:${SENTINEL_NONE_MARKER}`)
+        .maybeSingle();
+    return !!data;
+}
+async function writeSentinelForProduct(supabase, productCode) {
+    const nowIso = new Date().toISOString();
+    await supabase.from("floricode_records").upsert({
+        resource: REG_FEATURE_TYPE_RESOURCE,
+        record_id: `${productCode}:${SENTINEL_NONE_MARKER}`,
+        data: {
+            product_id: productCode,
+            __sentinel: "no-regulatory-features",
+            checked_at: nowIso,
+        },
+        change_date_time: null,
+        last_synced_at: nowIso,
+    }, { onConflict: "resource,record_id" });
+}
 export async function getProductCharacteristicsForVbnCode(supabase, environment, productCodeInput, options = {}) {
     const productCode = normalizeProductCode(productCodeInput);
     if (!options.forceRefresh) {
         const cached = await readCachedProductCharacteristics(supabase, environment, productCode);
-        if (cached.length > 0) {
+        if (cached.length > 0 && cacheIsComplete(cached)) {
             return {
                 ok: true,
                 productCode,
@@ -206,10 +238,25 @@ export async function getProductCharacteristicsForVbnCode(supabase, environment,
                 characteristics: cached,
             };
         }
+        // Sentinel: eerder bevestigd dat dit product geen regulatory features heeft.
+        // Terugvallen op wat er in de cache staat (B*/T* of leeg) zonder Floricode-call.
+        if (await hasSentinelForProduct(supabase, productCode)) {
+            const meta = await loadProductMeta(supabase, environment, productCode);
+            return {
+                ok: true,
+                productCode,
+                productGroupId: cached[0]?.productGroupId ?? meta.productGroupId,
+                productName: cached[0]?.productName ?? meta.productName,
+                source: "cache",
+                codeListName: PRODUCT_FEATURE_LIST_NAME,
+                characteristics: cached,
+            };
+        }
     }
-    // Live-fetch: RegulatoryFeatureType (verplichte/optionele kenmerken) +
-    // ProductFeature (default-waardes) parallel, upsert in floricode_records
-    // en daarna RPC draaien zodat de derived code-list weer up-to-date is.
+    // Live-fetch: RegulatoryFeatureType (verplichte kenmerken, S-codes) + ProductFeature
+    // (default-waarden) parallel, upsert in floricode_records en projectie draaien.
+    // ProductFeature is meestal al gedekt door de bulk-sync, maar we halen 'm veiligheidshalve
+    // ook op zodat een nieuw product direct default-waarden krijgt.
     const [regItems, pfItems] = await Promise.all([
         fetchFloricodeRegulatoryFeaturesForProduct(productCode).catch((e) => {
             console.warn("[product-characteristics] RegulatoryFeatureType fetch failed:", String(e?.message ?? e));
@@ -225,11 +272,18 @@ export async function getProductCharacteristicsForVbnCode(supabase, environment,
     if (pfItems.length > 0)
         await upsertFloricodeProductFeatureRecords(supabase, pfItems);
     if (regItems.length > 0 || pfItems.length > 0) {
-        const { error: projError } = await supabase.rpc("refresh_floricode_derived_code_lists");
+        // Lichtgewicht per-product projectie i.p.v. de volledige RPC — die is te zwaar
+        // om synchroon vanuit een wizard-request te draaien.
+        const { error: projError } = await supabase.rpc("refresh_floricode_derived_for_product", { p_product_code: productCode });
         if (projError) {
             console.warn("[product-characteristics] projection failed:", projError.message);
         }
     }
+    // Geen S-codes uit Floricode → sentinel schrijven zodat we dit product niet elke
+    // wizard-open opnieuw hoeven te bevragen.
+    if (regItems.length === 0) {
+        await writeSentinelForProduct(supabase, productCode).catch((e) => console.warn("[product-characteristics] sentinel write failed:", String(e?.message ?? e)));
+    }
     const fresh = await readCachedProductCharacteristics(supabase, environment, productCode);
     const meta = await loadProductMeta(supabase, environment, productCode);
     return {

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

@@ -28,14 +28,29 @@ export declare function syncFloricodeRegulationTypes(supabase: SupabaseClient):
 export declare function syncFloricodeRegulatoryFeatures(supabase: SupabaseClient, options?: {
     batchSize?: number;
     maxBatches?: number;
+    resume?: boolean;
 }): Promise<{
     ok: true;
     resource: string;
+    completed: boolean;
+    startSkip: number;
+    endSkip: number;
     fetched: number;
     upserted: number;
     batches: number;
     projected: any;
     durationMs: number;
+} | {
+    ok: true;
+    resource: string;
+    completed: boolean;
+    startSkip: number;
+    endSkip: number;
+    fetched: number;
+    upserted: number;
+    batches: number;
+    durationMs: number;
+    projected?: undefined;
 }>;
 export {};
 //# sourceMappingURL=floricode-regulatory-features.d.ts.map

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;AAoCD,wBAAsB,0CAA0C,CAC9D,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,EAAE,CAAC,CAgB3B;AAkCD,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,CAAA;CAAO;;;;;;;;GAyE1D"}
+{"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;AAoCD,wBAAsB,0CAA0C,CAC9D,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,EAAE,CAAC,CAgB3B;AAkCD,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;;;;;;;;;;;;;;;;;;;;;;GAwI5E"}

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

@@ -157,22 +157,40 @@ export async function syncFloricodeRegulatoryFeatures(supabase, options = {}) {
     const startedAt = Date.now();
     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;
+    // Read cursor from state so we can resume where the previous invocation stopped.
+    let skip = 0;
+    let maxChangeDateTime = null;
+    if (resume) {
+        const { data: state } = await supabase
+            .from("floricode_sync_state")
+            .select("cursor_skip,last_change_date_time,status")
+            .eq("resource", REG_FEATURE_TYPE_RESOURCE)
+            .maybeSingle();
+        if (state && state.status === "running") {
+            skip = Number(state.cursor_skip ?? 0) || 0;
+            maxChangeDateTime = state.last_change_date_time ?? null;
+        }
+    }
+    const startSkip = skip;
     let fetched = 0;
     let upserted = 0;
-    let skip = 0;
     let batches = 0;
-    let maxChangeDateTime = null;
+    let completed = false;
     await setSyncState(supabase, REG_FEATURE_TYPE_RESOURCE, {
         status: "running",
         error_message: null,
+        cursor_skip: skip,
         last_sync_at: new Date().toISOString(),
     });
     try {
         const token = await getFloricodeToken(REG_FEATURE_TYPE_SCOPE);
         while (batches < maxBatches) {
             const items = await fetchRegFeatureTypePage(token, skip, batchSize);
-            if (items.length === 0)
+            if (items.length === 0) {
+                completed = true;
                 break;
+            }
             fetched += items.length;
             upserted += await upsertRegulatoryFeatureRecords(supabase, items);
             for (const item of items) {
@@ -182,33 +200,71 @@ export async function syncFloricodeRegulatoryFeatures(supabase, options = {}) {
             }
             batches += 1;
             skip += items.length;
-            if (items.length < batchSize)
+            // Persist cursor after each batch so a crash mid-run resumes correctly.
+            await setSyncState(supabase, REG_FEATURE_TYPE_RESOURCE, {
+                status: "running",
+                error_message: null,
+                cursor_skip: skip,
+                last_change_date_time: maxChangeDateTime,
+                last_sync_at: new Date().toISOString(),
+            });
+            if (items.length < batchSize) {
+                completed = true;
                 break;
+            }
         }
-        // RegulationType is een kleine lijst — altijd meeladen voor labels.
-        try {
-            await syncFloricodeRegulationTypes(supabase);
+        // Ook bij partial runs projectie draaien zodat vbn-product-characteristic
+        // meegroeit met de raw cache. Fouten hier mogen de cursor niet blokkeren.
+        if (!completed && upserted > 0) {
+            try {
+                await supabase.rpc("refresh_floricode_derived_code_lists");
+            }
+            catch (e) {
+                console.warn("[regulatory] partial projection skipped:", String(e?.message ?? e));
+            }
         }
-        catch (e) {
-            console.warn("[regulatory] RegulationType sync skipped:", String(e?.message ?? e));
+        if (completed) {
+            // RegulationType is een kleine lijst — altijd meeladen voor labels.
+            try {
+                await syncFloricodeRegulationTypes(supabase);
+            }
+            catch (e) {
+                console.warn("[regulatory] RegulationType sync skipped:", String(e?.message ?? e));
+            }
+            const { data: projection, error: projectionError } = await supabase.rpc("refresh_floricode_derived_code_lists");
+            if (projectionError)
+                throw new Error(`Projectie naar code-lists mislukt: ${projectionError.message}`);
+            await setSyncState(supabase, REG_FEATURE_TYPE_RESOURCE, {
+                status: "success",
+                error_message: null,
+                cursor_skip: 0,
+                last_sequence_number: skip,
+                last_change_date_time: maxChangeDateTime,
+                last_sync_at: new Date().toISOString(),
+            });
+            return {
+                ok: true,
+                resource: REG_FEATURE_TYPE_RESOURCE,
+                completed: true,
+                startSkip,
+                endSkip: skip,
+                fetched,
+                upserted,
+                batches,
+                projected: projection ?? [],
+                durationMs: Date.now() - startedAt,
+            };
         }
-        const { data: projection, error: projectionError } = await supabase.rpc("refresh_floricode_derived_code_lists");
-        if (projectionError)
-            throw new Error(`Projectie naar code-lists mislukt: ${projectionError.message}`);
-        await setSyncState(supabase, REG_FEATURE_TYPE_RESOURCE, {
-            status: "success",
-            error_message: null,
-            last_sequence_number: fetched,
-            last_change_date_time: maxChangeDateTime,
-            last_sync_at: new Date().toISOString(),
-        });
+        // Partial run — leave status='running' so the next cron tick resumes.
         return {
             ok: true,
             resource: REG_FEATURE_TYPE_RESOURCE,
+            completed: false,
+            startSkip,
+            endSkip: skip,
             fetched,
             upserted,
             batches,
-            projected: projection ?? [],
             durationMs: Date.now() - startedAt,
         };
     }
@@ -217,7 +273,7 @@ export async function syncFloricodeRegulatoryFeatures(supabase, options = {}) {
         await setSyncState(supabase, REG_FEATURE_TYPE_RESOURCE, {
             status: "error",
             error_message: msg,
-            last_sequence_number: fetched,
+            cursor_skip: skip,
             last_change_date_time: maxChangeDateTime,
             last_sync_at: new Date().toISOString(),
         });