aprsd 4.0.0__py3-none-any.whl → 4.0.2__py3-none-any.whl

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)

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,17 @@ 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")
         self._parse_callback = callback
         self.kiss.read(callback=self.parse_frame, min_frames=None)
-        LOG.debug(f"END blocking KISS consumer {self.kiss}")
 
     def send(self, packet):
         """Send an APRS Message object."""
@@ -94,24 +96,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,

aprsd/client/kiss.py

@@ -12,7 +12,7 @@ from aprsd.client.drivers import kiss
 from aprsd.packets import core
 
 CONF = cfg.CONF
-LOG = logging.getLogger("APRSD")
+LOG = logging.getLogger('APRSD')
 LOGU = logger
 
 
@@ -27,15 +27,15 @@ class KISSClient(base.APRSClient):
             if serializable:
                 keepalive = keepalive.isoformat()
             stats = {
-                "connected": self.is_connected,
-                "connection_keepalive": keepalive,
-                "transport": self.transport(),
+                'connected': self.is_connected,
+                'connection_keepalive': keepalive,
+                'transport': self.transport(),
             }
             if self.transport() == client.TRANSPORT_TCPKISS:
-                stats["host"] = CONF.kiss_tcp.host
-                stats["port"] = CONF.kiss_tcp.port
+                stats['host'] = CONF.kiss_tcp.host
+                stats['port'] = CONF.kiss_tcp.port
             elif self.transport() == client.TRANSPORT_SERIALKISS:
-                stats["device"] = CONF.kiss_serial.device
+                stats['device'] = CONF.kiss_serial.device
         return stats
 
     @staticmethod
@@ -56,15 +56,15 @@ class KISSClient(base.APRSClient):
             transport = KISSClient.transport()
             if transport == client.TRANSPORT_SERIALKISS:
                 if not CONF.kiss_serial.device:
-                    LOG.error("KISS serial enabled, but no device is set.")
+                    LOG.error('KISS serial enabled, but no device is set.')
                     raise exception.MissingConfigOptionException(
-                        "kiss_serial.device is not set.",
+                        'kiss_serial.device is not set.',
                     )
             elif transport == client.TRANSPORT_TCPKISS:
                 if not CONF.kiss_tcp.host:
-                    LOG.error("KISS TCP enabled, but no host is set.")
+                    LOG.error('KISS TCP enabled, but no host is set.')
                     raise exception.MissingConfigOptionException(
-                        "kiss_tcp.host is not set.",
+                        'kiss_tcp.host is not set.',
                     )
 
             return True
@@ -91,8 +91,8 @@ class KISSClient(base.APRSClient):
         if ka := self._client.aprsd_keepalive:
             keepalive = timeago.format(ka)
         else:
-            keepalive = "N/A"
-        LOGU.opt(colors=True).info(f"<green>Client keepalive {keepalive}</green>")
+            keepalive = 'N/A'
+        LOGU.opt(colors=True).info(f'<green>Client keepalive {keepalive}</green>')
 
     @staticmethod
     def transport():
@@ -104,8 +104,8 @@ class KISSClient(base.APRSClient):
 
     def decode_packet(self, *args, **kwargs):
         """We get a frame, which has to be decoded."""
-        LOG.debug(f"kwargs {kwargs}")
-        frame = kwargs["frame"]
+        LOG.debug(f'kwargs {kwargs}')
+        frame = kwargs['frame']
         LOG.debug(f"Got an APRS Frame '{frame}'")
         # try and nuke the * from the fromcall sign.
         # frame.header._source._ch = False
@@ -114,20 +114,23 @@ class KISSClient(base.APRSClient):
         # msg = frame.tnc2
         # LOG.debug(f"Decoding {msg}")
 
-        raw = aprslib.parse(str(frame))
-        packet = core.factory(raw)
-        if isinstance(packet, core.ThirdPartyPacket):
-            return packet.subpacket
-        else:
-            return packet
+        try:
+            raw = aprslib.parse(str(frame))
+            packet = core.factory(raw)
+            if isinstance(packet, core.ThirdPartyPacket):
+                return packet.subpacket
+            else:
+                return packet
+        except Exception as ex:
+            LOG.error(f'Error decoding packet: {ex}')
 
     def setup_connection(self):
         try:
             self._client = kiss.KISS3Client()
-            self.connected = self.login_status["success"] = True
+            self.connected = self.login_status['success'] = True
         except Exception as ex:
-            self.connected = self.login_status["success"] = False
-            self.login_status["message"] = str(ex)
+            self.connected = self.login_status['success'] = False
+            self.login_status['message'] = str(ex)
         return self._client
 
     def consumer(self, callback, blocking=False, immortal=False, raw=False):
@@ -135,5 +138,5 @@ class KISSClient(base.APRSClient):
             self._client.consumer(callback)
             self.keepalive = datetime.datetime.now()
         except Exception as ex:
-            LOG.error(f"Consumer failed {ex}")
+            LOG.error(f'Consumer failed {ex}')
             LOG.error(ex)

aprsd/plugins/fortune.py

@@ -5,24 +5,30 @@ import subprocess
 from aprsd import packets, plugin
 from aprsd.utils import trace
 
+LOG = logging.getLogger('APRSD')
 
-LOG = logging.getLogger("APRSD")
-
-DEFAULT_FORTUNE_PATH = "/usr/games/fortune"
+FORTUNE_PATHS = [
+    '/usr/games/fortune',
+    '/usr/local/bin/fortune',
+    '/usr/bin/fortune',
+]
 
 
 class FortunePlugin(plugin.APRSDRegexCommandPluginBase):
     """Fortune."""
 
-    command_regex = r"^([f]|[f]\s|fortune)"
-    command_name = "fortune"
-    short_description = "Give me a fortune"
+    command_regex = r'^([f]|[f]\s|fortune)'
+    command_name = 'fortune'
+    short_description = 'Give me a fortune'
 
     fortune_path = None
 
     def setup(self):
-        self.fortune_path = shutil.which(DEFAULT_FORTUNE_PATH)
-        LOG.info(f"Fortune path {self.fortune_path}")
+        for path in FORTUNE_PATHS:
+            self.fortune_path = shutil.which(path)
+            LOG.info(f'Fortune path {self.fortune_path}')
+            if self.fortune_path:
+                break
         if not self.fortune_path:
             self.enabled = False
         else:
@@ -30,7 +36,7 @@ class FortunePlugin(plugin.APRSDRegexCommandPluginBase):
 
     @trace.trace
     def process(self, packet: packets.MessagePacket):
-        LOG.info("FortunePlugin")
+        LOG.info('FortunePlugin')
 
         # fromcall = packet.get("from")
         # message = packet.get("message_text", None)
@@ -39,8 +45,8 @@ class FortunePlugin(plugin.APRSDRegexCommandPluginBase):
         reply = None
 
         try:
-            cmnd = [self.fortune_path, "-s", "-n 60"]
-            command = " ".join(cmnd)
+            cmnd = [self.fortune_path, '-s', '-n 60']
+            command = ' '.join(cmnd)
             output = subprocess.check_output(
                 command,
                 shell=True,
@@ -48,10 +54,10 @@ class FortunePlugin(plugin.APRSDRegexCommandPluginBase):
                 text=True,
             )
             output = (
-                output.replace("\r", "")
-                .replace("\n", "")
-                .replace("  ", "")
-                .replace("\t", " ")
+                output.replace('\r', '')
+                .replace('\n', '')
+                .replace('  ', '')
+                .replace('\t', ' ')
             )
         except subprocess.CalledProcessError as ex:
             reply = f"Fortune command failed '{ex.output}'"