Fix version conflicts

Author: pvizeli

API.md

@@ -331,6 +331,10 @@ Image with `null` and last_version with `null` reset this options.
 
 Proxy to real home-assistant instance.
 
+- GET `/homeassistant/websocket`
+
+Proxy to real websocket instance.
+
 ### RESTful for API addons
 
 - GET `/addons`
@@ -373,6 +377,7 @@ Get all available addons.
 {
     "name": "xy bla",
     "description": "description",
+    "long_description": "null|markdown",
     "auto_update": "bool",
     "url": "null|url of addon",
     "detached": "bool",

hassio/addons/addon.py

@@ -137,6 +137,7 @@ def auto_update(self):
         """Return if auto update is enable."""
         if ATTR_AUTO_UPDATE in self.data.user.get(self._id, {}):
             return self.data.user[self._id][ATTR_AUTO_UPDATE]
+        return None
 
     @auto_update.setter
     def auto_update(self, value):
@@ -159,12 +160,26 @@ def api_token(self):
         """Return a API token for this add-on."""
         if self.is_installed:
             return self.data.user[self._id][ATTR_UUID]
+        return None
 
     @property
     def description(self):
         """Return description of addon."""
         return self._mesh[ATTR_DESCRIPTON]
 
+    @property
+    def long_description(self):
+        """Return README.md as long_description."""
+        readme = Path(self.path_location, 'README.md')
+
+        # If readme not exists
+        if not readme.exists():
+            return None
+
+        # Return data
+        with readme.open('r') as readme_file:
+            return readme_file.read()
+
     @property
     def repository(self):
         """Return repository of addon."""
@@ -333,7 +348,7 @@ def audio_output(self, value):
     def audio_input(self):
         """Return ALSA config for input or None."""
         if not self.with_audio:
-            return
+            return None
 
         setting = self.config.audio_input
         if self.is_installed and ATTR_AUDIO_INPUT in self.data.user[self._id]:

hassio/addons/build.py

@@ -1,7 +1,7 @@
 """HassIO addons build environment."""
 from pathlib import Path
 
-from .validate import SCHEMA_BUILD_CONFIG
+from .validate import SCHEMA_BUILD_CONFIG, BASE_IMAGE
 from ..const import ATTR_SQUASH, ATTR_BUILD_FROM, ATTR_ARGS, META_ADDON
 from ..tools import JsonConfig
 
@@ -24,7 +24,8 @@ def save(self):
     @property
     def base_image(self):
         """Base images for this addon."""
-        return self._data[ATTR_BUILD_FROM][self.config.arch]
+        return self._data[ATTR_BUILD_FROM].get(
+            self.config.arch, BASE_IMAGE[self.config.arch])
 
     @property
     def squash(self):

hassio/addons/built-in.json

@@ -2,7 +2,7 @@
     "local": {
         "name": "Local Add-Ons",
         "url": "https://home-assistant.io/hassio",
-        "maintainer": "By our self"
+        "maintainer": "you"
     },
     "core": {
         "name": "Built-in Add-Ons",

hassio/addons/validate.py

@@ -219,6 +219,7 @@ def validate(struct):
 
 
 # pylint: disable=no-value-for-parameter
+# pylint: disable=inconsistent-return-statements
 def _single_validate(typ, value, key):
     """Validate a single element."""
     # if required argument

hassio/api/__init__.py

@@ -8,6 +8,7 @@
 from .homeassistant import APIHomeAssistant
 from .host import APIHost
 from .network import APINetwork
+from .proxy import APIProxy
 from .supervisor import APISupervisor
 from .security import APISecurity
 from .snapshots import APISnapshots
@@ -63,9 +64,9 @@ def register_supervisor(self, supervisor, snapshots, addons, host_control,
             '/supervisor/options', api_supervisor.options)
         self.webapp.router.add_get('/supervisor/logs', api_supervisor.logs)
 
-    def register_homeassistant(self, dock_homeassistant):
+    def register_homeassistant(self, homeassistant):
         """Register homeassistant function."""
-        api_hass = APIHomeAssistant(self.config, self.loop, dock_homeassistant)
+        api_hass = APIHomeAssistant(self.config, self.loop, homeassistant)
 
         self.webapp.router.add_get('/homeassistant/info', api_hass.info)
         self.webapp.router.add_get('/homeassistant/logs', api_hass.logs)
@@ -75,10 +76,21 @@ def register_homeassistant(self, dock_homeassistant):
         self.webapp.router.add_post('/homeassistant/stop', api_hass.stop)
         self.webapp.router.add_post('/homeassistant/start', api_hass.start)
         self.webapp.router.add_post('/homeassistant/check', api_hass.check)
+
+    def register_proxy(self, homeassistant, websession):
+        """Register HomeAssistant API Proxy."""
+        api_proxy = APIProxy(self.loop, homeassistant, websession)
+
+        self.webapp.router.add_get(
+            '/homeassistant/api/websocket', api_proxy.websocket)
+        self.webapp.router.add_get(
+            '/homeassistant/websocket', api_proxy.websocket)
         self.webapp.router.add_post(
-            '/homeassistant/api/{path:.+}', api_hass.api)
+            '/homeassistant/api/{path:.+}', api_proxy.api)
+        self.webapp.router.add_get(
+            '/homeassistant/api/{path:.+}', api_proxy.api)
         self.webapp.router.add_get(
-            '/homeassistant/api/{path:.+}', api_hass.api)
+            '/homeassistant/api', api_proxy.api)
 
     def register_addons(self, addons):
         """Register homeassistant function."""

