Fixing more minor bugs

Author: QuinnDamerell

.vscode/settings.json

@@ -91,6 +91,7 @@
         "fsensor",
         "fstring",
         "FULLDICT",
+        "gaierror",
         "gcode",
         "geteuid",
         "getpwnam",

moonraker_octoeverywhere/moonrakercredentialmanager.py

@@ -63,6 +63,9 @@ def TryToGetOneshotToken(self, apiKey:Optional[str]=None) -> Optional[str]:
             if result is None:
                 raise Exception("Failed to get the oneshot token from moonraker.")
             if result.StatusCode != 200:
+                if result.StatusCode == 401:
+                    self.Logger.info("Failed to get the oneshot token from moonraker. Unauthorized. The API key is likely invalid.")
+                    return None
                 raise Exception("Failed to get the oneshot token from moonraker. "+str(result.StatusCode))
 
             # Read the response.

moonraker_octoeverywhere/moonrakerwebcamhelper.py

@@ -610,6 +610,11 @@ def _ValidateAndFixupWebCamSettings(self, webcamSettings:WebcamSettingItem) -> b
             if webcamSettings.SnapshotUrl is None or len(webcamSettings.SnapshotUrl) == 0:
                 webcamSettings.SnapshotUrl = self._TryToFigureOutSnapshotUrl(webcamSettings.StreamUrl)
 
+            # We have seen the rotation be a string in some cases, so ensure it's an int.
+            if webcamSettings.Rotation is None or isinstance(webcamSettings.Rotation, str):
+                self.Logger.warning("Webcam helper found an invalid rotation, resetting to 0. Value: '"+str(webcamSettings.Rotation)+"'")
+                webcamSettings.Rotation = 0
+
             # Ensure these are the correct types.
             webcamSettings.FlipH = bool(webcamSettings.FlipH)
             webcamSettings.FlipV = bool(webcamSettings.FlipV)

octoeverywhere/Webcam/webcamutil.py

@@ -93,6 +93,9 @@ def GetSnapshotFromStream(logger:logging.Logger, result:HttpResult, validateMult
                     if value.find('--') != -1:
                         value = value.split('--')[0].strip()
                     if len(p) == 2:
+                        # We have seen weird cases where there's a content-length header, but it's empty, and then there's another that has a length.
+                        if len(value) == 0:
+                            continue
                         frameSizeInt = int(value)
 
                 # Break when done.

octoeverywhere/notificationshandler.py

@@ -933,7 +933,7 @@ def GetNotificationSnapshot(self, snapshotResizeParams:Optional[SnapshotResizePa
                         self.Logger.warning("Can't manipulate image because the Image rotation lib failed to import.")
                 except Exception as e:
                     # Note that in the case of an exception we don't overwrite the original snapshot buffer, so something can still be sent.
-                    if "name 'Image' is not defined" in str(e):
+                    if isinstance(e, NameError) and "Image" in str(e):
                         self.Logger.info("Can't manipulate image because the Image rotation lib failed to import.")
                     if "cannot identify image file" in str(e):
                         self.Logger.info("Can't manipulate image because the Image lib can't figure out the image type.")

octoeverywhere/sentry.py

@@ -1,9 +1,10 @@
 import os
 import logging
+import socket
 import time
 import traceback
 import threading
-from typing import Any, Dict, Optional
+from typing import Any, Dict, List, Optional
 
 import octowebsocket
 import requests
@@ -328,30 +329,42 @@ def _HandleCantCreateThreadException(logger:logging.Logger, e:Exception) -> bool
     # We don't want to report these to sentry, as they are common and not actionable.
     @staticmethod
     def IsCommonConnectionException(e:Exception) -> bool:
+        def matchesException(exception:Exception, exceptionClass:Any, msgs:Optional[List[str]]=None) -> bool:
+            if not isinstance(exception, exceptionClass):
+                return False
+            exceptionStr = str(exception).lower().strip()
+            if msgs is not None:
+                for t in msgs:
+                    if t.lower() in exceptionStr:
+                        return True
+            return False
+
         try:
             # This means a device was at the IP, but the port isn't open.
-            if isinstance(e, ConnectionRefusedError):
+            if matchesException(e, ConnectionRefusedError):
                 return True
-            if isinstance(e, ConnectionResetError):
+            if matchesException(e, ConnectionResetError):
                 return True
             # This means the IP doesn't route to a device.
-            if isinstance(e, OSError) and ("No route to host" in str(e) or "Network is unreachable" in str(e)):
+            if matchesException(e, OSError, ["No route to host", "Network is unreachable", "Network unreachable", "Host is unreachable"]):
+                return True
+            if matchesException(e, socket.gaierror, ["Name does not resolve"]):
                 return True
             # This means the other side never responded.
-            if isinstance(e, TimeoutError) and "Connection timed out" in str(e):
+            if matchesException(e, TimeoutError, ["Connection timed out", "Operation timed out"]):
                 return True
-            if isinstance(e, octowebsocket.WebSocketTimeoutException):
+            if matchesException(e, octowebsocket.WebSocketTimeoutException):
                 return True
             # This just means the server closed the socket,
             #   or the socket connection was lost after a long delay
             #   or there was a DNS name resolve failure.
-            if isinstance(e, octowebsocket.WebSocketConnectionClosedException) and ("Connection to remote host was lost." in str(e) or "ping/pong timed out" in str(e) or "Name or service not known" in str(e)):
+            if matchesException(e, octowebsocket.WebSocketConnectionClosedException, ["Connection to remote host was lost.", "ping/pong timed out", "Name or service not known"]):
                 return True
             # Invalid host name.
-            if isinstance(e, octowebsocket.WebSocketAddressException) and "Name or service not known" in str(e):
+            if matchesException(e, octowebsocket.WebSocketAddressException, ["Name or service not known"]):
                 return True
             # We don't care.
-            if isinstance(e, octowebsocket.WebSocketConnectionClosedException):
+            if matchesException(e, octowebsocket.WebSocketConnectionClosedException):
                 return True
         except Exception:
             pass