mirror of
https://github.com/home-assistant/core.git
synced 2025-05-27 17:27:07 +00:00

* Update device_tracker.py From time to time, Swisscom Internet Box fails to respond and this causes an exception, which is currently not handled by the code: Traceback (most recent call last): File "/srv/homeassistant/lib/python3.7/site-packages/homeassistant/components/device_tracker/setup.py", line 164, in async_device_tracker_scan found_devices = await scanner.async_scan_devices() File "/usr/local/lib/python3.7/concurrent/futures/thread.py", line 57, in run result = self.fn(*self.args, **self.kwargs) File "/srv/homeassistant/lib/python3.7/site-packages/homeassistant/components/swisscom/device_tracker.py", line 46, in scan_devices self._update_info() File "/srv/homeassistant/lib/python3.7/site-packages/homeassistant/components/swisscom/device_tracker.py", line 67, in _update_info data = self.get_swisscom_data() File "/srv/homeassistant/lib/python3.7/site-packages/homeassistant/components/swisscom/device_tracker.py", line 83, in get_swisscom_data request = requests.post(url, headers=headers, data=data, timeout=10) File "/srv/homeassistant/lib/python3.7/site-packages/requests/api.py", line 116, in post return request('post', url, data=data, json=json, **kwargs) File "/srv/homeassistant/lib/python3.7/site-packages/requests/api.py", line 60, in request return session.request(method=method, url=url, **kwargs) File "/srv/homeassistant/lib/python3.7/site-packages/requests/sessions.py", line 533, in request resp = self.send(prep, **send_kwargs) File "/srv/homeassistant/lib/python3.7/site-packages/requests/sessions.py", line 686, in send r.content File "/srv/homeassistant/lib/python3.7/site-packages/requests/models.py", line 828, in content self._content = b''.join(self.iter_content(CONTENT_CHUNK_SIZE)) or b'' File "/srv/homeassistant/lib/python3.7/site-packages/requests/models.py", line 757, in generate raise ConnectionError(e) requests.exceptions.ConnectionError: HTTPConnectionPool(host='192.168.1.1', port=80): Read timed out. I've just added a try-except around the post. * Update device_tracker.py Addressed blank line issue reported by flake8 * Update device_tracker.py Fixed alignment to be Black compliant. * Update device_tracker.py Fixed one more alignment issue
106 lines
3.2 KiB
Python
106 lines
3.2 KiB
Python
"""Support for Swisscom routers (Internet-Box)."""
|
|
import logging
|
|
|
|
from aiohttp.hdrs import CONTENT_TYPE
|
|
import requests
|
|
import voluptuous as vol
|
|
|
|
from homeassistant.components.device_tracker import (
|
|
DOMAIN,
|
|
PLATFORM_SCHEMA,
|
|
DeviceScanner,
|
|
)
|
|
from homeassistant.const import CONF_HOST
|
|
import homeassistant.helpers.config_validation as cv
|
|
|
|
_LOGGER = logging.getLogger(__name__)
|
|
|
|
DEFAULT_IP = "192.168.1.1"
|
|
|
|
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
|
|
{vol.Optional(CONF_HOST, default=DEFAULT_IP): cv.string}
|
|
)
|
|
|
|
|
|
def get_scanner(hass, config):
|
|
"""Return the Swisscom device scanner."""
|
|
scanner = SwisscomDeviceScanner(config[DOMAIN])
|
|
|
|
return scanner if scanner.success_init else None
|
|
|
|
|
|
class SwisscomDeviceScanner(DeviceScanner):
|
|
"""This class queries a router running Swisscom Internet-Box firmware."""
|
|
|
|
def __init__(self, config):
|
|
"""Initialize the scanner."""
|
|
self.host = config[CONF_HOST]
|
|
self.last_results = {}
|
|
|
|
# Test the router is accessible.
|
|
data = self.get_swisscom_data()
|
|
self.success_init = data is not None
|
|
|
|
def scan_devices(self):
|
|
"""Scan for new devices and return a list with found device IDs."""
|
|
self._update_info()
|
|
return [client["mac"] for client in self.last_results]
|
|
|
|
def get_device_name(self, device):
|
|
"""Return the name of the given device or None if we don't know."""
|
|
if not self.last_results:
|
|
return None
|
|
for client in self.last_results:
|
|
if client["mac"] == device:
|
|
return client["host"]
|
|
return None
|
|
|
|
def _update_info(self):
|
|
"""Ensure the information from the Swisscom router is up to date.
|
|
|
|
Return boolean if scanning successful.
|
|
"""
|
|
if not self.success_init:
|
|
return False
|
|
|
|
_LOGGER.info("Loading data from Swisscom Internet Box")
|
|
data = self.get_swisscom_data()
|
|
if not data:
|
|
return False
|
|
|
|
active_clients = [client for client in data.values() if client["status"]]
|
|
self.last_results = active_clients
|
|
return True
|
|
|
|
def get_swisscom_data(self):
|
|
"""Retrieve data from Swisscom and return parsed result."""
|
|
url = f"http://{self.host}/ws"
|
|
headers = {CONTENT_TYPE: "application/x-sah-ws-4-call+json"}
|
|
data = """
|
|
{"service":"Devices", "method":"get",
|
|
"parameters":{"expression":"lan and not self"}}"""
|
|
|
|
devices = {}
|
|
|
|
try:
|
|
request = requests.post(url, headers=headers, data=data, timeout=10)
|
|
except (
|
|
requests.exceptions.ConnectionError,
|
|
requests.exceptions.Timeout,
|
|
requests.exceptions.ConnectTimeout,
|
|
):
|
|
_LOGGER.info("No response from Swisscom Internet Box")
|
|
return devices
|
|
|
|
for device in request.json()["status"]:
|
|
try:
|
|
devices[device["Key"]] = {
|
|
"ip": device["IPAddress"],
|
|
"mac": device["PhysAddress"],
|
|
"host": device["Name"],
|
|
"status": device["Active"],
|
|
}
|
|
except (KeyError, requests.exceptions.RequestException):
|
|
pass
|
|
return devices
|