Minor changes

.gitignore

@@ -0,0 +1,2 @@
+/custom_components/mr6400sms/devices/__pycache__/*.pyc
+/custom_components/mr6400sms/test.py

custom_components/mr6400sms/devices/mr6400.py

@@ -43,7 +43,7 @@ async def _perform_login(self):
 		url = self._buildUrl('cgi/getParm')
 		headers = {'Referer': self._baseurl}
 
-		async with self._websession.post(url, timeout=10, headers=headers) as response:
+		async with self._websession.post(url, timeout=self._requestTimeout, headers=headers) as response:
 			if response.status != 200:
 				raise RouterException(f"Invalid encryption key request because of status {response.status}")
 
@@ -64,7 +64,7 @@ async def _perform_login(self):
 		}
 		headers = { 'Referer': self._baseurl }
 
-		async with self._websession.post(url, params=params, headers=headers, timeout=10) as response:
+		async with self._websession.post(url, params=params, headers=headers, timeout=self._requestTimeout) as response:
 			if response.status != 200:
 				raise RouterException("Invalid login request")
 
@@ -75,7 +75,7 @@ async def _perform_login(self):
 
 		url = self._buildUrl('')
 
-		async with self._websession.get(url,timeout=10) as response:
+		async with self._websession.get(url,timeout=self._requestTimeout) as response:
 			if response.status != 200:
 				raise RouterException("Invalid token request because of status " + str(response.status))
 
@@ -100,6 +100,6 @@ async def _send_sms(self, phone, message):
 		data = ("[LTE_SMS_SENDNEWMSG#0,0,0,0,0,0#0,0,0,0,0,0]0,3\r\n"f"index=1\r\nto={phone}\r\ntextContent={message}\r\n")
 		headers = {'Referer': self._baseurl, 'TokenID': self._token}
 
-		async with self._websession.post(url, params=params, data=data, headers=headers, timeout=10) as response:
+		async with self._websession.post(url, params=params, data=data, headers=headers, timeout=self._requestTimeout) as response:
 			if response.status != 200:
 				raise RouterException("Failed sending SMS")

custom_components/mr6400sms/devices/router.py

@@ -8,7 +8,7 @@ class RouterException(Exception):
 	pass
 
 class Router:
-	def __init__(self, hostname, username, password):
+	def __init__(self, hostname, username, password, maxRetries=3, requestTimeout=10):
 		"""
 		Initializes the router.
 		"""
@@ -17,14 +17,27 @@ def __init__(self, hostname, username, password):
 		self._username = username
 		self._password = password
 		self._baseurl = "http://{}/".format(self._hostname)
-		self._maxRetries = 3
+		self._maxRetries = maxRetries
+		self._requestTimeout = requestTimeout
 
 	def _buildUrl(self, path):
 		"""
 		Builds the URL for the router.
 		"""
 		return self._baseurl + path
+
+	async def _perform_login(self):
+		"""
+		This function is overridden in child classes. Implements per-device login flow.
+		"""
+		pass
 
+	async def _perform_logout(self):
+		"""
+		This function is overridden in child classes. Implements per-device logout flow.
+		"""
+		pass
+
 	async def login(self):
 		"""
 		Login to the router.
@@ -35,7 +48,7 @@ async def login(self):
 			try:
 				await self._perform_login()
 				break
-			except Exception as e: #TOOD: Non-general exception
+			except (RouterException, Exception) as e:
 				if retries < self._maxRetries - 1:
 					_LOGGER.warning("Retrying login (%d of %d) due to exception {%s}", retries + 1, self._maxRetries, e)
 					await asyncio.sleep(1)
@@ -45,17 +58,15 @@ async def logout(self):
 		Logs out the user by closing the web session.
 		"""
 		if self._websession is not None:
+			await self._perform_logout()
 			await self._websession.close()
 			self._websession = None
 			pass
 
 	async def send_message(self, phone_numbers, message):
 		"""
-		Sends a message to a list of phone numbers.
+		Sends a message to a list of given phone numbers.
 		""" 
 		for phone in phone_numbers:
 			await self._send_sms(phone, message)
-			_LOGGER.info("Sent SMS to %s: %s", phone, message)
-
-	async def perform_login(self):
-		raise NotImplementedError()
+			_LOGGER.info("Sent SMS to %s: %s", phone, message)