Do not shutdown device upon errors (#587)

* Do not shutdown device upon errors

* Apply suggestions from code review

Co-authored-by: Simone Chemelli <simone.chemelli@gmail.com>

---------

Co-authored-by: Simone Chemelli <simone.chemelli@gmail.com>

Author: thecode

aioshelly/block_device/device.py

@@ -175,18 +175,15 @@ async def initialize(self) -> None:
             else:
                 self._last_error = DeviceConnectionError(err)
             _LOGGER.debug("host %s: error: %r", ip, self._last_error)
-            await self.shutdown()
             raise self._last_error from err
         except MacAddressMismatchError as err:
             self._last_error = err
             _LOGGER.debug("host %s: error: %r", ip, err)
-            await self.shutdown()
             raise
         except CONNECT_ERRORS as err:
             self._last_error = DeviceConnectionError(err)
             _LOGGER.debug("host %s: error: %r", ip, self._last_error)
-            await self.shutdown()
-            raise DeviceConnectionError(err) from err
+            raise self._last_error from err
         finally:
             self._initializing = False
 

aioshelly/rpc_device/device.py

@@ -192,18 +192,15 @@ async def initialize(self) -> None:
         except InvalidAuthError as err:
             self._last_error = InvalidAuthError(err)
             _LOGGER.debug("host %s:%s: error: %r", ip, port, self._last_error)
-            await self._disconnect_websocket()
             raise
         except MacAddressMismatchError as err:
             self._last_error = err
             _LOGGER.debug("host %s:%s: error: %r", ip, port, err)
-            await self._disconnect_websocket()
             raise
         except (*CONNECT_ERRORS, RpcCallError) as err:
             self._last_error = DeviceConnectionError(err)
             _LOGGER.debug("host %s:%s: error: %r", ip, port, self._last_error)
-            await self._disconnect_websocket()
-            raise DeviceConnectionError(err) from err
+            raise self._last_error from err
         finally:
             self._initializing = False