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

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

@@ -0,0 +1,182 @@
+// Tests met een nep-database en nep-Google: er worden geen echte aanroepen gedaan.
+import { beforeEach, describe, expect, it, vi } from "vitest";
+const google = vi.hoisted(() => ({
+    geocodeAddress: vi.fn(),
+    computeRouteMatrix: vi.fn(),
+}));
+vi.mock("./google-maps.server", () => google);
+let state;
+function makeBuilder(table) {
+    const ops = [];
+    const builder = new Proxy({}, {
+        get(_t, prop) {
+            if (prop === "then") {
+                return (resolve, reject) => {
+                    state.log.push({ table, ops });
+                    Promise.resolve(execute(table, ops)).then(resolve, reject);
+                };
+            }
+            return (...args) => {
+                ops.push([prop, args]);
+                return builder;
+            };
+        },
+    });
+    return builder;
+}
+function arg(ops, name) {
+    return ops.filter(([n]) => n === name).map(([, a]) => a);
+}
+function execute(table, ops) {
+    const kind = ops[0][0];
+    if (table === "maps_settings")
+        return { data: { id: "s1", ...state.settings }, error: null };
+    if (table === "maps_usage_log")
+        return { data: [], error: null };
+    if (table === "maps_addresses") {
+        if (kind === "select") {
+            const hash = arg(ops, "eq")[0]?.[1];
+            return { data: state.addresses.find((a) => a.address_hash === hash) ?? null, error: null };
+        }
+        if (kind === "insert") {
+            const row = { id: `a${state.addresses.length + 1}`, ...ops[0][1][0] };
+            state.addresses.push(row);
+            return { data: { id: row.id }, error: null };
+        }
+        if (kind === "update") {
+            const id = arg(ops, "eq")[0]?.[1];
+            const row = state.addresses.find((a) => a.id === id);
+            if (row)
+                Object.assign(row, ops[0][1][0]);
+            return { data: null, error: null };
+        }
+    }
+    if (table === "maps_request_queue") {
+        if (kind === "select") {
+            const max = arg(ops, "lt")[0]?.[1];
+            return { data: state.queue.filter((q) => q.status === "pending" && q.attempts < max).map((q) => ({ ...q })), error: null };
+        }
+        if (kind === "update") {
+            const patch = ops[0][1][0];
+            const ids = arg(ops, "in")[0]?.[1] ?? [arg(ops, "eq")[0]?.[1]];
+            for (const q of state.queue)
+                if (ids.includes(q.id))
+                    Object.assign(q, patch);
+            return { data: null, error: null };
+        }
+    }
+    return { data: null, error: null };
+}
+const fakeDb = {
+    from: (table) => makeBuilder(table),
+    rpc: async (name, params) => {
+        state.rpcCalls.push(name);
+        if (name === "maps_claim_queue_items") {
+            // Simuleert FOR UPDATE SKIP LOCKED: atomair pending → processing.
+            const picked = state.queue
+                .filter((q) => q.status === "pending" && q.attempts < params.p_max_attempts)
+                .slice(0, params.p_limit);
+            for (const q of picked)
+                q.status = "processing";
+            return { data: picked.map((q) => ({ ...q })), error: null };
+        }
+        if (name === "maps_try_consume_call") {
+            const cur = state.counter[params.p_day] ?? params.p_initial;
+            if (cur >= params.p_limit) {
+                state.counter[params.p_day] = cur;
+                return { data: null, error: null };
+            }
+            state.counter[params.p_day] = cur + 1;
+            return { data: cur + 1, error: null };
+        }
+        return { data: null, error: null };
+    },
+};
+vi.mock("@supabase/supabase-js", () => ({ createClient: () => fakeDb }));
+const { processMapsQueueBatch } = await import("./maps-processor.server");
+function geocodeItems(n) {
+    return Array.from({ length: n }, (_, i) => ({
+        id: `q${i}`,
+        kind: "geocode",
+        raw_origin: `Straat ${i}, Plaats`,
+        raw_destination: null,
+        mode: "drive",
+        status: "pending",
+        attempts: 0,
+    }));
+}
+beforeEach(() => {
+    process.env.SUPABASE_URL = "http://fake";
+    process.env.SERVICE_ROLE_KEY = "fake";
+    google.geocodeAddress.mockReset();
+    google.computeRouteMatrix.mockReset();
+    google.geocodeAddress.mockImplementation(async (raw) => {
+        await new Promise((r) => setTimeout(r, 1));
+        return { formattedAddress: raw, lat: 52, lng: 5, placeId: "p" };
+    });
+});
+function reset(settings, items = geocodeItems(3)) {
+    state = { settings, queue: items, addresses: [], counter: {}, log: [], rpcCalls: [] };
+}
+describe("processMapsQueueBatch — schakelaars uit = huidig gedrag", () => {
+    it("oude instellingen (zonder nieuwe kolommen) en nieuwe kolommen op uit geven exact hetzelfde", async () => {
+        reset({ daily_call_limit: 2000, cache_ttl_days: 30 });
+        const oud = await processMapsQueueBatch();
+        const oudOps = JSON.stringify(state.log.map((l) => [l.table, l.ops.map(([n]) => n)]));
+        const oudQueue = state.queue.map((q) => [q.id, q.status, q.attempts]);
+        expect(state.rpcCalls).toEqual([]);
+        reset({
+            daily_call_limit: 2000, cache_ttl_days: 30,
+            claim_via_rpc_enabled: false, per_call_limit_enabled: false,
+            max_attempts_enabled: false, stop_bij_sleutelfout_enabled: false,
+            max_attempts: 9, timezone: "Europe/Amsterdam",
+        });
+        const nieuw = await processMapsQueueBatch();
+        expect(nieuw).toEqual(oud);
+        expect(nieuw).toEqual({ processed: 3, geocoded: 3, travelTimes: 0, failed: 0, skipped: null });
+        expect(JSON.stringify(state.log.map((l) => [l.table, l.ops.map(([n]) => n)]))).toBe(oudOps);
+        expect(state.queue.map((q) => [q.id, q.status, q.attempts])).toEqual(oudQueue);
+        expect(state.rpcCalls).toEqual([]);
+    });
+    it("zonder schakelaar loopt de batch door na een sleutelfout", async () => {
+        reset({ daily_call_limit: 2000 });
+        google.geocodeAddress.mockRejectedValue(new Error("API key not valid"));
+        const r = await processMapsQueueBatch();
+        expect(google.geocodeAddress).toHaveBeenCalledTimes(3);
+        expect(r.failed).toBe(3);
+    });
+});
+describe("processMapsQueueBatch — nieuwe schakelaars", () => {
+    it("twee gelijktijdige verwerkingen roepen Google maximaal één keer per item aan", async () => {
+        reset({ daily_call_limit: 2000, claim_via_rpc_enabled: true }, geocodeItems(10));
+        await Promise.all([processMapsQueueBatch(), processMapsQueueBatch()]);
+        const calls = google.geocodeAddress.mock.calls.map((c) => c[0]);
+        expect(calls).toHaveLength(10);
+        expect(new Set(calls).size).toBe(10);
+    });
+    it("de daglimiet wordt nooit overschreden (limiet 2)", async () => {
+        reset({ daily_call_limit: 2, per_call_limit_enabled: true, claim_via_rpc_enabled: true }, geocodeItems(5));
+        const r = await processMapsQueueBatch();
+        expect(google.geocodeAddress).toHaveBeenCalledTimes(2);
+        expect(Object.values(state.counter)).toEqual([2]);
+        expect(r.skipped).toBe("Daglimiet bereikt");
+        // Niet-verwerkte items staan weer op pending zonder extra poging.
+        expect(state.queue.filter((q) => q.status === "pending" && q.attempts === 0)).toHaveLength(3);
+    });
+    it("met stop_bij_sleutelfout_enabled stopt de batch na de eerste sleutelfout", async () => {
+        reset({ daily_call_limit: 2000, stop_bij_sleutelfout_enabled: true });
+        google.geocodeAddress.mockRejectedValue(new Error("API key not valid"));
+        await processMapsQueueBatch();
+        expect(google.geocodeAddress).toHaveBeenCalledTimes(1);
+        expect(state.queue.filter((q) => q.status === "pending" && q.attempts === 0)).toHaveLength(2);
+    });
+    it("max_attempts uit de instellingen wordt alleen gebruikt als de schakelaar aan staat", async () => {
+        const items = geocodeItems(1).map((q) => ({ ...q, attempts: 3 }));
+        reset({ daily_call_limit: 2000, max_attempts: 5 }, items);
+        await processMapsQueueBatch();
+        expect(google.geocodeAddress).not.toHaveBeenCalled();
+        reset({ daily_call_limit: 2000, max_attempts: 5, max_attempts_enabled: true }, geocodeItems(1).map((q) => ({ ...q, attempts: 3 })));
+        await processMapsQueueBatch();
+        expect(google.geocodeAddress).toHaveBeenCalledTimes(1);
+    });
+});

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

