Tie points to locator serial numbers and store receiver telemetry

Field setups often relay through a phone/gateway that owns the MQTT
connection, so the publishing credential and the instrument are now
separate concepts:

- Points messages carry a "serial" identifying the locator receiver;
  unknown serials are auto-registered as devices in the publisher's
  org (name "Locator <serial>"). Device.mqttUsername is now optional
  and serialNumber is unique per org.
- LocatePoint gains standard receiver telemetry: frequencyHz,
  currentMa, signalDb, gainDb, locateMode (PEAK/NULL/BROAD_PEAK/SONDE),
  phaseDeg, compassDeg, distortionPct, plus GPS quality columns
  vAccuracy, satellites, hdop. All optional; raw payload still kept.
- Migration hand-edited to preserve the generated geom column and its
  GIST index (Prisma diff wanted to drop both).
- REST create/point DTOs, map tooltips, job-detail latest-point
  readout, devices settings form, seed, and the sample publisher all
  carry the new fields.
- Added .dockerignore for backend/web: COPY . . was clobbering the
  image's freshly generated Prisma client with the host's stale
  node_modules, breaking image builds after schema changes.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
ulhub
2026-07-14 14:58:12 +00:00
parent eae4075265
commit 21f5a04133
16 changed files with 380 additions and 68 deletions

2
web/.dockerignore Normal file
View File

@@ -0,0 +1,2 @@
node_modules
.next

View File

@@ -1,7 +1,7 @@
/// <reference types="google.maps" />
import { APIProvider, Map as GoogleMap, useMap } from '@vis.gl/react-google-maps';
import { useEffect, useRef } from 'react';
import { JobMapProps, MapPoint, UTILITY_COLORS } from '../types';
import { JobMapProps, MapPoint, pointSummary, UTILITY_COLORS } from '../types';
const API_KEY = process.env.NEXT_PUBLIC_GOOGLE_MAPS_API_KEY || '';
@@ -67,7 +67,7 @@ function PointsLayer({ points, fitBounds }: { points: MapPoint[]; fitBounds: boo
strokeColor: '#ffffff',
strokeWeight: 1.5,
},
title: `${p.utilityType} · ${p.fixType}${p.depth != null ? ` · depth ${p.depth}m` : ''}\n${new Date(p.recordedAt).toLocaleString()}`,
title: `${pointSummary(p)}\n${new Date(p.recordedAt).toLocaleString()}`,
});
overlaysRef.current.push(marker);
}

View File

@@ -8,9 +8,27 @@ export interface MapPoint {
lng: number;
utilityType: string;
fixType: string;
depth: number | null;
sequence: number | null;
recordedAt: string;
// Locator receiver telemetry (all optional — depends on the instrument)
depth: number | null;
frequencyHz: number | null;
currentMa: number | null;
signalDb: number | null;
gainDb: number | null;
locateMode: string | null;
compassDeg: number | null;
distortionPct: number | null;
}
export function pointSummary(p: MapPoint): string {
const parts = [`${p.utilityType} · ${p.fixType}`];
if (p.depth != null) parts.push(`depth ${p.depth}m`);
if (p.frequencyHz != null)
parts.push(p.frequencyHz >= 1000 ? `${p.frequencyHz / 1000}kHz` : `${p.frequencyHz}Hz`);
if (p.currentMa != null) parts.push(`${p.currentMa}mA`);
if (p.locateMode) parts.push(p.locateMode);
return parts.join(' · ');
}
export interface JobMapProps {

View File

@@ -2,7 +2,7 @@ import { useRouter } from 'next/router';
import { useCallback, useEffect, useState } from 'react';
import Layout from '../../components/Layout';
import JobMap from '../../components/map/JobMap';
import type { MapPoint } from '../../components/map/types';
import { pointSummary, type MapPoint } from '../../components/map/types';
import { api } from '../../lib/api';
import { useRequireAuth } from '../../lib/auth-context';
import { useJobStream } from '../../lib/use-job-stream';
@@ -98,13 +98,16 @@ export default function JobDetailPage() {
</p>
{job.description && <p>{job.description}</p>}
<div style={{ margin: '1rem 0', display: 'flex', gap: '1rem', color: '#555' }}>
<div style={{ margin: '1rem 0', display: 'flex', gap: '1rem', color: '#555', flexWrap: 'wrap' }}>
<span>
<strong>{points.length}</strong> points
</span>
<span style={{ color: live > 0 ? '#388e3c' : '#999' }}>
live{live > 0 ? ` (+${live} this session)` : ''}
</span>
{points.length > 0 && (
<span style={{ color: '#777' }}>latest: {pointSummary(points[points.length - 1])}</span>
)}
</div>
<JobMap points={points} heightPx={520} />

View File

@@ -7,7 +7,7 @@ interface DeviceRow {
id: string;
name: string;
serialNumber: string | null;
mqttUsername: string;
mqttUsername: string | null;
isActive: boolean;
lastSeenAt: string | null;
}
@@ -40,15 +40,19 @@ export default function DevicesPage() {
const addDevice = async (e: FormEvent) => {
e.preventDefault();
try {
const created = await api.post<DeviceRow & { provisioning: { pointsTopic: string } }>(
const created = await api.post<DeviceRow & { provisioning: { pointsTopic?: string; note: string } }>(
`/api/orgs/${orgId}/devices`,
{
name: form.name,
mqttUsername: form.mqttUsername,
mqttUsername: form.mqttUsername || undefined,
serialNumber: form.serialNumber || undefined,
},
);
setNotice(`Device created. It should publish points to ${created.provisioning.pointsTopic}`);
setNotice(
created.provisioning.pointsTopic
? `Device created. It should publish points to ${created.provisioning.pointsTopic}`
: created.provisioning.note,
);
setForm({ name: '', mqttUsername: '', serialNumber: '' });
reload();
} catch (err: any) {
@@ -98,16 +102,15 @@ export default function DevicesPage() {
style={{ padding: '0.4rem' }}
/>
<input
placeholder="mqtt username"
value={form.mqttUsername}
onChange={(e) => setForm((f) => ({ ...f, mqttUsername: e.target.value }))}
required
placeholder="serial number"
value={form.serialNumber}
onChange={(e) => setForm((f) => ({ ...f, serialNumber: e.target.value }))}
style={{ padding: '0.4rem' }}
/>
<input
placeholder="serial number (optional)"
value={form.serialNumber}
onChange={(e) => setForm((f) => ({ ...f, serialNumber: e.target.value }))}
placeholder="mqtt username (only if it connects itself)"
value={form.mqttUsername}
onChange={(e) => setForm((f) => ({ ...f, mqttUsername: e.target.value }))}
style={{ padding: '0.4rem' }}
/>
<button type="submit">Add device</button>
@@ -129,9 +132,7 @@ export default function DevicesPage() {
{devices.map((d) => (
<tr key={d.id} style={{ borderBottom: '1px solid #eee' }}>
<td style={{ padding: '0.5rem' }}>{d.name}</td>
<td>
<code>{d.mqttUsername}</code>
</td>
<td>{d.mqttUsername ? <code>{d.mqttUsername}</code> : '—'}</td>
<td>{d.serialNumber ?? '—'}</td>
<td style={{ color: d.isActive ? '#388e3c' : '#9e9e9e' }}>{d.isActive ? 'active' : 'disabled'}</td>
<td>{d.lastSeenAt ? new Date(d.lastSeenAt).toLocaleString() : 'never'}</td>