Merge pull request #833 from s53zo/fix/contest-qso-dx-target

Fix contest QSO DX target updates

Author: accius

.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [main, develop]
   pull_request:
-    branches: [main]
+    branches: [main, Staging]
 
 permissions:
   contents: read

AddOns/APRS-Newsfeed/aprs_newsfeed.user.js

@@ -160,7 +160,13 @@
   let lastUpdateTs = parseInt(localStorage.getItem('ohc_aprs_last_update')) || 0;
 
   // Escape HTML to prevent XSS when interpolating into innerHTML
-  const esc = (s) => String(s).replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;').replace(/'/g,'&#39;');
+  const esc = (s) =>
+    String(s)
+      .replace(/&/g, '&amp;')
+      .replace(/</g, '&lt;')
+      .replace(/>/g, '&gt;')
+      .replace(/"/g, '&quot;')
+      .replace(/'/g, '&#39;');
 
   function getCallsign() {
     try {

docs/N1MM-SETUP.md

@@ -53,12 +53,12 @@ If you're running directly with Node, restart the server after changing your `.e
 
 All settings go in your `.env` or `.env.local` file:
 
-| Variable | Default | Description |
-|----------|---------|-------------|
-| `N1MM_UDP_ENABLED` | `false` | Set to `true` to enable the UDP listener |
-| `N1MM_UDP_PORT` | `12060` | UDP port to listen on (must match N1MM+ config) |
-| `N1MM_MAX_QSOS` | `200` | Maximum QSOs to keep in memory |
-| `N1MM_QSO_MAX_AGE_MINUTES` | `360` | QSOs older than this (6 hours) are pruned automatically |
+| Variable                   | Default | Description                                             |
+| -------------------------- | ------- | ------------------------------------------------------- |
+| `N1MM_UDP_ENABLED`         | `false` | Set to `true` to enable the UDP listener                |
+| `N1MM_UDP_PORT`            | `12060` | UDP port to listen on (must match N1MM+ config)         |
+| `N1MM_MAX_QSOS`            | `200`   | Maximum QSOs to keep in memory                          |
+| `N1MM_QSO_MAX_AGE_MINUTES` | `360`   | QSOs older than this (6 hours) are pruned automatically |
 
 ## Docker Users
 

dxspider-proxy/server.js

@@ -447,7 +447,10 @@ const handleDisconnect = () => {
   // Detect rapid disconnect (kicked within seconds of connecting)
   const connectionDuration = connectionStartTime ? Date.now() - connectionStartTime.getTime() : 0;
   if (connectionDuration > 0 && connectionDuration < 15000) {
-    log('RECONNECT', `Rapid disconnect from ${currentNode?.name} after ${Math.round(connectionDuration / 1000)}s (likely auth rejection or SSID conflict)`);
+    log(
+      'RECONNECT',
+      `Rapid disconnect from ${currentNode?.name} after ${Math.round(connectionDuration / 1000)}s (likely auth rejection or SSID conflict)`,
+    );
   }
 
   reconnectAttempts++;
@@ -456,7 +459,10 @@ const handleDisconnect = () => {
     // Try next node
     currentNodeIndex = (currentNodeIndex + 1) % CONFIG.nodes.length;
     reconnectAttempts = 0;
-    log('FAILOVER', `${CONFIG.maxReconnectAttempts} consecutive failures — switching to node: ${CONFIG.nodes[currentNodeIndex].name}`);
+    log(
+      'FAILOVER',
+      `${CONFIG.maxReconnectAttempts} consecutive failures — switching to node: ${CONFIG.nodes[currentNodeIndex].name}`,
+    );
   }
 
   log('RECONNECT', `Attempting reconnect in ${CONFIG.reconnectDelayMs}ms (attempt ${reconnectAttempts})`);

src/components/PluginLayer.jsx

@@ -27,6 +27,7 @@ const PluginLayerInner = ({
   enabled,
   opacity,
   map,
+  onDXChange,
   mapBandFilter,
   callsign,
   locator,
@@ -43,6 +44,7 @@ const PluginLayerInner = ({
       map: safeMap,
       enabled,
       opacity,
+      onDXChange,
       callsign,
       locator,
       mapBandFilter,

src/components/WorldMap.jsx

@@ -1925,6 +1925,7 @@ export const WorldMap = ({
           plugin={layerDef}
           enabled={pluginLayerStates[layerDef.id]?.enabled ?? layerDef.defaultEnabled}
           opacity={pluginLayerStates[layerDef.id]?.opacity ?? layerDef.defaultOpacity}
+          onDXChange={onDXChange}
           mapBandFilter={mapBandFilter}
           config={pluginLayerStates[layerDef.id]?.config ?? layerDef.config}
           map={isAzimuthal ? azimuthalMapRef.current : mapInstanceRef.current}

src/plugins/layers/useContestQsos.js

@@ -30,13 +30,26 @@ const bandFromAnyFrequency = (freq) => {
   return normalizeBandKey(getBandFromFreq(n));
 };
 
-export function useLayer({ enabled = false, opacity = 0.7, map = null, mapBandFilter }) {
+const findLatestLocatedQso = (qsos) => {
+  for (let i = qsos.length - 1; i >= 0; i -= 1) {
+    const qso = qsos[i];
+    const lat = parseFloat(qso?.lat);
+    const lon = parseFloat(qso?.lon);
+    if (Number.isFinite(lat) && Number.isFinite(lon)) {
+      return { qso, lat, lon };
+    }
+  }
+  return null;
+};
+
+export function useLayer({ enabled = false, opacity = 0.7, map = null, onDXChange, mapBandFilter }) {
   const [qsos, setQsos] = useState([]);
   const [deLocation, setDeLocation] = useState(null);
   const markersRef = useRef([]);
   const linesRef = useRef([]);
   const pollRef = useRef(null);
   const configLoadedRef = useRef(false);
+  const lastHandledTargetKeyRef = useRef(null);
 
   useEffect(() => {
     if (!enabled || configLoadedRef.current) return;
@@ -80,6 +93,31 @@ export function useLayer({ enabled = false, opacity = 0.7, map = null, mapBandFi
     };
   }, [enabled]);
 
+  useEffect(() => {
+    if (!enabled) {
+      lastHandledTargetKeyRef.current = null;
+    }
+  }, [enabled]);
+
+  useEffect(() => {
+    if (!enabled || typeof onDXChange !== 'function') return;
+
+    const latestLocated = findLatestLocatedQso(qsos);
+    if (!latestLocated) return;
+
+    const { qso: latestLocatedQso, lat, lon } = latestLocated;
+    const targetKey =
+      latestLocatedQso.id ||
+      `${latestLocatedQso.timestamp || ''}:${latestLocatedQso.dxCall || ''}:${lat.toFixed(4)}:${lon.toFixed(4)}`;
+
+    if (lastHandledTargetKeyRef.current === targetKey) return;
+
+    // Remember handled QSOs even while DX is locked so unlocking later
+    // does not retroactively replay an older contest contact.
+    lastHandledTargetKeyRef.current = targetKey;
+    onDXChange({ lat, lon });
+  }, [enabled, qsos, onDXChange]);
+
   useEffect(() => {
     if (!map || typeof L === 'undefined') return;