[feature/satellite] OMM data download, server background driven update, optional Space-Track

.env.example

@@ -163,6 +163,16 @@ LAYOUT=modern
 # QRZ_USERNAME=your_callsign
 # QRZ_PASSWORD=your_qrz_password
 
+# Satellite data sources (effect server only)
+# CelesTrak.org data source is enabled by default, no username or password is needed.
+# CelesTrak can be disabled by setting CELESTRAK_ENABLED=false, but it is recommended to keep it enabled as a backup source.
+CELESTRAK_ENABLED=true
+# Space-Track.org is disabled by default, but can be enabled by providing a valid username and password.
+# To enable both username and password must be fields must be active.
+# When enabled Space-Track.org becomes primary data source for satellite data with CelesTrak as backup.
+#SPACE_TRACK_USERNAME=your_username
+#SPACE_TRACK_PASSWORD=your_password
+
 # ===========================================
 # FEATURE TOGGLES
 # ===========================================

dxspider-proxy/server.js

@@ -30,9 +30,13 @@ const CONFIG = {
   reconnectDelayMs: 10000, // 10 seconds between reconnect attempts
   maxReconnectAttempts: 3,
   cleanupIntervalMs: 60000, // 1 minute
-  keepAliveIntervalMs: 120000, // 2 minutes - send keepalive
+  keepAliveIntervalMs: 60000, // 1 minute - send keepalive (must stay < socketTimeoutMs)
   activityTimeoutMs: 180000, // 3 minutes - if no spots, assume dead and failover
   authTimeoutMs: 30000, // 30 seconds - if no prompt after login, try next node
+  // Last-resort TCP backstop. Must be LONGER than activityTimeoutMs so the
+  // graceful node-failover watchdog acts first. A 60s value here used to
+  // preempt it and tear down healthy connections during quiet-band gaps.
+  socketTimeoutMs: 300000, // 5 minutes
 };
 
 // State
