Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 94 additions & 9 deletions apps/server/src/broker/broker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import { randomUUID } from 'node:crypto';
import type { Logger } from '../logger.js';
import type { KafkaEvent, KafkaTail } from '../kafka/tail.js';
import type { GatewayClient } from '../rest/gateway-client.js';
import { resolveQuery } from './queries.js';
import type { Delta, Snapshot, Subscription } from './types.js';
import type { QueryName, QueryParams } from '@eveys-console/protocol';
import { mergeConnectorFromStatusEvent, resolveQuery } from './queries.js';
import type { Delta, Snapshot, Subscription, SubscriptionError } from './types.js';
import { applySubscriptionDelta, type QueryName, type QueryParams } from '@eveys-console/protocol';

export type DeliveryHandler = (subscriptionId: string, delta: Delta) => void;
export type DeliveryHandler = (subscriptionId: string, delta: Delta | SubscriptionError) => void;

interface ConnectionState {
connectionId: string;
Expand Down Expand Up @@ -64,11 +64,20 @@ export class Broker {
if (!conn) throw new Error(`unknown connection ${connectionId}`);

const subscriptionId = randomUUID();
const sub: Subscription = { id: subscriptionId, query, params };

const resolver = resolveQuery(query);
const snapshot = await resolver.snapshot(params, this.gateway);

if (this.connections.get(connectionId) !== conn)
throw new Error('Connection closed during subscribe');
const sub: Subscription = {
id: subscriptionId,
query,
params,
snapshot: snapshot.snapshot,
sequence: 0,
applied: new Map(),
pendingStatus: new Map(),
stoppedTransactions: new Set(),
};
conn.subscriptions.set(subscriptionId, sub);
return { subscriptionId, snapshot };
}
Expand All @@ -89,27 +98,103 @@ export class Broker {
for (const conn of this.connections.values()) {
for (const sub of conn.subscriptions.values()) {
const resolver = resolveQuery(sub.query);
const sequence = ++sub.sequence;
const key =
sub.query === 'charge-points' || sub.query === 'charge-point' ? event.cpId : null;
// Keep in-flight status events even before a new charger has a fleet
// row. The next completed refetch folds in every observed connector.
if (
event.topic === 'cp.status' &&
key &&
(sub.query === 'charge-points' || sub.params.cp_id === key)
) {
const pending = sub.pendingStatus.get(key) ?? [];
pending.push(event);
sub.pendingStatus.set(key, pending);
}
const current = () =>
this.connections.get(conn.connectionId) === conn &&
conn.subscriptions.get(sub.id) === sub;
void resolver
.deltasFromEvent(sub.params, event, this.gateway)
.then((deltas) => {
for (const delta of deltas) {
if (
!current() ||
deltas.length === 0 ||
(key && sequence < (sub.applied.get(key) ?? 0))
)
return;
if (key) sub.applied.set(key, sequence);
for (const raw of deltas) {
let delta = raw;
// Start and stop arrive on different topics. A transaction ID
// is terminal after stop, even if its old start is delivered later.
// This state lasts only for this active subscription.
if (delta.delta.kind === 'transactions-active') {
if (delta.delta.op === 'remove' && delta.delta.transaction_id !== undefined)
sub.stoppedTransactions.add(delta.delta.transaction_id);
if (
delta.delta.op === 'upsert' &&
delta.delta.row &&
sub.stoppedTransactions.has(delta.delta.row.transaction_id)
)
continue;
}
if (
(delta.delta.kind === 'charge-point' || delta.delta.kind === 'charge-points') &&
delta.delta.row
) {
let row = delta.delta.row;
for (const statusEvent of sub.pendingStatus.get(row.cp_id) ?? [])
row = mergeConnectorFromStatusEvent(row, statusEvent);
delta = { ...delta, delta: { ...delta.delta, row } };
}
sub.snapshot = applySubscriptionDelta(sub.snapshot, delta.delta) ?? sub.snapshot;
if (delta.delta.kind === 'charge-point' && sub.snapshot.kind === 'charge-point') {
delta = { ...delta, delta: { ...delta.delta, row: sub.snapshot.row } };
} else if (
delta.delta.kind === 'charge-points' &&
delta.delta.row &&
sub.snapshot.kind === 'charge-points'
) {
const incoming = delta.delta.row;
delta = {
...delta,
delta: {
...delta.delta,
row: sub.snapshot.rows.find((row) => row.cp_id === incoming.cp_id) ?? incoming,
},
};
}
try {
conn.deliver(sub.id, delta);
} catch (err) {
this.log.warn({ err, connectionId: conn.connectionId }, 'broker.deliver_failed');
}
}
if (key) sub.pendingStatus.delete(key);
})
.catch((err: unknown) => {
if (!current() || (key && sequence < (sub.applied.get(key) ?? 0))) return;
if (key) sub.applied.set(key, sequence);
if (key) sub.pendingStatus.delete(key);
this.log.warn(
{
err,
errorClass: err instanceof Error ? err.name : 'unknown',
connectionId: conn.connectionId,
subscriptionId: sub.id,
topic: event.topic,
},
'broker.resolver_failed',
);
try {
conn.deliver(sub.id, {
cursor: event.cursor,
error: 'Gateway refresh failed. Showing last known data.',
});
} catch {
this.log.warn({ connectionId: conn.connectionId }, 'broker.deliver_failed');
}
});
}
}
Expand Down
77 changes: 41 additions & 36 deletions apps/server/src/broker/queries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// protocol's wire shape is snake_case, so each resolver maps between
// the two.

import { mergeChargePoint, withConnectorFreshness } from '@eveys-console/protocol';
import type {
ChargePointSummary,
DeltaForQuery,
Expand Down Expand Up @@ -92,7 +93,7 @@ const chargePoints: QueryResolver = {
const cursor = `gw:cp-list:${Date.now()}`;
const snapshot: SnapshotForQuery = {
kind: 'charge-points',
rows: data.charge_points,
rows: data.charge_points.map(withConnectorFreshness),
next_cursor: data.next_cursor ?? null,
};
if (data.pagination) {
Expand Down Expand Up @@ -129,12 +130,8 @@ const chargePoints: QueryResolver = {
// call per event. Acceptable while load is low; a future commit
// will replace this with an in-memory snapshot store fed by the
// same Kafka tail.
let row: ChargePointSummary;
try {
row = (await gateway.getChargePoint(event.cpId)) as ChargePointSummary;
} catch {
return [];
}
let row = (await gateway.getChargePoint(event.cpId)) as ChargePointSummary;
if (row.cp_id !== event.cpId) throw new Error('Gateway charger identity mismatch');

// The gateway sources `connectors[]` from ClickHouse (`cp_status`),
// which the ingestor fills in batches. Right after a charger emits
Expand Down Expand Up @@ -216,43 +213,40 @@ const chargePoints: QueryResolver = {
// UI doesn't have to wait for the gateway's ClickHouse-backed
// connectors[] to catch up. Idempotent: if the row already carries a
// newer entry for the same connector, the event is dropped.
function mergeConnectorFromStatusEvent(
export function mergeConnectorFromStatusEvent(
row: ChargePointSummary,
event: KafkaEvent,
): ChargePointSummary {
const p = event.payload as Record<string, unknown> | null;
if (!p || typeof p !== 'object') return row;
const connectorId = Number(p.connectorId ?? NaN);
if (!Number.isFinite(connectorId)) return row;
if (!Number.isInteger(connectorId) || connectorId < 0) return row;
const status = typeof p.status === 'string' ? p.status : null;
if (!status) return row;
const reportedAt =
typeof p.chargerReportedAt === 'string' && p.chargerReportedAt
? p.chargerReportedAt
: event.timestamp.toISOString();
// EventEnvelope.occurred_at is the gateway receive time, also used by
// ClickHouse. A charger clock cannot outrank later server observations.
const reportedAt = event.timestamp.toISOString();
const errorCode = typeof p.errorCode === 'string' && p.errorCode !== '' ? p.errorCode : null;

const existing = row.connectors.find((c) => c.connector_id === connectorId);
if (existing && existing.last_changed_at && existing.last_changed_at >= reportedAt) {
return row;
}
const next = row.connectors.filter((c) => c.connector_id !== connectorId);
next.push({
connector_id: connectorId,
status,
error_code: errorCode,
last_changed_at: reportedAt,
return mergeChargePoint(row, {
...row,
connectors: [
{
connector_id: connectorId,
status,
error_code: errorCode,
last_changed_at: reportedAt,
},
],
});
next.sort((a, b) => a.connector_id - b.connector_id);
return { ...row, connectors: next };
}

const chargePoint: QueryResolver = {
async snapshot(params, gateway) {
const cpId = stringParam(params, 'cp_id');
const data = (await gateway.getChargePoint(cpId)) as ChargePointSummary;
const cursor = `gw:cp:${cpId}:${Date.now()}`;
return { cursor, snapshot: { kind: 'charge-point', row: data } };
return { cursor, snapshot: { kind: 'charge-point', row: withConnectorFreshness(data) } };
},
async deltasFromEvent(params, event, gateway) {
const cpId = stringParam(params, 'cp_id');
Expand All @@ -277,12 +271,9 @@ const chargePoint: QueryResolver = {
// Same approach as the list resolver: re-fetch the full row from
// the gateway so the UI gets a complete update. This page is one
// charger so the cost is bounded.
let row: ChargePointSummary;
try {
row = (await gateway.getChargePoint(cpId)) as ChargePointSummary;
} catch {
return [];
}
let row = (await gateway.getChargePoint(cpId)) as ChargePointSummary;
if (row.cp_id !== cpId) throw new Error('Gateway charger identity mismatch');
if (event.topic === 'cp.status') row = mergeConnectorFromStatusEvent(row, event);
const delta: DeltaForQuery = { kind: 'charge-point', row };
return [{ cursor: event.cursor, delta }];
},
Expand All @@ -299,15 +290,25 @@ const transactionsActive: QueryResolver = {
};
},
async deltasFromEvent(_params, event) {
if (event.topic !== 'tx.started') return [];
if (event.topic !== 'tx.started' && event.topic !== 'tx.stopped') return [];
const p = event.payload as Record<string, unknown> | null;
if (!p || typeof p !== 'object') return [];
const transactionId = Number(p.transactionId ?? NaN);
if (!Number.isInteger(transactionId)) return [];
if (event.topic === 'tx.stopped') {
return [
{
cursor: event.cursor,
delta: { kind: 'transactions-active', op: 'remove', transaction_id: transactionId },
},
];
}
// The wire shape mirrors the gateway's GET /api/v1/transactions row.
// For a delta from a tx.started event we only have a subset; the
// missing fields (stopped_*, consumed_wh) are null because the
// session is still open.
const row = {
transaction_id: Number(p.transactionId ?? 0),
transaction_id: transactionId,
cp_id: event.cpId ?? '',
connector_id: Number(p.connectorId ?? 0),
id_tag: String(p.idTag ?? ''),
Expand Down Expand Up @@ -435,17 +436,21 @@ const deviceEvents: QueryResolver = {
// that don't need history) or the CP has no recorded events
// yet.
let rows: DeviceEvent[] = [];
let history_state: 'available' | 'unavailable' | 'unconfigured' = 'unconfigured';
let history_error: 'read_failed' | null = null;
const cpIdRaw = params.cp_id;
if (eventLogRoot && typeof cpIdRaw === 'string' && cpIdRaw.length > 0) {
try {
rows = await tailLastN(eventLogRoot, cpIdRaw, { limit: bootstrapLimit });
history_state = 'available';
} catch {
rows = [];
history_state = 'unavailable';
history_error = 'read_failed';
}
}
return {
cursor: `gw:device-events:bootstrap:${Date.now()}`,
snapshot: { kind: 'device-events', rows },
snapshot: { kind: 'device-events', rows, history_state, history_error },
};
},
async deltasFromEvent(params, event) {
Expand Down
11 changes: 11 additions & 0 deletions apps/server/src/broker/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,17 @@ import type {
QueryParams,
SnapshotForQuery,
} from '@eveys-console/protocol';
import type { KafkaEvent } from '../kafka/tail.js';

export interface Subscription {
id: string;
query: QueryName;
params: QueryParams;
snapshot: SnapshotForQuery;
sequence: number;
applied: Map<string, number>;
pendingStatus: Map<string, KafkaEvent[]>;
stoppedTransactions: Set<number>;
}

export interface Snapshot {
Expand All @@ -20,3 +26,8 @@ export interface Delta {
cursor: string;
delta: DeltaForQuery;
}

export interface SubscriptionError {
cursor: string;
error: string;
}
2 changes: 1 addition & 1 deletion apps/server/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ async function main() {
// healthchecks already need to know the deployment's URL shape.
await app.register(
async (api) => {
await registerHealthRoutes(api);
await registerHealthRoutes(api, { kafka, gateway });
await registerMetricsRoute(api);
await registerAuthRoutes(api, { pow, users });
await registerSysStatusRoute(api, { broker, gateway, kafka, startedAt });
Expand Down
11 changes: 8 additions & 3 deletions apps/server/src/rest/gateway-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ export class GatewayClient {
private async json<T>(
op: GatewayOp,
path: string,
init?: { method?: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH'; body?: unknown },
init?: {
method?: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
body?: unknown;
signal?: AbortSignal;
},
): Promise<T> {
const url = `${this.cfg.GATEWAY_BASE_URL}${path}`;
const headers: Record<string, string> = {
Expand All @@ -29,6 +33,7 @@ export class GatewayClient {
const start = Date.now();
const method = init?.method ?? 'GET';
const reqOpts: Parameters<typeof request>[1] = { method, headers };
if (init?.signal) reqOpts.signal = init.signal;
if (init?.body !== undefined) reqOpts.body = JSON.stringify(init.body);
// `op` is a closed enum (see GatewayOp) so the {op,status} label
// cartesian stays bounded; URL paths never become labels.
Expand All @@ -49,8 +54,8 @@ export class GatewayClient {
}
}

health() {
return this.json<unknown>('health', '/api/v1/health');
health(signal?: AbortSignal) {
return this.json<unknown>('health', '/api/v1/health', signal ? { signal } : undefined);
}

sysConfig() {
Expand Down
Loading
Loading