Telnet clients disconnecting shouldn't log an exception

core/utils.py

@@ -156,3 +156,13 @@ def get_callsign_object_from_pyhamtools_callinfo(callsign, callinfo):
     except (KeyError, ValueError):
         # Unknown callsign, can't look anything up, return a Callsign object with basic data so that gets cached
         return Callsign(call=callsign)
+
+
+def decode_telnet_bytes(data: bytes) -> str:
+    """Decode a line of text received from a telnet connection, which might be UTF-8 or Latin-1 depending on the
+    whims of the server owner."""
+
+    try:
+        return data.decode("utf-8")
+    except UnicodeDecodeError:
+        return data.decode("latin-1")

providers/spot/dxcluster.py

@@ -9,7 +9,8 @@ import telnetlib3
 
 from core.config import SERVER_OWNER_CALLSIGN
 from data.spot import Spot
-from providers.spot.spot_provider import SpotProvider, decode_telnet_bytes
+from providers.spot.spot_provider import SpotProvider
+from core.utils import decode_telnet_bytes
 
 logger = logging.getLogger(__name__)
 

providers/spot/rbn.py

@@ -9,7 +9,8 @@ import telnetlib3
 
 from core.config import SERVER_OWNER_CALLSIGN
 from data.spot import Spot
-from providers.spot.spot_provider import SpotProvider, decode_telnet_bytes
+from providers.spot.spot_provider import SpotProvider
+from core.utils import decode_telnet_bytes
 
 logger = logging.getLogger(__name__)
 

providers/spot/spot_provider.py

@@ -5,18 +5,6 @@ import pytz
 from core.data_store import DATA_STORE
 
 
-def decode_telnet_bytes(data: bytes) -> str:
-    """Decode a line of text received from a telnet connection. DX cluster and RBN nodes are inconsistent about the
-    character encoding they use for spot comments: most send UTF-8, but some older ones send Latin-1/CP1252. Try
-    UTF-8 first, since valid multi-byte UTF-8 sequences are very unlikely to occur by chance in Latin-1 text, then
-    fall back to Latin-1, which can decode any byte sequence without raising."""
-
-    try:
-        return data.decode("utf-8")
-    except UnicodeDecodeError:
-        return data.decode("latin-1")
-
-
 class SpotProvider:
     """Generic spot provider class. Subclasses of this query the individual APIs for data."""
 

telnetserver/telnetserver.py

@@ -123,13 +123,19 @@ class TelnetServer:
 
         except asyncio.CancelledError:
             pass
+        except (TimeoutError, ConnectionResetError):
+            logger.debug("Telnet client connection timed out or was reset by client")
         except Exception:
             logger.exception("Exception handling telnet client")
         finally:
             logger.debug("Telnet client disconnected")
             self._clients.remove(writer)
-            writer.close()
+            try:
-            await writer.wait_closed()
+                writer.close()
+                await writer.wait_closed()
+            except (TimeoutError, ConnectionResetError, OSError):
+                # Socket already closed or timed out, don't care as we were getting rid of it anyway
+                pass
 
     def stop(self):
         """Stops the telnet server"""

templates/add_spot.html

@@ -77,7 +77,7 @@
 
 </div>
 
-<script src="/static/js/add-spot.js?v=1789927308"></script>
+<script src="/static/js/add-spot.js?v=1789933862"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/alerts.html

@@ -85,7 +85,7 @@
 
 </div>
 
-<script src="/static/js/alerts.js?v=1789927308"></script>
+<script src="/static/js/alerts.js?v=1789933862"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/bands.html

@@ -76,8 +76,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789927308"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789933862"></script>
-<script src="/static/js/bands.js?v=1789927308"></script>
+<script src="/static/js/bands.js?v=1789933862"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/base.html

@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/static/css/style.css?v=1789927308" type="text/css">
+<link rel="stylesheet" href="/static/css/style.css?v=1789933862" type="text/css">
 <link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -16,10 +16,10 @@
     window.fetchEventSource = fetchEventSource;
 </script>
 
-<script src="/static/js/utils.js?v=1789927308"></script>
+<script src="/static/js/utils.js?v=1789933862"></script>
-<script src="/static/js/ui-ham.js?v=1789927308"></script>
+<script src="/static/js/ui-ham.js?v=1789933862"></script>
-<script src="/static/js/geo.js?v=1789927308"></script>
+<script src="/static/js/geo.js?v=1789933862"></script>
-<script src="/static/js/common.js?v=1789927308"></script>
+<script src="/static/js/common.js?v=1789933862"></script>
 {% end %}
 {% block body %}
 <div class="container">

templates/conditions.html

@@ -284,7 +284,7 @@
 </div>
 
 <script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/static/js/conditions.js?v=1789927308"></script>
+<script src="/static/js/conditions.js?v=1789933862"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/map.html

@@ -113,8 +113,8 @@
     const CARTODB_API_KEY = "{{ web_ui_options.get('cartodb_api_key', '') }}";
 </script>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789927308"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789933861"></script>
-<script src="/static/js/map.js?v=1789927308"></script>
+<script src="/static/js/map.js?v=1789933861"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/spots.html

@@ -125,8 +125,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789927308"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789933861"></script>
-<script src="/static/js/spots.js?v=1789927308"></script>
+<script src="/static/js/spots.js?v=1789933861"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/status.html

@@ -96,7 +96,7 @@
     </div>
 </div>
 
-<script src="/static/js/status.js?v=1789927308"></script>
+<script src="/static/js/status.js?v=1789933862"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");