@flowselections/logistiek-engine 1.0.233 → 1.0.234

package/dist-lib/lib/handlers/logistics-plan-now.server.d.ts

@@ -9,6 +9,14 @@ export declare function leesOrderIds(raw: string): {
     ok: false;
     fout: string;
 };
+/**
+ * Ronde A (overgang): twee aanroepvormen worden geaccepteerd tot alle shells over zijn.
+ *  1. oud:   header x-logistics-key = module_runtime_config 'logistics_tick_apikey'
+ *  2. nieuw: flowselections_cron_post — header apikey = openbare sleutel van deze
+ *            omgeving én x-flowselections-cron-key = flowselections_cron_secret().
+ * Leesfouten worden gelogd; ontbreekt alle configuratie, dan "geen_configuratie".
+ */
+export declare function controleerAanroeper(request: Request, supabase: SupabaseClient): Promise<"ok" | "geweigerd" | "geen_configuratie">;
 type WaitUntil = (p: Promise<unknown>) => void;
 export declare function handleLogisticsPlanNow(request: Request, supabase: SupabaseClient, opts?: {
     moduleProject?: boolean;

package/dist-lib/lib/handlers/logistics-plan-now.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logistics-plan-now.server.d.ts","sourceRoot":"","sources":["../../../src/lib/handlers/logistics-plan-now.server.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAW5D,sEAAsE;AACtE,wBAAgB,cAAc,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAQ5D;AAED,uFAAuF;AACvF,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAgBnG;AAED,KAAK,SAAS,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC;AAc/C,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,cAAc,EACxB,IAAI,CAAC,EAAE;IAAE,aAAa,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,SAAS,CAAA;CAAE,GACxD,OAAO,CAAC,QAAQ,CAAC,CA6CnB"}
+{"version":3,"file":"logistics-plan-now.server.d.ts","sourceRoot":"","sources":["../../../src/lib/handlers/logistics-plan-now.server.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAW5D,sEAAsE;AACtE,wBAAgB,cAAc,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAQ5D;AAED,uFAAuF;AACvF,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAgBnG;AAED;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,cAAc,GACvB,OAAO,CAAC,IAAI,GAAG,WAAW,GAAG,mBAAmB,CAAC,CA8BnD;AAED,KAAK,SAAS,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC;AAc/C,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,cAAc,EACxB,IAAI,CAAC,EAAE;IAAE,aAAa,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,SAAS,CAAA;CAAE,GACxD,OAAO,CAAC,QAAQ,CAAC,CAqCnB"}

package/dist-lib/lib/handlers/logistics-plan-now.server.js

@@ -13,7 +13,7 @@
 import { engineIdent, runLockedTickRound } from "./logistics-tick.server.js";
 const CORS_HEADERS = {
     "Access-Control-Allow-Origin": "*",
-    "Access-Control-Allow-Headers": "x-logistics-key, content-type",
+    "Access-Control-Allow-Headers": "x-logistics-key, x-flowselections-cron-key, apikey, content-type",
     "Access-Control-Allow-Methods": "POST, OPTIONS",
 };
 const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
@@ -51,6 +51,45 @@ export function leesOrderIds(raw) {
     }
     return { ok: true, ids: ids };
 }
+/**
+ * Ronde A (overgang): twee aanroepvormen worden geaccepteerd tot alle shells over zijn.
+ *  1. oud:   header x-logistics-key = module_runtime_config 'logistics_tick_apikey'
+ *  2. nieuw: flowselections_cron_post — header apikey = openbare sleutel van deze
+ *            omgeving én x-flowselections-cron-key = flowselections_cron_secret().
+ * Leesfouten worden gelogd; ontbreekt alle configuratie, dan "geen_configuratie".
+ */
+export async function controleerAanroeper(request, supabase) {
+    let configAanwezig = false;
+    const oud = request.headers.get("x-logistics-key") ?? "";
+    const { data: cfg, error: cfgError } = await supabase
+        .from("module_runtime_config")
+        .select("value")
+        .eq("key", "logistics_tick_apikey")
+        .maybeSingle();
+    if (cfgError)
+        console.error("[logistics-plan-now] oude sleutel niet leesbaar:", cfgError.message);
+    const verwachtOud = String(cfg?.value ?? "").trim();
+    if (verwachtOud) {
+        configAanwezig = true;
+        if (oud && gelijkeSleutel(oud, verwachtOud))
+            return "ok";
+    }
+    const platform = request.headers.get("x-flowselections-cron-key") ?? "";
+    const apikey = request.headers.get("apikey") ?? "";
+    const openbaar = (process.env["SUPABASE_PUBLISHABLE_KEY"] ?? process.env["SUPABASE_ANON_KEY"] ?? "")
+        .replace(/^["']|["']$/g, "");
+    const { data: geheim, error: geheimError } = await supabase.rpc("flowselections_cron_secret");
+    if (geheimError)
+        console.error("[logistics-plan-now] platformsleutel niet leesbaar:", geheimError.message);
+    const verwachtPlatform = typeof geheim === "string" ? geheim : "";
+    if (verwachtPlatform && openbaar) {
+        configAanwezig = true;
+        if (platform && apikey && gelijkeSleutel(platform, verwachtPlatform) && gelijkeSleutel(apikey, openbaar)) {
+            return "ok";
+        }
+    }
+    return configAanwezig ? "geweigerd" : "geen_configuratie";
+}
 async function vindWaitUntil(opts) {
     if (opts?.waitUntil)
         return opts.waitUntil;
@@ -75,22 +114,14 @@ export async function handleLogisticsPlanNow(request, supabase, opts) {
         return new Response(null, { status: 204, headers: CORS_HEADERS });
     if (request.method !== "POST")
         return json(405, { ok: false, error: "Alleen POST" });
-    const { data: cfg, error: cfgError } = await supabase
-        .from("module_runtime_config")
-        .select("value")
-        .eq("key", "logistics_tick_apikey")
-        .maybeSingle();
-    const expected = String(cfg?.value ?? "").trim();
-    if (cfgError || !expected) {
-        return json(500, {
+    const toegang = await controleerAanroeper(request, supabase);
+    if (toegang === "geen_configuratie") {
+        return json(200, {
             ok: false,
-            error: cfgError
-                ? `Sleutel kon niet worden gelezen: ${cfgError.message}`
-                : "logistics_tick_apikey ontbreekt in module_runtime_config; vul deze voor deze omgeving in.",
+            melding: "Geen sleutel ingesteld (logistics_tick_apikey en platformsleutel ontbreken); niets gestart.",
         });
     }
-    const given = request.headers.get("x-logistics-key") ?? "";
-    if (!gelijkeSleutel(given, expected))
+    if (toegang !== "ok")
         return json(401, { ok: false, error: "Unauthorized" });
     const body = leesOrderIds(await request.text());
     if (!body.ok)

package/dist-lib/lib/moduleVersion.d.ts

@@ -1,2 +1,2 @@
-export declare const MODULE_VERSION = "1.0.233";
+export declare const MODULE_VERSION = "1.0.234";
 //# sourceMappingURL=moduleVersion.d.ts.map

package/dist-lib/lib/moduleVersion.js

@@ -1,2 +1,2 @@
 // Automatisch gegenereerd door prebuild:lib; niet handmatig aanpassen.
-export const MODULE_VERSION = "1.0.233";
+export const MODULE_VERSION = "1.0.234";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowselections/logistiek-engine",
-  "version": "1.0.233",
+  "version": "1.0.234",
   "flowselections": {
     "moduleId": "logistiek-engine",
     "pages": [
@@ -102,6 +102,96 @@
     "schema": {
       "file": "db/schema/logistiek-engine.sql",
       "order": 60
+    },
+    "crons": [
+      {
+        "name": "cron-history-prune-weekly",
+        "schedule": "10 4 * * 0",
+        "kind": "sql",
+        "sql": "SELECT public.logistics_prune_cron_history(7)"
+      },
+      {
+        "name": "logistics_cart_barcode_opschonen",
+        "schedule": "*/10 1-4 * * *",
+        "kind": "sql",
+        "sql": "SELECT public.logistics_cart_barcode_opschonen(10000)"
+      },
+      {
+        "name": "logistics-base-url-check",
+        "schedule": "7 * * * *",
+        "kind": "sql",
+        "sql": "SELECT public.logistics_tick_base_url_check()"
+      },
+      {
+        "name": "logistics-history-prune",
+        "schedule": "20 3 * * *",
+        "kind": "sql",
+        "sql": "SELECT public.logistics_cleanup_history(50000)"
+      },
+      {
+        "name": "logistics-order-finalize-prune",
+        "schedule": "23 3 * * *",
+        "kind": "sql",
+        "sql": "SELECT public.logistics_order_finalize_prune(7)"
+      },
+      {
+        "name": "logistics-order-finalize-reconcile",
+        "schedule": "*/15 * * * *",
+        "kind": "sql",
+        "sql": "SELECT public.logistics_order_finalize_reconcile(14, 200)"
+      },
+      {
+        "name": "logistics-packing-reconcile",
+        "schedule": "17 * * * *",
+        "kind": "sql",
+        "sql": "SELECT public.logistics_packing_reconcile(500, 100)"
+      },
+      {
+        "name": "logistics-plan-coverage-check",
+        "schedule": "*/15 * * * *",
+        "kind": "sql",
+        "sql": "SELECT public.logistics_plan_coverage_check(50)"
+      },
+      {
+        "name": "logistics-reapply-buffer-decisions",
+        "schedule": "*/5 * * * *",
+        "kind": "sql",
+        "sql": "SELECT public.logistics_reapply_buffer_decisions()"
+      },
+      {
+        "name": "logistics-recalc-tick",
+        "schedule": "* * * * *",
+        "kind": "sql",
+        "sql": "SELECT public.logistics_recalc_tick_kick()"
+      },
+      {
+        "name": "logistics-reserved-stock-nightly",
+        "schedule": "10 2 * * *",
+        "kind": "sql",
+        "sql": "SELECT public.logistics_reserved_stock_nightly()"
+      },
+      {
+        "name": "logistics-tasks-prune",
+        "schedule": "41 3 * * *",
+        "kind": "sql",
+        "sql": "SELECT public.logistics_tasks_prune(30)"
+      },
+      {
+        "name": "logistics-tick",
+        "schedule": "* * * * *",
+        "kind": "sql",
+        "sql": "SELECT public.logistics_tick()"
+      },
+      {
+        "name": "logistics-tick-runs-prune",
+        "schedule": "33 3 * * *",
+        "kind": "sql",
+        "sql": "SELECT public.logistics_tick_runs_prune()"
+      }
+    ],
+    "install": {
+      "ensureDefaults": "logistics_ensure_defaults",
+      "installCheck": "logistics_install_check"
     }
   },
   "private": false,