@@ -7,6 +7,13 @@ export interface MapsOverview {
         dailyCallLimit: number;
         allowEstimateFallback: boolean;
         provider: "free" | "google";
+        claimViaRpcEnabled: boolean;
+        perCallLimitEnabled: boolean;
+        maxAttemptsEnabled: boolean;
+        stopBijSleutelfoutEnabled: boolean;
+        maxAttempts: number;
+        timezone: string;
+        updatedAt: string | null;
         lastSuccessAt: string | null;
         lastErrorAt: string | null;
         lastError: string | null;
@@ -23,6 +30,29 @@ export interface MapsOverview {
     errorsMonth: number;
     estimatedCostMonth: number | null;
 }
+export interface MapsErrorPage {
+    total: number;
+    page: number;
+    pageSize: number;
+    items: Array<{
+        id: string;
+        at: string;
+        callType: string;
+        kind: "quota" | "invalid_key" | "not_found" | "token" | "other";
+        message: string;
+    }>;
+}
+export declare const getMapsErrors: import("@tanstack/start-client-core").RequiredFetcher<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>], (input: {
+    page?: number;
+    pageSize?: number;
+}) => {
+    page: number;
+    pageSize: number;
+}, Promise<MapsErrorPage>>;
 export declare const getMapsOverview: 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;
