Compare commits
13
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
09634eb851 | ||
|
|
90ab7781ad | ||
|
|
88d04253ca | ||
|
|
08005c5c07 | ||
|
|
026f816ddb | ||
|
|
d31b6f545f | ||
|
|
39f551c914 | ||
|
|
6d25ecdc11 | ||
|
|
37987b2779 | ||
|
|
67a7bace4e | ||
|
|
b48cc23d6e | ||
|
|
c1899229a0 | ||
|
|
84a99a3636 |
@@ -160,8 +160,18 @@ function updateAisSummary() {
|
||||
}
|
||||
}
|
||||
}
|
||||
function aisSummaryText(msg) {
|
||||
const parts = [];
|
||||
if (msg.lat != null && msg.lon != null) parts.push(`${msg.lat.toFixed(4)}, ${msg.lon.toFixed(4)}`);
|
||||
const motion = aisMotionText(msg);
|
||||
if (motion) parts.push(motion);
|
||||
const route = aisRouteText(msg);
|
||||
if (route && parts.length < 2) parts.push(route);
|
||||
if (!parts.length) return route || "no position reported";
|
||||
return parts.join(" · ");
|
||||
}
|
||||
function renderAisRow(msg) {
|
||||
const row = document.createElement("div");
|
||||
const row = document.createElement("details");
|
||||
row.className = "ais-message";
|
||||
const ts = msg._ts || (/* @__PURE__ */ new Date()).toLocaleTimeString([], {
|
||||
hour: "2-digit",
|
||||
@@ -174,7 +184,8 @@ function renderAisRow(msg) {
|
||||
const motion = aisMotionText(msg);
|
||||
const route = aisRouteText(msg);
|
||||
const distance = aisDistanceText(msg);
|
||||
const pos = msg.lat != null && msg.lon != null ? `<a class="ais-pos-link" href="javascript:void(0)" onclick="window.navigateToAprsMap(${msg.lat},${msg.lon})">${msg.lat.toFixed(4)}, ${msg.lon.toFixed(4)}</a>` : "";
|
||||
const pos = msg.lat != null && msg.lon != null ? `<a class="ais-pos-link" href="javascript:void(0)" data-ais-map="${msg.lat},${msg.lon}">${msg.lat.toFixed(5)}, ${msg.lon.toFixed(5)}</a>` : "";
|
||||
const vesselUrl = aisWindow.buildAisVesselUrl?.(msg.mmsi) ?? null;
|
||||
row.dataset.filterText = [
|
||||
name,
|
||||
msg.mmsi,
|
||||
@@ -185,7 +196,16 @@ function renderAisRow(msg) {
|
||||
msg.destination,
|
||||
aisTypeLabel(msg.message_type)
|
||||
].filter(Boolean).join(" ").toUpperCase();
|
||||
row.innerHTML = `<div class="ais-row-head"><span class="ais-time">${ts}</span><span class="ais-call">${nameHtml}</span><span class="${channel.badgeClass}">${escapeAisHtml(channel.label)}</span><span class="ais-badge ais-badge-type">${escapeAisHtml(aisTypeLabel(msg.message_type))}</span></div><div class="ais-row-meta"><span>MMSI ${escapeAisHtml(String(msg.mmsi))}</span>` + (route ? `<span class="ais-meta-text">${escapeAisHtml(route)}</span>` : "") + `<span class="ais-meta-text">${escapeAisHtml(channel.freqText)}</span></div><div class="ais-row-detail">` + (motion ? `<span>${escapeAisHtml(motion)}</span>` : `<span>No motion data</span>`) + (distance ? `<span>${escapeAisHtml(distance)}</span>` : "") + (pos ? `<span>${pos}</span>` : "") + `<span>${escapeAisHtml(aisAgeText(msg._tsMs))}</span></div>`;
|
||||
row.innerHTML = `<summary class="decode-line"><span class="ais-time">${escapeAisHtml(ts)}</span><span class="ais-call">${nameHtml}</span><span class="ais-badge ais-badge-type">${escapeAisHtml(aisTypeLabel(msg.message_type))}</span><span class="decode-line-summary">${escapeAisHtml(aisSummaryText(msg))}</span><span class="${channel.badgeClass}">${escapeAisHtml(channel.label)}</span>` + (distance ? `<span class="decode-line-distance">${escapeAisHtml(distance)}</span>` : "") + `</summary><div class="decode-expanded"><div class="decode-expanded-meta"><span>MMSI ${escapeAisHtml(String(msg.mmsi))}</span><span>${escapeAisHtml(channel.freqText)}</span>` + (route ? `<span>${escapeAisHtml(route)}</span>` : "") + (motion ? `<span>${escapeAisHtml(motion)}</span>` : "") + `<span>${escapeAisHtml(aisAgeText(msg._tsMs))}</span>` + (pos ? `<span>${pos}</span>` : "") + `</div><div class="aprs-row-actions">` + (msg.lat != null && msg.lon != null ? `<button class="aprs-inline-btn" type="button" data-ais-map="${msg.lat},${msg.lon}">Map</button>` : "") + (vesselUrl ? `<a class="aprs-inline-btn" href="${escapeAisHtml(vesselUrl)}" target="_blank" rel="noopener">Vessel</a>` : "") + `</div></div>`;
|
||||
row.querySelectorAll("[data-ais-map]").forEach((element) => {
|
||||
element.addEventListener("click", (event) => {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
const [lat, lon] = (element.dataset.aisMap ?? "").split(",").map(Number);
|
||||
if (lat == null || lon == null || !Number.isFinite(lat) || !Number.isFinite(lon)) return;
|
||||
aisWindow.navigateToAprsMap?.(lat, lon);
|
||||
});
|
||||
});
|
||||
applyAisFilterToRow(row);
|
||||
return row;
|
||||
}
|
||||
@@ -265,9 +285,11 @@ function addAisMessage(msg) {
|
||||
pruneAisMessageHistory();
|
||||
scheduleAisBarUpdate();
|
||||
scheduleAisHistoryRender();
|
||||
if (msg.lat != null && msg.lon != null && aisWindow.aisMapAddVessel) {
|
||||
aisWindow.aisMapAddVessel(msg);
|
||||
}
|
||||
plotAisMessage(msg);
|
||||
}
|
||||
function plotAisMessage(msg) {
|
||||
if (msg.lat == null || msg.lon == null || !aisWindow.aisMapAddVessel) return;
|
||||
aisWindow.aisMapAddVessel(msg);
|
||||
}
|
||||
function normalizeServerAisMessage(msg) {
|
||||
return {
|
||||
@@ -288,9 +310,7 @@ function onServerAisBatch(messages) {
|
||||
minute: "2-digit",
|
||||
second: "2-digit"
|
||||
});
|
||||
if (next.lat != null && next.lon != null && aisWindow.aisMapAddVessel) {
|
||||
aisWindow.aisMapAddVessel(next);
|
||||
}
|
||||
plotAisMessage(next);
|
||||
normalized.push(next);
|
||||
}
|
||||
normalized.reverse();
|
||||
@@ -332,5 +352,9 @@ window.trxPluginRuntime.registerDecoder({
|
||||
onBatch: onServerAisBatch,
|
||||
restore: onServerAisBatch,
|
||||
reset: resetAisHistoryView,
|
||||
prune: pruneAisHistoryView
|
||||
prune: pruneAisHistoryView,
|
||||
// Oldest first, so vessel tracks are rebuilt in the order they happened.
|
||||
syncMap: () => {
|
||||
for (const entry of [...aisMessageHistory].reverse()) plotAisMessage(entry);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1060,6 +1060,9 @@ var runtime = {
|
||||
plugin.prune();
|
||||
return true;
|
||||
},
|
||||
syncMapAll() {
|
||||
for (const plugin of decoders.values()) plugin.syncMap?.();
|
||||
},
|
||||
clearQueued() {
|
||||
queued.clear();
|
||||
},
|
||||
@@ -1689,7 +1692,24 @@ function estimateNoiseFloorDb(bins) {
|
||||
|
||||
// src/plugin-loader.ts
|
||||
var pluginGroups = {
|
||||
"digital-modes": ["/ft8.js", "/ft4.js", "/ft2.js", "/wspr.js", "/cw.js", "/background-decode.js", "/sat.js", "/wefax.js"],
|
||||
// AIS, VDES and the two APRS decoders have panels on this tab, so they load
|
||||
// with it. They used to come only with the map group, which left their
|
||||
// sub-tabs empty — decodes queueing in the runtime — until something opened
|
||||
// the Map tab. Their map calls are optional, so map-core stays lazy.
|
||||
"digital-modes": [
|
||||
"/ft8.js",
|
||||
"/ft4.js",
|
||||
"/ft2.js",
|
||||
"/wspr.js",
|
||||
"/cw.js",
|
||||
"/background-decode.js",
|
||||
"/sat.js",
|
||||
"/wefax.js",
|
||||
"/ais.js",
|
||||
"/vdes.js",
|
||||
"/aprs.js",
|
||||
"/hf-aprs.js"
|
||||
],
|
||||
"map-data": ["/map-core.js", "/ais.js", "/vdes.js", "/aprs.js", "/hf-aprs.js"],
|
||||
map: ["/map-core.js", "/ais.js", "/vdes.js", "/aprs.js", "/hf-aprs.js", "/sat.js", "/sat-scheduler.js"],
|
||||
statistics: ["/map-core.js"],
|
||||
@@ -2048,6 +2068,7 @@ var loadingSub = requiredElement("loading-sub");
|
||||
var decodeHistoryOverlayEl = document.getElementById("decode-history-overlay");
|
||||
var decodeHistoryOverlayTitleEl = document.getElementById("decode-history-overlay-title");
|
||||
var decodeHistoryOverlaySubEl = document.getElementById("decode-history-overlay-sub");
|
||||
var decodeHistoryProgressBarEl = document.getElementById("decode-history-progress-bar");
|
||||
var connLostOverlayEl = document.getElementById("conn-lost-overlay");
|
||||
var connLostOverlayTitleEl = document.getElementById("conn-lost-overlay-title");
|
||||
var connLostOverlaySubEl = document.getElementById("conn-lost-overlay-sub");
|
||||
@@ -2197,10 +2218,19 @@ function syncTopBarAccess() {
|
||||
}
|
||||
}
|
||||
var overviewDrawPending = false;
|
||||
function setDecodeHistoryOverlayVisible(visible, title = "", sub = "") {
|
||||
function setDecodeHistoryOverlayVisible(visible, title = "", sub = "", fraction = null) {
|
||||
if (!decodeHistoryOverlayEl) return;
|
||||
if (title && decodeHistoryOverlayTitleEl) decodeHistoryOverlayTitleEl.textContent = title;
|
||||
if (decodeHistoryOverlaySubEl) decodeHistoryOverlaySubEl.textContent = sub || "";
|
||||
if (decodeHistoryProgressBarEl) {
|
||||
if (fraction == null) {
|
||||
decodeHistoryOverlayEl.dataset.phase = "fetching";
|
||||
decodeHistoryProgressBarEl.style.width = "";
|
||||
} else {
|
||||
delete decodeHistoryOverlayEl.dataset.phase;
|
||||
decodeHistoryProgressBarEl.style.width = `${Math.round(Math.max(0, Math.min(1, fraction)) * 100)}%`;
|
||||
}
|
||||
}
|
||||
decodeHistoryOverlayEl.classList.toggle("is-hidden", !visible);
|
||||
}
|
||||
function setConnLostOverlay(visible, title = "Connection lost", sub = "Retrying…", fullscreen = false) {
|
||||
@@ -2798,7 +2828,7 @@ function updateRigSubtitle(activeRigId) {
|
||||
rigSubtitle.textContent = `Rig: ${name}`;
|
||||
updateDocumentTitle(activeChannelRds());
|
||||
}
|
||||
function applyRigList(activeRigId, rigIds, displayNames = {}) {
|
||||
function applyRigList(activeRigId, rigIds, displayNames) {
|
||||
if (!Array.isArray(rigIds)) return;
|
||||
const nextIds = rigIds.filter((id) => typeof id === "string" && id.length > 0);
|
||||
const prevKey = lastRigIds.join("\0") + "|" + (lastActiveRigId || "");
|
||||
@@ -6406,6 +6436,7 @@ function positionSquelchLine() {
|
||||
}
|
||||
function submitSdrSquelch() {
|
||||
if (!sdrSquelchSupported) return;
|
||||
sdrSquelchLocalAt = Date.now();
|
||||
saveSetting("sdrSquelchEnabled", sdrSquelchEnabled);
|
||||
saveSetting("sdrSquelchThresholdDb", sdrSquelchThresholdDb);
|
||||
postPath(
|
||||
@@ -6419,6 +6450,8 @@ function setSdrSquelch(thresholdDb, enabled, options = {}) {
|
||||
renderSdrSquelch();
|
||||
if (options.submit !== false) submitSdrSquelch();
|
||||
}
|
||||
var SDR_SQUELCH_HOLD_MS = 2e3;
|
||||
var sdrSquelchLocalAt = 0;
|
||||
var SQUELCH_NOISE_WINDOW_MS = 1e4;
|
||||
var SQUELCH_NOISE_MARGIN_DB = 5;
|
||||
var SQUELCH_MEASURE_MS = 1500;
|
||||
@@ -6451,6 +6484,7 @@ function updateSdrSquelchControlVisibility() {
|
||||
function syncSdrSquelchFromServer(enabled, thresholdDb) {
|
||||
if (squelchDragPointerId !== null) return;
|
||||
if (sdrSquelchDbEl && document.activeElement === sdrSquelchDbEl) return;
|
||||
if (Date.now() - sdrSquelchLocalAt < SDR_SQUELCH_HOLD_MS) return;
|
||||
sdrSquelchEnabled = enabled;
|
||||
if (isFiniteNumber(thresholdDb)) sdrSquelchThresholdDb = clampSdrSquelchDb(thresholdDb);
|
||||
saveSetting("sdrSquelchEnabled", sdrSquelchEnabled);
|
||||
@@ -7502,16 +7536,15 @@ function connectDecode() {
|
||||
let historySettled = false;
|
||||
let historyWorkerDone = false;
|
||||
let historyFallbackStarted = false;
|
||||
let historyRetried = false;
|
||||
let historyBatchDrainScheduled = false;
|
||||
let historyTotal = 0;
|
||||
let historyProcessed = 0;
|
||||
const historyGroupQueue = [];
|
||||
const liveBuffer = [];
|
||||
function flushLiveBuffer() {
|
||||
function releaseLiveBuffer() {
|
||||
if (historySettled) return;
|
||||
historySettled = true;
|
||||
terminateDecodeHistoryWorker();
|
||||
setDecodeHistoryReplayActive(false);
|
||||
setDecodeHistoryOverlayVisible(false);
|
||||
for (const msg of liveBuffer) {
|
||||
try {
|
||||
dispatchDecodeMessage(msg);
|
||||
@@ -7520,19 +7553,23 @@ function connectDecode() {
|
||||
}
|
||||
liveBuffer.length = 0;
|
||||
}
|
||||
function finishHistoryReplay() {
|
||||
clearTimeout(historyTimeout);
|
||||
releaseLiveBuffer();
|
||||
terminateDecodeHistoryWorker();
|
||||
setDecodeHistoryReplayActive(false);
|
||||
setDecodeHistoryOverlayVisible(false);
|
||||
}
|
||||
function updateHistoryReplayOverlay() {
|
||||
setDecodeHistoryOverlayVisible(
|
||||
true,
|
||||
"Loading decode history…",
|
||||
`Replaying ${historyProcessed} / ${historyTotal} decoded messages`
|
||||
`Replaying ${historyProcessed} / ${historyTotal} decoded messages`,
|
||||
historyTotal > 0 ? historyProcessed / historyTotal : null
|
||||
);
|
||||
}
|
||||
function maybeFinishHistoryReplay() {
|
||||
if (historySettled) return;
|
||||
if (historyWorkerDone && historyGroupQueue.length === 0) {
|
||||
clearTimeout(historyTimeout);
|
||||
flushLiveBuffer();
|
||||
}
|
||||
if (historyWorkerDone && historyGroupQueue.length === 0) finishHistoryReplay();
|
||||
}
|
||||
function pumpDecodeHistoryGroupQueue() {
|
||||
historyBatchDrainScheduled = false;
|
||||
@@ -7586,17 +7623,25 @@ function connectDecode() {
|
||||
if (historyFallbackStarted || historySettled) return;
|
||||
historyFallbackStarted = true;
|
||||
loadDecodeHistoryOnMainThread((groups) => {
|
||||
clearTimeout(historyTimeout);
|
||||
const total = totalDecodeHistoryMessages(groups);
|
||||
if (total > 0) {
|
||||
enqueueDecodeHistoryGroups(groups);
|
||||
} else {
|
||||
flushLiveBuffer();
|
||||
finishHistoryReplay();
|
||||
}
|
||||
}, (err) => {
|
||||
console.error("Decode history fallback failed", err);
|
||||
clearTimeout(historyTimeout);
|
||||
flushLiveBuffer();
|
||||
if (historyRetried) {
|
||||
showHint("Decode history unavailable", 3e3);
|
||||
finishHistoryReplay();
|
||||
return;
|
||||
}
|
||||
historyRetried = true;
|
||||
historyFallbackStarted = false;
|
||||
setDecodeHistoryOverlayVisible(true, "Loading decode history…", "Retrying");
|
||||
setTimeout(() => {
|
||||
startDecodeHistoryFallback();
|
||||
}, 2e3);
|
||||
});
|
||||
}
|
||||
function startDecodeHistoryWorkerReplay() {
|
||||
@@ -7657,10 +7702,9 @@ function connectDecode() {
|
||||
return true;
|
||||
}
|
||||
const historyTimeout = setTimeout(() => {
|
||||
if (!historySettled) {
|
||||
terminateDecodeHistoryWorker();
|
||||
flushLiveBuffer();
|
||||
}
|
||||
if (historySettled) return;
|
||||
releaseLiveBuffer();
|
||||
setDecodeHistoryOverlayVisible(true, "Loading decode history…", "Still loading — live decodes are showing");
|
||||
}, 2e4);
|
||||
setDecodeHistoryOverlayVisible(true, "Loading decode history…", "Fetching recent decodes from the client buffer");
|
||||
decodeSource = new EventSource("/decode");
|
||||
@@ -7682,7 +7726,7 @@ function connectDecode() {
|
||||
const wasClosed = source.readyState === 2;
|
||||
source.close();
|
||||
terminateDecodeHistoryWorker();
|
||||
if (!historySettled) flushLiveBuffer();
|
||||
if (!historySettled) releaseLiveBuffer();
|
||||
if (wasClosed) {
|
||||
updateDecodeStatus("Decode not available (check client audio config)");
|
||||
setTimeout(connectDecode, 1e4);
|
||||
|
||||
@@ -1,13 +1,10 @@
|
||||
import {
|
||||
aprsAgeText,
|
||||
aprsCategoryLabel,
|
||||
aprsHexBytes,
|
||||
aprsPacketCategory,
|
||||
collapseAprsDuplicates,
|
||||
normalizeAprsPacket,
|
||||
renderAprsInfo,
|
||||
renderLocalAprsSymbol
|
||||
} from "./chunk-ROTCLFXS.js";
|
||||
renderAprsPacketRow
|
||||
} from "./chunk-OPEIVJGD.js";
|
||||
import {
|
||||
hostCore,
|
||||
hostState
|
||||
@@ -114,51 +111,27 @@ function updateAprsChipState() {
|
||||
aprsHideCrcBtn?.classList.toggle("active", aprsHideCrc);
|
||||
aprsCollapseDupBtn?.classList.toggle("active", aprsCollapseDup);
|
||||
}
|
||||
function renderAprsRow(pkt, isFresh) {
|
||||
const row = document.createElement("div");
|
||||
row.className = "aprs-packet";
|
||||
if (!pkt.crcOk) row.classList.add("aprs-packet-crc");
|
||||
if (isFresh) row.classList.add("aprs-packet-new");
|
||||
const ts = pkt._ts || (/* @__PURE__ */ new Date()).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", second: "2-digit" });
|
||||
const age = aprsAgeText(pkt._tsMs);
|
||||
const category = aprsPacketCategory(pkt);
|
||||
const categoryLabel = aprsCategoryLabel(category);
|
||||
const categoryClass = `aprs-badge aprs-badge-type aprs-badge-type-${category}`;
|
||||
const pathBadge = pkt.path ? `<span class="aprs-badge">${escapeAprsHtml(pkt.path)}</span>` : "";
|
||||
const crcBadge = pkt.crcOk ? "" : '<span class="aprs-badge aprs-badge-crc">CRC Fail</span>';
|
||||
const symbolHtml = renderLocalAprsSymbol(pkt, escapeAprsHtml);
|
||||
const posLink = pkt.lat != null && pkt.lon != null ? `<a class="aprs-pos" href="javascript:void(0)" data-aprs-map="${pkt.lat},${pkt.lon}">${pkt.lat.toFixed(4)}, ${pkt.lon.toFixed(4)}</a>` : "";
|
||||
const distance = aprsDistanceText(pkt);
|
||||
const qrzHref = `https://qrzcq.com/call/${encodeURIComponent(pkt.srcCall || "")}`;
|
||||
row.innerHTML = `<div class="aprs-row-head"><span class="aprs-time">${ts}</span>` + symbolHtml + `<span class="aprs-call">${escapeAprsHtml(pkt.srcCall ?? "")}</span><span>>${escapeAprsHtml(pkt.destCall || "")}</span><span class="${categoryClass}">${escapeAprsHtml(categoryLabel)}</span>` + pathBadge + crcBadge + `</div><div class="aprs-row-meta"><span class="aprs-meta-text">${escapeAprsHtml(age)}</span>` + (distance ? `<span class="aprs-meta-text">${escapeAprsHtml(distance)}</span>` : "") + `<span class="aprs-meta-text">${escapeAprsHtml(pkt.type || "--")}</span></div><div class="aprs-row-detail"><span title="${escapeAprsHtml(pkt.type || "")}">${renderAprsInfo(pkt)}</span>` + (posLink ? `<span>${posLink}</span>` : "") + `</div><div class="aprs-row-actions">` + (pkt.lat != null && pkt.lon != null ? `<button class="aprs-inline-btn" type="button" data-aprs-map="${pkt.lat},${pkt.lon}">Map</button>` : "") + (pkt.lat != null && pkt.lon != null ? `<button class="aprs-inline-btn" type="button" data-aprs-copy="${pkt.lat},${pkt.lon}">Copy Coords</button>` : "") + `<a class="aprs-inline-btn" href="${qrzHref}" target="_blank" rel="noopener">QRZ</a></div><details class="aprs-details"><summary>Details</summary><div class="aprs-details-grid"><span class="aprs-detail-label">Source</span><span class="aprs-detail-value">${escapeAprsHtml(pkt.srcCall || "--")}</span><span class="aprs-detail-label">Destination</span><span class="aprs-detail-value">${escapeAprsHtml(pkt.destCall || "--")}</span><span class="aprs-detail-label">Type</span><span class="aprs-detail-value">${escapeAprsHtml(pkt.type || "--")}</span><span class="aprs-detail-label">Path</span><span class="aprs-detail-value">${escapeAprsHtml(pkt.path || "--")}</span><span class="aprs-detail-label">Age</span><span class="aprs-detail-value">${escapeAprsHtml(age)}</span><span class="aprs-detail-label">CRC</span><span class="aprs-detail-value">${pkt.crcOk ? "OK" : "Failed"}</span><span class="aprs-detail-label">Position</span><span class="aprs-detail-value">${pkt.lat != null && pkt.lon != null ? `${pkt.lat.toFixed(5)}, ${pkt.lon.toFixed(5)}` : "--"}</span><span class="aprs-detail-label">Info</span><span class="aprs-detail-value">${escapeAprsHtml(pkt.info || "--")}</span><span class="aprs-detail-label">Info Bytes</span><span class="aprs-detail-value">${escapeAprsHtml(aprsHexBytes(pkt.info_bytes))}</span></div></details>`;
|
||||
row.querySelectorAll("[data-aprs-map]").forEach((el) => {
|
||||
el.addEventListener("click", (evt) => {
|
||||
evt.preventDefault();
|
||||
const raw = el.dataset.aprsMap ?? "";
|
||||
const [lat, lon] = raw.split(",").map(Number);
|
||||
if (aprsWindow.navigateToAprsMap && typeof lat === "number" && typeof lon === "number" && Number.isFinite(lat) && Number.isFinite(lon)) {
|
||||
aprsWindow.navigateToAprsMap(lat, lon);
|
||||
}
|
||||
});
|
||||
});
|
||||
const copyBtn = row.querySelector("[data-aprs-copy]");
|
||||
if (copyBtn) {
|
||||
copyBtn.addEventListener("click", () => {
|
||||
void (async () => {
|
||||
const raw = copyBtn.dataset.aprsCopy ?? "";
|
||||
try {
|
||||
const clipboard = Reflect.get(navigator, "clipboard");
|
||||
if (clipboard) {
|
||||
await clipboard.writeText(raw);
|
||||
showAprsHint("Coordinates copied", 1200);
|
||||
}
|
||||
} catch {
|
||||
showAprsHint("Copy failed", 1500);
|
||||
}
|
||||
})();
|
||||
});
|
||||
async function copyAprsCoords(text) {
|
||||
try {
|
||||
const clipboard = Reflect.get(navigator, "clipboard");
|
||||
if (!clipboard) return;
|
||||
await clipboard.writeText(text);
|
||||
showAprsHint("Coordinates copied", 1200);
|
||||
} catch {
|
||||
showAprsHint("Copy failed", 1500);
|
||||
}
|
||||
return row;
|
||||
}
|
||||
function renderAprsRow(pkt, isFresh) {
|
||||
return renderAprsPacketRow(pkt, {
|
||||
fresh: isFresh,
|
||||
distance: aprsDistanceText(pkt),
|
||||
onMap: (lat, lon) => {
|
||||
aprsWindow.navigateToAprsMap?.(lat, lon);
|
||||
},
|
||||
onCopy: (text) => {
|
||||
void copyAprsCoords(text);
|
||||
}
|
||||
});
|
||||
}
|
||||
function renderAprsHistory() {
|
||||
pruneAprsPacketHistory();
|
||||
@@ -223,15 +196,17 @@ function pruneAprsHistoryView() {
|
||||
updateAprsBar();
|
||||
renderAprsHistory();
|
||||
}
|
||||
function plotAprsPacket(pkt) {
|
||||
if (pkt.lat == null || pkt.lon == null || !aprsWindow.aprsMapAddStation) return;
|
||||
aprsWindow.aprsMapAddStation(pkt.srcCall ?? "", pkt.lat, pkt.lon, pkt.info ?? "", pkt.symbolTable, pkt.symbolCode, pkt);
|
||||
}
|
||||
function addAprsPacket(pkt) {
|
||||
const tsMs = Number.isFinite(pkt.ts_ms) ? Number(pkt.ts_ms) : Date.now();
|
||||
pkt._tsMs = tsMs;
|
||||
pkt._ts = new Date(tsMs).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", second: "2-digit" });
|
||||
aprsPacketHistory.unshift(pkt);
|
||||
pruneAprsPacketHistory();
|
||||
if (pkt.lat != null && pkt.lon != null && aprsWindow.aprsMapAddStation) {
|
||||
aprsWindow.aprsMapAddStation(pkt.srcCall ?? "", pkt.lat, pkt.lon, pkt.info ?? "", pkt.symbolTable, pkt.symbolCode, pkt);
|
||||
}
|
||||
plotAprsPacket(pkt);
|
||||
if (pkt.crcOk) scheduleAprsBarUpdate();
|
||||
scheduleAprsHistoryRender();
|
||||
}
|
||||
@@ -248,9 +223,7 @@ function onServerAprsBatch(packets) {
|
||||
const tsMs = Number.isFinite(next.ts_ms) ? Number(next.ts_ms) : Date.now();
|
||||
next._tsMs = tsMs;
|
||||
next._ts = new Date(tsMs).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", second: "2-digit" });
|
||||
if (next.lat != null && next.lon != null && aprsWindow.aprsMapAddStation) {
|
||||
aprsWindow.aprsMapAddStation(next.srcCall ?? "", next.lat, next.lon, next.info ?? "", next.symbolTable, next.symbolCode, next);
|
||||
}
|
||||
plotAprsPacket(next);
|
||||
if (next.crcOk) hasCrcOk = true;
|
||||
normalized.push(next);
|
||||
}
|
||||
@@ -314,5 +287,9 @@ window.trxPluginRuntime.registerDecoder({
|
||||
onBatch: onServerAprsBatch,
|
||||
restore: onServerAprsBatch,
|
||||
reset: resetAprsHistoryView,
|
||||
prune: pruneAprsHistoryView
|
||||
prune: pruneAprsHistoryView,
|
||||
// Oldest first, so station tracks are rebuilt in the order they happened.
|
||||
syncMap: () => {
|
||||
for (const entry of [...aprsPacketHistory].reverse()) plotAprsPacket(entry);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -0,0 +1,254 @@
|
||||
// src/plugins/aprs-shared.ts
|
||||
function escapeAprsHtml(value) {
|
||||
return String(value ?? "").replaceAll("&", "&").replaceAll("<", "<").replaceAll(">", ">").replaceAll('"', """);
|
||||
}
|
||||
function aprsPacketCategory(packet) {
|
||||
const type = (packet.type ?? "").toLowerCase();
|
||||
const info = (packet.info ?? "").toLowerCase();
|
||||
if (packet.lat != null && packet.lon != null || type.includes("position")) return "position";
|
||||
if (type.includes("message") || info.startsWith(":")) return "message";
|
||||
if (type.includes("weather") || info.startsWith("_")) return "weather";
|
||||
if (type.includes("telemetry") || info.startsWith("t#")) return "telemetry";
|
||||
return "other";
|
||||
}
|
||||
function aprsCategoryLabel(category) {
|
||||
switch (category) {
|
||||
case "position":
|
||||
return "Position";
|
||||
case "message":
|
||||
return "Message";
|
||||
case "weather":
|
||||
return "Weather";
|
||||
case "telemetry":
|
||||
return "Telemetry";
|
||||
default:
|
||||
return "Other";
|
||||
}
|
||||
}
|
||||
function aprsAgeText(timestampMs) {
|
||||
if (typeof timestampMs !== "number" || !Number.isFinite(timestampMs)) return "just now";
|
||||
const seconds = Math.round(Math.max(0, Date.now() - timestampMs) / 1e3);
|
||||
if (seconds < 5) return "just now";
|
||||
if (seconds < 60) return `${String(seconds)}s ago`;
|
||||
const minutes = Math.round(seconds / 60);
|
||||
if (minutes < 60) return `${String(minutes)}m ago`;
|
||||
return `${String(Math.round(minutes / 60))}h ago`;
|
||||
}
|
||||
function aprsPacketSignature(packet) {
|
||||
return [
|
||||
packet.srcCall ?? "",
|
||||
packet.destCall ?? "",
|
||||
packet.path ?? "",
|
||||
packet.info ?? "",
|
||||
packet.type ?? "",
|
||||
packet.lat?.toFixed(4) ?? "",
|
||||
packet.lon?.toFixed(4) ?? ""
|
||||
].join("|");
|
||||
}
|
||||
function collapseAprsDuplicates(packets) {
|
||||
const seen = /* @__PURE__ */ new Set();
|
||||
return packets.filter((packet) => {
|
||||
const signature = aprsPacketSignature(packet);
|
||||
if (seen.has(signature)) return false;
|
||||
seen.add(signature);
|
||||
return true;
|
||||
});
|
||||
}
|
||||
function aprsHexBytes(bytes) {
|
||||
if (!bytes?.length) return "--";
|
||||
return bytes.map((byte) => byte.toString(16).toUpperCase().padStart(2, "0")).join(" ");
|
||||
}
|
||||
function renderAprsInfo(packet) {
|
||||
if (packet.info_bytes?.length) {
|
||||
return packet.info_bytes.map((byte) => renderAprsByte(byte)).join("");
|
||||
}
|
||||
return Array.from(packet.info ?? "", (character) => renderAprsCharacter(character)).join("");
|
||||
}
|
||||
function renderAprsByte(byte) {
|
||||
return byte >= 32 && byte <= 126 ? escapeAprsCharacter(String.fromCharCode(byte)) : `<span class="aprs-byte">0x${byte.toString(16).toUpperCase().padStart(2, "0")}</span>`;
|
||||
}
|
||||
function renderAprsCharacter(character) {
|
||||
const code = character.charCodeAt(0);
|
||||
return code >= 32 && code <= 126 ? escapeAprsCharacter(character) : `<span class="aprs-byte">0x${code.toString(16).toUpperCase().padStart(2, "0")}</span>`;
|
||||
}
|
||||
function escapeAprsCharacter(character) {
|
||||
if (character === "<") return "<";
|
||||
if (character === ">") return ">";
|
||||
if (character === "&") return "&";
|
||||
if (character === '"') return """;
|
||||
return character;
|
||||
}
|
||||
var APRS_SPRITE_COLUMNS = 16;
|
||||
var APRS_SPRITE_CELL_PX = 24;
|
||||
var APRS_SPRITE_FIRST_CODE = 33;
|
||||
var APRS_SPRITE_LAST_CODE = 126;
|
||||
function aprsSpriteOffset(code) {
|
||||
if (code.length !== 1) return null;
|
||||
const point = code.charCodeAt(0);
|
||||
if (point < APRS_SPRITE_FIRST_CODE || point > APRS_SPRITE_LAST_CODE) return null;
|
||||
const index = point - APRS_SPRITE_FIRST_CODE;
|
||||
const column = index % APRS_SPRITE_COLUMNS;
|
||||
const row = Math.floor(index / APRS_SPRITE_COLUMNS);
|
||||
return `${String(-column * APRS_SPRITE_CELL_PX)}px ${String(-row * APRS_SPRITE_CELL_PX)}px`;
|
||||
}
|
||||
function aprsSymbolSprite(symbolTable, symbolCode) {
|
||||
if (!symbolTable || !symbolCode) return null;
|
||||
const symbolOffset = aprsSpriteOffset(symbolCode);
|
||||
if (!symbolOffset) return null;
|
||||
if (symbolTable === "/") {
|
||||
return {
|
||||
className: "aprs-symbol-primary",
|
||||
backgroundPosition: symbolOffset,
|
||||
label: `Primary APRS symbol ${symbolTable}${symbolCode}`
|
||||
};
|
||||
}
|
||||
if (symbolTable === "\\") {
|
||||
return {
|
||||
className: "aprs-symbol-alternate",
|
||||
backgroundPosition: symbolOffset,
|
||||
label: `Alternate APRS symbol ${symbolTable}${symbolCode}`
|
||||
};
|
||||
}
|
||||
const overlayOffset = aprsSpriteOffset(symbolTable);
|
||||
if (!overlayOffset) return null;
|
||||
return {
|
||||
className: "aprs-symbol-overlaid",
|
||||
backgroundPosition: `${overlayOffset}, ${symbolOffset}`,
|
||||
label: `Alternate APRS symbol \\${symbolCode} with overlay ${symbolTable}`
|
||||
};
|
||||
}
|
||||
function renderAprsSymbolSlot(packet, escapeHtml) {
|
||||
return renderLocalAprsSymbol(packet, escapeHtml) || '<span class="aprs-symbol aprs-symbol-empty" aria-hidden="true"></span>';
|
||||
}
|
||||
function renderLocalAprsSymbol(packet, escapeHtml) {
|
||||
if (!packet.symbolTable || !packet.symbolCode) return "";
|
||||
const sprite = aprsSymbolSprite(packet.symbolTable, packet.symbolCode);
|
||||
if (sprite) {
|
||||
return `<span class="aprs-symbol ${sprite.className}" role="img" style="background-position:${sprite.backgroundPosition}" title="${escapeHtml(sprite.label)}" aria-label="${escapeHtml(sprite.label)}"></span>`;
|
||||
}
|
||||
const symbol = escapeHtml(packet.symbolCode);
|
||||
const table = packet.symbolTable === "/" ? "Primary" : "Alternate";
|
||||
return `<span class="aprs-symbol aprs-symbol-local" title="${table} APRS symbol ${symbol}">${symbol}</span>`;
|
||||
}
|
||||
function normalizeAprsPacket(packet, receiver) {
|
||||
return {
|
||||
rig_id: packet.rig_id || null,
|
||||
receiver,
|
||||
srcCall: packet.src_call ?? "",
|
||||
destCall: packet.dest_call ?? "",
|
||||
path: packet.path ?? "",
|
||||
info: packet.info ?? "",
|
||||
info_bytes: packet.info_bytes ?? [],
|
||||
type: packet.packet_type ?? "",
|
||||
crcOk: packet.crc_ok ?? false,
|
||||
ts_ms: packet.ts_ms ?? null,
|
||||
lat: packet.lat ?? null,
|
||||
lon: packet.lon ?? null,
|
||||
symbolTable: packet.symbol_table ?? null,
|
||||
symbolCode: packet.symbol_code ?? null
|
||||
};
|
||||
}
|
||||
function fahrenheitToCelsius(fahrenheit) {
|
||||
return Math.round((fahrenheit - 32) * 5 / 9 * 10) / 10;
|
||||
}
|
||||
function summarizeAprsWeather(info) {
|
||||
const parts = [];
|
||||
const temperature = /t(-?\d{2,3})/.exec(info);
|
||||
if (temperature) parts.push(`${fahrenheitToCelsius(Number(temperature[1]))} °C`);
|
||||
const wind = /(\d{3})\/(\d{3})/.exec(info) ?? /c(\d{3}).*?s(\d{3})/.exec(info);
|
||||
if (wind) {
|
||||
const gust = /g(\d{3})/.exec(info);
|
||||
const knots = Number(wind[2]);
|
||||
parts.push(`wind ${Number(wind[1])}° ${knots} kt${gust ? ` gust ${Number(gust[1])}` : ""}`);
|
||||
}
|
||||
const humidity = /h(\d{2})/.exec(info);
|
||||
if (humidity) {
|
||||
const value = Number(humidity[1]);
|
||||
parts.push(`${value === 0 ? 100 : value}% RH`);
|
||||
}
|
||||
const pressure = /b(\d{5})/.exec(info);
|
||||
if (pressure) parts.push(`${(Number(pressure[1]) / 10).toFixed(1)} hPa`);
|
||||
const rain = /r(\d{3})/.exec(info);
|
||||
if (rain && Number(rain[1]) > 0) parts.push(`rain ${(Number(rain[1]) / 100).toFixed(2)}"`);
|
||||
return parts.length ? parts.join(" · ") : null;
|
||||
}
|
||||
function summarizeAprsTelemetry(info) {
|
||||
const match = /^T#(\d+|MIC)((?:,-?[\d.]*)+)(?:,([01]{8}))?/.exec(info.trim());
|
||||
if (!match?.[2]) return null;
|
||||
const channels = match[2].split(",").filter((value) => value.length > 0);
|
||||
const bits = match[3] ? ` · bits ${match[3]}` : "";
|
||||
return `#${match[1]} · ${channels.join(" ")}${bits}`;
|
||||
}
|
||||
function summarizeAprsMessage(info) {
|
||||
const match = /^:([^:]{9}):(.*)$/.exec(info);
|
||||
if (!match?.[1] || match[2] == null) return null;
|
||||
const addressee = match[1].trim();
|
||||
const text = match[2].replace(/\{\d+\s*$/, "").trim();
|
||||
return `→ ${addressee}: ${text}`;
|
||||
}
|
||||
function summarizeAprsCourseSpeed(info) {
|
||||
const match = /(\d{3})\/(\d{3})/.exec(info);
|
||||
if (!match) return null;
|
||||
const knots = Number(match[2]);
|
||||
if (knots === 0) return null;
|
||||
return `${Number(match[1])}° ${knots} kt`;
|
||||
}
|
||||
function summarizeAprsPayload(packet) {
|
||||
const info = packet.info ?? "";
|
||||
if (!info) return null;
|
||||
const category = aprsPacketCategory(packet);
|
||||
if (category === "message") return summarizeAprsMessage(info);
|
||||
if (category === "weather") return summarizeAprsWeather(info);
|
||||
if (category === "telemetry") return summarizeAprsTelemetry(info);
|
||||
if (category === "position") {
|
||||
const parts = [];
|
||||
if (packet.lat != null && packet.lon != null) {
|
||||
parts.push(`${packet.lat.toFixed(4)}, ${packet.lon.toFixed(4)}`);
|
||||
}
|
||||
const courseSpeed = summarizeAprsCourseSpeed(info);
|
||||
if (courseSpeed) parts.push(courseSpeed);
|
||||
const comment = info.replace(/^[!=@/][^>]*[>_]?/, "").replace(/\d{3}\/\d{3}/, "").trim();
|
||||
if (comment && comment.length <= 60) parts.push(comment);
|
||||
return parts.length ? parts.join(" · ") : null;
|
||||
}
|
||||
const text = info.replace(/^[>;<?]/, "").trim();
|
||||
return text.length ? text : null;
|
||||
}
|
||||
function renderAprsPacketRow(packet, options = {}) {
|
||||
const row = document.createElement("details");
|
||||
row.className = "aprs-packet";
|
||||
if (!packet.crcOk) row.classList.add("aprs-packet-crc");
|
||||
if (options.fresh) row.classList.add("aprs-packet-new");
|
||||
const time = packet._ts || (/* @__PURE__ */ new Date()).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", second: "2-digit" });
|
||||
const category = aprsPacketCategory(packet);
|
||||
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.querySelectorAll("[data-aprs-map]").forEach((element) => {
|
||||
element.addEventListener("click", (event) => {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
const [lat, lon] = (element.dataset.aprsMap ?? "").split(",").map(Number);
|
||||
if (Number.isFinite(lat) && Number.isFinite(lon)) options.onMap?.(lat, lon);
|
||||
});
|
||||
});
|
||||
const copyButton = row.querySelector("[data-aprs-copy]");
|
||||
if (copyButton) {
|
||||
copyButton.addEventListener("click", (event) => {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
options.onCopy?.(copyButton.dataset.aprsCopy ?? "", copyButton);
|
||||
});
|
||||
}
|
||||
return row;
|
||||
}
|
||||
|
||||
export {
|
||||
aprsPacketCategory,
|
||||
aprsAgeText,
|
||||
collapseAprsDuplicates,
|
||||
aprsSymbolSprite,
|
||||
normalizeAprsPacket,
|
||||
renderAprsPacketRow
|
||||
};
|
||||
@@ -1,156 +0,0 @@
|
||||
// src/plugins/aprs-shared.ts
|
||||
function aprsPacketCategory(packet) {
|
||||
const type = (packet.type ?? "").toLowerCase();
|
||||
const info = (packet.info ?? "").toLowerCase();
|
||||
if (packet.lat != null && packet.lon != null || type.includes("position")) return "position";
|
||||
if (type.includes("message") || info.startsWith(":")) return "message";
|
||||
if (type.includes("weather") || info.startsWith("_")) return "weather";
|
||||
if (type.includes("telemetry") || info.startsWith("t#")) return "telemetry";
|
||||
return "other";
|
||||
}
|
||||
function aprsCategoryLabel(category) {
|
||||
switch (category) {
|
||||
case "position":
|
||||
return "Position";
|
||||
case "message":
|
||||
return "Message";
|
||||
case "weather":
|
||||
return "Weather";
|
||||
case "telemetry":
|
||||
return "Telemetry";
|
||||
default:
|
||||
return "Other";
|
||||
}
|
||||
}
|
||||
function aprsAgeText(timestampMs) {
|
||||
if (typeof timestampMs !== "number" || !Number.isFinite(timestampMs)) return "just now";
|
||||
const seconds = Math.round(Math.max(0, Date.now() - timestampMs) / 1e3);
|
||||
if (seconds < 5) return "just now";
|
||||
if (seconds < 60) return `${String(seconds)}s ago`;
|
||||
const minutes = Math.round(seconds / 60);
|
||||
if (minutes < 60) return `${String(minutes)}m ago`;
|
||||
return `${String(Math.round(minutes / 60))}h ago`;
|
||||
}
|
||||
function aprsPacketSignature(packet) {
|
||||
return [
|
||||
packet.srcCall ?? "",
|
||||
packet.destCall ?? "",
|
||||
packet.path ?? "",
|
||||
packet.info ?? "",
|
||||
packet.type ?? "",
|
||||
packet.lat?.toFixed(4) ?? "",
|
||||
packet.lon?.toFixed(4) ?? ""
|
||||
].join("|");
|
||||
}
|
||||
function collapseAprsDuplicates(packets) {
|
||||
const seen = /* @__PURE__ */ new Set();
|
||||
return packets.filter((packet) => {
|
||||
const signature = aprsPacketSignature(packet);
|
||||
if (seen.has(signature)) return false;
|
||||
seen.add(signature);
|
||||
return true;
|
||||
});
|
||||
}
|
||||
function aprsHexBytes(bytes) {
|
||||
if (!bytes?.length) return "--";
|
||||
return bytes.map((byte) => byte.toString(16).toUpperCase().padStart(2, "0")).join(" ");
|
||||
}
|
||||
function renderAprsInfo(packet) {
|
||||
if (packet.info_bytes?.length) {
|
||||
return packet.info_bytes.map((byte) => renderAprsByte(byte)).join("");
|
||||
}
|
||||
return Array.from(packet.info ?? "", (character) => renderAprsCharacter(character)).join("");
|
||||
}
|
||||
function renderAprsByte(byte) {
|
||||
return byte >= 32 && byte <= 126 ? escapeAprsCharacter(String.fromCharCode(byte)) : `<span class="aprs-byte">0x${byte.toString(16).toUpperCase().padStart(2, "0")}</span>`;
|
||||
}
|
||||
function renderAprsCharacter(character) {
|
||||
const code = character.charCodeAt(0);
|
||||
return code >= 32 && code <= 126 ? escapeAprsCharacter(character) : `<span class="aprs-byte">0x${code.toString(16).toUpperCase().padStart(2, "0")}</span>`;
|
||||
}
|
||||
function escapeAprsCharacter(character) {
|
||||
if (character === "<") return "<";
|
||||
if (character === ">") return ">";
|
||||
if (character === "&") return "&";
|
||||
if (character === '"') return """;
|
||||
return character;
|
||||
}
|
||||
var APRS_SPRITE_COLUMNS = 16;
|
||||
var APRS_SPRITE_CELL_PX = 24;
|
||||
var APRS_SPRITE_FIRST_CODE = 33;
|
||||
var APRS_SPRITE_LAST_CODE = 126;
|
||||
function aprsSpriteOffset(code) {
|
||||
if (code.length !== 1) return null;
|
||||
const point = code.charCodeAt(0);
|
||||
if (point < APRS_SPRITE_FIRST_CODE || point > APRS_SPRITE_LAST_CODE) return null;
|
||||
const index = point - APRS_SPRITE_FIRST_CODE;
|
||||
const column = index % APRS_SPRITE_COLUMNS;
|
||||
const row = Math.floor(index / APRS_SPRITE_COLUMNS);
|
||||
return `${String(-column * APRS_SPRITE_CELL_PX)}px ${String(-row * APRS_SPRITE_CELL_PX)}px`;
|
||||
}
|
||||
function aprsSymbolSprite(symbolTable, symbolCode) {
|
||||
if (!symbolTable || !symbolCode) return null;
|
||||
const symbolOffset = aprsSpriteOffset(symbolCode);
|
||||
if (!symbolOffset) return null;
|
||||
if (symbolTable === "/") {
|
||||
return {
|
||||
className: "aprs-symbol-primary",
|
||||
backgroundPosition: symbolOffset,
|
||||
label: `Primary APRS symbol ${symbolTable}${symbolCode}`
|
||||
};
|
||||
}
|
||||
if (symbolTable === "\\") {
|
||||
return {
|
||||
className: "aprs-symbol-alternate",
|
||||
backgroundPosition: symbolOffset,
|
||||
label: `Alternate APRS symbol ${symbolTable}${symbolCode}`
|
||||
};
|
||||
}
|
||||
const overlayOffset = aprsSpriteOffset(symbolTable);
|
||||
if (!overlayOffset) return null;
|
||||
return {
|
||||
className: "aprs-symbol-overlaid",
|
||||
backgroundPosition: `${overlayOffset}, ${symbolOffset}`,
|
||||
label: `Alternate APRS symbol \\${symbolCode} with overlay ${symbolTable}`
|
||||
};
|
||||
}
|
||||
function renderLocalAprsSymbol(packet, escapeHtml) {
|
||||
if (!packet.symbolTable || !packet.symbolCode) return "";
|
||||
const sprite = aprsSymbolSprite(packet.symbolTable, packet.symbolCode);
|
||||
if (sprite) {
|
||||
return `<span class="aprs-symbol ${sprite.className}" role="img" style="background-position:${sprite.backgroundPosition}" title="${escapeHtml(sprite.label)}" aria-label="${escapeHtml(sprite.label)}"></span>`;
|
||||
}
|
||||
const symbol = escapeHtml(packet.symbolCode);
|
||||
const table = packet.symbolTable === "/" ? "Primary" : "Alternate";
|
||||
return `<span class="aprs-symbol aprs-symbol-local" title="${table} APRS symbol ${symbol}">${symbol}</span>`;
|
||||
}
|
||||
function normalizeAprsPacket(packet, receiver) {
|
||||
return {
|
||||
rig_id: packet.rig_id || null,
|
||||
receiver,
|
||||
srcCall: packet.src_call ?? "",
|
||||
destCall: packet.dest_call ?? "",
|
||||
path: packet.path ?? "",
|
||||
info: packet.info ?? "",
|
||||
info_bytes: packet.info_bytes ?? [],
|
||||
type: packet.packet_type ?? "",
|
||||
crcOk: packet.crc_ok ?? false,
|
||||
ts_ms: packet.ts_ms ?? null,
|
||||
lat: packet.lat ?? null,
|
||||
lon: packet.lon ?? null,
|
||||
symbolTable: packet.symbol_table ?? null,
|
||||
symbolCode: packet.symbol_code ?? null
|
||||
};
|
||||
}
|
||||
|
||||
export {
|
||||
aprsPacketCategory,
|
||||
aprsCategoryLabel,
|
||||
aprsAgeText,
|
||||
collapseAprsDuplicates,
|
||||
aprsHexBytes,
|
||||
renderAprsInfo,
|
||||
aprsSymbolSprite,
|
||||
renderLocalAprsSymbol,
|
||||
normalizeAprsPacket
|
||||
};
|
||||
@@ -1,13 +1,10 @@
|
||||
import {
|
||||
aprsAgeText,
|
||||
aprsCategoryLabel,
|
||||
aprsHexBytes,
|
||||
aprsPacketCategory,
|
||||
collapseAprsDuplicates,
|
||||
normalizeAprsPacket,
|
||||
renderAprsInfo,
|
||||
renderLocalAprsSymbol
|
||||
} from "./chunk-ROTCLFXS.js";
|
||||
renderAprsPacketRow
|
||||
} from "./chunk-OPEIVJGD.js";
|
||||
import {
|
||||
hostCore,
|
||||
hostState
|
||||
@@ -15,7 +12,6 @@ import {
|
||||
|
||||
// src/plugins/hf-aprs.ts
|
||||
var hfAprsWindow = window;
|
||||
var escapeHfAprsHtml = (input) => hostCore.escapeMapHtml(input);
|
||||
var hfAprsStatus = document.getElementById("hf-aprs-status");
|
||||
var hfAprsPacketsEl = document.getElementById("hf-aprs-packets");
|
||||
var hfAprsFilterInput = document.getElementById("hf-aprs-filter");
|
||||
@@ -102,51 +98,27 @@ function updateHfAprsChipState() {
|
||||
hfAprsCollapseDupBtn?.classList.toggle("active", hfAprsCollapseDup);
|
||||
}
|
||||
function renderHfAprsRow(pkt, isFresh) {
|
||||
const row = document.createElement("div");
|
||||
row.className = "aprs-packet";
|
||||
if (!pkt.crcOk) row.classList.add("aprs-packet-crc");
|
||||
if (isFresh) row.classList.add("aprs-packet-new");
|
||||
const ts = pkt._ts || (/* @__PURE__ */ new Date()).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", second: "2-digit" });
|
||||
const age = aprsAgeText(pkt._tsMs);
|
||||
const category = aprsPacketCategory(pkt);
|
||||
const categoryLabel = aprsCategoryLabel(category);
|
||||
const categoryClass = `aprs-badge aprs-badge-type aprs-badge-type-${category}`;
|
||||
const pathBadge = pkt.path ? `<span class="aprs-badge">${escapeHfAprsHtml(pkt.path)}</span>` : "";
|
||||
const crcBadge = pkt.crcOk ? "" : '<span class="aprs-badge aprs-badge-crc">CRC Fail</span>';
|
||||
const hfBadge = '<span class="aprs-badge" style="background:var(--accent-alt,#f59e0b);color:#000">HF</span>';
|
||||
const symbolHtml = renderLocalAprsSymbol(pkt, escapeHfAprsHtml);
|
||||
const posLink = pkt.lat != null && pkt.lon != null ? `<a class="aprs-pos" href="javascript:void(0)" data-aprs-map="${pkt.lat},${pkt.lon}">${pkt.lat.toFixed(4)}, ${pkt.lon.toFixed(4)}</a>` : "";
|
||||
const distance = hfAprsDistanceText(pkt);
|
||||
const qrzHref = `https://qrzcq.com/call/${encodeURIComponent(pkt.srcCall || "")}`;
|
||||
row.innerHTML = `<div class="aprs-row-head"><span class="aprs-time">${ts}</span>` + hfBadge + symbolHtml + `<span class="aprs-call">${escapeHfAprsHtml(pkt.srcCall ?? "")}</span><span>>${escapeHfAprsHtml(pkt.destCall || "")}</span><span class="${categoryClass}">${escapeHfAprsHtml(categoryLabel)}</span>` + pathBadge + crcBadge + `</div><div class="aprs-row-meta"><span class="aprs-meta-text">${escapeHfAprsHtml(age)}</span>` + (distance ? `<span class="aprs-meta-text">${escapeHfAprsHtml(distance)}</span>` : "") + `<span class="aprs-meta-text">${escapeHfAprsHtml(pkt.type || "--")}</span></div><div class="aprs-row-detail"><span title="${escapeHfAprsHtml(pkt.type || "")}">${renderAprsInfo(pkt)}</span>` + (posLink ? `<span>${posLink}</span>` : "") + `</div><div class="aprs-row-actions">` + (pkt.lat != null && pkt.lon != null ? `<button class="aprs-inline-btn" type="button" data-aprs-map="${pkt.lat},${pkt.lon}">Map</button>` : "") + (pkt.lat != null && pkt.lon != null ? `<button class="aprs-inline-btn" type="button" data-aprs-copy="${pkt.lat},${pkt.lon}">Copy Coords</button>` : "") + `<a class="aprs-inline-btn" href="${qrzHref}" target="_blank" rel="noopener">QRZ</a></div><details class="aprs-details"><summary>Details</summary><div class="aprs-details-grid"><span class="aprs-detail-label">Source</span><span class="aprs-detail-value">${escapeHfAprsHtml(pkt.srcCall || "--")}</span><span class="aprs-detail-label">Destination</span><span class="aprs-detail-value">${escapeHfAprsHtml(pkt.destCall || "--")}</span><span class="aprs-detail-label">Type</span><span class="aprs-detail-value">${escapeHfAprsHtml(pkt.type || "--")}</span><span class="aprs-detail-label">Path</span><span class="aprs-detail-value">${escapeHfAprsHtml(pkt.path || "--")}</span><span class="aprs-detail-label">Age</span><span class="aprs-detail-value">${escapeHfAprsHtml(age)}</span><span class="aprs-detail-label">CRC</span><span class="aprs-detail-value">${pkt.crcOk ? "OK" : "Failed"}</span><span class="aprs-detail-label">Position</span><span class="aprs-detail-value">${pkt.lat != null && pkt.lon != null ? `${pkt.lat.toFixed(5)}, ${pkt.lon.toFixed(5)}` : "--"}</span><span class="aprs-detail-label">Info</span><span class="aprs-detail-value">${escapeHfAprsHtml(pkt.info || "--")}</span><span class="aprs-detail-label">Info Bytes</span><span class="aprs-detail-value">${escapeHfAprsHtml(aprsHexBytes(pkt.info_bytes))}</span></div></details>`;
|
||||
row.querySelectorAll("[data-aprs-map]").forEach((el) => {
|
||||
el.addEventListener("click", (evt) => {
|
||||
evt.preventDefault();
|
||||
const raw = el.dataset.aprsMap ?? "";
|
||||
const [lat, lon] = raw.split(",").map(Number);
|
||||
if (hfAprsWindow.navigateToAprsMap && typeof lat === "number" && typeof lon === "number" && Number.isFinite(lat) && Number.isFinite(lon)) {
|
||||
hfAprsWindow.navigateToAprsMap(lat, lon);
|
||||
}
|
||||
});
|
||||
return renderAprsPacketRow(pkt, {
|
||||
fresh: isFresh,
|
||||
badge: "HF",
|
||||
distance: hfAprsDistanceText(pkt),
|
||||
onMap: (lat, lon) => {
|
||||
hfAprsWindow.navigateToAprsMap?.(lat, lon);
|
||||
},
|
||||
onCopy: (text) => {
|
||||
void copyHfAprsCoords(text);
|
||||
}
|
||||
});
|
||||
const copyBtn = row.querySelector("[data-aprs-copy]");
|
||||
if (copyBtn) {
|
||||
copyBtn.addEventListener("click", () => {
|
||||
void (async () => {
|
||||
const raw = copyBtn.dataset.aprsCopy ?? "";
|
||||
try {
|
||||
const clipboard = Reflect.get(navigator, "clipboard");
|
||||
if (clipboard) {
|
||||
await clipboard.writeText(raw);
|
||||
hostCore.showHint("Coordinates copied", 1200);
|
||||
}
|
||||
} catch {
|
||||
hostCore.showHint("Copy failed", 1500);
|
||||
}
|
||||
})();
|
||||
});
|
||||
}
|
||||
async function copyHfAprsCoords(text) {
|
||||
try {
|
||||
const clipboard = Reflect.get(navigator, "clipboard");
|
||||
if (!clipboard) return;
|
||||
await clipboard.writeText(text);
|
||||
hostCore.showHint("Coordinates copied", 1200);
|
||||
} catch {
|
||||
hostCore.showHint("Copy failed", 1500);
|
||||
}
|
||||
return row;
|
||||
}
|
||||
function renderHfAprsHistory() {
|
||||
pruneHfAprsPacketHistory();
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import {
|
||||
aprsSymbolSprite
|
||||
} from "./chunk-ROTCLFXS.js";
|
||||
} from "./chunk-OPEIVJGD.js";
|
||||
|
||||
// src/map-core.ts
|
||||
function mapEl(id) {
|
||||
@@ -62,6 +62,7 @@ var mapWindow = window;
|
||||
const mapMarkers = /* @__PURE__ */ new Set();
|
||||
const DEFAULT_MAP_SOURCE_FILTER = { ais: true, vdes: true, aprs: true, bookmark: false, ft8: true, ft4: true, ft2: true, wspr: true, sat: false };
|
||||
const mapFilter = { ...DEFAULT_MAP_SOURCE_FILTER };
|
||||
const MAP_FILTER_ALL_KEY = "__all";
|
||||
const mapLocatorFilter = { phase: "band", bands: /* @__PURE__ */ new Set() };
|
||||
let mapSearchFilter = "";
|
||||
let mapRigFilter = "";
|
||||
@@ -838,38 +839,36 @@ var mapWindow = window;
|
||||
container.innerHTML = `<span class="map-locator-empty">No ${kind === "band" ? "bands" : "sources"} available</span>`;
|
||||
return;
|
||||
}
|
||||
let helperText = "";
|
||||
const noun = kind === "band" ? "bands" : "sources";
|
||||
const sourceKeys = kind === "source" ? Object.keys(DEFAULT_MAP_SOURCE_FILTER) : [];
|
||||
const noneSelected = kind === "source" && sourceKeys.every((k) => !mapFilter[k]);
|
||||
if (kind === "source") {
|
||||
if (noneSelected) {
|
||||
helperText = "All sources visible — click to filter";
|
||||
}
|
||||
} else if (!(selectedSet instanceof Set) || selectedSet.size === 0) {
|
||||
helperText = `All ${kind === "band" ? "bands" : "sources"} visible by default`;
|
||||
}
|
||||
const showingAll = kind === "source" ? sourceKeys.every((k) => !mapFilter[k]) : !(selectedSet instanceof Set) || selectedSet.size === 0;
|
||||
const allChip = document.createElement("button");
|
||||
allChip.type = "button";
|
||||
allChip.className = "map-locator-chip map-locator-chip-all";
|
||||
if (showingAll) allChip.classList.add("is-active");
|
||||
allChip.dataset.filterKind = kind;
|
||||
allChip.dataset.filterKey = MAP_FILTER_ALL_KEY;
|
||||
allChip.setAttribute("aria-pressed", showingAll ? "true" : "false");
|
||||
allChip.title = showingAll ? `All ${noun} shown` : `Show all ${noun}`;
|
||||
allChip.innerHTML = `<span class="map-locator-chip-text">All</span>`;
|
||||
container.appendChild(allChip);
|
||||
for (const item of items) {
|
||||
const btn = document.createElement("button");
|
||||
btn.type = "button";
|
||||
btn.className = "map-locator-chip";
|
||||
const isActive = kind === "source" ? !!mapFilter[item.key] : !!selectedSet?.has(item.key);
|
||||
if (kind === "source" && noneSelected) {
|
||||
if (showingAll) {
|
||||
btn.classList.add("is-default");
|
||||
} else if (!isActive) {
|
||||
btn.classList.add("is-inactive");
|
||||
}
|
||||
btn.setAttribute("aria-pressed", !showingAll && isActive ? "true" : "false");
|
||||
btn.dataset.filterKind = kind;
|
||||
btn.dataset.filterKey = item.key;
|
||||
btn.style.setProperty("--chip-color", item.color);
|
||||
btn.innerHTML = `<span class="map-locator-chip-text">${escapeMapHtml(item.label)}</span>`;
|
||||
container.appendChild(btn);
|
||||
}
|
||||
if (helperText) {
|
||||
const hint = document.createElement("span");
|
||||
hint.className = "map-locator-empty";
|
||||
hint.textContent = helperText;
|
||||
container.appendChild(hint);
|
||||
}
|
||||
}
|
||||
function renderMapLocatorPhaseRow(container, phase) {
|
||||
if (!container) return;
|
||||
@@ -977,11 +976,10 @@ var mapWindow = window;
|
||||
renderMapLocatorLegend(mapLocatorFilter.phase, sourceItems, bandItems);
|
||||
if (!phaseEl || !choiceEl || !choiceLabelEl) return;
|
||||
renderMapLocatorPhaseRow(phaseEl, mapLocatorFilter.phase);
|
||||
choiceLabelEl.textContent = "Show";
|
||||
if (mapLocatorFilter.phase === "band") {
|
||||
choiceLabelEl.textContent = "Visible Bands";
|
||||
renderMapLocatorChipRow(choiceEl, bandItems, mapLocatorFilter.bands, "band");
|
||||
} else {
|
||||
choiceLabelEl.textContent = "Visible Sources";
|
||||
renderMapLocatorChipRow(choiceEl, sourceItems, null, "source");
|
||||
}
|
||||
syncLocatorMarkerStyles();
|
||||
@@ -1335,7 +1333,8 @@ var mapWindow = window;
|
||||
function applyMapOverlayPanelVisibility() {
|
||||
const panel = document.querySelector("#map-stage .map-overlay-panel");
|
||||
if (!panel) return;
|
||||
panel.classList.toggle("is-hidden", !mapOverlayPanelVisible);
|
||||
panel.classList.toggle("filters-hidden", !mapOverlayPanelVisible);
|
||||
panel.querySelector(".map-overlay-filters")?.classList.toggle("is-hidden", !mapOverlayPanelVisible);
|
||||
}
|
||||
function updateMapOverlayToggleButton() {
|
||||
const btn = mapEl("map-overlay-toggle-btn");
|
||||
@@ -1532,7 +1531,13 @@ var mapWindow = window;
|
||||
const kind = String(chip.dataset.filterKind || "");
|
||||
const key = String(chip.dataset.filterKey || "");
|
||||
if (!key) return;
|
||||
if (kind === "source" && Object.prototype.hasOwnProperty.call(mapFilter, key)) {
|
||||
if (key === MAP_FILTER_ALL_KEY) {
|
||||
if (kind === "source") {
|
||||
for (const srcKey of Object.keys(DEFAULT_MAP_SOURCE_FILTER)) mapFilter[srcKey] = false;
|
||||
} else {
|
||||
mapLocatorFilter.bands.clear();
|
||||
}
|
||||
} else if (kind === "source" && Object.prototype.hasOwnProperty.call(mapFilter, key)) {
|
||||
const sourceKey = key;
|
||||
mapFilter[sourceKey] = !mapFilter[sourceKey];
|
||||
const srcKeys = Object.keys(DEFAULT_MAP_SOURCE_FILTER);
|
||||
@@ -2147,14 +2152,16 @@ var mapWindow = window;
|
||||
function updateMapContactPathsToggle() {
|
||||
const btn = mapEl("map-contact-paths-toggle");
|
||||
if (!btn) return;
|
||||
btn.textContent = mapDecodeContactPathsEnabled ? "Contact Paths On" : "Contact Paths Off";
|
||||
btn.classList.toggle("is-active", mapDecodeContactPathsEnabled);
|
||||
btn.setAttribute("aria-pressed", mapDecodeContactPathsEnabled ? "true" : "false");
|
||||
btn.title = mapDecodeContactPathsEnabled ? "Directed decode paths are drawn when the target locator is known" : "Directed decode paths are hidden";
|
||||
}
|
||||
function updateMapP2pPathsToggle() {
|
||||
const btn = mapEl("map-p2p-paths-toggle");
|
||||
if (!btn) return;
|
||||
btn.textContent = mapP2pRadioPathsEnabled ? "TRX Paths On" : "TRX Paths Off";
|
||||
btn.classList.toggle("is-active", mapP2pRadioPathsEnabled);
|
||||
btn.setAttribute("aria-pressed", mapP2pRadioPathsEnabled ? "true" : "false");
|
||||
btn.title = mapP2pRadioPathsEnabled ? "TRX paths are drawn from a station popup" : "TRX paths are hidden";
|
||||
}
|
||||
function scheduleDecodeMapMaintenance() {
|
||||
if (C.decodeHistoryMapRenderingDeferred()) {
|
||||
@@ -3093,5 +3100,6 @@ var mapWindow = window;
|
||||
bandForHz,
|
||||
reverseGeocodeLocation
|
||||
};
|
||||
window.trxPluginRuntime.syncMapAll();
|
||||
autoInitIfVisible();
|
||||
})();
|
||||
|
||||
@@ -220,9 +220,7 @@ function onServerVdesBatch(messages) {
|
||||
minute: "2-digit",
|
||||
second: "2-digit"
|
||||
});
|
||||
if (next.lat != null && next.lon != null && vdesWindow.vdesMapAddPoint) {
|
||||
vdesWindow.vdesMapAddPoint(next);
|
||||
}
|
||||
plotVdesMessage(next);
|
||||
normalized.push(next);
|
||||
}
|
||||
normalized.reverse();
|
||||
@@ -248,13 +246,15 @@ if (vdesFilterInput) {
|
||||
renderVdesHistory();
|
||||
});
|
||||
}
|
||||
function plotVdesMessage(msg) {
|
||||
if (msg.lat == null || msg.lon == null || !vdesWindow.vdesMapAddPoint) return;
|
||||
vdesWindow.vdesMapAddPoint(msg);
|
||||
}
|
||||
function onServerVdes(msg) {
|
||||
if (vdesStatus) vdesStatus.textContent = "Receiving";
|
||||
const next = normalizeServerVdesMessage(msg);
|
||||
addVdesMessage(next);
|
||||
if (next.lat != null && next.lon != null && vdesWindow.vdesMapAddPoint) {
|
||||
vdesWindow.vdesMapAddPoint(next);
|
||||
}
|
||||
plotVdesMessage(next);
|
||||
}
|
||||
function pruneVdesHistoryView() {
|
||||
pruneVdesMessageHistory();
|
||||
@@ -268,5 +268,9 @@ window.trxPluginRuntime.registerDecoder({
|
||||
onBatch: onServerVdesBatch,
|
||||
restore: onServerVdesBatch,
|
||||
reset: resetVdesHistoryView,
|
||||
prune: pruneVdesHistoryView
|
||||
prune: pruneVdesHistoryView,
|
||||
// Oldest first, so tracks are rebuilt in the order they happened.
|
||||
syncMap: () => {
|
||||
for (const entry of [...vdesMessageHistory].reverse()) plotVdesMessage(entry);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -209,11 +209,11 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<div class="label"><span>Signal strength</span></div>
|
||||
</div>
|
||||
<div class="freq-field frequency-col">
|
||||
<input class="status-input" id="freq" type="text" value="--" aria-describedby="freq-label" aria-label="Tuned frequency" />
|
||||
<input class="status-input" id="freq" type="text" value="--" aria-describedby="freq-label" aria-label="Tuned frequency" autocomplete="off" autocorrect="off" spellcheck="false" />
|
||||
<div class="label" id="freq-label"><span>Frequency</span></div>
|
||||
</div>
|
||||
<div class="freq-field frequency-col center-frequency-col" id="center-freq-field" style="display:none;">
|
||||
<input class="status-input" id="center-freq" type="text" value="--" aria-describedby="center-freq-label" aria-label="SDR center frequency" />
|
||||
<input class="status-input" id="center-freq" type="text" value="--" aria-describedby="center-freq-label" aria-label="SDR center frequency" autocomplete="off" autocorrect="off" spellcheck="false" />
|
||||
<div class="label" id="center-freq-label"><span>Center Frequency</span></div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -680,19 +680,12 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<input id="ais-filter" class="ft8-filter" type="text" placeholder="Filter (e.g. MMSI, vessel, A)" />
|
||||
<small id="ais-status" style="color:var(--text-muted);">Waiting for server decode</small>
|
||||
</div>
|
||||
<div class="ais-summary">
|
||||
<div class="ais-summary-card">
|
||||
<span class="ais-summary-label">Channels</span>
|
||||
<span id="ais-channel-summary" class="ais-summary-value">A 161.975 MHz · B 162.025 MHz</span>
|
||||
</div>
|
||||
<div class="ais-summary-card">
|
||||
<span class="ais-summary-label">Tracked</span>
|
||||
<span id="ais-vessel-count" class="ais-summary-value">0 vessels</span>
|
||||
</div>
|
||||
<div class="ais-summary-card">
|
||||
<span class="ais-summary-label">Latest</span>
|
||||
<span id="ais-latest-seen" class="ais-summary-value">No traffic yet</span>
|
||||
</div>
|
||||
<div class="aprs-filter-row">
|
||||
<span class="aprs-counts">
|
||||
<span id="ais-vessel-count" class="aprs-counts-value">0 vessels</span>
|
||||
<span id="ais-latest-seen" class="aprs-counts-value">No traffic yet</span>
|
||||
<span id="ais-channel-summary" class="aprs-counts-value">A 161.975 MHz · B 162.025 MHz</span>
|
||||
</span>
|
||||
</div>
|
||||
<div id="ais-messages"></div>
|
||||
</div>
|
||||
@@ -722,20 +715,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<input id="aprs-filter" class="ft8-filter" type="text" placeholder="Filter (e.g. SP2, beacon)" />
|
||||
<small id="aprs-status" style="color:var(--text-muted);">Waiting for server decode</small>
|
||||
</div>
|
||||
<div class="aprs-summary">
|
||||
<div class="aprs-summary-card">
|
||||
<span class="aprs-summary-label">Frames</span>
|
||||
<span id="aprs-total-count" class="aprs-summary-value">0 total</span>
|
||||
</div>
|
||||
<div class="aprs-summary-card">
|
||||
<span class="aprs-summary-label">Visible</span>
|
||||
<span id="aprs-visible-count" class="aprs-summary-value">0 shown</span>
|
||||
</div>
|
||||
<div class="aprs-summary-card">
|
||||
<span class="aprs-summary-label">Latest</span>
|
||||
<span id="aprs-latest-seen" class="aprs-summary-value">No packets yet</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="aprs-filter-row">
|
||||
<button id="aprs-type-all" class="aprs-chip active" type="button">All</button>
|
||||
<button id="aprs-type-position" class="aprs-chip" type="button">Pos</button>
|
||||
@@ -743,11 +722,15 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<button id="aprs-type-weather" class="aprs-chip" type="button">Wx</button>
|
||||
<button id="aprs-type-telemetry" class="aprs-chip" type="button">Tlm</button>
|
||||
<button id="aprs-type-other" class="aprs-chip" type="button">Other</button>
|
||||
</div>
|
||||
<div class="aprs-filter-row">
|
||||
<span class="aprs-filter-sep" aria-hidden="true"></span>
|
||||
<button id="aprs-only-pos-btn" class="aprs-chip" type="button">Pos Only</button>
|
||||
<button id="aprs-hide-crc-btn" class="aprs-chip" type="button">No CRC</button>
|
||||
<button id="aprs-collapse-dup-btn" class="aprs-chip" type="button">Dupes</button>
|
||||
<span class="aprs-counts">
|
||||
<span id="aprs-visible-count" class="aprs-counts-value">0 shown</span>
|
||||
<span id="aprs-total-count" class="aprs-counts-value">0 total</span>
|
||||
<span id="aprs-latest-seen" class="aprs-counts-value">No packets yet</span>
|
||||
</span>
|
||||
</div>
|
||||
<div id="aprs-packets"></div>
|
||||
</div>
|
||||
@@ -757,20 +740,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<input id="hf-aprs-filter" class="ft8-filter" type="text" placeholder="Filter (e.g. SP2, beacon)" />
|
||||
<small id="hf-aprs-status" style="color:var(--text-muted);">Waiting for server decode</small>
|
||||
</div>
|
||||
<div class="aprs-summary">
|
||||
<div class="aprs-summary-card">
|
||||
<span class="aprs-summary-label">Frames</span>
|
||||
<span id="hf-aprs-total-count" class="aprs-summary-value">0 total</span>
|
||||
</div>
|
||||
<div class="aprs-summary-card">
|
||||
<span class="aprs-summary-label">Visible</span>
|
||||
<span id="hf-aprs-visible-count" class="aprs-summary-value">0 shown</span>
|
||||
</div>
|
||||
<div class="aprs-summary-card">
|
||||
<span class="aprs-summary-label">Latest</span>
|
||||
<span id="hf-aprs-latest-seen" class="aprs-summary-value">No packets yet</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="aprs-filter-row">
|
||||
<button id="hf-aprs-type-all" class="aprs-chip active" type="button">All</button>
|
||||
<button id="hf-aprs-type-position" class="aprs-chip" type="button">Pos</button>
|
||||
@@ -778,11 +747,15 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<button id="hf-aprs-type-weather" class="aprs-chip" type="button">Wx</button>
|
||||
<button id="hf-aprs-type-telemetry" class="aprs-chip" type="button">Tlm</button>
|
||||
<button id="hf-aprs-type-other" class="aprs-chip" type="button">Other</button>
|
||||
</div>
|
||||
<div class="aprs-filter-row">
|
||||
<span class="aprs-filter-sep" aria-hidden="true"></span>
|
||||
<button id="hf-aprs-only-pos-btn" class="aprs-chip" type="button">Pos Only</button>
|
||||
<button id="hf-aprs-hide-crc-btn" class="aprs-chip" type="button">No CRC</button>
|
||||
<button id="hf-aprs-collapse-dup-btn" class="aprs-chip" type="button">Dupes</button>
|
||||
<span class="aprs-counts">
|
||||
<span id="hf-aprs-visible-count" class="aprs-counts-value">0 shown</span>
|
||||
<span id="hf-aprs-total-count" class="aprs-counts-value">0 total</span>
|
||||
<span id="hf-aprs-latest-seen" class="aprs-counts-value">No packets yet</span>
|
||||
</span>
|
||||
</div>
|
||||
<div id="hf-aprs-packets"></div>
|
||||
</div>
|
||||
@@ -1028,48 +1001,52 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<template id="tmpl-map">
|
||||
<div id="map-stage">
|
||||
<div class="map-overlay-panel">
|
||||
<div class="map-locator-filter-group">
|
||||
<span class="map-locator-filter-label">Filter by</span>
|
||||
<div id="map-locator-phase" class="map-locator-phase-row"></div>
|
||||
</div>
|
||||
<div class="map-locator-filter-group">
|
||||
<span class="map-locator-filter-label" id="map-locator-choice-label">Show</span>
|
||||
<div id="map-locator-choice-filter" class="map-locator-chip-row"></div>
|
||||
</div>
|
||||
<div class="map-locator-filter-group">
|
||||
<span class="map-locator-filter-label">Rig</span>
|
||||
<select id="map-rig-filter" class="map-history-select" aria-label="Filter by rig">
|
||||
<option value="">All</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="map-locator-filter-group">
|
||||
<span class="map-locator-filter-label">Search</span>
|
||||
<input type="text" id="map-search-filter" class="map-search-input" placeholder="Callsign, MMSI, locator, message..." />
|
||||
</div>
|
||||
<div class="map-locator-filter-group">
|
||||
<span class="map-locator-filter-label">History</span>
|
||||
<select id="map-history-limit" class="map-history-select" aria-label="Map history limit">
|
||||
<option value="15">15 min</option>
|
||||
<option value="30">30 min</option>
|
||||
<option value="60">1 hr</option>
|
||||
<option value="180">3 hrs</option>
|
||||
<option value="360">6 hrs</option>
|
||||
<option value="720">12 hrs</option>
|
||||
<option value="1440">24 hrs</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="map-locator-filter-group">
|
||||
<span class="map-locator-filter-label">Paths</span>
|
||||
<div class="map-locator-phase-row">
|
||||
<button type="button" id="map-p2p-paths-toggle" class="map-locator-phase-btn">TRX Paths On</button>
|
||||
<button type="button" id="map-contact-paths-toggle" class="map-locator-phase-btn">Contact Paths On</button>
|
||||
<span class="map-locator-empty">TRX paths on popup, directed decode paths when target locator is known</span>
|
||||
<div class="map-overlay-filters">
|
||||
<div class="map-locator-filter-group">
|
||||
<span class="map-locator-filter-label">Filter</span>
|
||||
<div id="map-locator-phase" class="map-locator-phase-row"></div>
|
||||
</div>
|
||||
<div class="map-locator-filter-group">
|
||||
<span class="map-locator-filter-label" id="map-locator-choice-label">Show</span>
|
||||
<div id="map-locator-choice-filter" class="map-locator-chip-row"></div>
|
||||
</div>
|
||||
<div class="map-locator-filter-group">
|
||||
<span class="map-locator-filter-label">Rig</span>
|
||||
<select id="map-rig-filter" class="map-history-select" aria-label="Filter by rig">
|
||||
<option value="">All</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="map-locator-filter-group">
|
||||
<span class="map-locator-filter-label">History</span>
|
||||
<select id="map-history-limit" class="map-history-select" aria-label="Map history limit">
|
||||
<option value="15">15 min</option>
|
||||
<option value="30">30 min</option>
|
||||
<option value="60">1 hr</option>
|
||||
<option value="180">3 hrs</option>
|
||||
<option value="360">6 hrs</option>
|
||||
<option value="720">12 hrs</option>
|
||||
<option value="1440">24 hrs</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="map-locator-filter-group">
|
||||
<span class="map-locator-filter-label">Paths</span>
|
||||
<div class="map-locator-phase-row">
|
||||
<button type="button" id="map-p2p-paths-toggle" class="map-locator-phase-btn" aria-pressed="true" title="TRX paths are drawn from a station popup">TRX</button>
|
||||
<button type="button" id="map-contact-paths-toggle" class="map-locator-phase-btn" aria-pressed="true" title="Directed decode paths are drawn when the target locator is known">Contact</button>
|
||||
<span class="map-paths-hint">TRX paths on popup, directed decode paths when target locator is known</span>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Last, so the search field takes whatever the fixed-width
|
||||
groups leave on the bar's final row rather than a sliver. -->
|
||||
<div class="map-locator-filter-group map-filter-grow">
|
||||
<span class="map-locator-filter-label">Search</span>
|
||||
<input type="text" id="map-search-filter" class="map-search-input" placeholder="Callsign, MMSI, locator, message..." />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="map-corner-controls">
|
||||
<button type="button" id="map-fullscreen-btn" class="map-fullscreen-btn">Fullscreen</button>
|
||||
<button type="button" id="map-overlay-toggle-btn" class="map-overlay-toggle-btn">Hide Filters</button>
|
||||
<div class="map-overlay-actions">
|
||||
<button type="button" id="map-fullscreen-btn" class="map-fullscreen-btn">Fullscreen</button>
|
||||
<button type="button" id="map-overlay-toggle-btn" class="map-overlay-toggle-btn">Hide Filters</button>
|
||||
</div>
|
||||
</div>
|
||||
<div id="map-band-legend" class="map-band-legend" aria-label="Band color legend"></div>
|
||||
<div id="aprs-map"></div>
|
||||
@@ -1660,11 +1637,12 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<div class="shortcut-overlay-hint">Press <kbd>F1</kbd> or <kbd>Esc</kbd> to close</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="decode-history-overlay" class="decode-history-overlay is-hidden" aria-live="polite" aria-atomic="true">
|
||||
<div class="decode-history-overlay-card">
|
||||
<div id="decode-history-overlay-title" class="decode-history-overlay-title">Loading decode history…</div>
|
||||
<div id="decode-history-overlay-sub" class="decode-history-overlay-sub">Preparing recent decodes for the UI</div>
|
||||
<div id="decode-history-overlay" class="history-progress is-hidden" role="status" aria-live="polite" aria-atomic="true">
|
||||
<div class="history-progress-text">
|
||||
<span id="decode-history-overlay-title" class="history-progress-title">Loading decode history…</span>
|
||||
<span id="decode-history-overlay-sub" class="history-progress-sub">Preparing recent decodes for the UI</span>
|
||||
</div>
|
||||
<span class="history-progress-track"><span id="decode-history-progress-bar" class="history-progress-bar"></span></span>
|
||||
</div>
|
||||
<script defer src="/vendor/opus-decoder-0.7.11.min.js" charset="UTF-8"></script>
|
||||
<script defer src="/vendor/leaflet.js"></script>
|
||||
|
||||
@@ -2085,9 +2085,15 @@ small { color: var(--text-muted); }
|
||||
display: grid;
|
||||
grid-template-columns: minmax(8.5rem, 11rem) minmax(0, 1fr);
|
||||
gap: 1rem;
|
||||
align-items: start;
|
||||
/* The panel takes the full height of the tab, which is what the decode
|
||||
lists inside it size against: FT8, FT4, FT2 and WSPR fill their panel
|
||||
with flex, so a panel sized to its own content collapsed them to their
|
||||
120px minimum however much room was going spare. */
|
||||
align-items: stretch;
|
||||
}
|
||||
#tab-digital-modes > .sub-tab-bar {
|
||||
/* The list keeps its own height while the panel stretches. */
|
||||
align-self: start;
|
||||
flex-direction: column;
|
||||
align-items: stretch;
|
||||
gap: 0.12rem;
|
||||
@@ -2130,6 +2136,7 @@ small { color: var(--text-muted); }
|
||||
grid-column: 2;
|
||||
grid-row: 1;
|
||||
min-width: 0;
|
||||
min-height: 0;
|
||||
}
|
||||
.sub-tab { flex-shrink: 0; background: transparent; border: none; border-bottom: 2px solid transparent; border-radius: 0; padding: 0.35rem 0.75rem; color: var(--text-muted); cursor: pointer; font-size: 0.85rem; height: auto; }
|
||||
.sub-tab.active { border-bottom-color: var(--accent-green); color: var(--accent-green); font-weight: 600; }
|
||||
@@ -2209,6 +2216,74 @@ small { color: var(--text-muted); }
|
||||
color: var(--text-muted);
|
||||
}
|
||||
|
||||
/* Decode history loads in the corner, not over the page. It was a full-screen
|
||||
scrim: the operator could not read the waterfall, the decode panels or
|
||||
anything else while a large history replayed, and the replay is exactly when
|
||||
there is something to watch. */
|
||||
.history-progress {
|
||||
position: fixed;
|
||||
left: var(--space-4);
|
||||
bottom: var(--space-4);
|
||||
z-index: 120;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.4rem;
|
||||
width: min(20rem, calc(100vw - 2rem));
|
||||
padding: 0.6rem 0.75rem 0.7rem;
|
||||
border: 1px solid color-mix(in srgb, var(--border-light) 70%, transparent);
|
||||
border-radius: var(--radius-md);
|
||||
background: color-mix(in srgb, var(--card-bg) 94%, transparent);
|
||||
box-shadow: 0 10px 24px color-mix(in srgb, var(--bg) 35%, transparent);
|
||||
pointer-events: none;
|
||||
transition: opacity var(--dur-base) var(--ease-standard),
|
||||
visibility var(--dur-base) var(--ease-standard);
|
||||
}
|
||||
.history-progress.is-hidden {
|
||||
opacity: 0;
|
||||
visibility: hidden;
|
||||
}
|
||||
.history-progress-text {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.1rem;
|
||||
min-width: 0;
|
||||
}
|
||||
.history-progress-title {
|
||||
font-size: var(--fs-xs);
|
||||
font-weight: 700;
|
||||
color: var(--text-heading);
|
||||
}
|
||||
.history-progress-sub {
|
||||
font-size: var(--fs-xs);
|
||||
color: var(--text-muted);
|
||||
font-variant-numeric: tabular-nums;
|
||||
}
|
||||
.history-progress-track {
|
||||
height: 0.28rem;
|
||||
border-radius: var(--radius-pill);
|
||||
background: color-mix(in srgb, var(--border-light) 45%, transparent);
|
||||
overflow: hidden;
|
||||
}
|
||||
.history-progress-bar {
|
||||
display: block;
|
||||
width: 0%;
|
||||
height: 100%;
|
||||
border-radius: inherit;
|
||||
background: var(--accent-green);
|
||||
transition: width var(--dur-base) var(--ease-out);
|
||||
}
|
||||
/* Indeterminate while the payload is still on the wire. */
|
||||
.history-progress[data-phase="fetching"] .history-progress-bar {
|
||||
width: 35%;
|
||||
animation: trx-history-sweep 1.1s var(--ease-standard) infinite;
|
||||
}
|
||||
@keyframes trx-history-sweep {
|
||||
0% { transform: translateX(-100%); }
|
||||
100% { transform: translateX(285%); }
|
||||
}
|
||||
@media (max-width: 760px) {
|
||||
.history-progress { bottom: calc(5.9rem + env(safe-area-inset-bottom)); }
|
||||
}
|
||||
.decode-history-overlay {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
@@ -2481,18 +2556,29 @@ button.map-qso-card:focus-visible {
|
||||
border-color: color-mix(in srgb, var(--accent-blue, #5b9bd5) 35%, transparent);
|
||||
background: color-mix(in srgb, var(--accent-blue, #5b9bd5) 10%, transparent);
|
||||
}
|
||||
/* A toolbar across the top of the map rather than a panel parked in a corner:
|
||||
it leaves the map itself unobscured, and the bottom-left band legend keeps
|
||||
its place. Fullscreen and the filter toggle ride at its right-hand end;
|
||||
only the filters themselves collapse, so the button that hides them is
|
||||
still there to bring them back. */
|
||||
.map-overlay-panel {
|
||||
position: absolute;
|
||||
top: 0.7rem;
|
||||
/* Clear of Leaflet's zoom buttons, which draw over the top-left corner. */
|
||||
left: 3.4rem;
|
||||
right: 0.7rem;
|
||||
bottom: 0.7rem;
|
||||
z-index: 410;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.45rem;
|
||||
width: min(30rem, calc(100% - 4.9rem));
|
||||
flex-flow: row nowrap;
|
||||
/* Stretched, not centred: the rule dividing the filters from the buttons is
|
||||
drawn on the button block's edge, and it has to run the height of the bar
|
||||
rather than float beside it as a stub. */
|
||||
align-items: stretch;
|
||||
gap: 0.5rem;
|
||||
width: auto;
|
||||
max-height: calc(100% - 1.4rem);
|
||||
padding: 0.7rem 0.75rem;
|
||||
border-radius: 0.8rem;
|
||||
padding: 0.45rem 0.6rem;
|
||||
border-radius: 0.7rem;
|
||||
border: 1px solid color-mix(in srgb, var(--border-light) 74%, transparent);
|
||||
background: color-mix(in srgb, var(--card-bg) 82%, transparent);
|
||||
box-shadow: 0 16px 30px rgba(0, 0, 0, 0.24);
|
||||
@@ -2502,22 +2588,94 @@ button.map-qso-card:focus-visible {
|
||||
overflow: auto;
|
||||
transition: opacity 140ms ease, transform 140ms ease, visibility 140ms ease;
|
||||
}
|
||||
.map-overlay-filters {
|
||||
display: flex;
|
||||
flex: 1 1 auto;
|
||||
flex-flow: row wrap;
|
||||
align-items: center;
|
||||
/* Rows keep their own height when the bar is taller than they are, so the
|
||||
groups stay a bar's two rows rather than drifting apart to fill it. */
|
||||
align-content: center;
|
||||
gap: 0.35rem 0.5rem;
|
||||
min-width: 0;
|
||||
}
|
||||
.map-overlay-filters.is-hidden {
|
||||
display: none;
|
||||
}
|
||||
/* With the filters collapsed the bar has no reason to span the map. */
|
||||
.map-overlay-panel.filters-hidden {
|
||||
left: auto;
|
||||
}
|
||||
.map-overlay-actions {
|
||||
display: flex;
|
||||
flex: 0 0 auto;
|
||||
/* The block spans the bar so its divider can; the buttons still sit level
|
||||
with the middle of it. */
|
||||
align-self: stretch;
|
||||
align-items: center;
|
||||
gap: 0.4rem;
|
||||
}
|
||||
/* Set off from the filters, but only while there are filters to set off. */
|
||||
.map-overlay-panel:not(.filters-hidden) .map-overlay-actions {
|
||||
padding-left: 0.5rem;
|
||||
border-left: 1px solid color-mix(in srgb, var(--border-light) 55%, transparent);
|
||||
}
|
||||
.map-overlay-panel .map-locator-filter-group {
|
||||
flex: 0 1 auto;
|
||||
/* The label stays beside its control; only the bar itself wraps. */
|
||||
flex-wrap: nowrap;
|
||||
align-items: center;
|
||||
gap: 0.35rem;
|
||||
min-width: 0;
|
||||
padding-right: 0.5rem;
|
||||
border-right: 1px solid color-mix(in srgb, var(--border-light) 55%, transparent);
|
||||
}
|
||||
.map-overlay-panel .map-locator-filter-group:last-child {
|
||||
padding-right: 0;
|
||||
border-right: 0;
|
||||
}
|
||||
/* The search field takes whatever room the fixed-width groups leave, up to a
|
||||
width past which a text box spanning the map reads as a mistake. */
|
||||
.map-overlay-panel .map-filter-grow {
|
||||
flex: 1 1 9rem;
|
||||
max-width: 26rem;
|
||||
}
|
||||
/* One gutter for every label, so whichever group starts a row starts it in the
|
||||
same place: at their natural widths the labels staggered each row's first
|
||||
control by however much the label above it was wider or narrower. */
|
||||
.map-overlay-panel .map-locator-filter-label {
|
||||
min-width: 3.5rem;
|
||||
padding-top: 0;
|
||||
font-size: 0.72rem;
|
||||
letter-spacing: 0.02em;
|
||||
white-space: nowrap;
|
||||
}
|
||||
/* The two rows of the bar are led by the two pairs of phase buttons, and
|
||||
SOURCE|BAND is wider than TRX|CONTACT: left to their own widths the groups
|
||||
after them missed each other by four pixels. One width for both pairs. */
|
||||
.map-overlay-panel .map-locator-phase-row {
|
||||
flex: 0 0 auto;
|
||||
min-width: 9rem;
|
||||
}
|
||||
.map-overlay-panel .map-history-select {
|
||||
flex: 0 0 auto;
|
||||
width: auto;
|
||||
max-width: 8rem;
|
||||
}
|
||||
.map-overlay-panel .map-search-input {
|
||||
flex: 1 1 6rem;
|
||||
min-width: 4.5rem;
|
||||
}
|
||||
/* The buttons carry this as a tooltip; a sentence of it would swallow the bar. */
|
||||
.map-overlay-panel .map-paths-hint {
|
||||
display: none;
|
||||
}
|
||||
.map-overlay-panel.is-hidden {
|
||||
opacity: 0;
|
||||
visibility: hidden;
|
||||
transform: translateY(0.25rem);
|
||||
pointer-events: none;
|
||||
}
|
||||
.map-corner-controls {
|
||||
position: absolute;
|
||||
top: 0.7rem;
|
||||
right: 0.7rem;
|
||||
z-index: 410;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: flex-end;
|
||||
gap: 0.4rem;
|
||||
}
|
||||
.map-fullscreen-btn {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
@@ -2748,52 +2906,133 @@ body.map-fake-fullscreen-active {
|
||||
#aprs-packets,
|
||||
#ais-messages,
|
||||
#vdes-messages { max-height: 360px; overflow-y: auto; border: 1px solid var(--border-light); border-radius: 6px; background: var(--input-bg); font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; }
|
||||
#aprs-packets {
|
||||
flex: 0 1 auto;
|
||||
height: calc(100vh - 28rem);
|
||||
min-height: 16rem;
|
||||
max-height: calc(100vh - 28rem);
|
||||
/* Fill the panel, the way the FT8, FT4, FT2 and WSPR lists do. These were
|
||||
sized by formula against the viewport — 100vh minus a guess at everything
|
||||
above them — which stopped matching the moment the panel changed shape, and
|
||||
left a few hundred pixels of the page empty under a scrolling list. */
|
||||
#aprs-packets,
|
||||
#ais-messages,
|
||||
#vdes-messages,
|
||||
#hf-aprs-packets {
|
||||
flex: 1 1 0;
|
||||
min-height: 12rem;
|
||||
max-height: none;
|
||||
}
|
||||
#ais-messages {
|
||||
flex: 0 1 auto;
|
||||
height: calc(100vh - 24rem);
|
||||
min-height: 16rem;
|
||||
max-height: calc(100vh - 24rem);
|
||||
/* HF APRS had no container styling at all: no scroller, no frame, no height —
|
||||
its packets simply ran down the page. */
|
||||
#hf-aprs-packets {
|
||||
overflow-y: auto;
|
||||
border: 1px solid var(--border-light);
|
||||
border-radius: 6px;
|
||||
background: var(--input-bg);
|
||||
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
|
||||
}
|
||||
#vdes-messages {
|
||||
flex: 0 1 auto;
|
||||
height: calc(100vh - 24rem);
|
||||
min-height: 16rem;
|
||||
max-height: calc(100vh - 24rem);
|
||||
}
|
||||
.aprs-packet { font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; font-size: 0.82rem; padding: 0.45rem 0.55rem; border-bottom: 1px solid var(--border); line-height: 1.35; }
|
||||
/* One line per decode, opening in place — shared by the APRS and AIS lists. A frame used to be a card five lines
|
||||
tall — timestamp, meta, raw information field, three buttons, a Details
|
||||
panel repeating the row — so five of them filled the panel. */
|
||||
.aprs-packet { font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; font-size: 0.82rem; border-bottom: 1px solid var(--border); line-height: 1.35; }
|
||||
.aprs-packet:last-child { border-bottom: none; }
|
||||
.decode-line {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.5rem;
|
||||
padding: 0.28rem 0.55rem;
|
||||
cursor: pointer;
|
||||
list-style: none;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.decode-line::-webkit-details-marker { display: none; }
|
||||
.decode-line:hover {
|
||||
background: color-mix(in srgb, var(--btn-bg) 45%, transparent);
|
||||
}
|
||||
.aprs-packet[open] > .decode-line {
|
||||
background: color-mix(in srgb, var(--accent-green) 8%, transparent);
|
||||
}
|
||||
/* Fixed columns for what identifies a decode, so the summaries line up down
|
||||
the list and the eye can run along one of them instead of hunting. Names
|
||||
longer than the column ellipsise rather than pushing the rest along. */
|
||||
.decode-line .aprs-call,
|
||||
.decode-line .ais-call {
|
||||
flex: 0 0 auto;
|
||||
width: 8.5rem;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.decode-line .aprs-badge-type {
|
||||
flex: 0 0 auto;
|
||||
min-width: 5.5rem;
|
||||
}
|
||||
.decode-line .ais-badge-type {
|
||||
flex: 0 0 auto;
|
||||
min-width: 9rem;
|
||||
}
|
||||
/* The summary takes the leftover width and ellipsises: a frame is one line
|
||||
whatever its payload, so the column of times and callsigns stays readable. */
|
||||
.decode-line-summary {
|
||||
flex: 1 1 auto;
|
||||
min-width: 0;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
color: var(--text);
|
||||
}
|
||||
.decode-line-distance {
|
||||
flex: 0 0 auto;
|
||||
color: var(--text-muted);
|
||||
font-size: 0.75rem;
|
||||
}
|
||||
.decode-expanded {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.35rem;
|
||||
padding: 0.1rem 0.55rem 0.55rem 2.6rem;
|
||||
}
|
||||
.decode-expanded-meta {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 0.6rem;
|
||||
font-size: 0.75rem;
|
||||
color: var(--text-muted);
|
||||
}
|
||||
.decode-expanded-raw,
|
||||
.decode-expanded-bytes {
|
||||
word-break: break-all;
|
||||
font-size: 0.78rem;
|
||||
color: var(--text);
|
||||
}
|
||||
.decode-expanded-bytes {
|
||||
color: var(--text-muted);
|
||||
font-size: 0.72rem;
|
||||
}
|
||||
.aprs-packet-new {
|
||||
animation: aprs-row-flash 1.2s ease;
|
||||
}
|
||||
.aprs-packet-crc {
|
||||
opacity: 0.6;
|
||||
}
|
||||
.aprs-row-head,
|
||||
.aprs-row-meta,
|
||||
.aprs-row-detail,
|
||||
.aprs-row-actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.45rem;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
.aprs-row-head + .aprs-row-meta,
|
||||
.aprs-row-meta + .aprs-row-detail,
|
||||
.aprs-row-detail + .aprs-row-actions {
|
||||
margin-top: 0.2rem;
|
||||
}
|
||||
.aprs-row-detail {
|
||||
/* Counts sit with the filters rather than in three cards of their own: they
|
||||
are one short line of text, and they were taking a fifth of the panel. */
|
||||
.aprs-counts {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.6rem;
|
||||
margin-left: auto;
|
||||
font-size: 0.72rem;
|
||||
color: var(--text-muted);
|
||||
font-size: 0.78rem;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.aprs-row-actions {
|
||||
margin-top: 0.28rem;
|
||||
.aprs-filter-sep {
|
||||
width: 1px;
|
||||
align-self: stretch;
|
||||
min-height: 1.2rem;
|
||||
margin-inline: 0.15rem;
|
||||
background: color-mix(in srgb, var(--border-light) 65%, transparent);
|
||||
}
|
||||
.aprs-badge {
|
||||
display: inline-flex;
|
||||
@@ -2888,7 +3127,9 @@ body.map-fake-fullscreen-active {
|
||||
color: var(--text);
|
||||
word-break: break-word;
|
||||
}
|
||||
.ais-message { font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; font-size: 0.82rem; padding: 0.45rem 0.55rem; border-bottom: 1px solid var(--border); line-height: 1.35; }
|
||||
.ais-message { font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; font-size: 0.82rem; border-bottom: 1px solid var(--border); line-height: 1.35; }
|
||||
.ais-message > .decode-line:hover { background: color-mix(in srgb, var(--btn-bg) 45%, transparent); }
|
||||
.ais-message[open] > .decode-line { background: color-mix(in srgb, var(--accent-red) 8%, transparent); }
|
||||
.ais-message:last-child { border-bottom: none; }
|
||||
.vdes-message { font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; font-size: 0.82rem; padding: 0.45rem 0.55rem; border-bottom: 1px solid var(--border); line-height: 1.35; }
|
||||
.vdes-message:last-child { border-bottom: none; }
|
||||
@@ -2995,6 +3236,8 @@ body.map-fake-fullscreen-active {
|
||||
displays can swap in the @2x variants. */
|
||||
.aprs-symbol { display: inline-block; width: 24px; height: 24px; background-repeat: no-repeat; background-size: 384px 144px; vertical-align: middle; margin-right: 0.3rem; }
|
||||
.aprs-symbol-marker { margin-right: 0; }
|
||||
/* Holds the column open for a frame that carries no symbol. */
|
||||
.aprs-symbol-empty { background-image: none; }
|
||||
.aprs-symbol-primary { background-image: url('/vendor/aprs-symbols-24-0.png'); }
|
||||
.aprs-symbol-alternate { background-image: url('/vendor/aprs-symbols-24-1.png'); }
|
||||
.aprs-symbol-overlaid { background-image: url('/vendor/aprs-symbols-24-2.png'), url('/vendor/aprs-symbols-24-1.png'); }
|
||||
@@ -3249,6 +3492,23 @@ body.map-fake-fullscreen-active {
|
||||
border-color: color-mix(in srgb, var(--border-light) 68%, transparent);
|
||||
background: color-mix(in srgb, var(--input-bg) 96%, transparent);
|
||||
}
|
||||
/* "All" clears the selection rather than naming a band or a source, so it
|
||||
borrows the phase buttons' look instead of a colour of its own — and says
|
||||
in one chip's width what a line of helper text used to say in the bar. */
|
||||
.map-locator-chip-all {
|
||||
--chip-color: var(--border-light);
|
||||
color: var(--text-muted);
|
||||
}
|
||||
.map-locator-chip-all.is-active {
|
||||
border-color: var(--accent-green);
|
||||
background: color-mix(in srgb, var(--accent-green) 10%, var(--input-bg));
|
||||
color: var(--accent-green);
|
||||
}
|
||||
.map-locator-chip-all .map-locator-chip-text {
|
||||
font-weight: 700;
|
||||
letter-spacing: 0.03em;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
.map-locator-chip-text {
|
||||
font-size: 0.78rem;
|
||||
font-weight: 600;
|
||||
@@ -3319,7 +3579,7 @@ body.map-fake-fullscreen-active {
|
||||
.cw-tone-picker-head { display: flex; align-items: baseline; justify-content: space-between; gap: 0.6rem; margin-bottom: 0.35rem; color: var(--text-muted); font-size: 0.78rem; }
|
||||
#cw-tone-waterfall { width: 100%; height: 56px; display: block; border-radius: 6px; background: linear-gradient(180deg, rgba(8, 14, 18, 0.92), rgba(18, 28, 36, 0.98)); cursor: crosshair; }
|
||||
.cw-tone-picker.is-auto #cw-tone-waterfall { cursor: not-allowed; }
|
||||
#cw-output { max-height: 360px; overflow-y: auto; border: 1px solid var(--border-light); border-radius: 6px; background: var(--input-bg); font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; font-size: 0.85rem; padding: 0.4rem 0.5rem; min-height: 60px; white-space: pre-wrap; word-break: break-all; }
|
||||
#cw-output { flex: 1 1 0; max-height: none; overflow-y: auto; border: 1px solid var(--border-light); border-radius: 6px; background: var(--input-bg); font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; font-size: 0.85rem; padding: 0.4rem 0.5rem; min-height: 60px; white-space: pre-wrap; word-break: break-all; }
|
||||
.cw-line { line-height: 1.5; }
|
||||
.cw-signal-on { width: 10px; height: 10px; border-radius: 50%; background: var(--accent-green); box-shadow: 0 0 6px var(--accent-green); flex-shrink: 0; }
|
||||
.cw-signal-off { width: 10px; height: 10px; border-radius: 50%; background: var(--border-light); flex-shrink: 0; }
|
||||
@@ -3938,14 +4198,10 @@ body[data-operator-layout="broadcast"] #cw-bar-overlay {
|
||||
#subtab-aprs {
|
||||
min-height: calc(100vh - 14rem);
|
||||
}
|
||||
#aprs-packets {
|
||||
min-height: calc(100vh - 26rem);
|
||||
}
|
||||
#ais-messages {
|
||||
min-height: calc(100vh - 22rem);
|
||||
}
|
||||
#aprs-packets,
|
||||
#ais-messages,
|
||||
#vdes-messages {
|
||||
min-height: calc(100vh - 22rem);
|
||||
min-height: 60vh;
|
||||
}
|
||||
.aprs-details-grid {
|
||||
grid-template-columns: minmax(0, 1fr);
|
||||
@@ -3963,15 +4219,42 @@ body[data-operator-layout="broadcast"] #cw-bar-overlay {
|
||||
}
|
||||
.map-overlay-panel {
|
||||
top: 0.55rem;
|
||||
left: 0.55rem;
|
||||
width: calc(100% - 1.1rem);
|
||||
left: 3.25rem;
|
||||
right: 0.55rem;
|
||||
flex-flow: column nowrap;
|
||||
align-items: stretch;
|
||||
width: auto;
|
||||
max-height: min(16.5rem, calc(100% - 1.1rem));
|
||||
padding: 0.6rem 0.65rem;
|
||||
border-radius: 0.7rem;
|
||||
}
|
||||
.map-corner-controls {
|
||||
top: 0.55rem;
|
||||
right: 0.55rem;
|
||||
.map-overlay-panel .map-locator-filter-group {
|
||||
flex-wrap: wrap;
|
||||
align-items: flex-start;
|
||||
padding-right: 0;
|
||||
border-right: 0;
|
||||
}
|
||||
/* Stacked in a column the panel scrolls, and the search field is no use at
|
||||
the bottom of it: it goes back to the top, where it needs no scrolling. */
|
||||
.map-overlay-panel .map-filter-grow {
|
||||
order: -1;
|
||||
max-width: none;
|
||||
}
|
||||
.map-overlay-actions {
|
||||
justify-content: flex-end;
|
||||
}
|
||||
/* Stacked, the buttons sit under the filters rather than beside them, so the
|
||||
rule that divides them has to lie across the panel, not down its left. */
|
||||
.map-overlay-panel:not(.filters-hidden) .map-overlay-actions {
|
||||
padding-left: 0;
|
||||
padding-top: 0.5rem;
|
||||
border-left: 0;
|
||||
border-top: 1px solid color-mix(in srgb, var(--border-light) 55%, transparent);
|
||||
}
|
||||
.map-overlay-panel .map-paths-hint {
|
||||
display: block;
|
||||
font-size: 0.75rem;
|
||||
color: var(--text-muted);
|
||||
}
|
||||
.map-band-legend {
|
||||
left: 0.55rem;
|
||||
|
||||
@@ -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",
|
||||
"test:browser": "node tests/browser-smoke.mjs && node tests/spectrum-layout.mjs && node tests/decode-flow.mjs",
|
||||
"verify-generated": "npm run generate-types && npm run build && git diff --exit-code -- ../assets/web/generated src/api/generated.ts"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
@@ -712,6 +712,7 @@ const loadingSub = requiredElement("loading-sub");
|
||||
const decodeHistoryOverlayEl = document.getElementById("decode-history-overlay");
|
||||
const decodeHistoryOverlayTitleEl = document.getElementById("decode-history-overlay-title");
|
||||
const decodeHistoryOverlaySubEl = document.getElementById("decode-history-overlay-sub");
|
||||
const decodeHistoryProgressBarEl = document.getElementById("decode-history-progress-bar");
|
||||
const connLostOverlayEl = document.getElementById("conn-lost-overlay");
|
||||
const connLostOverlayTitleEl = document.getElementById("conn-lost-overlay-title");
|
||||
const connLostOverlaySubEl = document.getElementById("conn-lost-overlay-sub");
|
||||
@@ -880,10 +881,29 @@ function syncTopBarAccess() {
|
||||
}
|
||||
|
||||
let overviewDrawPending = false;
|
||||
function setDecodeHistoryOverlayVisible(visible: boolean, title = "", sub = "") {
|
||||
// Progress, in the corner. This used to dim the whole page behind a scrim,
|
||||
// which hid the waterfall and the decode panels for as long as the replay ran
|
||||
// — and a replay only happens when there is a backlog worth watching arrive.
|
||||
// `fraction` null leaves the bar indeterminate, for the part where the payload
|
||||
// is still on the wire and there is nothing to count yet.
|
||||
function setDecodeHistoryOverlayVisible(
|
||||
visible: boolean,
|
||||
title = "",
|
||||
sub = "",
|
||||
fraction: number | null = null,
|
||||
) {
|
||||
if (!decodeHistoryOverlayEl) return;
|
||||
if (title && decodeHistoryOverlayTitleEl) decodeHistoryOverlayTitleEl.textContent = title;
|
||||
if (decodeHistoryOverlaySubEl) decodeHistoryOverlaySubEl.textContent = sub || "";
|
||||
if (decodeHistoryProgressBarEl) {
|
||||
if (fraction == null) {
|
||||
decodeHistoryOverlayEl.dataset.phase = "fetching";
|
||||
decodeHistoryProgressBarEl.style.width = "";
|
||||
} else {
|
||||
delete decodeHistoryOverlayEl.dataset.phase;
|
||||
decodeHistoryProgressBarEl.style.width = `${Math.round(Math.max(0, Math.min(1, fraction)) * 100)}%`;
|
||||
}
|
||||
}
|
||||
decodeHistoryOverlayEl.classList.toggle("is-hidden", !visible);
|
||||
}
|
||||
|
||||
@@ -1404,7 +1424,11 @@ function updateRigSubtitle(activeRigId: string | null) {
|
||||
updateDocumentTitle(activeChannelRds());
|
||||
}
|
||||
|
||||
function applyRigList(activeRigId: string | null, rigIds: string[], displayNames: Record<string, string> = {}) {
|
||||
// `displayNames` omitted means "no news", not "no names". The state updates
|
||||
// carry only the rig ids — /rigs is what knows the names — and this defaulted
|
||||
// to an empty map, so the first state frame after load wiped the names and the
|
||||
// picker and header fell back to the lowercase ids for the rest of the session.
|
||||
function applyRigList(activeRigId: string | null, rigIds: string[], displayNames?: Record<string, string>) {
|
||||
if (!Array.isArray(rigIds)) return;
|
||||
const nextIds = rigIds.filter((id) => typeof id === "string" && id.length > 0);
|
||||
// Detect whether the rig list or active rig actually changed so we can
|
||||
@@ -5384,6 +5408,7 @@ function positionSquelchLine() {
|
||||
|
||||
function submitSdrSquelch() {
|
||||
if (!sdrSquelchSupported) return;
|
||||
sdrSquelchLocalAt = Date.now();
|
||||
saveSetting("sdrSquelchEnabled", sdrSquelchEnabled);
|
||||
saveSetting("sdrSquelchThresholdDb", sdrSquelchThresholdDb);
|
||||
postPath(
|
||||
@@ -5407,6 +5432,9 @@ function setSdrSquelch(thresholdDb: number, enabled: boolean, options: { submit?
|
||||
// the old "noise floor + 6 dB" left the gate 16-22 dB below the noise on a
|
||||
// narrow span and it simply never closed. Reading the same number the DSP
|
||||
// compares needs no conversion at all.
|
||||
// How long a local squelch change outranks the server's echo of the old one.
|
||||
const SDR_SQUELCH_HOLD_MS = 2_000;
|
||||
let sdrSquelchLocalAt = 0;
|
||||
const SQUELCH_NOISE_WINDOW_MS = 10_000;
|
||||
const SQUELCH_NOISE_MARGIN_DB = 5;
|
||||
const SQUELCH_MEASURE_MS = 1_500;
|
||||
@@ -5452,6 +5480,10 @@ function syncSdrSquelchFromServer(enabled: boolean, thresholdDb: number | null)
|
||||
// level would fight the echo of the value the server last confirmed.
|
||||
if (squelchDragPointerId !== null) return;
|
||||
if (sdrSquelchDbEl && document.activeElement === sdrSquelchDbEl) return;
|
||||
// Nor just after letting go: state frames are in flight continuously, and
|
||||
// one sent before the new threshold was applied would snap the line back to
|
||||
// where it was dragged from.
|
||||
if (Date.now() - sdrSquelchLocalAt < SDR_SQUELCH_HOLD_MS) return;
|
||||
sdrSquelchEnabled = enabled;
|
||||
if (isFiniteNumber(thresholdDb)) sdrSquelchThresholdDb = clampSdrSquelchDb(thresholdDb);
|
||||
saveSetting("sdrSquelchEnabled", sdrSquelchEnabled);
|
||||
@@ -6494,36 +6526,44 @@ function connectDecode() {
|
||||
let historySettled = false;
|
||||
let historyWorkerDone = false;
|
||||
let historyFallbackStarted = false;
|
||||
let historyRetried = false;
|
||||
let historyBatchDrainScheduled = false;
|
||||
let historyTotal = 0;
|
||||
let historyProcessed = 0;
|
||||
const historyGroupQueue: DecodeHistoryGroup[] = [];
|
||||
const liveBuffer: DecodeMessage[] = [];
|
||||
function flushLiveBuffer() {
|
||||
// Live decodes wait behind the history so the panels stay in order. Letting
|
||||
// them through is not the same as being finished, and conflating the two is
|
||||
// what made a slow history disappear: the safety valve released the buffer
|
||||
// and tore the worker down with it, so whatever had not arrived never did.
|
||||
function releaseLiveBuffer() {
|
||||
if (historySettled) return;
|
||||
historySettled = true;
|
||||
terminateDecodeHistoryWorker();
|
||||
setDecodeHistoryReplayActive(false);
|
||||
setDecodeHistoryOverlayVisible(false);
|
||||
for (const msg of liveBuffer) {
|
||||
try { dispatchDecodeMessage(msg); } catch (_) {}
|
||||
}
|
||||
liveBuffer.length = 0;
|
||||
}
|
||||
|
||||
function finishHistoryReplay() {
|
||||
clearTimeout(historyTimeout);
|
||||
releaseLiveBuffer();
|
||||
terminateDecodeHistoryWorker();
|
||||
setDecodeHistoryReplayActive(false);
|
||||
setDecodeHistoryOverlayVisible(false);
|
||||
}
|
||||
|
||||
function updateHistoryReplayOverlay() {
|
||||
setDecodeHistoryOverlayVisible(
|
||||
true,
|
||||
"Loading decode history…",
|
||||
`Replaying ${historyProcessed} / ${historyTotal} decoded messages`
|
||||
`Replaying ${historyProcessed} / ${historyTotal} decoded messages`,
|
||||
historyTotal > 0 ? historyProcessed / historyTotal : null,
|
||||
);
|
||||
}
|
||||
|
||||
function maybeFinishHistoryReplay() {
|
||||
if (historySettled) return;
|
||||
if (historyWorkerDone && historyGroupQueue.length === 0) {
|
||||
clearTimeout(historyTimeout);
|
||||
flushLiveBuffer();
|
||||
}
|
||||
if (historyWorkerDone && historyGroupQueue.length === 0) finishHistoryReplay();
|
||||
}
|
||||
|
||||
function pumpDecodeHistoryGroupQueue() {
|
||||
@@ -6585,17 +6625,26 @@ function connectDecode() {
|
||||
if (historyFallbackStarted || historySettled) return;
|
||||
historyFallbackStarted = true;
|
||||
loadDecodeHistoryOnMainThread((groups) => {
|
||||
clearTimeout(historyTimeout);
|
||||
const total = totalDecodeHistoryMessages(groups);
|
||||
if (total > 0) {
|
||||
enqueueDecodeHistoryGroups(groups);
|
||||
} else {
|
||||
flushLiveBuffer();
|
||||
finishHistoryReplay();
|
||||
}
|
||||
}, (err: unknown) => {
|
||||
console.error("Decode history fallback failed", err);
|
||||
clearTimeout(historyTimeout);
|
||||
flushLiveBuffer();
|
||||
// One retry, then say so. Failing silently here is why the history
|
||||
// sometimes only turned up on a second reload: nothing asked again and
|
||||
// nothing said anything was missing.
|
||||
if (historyRetried) {
|
||||
showHint("Decode history unavailable", 3000);
|
||||
finishHistoryReplay();
|
||||
return;
|
||||
}
|
||||
historyRetried = true;
|
||||
historyFallbackStarted = false;
|
||||
setDecodeHistoryOverlayVisible(true, "Loading decode history…", "Retrying");
|
||||
setTimeout(() => { startDecodeHistoryFallback(); }, 2000);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -6664,12 +6713,13 @@ function connectDecode() {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Safety valve: if the history fetch hangs, unblock after 20 s.
|
||||
// Safety valve: after 20 s, stop holding live decodes back — but keep
|
||||
// loading. The history is what the operator is waiting for, and dropping it
|
||||
// on the floor at the timeout is not something they can even see happen.
|
||||
const historyTimeout = setTimeout(() => {
|
||||
if (!historySettled) {
|
||||
terminateDecodeHistoryWorker();
|
||||
flushLiveBuffer();
|
||||
}
|
||||
if (historySettled) return;
|
||||
releaseLiveBuffer();
|
||||
setDecodeHistoryOverlayVisible(true, "Loading decode history…", "Still loading — live decodes are showing");
|
||||
}, 20000);
|
||||
setDecodeHistoryOverlayVisible(true, "Loading decode history…", "Fetching recent decodes from the client buffer");
|
||||
|
||||
@@ -6692,7 +6742,7 @@ function connectDecode() {
|
||||
const wasClosed = source.readyState === 2;
|
||||
source.close();
|
||||
terminateDecodeHistoryWorker();
|
||||
if (!historySettled) flushLiveBuffer();
|
||||
if (!historySettled) releaseLiveBuffer();
|
||||
if (wasClosed) {
|
||||
updateDecodeStatus("Decode not available (check client audio config)");
|
||||
setTimeout(connectDecode, 10000);
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
import type * as Leaflet from "leaflet";
|
||||
import { aprsSymbolSprite } from "./plugins/aprs-shared";
|
||||
import type { PluginRuntimeWindow } from "./plugins/runtime-contract";
|
||||
|
||||
export {};
|
||||
|
||||
@@ -229,6 +230,8 @@ const mapWindow = window as unknown as MapWindow;
|
||||
const mapMarkers = new Set<TrxLayer>();
|
||||
const DEFAULT_MAP_SOURCE_FILTER: Record<MapFilterKey, boolean> = { ais: true, vdes: true, aprs: true, bookmark: false, ft8: true, ft4: true, ft2: true, wspr: true, sat: false };
|
||||
const mapFilter: Record<MapFilterKey, boolean> = { ...DEFAULT_MAP_SOURCE_FILTER };
|
||||
/** Chip key that clears a selection rather than naming a band or a source. */
|
||||
const MAP_FILTER_ALL_KEY = "__all";
|
||||
const mapLocatorFilter: { phase: "band" | "type"; bands: Set<string> } = { phase: "band", bands: new Set() };
|
||||
let mapSearchFilter = "";
|
||||
let mapRigFilter = ""; // "" = all rigs
|
||||
@@ -1078,38 +1081,42 @@ const mapWindow = window as unknown as MapWindow;
|
||||
container.innerHTML = `<span class="map-locator-empty">No ${kind === "band" ? "bands" : "sources"} available</span>`;
|
||||
return;
|
||||
}
|
||||
let helperText = "";
|
||||
const noun = kind === "band" ? "bands" : "sources";
|
||||
const sourceKeys = kind === "source" ? Object.keys(DEFAULT_MAP_SOURCE_FILTER) as MapFilterKey[] : [];
|
||||
const noneSelected = kind === "source" && sourceKeys.every((k) => !mapFilter[k]);
|
||||
if (kind === "source") {
|
||||
if (noneSelected) {
|
||||
helperText = "All sources visible \u2014 click to filter";
|
||||
}
|
||||
} else if (!(selectedSet instanceof Set) || selectedSet.size === 0) {
|
||||
helperText = `All ${kind === "band" ? "bands" : "sources"} visible by default`;
|
||||
}
|
||||
// Selecting nothing selects everything, for both kinds.
|
||||
const showingAll = kind === "source"
|
||||
? sourceKeys.every((k) => !mapFilter[k])
|
||||
: !(selectedSet instanceof Set) || selectedSet.size === 0;
|
||||
// An "All" chip carries what a sentence of helper text used to say, in a
|
||||
// width the bar can afford, and gives the selection somewhere to be undone.
|
||||
const allChip = document.createElement("button");
|
||||
allChip.type = "button";
|
||||
allChip.className = "map-locator-chip map-locator-chip-all";
|
||||
if (showingAll) allChip.classList.add("is-active");
|
||||
allChip.dataset.filterKind = kind;
|
||||
allChip.dataset.filterKey = MAP_FILTER_ALL_KEY;
|
||||
allChip.setAttribute("aria-pressed", showingAll ? "true" : "false");
|
||||
allChip.title = showingAll ? `All ${noun} shown` : `Show all ${noun}`;
|
||||
allChip.innerHTML = `<span class="map-locator-chip-text">All</span>`;
|
||||
container.appendChild(allChip);
|
||||
for (const item of items) {
|
||||
const btn = document.createElement("button");
|
||||
btn.type = "button";
|
||||
btn.className = "map-locator-chip";
|
||||
const isActive = kind === "source" ? !!mapFilter[item.key as MapFilterKey] : !!selectedSet?.has(item.key);
|
||||
if (kind === "source" && noneSelected) {
|
||||
// Nothing is filtered out yet, so no chip is dimmed as if it were.
|
||||
if (showingAll) {
|
||||
btn.classList.add("is-default");
|
||||
} else if (!isActive) {
|
||||
btn.classList.add("is-inactive");
|
||||
}
|
||||
btn.setAttribute("aria-pressed", !showingAll && isActive ? "true" : "false");
|
||||
btn.dataset.filterKind = kind;
|
||||
btn.dataset.filterKey = item.key;
|
||||
btn.style.setProperty("--chip-color", item.color);
|
||||
btn.innerHTML = `<span class="map-locator-chip-text">${escapeMapHtml(item.label)}</span>`;
|
||||
container.appendChild(btn);
|
||||
}
|
||||
if (helperText) {
|
||||
const hint = document.createElement("span");
|
||||
hint.className = "map-locator-empty";
|
||||
hint.textContent = helperText;
|
||||
container.appendChild(hint);
|
||||
}
|
||||
}
|
||||
|
||||
function renderMapLocatorPhaseRow(container: HTMLElement, phase: "band" | "type"): void {
|
||||
@@ -1233,11 +1240,12 @@ const mapWindow = window as unknown as MapWindow;
|
||||
if (!phaseEl || !choiceEl || !choiceLabelEl) return;
|
||||
|
||||
renderMapLocatorPhaseRow(phaseEl, mapLocatorFilter.phase);
|
||||
// The phase buttons next door already name the dimension; "Show" is the
|
||||
// rest of the sentence, and it keeps the bar's labels a uniform width.
|
||||
choiceLabelEl.textContent = "Show";
|
||||
if (mapLocatorFilter.phase === "band") {
|
||||
choiceLabelEl.textContent = "Visible Bands";
|
||||
renderMapLocatorChipRow(choiceEl, bandItems, mapLocatorFilter.bands, "band");
|
||||
} else {
|
||||
choiceLabelEl.textContent = "Visible Sources";
|
||||
renderMapLocatorChipRow(choiceEl, sourceItems, null, "source");
|
||||
}
|
||||
syncLocatorMarkerStyles();
|
||||
@@ -1636,7 +1644,10 @@ const mapWindow = window as unknown as MapWindow;
|
||||
function applyMapOverlayPanelVisibility() {
|
||||
const panel = document.querySelector("#map-stage .map-overlay-panel");
|
||||
if (!panel) return;
|
||||
panel.classList.toggle("is-hidden", !mapOverlayPanelVisible);
|
||||
// Only the filters collapse. The bar itself stays, because it carries the
|
||||
// button that brings them back.
|
||||
panel.classList.toggle("filters-hidden", !mapOverlayPanelVisible);
|
||||
panel.querySelector(".map-overlay-filters")?.classList.toggle("is-hidden", !mapOverlayPanelVisible);
|
||||
}
|
||||
|
||||
function updateMapOverlayToggleButton() {
|
||||
@@ -1859,7 +1870,14 @@ const mapWindow = window as unknown as MapWindow;
|
||||
const kind = String(chip.dataset.filterKind || "");
|
||||
const key = String(chip.dataset.filterKey || "");
|
||||
if (!key) return;
|
||||
if (kind === "source" && Object.prototype.hasOwnProperty.call(mapFilter, key)) {
|
||||
if (key === MAP_FILTER_ALL_KEY) {
|
||||
// Back to no selection at all, which is what shows everything.
|
||||
if (kind === "source") {
|
||||
for (const srcKey of Object.keys(DEFAULT_MAP_SOURCE_FILTER) as MapFilterKey[]) mapFilter[srcKey] = false;
|
||||
} else {
|
||||
mapLocatorFilter.bands.clear();
|
||||
}
|
||||
} else if (kind === "source" && Object.prototype.hasOwnProperty.call(mapFilter, key)) {
|
||||
// toggle the clicked source; when none are selected everything is shown
|
||||
const sourceKey = key as MapFilterKey;
|
||||
mapFilter[sourceKey] = !mapFilter[sourceKey];
|
||||
@@ -2580,18 +2598,26 @@ const mapWindow = window as unknown as MapWindow;
|
||||
syncDecodeContactPathVisibility();
|
||||
}
|
||||
|
||||
// The buttons light up when they are on, so the label need not repeat it —
|
||||
// an "On"/"Off" suffix on each cost the bar most of a row.
|
||||
function updateMapContactPathsToggle() {
|
||||
const btn = mapEl("map-contact-paths-toggle");
|
||||
if (!btn) return;
|
||||
btn.textContent = mapDecodeContactPathsEnabled ? "Contact Paths On" : "Contact Paths Off";
|
||||
btn.classList.toggle("is-active", mapDecodeContactPathsEnabled);
|
||||
btn.setAttribute("aria-pressed", mapDecodeContactPathsEnabled ? "true" : "false");
|
||||
btn.title = mapDecodeContactPathsEnabled
|
||||
? "Directed decode paths are drawn when the target locator is known"
|
||||
: "Directed decode paths are hidden";
|
||||
}
|
||||
|
||||
function updateMapP2pPathsToggle() {
|
||||
const btn = mapEl("map-p2p-paths-toggle");
|
||||
if (!btn) return;
|
||||
btn.textContent = mapP2pRadioPathsEnabled ? "TRX Paths On" : "TRX Paths Off";
|
||||
btn.classList.toggle("is-active", mapP2pRadioPathsEnabled);
|
||||
btn.setAttribute("aria-pressed", mapP2pRadioPathsEnabled ? "true" : "false");
|
||||
btn.title = mapP2pRadioPathsEnabled
|
||||
? "TRX paths are drawn from a station popup"
|
||||
: "TRX paths are hidden";
|
||||
}
|
||||
|
||||
function scheduleDecodeMapMaintenance() {
|
||||
@@ -3662,6 +3688,18 @@ const mapWindow = window as unknown as MapWindow;
|
||||
reverseGeocodeLocation,
|
||||
};
|
||||
|
||||
// Everything the decoders already hold goes onto the map now. This module is
|
||||
// lazy -- it arrives when the Map tab is first opened, long after startup
|
||||
// restored the decode history -- and until it does, aprsMapAddStation and
|
||||
// friends are undefined, so every restored position was dropped on the floor.
|
||||
// The map then showed only what arrived live after it loaded, which is why it
|
||||
// took a second reload (with the module cached, and so loaded early enough to
|
||||
// win the race against the history fetch) for the stations to appear.
|
||||
//
|
||||
// The add functions are keyed by callsign/MMSI/point, so replaying costs
|
||||
// nothing on a second call and cannot duplicate a marker.
|
||||
(window as unknown as PluginRuntimeWindow).trxPluginRuntime.syncMapAll();
|
||||
|
||||
// If the map tab is already visible (direct /map URL), init immediately.
|
||||
autoInitIfVisible();
|
||||
})();
|
||||
|
||||
@@ -5,7 +5,14 @@
|
||||
type PluginGroup = "digital-modes" | "map-data" | "map" | "statistics" | "bookmarks" | "recorder" | "settings";
|
||||
|
||||
const pluginGroups: Readonly<Record<PluginGroup, readonly string[]>> = {
|
||||
"digital-modes": ["/ft8.js", "/ft4.js", "/ft2.js", "/wspr.js", "/cw.js", "/background-decode.js", "/sat.js", "/wefax.js"],
|
||||
// AIS, VDES and the two APRS decoders have panels on this tab, so they load
|
||||
// with it. They used to come only with the map group, which left their
|
||||
// sub-tabs empty — decodes queueing in the runtime — until something opened
|
||||
// the Map tab. Their map calls are optional, so map-core stays lazy.
|
||||
"digital-modes": [
|
||||
"/ft8.js", "/ft4.js", "/ft2.js", "/wspr.js", "/cw.js", "/background-decode.js",
|
||||
"/sat.js", "/wefax.js", "/ais.js", "/vdes.js", "/aprs.js", "/hf-aprs.js",
|
||||
],
|
||||
"map-data": ["/map-core.js", "/ais.js", "/vdes.js", "/aprs.js", "/hf-aprs.js"],
|
||||
map: ["/map-core.js", "/ais.js", "/vdes.js", "/aprs.js", "/hf-aprs.js", "/sat.js", "/sat-scheduler.js"],
|
||||
statistics: ["/map-core.js"],
|
||||
|
||||
@@ -81,6 +81,7 @@ const runtime: TrxPluginRuntime = {
|
||||
plugin.prune();
|
||||
return true;
|
||||
},
|
||||
syncMapAll() { for (const plugin of decoders.values()) plugin.syncMap?.(); },
|
||||
clearQueued() { queued.clear(); },
|
||||
hasDecoder: (id) => decoders.has(id),
|
||||
};
|
||||
|
||||
@@ -27,6 +27,7 @@ interface AisMessage {
|
||||
}
|
||||
interface AisChannelInfo { label: string; badgeClass: string; freqText: string }
|
||||
interface AisBridge {
|
||||
navigateToAprsMap?: (lat: number, lon: number) => void;
|
||||
getDecodeHistoryRetentionMs?: () => number;
|
||||
trxScheduleUiFrameJob?: (key: string, job: () => void) => void;
|
||||
buildAisVesselUrl?: (mmsi: number | null | undefined) => string | null;
|
||||
@@ -212,8 +213,21 @@ function updateAisSummary() {
|
||||
}
|
||||
}
|
||||
|
||||
/** What the message says, in one line: where the vessel is and what it is
|
||||
* doing, or — for the static reports that carry no fix — where it is going. */
|
||||
function aisSummaryText(msg: AisMessage): string {
|
||||
const parts: string[] = [];
|
||||
if (msg.lat != null && msg.lon != null) parts.push(`${msg.lat.toFixed(4)}, ${msg.lon.toFixed(4)}`);
|
||||
const motion = aisMotionText(msg);
|
||||
if (motion) parts.push(motion);
|
||||
const route = aisRouteText(msg);
|
||||
if (route && parts.length < 2) parts.push(route);
|
||||
if (!parts.length) return route || "no position reported";
|
||||
return parts.join(" · ");
|
||||
}
|
||||
|
||||
function renderAisRow(msg: AisMessage): HTMLElement {
|
||||
const row = document.createElement("div");
|
||||
const row = document.createElement("details");
|
||||
row.className = "ais-message";
|
||||
const ts = msg._ts || new Date().toLocaleTimeString([], {
|
||||
hour: "2-digit",
|
||||
@@ -227,8 +241,9 @@ function renderAisRow(msg: AisMessage): HTMLElement {
|
||||
const route = aisRouteText(msg);
|
||||
const distance = aisDistanceText(msg);
|
||||
const pos = msg.lat != null && msg.lon != null
|
||||
? `<a class="ais-pos-link" href="javascript:void(0)" onclick="window.navigateToAprsMap(${msg.lat},${msg.lon})">${msg.lat.toFixed(4)}, ${msg.lon.toFixed(4)}</a>`
|
||||
? `<a class="ais-pos-link" href="javascript:void(0)" data-ais-map="${msg.lat},${msg.lon}">${msg.lat.toFixed(5)}, ${msg.lon.toFixed(5)}</a>`
|
||||
: "";
|
||||
const vesselUrl = aisWindow.buildAisVesselUrl?.(msg.mmsi) ?? null;
|
||||
row.dataset.filterText = [
|
||||
name,
|
||||
msg.mmsi,
|
||||
@@ -243,23 +258,43 @@ function renderAisRow(msg: AisMessage): HTMLElement {
|
||||
.join(" ")
|
||||
.toUpperCase();
|
||||
row.innerHTML =
|
||||
`<div class="ais-row-head">` +
|
||||
`<span class="ais-time">${ts}</span>` +
|
||||
`<summary class="decode-line">` +
|
||||
`<span class="ais-time">${escapeAisHtml(ts)}</span>` +
|
||||
`<span class="ais-call">${nameHtml}</span>` +
|
||||
`<span class="${channel.badgeClass}">${escapeAisHtml(channel.label)}</span>` +
|
||||
`<span class="ais-badge ais-badge-type">${escapeAisHtml(aisTypeLabel(msg.message_type))}</span>` +
|
||||
`</div>` +
|
||||
`<div class="ais-row-meta">` +
|
||||
`<span>MMSI ${escapeAisHtml(String(msg.mmsi))}</span>` +
|
||||
(route ? `<span class="ais-meta-text">${escapeAisHtml(route)}</span>` : "") +
|
||||
`<span class="ais-meta-text">${escapeAisHtml(channel.freqText)}</span>` +
|
||||
`</div>` +
|
||||
`<div class="ais-row-detail">` +
|
||||
(motion ? `<span>${escapeAisHtml(motion)}</span>` : `<span>No motion data</span>`) +
|
||||
(distance ? `<span>${escapeAisHtml(distance)}</span>` : "") +
|
||||
(pos ? `<span>${pos}</span>` : "") +
|
||||
`<span>${escapeAisHtml(aisAgeText(msg._tsMs))}</span>` +
|
||||
`<span class="decode-line-summary">${escapeAisHtml(aisSummaryText(msg))}</span>` +
|
||||
`<span class="${channel.badgeClass}">${escapeAisHtml(channel.label)}</span>` +
|
||||
(distance ? `<span class="decode-line-distance">${escapeAisHtml(distance)}</span>` : "") +
|
||||
`</summary>` +
|
||||
`<div class="decode-expanded">` +
|
||||
`<div class="decode-expanded-meta">` +
|
||||
`<span>MMSI ${escapeAisHtml(String(msg.mmsi))}</span>` +
|
||||
`<span>${escapeAisHtml(channel.freqText)}</span>` +
|
||||
(route ? `<span>${escapeAisHtml(route)}</span>` : "") +
|
||||
(motion ? `<span>${escapeAisHtml(motion)}</span>` : "") +
|
||||
`<span>${escapeAisHtml(aisAgeText(msg._tsMs))}</span>` +
|
||||
(pos ? `<span>${pos}</span>` : "") +
|
||||
`</div>` +
|
||||
`<div class="aprs-row-actions">` +
|
||||
(msg.lat != null && msg.lon != null
|
||||
? `<button class="aprs-inline-btn" type="button" data-ais-map="${msg.lat},${msg.lon}">Map</button>`
|
||||
: "") +
|
||||
(vesselUrl
|
||||
? `<a class="aprs-inline-btn" href="${escapeAisHtml(vesselUrl)}" target="_blank" rel="noopener">Vessel</a>`
|
||||
: "") +
|
||||
`</div>` +
|
||||
`</div>`;
|
||||
|
||||
row.querySelectorAll<HTMLElement>("[data-ais-map]").forEach((element) => {
|
||||
element.addEventListener("click", (event) => {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
const [lat, lon] = (element.dataset.aisMap ?? "").split(",").map(Number);
|
||||
if (lat == null || lon == null || !Number.isFinite(lat) || !Number.isFinite(lon)) return;
|
||||
aisWindow.navigateToAprsMap?.(lat, lon);
|
||||
});
|
||||
});
|
||||
|
||||
applyAisFilterToRow(row);
|
||||
return row;
|
||||
}
|
||||
@@ -354,9 +389,13 @@ function addAisMessage(msg: AisMessage): void {
|
||||
scheduleAisBarUpdate();
|
||||
scheduleAisHistoryRender();
|
||||
|
||||
if (msg.lat != null && msg.lon != null && aisWindow.aisMapAddVessel) {
|
||||
aisWindow.aisMapAddVessel(msg);
|
||||
}
|
||||
plotAisMessage(msg);
|
||||
}
|
||||
|
||||
/** Hands a positioned message to the map, if the map module is loaded yet. */
|
||||
function plotAisMessage(msg: AisMessage): void {
|
||||
if (msg.lat == null || msg.lon == null || !aisWindow.aisMapAddVessel) return;
|
||||
aisWindow.aisMapAddVessel(msg);
|
||||
}
|
||||
|
||||
function normalizeServerAisMessage(msg: AisMessage): AisMessage {
|
||||
@@ -379,9 +418,7 @@ function onServerAisBatch(messages: AisMessage[]): void {
|
||||
minute: "2-digit",
|
||||
second: "2-digit",
|
||||
});
|
||||
if (next.lat != null && next.lon != null && aisWindow.aisMapAddVessel) {
|
||||
aisWindow.aisMapAddVessel(next);
|
||||
}
|
||||
plotAisMessage(next);
|
||||
normalized.push(next);
|
||||
}
|
||||
normalized.reverse();
|
||||
@@ -427,4 +464,6 @@ updateAisSummary();
|
||||
restore: onServerAisBatch,
|
||||
reset: resetAisHistoryView,
|
||||
prune: pruneAisHistoryView,
|
||||
// Oldest first, so vessel tracks are rebuilt in the order they happened.
|
||||
syncMap: () => { for (const entry of [...aisMessageHistory].reverse()) plotAisMessage(entry); },
|
||||
});
|
||||
|
||||
@@ -30,6 +30,14 @@ export interface AprsPacket {
|
||||
symbol_code?: string | null;
|
||||
}
|
||||
|
||||
function escapeAprsHtml(value: string): string {
|
||||
return String(value ?? "")
|
||||
.replaceAll("&", "&")
|
||||
.replaceAll("<", "<")
|
||||
.replaceAll(">", ">")
|
||||
.replaceAll('"', """);
|
||||
}
|
||||
|
||||
export function aprsPacketCategory(packet: AprsPacket): AprsCategory {
|
||||
const type = (packet.type ?? "").toLowerCase();
|
||||
const info = (packet.info ?? "").toLowerCase();
|
||||
@@ -174,6 +182,13 @@ export function aprsSymbolSprite(
|
||||
};
|
||||
}
|
||||
|
||||
/** An empty slot of the symbol's size, so a frame without one still lines up
|
||||
* with the frames around it in the list. */
|
||||
export function renderAprsSymbolSlot(packet: AprsPacket, escapeHtml: (value: string) => string): string {
|
||||
return renderLocalAprsSymbol(packet, escapeHtml)
|
||||
|| '<span class="aprs-symbol aprs-symbol-empty" aria-hidden="true"></span>';
|
||||
}
|
||||
|
||||
export function renderLocalAprsSymbol(packet: AprsPacket, escapeHtml: (value: string) => string): string {
|
||||
if (!packet.symbolTable || !packet.symbolCode) return "";
|
||||
const sprite = aprsSymbolSprite(packet.symbolTable, packet.symbolCode);
|
||||
@@ -205,3 +220,174 @@ export function normalizeAprsPacket(packet: AprsPacket, receiver: unknown): Aprs
|
||||
symbolCode: packet.symbol_code ?? null,
|
||||
};
|
||||
}
|
||||
|
||||
// ── Payload summaries ──────────────────────────────────────────────────────
|
||||
// APRS packs its meaning into the information field with a set of one-character
|
||||
// type identifiers and fixed-width encodings (APRS 1.0.1, chapters 6-15). The
|
||||
// list showed that field as it arrives on the air, so reading a weather report
|
||||
// meant decoding "_10090556c220s004g005t077..." by eye. These produce a line
|
||||
// of plain text for the common types and leave the raw field to the expanded
|
||||
// view, which is still the authority when a summary cannot be made.
|
||||
|
||||
/** `t077` → 25.0 °C. APRS carries temperature in whole degrees Fahrenheit. */
|
||||
function fahrenheitToCelsius(fahrenheit: number): number {
|
||||
return Math.round(((fahrenheit - 32) * 5 / 9) * 10) / 10;
|
||||
}
|
||||
|
||||
/** Weather report fields: wind, gust, temperature, rain, humidity, pressure. */
|
||||
function summarizeAprsWeather(info: string): string | null {
|
||||
const parts: string[] = [];
|
||||
const temperature = /t(-?\d{2,3})/.exec(info);
|
||||
if (temperature) parts.push(`${fahrenheitToCelsius(Number(temperature[1]))} °C`);
|
||||
const wind = /(\d{3})\/(\d{3})/.exec(info) ?? /c(\d{3}).*?s(\d{3})/.exec(info);
|
||||
if (wind) {
|
||||
const gust = /g(\d{3})/.exec(info);
|
||||
const knots = Number(wind[2]);
|
||||
parts.push(`wind ${Number(wind[1])}° ${knots} kt${gust ? ` gust ${Number(gust[1])}` : ""}`);
|
||||
}
|
||||
const humidity = /h(\d{2})/.exec(info);
|
||||
if (humidity) {
|
||||
const value = Number(humidity[1]);
|
||||
parts.push(`${value === 0 ? 100 : value}% RH`);
|
||||
}
|
||||
const pressure = /b(\d{5})/.exec(info);
|
||||
if (pressure) parts.push(`${(Number(pressure[1]) / 10).toFixed(1)} hPa`);
|
||||
const rain = /r(\d{3})/.exec(info);
|
||||
if (rain && Number(rain[1]) > 0) parts.push(`rain ${(Number(rain[1]) / 100).toFixed(2)}"`);
|
||||
return parts.length ? parts.join(" · ") : null;
|
||||
}
|
||||
|
||||
/** `T#005,199,000,255,073,123,01101001` → sequence, five channels, eight bits. */
|
||||
function summarizeAprsTelemetry(info: string): string | null {
|
||||
const match = /^T#(\d+|MIC)((?:,-?[\d.]*)+)(?:,([01]{8}))?/.exec(info.trim());
|
||||
if (!match?.[2]) return null;
|
||||
const channels = match[2].split(",").filter((value) => value.length > 0);
|
||||
const bits = match[3] ? ` · bits ${match[3]}` : "";
|
||||
return `#${match[1]} · ${channels.join(" ")}${bits}`;
|
||||
}
|
||||
|
||||
/** `:DEST :text{01` → addressed message text. */
|
||||
function summarizeAprsMessage(info: string): string | null {
|
||||
const match = /^:([^:]{9}):(.*)$/.exec(info);
|
||||
if (!match?.[1] || match[2] == null) return null;
|
||||
const addressee = match[1].trim();
|
||||
const text = match[2].replace(/\{\d+\s*$/, "").trim();
|
||||
return `→ ${addressee}: ${text}`;
|
||||
}
|
||||
|
||||
/** Course/speed appended to a position, as `088/036`. */
|
||||
function summarizeAprsCourseSpeed(info: string): string | null {
|
||||
const match = /(\d{3})\/(\d{3})/.exec(info);
|
||||
if (!match) return null;
|
||||
const knots = Number(match[2]);
|
||||
if (knots === 0) return null;
|
||||
return `${Number(match[1])}° ${knots} kt`;
|
||||
}
|
||||
|
||||
/** Whatever a frame is worth saying in one line, or null to fall back to raw. */
|
||||
export function summarizeAprsPayload(packet: AprsPacket): string | null {
|
||||
const info = packet.info ?? "";
|
||||
if (!info) return null;
|
||||
const category = aprsPacketCategory(packet);
|
||||
if (category === "message") return summarizeAprsMessage(info);
|
||||
if (category === "weather") return summarizeAprsWeather(info);
|
||||
if (category === "telemetry") return summarizeAprsTelemetry(info);
|
||||
if (category === "position") {
|
||||
const parts: string[] = [];
|
||||
if (packet.lat != null && packet.lon != null) {
|
||||
parts.push(`${packet.lat.toFixed(4)}, ${packet.lon.toFixed(4)}`);
|
||||
}
|
||||
const courseSpeed = summarizeAprsCourseSpeed(info);
|
||||
if (courseSpeed) parts.push(courseSpeed);
|
||||
// Whatever the station wrote after the position report.
|
||||
const comment = info.replace(/^[!=@/][^>]*[>_]?/, "").replace(/\d{3}\/\d{3}/, "").trim();
|
||||
if (comment && comment.length <= 60) parts.push(comment);
|
||||
return parts.length ? parts.join(" · ") : null;
|
||||
}
|
||||
// Status and anything else: the text it carries, minus its type character.
|
||||
const text = info.replace(/^[>;<?]/, "").trim();
|
||||
return text.length ? text : null;
|
||||
}
|
||||
|
||||
// ── Frame row ──────────────────────────────────────────────────────────────
|
||||
// Shared by the APRS and HF APRS lists, which had a copy each of the same
|
||||
// forty lines of markup and drifted only by one badge.
|
||||
|
||||
export interface AprsRowOptions {
|
||||
/** Marks the newest frame so it can flash on arrival. */
|
||||
fresh?: boolean;
|
||||
/** Leading badge, e.g. the band a copy of this list is dedicated to. */
|
||||
badge?: string;
|
||||
/** Distance from the receiver, already formatted, or "" to leave it out. */
|
||||
distance?: string;
|
||||
/** Opens the map on a frame's position. */
|
||||
onMap?: (lat: number, lon: number) => void;
|
||||
/** Puts a frame's coordinates on the clipboard. */
|
||||
onCopy?: (text: string, button: HTMLElement) => void;
|
||||
}
|
||||
|
||||
export function renderAprsPacketRow(packet: AprsPacket, options: AprsRowOptions = {}): HTMLElement {
|
||||
const row = document.createElement("details");
|
||||
row.className = "aprs-packet";
|
||||
if (!packet.crcOk) row.classList.add("aprs-packet-crc");
|
||||
if (options.fresh) row.classList.add("aprs-packet-new");
|
||||
|
||||
const time = packet._ts
|
||||
|| new Date().toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", second: "2-digit" });
|
||||
const category = aprsPacketCategory(packet);
|
||||
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.querySelectorAll<HTMLElement>("[data-aprs-map]").forEach((element) => {
|
||||
element.addEventListener("click", (event) => {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
const [lat, lon] = (element.dataset.aprsMap ?? "").split(",").map(Number);
|
||||
if (Number.isFinite(lat) && Number.isFinite(lon)) options.onMap?.(lat as number, lon as number);
|
||||
});
|
||||
});
|
||||
const copyButton = row.querySelector<HTMLElement>("[data-aprs-copy]");
|
||||
if (copyButton) {
|
||||
copyButton.addEventListener("click", (event) => {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
options.onCopy?.(copyButton.dataset.aprsCopy ?? "", copyButton);
|
||||
});
|
||||
}
|
||||
return row;
|
||||
}
|
||||
|
||||
@@ -6,13 +6,10 @@ import { hostCore, hostState } from "./host.js";
|
||||
|
||||
import {
|
||||
aprsAgeText,
|
||||
aprsCategoryLabel,
|
||||
aprsHexBytes,
|
||||
aprsPacketCategory,
|
||||
collapseAprsDuplicates,
|
||||
normalizeAprsPacket,
|
||||
renderAprsInfo,
|
||||
renderLocalAprsSymbol,
|
||||
renderAprsPacketRow,
|
||||
type AprsPacket,
|
||||
type AprsTypeFilter,
|
||||
} from "./aprs-shared";
|
||||
@@ -141,93 +138,24 @@ function updateAprsChipState() {
|
||||
aprsCollapseDupBtn?.classList.toggle("active", aprsCollapseDup);
|
||||
}
|
||||
|
||||
function renderAprsRow(pkt: AprsPacket, isFresh: boolean): HTMLElement {
|
||||
const row = document.createElement("div");
|
||||
row.className = "aprs-packet";
|
||||
if (!pkt.crcOk) row.classList.add("aprs-packet-crc");
|
||||
if (isFresh) row.classList.add("aprs-packet-new");
|
||||
|
||||
const ts = pkt._ts || new Date().toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", second: "2-digit" });
|
||||
const age = aprsAgeText(pkt._tsMs);
|
||||
const category = aprsPacketCategory(pkt);
|
||||
const categoryLabel = aprsCategoryLabel(category);
|
||||
const categoryClass = `aprs-badge aprs-badge-type aprs-badge-type-${category}`;
|
||||
const pathBadge = pkt.path ? `<span class="aprs-badge">${escapeAprsHtml(pkt.path)}</span>` : "";
|
||||
const crcBadge = pkt.crcOk ? "" : '<span class="aprs-badge aprs-badge-crc">CRC Fail</span>';
|
||||
const symbolHtml = renderLocalAprsSymbol(pkt, escapeAprsHtml);
|
||||
const posLink = pkt.lat != null && pkt.lon != null
|
||||
? `<a class="aprs-pos" href="javascript:void(0)" data-aprs-map="${pkt.lat},${pkt.lon}">${pkt.lat.toFixed(4)}, ${pkt.lon.toFixed(4)}</a>`
|
||||
: "";
|
||||
const distance = aprsDistanceText(pkt);
|
||||
const qrzHref = `https://qrzcq.com/call/${encodeURIComponent(pkt.srcCall || "")}`;
|
||||
|
||||
row.innerHTML =
|
||||
`<div class="aprs-row-head">` +
|
||||
`<span class="aprs-time">${ts}</span>` +
|
||||
symbolHtml +
|
||||
`<span class="aprs-call">${escapeAprsHtml(pkt.srcCall ?? "")}</span>` +
|
||||
`<span>>${escapeAprsHtml(pkt.destCall || "")}</span>` +
|
||||
`<span class="${categoryClass}">${escapeAprsHtml(categoryLabel)}</span>` +
|
||||
pathBadge +
|
||||
crcBadge +
|
||||
`</div>` +
|
||||
`<div class="aprs-row-meta">` +
|
||||
`<span class="aprs-meta-text">${escapeAprsHtml(age)}</span>` +
|
||||
(distance ? `<span class="aprs-meta-text">${escapeAprsHtml(distance)}</span>` : "") +
|
||||
`<span class="aprs-meta-text">${escapeAprsHtml(pkt.type || "--")}</span>` +
|
||||
`</div>` +
|
||||
`<div class="aprs-row-detail">` +
|
||||
`<span title="${escapeAprsHtml(pkt.type || "")}">${renderAprsInfo(pkt)}</span>` +
|
||||
(posLink ? `<span>${posLink}</span>` : "") +
|
||||
`</div>` +
|
||||
`<div class="aprs-row-actions">` +
|
||||
(pkt.lat != null && pkt.lon != null ? `<button class="aprs-inline-btn" type="button" data-aprs-map="${pkt.lat},${pkt.lon}">Map</button>` : "") +
|
||||
(pkt.lat != null && pkt.lon != null ? `<button class="aprs-inline-btn" type="button" data-aprs-copy="${pkt.lat},${pkt.lon}">Copy Coords</button>` : "") +
|
||||
`<a class="aprs-inline-btn" href="${qrzHref}" target="_blank" rel="noopener">QRZ</a>` +
|
||||
`</div>` +
|
||||
`<details class="aprs-details">` +
|
||||
`<summary>Details</summary>` +
|
||||
`<div class="aprs-details-grid">` +
|
||||
`<span class="aprs-detail-label">Source</span><span class="aprs-detail-value">${escapeAprsHtml(pkt.srcCall || "--")}</span>` +
|
||||
`<span class="aprs-detail-label">Destination</span><span class="aprs-detail-value">${escapeAprsHtml(pkt.destCall || "--")}</span>` +
|
||||
`<span class="aprs-detail-label">Type</span><span class="aprs-detail-value">${escapeAprsHtml(pkt.type || "--")}</span>` +
|
||||
`<span class="aprs-detail-label">Path</span><span class="aprs-detail-value">${escapeAprsHtml(pkt.path || "--")}</span>` +
|
||||
`<span class="aprs-detail-label">Age</span><span class="aprs-detail-value">${escapeAprsHtml(age)}</span>` +
|
||||
`<span class="aprs-detail-label">CRC</span><span class="aprs-detail-value">${pkt.crcOk ? "OK" : "Failed"}</span>` +
|
||||
`<span class="aprs-detail-label">Position</span><span class="aprs-detail-value">${pkt.lat != null && pkt.lon != null ? `${pkt.lat.toFixed(5)}, ${pkt.lon.toFixed(5)}` : "--"}</span>` +
|
||||
`<span class="aprs-detail-label">Info</span><span class="aprs-detail-value">${escapeAprsHtml(pkt.info || "--")}</span>` +
|
||||
`<span class="aprs-detail-label">Info Bytes</span><span class="aprs-detail-value">${escapeAprsHtml(aprsHexBytes(pkt.info_bytes))}</span>` +
|
||||
`</div>` +
|
||||
`</details>`;
|
||||
|
||||
row.querySelectorAll<HTMLElement>("[data-aprs-map]").forEach((el) => {
|
||||
el.addEventListener("click", (evt) => {
|
||||
evt.preventDefault();
|
||||
const raw = el.dataset.aprsMap ?? "";
|
||||
const [lat, lon] = raw.split(",").map(Number);
|
||||
if (aprsWindow.navigateToAprsMap && typeof lat === "number" && typeof lon === "number" && Number.isFinite(lat) && Number.isFinite(lon)) {
|
||||
aprsWindow.navigateToAprsMap(lat, lon);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
const copyBtn = row.querySelector<HTMLElement>("[data-aprs-copy]");
|
||||
if (copyBtn) {
|
||||
copyBtn.addEventListener("click", () => { void (async () => {
|
||||
const raw = copyBtn.dataset.aprsCopy ?? "";
|
||||
try {
|
||||
const clipboard = Reflect.get(navigator, "clipboard") as Clipboard | undefined;
|
||||
if (clipboard) {
|
||||
await clipboard.writeText(raw);
|
||||
showAprsHint("Coordinates copied", 1200);
|
||||
}
|
||||
} catch {
|
||||
showAprsHint("Copy failed", 1500);
|
||||
}
|
||||
})(); });
|
||||
async function copyAprsCoords(text: string): Promise<void> {
|
||||
try {
|
||||
const clipboard = Reflect.get(navigator, "clipboard") as Clipboard | undefined;
|
||||
if (!clipboard) return;
|
||||
await clipboard.writeText(text);
|
||||
showAprsHint("Coordinates copied", 1200);
|
||||
} catch {
|
||||
showAprsHint("Copy failed", 1500);
|
||||
}
|
||||
}
|
||||
|
||||
return row;
|
||||
function renderAprsRow(pkt: AprsPacket, isFresh: boolean): HTMLElement {
|
||||
return renderAprsPacketRow(pkt, {
|
||||
fresh: isFresh,
|
||||
distance: aprsDistanceText(pkt),
|
||||
onMap: (lat, lon) => { aprsWindow.navigateToAprsMap?.(lat, lon); },
|
||||
onCopy: (text) => { void copyAprsCoords(text); },
|
||||
});
|
||||
}
|
||||
|
||||
function renderAprsHistory() {
|
||||
@@ -301,6 +229,12 @@ function pruneAprsHistoryView(): void {
|
||||
renderAprsHistory();
|
||||
}
|
||||
|
||||
/** Hands a positioned packet to the map, if the map module is loaded yet. */
|
||||
function plotAprsPacket(pkt: AprsPacket): void {
|
||||
if (pkt.lat == null || pkt.lon == null || !aprsWindow.aprsMapAddStation) return;
|
||||
aprsWindow.aprsMapAddStation(pkt.srcCall ?? "", pkt.lat, pkt.lon, pkt.info ?? "", pkt.symbolTable, pkt.symbolCode, pkt);
|
||||
}
|
||||
|
||||
function addAprsPacket(pkt: AprsPacket): void {
|
||||
const tsMs = Number.isFinite(pkt.ts_ms) ? Number(pkt.ts_ms) : Date.now();
|
||||
pkt._tsMs = tsMs;
|
||||
@@ -309,9 +243,7 @@ function addAprsPacket(pkt: AprsPacket): void {
|
||||
aprsPacketHistory.unshift(pkt);
|
||||
pruneAprsPacketHistory();
|
||||
|
||||
if (pkt.lat != null && pkt.lon != null && aprsWindow.aprsMapAddStation) {
|
||||
aprsWindow.aprsMapAddStation(pkt.srcCall ?? "", pkt.lat, pkt.lon, pkt.info ?? "", pkt.symbolTable, pkt.symbolCode, pkt);
|
||||
}
|
||||
plotAprsPacket(pkt);
|
||||
|
||||
if (pkt.crcOk) scheduleAprsBarUpdate();
|
||||
|
||||
@@ -332,9 +264,7 @@ function onServerAprsBatch(packets: AprsPacket[]): void {
|
||||
const tsMs = Number.isFinite(next.ts_ms) ? Number(next.ts_ms) : Date.now();
|
||||
next._tsMs = tsMs;
|
||||
next._ts = new Date(tsMs).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", second: "2-digit" });
|
||||
if (next.lat != null && next.lon != null && aprsWindow.aprsMapAddStation) {
|
||||
aprsWindow.aprsMapAddStation(next.srcCall ?? "", next.lat, next.lon, next.info ?? "", next.symbolTable, next.symbolCode, next);
|
||||
}
|
||||
plotAprsPacket(next);
|
||||
if (next.crcOk) hasCrcOk = true;
|
||||
normalized.push(next);
|
||||
}
|
||||
@@ -406,4 +336,6 @@ renderAprsHistory();
|
||||
restore: onServerAprsBatch,
|
||||
reset: resetAprsHistoryView,
|
||||
prune: pruneAprsHistoryView,
|
||||
// Oldest first, so station tracks are rebuilt in the order they happened.
|
||||
syncMap: () => { for (const entry of [...aprsPacketHistory].reverse()) plotAprsPacket(entry); },
|
||||
});
|
||||
|
||||
@@ -6,13 +6,10 @@ import { hostCore, hostState } from "./host.js";
|
||||
|
||||
import {
|
||||
aprsAgeText,
|
||||
aprsCategoryLabel,
|
||||
aprsHexBytes,
|
||||
aprsPacketCategory,
|
||||
collapseAprsDuplicates,
|
||||
normalizeAprsPacket,
|
||||
renderAprsInfo,
|
||||
renderLocalAprsSymbol,
|
||||
renderAprsPacketRow,
|
||||
type AprsPacket,
|
||||
type AprsTypeFilter,
|
||||
} from "./aprs-shared";
|
||||
@@ -27,7 +24,6 @@ interface HfAprsBridge {
|
||||
trxUi: { confirm(options: { title: string; message: string; confirmLabel: string }): Promise<boolean> };
|
||||
}
|
||||
const hfAprsWindow = window as unknown as HfAprsBridge;
|
||||
const escapeHfAprsHtml = (input: string): string => hostCore.escapeMapHtml(input);
|
||||
|
||||
// --- HF APRS Decoder Plugin (server-side decode, 300 baud) ---
|
||||
const hfAprsStatus = document.getElementById("hf-aprs-status");
|
||||
@@ -128,95 +124,27 @@ function updateHfAprsChipState() {
|
||||
hfAprsCollapseDupBtn?.classList.toggle("active", hfAprsCollapseDup);
|
||||
}
|
||||
|
||||
// HF traffic goes in the same row as VHF, marked with the band it came in on.
|
||||
// This was a second copy of the same forty lines of markup.
|
||||
function renderHfAprsRow(pkt: AprsPacket, isFresh: boolean): HTMLElement {
|
||||
const row = document.createElement("div");
|
||||
row.className = "aprs-packet";
|
||||
if (!pkt.crcOk) row.classList.add("aprs-packet-crc");
|
||||
if (isFresh) row.classList.add("aprs-packet-new");
|
||||
|
||||
const ts = pkt._ts || new Date().toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", second: "2-digit" });
|
||||
const age = aprsAgeText(pkt._tsMs);
|
||||
const category = aprsPacketCategory(pkt);
|
||||
const categoryLabel = aprsCategoryLabel(category);
|
||||
const categoryClass = `aprs-badge aprs-badge-type aprs-badge-type-${category}`;
|
||||
const pathBadge = pkt.path ? `<span class="aprs-badge">${escapeHfAprsHtml(pkt.path)}</span>` : "";
|
||||
const crcBadge = pkt.crcOk ? "" : '<span class="aprs-badge aprs-badge-crc">CRC Fail</span>';
|
||||
const hfBadge = '<span class="aprs-badge" style="background:var(--accent-alt,#f59e0b);color:#000">HF</span>';
|
||||
const symbolHtml = renderLocalAprsSymbol(pkt, escapeHfAprsHtml);
|
||||
const posLink = pkt.lat != null && pkt.lon != null
|
||||
? `<a class="aprs-pos" href="javascript:void(0)" data-aprs-map="${pkt.lat},${pkt.lon}">${pkt.lat.toFixed(4)}, ${pkt.lon.toFixed(4)}</a>`
|
||||
: "";
|
||||
const distance = hfAprsDistanceText(pkt);
|
||||
const qrzHref = `https://qrzcq.com/call/${encodeURIComponent(pkt.srcCall || "")}`;
|
||||
|
||||
row.innerHTML =
|
||||
`<div class="aprs-row-head">` +
|
||||
`<span class="aprs-time">${ts}</span>` +
|
||||
hfBadge +
|
||||
symbolHtml +
|
||||
`<span class="aprs-call">${escapeHfAprsHtml(pkt.srcCall ?? "")}</span>` +
|
||||
`<span>>${escapeHfAprsHtml(pkt.destCall || "")}</span>` +
|
||||
`<span class="${categoryClass}">${escapeHfAprsHtml(categoryLabel)}</span>` +
|
||||
pathBadge +
|
||||
crcBadge +
|
||||
`</div>` +
|
||||
`<div class="aprs-row-meta">` +
|
||||
`<span class="aprs-meta-text">${escapeHfAprsHtml(age)}</span>` +
|
||||
(distance ? `<span class="aprs-meta-text">${escapeHfAprsHtml(distance)}</span>` : "") +
|
||||
`<span class="aprs-meta-text">${escapeHfAprsHtml(pkt.type || "--")}</span>` +
|
||||
`</div>` +
|
||||
`<div class="aprs-row-detail">` +
|
||||
`<span title="${escapeHfAprsHtml(pkt.type || "")}">${renderAprsInfo(pkt)}</span>` +
|
||||
(posLink ? `<span>${posLink}</span>` : "") +
|
||||
`</div>` +
|
||||
`<div class="aprs-row-actions">` +
|
||||
(pkt.lat != null && pkt.lon != null ? `<button class="aprs-inline-btn" type="button" data-aprs-map="${pkt.lat},${pkt.lon}">Map</button>` : "") +
|
||||
(pkt.lat != null && pkt.lon != null ? `<button class="aprs-inline-btn" type="button" data-aprs-copy="${pkt.lat},${pkt.lon}">Copy Coords</button>` : "") +
|
||||
`<a class="aprs-inline-btn" href="${qrzHref}" target="_blank" rel="noopener">QRZ</a>` +
|
||||
`</div>` +
|
||||
`<details class="aprs-details">` +
|
||||
`<summary>Details</summary>` +
|
||||
`<div class="aprs-details-grid">` +
|
||||
`<span class="aprs-detail-label">Source</span><span class="aprs-detail-value">${escapeHfAprsHtml(pkt.srcCall || "--")}</span>` +
|
||||
`<span class="aprs-detail-label">Destination</span><span class="aprs-detail-value">${escapeHfAprsHtml(pkt.destCall || "--")}</span>` +
|
||||
`<span class="aprs-detail-label">Type</span><span class="aprs-detail-value">${escapeHfAprsHtml(pkt.type || "--")}</span>` +
|
||||
`<span class="aprs-detail-label">Path</span><span class="aprs-detail-value">${escapeHfAprsHtml(pkt.path || "--")}</span>` +
|
||||
`<span class="aprs-detail-label">Age</span><span class="aprs-detail-value">${escapeHfAprsHtml(age)}</span>` +
|
||||
`<span class="aprs-detail-label">CRC</span><span class="aprs-detail-value">${pkt.crcOk ? "OK" : "Failed"}</span>` +
|
||||
`<span class="aprs-detail-label">Position</span><span class="aprs-detail-value">${pkt.lat != null && pkt.lon != null ? `${pkt.lat.toFixed(5)}, ${pkt.lon.toFixed(5)}` : "--"}</span>` +
|
||||
`<span class="aprs-detail-label">Info</span><span class="aprs-detail-value">${escapeHfAprsHtml(pkt.info || "--")}</span>` +
|
||||
`<span class="aprs-detail-label">Info Bytes</span><span class="aprs-detail-value">${escapeHfAprsHtml(aprsHexBytes(pkt.info_bytes))}</span>` +
|
||||
`</div>` +
|
||||
`</details>`;
|
||||
|
||||
row.querySelectorAll<HTMLElement>("[data-aprs-map]").forEach((el) => {
|
||||
el.addEventListener("click", (evt) => {
|
||||
evt.preventDefault();
|
||||
const raw = el.dataset.aprsMap ?? "";
|
||||
const [lat, lon] = raw.split(",").map(Number);
|
||||
if (hfAprsWindow.navigateToAprsMap && typeof lat === "number" && typeof lon === "number" && Number.isFinite(lat) && Number.isFinite(lon)) {
|
||||
hfAprsWindow.navigateToAprsMap(lat, lon);
|
||||
}
|
||||
});
|
||||
return renderAprsPacketRow(pkt, {
|
||||
fresh: isFresh,
|
||||
badge: "HF",
|
||||
distance: hfAprsDistanceText(pkt),
|
||||
onMap: (lat: number, lon: number) => { hfAprsWindow.navigateToAprsMap?.(lat, lon); },
|
||||
onCopy: (text: string) => { void copyHfAprsCoords(text); },
|
||||
});
|
||||
}
|
||||
|
||||
const copyBtn = row.querySelector<HTMLElement>("[data-aprs-copy]");
|
||||
if (copyBtn) {
|
||||
copyBtn.addEventListener("click", () => { void (async () => {
|
||||
const raw = copyBtn.dataset.aprsCopy ?? "";
|
||||
try {
|
||||
const clipboard = Reflect.get(navigator, "clipboard") as Clipboard | undefined;
|
||||
if (clipboard) {
|
||||
await clipboard.writeText(raw);
|
||||
hostCore.showHint("Coordinates copied", 1200);
|
||||
}
|
||||
} catch {
|
||||
hostCore.showHint("Copy failed", 1500);
|
||||
}
|
||||
})(); });
|
||||
async function copyHfAprsCoords(text: string): Promise<void> {
|
||||
try {
|
||||
const clipboard = Reflect.get(navigator, "clipboard") as Clipboard | undefined;
|
||||
if (!clipboard) return;
|
||||
await clipboard.writeText(text);
|
||||
hostCore.showHint("Coordinates copied", 1200);
|
||||
} catch {
|
||||
hostCore.showHint("Copy failed", 1500);
|
||||
}
|
||||
|
||||
return row;
|
||||
}
|
||||
|
||||
function renderHfAprsHistory() {
|
||||
|
||||
@@ -9,6 +9,9 @@ export interface DecoderPlugin<TMessage = unknown> {
|
||||
restore?(messages: TMessage[]): void;
|
||||
reset?(): void;
|
||||
prune?(): void;
|
||||
/** Replay everything the plugin is holding onto the map. Called when the map
|
||||
* module attaches, which can happen long after the decodes arrived. */
|
||||
syncMap?(): void;
|
||||
}
|
||||
|
||||
export interface TrxPluginRuntime {
|
||||
@@ -19,6 +22,7 @@ export interface TrxPluginRuntime {
|
||||
reset(id: string): boolean;
|
||||
resetAll(): void;
|
||||
prune(id: string): boolean;
|
||||
syncMapAll(): void;
|
||||
clearQueued(): void;
|
||||
hasDecoder(id: string): boolean;
|
||||
}
|
||||
|
||||
@@ -320,9 +320,7 @@ function onServerVdesBatch(messages: VdesMessage[]): void {
|
||||
minute: "2-digit",
|
||||
second: "2-digit",
|
||||
});
|
||||
if (next.lat != null && next.lon != null && vdesWindow.vdesMapAddPoint) {
|
||||
vdesWindow.vdesMapAddPoint(next);
|
||||
}
|
||||
plotVdesMessage(next);
|
||||
normalized.push(next);
|
||||
}
|
||||
normalized.reverse();
|
||||
@@ -349,13 +347,17 @@ if (vdesFilterInput) {
|
||||
});
|
||||
}
|
||||
|
||||
/** Hands a positioned message to the map, if the map module is loaded yet. */
|
||||
function plotVdesMessage(msg: VdesMessage): void {
|
||||
if (msg.lat == null || msg.lon == null || !vdesWindow.vdesMapAddPoint) return;
|
||||
vdesWindow.vdesMapAddPoint(msg);
|
||||
}
|
||||
|
||||
function onServerVdes(msg: VdesMessage): void {
|
||||
if (vdesStatus) vdesStatus.textContent = "Receiving";
|
||||
const next = normalizeServerVdesMessage(msg);
|
||||
addVdesMessage(next);
|
||||
if (next.lat != null && next.lon != null && vdesWindow.vdesMapAddPoint) {
|
||||
vdesWindow.vdesMapAddPoint(next);
|
||||
}
|
||||
plotVdesMessage(next);
|
||||
}
|
||||
|
||||
function pruneVdesHistoryView(): void {
|
||||
@@ -372,4 +374,6 @@ updateVdesSummary();
|
||||
restore: onServerVdesBatch,
|
||||
reset: resetVdesHistoryView,
|
||||
prune: pruneVdesHistoryView,
|
||||
// Oldest first, so tracks are rebuilt in the order they happened.
|
||||
syncMap: () => { for (const entry of [...vdesMessageHistory].reverse()) plotVdesMessage(entry); },
|
||||
});
|
||||
|
||||
@@ -47,6 +47,29 @@ try {
|
||||
assert.ok(digital.panelBesideSidebar, "the decoder panel does not sit beside the sidebar");
|
||||
assert.deepEqual(digital.panelsShown, ["subtab-ft8"], `panels shown: ${JSON.stringify(digital.panelsShown)}`);
|
||||
assert.ok(digital.decoders >= 10, `only ${digital.decoders} decoders in the sidebar`);
|
||||
|
||||
// Each decoder's list fills its panel. FT8, FT4, FT2 and WSPR size against
|
||||
// the panel with flex, so a panel sized to its own content collapsed them to
|
||||
// their 120px minimum with the rest of the page left empty; the marine lists
|
||||
// were sized by a viewport formula that stopped matching when the panel
|
||||
// changed shape.
|
||||
for (const [subtab, list] of [["ft8", "ft8-messages"], ["wspr", "wspr-messages"],
|
||||
["ais", "ais-messages"], ["aprs", "aprs-packets"], ["hf-aprs", "hf-aprs-packets"]]) {
|
||||
await page.locator(`.sub-tab[data-subtab="${subtab}"]`).click();
|
||||
await page.waitForTimeout(150);
|
||||
const filled = await page.evaluate((id) => {
|
||||
const element = document.getElementById(id);
|
||||
const panel = element.closest(".sub-tab-panel");
|
||||
return {
|
||||
list: Math.round(element.getBoundingClientRect().height),
|
||||
panel: Math.round(panel.getBoundingClientRect().height),
|
||||
scrolls: getComputedStyle(element).overflowY,
|
||||
};
|
||||
}, list);
|
||||
assert.ok(filled.list > filled.panel * 0.6,
|
||||
`${subtab}: the list is ${filled.list}px in a ${filled.panel}px panel`);
|
||||
assert.equal(filled.scrolls, "auto", `${subtab}: the list does not scroll on its own`);
|
||||
}
|
||||
await page.locator('.tab[data-tab="main"]').click();
|
||||
await page.waitForTimeout(200);
|
||||
|
||||
@@ -147,6 +170,20 @@ try {
|
||||
assert.ok(["ok", "busy", "error"].includes(hint.state), `status pill state is ${hint.state}`);
|
||||
assert.equal(hint.state, "ok", `fixture reports "${hint.text}" but the pill is ${hint.state}`);
|
||||
|
||||
// Rig names, and they have to survive the state stream. The updates carry
|
||||
// only rig ids — /rigs is what knows the names — and applying one used to
|
||||
// clear the names, so the picker and the header fell back to the lowercase
|
||||
// ids a second after load and stayed there.
|
||||
await page.waitForTimeout(1500);
|
||||
const rigLabels = await page.evaluate(() => ({
|
||||
options: [...document.getElementById("header-rig-switch-select").options].map((o) => o.textContent),
|
||||
subtitle: document.getElementById("rig-subtitle").textContent,
|
||||
}));
|
||||
assert.deepEqual(rigLabels.options, ["Primary fixture", "Secondary fixture"],
|
||||
`the picker reads ${JSON.stringify(rigLabels.options)}`);
|
||||
assert.equal(rigLabels.subtitle, "Rig: Primary fixture",
|
||||
`the header reads "${rigLabels.subtitle}"`);
|
||||
|
||||
const rigPicker = page.locator("#header-rig-switch-select");
|
||||
await rigPicker.locator("option").nth(1).waitFor({ state: "attached" });
|
||||
await rigPicker.selectOption("rig-b");
|
||||
@@ -339,6 +376,18 @@ try {
|
||||
`text grew without a resize and the strip overlaps by ${unresized.overlap}px`);
|
||||
assert.equal(unresized.iconsOnly, true, "the strip kept its labels with no room for them");
|
||||
|
||||
// The frequency readouts are typed into, so the browser remembers what went
|
||||
// in and offers it back in a dropdown over the reading — Edge does this by
|
||||
// default. Nothing here wants to be autofilled from what was tuned last week.
|
||||
const autofill = await page.evaluate(() => ["freq", "center-freq"].map((id) => {
|
||||
const input = document.getElementById(id);
|
||||
return { id, autocomplete: input?.getAttribute("autocomplete") ?? null };
|
||||
}));
|
||||
for (const field of autofill) {
|
||||
assert.equal(field.autocomplete, "off",
|
||||
`#${field.id} offers autofill (autocomplete=${field.autocomplete})`);
|
||||
}
|
||||
|
||||
} finally {
|
||||
await browser.close();
|
||||
await fixture.close();
|
||||
|
||||
@@ -0,0 +1,334 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
// What happens to a decode after it arrives: the panel on its tab, the mini
|
||||
// view over the waterfall, the marker on the map, and the link between them.
|
||||
// Nothing exercised this before — the fixture served an empty decode stream —
|
||||
// which is how the map links came to be broken for every decoder at once.
|
||||
|
||||
import assert from "node:assert/strict";
|
||||
import { chromium } from "playwright-core";
|
||||
import { startBrowser, startWebFixture } from "./web-fixture.mjs";
|
||||
|
||||
/* global document, getComputedStyle, window, location, requestAnimationFrame, MutationObserver */
|
||||
|
||||
const VESSEL = {
|
||||
type: "ais", mmsi: 244660000, lat: 52.37, lon: 4.89, vessel_name: "NEDERLAND",
|
||||
callsign: "PBTX", sog_knots: 8.2, cog_deg: 91, channel: "A", message_type: 1, rig_id: "rig-a",
|
||||
};
|
||||
const BEACON = {
|
||||
type: "aprs", src_call: "SP2SJG-9", dest_call: "APRS", path: "WIDE1-1", info: "Test beacon",
|
||||
packet_type: "position", crc_ok: true, lat: 54.35, lon: 18.65,
|
||||
symbol_table: "/", symbol_code: ">", rig_id: "rig-a",
|
||||
};
|
||||
|
||||
// AIS is what the mini view for vessels is gated on; the rig has to be on it.
|
||||
const fixture = await startWebFixture({ spectrum: true, decodes: [VESSEL, BEACON], mode: "AIS" });
|
||||
const { browser, page, runtimeErrors } = await startBrowser(chromium);
|
||||
|
||||
try {
|
||||
await page.setViewportSize({ width: 1500, height: 950 });
|
||||
await page.goto(`${fixture.origin}/digital-modes`, { waitUntil: "domcontentloaded" });
|
||||
await page.locator("#tab-digital-modes").waitFor({ state: "visible" });
|
||||
await page.waitForTimeout(2000);
|
||||
|
||||
// The decoders with panels on this tab have to load with it. They used to
|
||||
// come only with the map group, so these panels stayed empty — decodes
|
||||
// queued in the plugin runtime — until something opened the Map tab.
|
||||
const panels = await page.evaluate(() => ({
|
||||
ais: document.getElementById("ais-messages")?.children.length ?? 0,
|
||||
aprs: document.getElementById("aprs-packets")?.children.length ?? 0,
|
||||
aisStatus: document.getElementById("ais-status")?.textContent ?? "",
|
||||
aprsStatus: document.getElementById("aprs-status")?.textContent ?? "",
|
||||
mapLoaded: !!window.trx.modules.map,
|
||||
}));
|
||||
assert.equal(panels.mapLoaded, false, "the map module was loaded, so this proves nothing");
|
||||
assert.ok(panels.ais > 0, `the AIS panel is empty (status: ${panels.aisStatus})`);
|
||||
assert.ok(panels.aprs > 0, `the APRS panel is empty (status: ${panels.aprsStatus})`);
|
||||
|
||||
// The mini view rides over the waterfall on the radio page.
|
||||
await page.locator('.tab[data-tab="main"]').click();
|
||||
await page.waitForTimeout(1500);
|
||||
const miniView = await page.evaluate(() => {
|
||||
const bar = document.getElementById("ais-bar-overlay");
|
||||
return {
|
||||
shown: getComputedStyle(bar).display !== "none",
|
||||
pins: bar.querySelectorAll(".aprs-bar-pin").length,
|
||||
names: bar.textContent.includes("NEDERLAND"),
|
||||
};
|
||||
});
|
||||
assert.equal(miniView.shown, true, "the AIS mini view did not appear");
|
||||
assert.ok(miniView.pins > 0, "the mini view has no pin to follow");
|
||||
assert.equal(miniView.names, true, "the mini view does not name the vessel");
|
||||
|
||||
// Following the pin: the map opens, on the vessel. This is the path that was
|
||||
// broken for every decoder — the module that owned the navigation had not
|
||||
// been loaded, so the pin did nothing at all.
|
||||
await page.locator("#ais-bar-overlay .aprs-bar-pin").first().click();
|
||||
await page.locator("#aprs-map .leaflet-pane").first().waitFor({ state: "attached" });
|
||||
await page.waitForTimeout(800);
|
||||
const followed = await page.evaluate(() => {
|
||||
const centre = window.trx.modules.map?.aprsMap?.getCenter?.();
|
||||
return {
|
||||
path: location.pathname,
|
||||
lat: centre ? Number(centre.lat.toFixed(2)) : null,
|
||||
lon: centre ? Number(centre.lng.toFixed(2)) : null,
|
||||
};
|
||||
});
|
||||
assert.equal(followed.path, "/map", `the pin left the page on ${followed.path}`);
|
||||
assert.equal(followed.lat, VESSEL.lat, `the map centred on ${followed.lat}, not the vessel`);
|
||||
assert.equal(followed.lon, VESSEL.lon, `the map centred on ${followed.lon}, not the vessel`);
|
||||
|
||||
// Both decoders put their own marker on it.
|
||||
await page.waitForTimeout(1200);
|
||||
const markers = await page.evaluate(() => {
|
||||
const map = window.trx.modules.map;
|
||||
const size = (collection) => (collection instanceof Map
|
||||
? collection.size
|
||||
: Object.keys(collection ?? {}).length);
|
||||
return { ais: size(map?.aisMarkers), stations: size(map?.stationMarkers) };
|
||||
});
|
||||
assert.ok(markers.ais > 0, "the vessel never reached the map");
|
||||
assert.ok(markers.stations > 0, "the APRS station never reached the map");
|
||||
|
||||
assert.deepEqual(runtimeErrors, []);
|
||||
} finally {
|
||||
await browser.close();
|
||||
await fixture.close();
|
||||
}
|
||||
|
||||
// Stored history, which is what is on screen a second after a page load. The
|
||||
// endpoint answers in CBOR, so the fixture speaks CBOR: serving anything else
|
||||
// left the client on its retry path and the history path untested.
|
||||
const HISTORY_AIS = 900;
|
||||
const HISTORY_APRS = 300;
|
||||
const historyFixture = await startWebFixture({
|
||||
spectrum: true,
|
||||
mode: "AIS",
|
||||
history: {
|
||||
ais: Array.from({ length: HISTORY_AIS }, (_, index) => ({
|
||||
mmsi: 244660000 + index, lat: 52.3 + index * 0.001, lon: 4.8,
|
||||
vessel_name: `HISTORIC ${index}`, channel: "A", message_type: 1,
|
||||
rig_id: "rig-a", ts_ms: Date.now() - (index + 1) * 1000,
|
||||
})),
|
||||
aprs: Array.from({ length: HISTORY_APRS }, (_, index) => ({
|
||||
src_call: `SP2SJG-${index % 15}`, dest_call: "APRS", path: "WIDE1-1",
|
||||
info: `history ${index}`, packet_type: "position", crc_ok: true,
|
||||
lat: 54.3 + (index % 15) * 0.01, lon: 18.6, rig_id: "rig-a",
|
||||
ts_ms: Date.now() - (index + 1) * 1000,
|
||||
})),
|
||||
},
|
||||
});
|
||||
const replay = await startBrowser(chromium);
|
||||
|
||||
// Installed before the page's own scripts, so nothing can be missed: every
|
||||
// time the progress element becomes visible, its geometry is recorded.
|
||||
await replay.page.addInitScript(() => {
|
||||
window.__historyProgressSamples = [];
|
||||
const watch = () => {
|
||||
const element = document.getElementById("decode-history-overlay");
|
||||
if (!element) { requestAnimationFrame(watch); return; }
|
||||
const sample = () => {
|
||||
if (element.classList.contains("is-hidden")) return;
|
||||
const rect = element.getBoundingClientRect();
|
||||
window.__historyProgressSamples.push({
|
||||
width: Math.round(rect.width),
|
||||
coversCentre: document.elementFromPoint(700, 450)?.id === "decode-history-overlay",
|
||||
});
|
||||
};
|
||||
new MutationObserver(sample).observe(element, { attributes: true, attributeFilter: ["class"] });
|
||||
sample();
|
||||
};
|
||||
watch();
|
||||
});
|
||||
|
||||
try {
|
||||
await replay.page.setViewportSize({ width: 1400, height: 900 });
|
||||
await replay.page.goto(`${historyFixture.origin}/digital-modes`, { waitUntil: "domcontentloaded" });
|
||||
await replay.page.locator("#tab-digital-modes").waitFor({ state: "visible" });
|
||||
|
||||
// While it loads, the operator can still see the radio. This used to be a
|
||||
// full-screen scrim over everything for as long as the replay ran.
|
||||
//
|
||||
// Watched from inside the page rather than polled from here: a fast replay
|
||||
// can start and finish between two polls, and then the test reports that no
|
||||
// progress was ever shown when what happened is that it blinked.
|
||||
const shown = await replay.page.evaluate(() => window.__historyProgressSamples ?? []);
|
||||
assert.ok(shown.length > 0, "no progress was shown while the history loaded");
|
||||
for (const sample of shown) {
|
||||
assert.ok(sample.width < 700, `the progress covers ${sample.width}px of a 1400px page`);
|
||||
assert.equal(sample.coversCentre, false, "the progress sits over the page");
|
||||
}
|
||||
|
||||
// And all of it arrives, on the first load.
|
||||
await replay.page.waitForTimeout(2000);
|
||||
const restored = await replay.page.evaluate(() => ({
|
||||
ais: document.getElementById("ais-messages")?.children.length ?? 0,
|
||||
aprs: document.getElementById("aprs-packets")?.children.length ?? 0,
|
||||
progressHidden: document.getElementById("decode-history-overlay").classList.contains("is-hidden"),
|
||||
}));
|
||||
assert.equal(restored.ais, HISTORY_AIS, `restored ${restored.ais} of ${HISTORY_AIS} AIS records`);
|
||||
assert.equal(restored.aprs, HISTORY_APRS, `restored ${restored.aprs} of ${HISTORY_APRS} APRS records`);
|
||||
assert.equal(restored.progressHidden, true, "the progress stayed up after the replay finished");
|
||||
|
||||
// Opening the map for the first time has to show the stored history too.
|
||||
// The map module is lazy, so at the moment the history was restored its
|
||||
// aprsMapAddStation/aisMapAddVessel hooks did not exist yet and every
|
||||
// position was dropped. Nothing replayed them when the module finally
|
||||
// arrived, so the map came up empty and only filled in from decodes heard
|
||||
// afterwards -- a station heard once was never plotted at all, and it took a
|
||||
// second reload (module cached, so loaded early enough to beat the history
|
||||
// fetch) before the map showed anything.
|
||||
//
|
||||
// This fixture serves no live decode stream on purpose: with one, fresh
|
||||
// frames arriving after the module loads would paper over the whole thing.
|
||||
const mapLoadedDuringReplay = await replay.page.evaluate(() => !!window.trx.modules.map);
|
||||
assert.equal(mapLoadedDuringReplay, false, "the map was already loaded, so this proves nothing");
|
||||
|
||||
await replay.page.locator('.tab[data-tab="map"]').click();
|
||||
await replay.page.locator("#aprs-map .leaflet-pane").first().waitFor({ state: "attached" });
|
||||
await replay.page.waitForTimeout(1500);
|
||||
const plotted = await replay.page.evaluate(() => {
|
||||
const map = window.trx.modules.map;
|
||||
const size = (collection) => (collection instanceof Map
|
||||
? collection.size
|
||||
: Object.keys(collection ?? {}).length);
|
||||
return { ais: size(map?.aisMarkers), stations: size(map?.stationMarkers) };
|
||||
});
|
||||
assert.equal(plotted.ais, HISTORY_AIS, `${plotted.ais} of ${HISTORY_AIS} vessels reached the map`);
|
||||
assert.equal(plotted.stations, 15, `${plotted.stations} of 15 stations reached the map`);
|
||||
|
||||
assert.deepEqual(replay.runtimeErrors, []);
|
||||
} finally {
|
||||
await replay.browser.close();
|
||||
await historyFixture.close();
|
||||
}
|
||||
|
||||
// The APRS list: one line per frame, with the information field read for the
|
||||
// operator rather than shown as it arrives on the air.
|
||||
const APRS_FRAMES = [
|
||||
{ packet_type: "weather", info: "_10090556c220s004g005t077r000p000P000h50b09900" },
|
||||
{ packet_type: "message", info: ":SP2SJG-9 :Hello from the field{01" },
|
||||
{ packet_type: "telemetry", info: "T#005,199,000,255,073,123,01101001" },
|
||||
{ packet_type: "position", info: "!5421.30N/01839.20E>Test beacon 73", lat: 54.35, lon: 18.65 },
|
||||
].map((frame, index) => ({
|
||||
src_call: `SP2SJG-${index}`, dest_call: "APRS", path: "WIDE1-1", crc_ok: true,
|
||||
// Only position reports carry a symbol here, which is the case the columns
|
||||
// have to survive: a frame without one used to close the gap and shift
|
||||
// everything after it left.
|
||||
...(frame.packet_type === "position" ? { symbol_table: "/", symbol_code: ">" } : {}),
|
||||
rig_id: "rig-a", ts_ms: Date.now() - index * 1000,
|
||||
...frame,
|
||||
}));
|
||||
|
||||
// The AIS list is the same shape: a line per message, saying where the vessel
|
||||
// is and what it is doing, with the identifiers behind it.
|
||||
const AIS_MESSAGES = [
|
||||
{ message_type: 1, mmsi: 244660001, vessel_name: "NEDERLAND", channel: "A",
|
||||
lat: 54.35, lon: 18.65, sog_knots: 8.2, cog_deg: 91.4 },
|
||||
{ message_type: 5, mmsi: 244660002, vessel_name: "STENA SPIRIT", channel: "B",
|
||||
callsign: "PBTX", destination: "GDANSK" },
|
||||
].map((message, index) => ({ rig_id: "rig-a", ts_ms: Date.now() - index * 1000, ...message }));
|
||||
|
||||
const aprsFixture = await startWebFixture({
|
||||
spectrum: true,
|
||||
mode: "AIS",
|
||||
history: { aprs: APRS_FRAMES, ais: AIS_MESSAGES },
|
||||
});
|
||||
const aprs = await startBrowser(chromium);
|
||||
|
||||
try {
|
||||
await aprs.page.setViewportSize({ width: 1400, height: 900 });
|
||||
await aprs.page.goto(`${aprsFixture.origin}/digital-modes`, { waitUntil: "domcontentloaded" });
|
||||
await aprs.page.locator("#tab-digital-modes").waitFor({ state: "visible" });
|
||||
await aprs.page.waitForTimeout(2000);
|
||||
await aprs.page.locator('.sub-tab[data-subtab="aprs"]').click();
|
||||
await aprs.page.waitForTimeout(400);
|
||||
|
||||
const rows = await aprs.page.evaluate(() =>
|
||||
[...document.querySelectorAll("#aprs-packets .aprs-packet")].map((row) => ({
|
||||
tag: row.tagName,
|
||||
height: Math.round(row.getBoundingClientRect().height),
|
||||
type: row.querySelector(".aprs-badge-type")?.textContent?.trim() ?? "",
|
||||
summary: row.querySelector(".decode-line-summary")?.textContent?.trim() ?? "",
|
||||
})));
|
||||
// Newest first, so find each by the type it carries rather than by position.
|
||||
const summaryOf = (type) => rows.find((row) => row.type === type)?.summary ?? "";
|
||||
assert.equal(rows.length, APRS_FRAMES.length, `rendered ${rows.length} frames`);
|
||||
for (const row of rows) {
|
||||
assert.equal(row.tag, "DETAILS", "a frame is not expandable in place");
|
||||
assert.ok(row.height < 44, `a frame is ${row.height}px tall; it used to be a card of about 140`);
|
||||
}
|
||||
// Each payload read rather than echoed: 25 °C from t077, the addressee from
|
||||
// a message, the sequence from telemetry, the fix from a position report.
|
||||
assert.match(summaryOf("Weather"), /25 °C/, `weather summary: ${summaryOf("Weather")}`);
|
||||
assert.match(summaryOf("Weather"), /990\.0 hPa/, `weather summary: ${summaryOf("Weather")}`);
|
||||
assert.match(summaryOf("Message"), /→ SP2SJG-9: Hello from the field/, `message summary: ${summaryOf("Message")}`);
|
||||
assert.match(summaryOf("Telemetry"), /^#005/, `telemetry summary: ${summaryOf("Telemetry")}`);
|
||||
assert.match(summaryOf("Position"), /54\.3500, 18\.6500/, `position summary: ${summaryOf("Position")}`);
|
||||
|
||||
// Frames with and without a symbol line up: the slot is held open either way.
|
||||
const columns = await aprs.page.evaluate(() =>
|
||||
[...document.querySelectorAll("#aprs-packets .aprs-packet")].map((row) => ({
|
||||
call: Math.round(row.querySelector(".aprs-call").getBoundingClientRect().x),
|
||||
summary: Math.round(row.querySelector(".decode-line-summary").getBoundingClientRect().x),
|
||||
symbol: !!row.querySelector(".aprs-symbol:not(.aprs-symbol-empty)"),
|
||||
})));
|
||||
assert.ok(columns.some((column) => column.symbol) && columns.some((column) => !column.symbol),
|
||||
"the sample has to mix frames with and without a symbol to test this");
|
||||
assert.equal(new Set(columns.map((column) => column.call)).size, 1,
|
||||
`callsigns start at ${JSON.stringify(columns.map((column) => column.call))}`);
|
||||
assert.equal(new Set(columns.map((column) => column.summary)).size, 1,
|
||||
`summaries start at ${JSON.stringify(columns.map((column) => column.summary))}`);
|
||||
|
||||
// The frame as it arrived is still there, one click away.
|
||||
await aprs.page.locator("#aprs-packets .aprs-packet", { hasText: "25 °C" })
|
||||
.locator(".decode-line").first().click();
|
||||
await aprs.page.waitForTimeout(200);
|
||||
const expanded = await aprs.page.evaluate(() => {
|
||||
const row = document.querySelector("#aprs-packets .aprs-packet[open]");
|
||||
return {
|
||||
open: row.hasAttribute("open"),
|
||||
raw: row.querySelector(".decode-expanded-raw")?.textContent?.trim() ?? "",
|
||||
meta: row.querySelector(".decode-expanded-meta")?.textContent ?? "",
|
||||
};
|
||||
});
|
||||
assert.equal(expanded.open, true, "the frame did not open");
|
||||
assert.match(expanded.raw, /^_10090556c220s004g005t077/, `raw frame: ${expanded.raw}`);
|
||||
assert.match(expanded.meta, /WIDE1-1/, `expanded meta: ${expanded.meta}`);
|
||||
|
||||
// AIS, on the same row.
|
||||
await aprs.page.locator('.sub-tab[data-subtab="ais"]').click();
|
||||
await aprs.page.waitForTimeout(300);
|
||||
const aisRows = await aprs.page.evaluate(() =>
|
||||
[...document.querySelectorAll("#ais-messages .ais-message")].map((row) => ({
|
||||
tag: row.tagName,
|
||||
height: Math.round(row.getBoundingClientRect().height),
|
||||
name: row.querySelector(".ais-call")?.textContent?.trim() ?? "",
|
||||
summary: row.querySelector(".decode-line-summary")?.textContent?.trim() ?? "",
|
||||
})));
|
||||
assert.equal(aisRows.length, AIS_MESSAGES.length, `rendered ${aisRows.length} messages`);
|
||||
for (const row of aisRows) {
|
||||
assert.equal(row.tag, "DETAILS", "an AIS message is not expandable in place");
|
||||
assert.ok(row.height < 44, `an AIS message is ${row.height}px tall`);
|
||||
}
|
||||
const positionRow = aisRows.find((row) => row.name === "NEDERLAND");
|
||||
const staticRow = aisRows.find((row) => row.name === "STENA SPIRIT");
|
||||
assert.match(positionRow?.summary ?? "", /54\.3500, 18\.6500/, `position: ${positionRow?.summary}`);
|
||||
assert.match(positionRow?.summary ?? "", /8\.2 kn/, `position: ${positionRow?.summary}`);
|
||||
// A static report carries no fix, so it says where the vessel is going.
|
||||
assert.match(staticRow?.summary ?? "", /PBTX -> GDANSK/, `static: ${staticRow?.summary}`);
|
||||
|
||||
await aprs.page.locator("#ais-messages .ais-message .decode-line").first().click();
|
||||
await aprs.page.waitForTimeout(200);
|
||||
const aisExpanded = await aprs.page.evaluate(() =>
|
||||
document.querySelector("#ais-messages .ais-message[open] .decode-expanded-meta")?.textContent ?? "");
|
||||
assert.match(aisExpanded, /MMSI 2446600/, `expanded AIS: ${aisExpanded}`);
|
||||
assert.match(aisExpanded, /MHz/, `expanded AIS: ${aisExpanded}`);
|
||||
|
||||
assert.deepEqual(aprs.runtimeErrors, []);
|
||||
} finally {
|
||||
await aprs.browser.close();
|
||||
await aprsFixture.close();
|
||||
}
|
||||
@@ -12,7 +12,7 @@ import assert from "node:assert/strict";
|
||||
import { chromium } from "playwright-core";
|
||||
import { startBrowser, startWebFixture } from "./web-fixture.mjs";
|
||||
|
||||
/* global document, getComputedStyle */
|
||||
/* global document, getComputedStyle, window */
|
||||
|
||||
const BOOKMARKS = [
|
||||
{ id: "b1", name: "40m FT8", freq_hz: 7074000, mode: "DIG", category: "Digital", comment: "", locator: "" },
|
||||
@@ -222,3 +222,159 @@ try {
|
||||
await retry.browser.close();
|
||||
await retryFixture.close();
|
||||
}
|
||||
|
||||
// The map's filter panel is a bar across the top of the map, not a window
|
||||
// sitting on it: it has to stay one or two rows tall, span most of the width,
|
||||
// and keep clear of what shares the map's corners — Leaflet's zoom buttons and
|
||||
// the band legend. A panel that grew a column would cover the map it filters.
|
||||
// Fullscreen and the filter toggle ride at the bar's right-hand end, so only
|
||||
// the filters collapse: the bar itself has to survive Hide Filters, or there
|
||||
// is nothing left to click to bring them back.
|
||||
const mapFixture = await startWebFixture({ spectrum: true });
|
||||
const mapView = await startBrowser(chromium);
|
||||
try {
|
||||
for (const width of [1600, 1200]) {
|
||||
await mapView.page.setViewportSize({ width, height: 950 });
|
||||
await mapView.page.goto(`${mapFixture.origin}/map`, { waitUntil: "domcontentloaded" });
|
||||
await mapView.page.locator("#aprs-map .leaflet-pane").first().waitFor({ state: "attached" });
|
||||
await mapView.page.waitForTimeout(1200);
|
||||
|
||||
const bar = await mapView.page.evaluate(() => {
|
||||
const box = (element) => (element ? element.getBoundingClientRect() : null);
|
||||
const panel = document.querySelector(".map-overlay-panel");
|
||||
const stage = box(document.getElementById("map-stage"));
|
||||
const zoom = box(document.querySelector("#aprs-map .leaflet-control-zoom"));
|
||||
const legend = box(document.getElementById("map-band-legend"));
|
||||
const panelBox = box(panel);
|
||||
const hits = (a, b) => !!a && !!b
|
||||
&& a.left < b.right && b.left < a.right && a.top < b.bottom && b.top < a.bottom;
|
||||
return {
|
||||
widthPct: Math.round((panelBox.width / stage.width) * 100),
|
||||
height: Math.round(panelBox.height),
|
||||
outsideStage: panelBox.right > stage.right + 1 || panelBox.bottom > stage.bottom + 1,
|
||||
hitsZoom: hits(panelBox, zoom),
|
||||
hitsLegend: hits(panelBox, legend),
|
||||
// Both controls belong to the bar now, not to a floating corner block.
|
||||
actionsInBar: [...panel.querySelectorAll(".map-overlay-actions button")]
|
||||
.map((button) => button.id).join(","),
|
||||
// The rule dividing them from the filters is drawn on this block's
|
||||
// edge, so the block has to run the height of the filters beside it —
|
||||
// centred, it left the rule floating as a stub against a two-row bar.
|
||||
actionsShort: Math.round(box(panel.querySelector(".map-overlay-filters")).height
|
||||
- box(panel.querySelector(".map-overlay-actions")).height),
|
||||
// Every label sits in a gutter of one width, so whichever group leads
|
||||
// a row leads it from the same place: with the labels at their natural
|
||||
// widths, a row starting "Search" began 10px off one starting "Filter".
|
||||
rowStarts: (() => {
|
||||
const leaders = new Map();
|
||||
for (const group of panel.querySelectorAll(".map-overlay-filters .map-locator-filter-group")) {
|
||||
const rect = box(group);
|
||||
// Groups of a row differ in height, so bucket them by their middle.
|
||||
const row = Math.round((rect.top + rect.height / 2) / 20);
|
||||
if (!leaders.has(row) || rect.left < box(leaders.get(row)).left) leaders.set(row, group);
|
||||
}
|
||||
return [...leaders.values()].map((group) => Math.round(box(group.children[1]).left));
|
||||
})(),
|
||||
clipped: panel.scrollWidth > panel.clientWidth + 1 || panel.scrollHeight > panel.clientHeight + 1,
|
||||
};
|
||||
});
|
||||
assert.ok(bar.widthPct >= 70, `the filter bar covers ${bar.widthPct}% of the map at ${width}px`);
|
||||
assert.ok(bar.height <= 140, `the filter bar is ${bar.height}px tall at ${width}px, not a bar`);
|
||||
assert.equal(bar.outsideStage, false, `the filter bar runs off the map at ${width}px`);
|
||||
assert.equal(bar.hitsZoom, false, `the filter bar covers the zoom buttons at ${width}px`);
|
||||
assert.equal(bar.actionsInBar, "map-fullscreen-btn,map-overlay-toggle-btn",
|
||||
`the bar carries "${bar.actionsInBar}" at ${width}px`);
|
||||
assert.ok(bar.actionsShort <= 1,
|
||||
`the buttons' divider falls ${bar.actionsShort}px short of the bar at ${width}px`);
|
||||
assert.equal(new Set(bar.rowStarts).size, 1,
|
||||
`the bar's rows start at ${bar.rowStarts.join(", ")}px at ${width}px`);
|
||||
assert.equal(bar.hitsLegend, false, `the filter bar covers the band legend at ${width}px`);
|
||||
assert.equal(bar.clipped, false, `the filter bar is clipping its own controls at ${width}px`);
|
||||
}
|
||||
|
||||
// Band chips only exist once something has been heard on a band. The bar
|
||||
// used to explain "all bands visible by default" in a line of prose wedged
|
||||
// between the chips and the next group, which is neither what a toolbar is
|
||||
// for nor a width it can spare: an "All" chip says it and undoes a
|
||||
// selection. Nothing is dimmed while nothing is filtered out, either — every
|
||||
// chip used to come up greyed at the very moment all of them were showing.
|
||||
await mapView.page.evaluate(() => {
|
||||
const ts = Date.now();
|
||||
for (const [grid, hz] of [["JO94", 14_074_000], ["JN48", 7_074_000], ["FN42", 21_074_000]]) {
|
||||
window.trxPluginRuntime.dispatch("ft8",
|
||||
{ message: `CQ TEST ${grid}`, grid, freq_hz: hz, snr_db: -8, ts_ms: ts, rig_id: "rig-a" });
|
||||
}
|
||||
});
|
||||
await mapView.page.waitForTimeout(1500);
|
||||
const chipRow = () => mapView.page.evaluate(() => {
|
||||
const row = document.getElementById("map-locator-choice-filter");
|
||||
const chips = [...row.querySelectorAll(".map-locator-chip")];
|
||||
const all = row.querySelector(".map-locator-chip-all");
|
||||
return {
|
||||
bands: chips.filter((chip) => chip !== all).map((chip) => chip.textContent.trim()),
|
||||
prose: row.querySelector(".map-locator-empty")?.textContent ?? null,
|
||||
allActive: all?.classList.contains("is-active") ?? null,
|
||||
dimmed: chips.filter((chip) => chip.classList.contains("is-inactive"))
|
||||
.map((chip) => chip.textContent.trim()),
|
||||
selected: chips.filter((chip) => chip.getAttribute("aria-pressed") === "true"
|
||||
&& chip !== all).map((chip) => chip.textContent.trim()),
|
||||
};
|
||||
});
|
||||
|
||||
const unfiltered = await chipRow();
|
||||
assert.ok(unfiltered.bands.includes("20m") && unfiltered.bands.includes("40m"),
|
||||
`the chip row is showing ${unfiltered.bands.join(",")}`);
|
||||
assert.equal(unfiltered.prose, null, `the bar is explaining itself in prose: "${unfiltered.prose}"`);
|
||||
assert.equal(unfiltered.allActive, true, "All is not lit while every band is on the map");
|
||||
assert.deepEqual(unfiltered.dimmed, [], `${unfiltered.dimmed.join(",")} came up dimmed with no filter set`);
|
||||
|
||||
await mapView.page.locator('#map-locator-choice-filter .map-locator-chip[data-filter-key="20m"]').click();
|
||||
await mapView.page.waitForTimeout(300);
|
||||
const filtered = await chipRow();
|
||||
assert.deepEqual(filtered.selected, ["20m"], `picking 20m selected ${filtered.selected.join(",")}`);
|
||||
assert.equal(filtered.allActive, false, "All stayed lit with a band picked out");
|
||||
assert.ok(filtered.dimmed.includes("40m"), "the bands now filtered out are not shown as such");
|
||||
|
||||
// And back: All is how a selection is undone without hunting for the chips
|
||||
// that are in it.
|
||||
await mapView.page.locator('#map-locator-choice-filter .map-locator-chip-all').click();
|
||||
await mapView.page.waitForTimeout(300);
|
||||
const cleared = await chipRow();
|
||||
assert.equal(cleared.allActive, true, "All did not clear the band selection");
|
||||
assert.deepEqual(cleared.selected, [], `${cleared.selected.join(",")} survived All`);
|
||||
assert.deepEqual(cleared.dimmed, [], `${cleared.dimmed.join(",")} stayed dimmed after All`);
|
||||
|
||||
// Hiding gives the map back, but leaves the bar itself — collapsed to its
|
||||
// two controls at the right-hand edge — so the filters can be brought back.
|
||||
await mapView.page.locator("#map-overlay-toggle-btn").click();
|
||||
await mapView.page.waitForTimeout(400);
|
||||
const toggled = await mapView.page.evaluate(() => {
|
||||
const panel = document.querySelector(".map-overlay-panel");
|
||||
const stage = document.getElementById("map-stage").getBoundingClientRect();
|
||||
const panelBox = panel.getBoundingClientRect();
|
||||
const visible = (id) => document.getElementById(id).getBoundingClientRect().width > 0;
|
||||
return {
|
||||
filtersHidden: panel.querySelector(".map-overlay-filters").classList.contains("is-hidden"),
|
||||
widthPct: Math.round((panelBox.width / stage.width) * 100),
|
||||
rightGap: Math.round(stage.right - panelBox.right),
|
||||
label: document.getElementById("map-overlay-toggle-btn").textContent.trim(),
|
||||
togglesVisible: visible("map-fullscreen-btn") && visible("map-overlay-toggle-btn"),
|
||||
};
|
||||
});
|
||||
assert.equal(toggled.filtersHidden, true, "the filters stayed up after Hide Filters");
|
||||
assert.equal(toggled.togglesVisible, true, "Hide Filters took its own button down with it");
|
||||
assert.ok(toggled.widthPct < 30, `the collapsed bar still covers ${toggled.widthPct}% of the map`);
|
||||
assert.ok(toggled.rightGap < 30, `the collapsed bar sits ${toggled.rightGap}px from the map's edge`);
|
||||
assert.equal(toggled.label, "Show Filters", `the toggle still reads "${toggled.label}"`);
|
||||
|
||||
await mapView.page.locator("#map-overlay-toggle-btn").click();
|
||||
await mapView.page.waitForTimeout(400);
|
||||
const restored = await mapView.page.evaluate(() =>
|
||||
!document.querySelector(".map-overlay-filters").classList.contains("is-hidden"));
|
||||
assert.equal(restored, true, "Show Filters did not bring the filters back");
|
||||
|
||||
assert.deepEqual(mapView.runtimeErrors, []);
|
||||
} finally {
|
||||
await mapView.browser.close();
|
||||
await mapFixture.close();
|
||||
}
|
||||
|
||||
@@ -44,6 +44,68 @@ const CONTENT_TYPES = new Map([
|
||||
[".woff2", "font/woff2"],
|
||||
]);
|
||||
|
||||
// The history endpoint answers in CBOR (see api/decoder.rs), and the worker
|
||||
// that reads it takes the body as CBOR unconditionally. Serving JSON here left
|
||||
// every run exercising the client's retry path instead of its history path.
|
||||
function encodeCbor(value) {
|
||||
const chunks = [];
|
||||
const head = (major, length) => {
|
||||
if (length < 24) return Buffer.from([(major << 5) | length]);
|
||||
if (length < 0x100) return Buffer.from([(major << 5) | 24, length]);
|
||||
if (length < 0x10000) {
|
||||
const buffer = Buffer.alloc(3);
|
||||
buffer[0] = (major << 5) | 25;
|
||||
buffer.writeUInt16BE(length, 1);
|
||||
return buffer;
|
||||
}
|
||||
if (length < 0x1_0000_0000) {
|
||||
const buffer = Buffer.alloc(5);
|
||||
buffer[0] = (major << 5) | 26;
|
||||
buffer.writeUInt32BE(length, 1);
|
||||
return buffer;
|
||||
}
|
||||
// Timestamps are past 2^32 milliseconds, so the 64-bit form is needed.
|
||||
const buffer = Buffer.alloc(9);
|
||||
buffer[0] = (major << 5) | 27;
|
||||
buffer.writeBigUInt64BE(BigInt(length), 1);
|
||||
return buffer;
|
||||
};
|
||||
const write = (item) => {
|
||||
if (item === null || item === undefined) { chunks.push(Buffer.from([0xf6])); return; }
|
||||
if (typeof item === "boolean") { chunks.push(Buffer.from([item ? 0xf5 : 0xf4])); return; }
|
||||
if (typeof item === "number") {
|
||||
if (Number.isInteger(item) && item >= 0) { chunks.push(head(0, item)); return; }
|
||||
if (Number.isInteger(item) && item < 0) { chunks.push(head(1, -item - 1)); return; }
|
||||
const buffer = Buffer.alloc(9);
|
||||
buffer[0] = 0xfb;
|
||||
buffer.writeDoubleBE(item, 1);
|
||||
chunks.push(buffer);
|
||||
return;
|
||||
}
|
||||
if (typeof item === "string") {
|
||||
const bytes = Buffer.from(item, "utf8");
|
||||
chunks.push(head(3, bytes.length), bytes);
|
||||
return;
|
||||
}
|
||||
if (Array.isArray(item)) {
|
||||
chunks.push(head(4, item.length));
|
||||
item.forEach(write);
|
||||
return;
|
||||
}
|
||||
const entries = Object.entries(item);
|
||||
chunks.push(head(5, entries.length));
|
||||
for (const [key, entryValue] of entries) {
|
||||
const keyBytes = Buffer.from(key, "utf8");
|
||||
chunks.push(head(3, keyBytes.length), keyBytes);
|
||||
write(entryValue);
|
||||
}
|
||||
};
|
||||
write(value);
|
||||
return Buffer.concat(chunks);
|
||||
}
|
||||
|
||||
const HISTORY_GROUPS = ["ais", "vdes", "aprs", "hf_aprs", "cw", "ft8", "ft4", "ft2", "wspr", "wefax"];
|
||||
|
||||
function assetPath(urlPath) {
|
||||
// Every tab route has its own index handler on the server (see api/assets.rs),
|
||||
// so a deep link or a refresh serves the SPA shell, not a 404.
|
||||
@@ -65,6 +127,9 @@ export async function startWebFixture({
|
||||
spectrum = false,
|
||||
tx = false,
|
||||
meterDb = -70,
|
||||
decodes = [],
|
||||
mode = "FM",
|
||||
history = {},
|
||||
bookmarks = [],
|
||||
bandplan = {},
|
||||
bandplanEnabled = false,
|
||||
@@ -112,7 +177,7 @@ export async function startWebFixture({
|
||||
signal_meter: spectrum,
|
||||
},
|
||||
},
|
||||
status: { freq: { hz: 100_000_000 }, mode: "FM", tx_en: false, vfo: null, tx: null, rx: { sig: meterDb }, lock: null },
|
||||
status: { freq: { hz: 100_000_000 }, mode, tx_en: false, vfo: null, tx: null, rx: { sig: meterDb }, lock: null },
|
||||
// Reported only by SDR backends, and what makes the client show the
|
||||
// squelch control at all.
|
||||
filter: spectrum
|
||||
@@ -172,6 +237,18 @@ export async function startWebFixture({
|
||||
|
||||
const server = http.createServer(async (request, response) => {
|
||||
const url = new URL(request.url ?? "/", "http://127.0.0.1");
|
||||
// Setting a control means the next status carries the new value, the way a
|
||||
// real server echoes what it applied.
|
||||
if (url.pathname === "/set_sdr_squelch") {
|
||||
const enabled = url.searchParams.get("enabled") === "true";
|
||||
const threshold = Number(url.searchParams.get("threshold_db"));
|
||||
if (status.filter) {
|
||||
status.filter.sdr_squelch_enabled = enabled;
|
||||
if (Number.isFinite(threshold)) status.filter.sdr_squelch_threshold_db = threshold;
|
||||
}
|
||||
response.writeHead(200).end();
|
||||
return;
|
||||
}
|
||||
if (url.pathname === "/select_rig" && request.method === "POST") {
|
||||
const remote = url.searchParams.get("remote");
|
||||
if (remote) {
|
||||
@@ -228,6 +305,59 @@ export async function startWebFixture({
|
||||
request.on("close", () => clearInterval(timer));
|
||||
return;
|
||||
}
|
||||
// Decodes arrive on this stream in the server's own shape: a routing
|
||||
// "type" naming the decoder, snake_case fields inside. The mini views, the
|
||||
// map markers and the history all hang off it, and serving nothing left
|
||||
// every one of them untested.
|
||||
if (url.pathname === "/decode/history") {
|
||||
const payload = Object.fromEntries(HISTORY_GROUPS.map((group) => [group, history[group] ?? []]));
|
||||
response.writeHead(200, { "content-type": "application/cbor" });
|
||||
response.end(encodeCbor(payload));
|
||||
return;
|
||||
}
|
||||
if (url.pathname === "/decode") {
|
||||
response.writeHead(200, {
|
||||
"cache-control": "no-cache",
|
||||
connection: "keep-alive",
|
||||
"content-type": "text/event-stream",
|
||||
});
|
||||
response.write(": decode stream\n\n");
|
||||
// Repeats: a live decoder keeps producing, and the views that collapse
|
||||
// by station or vessel need more than one frame to behave like they do
|
||||
// in front of a radio.
|
||||
let sent = 0;
|
||||
const timer = setInterval(() => {
|
||||
if (!decodes.length) return;
|
||||
const decode = decodes[sent++ % decodes.length];
|
||||
// Stamped as they leave: the client prunes anything older than the
|
||||
// retention window, so a fixed epoch would be dropped on arrival.
|
||||
response.write(`data: ${JSON.stringify({ ts_ms: Date.now(), ...decode })}\n\n`);
|
||||
}, 400);
|
||||
request.on("close", () => clearInterval(timer));
|
||||
return;
|
||||
}
|
||||
// The real server pushes rig state here every second or so; serving an
|
||||
// open-but-silent stream meant nothing in the client's state-update path
|
||||
// was ever exercised.
|
||||
if (url.pathname === "/events") {
|
||||
response.writeHead(200, {
|
||||
"cache-control": "no-cache",
|
||||
connection: "keep-alive",
|
||||
"content-type": "text/event-stream",
|
||||
});
|
||||
// Varying, as a real one is: the client skips a frame identical to the
|
||||
// last, so a repeated payload exercises none of the state-update path.
|
||||
const frame = () => JSON.stringify({
|
||||
...status,
|
||||
status: { ...status.status, freq: { hz: 100_000_000 + (Date.now() % 1000) } },
|
||||
});
|
||||
response.write(`data: ${frame()}\n\n`);
|
||||
const timer = setInterval(() => {
|
||||
response.write(`data: ${frame()}\n\n`);
|
||||
}, 700);
|
||||
request.on("close", () => clearInterval(timer));
|
||||
return;
|
||||
}
|
||||
if (["/events", "/decode", "/spectrum", "/meter"].includes(url.pathname)) {
|
||||
response.writeHead(200, {
|
||||
"cache-control": "no-cache",
|
||||
|
||||
Reference in New Issue
Block a user