Parse skimmer spots

Author: int2001

app.js

@@ -15,7 +15,7 @@ const APIv1 = require('./modules/apiv1');
 const APIv2 = require('./modules/apiv2');
 const Metrics = require('./modules/metrics');
 const RateLimiter = require('./modules/rate-limiter');
-const { toUcWord, qrg2band, getFreshestSpot, getOldestSpot, normalizeFrequency } = require('./lib/utils');
+const { toUcWord, qrg2band, getFreshestSpot, getOldestSpot, normalizeFrequency, parseSkimmerMessage } = require('./lib/utils');
 const express = require("express");
 const app = express();
 const path = require("path");
@@ -1504,6 +1504,7 @@ function validateAndSanitizeSpot(spot) {
         band: String(spot.band || ''),
         mode: spot.mode || null,
         submode: spot.submode || null,
+	        skimmer: spot.skimmer || null,
         dxcc_spotter: normalizeDXCCObject(spot.dxcc_spotter),
         dxcc_spotted: normalizeDXCCObject(spot.dxcc_spotted)
     };
@@ -1538,10 +1539,13 @@ async function handlespot(spot, spot_source = "cluster") {
 			return;
 		}
 
+		// Store original spotter callsign before normalization for skimmer parsing
+		const originalSpotter = spot.spotter;
+
 		// Normalize spotter callsign - strip RBN/cluster suffixes like -#, -15, etc.
 		// This simplifies deduplication and improves cache hit rates
 		spot.spotter = normalizeSpotterCallsign(spot.spotter);
-		
+
 		// Normalize frequency for consistency (based on Wavelog PR #2514)
 		// All frequencies should be in kHz with 1 decimal place
 		const normalizedFreq = normalizeFrequency(spot.frequency);
@@ -1602,7 +1606,14 @@ async function handlespot(spot, spot_source = "cluster") {
 			_sourceData: sourceData  // Attach source data for GUI display
 		}
 
