alex/pi-car-companion
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix active connection observation

Browse Source
This commit is contained in:
Alex
2026-07-31 21:05:53 +02:00
parent 37e2cb154e
commit 4738bf0ecc
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/network-observer.ts
+6 -2
View File
@@ -109,7 +109,7 @@ function numericValue(line: string, name: string): number | null {
async function flows(): Promise<{ available: boolean; flows: Flow[] }> { async function flows(): Promise<{ available: boolean; flows: Flow[] }> {
try { try {
const output = await execute("/usr/sbin/conntrack", ["--list"], 1024 * 1024); const output = await execute("/usr/sbin/conntrack", ["-L"], 1024 * 1024);
const parsed: Flow[] = []; const parsed: Flow[] = [];
for (const line of output.trim().split("\n")) { for (const line of output.trim().split("\n")) {
const protocol = line.match(/^(tcp|udp)\s/)?.[1] as "tcp" | "udp" | undefined; const protocol = line.match(/^(tcp|udp)\s/)?.[1] as "tcp" | "udp" | undefined;
@@ -140,12 +140,16 @@ async function flows(): Promise<{ available: boolean; flows: Flow[] }> {
async function collect(): Promise<Activity> { async function collect(): Promise<Activity> {
const [clientList, dns, activeFlows] = await Promise.all([clients(), dnsQueries(), flows()]); const [clientList, dns, activeFlows] = await Promise.all([clients(), dnsQueries(), flows()]);
const activeClients = new Set(activeFlows.flows.map((flow) => flow.sourceAddress));
const clientsWithFlowState = clientList.map((client) =>
!client.connected && activeClients.has(client.ipAddress) ? { ...client, connected: true, state: "ACTIVE" } : client
);
const messages: string[] = []; const messages: string[] = [];
if (!dns.available) messages.push("DNS query metadata is unavailable; restart the hotspot after installing its dnsmasq configuration."); if (!dns.available) messages.push("DNS query metadata is unavailable; restart the hotspot after installing its dnsmasq configuration.");
if (!activeFlows.available) messages.push("Active flows are unavailable because conntrack is not installed or accessible."); if (!activeFlows.available) messages.push("Active flows are unavailable because conntrack is not installed or accessible.");
return networkActivitySchema.parse({ return networkActivitySchema.parse({
collectedAt: new Date().toISOString(), collectedAt: new Date().toISOString(),
clients: clientList, clients: clientsWithFlowState,
dnsQueries: dns.queries, dnsQueries: dns.queries,
flows: activeFlows.flows, flows: activeFlows.flows,
dnsAvailable: dns.available, dnsAvailable: dns.available,