65328b8c11
CI / check (push) Failing after 15s
Wire the lane camera's vehicle event into the gated subscription flow: on a vehicle/active push from an opt-in (config.anpr) camera, AnprBridge pulls a fresh snapshot, runs ANPR, applies a stricter entry confidence floor, debounces, and — matching the plate to a subscription BEFORE emitting — emits a kind:"plate" read. The existing ReadDispatcher -> SubscriptionFlow then signs the entry/exit and opens the barrier. A plate is never the sole authority: it routes through the same gate (active/window/blocklist/car-count) as any credential. Fail-soft, fire-and-forget, subscriber-only by construction. Field-verified end to end (plate AA504LX opened the entry barrier and appended a signed vehicle_entry). Add an admin master switch (site_config.anpr_entry_enabled, default ON) in Site Settings that disables ONLY the barrier-driving bridge; advisory snapshot-ANPR and lane busy/free are unaffected. Read live per event, so toggling takes effect with no restart. Migration 0013 (additive ALTER ADD COLUMN, default 1). - New: apps/server/src/anpr-entry.ts (AnprBridge) + tests (9) - hikvision-alarm.ts hands vehicle detections to the bridge (fire-and-forget) + wiring tests (3) - server.ts reorders the read flows above the hik-alarm registration - snapshot.ts exports buildCamera for reuse - env: VISION_ENTRY_MIN_CONFIDENCE (0.85), ANPR_DEBOUNCE_MS (12000) - site route + SiteSettings checkbox + i18n (sq/en parity) - wiki: lane-presence-and-anpr-entry / lpr-camera / index / log -> BUILT Claude-Session: https://claude.ai/code/session_01Xcm6ikLgGoCxxHrxtjkk5V
135 lines
5.5 KiB
TypeScript
135 lines
5.5 KiB
TypeScript
import type { FastifyInstance } from "fastify";
|
|
import { eq, siteConfig, type Db } from "@parking/db";
|
|
import { requirePermission } from "../auth.js";
|
|
import { getOccupancy } from "../occupancy.js";
|
|
|
|
// Site config (capacity) + live occupancy. Occupancy is a fold over the signed
|
|
// ledger; capacity is an admin-set knob. The FULL gate (refuse transient entry at
|
|
// capacity) lives in the entry flow. See wiki/concepts/capacity-occupancy.md.
|
|
|
|
// Optional park-metadata text fields (all nullable). Trimmed; "" → null.
|
|
const TEXT_FIELDS = [
|
|
"parkName",
|
|
"operatorName",
|
|
"nius",
|
|
"address",
|
|
"phone",
|
|
"email",
|
|
// IANA timezone for tariff wall-clock windows (copied into each published version).
|
|
"timezone",
|
|
// Default vehicle/customer category frozen onto each transient entry.
|
|
"defaultVehicleCategory",
|
|
] as const;
|
|
type TextField = (typeof TEXT_FIELDS)[number];
|
|
|
|
interface SiteConfigBody extends Partial<Record<TextField, string | null>> {
|
|
/** Nominal capacity; null = no limit. */
|
|
capacity?: number | null;
|
|
/** Default for the booth "print exit ticket" checkbox (booth-geography knob). */
|
|
exitVoucherDefault?: boolean;
|
|
/** Site default monthly subscription price in minor units (pre-fills the form). */
|
|
subscriptionMonthlyPriceMinor?: number | null;
|
|
/** Reserve a spot in occupancy for each active subscriber's car(s), even when not
|
|
* parked — so transients see "full" sooner and the subscriber's spot is held. */
|
|
reserveSubscriberSpots?: boolean;
|
|
/** Master switch for the ANPR subscriber-entry bridge (auto-open on a subscriber's
|
|
* plate read). OFF → subscribers fall back to card/QR; advisory ANPR still records. */
|
|
anprEntryEnabled?: boolean;
|
|
}
|
|
|
|
/** Shape returned by GET/PUT: capacity + the booth flag + the subscription default
|
|
* + every metadata field. */
|
|
type SiteConfig = {
|
|
capacity: number | null;
|
|
exitVoucherDefault: boolean;
|
|
subscriptionMonthlyPriceMinor: number | null;
|
|
reserveSubscriberSpots: boolean;
|
|
anprEntryEnabled: boolean;
|
|
} & Record<TextField, string | null>;
|
|
|
|
function toSiteConfig(row: typeof siteConfig.$inferSelect | undefined): SiteConfig {
|
|
const out = {
|
|
capacity: row?.capacity ?? null,
|
|
exitVoucherDefault: row?.exitVoucherDefault ?? false,
|
|
subscriptionMonthlyPriceMinor: row?.subscriptionMonthlyPriceMinor ?? null,
|
|
reserveSubscriberSpots: row?.reserveSubscriberSpots ?? false,
|
|
anprEntryEnabled: row?.anprEntryEnabled ?? true,
|
|
} as SiteConfig;
|
|
for (const f of TEXT_FIELDS) out[f] = row?.[f] ?? null;
|
|
return out;
|
|
}
|
|
|
|
/** Trim a text field; empty string becomes null so blank input clears it. */
|
|
function normText(v: unknown): string | null {
|
|
if (v == null) return null;
|
|
const s = String(v).trim();
|
|
return s === "" ? null : s;
|
|
}
|
|
|
|
export async function siteRoutes(app: FastifyInstance, db: Db): Promise<void> {
|
|
const readGuard = requirePermission("site:read");
|
|
const writeGuard = requirePermission("site:update");
|
|
|
|
// Live occupancy: cars inside, capacity, free, full. Any signed-in role.
|
|
app.get("/api/occupancy", { preHandler: readGuard }, async () => getOccupancy(db));
|
|
|
|
// Read site config (capacity + park metadata).
|
|
app.get("/api/site-config", { preHandler: readGuard }, async () => {
|
|
const row = db.select().from(siteConfig).where(eq(siteConfig.id, 1)).get();
|
|
return toSiteConfig(row);
|
|
});
|
|
|
|
// Set site config (admin). Capacity: null or 0+ integer. Metadata: optional text
|
|
// (only the fields PRESENT in the body are updated; absent fields are untouched).
|
|
app.put<{ Body: SiteConfigBody }>("/api/site-config", { preHandler: writeGuard }, async (req, reply) => {
|
|
const body = req.body ?? ({} as SiteConfigBody);
|
|
|
|
const patch: Partial<typeof siteConfig.$inferInsert> = {};
|
|
if ("capacity" in body) {
|
|
const c = body.capacity;
|
|
if (c != null && (!Number.isInteger(c) || c < 0)) {
|
|
return reply.code(400).send({ error: "capacity must be a non-negative integer or null" });
|
|
}
|
|
patch.capacity = c ?? null;
|
|
}
|
|
if ("exitVoucherDefault" in body) {
|
|
if (typeof body.exitVoucherDefault !== "boolean") {
|
|
return reply.code(400).send({ error: "exitVoucherDefault must be a boolean" });
|
|
}
|
|
patch.exitVoucherDefault = body.exitVoucherDefault;
|
|
}
|
|
if ("subscriptionMonthlyPriceMinor" in body) {
|
|
const p = body.subscriptionMonthlyPriceMinor;
|
|
if (p != null && (!Number.isInteger(p) || p < 0)) {
|
|
return reply.code(400).send({ error: "subscriptionMonthlyPriceMinor must be a non-negative integer or null" });
|
|
}
|
|
patch.subscriptionMonthlyPriceMinor = p ?? null;
|
|
}
|
|
if ("reserveSubscriberSpots" in body) {
|
|
if (typeof body.reserveSubscriberSpots !== "boolean") {
|
|
return reply.code(400).send({ error: "reserveSubscriberSpots must be a boolean" });
|
|
}
|
|
patch.reserveSubscriberSpots = body.reserveSubscriberSpots;
|
|
}
|
|
if ("anprEntryEnabled" in body) {
|
|
if (typeof body.anprEntryEnabled !== "boolean") {
|
|
return reply.code(400).send({ error: "anprEntryEnabled must be a boolean" });
|
|
}
|
|
patch.anprEntryEnabled = body.anprEntryEnabled;
|
|
}
|
|
for (const f of TEXT_FIELDS) {
|
|
if (f in body) patch[f] = normText(body[f]);
|
|
}
|
|
|
|
const existing = db.select().from(siteConfig).where(eq(siteConfig.id, 1)).get();
|
|
const updatedAt = new Date().toISOString();
|
|
if (existing) {
|
|
db.update(siteConfig).set({ ...patch, updatedAt }).where(eq(siteConfig.id, 1)).run();
|
|
} else {
|
|
db.insert(siteConfig).values({ id: 1, ...patch, updatedAt }).run();
|
|
}
|
|
const row = db.select().from(siteConfig).where(eq(siteConfig.id, 1)).get();
|
|
return toSiteConfig(row);
|
|
});
|
|
}
|