@flowselections/google-maps-api-installatie-techniek 1.0.5 → 1.1.1

package/dist-lib/integrations/supabase/types.js

@@ -40,6 +40,7 @@ export const Constants = {
                 "afleverbrief",
                 "veilingbrief",
                 "traysticker",
+                "eigen_sticker",
             ],
             doc_orientation: ["portrait", "landscape"],
             exact_env: ["staging", "live"],

package/dist-lib/lib/maps-admin.server.d.ts

@@ -1,10 +1,17 @@
-import type { MapsOverview } from "./maps.functions";
+import type { MapsErrorPage, MapsOverview } from "./maps.functions";
 export declare function getMapsOverviewData(): Promise<MapsOverview>;
 export declare function saveMapsSettings(input: {
     cacheTtlDays: number;
     dailyCallLimit: number;
     allowEstimateFallback: boolean;
     provider: "free" | "google";
+    claimViaRpcEnabled?: boolean;
+    perCallLimitEnabled?: boolean;
+    maxAttemptsEnabled?: boolean;
+    stopBijSleutelfoutEnabled?: boolean;
+    maxAttempts?: number;
+    timezone?: string;
+    expectedUpdatedAt?: string | null;
 }): Promise<{
     ok: boolean;
 }>;
@@ -14,4 +21,5 @@ export declare function clearCache(): Promise<{
 export declare function purgeExpired(): Promise<{
     ok: boolean;
 }>;
+export declare function listMapsErrors(page: number, pageSize: number): Promise<MapsErrorPage>;
 //# sourceMappingURL=maps-admin.server.d.ts.map

package/dist-lib/lib/maps-admin.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"maps-admin.server.d.ts","sourceRoot":"","sources":["../../src/lib/maps-admin.server.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAiCrD,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,YAAY,CAAC,CAuEjE;AAED,wBAAsB,gBAAgB,CAAC,KAAK,EAAE;IAC5C,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,QAAQ,EAAE,MAAM,GAAG,QAAQ,CAAC;CAC7B;;GAeA;AAED,wBAAsB,UAAU;;GAK/B;AAED,wBAAsB,YAAY;;GAQjC"}
+{"version":3,"file":"maps-admin.server.d.ts","sourceRoot":"","sources":["../../src/lib/maps-admin.server.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAkCpE,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,YAAY,CAAC,CA8EjE;AAED,wBAAsB,gBAAgB,CAAC,KAAK,EAAE;IAC5C,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,QAAQ,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACnC;;GA8BA;AAED,wBAAsB,UAAU;;GAK/B;AAED,wBAAsB,YAAY;;GAQjC;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CA0B3F"}

package/dist-lib/lib/maps-admin.server.js

@@ -1,6 +1,7 @@
 // Server-only beheerlogica voor de kaarten-module.
 import { createClient } from "@supabase/supabase-js";
 import { getGoogleConnectionStatus } from "./central-auth.server";
+import { classifyGoogleError, resolveProcessorSettings } from "./maps-errors";
 // Ruwe schatting: Routes/Places kosten ~ USD 5 per 1000 elementen.
 // Alleen relevant zodra de betaalde Google-provider actief is.
 const COST_PER_ELEMENT = 0.005;
@@ -66,6 +67,13 @@ export async function getMapsOverviewData() {
                 dailyCallLimit: settings.daily_call_limit,
                 allowEstimateFallback: settings.allow_estimate_fallback,
                 provider: settings.provider === "google" ? "google" : "free",
+                claimViaRpcEnabled: settings.claim_via_rpc_enabled === true,
+                perCallLimitEnabled: settings.per_call_limit_enabled === true,
+                maxAttemptsEnabled: settings.max_attempts_enabled === true,
+                stopBijSleutelfoutEnabled: settings.stop_bij_sleutelfout_enabled === true,
+                maxAttempts: resolveProcessorSettings({ ...settings, max_attempts_enabled: true }).maxAttempts,
+                timezone: resolveProcessorSettings(settings).timezone,
+                updatedAt: settings.updated_at,
                 lastSuccessAt: settings.last_success_at,
                 lastErrorAt: settings.last_error_at,
                 lastError: settings.last_error,
@@ -89,18 +97,37 @@ export async function getMapsOverviewData() {
 export async function saveMapsSettings(input) {
     const db = adminClient();
     const settings = await ensureSettings(db);
-    const { error } = await db
-        .from("maps_settings")
-        .update({
+    const patch = {
         cache_ttl_days: input.cacheTtlDays,
         daily_call_limit: input.dailyCallLimit,
         allow_estimate_fallback: input.allowEstimateFallback,
         provider: input.provider,
         updated_at: new Date().toISOString(),
-    })
-        .eq("id", settings.id);
-    if (error)
+    };
+    if (input.claimViaRpcEnabled !== undefined)
+        patch.claim_via_rpc_enabled = input.claimViaRpcEnabled;
+    if (input.perCallLimitEnabled !== undefined)
+        patch.per_call_limit_enabled = input.perCallLimitEnabled;
+    if (input.maxAttemptsEnabled !== undefined)
+        patch.max_attempts_enabled = input.maxAttemptsEnabled;
+    if (input.stopBijSleutelfoutEnabled !== undefined)
+        patch.stop_bij_sleutelfout_enabled = input.stopBijSleutelfoutEnabled;
+    if (input.maxAttempts !== undefined)
+        patch.max_attempts = input.maxAttempts;
+    if (input.timezone !== undefined)
+        patch.timezone = input.timezone;
+    let query = db.from("maps_settings").update(patch).eq("id", settings.id);
+    // Optimistische vergrendeling op updated_at.
+    if (input.expectedUpdatedAt)
+        query = query.eq("updated_at", input.expectedUpdatedAt);
+    const { data, error } = await query.select("id");
+    if (error) {
+        console.error("[maps] instellingen opslaan", error);
         throw new Error(error.message);
+    }
+    if (input.expectedUpdatedAt && (!Array.isArray(data) || data.length === 0)) {
+        throw new Error("Dit is intussen door iemand anders gewijzigd. Ververs de pagina.");
+    }
     return { ok: true };
 }
 export async function clearCache() {
@@ -119,3 +146,30 @@ export async function purgeExpired() {
         throw new Error(error.message);
     return { ok: true };
 }
+export async function listMapsErrors(page, pageSize) {
+    const db = adminClient();
+    const from = page * pageSize;
+    const { data, count: total, error } = await db
+        .from("maps_usage_log")
+        .select("id, call_type, outcome, detail, created_at", { count: "exact" })
+        .in("outcome", ["error", "no_result"])
+        .order("created_at", { ascending: false })
+        .range(from, from + pageSize - 1);
+    if (error) {
+        console.error("[maps] fouten lezen", error);
+        throw new Error(error.message);
+    }
+    const rows = Array.isArray(data) ? data : [];
+    return {
+        total: total ?? 0,
+        page,
+        pageSize,
+        items: rows.map((row) => ({
+            id: String(row.id),
+            at: row.created_at,
+            callType: row.call_type,
+            kind: row.outcome === "no_result" ? "not_found" : classifyGoogleError(row.detail),
+            message: row.detail ?? (row.outcome === "no_result" ? "Adres niet gevonden" : "Onbekende fout"),
+        })),
+    };
+}

package/dist-lib/lib/maps-errors.d.ts

@@ -0,0 +1,24 @@
+export type GoogleErrorKind = "quota" | "invalid_key" | "not_found" | "token" | "other";
+/** Deelt een foutmelding in. Volgorde is bewust: token vóór sleutel. */
+export declare function classifyGoogleError(message: string | null | undefined): GoogleErrorKind;
+/** Fouten waarbij doorgaan zinloos is (alleen relevant als de schakelaar aan staat). */
+export declare function isFatalKeyError(kind: GoogleErrorKind): boolean;
+export declare const DEFAULT_MAX_ATTEMPTS = 3;
+export declare const DEFAULT_DAILY_LIMIT = 2000;
+export declare const DEFAULT_TIMEZONE = "Europe/Amsterdam";
+export interface ProcessorSettings {
+    dailyCallLimit: number;
+    maxAttempts: number;
+    claimViaRpc: boolean;
+    perCallLimit: boolean;
+    stopOnKeyError: boolean;
+    timezone: string;
+}
+/** Ontbrekende waarden vallen terug op het huidige gedrag (alle schakelaars uit). */
+export declare function resolveProcessorSettings(row: Record<string, unknown> | null | undefined): ProcessorSettings;
+/** Kalenderdatum (yyyy-mm-dd) in de opgegeven tijdzone. */
+export declare function calendarDay(date: Date, timeZone: string): string;
+export declare class DailyLimitReachedError extends Error {
+    constructor();
+}
+//# sourceMappingURL=maps-errors.d.ts.map

package/dist-lib/lib/maps-errors.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"maps-errors.d.ts","sourceRoot":"","sources":["../../src/lib/maps-errors.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,aAAa,GAAG,WAAW,GAAG,OAAO,GAAG,OAAO,CAAC;AAExF,wEAAwE;AACxE,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,eAAe,CAUvF;AAED,wFAAwF;AACxF,wBAAgB,eAAe,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAE9D;AAED,eAAO,MAAM,oBAAoB,IAAI,CAAC;AACtC,eAAO,MAAM,mBAAmB,OAAO,CAAC;AACxC,eAAO,MAAM,gBAAgB,qBAAqB,CAAC;AAEnD,MAAM,WAAW,iBAAiB;IAChC,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,qFAAqF;AACrF,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS,GAAG,iBAAiB,CAa3G;AAED,2DAA2D;AAC3D,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAUhE;AAED,qBAAa,sBAAuB,SAAQ,KAAK;;CAKhD"}

package/dist-lib/lib/maps-errors.js

@@ -0,0 +1,57 @@
+// Pure helpers voor foutindeling en instellingen van de wachtrijverwerking.
+/** Deelt een foutmelding in. Volgorde is bewust: token vóór sleutel. */
+export function classifyGoogleError(message) {
+    const m = (message ?? "").toLowerCase();
+    if (!m)
+        return "other";
+    if (/central auth|token|credential|niet geconfigureerd/.test(m))
+        return "token";
+    if (/api[_ -]?key|api key not valid|permission_denied|request_denied|ongeldige sleutel|\b403\b|\b401\b/.test(m))
+        return "invalid_key";
+    if (/quota|resource_exhausted|rate limit|over_query_limit|\b429\b|daglimiet/.test(m))
+        return "quota";
+    if (/zero_results|not[_ ]found|geen resultaat|niet gevonden|geen route|niet worden omgezet/.test(m))
+        return "not_found";
+    return "other";
+}
+/** Fouten waarbij doorgaan zinloos is (alleen relevant als de schakelaar aan staat). */
+export function isFatalKeyError(kind) {
+    return kind === "invalid_key" || kind === "token";
+}
+export const DEFAULT_MAX_ATTEMPTS = 3;
+export const DEFAULT_DAILY_LIMIT = 2000;
+export const DEFAULT_TIMEZONE = "Europe/Amsterdam";
+/** Ontbrekende waarden vallen terug op het huidige gedrag (alle schakelaars uit). */
+export function resolveProcessorSettings(row) {
+    const r = row ?? {};
+    const limit = Number(r.daily_call_limit);
+    const max = Number(r.max_attempts);
+    const maxEnabled = r.max_attempts_enabled === true;
+    return {
+        dailyCallLimit: Number.isFinite(limit) && r.daily_call_limit != null ? limit : DEFAULT_DAILY_LIMIT,
+        maxAttempts: maxEnabled && Number.isFinite(max) && max >= 1 ? Math.round(max) : DEFAULT_MAX_ATTEMPTS,
+        claimViaRpc: r.claim_via_rpc_enabled === true,
+        perCallLimit: r.per_call_limit_enabled === true,
+        stopOnKeyError: r.stop_bij_sleutelfout_enabled === true,
+        timezone: typeof r.timezone === "string" && r.timezone ? r.timezone : DEFAULT_TIMEZONE,
+    };
+}
+/** Kalenderdatum (yyyy-mm-dd) in de opgegeven tijdzone. */
+export function calendarDay(date, timeZone) {
+    try {
+        return new Intl.DateTimeFormat("en-CA", {
+            timeZone, year: "numeric", month: "2-digit", day: "2-digit",
+        }).format(date);
+    }
+    catch {
+        return new Intl.DateTimeFormat("en-CA", {
+            timeZone: DEFAULT_TIMEZONE, year: "numeric", month: "2-digit", day: "2-digit",
+        }).format(date);
+    }
+}
+export class DailyLimitReachedError extends Error {
+    constructor() {
+        super("Daglimiet bereikt");
+        this.name = "DailyLimitReachedError";
+    }
+}

package/dist-lib/lib/maps-errors.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=maps-errors.test.d.ts.map

package/dist-lib/lib/maps-errors.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"maps-errors.test.d.ts","sourceRoot":"","sources":["../../src/lib/maps-errors.test.ts"],"names":[],"mappings":""}

package/dist-lib/lib/maps-errors.test.js

@@ -0,0 +1,40 @@
+import { describe, expect, it } from "vitest";
+import { calendarDay, classifyGoogleError, isFatalKeyError, resolveProcessorSettings, } from "./maps-errors";
+describe("classifyGoogleError", () => {
+    it("herkent quota", () => expect(classifyGoogleError("RESOURCE_EXHAUSTED: quota exceeded (429)")).toBe("quota"));
+    it("herkent ongeldige sleutel", () => expect(classifyGoogleError("API key not valid. Please pass a valid API key.")).toBe("invalid_key"));
+    it("herkent adres niet gevonden", () => expect(classifyGoogleError("Geen resultaat van Google")).toBe("not_found"));
+    it("herkent tokenfout van Central", () => expect(classifyGoogleError("Central Auth weigert het secret van deze module")).toBe("token"));
+    it("onbekend is other", () => expect(classifyGoogleError("iets raars")).toBe("other"));
+    it("alleen sleutel- en tokenfouten zijn fataal", () => {
+        expect(isFatalKeyError("invalid_key")).toBe(true);
+        expect(isFatalKeyError("token")).toBe(true);
+        expect(isFatalKeyError("quota")).toBe(false);
+    });
+});
+describe("resolveProcessorSettings", () => {
+    it("ontbrekende instellingen = huidig gedrag (limiet 2000, 3 pogingen, alles uit)", () => {
+        expect(resolveProcessorSettings(null)).toEqual({
+            dailyCallLimit: 2000,
+            maxAttempts: 3,
+            claimViaRpc: false,
+            perCallLimit: false,
+            stopOnKeyError: false,
+            timezone: "Europe/Amsterdam",
+        });
+    });
+    it("max_attempts telt alleen als de schakelaar aan staat", () => {
+        expect(resolveProcessorSettings({ max_attempts: 7 }).maxAttempts).toBe(3);
+        expect(resolveProcessorSettings({ max_attempts: 7, max_attempts_enabled: true }).maxAttempts).toBe(7);
+    });
+    it("neemt de daglimiet uit de instellingen", () => {
+        expect(resolveProcessorSettings({ daily_call_limit: 50 }).dailyCallLimit).toBe(50);
+    });
+});
+describe("calendarDay", () => {
+    it("gebruikt de tijdzone voor de daggrens", () => {
+        // 23:30 UTC op 9 nov = 00:30 op 10 nov in Amsterdam
+        expect(calendarDay(new Date(Date.UTC(2026, 10, 9, 23, 30)), "Europe/Amsterdam")).toBe("2026-11-10");
+        expect(calendarDay(new Date(Date.UTC(2026, 10, 9, 23, 30)), "UTC")).toBe("2026-11-09");
+    });
+});

package/dist-lib/lib/maps-processor.server.d.ts

@@ -1,3 +1,5 @@
+/** Terugvalwaarde (huidig gedrag) voor het maximum aantal pogingen. */
+export declare const MAX_ATTEMPTS = 3;
 export interface ProcessResult {
     processed: number;
     geocoded: number;

package/dist-lib/lib/maps-processor.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"maps-processor.server.d.ts","sourceRoot":"","sources":["../../src/lib/maps-processor.server.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,+DAA+D;AAC/D,wBAAsB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAS9D;AAcD,0EAA0E;AAC1E,wBAAsB,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC,CAUxD;AAED,2CAA2C;AAC3C,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAMvD;AAgHD,yEAAyE;AACzE,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC,CAmMpE"}
+{"version":3,"file":"maps-processor.server.d.ts","sourceRoot":"","sources":["../../src/lib/maps-processor.server.ts"],"names":[],"mappings":"AAeA,uEAAuE;AACvE,eAAO,MAAM,YAAY,IAAI,CAAC;AAG9B,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,+DAA+D;AAC/D,wBAAsB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAS9D;AAcD,0EAA0E;AAC1E,wBAAsB,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC,CAUxD;AAED,2CAA2C;AAC3C,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAMvD;AA2LD,yEAAyE;AACzE,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC,CAyNpE"}

package/dist-lib/lib/maps-processor.server.js

@@ -2,8 +2,10 @@
 // Leest maps_request_queue, geocodet adressen en haalt reistijden op.
 import { createClient } from "@supabase/supabase-js";
 import { computeRouteMatrix, geocodeAddress } from "./google-maps.server";
+import { DailyLimitReachedError, calendarDay, classifyGoogleError, isFatalKeyError, resolveProcessorSettings, } from "./maps-errors";
 const BATCH_SIZE = 50;
-const MAX_ATTEMPTS = 3;
+/** Terugvalwaarde (huidig gedrag) voor het maximum aantal pogingen. */
+export const MAX_ATTEMPTS = 3;
 const MAX_MATRIX_SIDE = 25;
 /** SHA-256 hash via Web Crypto (browser, Node 15+ en Deno). */
 export async function addressHash(raw) {
@@ -69,15 +71,81 @@ async function callsToday(db) {
     const rows = Array.isArray(data) ? data : [];
     return rows.reduce((sum, row) => sum + (row.elements ?? 0), 0);
 }
+const noop = async () => { };
+/**
+ * Verhoogt de dagteller atomair in de database (alleen bij per_call_limit_enabled).
+ * Gooit DailyLimitReachedError als de limiet bereikt is; dan wordt Google niet aangeroepen.
+ */
+function makeConsumeCall(db, cfg, initialUsed) {
+    if (!cfg.perCallLimit)
+        return noop;
+    return async () => {
+        const { data, error } = await db.rpc("maps_try_consume_call", {
+            p_day: calendarDay(new Date(), cfg.timezone),
+            p_limit: cfg.dailyCallLimit,
+            p_initial: initialUsed,
+        });
+        if (error) {
+            console.error("[maps] maps_try_consume_call", error);
+            throw new Error(`Daglimietteller niet bereikbaar: ${error.message}`);
+        }
+        if (data == null)
+            throw new DailyLimitReachedError();
+    };
+}
+async function claimItems(db, cfg) {
+    if (cfg.claimViaRpc) {
+        const { data, error } = await db.rpc("maps_claim_queue_items", {
+            p_limit: BATCH_SIZE,
+            p_max_attempts: cfg.maxAttempts,
+        });
+        if (error) {
+            console.error("[maps] maps_claim_queue_items", error);
+            throw new Error(`Wachtrij claimen mislukt: ${error.message}`);
+        }
+        return Array.isArray(data) ? data : [];
+    }
+    // Huidig gedrag (schakelaar uit): eerst lezen, dan op processing zetten.
+    const { data: queue, error } = await db
+        .from("maps_request_queue")
+        .select("*")
+        .eq("status", "pending")
+        .lt("attempts", cfg.maxAttempts)
+        .order("created_at", { ascending: true })
+        .limit(BATCH_SIZE);
+    if (error)
+        console.error("[maps] wachtrij lezen", error);
+    const items = Array.isArray(queue) ? queue : [];
+    if (items.length === 0)
+        return items;
+    const { error: updError } = await db
+        .from("maps_request_queue")
+        .update({ status: "processing", updated_at: new Date().toISOString() })
+        .in("id", items.map((item) => item.id));
+    if (updError)
+        console.error("[maps] wachtrij claimen", updError);
+    return items;
+}
+async function releaseItem(db, id) {
+    // Terug naar pending zonder extra poging (limiet of afgebroken batch).
+    const { error } = await db
+        .from("maps_request_queue")
+        .update({ status: "pending", updated_at: new Date().toISOString() })
+        .eq("id", id);
+    if (error)
+        console.error("[maps] item vrijgeven", error);
+}
 async function logUsage(db, callType, elements, outcome, detail) {
-    await db.from("maps_usage_log").insert({
+    const { error } = await db.from("maps_usage_log").insert({
         call_type: callType,
         elements,
         outcome,
         detail: detail ?? null,
     });
+    if (error)
+        console.error("[maps] usage log", error);
 }
-async function ensureAddress(db, raw) {
+async function ensureAddress(db, raw, beforeCall = noop) {
     const hash = await addressHash(raw);
     const { data: existing } = await db
         .from("maps_addresses")
@@ -97,6 +165,7 @@ async function ensureAddress(db, raw) {
             .single()).data?.id;
     if (!id)
         return null;
+    await beforeCall();
     try {
         const result = await geocodeAddress(raw);
         if (!result) {
@@ -141,6 +210,7 @@ async function ensureAddress(db, raw) {
 export async function processMapsQueueBatch() {
     const db = adminClient();
     const settings = await getSettings(db);
+    const cfg = resolveProcessorSettings(settings);
     const result = {
         processed: 0,
         geocoded: 0,
@@ -149,36 +219,38 @@ export async function processMapsQueueBatch() {
         skipped: null,
     };
     const used = await callsToday(db);
-    if (settings && used >= settings.daily_call_limit) {
+    if (settings && used >= cfg.dailyCallLimit) {
         await logUsage(db, "limit", 0, "skipped", "Daglimiet bereikt");
         result.skipped = "Daglimiet bereikt";
         return result;
     }
-    const { data: queue } = await db
-        .from("maps_request_queue")
-        .select("*")
-        .eq("status", "pending")
-        .lt("attempts", MAX_ATTEMPTS)
-        .order("created_at", { ascending: true })
-        .limit(BATCH_SIZE);
-    const items = Array.isArray(queue) ? queue : [];
+    const items = await claimItems(db, cfg);
     if (items.length === 0)
         return result;
-    const ids = items.map((item) => item.id);
-    await db
-        .from("maps_request_queue")
-        .update({ status: "processing", updated_at: new Date().toISOString() })
-        .in("id", ids);
+    const beforeCall = makeConsumeCall(db, cfg, used);
+    let aborted = false;
+    let limitLogged = false;
+    const onLimit = async () => {
+        if (!limitLogged) {
+            limitLogged = true;
+            await logUsage(db, "limit", 0, "skipped", "Daglimiet bereikt");
+        }
+        result.skipped = "Daglimiet bereikt";
+    };
     const ttlDays = settings?.cache_ttl_days ?? 30;
     const expiresAt = new Date(Date.now() + ttlDays * 86400000).toISOString();
     const pairs = [];
     for (const item of items) {
+        if (aborted) {
+            await releaseItem(db, item.id);
+            continue;
+        }
         try {
             if (item.kind === "geocode") {
                 const raw = item.raw_origin ?? item.raw_destination;
                 if (!raw)
                     throw new Error("Geen adres in wachtrijregel");
-                const address = await ensureAddress(db, raw);
+                const address = await ensureAddress(db, raw, beforeCall);
                 if (address)
                     result.geocoded += 1;
                 else
@@ -196,9 +268,9 @@ export async function processMapsQueueBatch() {
                 result.processed += 1;
                 continue;
             }
-            const origin = item.raw_origin ? await ensureAddress(db, item.raw_origin) : null;
+            const origin = item.raw_origin ? await ensureAddress(db, item.raw_origin, beforeCall) : null;
             const destination = item.raw_destination
-                ? await ensureAddress(db, item.raw_destination)
+                ? await ensureAddress(db, item.raw_destination, beforeCall)
                 : null;
             if (!origin || !destination) {
                 result.failed += 1;
@@ -218,12 +290,20 @@ export async function processMapsQueueBatch() {
             pairs.push({ item, origin, destination });
         }
         catch (error) {
+            if (error instanceof DailyLimitReachedError) {
+                await releaseItem(db, item.id);
+                await onLimit();
+                aborted = true;
+                continue;
+            }
             const message = error instanceof Error ? error.message : String(error);
+            if (cfg.stopOnKeyError && isFatalKeyError(classifyGoogleError(message)))
+                aborted = true;
             result.failed += 1;
             await db
                 .from("maps_request_queue")
                 .update({
-                status: (item.attempts ?? 0) + 1 >= MAX_ATTEMPTS ? "failed" : "pending",
+                status: (item.attempts ?? 0) + 1 >= cfg.maxAttempts ? "failed" : "pending",
                 attempts: (item.attempts ?? 0) + 1,
                 last_error: message,
                 updated_at: new Date().toISOString(),
@@ -241,7 +321,13 @@ export async function processMapsQueueBatch() {
         const origins = chunk.map((pair) => pair.origin);
         const destinations = chunk.map((pair) => pair.destination);
         const mode = chunk[0]?.item.mode ?? "drive";
+        if (aborted) {
+            for (const pair of chunk)
+                await releaseItem(db, pair.item.id);
+            continue;
+        }
         try {
+            await beforeCall();
             const elements = await computeRouteMatrix(origins, destinations, mode);
             await logUsage(db, "matrix", chunk.length, "ok");
             for (let position = 0; position < chunk.length; position += 1) {
@@ -290,7 +376,16 @@ export async function processMapsQueueBatch() {
                 .eq("id", settings.id);
         }
         catch (error) {
+            if (error instanceof DailyLimitReachedError) {
+                for (const pair of chunk)
+                    await releaseItem(db, pair.item.id);
+                await onLimit();
+                aborted = true;
+                continue;
+            }
             const message = error instanceof Error ? error.message : String(error);
+            if (cfg.stopOnKeyError && isFatalKeyError(classifyGoogleError(message)))
+                aborted = true;
             await logUsage(db, "matrix", chunk.length, "error", message);
             await db
                 .from("maps_settings")
@@ -302,7 +397,7 @@ export async function processMapsQueueBatch() {
                 await db
                     .from("maps_request_queue")
                     .update({
-                    status: (pair.item.attempts ?? 0) + 1 >= MAX_ATTEMPTS ? "failed" : "pending",
+                    status: (pair.item.attempts ?? 0) + 1 >= cfg.maxAttempts ? "failed" : "pending",
                     attempts: (pair.item.attempts ?? 0) + 1,
                     last_error: message,
                     updated_at: new Date().toISOString(),

package/dist-lib/lib/maps-processor.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=maps-processor.test.d.ts.map

package/dist-lib/lib/maps-processor.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"maps-processor.test.d.ts","sourceRoot":"","sources":["../../src/lib/maps-processor.test.ts"],"names":[],"mappings":""}