@@ -242,7 +246,7 @@ const connect = () => {
   log('CONNECT', `Attempting connection to ${node.name} (${node.host}:${node.port})`);
 
   client = new net.Socket();
-  client.setTimeout(60000); // 60 second timeout
+  client.setTimeout(CONFIG.socketTimeoutMs);
 
   client.connect(node.port, node.host, () => {
     connected = true;
@@ -313,6 +317,13 @@ const connect = () => {
         if (spot) {
           addSpot(spot);
           resetActivityWatchdog(); // Got a spot, connection is healthy
+          // A flowing spot is definitive proof login succeeded. The DXSpider
+          // prompt has no trailing newline so it never arrives as a complete
+          // line — prompt-based detection alone is unreliable.
+          if (!authenticated) {
+            authenticated = true;
+            log('AUTH', 'Login confirmed (spot stream active)');
+          }
           // Only reset failover counter if connection has been stable for 60s+
           // A few spots before a timeout isn't truly healthy — it traps us
           // on a flaky node that connects briefly then drops
@@ -328,8 +339,10 @@ const connect = () => {
         continue;
       }
 
-      // Detect auth completion - DX Spider sends "callsign de NODE >" prompt
-      if (!authenticated && /\sde\s+\S+\s*>/.test(trimmed)) {
+      // Detect auth completion - DX Spider sends "callsign de NODE >" prompt.
+      // Exclude lines containing '<' — sh/dx output (e.g. "...de Helmut<DF4IY>")
+      // otherwise false-matches this pattern.
+      if (!authenticated && !trimmed.includes('<') && /\sde\s+\S+\s*>/.test(trimmed)) {
         authenticated = true;
         log('AUTH', `Login confirmed: ${trimmed.substring(0, 80)}`);
         resetActivityWatchdog(); // Auth done, start watching for spots
@@ -344,6 +357,16 @@ const connect = () => {
   client.on('timeout', () => {
     log('TIMEOUT', 'Connection timed out');
     connecting = false;
+    // Node does NOT auto-close a socket on timeout. Without this teardown the
+    // old socket keeps emitting 'data' until the next connect(), spuriously
+    // logging "Connection stable" and resetting the failover counter.
+    if (client) {
+      try {
+        client.removeAllListeners();
+        client.destroy();
+      } catch (e) {}
+      client = null;
+    }
     handleDisconnect();
   });
 

package.json

@@ -24,7 +24,9 @@
   },
   "dependencies": {
     "axios": "^1.6.2",
+    "axios-cookiejar-support": "^6.0.5",
     "compression": "^1.7.4",
+    "convert-csv-to-json": "^4.38.0",
     "cors": "^2.8.5",
     "dotenv": "^16.3.1",
     "express": "^4.21.2",
@@ -40,6 +42,7 @@
     "react-i18next": "^16.5.4",
     "rss-parser": "^3.13.0",
     "satellite.js": "^6.0.0",
+    "tough-cookie": "^6.0.1",
     "ws": "^8.14.2"
   },
   "devDependencies": {

server/config.js

@@ -118,6 +118,23 @@ const CONFIG = {
     ? parseFloat(process.env.DX_LONGITUDE)
     : (jsonConfig.defaultDX?.lon ?? -0.1278),
 
+  // Satellites configuration
+  satellites: {
+    celestrak: {
+      get enabled() {
+        return !(process.env.CELESTRAK_ENABLED && process.env.CELESTRAK_ENABLED === 'false');
+      },
+    },
+    spaceTrack: {
+      // (do not expose usernames/passwords to frontend)
+      _username: process.env.SPACE_TRACK_USERNAME || '',
+      _password: process.env.SPACE_TRACK_PASSWORD || '',
+      get enabled() {
+        return this._username.length > 0 && this._password.length > 0;
+      },
+    },
+  },
+
   // Feature toggles
   showSatellites: process.env.SHOW_SATELLITES !== 'false' && jsonConfig.features?.showSatellites !== false,
   showPota: process.env.SHOW_POTA !== 'false' && jsonConfig.features?.showPOTA !== false,

server/routes/dxcluster.js

@@ -1303,8 +1303,6 @@ module.exports = function (app, ctx) {
     }
 
     try {
-      const controller = new AbortController();
-      const timeout = setTimeout(() => controller.abort(), 10000);
       const now = Date.now();
 
       // Try proxy first for better real-time data
@@ -1383,10 +1381,15 @@ module.exports = function (app, ctx) {
 
       // Try proxy if not using custom or custom failed
       if (newSpots.length === 0 && source !== 'custom' && source !== 'udp') {
+        // Each upstream gets its OWN AbortController. A shared controller meant a
+        // proxy timeout left the signal pre-aborted, so the HamQTH fallback below
+        // rejected instantly with AbortError and never actually ran.
+        const proxyController = new AbortController();
+        const proxyTimeout = setTimeout(() => proxyController.abort(), 10000);
         try {
           const proxyResponse = await fetch(`${DXSPIDER_PROXY_URL}/api/spots?limit=100`, {
             headers: { 'User-Agent': 'OpenHamClock/3.14.11' },
-            signal: controller.signal,
+            signal: proxyController.signal,
           });
 
           if (proxyResponse.ok) {
@@ -1409,15 +1412,19 @@ module.exports = function (app, ctx) {
           }
         } catch (proxyErr) {
           logDebug('[DX Paths] Proxy failed, trying HamQTH');
+        } finally {
+          clearTimeout(proxyTimeout);
         }
       }
 
       // Fallback to HamQTH if proxy failed (never for explicit custom source)
       if (newSpots.length === 0 && source !== 'custom' && source !== 'udp') {
+        const hamqthController = new AbortController();
+        const hamqthTimeout = setTimeout(() => hamqthController.abort(), 10000);
         try {
           const response = await fetch('https://www.hamqth.com/dxc_csv.php?limit=50', {
             headers: { 'User-Agent': 'OpenHamClock/3.13.1' },
-            signal: controller.signal,
+            signal: hamqthController.signal,
           });
 
           if (response.ok) {
@@ -1469,11 +1476,11 @@ module.exports = function (app, ctx) {
           }
         } catch (hamqthErr) {
           logDebug('[DX Paths] HamQTH also failed');
+        } finally {
+          clearTimeout(hamqthTimeout);
         }
       }
 
-      clearTimeout(timeout);
-
       if (newSpots.length === 0) {
         // Return existing paths if fetch failed
         const validPaths = pathsCache.allPaths.filter((p) => now - p.timestamp < DXPATHS_RETENTION);