refactor: make FT8 family a typed module

2026-08-01 12:21:13 +02:00
parent 03bdc10b02
commit 5ba3ecf59b
8 changed files with 562 additions and 930 deletions
@@ -6,8 +6,58 @@
    const number = typeof value === "number" ? value : Number(value);
    return Number.isFinite(number) ? number : null;
  }
+  function isAlphaNumeric(value) {
+    return value !== void 0 && /[A-Za-z0-9]/.test(value);
+  }
+  function isGrid(value) {
+    const normalized = value.trim().toUpperCase();
+    return /^[A-R]{2}\d{2}(?:[A-X]{2})?$/.test(normalized) && normalized !== "RR73" && normalized !== "73" && normalized !== "RR";
+  }
+  function escapeFtxHtml(input) {
+    return input.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;");
+  }
+  function extractFtxGrids(message) {
+    return [...new Set(message.toUpperCase().split(/[^A-Z0-9]+/).filter(isGrid))];
+  }
+  function tokenize(message) {
+    return message.toUpperCase().split(/[^A-Z0-9/]+/).filter(Boolean);
+  }
+  function isCallsign(token) {
+    return token !== void 0 && token.length >= 3 && token.length <= 12 && !["CQ", "DE", "QRZ", "DX"].includes(token) && !isGrid(token) && /^[A-Z0-9/]{1,5}\d[A-Z0-9/]{1,6}$/.test(token);
+  }
+  function extractFtxLocatorDetails(message) {
+    const tokens = tokenize(message);
+    const grids = extractFtxGrids(message);
+    const gridIndex = tokens.findIndex(isGrid);
+    const callsigns = tokens.slice(0, gridIndex < 0 ? tokens.length : gridIndex).filter(isCallsign);
+    const directed = callsigns.length >= 2 && !["CQ", "DE", "QRZ"].includes(tokens[0] ?? "");
+    const source = directed ? callsigns[1] ?? null : callsigns[0] ?? null;
+    const target = directed ? callsigns[0] ?? null : null;
+    return grids.map((grid) => ({ grid, station: source, source, target }));
+  }
+  function extractFtxCallsign(message) {
+    return extractFtxLocatorDetails(message)[0]?.station ?? tokenize(message).find(isCallsign) ?? null;
+  }
+  function renderFtxMessage(message) {
+    let html = "";
+    let index = 0;
+    while (index < message.length) {
+      if (!isAlphaNumeric(message[index])) {
+        html += escapeFtxHtml(message[index] ?? "");
+        index += 1;
+        continue;
+      }
+      let end = index + 1;
+      while (end < message.length && isAlphaNumeric(message[end])) end += 1;
+      const token = message.slice(index, end);
+      const grid = token.toUpperCase();
+      html += isGrid(grid) ? `<span class="ft8-locator" data-locator-grid="${grid}" role="button" tabindex="0" aria-label="Show locator ${grid} on map">${grid}</span>` : escapeFtxHtml(token);
+      index = end;
+    }
+    return html;
+  }
  function initializeFtxDecoder(config) {
-    const { id, label, periodMs } = config;
+    const { id, label, periodMs, periodDigits = 1 } = config;
    const status = document.getElementById(`${id}-status`);
    const period = document.getElementById(`${id}-period`);
    const messagesElement = document.getElementById(`${id}-messages`);
@@ -15,9 +65,7 @@
    let filterText = "";
    let history = [];
    const renderMessage = (message) => {
-      if (bridge.renderFt8Message) return bridge.renderFt8Message(message);
-      if (bridge.ft8EscapeHtml) return bridge.ft8EscapeHtml(message);
-      return message;
+      return bridge.renderFt8Message?.(message) ?? renderFtxMessage(message);
    };
    const retentionMs = () => bridge.getDecodeHistoryRetentionMs?.() ?? 864e5;
    const prune = () => {
@@ -69,9 +117,9 @@
    };
    const normalize = (message) => {
      const raw = message.message ?? "";
-      const locatorDetails = bridge.ft8ExtractLocatorDetails?.(raw) ?? [];
-      const grids = locatorDetails.length > 0 ? locatorDetails.map(({ grid }) => grid) : bridge.ft8ExtractAllGrids?.(raw) ?? [];
-      const station = bridge.ft8ExtractLikelyCallsign?.(raw) ?? null;
+      const locatorDetails = bridge.ft8ExtractLocatorDetails?.(raw) ?? extractFtxLocatorDetails(raw);
+      const grids = locatorDetails.length > 0 ? locatorDetails.map(({ grid }) => grid) : bridge.ft8ExtractAllGrids?.(raw) ?? extractFtxGrids(raw);
+      const station = bridge.ft8ExtractLikelyCallsign?.(raw) ?? extractFtxCallsign(raw);
      const frequency = displayFrequency(message.freq_hz);
      if (grids.length > 0) {
        bridge.mapAddLocator?.(raw, grids, id, station, {
@@ -103,6 +151,7 @@
      history = [];
      bridge.updateFt8Bar?.();
      render();
+      bridge.clearMapMarkersByType?.(id);
    };
    const barFrames = () => {
      const recent = history.filter((message) => (finiteNumber(message._tsMs ?? message.ts_ms) ?? 0) >= Date.now() - 9e5).slice(0, 8);
@@ -133,7 +182,7 @@
    };
    bridge.registerFt8FamilyBarRenderer?.(id, barFrames);
    const updatePeriod = () => {
-      if (period) period.textContent = `Next slot ${((periodMs - Date.now() % periodMs) / 1e3).toFixed(1)}s`;
+      if (period) period.textContent = `Next slot ${((periodMs - Date.now() % periodMs) / 1e3).toFixed(periodDigits)}s`;
    };
    updatePeriod();
    window.setInterval(updatePeriod, 250);
@@ -141,6 +190,14 @@
      filterText = filterInput.value.trim().toUpperCase();
      render();
    });
+    messagesElement?.addEventListener("click", (event) => {
+      if (!(event.target instanceof Element)) return;
+      const grid = event.target.closest(".ft8-locator[data-locator-grid]")?.dataset.locatorGrid;
+      if (grid) {
+        bridge.navigateToMapLocator?.(grid.toUpperCase(), id);
+        event.preventDefault();
+      }
+    });
    const toggle = document.getElementById(`${id}-decode-toggle-btn`);
    toggle?.addEventListener("click", () => {
      void (async () => {