feat(booth): pay-on-foot at the booth — ticket lookup, pay, exit, voucher, snapshots
Backend: PayStation.lookup (session view + quote in one read); ExitFlow.exitForBooth reuses the reader path's paid+grace validation (no booth-only unpaid bypass) and signs vehicle_exit + pulses an exit relay; printExitVoucher reprints the paid ticket id barcode; site_config.exit_voucher_default (migration 0002) drives the default. Routes: GET /api/session/:id, POST /api/exit, POST /api/voucher. Web: BoothPayModal (entry/now/duration/total, tender, 'Printo biletë dalje'), SnapshotStrip (entry/exit evidence), api.ts client fns, SiteSettings toggle.
This commit is contained in:
@@ -0,0 +1,81 @@
|
||||
import { eq, siteConfig, type Db } from "@parking/db";
|
||||
import {
|
||||
printWithFailover,
|
||||
registry,
|
||||
type PrinterDevice,
|
||||
type PrinterInstance,
|
||||
type TicketData,
|
||||
type TicketHeader,
|
||||
} from "@parking/devices";
|
||||
import type { FastifyBaseLogger } from "fastify";
|
||||
import { devicesByDirection } from "./device-resolve.js";
|
||||
|
||||
// Booth-side printing for the EXIT VOUCHER ("biletë dalje"). When the booth is far
|
||||
// from the exit, the customer pays at the booth and walks a printed voucher to the
|
||||
// exit, where they self-scan it. The voucher reprints the SAME ticket id as a
|
||||
// Code128 barcode (now a paid session) — so the exit reader runs the normal exit
|
||||
// validation and opens. See wiki/concepts/booth-exit-flow.md, ticket-encoding.md.
|
||||
//
|
||||
// This mirrors the entry flow's printer selection + header build, but prints on the
|
||||
// BOOTH printer (role "booth-receipt") since that's where the operator stands.
|
||||
|
||||
/** Park identity for the voucher header, from site_config (all fields optional). */
|
||||
function ticketHeader(db: Db): TicketHeader | undefined {
|
||||
const row = db.select().from(siteConfig).where(eq(siteConfig.id, 1)).get();
|
||||
if (!row) return undefined;
|
||||
return {
|
||||
parkName: row.parkName,
|
||||
operatorName: row.operatorName,
|
||||
nius: row.nius,
|
||||
address: row.address,
|
||||
phone: row.phone,
|
||||
};
|
||||
}
|
||||
|
||||
/** Build live printer instances for failover selection (entry direction covers the
|
||||
* booth-receipt role too — the booth printer is configured on the entry side). */
|
||||
function loadPrinters(db: Db): PrinterInstance[] {
|
||||
const rows = devicesByDirection(db, "printer", "entry");
|
||||
const out: PrinterInstance[] = [];
|
||||
for (const row of rows) {
|
||||
const driver = registry.get(row.driverId);
|
||||
if (!driver) continue;
|
||||
const cfg = row.config as Record<string, unknown>;
|
||||
const role = cfg.role === "booth-receipt" ? "booth-receipt" : "entry-dispenser";
|
||||
try {
|
||||
out.push({
|
||||
id: row.id,
|
||||
role,
|
||||
failoverRank: typeof cfg.failoverRank === "number" ? cfg.failoverRank : 0,
|
||||
device: driver.create(cfg as never) as PrinterDevice,
|
||||
});
|
||||
} catch {
|
||||
// skip a printer whose config won't build
|
||||
}
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
/**
|
||||
* Print an exit voucher for a paid session: the same ticket id reprinted as a
|
||||
* barcode, on the booth printer (failing over to the entry dispenser). Returns the
|
||||
* id of the printer that printed it. Throws NoPrinterAvailableError if none can.
|
||||
*/
|
||||
export async function printExitVoucher(
|
||||
db: Db,
|
||||
ticketId: string,
|
||||
logger: FastifyBaseLogger,
|
||||
): Promise<string> {
|
||||
const printers = loadPrinters(db);
|
||||
const ticket: TicketData = {
|
||||
ticketId,
|
||||
issuedAt: new Date().toISOString(),
|
||||
header: ticketHeader(db),
|
||||
};
|
||||
// Prefer the booth printer (operator is at the booth); fall back to the dispenser.
|
||||
const printedBy = await printWithFailover(printers, "booth-receipt", (d: PrinterDevice) =>
|
||||
d.printTicket(ticket),
|
||||
);
|
||||
logger.info(`exit voucher for ${ticketId} printed on ${printedBy}`);
|
||||
return printedBy;
|
||||
}
|
||||
+216
-13
@@ -1,6 +1,6 @@
|
||||
import { desc, eq, ledgerEvents, sessions, tariffVersions, tariffs, type Db, type DeviceRow } from "@parking/db";
|
||||
import { registry, type AccessControlDevice } from "@parking/devices";
|
||||
import type { ResolvedRelay } from "./device-resolve.js";
|
||||
import { firstRelayByDirection, type ResolvedRelay } from "./device-resolve.js";
|
||||
import { snapshotAsync } from "./snapshot.js";
|
||||
import { computeFee, type LedgerPayload, type TariffStructure } from "@parking/shared";
|
||||
import type { FastifyBaseLogger } from "fastify";
|
||||
@@ -38,6 +38,21 @@ interface SessionView {
|
||||
readonly freeGrace: { tariffVersionId: string; currency: string; graceExitMin: number } | null;
|
||||
}
|
||||
|
||||
/** Result of a booth-driven exit (POST /api/exit). `ok=false` = validation rejected
|
||||
* (nothing signed beyond an anomaly). `ok=true, opened=false` = exit IS signed but
|
||||
* the barrier didn't open (payment stands; operator opens manually). */
|
||||
export type BoothExitResult =
|
||||
| { ok: false; status: "invalid" | "no_session" | "closed" | "unpaid" | "grace_expired"; reason: string }
|
||||
| { ok: true; opened: true }
|
||||
| { ok: true; opened: false; reason: string };
|
||||
|
||||
/** Result of a human-intervention barrier re-open (POST /api/barrier/reopen).
|
||||
* `ok=false` = refused (no session / unpaid). `ok=true, opened=false` = the
|
||||
* intervention was recorded (signed anomaly) but the relay did not fire. */
|
||||
export type BoothReopenResult =
|
||||
| { ok: false; reason: string }
|
||||
| { ok: true; opened: boolean; reason?: string };
|
||||
|
||||
export class ExitFlow {
|
||||
readonly #db: Db;
|
||||
readonly #log: EventLog;
|
||||
@@ -50,6 +65,170 @@ export class ExitFlow {
|
||||
this.#logger = logger;
|
||||
}
|
||||
|
||||
/**
|
||||
* BOOTH-driven exit: the operator (not a reader at the lane) opens the barrier for
|
||||
* a ticket. Runs the SAME validation as the reader path — there is no booth-only
|
||||
* bypass that admits an unpaid car (see wiki/concepts/booth-exit-flow.md +
|
||||
* threat-model.md). On a valid session it signs vehicle_exit, resolves AN exit
|
||||
* relay site-wide, pulses it, and fires the exit snapshot.
|
||||
*
|
||||
* Returns a discriminated result so the route can react precisely:
|
||||
* - { ok: false, status } when validation rejects (unpaid / no session / closed)
|
||||
* — nothing is signed beyond the existing anomaly; the operator takes payment.
|
||||
* - { ok: true, opened: true } on a clean exit.
|
||||
* - { ok: true, opened: false } when the exit IS signed but the relay open FAILED
|
||||
* (offline controller / no exit relay). The signed payment + vehicle_exit STAND
|
||||
* (money was taken, the car is owed an exit) and an `anomaly` is appended so the
|
||||
* operator opens manually. Payment is never rolled back.
|
||||
*/
|
||||
async exitForBooth(identity: string): Promise<BoothExitResult> {
|
||||
const id = identity.trim();
|
||||
if (!id) return { ok: false, status: "invalid", reason: "ticket id required" };
|
||||
|
||||
const key = `booth:${id}`;
|
||||
if (this.#inFlight.has(key)) return { ok: false, status: "invalid", reason: "exit already in progress" };
|
||||
this.#inFlight.add(key);
|
||||
try {
|
||||
const view = this.#sessionFor(id);
|
||||
|
||||
// No open session — unknown/closed ticket. Sign an anomaly (same as the reader
|
||||
// path) so a booth attempt on a bad ticket is auditable.
|
||||
if (!view || !view.open) {
|
||||
const reason = view ? "exit refused — session already closed" : "exit refused — no open session for ticket";
|
||||
await this.#log.append({ type: "anomaly", identity: id, payload: { reason, exitRefused: true, source: "booth" } });
|
||||
this.#logger.warn(`booth exit refused (${id}): ${reason}`);
|
||||
return { ok: false, status: view ? "closed" : "no_session", reason };
|
||||
}
|
||||
|
||||
// PAID + within grace, OR free entry-grace — the same checks the reader uses.
|
||||
const freeGrace = view.paidAt == null && view.freeGrace != null;
|
||||
const paid = view.paidAt != null;
|
||||
const withinGrace =
|
||||
paid && view.graceExitMin != null && Date.now() - Date.parse(view.paidAt!) <= view.graceExitMin * 60_000;
|
||||
|
||||
if (!freeGrace && (!paid || !withinGrace)) {
|
||||
const reason = !paid
|
||||
? "exit refused — not paid (take payment first)"
|
||||
: "exit refused — walk-back grace expired (top-up required)";
|
||||
await this.#log.append({ type: "anomaly", identity: id, payload: { reason, exitRefused: true, source: "booth" } });
|
||||
this.#logger.warn(`booth exit refused (${id}): ${reason}`);
|
||||
return { ok: false, status: paid ? "grace_expired" : "unpaid", reason };
|
||||
}
|
||||
|
||||
// Free entry-grace path: mint the $0 payment first (ledger invariant), as the
|
||||
// reader path does.
|
||||
if (freeGrace && view.freeGrace) {
|
||||
await this.#log.append({
|
||||
type: "payment",
|
||||
identity: id,
|
||||
payload: {
|
||||
sessionRef: id,
|
||||
amountMinor: 0,
|
||||
currency: view.freeGrace.currency,
|
||||
tariffVersionId: view.freeGrace.tariffVersionId,
|
||||
graceExitMin: view.freeGrace.graceExitMin,
|
||||
reason: "free entry-grace (no charge)",
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
// Resolve AN exit barrier site-wide (no reader binding to follow at the booth).
|
||||
const resolved = firstRelayByDirection(this.#db, "exit");
|
||||
|
||||
// Sign the vehicle_exit regardless of whether a relay resolves — the decision
|
||||
// to let the car out has been made and validated. Then attempt the open.
|
||||
await this.#signExit(id);
|
||||
|
||||
if (!resolved) {
|
||||
await this.#openFailedAnomaly(id, "no exit relay configured");
|
||||
return { ok: true, opened: false, reason: "exit recorded, but no exit barrier is configured — open manually" };
|
||||
}
|
||||
const access = this.#buildAccess(resolved.controller);
|
||||
if (!access) {
|
||||
await this.#openFailedAnomaly(id, "exit controller would not build");
|
||||
return { ok: true, opened: false, reason: "exit recorded, but the barrier is unavailable — open manually" };
|
||||
}
|
||||
try {
|
||||
await access.pulseOpen(resolved.relay);
|
||||
} catch (err) {
|
||||
await this.#openFailedAnomaly(id, `pulseOpen failed: ${(err as Error).message}`);
|
||||
return { ok: true, opened: false, reason: "exit recorded, but the barrier did not open — open manually" };
|
||||
}
|
||||
|
||||
this.#fireExitSnapshot(id);
|
||||
this.#closeSessionCache(id);
|
||||
return { ok: true, opened: true };
|
||||
} finally {
|
||||
this.#inFlight.delete(key);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* HUMAN-INTERVENTION barrier re-open for an ACTIVE session (booth Active Sessions
|
||||
* list). The barrier is unconfirmed; a car may be stuck after a damaged-ticket
|
||||
* read, a dead scanner, or a phantom re-close (animal / bag / box). The operator
|
||||
* opens the barrier with a signed trace.
|
||||
*
|
||||
* Guard: requires a PAYMENT — no payment, no re-open (the no-unpaid-bypass rule;
|
||||
* the UI also hides the button). Unlike exitForBooth this does NOT sign a
|
||||
* `vehicle_exit` (the session may already be exited; a second exit would
|
||||
* double-count occupancy). It re-pulses the exit relay and signs an `anomaly`
|
||||
* ("manual barrier open", attributed). Idempotent-safe per identity via #inFlight.
|
||||
* See wiki/concepts/booth-exit-flow.md.
|
||||
*/
|
||||
async reopenBarrier(identity: string, operator?: string): Promise<BoothReopenResult> {
|
||||
const id = identity.trim();
|
||||
if (!id) return { ok: false, reason: "ticket id required" };
|
||||
|
||||
const view = this.#sessionFor(id);
|
||||
if (!view) return { ok: false, reason: "no session for ticket" };
|
||||
// No payment → no re-open. The barrier-open action is only for sessions that
|
||||
// have been paid (or paid-then-exited within grace). An unpaid car takes the
|
||||
// pay/exit flow instead — enforced here, not just in the UI.
|
||||
if (view.paidAt == null) {
|
||||
return { ok: false, reason: "session not paid — no barrier open without payment" };
|
||||
}
|
||||
|
||||
const key = `reopen:${id}`;
|
||||
if (this.#inFlight.has(key)) return { ok: false, reason: "re-open already in progress" };
|
||||
this.#inFlight.add(key);
|
||||
try {
|
||||
const resolved = firstRelayByDirection(this.#db, "exit");
|
||||
// Sign the audited anomaly FIRST (the intervention is recorded whether or not
|
||||
// the physical open succeeds) — never a second vehicle_exit.
|
||||
await this.#log.append({
|
||||
type: "anomaly",
|
||||
identity: id,
|
||||
payload: {
|
||||
reason: "manual barrier open (human intervention)",
|
||||
source: "booth",
|
||||
barrierReopen: true,
|
||||
...(operator ? { operator } : {}),
|
||||
},
|
||||
});
|
||||
|
||||
if (!resolved) {
|
||||
this.#logger.warn(`barrier re-open for ${id}: no exit relay configured`);
|
||||
return { ok: true, opened: false, reason: "no exit barrier configured — open manually" };
|
||||
}
|
||||
const access = this.#buildAccess(resolved.controller);
|
||||
if (!access) {
|
||||
this.#logger.warn(`barrier re-open for ${id}: exit controller would not build`);
|
||||
return { ok: true, opened: false, reason: "barrier unavailable — open manually" };
|
||||
}
|
||||
try {
|
||||
await access.pulseOpen(resolved.relay);
|
||||
} catch (err) {
|
||||
this.#logger.error(`barrier re-open pulseOpen failed (${id}): ${(err as Error).message}`);
|
||||
return { ok: true, opened: false, reason: "barrier did not open — open manually" };
|
||||
}
|
||||
this.#logger.info(`manual barrier open for ${id}${operator ? ` by ${operator}` : ""}`);
|
||||
return { ok: true, opened: true };
|
||||
} finally {
|
||||
this.#inFlight.delete(key);
|
||||
}
|
||||
}
|
||||
|
||||
/** Handle a transient-ticket read at an exit barrier (the relay pre-resolved by the
|
||||
* read dispatcher from the reader's binding, which has ruled out a permit match). */
|
||||
async handleAt(resolved: ResolvedRelay, e: DeviceReadEvent): Promise<ReadOutcome> {
|
||||
@@ -131,36 +310,60 @@ export class ExitFlow {
|
||||
* Shared by the paid-exit and free-entry-grace paths. The caller has already
|
||||
* established the session is allowed out (and, for grace, minted the $0 payment). */
|
||||
async #signExitAndOpen(resolved: ResolvedRelay, e: DeviceReadEvent): Promise<ReadOutcome> {
|
||||
await this.#log.append({
|
||||
type: "vehicle_exit",
|
||||
direction: "exit",
|
||||
source: e.kind === "plate" ? "lpr" : "ticket",
|
||||
identity: e.value,
|
||||
payload: { sessionRef: e.value },
|
||||
});
|
||||
await this.#signExit(e.value, e.kind === "plate" ? "lpr" : "ticket");
|
||||
|
||||
const access = this.#buildAccess(resolved.controller);
|
||||
if (access) await access.pulseOpen(resolved.relay);
|
||||
else this.#logger.warn(`exit signed for ${e.value} but the exit relay won't build`);
|
||||
|
||||
// SNAPSHOT — fire the exit camera(s), never awaited (evidence, not a gate).
|
||||
this.#fireExitSnapshot(e.value);
|
||||
this.#closeSessionCache(e.value);
|
||||
return { accepted: true, direction: "exit" };
|
||||
}
|
||||
|
||||
/** Append the signed vehicle_exit. `source` defaults to "ticket" (booth/manual). */
|
||||
async #signExit(identity: string, source: "ticket" | "lpr" = "ticket"): Promise<void> {
|
||||
await this.#log.append({
|
||||
type: "vehicle_exit",
|
||||
direction: "exit",
|
||||
source,
|
||||
identity,
|
||||
payload: { sessionRef: identity },
|
||||
});
|
||||
}
|
||||
|
||||
/** Fire the exit camera(s); never awaited (evidence, not a gate). */
|
||||
#fireExitSnapshot(identity: string): void {
|
||||
void snapshotAsync({
|
||||
db: this.#db,
|
||||
direction: "exit",
|
||||
identity: e.value,
|
||||
identity,
|
||||
logger: this.#logger,
|
||||
}).catch((err) => this.#logger.error(`exit snapshot error: ${(err as Error).message}`));
|
||||
}
|
||||
|
||||
/** Update the (rebuildable) session projection cache to closed. */
|
||||
#closeSessionCache(identity: string): void {
|
||||
try {
|
||||
this.#db
|
||||
.update(sessions)
|
||||
.set({ exitedAt: new Date().toISOString(), state: "closed" })
|
||||
.where(eq(sessions.id, e.value))
|
||||
.where(eq(sessions.id, identity))
|
||||
.run();
|
||||
} catch (err) {
|
||||
this.#logger.error(`session-cache close failed for ${e.value}: ${(err as Error).message}`);
|
||||
this.#logger.error(`session-cache close failed for ${identity}: ${(err as Error).message}`);
|
||||
}
|
||||
return { accepted: true, direction: "exit" };
|
||||
}
|
||||
|
||||
/** Record an audited anomaly when an exit was signed but the barrier didn't open.
|
||||
* The payment + exit STAND; this tells the operator to open manually. */
|
||||
async #openFailedAnomaly(identity: string, detail: string): Promise<void> {
|
||||
await this.#log.append({
|
||||
type: "anomaly",
|
||||
identity,
|
||||
payload: { reason: "exit signed but barrier open failed", detail, source: "booth", exitOpenFailed: true },
|
||||
});
|
||||
this.#logger.error(`booth exit open failed (${identity}): ${detail}`);
|
||||
}
|
||||
|
||||
/** Fold the signed ledger into a session view for one identity (authoritative). */
|
||||
|
||||
@@ -35,6 +35,45 @@ export interface Quote {
|
||||
readonly graceExitMin: number;
|
||||
}
|
||||
|
||||
/** One row in the booth Active Sessions list. A session is "active" while it is
|
||||
* still open OR exited-but-within-grace — because the barrier is UNCONFIRMED, a
|
||||
* paid/exited car is presumed possibly-still-present until grace expires. The
|
||||
* "Open barrier" action is offered only when `paidAt != null` (no payment, no
|
||||
* button — the no-unpaid-bypass rule). See wiki/concepts/booth-exit-flow.md. */
|
||||
export interface ActiveSession {
|
||||
readonly identity: string;
|
||||
readonly source: string | null;
|
||||
readonly enteredAt: string;
|
||||
/** null while still inside; set once a vehicle_exit is signed (may still be present). */
|
||||
readonly exitedAt: string | null;
|
||||
readonly open: boolean;
|
||||
readonly paidAt: string | null;
|
||||
/** Amount owed now (open + unpaid only; null otherwise / no tariff). */
|
||||
readonly amountMinor: number | null;
|
||||
readonly currency: string | null;
|
||||
readonly withinGrace: boolean;
|
||||
readonly graceExpiresAt: string | null;
|
||||
}
|
||||
|
||||
/** Booth session view: everything the pay/exit modal needs in one read. */
|
||||
export interface SessionLookup {
|
||||
readonly identity: string;
|
||||
readonly found: boolean;
|
||||
/** Open = entered, no exit yet. */
|
||||
readonly open: boolean;
|
||||
readonly enteredAt: string | null;
|
||||
readonly exitedAt: string | null;
|
||||
/** Latest payment time, if paid. */
|
||||
readonly paidAt: string | null;
|
||||
/** Amount owed right now (the quote). Null when no session / no active tariff. */
|
||||
readonly amountMinor: number | null;
|
||||
readonly currency: string | null;
|
||||
/** True when paid AND still within the walk-back grace window. */
|
||||
readonly withinGrace: boolean;
|
||||
/** ISO time the walk-back grace expires (paidAt + graceExitMin), if paid. */
|
||||
readonly graceExpiresAt: string | null;
|
||||
}
|
||||
|
||||
export class PayStation {
|
||||
readonly #db: Db;
|
||||
readonly #log: EventLog;
|
||||
@@ -109,6 +148,145 @@ export class PayStation {
|
||||
return { amountMinor, currency: q.currency };
|
||||
}
|
||||
|
||||
/**
|
||||
* One-read session view for the booth pay/exit modal: entry/exit times, paid
|
||||
* state, amount owed now, and walk-back-grace status. Read-only — folds the
|
||||
* signed ledger (authoritative). A quote failure (no tariff) leaves amount null
|
||||
* rather than throwing, so the modal can still show the session.
|
||||
*/
|
||||
lookup(identity: string): SessionLookup {
|
||||
const id = identity.trim();
|
||||
const rows = this.#db
|
||||
.select()
|
||||
.from(ledgerEvents)
|
||||
.where(eq(ledgerEvents.identity, id))
|
||||
.orderBy(ledgerEvents.index)
|
||||
.all();
|
||||
const entry = rows.find((r) => r.type === "vehicle_entry");
|
||||
if (!entry) {
|
||||
return {
|
||||
identity: id, found: false, open: false, enteredAt: null, exitedAt: null,
|
||||
paidAt: null, amountMinor: null, currency: null, withinGrace: false, graceExpiresAt: null,
|
||||
};
|
||||
}
|
||||
const exitRow = rows.find((r) => r.type === "vehicle_exit");
|
||||
const open = !exitRow;
|
||||
|
||||
let paidAt: string | null = null;
|
||||
let graceExitMin: number | null = null;
|
||||
for (const r of rows) {
|
||||
if (r.type === "payment") {
|
||||
paidAt = r.occurredAt;
|
||||
const p = (r.payload ?? {}) as { graceExitMin?: number };
|
||||
if (typeof p.graceExitMin === "number") graceExitMin = p.graceExitMin;
|
||||
}
|
||||
}
|
||||
const graceExpiresAt =
|
||||
paidAt && graceExitMin != null ? new Date(Date.parse(paidAt) + graceExitMin * 60_000).toISOString() : null;
|
||||
const withinGrace = graceExpiresAt != null && Date.now() <= Date.parse(graceExpiresAt);
|
||||
|
||||
// Amount owed now (best-effort; null if no tariff resolves). Only meaningful while open.
|
||||
let amountMinor: number | null = null;
|
||||
let currency: string | null = null;
|
||||
if (open) {
|
||||
try {
|
||||
const q = this.quote(id);
|
||||
amountMinor = q.amountMinor;
|
||||
currency = q.currency;
|
||||
} catch {
|
||||
/* no active tariff — leave null; modal shows session without a price */
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
identity: id, found: true, open,
|
||||
enteredAt: entry.occurredAt, exitedAt: exitRow?.occurredAt ?? null,
|
||||
paidAt, amountMinor, currency, withinGrace, graceExpiresAt,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* All ACTIVE sessions for the booth list: still-open, OR exited-but-within-grace
|
||||
* (the barrier is unconfirmed, so a paid/exited car is presumed possibly-present
|
||||
* until grace expires). One ledger scan, grouped by identity (cheaper than N
|
||||
* lookups). Sorted by entry time, newest first. Folds the SIGNED ledger
|
||||
* (authoritative — not the sessions projection cache, which can drift).
|
||||
* See wiki/concepts/booth-exit-flow.md.
|
||||
*/
|
||||
activeSessions(): ActiveSession[] {
|
||||
const rows = this.#db.select().from(ledgerEvents).orderBy(ledgerEvents.index).all();
|
||||
|
||||
// Group the relevant events per identity in one pass.
|
||||
type Acc = { enteredAt?: string; source: string | null; exitedAt?: string; paidAt?: string; graceExitMin?: number };
|
||||
const byId = new Map<string, Acc>();
|
||||
for (const r of rows) {
|
||||
const id = r.identity;
|
||||
if (!id) continue;
|
||||
if (r.type === "vehicle_entry") {
|
||||
const a = byId.get(id) ?? { source: r.source ?? null };
|
||||
a.enteredAt = r.occurredAt;
|
||||
a.source = r.source ?? a.source;
|
||||
byId.set(id, a);
|
||||
} else if (r.type === "vehicle_exit") {
|
||||
const a = byId.get(id);
|
||||
if (a) a.exitedAt = r.occurredAt;
|
||||
} else if (r.type === "payment") {
|
||||
const a = byId.get(id);
|
||||
if (a) {
|
||||
a.paidAt = r.occurredAt;
|
||||
const p = (r.payload ?? {}) as { graceExitMin?: number };
|
||||
if (typeof p.graceExitMin === "number") a.graceExitMin = p.graceExitMin;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const now = Date.now();
|
||||
const out: ActiveSession[] = [];
|
||||
for (const [identity, a] of byId) {
|
||||
if (!a.enteredAt) continue; // no entry → not a real session
|
||||
const open = a.exitedAt == null;
|
||||
const graceExpiresAt =
|
||||
a.paidAt && a.graceExitMin != null
|
||||
? new Date(Date.parse(a.paidAt) + a.graceExitMin * 60_000).toISOString()
|
||||
: null;
|
||||
const withinGrace = graceExpiresAt != null && now <= Date.parse(graceExpiresAt);
|
||||
|
||||
// ACTIVE = still inside, OR exited but still within the (unconfirmed) grace window.
|
||||
// An exited session past grace is presumed truly gone → omitted.
|
||||
if (!open && !withinGrace) continue;
|
||||
|
||||
// Amount owed now: only meaningful for an open + unpaid session.
|
||||
let amountMinor: number | null = null;
|
||||
let currency: string | null = null;
|
||||
if (open && a.paidAt == null) {
|
||||
try {
|
||||
const q = this.quote(identity);
|
||||
amountMinor = q.amountMinor;
|
||||
currency = q.currency;
|
||||
} catch {
|
||||
/* no active tariff — leave null */
|
||||
}
|
||||
}
|
||||
|
||||
out.push({
|
||||
identity,
|
||||
source: a.source,
|
||||
enteredAt: a.enteredAt,
|
||||
exitedAt: a.exitedAt ?? null,
|
||||
open,
|
||||
paidAt: a.paidAt ?? null,
|
||||
amountMinor,
|
||||
currency,
|
||||
withinGrace,
|
||||
graceExpiresAt,
|
||||
});
|
||||
}
|
||||
|
||||
// Newest entry first.
|
||||
out.sort((x, y) => Date.parse(y.enteredAt) - Date.parse(x.enteredAt));
|
||||
return out;
|
||||
}
|
||||
|
||||
/** The vehicle_entry of an OPEN session for this identity (no later exit), or null. */
|
||||
#openEntry(identity: string) {
|
||||
const rows = this.#db
|
||||
|
||||
@@ -1,15 +1,21 @@
|
||||
import type { FastifyInstance } from "fastify";
|
||||
import type { Db } from "@parking/db";
|
||||
import { NoPrinterAvailableError } from "@parking/devices";
|
||||
import { requireRole } from "../auth.js";
|
||||
import {
|
||||
NoOpenSessionError,
|
||||
NoTariffError,
|
||||
type PayStation,
|
||||
} from "../pay-station.js";
|
||||
import type { ExitFlow } from "../exit-flow.js";
|
||||
import { printExitVoucher } from "../booth-print.js";
|
||||
|
||||
// Pay-station endpoints (pay-on-foot). The terminal/operator UI quotes a session
|
||||
// then takes payment; the payment becomes a signed ledger event. PCI scope stays
|
||||
// OUT of the app — actual card capture is a standalone P2PE terminal; here `tender`
|
||||
// just records cash vs. card. See wiki/concepts/tariff.md, parking-session.md, bom.md.
|
||||
// Booth endpoints (pay-on-foot): look up a session, quote it, take payment, and —
|
||||
// when the booth is at/near the exit — open the barrier. The payment becomes a
|
||||
// signed ledger event; PCI scope stays OUT of the app (card capture is a standalone
|
||||
// P2PE terminal; `tender` just records cash vs. card). The booth exit reuses the
|
||||
// SAME validation as the reader path — no booth-only bypass admits an unpaid car.
|
||||
// See wiki/concepts/tariff.md, parking-session.md, booth-exit-flow.md, bom.md.
|
||||
|
||||
interface QuoteQuery {
|
||||
identity: string;
|
||||
@@ -20,11 +26,76 @@ interface PayBody {
|
||||
/** Operator-set amount (lost ticket / dispute) — overrides the computed fee. */
|
||||
overrideMinor?: number;
|
||||
}
|
||||
interface ExitBody {
|
||||
identity: string;
|
||||
}
|
||||
interface VoucherBody {
|
||||
identity: string;
|
||||
}
|
||||
|
||||
export async function payRoutes(app: FastifyInstance, payStation: PayStation): Promise<void> {
|
||||
// Cashier/operator/admin operate the pay station; readonly may not.
|
||||
export async function payRoutes(
|
||||
app: FastifyInstance,
|
||||
db: Db,
|
||||
payStation: PayStation,
|
||||
exitFlow: ExitFlow,
|
||||
): Promise<void> {
|
||||
// Cashier/operator/admin operate the booth; readonly may not.
|
||||
const guard = requireRole("admin", "operator", "cashier");
|
||||
|
||||
// Active sessions for the booth list: still-open OR exited-but-within-grace
|
||||
// (barrier unconfirmed → a paid/exited car is presumed possibly-present until
|
||||
// grace expires). Read-only. See wiki/concepts/booth-exit-flow.md.
|
||||
app.get("/api/sessions/active", { preHandler: guard }, async () => ({
|
||||
sessions: payStation.activeSessions(),
|
||||
}));
|
||||
|
||||
// Session lookup for the booth pay/exit modal: entry/exit times, paid state,
|
||||
// amount owed now, walk-back-grace status. Read-only (no side effect).
|
||||
app.get<{ Params: { identity: string } }>(
|
||||
"/api/session/:identity",
|
||||
{ preHandler: guard },
|
||||
async (req, reply) => {
|
||||
const identity = (req.params.identity ?? "").trim();
|
||||
if (!identity) return reply.code(400).send({ error: "identity required" });
|
||||
return payStation.lookup(identity);
|
||||
},
|
||||
);
|
||||
|
||||
// Booth-driven exit: validate (paid + grace, or free entry-grace) THEN sign
|
||||
// vehicle_exit + open the barrier. Maps the discriminated result to HTTP:
|
||||
// - validation reject → 409 with a reason (operator takes payment first),
|
||||
// - exit signed but barrier didn't open → 200 { opened:false } (payment stands;
|
||||
// operator opens manually; an anomaly is already signed),
|
||||
// - clean exit → 200 { opened:true }.
|
||||
app.post<{ Body: ExitBody }>(
|
||||
"/api/exit",
|
||||
{ preHandler: guard },
|
||||
async (req, reply) => {
|
||||
const identity = (req.body?.identity ?? "").trim();
|
||||
if (!identity) return reply.code(400).send({ error: "identity required" });
|
||||
const res = await exitFlow.exitForBooth(identity);
|
||||
if (!res.ok) return reply.code(409).send({ error: res.reason, status: res.status });
|
||||
return reply.code(200).send(res);
|
||||
},
|
||||
);
|
||||
|
||||
// Human-intervention barrier re-open for an ACTIVE (paid) session — damaged
|
||||
// ticket / dead scanner / phantom re-close. Re-pulses the exit relay + signs an
|
||||
// anomaly (attributed); NEVER a second vehicle_exit. Refused without a payment
|
||||
// (no-unpaid-bypass). See wiki/concepts/booth-exit-flow.md.
|
||||
app.post<{ Body: ExitBody }>(
|
||||
"/api/barrier/reopen",
|
||||
{ preHandler: guard },
|
||||
async (req, reply) => {
|
||||
const identity = (req.body?.identity ?? "").trim();
|
||||
if (!identity) return reply.code(400).send({ error: "identity required" });
|
||||
const operator = req.user?.username;
|
||||
const res = await exitFlow.reopenBarrier(identity, operator);
|
||||
if (!res.ok) return reply.code(409).send({ error: res.reason });
|
||||
return reply.code(200).send(res);
|
||||
},
|
||||
);
|
||||
|
||||
// Quote: what does this session owe right now? (No side effect.)
|
||||
app.get<{ Querystring: QuoteQuery }>(
|
||||
"/api/pay/quote",
|
||||
@@ -60,6 +131,35 @@ export async function payRoutes(app: FastifyInstance, payStation: PayStation): P
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
// Print an exit voucher (the paid ticket id reprinted as a barcode) on the booth
|
||||
// printer. Used when the booth is far from the exit — the customer self-scans the
|
||||
// voucher at the exit reader, which runs the normal validated exit. Requires the
|
||||
// session to be PAID (no free vouchers for unpaid sessions). See booth-exit-flow.md.
|
||||
app.post<{ Body: VoucherBody }>(
|
||||
"/api/voucher",
|
||||
{ preHandler: guard },
|
||||
async (req, reply) => {
|
||||
const identity = (req.body?.identity ?? "").trim();
|
||||
if (!identity) return reply.code(400).send({ error: "identity required" });
|
||||
const view = payStation.lookup(identity);
|
||||
if (!view.found || !view.open) {
|
||||
return reply.code(404).send({ error: "no open session for ticket" });
|
||||
}
|
||||
if (view.paidAt == null) {
|
||||
return reply.code(409).send({ error: "session not paid — take payment before printing a voucher" });
|
||||
}
|
||||
try {
|
||||
const printedBy = await printExitVoucher(db, identity, app.log);
|
||||
return reply.code(200).send({ ok: true, printedBy });
|
||||
} catch (err) {
|
||||
if (err instanceof NoPrinterAvailableError) {
|
||||
return reply.code(503).send({ error: err.message });
|
||||
}
|
||||
return reply.code(500).send({ error: (err as Error).message });
|
||||
}
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
function mapError(reply: import("fastify").FastifyReply, err: unknown) {
|
||||
|
||||
@@ -21,13 +21,21 @@ 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;
|
||||
}
|
||||
|
||||
/** Shape returned by GET/PUT: capacity + every metadata field (null when unset). */
|
||||
type SiteConfig = { capacity: number | null } & Record<TextField, string | null>;
|
||||
/** Shape returned by GET/PUT: capacity + the booth flag + every metadata field. */
|
||||
type SiteConfig = { capacity: number | null; exitVoucherDefault: boolean } & Record<
|
||||
TextField,
|
||||
string | null
|
||||
>;
|
||||
|
||||
function toSiteConfig(row: typeof siteConfig.$inferSelect | undefined): SiteConfig {
|
||||
const out = { capacity: row?.capacity ?? null } as SiteConfig;
|
||||
const out = {
|
||||
capacity: row?.capacity ?? null,
|
||||
exitVoucherDefault: row?.exitVoucherDefault ?? false,
|
||||
} as SiteConfig;
|
||||
for (const f of TEXT_FIELDS) out[f] = row?.[f] ?? null;
|
||||
return out;
|
||||
}
|
||||
@@ -65,6 +73,12 @@ export async function siteRoutes(app: FastifyInstance, db: Db): Promise<void> {
|
||||
}
|
||||
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;
|
||||
}
|
||||
for (const f of TEXT_FIELDS) {
|
||||
if (f in body) patch[f] = normText(body[f]);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user