Merge pull request #69 from SimplyPrint/fix-extract-image-issue

Fix crash + add more logging for future similar issues.

Author: AlbertMN

octoprint_simplyprint/websocket/simplyprint.py

@@ -314,28 +314,35 @@ def _monotonic(self) -> float:
         return self._aioloop.time()
 
     async def _initialize(self) -> None:
-        self._loop = IOLoop.current()
-        for (func, args) in self.cached_events:
-            func(*args)
-        self.cached_events = []
-        self.update_timer.start(delay=60.)
-        self.cpu_timer.start()
-        self.ping_timer.start()
-        if self.printer.is_operational():
-            self._on_printer_connected()
-        else:
-            self._update_state_from_octo()
-        self.cache.machine_data = await self._get_machine_data()
-        await self.webcam_stream.test_connection()
-        await self._connect()
+        try:
+            self._loop = IOLoop.current()
+            for (func, args) in self.cached_events:
+                func(*args)
+            self.cached_events = []
+            self.update_timer.start(delay=60.)
+            self.cpu_timer.start()
+            self.ping_timer.start()
+            if self.printer.is_operational():
+                self._on_printer_connected()
+            else:
+                self._update_state_from_octo()
+            self.cache.machine_data = await self._get_machine_data()
+            await self.webcam_stream.test_connection()
+            await self._connect()
+        except Exception as e:
+            self._logger.error("Failed to initialize SimplyPrint Plugin!", exc_info=e)
 
     async def _get_machine_data(self) -> Dict[str, Any]:
-        sys_query = SystemQuery(self.settings)
-        data = await self._loop.run_in_executor(None, sys_query.get_system_info)
-        data["ui"] = "OctoPrint"
-        data["api"] = "OctoPrint"
-        data["sp_version"] = self.plugin._plugin_version
-        return data
+        try:
+            sys_query = SystemQuery(self.settings)
+            data = await self._loop.run_in_executor(None, sys_query.get_system_info)
+            data["ui"] = "OctoPrint"
+            data["api"] = "OctoPrint"
+            data["sp_version"] = self.plugin._plugin_version
+            return data
+        except Exception as e:
+            self._logger.warning("Failed to get machine data", exc_info=e)
+            return {}
 
     async def _connect(self) -> None:
         log_connect = True

octoprint_simplyprint/websocket/webcam.py

@@ -57,10 +57,13 @@ def webcam_connected(self):
         return self._connection_test_passed
 
     async def test_connection(self) -> None:
-        if not hasattr(self, "_loop"):
-            self._loop = IOLoop.current()
-        img = await self._loop.run_in_executor(None, self.extract_image)
-        self._connection_test_passed = img is not None
+        try:
+            if not hasattr(self, "_loop"):
+                self._loop = IOLoop.current()
+            img = await self._loop.run_in_executor(None, self.extract_image)
+            self._connection_test_passed = img is not None
+        except Exception as e:
+            self._logger.warning("Failed to test webcam connection", exc_info=e)
 
     def extract_image(self) -> Optional[str]:
         headers = {"Accept": "image/jpeg"}
@@ -75,11 +78,13 @@ def extract_image(self) -> Optional[str]:
                     self.url, headers=headers, verify=False, timeout=4
                 )
                 resp.raise_for_status()
+                
+                return self._encode_image(resp.content)
             else:
                 self._logger.warning("Unable to determine snapshot URL")
         except Exception:
-            return None
-        return self._encode_image(resp.content)
+            pass
+        return None
 
     def _encode_image(self, image: bytes) -> str:
         return base64.b64encode(image).decode()