fix: packet log millisecond timestamps and date column (#2403)

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: Yeraze

public/locales/en.json

@@ -1170,6 +1170,8 @@
   "packet_monitor.loading": "Loading packets...",
   "packet_monitor.no_packets": "No packets logged yet",
   "packet_monitor.loading_more": "Loading more packets...",
+  "packet_monitor.column.date": "Date",
+  "packet_monitor.today": "Today",
   "packet_monitor.column.time": "Time",
   "packet_monitor.column.from": "From",
   "packet_monitor.column.to": "To",

src/components/PacketMonitorPanel.tsx

@@ -226,7 +226,7 @@ const PacketMonitorPanel: React.FC<PacketMonitorPanelProps> = ({ onClose, onNode
     event.stopPropagation(); // Prevent row click
     // Set relay node to 0 if undefined/null (triggers "unknown relay" mode in modal)
     setSelectedRelayNode(packet.relay_node ?? 0);
-    setSelectedRxTime(new Date(packet.timestamp * 1000));
+    setSelectedRxTime(new Date(toMs(packet.timestamp)));
     setSelectedMessageRssi(packet.rssi ?? undefined);
 
     // Fetch direct neighbor stats (refresh to ensure up-to-date data)
@@ -295,38 +295,45 @@ const PacketMonitorPanel: React.FC<PacketMonitorPanelProps> = ({ onClose, onNode
     }
   };
 
-  // Format timestamp — prepend short date for entries before today
-  const formatTimestamp = (timestamp: number): string => {
-    const date = new Date(timestamp * 1000);
-    const time = date.toLocaleTimeString('en-US', {
-      hour12: timeFormat === '12',
-      hour: '2-digit',
-      minute: '2-digit',
-      second: '2-digit',
-    });
-    const ms = String(date.getMilliseconds()).padStart(3, '0');
-    const timeStr = `${time}.${ms}`;
+  // Convert timestamp to milliseconds (handles both old seconds and new ms data)
+  const toMs = (ts: number) => ts < 10_000_000_000 ? ts * 1000 : ts;
 
+  // Format date column — "Today" or short date
+  const formatDateColumn = (timestamp: number): string => {
+    const date = new Date(toMs(timestamp));
     const now = new Date();
     const isToday = date.getFullYear() === now.getFullYear() &&
       date.getMonth() === now.getMonth() &&
       date.getDate() === now.getDate();
 
     if (isToday) {
-      return timeStr;
+      return t('packet_monitor.today', 'Today');
     }
 
     const month = String(date.getMonth() + 1).padStart(2, '0');
     const day = String(date.getDate()).padStart(2, '0');
-    let dateStr: string;
     if (dateFormat === 'DD/MM/YYYY') {
-      dateStr = `${day}/${month}`;
+      return `${day}/${month}`;
     } else if (dateFormat === 'YYYY-MM-DD') {
-      dateStr = `${month}-${day}`;
-    } else {
-      dateStr = `${month}/${day}`;
+      return `${month}-${day}`;
     }
-    return `${dateStr} ${timeStr}`;
+    return `${month}/${day}`;
+  };
+
+  // Format time column — time with milliseconds
+  const formatTimestamp = (timestamp: number): string => {
+    const date = new Date(toMs(timestamp));
+    const time = date.toLocaleTimeString('en-US', {
+      hour12: timeFormat === '12',
+      hour: '2-digit',
+      minute: '2-digit',
+      second: '2-digit',
+    });
+    const ms = String(date.getMilliseconds()).padStart(3, '0');
+    // Insert ms before AM/PM if 12h format (e.g. "12:09:55 PM" → "12:09:55.979 PM")
+    return timeFormat === '12'
+      ? time.replace(/(\d{2}:\d{2}:\d{2})\s*(AM|PM)/i, `$1.${ms} $2`)
+      : `${time}.${ms}`;
   };
 
   // Calculate hops
@@ -642,6 +649,7 @@ const PacketMonitorPanel: React.FC<PacketMonitorPanelProps> = ({ onClose, onNode
                     <th style={{ width: '60px' }}>#</th>
                     <th style={{ width: '35px' }}>{t('packet_monitor.column.dir')}</th>
                     <th style={{ width: '45px' }}>{t('packet_monitor.column.via')}</th>
+                    <th style={{ width: '55px' }}>{t('packet_monitor.column.date')}</th>
                     <th style={{ width: '110px' }}>{t('packet_monitor.column.time')}</th>
                     <th style={{ width: '140px' }}>{t('packet_monitor.column.from')}</th>
                     <th style={{ width: '140px' }}>{t('packet_monitor.column.to')}</th>
@@ -743,10 +751,16 @@ const PacketMonitorPanel: React.FC<PacketMonitorPanelProps> = ({ onClose, onNode
                           >
                             {getTransportMechanismName(packet.transport_mechanism).short}
                           </td>
+                          <td
+                            className="date"
+                            style={{ width: '55px' }}
+                          >
+                            {formatDateColumn(packet.timestamp)}
+                          </td>
                           <td
                             className="timestamp"
                             style={{ width: '110px' }}
-                            title={formatDateTime(new Date(packet.timestamp * 1000), timeFormat, dateFormat)}
+                            title={formatDateTime(new Date(toMs(packet.timestamp)), timeFormat, dateFormat)}
                           >
                             {formatTimestamp(packet.timestamp)}
                           </td>

src/db/repositories/misc.ts

@@ -925,7 +925,7 @@ export class MiscRepository extends BaseRepository {
         LEFT JOIN nodes from_nodes ON pl.from_node = from_nodes.${nodeNum}
         LEFT JOIN nodes to_nodes ON pl.to_node = to_nodes.${nodeNum}
         WHERE ${whereClause}
-        ORDER BY pl.timestamp DESC, pl.created_at DESC LIMIT ${limit} OFFSET ${offset}
+        ORDER BY pl.timestamp DESC, pl.id DESC LIMIT ${limit} OFFSET ${offset}
       `;
 
       const rows = await this.executeQuery(joinQuery);

src/server/meshtasticManager.ts

@@ -817,7 +817,7 @@ class MeshtasticManager {
       : `!${destination.toString(16).padStart(8, '0')}`;
 
     packetLogService.logPacket({
-      timestamp: Math.floor(Date.now() / 1000),
+      timestamp: Date.now(),
       from_node: localNodeNum,
       from_node_id: localNodeId,
       to_node: destination,
@@ -3658,7 +3658,7 @@ class MeshtasticManager {
 
         packetLogService.logPacket({
           packet_id: meshPacket.id ?? undefined,
-          timestamp: Math.floor(Date.now() / 1000), // Use server time for consistent ordering (rxTime preserved in metadata.rx_time)
+          timestamp: Date.now(), // Use server time in ms for consistent ordering (rxTime preserved in metadata.rx_time)
           from_node: fromNum,
           from_node_id: fromNodeId ?? undefined,
           to_node: toNum ?? undefined,

src/server/routes/packetRoutes.ts

@@ -8,6 +8,12 @@ import { PortNum } from '../constants/meshtastic.js';
 
 const BROADCAST_NODE = 4294967295; // 0xFFFFFFFF
 
+/** Normalize a `since` timestamp to milliseconds (auto-detect seconds vs ms) */
+function normalizeSinceToMs(value: string): number {
+  const n = parseInt(value, 10);
+  return n < 10_000_000_000 ? n * 1000 : n;
+}
+
 const router = express.Router();
 
 /**
@@ -140,7 +146,7 @@ router.get('/', requirePacketPermissions, async (req, res) => {
     const to_node = req.query.to_node ? parseInt(req.query.to_node as string, 10) : undefined;
     const channel = req.query.channel ? parseInt(req.query.channel as string, 10) : undefined;
     const encrypted = req.query.encrypted === 'true' ? true : req.query.encrypted === 'false' ? false : undefined;
-    const since = req.query.since ? parseInt(req.query.since as string, 10) : undefined;
+    const since = req.query.since ? normalizeSinceToMs(req.query.since as string) : undefined;
     const relay_node = req.query.relay_node === 'unknown' ? 'unknown' as const : req.query.relay_node ? parseInt(req.query.relay_node as string, 10) : undefined;
 
     const isAdmin = (req as any).isAdmin;
@@ -214,7 +220,7 @@ router.get('/stats', requirePacketPermissions, async (_req, res) => {
  * GET /api/packets/stats/distribution
  * Get packet distribution by device and by type
  * Query params:
- *   - since: Unix timestamp (seconds) to filter packets from
+ *   - since: Unix timestamp (seconds or milliseconds, auto-detected) to filter packets from
  */
 router.get('/stats/distribution', requirePacketPermissions, async (req, res) => {
   try {
@@ -230,7 +236,7 @@ router.get('/stats/distribution', requirePacketPermissions, async (req, res) =>
       });
     }
 
-    const since = req.query.since ? parseInt(req.query.since as string, 10) : undefined;
+    const since = req.query.since ? normalizeSinceToMs(req.query.since as string) : undefined;
     const from_node = req.query.from_node ? parseInt(req.query.from_node as string, 10) : undefined;
     const portnum = req.query.portnum ? parseInt(req.query.portnum as string, 10) : undefined;
 
@@ -280,7 +286,7 @@ router.get('/export', requirePacketPermissions, async (req, res) => {
     const to_node = req.query.to_node ? parseInt(req.query.to_node as string, 10) : undefined;
     const channel = req.query.channel ? parseInt(req.query.channel as string, 10) : undefined;
     const encrypted = req.query.encrypted === 'true' ? true : req.query.encrypted === 'false' ? false : undefined;
-    const since = req.query.since ? parseInt(req.query.since as string, 10) : undefined;
+    const since = req.query.since ? normalizeSinceToMs(req.query.since as string) : undefined;
     const relay_node = req.query.relay_node === 'unknown' ? 'unknown' as const : req.query.relay_node ? parseInt(req.query.relay_node as string, 10) : undefined;
 
     const isAdmin = (req as any).isAdmin;

src/server/routes/v1/packets.ts

@@ -8,6 +8,12 @@ import express from 'express';
 import packetLogService from '../../services/packetLogService.js';
 import { logger } from '../../../utils/logger.js';
 
+/** Normalize a `since` timestamp to milliseconds (auto-detect seconds vs ms) */
+function normalizeSinceToMs(value: string): number {
+  const n = parseInt(value, 10);
+  return n < 10_000_000_000 ? n * 1000 : n;
+}
+
 const router = express.Router();
 
 /**
@@ -44,7 +50,7 @@ router.get('/', async (req, res) => {
     const to_node = req.query.to_node ? parseInt(req.query.to_node as string, 10) : undefined;
     const channel = req.query.channel ? parseInt(req.query.channel as string, 10) : undefined;
     const encrypted = req.query.encrypted === 'true' ? true : req.query.encrypted === 'false' ? false : undefined;
-    const since = req.query.since ? parseInt(req.query.since as string, 10) : undefined;
+    const since = req.query.since ? normalizeSinceToMs(req.query.since as string) : undefined;
 
     const filterOptions = { portnum, from_node, to_node, channel, encrypted, since };