@@ -42,7 +72,21 @@ export declare const updateMapsSettings: import("@tanstack/start-client-core").R
     dailyCallLimit: number;
     allowEstimateFallback: boolean;
     provider: "free" | "google";
+    claimViaRpcEnabled?: boolean;
+    perCallLimitEnabled?: boolean;
+    maxAttemptsEnabled?: boolean;
+    stopBijSleutelfoutEnabled?: boolean;
+    maxAttempts?: number;
+    timezone?: string;
+    expectedUpdatedAt?: string | null;
 }) => {
+    expectedUpdatedAt: string | null;
+    timezone?: string | undefined;
+    maxAttempts?: number | undefined;
+    stopBijSleutelfoutEnabled?: boolean | undefined;
+    maxAttemptsEnabled?: boolean | undefined;
+    perCallLimitEnabled?: boolean | undefined;
+    claimViaRpcEnabled?: boolean | undefined;
     cacheTtlDays: number;
     dailyCallLimit: number;
     allowEstimateFallback: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"maps.functions.d.ts","sourceRoot":"","sources":["../../src/lib/maps.functions.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,QAAQ,EAAE;QACR,EAAE,EAAE,MAAM,CAAC;QACX,YAAY,EAAE,MAAM,CAAC;QACrB,cAAc,EAAE,MAAM,CAAC;QACvB,qBAAqB,EAAE,OAAO,CAAC;QAC/B,QAAQ,EAAE,MAAM,GAAG,QAAQ,CAAC;QAC5B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;QAC7B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;QAC3B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;KAC1B,GAAG,IAAI,CAAC;IACT,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;CACnC;AAED,eAAO,MAAM,eAAe;;;;uEAKxB,CAAC;AAEL,eAAO,MAAM,gBAAgB;;;;0GAKzB,CAAC;AAEL,eAAO,MAAM,kBAAkB;;;;8CAEL;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,QAAQ,EAAE,MAAM,GAAG,QAAQ,CAAC;CAC7B;;;;;;;GAgBC,CAAC;AAEL,eAAO,MAAM,cAAc;;;;;;GAKvB,CAAC;AAEL,eAAO,MAAM,uBAAuB;;;;;;GAKhC,CAAC;AAEL,eAAO,MAAM,aAAa;;;;+GAKtB,CAAC;AAEL,eAAO,MAAM,kBAAkB;;;;;;;;GAK3B,CAAC;AAEL,eAAO,MAAM,kBAAkB;;;;gHAK3B,CAAC"}
+{"version":3,"file":"maps.functions.d.ts","sourceRoot":"","sources":["../../src/lib/maps.functions.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,QAAQ,EAAE;QACR,EAAE,EAAE,MAAM,CAAC;QACX,YAAY,EAAE,MAAM,CAAC;QACrB,cAAc,EAAE,MAAM,CAAC;QACvB,qBAAqB,EAAE,OAAO,CAAC;QAC/B,QAAQ,EAAE,MAAM,GAAG,QAAQ,CAAC;QAC5B,kBAAkB,EAAE,OAAO,CAAC;QAC5B,mBAAmB,EAAE,OAAO,CAAC;QAC7B,kBAAkB,EAAE,OAAO,CAAC;QAC5B,yBAAyB,EAAE,OAAO,CAAC;QACnC,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;QAC7B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;QAC3B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;KAC1B,GAAG,IAAI,CAAC;IACT,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;CACnC;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,KAAK,CAAC;QACX,EAAE,EAAE,MAAM,CAAC;QACX,EAAE,EAAE,MAAM,CAAC;QACX,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,OAAO,GAAG,aAAa,GAAG,WAAW,GAAG,OAAO,GAAG,OAAO,CAAC;QAChE,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC,CAAC;CACJ;AAED,eAAO,MAAM,aAAa;;;;8CAEA;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE;;;0BAO1D,CAAC;AAEL,eAAO,MAAM,eAAe;;;;uEAKxB,CAAC;AAEL,eAAO,MAAM,gBAAgB;;;;0GAKzB,CAAC;AAEL,eAAO,MAAM,kBAAkB;;;;8CAEL;IACtB,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;;;;;;;;;;;;;;GA6BC,CAAC;AAEL,eAAO,MAAM,cAAc;;;;;;GAKvB,CAAC;AAEL,eAAO,MAAM,uBAAuB;;;;;;GAKhC,CAAC;AAEL,eAAO,MAAM,aAAa;;;;+GAKtB,CAAC;AAEL,eAAO,MAAM,kBAAkB;;;;;;;;GAK3B,CAAC;AAEL,eAAO,MAAM,kBAAkB;;;;gHAK3B,CAAC"}

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

@@ -1,5 +1,15 @@
 import { createServerFn } from "@tanstack/react-start";
 import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
+export const getMapsErrors = createServerFn({ method: "GET" })
+    .middleware([requireSupabaseAuth])
+    .inputValidator((input) => ({
+    page: Math.max(0, Math.floor(Number(input?.page ?? 0)) || 0),
+    pageSize: Math.min(100, Math.max(1, Math.floor(Number(input?.pageSize ?? 10)) || 10)),
+}))
+    .handler(async ({ data }) => {
+    const { listMapsErrors } = await import("./maps-admin.server");
+    return listMapsErrors(data.page, data.pageSize);
+});
 export const getMapsOverview = createServerFn({ method: "GET" })
     .middleware([requireSupabaseAuth])
     .handler(async () => {
@@ -25,6 +35,19 @@ export const updateMapsSettings = createServerFn({ method: "POST" })
         dailyCallLimit: limit,
         allowEstimateFallback: Boolean(input.allowEstimateFallback),
         provider: input.provider === "google" ? "google" : "free",
+        ...(input.claimViaRpcEnabled !== undefined && { claimViaRpcEnabled: Boolean(input.claimViaRpcEnabled) }),
+        ...(input.perCallLimitEnabled !== undefined && { perCallLimitEnabled: Boolean(input.perCallLimitEnabled) }),
+        ...(input.maxAttemptsEnabled !== undefined && { maxAttemptsEnabled: Boolean(input.maxAttemptsEnabled) }),
+        ...(input.stopBijSleutelfoutEnabled !== undefined && {
+            stopBijSleutelfoutEnabled: Boolean(input.stopBijSleutelfoutEnabled),
+        }),
+        ...(input.maxAttempts !== undefined && {
+            maxAttempts: Math.min(100, Math.max(1, Math.round(Number(input.maxAttempts)) || 3)),
+        }),
+        ...(typeof input.timezone === "string" && input.timezone.trim() && {
+            timezone: input.timezone.trim().slice(0, 64),
+        }),
+        expectedUpdatedAt: typeof input.expectedUpdatedAt === "string" ? input.expectedUpdatedAt : null,
     };
 })
     .handler(async ({ data }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowselections/google-maps-api-installatie-techniek",
-  "version": "1.0.5",
+  "version": "1.1.1",
   "flowselections": {
     "moduleId": "maps-installatie",
     "pages": [
@@ -37,7 +37,8 @@
     "build:lib:watch": "tsc -p tsconfig.build.json --watch",
     "build:dev": "vite build --mode development",
     "preview": "vite preview",
-    "lint": "eslint ."
+    "lint": "eslint .",
+    "test": "vitest run --dir src"
   },
   "peerDependencies": {
     "@flowselections/core": "*",
@@ -55,7 +56,7 @@
   "devDependencies": {
     "@cloudflare/vite-plugin": "^1.25.5",
     "@eslint/js": "^9.32.0",
-    "@flowselections/core": "1.0.30",
+    "@flowselections/core": "1.0.37",
     "@lovable.dev/vite-tanstack-config": "2.26.5",
     "@rsbuild/core": "^1.0.0",
     "@tailwindcss/vite": "^4.2.1",
@@ -72,16 +73,17 @@
     "eslint-plugin-react-refresh": "^0.4.20",
     "globals": "^15.15.0",
     "lucide-react": "^0.575.0",
+    "nitro": "3.0.260603-beta",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
     "sonner": "^2.0.7",
     "tailwindcss": "^4.2.1",
+    "tsc-alias": "^1.8.10",
     "tw-animate-css": "^1.3.4",
     "typescript": "^5.8.3",
-    "tsc-alias": "^1.8.10",
     "typescript-eslint": "^8.56.1",
     "vite": "^7.3.1",
     "vite-tsconfig-paths": "^6.0.2",
-    "nitro": "3.0.260603-beta"
+    "vitest": "^3"
   }
 }