Merge pull request #50 from MrAlders0n/copilot/fix-gps-data-skipping-issue

Add live countdown for GPS skip in auto-ping mode

Author: MrAlders0n

content/wardrive.js

@@ -89,7 +89,8 @@ const state = {
   autoCountdownTimer: null, // Timer for auto-ping countdown display
   nextAutoPingTime: null, // Timestamp when next auto-ping will occur
   apiCountdownTimer: null, // Timer for API post countdown display
-  apiPostTime: null // Timestamp when API post will occur
+  apiPostTime: null, // Timestamp when API post will occur
+  skipReason: null // Reason for skipping a ping - internal value only (e.g., "gps too old")
 };
 
 // ---- UI helpers ----
@@ -107,6 +108,20 @@ function setStatus(text, color = STATUS_COLORS.idle) {
   statusEl.className = `font-semibold ${color}`;
 }
 
+/**
+ * Apply status message from countdown timer result
+ * @param {string|{message: string, color: string}|null} result - Status message (string) or object with message and optional color
+ * @param {string} defaultColor - Default color to use if result is a string or object without color
+ */
+function applyCountdownStatus(result, defaultColor) {
+  if (!result) return;
+  if (typeof result === 'string') {
+    setStatus(result, defaultColor);
+  } else {
+    setStatus(result.message, result.color || defaultColor);
+  }
+}
+
 // Countdown timer management - generalized for reuse
 function createCountdownTimer(getEndTime, getStatusMessage) {
   return {
@@ -125,14 +140,12 @@ function createCountdownTimer(getEndTime, getStatusMessage) {
 
       const remainingMs = this.endTime - Date.now();
       if (remainingMs <= 0) {
-        const message = getStatusMessage(0);
-        if (message) setStatus(message, STATUS_COLORS.info);
+        applyCountdownStatus(getStatusMessage(0), STATUS_COLORS.info);
         return;
       }
 
       const remainingSec = Math.ceil(remainingMs / 1000);
-      const message = getStatusMessage(remainingSec);
-      if (message) setStatus(message, STATUS_COLORS.idle);
+      applyCountdownStatus(getStatusMessage(remainingSec), STATUS_COLORS.idle);
     },
 
     stop() {
@@ -150,19 +163,34 @@ const autoCountdownTimer = createCountdownTimer(
   () => state.nextAutoPingTime,
   (remainingSec) => {
     if (!state.running) return null;
-    return remainingSec === 0 
-      ? "Sending auto ping..." 
-      : `Waiting for next auto ping (${remainingSec}s)`;
+    if (remainingSec === 0) {
+      return { message: "Sending auto ping...", color: STATUS_COLORS.info };
+    }
+    // If there's a skip reason, show it with the countdown in warning color
+    if (state.skipReason) {
+      return { 
+        message: `Skipped (${state.skipReason}), next ping (${remainingSec}s)`,
+        color: STATUS_COLORS.warning
+      };
+    }
+    return { 
+      message: `Waiting for next auto ping (${remainingSec}s)`,
+      color: STATUS_COLORS.idle
+    };
   }
 );
 
 // API post countdown timer
 const apiCountdownTimer = createCountdownTimer(
   () => state.apiPostTime,
   (remainingSec) => {
-    return remainingSec === 0 
-      ? "Posting to API..." 
-      : `Wait to post API (${remainingSec}s)`;
+    if (remainingSec === 0) {
+      return { message: "Posting to API...", color: STATUS_COLORS.info };
+    }
+    return { 
+      message: `Wait to post API (${remainingSec}s)`,
+      color: STATUS_COLORS.idle
+    };
   }
 );
 
@@ -705,8 +733,8 @@ async function getGpsCoordinatesForPing(isAutoMode) {
         return await acquireFreshGpsPosition();
       } catch (e) {
         debugError(`Could not refresh GPS position for auto ping: ${e.message}`, e);
-        const intervalSec = Math.ceil(intervalMs / 1000);
-        setStatus(`GPS could not refresh position, skipping ping. Next attempt (${intervalSec}s)`, STATUS_COLORS.error);
+        // Set skip reason so the countdown will show the appropriate message
+        state.skipReason = "gps too old";
         return null;
       }
     }
@@ -873,6 +901,9 @@ function stopAutoPing(stopGps = false) {
   }
   stopAutoCountdown();
 
+  // Clear skip reason
+  state.skipReason = null;
+  
   // Only stop GPS watch when disconnecting or page hidden, not during normal stop
   if (stopGps) {
     stopGeoWatch();
@@ -892,12 +923,14 @@ function scheduleNextAutoPing() {
   const intervalMs = getSelectedIntervalMs();
   debugLog(`Scheduling next auto ping in ${intervalMs}ms`);
 
-  // Start countdown immediately
+  // Start countdown immediately (skipReason may be set if ping was skipped)
   startAutoCountdown(intervalMs);
 
   // Schedule the next ping
   state.autoTimerId = setTimeout(() => {
     if (state.running) {
+      // Clear skip reason before next attempt
+      state.skipReason = null;
       debugLog("Auto ping timer fired, sending ping");
       sendPing(false).catch(console.error);
     }
@@ -928,6 +961,9 @@ function startAutoPing() {
   }
   stopAutoCountdown();
 
+  // Clear any previous skip reason
+  state.skipReason = null;
+  
   // Start GPS watch for continuous updates
   debugLog("Starting GPS watch for auto mode");
   startGeoWatch();