[feat](trx-rs): keep a station log, and a layout to work the bands from
The logbook of issue #54, in the shape the proposal settled on. A new crate, trx-logbook, holds the contact, the ADIF reader and writer, the file, and the rules for telling one contact from two. ADIF because it is the only thing the ecosystem reads: LoTW, eQSL, Club Log, QRZ and every other logger take it and nothing else, so a log that cannot write .adi cannot be uploaded, confirmed or moved. The reader is forgiving in the ways real files are irregular -- lowercase tags, CRLF, missing header, unknown fields, a declared length that is the only thing ending a value -- and carries what it does not model through to the export, so a round trip does not strip what another program wrote. The file is JSON Lines, appended one line per contact. A log is the one thing here that cannot be regenerated, and the bookmark store's whole-file dump would rewrite megabytes to log one contact and lose all of them if the power went halfway; an append costs the record being written and no more, which a test tears a line in half to prove. Edits append revisions, deletes append tombstones, and the file compacts when the superseded outnumber the live. The panel is its own tab and stands in every layout. An entry opens with six fields and no more -- frequency, mode, rig name, time, and the callsign and locator of whatever decode it was started from. A report stays empty: an FT8 SNR is not what was sent. Times come from the server, because the browser may be a phone in another timezone, and the panel says so when the two disagree by more than a second. Worked-before answers as a callsign is typed. A decode is not a contact, so the Log button on an FT8 or APRS row opens an entry and logs nothing by itself. The ham layout is the fifth operator layout, opening on the logbook with the radio controls around it, offered only where the rig can transmit. Two bugs found on the way, both in code written here: a frequency of a whole number of megahertz ending in a zero rendered as a tenth of itself, in Rust and in TypeScript alike, because trimming trailing zeros from "20.000000" walks back through the point. The API also sits under /api/logbook rather than /logbook, so it cannot shadow its own page the way /bookmarks does. Closes #54 Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01SyX26FCpMQxiBoC7r5K1A7 Signed-off-by: Stan Grams <sjg@haxx.space>
This commit is contained in:
Claude Opus 5
@@ -292,6 +292,10 @@ pub struct HttpUiConfig {
|
||||
pub bandplan_region: String,
|
||||
pub decode_history_retention_min: u64,
|
||||
pub decode_history_retention_min_by_rig: HashMap<String, u64>,
|
||||
/// Where the station log is kept; `None` takes the default.
|
||||
pub logbook_path: Option<String>,
|
||||
/// The callsign contacts are logged under, and the operator by default.
|
||||
pub station_callsign: Option<String>,
|
||||
}
|
||||
|
||||
impl Default for HttpUiConfig {
|
||||
@@ -305,6 +309,8 @@ impl Default for HttpUiConfig {
|
||||
bandplan_region: "iaru_r1".to_string(),
|
||||
decode_history_retention_min: 24 * 60,
|
||||
decode_history_retention_min_by_rig: HashMap::new(),
|
||||
logbook_path: None,
|
||||
station_callsign: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,8 @@ build = "build.rs"
|
||||
[dependencies]
|
||||
trx-core = { path = "../../../trx-core" }
|
||||
trx-frontend = { path = ".." }
|
||||
trx-logbook = { path = "../../trx-logbook" }
|
||||
chrono = { version = "0.4", default-features = false, features = ["clock", "serde"] }
|
||||
trx-protocol = { path = "../../../../src/trx-protocol" }
|
||||
tokio = { workspace = true, features = ["full"] }
|
||||
serde = { workspace = true, features = ["derive"] }
|
||||
@@ -30,3 +32,6 @@ pickledb = "0.5"
|
||||
dirs = "6"
|
||||
uuid = { workspace = true }
|
||||
ts-rs = "12.0.1"
|
||||
|
||||
[dev-dependencies]
|
||||
tempfile = "3"
|
||||
|
||||
@@ -633,9 +633,12 @@ function elementById(id) {
|
||||
compact: { label: "Compact", advanced: false, audio: false, scheduler: false, preferredTab: "main" },
|
||||
broadcast: { label: "Broadcast", unavailable: "Broadcast requires an enumerated WFM-capable receiver", advanced: false, audio: true, scheduler: false, preferredTab: "main", capability: "broadcast" },
|
||||
digital: { label: "Digital", unavailable: "Digital requires a compatible rig mode and an available decoder", advanced: false, audio: false, scheduler: false, preferredTab: "digital-modes", capability: "digital" },
|
||||
full: { label: "Full controls", advanced: true, audio: true, scheduler: true, preferredTab: "main" }
|
||||
full: { label: "Full controls", advanced: true, audio: true, scheduler: true, preferredTab: "main" },
|
||||
// Working the bands: the log is the task and the radio is the instrument,
|
||||
// so this one opens on the logbook with the controls a keystroke away.
|
||||
ham: { label: "Ham radio", unavailable: "Ham radio needs a rig that can transmit", advanced: true, audio: true, scheduler: false, preferredTab: "logbook", capability: "ham" }
|
||||
};
|
||||
const layoutCapabilities = { broadcast: false, digital: false };
|
||||
const layoutCapabilities = { broadcast: false, digital: false, ham: false };
|
||||
let activeRigId = null;
|
||||
const layoutSections = [
|
||||
{ id: "advanced-radio-controls", key: "advanced" },
|
||||
@@ -1530,6 +1533,7 @@ function decodeCbor(buffer) {
|
||||
var TAB_ORDER = [
|
||||
"main",
|
||||
"bookmarks",
|
||||
"logbook",
|
||||
"digital-modes",
|
||||
"map",
|
||||
"satellites",
|
||||
@@ -1541,6 +1545,7 @@ var TAB_ORDER = [
|
||||
var TAB_PATHS = {
|
||||
main: "/",
|
||||
bookmarks: "/bookmarks",
|
||||
logbook: "/logbook",
|
||||
"digital-modes": "/digital-modes",
|
||||
map: "/map",
|
||||
satellites: "/satellites",
|
||||
@@ -1764,6 +1769,7 @@ var pluginGroups = {
|
||||
satellites: ["/satellite-predictions.js"],
|
||||
statistics: ["/map-core.js"],
|
||||
bookmarks: ["/bookmarks.js"],
|
||||
logbook: ["/logbook.js"],
|
||||
recorder: [],
|
||||
settings: ["/vchan.js", "/scheduler.js"]
|
||||
};
|
||||
@@ -1788,7 +1794,7 @@ async function loadPlugins(group) {
|
||||
for (const path of pluginGroups[group]) await loadPlugin(path);
|
||||
}
|
||||
async function loadEagerPlugins() {
|
||||
await Promise.all(["digital-modes", "bookmarks", "settings"].map(loadPlugins));
|
||||
await Promise.all(["digital-modes", "bookmarks", "logbook", "settings"].map(loadPlugins));
|
||||
}
|
||||
async function loadPluginsForTab(tab) {
|
||||
await loadPlugins(tab);
|
||||
@@ -2950,7 +2956,10 @@ function refreshOperatorLayoutCapabilities() {
|
||||
));
|
||||
window.trxUi?.setLayoutCapabilities({
|
||||
broadcast: rigModes.some((modes) => modes.includes("WFM")),
|
||||
digital: decoderModes.size > 0 && rigModes.some((modes) => modes.some((mode) => decoderModes.has(mode)))
|
||||
digital: decoderModes.size > 0 && rigModes.some((modes) => modes.some((mode) => decoderModes.has(mode))),
|
||||
// A logbook is for contacts made, so the layout built around it is offered
|
||||
// where a rig can transmit.
|
||||
ham: serverRigs.some((rig) => rig?.tx === true)
|
||||
});
|
||||
}
|
||||
function showHint(msg, duration) {
|
||||
|
||||
@@ -4,7 +4,7 @@ import {
|
||||
collapseAprsDuplicates,
|
||||
normalizeAprsPacket,
|
||||
renderAprsPacketRow
|
||||
} from "./chunk-OPEIVJGD.js";
|
||||
} from "./chunk-REYSUJQ4.js";
|
||||
import {
|
||||
forActiveRig,
|
||||
isActiveRigDecode
|
||||
@@ -139,6 +139,9 @@ function renderAprsRow(pkt, isFresh) {
|
||||
},
|
||||
onCopy: (text) => {
|
||||
void copyAprsCoords(text);
|
||||
},
|
||||
onLog: (call, gridsquare) => {
|
||||
aprsWindow.logContact?.({ call, gridsquare: gridsquare ?? void 0, decoder: "aprs" });
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
+20
-1
@@ -214,6 +214,16 @@ function summarizeAprsPayload(packet) {
|
||||
const text = info.replace(/^[>;<?]/, "").trim();
|
||||
return text.length ? text : null;
|
||||
}
|
||||
function maidenheadForLatLon(lat, lon) {
|
||||
const adjustedLon = lon + 180;
|
||||
const adjustedLat = lat + 90;
|
||||
const field = String.fromCharCode(65 + Math.floor(adjustedLon / 20)) + String.fromCharCode(65 + Math.floor(adjustedLat / 10));
|
||||
const square = String(Math.floor(adjustedLon % 20 / 2)) + String(Math.floor(adjustedLat % 10));
|
||||
const subLon = adjustedLon % 2 * 60 / 5;
|
||||
const subLat = adjustedLat % 1 * 60 / 2.5;
|
||||
const sub = String.fromCharCode(97 + Math.floor(subLon)) + String.fromCharCode(97 + Math.floor(subLat));
|
||||
return `${field}${square}${sub}`.toUpperCase();
|
||||
}
|
||||
function renderAprsPacketRow(packet, options = {}) {
|
||||
const row = document.createElement("details");
|
||||
row.className = "aprs-packet";
|
||||
@@ -224,7 +234,7 @@ function renderAprsPacketRow(packet, options = {}) {
|
||||
const summary = summarizeAprsPayload(packet);
|
||||
const hasPosition = packet.lat != null && packet.lon != null;
|
||||
const qrzHref = `https://qrzcq.com/call/${encodeURIComponent(packet.srcCall || "")}`;
|
||||
row.innerHTML = `<summary class="decode-line"><span class="aprs-time">${escapeAprsHtml(time)}</span>` + (options.badge ? `<span class="aprs-badge aprs-badge-band">${escapeAprsHtml(options.badge)}</span>` : "") + renderAprsSymbolSlot(packet, escapeAprsHtml) + `<span class="aprs-call">${escapeAprsHtml(packet.srcCall ?? "")}</span><span class="aprs-badge aprs-badge-type aprs-badge-type-${category}">${escapeAprsHtml(aprsCategoryLabel(category))}</span><span class="decode-line-summary">${summary ? escapeAprsHtml(summary) : renderAprsInfo(packet)}</span>` + (packet.crcOk ? "" : '<span class="aprs-badge aprs-badge-crc">CRC</span>') + (options.distance ? `<span class="decode-line-distance">${escapeAprsHtml(options.distance)}</span>` : "") + `</summary><div class="decode-expanded"><div class="decode-expanded-meta"><span>>${escapeAprsHtml(packet.destCall || "--")}</span><span>${escapeAprsHtml(packet.path || "no path")}</span><span>${escapeAprsHtml(aprsAgeText(packet._tsMs))}</span><span>CRC ${packet.crcOk ? "ok" : "failed"}</span>` + (hasPosition ? `<a class="aprs-pos" href="javascript:void(0)" data-aprs-map="${packet.lat},${packet.lon}">${packet.lat?.toFixed(5)}, ${packet.lon?.toFixed(5)}</a>` : "") + `</div><div class="decode-expanded-raw">${renderAprsInfo(packet)}</div>` + (packet.info_bytes?.length ? `<div class="decode-expanded-bytes">${escapeAprsHtml(aprsHexBytes(packet.info_bytes))}</div>` : "") + `<div class="aprs-row-actions">` + (hasPosition ? `<button class="aprs-inline-btn" type="button" data-aprs-map="${packet.lat},${packet.lon}">Map</button>` : "") + (hasPosition ? `<button class="aprs-inline-btn" type="button" data-aprs-copy="${packet.lat},${packet.lon}">Copy Coords</button>` : "") + `<a class="aprs-inline-btn" href="${qrzHref}" target="_blank" rel="noopener">QRZ</a></div></div>`;
|
||||
row.innerHTML = `<summary class="decode-line"><span class="aprs-time">${escapeAprsHtml(time)}</span>` + (options.badge ? `<span class="aprs-badge aprs-badge-band">${escapeAprsHtml(options.badge)}</span>` : "") + renderAprsSymbolSlot(packet, escapeAprsHtml) + `<span class="aprs-call">${escapeAprsHtml(packet.srcCall ?? "")}</span><span class="aprs-badge aprs-badge-type aprs-badge-type-${category}">${escapeAprsHtml(aprsCategoryLabel(category))}</span><span class="decode-line-summary">${summary ? escapeAprsHtml(summary) : renderAprsInfo(packet)}</span>` + (packet.crcOk ? "" : '<span class="aprs-badge aprs-badge-crc">CRC</span>') + (options.distance ? `<span class="decode-line-distance">${escapeAprsHtml(options.distance)}</span>` : "") + `</summary><div class="decode-expanded"><div class="decode-expanded-meta"><span>>${escapeAprsHtml(packet.destCall || "--")}</span><span>${escapeAprsHtml(packet.path || "no path")}</span><span>${escapeAprsHtml(aprsAgeText(packet._tsMs))}</span><span>CRC ${packet.crcOk ? "ok" : "failed"}</span>` + (hasPosition ? `<a class="aprs-pos" href="javascript:void(0)" data-aprs-map="${packet.lat},${packet.lon}">${packet.lat?.toFixed(5)}, ${packet.lon?.toFixed(5)}</a>` : "") + `</div><div class="decode-expanded-raw">${renderAprsInfo(packet)}</div>` + (packet.info_bytes?.length ? `<div class="decode-expanded-bytes">${escapeAprsHtml(aprsHexBytes(packet.info_bytes))}</div>` : "") + `<div class="aprs-row-actions">` + (hasPosition ? `<button class="aprs-inline-btn" type="button" data-aprs-map="${packet.lat},${packet.lon}">Map</button>` : "") + (hasPosition ? `<button class="aprs-inline-btn" type="button" data-aprs-copy="${packet.lat},${packet.lon}">Copy Coords</button>` : "") + `<a class="aprs-inline-btn" href="${qrzHref}" target="_blank" rel="noopener">QRZ</a>` + (options.onLog && packet.srcCall ? '<button class="aprs-inline-btn" type="button" data-aprs-log="1">Log</button>' : "") + `</div></div>`;
|
||||
row.querySelectorAll("[data-aprs-map]").forEach((element) => {
|
||||
element.addEventListener("click", (event) => {
|
||||
event.preventDefault();
|
||||
@@ -233,6 +243,15 @@ function renderAprsPacketRow(packet, options = {}) {
|
||||
if (Number.isFinite(lat) && Number.isFinite(lon)) options.onMap?.(lat, lon);
|
||||
});
|
||||
});
|
||||
const logButton = row.querySelector("[data-aprs-log]");
|
||||
if (logButton) {
|
||||
logButton.addEventListener("click", (event) => {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
const grid = packet.lat != null && packet.lon != null ? maidenheadForLatLon(packet.lat, packet.lon) : null;
|
||||
options.onLog?.(packet.srcCall ?? "", grid);
|
||||
});
|
||||
}
|
||||
const copyButton = row.querySelector("[data-aprs-copy]");
|
||||
if (copyButton) {
|
||||
copyButton.addEventListener("click", (event) => {
|
||||
+18
@@ -152,6 +152,24 @@ function initializeFtxDecoder(config) {
|
||||
second: "2-digit"
|
||||
});
|
||||
row.innerHTML = `<span class="ft8-time">${time}</span><span class="ft8-snr">${snr?.toFixed(1) ?? "--"}</span><span class="ft8-dt">${delta?.toFixed(2) ?? "--"}</span><span class="ft8-freq">${frequency?.toFixed(0) ?? "--"}</span><span class="ft8-msg">${renderMessage(raw)}</span>`;
|
||||
const station = bridge.ft8ExtractLikelyCallsign?.(raw) ?? extractFtxCallsign(raw);
|
||||
if (station) {
|
||||
const log = document.createElement("button");
|
||||
log.type = "button";
|
||||
log.className = "ft8-log-btn";
|
||||
log.textContent = "Log";
|
||||
log.title = `Start a log entry for ${station}`;
|
||||
log.addEventListener("click", (event) => {
|
||||
event.stopPropagation();
|
||||
const details = bridge.ft8ExtractLocatorDetails?.(raw) ?? extractFtxLocatorDetails(raw);
|
||||
bridge.logContact?.({
|
||||
call: station,
|
||||
gridsquare: details.find((detail) => detail.station === station)?.grid,
|
||||
decoder: id
|
||||
});
|
||||
});
|
||||
row.appendChild(log);
|
||||
}
|
||||
return row;
|
||||
};
|
||||
const render = () => {
|
||||
@@ -1,6 +1,6 @@
|
||||
import {
|
||||
initializeFtxDecoder
|
||||
} from "./chunk-PJ5Q7CWJ.js";
|
||||
} from "./chunk-WU5EWJX4.js";
|
||||
import "./chunk-S57W63QN.js";
|
||||
import "./chunk-KL66PICH.js";
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import {
|
||||
initializeFtxDecoder
|
||||
} from "./chunk-PJ5Q7CWJ.js";
|
||||
} from "./chunk-WU5EWJX4.js";
|
||||
import "./chunk-S57W63QN.js";
|
||||
import "./chunk-KL66PICH.js";
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ import {
|
||||
initializeFt8FamilyBar,
|
||||
initializeFtxDecoder,
|
||||
installFtxCompatibilityHelpers
|
||||
} from "./chunk-PJ5Q7CWJ.js";
|
||||
} from "./chunk-WU5EWJX4.js";
|
||||
import "./chunk-S57W63QN.js";
|
||||
import "./chunk-KL66PICH.js";
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import {
|
||||
collapseAprsDuplicates,
|
||||
normalizeAprsPacket,
|
||||
renderAprsPacketRow
|
||||
} from "./chunk-OPEIVJGD.js";
|
||||
} from "./chunk-REYSUJQ4.js";
|
||||
import {
|
||||
forActiveRig,
|
||||
isActiveRigDecode
|
||||
|
||||
@@ -0,0 +1,331 @@
|
||||
import {
|
||||
hostCore,
|
||||
hostState
|
||||
} from "./chunk-KL66PICH.js";
|
||||
|
||||
// src/plugins/logbook.ts
|
||||
var bridge = window;
|
||||
var el = (id) => document.getElementById(id);
|
||||
var form = el("log-entry-form");
|
||||
var callInput = el("log-call");
|
||||
var freqInput = el("log-freq");
|
||||
var modeInput = el("log-mode");
|
||||
var rstSentInput = el("log-rst-sent");
|
||||
var rstRcvdInput = el("log-rst-rcvd");
|
||||
var gridInput = el("log-grid");
|
||||
var nameInput = el("log-name");
|
||||
var commentInput = el("log-comment");
|
||||
var operatorInput = el("log-operator");
|
||||
var rowsBody = el("log-rows");
|
||||
var summaryEl = el("log-summary");
|
||||
var workedEl = el("log-worked-before");
|
||||
var clockEl = el("log-clock");
|
||||
var stationCallEl = el("log-station-callsign");
|
||||
var stationRigEl = el("log-station-rig-name");
|
||||
var stationGridEl = el("log-station-grid");
|
||||
var filterCall = el("log-filter-call");
|
||||
var filterBand = el("log-filter-band");
|
||||
var filterMode = el("log-filter-mode");
|
||||
var importBtn = el("log-import-btn");
|
||||
var importFile = el("log-import-file");
|
||||
var exportLink = el("log-export-btn");
|
||||
var clearBtn = el("log-clear-btn");
|
||||
var saveBtn = el("log-save-btn");
|
||||
var entryStartedAt = null;
|
||||
var entryRigId = null;
|
||||
var entryRigName = null;
|
||||
var entryGrid = null;
|
||||
var qsos = [];
|
||||
var workedRequest = 0;
|
||||
function notify(message, kind) {
|
||||
if (bridge.trxUi.notify) bridge.trxUi.notify(message, kind ? { kind } : void 0);
|
||||
else hostCore.showHint(message, 2e3);
|
||||
}
|
||||
async function getJson(path) {
|
||||
const response = await fetch(path);
|
||||
if (!response.ok) throw new Error(`HTTP ${String(response.status)}`);
|
||||
return await response.json();
|
||||
}
|
||||
function formatFreq(hz) {
|
||||
if (!Number.isFinite(hz) || hz <= 0) return "";
|
||||
return String(Number((hz / 1e6).toFixed(6)));
|
||||
}
|
||||
function parseFreq(text) {
|
||||
const value = Number(text.trim().replace(/\s+/g, "").replace(",", "."));
|
||||
if (!Number.isFinite(value) || value <= 0) return null;
|
||||
return value < 1e5 ? Math.round(value * 1e6) : Math.round(value);
|
||||
}
|
||||
function utcDate(iso) {
|
||||
const date = new Date(iso);
|
||||
return Number.isNaN(date.getTime()) ? "" : date.toISOString().slice(0, 10);
|
||||
}
|
||||
function utcTime(iso) {
|
||||
const date = new Date(iso);
|
||||
return Number.isNaN(date.getTime()) ? "" : date.toISOString().slice(11, 19);
|
||||
}
|
||||
async function openEntry(seed = {}) {
|
||||
const params = new URLSearchParams();
|
||||
if (hostState.lastActiveRigId) params.set("remote", hostState.lastActiveRigId);
|
||||
if (seed.decoder) params.set("decoder", seed.decoder);
|
||||
if (seed.call) params.set("call", seed.call);
|
||||
if (seed.gridsquare) params.set("gridsquare", seed.gridsquare);
|
||||
try {
|
||||
const prefill = await getJson(`/api/logbook/prefill?${params.toString()}`);
|
||||
applyPrefill(prefill);
|
||||
} catch (error) {
|
||||
console.error("logbook prefill failed", error);
|
||||
}
|
||||
}
|
||||
function applyPrefill(prefill) {
|
||||
entryStartedAt = prefill.started_at;
|
||||
entryRigId = prefill.rig_id;
|
||||
entryRigName = prefill.my_rig;
|
||||
if (freqInput) freqInput.value = formatFreq(prefill.freq_hz);
|
||||
if (modeInput) modeInput.value = prefill.submode ?? prefill.mode;
|
||||
if (callInput && prefill.call) callInput.value = prefill.call;
|
||||
if (gridInput && prefill.gridsquare) gridInput.value = prefill.gridsquare;
|
||||
if (stationRigEl) stationRigEl.textContent = prefill.my_rig ?? "no rig";
|
||||
showClock(prefill);
|
||||
updateWorkedBefore();
|
||||
}
|
||||
function showClock(prefill) {
|
||||
if (!clockEl) return;
|
||||
const time = utcTime(prefill.started_at);
|
||||
const drift = Math.abs(Date.now() - prefill.epoch_ms);
|
||||
clockEl.textContent = drift > 1e3 ? `${time}Z · your clock is ${(drift / 1e3).toFixed(0)}s out` : `${time}Z`;
|
||||
clockEl.classList.toggle("is-adrift", drift > 1e3);
|
||||
}
|
||||
function resetEntry() {
|
||||
for (const input of [callInput, rstSentInput, rstRcvdInput, gridInput, nameInput, commentInput]) {
|
||||
if (input) input.value = "";
|
||||
}
|
||||
if (workedEl) workedEl.textContent = "";
|
||||
void openEntry();
|
||||
}
|
||||
async function submitEntry(event) {
|
||||
event.preventDefault();
|
||||
const call = callInput?.value.trim() ?? "";
|
||||
if (!call) {
|
||||
notify("A contact needs a callsign", "error");
|
||||
callInput?.focus();
|
||||
return;
|
||||
}
|
||||
const freqHz = parseFreq(freqInput?.value ?? "");
|
||||
if (freqHz == null) {
|
||||
notify("A contact needs a frequency", "error");
|
||||
freqInput?.focus();
|
||||
return;
|
||||
}
|
||||
const typedMode = (modeInput?.value ?? "").trim().toUpperCase();
|
||||
const isSideband = typedMode === "USB" || typedMode === "LSB";
|
||||
const body = {
|
||||
// The server stamps the time; this is the one it gave when the entry
|
||||
// opened, so a contact logged five minutes later keeps the time it started.
|
||||
started_at: entryStartedAt,
|
||||
call,
|
||||
freq_hz: freqHz,
|
||||
mode: isSideband ? "SSB" : typedMode,
|
||||
submode: isSideband ? typedMode : null,
|
||||
rst_sent: rstSentInput?.value ?? null,
|
||||
rst_rcvd: rstRcvdInput?.value ?? null,
|
||||
gridsquare: gridInput?.value ?? null,
|
||||
name: nameInput?.value ?? null,
|
||||
comment: commentInput?.value ?? null,
|
||||
station_callsign: stationCallEl?.textContent?.trim() ?? null,
|
||||
operator: operatorInput?.value ?? null,
|
||||
my_gridsquare: entryGrid,
|
||||
my_rig: entryRigName,
|
||||
rig_id: entryRigId
|
||||
};
|
||||
if (saveBtn) saveBtn.disabled = true;
|
||||
try {
|
||||
const response = await fetch("/api/logbook", {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify(body)
|
||||
});
|
||||
if (!response.ok) {
|
||||
const detail = await response.json().catch(() => ({}));
|
||||
throw new Error(detail.error ?? `HTTP ${String(response.status)}`);
|
||||
}
|
||||
notify(`${call} logged`);
|
||||
resetEntry();
|
||||
await refreshLog();
|
||||
} catch (error) {
|
||||
notify(`Could not log: ${error instanceof Error ? error.message : String(error)}`, "error");
|
||||
} finally {
|
||||
if (saveBtn) saveBtn.disabled = false;
|
||||
}
|
||||
}
|
||||
function updateWorkedBefore() {
|
||||
if (!workedEl) return;
|
||||
const call = callInput?.value.trim() ?? "";
|
||||
if (call.length < 3) {
|
||||
workedEl.textContent = "";
|
||||
return;
|
||||
}
|
||||
const request = ++workedRequest;
|
||||
void getJson(
|
||||
`/api/logbook/worked/${encodeURIComponent(call)}`
|
||||
).then((answer) => {
|
||||
if (request !== workedRequest || !workedEl) return;
|
||||
if (answer.worked.length === 0) {
|
||||
workedEl.textContent = "Not worked before";
|
||||
workedEl.classList.remove("is-worked");
|
||||
return;
|
||||
}
|
||||
const where = answer.worked.map((entry) => `${entry.band} ${entry.mode}`).join(", ");
|
||||
workedEl.textContent = `Worked before: ${where}`;
|
||||
workedEl.classList.add("is-worked");
|
||||
}).catch(() => {
|
||||
});
|
||||
}
|
||||
function currentQuery() {
|
||||
const params = new URLSearchParams();
|
||||
const call = filterCall?.value.trim();
|
||||
if (call) params.set("call", call);
|
||||
if (filterBand?.value) params.set("band", filterBand.value);
|
||||
if (filterMode?.value) params.set("mode", filterMode.value);
|
||||
return params.toString();
|
||||
}
|
||||
async function refreshLog() {
|
||||
try {
|
||||
const query = currentQuery();
|
||||
const answer = await getJson(
|
||||
`/api/logbook${query ? `?${query}` : ""}`
|
||||
);
|
||||
qsos = answer.qsos;
|
||||
renderRows();
|
||||
renderFilterOptions();
|
||||
if (summaryEl) {
|
||||
summaryEl.textContent = query ? `${String(qsos.length)} of ${String(answer.total)} contacts` : `${String(answer.total)} contact${answer.total === 1 ? "" : "s"}`;
|
||||
}
|
||||
if (exportLink) exportLink.href = `/api/logbook/export.adi${query ? `?${query}` : ""}`;
|
||||
} catch (error) {
|
||||
console.error("logbook read failed", error);
|
||||
}
|
||||
}
|
||||
function renderRows() {
|
||||
if (!rowsBody) return;
|
||||
if (qsos.length === 0) {
|
||||
rowsBody.innerHTML = '<tr><td colspan="10" class="log-empty">No contacts yet. Work someone and log them here, or bring a log in with Import ADIF.</td></tr>';
|
||||
return;
|
||||
}
|
||||
const fragment = document.createDocumentFragment();
|
||||
for (const qso of qsos) {
|
||||
const row = document.createElement("tr");
|
||||
row.dataset.qsoId = qso.id;
|
||||
const cells = [
|
||||
utcDate(qso.started_at),
|
||||
utcTime(qso.started_at),
|
||||
qso.call,
|
||||
qso.band ?? "",
|
||||
qso.submode ?? qso.mode,
|
||||
qso.rst_sent ?? "",
|
||||
qso.rst_rcvd ?? "",
|
||||
qso.gridsquare ?? "",
|
||||
qso.my_rig ?? ""
|
||||
];
|
||||
for (const [index, value] of cells.entries()) {
|
||||
const cell = document.createElement("td");
|
||||
cell.textContent = value ?? "";
|
||||
if (index === 2) cell.className = "log-cell-call";
|
||||
row.appendChild(cell);
|
||||
}
|
||||
const actions = document.createElement("td");
|
||||
const remove = document.createElement("button");
|
||||
remove.type = "button";
|
||||
remove.className = "log-row-btn";
|
||||
remove.textContent = "Delete";
|
||||
remove.setAttribute("aria-label", `Delete the contact with ${qso.call}`);
|
||||
remove.addEventListener("click", () => {
|
||||
void deleteQso(qso);
|
||||
});
|
||||
actions.appendChild(remove);
|
||||
row.appendChild(actions);
|
||||
fragment.appendChild(row);
|
||||
}
|
||||
rowsBody.replaceChildren(fragment);
|
||||
}
|
||||
function renderFilterOptions() {
|
||||
for (const [select, values] of [
|
||||
[filterBand, [...new Set(qsos.map((q) => q.band).filter((b) => !!b))]],
|
||||
[filterMode, [...new Set(qsos.map((q) => q.submode ?? q.mode).filter(Boolean))]]
|
||||
]) {
|
||||
if (!select) continue;
|
||||
const chosen = select.value;
|
||||
const known = new Set([...select.options].map((option) => option.value));
|
||||
for (const value of [...values].sort()) {
|
||||
if (known.has(value)) continue;
|
||||
select.add(new Option(value, value));
|
||||
}
|
||||
select.value = chosen;
|
||||
}
|
||||
}
|
||||
async function deleteQso(qso) {
|
||||
const confirmed = await bridge.trxUi.confirm({
|
||||
title: "Delete this contact?",
|
||||
message: `${qso.call} on ${qso.band ?? formatFreq(qso.freq_hz)} will be removed from the log.`,
|
||||
confirmLabel: "Delete"
|
||||
});
|
||||
if (!confirmed) return;
|
||||
try {
|
||||
const response = await fetch(`/api/logbook/${encodeURIComponent(qso.id)}`, { method: "DELETE" });
|
||||
if (!response.ok) throw new Error(`HTTP ${String(response.status)}`);
|
||||
await refreshLog();
|
||||
} catch (error) {
|
||||
notify(`Could not delete: ${error instanceof Error ? error.message : String(error)}`, "error");
|
||||
}
|
||||
}
|
||||
async function importAdif(file) {
|
||||
try {
|
||||
const response = await fetch("/api/logbook/import", { method: "POST", body: await file.arrayBuffer() });
|
||||
if (!response.ok) throw new Error(`HTTP ${String(response.status)}`);
|
||||
const outcome = await response.json();
|
||||
const parts = [`${String(outcome.added)} added`];
|
||||
if (outcome.duplicate > 0) parts.push(`${String(outcome.duplicate)} already held`);
|
||||
if (outcome.rejected.length > 0) parts.push(`${String(outcome.rejected.length)} not readable`);
|
||||
notify(parts.join(", "));
|
||||
await refreshLog();
|
||||
} catch (error) {
|
||||
notify(`Import failed: ${error instanceof Error ? error.message : String(error)}`, "error");
|
||||
}
|
||||
}
|
||||
function renderStation() {
|
||||
const callsign = hostState.ownerCallsign ?? "";
|
||||
if (stationCallEl) stationCallEl.textContent = callsign || "no callsign set";
|
||||
if (operatorInput && !operatorInput.value) operatorInput.value = callsign;
|
||||
if (stationGridEl) {
|
||||
const grid = hostState.serverLat != null && hostState.serverLon != null ? hostCore.latLonToMaidenhead(hostState.serverLat, hostState.serverLon) : "";
|
||||
entryGrid = grid || null;
|
||||
stationGridEl.textContent = grid;
|
||||
}
|
||||
}
|
||||
form?.addEventListener("submit", (event) => {
|
||||
void submitEntry(event);
|
||||
});
|
||||
clearBtn?.addEventListener("click", resetEntry);
|
||||
callInput?.addEventListener("input", updateWorkedBefore);
|
||||
for (const control of [filterCall, filterBand, filterMode]) {
|
||||
control?.addEventListener("input", () => {
|
||||
void refreshLog();
|
||||
});
|
||||
control?.addEventListener("change", () => {
|
||||
void refreshLog();
|
||||
});
|
||||
}
|
||||
importBtn?.addEventListener("click", () => {
|
||||
importFile?.click();
|
||||
});
|
||||
importFile?.addEventListener("change", () => {
|
||||
const file = importFile.files?.[0];
|
||||
if (file) void importAdif(file);
|
||||
importFile.value = "";
|
||||
});
|
||||
bridge.logContact = (seed) => {
|
||||
bridge.navigateToTab?.("logbook");
|
||||
void openEntry(seed).then(() => callInput?.focus());
|
||||
};
|
||||
renderStation();
|
||||
void openEntry();
|
||||
void refreshLog();
|
||||
@@ -1,6 +1,6 @@
|
||||
import {
|
||||
aprsSymbolSprite
|
||||
} from "./chunk-OPEIVJGD.js";
|
||||
} from "./chunk-REYSUJQ4.js";
|
||||
|
||||
// src/map-core.ts
|
||||
function mapEl(id) {
|
||||
|
||||
@@ -22,6 +22,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<svg xmlns="http://www.w3.org/2000/svg" style="display:none">
|
||||
<symbol id="icon-home" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M2.8 7 8 2.9 13.2 7"/><path d="M4.3 5.9V13h7.4V5.9"/><path d="M6.8 13V9.3h2.4V13"/></symbol>
|
||||
<symbol id="icon-bookmark" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M4 2h8v12l-4-2.5L4 14V2z"/></symbol>
|
||||
<symbol id="icon-logbook" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M3.5 2h8a1 1 0 0 1 1 1v10a1 1 0 0 1-1 1h-8a1 1 0 0 1-1-1V3a1 1 0 0 1 1-1z"/><path d="M5.5 2v12"/><path d="M7.5 5.5h3M7.5 8h3M7.5 10.5h2"/></symbol>
|
||||
<symbol id="icon-digital" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M1 11.5h2.6V4.5h3.2v7h3.2v-7h3.2v7H15"/></symbol>
|
||||
<symbol id="icon-map" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M8 2a4 4 0 0 1 4 4c0 3-4 8-4 8S4 9 4 6a4 4 0 0 1 4-4z"/><circle cx="8" cy="6" r="1.2" fill="currentColor" stroke="none"/></symbol>
|
||||
<symbol id="icon-satellite" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"><path d="M2 13.2 5.6 9.6"/><path d="M4.2 8.2a3.4 3.4 0 0 1 4.8 4.8z"/><path d="M9.2 6.6a3.2 3.2 0 0 1 2.6 2.6"/><path d="M9.8 3.6a6.2 6.2 0 0 1 5.2 5.2"/></symbol>
|
||||
@@ -53,6 +54,10 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<svg class="tab-icon" aria-hidden="true"><use href="#icon-bookmark"/></svg>
|
||||
<span class="tab-label">Bookmarks</span>
|
||||
</button>
|
||||
<button class="tab" data-tab="logbook">
|
||||
<svg class="tab-icon" aria-hidden="true"><use href="#icon-logbook"/></svg>
|
||||
<span class="tab-label">Logbook</span>
|
||||
</button>
|
||||
<button class="tab" data-tab="digital-modes" aria-label="Digital modes">
|
||||
<svg class="tab-icon" aria-hidden="true"><use href="#icon-digital"/></svg>
|
||||
<span class="tab-label">Digital modes</span>
|
||||
@@ -480,6 +485,111 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="tab-logbook" class="tab-panel" style="display:none;">
|
||||
<div id="logbook-panel" class="log-panel">
|
||||
<!-- Station: who the contacts are logged under, and from where. Shown
|
||||
once rather than typed into every entry. -->
|
||||
<div class="log-station">
|
||||
<div class="log-station-identity">
|
||||
<span class="log-station-call" id="log-station-callsign">--</span>
|
||||
<label class="log-station-operator">
|
||||
<span>Operator</span>
|
||||
<input type="text" id="log-operator" class="status-input" autocomplete="off"
|
||||
spellcheck="false" aria-label="Operator callsign" />
|
||||
</label>
|
||||
</div>
|
||||
<div class="log-station-rig">
|
||||
<span id="log-station-rig-name">--</span>
|
||||
<span id="log-station-grid" class="log-station-grid"></span>
|
||||
<span id="log-clock" class="log-clock" aria-live="polite"></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Entry: opens pre-filled with the six fields the radio and the clock
|
||||
can answer for. Everything else is the operator's. -->
|
||||
<form id="log-entry-form" class="log-entry" autocomplete="off">
|
||||
<div class="log-entry-grid">
|
||||
<label class="log-field log-field-call">
|
||||
<span>Callsign</span>
|
||||
<input type="text" id="log-call" class="status-input" required
|
||||
spellcheck="false" aria-describedby="log-worked-before" />
|
||||
</label>
|
||||
<label class="log-field">
|
||||
<span>Frequency</span>
|
||||
<input type="text" id="log-freq" class="status-input" inputmode="decimal" />
|
||||
</label>
|
||||
<label class="log-field log-field-narrow">
|
||||
<span>Mode</span>
|
||||
<input type="text" id="log-mode" class="status-input" spellcheck="false" />
|
||||
</label>
|
||||
<label class="log-field log-field-narrow">
|
||||
<span>RST sent</span>
|
||||
<input type="text" id="log-rst-sent" class="status-input" spellcheck="false" />
|
||||
</label>
|
||||
<label class="log-field log-field-narrow">
|
||||
<span>RST rcvd</span>
|
||||
<input type="text" id="log-rst-rcvd" class="status-input" spellcheck="false" />
|
||||
</label>
|
||||
<label class="log-field log-field-narrow">
|
||||
<span>Locator</span>
|
||||
<input type="text" id="log-grid" class="status-input" spellcheck="false" />
|
||||
</label>
|
||||
<label class="log-field">
|
||||
<span>Name</span>
|
||||
<input type="text" id="log-name" class="status-input" />
|
||||
</label>
|
||||
<label class="log-field">
|
||||
<span>Comment</span>
|
||||
<input type="text" id="log-comment" class="status-input" />
|
||||
</label>
|
||||
</div>
|
||||
<div class="log-entry-actions">
|
||||
<span id="log-worked-before" class="log-worked" aria-live="polite"></span>
|
||||
<span class="log-entry-buttons">
|
||||
<button type="button" id="log-clear-btn" class="log-secondary-btn">Clear</button>
|
||||
<button type="submit" id="log-save-btn" class="log-primary-btn">Log contact</button>
|
||||
</span>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<!-- The log itself. -->
|
||||
<div class="log-list-toolbar">
|
||||
<input type="text" id="log-filter-call" class="status-input" placeholder="Callsign…"
|
||||
aria-label="Filter by callsign" />
|
||||
<select id="log-filter-band" class="status-input" aria-label="Filter by band">
|
||||
<option value="">All bands</option>
|
||||
</select>
|
||||
<select id="log-filter-mode" class="status-input" aria-label="Filter by mode">
|
||||
<option value="">All modes</option>
|
||||
</select>
|
||||
<span class="log-toolbar-spacer"></span>
|
||||
<a id="log-export-btn" class="log-secondary-btn" href="/api/logbook/export.adi"
|
||||
download>Export ADIF</a>
|
||||
<button type="button" id="log-import-btn" class="log-secondary-btn">Import ADIF</button>
|
||||
<input type="file" id="log-import-file" accept=".adi,.adif,text/plain" hidden />
|
||||
</div>
|
||||
<div class="log-table-wrap">
|
||||
<table class="log-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col">Date</th>
|
||||
<th scope="col">Time</th>
|
||||
<th scope="col">Callsign</th>
|
||||
<th scope="col">Band</th>
|
||||
<th scope="col">Mode</th>
|
||||
<th scope="col">Sent</th>
|
||||
<th scope="col">Rcvd</th>
|
||||
<th scope="col">Locator</th>
|
||||
<th scope="col">Rig</th>
|
||||
<th scope="col"><span class="visually-hidden">Actions</span></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="log-rows"></tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div id="log-summary" class="log-summary" aria-live="polite"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="tab-bookmarks" class="tab-panel" style="display:none;">
|
||||
<div class="bm-toolbar">
|
||||
<select id="bm-scope-picker" class="status-input" aria-label="Bookmark scope">
|
||||
|
||||
@@ -6388,3 +6388,248 @@ body[data-operator-layout="broadcast"] #cw-bar-overlay {
|
||||
}
|
||||
|
||||
#tab-statistics > .section-heading { margin-bottom: 0; }
|
||||
|
||||
/* =========================================================================
|
||||
Logbook
|
||||
========================================================================= */
|
||||
.log-panel {
|
||||
padding: 1rem;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.85rem;
|
||||
}
|
||||
/* Who the contacts are logged under, and from where: shown once, not typed
|
||||
into every entry. */
|
||||
.log-station {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 0.75rem;
|
||||
padding: 0.6rem 0.85rem;
|
||||
border: 1px solid var(--border-light);
|
||||
border-radius: 0.5rem;
|
||||
background: var(--bg-secondary);
|
||||
}
|
||||
.log-station-identity {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.85rem;
|
||||
min-width: 0;
|
||||
}
|
||||
.log-station-call {
|
||||
font-size: 1.05rem;
|
||||
font-weight: 700;
|
||||
letter-spacing: 0.04em;
|
||||
color: var(--text);
|
||||
}
|
||||
.log-station-operator {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.4rem;
|
||||
font-size: 0.78rem;
|
||||
color: var(--text-muted);
|
||||
}
|
||||
.log-station-operator input {
|
||||
width: 7rem;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
.log-station-rig {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.75rem;
|
||||
font-size: 0.82rem;
|
||||
color: var(--text-muted);
|
||||
min-width: 0;
|
||||
}
|
||||
.log-station-grid {
|
||||
font-variant-numeric: tabular-nums;
|
||||
}
|
||||
.log-clock {
|
||||
font-variant-numeric: tabular-nums;
|
||||
padding: 0.1rem 0.45rem;
|
||||
border-radius: 0.3rem;
|
||||
background: color-mix(in srgb, var(--card-bg) 70%, transparent);
|
||||
}
|
||||
/* A browser clock that disagrees with the radio's is worth saying out loud:
|
||||
the times in a log are the one thing that cannot be corrected later. */
|
||||
.log-clock.is-adrift {
|
||||
color: var(--accent-yellow, #b7791f);
|
||||
font-weight: 600;
|
||||
}
|
||||
.log-entry {
|
||||
border: 1px solid var(--border-light);
|
||||
border-radius: 0.5rem;
|
||||
padding: 0.85rem;
|
||||
background: var(--bg-secondary);
|
||||
}
|
||||
.log-entry-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(8.5rem, 1fr));
|
||||
gap: 0.6rem 0.75rem;
|
||||
}
|
||||
.log-field {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.25rem;
|
||||
min-width: 0;
|
||||
font-size: 0.75rem;
|
||||
color: var(--text-muted);
|
||||
}
|
||||
.log-field input {
|
||||
min-width: 0;
|
||||
}
|
||||
.log-field-call {
|
||||
grid-column: span 2;
|
||||
}
|
||||
.log-field-call input {
|
||||
font-size: 1.05rem;
|
||||
font-weight: 700;
|
||||
letter-spacing: 0.06em;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
.log-field-narrow {
|
||||
max-width: 10rem;
|
||||
}
|
||||
.log-entry-actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 0.75rem;
|
||||
margin-top: 0.75rem;
|
||||
}
|
||||
.log-entry-buttons {
|
||||
display: inline-flex;
|
||||
gap: 0.5rem;
|
||||
margin-left: auto;
|
||||
}
|
||||
.log-worked {
|
||||
font-size: 0.8rem;
|
||||
color: var(--text-muted);
|
||||
}
|
||||
.log-worked.is-worked {
|
||||
color: var(--accent-green);
|
||||
font-weight: 600;
|
||||
}
|
||||
.log-primary-btn {
|
||||
background: var(--accent-green);
|
||||
color: #fff;
|
||||
border: none;
|
||||
border-radius: 0.35rem;
|
||||
padding: 0.4rem 1.1rem;
|
||||
font-weight: 600;
|
||||
cursor: pointer;
|
||||
}
|
||||
.log-secondary-btn {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
background: var(--bg-secondary);
|
||||
border: 1px solid var(--border-light);
|
||||
border-radius: 0.35rem;
|
||||
color: var(--text-muted);
|
||||
padding: 0.35rem 0.75rem;
|
||||
font-size: 0.82rem;
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
}
|
||||
.log-secondary-btn:hover {
|
||||
background: var(--card-bg);
|
||||
color: var(--text);
|
||||
}
|
||||
.log-list-toolbar {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
gap: 0.5rem;
|
||||
}
|
||||
.log-list-toolbar .status-input {
|
||||
max-width: 11rem;
|
||||
}
|
||||
.log-toolbar-spacer {
|
||||
flex: 1 1 auto;
|
||||
}
|
||||
.log-table-wrap {
|
||||
overflow-x: auto;
|
||||
border: 1px solid var(--border-light);
|
||||
border-radius: 0.5rem;
|
||||
}
|
||||
.log-table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
font-size: 0.83rem;
|
||||
}
|
||||
.log-table th {
|
||||
position: sticky;
|
||||
top: 0;
|
||||
z-index: 1;
|
||||
text-align: left;
|
||||
padding: 0.5rem 0.65rem;
|
||||
background: var(--bg-secondary);
|
||||
border-bottom: 1px solid var(--border-light);
|
||||
font-size: 0.72rem;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.05em;
|
||||
color: var(--text-muted);
|
||||
white-space: nowrap;
|
||||
}
|
||||
.log-table td {
|
||||
padding: 0.4rem 0.65rem;
|
||||
border-bottom: 1px solid color-mix(in srgb, var(--border-light) 60%, transparent);
|
||||
white-space: nowrap;
|
||||
font-variant-numeric: tabular-nums;
|
||||
}
|
||||
.log-table tr:last-child td {
|
||||
border-bottom: none;
|
||||
}
|
||||
.log-table tbody tr:hover {
|
||||
background: color-mix(in srgb, var(--card-bg) 60%, transparent);
|
||||
}
|
||||
.log-cell-call {
|
||||
font-weight: 700;
|
||||
letter-spacing: 0.04em;
|
||||
font-variant-numeric: normal;
|
||||
}
|
||||
.log-row-btn {
|
||||
background: transparent;
|
||||
border: 1px solid var(--border-light);
|
||||
border-radius: 0.3rem;
|
||||
color: var(--text-muted);
|
||||
font-size: 0.75rem;
|
||||
padding: 0.15rem 0.5rem;
|
||||
cursor: pointer;
|
||||
}
|
||||
.log-row-btn:hover {
|
||||
color: var(--text);
|
||||
background: var(--card-bg);
|
||||
}
|
||||
.log-empty {
|
||||
padding: 1.5rem 0.75rem;
|
||||
text-align: center;
|
||||
color: var(--text-muted);
|
||||
white-space: normal;
|
||||
}
|
||||
.log-summary {
|
||||
color: var(--text-muted);
|
||||
font-size: 0.8rem;
|
||||
}
|
||||
/* The ham layout works the bands: the broadcast furniture goes, and the entry
|
||||
form is the thing the panel opens on. */
|
||||
body[data-operator-layout="ham"] .controls-col-wfm { display: none !important; }
|
||||
body[data-operator-layout="ham"] #rds-panel { display: none !important; }
|
||||
@media (max-width: 700px) {
|
||||
.log-station,
|
||||
.log-entry-actions {
|
||||
flex-direction: column;
|
||||
align-items: stretch;
|
||||
}
|
||||
.log-entry-buttons {
|
||||
margin-left: 0;
|
||||
}
|
||||
.log-field-call {
|
||||
grid-column: span 2;
|
||||
}
|
||||
.log-list-toolbar .status-input {
|
||||
max-width: none;
|
||||
flex: 1 1 8rem;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -33,6 +33,7 @@ await build({
|
||||
"satellite-predictions": path.join(sourceDir, "plugins", "satellite-predictions.ts"),
|
||||
vchan: path.join(sourceDir, "plugins", "vchan.ts"),
|
||||
bookmarks: path.join(sourceDir, "plugins", "bookmarks.ts"),
|
||||
logbook: path.join(sourceDir, "plugins", "logbook.ts"),
|
||||
scheduler: path.join(sourceDir, "plugins", "scheduler.ts"),
|
||||
"map-core": path.join(sourceDir, "map-core.ts"),
|
||||
screenshot: path.join(sourceDir, "screenshot.ts"),
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
"typecheck": "tsc --project tsconfig.json && tsc --project tsconfig.worker.json",
|
||||
"lint": "eslint \"src/**/*.ts\" \"tests/**/*.mjs\" build.mjs --no-error-on-unmatched-pattern",
|
||||
"test": "node --test tests/*.test.mjs",
|
||||
"test:browser": "node tests/browser-smoke.mjs && node tests/spectrum-layout.mjs && node tests/decode-flow.mjs && node tests/tune-links.mjs && node tests/mobile-layout.mjs && node tests/satellite-predictions.mjs && node tests/background-decode.mjs",
|
||||
"test:browser": "node tests/browser-smoke.mjs && node tests/spectrum-layout.mjs && node tests/decode-flow.mjs && node tests/tune-links.mjs && node tests/mobile-layout.mjs && node tests/satellite-predictions.mjs && node tests/background-decode.mjs && node tests/logbook.mjs",
|
||||
"verify-generated": "npm run generate-types && npm run build && git diff --exit-code -- ../assets/web/generated src/api/generated.ts"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
@@ -265,7 +265,7 @@ interface TrxUi {
|
||||
confirm(options?: { title?: string; message?: string; confirmLabel?: string; danger?: boolean }): Promise<boolean>;
|
||||
notify(message: string, options?: { kind?: "info" | "error" | "success" | "warning"; duration?: number; action?: { label?: string; run(): void } | null }): HTMLDivElement;
|
||||
setActiveRig(rigId: string | null): void;
|
||||
setLayoutCapabilities(capabilities?: Partial<Record<"broadcast" | "digital", boolean>>): void;
|
||||
setLayoutCapabilities(capabilities?: Partial<Record<"broadcast" | "digital" | "ham", boolean>>): void;
|
||||
setButtonState(element: HTMLButtonElement | null, options?: { active?: boolean; activeLabel?: string; inactiveLabel?: string; busy?: boolean; disabled?: boolean }): void;
|
||||
closeMobileOverlays?(restoreFocus?: boolean): void;
|
||||
syncSelectedTab(container: HTMLElement | null, selected: Element): void;
|
||||
@@ -1522,6 +1522,9 @@ function refreshOperatorLayoutCapabilities() {
|
||||
window.trxUi?.setLayoutCapabilities({
|
||||
broadcast: rigModes.some((modes) => modes.includes("WFM")),
|
||||
digital: decoderModes.size > 0 && rigModes.some((modes) => modes.some((mode) => decoderModes.has(mode))),
|
||||
// A logbook is for contacts made, so the layout built around it is offered
|
||||
// where a rig can transmit.
|
||||
ham: serverRigs.some((rig) => rig?.tx === true),
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
+2
-1
@@ -3,7 +3,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
export const TAB_ORDER = [
|
||||
"main", "bookmarks", "digital-modes", "map", "satellites", "statistics", "recorder", "settings", "about",
|
||||
"main", "bookmarks", "logbook", "digital-modes", "map", "satellites", "statistics", "recorder", "settings", "about",
|
||||
] as const;
|
||||
|
||||
export type TabName = typeof TAB_ORDER[number];
|
||||
@@ -11,6 +11,7 @@ export type TabName = typeof TAB_ORDER[number];
|
||||
export const TAB_PATHS: Readonly<Record<TabName, string>> = {
|
||||
main: "/",
|
||||
bookmarks: "/bookmarks",
|
||||
logbook: "/logbook",
|
||||
"digital-modes": "/digital-modes",
|
||||
map: "/map",
|
||||
satellites: "/satellites",
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
type PluginGroup =
|
||||
| "digital-modes" | "map-data" | "map" | "satellites" | "statistics"
|
||||
| "bookmarks" | "recorder" | "settings";
|
||||
| "bookmarks" | "logbook" | "recorder" | "settings";
|
||||
|
||||
const pluginGroups: Readonly<Record<PluginGroup, readonly string[]>> = {
|
||||
// AIS, VDES and the two APRS decoders have panels on this tab, so they load
|
||||
@@ -20,6 +20,7 @@ const pluginGroups: Readonly<Record<PluginGroup, readonly string[]>> = {
|
||||
satellites: ["/satellite-predictions.js"],
|
||||
statistics: ["/map-core.js"],
|
||||
bookmarks: ["/bookmarks.js"],
|
||||
logbook: ["/logbook.js"],
|
||||
recorder: [],
|
||||
settings: ["/vchan.js", "/scheduler.js"],
|
||||
};
|
||||
@@ -47,7 +48,7 @@ async function loadPlugins(group: string): Promise<void> {
|
||||
}
|
||||
|
||||
export async function loadEagerPlugins(): Promise<void> {
|
||||
await Promise.all(["digital-modes", "bookmarks", "settings"].map(loadPlugins));
|
||||
await Promise.all(["digital-modes", "bookmarks", "logbook", "settings"].map(loadPlugins));
|
||||
}
|
||||
|
||||
export async function loadPluginsForTab(tab: string): Promise<void> {
|
||||
|
||||
@@ -324,6 +324,21 @@ export interface AprsRowOptions {
|
||||
onMap?: (lat: number, lon: number) => void;
|
||||
/** Puts a frame's coordinates on the clipboard. */
|
||||
onCopy?: (text: string, button: HTMLElement) => void;
|
||||
/** Opens a log entry for the station that sent the frame. */
|
||||
onLog?: (call: string, gridsquare: string | null) => void;
|
||||
}
|
||||
|
||||
/** A position as a six-character locator, which is what a log wants. */
|
||||
function maidenheadForLatLon(lat: number, lon: number): string {
|
||||
const adjustedLon = lon + 180;
|
||||
const adjustedLat = lat + 90;
|
||||
const field = String.fromCharCode(65 + Math.floor(adjustedLon / 20))
|
||||
+ String.fromCharCode(65 + Math.floor(adjustedLat / 10));
|
||||
const square = String(Math.floor((adjustedLon % 20) / 2)) + String(Math.floor(adjustedLat % 10));
|
||||
const subLon = ((adjustedLon % 2) * 60) / 5;
|
||||
const subLat = ((adjustedLat % 1) * 60) / 2.5;
|
||||
const sub = String.fromCharCode(97 + Math.floor(subLon)) + String.fromCharCode(97 + Math.floor(subLat));
|
||||
return `${field}${square}${sub}`.toUpperCase();
|
||||
}
|
||||
|
||||
export function renderAprsPacketRow(packet: AprsPacket, options: AprsRowOptions = {}): HTMLElement {
|
||||
@@ -370,6 +385,7 @@ export function renderAprsPacketRow(packet: AprsPacket, options: AprsRowOptions
|
||||
(hasPosition ? `<button class="aprs-inline-btn" type="button" data-aprs-map="${packet.lat},${packet.lon}">Map</button>` : "") +
|
||||
(hasPosition ? `<button class="aprs-inline-btn" type="button" data-aprs-copy="${packet.lat},${packet.lon}">Copy Coords</button>` : "") +
|
||||
`<a class="aprs-inline-btn" href="${qrzHref}" target="_blank" rel="noopener">QRZ</a>` +
|
||||
(options.onLog && packet.srcCall ? '<button class="aprs-inline-btn" type="button" data-aprs-log="1">Log</button>' : "") +
|
||||
`</div>` +
|
||||
`</div>`;
|
||||
|
||||
@@ -381,6 +397,17 @@ export function renderAprsPacketRow(packet: AprsPacket, options: AprsRowOptions
|
||||
if (Number.isFinite(lat) && Number.isFinite(lon)) options.onMap?.(lat as number, lon as number);
|
||||
});
|
||||
});
|
||||
const logButton = row.querySelector<HTMLElement>("[data-aprs-log]");
|
||||
if (logButton) {
|
||||
logButton.addEventListener("click", (event) => {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
const grid = packet.lat != null && packet.lon != null
|
||||
? maidenheadForLatLon(packet.lat, packet.lon)
|
||||
: null;
|
||||
options.onLog?.(packet.srcCall ?? "", grid);
|
||||
});
|
||||
}
|
||||
const copyButton = row.querySelector<HTMLElement>("[data-aprs-copy]");
|
||||
if (copyButton) {
|
||||
copyButton.addEventListener("click", (event) => {
|
||||
|
||||
@@ -23,6 +23,7 @@ interface AprsBridge {
|
||||
aprsMapAddStation?: (call: string, lat: number, lon: number, info: string, symbolTable: string | null | undefined, symbolCode: string | null | undefined, packet: AprsPacket) => void;
|
||||
getDecodeRigMeta?: () => unknown;
|
||||
trxUi: { confirm(options: { title: string; message: string; confirmLabel: string }): Promise<boolean> };
|
||||
logContact?: (seed: { call?: string; gridsquare?: string | undefined; decoder?: string }) => void;
|
||||
updateAprsBar?: () => void;
|
||||
clearAprsBar?: () => void;
|
||||
closeAprsBar?: () => void;
|
||||
@@ -164,6 +165,9 @@ function renderAprsRow(pkt: AprsPacket, isFresh: boolean): HTMLElement {
|
||||
distance: aprsDistanceText(pkt),
|
||||
onMap: (lat, lon) => { aprsWindow.navigateToAprsMap?.(lat, lon); },
|
||||
onCopy: (text) => { void copyAprsCoords(text); },
|
||||
onLog: (call, gridsquare) => {
|
||||
aprsWindow.logContact?.({ call, gridsquare: gridsquare ?? undefined, decoder: "aprs" });
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -49,6 +49,8 @@ interface FtxBridge {
|
||||
updateFt8Bar?: () => void;
|
||||
registerFt8FamilyBarRenderer?: (decoder: FtxDecoderId, renderer: () => BarFrames) => void;
|
||||
takeSchedulerControlForDecoderDisable?: (button: HTMLElement) => Promise<void>;
|
||||
/** Opens a log entry from a decode. Pre-fills it; never logs by itself. */
|
||||
logContact?: (seed: { call?: string; gridsquare?: string | undefined; decoder?: string }) => void;
|
||||
trxUi: ConfirmApi;
|
||||
clearFt8Bar?: () => void;
|
||||
closeFt8Bar?: () => void;
|
||||
@@ -224,6 +226,26 @@ export function initializeFtxDecoder(config: FtxConfig): void {
|
||||
hour: "2-digit", minute: "2-digit", second: "2-digit",
|
||||
});
|
||||
row.innerHTML = `<span class="ft8-time">${time}</span><span class="ft8-snr">${snr?.toFixed(1) ?? "--"}</span><span class="ft8-dt">${delta?.toFixed(2) ?? "--"}</span><span class="ft8-freq">${frequency?.toFixed(0) ?? "--"}</span><span class="ft8-msg">${renderMessage(raw)}</span>`;
|
||||
// A decode is not a contact: this opens an entry with what was heard in it
|
||||
// and leaves the logging to the operator.
|
||||
const station = bridge.ft8ExtractLikelyCallsign?.(raw) ?? extractFtxCallsign(raw);
|
||||
if (station) {
|
||||
const log = document.createElement("button");
|
||||
log.type = "button";
|
||||
log.className = "ft8-log-btn";
|
||||
log.textContent = "Log";
|
||||
log.title = `Start a log entry for ${station}`;
|
||||
log.addEventListener("click", (event) => {
|
||||
event.stopPropagation();
|
||||
const details = bridge.ft8ExtractLocatorDetails?.(raw) ?? extractFtxLocatorDetails(raw);
|
||||
bridge.logContact?.({
|
||||
call: station,
|
||||
gridsquare: details.find((detail) => detail.station === station)?.grid,
|
||||
decoder: id,
|
||||
});
|
||||
});
|
||||
row.appendChild(log);
|
||||
}
|
||||
return row;
|
||||
};
|
||||
const render = (): void => {
|
||||
|
||||
@@ -22,6 +22,8 @@ export interface HostDecoderDescriptor {
|
||||
export interface HostState {
|
||||
readonly serverLat: number | null;
|
||||
readonly serverLon: number | null;
|
||||
/** The callsign this station is on the air with, from the client config. */
|
||||
readonly ownerCallsign: string | null;
|
||||
readonly authEnabled: boolean;
|
||||
readonly authRole: string | null;
|
||||
readonly lastActiveRigId: string | null;
|
||||
@@ -43,6 +45,7 @@ export interface HostCore {
|
||||
armOptimisticFrequency(frequencyHz: number): void;
|
||||
escapeMapHtml(value: string): string;
|
||||
haversineKm(lat1: number, lon1: number, lat2: number, lon2: number): number;
|
||||
latLonToMaidenhead(lat: number, lon: number): string;
|
||||
showHint(message: string, durationMs?: number): void;
|
||||
formatFreqForStep(frequencyHz: number, stepHz: number): string;
|
||||
refreshFreqDisplay(): void;
|
||||
|
||||
@@ -0,0 +1,430 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
// The station log: one panel that opens an entry, keeps the log, and takes
|
||||
// ADIF in and out.
|
||||
//
|
||||
// Times come from the server, never from here. The browser may be a phone in
|
||||
// another timezone with a clock nobody has checked, and a log is only worth
|
||||
// keeping if the times in it are the radio's.
|
||||
|
||||
import { hostCore, hostState } from "./host.js";
|
||||
|
||||
export {};
|
||||
|
||||
interface Qso {
|
||||
id: string;
|
||||
started_at: string;
|
||||
call: string;
|
||||
freq_hz: number;
|
||||
band?: string | null;
|
||||
mode: string;
|
||||
submode?: string | null;
|
||||
rst_sent?: string | null;
|
||||
rst_rcvd?: string | null;
|
||||
gridsquare?: string | null;
|
||||
name?: string | null;
|
||||
qth?: string | null;
|
||||
comment?: string | null;
|
||||
station_callsign?: string | null;
|
||||
operator?: string | null;
|
||||
my_gridsquare?: string | null;
|
||||
my_rig?: string | null;
|
||||
rig_id?: string | null;
|
||||
}
|
||||
|
||||
interface Prefill {
|
||||
started_at: string;
|
||||
epoch_ms: number;
|
||||
freq_hz: number;
|
||||
band: string | null;
|
||||
mode: string;
|
||||
submode: string | null;
|
||||
rig_id: string | null;
|
||||
my_rig: string | null;
|
||||
call: string | null;
|
||||
gridsquare: string | null;
|
||||
}
|
||||
|
||||
interface LogbookBridge {
|
||||
trxUi: {
|
||||
confirm(options: { title: string; message: string; confirmLabel: string }): Promise<boolean>;
|
||||
notify?(message: string, options?: { kind?: string }): void;
|
||||
};
|
||||
navigateToTab?: (name: string) => void;
|
||||
/** Opens the panel with an entry started from a decode. */
|
||||
logContact?: (seed: { call?: string; gridsquare?: string | undefined; decoder?: string }) => void;
|
||||
}
|
||||
|
||||
const bridge = window as unknown as LogbookBridge;
|
||||
|
||||
const el = <T extends HTMLElement>(id: string): T | null => document.getElementById(id) as T | null;
|
||||
|
||||
const form = el<HTMLFormElement>("log-entry-form");
|
||||
const callInput = el<HTMLInputElement>("log-call");
|
||||
const freqInput = el<HTMLInputElement>("log-freq");
|
||||
const modeInput = el<HTMLInputElement>("log-mode");
|
||||
const rstSentInput = el<HTMLInputElement>("log-rst-sent");
|
||||
const rstRcvdInput = el<HTMLInputElement>("log-rst-rcvd");
|
||||
const gridInput = el<HTMLInputElement>("log-grid");
|
||||
const nameInput = el<HTMLInputElement>("log-name");
|
||||
const commentInput = el<HTMLInputElement>("log-comment");
|
||||
const operatorInput = el<HTMLInputElement>("log-operator");
|
||||
const rowsBody = el<HTMLTableSectionElement>("log-rows");
|
||||
const summaryEl = el("log-summary");
|
||||
const workedEl = el("log-worked-before");
|
||||
const clockEl = el("log-clock");
|
||||
const stationCallEl = el("log-station-callsign");
|
||||
const stationRigEl = el("log-station-rig-name");
|
||||
const stationGridEl = el("log-station-grid");
|
||||
const filterCall = el<HTMLInputElement>("log-filter-call");
|
||||
const filterBand = el<HTMLSelectElement>("log-filter-band");
|
||||
const filterMode = el<HTMLSelectElement>("log-filter-mode");
|
||||
const importBtn = el<HTMLButtonElement>("log-import-btn");
|
||||
const importFile = el<HTMLInputElement>("log-import-file");
|
||||
const exportLink = el<HTMLAnchorElement>("log-export-btn");
|
||||
const clearBtn = el<HTMLButtonElement>("log-clear-btn");
|
||||
const saveBtn = el<HTMLButtonElement>("log-save-btn");
|
||||
|
||||
/** The time the open entry was started, as the server gave it. */
|
||||
let entryStartedAt: string | null = null;
|
||||
/** The rig the open entry belongs to, likewise. */
|
||||
let entryRigId: string | null = null;
|
||||
let entryRigName: string | null = null;
|
||||
let entryGrid: string | null = null;
|
||||
let qsos: Qso[] = [];
|
||||
let workedRequest = 0;
|
||||
|
||||
function notify(message: string, kind?: string): void {
|
||||
if (bridge.trxUi.notify) bridge.trxUi.notify(message, kind ? { kind } : undefined);
|
||||
else hostCore.showHint(message, 2000);
|
||||
}
|
||||
|
||||
async function getJson<T>(path: string): Promise<T> {
|
||||
const response = await fetch(path);
|
||||
if (!response.ok) throw new Error(`HTTP ${String(response.status)}`);
|
||||
return await response.json() as T;
|
||||
}
|
||||
|
||||
function formatFreq(hz: number): string {
|
||||
if (!Number.isFinite(hz) || hz <= 0) return "";
|
||||
// Through Number, not a trailing-zero trim: trimming "20.000000" as a string
|
||||
// walks back through the point and leaves "2".
|
||||
return String(Number((hz / 1e6).toFixed(6)));
|
||||
}
|
||||
|
||||
/** What the operator typed, in Hz: MHz unless it is plainly already Hz. */
|
||||
function parseFreq(text: string): number | null {
|
||||
const value = Number(text.trim().replace(/\s+/g, "").replace(",", "."));
|
||||
if (!Number.isFinite(value) || value <= 0) return null;
|
||||
return value < 100_000 ? Math.round(value * 1e6) : Math.round(value);
|
||||
}
|
||||
|
||||
function utcDate(iso: string): string {
|
||||
const date = new Date(iso);
|
||||
return Number.isNaN(date.getTime()) ? "" : date.toISOString().slice(0, 10);
|
||||
}
|
||||
|
||||
function utcTime(iso: string): string {
|
||||
const date = new Date(iso);
|
||||
return Number.isNaN(date.getTime()) ? "" : date.toISOString().slice(11, 19);
|
||||
}
|
||||
|
||||
// ── The entry ───────────────────────────────────────────────────────────────
|
||||
|
||||
/** Open an entry, pre-filled with the six fields the radio and clock answer. */
|
||||
async function openEntry(
|
||||
seed: { call?: string; gridsquare?: string | undefined; decoder?: string } = {},
|
||||
): Promise<void> {
|
||||
const params = new URLSearchParams();
|
||||
if (hostState.lastActiveRigId) params.set("remote", hostState.lastActiveRigId);
|
||||
if (seed.decoder) params.set("decoder", seed.decoder);
|
||||
if (seed.call) params.set("call", seed.call);
|
||||
if (seed.gridsquare) params.set("gridsquare", seed.gridsquare);
|
||||
try {
|
||||
const prefill = await getJson<Prefill>(`/api/logbook/prefill?${params.toString()}`);
|
||||
applyPrefill(prefill);
|
||||
} catch (error: unknown) {
|
||||
console.error("logbook prefill failed", error);
|
||||
}
|
||||
}
|
||||
|
||||
function applyPrefill(prefill: Prefill): void {
|
||||
entryStartedAt = prefill.started_at;
|
||||
entryRigId = prefill.rig_id;
|
||||
entryRigName = prefill.my_rig;
|
||||
if (freqInput) freqInput.value = formatFreq(prefill.freq_hz);
|
||||
if (modeInput) modeInput.value = prefill.submode ?? prefill.mode;
|
||||
if (callInput && prefill.call) callInput.value = prefill.call;
|
||||
if (gridInput && prefill.gridsquare) gridInput.value = prefill.gridsquare;
|
||||
if (stationRigEl) stationRigEl.textContent = prefill.my_rig ?? "no rig";
|
||||
showClock(prefill);
|
||||
updateWorkedBefore();
|
||||
}
|
||||
|
||||
/** The entry's time, and whether this browser agrees with it. */
|
||||
function showClock(prefill: Prefill): void {
|
||||
if (!clockEl) return;
|
||||
const time = utcTime(prefill.started_at);
|
||||
const drift = Math.abs(Date.now() - prefill.epoch_ms);
|
||||
clockEl.textContent = drift > 1000
|
||||
? `${time}Z · your clock is ${(drift / 1000).toFixed(0)}s out`
|
||||
: `${time}Z`;
|
||||
clockEl.classList.toggle("is-adrift", drift > 1000);
|
||||
}
|
||||
|
||||
/** Clear the entry and open a fresh one. */
|
||||
function resetEntry(): void {
|
||||
for (const input of [callInput, rstSentInput, rstRcvdInput, gridInput, nameInput, commentInput]) {
|
||||
if (input) input.value = "";
|
||||
}
|
||||
if (workedEl) workedEl.textContent = "";
|
||||
void openEntry();
|
||||
}
|
||||
|
||||
async function submitEntry(event: Event): Promise<void> {
|
||||
event.preventDefault();
|
||||
const call = callInput?.value.trim() ?? "";
|
||||
if (!call) {
|
||||
notify("A contact needs a callsign", "error");
|
||||
callInput?.focus();
|
||||
return;
|
||||
}
|
||||
const freqHz = parseFreq(freqInput?.value ?? "");
|
||||
if (freqHz == null) {
|
||||
notify("A contact needs a frequency", "error");
|
||||
freqInput?.focus();
|
||||
return;
|
||||
}
|
||||
const typedMode = (modeInput?.value ?? "").trim().toUpperCase();
|
||||
// USB and LSB are how a rig says SSB; the log wants the mode with the
|
||||
// sideband beside it, which is what other loggers read.
|
||||
const isSideband = typedMode === "USB" || typedMode === "LSB";
|
||||
const body = {
|
||||
// The server stamps the time; this is the one it gave when the entry
|
||||
// opened, so a contact logged five minutes later keeps the time it started.
|
||||
started_at: entryStartedAt,
|
||||
call,
|
||||
freq_hz: freqHz,
|
||||
mode: isSideband ? "SSB" : typedMode,
|
||||
submode: isSideband ? typedMode : null,
|
||||
rst_sent: rstSentInput?.value ?? null,
|
||||
rst_rcvd: rstRcvdInput?.value ?? null,
|
||||
gridsquare: gridInput?.value ?? null,
|
||||
name: nameInput?.value ?? null,
|
||||
comment: commentInput?.value ?? null,
|
||||
station_callsign: stationCallEl?.textContent?.trim() ?? null,
|
||||
operator: operatorInput?.value ?? null,
|
||||
my_gridsquare: entryGrid,
|
||||
my_rig: entryRigName,
|
||||
rig_id: entryRigId,
|
||||
};
|
||||
if (saveBtn) saveBtn.disabled = true;
|
||||
try {
|
||||
const response = await fetch("/api/logbook", {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify(body),
|
||||
});
|
||||
if (!response.ok) {
|
||||
const detail = await response.json().catch(() => ({})) as { error?: string };
|
||||
throw new Error(detail.error ?? `HTTP ${String(response.status)}`);
|
||||
}
|
||||
notify(`${call} logged`);
|
||||
resetEntry();
|
||||
await refreshLog();
|
||||
} catch (error: unknown) {
|
||||
notify(`Could not log: ${error instanceof Error ? error.message : String(error)}`, "error");
|
||||
} finally {
|
||||
if (saveBtn) saveBtn.disabled = false;
|
||||
}
|
||||
}
|
||||
|
||||
/** Whether this station has been worked, and on what. */
|
||||
function updateWorkedBefore(): void {
|
||||
if (!workedEl) return;
|
||||
const call = callInput?.value.trim() ?? "";
|
||||
if (call.length < 3) {
|
||||
workedEl.textContent = "";
|
||||
return;
|
||||
}
|
||||
const request = ++workedRequest;
|
||||
void getJson<{ worked: { band: string; mode: string }[] }>(
|
||||
`/api/logbook/worked/${encodeURIComponent(call)}`,
|
||||
).then((answer) => {
|
||||
// A slower answer to an earlier callsign must not overwrite a later one.
|
||||
if (request !== workedRequest || !workedEl) return;
|
||||
if (answer.worked.length === 0) {
|
||||
workedEl.textContent = "Not worked before";
|
||||
workedEl.classList.remove("is-worked");
|
||||
return;
|
||||
}
|
||||
const where = answer.worked.map((entry) => `${entry.band} ${entry.mode}`).join(", ");
|
||||
workedEl.textContent = `Worked before: ${where}`;
|
||||
workedEl.classList.add("is-worked");
|
||||
}).catch(() => { /* the log will still take the contact */ });
|
||||
}
|
||||
|
||||
// ── The log ─────────────────────────────────────────────────────────────────
|
||||
|
||||
function currentQuery(): string {
|
||||
const params = new URLSearchParams();
|
||||
const call = filterCall?.value.trim();
|
||||
if (call) params.set("call", call);
|
||||
if (filterBand?.value) params.set("band", filterBand.value);
|
||||
if (filterMode?.value) params.set("mode", filterMode.value);
|
||||
return params.toString();
|
||||
}
|
||||
|
||||
async function refreshLog(): Promise<void> {
|
||||
try {
|
||||
const query = currentQuery();
|
||||
const answer = await getJson<{ total: number; qsos: Qso[] }>(
|
||||
`/api/logbook${query ? `?${query}` : ""}`,
|
||||
);
|
||||
qsos = answer.qsos;
|
||||
renderRows();
|
||||
renderFilterOptions();
|
||||
if (summaryEl) {
|
||||
summaryEl.textContent = query
|
||||
? `${String(qsos.length)} of ${String(answer.total)} contacts`
|
||||
: `${String(answer.total)} contact${answer.total === 1 ? "" : "s"}`;
|
||||
}
|
||||
if (exportLink) exportLink.href = `/api/logbook/export.adi${query ? `?${query}` : ""}`;
|
||||
} catch (error: unknown) {
|
||||
console.error("logbook read failed", error);
|
||||
}
|
||||
}
|
||||
|
||||
function renderRows(): void {
|
||||
if (!rowsBody) return;
|
||||
if (qsos.length === 0) {
|
||||
rowsBody.innerHTML =
|
||||
'<tr><td colspan="10" class="log-empty">No contacts yet. Work someone and log them here,'
|
||||
+ " or bring a log in with Import ADIF.</td></tr>";
|
||||
return;
|
||||
}
|
||||
const fragment = document.createDocumentFragment();
|
||||
for (const qso of qsos) {
|
||||
const row = document.createElement("tr");
|
||||
row.dataset.qsoId = qso.id;
|
||||
const cells: (string | null | undefined)[] = [
|
||||
utcDate(qso.started_at),
|
||||
utcTime(qso.started_at),
|
||||
qso.call,
|
||||
qso.band ?? "",
|
||||
qso.submode ?? qso.mode,
|
||||
qso.rst_sent ?? "",
|
||||
qso.rst_rcvd ?? "",
|
||||
qso.gridsquare ?? "",
|
||||
qso.my_rig ?? "",
|
||||
];
|
||||
for (const [index, value] of cells.entries()) {
|
||||
const cell = document.createElement("td");
|
||||
cell.textContent = value ?? "";
|
||||
if (index === 2) cell.className = "log-cell-call";
|
||||
row.appendChild(cell);
|
||||
}
|
||||
const actions = document.createElement("td");
|
||||
const remove = document.createElement("button");
|
||||
remove.type = "button";
|
||||
remove.className = "log-row-btn";
|
||||
remove.textContent = "Delete";
|
||||
remove.setAttribute("aria-label", `Delete the contact with ${qso.call}`);
|
||||
remove.addEventListener("click", () => { void deleteQso(qso); });
|
||||
actions.appendChild(remove);
|
||||
row.appendChild(actions);
|
||||
fragment.appendChild(row);
|
||||
}
|
||||
rowsBody.replaceChildren(fragment);
|
||||
}
|
||||
|
||||
/** Bands and modes the log actually holds, so the filters offer only those. */
|
||||
function renderFilterOptions(): void {
|
||||
for (const [select, values] of [
|
||||
[filterBand, [...new Set(qsos.map((q) => q.band).filter((b): b is string => !!b))]],
|
||||
[filterMode, [...new Set(qsos.map((q) => q.submode ?? q.mode).filter(Boolean))]],
|
||||
] as const) {
|
||||
if (!select) continue;
|
||||
const chosen = select.value;
|
||||
const known = new Set([...select.options].map((option) => option.value));
|
||||
for (const value of [...values].sort()) {
|
||||
if (known.has(value)) continue;
|
||||
select.add(new Option(value, value));
|
||||
}
|
||||
select.value = chosen;
|
||||
}
|
||||
}
|
||||
|
||||
async function deleteQso(qso: Qso): Promise<void> {
|
||||
const confirmed = await bridge.trxUi.confirm({
|
||||
title: "Delete this contact?",
|
||||
message: `${qso.call} on ${qso.band ?? formatFreq(qso.freq_hz)} will be removed from the log.`,
|
||||
confirmLabel: "Delete",
|
||||
});
|
||||
if (!confirmed) return;
|
||||
try {
|
||||
const response = await fetch(`/api/logbook/${encodeURIComponent(qso.id)}`, { method: "DELETE" });
|
||||
if (!response.ok) throw new Error(`HTTP ${String(response.status)}`);
|
||||
await refreshLog();
|
||||
} catch (error: unknown) {
|
||||
notify(`Could not delete: ${error instanceof Error ? error.message : String(error)}`, "error");
|
||||
}
|
||||
}
|
||||
|
||||
async function importAdif(file: File): Promise<void> {
|
||||
try {
|
||||
const response = await fetch("/api/logbook/import", { method: "POST", body: await file.arrayBuffer() });
|
||||
if (!response.ok) throw new Error(`HTTP ${String(response.status)}`);
|
||||
const outcome = await response.json() as { added: number; duplicate: number; rejected: string[] };
|
||||
const parts = [`${String(outcome.added)} added`];
|
||||
if (outcome.duplicate > 0) parts.push(`${String(outcome.duplicate)} already held`);
|
||||
if (outcome.rejected.length > 0) parts.push(`${String(outcome.rejected.length)} not readable`);
|
||||
notify(parts.join(", "));
|
||||
await refreshLog();
|
||||
} catch (error: unknown) {
|
||||
notify(`Import failed: ${error instanceof Error ? error.message : String(error)}`, "error");
|
||||
}
|
||||
}
|
||||
|
||||
// ── Station line ────────────────────────────────────────────────────────────
|
||||
|
||||
function renderStation(): void {
|
||||
const callsign = hostState.ownerCallsign ?? "";
|
||||
if (stationCallEl) stationCallEl.textContent = callsign || "no callsign set";
|
||||
if (operatorInput && !operatorInput.value) operatorInput.value = callsign;
|
||||
if (stationGridEl) {
|
||||
const grid = hostState.serverLat != null && hostState.serverLon != null
|
||||
? hostCore.latLonToMaidenhead(hostState.serverLat, hostState.serverLon)
|
||||
: "";
|
||||
entryGrid = grid || null;
|
||||
stationGridEl.textContent = grid;
|
||||
}
|
||||
}
|
||||
|
||||
// ── Wiring ──────────────────────────────────────────────────────────────────
|
||||
|
||||
form?.addEventListener("submit", (event) => { void submitEntry(event); });
|
||||
clearBtn?.addEventListener("click", resetEntry);
|
||||
callInput?.addEventListener("input", updateWorkedBefore);
|
||||
for (const control of [filterCall, filterBand, filterMode]) {
|
||||
control?.addEventListener("input", () => { void refreshLog(); });
|
||||
control?.addEventListener("change", () => { void refreshLog(); });
|
||||
}
|
||||
importBtn?.addEventListener("click", () => { importFile?.click(); });
|
||||
importFile?.addEventListener("change", () => {
|
||||
const file = importFile.files?.[0];
|
||||
if (file) void importAdif(file);
|
||||
importFile.value = "";
|
||||
});
|
||||
|
||||
/** Start an entry from a decode, and show the operator where it went. */
|
||||
bridge.logContact = (seed) => {
|
||||
bridge.navigateToTab?.("logbook");
|
||||
void openEntry(seed).then(() => callInput?.focus());
|
||||
};
|
||||
|
||||
renderStation();
|
||||
void openEntry();
|
||||
void refreshLog();
|
||||
@@ -24,8 +24,8 @@ interface ButtonStateOptions {
|
||||
disabled?: boolean;
|
||||
}
|
||||
type TabKind = "primary" | "secondary";
|
||||
type LayoutCapability = "broadcast" | "digital";
|
||||
type LayoutName = "compact" | "broadcast" | "digital" | "full";
|
||||
type LayoutCapability = "broadcast" | "digital" | "ham";
|
||||
type LayoutName = "compact" | "broadcast" | "digital" | "full" | "ham";
|
||||
interface OperatorLayout {
|
||||
label: string;
|
||||
unavailable?: string;
|
||||
@@ -191,8 +191,11 @@ function elementById<T extends HTMLElement>(id: string): T {
|
||||
broadcast: { label: "Broadcast", unavailable: "Broadcast requires an enumerated WFM-capable receiver", advanced: false, audio: true, scheduler: false, preferredTab: "main", capability: "broadcast" },
|
||||
digital: { label: "Digital", unavailable: "Digital requires a compatible rig mode and an available decoder", advanced: false, audio: false, scheduler: false, preferredTab: "digital-modes", capability: "digital" },
|
||||
full: { label: "Full controls", advanced: true, audio: true, scheduler: true, preferredTab: "main" },
|
||||
// Working the bands: the log is the task and the radio is the instrument,
|
||||
// so this one opens on the logbook with the controls a keystroke away.
|
||||
ham: { label: "Ham radio", unavailable: "Ham radio needs a rig that can transmit", advanced: true, audio: true, scheduler: false, preferredTab: "logbook", capability: "ham" },
|
||||
};
|
||||
const layoutCapabilities: Record<LayoutCapability, boolean> = { broadcast: false, digital: false };
|
||||
const layoutCapabilities: Record<LayoutCapability, boolean> = { broadcast: false, digital: false, ham: false };
|
||||
let activeRigId: string | null = null;
|
||||
|
||||
// A layout seeds the collapsible sections; it does not hold them there.
|
||||
|
||||
@@ -0,0 +1,162 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
// The station log: the panel opens an entry pre-filled from the radio and the
|
||||
// server's clock, writes a contact, keeps it, and says whether the station has
|
||||
// been worked before. And the ham layout, which is offered only where a rig can
|
||||
// transmit -- a log is of contacts made.
|
||||
|
||||
import assert from "node:assert/strict";
|
||||
import { chromium } from "playwright-core";
|
||||
import { startBrowser, startWebFixture } from "./web-fixture.mjs";
|
||||
|
||||
/* global document, window, location */
|
||||
|
||||
const HELD = [
|
||||
{
|
||||
id: "q1", started_at: "2026-08-06T14:22:00Z", call: "DL3ABC", freq_hz: 14_074_000,
|
||||
band: "20m", mode: "FT8", rst_sent: "-07", rst_rcvd: "-12", gridsquare: "JO31",
|
||||
my_rig: "Primary fixture",
|
||||
},
|
||||
{
|
||||
id: "q2", started_at: "2026-08-06T13:05:00Z", call: "SP9XYZ", freq_hz: 7_120_000,
|
||||
band: "40m", mode: "SSB", submode: "LSB", rst_sent: "59", rst_rcvd: "57",
|
||||
gridsquare: "JO90", my_rig: "Primary fixture",
|
||||
},
|
||||
];
|
||||
|
||||
const fixture = await startWebFixture({ spectrum: true, tx: true, logbook: [...HELD] });
|
||||
const { browser, page, runtimeErrors } = await startBrowser(chromium);
|
||||
|
||||
const readPanel = () => page.evaluate(() => ({
|
||||
rows: [...(document.getElementById("log-rows")?.children ?? [])].map((row) => ({
|
||||
call: row.querySelector(".log-cell-call")?.textContent ?? "",
|
||||
cells: [...row.querySelectorAll("td")].map((cell) => cell.textContent),
|
||||
})),
|
||||
summary: document.getElementById("log-summary")?.textContent ?? "",
|
||||
freq: document.getElementById("log-freq")?.value ?? "",
|
||||
mode: document.getElementById("log-mode")?.value ?? "",
|
||||
call: document.getElementById("log-call")?.value ?? "",
|
||||
grid: document.getElementById("log-grid")?.value ?? "",
|
||||
rig: document.getElementById("log-station-rig-name")?.textContent ?? "",
|
||||
clock: document.getElementById("log-clock")?.textContent ?? "",
|
||||
worked: document.getElementById("log-worked-before")?.textContent ?? "",
|
||||
}));
|
||||
|
||||
try {
|
||||
await page.setViewportSize({ width: 1400, height: 950 });
|
||||
await page.goto(`${fixture.origin}/logbook`, { waitUntil: "domcontentloaded" });
|
||||
await page.locator("#tab-logbook").waitFor({ state: "visible" });
|
||||
await page.waitForTimeout(2500);
|
||||
|
||||
// The log is there, newest first, with the band and mode of each contact.
|
||||
const opened = await readPanel();
|
||||
assert.deepEqual(opened.rows.map((row) => row.call), ["DL3ABC", "SP9XYZ"]);
|
||||
assert.equal(opened.summary, "2 contacts");
|
||||
// A phone contact shows the sideband it was worked on, not just "SSB".
|
||||
assert.ok(opened.rows[1].cells.includes("LSB"), `the row reads ${JSON.stringify(opened.rows[1].cells)}`);
|
||||
|
||||
// The entry opened pre-filled: frequency and mode from the rig, the rig's
|
||||
// name, and the time from the server.
|
||||
assert.equal(opened.freq, "100", `the frequency pre-filled as "${opened.freq}"`);
|
||||
assert.equal(opened.mode, "USB", `the mode pre-filled as "${opened.mode}"`);
|
||||
assert.equal(opened.rig, "Primary fixture");
|
||||
assert.match(opened.clock, /^\d{2}:\d{2}:\d{2}Z$/, `the clock reads "${opened.clock}"`);
|
||||
// ...and nothing else was: a report is the operator's to give.
|
||||
assert.equal(opened.call, "");
|
||||
assert.equal(await page.evaluate(() => document.getElementById("log-rst-sent")?.value), "");
|
||||
|
||||
// Worked-before answers as the callsign is typed.
|
||||
await page.locator("#log-call").fill("DL3ABC");
|
||||
await page.waitForTimeout(600);
|
||||
assert.match((await readPanel()).worked, /Worked before: 20m FT8/);
|
||||
await page.locator("#log-call").fill("OZ1NEW");
|
||||
await page.waitForTimeout(600);
|
||||
assert.match((await readPanel()).worked, /Not worked before/);
|
||||
|
||||
// Logging writes the contact and clears the entry for the next one.
|
||||
await page.locator("#log-rst-sent").fill("59");
|
||||
await page.locator("#log-rst-rcvd").fill("57");
|
||||
await page.locator("#log-save-btn").click();
|
||||
await page.waitForTimeout(900);
|
||||
const afterLogging = await readPanel();
|
||||
assert.deepEqual(afterLogging.rows.map((row) => row.call), ["OZ1NEW", "DL3ABC", "SP9XYZ"]);
|
||||
assert.equal(afterLogging.summary, "3 contacts");
|
||||
assert.equal(afterLogging.call, "", "the entry kept the callsign after logging it");
|
||||
assert.equal(afterLogging.freq, "100", "the entry did not re-open pre-filled");
|
||||
|
||||
// A decode row starts an entry rather than logging one: what was heard goes
|
||||
// into the form, and the operator finishes it.
|
||||
await page.evaluate(() => { window.navigateToTab("digital-modes"); });
|
||||
await page.waitForTimeout(800);
|
||||
await page.locator('#tab-digital-modes .sub-tab[data-subtab="ft8"]').click();
|
||||
await page.waitForTimeout(400);
|
||||
await page.evaluate(() => {
|
||||
window.trxPluginRuntime.dispatch("ft8", {
|
||||
message: "CQ SP2SJG JO94", snr_db: -7, dt_s: 0.2, freq_hz: 1200,
|
||||
ts_ms: Date.now(), rig_id: "rig-a",
|
||||
});
|
||||
});
|
||||
await page.waitForTimeout(600);
|
||||
await page.locator("#ft8-messages .ft8-log-btn").first().click();
|
||||
await page.waitForTimeout(900);
|
||||
const fromDecode = await page.evaluate(() => ({
|
||||
path: location.pathname,
|
||||
call: document.getElementById("log-call")?.value ?? "",
|
||||
grid: document.getElementById("log-grid")?.value ?? "",
|
||||
mode: document.getElementById("log-mode")?.value ?? "",
|
||||
rows: document.getElementById("log-rows")?.children.length ?? 0,
|
||||
}));
|
||||
assert.equal(fromDecode.path, "/logbook", `the Log button landed on ${fromDecode.path}`);
|
||||
assert.equal(fromDecode.call, "SP2SJG", "the heard callsign did not reach the entry");
|
||||
assert.equal(fromDecode.grid, "JO94", "the heard locator did not reach the entry");
|
||||
// The decoder answers for the mode, because a rig in DIG cannot.
|
||||
assert.equal(fromDecode.mode, "FT8", `the mode came through as "${fromDecode.mode}"`);
|
||||
assert.equal(fromDecode.rows, 3, "a decode logged itself instead of opening an entry");
|
||||
|
||||
// The ham layout is on offer, because this rig can transmit.
|
||||
const layouts = await page.evaluate(() =>
|
||||
[...document.querySelectorAll("#operator-layout-select option")].map((option) => option.value));
|
||||
assert.ok(layouts.includes("ham"), `the layouts are ${JSON.stringify(layouts)}`);
|
||||
// Choosing it the way the picker does. The <select> itself measures zero
|
||||
// wide in a headless window, so Playwright will not click it; the change
|
||||
// event is what the picker is wired to either way.
|
||||
await page.evaluate(() => { window.navigateToTab("main"); });
|
||||
await page.waitForTimeout(600);
|
||||
await page.evaluate(() => {
|
||||
const select = document.getElementById("operator-layout-select");
|
||||
select.value = "ham";
|
||||
select.dispatchEvent(new Event("change", { bubbles: true }));
|
||||
});
|
||||
await page.waitForTimeout(900);
|
||||
const inHamLayout = await page.evaluate(() => ({
|
||||
layout: document.body.dataset.operatorLayout,
|
||||
path: location.pathname,
|
||||
}));
|
||||
assert.equal(inHamLayout.layout, "ham");
|
||||
assert.equal(inHamLayout.path, "/logbook", "the ham layout opened somewhere else");
|
||||
|
||||
assert.deepEqual(runtimeErrors, []);
|
||||
} finally {
|
||||
await browser.close();
|
||||
await fixture.close();
|
||||
}
|
||||
|
||||
// Without a transmitter there is nothing to log, so the layout is not offered.
|
||||
const listenerFixture = await startWebFixture({ spectrum: true, tx: false });
|
||||
const listener = await startBrowser(chromium);
|
||||
try {
|
||||
await listener.page.setViewportSize({ width: 1400, height: 950 });
|
||||
await listener.page.goto(`${listenerFixture.origin}/`, { waitUntil: "domcontentloaded" });
|
||||
await listener.page.locator("#content").waitFor({ state: "visible" });
|
||||
await listener.page.waitForTimeout(2000);
|
||||
const layouts = await listener.page.evaluate(() =>
|
||||
[...document.querySelectorAll("#operator-layout-select option")].map((option) => option.value));
|
||||
assert.ok(!layouts.includes("ham"), `a receiver was offered the ham layout: ${JSON.stringify(layouts)}`);
|
||||
} finally {
|
||||
await listener.browser.close();
|
||||
await listenerFixture.close();
|
||||
}
|
||||
|
||||
console.log("logbook tests passed");
|
||||
@@ -140,6 +140,7 @@ export async function startWebFixture({
|
||||
history = {},
|
||||
bookmarks = [],
|
||||
backgroundDecode = null,
|
||||
logbook = [],
|
||||
bandplan = {},
|
||||
bandplanEnabled = false,
|
||||
bandplanUnauthorizedFirst = false,
|
||||
@@ -279,6 +280,83 @@ export async function startWebFixture({
|
||||
response.writeHead(200).end();
|
||||
return;
|
||||
}
|
||||
// The logbook: an in-memory station log, enough for the panel to open an
|
||||
// entry, write it, read it back and export it.
|
||||
if (url.pathname.startsWith("/api/logbook")) {
|
||||
const tail = url.pathname.slice("/api/logbook".length);
|
||||
if (tail === "/prefill") {
|
||||
response.writeHead(200, { "content-type": "application/json" });
|
||||
response.end(JSON.stringify({
|
||||
started_at: new Date().toISOString(),
|
||||
epoch_ms: Date.now(),
|
||||
freq_hz: status.status.freq.hz,
|
||||
band: "20m",
|
||||
mode: url.searchParams.get("decoder") === "ft8" ? "FT8" : "SSB",
|
||||
submode: url.searchParams.get("decoder") === "ft8" ? null : "USB",
|
||||
rig_id: url.searchParams.get("remote") ?? "rig-a",
|
||||
my_rig: "Primary fixture",
|
||||
call: url.searchParams.get("call"),
|
||||
gridsquare: url.searchParams.get("gridsquare"),
|
||||
}));
|
||||
return;
|
||||
}
|
||||
if (tail.startsWith("/worked/")) {
|
||||
const call = decodeURIComponent(tail.slice("/worked/".length)).toUpperCase();
|
||||
const worked = logbook
|
||||
.filter((qso) => qso.call === call)
|
||||
.map((qso) => ({ band: qso.band, mode: qso.mode }));
|
||||
response.writeHead(200, { "content-type": "application/json" });
|
||||
response.end(JSON.stringify({ call, worked }));
|
||||
return;
|
||||
}
|
||||
if (tail === "/export.adi") {
|
||||
const body = logbook
|
||||
.map((qso) => `<CALL:${qso.call.length}>${qso.call}<EOR>\n`)
|
||||
.join("");
|
||||
response.writeHead(200, { "content-type": "text/plain" });
|
||||
response.end(body);
|
||||
return;
|
||||
}
|
||||
if (request.method === "POST" && tail === "") {
|
||||
const raw = await new Promise((resolve) => {
|
||||
let text = "";
|
||||
request.on("data", (chunk) => { text += chunk; });
|
||||
request.on("end", () => resolve(text));
|
||||
});
|
||||
const input = JSON.parse(raw);
|
||||
const qso = {
|
||||
id: `qso-${String(logbook.length + 1)}`,
|
||||
started_at: input.started_at ?? new Date().toISOString(),
|
||||
call: String(input.call).toUpperCase(),
|
||||
freq_hz: input.freq_hz,
|
||||
band: "20m",
|
||||
mode: input.mode,
|
||||
submode: input.submode,
|
||||
rst_sent: input.rst_sent,
|
||||
rst_rcvd: input.rst_rcvd,
|
||||
gridsquare: input.gridsquare ? String(input.gridsquare).toUpperCase() : null,
|
||||
my_rig: input.my_rig,
|
||||
operator: input.operator,
|
||||
};
|
||||
logbook.unshift(qso);
|
||||
response.writeHead(200, { "content-type": "application/json" });
|
||||
response.end(JSON.stringify(qso));
|
||||
return;
|
||||
}
|
||||
if (request.method === "DELETE") {
|
||||
const id = tail.replace("/", "");
|
||||
const index = logbook.findIndex((qso) => qso.id === id);
|
||||
if (index >= 0) logbook.splice(index, 1);
|
||||
response.writeHead(200, { "content-type": "application/json" });
|
||||
response.end(JSON.stringify({ deleted: index >= 0 }));
|
||||
return;
|
||||
}
|
||||
const wanted = (url.searchParams.get("call") ?? "").toUpperCase();
|
||||
const matching = wanted ? logbook.filter((qso) => qso.call.includes(wanted)) : logbook;
|
||||
response.writeHead(200, { "content-type": "application/json" });
|
||||
response.end(JSON.stringify({ total: logbook.length, qsos: matching }));
|
||||
return;
|
||||
}
|
||||
// Background decode: the panel reads its config, its status, and the
|
||||
// bookmark list, and writes the config back.
|
||||
if (url.pathname.startsWith("/background-decode/")) {
|
||||
|
||||
@@ -138,6 +138,17 @@ pub(crate) async fn statistics_index(req: HttpRequest) -> impl Responder {
|
||||
)
|
||||
}
|
||||
|
||||
#[get("/logbook")]
|
||||
pub(crate) async fn logbook_index(req: HttpRequest) -> impl Responder {
|
||||
let c = gz_index_html();
|
||||
static_asset_response(
|
||||
&req,
|
||||
"text/html; charset=utf-8",
|
||||
c,
|
||||
AssetCaching::Revalidate,
|
||||
)
|
||||
}
|
||||
|
||||
#[get("/satellites")]
|
||||
pub(crate) async fn satellites_index(req: HttpRequest) -> impl Responder {
|
||||
let c = gz_index_html();
|
||||
|
||||
@@ -0,0 +1,372 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! The logbook over HTTP: read, write, import, export, and the clock a contact
|
||||
//! is stamped from.
|
||||
|
||||
use std::sync::Arc;
|
||||
|
||||
use actix_web::http::header;
|
||||
use actix_web::{delete, get, post, put, web, HttpRequest, HttpResponse, Responder};
|
||||
use chrono::Utc;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use trx_logbook::qso::{adif_mode_for_rig_mode, band_for_hz, mode_for_decoder};
|
||||
use trx_logbook::{LogQuery, Logbook, Qso};
|
||||
|
||||
use super::{active_rig_id_from_context, require_control};
|
||||
use crate::server::auth::AuthState;
|
||||
|
||||
/// What a contact looks like on the wire.
|
||||
///
|
||||
/// The band is sent although it is derived, because every reader of the log
|
||||
/// wants it and none of them should have to carry the band plan to get it.
|
||||
#[derive(Debug, Serialize)]
|
||||
struct QsoView {
|
||||
#[serde(flatten)]
|
||||
qso: Qso,
|
||||
band: Option<&'static str>,
|
||||
}
|
||||
|
||||
impl From<Qso> for QsoView {
|
||||
fn from(qso: Qso) -> Self {
|
||||
Self {
|
||||
band: qso.band(),
|
||||
qso,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// A contact as the panel sends it.
|
||||
///
|
||||
/// Times come from the server (`started_at` omitted means "now"), so a browser
|
||||
/// with a wrong clock cannot write a wrong time into the log.
|
||||
#[derive(Debug, Deserialize)]
|
||||
struct QsoInput {
|
||||
#[serde(default)]
|
||||
id: Option<String>,
|
||||
#[serde(default)]
|
||||
started_at: Option<chrono::DateTime<Utc>>,
|
||||
#[serde(default)]
|
||||
ended_at: Option<chrono::DateTime<Utc>>,
|
||||
call: String,
|
||||
freq_hz: u64,
|
||||
mode: String,
|
||||
#[serde(default)]
|
||||
submode: Option<String>,
|
||||
#[serde(default)]
|
||||
rst_sent: Option<String>,
|
||||
#[serde(default)]
|
||||
rst_rcvd: Option<String>,
|
||||
#[serde(default)]
|
||||
gridsquare: Option<String>,
|
||||
#[serde(default)]
|
||||
name: Option<String>,
|
||||
#[serde(default)]
|
||||
qth: Option<String>,
|
||||
#[serde(default)]
|
||||
comment: Option<String>,
|
||||
#[serde(default)]
|
||||
tx_pwr_w: Option<f64>,
|
||||
#[serde(default)]
|
||||
station_callsign: Option<String>,
|
||||
#[serde(default)]
|
||||
operator: Option<String>,
|
||||
#[serde(default)]
|
||||
my_gridsquare: Option<String>,
|
||||
#[serde(default)]
|
||||
my_rig: Option<String>,
|
||||
#[serde(default)]
|
||||
rig_id: Option<String>,
|
||||
}
|
||||
|
||||
fn blank_to_none(value: Option<String>) -> Option<String> {
|
||||
value
|
||||
.map(|text| text.trim().to_string())
|
||||
.filter(|text| !text.is_empty())
|
||||
}
|
||||
|
||||
impl QsoInput {
|
||||
fn into_qso(self, existing: Option<Qso>) -> Result<Qso, String> {
|
||||
let call = self.call.trim();
|
||||
if call.is_empty() {
|
||||
return Err("a contact needs a callsign".to_string());
|
||||
}
|
||||
if self.mode.trim().is_empty() {
|
||||
return Err("a contact needs a mode".to_string());
|
||||
}
|
||||
let started_at = self
|
||||
.started_at
|
||||
.or(existing.as_ref().map(|q| q.started_at))
|
||||
.unwrap_or_else(Utc::now);
|
||||
let mut qso = Qso::new(
|
||||
self.id
|
||||
.or(existing.as_ref().map(|q| q.id.clone()))
|
||||
.unwrap_or_else(trx_logbook::new_id),
|
||||
started_at,
|
||||
call,
|
||||
self.freq_hz,
|
||||
&self.mode,
|
||||
);
|
||||
qso.ended_at = self.ended_at;
|
||||
qso.submode = blank_to_none(self.submode).map(|s| s.to_uppercase());
|
||||
qso.rst_sent = blank_to_none(self.rst_sent);
|
||||
qso.rst_rcvd = blank_to_none(self.rst_rcvd);
|
||||
qso.gridsquare = blank_to_none(self.gridsquare).map(|g| g.to_uppercase());
|
||||
qso.name = blank_to_none(self.name);
|
||||
qso.qth = blank_to_none(self.qth);
|
||||
qso.comment = blank_to_none(self.comment);
|
||||
qso.tx_pwr_w = self.tx_pwr_w;
|
||||
qso.station_callsign = blank_to_none(self.station_callsign).map(|c| c.to_uppercase());
|
||||
qso.operator = blank_to_none(self.operator).map(|c| c.to_uppercase());
|
||||
qso.my_gridsquare = blank_to_none(self.my_gridsquare).map(|g| g.to_uppercase());
|
||||
qso.my_rig = blank_to_none(self.my_rig);
|
||||
qso.rig_id = blank_to_none(self.rig_id);
|
||||
// Whatever an imported contact carried that this application does not
|
||||
// model stays with it through an edit.
|
||||
if let Some(existing) = existing {
|
||||
qso.extra = existing.extra;
|
||||
}
|
||||
Ok(qso)
|
||||
}
|
||||
}
|
||||
|
||||
fn book(logbook: &web::Data<Arc<Logbook>>) -> Arc<Logbook> {
|
||||
logbook.get_ref().clone()
|
||||
}
|
||||
|
||||
/// The rig's name as the operator knows it, which is what belongs in the log —
|
||||
/// falling back to its id, since a log entry naming nothing is worse.
|
||||
fn rig_display_name(context: &trx_frontend::FrontendRuntimeContext, rig_id: &str) -> String {
|
||||
context
|
||||
.routing
|
||||
.remote_rigs
|
||||
.lock()
|
||||
.ok()
|
||||
.and_then(|rigs| {
|
||||
rigs.iter()
|
||||
.find(|rig| rig.rig_id == rig_id)
|
||||
.and_then(|rig| rig.display_name.clone())
|
||||
})
|
||||
.unwrap_or_else(|| rig_id.to_string())
|
||||
}
|
||||
|
||||
/// `GET /api/logbook` — contacts, newest first, filtered.
|
||||
#[get("/api/logbook")]
|
||||
pub async fn list_qsos(
|
||||
query: web::Query<LogQuery>,
|
||||
logbook: web::Data<Arc<Logbook>>,
|
||||
) -> impl Responder {
|
||||
let query = query.into_inner();
|
||||
let total = book(&logbook).count();
|
||||
let qsos: Vec<QsoView> = book(&logbook)
|
||||
.query(&query)
|
||||
.into_iter()
|
||||
.map(QsoView::from)
|
||||
.collect();
|
||||
HttpResponse::Ok().json(serde_json::json!({ "total": total, "qsos": qsos }))
|
||||
}
|
||||
|
||||
/// `POST /api/logbook` — write a contact.
|
||||
#[post("/api/logbook")]
|
||||
pub async fn add_qso(
|
||||
req: HttpRequest,
|
||||
input: web::Json<QsoInput>,
|
||||
logbook: web::Data<Arc<Logbook>>,
|
||||
auth_state: web::Data<AuthState>,
|
||||
) -> Result<HttpResponse, actix_web::Error> {
|
||||
require_control(&req, auth_state.get_ref())?;
|
||||
let qso = match input.into_inner().into_qso(None) {
|
||||
Ok(qso) => qso,
|
||||
Err(reason) => {
|
||||
return Ok(HttpResponse::BadRequest().json(serde_json::json!({ "error": reason })))
|
||||
}
|
||||
};
|
||||
match book(&logbook).put(qso) {
|
||||
Ok(saved) => Ok(HttpResponse::Ok().json(QsoView::from(saved))),
|
||||
Err(err) => Ok(HttpResponse::InternalServerError()
|
||||
.json(serde_json::json!({ "error": err.to_string() }))),
|
||||
}
|
||||
}
|
||||
|
||||
/// `PUT /api/logbook/{id}` — change a contact.
|
||||
#[put("/api/logbook/{id}")]
|
||||
pub async fn edit_qso(
|
||||
req: HttpRequest,
|
||||
path: web::Path<String>,
|
||||
input: web::Json<QsoInput>,
|
||||
logbook: web::Data<Arc<Logbook>>,
|
||||
auth_state: web::Data<AuthState>,
|
||||
) -> Result<HttpResponse, actix_web::Error> {
|
||||
require_control(&req, auth_state.get_ref())?;
|
||||
let id = path.into_inner();
|
||||
let Some(existing) = book(&logbook).get(&id) else {
|
||||
return Ok(HttpResponse::NotFound().json(serde_json::json!({ "error": "no such contact" })));
|
||||
};
|
||||
let mut input = input.into_inner();
|
||||
input.id = Some(id);
|
||||
let qso = match input.into_qso(Some(existing)) {
|
||||
Ok(qso) => qso,
|
||||
Err(reason) => {
|
||||
return Ok(HttpResponse::BadRequest().json(serde_json::json!({ "error": reason })))
|
||||
}
|
||||
};
|
||||
match book(&logbook).put(qso) {
|
||||
Ok(saved) => Ok(HttpResponse::Ok().json(QsoView::from(saved))),
|
||||
Err(err) => Ok(HttpResponse::InternalServerError()
|
||||
.json(serde_json::json!({ "error": err.to_string() }))),
|
||||
}
|
||||
}
|
||||
|
||||
/// `DELETE /api/logbook/{id}` — forget a contact.
|
||||
#[delete("/api/logbook/{id}")]
|
||||
pub async fn delete_qso(
|
||||
req: HttpRequest,
|
||||
path: web::Path<String>,
|
||||
logbook: web::Data<Arc<Logbook>>,
|
||||
auth_state: web::Data<AuthState>,
|
||||
) -> Result<HttpResponse, actix_web::Error> {
|
||||
require_control(&req, auth_state.get_ref())?;
|
||||
match book(&logbook).delete(&path.into_inner()) {
|
||||
Ok(true) => Ok(HttpResponse::Ok().json(serde_json::json!({ "deleted": true }))),
|
||||
Ok(false) => {
|
||||
Ok(HttpResponse::NotFound().json(serde_json::json!({ "error": "no such contact" })))
|
||||
}
|
||||
Err(err) => Ok(HttpResponse::InternalServerError()
|
||||
.json(serde_json::json!({ "error": err.to_string() }))),
|
||||
}
|
||||
}
|
||||
|
||||
/// `GET /api/logbook/export.adi` — ADIF, honouring the same filters as a read.
|
||||
#[get("/api/logbook/export.adi")]
|
||||
pub async fn export_adi(
|
||||
query: web::Query<LogQuery>,
|
||||
logbook: web::Data<Arc<Logbook>>,
|
||||
) -> impl Responder {
|
||||
let text = book(&logbook).export_adi(&query.into_inner(), env!("CARGO_PKG_VERSION"));
|
||||
let filename = format!("trx-rs-log-{}.adi", Utc::now().format("%Y%m%d"));
|
||||
HttpResponse::Ok()
|
||||
.insert_header((header::CONTENT_TYPE, "text/plain; charset=utf-8"))
|
||||
.insert_header((
|
||||
header::CONTENT_DISPOSITION,
|
||||
format!("attachment; filename=\"{filename}\""),
|
||||
))
|
||||
.body(text)
|
||||
}
|
||||
|
||||
/// `POST /api/logbook/import` — take an ADIF file, skipping what is already held.
|
||||
#[post("/api/logbook/import")]
|
||||
pub async fn import_adi(
|
||||
req: HttpRequest,
|
||||
body: web::Bytes,
|
||||
logbook: web::Data<Arc<Logbook>>,
|
||||
auth_state: web::Data<AuthState>,
|
||||
) -> Result<HttpResponse, actix_web::Error> {
|
||||
require_control(&req, auth_state.get_ref())?;
|
||||
match book(&logbook).import_adi(&body) {
|
||||
Ok(outcome) => Ok(HttpResponse::Ok().json(outcome)),
|
||||
Err(err) => Ok(HttpResponse::InternalServerError()
|
||||
.json(serde_json::json!({ "error": err.to_string() }))),
|
||||
}
|
||||
}
|
||||
|
||||
/// `GET /api/logbook/worked/{call}` — which bands and modes this station has been
|
||||
/// worked on.
|
||||
#[get("/api/logbook/worked/{call}")]
|
||||
pub async fn worked_before(
|
||||
path: web::Path<String>,
|
||||
logbook: web::Data<Arc<Logbook>>,
|
||||
) -> impl Responder {
|
||||
let call = path.into_inner();
|
||||
let worked: Vec<serde_json::Value> = book(&logbook)
|
||||
.worked_before(&call)
|
||||
.into_iter()
|
||||
.map(|(band, mode)| serde_json::json!({ "band": band, "mode": mode }))
|
||||
.collect();
|
||||
HttpResponse::Ok().json(serde_json::json!({
|
||||
"call": trx_logbook::qso::normalize_call(&call),
|
||||
"worked": worked,
|
||||
}))
|
||||
}
|
||||
|
||||
/// `GET /api/logbook/now` — the clock a contact is stamped from.
|
||||
///
|
||||
/// The panel shows the operator when their browser disagrees with it, rather
|
||||
/// than logging a time nobody expected.
|
||||
#[get("/api/logbook/now")]
|
||||
pub async fn server_now() -> impl Responder {
|
||||
let now = Utc::now();
|
||||
HttpResponse::Ok().json(serde_json::json!({
|
||||
"utc": now.to_rfc3339(),
|
||||
"epoch_ms": now.timestamp_millis(),
|
||||
}))
|
||||
}
|
||||
|
||||
/// `GET /api/logbook/prefill` — the six fields an entry opens with.
|
||||
///
|
||||
/// Worked out on the server because that is where the rig state, the station
|
||||
/// identity and the clock all are; the panel would otherwise have to assemble
|
||||
/// them from three places and would still not have the clock.
|
||||
#[derive(Debug, Deserialize)]
|
||||
pub struct PrefillQuery {
|
||||
/// The rig the entry is for.
|
||||
#[serde(default)]
|
||||
pub remote: Option<String>,
|
||||
/// The decoder a decode row came from, which answers for the mode when the
|
||||
/// rig only says `DIG`.
|
||||
#[serde(default)]
|
||||
pub decoder: Option<String>,
|
||||
/// A callsign and locator carried over from a decode row.
|
||||
#[serde(default)]
|
||||
pub call: Option<String>,
|
||||
#[serde(default)]
|
||||
pub gridsquare: Option<String>,
|
||||
}
|
||||
|
||||
#[get("/api/logbook/prefill")]
|
||||
pub async fn prefill(
|
||||
query: web::Query<PrefillQuery>,
|
||||
context: web::Data<Arc<trx_frontend::FrontendRuntimeContext>>,
|
||||
state: web::Data<tokio::sync::watch::Receiver<trx_core::RigState>>,
|
||||
) -> impl Responder {
|
||||
let query = query.into_inner();
|
||||
let rig_id = query
|
||||
.remote
|
||||
.clone()
|
||||
.filter(|id| !id.is_empty())
|
||||
.or_else(|| active_rig_id_from_context(context.get_ref()));
|
||||
let rig_state = rig_id
|
||||
.as_deref()
|
||||
.and_then(|id| context.rig_state_rx(id))
|
||||
.unwrap_or_else(|| state.get_ref().clone())
|
||||
.borrow()
|
||||
.clone();
|
||||
|
||||
let freq_hz = rig_state.status.freq.hz;
|
||||
let rig_mode = format!("{:?}", rig_state.status.mode);
|
||||
// The rig cannot answer for DIG: a rig in DIG is in FT8 or FT4 depending on
|
||||
// which decoder is running, so the decoder is asked first when there is one.
|
||||
let (mode, submode) = query
|
||||
.decoder
|
||||
.as_deref()
|
||||
.and_then(mode_for_decoder)
|
||||
.or_else(|| adif_mode_for_rig_mode(&rig_mode))
|
||||
.map_or((String::new(), None), |(mode, submode)| {
|
||||
(mode.to_string(), submode.map(str::to_string))
|
||||
});
|
||||
|
||||
let now = Utc::now();
|
||||
HttpResponse::Ok().json(serde_json::json!({
|
||||
"started_at": now.to_rfc3339(),
|
||||
"epoch_ms": now.timestamp_millis(),
|
||||
"freq_hz": freq_hz,
|
||||
"band": band_for_hz(freq_hz),
|
||||
"mode": mode,
|
||||
"submode": submode,
|
||||
"rig_id": rig_id,
|
||||
"my_rig": rig_id.as_deref().map(|id| rig_display_name(context.get_ref(), id)),
|
||||
"call": query.call.map(|c| trx_logbook::qso::normalize_call(&c)),
|
||||
"gridsquare": query.gridsquare.map(|g| g.trim().to_uppercase()),
|
||||
}))
|
||||
}
|
||||
@@ -7,6 +7,7 @@
|
||||
mod assets;
|
||||
mod bookmarks;
|
||||
mod decoder;
|
||||
mod logbook;
|
||||
pub mod recorder;
|
||||
pub mod rig;
|
||||
mod sse;
|
||||
@@ -664,6 +665,7 @@ pub fn configure(cfg: &mut web::ServiceConfig) {
|
||||
.service(assets::recorder_index)
|
||||
.service(assets::settings_index)
|
||||
.service(assets::about_index)
|
||||
.service(assets::logbook_index)
|
||||
.service(assets::satellites_index)
|
||||
.service(assets::statistics_index)
|
||||
.service(assets::bookmarks_index)
|
||||
@@ -706,7 +708,17 @@ pub fn configure(cfg: &mut web::ServiceConfig) {
|
||||
// Auth endpoints
|
||||
.service(crate::server::auth::login)
|
||||
.service(crate::server::auth::logout)
|
||||
.service(crate::server::auth::session_status);
|
||||
.service(crate::server::auth::session_status)
|
||||
// Logbook
|
||||
.service(logbook::list_qsos)
|
||||
.service(logbook::add_qso)
|
||||
.service(logbook::edit_qso)
|
||||
.service(logbook::delete_qso)
|
||||
.service(logbook::export_adi)
|
||||
.service(logbook::import_adi)
|
||||
.service(logbook::worked_before)
|
||||
.service(logbook::server_now)
|
||||
.service(logbook::prefill);
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
@@ -935,6 +947,173 @@ mod tests {
|
||||
);
|
||||
}
|
||||
|
||||
/// Auth off: every session may write, as a station with no passphrase set.
|
||||
fn auth_state_disabled() -> crate::server::auth::AuthState {
|
||||
crate::server::auth::AuthState::new(crate::server::auth::AuthConfig::new(
|
||||
false,
|
||||
None,
|
||||
None,
|
||||
false,
|
||||
std::time::Duration::from_secs(3600),
|
||||
false,
|
||||
crate::server::auth::SameSite::Lax,
|
||||
))
|
||||
}
|
||||
|
||||
/// Auth on with no session presented, which is what a listener is.
|
||||
fn auth_state_locked() -> crate::server::auth::AuthState {
|
||||
crate::server::auth::AuthState::new(crate::server::auth::AuthConfig::new(
|
||||
true,
|
||||
Some("listen".to_string()),
|
||||
Some("control".to_string()),
|
||||
false,
|
||||
std::time::Duration::from_secs(3600),
|
||||
false,
|
||||
crate::server::auth::SameSite::Lax,
|
||||
))
|
||||
}
|
||||
|
||||
/// A contact written over HTTP comes back out of the log, and out of an
|
||||
/// ADIF export that another logger could read.
|
||||
#[actix_web::test]
|
||||
async fn a_contact_written_over_http_is_kept_and_exported() {
|
||||
let dir = tempfile::tempdir().expect("tempdir");
|
||||
let logbook = std::sync::Arc::new(
|
||||
trx_logbook::Logbook::open(&dir.path().join("logbook.jsonl")).expect("open"),
|
||||
);
|
||||
let app = actix_test::init_service(
|
||||
App::new()
|
||||
.app_data(web::Data::new(logbook.clone()))
|
||||
.app_data(web::Data::new(auth_state_disabled()))
|
||||
.service(logbook::add_qso)
|
||||
.service(logbook::list_qsos)
|
||||
.service(logbook::export_adi)
|
||||
.service(logbook::worked_before),
|
||||
)
|
||||
.await;
|
||||
|
||||
let response = actix_test::call_service(
|
||||
&app,
|
||||
actix_test::TestRequest::post()
|
||||
.uri("/api/logbook")
|
||||
.set_json(serde_json::json!({
|
||||
"call": "sp2sjg",
|
||||
"freq_hz": 14_074_000_u64,
|
||||
"mode": "FT8",
|
||||
"rst_sent": "-07",
|
||||
"gridsquare": "jo94",
|
||||
}))
|
||||
.to_request(),
|
||||
)
|
||||
.await;
|
||||
assert_eq!(response.status(), 200);
|
||||
let written: serde_json::Value = actix_test::read_body_json(response).await;
|
||||
// Normalised on the way in, and the band worked out from the dial.
|
||||
assert_eq!(written["call"], "SP2SJG");
|
||||
assert_eq!(written["gridsquare"], "JO94");
|
||||
assert_eq!(written["band"], "20m");
|
||||
|
||||
let listed: serde_json::Value = actix_test::call_and_read_body_json(
|
||||
&app,
|
||||
actix_test::TestRequest::get()
|
||||
.uri("/api/logbook")
|
||||
.to_request(),
|
||||
)
|
||||
.await;
|
||||
assert_eq!(listed["total"], 1);
|
||||
assert_eq!(listed["qsos"][0]["call"], "SP2SJG");
|
||||
|
||||
let worked: serde_json::Value = actix_test::call_and_read_body_json(
|
||||
&app,
|
||||
actix_test::TestRequest::get()
|
||||
.uri("/api/logbook/worked/SP2SJG")
|
||||
.to_request(),
|
||||
)
|
||||
.await;
|
||||
assert_eq!(worked["worked"][0]["band"], "20m");
|
||||
|
||||
let exported = actix_test::call_and_read_body(
|
||||
&app,
|
||||
actix_test::TestRequest::get()
|
||||
.uri("/api/logbook/export.adi")
|
||||
.to_request(),
|
||||
)
|
||||
.await;
|
||||
let text = String::from_utf8_lossy(&exported);
|
||||
assert!(text.contains("<CALL:6>SP2SJG"), "{text}");
|
||||
assert!(text.contains("<BAND:3>20m"), "{text}");
|
||||
assert!(text.contains("<EOR>"), "{text}");
|
||||
}
|
||||
|
||||
/// A read-only session may read the log and may not write to it.
|
||||
#[actix_web::test]
|
||||
async fn a_read_only_session_cannot_write_to_the_log() {
|
||||
let dir = tempfile::tempdir().expect("tempdir");
|
||||
let logbook = std::sync::Arc::new(
|
||||
trx_logbook::Logbook::open(&dir.path().join("logbook.jsonl")).expect("open"),
|
||||
);
|
||||
let app = actix_test::init_service(
|
||||
App::new()
|
||||
.app_data(web::Data::new(logbook))
|
||||
.app_data(web::Data::new(auth_state_locked()))
|
||||
.service(logbook::add_qso)
|
||||
.service(logbook::list_qsos),
|
||||
)
|
||||
.await;
|
||||
|
||||
let response = actix_test::call_service(
|
||||
&app,
|
||||
actix_test::TestRequest::post()
|
||||
.uri("/api/logbook")
|
||||
.set_json(serde_json::json!({
|
||||
"call": "SP2SJG", "freq_hz": 14_074_000_u64, "mode": "FT8",
|
||||
}))
|
||||
.to_request(),
|
||||
)
|
||||
.await;
|
||||
assert!(
|
||||
response.status().is_client_error(),
|
||||
"a listener wrote to the log: {}",
|
||||
response.status()
|
||||
);
|
||||
let listed: serde_json::Value = actix_test::call_and_read_body_json(
|
||||
&app,
|
||||
actix_test::TestRequest::get()
|
||||
.uri("/api/logbook")
|
||||
.to_request(),
|
||||
)
|
||||
.await;
|
||||
assert_eq!(listed["total"], 0);
|
||||
}
|
||||
|
||||
/// A contact needs a callsign; the panel is not the only thing that has to
|
||||
/// insist on it.
|
||||
#[actix_web::test]
|
||||
async fn a_contact_without_a_callsign_is_refused() {
|
||||
let dir = tempfile::tempdir().expect("tempdir");
|
||||
let logbook = std::sync::Arc::new(
|
||||
trx_logbook::Logbook::open(&dir.path().join("logbook.jsonl")).expect("open"),
|
||||
);
|
||||
let app = actix_test::init_service(
|
||||
App::new()
|
||||
.app_data(web::Data::new(logbook))
|
||||
.app_data(web::Data::new(auth_state_disabled()))
|
||||
.service(logbook::add_qso),
|
||||
)
|
||||
.await;
|
||||
let response = actix_test::call_service(
|
||||
&app,
|
||||
actix_test::TestRequest::post()
|
||||
.uri("/api/logbook")
|
||||
.set_json(serde_json::json!({
|
||||
"call": " ", "freq_hz": 14_074_000_u64, "mode": "FT8",
|
||||
}))
|
||||
.to_request(),
|
||||
)
|
||||
.await;
|
||||
assert_eq!(response.status(), 400);
|
||||
}
|
||||
|
||||
/// GET /status returns 200 with valid JSON containing rig snapshot fields.
|
||||
#[actix_web::test]
|
||||
async fn test_status_endpoint_returns_json() {
|
||||
|
||||
@@ -106,6 +106,39 @@ async fn serve(
|
||||
activity_log_map.clone(),
|
||||
);
|
||||
|
||||
// The log is opened once and shared: it is one station's log, not one per
|
||||
// rig or per session.
|
||||
let logbook_path = context
|
||||
.http_ui
|
||||
.logbook_path
|
||||
.clone()
|
||||
.map(std::path::PathBuf::from)
|
||||
.unwrap_or_else(trx_logbook::default_log_path);
|
||||
let logbook = match trx_logbook::Logbook::open(&logbook_path) {
|
||||
Ok(logbook) => {
|
||||
tracing::info!(
|
||||
"Logbook: {} contact(s) in {}",
|
||||
logbook.count(),
|
||||
logbook_path.display()
|
||||
);
|
||||
Arc::new(logbook)
|
||||
}
|
||||
Err(err) => {
|
||||
// A log that cannot be opened must not stop the radio working, but
|
||||
// it must be said loudly: contacts made now will not be kept.
|
||||
tracing::error!(
|
||||
"Logbook at {} could not be opened ({err}); logging is unavailable",
|
||||
logbook_path.display()
|
||||
);
|
||||
Arc::new(
|
||||
trx_logbook::Logbook::open(std::path::Path::new(
|
||||
&std::env::temp_dir().join("trx-rs-logbook.jsonl"),
|
||||
))
|
||||
.unwrap_or_else(|e| panic!("logbook fallback in the temp directory failed: {e}")),
|
||||
)
|
||||
}
|
||||
};
|
||||
|
||||
let background_decode_path = BackgroundDecodeStore::default_path();
|
||||
let background_decode_store = Arc::new(BackgroundDecodeStore::open(&background_decode_path));
|
||||
let vchan_mgr = Arc::new(ClientChannelManager::new(
|
||||
@@ -164,6 +197,7 @@ async fn serve(
|
||||
session_rig_mgr,
|
||||
background_decode_mgr,
|
||||
recorder_mgr,
|
||||
logbook,
|
||||
)?;
|
||||
let handle = server.handle();
|
||||
tokio::spawn(async move {
|
||||
@@ -192,6 +226,7 @@ fn build_server(
|
||||
session_rig_mgr: Arc<api::SessionRigManager>,
|
||||
background_decode_mgr: Arc<BackgroundDecodeManager>,
|
||||
recorder_mgr: Arc<RecorderManager>,
|
||||
logbook: Arc<trx_logbook::Logbook>,
|
||||
) -> Result<Server, actix_web::Error> {
|
||||
let state_data = web::Data::new(state_rx);
|
||||
let rig_tx = web::Data::new(rig_tx);
|
||||
@@ -209,6 +244,7 @@ fn build_server(
|
||||
let session_rig_mgr = web::Data::new(session_rig_mgr);
|
||||
let background_decode_mgr = web::Data::new(background_decode_mgr);
|
||||
let recorder_mgr = web::Data::new(recorder_mgr);
|
||||
let logbook = web::Data::new(logbook);
|
||||
|
||||
// Extract auth config values before moving context
|
||||
let same_site = match context.http_auth.cookie_same_site.as_str() {
|
||||
@@ -267,6 +303,7 @@ fn build_server(
|
||||
.app_data(session_rig_mgr.clone())
|
||||
.app_data(background_decode_mgr.clone())
|
||||
.app_data(recorder_mgr.clone())
|
||||
.app_data(logbook.clone())
|
||||
.wrap(Compress::default())
|
||||
.wrap(
|
||||
DefaultHeaders::new()
|
||||
|
||||
Reference in New Issue
Block a user