-		//do DXCC lookup (with timeout protection)
+		// Parse skimmer messages if this is a skimmer spot
+			// Only processes spots with -# suffix in spotter callsign
+			const skimmerData = parseSkimmerMessage(spot.message, originalSpotter);
+			if (skimmerData) {
+				dxSpot.skimmer = skimmerData;
+			}
+
+			//do DXCC lookup (with timeout protection)
 		try {
 			dxSpot.dxcc_spotter = await dxcc_lookup(spot.spotter);
 			dxSpot.dxcc_spotted = await dxcc_lookup(spot.spotted);
@@ -1934,23 +1945,6 @@ function removeFromIndexes(spot) {
 /**
  * Rebuilds all indexes from scratch
  */
-function rebuildIndexes() {
-    bandIndex.clear();
-    frequencyIndex.clear();
-    sourceIndex.clear();
-    spotKeyIndex.clear();
-    
-    // Clear statistics indexes
-    modeTypeStats.phone = 0;
-    modeTypeStats.digi = 0;
-    modeTypeStats.cw = 0;
-    modeTypeStats.unknown = 0;
-    Object.keys(continentStats).forEach(key => delete continentStats[key]);
-    Object.keys(continentDeStats).forEach(key => delete continentDeStats[key]);
-    rbnSpotCount = 0;
-
-    spots.forEach(spot => updateIndexes(spot));
-}
 
 /**
  * Removes spots older than the configured maximum age
@@ -2008,17 +2002,11 @@ function logStatistics() {
             const analyticsSummary = analytics.getSummary();
             totalRequests = analyticsSummary.summary?.totalRequests || 0;
 
-            // Debug: log if analytics seems disabled or has no data
-            if (totalRequests === 0 && Object.keys(analyticsSummary.clients || {}).length === 0) {
-                console.log(`[Core] [DEBUG] Analytics enabled but no requests tracked yet`);
-            }
         } catch (e) {
             console.error(`[Core] [ERROR] Failed to get analytics summary: ${e.message}`);
         }
     } else {
-        console.log(`[Core] [DEBUG] Analytics disabled (enabled: ${config.analyticsEnabled})`);
-    }
-    
+            }
     console.log(`[Core] ═══════════════════════════════════════════════════════════════════════════`);
     console.log(`[Core] Statistics: Uptime=${uptimeHours}h ${uptimeMinutes}m | Requests=${totalRequests} | Total Spots=${spots.length}`);
     console.log(`[Core] Sources: ${sourceList || 'none'}`);

lib/utils.js

@@ -168,12 +168,12 @@ function toKHz(freqMHz) {
  * Normalizes frequency to consistent kHz format with 1 decimal place.
  * This ensures frequency consistency across all sources (DXCluster, POTA, SOTA, RBN).
  * Handles both kHz and Hz inputs automatically.
- * 
+ *
  * Based on Wavelog PR #2514 fix for inconsistent frequency format.
- * 
+ *
  * @param {number|string} frequency - Frequency in kHz or Hz (auto-detected).
  * @returns {number} - Normalized frequency in kHz with 1 decimal precision, or NaN if invalid.
- * 
+ *
  * @example
  * normalizeFrequency(14074)      // 14074.0
  * normalizeFrequency(14074.1)    // 14074.1
@@ -182,30 +182,74 @@ function toKHz(freqMHz) {
  */
 function normalizeFrequency(frequency) {
     const freq = Number(frequency);
-    
+
     // Validate input
     if (!Number.isFinite(freq) || freq <= 0) {
         return NaN;
     }
-    
+
     // Auto-detect Hz vs kHz based on magnitude
     // If frequency > 1 MHz (1000 kHz), assume it's in Hz
     let freqInKHz = freq;
     if (freq >= 1000000) {
         // Convert Hz to kHz
         freqInKHz = freq / 1000;
     }
-    
+
     // Validate frequency range (30 kHz to 300 GHz = 300,000,000 kHz)
     if (freqInKHz < 30 || freqInKHz > 300000000) {
         return NaN;
     }
-    
+
     // Round to 1 decimal place for consistency
     // This matches DXCluster format (e.g., 14074.1)
     return Math.round(freqInKHz * 10) / 10;
 }
 
+/**
+ * Parse skimmer message into structured components.
+ * Only processes skimmer spots (those with -# suffix in spotter callsign).
+ * Extracts mode, SNR, speed, and type from skimmer messages.
+ *
+ * @param {string} message - Skimmer message (e.g., "CW 34 dB 28 WPM CQ")
+ * @param {string} spotter - Spotter callsign to check for -# suffix
+ * @returns {object|null} Parsed skimmer data or null if not a skimmer spot or parsing fails
+ *
+ * @example
+ * parseSkimmerMessage("CW 34 dB 28 WPM CQ", "LZ5DI-#")
+ * // Returns: { mode: "CW", snr: 34, speed: 28, type: "CQ" }
+ *
+ * parseSkimmerMessage("tnx QRP 1W QSO 73 GL", "9Y4M")
+ * // Returns: null (not a skimmer spot)
+ */
+function parseSkimmerMessage(message, spotter) {
+    // Only process skimmer spots (those with -# suffix)
+    if (!spotter || !spotter.includes('-#')) {
+        return null;
+    }
+
+    // Validate message is a string
+    if (typeof message !== 'string') {
+        return null;
+    }
+
+    // Pattern: MODE SNR dB SPEED WPM TYPE
+    // Example: "CW 34 dB 28 WPM CQ" or "CW  4 dB 18 WPM BEACON"
+    const regex = /^(\w+)\s+(\d+)\s+dB\s+(\d+)\s+WPM\s+(\w+).*$/;
+    const match = message.match(regex);
+
+    if (!match) {
+        return null;
+    }
+
+    return {
+        mode: match[1],           // e.g., "CW", "RTTY"
+        snr: parseInt(match[2], 10),  // e.g., 34 (without "dB")
+        speed: parseInt(match[3], 10),// e.g., 28 (without "WPM")
+        type: match[4]            // e.g., "CQ", "BEACON"
+    };
+}
+
 module.exports = {
     logConnectionState,
     toUcWord,
@@ -215,5 +259,6 @@ module.exports = {
     sleepNow,
     getAllowedDeviation,
     toKHz,
-    normalizeFrequency
+    normalizeFrequency,
+    parseSkimmerMessage
 };