From edeba7f5141c3197a3ddff5fe45127894c861e07 Mon Sep 17 00:00:00 2001
From: Hemna <waboring@hemna.com>
Date: Fri, 24 Jan 2025 17:28:59 -0500
Subject: [PATCH] Fix for KISS/Fake client drivers

They were both missing a setting of aprsd_keepalive to test
for the logging of the keepalive last time called.
---
 aprsd/client/drivers/fake.py |  5 +++++
 aprsd/client/drivers/kiss.py | 34 +++++++++++++++++++---------------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/aprsd/client/drivers/fake.py b/aprsd/client/drivers/fake.py
index 77fe677..3229f88 100644
--- a/aprsd/client/drivers/fake.py
+++ b/aprsd/client/drivers/fake.py
@@ -1,3 +1,4 @@
+import datetime
 import logging
 import threading
 import time
@@ -20,6 +21,9 @@ class APRSDFakeClient(metaclass=trace.TraceWrapperMetaclass):
     # flag to tell us to stop
     thread_stop = False
 
+    # date for last time we heard from the server
+    aprsd_keepalive = datetime.datetime.now()
+
     lock = threading.Lock()
     path = []
 
@@ -63,6 +67,7 @@ class APRSDFakeClient(metaclass=trace.TraceWrapperMetaclass):
         raw = 'GTOWN>APDW16,WIDE1-1,WIDE2-1:}KM6LYW-9>APZ100,TCPIP,GTOWN*::KM6LYW   :KM6LYW: 19 Miles SW'
         pkt_raw = aprslib.parse(raw)
         pkt = core.factory(pkt_raw)
+        self.aprsd_keepalive = datetime.datetime.now()
         callback(packet=pkt)
         LOG.debug(f'END blocking FAKE consumer {self}')
         time.sleep(8)
diff --git a/aprsd/client/drivers/kiss.py b/aprsd/client/drivers/kiss.py
index e4c7bca..9409364 100644
--- a/aprsd/client/drivers/kiss.py
+++ b/aprsd/client/drivers/kiss.py
@@ -1,21 +1,24 @@
+import datetime
 import logging
 
-from ax253 import Frame
 import kiss
+from ax253 import Frame
 from oslo_config import cfg
 
 from aprsd import conf  # noqa
 from aprsd.packets import core
 from aprsd.utils import trace
 
-
 CONF = cfg.CONF
-LOG = logging.getLogger("APRSD")
+LOG = logging.getLogger('APRSD')
 
 
 class KISS3Client:
     path = []
 
+    # date for last time we heard from the server
+    aprsd_keepalive = datetime.datetime.now()
+
     def __init__(self):
         self.setup()
 
@@ -26,7 +29,7 @@ class KISS3Client:
         # we can be TCP kiss or Serial kiss
         if CONF.kiss_serial.enabled:
             LOG.debug(
-                "KISS({}) Serial connection to {}".format(
+                'KISS({}) Serial connection to {}'.format(
                     kiss.__version__,
                     CONF.kiss_serial.device,
                 ),
@@ -39,7 +42,7 @@ class KISS3Client:
             self.path = CONF.kiss_serial.path
         elif CONF.kiss_tcp.enabled:
             LOG.debug(
-                "KISS({}) TCP Connection to {}:{}".format(
+                'KISS({}) TCP Connection to {}:{}'.format(
                     kiss.__version__,
                     CONF.kiss_tcp.host,
                     CONF.kiss_tcp.port,
@@ -52,7 +55,7 @@ class KISS3Client:
             )
             self.path = CONF.kiss_tcp.path
 
-        LOG.debug("Starting KISS interface connection")
+        LOG.debug('Starting KISS interface connection')
         self.kiss.start()
 
     @trace.trace
@@ -74,18 +77,19 @@ class KISS3Client:
             frame = Frame.from_bytes(frame_bytes)
             # Now parse it with aprslib
             kwargs = {
-                "frame": frame,
+                'frame': frame,
             }
             self._parse_callback(**kwargs)
+            self.aprsd_keepalive = datetime.datetime.now()
         except Exception as ex:
-            LOG.error("Failed to parse bytes received from KISS interface.")
+            LOG.error('Failed to parse bytes received from KISS interface.')
             LOG.exception(ex)
 
     def consumer(self, callback):
-        LOG.debug("Start blocking KISS consumer")
+        LOG.debug('Start blocking KISS consumer')
         self._parse_callback = callback
         self.kiss.read(callback=self.parse_frame, min_frames=None)
-        LOG.debug(f"END blocking KISS consumer {self.kiss}")
+        LOG.debug(f'END blocking KISS consumer {self.kiss}')
 
     def send(self, packet):
         """Send an APRS Message object."""
@@ -94,24 +98,24 @@ class KISS3Client:
         path = self.path
         if isinstance(packet, core.Packet):
             packet.prepare()
-            payload = packet.payload.encode("US-ASCII")
+            payload = packet.payload.encode('US-ASCII')
             if packet.path:
                 path = packet.path
         else:
-            msg_payload = f"{packet.raw}{{{str(packet.msgNo)}"
+            msg_payload = f'{packet.raw}{{{str(packet.msgNo)}'
             payload = (
-                ":{:<9}:{}".format(
+                ':{:<9}:{}'.format(
                     packet.to_call,
                     msg_payload,
                 )
-            ).encode("US-ASCII")
+            ).encode('US-ASCII')
 
         LOG.debug(
             f"KISS Send '{payload}' TO '{packet.to_call}' From "
             f"'{packet.from_call}' with PATH '{path}'",
         )
         frame = Frame.ui(
-            destination="APZ100",
+            destination='APZ100',
             source=packet.from_call,
             path=path,
             info=payload,