hassio/api/addons.py

@@ -14,7 +14,7 @@
     ATTR_INSTALLED, ATTR_LOGO, ATTR_WEBUI, ATTR_DEVICES, ATTR_PRIVILEGED,
     ATTR_AUDIO, ATTR_AUDIO_INPUT, ATTR_AUDIO_OUTPUT, ATTR_HASSIO_API,
     ATTR_GPIO, ATTR_HOMEASSISTANT_API, ATTR_STDIN, BOOT_AUTO, BOOT_MANUAL,
-    ATTR_CHANGELOG, ATTR_HOST_IPC, ATTR_HOST_DBUS,
+    ATTR_CHANGELOG, ATTR_HOST_IPC, ATTR_HOST_DBUS, ATTR_LONG_DESCRIPTION,
     CONTENT_TYPE_PNG, CONTENT_TYPE_BINARY, CONTENT_TYPE_TEXT)
 from ..validate import DOCKER_PORTS
 
@@ -57,7 +57,7 @@ def _pretty_devices(addon):
         """Return a simplified device list."""
         dev_list = addon.devices
         if not dev_list:
-            return
+            return None
         return [row.split(':')[0] for row in dev_list]
 
     @api_process
@@ -108,6 +108,7 @@ async def info(self, request):
         return {
             ATTR_NAME: addon.name,
             ATTR_DESCRIPTON: addon.description,
+            ATTR_LONG_DESCRIPTION: addon.long_description,
             ATTR_VERSION: addon.version_installed,
             ATTR_AUTO_UPDATE: addon.auto_update,
             ATTR_REPOSITORY: addon.repository,

hassio/api/homeassistant.py

@@ -2,18 +2,13 @@
 import asyncio
 import logging
 
-import aiohttp
-from aiohttp import web
-from aiohttp.web_exceptions import HTTPBadGateway
-from aiohttp.hdrs import CONTENT_TYPE
-import async_timeout
 import voluptuous as vol
 
 from .util import api_process, api_process_raw, api_validate
 from ..const import (
     ATTR_VERSION, ATTR_LAST_VERSION, ATTR_DEVICES, ATTR_IMAGE, ATTR_CUSTOM,
     ATTR_BOOT, ATTR_PORT, ATTR_PASSWORD, ATTR_SSL, ATTR_WATCHDOG,
-    CONTENT_TYPE_BINARY, HEADER_HA_ACCESS)
+    CONTENT_TYPE_BINARY)
 from ..validate import HASS_DEVICES, NETWORK_PORT
 
 _LOGGER = logging.getLogger(__name__)
@@ -46,45 +41,6 @@ def __init__(self, config, loop, homeassistant):
         self.loop = loop
         self.homeassistant = homeassistant
 
-    async def homeassistant_proxy(self, path, request):
-        """Return a client request with proxy origin for Home-Assistant."""
-        url = "{}/api/{}".format(self.homeassistant.api_url, path)
-
-        try:
-            data = None
-            headers = {}
-            method = getattr(
-                self.homeassistant.websession, request.method.lower())
-
-            # read data
-            with async_timeout.timeout(10, loop=self.loop):
-                data = await request.read()
-
-            if data:
-                headers.update({CONTENT_TYPE: request.content_type})
-
-            # need api password?
-            if self.homeassistant.api_password:
-                headers = {HEADER_HA_ACCESS: self.homeassistant.api_password}
-
-            # reset headers
-            if not headers:
-                headers = None
-
-            client = await method(
-                url, data=data, headers=headers, timeout=300
-            )
-
-            return client
-
-        except aiohttp.ClientError as err:
-            _LOGGER.error("Client error on api %s request %s.", path, err)
-
-        except asyncio.TimeoutError:
-            _LOGGER.error("Client timeout error on api request %s.", path)
-
-        raise HTTPBadGateway()
-
     @api_process
     async def info(self, request):
         """Return host information."""
@@ -169,14 +125,3 @@ async def check(self, request):
             raise RuntimeError(message)
 
         return True
-
-    async def api(self, request):
-        """Proxy API request to Home-Assistant."""
-        path = request.match_info.get('path')
-
-        client = await self.homeassistant_proxy(path, request)
-        return web.Response(
-            body=await client.read(),
-            status=client.status,
-            content_type=client.content_type
-        )