Fix version conflict

* Read version from AWS

* Update const.py

* Update updater.py

* Update updater.py

* Update updater.py

* Update updater.py

* Update updater.py

* Update const.py

* Update updater.py

.github/move.yml

@@ -0,0 +1,13 @@
+# Configuration for move-issues - https://github.com/dessant/move-issues
+
+# Delete the command comment. Ignored when the comment also contains other content
+deleteCommand: true
+# Close the source issue after moving
+closeSourceIssue: true
+# Lock the source issue after moving
+lockSourceIssue: false
+# Set custom aliases for targets
+# aliases:
+#   r: repo
+#   or: owner/repo
+

API.md

@@ -4,7 +4,7 @@
 
 Interface for Home Assistant to control things from supervisor.
 
-On error:
+On error / Code 400:
 
 ```json
 {
@@ -13,7 +13,7 @@ On error:
 }
 ```
 
-On success:
+On success / Code 200:
 
 ```json
 {
@@ -22,6 +22,8 @@ On success:
 }
 ```
 
+For access to API you need set the `X-HASSIO-KEY` they will be available for Add-ons/HomeAssistant with envoriment `HASSIO_TOKEN`.
+
 ### Hass.io
 
 - GET `/supervisor/ping`
@@ -34,8 +36,9 @@ The addons from `addons` are only installed one.
     "version": "INSTALL_VERSION",
     "last_version": "LAST_VERSION",
     "arch": "armhf|aarch64|i386|amd64",
-    "beta_channel": "true|false",
+    "channel": "stable|beta|dev",
     "timezone": "TIMEZONE",
+    "wait_boot": "int",
     "addons": [
         {
             "name": "xy bla",
@@ -44,6 +47,7 @@ The addons from `addons` are only installed one.
             "repository": "12345678|null",
             "version": "LAST_VERSION",
             "installed": "INSTALL_VERSION",
+            "icon": "bool",
             "logo": "bool",
             "state": "started|stopped",
         }
@@ -68,8 +72,9 @@ Optional:
 
 ```json
 {
-    "beta_channel": "true|false",
+    "channel": "stable|beta|dev",
     "timezone": "TIMEZONE",
+    "wait_boot": "int",
     "addons_repositories": [
         "REPO_URL"
     ]
@@ -84,44 +89,20 @@ Reload addons/version.
 
 Output is the raw docker log.
 
-### Security
+- GET `/supervisor/stats`
-
-- GET `/security/info`
-
 ```json
 {
-    "initialize": "bool",
+    "cpu_percent": 0.0,
-    "totp": "bool"
+    "memory_usage": 283123,
+    "memory_limit": 329392,
+    "network_tx": 0,
+    "network_rx": 0,
+    "blk_read": 0,
+    "blk_write": 0
 }
 ```
 
-- POST `/security/options`
+### Snapshot
-
-```json
-{
-    "password": "xy"
-}
-```
-
-- POST `/security/totp`
-
-```json
-{
-    "password": "xy"
-}
-```
-
-Return QR-Code
-
-- POST `/security/session`
-```json
-{
-    "password": "xy",
-    "totp": "null|123456"
-}
-```
-
-### Backup/Snapshot
 
 - GET `/snapshots`
 
@@ -131,7 +112,9 @@ Return QR-Code
         {
             "slug": "SLUG",
             "date": "ISO",
-            "name": "Custom name"
+            "name": "Custom name",
+            "type": "full|partial",
+            "protected": "bool"
         }
     ]
 }
@@ -139,11 +122,28 @@ Return QR-Code
 
 - POST `/snapshots/reload`
 
+- POST `/snapshots/new/upload`
+
+return:
+```json
+{
+    "slug": ""
+}
+```
+
 - POST `/snapshots/new/full`
 
 ```json
 {
-    "name": "Optional"
+    "name": "Optional",
+    "password": "Optional"
+}
+```
+
+return:
+```json
+{
+    "slug": ""
 }
 ```
 
@@ -153,7 +153,15 @@ Return QR-Code
 {
     "name": "Optional",
     "addons": ["ADDON_SLUG"],
-    "folders": ["FOLDER_NAME"]
+    "folders": ["FOLDER_NAME"],
+    "password": "Optional"
+}
+```
+
+return:
+```json
+{
+    "slug": ""
 }
 ```
 
@@ -168,15 +176,14 @@ Return QR-Code
     "name": "custom snapshot name / description",
     "date": "ISO",
     "size": "SIZE_IN_MB",
-    "homeassistant": {
+    "protected": "bool",
-      "version": "INSTALLED_HASS_VERSION",
+    "homeassistant": "version",
-      "devices": []
-    },
     "addons": [
         {
             "slug": "ADDON_SLUG",
             "name": "NAME",
-            "version": "INSTALLED_VERSION"
+            "version": "INSTALLED_VERSION",
+            "size": "SIZE_IN_MB"
         }
     ],
     "repositories": ["URL"],
@@ -185,36 +192,49 @@ Return QR-Code
 ```
 
 - POST `/snapshots/{slug}/remove`
+
+- GET `/snapshots/{slug}/download`
+
 - POST `/snapshots/{slug}/restore/full`
+
+```json
+{
+    "password": "Optional"
+}
+```
+
 - POST `/snapshots/{slug}/restore/partial`
 
 ```json
 {
     "homeassistant": "bool",
     "addons": ["ADDON_SLUG"],
-    "folders": ["FOLDER_NAME"]
+    "folders": ["FOLDER_NAME"],
+    "password": "Optional"
 }
 ```
 
 ### Host
 
 - POST `/host/reload`
+
 - POST `/host/shutdown`
+
 - POST `/host/reboot`
+
 - GET `/host/info`
 
 ```json
 {
-    "type": "",
+    "hostname": "hostname|null",
-    "version": "",
+    "features": ["shutdown", "reboot", "update", "hostname"],
-    "last_version": "",
+    "operating_system": "Hass.io-OS XY|Ubuntu 16.4|null",
-    "features": ["shutdown", "reboot", "update", "hostname", "network_info", "network_control"],
+    "kernel": "4.15.7|null",
-    "hostname": "",
+    "chassis": "specific|null",
-    "os": "",
+    "type": "Hass.io-OS Type|null",
-    "audio": {
+    "deployment": "stable|beta|dev|null",
-        "input": "0,0",
+    "version": "xy|null",
-        "output": "0,0"
+    "last_version": "xy|null",
-    }
 }
 ```
 
@@ -222,11 +242,11 @@ Return QR-Code
 
 ```json
 {
-    "audio_input": "0,0",
+    "hostname": "",
-    "audio_output": "0,0"
 }
 ```
 
+
 - POST `/host/update`
 
 Optional:
@@ -237,12 +257,17 @@ Optional:
 }
 ```
 
-- GET `/host/hardware`
+- POST `/host/reload`
+
+### Hardware
+
+- GET `/hardware/info`
 ```json
 {
     "serial": ["/dev/xy"],
     "input": ["Input device name"],
     "disk": ["/dev/sdax"],
+    "gpio": ["gpiochip0", "gpiochip100"],
     "audio": {
         "CARD_ID": {
             "name": "xy",
@@ -255,21 +280,18 @@ Optional:
 }
 ```
 
-### Network
+- GET `/hardware/audio`
-
-- GET `/network/info`
-
 ```json
 {
-    "hostname": ""
+    "audio": {
-}
+        "input": {
-```
+            "0,0": "Mic"
-
+        },
-- POST `/network/options`
+        "output": {
-
+            "1,0": "Jack",
-```json
+            "1,1": "HDMI"
-{
+        }
-    "hostname": "",
+    }
 }
 ```
 
@@ -281,10 +303,14 @@ Optional:
 {
     "version": "INSTALL_VERSION",
     "last_version": "LAST_VERSION",
-    "devices": [""],
+    "machine": "Image machine type",
     "image": "str",
     "custom": "bool -> if custom image",
-    "boot": "bool"
+    "boot": "bool",
+    "port": 8123,
+    "ssl": "bool",
+    "watchdog": "bool",
+    "startup_time": 600
 }
 ```
 
@@ -303,21 +329,47 @@ Optional:
 Output is the raw Docker log.
 
 - POST `/homeassistant/restart`
-- POST `/homeassistant/options`
 - POST `/homeassistant/check`
 - POST `/homeassistant/start`
 - POST `/homeassistant/stop`
 
+- POST `/homeassistant/options`
+
 ```json
 {
-    "devices": [],
     "image": "Optional|null",
-    "last_version": "Optional for custom image|null"
+    "last_version": "Optional for custom image|null",
+    "port": "port for access hass",
+    "ssl": "bool",
+    "password": "",
+    "watchdog": "bool",
+    "startup_time": 600
 }
 ```
 
 Image with `null` and last_version with `null` reset this options.
 
+- POST/GET `/homeassistant/api`
+
+Proxy to real home-assistant instance.
+
+- GET `/homeassistant/websocket`
+
+Proxy to real websocket instance.
+
+- GET `/homeassistant/stats`
+```json
+{
+    "cpu_percent": 0.0,
+    "memory_usage": 283123,
+    "memory_limit": 329392,
+    "network_tx": 0,
+    "network_rx": 0,
+    "blk_read": 0,
+    "blk_write": 0
+}
+```
+
 ### RESTful for API addons
 
 - GET `/addons`
@@ -337,13 +389,9 @@ Get all available addons.
             "installed": "none|INSTALL_VERSION",
             "detached": "bool",
             "build": "bool",
-            "privileged": ["NET_ADMIN", "SYS_ADMIN"],
-            "devices": ["/dev/xy"],
             "url": "null|url",
-            "logo": "bool",
+            "icon": "bool",
-            "audio": "bool",
+            "logo": "bool"
-            "audio": "bool",
-            "hassio_api": "bool"
         }
     ],
     "repositories": [
@@ -364,7 +412,9 @@ Get all available addons.
 ```json
 {
     "name": "xy bla",
+    "slug": "xdssd_xybla",
     "description": "description",
+    "long_description": "null|markdown",
     "auto_update": "bool",
     "url": "null|url of addon",
     "detached": "bool",
@@ -377,20 +427,35 @@ Get all available addons.
     "options": "{}",
     "network": "{}|null",
     "host_network": "bool",
+    "host_ipc": "bool",
+    "host_dbus": "bool",
     "privileged": ["NET_ADMIN", "SYS_ADMIN"],
+    "seccomp": "disable|default|profile",
+    "apparmor": "disable|default|profile",
     "devices": ["/dev/xy"],
+    "auto_uart": "bool",
+    "icon": "bool",
     "logo": "bool",
+    "changelog": "bool",
     "hassio_api": "bool",
+    "homeassistant_api": "bool",
+    "stdin": "bool",
     "webui": "null|http(s)://[HOST]:port/xy/zx",
     "gpio": "bool",
     "audio": "bool",
     "audio_input": "null|0,0",
-    "audio_output": "null|0,0"
+    "audio_output": "null|0,0",
+    "services": "null|['mqtt']",
+    "discovery": "null|['component/platform']"
 }
 ```
 
+- GET `/addons/{addon}/icon`
+
 - GET `/addons/{addon}/logo`
 
+- GET `/addons/{addon}/changelog`
+
 - POST `/addons/{addon}/options`
 
 ```json
@@ -406,7 +471,7 @@ Get all available addons.
 }
 ```
 
-For reset custom network/audio settings, set it `null`.
+Reset custom network/audio/options, set it `null`.
 
 - POST `/addons/{addon}/start`
 
@@ -414,26 +479,10 @@ For reset custom network/audio settings, set it `null`.
 
 - POST `/addons/{addon}/install`
 
-Optional:
-
-```json
-{
-    "version": "VERSION"
-}
-```
-
 - POST `/addons/{addon}/uninstall`
 
 - POST `/addons/{addon}/update`
 
-Optional:
-
-```json
-{
-    "version": "VERSION"
-}
-```
-
 - GET `/addons/{addon}/logs`
 
 Output is the raw Docker log.
@@ -444,45 +493,117 @@ Output is the raw Docker log.
 
 Only supported for local build addons
 
-## Host Control
+- POST `/addons/{addon}/stdin`
 
-Communicate over UNIX socket with a host daemon.
+Write data to add-on stdin
 
-- commands
+- GET `/addons/{addon}/stats`
-
+```json
-```
+{
-# info
+    "cpu_percent": 0.0,
--> {'type', 'version', 'last_version', 'features', 'hostname'}
+    "memory_usage": 283123,
-# reboot
+    "memory_limit": 329392,
-# shutdown
+    "network_tx": 0,
-# host-update [v]
+    "network_rx": 0,
-
+    "blk_read": 0,
-# hostname xy
+    "blk_write": 0
-
+}
-# network info
--> {}
-# network wlan ssd xy
-# network wlan password xy
-# network int ip xy
-# network int netmask xy
-# network int route xy
 ```
 
-Features:
+### Service discovery
 
-- shutdown
+- GET `/services/discovery`
-- reboot
+```json
-- update
+{
-- hostname
+    "discovery": [
-- network_info
+        {
-- network_control
+            "provider": "name",
-
+            "uuid": "uuid",
-Answer:
+            "component": "component",
-```
+            "platform": "null|platform",
-{}|OK|ERROR|WRONG
+            "config": {}
+        }
+    ]
+}
 ```
 
-- {}: json
+- GET `/services/discovery/{UUID}`
-- OK: call was successfully
+```json
-- ERROR: error on call
+{
-- WRONG: not supported
+    "provider": "name",
+    "uuid": "uuid",
+    "component": "component",
+    "platform": "null|platform",
+    "config": {}
+}
+```
+
+- POST `/services/discovery`
+```json
+{
+    "component": "component",
+    "platform": "null|platform",
+    "config": {}
+}
+```
+
+return:
+```json
+{
+    "uuid": "uuid"
+}
+```
+
+- DEL `/services/discovery/{UUID}`
+
+- GET `/services`
+```json
+{
+    "services": [
+        {
+            "slug": "name",
+            "available": "bool",
+            "provider": "null|name|list"
+        }
+    ]
+}
+```
+
+- GET `/services/xy`
+```json
+{
+    "available": "bool",
+    "xy": {}
+}
+```
+
+#### MQTT
+
+This service perform a auto discovery to Home-Assistant.
+
+- GET `/services/mqtt`
+```json
+{
+    "provider": "name",
+    "host": "xy",
+    "port": "8883",
+    "ssl": "bool",
+    "username": "optional",
+    "password": "optional",
+    "protocol": "3.1.1"
+}
+```
+
+- POST `/services/mqtt`
+```json
+{
+    "host": "xy",
+    "port": "8883",
+    "ssl": "bool|optional",
+    "username": "optional",
+    "password": "optional",
+    "protocol": "3.1.1"
+}
+```
+
+- DEL `/services/mqtt`

Dockerfile

@@ -1,21 +1,28 @@
 ARG BUILD_FROM
 FROM $BUILD_FROM
 
-# add env
+# Add env
 ENV LANG C.UTF-8
 
-# setup base
+# Setup base
-RUN apk add --no-cache python3 python3-dev \
+RUN apk add --no-cache \
-        libressl libressl-dev \
+        python3 \
-        libffi libffi-dev \
+        git \
-        musl musl-dev \
+        socat \
-        gcc libstdc++ \
+        glib \
-        git socat \
+        libstdc++ \
-    && pip3 install --no-cache-dir --upgrade pip \
+        eudev-libs \
-    && pip3 install --no-cache-dir --upgrade cryptography jwcrypto \
+    && apk add --no-cache --virtual .build-dependencies \
-    && apk del python3-dev libressl-dev libffi-dev musl-dev gcc
+        make \
+        python3-dev \
+        g++ \
+    && pip3 install --no-cache-dir \
+        uvloop==0.9.1 \
+        cchardet==2.1.1 \
+        pycryptodome==3.4.11 \
+    && apk del .build-dependencies
 
-# install HassIO
+# Install HassIO
 COPY . /usr/src/hassio
 RUN pip3 install --no-cache-dir /usr/src/hassio \
     && rm -rf /usr/src/hassio

README.md

@@ -1,8 +1,12 @@
 # Hass.io
 
-### First private cloud solution for home automation.
+## First private cloud solution for home automation
 
-Hass.io is a Docker based system for managing your Home Assistant installation and related applications. The system is controlled via Home Assistant which communicates with the supervisor. The supervisor provides an API to manage the installation. This includes changing network settings or installing and updating software.
+Hass.io is a Docker-based system for managing your Home Assistant installation
+and related applications. The system is controlled via Home Assistant which
+communicates with the Supervisor. The Supervisor provides an API to manage the
+installation. This includes changing network settings or installing
+and updating software.
 
 ![](misc/hassio.png?raw=true)
 
@@ -11,4 +15,4 @@ Hass.io is a Docker based system for managing your Home Assistant installation a
 
 ## Installation
 
-Installation instructions can be found at [https://home-assistant.io/hassio](https://home-assistant.io/hassio).
+Installation instructions can be found at <https://home-assistant.io/hassio>.

hassio/__main__.py

@@ -5,41 +5,51 @@ import logging
 import sys
 
 import hassio.bootstrap as bootstrap
-import hassio.core as core
 
 _LOGGER = logging.getLogger(__name__)
 
 
+def attempt_use_uvloop():
+    """Attempt to use uvloop."""
+    try:
+        import uvloop
+        asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
+    except ImportError:
+        pass
+
+
 # pylint: disable=invalid-name
 if __name__ == "__main__":
     bootstrap.initialize_logging()
+    attempt_use_uvloop()
+    loop = asyncio.get_event_loop()
 
     if not bootstrap.check_environment():
-        exit(1)
+        sys.exit(1)
 
-    loop = asyncio.get_event_loop()
+    # init executor pool
     executor = ThreadPoolExecutor(thread_name_prefix="SyncWorker")
     loop.set_default_executor(executor)
 
     _LOGGER.info("Initialize Hassio setup")
-    config = bootstrap.initialize_system_data()
+    coresys = bootstrap.initialize_coresys(loop)
-    hassio = core.HassIO(loop, config)
 
-    bootstrap.migrate_system_env(config)
+    bootstrap.migrate_system_env(coresys)
 
-    _LOGGER.info("Run Hassio setup")
+    _LOGGER.info("Setup HassIO")
-    loop.run_until_complete(hassio.setup())
+    loop.run_until_complete(coresys.core.setup())
 
-    _LOGGER.info("Start Hassio")
+    loop.call_soon_threadsafe(loop.create_task, coresys.core.start())
-    loop.call_soon_threadsafe(loop.create_task, hassio.start())
+    loop.call_soon_threadsafe(bootstrap.reg_signal, loop)
-    loop.call_soon_threadsafe(bootstrap.reg_signal, loop, hassio)
 
-    _LOGGER.info("Run Hassio loop")
+    try:
+        _LOGGER.info("Run HassIO")
         loop.run_forever()
-
+    finally:
-    _LOGGER.info("Cleanup system")
+        _LOGGER.info("Stopping HassIO")
+        loop.run_until_complete(coresys.core.stop())
         executor.shutdown(wait=False)
         loop.close()
 
     _LOGGER.info("Close Hassio")
-    sys.exit(hassio.exit_code)
+    sys.exit(0)

hassio/addons/__init__.py

@@ -4,47 +4,59 @@ import logging
 
 from .addon import Addon
 from .repository import Repository
-from .data import Data
+from .data import AddonsData
-from ..const import REPOSITORY_CORE, REPOSITORY_LOCAL, BOOT_AUTO
+from ..const import REPOSITORY_CORE, REPOSITORY_LOCAL, BOOT_AUTO, STATE_STARTED
+from ..coresys import CoreSysAttributes
 
 _LOGGER = logging.getLogger(__name__)
 
 BUILTIN_REPOSITORIES = set((REPOSITORY_CORE, REPOSITORY_LOCAL))
 
 
-class AddonManager(object):
+class AddonManager(CoreSysAttributes):
     """Manage addons inside HassIO."""
 
-    def __init__(self, config, loop, docker):
+    def __init__(self, coresys):
         """Initialize docker base wrapper."""
-        self.loop = loop
+        self.coresys = coresys
-        self.config = config
+        self.data = AddonsData(coresys)
-        self.docker = docker
+        self.addons_obj = {}
-        self.data = Data(config)
+        self.repositories_obj = {}
-        self.addons = {}
-        self.repositories = {}
 
     @property
     def list_addons(self):
         """Return a list of all addons."""
-        return list(self.addons.values())
+        return list(self.addons_obj.values())
+
+    @property
+    def list_installed(self):
+        """Return a list of installed addons."""
+        return [addon for addon in self.addons_obj.values()
+                if addon.is_installed]
 
     @property
     def list_repositories(self):
         """Return list of addon repositories."""
-        return list(self.repositories.values())
+        return list(self.repositories_obj.values())
 
     def get(self, addon_slug):
-        """Return a adddon from slug."""
+        """Return a add-on from slug."""
-        return self.addons.get(addon_slug)
+        return self.addons_obj.get(addon_slug)
 
-    async def prepare(self):
+    def from_uuid(self, uuid):
+        """Return a add-on from uuid."""
+        for addon in self.list_addons:
+            if addon.is_installed and uuid == addon.uuid:
+                return addon
+        return None
+
+    async def load(self):
         """Startup addon management."""
         self.data.reload()
 
         # init hassio built-in repositories
         repositories = \
-            set(self.config.addons_repositories) | BUILTIN_REPOSITORIES
+            set(self.sys_config.addons_repositories) | BUILTIN_REPOSITORIES
 
         # init custom repositories & load addons
         await self.load_repositories(repositories)
@@ -52,9 +64,9 @@ class AddonManager(object):
     async def reload(self):
         """Update addons from repo and reload list."""
         tasks = [repository.update() for repository in
-                 self.repositories.values()]
+                 self.repositories_obj.values()]
         if tasks:
-            await asyncio.wait(tasks, loop=self.loop)
+            await asyncio.wait(tasks)
 
         # read data from repositories
         self.data.reload()
@@ -65,29 +77,29 @@ class AddonManager(object):
     async def load_repositories(self, list_repositories):
         """Add a new custom repository."""
         new_rep = set(list_repositories)
-        old_rep = set(self.repositories)
+        old_rep = set(self.repositories_obj)
 
         # add new repository
         async def _add_repository(url):
             """Helper function to async add repository."""
-            repository = Repository(self.config, self.loop, self.data, url)
+            repository = Repository(self.coresys, url)
             if not await repository.load():
                 _LOGGER.error("Can't load from repository %s", url)
                 return
-            self.repositories[url] = repository
+            self.repositories_obj[url] = repository
 
             # don't add built-in repository to config
             if url not in BUILTIN_REPOSITORIES:
-                self.config.add_addon_repository(url)
+                self.sys_config.add_addon_repository(url)
 
         tasks = [_add_repository(url) for url in new_rep - old_rep]
         if tasks:
-            await asyncio.wait(tasks, loop=self.loop)
+            await asyncio.wait(tasks)
 
         # del new repository
         for url in old_rep - new_rep - BUILTIN_REPOSITORIES:
-            self.repositories.pop(url).remove()
+            self.repositories_obj.pop(url).remove()
-            self.config.drop_addon_repository(url)
+            self.sys_config.drop_addon_repository(url)
 
         # update data
         self.data.reload()
@@ -98,8 +110,8 @@ class AddonManager(object):
         all_addons = set(self.data.system) | set(self.data.cache)
 
         # calc diff
-        add_addons = all_addons - set(self.addons)
+        add_addons = all_addons - set(self.addons_obj)
-        del_addons = set(self.addons) - all_addons
+        del_addons = set(self.addons_obj) - all_addons
 
         _LOGGER.info("Load addons: %d all - %d new - %d remove",
                      len(all_addons), len(add_addons), len(del_addons))
@@ -107,27 +119,40 @@ class AddonManager(object):
         # new addons
         tasks = []
         for addon_slug in add_addons:
-            addon = Addon(
+            addon = Addon(self.coresys, addon_slug)
-                self.config, self.loop, self.docker, self.data, addon_slug)
 
             tasks.append(addon.load())
-            self.addons[addon_slug] = addon
+            self.addons_obj[addon_slug] = addon
 
         if tasks:
-            await asyncio.wait(tasks, loop=self.loop)
+            await asyncio.wait(tasks)
 
         # remove
         for addon_slug in del_addons:
-            self.addons.pop(addon_slug)
+            self.addons_obj.pop(addon_slug)
 
-    async def auto_boot(self, stage):
+    async def boot(self, stage):
         """Boot addons with mode auto."""
         tasks = []
-        for addon in self.addons.values():
+        for addon in self.addons_obj.values():
             if addon.is_installed and addon.boot == BOOT_AUTO and \
                     addon.startup == stage:
                 tasks.append(addon.start())
 
         _LOGGER.info("Startup %s run %d addons", stage, len(tasks))
         if tasks:
-            await asyncio.wait(tasks, loop=self.loop)
+            await asyncio.wait(tasks)
+            await asyncio.sleep(self.sys_config.wait_boot)
+
+    async def shutdown(self, stage):
+        """Shutdown addons."""
+        tasks = []
+        for addon in self.addons_obj.values():
+            if addon.is_installed and \
+                    await addon.state() == STATE_STARTED and \
+                    addon.startup == stage:
+                tasks.append(addon.stop())
+
+        _LOGGER.info("Shutdown %s stop %d addons", stage, len(tasks))
+        if tasks:
+            await asyncio.wait(tasks)

hassio/addons/addon.py

@@ -1,4 +1,5 @@
 """Init file for HassIO addons."""
+from contextlib import suppress
 from copy import deepcopy
 import logging
 import json
@@ -8,48 +9,49 @@ import shutil
 import tarfile
 from tempfile import TemporaryDirectory
 
-from deepmerge import Merger
 import voluptuous as vol
 from voluptuous.humanize import humanize_error
 
 from .validate import (
-    validate_options, SCHEMA_ADDON_SNAPSHOT, RE_VOLUME)
+    validate_options, SCHEMA_ADDON_SNAPSHOT, RE_VOLUME, RE_SERVICE)
+from .utils import check_installed
 from ..const import (
     ATTR_NAME, ATTR_VERSION, ATTR_SLUG, ATTR_DESCRIPTON, ATTR_BOOT, ATTR_MAP,
     ATTR_OPTIONS, ATTR_PORTS, ATTR_SCHEMA, ATTR_IMAGE, ATTR_REPOSITORY,
     ATTR_URL, ATTR_ARCH, ATTR_LOCATON, ATTR_DEVICES, ATTR_ENVIRONMENT,
-    ATTR_HOST_NETWORK, ATTR_TMPFS, ATTR_PRIVILEGED, ATTR_STARTUP,
+    ATTR_HOST_NETWORK, ATTR_TMPFS, ATTR_PRIVILEGED, ATTR_STARTUP, ATTR_UUID,
     STATE_STARTED, STATE_STOPPED, STATE_NONE, ATTR_USER, ATTR_SYSTEM,
     ATTR_STATE, ATTR_TIMEOUT, ATTR_AUTO_UPDATE, ATTR_NETWORK, ATTR_WEBUI,
     ATTR_HASSIO_API, ATTR_AUDIO, ATTR_AUDIO_OUTPUT, ATTR_AUDIO_INPUT,
-    ATTR_GPIO)
+    ATTR_GPIO, ATTR_HOMEASSISTANT_API, ATTR_STDIN, ATTR_LEGACY, ATTR_HOST_IPC,
-from .util import check_installed
+    ATTR_HOST_DBUS, ATTR_AUTO_UART, ATTR_DISCOVERY, ATTR_SERVICES,
-from ..dock.addon import DockerAddon
+    ATTR_SECCOMP, ATTR_APPARMOR, SECURITY_PROFILE, SECURITY_DISABLE,
-from ..tools import write_json_file, read_json_file
+    SECURITY_DEFAULT)
+from ..coresys import CoreSysAttributes
+from ..docker.addon import DockerAddon
+from ..utils.json import write_json_file, read_json_file
 
 _LOGGER = logging.getLogger(__name__)
 
-RE_WEBUI = re.compile(r"^(.*\[HOST\]:)\[PORT:(\d+)\](.*)$")
+RE_WEBUI = re.compile(
-
+    r"^(?:(?P<s_prefix>https?)|\[PROTO:(?P<t_proto>\w+)\])"
-MERGE_OPT = Merger([(dict, ['merge'])], ['override'], ['override'])
+    r":\/\/\[HOST\]:\[PORT:(?P<t_port>\d+)\](?P<s_suffix>.*)$")
 
 
-class Addon(object):
+class Addon(CoreSysAttributes):
     """Hold data for addon inside HassIO."""
 
-    def __init__(self, config, loop, docker, data, slug):
+    def __init__(self, coresys, slug):
         """Initialize data holder."""
-        self.loop = loop
+        self.coresys = coresys
-        self.config = config
+        self.instance = DockerAddon(coresys, slug)
-        self.data = data
-        self._id = slug
 
-        self.docker = DockerAddon(config, loop, docker, self)
+        self._id = slug
 
     async def load(self):
         """Async initialize of object."""
         if self.is_installed:
-            await self.docker.attach()
+            await self.instance.attach()
 
     @property
     def slug(self):
@@ -59,90 +61,96 @@ class Addon(object):
     @property
     def _mesh(self):
         """Return addon data from system or cache."""
-        return self.data.system.get(self._id, self.data.cache.get(self._id))
+        return self._data.system.get(self._id, self._data.cache.get(self._id))
+
+    @property
+    def _data(self):
+        """Return addons data storage."""
+        return self.sys_addons.data
 
     @property
     def is_installed(self):
         """Return True if a addon is installed."""
-        return self._id in self.data.system
+        return self._id in self._data.system
 
     @property
     def is_detached(self):
         """Return True if addon is detached."""
-        return self._id not in self.data.cache
+        return self._id not in self._data.cache
 
     @property
     def version_installed(self):
         """Return installed version."""
-        return self.data.user.get(self._id, {}).get(ATTR_VERSION)
+        return self._data.user.get(self._id, {}).get(ATTR_VERSION)
 
     def _set_install(self, version):
         """Set addon as installed."""
-        self.data.system[self._id] = deepcopy(self.data.cache[self._id])
+        self._data.system[self._id] = deepcopy(self._data.cache[self._id])
-        self.data.user[self._id] = {
+        self._data.user[self._id] = {
             ATTR_OPTIONS: {},
             ATTR_VERSION: version,
         }
-        self.data.save()
+        self._data.save_data()
 
     def _set_uninstall(self):
         """Set addon as uninstalled."""
-        self.data.system.pop(self._id, None)
+        self._data.system.pop(self._id, None)
-        self.data.user.pop(self._id, None)
+        self._data.user.pop(self._id, None)
-        self.data.save()
+        self._data.save_data()
 
     def _set_update(self, version):
         """Update version of addon."""
-        self.data.system[self._id] = deepcopy(self.data.cache[self._id])
+        self._data.system[self._id] = deepcopy(self._data.cache[self._id])
-        self.data.user[self._id][ATTR_VERSION] = version
+        self._data.user[self._id][ATTR_VERSION] = version
-        self.data.save()
+        self._data.save_data()
 
     def _restore_data(self, user, system):
         """Restore data to addon."""
-        self.data.user[self._id] = deepcopy(user)
+        self._data.user[self._id] = deepcopy(user)
-        self.data.system[self._id] = deepcopy(system)
+        self._data.system[self._id] = deepcopy(system)
-        self.data.save()
+        self._data.save_data()
 
     @property
     def options(self):
         """Return options with local changes."""
         if self.is_installed:
-            return MERGE_OPT.merge(
+            return {
-                self.data.system[self._id][ATTR_OPTIONS],
+                **self._data.system[self._id][ATTR_OPTIONS],
-                self.data.user[self._id][ATTR_OPTIONS],
+                **self._data.user[self._id][ATTR_OPTIONS]
-            )
+            }
-        return self.data.cache[self._id][ATTR_OPTIONS]
+        return self._data.cache[self._id][ATTR_OPTIONS]
 
     @options.setter
     def options(self, value):
         """Store user addon options."""
-        self.data.user[self._id][ATTR_OPTIONS] = deepcopy(value)
+        if value is None:
-        self.data.save()
+            self._data.user[self._id][ATTR_OPTIONS] = {}
+        else:
+            self._data.user[self._id][ATTR_OPTIONS] = deepcopy(value)
 
     @property
     def boot(self):
         """Return boot config with prio local settings."""
-        if ATTR_BOOT in self.data.user.get(self._id, {}):
+        if ATTR_BOOT in self._data.user.get(self._id, {}):
-            return self.data.user[self._id][ATTR_BOOT]
+            return self._data.user[self._id][ATTR_BOOT]
         return self._mesh[ATTR_BOOT]
 
     @boot.setter
     def boot(self, value):
         """Store user boot options."""
-        self.data.user[self._id][ATTR_BOOT] = value
+        self._data.user[self._id][ATTR_BOOT] = value
-        self.data.save()
 
     @property
     def auto_update(self):
         """Return if auto update is enable."""
-        if ATTR_AUTO_UPDATE in self.data.user.get(self._id, {}):
+        if ATTR_AUTO_UPDATE in self._data.user.get(self._id, {}):
-            return self.data.user[self._id][ATTR_AUTO_UPDATE]
+            return self._data.user[self._id][ATTR_AUTO_UPDATE]
+        return None
 
     @auto_update.setter
     def auto_update(self, value):
         """Set auto update."""
-        self.data.user[self._id][ATTR_AUTO_UPDATE] = value
+        self._data.user[self._id][ATTR_AUTO_UPDATE] = value
-        self.data.save()
 
     @property
     def name(self):
@@ -154,11 +162,31 @@ class Addon(object):
         """Return timeout of addon for docker stop."""
         return self._mesh[ATTR_TIMEOUT]
 
+    @property
+    def uuid(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."""
@@ -167,8 +195,8 @@ class Addon(object):
     @property
     def last_version(self):
         """Return version of addon."""
-        if self._id in self.data.cache:
+        if self._id in self._data.cache:
-            return self.data.cache[self._id][ATTR_VERSION]
+            return self._data.cache[self._id][ATTR_VERSION]
         return self.version_installed
 
     @property
@@ -176,6 +204,26 @@ class Addon(object):
         """Return startup type of addon."""
         return self._mesh.get(ATTR_STARTUP)
 
+    @property
+    def services(self):
+        """Return dict of services with rights."""
+        raw_services = self._mesh.get(ATTR_SERVICES)
+        if not raw_services:
+            return None
+
+        formated_services = {}
+        for data in raw_services:
+            service = RE_SERVICE.match(data)
+            formated_services[service.group('service')] = \
+                service.group('rights') or 'ro'
+
+        return formated_services
+
+    @property
+    def discovery(self):
+        """Return list of discoverable components/platforms."""
+        return self._mesh.get(ATTR_DISCOVERY)
+
     @property
     def ports(self):
         """Return ports of addon."""
@@ -183,54 +231,79 @@ class Addon(object):
             return None
 
         if not self.is_installed or \
-                ATTR_NETWORK not in self.data.user[self._id]:
+                ATTR_NETWORK not in self._data.user[self._id]:
             return self._mesh[ATTR_PORTS]
-        return self.data.user[self._id][ATTR_NETWORK]
+        return self._data.user[self._id][ATTR_NETWORK]
 
     @ports.setter
     def ports(self, value):
         """Set custom ports of addon."""
         if value is None:
-            self.data.user[self._id].pop(ATTR_NETWORK, None)
+            self._data.user[self._id].pop(ATTR_NETWORK, None)
         else:
             new_ports = {}
             for container_port, host_port in value.items():
                 if container_port in self._mesh.get(ATTR_PORTS, {}):
                     new_ports[container_port] = host_port
 
-            self.data.user[self._id][ATTR_NETWORK] = new_ports
+            self._data.user[self._id][ATTR_NETWORK] = new_ports
-
-        self.data.save()
 
     @property
     def webui(self):
         """Return URL to webui or None."""
         if ATTR_WEBUI not in self._mesh:
             return None
+        webui = RE_WEBUI.match(self._mesh[ATTR_WEBUI])
 
-        webui = self._mesh[ATTR_WEBUI]
+        # extract arguments
-        dock_port = RE_WEBUI.sub(r"\2", webui)
+        t_port = webui.group('t_port')
+        t_proto = webui.group('t_proto')
+        s_prefix = webui.group('s_prefix') or ""
+        s_suffix = webui.group('s_suffix') or ""
+
+        # search host port for this docker port
         if self.ports is None:
-            real_port = dock_port
+            port = t_port
         else:
-            real_port = self.ports.get("{}/tcp".format(dock_port), dock_port)
+            port = self.ports.get(f"{t_port}/tcp", t_port)
 
         # for interface config or port lists
-        if isinstance(real_port, (tuple, list)):
+        if isinstance(port, (tuple, list)):
-            real_port = real_port[-1]
+            port = port[-1]
 
-        return RE_WEBUI.sub(r"\g<1>{}\g<3>".format(real_port), webui)
+        # lookup the correct protocol from config
+        if t_proto:
+            proto = 'https' if self.options[t_proto] else 'http'
+        else:
+            proto = s_prefix
+
+        return f"{proto}://[HOST]:{port}{s_suffix}"
 
     @property
     def host_network(self):
         """Return True if addon run on host network."""
         return self._mesh[ATTR_HOST_NETWORK]
 
+    @property
+    def host_ipc(self):
+        """Return True if addon run on host IPC namespace."""
+        return self._mesh[ATTR_HOST_IPC]
+
+    @property
+    def host_dbus(self):
+        """Return True if addon run on host DBUS."""
+        return self._mesh[ATTR_HOST_DBUS]
+
     @property
     def devices(self):
         """Return devices of addon."""
         return self._mesh.get(ATTR_DEVICES)
 
+    @property
+    def auto_uart(self):
+        """Return True if we should map all uart device."""
+        return self._mesh.get(ATTR_AUTO_UART)
+
     @property
     def tmpfs(self):
         """Return tmpfs of addon."""
@@ -247,10 +320,43 @@ class Addon(object):
         return self._mesh.get(ATTR_PRIVILEGED)
 
     @property
-    def use_hassio_api(self):
+    def seccomp(self):
+        """Return True if seccomp is enabled."""
+        if not self._mesh.get(ATTR_SECCOMP):
+            return SECURITY_DISABLE
+        elif self.path_seccomp.exists():
+            return SECURITY_PROFILE
+        return SECURITY_DEFAULT
+
+    @property
+    def apparmor(self):
+        """Return True if seccomp is enabled."""
+        if not self._mesh.get(ATTR_APPARMOR):
+            return SECURITY_DISABLE
+        elif self.path_apparmor.exists():
+            return SECURITY_PROFILE
+        return SECURITY_DEFAULT
+
+    @property
+    def legacy(self):
+        """Return if the add-on don't support hass labels."""
+        return self._mesh.get(ATTR_LEGACY)
+
+    @property
+    def access_hassio_api(self):
         """Return True if the add-on access to hassio api."""
         return self._mesh[ATTR_HASSIO_API]
 
+    @property
+    def access_homeassistant_api(self):
+        """Return True if the add-on access to Home-Assistant api proxy."""
+        return self._mesh[ATTR_HOMEASSISTANT_API]
+
+    @property
+    def with_stdin(self):
+        """Return True if the add-on access use stdin input."""
+        return self._mesh[ATTR_STDIN]
+
     @property
     def with_gpio(self):
         """Return True if the add-on access to gpio interface."""
@@ -267,50 +373,57 @@ class Addon(object):
         if not self.with_audio:
             return None
 
-        setting = self.config.audio_output
+        if self.is_installed and \
-        if self.is_installed and ATTR_AUDIO_OUTPUT in self.data.user[self._id]:
+                ATTR_AUDIO_OUTPUT in self._data.user[self._id]:
-            setting = self.data.user[self._id][ATTR_AUDIO_OUTPUT]
+            return self._data.user[self._id][ATTR_AUDIO_OUTPUT]
-        return setting
+        return self.sys_host.alsa.default.output
 
     @audio_output.setter
     def audio_output(self, value):
-        """Set/remove custom audio output settings."""
+        """Set/reset audio output settings."""
         if value is None:
-            self.data.user[self._id].pop(ATTR_AUDIO_OUTPUT, None)
+            self._data.user[self._id].pop(ATTR_AUDIO_OUTPUT, None)
         else:
-            self.data.user[self._id][ATTR_AUDIO_OUTPUT] = value
+            self._data.user[self._id][ATTR_AUDIO_OUTPUT] = value
-        self.data.save()
 
     @property
     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]:
-        if self.is_installed and ATTR_AUDIO_INPUT in self.data.user[self._id]:
+            return self._data.user[self._id][ATTR_AUDIO_INPUT]
-            setting = self.data.user[self._id][ATTR_AUDIO_INPUT]
+        return self.sys_host.alsa.default.input
-        return setting
 
     @audio_input.setter
     def audio_input(self, value):
-        """Set/remove custom audio input settings."""
+        """Set/reset audio input settings."""
         if value is None:
-            self.data.user[self._id].pop(ATTR_AUDIO_INPUT, None)
+            self._data.user[self._id].pop(ATTR_AUDIO_INPUT, None)
         else:
-            self.data.user[self._id][ATTR_AUDIO_INPUT] = value
+            self._data.user[self._id][ATTR_AUDIO_INPUT] = value
-        self.data.save()
 
     @property
     def url(self):
         """Return url of addon."""
         return self._mesh.get(ATTR_URL)
 
+    @property
+    def with_icon(self):
+        """Return True if a icon exists."""
+        return self.path_icon.exists()
+
     @property
     def with_logo(self):
         """Return True if a logo exists."""
         return self.path_logo.exists()
 
+    @property
+    def with_changelog(self):
+        """Return True if a changelog exists."""
+        return self.path_changelog.exists()
+
     @property
     def supported_arch(self):
         """Return list of supported arch."""
@@ -323,11 +436,11 @@ class Addon(object):
 
         # Repository with dockerhub images
         if ATTR_IMAGE in addon_data:
-            return addon_data[ATTR_IMAGE].format(arch=self.config.arch)
+            return addon_data[ATTR_IMAGE].format(arch=self.sys_arch)
 
         # local build
         return "{}/{}-addon-{}".format(
-            addon_data[ATTR_REPOSITORY], self.config.arch,
+            addon_data[ATTR_REPOSITORY], self.sys_arch,
             addon_data[ATTR_SLUG])
 
     @property
@@ -348,12 +461,12 @@ class Addon(object):
     @property
     def path_data(self):
         """Return addon data path inside supervisor."""
-        return Path(self.config.path_addons_data, self._id)
+        return Path(self.sys_config.path_addons_data, self._id)
 
     @property
     def path_extern_data(self):
         """Return addon data path external for docker."""
-        return PurePath(self.config.path_extern_addons_data, self._id)
+        return PurePath(self.sys_config.path_extern_addons_data, self._id)
 
     @property
     def path_options(self):
@@ -365,11 +478,45 @@ class Addon(object):
         """Return path to this addon."""
         return Path(self._mesh[ATTR_LOCATON])
 
+    @property
+    def path_icon(self):
+        """Return path to addon icon."""
+        return Path(self.path_location, 'icon.png')
+
     @property
     def path_logo(self):
         """Return path to addon logo."""
         return Path(self.path_location, 'logo.png')
 
+    @property
+    def path_changelog(self):
+        """Return path to addon changelog."""
+        return Path(self.path_location, 'CHANGELOG.md')
+
+    @property
+    def path_seccomp(self):
+        """Return path to custom seccomp profile."""
+        return Path(self.path_location, 'seccomp.json')
+
+    @property
+    def path_apparmor(self):
+        """Return path to custom AppArmor profile."""
+        return Path(self.path_location, 'apparmor')
+
+    @property
+    def path_asound(self):
+        """Return path to asound config."""
+        return Path(self.sys_config.path_tmp, f"{self.slug}_asound")
+
+    @property
+    def path_extern_asound(self):
+        """Return path to asound config for docker."""
+        return Path(self.sys_config.path_extern_tmp, f"{self.slug}_asound")
+
+    def save_data(self):
+        """Save data of addon."""
+        self.sys_addons.data.save_data()
+
     def write_options(self):
         """Return True if addon options is written to data."""
         schema = self.schema
@@ -377,13 +524,31 @@ class Addon(object):
 
         try:
             schema(options)
-            return write_json_file(self.path_options, options)
+            write_json_file(self.path_options, options)
         except vol.Invalid as ex:
-            _LOGGER.error("Addon %s have wrong options -> %s", self._id,
+            _LOGGER.error("Addon %s have wrong options: %s", self._id,
                           humanize_error(options, ex))
+        except (OSError, json.JSONDecodeError) as err:
+            _LOGGER.error("Addon %s can't write options: %s", self._id, err)
+        else:
+            return True
 
         return False
 
+    def write_asound(self):
+        """Write asound config to file and return True on success."""
+        asound_config = self.sys_host.alsa.asound(
+            alsa_input=self.audio_input, alsa_output=self.audio_output)
+
+        try:
+            with self.path_asound.open('w') as config_file:
+                config_file.write(asound_config)
+        except OSError as err:
+            _LOGGER.error("Addon %s can't write asound: %s", self._id, err)
+            return False
+
+        return True
+
     @property
     def schema(self):
         """Create a schema for addon options."""
@@ -399,8 +564,8 @@ class Addon(object):
             return True
 
         # load next schema
-        new_raw_schema = self.data.cache[self._id][ATTR_SCHEMA]
+        new_raw_schema = self._data.cache[self._id][ATTR_SCHEMA]
-        default_options = self.data.cache[self._id][ATTR_OPTIONS]
+        default_options = self._data.cache[self._id][ATTR_OPTIONS]
 
         # if disabled
         if isinstance(new_raw_schema, bool):
@@ -408,7 +573,7 @@ class Addon(object):
 
         # merge options
         options = {
-            **self.data.user[self._id][ATTR_OPTIONS],
+            **self._data.user[self._id][ATTR_OPTIONS],
             **default_options,
         }
 
@@ -423,11 +588,11 @@ class Addon(object):
             return False
         return True
 
-    async def install(self, version=None):
+    async def install(self):
         """Install a addon."""
-        if self.config.arch not in self.supported_arch:
+        if self.sys_arch not in self.supported_arch:
             _LOGGER.error(
-                "Addon %s not supported on %s", self._id, self.config.arch)
+                "Addon %s not supported on %s", self._id, self.sys_arch)
             return False
 
         if self.is_installed:
@@ -439,17 +604,16 @@ class Addon(object):
                 "Create Home-Assistant addon data folder %s", self.path_data)
             self.path_data.mkdir()
 
-        version = version or self.last_version
+        if not await self.instance.install(self.last_version):
-        if not await self.docker.install(version):
             return False
 
-        self._set_install(version)
+        self._set_install(self.last_version)
         return True
 
     @check_installed
     async def uninstall(self):
         """Remove a addon."""
-        if not await self.docker.remove():
+        if not await self.instance.remove():
             return False
 
         if self.path_data.is_dir():
@@ -457,6 +621,11 @@ class Addon(object):
                 "Remove Home-Assistant addon data folder %s", self.path_data)
             shutil.rmtree(str(self.path_data))
 
+        # Cleanup audio settings
+        if self.path_asound.exists():
+            with suppress(OSError):
+                self.path_asound.unlink()
+
         self._set_uninstall()
         return True
 
@@ -465,17 +634,22 @@ class Addon(object):
         if not self.is_installed:
             return STATE_NONE
 
-        if await self.docker.is_running():
+        if await self.instance.is_running():
             return STATE_STARTED
         return STATE_STOPPED
 
     @check_installed
-    def start(self):
+    async def start(self):
-        """Set options and start addon.
+        """Set options and start addon."""
+        # Options
+        if not self.write_options():
+            return False
 
-        Return a coroutine.
+        # Sound
-        """
+        if self.with_audio and not self.write_asound():
-        return self.docker.run()
+            return False
+
+        return await self.instance.run()
 
     @check_installed
     def stop(self):
@@ -483,35 +657,31 @@ class Addon(object):
 
         Return a coroutine.
         """
-        return self.docker.stop()
+        return self.instance.stop()
 
     @check_installed
-    async def update(self, version=None):
+    async def update(self):
         """Update addon."""
-        version = version or self.last_version
         last_state = await self.state()
 
-        if version == self.version_installed:
+        if self.last_version == self.version_installed:
-            _LOGGER.warning(
+            _LOGGER.warning("No update available for Addon %s", self._id)
-                "Addon %s is already installed in %s", self._id, version)
             return False
 
-        if not await self.docker.update(version):
+        if not await self.instance.update(self.last_version):
             return False
-        self._set_update(version)
+        self._set_update(self.last_version)
 
         # restore state
         if last_state == STATE_STARTED:
-            await self.docker.run()
+            await self.start()
         return True
 
     @check_installed
-    def restart(self):
+    async def restart(self):
-        """Restart addon.
+        """Restart addon."""
-
+        await self.stop()
-        Return a coroutine.
+        return await self.start()
-        """
-        return self.docker.restart()
 
     @check_installed
     def logs(self):
@@ -519,7 +689,15 @@ class Addon(object):
 
         Return a coroutine.
         """
-        return self.docker.logs()
+        return self.instance.logs()
+
+    @check_installed
+    def stats(self):
+        """Return stats of container.
+
+        Return a coroutine.
+        """
+        return self.instance.stats()
 
     @check_installed
     async def rebuild(self):
@@ -531,51 +709,64 @@ class Addon(object):
             return False
 
         # remove docker container but not addon config
-        if not await self.docker.remove():
+        if not await self.instance.remove():
             return False
 
-        if not await self.docker.install(self.version_installed):
+        if not await self.instance.install(self.version_installed):
             return False
 
         # restore state
         if last_state == STATE_STARTED:
-            await self.docker.run()
+            await self.start()
         return True
 
+    @check_installed
+    async def write_stdin(self, data):
+        """Write data to add-on stdin.
+
+        Return a coroutine.
+        """
+        if not self.with_stdin:
+            _LOGGER.error("Add-on don't support write to stdin!")
+            return False
+
+        return await self.instance.write_stdin(data)
+
     @check_installed
     async def snapshot(self, tar_file):
         """Snapshot a state of a addon."""
-        with TemporaryDirectory(dir=str(self.config.path_tmp)) as temp:
+        with TemporaryDirectory(dir=str(self.sys_config.path_tmp)) as temp:
             # store local image
             if self.need_build and not await \
-                    self.docker.export_image(Path(temp, "image.tar")):
+                    self.instance.export_image(Path(temp, "image.tar")):
                 return False
 
             data = {
-                ATTR_USER: self.data.user.get(self._id, {}),
+                ATTR_USER: self._data.user.get(self._id, {}),
-                ATTR_SYSTEM: self.data.system.get(self._id, {}),
+                ATTR_SYSTEM: self._data.system.get(self._id, {}),
                 ATTR_VERSION: self.version_installed,
                 ATTR_STATE: await self.state(),
             }
 
             # store local configs/state
-            if not write_json_file(Path(temp, "addon.json"), data):
+            try:
-                _LOGGER.error("Can't write addon.json for %s", self._id)
+                write_json_file(Path(temp, "addon.json"), data)
+            except (OSError, json.JSONDecodeError) as err:
+                _LOGGER.error("Can't save meta for %s: %s", self._id, err)
                 return False
 
             # write into tarfile
-            def _create_tar():
+            def _write_tarfile():
                 """Write tar inside loop."""
-                with tarfile.open(tar_file, "w:gz",
+                with tar_file as snapshot:
-                                  compresslevel=1) as snapshot:
                     snapshot.add(temp, arcname=".")
                     snapshot.add(self.path_data, arcname="data")
 
             try:
                 _LOGGER.info("Build snapshot for addon %s", self._id)
-                await self.loop.run_in_executor(None, _create_tar)
+                await self.sys_run_in_executor(_write_tarfile)
-            except tarfile.TarError as err:
+            except (tarfile.TarError, OSError) as err:
-                _LOGGER.error("Can't write tarfile %s -> %s", tar_file, err)
+                _LOGGER.error("Can't write tarfile %s: %s", tar_file, err)
                 return False
 
         _LOGGER.info("Finish snapshot for addon %s", self._id)
@@ -583,47 +774,50 @@ class Addon(object):
 
     async def restore(self, tar_file):
         """Restore a state of a addon."""
-        with TemporaryDirectory(dir=str(self.config.path_tmp)) as temp:
+        with TemporaryDirectory(dir=str(self.sys_config.path_tmp)) as temp:
             # extract snapshot
-            def _extract_tar():
+            def _extract_tarfile():
                 """Extract tar snapshot."""
-                with tarfile.open(tar_file, "r:gz") as snapshot:
+                with tar_file as snapshot:
                     snapshot.extractall(path=Path(temp))
 
             try:
-                await self.loop.run_in_executor(None, _extract_tar)
+                await self.sys_run_in_executor(_extract_tarfile)
             except tarfile.TarError as err:
-                _LOGGER.error("Can't read tarfile %s -> %s", tar_file, err)
+                _LOGGER.error("Can't read tarfile %s: %s", tar_file, err)
                 return False
 
             # read snapshot data
             try:
                 data = read_json_file(Path(temp, "addon.json"))
             except (OSError, json.JSONDecodeError) as err:
-                _LOGGER.error("Can't read addon.json -> %s", err)
+                _LOGGER.error("Can't read addon.json: %s", err)
 
             # validate
             try:
                 data = SCHEMA_ADDON_SNAPSHOT(data)
             except vol.Invalid as err:
-                _LOGGER.error("Can't validate %s, snapshot data -> %s",
+                _LOGGER.error("Can't validate %s, snapshot data: %s",
                               self._id, humanize_error(data, err))
                 return False
 
             # restore data / reload addon
+            _LOGGER.info("Restore config for addon %s", self._id)
             self._restore_data(data[ATTR_USER], data[ATTR_SYSTEM])
 
             # check version / restore image
             version = data[ATTR_VERSION]
-            if version != self.docker.version:
+            if not await self.instance.exists():
+                _LOGGER.info("Restore image for addon %s", self._id)
+
                 image_file = Path(temp, "image.tar")
                 if image_file.is_file():
-                    await self.docker.import_image(image_file, version)
+                    await self.instance.import_image(image_file, version)
                 else:
-                    if await self.docker.install(version):
+                    if await self.instance.install(version):
-                        await self.docker.cleanup()
+                        await self.instance.cleanup()
             else:
-                await self.docker.stop()
+                await self.instance.stop()
 
             # restore data
             def _restore_data():
@@ -634,9 +828,9 @@ class Addon(object):
 
             try:
                 _LOGGER.info("Restore data for addon %s", self._id)
-                await self.loop.run_in_executor(None, _restore_data)
+                await self.sys_run_in_executor(_restore_data)
             except shutil.Error as err:
-                _LOGGER.error("Can't restore origin data -> %s", err)
+                _LOGGER.error("Can't restore origin data: %s", err)
                 return False
 
             # run addon

hassio/addons/build.py

@@ -1,30 +1,37 @@
 """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
+from ..coresys import CoreSysAttributes
+from ..utils.json import JsonConfig
 
 
-class AddonBuild(JsonConfig):
+class AddonBuild(JsonConfig, CoreSysAttributes):
     """Handle build options for addons."""
 
-    def __init__(self, config, addon):
+    def __init__(self, coresys, slug):
         """Initialize addon builder."""
-        self.config = config
+        self.coresys = coresys
-        self.addon = addon
+        self._id = slug
 
         super().__init__(
-            Path(addon.path_location, 'build.json'), SCHEMA_BUILD_CONFIG)
+            Path(self.addon.path_location, 'build.json'), SCHEMA_BUILD_CONFIG)
 
-    def save(self):
+    def save_data(self):
         """Ignore save function."""
         pass
 
+    @property
+    def addon(self):
+        """Return addon of build data."""
+        return self.sys_addons.get(self._id)
+
     @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.sys_arch, BASE_IMAGE[self.sys_arch])
 
     @property
     def squash(self):
@@ -40,21 +47,21 @@ class AddonBuild(JsonConfig):
         """Create a dict with docker build arguments."""
         args = {
             'path': str(self.addon.path_location),
-            'tag': "{}:{}".format(self.addon.image, version),
+            'tag': f"{self.addon.image}:{version}",
             'pull': True,
             'forcerm': True,
             'squash': self.squash,
             'labels': {
                 'io.hass.version': version,
-                'io.hass.arch': self.config.arch,
+                'io.hass.arch': self.sys_arch,
                 'io.hass.type': META_ADDON,
-                'io.hass.name': self.addon.name,
+                'io.hass.name': self._fix_label('name'),
-                'io.hass.description': self.addon.description,
+                'io.hass.description': self._fix_label('description'),
             },
             'buildargs': {
                 'BUILD_FROM': self.base_image,
                 'BUILD_VERSION': version,
-                'BUILD_ARCH': self.config.arch,
+                'BUILD_ARCH': self.sys_arch,
                 **self.additional_args,
             }
         }
@@ -63,3 +70,8 @@ class AddonBuild(JsonConfig):
             args['labels']['io.hass.url'] = self.addon.url
 
         return args
+
+    def _fix_label(self, label_name):
+        """Remove characters they are not supported."""
+        label = getattr(self.addon, label_name, "")
+        return label.replace("'", "")

hassio/addons/built-in.json

@@ -1,12 +1,12 @@
 {
     "local": {
-        "name": "Local Add-Ons",
+        "name": "Local add-ons",
         "url": "https://home-assistant.io/hassio",
-        "maintainer": "By our self"
+        "maintainer": "you"
     },
     "core": {
-        "name": "Built-in Add-Ons",
+        "name": "Official add-ons",
         "url": "https://home-assistant.io/addons",
-        "maintainer": "Home Assistant authors"
+        "maintainer": "Home Assistant"
     }
 }

hassio/addons/data.py

@@ -7,24 +7,25 @@ from pathlib import Path
 import voluptuous as vol
 from voluptuous.humanize import humanize_error
 
-from .util import extract_hash_from_path
+from .utils import extract_hash_from_path
 from .validate import (
-    SCHEMA_ADDON_CONFIG, SCHEMA_ADDON_FILE, SCHEMA_REPOSITORY_CONFIG)
+    SCHEMA_ADDON_CONFIG, SCHEMA_ADDONS_FILE, SCHEMA_REPOSITORY_CONFIG)
 from ..const import (
     FILE_HASSIO_ADDONS, ATTR_VERSION, ATTR_SLUG, ATTR_REPOSITORY, ATTR_LOCATON,
     REPOSITORY_CORE, REPOSITORY_LOCAL, ATTR_USER, ATTR_SYSTEM)
-from ..tools import JsonConfig, read_json_file
+from ..coresys import CoreSysAttributes
+from ..utils.json import JsonConfig, read_json_file
 
 _LOGGER = logging.getLogger(__name__)
 
 
-class Data(JsonConfig):
+class AddonsData(JsonConfig, CoreSysAttributes):
     """Hold data for addons inside HassIO."""
 
-    def __init__(self, config):
+    def __init__(self, coresys):
         """Initialize data holder."""
-        super().__init__(FILE_HASSIO_ADDONS, SCHEMA_ADDON_FILE)
+        super().__init__(FILE_HASSIO_ADDONS, SCHEMA_ADDONS_FILE)
-        self.config = config
+        self.coresys = coresys
         self._repositories = {}
         self._cache = {}
 
@@ -55,17 +56,17 @@ class Data(JsonConfig):
 
         # read core repository
         self._read_addons_folder(
-            self.config.path_addons_core, REPOSITORY_CORE)
+            self.sys_config.path_addons_core, REPOSITORY_CORE)
 
         # read local repository
         self._read_addons_folder(
-            self.config.path_addons_local, REPOSITORY_LOCAL)
+            self.sys_config.path_addons_local, REPOSITORY_LOCAL)
 
         # add built-in repositories information
         self._set_builtin_repositories()
 
         # read custom git repositories
-        for repository_element in self.config.path_addons_git.iterdir():
+        for repository_element in self.sys_config.path_addons_git.iterdir():
             if repository_element.is_dir():
                 self._read_git_repository(repository_element)
 
@@ -118,7 +119,7 @@ class Data(JsonConfig):
                 _LOGGER.warning("Can't read %s", addon)
 
             except vol.Invalid as ex:
-                _LOGGER.warning("Can't read %s -> %s", addon,
+                _LOGGER.warning("Can't read %s: %s", addon,
                                 humanize_error(addon_config, ex))
 
     def _set_builtin_repositories(self):
@@ -127,7 +128,7 @@ class Data(JsonConfig):
             builtin_file = Path(__file__).parent.joinpath('built-in.json')
             builtin_data = read_json_file(builtin_file)
         except (OSError, json.JSONDecodeError) as err:
-            _LOGGER.warning("Can't read built-in.json -> %s", err)
+            _LOGGER.warning("Can't read built-in json: %s", err)
             return
 
         # core repository
@@ -158,4 +159,4 @@ class Data(JsonConfig):
                     have_change = True
 
         if have_change:
-            self.save()
+            self.save_data()

hassio/addons/git.py

@@ -7,33 +7,45 @@ import shutil
 
 import git
 
-from .util import get_hash_from_repository
+from .utils import get_hash_from_repository
-from ..const import URL_HASSIO_ADDONS
+from ..const import URL_HASSIO_ADDONS, ATTR_URL, ATTR_BRANCH
+from ..coresys import CoreSysAttributes
+from ..validate import RE_REPOSITORY
 
 _LOGGER = logging.getLogger(__name__)
 
 
-class GitRepo(object):
+class GitRepo(CoreSysAttributes):
     """Manage addons git repo."""
 
-    def __init__(self, config, loop, path, url):
+    def __init__(self, coresys, path, url):
         """Initialize git base wrapper."""
-        self.config = config
+        self.coresys = coresys
-        self.loop = loop
         self.repo = None
         self.path = path
-        self.url = url
+        self.lock = asyncio.Lock(loop=coresys.loop)
-        self._lock = asyncio.Lock(loop=loop)
+
+        self._data = RE_REPOSITORY.match(url).groupdict()
+
+    @property
+    def url(self):
+        """Return repository URL."""
+        return self._data[ATTR_URL]
+
+    @property
+    def branch(self):
+        """Return repository branch."""
+        return self._data[ATTR_BRANCH]
 
     async def load(self):
         """Init git addon repo."""
         if not self.path.is_dir():
             return await self.clone()
 
-        async with self._lock:
+        async with self.lock:
             try:
                 _LOGGER.info("Load addon %s repository", self.path)
-                self.repo = await self.loop.run_in_executor(
+                self.repo = await self.sys_loop.run_in_executor(
                     None, git.Repo, str(self.path))
 
             except (git.InvalidGitRepositoryError, git.NoSuchPathError,
@@ -45,13 +57,21 @@ class GitRepo(object):
 
     async def clone(self):
         """Clone git addon repo."""
-        async with self._lock:
+        async with self.lock:
+            git_args = {
+                attribute: value
+                for attribute, value in (
+                    ('recursive', True),
+                    ('branch', self.branch)
+                ) if value is not None
+            }
+
             try:
                 _LOGGER.info("Clone addon %s repository", self.url)
-                self.repo = await self.loop.run_in_executor(
+                self.repo = await self.sys_run_in_executor(ft.partial(
-                    None, ft.partial(
                     git.Repo.clone_from, self.url, str(self.path),
-                        recursive=True))
+                    **git_args
+                ))
 
             except (git.InvalidGitRepositoryError, git.NoSuchPathError,
                     git.GitCommandError) as err:
@@ -62,14 +82,14 @@ class GitRepo(object):
 
     async def pull(self):
         """Pull git addon repo."""
-        if self._lock.locked():
+        if self.lock.locked():
             _LOGGER.warning("It is already a task in progress.")
             return False
 
-        async with self._lock:
+        async with self.lock:
             try:
                 _LOGGER.info("Pull addon %s repository", self.url)
-                await self.loop.run_in_executor(
+                await self.sys_loop.run_in_executor(
                     None, self.repo.remotes.origin.pull)
 
             except (git.InvalidGitRepositoryError, git.NoSuchPathError,
@@ -83,20 +103,22 @@ class GitRepo(object):
 class GitRepoHassIO(GitRepo):
     """HassIO addons repository."""
 
-    def __init__(self, config, loop):
+    def __init__(self, coresys):
         """Initialize git hassio addon repository."""
         super().__init__(
-            config, loop, config.path_addons_core, URL_HASSIO_ADDONS)
+            coresys, coresys.config.path_addons_core, URL_HASSIO_ADDONS)
 
 
 class GitRepoCustom(GitRepo):
     """Custom addons repository."""
 
-    def __init__(self, config, loop, url):
+    def __init__(self, coresys, url):
         """Initialize git hassio addon repository."""
-        path = Path(config.path_addons_git, get_hash_from_repository(url))
+        path = Path(
+            coresys.config.path_addons_git,
+            get_hash_from_repository(url))
 
-        super().__init__(config, loop, path, url)
+        super().__init__(coresys, path, url)
 
     def remove(self):
         """Remove a custom addon."""

hassio/addons/repository.py

@@ -1,18 +1,19 @@
 """Represent a HassIO repository."""
 from .git import GitRepoHassIO, GitRepoCustom
-from .util import get_hash_from_repository
+from .utils import get_hash_from_repository
 from ..const import (
     REPOSITORY_CORE, REPOSITORY_LOCAL, ATTR_NAME, ATTR_URL, ATTR_MAINTAINER)
+from ..coresys import CoreSysAttributes
 
 UNKNOWN = 'unknown'
 
 
-class Repository(object):
+class Repository(CoreSysAttributes):
     """Repository in HassIO."""
 
-    def __init__(self, config, loop, data, repository):
+    def __init__(self, coresys, repository):
         """Initialize repository object."""
-        self.data = data
+        self.coresys = coresys
         self.source = None
         self.git = None
 
@@ -20,16 +21,16 @@ class Repository(object):
             self._id = repository
         elif repository == REPOSITORY_CORE:
             self._id = repository
-            self.git = GitRepoHassIO(config, loop)
+            self.git = GitRepoHassIO(coresys)
         else:
             self._id = get_hash_from_repository(repository)
-            self.git = GitRepoCustom(config, loop, repository)
+            self.git = GitRepoCustom(coresys, repository)
             self.source = repository
 
     @property
     def _mesh(self):
         """Return data struct repository."""
-        return self.data.repositories.get(self._id, {})
+        return self.sys_addons.data.repositories.get(self._id, {})
 
     @property
     def slug(self):

hassio/addons/validate.py

@@ -1,5 +1,7 @@
 """Validate addons options schema."""
+import logging
 import re
+import uuid
 
 import voluptuous as vol
 
@@ -11,14 +13,20 @@ from ..const import (
     ATTR_ARCH, ATTR_DEVICES, ATTR_ENVIRONMENT, ATTR_HOST_NETWORK, ARCH_ARMHF,
     ARCH_AARCH64, ARCH_AMD64, ARCH_I386, ATTR_TMPFS, ATTR_PRIVILEGED,
     ATTR_USER, ATTR_STATE, ATTR_SYSTEM, STATE_STARTED, STATE_STOPPED,
-    ATTR_LOCATON, ATTR_REPOSITORY, ATTR_TIMEOUT, ATTR_NETWORK,
+    ATTR_LOCATON, ATTR_REPOSITORY, ATTR_TIMEOUT, ATTR_NETWORK, ATTR_UUID,
-    ATTR_AUTO_UPDATE, ATTR_WEBUI, ATTR_AUDIO, ATTR_AUDIO_INPUT,
+    ATTR_AUTO_UPDATE, ATTR_WEBUI, ATTR_AUDIO, ATTR_AUDIO_INPUT, ATTR_HOST_IPC,
     ATTR_AUDIO_OUTPUT, ATTR_HASSIO_API, ATTR_BUILD_FROM, ATTR_SQUASH,
-    ATTR_ARGS, ATTR_GPIO)
+    ATTR_ARGS, ATTR_GPIO, ATTR_HOMEASSISTANT_API, ATTR_STDIN, ATTR_LEGACY,
-from ..validate import NETWORK_PORT, DOCKER_PORTS, ALSA_CHANNEL
+    ATTR_HOST_DBUS, ATTR_AUTO_UART, ATTR_SERVICES, ATTR_DISCOVERY,
+    ATTR_SECCOMP, ATTR_APPARMOR)
+from ..validate import NETWORK_PORT, DOCKER_PORTS, ALSA_DEVICE
+
+_LOGGER = logging.getLogger(__name__)
 
 
 RE_VOLUME = re.compile(r"^(config|ssl|addons|backup|share)(?::(rw|:ro))?$")
+RE_SERVICE = re.compile(r"^(?P<service>mqtt)(?::(?P<rights>rw|:ro))?$")
+RE_DISCOVERY = re.compile(r"^(?P<component>\w*)(?:/(?P<platform>\w*>))?$")
 
 V_STR = 'str'
 V_INT = 'int'
@@ -35,7 +43,7 @@ RE_SCHEMA_ELEMENT = re.compile(
     r"|int(?:\((?P<i_min>\d+)?,(?P<i_max>\d+)?\))?"
     r"|float(?:\((?P<f_min>[\d\.]+)?,(?P<f_max>[\d\.]+)?\))?"
     r"|match\((?P<match>.*)\)"
-    r")$"
+    r")\??$"
 )
 
 SCHEMA_ELEMENT = vol.Match(RE_SCHEMA_ELEMENT)
@@ -52,7 +60,10 @@ STARTUP_ALL = [
 PRIVILEGED_ALL = [
     "NET_ADMIN",
     "SYS_ADMIN",
-    "SYS_RAWIO"
+    "SYS_RAWIO",
+    "IPC_LOCK",
+    "SYS_TIME",
+    "SYS_NICE"
 ]
 
 BASE_IMAGE = {
@@ -86,27 +97,42 @@ SCHEMA_ADDON_CONFIG = vol.Schema({
         vol.In([BOOT_AUTO, BOOT_MANUAL]),
     vol.Optional(ATTR_PORTS): DOCKER_PORTS,
     vol.Optional(ATTR_WEBUI):
-        vol.Match(r"^(?:https?):\/\/\[HOST\]:\[PORT:\d+\].*$"),
+        vol.Match(r"^(?:https?|\[PROTO:\w+\]):\/\/\[HOST\]:\[PORT:\d+\].*$"),
     vol.Optional(ATTR_HOST_NETWORK, default=False): vol.Boolean(),
+    vol.Optional(ATTR_HOST_IPC, default=False): vol.Boolean(),
+    vol.Optional(ATTR_HOST_DBUS, default=False): vol.Boolean(),
     vol.Optional(ATTR_DEVICES): [vol.Match(r"^(.*):(.*):([rwm]{1,3})$")],
+    vol.Optional(ATTR_AUTO_UART, default=False): vol.Boolean(),
     vol.Optional(ATTR_TMPFS):
         vol.Match(r"^size=(\d)*[kmg](,uid=\d{1,4})?(,rw)?$"),
-    vol.Optional(ATTR_MAP, default=[]): [vol.Match(RE_VOLUME)],
+    vol.Optional(ATTR_MAP, default=list): [vol.Match(RE_VOLUME)],
     vol.Optional(ATTR_ENVIRONMENT): {vol.Match(r"\w*"): vol.Coerce(str)},
     vol.Optional(ATTR_PRIVILEGED): [vol.In(PRIVILEGED_ALL)],
+    vol.Optional(ATTR_SECCOMP, default=True): vol.Boolean(),
+    vol.Optional(ATTR_APPARMOR, default=True): vol.Boolean(),
     vol.Optional(ATTR_AUDIO, default=False): vol.Boolean(),
     vol.Optional(ATTR_GPIO, default=False): vol.Boolean(),
     vol.Optional(ATTR_HASSIO_API, default=False): vol.Boolean(),
+    vol.Optional(ATTR_HOMEASSISTANT_API, default=False): vol.Boolean(),
+    vol.Optional(ATTR_STDIN, default=False): vol.Boolean(),
+    vol.Optional(ATTR_LEGACY, default=False): vol.Boolean(),
+    vol.Optional(ATTR_SERVICES): [vol.Match(RE_SERVICE)],
+    vol.Optional(ATTR_DISCOVERY): [vol.Match(RE_DISCOVERY)],
     vol.Required(ATTR_OPTIONS): dict,
     vol.Required(ATTR_SCHEMA): vol.Any(vol.Schema({
         vol.Coerce(str): vol.Any(SCHEMA_ELEMENT, [
-            vol.Any(SCHEMA_ELEMENT, {vol.Coerce(str): SCHEMA_ELEMENT})
+            vol.Any(
-        ], vol.Schema({vol.Coerce(str): SCHEMA_ELEMENT}))
+                SCHEMA_ELEMENT,
+                {vol.Coerce(str): vol.Any(SCHEMA_ELEMENT, [SCHEMA_ELEMENT])}
+            ),
+        ], vol.Schema({
+            vol.Coerce(str): vol.Any(SCHEMA_ELEMENT, [SCHEMA_ELEMENT])
+        }))
     }), False),
-    vol.Optional(ATTR_IMAGE): vol.Match(r"^[\-\w{}]+/[\-\w{}]+$"),
+    vol.Optional(ATTR_IMAGE): vol.Match(r"^[\w{}]+/[\-\w{}]+$"),
     vol.Optional(ATTR_TIMEOUT, default=10):
-        vol.All(vol.Coerce(int), vol.Range(min=10, max=120))
+        vol.All(vol.Coerce(int), vol.Range(min=10, max=120)),
-})
+}, extra=vol.REMOVE_EXTRA)
 
 
 # pylint: disable=no-value-for-parameter
@@ -114,32 +140,34 @@ SCHEMA_REPOSITORY_CONFIG = vol.Schema({
     vol.Required(ATTR_NAME): vol.Coerce(str),
     vol.Optional(ATTR_URL): vol.Url(),
     vol.Optional(ATTR_MAINTAINER): vol.Coerce(str),
-})
+}, extra=vol.REMOVE_EXTRA)
 
 
 # pylint: disable=no-value-for-parameter
 SCHEMA_BUILD_CONFIG = vol.Schema({
     vol.Optional(ATTR_BUILD_FROM, default=BASE_IMAGE): vol.Schema({
-        vol.In(ARCH_ALL): vol.Match(r"^[\-\w{}]+/[\-\w{}]+:[\-\w{}]+$"),
+        vol.In(ARCH_ALL): vol.Match(r"(?:^[\w{}]+/)?[\-\w{}]+:[\.\-\w{}]+$"),
     }),
     vol.Optional(ATTR_SQUASH, default=False): vol.Boolean(),
-    vol.Optional(ATTR_ARGS, default={}): vol.Schema({
+    vol.Optional(ATTR_ARGS, default=dict): vol.Schema({
         vol.Coerce(str): vol.Coerce(str)
     }),
-})
+}, extra=vol.REMOVE_EXTRA)
 
 
 # pylint: disable=no-value-for-parameter
 SCHEMA_ADDON_USER = vol.Schema({
     vol.Required(ATTR_VERSION): vol.Coerce(str),
-    vol.Optional(ATTR_OPTIONS, default={}): dict,
+    vol.Optional(ATTR_UUID, default=lambda: uuid.uuid4().hex):
+        vol.Match(r"^[0-9a-f]{32}$"),
+    vol.Optional(ATTR_OPTIONS, default=dict): dict,
     vol.Optional(ATTR_AUTO_UPDATE, default=False): vol.Boolean(),
     vol.Optional(ATTR_BOOT):
         vol.In([BOOT_AUTO, BOOT_MANUAL]),
     vol.Optional(ATTR_NETWORK): DOCKER_PORTS,
-    vol.Optional(ATTR_AUDIO_OUTPUT): ALSA_CHANNEL,
+    vol.Optional(ATTR_AUDIO_OUTPUT): ALSA_DEVICE,
-    vol.Optional(ATTR_AUDIO_INPUT): ALSA_CHANNEL,
+    vol.Optional(ATTR_AUDIO_INPUT): ALSA_DEVICE,
-})
+}, extra=vol.REMOVE_EXTRA)
 
 
 SCHEMA_ADDON_SYSTEM = SCHEMA_ADDON_CONFIG.extend({
@@ -148,11 +176,11 @@ SCHEMA_ADDON_SYSTEM = SCHEMA_ADDON_CONFIG.extend({
 })
 
 
-SCHEMA_ADDON_FILE = vol.Schema({
+SCHEMA_ADDONS_FILE = vol.Schema({
-    vol.Optional(ATTR_USER, default={}): {
+    vol.Optional(ATTR_USER, default=dict): {
         vol.Coerce(str): SCHEMA_ADDON_USER,
     },
-    vol.Optional(ATTR_SYSTEM, default={}): {
+    vol.Optional(ATTR_SYSTEM, default=dict): {
         vol.Coerce(str): SCHEMA_ADDON_SYSTEM,
     }
 })
@@ -163,7 +191,7 @@ SCHEMA_ADDON_SNAPSHOT = vol.Schema({
     vol.Required(ATTR_SYSTEM): SCHEMA_ADDON_SYSTEM,
     vol.Required(ATTR_STATE): vol.In([STATE_STARTED, STATE_STOPPED]),
     vol.Required(ATTR_VERSION): vol.Coerce(str),
-})
+}, extra=vol.REMOVE_EXTRA)
 
 
 def validate_options(raw_schema):
@@ -174,8 +202,10 @@ def validate_options(raw_schema):
 
         # read options
         for key, value in struct.items():
+            # Ignore unknown options / remove from list
             if key not in raw_schema:
-                raise vol.Invalid("Unknown options {}.".format(key))
+                _LOGGER.warning("Unknown options %s", key)
+                continue
 
             typ = raw_schema[key]
             try:
@@ -189,21 +219,21 @@ def validate_options(raw_schema):
                     # normal value
                     options[key] = _single_validate(typ, value, key)
             except (IndexError, KeyError):
-                raise vol.Invalid(
+                raise vol.Invalid(f"Type error for {key}") from None
-                    "Type error for {}.".format(key)) from None
 
+        _check_missing_options(raw_schema, options, 'root')
         return options
 
     return validate
 
 
 # pylint: disable=no-value-for-parameter
+# pylint: disable=inconsistent-return-statements
 def _single_validate(typ, value, key):
     """Validate a single element."""
-    try:
     # if required argument
     if value is None:
-            raise vol.Invalid("Missing required option '{}'.".format(key))
+        raise vol.Invalid(f"Missing required option '{key}'")
 
     # parse extend data from type
     match = RE_SCHEMA_ELEMENT.match(typ)
@@ -232,10 +262,7 @@ def _single_validate(typ, value, key):
     elif typ.startswith(V_MATCH):
         return vol.Match(match.group('match'))(str(value))
 
-        raise vol.Invalid("Fatal error for {} type {}".format(key, typ))
+    raise vol.Invalid(f"Fatal error for {key} type {typ}")
-    except ValueError:
-        raise vol.Invalid(
-            "Type {} error for '{}' on {}.".format(typ, value, key)) from None
 
 
 def _nested_validate_list(typ, data_list, key):
@@ -243,17 +270,10 @@ def _nested_validate_list(typ, data_list, key):
     options = []
 
     for element in data_list:
-        # dict list
+        # Nested?
         if isinstance(typ, dict):
-            c_options = {}
+            c_options = _nested_validate_dict(typ, element, key)
-            for c_key, c_value in element.items():
-                if c_key not in typ:
-                    raise vol.Invalid(
-                        "Unknown nested options {}".format(c_key))
-
-                c_options[c_key] = _single_validate(typ[c_key], c_value, c_key)
             options.append(c_options)
-        # normal list
         else:
             options.append(_single_validate(typ, element, key))
 
@@ -265,9 +285,27 @@ def _nested_validate_dict(typ, data_dict, key):
     options = {}
 
     for c_key, c_value in data_dict.items():
+        # Ignore unknown options / remove from list
         if c_key not in typ:
-            raise vol.Invalid("Unknow nested dict options {}".format(c_key))
+            _LOGGER.warning("Unknown options %s", c_key)
+            continue
 
+        # Nested?
+        if isinstance(typ[c_key], list):
+            options[c_key] = _nested_validate_list(typ[c_key][0],
+                                                   c_value, c_key)
+        else:
             options[c_key] = _single_validate(typ[c_key], c_value, c_key)
 
+    _check_missing_options(typ, options, key)
     return options
+
+
+def _check_missing_options(origin, exists, root):
+    """Check if all options are exists."""
+    missing = set(origin) - set(exists)
+    for miss_opt in missing:
+        if isinstance(origin[miss_opt], str) and \
+                origin[miss_opt].endswith("?"):
+            continue
+        raise vol.Invalid(f"Missing option {miss_opt} in {root}")

hassio/api/__init__.py

@@ -5,149 +5,218 @@ from pathlib import Path
 from aiohttp import web
 
 from .addons import APIAddons
+from .discovery import APIDiscovery
 from .homeassistant import APIHomeAssistant
+from .hardware import APIHardware
 from .host import APIHost
-from .network import APINetwork
+from .proxy import APIProxy
 from .supervisor import APISupervisor
-from .security import APISecurity
 from .snapshots import APISnapshots
+from .services import APIServices
+from .security import SecurityMiddleware
+from ..coresys import CoreSysAttributes
 
 _LOGGER = logging.getLogger(__name__)
 
 
-class RestAPI(object):
+class RestAPI(CoreSysAttributes):
     """Handle rest api for hassio."""
 
-    def __init__(self, config, loop):
+    def __init__(self, coresys):
         """Initialize docker base wrapper."""
-        self.config = config
+        self.coresys = coresys
-        self.loop = loop
+        self.security = SecurityMiddleware(coresys)
-        self.webapp = web.Application(loop=self.loop)
+        self.webapp = web.Application(
+            middlewares=[self.security.token_validation], loop=coresys.loop)
 
         # service stuff
         self._handler = None
         self.server = None
 
-    def register_host(self, host_control, hardware):
+    async def load(self):
+        """Register REST API Calls."""
+        self._register_supervisor()
+        self._register_host()
+        self._register_hardware()
+        self._register_homeassistant()
+        self._register_proxy()
+        self._register_panel()
+        self._register_addons()
+        self._register_snapshots()
+        self._register_discovery()
+        self._register_services()
+
+    def _register_host(self):
         """Register hostcontrol function."""
-        api_host = APIHost(self.config, self.loop, host_control, hardware)
+        api_host = APIHost()
+        api_host.coresys = self.coresys
 
-        self.webapp.router.add_get('/host/info', api_host.info)
+        self.webapp.add_routes([
-        self.webapp.router.add_get('/host/hardware', api_host.hardware)
+            web.get('/host/info', api_host.info),
-        self.webapp.router.add_post('/host/reboot', api_host.reboot)
+            web.post('/host/reboot', api_host.reboot),
-        self.webapp.router.add_post('/host/shutdown', api_host.shutdown)
+            web.post('/host/shutdown', api_host.shutdown),
-        self.webapp.router.add_post('/host/update', api_host.update)
+            web.post('/host/update', api_host.update),
-        self.webapp.router.add_post('/host/options', api_host.options)
+            web.post('/host/reload', api_host.reload),
+        ])
 
-    def register_network(self, host_control):
+    def _register_hardware(self):
-        """Register network function."""
+        """Register hardware function."""
-        api_net = APINetwork(self.config, self.loop, host_control)
+        api_hardware = APIHardware()
+        api_hardware.coresys = self.coresys
 
-        self.webapp.router.add_get('/network/info', api_net.info)
+        self.webapp.add_routes([
-        self.webapp.router.add_post('/network/options', api_net.options)
+            web.get('/hardware/info', api_hardware.info),
+            web.get('/hardware/audio', api_hardware.audio),
+        ])
 
-    def register_supervisor(self, supervisor, snapshots, addons, host_control,
+    def _register_supervisor(self):
-                            updater):
         """Register supervisor function."""
-        api_supervisor = APISupervisor(
+        api_supervisor = APISupervisor()
-            self.config, self.loop, supervisor, snapshots, addons,
+        api_supervisor.coresys = self.coresys
-            host_control, updater)
 
-        self.webapp.router.add_get('/supervisor/ping', api_supervisor.ping)
+        self.webapp.add_routes([
-        self.webapp.router.add_get('/supervisor/info', api_supervisor.info)
+            web.get('/supervisor/ping', api_supervisor.ping),
-        self.webapp.router.add_post(
+            web.get('/supervisor/info', api_supervisor.info),
-            '/supervisor/update', api_supervisor.update)
+            web.get('/supervisor/stats', api_supervisor.stats),
-        self.webapp.router.add_post(
+            web.get('/supervisor/logs', api_supervisor.logs),
-            '/supervisor/reload', api_supervisor.reload)
+            web.post('/supervisor/update', api_supervisor.update),
-        self.webapp.router.add_post(
+            web.post('/supervisor/reload', api_supervisor.reload),
-            '/supervisor/options', api_supervisor.options)
+            web.post('/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):
         """Register homeassistant function."""
-        api_hass = APIHomeAssistant(self.config, self.loop, dock_homeassistant)
+        api_hass = APIHomeAssistant()
+        api_hass.coresys = self.coresys
 
-        self.webapp.router.add_get('/homeassistant/info', api_hass.info)
+        self.webapp.add_routes([
-        self.webapp.router.add_get('/homeassistant/logs', api_hass.logs)
+            web.get('/homeassistant/info', api_hass.info),
-        self.webapp.router.add_post('/homeassistant/options', api_hass.options)
+            web.get('/homeassistant/logs', api_hass.logs),
-        self.webapp.router.add_post('/homeassistant/update', api_hass.update)
+            web.get('/homeassistant/stats', api_hass.stats),
-        self.webapp.router.add_post('/homeassistant/restart', api_hass.restart)
+            web.post('/homeassistant/options', api_hass.options),
-        self.webapp.router.add_post('/homeassistant/stop', api_hass.stop)
+            web.post('/homeassistant/update', api_hass.update),
-        self.webapp.router.add_post('/homeassistant/start', api_hass.start)
+            web.post('/homeassistant/restart', api_hass.restart),
-        self.webapp.router.add_post('/homeassistant/check', api_hass.check)
+            web.post('/homeassistant/stop', api_hass.stop),
+            web.post('/homeassistant/start', api_hass.start),
+            web.post('/homeassistant/check', api_hass.check),
+        ])
 
-    def register_addons(self, addons):
+    def _register_proxy(self):
+        """Register HomeAssistant API Proxy."""
+        api_proxy = APIProxy()
+        api_proxy.coresys = self.coresys
+
+        self.webapp.add_routes([
+            web.get('/homeassistant/api/websocket', api_proxy.websocket),
+            web.get('/homeassistant/websocket', api_proxy.websocket),
+            web.get('/homeassistant/api/stream', api_proxy.stream),
+            web.post('/homeassistant/api/{path:.+}', api_proxy.api),
+            web.get('/homeassistant/api/{path:.+}', api_proxy.api),
+            web.get('/homeassistant/api/', api_proxy.api),
+        ])
+
+    def _register_addons(self):
         """Register homeassistant function."""
-        api_addons = APIAddons(self.config, self.loop, addons)
+        api_addons = APIAddons()
+        api_addons.coresys = self.coresys
 
-        self.webapp.router.add_get('/addons', api_addons.list)
+        self.webapp.add_routes([
-        self.webapp.router.add_post('/addons/reload', api_addons.reload)
+            web.get('/addons', api_addons.list),
+            web.post('/addons/reload', api_addons.reload),
+            web.get('/addons/{addon}/info', api_addons.info),
+            web.post('/addons/{addon}/install', api_addons.install),
+            web.post('/addons/{addon}/uninstall', api_addons.uninstall),
+            web.post('/addons/{addon}/start', api_addons.start),
+            web.post('/addons/{addon}/stop', api_addons.stop),
+            web.post('/addons/{addon}/restart', api_addons.restart),
+            web.post('/addons/{addon}/update', api_addons.update),
+            web.post('/addons/{addon}/options', api_addons.options),
+            web.post('/addons/{addon}/rebuild', api_addons.rebuild),
+            web.get('/addons/{addon}/logs', api_addons.logs),
+            web.get('/addons/{addon}/icon', api_addons.icon),
+            web.get('/addons/{addon}/logo', api_addons.logo),
+            web.get('/addons/{addon}/changelog', api_addons.changelog),
+            web.post('/addons/{addon}/stdin', api_addons.stdin),
+            web.get('/addons/{addon}/stats', api_addons.stats),
+        ])
 
-        self.webapp.router.add_get('/addons/{addon}/info', api_addons.info)
+    def _register_snapshots(self):
-        self.webapp.router.add_post(
-            '/addons/{addon}/install', api_addons.install)
-        self.webapp.router.add_post(
-            '/addons/{addon}/uninstall', api_addons.uninstall)
-        self.webapp.router.add_post('/addons/{addon}/start', api_addons.start)
-        self.webapp.router.add_post('/addons/{addon}/stop', api_addons.stop)
-        self.webapp.router.add_post(
-            '/addons/{addon}/restart', api_addons.restart)
-        self.webapp.router.add_post(
-            '/addons/{addon}/update', api_addons.update)
-        self.webapp.router.add_post(
-            '/addons/{addon}/options', api_addons.options)
-        self.webapp.router.add_post(
-            '/addons/{addon}/rebuild', api_addons.rebuild)
-        self.webapp.router.add_get('/addons/{addon}/logs', api_addons.logs)
-        self.webapp.router.add_get('/addons/{addon}/logo', api_addons.logo)
-
-    def register_security(self):
-        """Register security function."""
-        api_security = APISecurity(self.config, self.loop)
-
-        self.webapp.router.add_get('/security/info', api_security.info)
-        self.webapp.router.add_post('/security/options', api_security.options)
-        self.webapp.router.add_post('/security/totp', api_security.totp)
-        self.webapp.router.add_post('/security/session', api_security.session)
-
-    def register_snapshots(self, snapshots):
         """Register snapshots function."""
-        api_snapshots = APISnapshots(self.config, self.loop, snapshots)
+        api_snapshots = APISnapshots()
+        api_snapshots.coresys = self.coresys
 
-        self.webapp.router.add_get('/snapshots', api_snapshots.list)
+        self.webapp.add_routes([
-        self.webapp.router.add_post('/snapshots/reload', api_snapshots.reload)
+            web.get('/snapshots', api_snapshots.list),
+            web.post('/snapshots/reload', api_snapshots.reload),
+            web.post('/snapshots/new/full', api_snapshots.snapshot_full),
+            web.post('/snapshots/new/partial', api_snapshots.snapshot_partial),
+            web.post('/snapshots/new/upload', api_snapshots.upload),
+            web.get('/snapshots/{snapshot}/info', api_snapshots.info),
+            web.post('/snapshots/{snapshot}/remove', api_snapshots.remove),
+            web.post('/snapshots/{snapshot}/restore/full',
+                     api_snapshots.restore_full),
+            web.post('/snapshots/{snapshot}/restore/partial',
+                     api_snapshots.restore_partial),
+            web.get('/snapshots/{snapshot}/download', api_snapshots.download),
+        ])
 
-        self.webapp.router.add_post(
+    def _register_services(self):
-            '/snapshots/new/full', api_snapshots.snapshot_full)
+        api_services = APIServices()
-        self.webapp.router.add_post(
+        api_services.coresys = self.coresys
-            '/snapshots/new/partial', api_snapshots.snapshot_partial)
 
-        self.webapp.router.add_get(
+        self.webapp.add_routes([
-            '/snapshots/{snapshot}/info', api_snapshots.info)
+            web.get('/services', api_services.list),
-        self.webapp.router.add_post(
+            web.get('/services/{service}', api_services.get_service),
-            '/snapshots/{snapshot}/remove', api_snapshots.remove)
+            web.post('/services/{service}', api_services.set_service),
-        self.webapp.router.add_post(
+            web.delete('/services/{service}', api_services.del_service),
-            '/snapshots/{snapshot}/restore/full', api_snapshots.restore_full)
+        ])
-        self.webapp.router.add_post(
-            '/snapshots/{snapshot}/restore/partial',
-            api_snapshots.restore_partial)
 
-    def register_panel(self):
+    def _register_discovery(self):
+        api_discovery = APIDiscovery()
+        api_discovery.coresys = self.coresys
+
+        self.webapp.add_routes([
+            web.get('/services/discovery', api_discovery.list),
+            web.get('/services/discovery/{uuid}', api_discovery.get_discovery),
+            web.delete('/services/discovery/{uuid}',
+                       api_discovery.del_discovery),
+            web.post('/services/discovery', api_discovery.set_discovery),
+        ])
+
+    def _register_panel(self):
         """Register panel for homeassistant."""
-        panel = Path(__file__).parents[1].joinpath('panel/hassio-main.html')
+        panel_dir = Path(__file__).parent.joinpath("panel")
 
-        def get_panel(request):
+        def create_response(panel_file):
-            """Return file response with panel."""
+            """Create a function to generate a response."""
-            return web.FileResponse(panel)
+            path = panel_dir.joinpath(f"{panel_file!s}.html")
+            return lambda request: web.FileResponse(path)
 
-        self.webapp.router.add_get('/panel', get_panel)
+        # This route is for backwards compatibility with HA < 0.58
+        self.webapp.add_routes([
+            web.get('/panel', create_response('hassio-main-es5'))])
+
+        # This route is for backwards compatibility with HA 0.58 - 0.61
+        self.webapp.add_routes([
+            web.get('/panel_es5', create_response('hassio-main-es5')),
+            web.get('/panel_latest', create_response('hassio-main-latest')),
+        ])
+
+        # This route is for backwards compatibility with HA 0.62 - 0.70
+        self.webapp.add_routes([
+            web.get('/app-es5/index.html', create_response('index')),
+            web.get('/app-es5/hassio-app.html', create_response('hassio-app')),
+        ])
+
+        # This route is for HA > 0.70
+        self.webapp.add_routes([web.static('/app', panel_dir)])
 
     async def start(self):
         """Run rest api webserver."""
-        self._handler = self.webapp.make_handler(loop=self.loop)
+        self._handler = self.webapp.make_handler()
 
         try:
-            self.server = await self.loop.create_server(
+            self.server = await self.sys_loop.create_server(
                 self._handler, "0.0.0.0", "80")
         except OSError as err:
             _LOGGER.fatal(
@@ -161,5 +230,5 @@ class RestAPI(object):
         await self.webapp.shutdown()
 
         if self._handler:
-            await self._handler.finish_connections(60)
+            await self._handler.shutdown(60)
         await self.webapp.cleanup()

hassio/api/addons.py

@@ -5,7 +5,7 @@ import logging
 import voluptuous as vol
 from voluptuous.humanize import humanize_error
 
-from .util import api_process, api_process_raw, api_validate
+from .utils import api_process, api_process_raw, api_validate
 from ..const import (
     ATTR_VERSION, ATTR_LAST_VERSION, ATTR_STATE, ATTR_BOOT, ATTR_OPTIONS,
     ATTR_URL, ATTR_DESCRIPTON, ATTR_DETACHED, ATTR_NAME, ATTR_REPOSITORY,
@@ -13,8 +13,14 @@ from ..const import (
     ATTR_SOURCE, ATTR_REPOSITORIES, ATTR_ADDONS, ATTR_ARCH, ATTR_MAINTAINER,
     ATTR_INSTALLED, ATTR_LOGO, ATTR_WEBUI, ATTR_DEVICES, ATTR_PRIVILEGED,
     ATTR_AUDIO, ATTR_AUDIO_INPUT, ATTR_AUDIO_OUTPUT, ATTR_HASSIO_API,
-    ATTR_GPIO, BOOT_AUTO, BOOT_MANUAL, CONTENT_TYPE_PNG, CONTENT_TYPE_BINARY)
+    ATTR_GPIO, ATTR_HOMEASSISTANT_API, ATTR_STDIN, BOOT_AUTO, BOOT_MANUAL,
-from ..validate import DOCKER_PORTS
+    ATTR_CHANGELOG, ATTR_HOST_IPC, ATTR_HOST_DBUS, ATTR_LONG_DESCRIPTION,
+    ATTR_CPU_PERCENT, ATTR_MEMORY_LIMIT, ATTR_MEMORY_USAGE, ATTR_NETWORK_TX,
+    ATTR_NETWORK_RX, ATTR_BLK_READ, ATTR_BLK_WRITE, ATTR_ICON, ATTR_SERVICES,
+    ATTR_DISCOVERY, ATTR_SECCOMP, ATTR_APPARMOR,
+    CONTENT_TYPE_PNG, CONTENT_TYPE_BINARY, CONTENT_TYPE_TEXT)
+from ..coresys import CoreSysAttributes
+from ..validate import DOCKER_PORTS, ALSA_DEVICE
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -27,21 +33,17 @@ SCHEMA_OPTIONS = vol.Schema({
     vol.Optional(ATTR_BOOT): vol.In([BOOT_AUTO, BOOT_MANUAL]),
     vol.Optional(ATTR_NETWORK): vol.Any(None, DOCKER_PORTS),
     vol.Optional(ATTR_AUTO_UPDATE): vol.Boolean(),
+    vol.Optional(ATTR_AUDIO_OUTPUT): ALSA_DEVICE,
+    vol.Optional(ATTR_AUDIO_INPUT): ALSA_DEVICE,
 })
 
 
-class APIAddons(object):
+class APIAddons(CoreSysAttributes):
     """Handle rest api for addons functions."""
 
-    def __init__(self, config, loop, addons):
-        """Initialize homeassistant rest api part."""
-        self.config = config
-        self.loop = loop
-        self.addons = addons
-
     def _extract_addon(self, request, check_installed=True):
         """Return addon and if not exists trow a exception."""
-        addon = self.addons.get(request.match_info.get('addon'))
+        addon = self.sys_addons.get(request.match_info.get('addon'))
         if not addon:
             raise RuntimeError("Addon not exists")
 
@@ -55,14 +57,14 @@ class APIAddons(object):
         """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
     async def list(self, request):
         """Return all addons / repositories ."""
         data_addons = []
-        for addon in self.addons.list_addons:
+        for addon in self.sys_addons.list_addons:
             data_addons.append({
                 ATTR_NAME: addon.name,
                 ATTR_SLUG: addon.slug,
@@ -73,17 +75,13 @@ class APIAddons(object):
                 ATTR_DETACHED: addon.is_detached,
                 ATTR_REPOSITORY: addon.repository,
                 ATTR_BUILD: addon.need_build,
-                ATTR_PRIVILEGED: addon.privileged,
-                ATTR_DEVICES: self._pretty_devices(addon),
                 ATTR_URL: addon.url,
+                ATTR_ICON: addon.with_icon,
                 ATTR_LOGO: addon.with_logo,
-                ATTR_HASSIO_API: addon.use_hassio_api,
-                ATTR_AUDIO: addon.with_audio,
-                ATTR_GPIO: addon.with_gpio,
             })
 
         data_repositories = []
-        for repository in self.addons.list_repositories:
+        for repository in self.sys_addons.list_repositories:
             data_repositories.append({
                 ATTR_SLUG: repository.slug,
                 ATTR_NAME: repository.name,
@@ -100,7 +98,7 @@ class APIAddons(object):
     @api_process
     async def reload(self, request):
         """Reload all addons data."""
-        await asyncio.shield(self.addons.reload(), loop=self.loop)
+        await asyncio.shield(self.sys_addons.reload())
         return True
 
     @api_process
@@ -110,7 +108,9 @@ class APIAddons(object):
 
         return {
             ATTR_NAME: addon.name,
+            ATTR_SLUG: addon.slug,
             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,
@@ -123,15 +123,25 @@ class APIAddons(object):
             ATTR_BUILD: addon.need_build,
             ATTR_NETWORK: addon.ports,
             ATTR_HOST_NETWORK: addon.host_network,
+            ATTR_HOST_IPC: addon.host_ipc,
+            ATTR_HOST_DBUS: addon.host_dbus,
             ATTR_PRIVILEGED: addon.privileged,
+            ATTR_SECCOMP: addon.seccomp,
+            ATTR_APPARMOR: addon.apparmor,
             ATTR_DEVICES: self._pretty_devices(addon),
+            ATTR_ICON: addon.with_icon,
             ATTR_LOGO: addon.with_logo,
+            ATTR_CHANGELOG: addon.with_changelog,
             ATTR_WEBUI: addon.webui,
-            ATTR_HASSIO_API: addon.use_hassio_api,
+            ATTR_STDIN: addon.with_stdin,
+            ATTR_HASSIO_API: addon.access_hassio_api,
+            ATTR_HOMEASSISTANT_API: addon.access_homeassistant_api,
             ATTR_GPIO: addon.with_gpio,
             ATTR_AUDIO: addon.with_audio,
             ATTR_AUDIO_INPUT: addon.audio_input,
             ATTR_AUDIO_OUTPUT: addon.audio_output,
+            ATTR_SERVICES: addon.services,
+            ATTR_DISCOVERY: addon.discovery,
         }
 
     @api_process
@@ -140,7 +150,7 @@ class APIAddons(object):
         addon = self._extract_addon(request)
 
         addon_schema = SCHEMA_OPTIONS.extend({
-            vol.Optional(ATTR_OPTIONS): addon.schema,
+            vol.Optional(ATTR_OPTIONS): vol.Any(None, addon.schema),
         })
 
         body = await api_validate(addon_schema, request)
@@ -158,23 +168,39 @@ class APIAddons(object):
         if ATTR_AUDIO_OUTPUT in body:
             addon.audio_output = body[ATTR_AUDIO_OUTPUT]
 
+        addon.save_data()
         return True
 
     @api_process
-    async def install(self, request):
+    async def stats(self, request):
-        """Install addon."""
+        """Return resource information."""
-        body = await api_validate(SCHEMA_VERSION, request)
+        addon = self._extract_addon(request)
-        addon = self._extract_addon(request, check_installed=False)
+        stats = await addon.stats()
-        version = body.get(ATTR_VERSION, addon.last_version)
 
-        return await asyncio.shield(
+        if not stats:
-            addon.install(version=version), loop=self.loop)
+            raise RuntimeError("No stats available")
+
+        return {
+            ATTR_CPU_PERCENT: stats.cpu_percent,
+            ATTR_MEMORY_USAGE: stats.memory_usage,
+            ATTR_MEMORY_LIMIT: stats.memory_limit,
+            ATTR_NETWORK_RX: stats.network_rx,
+            ATTR_NETWORK_TX: stats.network_tx,
+            ATTR_BLK_READ: stats.blk_read,
+            ATTR_BLK_WRITE: stats.blk_write,
+        }
+
+    @api_process
+    def install(self, request):
+        """Install addon."""
+        addon = self._extract_addon(request, check_installed=False)
+        return asyncio.shield(addon.install())
 
     @api_process
     def uninstall(self, request):
         """Uninstall addon."""
         addon = self._extract_addon(request)
-        return asyncio.shield(addon.uninstall(), loop=self.loop)
+        return asyncio.shield(addon.uninstall())
 
     @api_process
     def start(self, request):
@@ -188,32 +214,29 @@ class APIAddons(object):
         except vol.Invalid as ex:
             raise RuntimeError(humanize_error(options, ex)) from None
 
-        return asyncio.shield(addon.start(), loop=self.loop)
+        return asyncio.shield(addon.start())
 
     @api_process
     def stop(self, request):
         """Stop addon."""
         addon = self._extract_addon(request)
-        return asyncio.shield(addon.stop(), loop=self.loop)
+        return asyncio.shield(addon.stop())
 
     @api_process
-    async def update(self, request):
+    def update(self, request):
         """Update addon."""
-        body = await api_validate(SCHEMA_VERSION, request)
         addon = self._extract_addon(request)
-        version = body.get(ATTR_VERSION, addon.last_version)
 
-        if version == addon.version_installed:
+        if addon.last_version == addon.version_installed:
-            raise RuntimeError("Version %s is already in use", version)
+            raise RuntimeError("No update available!")
 
-        return await asyncio.shield(
+        return asyncio.shield(addon.update())
-            addon.update(version=version), loop=self.loop)
 
     @api_process
     def restart(self, request):
         """Restart addon."""
         addon = self._extract_addon(request)
-        return asyncio.shield(addon.restart(), loop=self.loop)
+        return asyncio.shield(addon.restart())
 
     @api_process
     def rebuild(self, request):
@@ -222,7 +245,7 @@ class APIAddons(object):
         if not addon.need_build:
             raise RuntimeError("Only local build addons are supported")
 
-        return asyncio.shield(addon.rebuild(), loop=self.loop)
+        return asyncio.shield(addon.rebuild())
 
     @api_process_raw(CONTENT_TYPE_BINARY)
     def logs(self, request):
@@ -230,12 +253,42 @@ class APIAddons(object):
         addon = self._extract_addon(request)
         return addon.logs()
 
+    @api_process_raw(CONTENT_TYPE_PNG)
+    async def icon(self, request):
+        """Return icon from addon."""
+        addon = self._extract_addon(request, check_installed=False)
+        if not addon.with_icon:
+            raise RuntimeError("No icon found!")
+
+        with addon.path_icon.open('rb') as png:
+            return png.read()
+
     @api_process_raw(CONTENT_TYPE_PNG)
     async def logo(self, request):
         """Return logo from addon."""
         addon = self._extract_addon(request, check_installed=False)
         if not addon.with_logo:
-            raise RuntimeError("No image found!")
+            raise RuntimeError("No logo found!")
 
         with addon.path_logo.open('rb') as png:
             return png.read()
+
+    @api_process_raw(CONTENT_TYPE_TEXT)
+    async def changelog(self, request):
+        """Return changelog from addon."""
+        addon = self._extract_addon(request, check_installed=False)
+        if not addon.with_changelog:
+            raise RuntimeError("No changelog found!")
+
+        with addon.path_changelog.open('r') as changelog:
+            return changelog.read()
+
+    @api_process
+    async def stdin(self, request):
+        """Write to stdin of addon."""
+        addon = self._extract_addon(request)
+        if not addon.with_stdin:
+            raise RuntimeError("STDIN not supported by addon")
+
+        data = await request.read()
+        return await asyncio.shield(addon.write_stdin(data))

hassio/api/discovery.py

@@ -0,0 +1,72 @@
+"""Init file for HassIO network rest api."""
+
+import voluptuous as vol
+
+from .utils import api_process, api_validate
+from ..const import (
+    ATTR_PROVIDER, ATTR_UUID, ATTR_COMPONENT, ATTR_PLATFORM, ATTR_CONFIG,
+    ATTR_DISCOVERY, REQUEST_FROM)
+from ..coresys import CoreSysAttributes
+
+
+SCHEMA_DISCOVERY = vol.Schema({
+    vol.Required(ATTR_COMPONENT): vol.Coerce(str),
+    vol.Optional(ATTR_PLATFORM): vol.Any(None, vol.Coerce(str)),
+    vol.Optional(ATTR_CONFIG): vol.Any(None, dict),
+})
+
+
+class APIDiscovery(CoreSysAttributes):
+    """Handle rest api for discovery functions."""
+
+    def _extract_message(self, request):
+        """Extract discovery message from URL."""
+        message = self.sys_discovery.get(request.match_info.get('uuid'))
+        if not message:
+            raise RuntimeError("Discovery message not found")
+        return message
+
+    @api_process
+    async def list(self, request):
+        """Show register services."""
+        discovery = []
+        for message in self.sys_discovery.list_messages:
+            discovery.append({
+                ATTR_PROVIDER: message.provider,
+                ATTR_UUID: message.uuid,
+                ATTR_COMPONENT: message.component,
+                ATTR_PLATFORM: message.platform,
+                ATTR_CONFIG: message.config,
+            })
+
+        return {ATTR_DISCOVERY: discovery}
+
+    @api_process
+    async def set_discovery(self, request):
+        """Write data into a discovery pipeline."""
+        body = await api_validate(SCHEMA_DISCOVERY, request)
+        message = self.sys_discovery.send(
+            provider=request[REQUEST_FROM], **body)
+
+        return {ATTR_UUID: message.uuid}
+
+    @api_process
+    async def get_discovery(self, request):
+        """Read data into a discovery message."""
+        message = self._extract_message(request)
+
+        return {
+            ATTR_PROVIDER: message.provider,
+            ATTR_UUID: message.uuid,
+            ATTR_COMPONENT: message.component,
+            ATTR_PLATFORM: message.platform,
+            ATTR_CONFIG: message.config,
+        }
+
+    @api_process
+    async def del_discovery(self, request):
+        """Delete data into a discovery message."""
+        message = self._extract_message(request)
+
+        self.sys_discovery.remove(message)
+        return True

hassio/api/hardware.py

@@ -0,0 +1,34 @@
+"""Init file for HassIO hardware rest api."""
+import logging
+
+from .utils import api_process
+from ..const import (
+    ATTR_SERIAL, ATTR_DISK, ATTR_GPIO, ATTR_AUDIO, ATTR_INPUT, ATTR_OUTPUT)
+from ..coresys import CoreSysAttributes
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class APIHardware(CoreSysAttributes):
+    """Handle rest api for hardware functions."""
+
+    @api_process
+    async def info(self, request):
+        """Show hardware info."""
+        return {
+            ATTR_SERIAL: list(self.sys_hardware.serial_devices),
+            ATTR_INPUT: list(self.sys_hardware.input_devices),
+            ATTR_DISK: list(self.sys_hardware.disk_devices),
+            ATTR_GPIO: list(self.sys_hardware.gpio_devices),
+            ATTR_AUDIO: self.sys_hardware.audio_devices,
+        }
+
+    @api_process
+    async def audio(self, request):
+        """Show ALSA audio devices."""
+        return {
+            ATTR_AUDIO: {
+                ATTR_INPUT: self.sys_host.alsa.input_devices,
+                ATTR_OUTPUT: self.sys_host.alsa.output_devices,
+            }
+        }

hassio/api/homeassistant.py

@@ -4,22 +4,32 @@ import logging
 
 import voluptuous as vol
 
-from .util import api_process, api_process_raw, api_validate
+from .utils import api_process, api_process_raw, api_validate
 from ..const import (
-    ATTR_VERSION, ATTR_LAST_VERSION, ATTR_DEVICES, ATTR_IMAGE, ATTR_CUSTOM,
+    ATTR_VERSION, ATTR_LAST_VERSION, ATTR_IMAGE, ATTR_CUSTOM, ATTR_BOOT,
-    ATTR_BOOT, CONTENT_TYPE_BINARY)
+    ATTR_PORT, ATTR_PASSWORD, ATTR_SSL, ATTR_WATCHDOG, ATTR_CPU_PERCENT,
-from ..validate import HASS_DEVICES
+    ATTR_MEMORY_USAGE, ATTR_MEMORY_LIMIT, ATTR_NETWORK_RX, ATTR_NETWORK_TX,
+    ATTR_BLK_READ, ATTR_BLK_WRITE, ATTR_WAIT_BOOT, ATTR_MACHINE,
+    CONTENT_TYPE_BINARY)
+from ..coresys import CoreSysAttributes
+from ..validate import NETWORK_PORT, DOCKER_IMAGE
 
 _LOGGER = logging.getLogger(__name__)
 
 
 # pylint: disable=no-value-for-parameter
 SCHEMA_OPTIONS = vol.Schema({
-    vol.Optional(ATTR_DEVICES): HASS_DEVICES,
     vol.Optional(ATTR_BOOT): vol.Boolean(),
-    vol.Inclusive(ATTR_IMAGE, 'custom_hass'): vol.Any(None, vol.Coerce(str)),
+    vol.Inclusive(ATTR_IMAGE, 'custom_hass'):
-    vol.Inclusive(ATTR_LAST_VERSION, 'custom_hass'):
         vol.Any(None, vol.Coerce(str)),
+    vol.Inclusive(ATTR_LAST_VERSION, 'custom_hass'):
+        vol.Any(None, DOCKER_IMAGE),
+    vol.Optional(ATTR_PORT): NETWORK_PORT,
+    vol.Optional(ATTR_PASSWORD): vol.Any(None, vol.Coerce(str)),
+    vol.Optional(ATTR_SSL): vol.Boolean(),
+    vol.Optional(ATTR_WATCHDOG): vol.Boolean(),
+    vol.Optional(ATTR_WAIT_BOOT):
+        vol.All(vol.Coerce(int), vol.Range(min=60)),
 })
 
 SCHEMA_VERSION = vol.Schema({
@@ -27,25 +37,23 @@ SCHEMA_VERSION = vol.Schema({
 })
 
 
-class APIHomeAssistant(object):
+class APIHomeAssistant(CoreSysAttributes):
     """Handle rest api for homeassistant functions."""
 
-    def __init__(self, config, loop, homeassistant):
-        """Initialize homeassistant rest api part."""
-        self.config = config
-        self.loop = loop
-        self.homeassistant = homeassistant
-
     @api_process
     async def info(self, request):
         """Return host information."""
         return {
-            ATTR_VERSION: self.homeassistant.version,
+            ATTR_VERSION: self.sys_homeassistant.version,
-            ATTR_LAST_VERSION: self.homeassistant.last_version,
+            ATTR_LAST_VERSION: self.sys_homeassistant.last_version,
-            ATTR_IMAGE: self.homeassistant.image,
+            ATTR_MACHINE: self.sys_homeassistant.machine,
-            ATTR_DEVICES: self.homeassistant.devices,
+            ATTR_IMAGE: self.sys_homeassistant.image,
-            ATTR_CUSTOM: self.homeassistant.is_custom_image,
+            ATTR_CUSTOM: self.sys_homeassistant.is_custom_image,
-            ATTR_BOOT: self.homeassistant.boot,
+            ATTR_BOOT: self.sys_homeassistant.boot,
+            ATTR_PORT: self.sys_homeassistant.api_port,
+            ATTR_SSL: self.sys_homeassistant.api_ssl,
+            ATTR_WATCHDOG: self.sys_homeassistant.watchdog,
+            ATTR_WAIT_BOOT: self.sys_homeassistant.wait_boot,
         }
 
     @api_process
@@ -53,55 +61,85 @@ class APIHomeAssistant(object):
         """Set homeassistant options."""
         body = await api_validate(SCHEMA_OPTIONS, request)
 
-        if ATTR_DEVICES in body:
+        if ATTR_IMAGE in body and ATTR_LAST_VERSION in body:
-            self.homeassistant.devices = body[ATTR_DEVICES]
+            self.sys_homeassistant.image = body[ATTR_IMAGE]
-
+            self.sys_homeassistant.last_version = body[ATTR_LAST_VERSION]
-        if ATTR_IMAGE in body:
-            self.homeassistant.set_custom(
-                body[ATTR_IMAGE], body[ATTR_LAST_VERSION])
 
         if ATTR_BOOT in body:
-            self.homeassistant.boot = body[ATTR_BOOT]
+            self.sys_homeassistant.boot = body[ATTR_BOOT]
 
+        if ATTR_PORT in body:
+            self.sys_homeassistant.api_port = body[ATTR_PORT]
+
+        if ATTR_PASSWORD in body:
+            self.sys_homeassistant.api_password = body[ATTR_PASSWORD]
+
+        if ATTR_SSL in body:
+            self.sys_homeassistant.api_ssl = body[ATTR_SSL]
+
+        if ATTR_WATCHDOG in body:
+            self.sys_homeassistant.watchdog = body[ATTR_WATCHDOG]
+
+        if ATTR_WAIT_BOOT in body:
+            self.sys_homeassistant.wait_boot = body[ATTR_WAIT_BOOT]
+
+        self.sys_homeassistant.save_data()
         return True
 
+    @api_process
+    async def stats(self, request):
+        """Return resource information."""
+        stats = await self.sys_homeassistant.stats()
+        if not stats:
+            raise RuntimeError("No stats available")
+
+        return {
+            ATTR_CPU_PERCENT: stats.cpu_percent,
+            ATTR_MEMORY_USAGE: stats.memory_usage,
+            ATTR_MEMORY_LIMIT: stats.memory_limit,
+            ATTR_NETWORK_RX: stats.network_rx,
+            ATTR_NETWORK_TX: stats.network_tx,
+            ATTR_BLK_READ: stats.blk_read,
+            ATTR_BLK_WRITE: stats.blk_write,
+        }
+
     @api_process
     async def update(self, request):
         """Update homeassistant."""
         body = await api_validate(SCHEMA_VERSION, request)
-        version = body.get(ATTR_VERSION, self.homeassistant.last_version)
+        version = body.get(ATTR_VERSION, self.sys_homeassistant.last_version)
 
-        if version == self.homeassistant.version:
+        if version == self.sys_homeassistant.version:
             raise RuntimeError("Version {} is already in use".format(version))
 
         return await asyncio.shield(
-            self.homeassistant.update(version), loop=self.loop)
+            self.sys_homeassistant.update(version))
 
     @api_process
     def stop(self, request):
         """Stop homeassistant."""
-        return asyncio.shield(self.homeassistant.stop(), loop=self.loop)
+        return asyncio.shield(self.sys_homeassistant.stop())
 
     @api_process
     def start(self, request):
         """Start homeassistant."""
-        return asyncio.shield(self.homeassistant.run(), loop=self.loop)
+        return asyncio.shield(self.sys_homeassistant.start())
 
     @api_process
     def restart(self, request):
         """Restart homeassistant."""
-        return asyncio.shield(self.homeassistant.restart(), loop=self.loop)
+        return asyncio.shield(self.sys_homeassistant.restart())
 
     @api_process_raw(CONTENT_TYPE_BINARY)
     def logs(self, request):
         """Return homeassistant docker logs."""
-        return self.homeassistant.logs()
+        return self.sys_homeassistant.logs()
 
     @api_process
     async def check(self, request):
         """Check config of homeassistant."""
-        code, message = await self.homeassistant.check_config()
+        result = await self.sys_homeassistant.check_config()
-        if not code:
+        if not result.valid:
-            raise RuntimeError(message)
+            raise RuntimeError(result.log)
 
         return True

hassio/api/host.py

@@ -4,12 +4,11 @@ import logging
 
 import voluptuous as vol
 
-from .util import api_process_hostcontrol, api_process, api_validate
+from .utils import api_process, api_validate
 from ..const import (
-    ATTR_VERSION, ATTR_LAST_VERSION, ATTR_TYPE, ATTR_HOSTNAME, ATTR_FEATURES,
+    ATTR_VERSION, ATTR_LAST_VERSION, ATTR_HOSTNAME, ATTR_FEATURES, ATTR_KERNEL,
-    ATTR_OS, ATTR_SERIAL, ATTR_INPUT, ATTR_DISK, ATTR_AUDIO, ATTR_AUDIO_INPUT,
+    ATTR_TYPE, ATTR_OPERATING_SYSTEM, ATTR_CHASSIS, ATTR_DEPLOYMENT)
-    ATTR_AUDIO_OUTPUT)
+from ..coresys import CoreSysAttributes
-from ..validate import ALSA_CHANNEL
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -18,73 +17,56 @@ SCHEMA_VERSION = vol.Schema({
 })
 
 SCHEMA_OPTIONS = vol.Schema({
-    vol.Optional(ATTR_AUDIO_OUTPUT): ALSA_CHANNEL,
+    vol.Optional(ATTR_HOSTNAME): vol.Coerce(str),
-    vol.Optional(ATTR_AUDIO_INPUT): ALSA_CHANNEL,
 })
 
 
-class APIHost(object):
+class APIHost(CoreSysAttributes):
     """Handle rest api for host functions."""
 
-    def __init__(self, config, loop, host_control, hardware):
-        """Initialize host rest api part."""
-        self.config = config
-        self.loop = loop
-        self.host_control = host_control
-        self.local_hw = hardware
-
     @api_process
     async def info(self, request):
         """Return host information."""
         return {
-            ATTR_TYPE: self.host_control.type,
+            ATTR_CHASSIS: self.sys_host.info.chassis,
-            ATTR_VERSION: self.host_control.version,
+            ATTR_VERSION: None,
-            ATTR_LAST_VERSION: self.host_control.last_version,
+            ATTR_LAST_VERSION: None,
-            ATTR_FEATURES: self.host_control.features,
+            ATTR_TYPE: None,
-            ATTR_HOSTNAME: self.host_control.hostname,
+            ATTR_FEATURES: self.sys_host.supperted_features,
-            ATTR_OS: self.host_control.os_info,
+            ATTR_HOSTNAME: self.sys_host.info.hostname,
+            ATTR_OPERATING_SYSTEM: self.sys_host.info.operating_system,
+            ATTR_DEPLOYMENT: self.sys_host.info.deployment,
+            ATTR_KERNEL: self.sys_host.info.kernel,
         }
 
     @api_process
     async def options(self, request):
-        """Process host options."""
+        """Edit host settings."""
         body = await api_validate(SCHEMA_OPTIONS, request)
 
-        if ATTR_AUDIO_OUTPUT in body:
+        # hostname
-            self.config.audio_output = body[ATTR_AUDIO_OUTPUT]
+        if ATTR_HOSTNAME in body:
-        if ATTR_AUDIO_INPUT in body:
+            await asyncio.shield(
-            self.config.audio_input = body[ATTR_AUDIO_INPUT]
+                self.sys_host.control.set_hostname(body[ATTR_HOSTNAME]))
-
-        return True
-
-    @api_process_hostcontrol
-    def reboot(self, request):
-        """Reboot host."""
-        return self.host_control.reboot()
-
-    @api_process_hostcontrol
-    def shutdown(self, request):
-        """Poweroff host."""
-        return self.host_control.shutdown()
-
-    @api_process_hostcontrol
-    async def update(self, request):
-        """Update host OS."""
-        body = await api_validate(SCHEMA_VERSION, request)
-        version = body.get(ATTR_VERSION, self.host_control.last_version)
-
-        if version == self.host_control.version:
-            raise RuntimeError("Version {} is already in use".format(version))
-
-        return await asyncio.shield(
-            self.host_control.update(version=version), loop=self.loop)
 
     @api_process
-    async def hardware(self, request):
+    def reboot(self, request):
-        """Return local hardware infos."""
+        """Reboot host."""
-        return {
+        return asyncio.shield(self.sys_host.control.reboot())
-            ATTR_SERIAL: self.local_hw.serial_devices,
+
-            ATTR_INPUT: self.local_hw.input_devices,
+    @api_process
-            ATTR_DISK: self.local_hw.disk_devices,
+    def shutdown(self, request):
-            ATTR_AUDIO: self.local_hw.audio_devices,
+        """Poweroff host."""
-        }
+        return asyncio.shield(self.sys_host.control.shutdown())
+
+    @api_process
+    def reload(self, request):
+        """Reload host data."""
+        return asyncio.shield(self.sys_host.reload())
+
+    @api_process
+    async def update(self, request):
+        """Update host OS."""
+        pass
+        # body = await api_validate(SCHEMA_VERSION, request)
+        # version = body.get(ATTR_VERSION, self.sys_host.last_version)

hassio/api/network.py

@@ -1,43 +0,0 @@
-"""Init file for HassIO network rest api."""
-import logging
-
-import voluptuous as vol
-
-from .util import api_process, api_process_hostcontrol, api_validate
-from ..const import ATTR_HOSTNAME
-
-_LOGGER = logging.getLogger(__name__)
-
-
-SCHEMA_OPTIONS = vol.Schema({
-    vol.Optional(ATTR_HOSTNAME): vol.Coerce(str),
-})
-
-
-class APINetwork(object):
-    """Handle rest api for network functions."""
-
-    def __init__(self, config, loop, host_control):
-        """Initialize network rest api part."""
-        self.config = config
-        self.loop = loop
-        self.host_control = host_control
-
-    @api_process
-    async def info(self, request):
-        """Show network settings."""
-        return {
-            ATTR_HOSTNAME: self.host_control.hostname,
-        }
-
-    @api_process_hostcontrol
-    async def options(self, request):
-        """Edit network settings."""
-        body = await api_validate(SCHEMA_OPTIONS, request)
-
-        # hostname
-        if ATTR_HOSTNAME in body:
-            if self.host_control.hostname != body[ATTR_HOSTNAME]:
-                await self.host_control.set_hostname(body[ATTR_HOSTNAME])
-
-        return True

hassio/api/panel/index.html

@@ -0,0 +1,38 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Hass.io</title>
+    <meta name='viewport' content='width=device-width, user-scalable=no'>
+    <style>
+      body {
+        height: 100vh;
+        margin: 0;
+        padding: 0;
+      }
+    </style>
+    <script src='/frontend_es5/custom-elements-es5-adapter.js'></script>
+  </head>
+  <body>
+    <hassio-app></hassio-app>
+    <script>
+    function addScript(src) {
+      var e = document.createElement('script');
+      e.src = src;
+      document.write(e.outerHTML);
+    }
+    var webComponentsSupported = (
+      'customElements' in window &&
+      'import' in document.createElement('link') &&
+      'content' in document.createElement('template'));
+    if (!webComponentsSupported) {
+      addScript('/static/webcomponents-bundle.js');
+    }
+    </script>
+    <!--
+      Disabled while we make Home Assistant able to serve the right files.
+      <script src="./app.js"></script>
+    -->
+    <link rel='import' href='./hassio-app.html'>
+  </body>
+</html>

hassio/api/proxy.py

@@ -0,0 +1,226 @@
+"""Utils for HomeAssistant Proxy."""
+import asyncio
+import logging
+
+import aiohttp
+from aiohttp import web
+from aiohttp.web_exceptions import HTTPBadGateway, HTTPInternalServerError
+from aiohttp.hdrs import CONTENT_TYPE
+import async_timeout
+
+from ..const import HEADER_HA_ACCESS
+from ..coresys import CoreSysAttributes
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class APIProxy(CoreSysAttributes):
+    """API Proxy for Home-Assistant."""
+
+    def _check_access(self, request):
+        """Check the Hass.io token."""
+        hassio_token = request.headers.get(HEADER_HA_ACCESS)
+        addon = self.sys_addons.from_uuid(hassio_token)
+
+        if not addon:
+            _LOGGER.warning("Unknown Home-Assistant API access!")
+        else:
+            _LOGGER.info("%s access from %s", request.path, addon.slug)
+
+    async def _api_client(self, request, path, timeout=300):
+        """Return a client request with proxy origin for Home-Assistant."""
+        url = f"{self.sys_homeassistant.api_url}/api/{path}"
+
+        try:
+            data = None
+            headers = {}
+            method = getattr(self.sys_websession_ssl, request.method.lower())
+            params = request.query or None
+
+            # read data
+            with async_timeout.timeout(30):
+                data = await request.read()
+
+            if data:
+                headers.update({CONTENT_TYPE: request.content_type})
+
+            # need api password?
+            if self.sys_homeassistant.api_password:
+                headers = {
+                    HEADER_HA_ACCESS: self.sys_homeassistant.api_password,
+                }
+
+            # reset headers
+            if not headers:
+                headers = None
+
+            client = await method(
+                url, data=data, headers=headers, timeout=timeout,
+                params=params
+            )
+
+            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()
+
+    async def stream(self, request):
+        """Proxy HomeAssistant EventStream Requests."""
+        self._check_access(request)
+
+        _LOGGER.info("Home-Assistant EventStream start")
+        client = await self._api_client(request, 'stream', timeout=None)
+
+        response = web.StreamResponse()
+        response.content_type = request.headers.get(CONTENT_TYPE)
+        try:
+            await response.prepare(request)
+            while True:
+                data = await client.content.read(10)
+                if not data:
+                    await response.write_eof()
+                    break
+                await response.write(data)
+
+        except aiohttp.ClientError:
+            await response.write_eof()
+
+        except asyncio.CancelledError:
+            pass
+
+        finally:
+            client.close()
+            _LOGGER.info("Home-Assistant EventStream close")
+
+        return response
+
+    async def api(self, request):
+        """Proxy HomeAssistant API Requests."""
+        self._check_access(request)
+
+        # Normal request
+        path = request.match_info.get('path', '')
+        client = await self._api_client(request, path)
+
+        data = await client.read()
+        return web.Response(
+            body=data,
+            status=client.status,
+            content_type=client.content_type
+        )
+
+    async def _websocket_client(self):
+        """Initialize a websocket api connection."""
+        url = f"{self.sys_homeassistant.api_url}/api/websocket"
+
+        try:
+            client = await self.sys_websession_ssl.ws_connect(
+                url, heartbeat=60, verify_ssl=False)
+
+            # handle authentication
+            for _ in range(2):
+                data = await client.receive_json()
+                if data.get('type') == 'auth_ok':
+                    return client
+                elif data.get('type') == 'auth_required':
+                    await client.send_json({
+                        'type': 'auth',
+                        'api_password': self.sys_homeassistant.api_password,
+                    })
+
+            _LOGGER.error("Authentication to Home-Assistant websocket")
+
+        except (aiohttp.ClientError, RuntimeError) as err:
+            _LOGGER.error("Client error on websocket API %s.", err)
+
+        raise HTTPBadGateway()
+
+    async def websocket(self, request):
+        """Initialize a websocket api connection."""
+        _LOGGER.info("Home-Assistant Websocket API request initialze")
+
+        # init server
+        server = web.WebSocketResponse(heartbeat=60)
+        await server.prepare(request)
+
+        # handle authentication
+        try:
+            await server.send_json({
+                'type': 'auth_required',
+                'ha_version': self.sys_homeassistant.version,
+            })
+
+            # Check API access
+            response = await server.receive_json()
+            hassio_token = response.get('api_password')
+            addon = self.sys_addons.from_uuid(hassio_token)
+
+            if not addon:
+                _LOGGER.warning("Unauthorized websocket access!")
+            else:
+                _LOGGER.info("Websocket access from %s", addon.slug)
+
+            await server.send_json({
+                'type': 'auth_ok',
+                'ha_version': self.sys_homeassistant.version,
+            })
+        except (RuntimeError, ValueError) as err:
+            _LOGGER.error("Can't initialize handshake: %s", err)
+            raise HTTPInternalServerError() from None
+
+        # init connection to hass
+        client = await self._websocket_client()
+
+        _LOGGER.info("Home-Assistant Websocket API request running")
+        try:
+            client_read = None
+            server_read = None
+            while not server.closed and not client.closed:
+                if not client_read:
+                    client_read = self.sys_create_task(
+                        client.receive_str())
+                if not server_read:
+                    server_read = self.sys_create_task(
+                        server.receive_str())
+
+                # wait until data need to be processed
+                await asyncio.wait(
+                    [client_read, server_read],
+                    return_when=asyncio.FIRST_COMPLETED
+                )
+
+                # server
+                if server_read.done() and not client.closed:
+                    server_read.exception()
+                    await client.send_str(server_read.result())
+                    server_read = None
+
+                # client
+                if client_read.done() and not server.closed:
+                    client_read.exception()
+                    await server.send_str(client_read.result())
+                    client_read = None
+
+        except asyncio.CancelledError:
+            pass
+
+        except RuntimeError as err:
+            _LOGGER.info("Home-Assistant Websocket API error: %s", err)
+
+        finally:
+            if client_read:
+                client_read.cancel()
+            if server_read:
+                server_read.cancel()
+
+            # close connections
+            await client.close()
+            await server.close()
+
+        _LOGGER.info("Home-Assistant Websocket API connection is closed")
+        return server

hassio/api/security.py

@@ -1,102 +1,56 @@
-"""Init file for HassIO security rest api."""
+"""Handle security part of this API."""
-from datetime import datetime, timedelta
-import io
 import logging
-import hashlib
+import re
-import os
 
-from aiohttp import web
+from aiohttp.web import middleware
-import voluptuous as vol
+from aiohttp.web_exceptions import HTTPUnauthorized
-import pyotp
-import pyqrcode
 
-from .util import api_process, api_validate, hash_password
+from ..const import HEADER_TOKEN, REQUEST_FROM
-from ..const import ATTR_INITIALIZE, ATTR_PASSWORD, ATTR_TOTP, ATTR_SESSION
+from ..coresys import CoreSysAttributes
 
 _LOGGER = logging.getLogger(__name__)
 
-SCHEMA_PASSWORD = vol.Schema({
+NO_SECURITY_CHECK = set((
-    vol.Required(ATTR_PASSWORD): vol.Coerce(str),
+    re.compile(r"^/homeassistant/api/.*$"),
-})
+    re.compile(r"^/homeassistant/websocket$"),
-
+    re.compile(r"^/supervisor/ping$"),
-SCHEMA_SESSION = SCHEMA_PASSWORD.extend({
+))
-    vol.Optional(ATTR_TOTP, default=None): vol.Coerce(str),
-})
 
 
-class APISecurity(object):
+class SecurityMiddleware(CoreSysAttributes):
-    """Handle rest api for security functions."""
+    """Security middleware functions."""
 
-    def __init__(self, config, loop):
+    def __init__(self, coresys):
-        """Initialize security rest api part."""
+        """Initialize security middleware."""
-        self.config = config
+        self.coresys = coresys
-        self.loop = loop
 
-    def _check_password(self, body):
+    @middleware
-        """Check if password is valid and security is initialize."""
+    async def token_validation(self, request, handler):
-        if not self.config.security_initialize:
+        """Check security access of this layer."""
-            raise RuntimeError("First set a password")
+        hassio_token = request.headers.get(HEADER_TOKEN)
 
-        password = hash_password(body[ATTR_PASSWORD])
+        # Ignore security check
-        if password != self.config.security_password:
+        for rule in NO_SECURITY_CHECK:
-            raise RuntimeError("Wrong password")
+            if rule.match(request.path):
+                _LOGGER.debug("Passthrough %s", request.path)
+                return await handler(request)
 
-    @api_process
+        # Unknown API access
-    async def info(self, request):
+        if not hassio_token:
-        """Return host information."""
+            _LOGGER.warning("Invalid token for access %s", request.path)
-        return {
+            raise HTTPUnauthorized()
-            ATTR_INITIALIZE: self.config.security_initialize,
-            ATTR_TOTP: self.config.security_totp is not None,
-        }
 
-    @api_process
+        # Home-Assistant
-    async def options(self, request):
+        if hassio_token == self.sys_homeassistant.uuid:
-        """Set options / password."""
+            _LOGGER.debug("%s access from Home-Assistant", request.path)
-        body = await api_validate(SCHEMA_PASSWORD, request)
+            request[REQUEST_FROM] = 'homeassistant'
+            return await handler(request)
 
-        if self.config.security_initialize:
+        # Add-on
-            raise RuntimeError("Password is already set!")
+        addon = self.sys_addons.from_uuid(hassio_token)
+        if addon:
+            _LOGGER.info("%s access from %s", request.path, addon.slug)
+            request[REQUEST_FROM] = addon.slug
+            return await handler(request)
 
-        self.config.security_password = hash_password(body[ATTR_PASSWORD])
+        raise HTTPUnauthorized()
-        self.config.security_initialize = True
-        return True
-
-    @api_process
-    async def totp(self, request):
-        """Set and initialze TOTP."""
-        body = await api_validate(SCHEMA_PASSWORD, request)
-        self._check_password(body)
-
-        # generate TOTP
-        totp_init_key = pyotp.random_base32()
-        totp = pyotp.TOTP(totp_init_key)
-
-        # init qrcode
-        buff = io.BytesIO()
-
-        qrcode = pyqrcode.create(totp.provisioning_uri("Hass.IO"))
-        qrcode.svg(buff)
-
-        # finish
-        self.config.security_totp = totp_init_key
-        return web.Response(body=buff.getvalue(), content_type='image/svg+xml')
-
-    @api_process
-    async def session(self, request):
-        """Set and initialze session."""
-        body = await api_validate(SCHEMA_SESSION, request)
-        self._check_password(body)
-
-        # check TOTP
-        if self.config.security_totp:
-            totp = pyotp.TOTP(self.config.security_totp)
-            if body[ATTR_TOTP] != totp.now():
-                raise RuntimeError("Invalid TOTP token!")
-
-        # create session
-        valid_until = datetime.now() + timedelta(days=1)
-        session = hashlib.sha256(os.urandom(54)).hexdigest()
-
-        # store session
-        self.config.add_security_session(session, valid_until)
-        return {ATTR_SESSION: session}

hassio/api/services.py

@@ -0,0 +1,55 @@
+"""Init file for HassIO network rest api."""
+
+from .utils import api_process, api_validate
+from ..const import (
+    ATTR_AVAILABLE, ATTR_PROVIDER, ATTR_SLUG, ATTR_SERVICES, REQUEST_FROM)
+from ..coresys import CoreSysAttributes
+
+
+class APIServices(CoreSysAttributes):
+    """Handle rest api for services functions."""
+
+    def _extract_service(self, request):
+        """Return service and if not exists trow a exception."""
+        service = self.sys_services.get(request.match_info.get('service'))
+        if not service:
+            raise RuntimeError("Service not exists")
+
+        return service
+
+    @api_process
+    async def list(self, request):
+        """Show register services."""
+        services = []
+        for service in self.sys_services.list_services:
+            services.append({
+                ATTR_SLUG: service.slug,
+                ATTR_AVAILABLE: service.enabled,
+                ATTR_PROVIDER: service.provider,
+            })
+
+        return {ATTR_SERVICES: services}
+
+    @api_process
+    async def set_service(self, request):
+        """Write data into a service."""
+        service = self._extract_service(request)
+        body = await api_validate(service.schema, request)
+
+        return service.set_service_data(request[REQUEST_FROM], body)
+
+    @api_process
+    async def get_service(self, request):
+        """Read data into a service."""
+        service = self._extract_service(request)
+
+        return {
+            ATTR_AVAILABLE: service.enabled,
+            service.slug: service.get_service_data(),
+        }
+
+    @api_process
+    async def del_service(self, request):
+        """Delete data into a service."""
+        service = self._extract_service(request)
+        return service.del_service_data(request[REQUEST_FROM])

hassio/api/snapshots.py

@@ -1,48 +1,56 @@
 """Init file for HassIO snapshot rest api."""
 import asyncio
 import logging
+from pathlib import Path
+from tempfile import TemporaryDirectory
 
+from aiohttp import web
 import voluptuous as vol
 
-from .util import api_process, api_validate
+from .utils import api_process, api_validate
 from ..snapshots.validate import ALL_FOLDERS
 from ..const import (
     ATTR_NAME, ATTR_SLUG, ATTR_DATE, ATTR_ADDONS, ATTR_REPOSITORIES,
     ATTR_HOMEASSISTANT, ATTR_VERSION, ATTR_SIZE, ATTR_FOLDERS, ATTR_TYPE,
-    ATTR_DEVICES, ATTR_SNAPSHOTS)
+    ATTR_SNAPSHOTS, ATTR_PASSWORD, ATTR_PROTECTED, CONTENT_TYPE_TAR)
+from ..coresys import CoreSysAttributes
 
 _LOGGER = logging.getLogger(__name__)
 
 
 # pylint: disable=no-value-for-parameter
 SCHEMA_RESTORE_PARTIAL = vol.Schema({
+    vol.Optional(ATTR_PASSWORD): vol.Any(None, vol.Coerce(str)),
     vol.Optional(ATTR_HOMEASSISTANT): vol.Boolean(),
-    vol.Optional(ATTR_ADDONS): [vol.Coerce(str)],
+    vol.Optional(ATTR_ADDONS):
-    vol.Optional(ATTR_FOLDERS): [vol.In(ALL_FOLDERS)],
+        vol.All([vol.Coerce(str)], vol.Unique()),
+    vol.Optional(ATTR_FOLDERS):
+        vol.All([vol.In(ALL_FOLDERS)], vol.Unique()),
+})
+
+SCHEMA_RESTORE_FULL = vol.Schema({
+    vol.Optional(ATTR_PASSWORD): vol.Any(None, vol.Coerce(str)),
 })
 
 SCHEMA_SNAPSHOT_FULL = vol.Schema({
     vol.Optional(ATTR_NAME): vol.Coerce(str),
+    vol.Optional(ATTR_PASSWORD): vol.Any(None, vol.Coerce(str)),
 })
 
 SCHEMA_SNAPSHOT_PARTIAL = SCHEMA_SNAPSHOT_FULL.extend({
-    vol.Optional(ATTR_ADDONS): [vol.Coerce(str)],
+    vol.Optional(ATTR_ADDONS):
-    vol.Optional(ATTR_FOLDERS): [vol.In(ALL_FOLDERS)],
+        vol.All([vol.Coerce(str)], vol.Unique()),
+    vol.Optional(ATTR_FOLDERS):
+        vol.All([vol.In(ALL_FOLDERS)], vol.Unique()),
 })
 
 
-class APISnapshots(object):
+class APISnapshots(CoreSysAttributes):
     """Handle rest api for snapshot functions."""
 
-    def __init__(self, config, loop, snapshots):
-        """Initialize network rest api part."""
-        self.config = config
-        self.loop = loop
-        self.snapshots = snapshots
-
     def _extract_snapshot(self, request):
         """Return addon and if not exists trow a exception."""
-        snapshot = self.snapshots.get(request.match_info.get('snapshot'))
+        snapshot = self.sys_snapshots.get(request.match_info.get('snapshot'))
         if not snapshot:
             raise RuntimeError("Snapshot not exists")
         return snapshot
@@ -51,11 +59,13 @@ class APISnapshots(object):
     async def list(self, request):
         """Return snapshot list."""
         data_snapshots = []
-        for snapshot in self.snapshots.list_snapshots:
+        for snapshot in self.sys_snapshots.list_snapshots:
             data_snapshots.append({
                 ATTR_SLUG: snapshot.slug,
                 ATTR_NAME: snapshot.name,
                 ATTR_DATE: snapshot.date,
+                ATTR_TYPE: snapshot.sys_type,
+                ATTR_PROTECTED: snapshot.protected,
             })
 
         return {
@@ -65,7 +75,7 @@ class APISnapshots(object):
     @api_process
     async def reload(self, request):
         """Reload snapshot list."""
-        await asyncio.shield(self.snapshots.reload(), loop=self.loop)
+        await asyncio.shield(self.sys_snapshots.reload())
         return True
 
     @api_process
@@ -79,6 +89,7 @@ class APISnapshots(object):
                 ATTR_SLUG: addon_data[ATTR_SLUG],
                 ATTR_NAME: addon_data[ATTR_NAME],
                 ATTR_VERSION: addon_data[ATTR_VERSION],
+                ATTR_SIZE: addon_data[ATTR_SIZE],
             })
 
         return {
@@ -87,10 +98,8 @@ class APISnapshots(object):
             ATTR_NAME: snapshot.name,
             ATTR_DATE: snapshot.date,
             ATTR_SIZE: snapshot.size,
-            ATTR_HOMEASSISTANT: {
+            ATTR_PROTECTED: snapshot.protected,
-                ATTR_VERSION: snapshot.homeassistant_version,
+            ATTR_HOMEASSISTANT: snapshot.homeassistant_version,
-                ATTR_DEVICES: snapshot.homeassistant_devices,
-            },
             ATTR_ADDONS: data_addons,
             ATTR_REPOSITORIES: snapshot.repositories,
             ATTR_FOLDERS: snapshot.folders,
@@ -100,36 +109,78 @@ class APISnapshots(object):
     async def snapshot_full(self, request):
         """Full-Snapshot a snapshot."""
         body = await api_validate(SCHEMA_SNAPSHOT_FULL, request)
-        return await asyncio.shield(
+        snapshot = await asyncio.shield(
-            self.snapshots.do_snapshot_full(**body), loop=self.loop)
+            self.sys_snapshots.do_snapshot_full(**body))
+
+        if snapshot:
+            return {ATTR_SLUG: snapshot.slug}
+        return False
 
     @api_process
     async def snapshot_partial(self, request):
         """Partial-Snapshot a snapshot."""
         body = await api_validate(SCHEMA_SNAPSHOT_PARTIAL, request)
-        return await asyncio.shield(
+        snapshot = await asyncio.shield(
-            self.snapshots.do_snapshot_partial(**body), loop=self.loop)
+            self.sys_snapshots.do_snapshot_partial(**body))
+
+        if snapshot:
+            return {ATTR_SLUG: snapshot.slug}
+        return False
 
     @api_process
-    def restore_full(self, request):
+    async def restore_full(self, request):
         """Full-Restore a snapshot."""
         snapshot = self._extract_snapshot(request)
-        return asyncio.shield(
+        body = await api_validate(SCHEMA_RESTORE_FULL, request)
-            self.snapshots.do_restore_full(snapshot), loop=self.loop)
+
+        return await asyncio.shield(
+            self.sys_snapshots.do_restore_full(snapshot, **body))
 
     @api_process
     async def restore_partial(self, request):
         """Partial-Restore a snapshot."""
         snapshot = self._extract_snapshot(request)
-        body = await api_validate(SCHEMA_SNAPSHOT_PARTIAL, request)
+        body = await api_validate(SCHEMA_RESTORE_PARTIAL, request)
 
         return await asyncio.shield(
-            self.snapshots.do_restore_partial(snapshot, **body),
+            self.sys_snapshots.do_restore_partial(snapshot, **body))
-            loop=self.loop
-        )
 
     @api_process
     async def remove(self, request):
         """Remove a snapshot."""
         snapshot = self._extract_snapshot(request)
-        return self.snapshots.remove(snapshot)
+        return self.sys_snapshots.remove(snapshot)
+
+    async def download(self, request):
+        """Download a snapshot file."""
+        snapshot = self._extract_snapshot(request)
+
+        _LOGGER.info("Download snapshot %s", snapshot.slug)
+        response = web.FileResponse(snapshot.tarfile)
+        response.content_type = CONTENT_TYPE_TAR
+        return response
+
+    @api_process
+    async def upload(self, request):
+        """Upload a snapshot file."""
+        with TemporaryDirectory(dir=str(self.sys_config.path_tmp)) as temp_dir:
+            tar_file = Path(temp_dir, f"snapshot.tar")
+
+            try:
+                with tar_file.open('wb') as snapshot:
+                    async for data in request.content.iter_any():
+                        snapshot.write(data)
+
+            except OSError as err:
+                _LOGGER.error("Can't write new snapshot file: %s", err)
+                return False
+
+            except asyncio.CancelledError:
+                return False
+
+            snapshot = await asyncio.shield(
+                self.sys_snapshots.import_snapshot(tar_file))
+
+            if snapshot:
+                return {ATTR_SLUG: snapshot.slug}
+            return False

hassio/api/supervisor.py

@@ -4,21 +4,24 @@ import logging
 
 import voluptuous as vol
 
-from .util import api_process, api_process_raw, api_validate
+from .utils import api_process, api_process_raw, api_validate
 from ..const import (
-    ATTR_ADDONS, ATTR_VERSION, ATTR_LAST_VERSION, ATTR_BETA_CHANNEL, ATTR_ARCH,
+    ATTR_ADDONS, ATTR_VERSION, ATTR_LAST_VERSION, ATTR_CHANNEL, ATTR_ARCH,
     HASSIO_VERSION, ATTR_ADDONS_REPOSITORIES, ATTR_LOGO, ATTR_REPOSITORY,
     ATTR_DESCRIPTON, ATTR_NAME, ATTR_SLUG, ATTR_INSTALLED, ATTR_TIMEZONE,
-    ATTR_STATE, CONTENT_TYPE_BINARY)
+    ATTR_STATE, ATTR_WAIT_BOOT, ATTR_CPU_PERCENT, ATTR_MEMORY_USAGE,
-from ..validate import validate_timezone
+    ATTR_MEMORY_LIMIT, ATTR_NETWORK_RX, ATTR_NETWORK_TX, ATTR_BLK_READ,
+    ATTR_BLK_WRITE, CONTENT_TYPE_BINARY, ATTR_ICON)
+from ..coresys import CoreSysAttributes
+from ..validate import validate_timezone, WAIT_BOOT, REPOSITORIES, CHANNELS
 
 _LOGGER = logging.getLogger(__name__)
 
 SCHEMA_OPTIONS = vol.Schema({
-    # pylint: disable=no-value-for-parameter
+    vol.Optional(ATTR_CHANNEL): CHANNELS,
-    vol.Optional(ATTR_BETA_CHANNEL): vol.Boolean(),
+    vol.Optional(ATTR_ADDONS_REPOSITORIES): REPOSITORIES,
-    vol.Optional(ATTR_ADDONS_REPOSITORIES): [vol.Url()],
     vol.Optional(ATTR_TIMEZONE): validate_timezone,
+    vol.Optional(ATTR_WAIT_BOOT): WAIT_BOOT,
 })
 
 SCHEMA_VERSION = vol.Schema({
@@ -26,20 +29,9 @@ SCHEMA_VERSION = vol.Schema({
 })
 
 
-class APISupervisor(object):
+class APISupervisor(CoreSysAttributes):
     """Handle rest api for supervisor functions."""
 
-    def __init__(self, config, loop, supervisor, snapshots, addons,
-                 host_control, updater):
-        """Initialize supervisor rest api part."""
-        self.config = config
-        self.loop = loop
-        self.supervisor = supervisor
-        self.addons = addons
-        self.snapshots = snapshots
-        self.host_control = host_control
-        self.updater = updater
-
     @api_process
     async def ping(self, request):
         """Return ok for signal that the api is ready."""
@@ -49,7 +41,7 @@ class APISupervisor(object):
     async def info(self, request):
         """Return host information."""
         list_addons = []
-        for addon in self.addons.list_addons:
+        for addon in self.sys_addons.list_addons:
             if addon.is_installed:
                 list_addons.append({
                     ATTR_NAME: addon.name,
@@ -59,17 +51,19 @@ class APISupervisor(object):
                     ATTR_VERSION: addon.last_version,
                     ATTR_INSTALLED: addon.version_installed,
                     ATTR_REPOSITORY: addon.repository,
+                    ATTR_ICON: addon.with_icon,
                     ATTR_LOGO: addon.with_logo,
                 })
 
         return {
             ATTR_VERSION: HASSIO_VERSION,
-            ATTR_LAST_VERSION: self.updater.version_hassio,
+            ATTR_LAST_VERSION: self.sys_updater.version_hassio,
-            ATTR_BETA_CHANNEL: self.updater.beta_channel,
+            ATTR_CHANNEL: self.sys_updater.channel,
-            ATTR_ARCH: self.config.arch,
+            ATTR_ARCH: self.sys_arch,
-            ATTR_TIMEZONE: self.config.timezone,
+            ATTR_WAIT_BOOT: self.sys_config.wait_boot,
+            ATTR_TIMEZONE: self.sys_config.timezone,
             ATTR_ADDONS: list_addons,
-            ATTR_ADDONS_REPOSITORIES: self.config.addons_repositories,
+            ATTR_ADDONS_REPOSITORIES: self.sys_config.addons_repositories,
         }
 
     @api_process
@@ -77,41 +71,60 @@ class APISupervisor(object):
         """Set supervisor options."""
         body = await api_validate(SCHEMA_OPTIONS, request)
 
-        if ATTR_BETA_CHANNEL in body:
+        if ATTR_CHANNEL in body:
-            self.updater.beta_channel = body[ATTR_BETA_CHANNEL]
+            self.sys_updater.channel = body[ATTR_CHANNEL]
 
         if ATTR_TIMEZONE in body:
-            self.config.timezone = body[ATTR_TIMEZONE]
+            self.sys_config.timezone = body[ATTR_TIMEZONE]
+
+        if ATTR_WAIT_BOOT in body:
+            self.sys_config.wait_boot = body[ATTR_WAIT_BOOT]
 
         if ATTR_ADDONS_REPOSITORIES in body:
             new = set(body[ATTR_ADDONS_REPOSITORIES])
-            await asyncio.shield(self.addons.load_repositories(new))
+            await asyncio.shield(self.sys_addons.load_repositories(new))
 
+        self.sys_updater.save_data()
+        self.sys_config.save_data()
         return True
 
+    @api_process
+    async def stats(self, request):
+        """Return resource information."""
+        stats = await self.sys_supervisor.stats()
+        if not stats:
+            raise RuntimeError("No stats available")
+
+        return {
+            ATTR_CPU_PERCENT: stats.cpu_percent,
+            ATTR_MEMORY_USAGE: stats.memory_usage,
+            ATTR_MEMORY_LIMIT: stats.memory_limit,
+            ATTR_NETWORK_RX: stats.network_rx,
+            ATTR_NETWORK_TX: stats.network_tx,
+            ATTR_BLK_READ: stats.blk_read,
+            ATTR_BLK_WRITE: stats.blk_write,
+        }
+
     @api_process
     async def update(self, request):
         """Update supervisor OS."""
         body = await api_validate(SCHEMA_VERSION, request)
-        version = body.get(ATTR_VERSION, self.updater.version_hassio)
+        version = body.get(ATTR_VERSION, self.sys_updater.version_hassio)
 
-        if version == self.supervisor.version:
+        if version == self.sys_supervisor.version:
             raise RuntimeError("Version {} is already in use".format(version))
 
         return await asyncio.shield(
-            self.supervisor.update(version), loop=self.loop)
+            self.sys_supervisor.update(version))
 
     @api_process
     async def reload(self, request):
         """Reload addons, config ect."""
         tasks = [
-            self.addons.reload(),
+            self.sys_updater.reload(),
-            self.snapshots.reload(),
-            self.updater.fetch_data(),
-            self.host_control.load()
         ]
         results, _ = await asyncio.shield(
-            asyncio.wait(tasks, loop=self.loop), loop=self.loop)
+            asyncio.wait(tasks))
 
         for result in results:
             if result.exception() is not None:
@@ -122,4 +135,4 @@ class APISupervisor(object):
     @api_process_raw(CONTENT_TYPE_BINARY)
     def logs(self, request):
         """Return supervisor docker logs."""
-        return self.supervisor.logs()
+        return self.sys_supervisor.logs()

hassio/api/utils.py

@@ -4,23 +4,25 @@ import hashlib
 import logging
 
 from aiohttp import web
-from aiohttp.web_exceptions import HTTPServiceUnavailable
 import voluptuous as vol
 from voluptuous.humanize import humanize_error
 
 from ..const import (
     JSON_RESULT, JSON_DATA, JSON_MESSAGE, RESULT_OK, RESULT_ERROR,
     CONTENT_TYPE_BINARY)
+from ..exceptions import HassioError
 
 _LOGGER = logging.getLogger(__name__)
 
 
 def json_loads(data):
     """Extract json from string with support for '' and None."""
+    if not data:
+        return {}
     try:
         return json.loads(data)
     except json.JSONDecodeError:
-        return {}
+        raise RuntimeError("Invalid json")
 
 
 def api_process(method):
@@ -31,41 +33,21 @@ def api_process(method):
             answer = await method(api, *args, **kwargs)
         except RuntimeError as err:
             return api_return_error(message=str(err))
+        except HassioError:
+            _LOGGER.exception("Hassio error")
+            return api_return_error()
 
         if isinstance(answer, dict):
             return api_return_ok(data=answer)
         if isinstance(answer, web.Response):
             return answer
-        elif answer:
+        elif isinstance(answer, bool) and not answer:
-            return api_return_ok()
             return api_return_error()
+        return api_return_ok()
 
     return wrap_api
 
 
-def api_process_hostcontrol(method):
-    """Wrap HostControl calls to rest api."""
-    async def wrap_hostcontrol(api, *args, **kwargs):
-        """Return host information."""
-        if not api.host_control.active:
-            raise HTTPServiceUnavailable()
-
-        try:
-            answer = await method(api, *args, **kwargs)
-        except RuntimeError as err:
-            return api_return_error(message=str(err))
-
-        if isinstance(answer, dict):
-            return api_return_ok(data=answer)
-        elif answer is None:
-            return api_return_error("Function is not supported")
-        elif answer:
-            return api_return_ok()
-        return api_return_error()
-
-    return wrap_hostcontrol
-
-
 def api_process_raw(content):
     """Wrap content_type into function."""
     def wrap_method(method):
@@ -78,6 +60,9 @@ def api_process_raw(content):
             except RuntimeError as err:
                 msg_data = str(err).encode()
                 msg_type = CONTENT_TYPE_BINARY
+            except HassioError:
+                msg_data = b''
+                msg_type = CONTENT_TYPE_BINARY
 
             return web.Response(body=msg_data, content_type=msg_type)
 

hassio/bootstrap.py

@@ -7,15 +7,51 @@ from pathlib import Path
 
 from colorlog import ColoredFormatter
 
+from .core import HassIO
+from .addons import AddonManager
+from .api import RestAPI
 from .const import SOCKET_DOCKER
-from .config import CoreConfig
+from .coresys import CoreSys
+from .supervisor import Supervisor
+from .homeassistant import HomeAssistant
+from .snapshots import SnapshotManager
+from .tasks import Tasks
+from .updater import Updater
+from .services import ServiceManager
+from .services import Discovery
+from .host import HostManager
+from .dbus import DBusManager
 
 _LOGGER = logging.getLogger(__name__)
 
 
-def initialize_system_data():
+def initialize_coresys(loop):
+    """Initialize HassIO coresys/objects."""
+    coresys = CoreSys(loop)
+
+    # Initialize core objects
+    coresys.core = HassIO(coresys)
+    coresys.updater = Updater(coresys)
+    coresys.api = RestAPI(coresys)
+    coresys.supervisor = Supervisor(coresys)
+    coresys.homeassistant = HomeAssistant(coresys)
+    coresys.addons = AddonManager(coresys)
+    coresys.snapshots = SnapshotManager(coresys)
+    coresys.host = HostManager(coresys)
+    coresys.tasks = Tasks(coresys)
+    coresys.services = ServiceManager(coresys)
+    coresys.discovery = Discovery(coresys)
+    coresys.dbus = DBusManager(coresys)
+
+    # bootstrap config
+    initialize_system_data(coresys)
+
+    return coresys
+
+
+def initialize_system_data(coresys):
     """Setup default config and create folders."""
-    config = CoreConfig()
+    config = coresys.config
 
     # homeassistant config folder
     if not config.path_config.is_dir():
@@ -62,8 +98,9 @@ def initialize_system_data():
     return config
 
 
-def migrate_system_env(config):
+def migrate_system_env(coresys):
     """Cleanup some stuff after update."""
+    config = coresys.config
 
     # hass.io 0.37 -> 0.38
     old_build = Path(config.path_hassio, "addons/build")
@@ -117,28 +154,33 @@ def check_environment():
 
     # check socat exec
     if not shutil.which('socat'):
-        _LOGGER.fatal("Can0t find socat program!")
+        _LOGGER.fatal("Can't find socat program!")
+        return False
+
+    # check socat exec
+    if not shutil.which('gdbus'):
+        _LOGGER.fatal("Can't find gdbus program!")
         return False
 
     return True
 
 
-def reg_signal(loop, hassio):
+def reg_signal(loop):
     """Register SIGTERM, SIGKILL to stop system."""
     try:
         loop.add_signal_handler(
-            signal.SIGTERM, lambda: loop.create_task(hassio.stop()))
+            signal.SIGTERM, lambda: loop.call_soon(loop.stop))
     except (ValueError, RuntimeError):
         _LOGGER.warning("Could not bind to SIGTERM")
 
     try:
         loop.add_signal_handler(
-            signal.SIGHUP, lambda: loop.create_task(hassio.stop()))
+            signal.SIGHUP, lambda: loop.call_soon(loop.stop))
     except (ValueError, RuntimeError):
         _LOGGER.warning("Could not bind to SIGHUP")
 
     try:
         loop.add_signal_handler(
-            signal.SIGINT, lambda: loop.create_task(hassio.stop()))
+            signal.SIGINT, lambda: loop.call_soon(loop.stop))
     except (ValueError, RuntimeError):
         _LOGGER.warning("Could not bind to SIGINT")

hassio/config.py

@@ -5,10 +5,10 @@ import os
 from pathlib import Path, PurePath
 
 from .const import (
-    FILE_HASSIO_CONFIG, HASSIO_DATA, ATTR_SECURITY, ATTR_SESSIONS,
+    FILE_HASSIO_CONFIG, HASSIO_DATA, ATTR_TIMEZONE, ATTR_ADDONS_CUSTOM_LIST,
-    ATTR_PASSWORD, ATTR_TOTP, ATTR_TIMEZONE, ATTR_ADDONS_CUSTOM_LIST,
+    ATTR_LAST_BOOT, ATTR_WAIT_BOOT)
-    ATTR_AUDIO_INPUT, ATTR_AUDIO_OUTPUT, ATTR_LAST_BOOT)
+from .utils.dt import parse_datetime
-from .tools import JsonConfig, parse_datetime
+from .utils.json import JsonConfig
 from .validate import SCHEMA_HASSIO_CONFIG
 
 _LOGGER = logging.getLogger(__name__)
@@ -35,7 +35,6 @@ class CoreConfig(JsonConfig):
     def __init__(self):
         """Initialize config object."""
         super().__init__(FILE_HASSIO_CONFIG, SCHEMA_HASSIO_CONFIG)
-        self.arch = None
 
     @property
     def timezone(self):
@@ -46,7 +45,16 @@ class CoreConfig(JsonConfig):
     def timezone(self, value):
         """Set system timezone."""
         self._data[ATTR_TIMEZONE] = value
-        self.save()
+
+    @property
+    def wait_boot(self):
+        """Return wait time for auto boot stages."""
+        return self._data[ATTR_WAIT_BOOT]
+
+    @wait_boot.setter
+    def wait_boot(self, value):
+        """Set wait boot time."""
+        self._data[ATTR_WAIT_BOOT] = value
 
     @property
     def last_boot(self):
@@ -62,7 +70,6 @@ class CoreConfig(JsonConfig):
     def last_boot(self, value):
         """Set last boot datetime."""
         self._data[ATTR_LAST_BOOT] = value.isoformat()
-        self.save()
 
     @property
     def path_hassio(self):
@@ -129,6 +136,11 @@ class CoreConfig(JsonConfig):
         """Return hass.io temp folder."""
         return Path(HASSIO_DATA, TMP_DATA)
 
+    @property
+    def path_extern_tmp(self):
+        """Return hass.io temp folder for docker."""
+        return PurePath(self.path_extern_hassio, TMP_DATA)
+
     @property
     def path_backup(self):
         """Return root backup data folder."""
@@ -160,7 +172,6 @@ class CoreConfig(JsonConfig):
             return
 
         self._data[ATTR_ADDONS_CUSTOM_LIST].append(repo)
-        self.save()
 
     def drop_addon_repository(self, repo):
         """Remove a custom repository from list."""
@@ -168,79 +179,3 @@ class CoreConfig(JsonConfig):
             return
 
         self._data[ATTR_ADDONS_CUSTOM_LIST].remove(repo)
-        self.save()
-
-    @property
-    def security_initialize(self):
-        """Return is security was initialize."""
-        return self._data[ATTR_SECURITY]
-
-    @security_initialize.setter
-    def security_initialize(self, value):
-        """Set is security initialize."""
-        self._data[ATTR_SECURITY] = value
-        self.save()
-
-    @property
-    def security_totp(self):
-        """Return the TOTP key."""
-        return self._data.get(ATTR_TOTP)
-
-    @security_totp.setter
-    def security_totp(self, value):
-        """Set the TOTP key."""
-        self._data[ATTR_TOTP] = value
-        self.save()
-
-    @property
-    def security_password(self):
-        """Return the password key."""
-        return self._data.get(ATTR_PASSWORD)
-
-    @security_password.setter
-    def security_password(self, value):
-        """Set the password key."""
-        self._data[ATTR_PASSWORD] = value
-        self.save()
-
-    @property
-    def security_sessions(self):
-        """Return api sessions."""
-        return {
-            session: parse_datetime(until) for
-            session, until in self._data[ATTR_SESSIONS].items()
-        }
-
-    def add_security_session(self, session, valid):
-        """Set the a new session."""
-        self._data[ATTR_SESSIONS].update(
-            {session: valid.isoformat()}
-        )
-        self.save()
-
-    def drop_security_session(self, session):
-        """Delete the a session."""
-        self._data[ATTR_SESSIONS].pop(session, None)
-        self.save()
-
-    @property
-    def audio_output(self):
-        """Return ALSA audio output card,dev."""
-        return self._data.get(ATTR_AUDIO_OUTPUT)
-
-    @audio_output.setter
-    def audio_output(self, value):
-        """Set ALSA audio output card,dev."""
-        self._data[ATTR_AUDIO_OUTPUT] = value
-        self.save()
-
-    @property
-    def audio_input(self):
-        """Return ALSA audio input card,dev."""
-        return self._data.get(ATTR_AUDIO_INPUT)
-
-    @audio_input.setter
-    def audio_input(self, value):
-        """Set ALSA audio input card,dev."""
-        self._data[ATTR_AUDIO_INPUT] = value
-        self.save()

hassio/const.py

@@ -2,32 +2,21 @@
 from pathlib import Path
 from ipaddress import ip_network
 
-HASSIO_VERSION = '0.65'
+HASSIO_VERSION = '105'
 
-URL_HASSIO_VERSION = ('https://raw.githubusercontent.com/home-assistant/'
+URL_HASSIO_ADDONS = "https://github.com/home-assistant/hassio-addons"
-                      'hassio/{}/version.json')
+URL_HASSIO_VERSION = \
-
+  "https://s3.amazonaws.com/hassio-version/{channel}.json"
-URL_HASSIO_ADDONS = 'https://github.com/home-assistant/hassio-addons'
 
 HASSIO_DATA = Path("/data")
 
-RUN_UPDATE_INFO_TASKS = 28800
-RUN_UPDATE_SUPERVISOR_TASKS = 29100
-RUN_UPDATE_ADDONS_TASKS = 57600
-RUN_RELOAD_ADDONS_TASKS = 28800
-RUN_RELOAD_SNAPSHOTS_TASKS = 72000
-RUN_WATCHDOG_HOMEASSISTANT = 15
-RUN_CLEANUP_API_SESSIONS = 900
-
-RESTART_EXIT_CODE = 100
-
 FILE_HASSIO_ADDONS = Path(HASSIO_DATA, "addons.json")
 FILE_HASSIO_CONFIG = Path(HASSIO_DATA, "config.json")
 FILE_HASSIO_HOMEASSISTANT = Path(HASSIO_DATA, "homeassistant.json")
 FILE_HASSIO_UPDATER = Path(HASSIO_DATA, "updater.json")
+FILE_HASSIO_SERVICES = Path(HASSIO_DATA, "services.json")
 
 SOCKET_DOCKER = Path("/var/run/docker.sock")
-SOCKET_HC = Path("/var/run/hassio-hc.sock")
 
 DOCKER_NETWORK = 'hassio'
 DOCKER_NETWORK_MASK = ip_network('172.30.32.0/23')
@@ -36,6 +25,7 @@ DOCKER_NETWORK_RANGE = ip_network('172.30.33.0/24')
 LABEL_VERSION = 'io.hass.version'
 LABEL_ARCH = 'io.hass.arch'
 LABEL_TYPE = 'io.hass.type'
+LABEL_MACHINE = 'io.hass.machine'
 
 META_ADDON = 'addon'
 META_SUPERVISOR = 'supervisor'
@@ -50,27 +40,47 @@ RESULT_OK = 'ok'
 
 CONTENT_TYPE_BINARY = 'application/octet-stream'
 CONTENT_TYPE_PNG = 'image/png'
+CONTENT_TYPE_JSON = 'application/json'
+CONTENT_TYPE_TEXT = 'text/plain'
+CONTENT_TYPE_TAR = 'application/tar'
+HEADER_HA_ACCESS = 'x-ha-access'
+HEADER_TOKEN = 'X-HASSIO-KEY'
 
+ENV_TOKEN = 'HASSIO_TOKEN'
+ENV_TIME = 'TZ'
+
+REQUEST_FROM = 'HASSIO_FROM'
+
+ATTR_MACHINE = 'machine'
+ATTR_WAIT_BOOT = 'wait_boot'
+ATTR_DEPLOYMENT = 'deployment'
+ATTR_WATCHDOG = 'watchdog'
+ATTR_CHANGELOG = 'changelog'
 ATTR_DATE = 'date'
 ATTR_ARCH = 'arch'
+ATTR_LONG_DESCRIPTION = 'long_description'
 ATTR_HOSTNAME = 'hostname'
 ATTR_TIMEZONE = 'timezone'
 ATTR_ARGS = 'args'
-ATTR_OS = 'os'
+ATTR_OPERATING_SYSTEM = 'operating_system'
+ATTR_CHASSIS = 'chassis'
 ATTR_TYPE = 'type'
 ATTR_SOURCE = 'source'
 ATTR_FEATURES = 'features'
 ATTR_ADDONS = 'addons'
 ATTR_VERSION = 'version'
+ATTR_AUTO_UART = 'auto_uart'
 ATTR_LAST_BOOT = 'last_boot'
 ATTR_LAST_VERSION = 'last_version'
-ATTR_BETA_CHANNEL = 'beta_channel'
+ATTR_CHANNEL = 'channel'
 ATTR_NAME = 'name'
 ATTR_SLUG = 'slug'
 ATTR_DESCRIPTON = 'description'
 ATTR_STARTUP = 'startup'
 ATTR_BOOT = 'boot'
 ATTR_PORTS = 'ports'
+ATTR_PORT = 'port'
+ATTR_SSL = 'ssl'
 ATTR_MAP = 'map'
 ATTR_WEBUI = 'webui'
 ATTR_OPTIONS = 'options'
@@ -79,7 +89,9 @@ ATTR_DETACHED = 'detached'
 ATTR_STATE = 'state'
 ATTR_SCHEMA = 'schema'
 ATTR_IMAGE = 'image'
+ATTR_ICON = 'icon'
 ATTR_LOGO = 'logo'
+ATTR_STDIN = 'stdin'
 ATTR_ADDONS_REPOSITORIES = 'addons_repositories'
 ATTR_REPOSITORY = 'repository'
 ATTR_REPOSITORIES = 'repositories'
@@ -95,6 +107,8 @@ ATTR_BUILD = 'build'
 ATTR_DEVICES = 'devices'
 ATTR_ENVIRONMENT = 'environment'
 ATTR_HOST_NETWORK = 'host_network'
+ATTR_HOST_IPC = 'host_ipc'
+ATTR_HOST_DBUS = 'host_dbus'
 ATTR_NETWORK = 'network'
 ATTR_TMPFS = 'tmpfs'
 ATTR_PRIVILEGED = 'privileged'
@@ -104,6 +118,8 @@ ATTR_SNAPSHOTS = 'snapshots'
 ATTR_HOMEASSISTANT = 'homeassistant'
 ATTR_HASSIO = 'hassio'
 ATTR_HASSIO_API = 'hassio_api'
+ATTR_HOMEASSISTANT_API = 'homeassistant_api'
+ATTR_UUID = 'uuid'
 ATTR_FOLDERS = 'folders'
 ATTR_SIZE = 'size'
 ATTR_TYPE = 'type'
@@ -121,7 +137,35 @@ ATTR_SECURITY = 'security'
 ATTR_BUILD_FROM = 'build_from'
 ATTR_SQUASH = 'squash'
 ATTR_GPIO = 'gpio'
+ATTR_LEGACY = 'legacy'
 ATTR_ADDONS_CUSTOM_LIST = 'addons_custom_list'
+ATTR_CPU_PERCENT = 'cpu_percent'
+ATTR_NETWORK_RX = 'network_rx'
+ATTR_NETWORK_TX = 'network_tx'
+ATTR_MEMORY_LIMIT = 'memory_limit'
+ATTR_MEMORY_USAGE = 'memory_usage'
+ATTR_BLK_READ = 'blk_read'
+ATTR_BLK_WRITE = 'blk_write'
+ATTR_PROVIDER = 'provider'
+ATTR_AVAILABLE = 'available'
+ATTR_HOST = 'host'
+ATTR_USERNAME = 'username'
+ATTR_PROTOCOL = 'protocol'
+ATTR_DISCOVERY = 'discovery'
+ATTR_PLATFORM = 'platform'
+ATTR_COMPONENT = 'component'
+ATTR_CONFIG = 'config'
+ATTR_DISCOVERY_ID = 'discovery_id'
+ATTR_SERVICES = 'services'
+ATTR_DISCOVERY = 'discovery'
+ATTR_PROTECTED = 'protected'
+ATTR_CRYPTO = 'crypto'
+ATTR_BRANCH = 'branch'
+ATTR_KERNEL = 'kernel'
+ATTR_SECCOMP = 'seccomp'
+ATTR_APPARMOR = 'apparmor'
+
+SERVICE_MQTT = 'mqtt'
 
 STARTUP_INITIALIZE = 'initialize'
 STARTUP_SYSTEM = 'system'
@@ -147,6 +191,10 @@ ARCH_AARCH64 = 'aarch64'
 ARCH_AMD64 = 'amd64'
 ARCH_I386 = 'i386'
 
+CHANNEL_STABLE = 'stable'
+CHANNEL_BETA = 'beta'
+CHANNEL_DEV = 'dev'
+
 REPOSITORY_CORE = 'core'
 REPOSITORY_LOCAL = 'local'
 
@@ -157,3 +205,14 @@ FOLDER_SSL = 'ssl'
 
 SNAPSHOT_FULL = 'full'
 SNAPSHOT_PARTIAL = 'partial'
+
+CRYPTO_AES128 = 'aes128'
+
+SECURITY_PROFILE = 'profile'
+SECURITY_DEFAULT = 'default'
+SECURITY_DISABLE = 'disable'
+
+FEATURES_SHUTDOWN = 'shutdown'
+FEATURES_REBOOT = 'reboot'
+FEATURES_UPDATE = 'update'
+FEATURES_HOSTNAME = 'hostname'

hassio/core.py

@@ -1,185 +1,135 @@
 """Main file for HassIO."""
+from contextlib import suppress
 import asyncio
 import logging
 
-import aiohttp
+from .coresys import CoreSysAttributes
-
-from .addons import AddonManager
-from .api import RestAPI
-from .host_control import HostControl
 from .const import (
-    RUN_UPDATE_INFO_TASKS, RUN_RELOAD_ADDONS_TASKS,
+    STARTUP_SYSTEM, STARTUP_SERVICES, STARTUP_APPLICATION, STARTUP_INITIALIZE)
-    RUN_UPDATE_SUPERVISOR_TASKS, RUN_WATCHDOG_HOMEASSISTANT,
+from .exceptions import HassioError
-    RUN_CLEANUP_API_SESSIONS, STARTUP_SYSTEM, STARTUP_SERVICES,
+from .utils.dt import fetch_timezone
-    STARTUP_APPLICATION, STARTUP_INITIALIZE, RUN_RELOAD_SNAPSHOTS_TASKS,
-    RUN_UPDATE_ADDONS_TASKS)
-from .hardware import Hardware
-from .homeassistant import HomeAssistant
-from .scheduler import Scheduler
-from .dock import DockerAPI
-from .dock.supervisor import DockerSupervisor
-from .dns import DNSForward
-from .snapshots import SnapshotsManager
-from .updater import Updater
-from .tasks import (
-    hassio_update, homeassistant_watchdog, api_sessions_cleanup, addons_update)
-from .tools import fetch_timezone
 
 _LOGGER = logging.getLogger(__name__)
 
 
-class HassIO(object):
+class HassIO(CoreSysAttributes):
     """Main object of hassio."""
 
-    def __init__(self, loop, config):
+    def __init__(self, coresys):
         """Initialize hassio object."""
-        self.exit_code = 0
+        self.coresys = coresys
-        self.loop = loop
-        self.config = config
-        self.websession = aiohttp.ClientSession(loop=loop)
-        self.updater = Updater(config, loop, self.websession)
-        self.scheduler = Scheduler(loop)
-        self.api = RestAPI(config, loop)
-        self.hardware = Hardware()
-        self.docker = DockerAPI()
-        self.dns = DNSForward()
-
-        # init basic docker container
-        self.supervisor = DockerSupervisor(
-            config, loop, self.docker, self.stop)
-
-        # init homeassistant
-        self.homeassistant = HomeAssistant(
-            config, loop, self.docker, self.updater)
-
-        # init HostControl
-        self.host_control = HostControl(loop)
-
-        # init addon system
-        self.addons = AddonManager(config, loop, self.docker)
-
-        # init snapshot system
-        self.snapshots = SnapshotsManager(
-            config, loop, self.scheduler, self.addons, self.homeassistant)
 
     async def setup(self):
         """Setup HassIO orchestration."""
-        # supervisor
-        if not await self.supervisor.attach():
-            _LOGGER.fatal("Can't setup supervisor docker container!")
-        await self.supervisor.cleanup()
-
-        # set running arch
-        self.config.arch = self.supervisor.arch
-
         # update timezone
-        if self.config.timezone == 'UTC':
+        if self.sys_config.timezone == 'UTC':
-            self.config.timezone = await fetch_timezone(self.websession)
+            self.sys_config.timezone = \
+                await fetch_timezone(self.sys_websession)
 
-        # hostcontrol
+        # Load DBus
-        await self.host_control.load()
+        await self.sys_dbus.load()
 
-        # schedule update info tasks
+        # Load Host
-        self.scheduler.register_task(
+        await self.sys_host.load()
-            self.host_control.load, RUN_UPDATE_INFO_TASKS)
+
+        # Load Supervisor
+        await self.sys_supervisor.load()
+
+        # Load Home Assistant
+        await self.sys_homeassistant.load()
+
+        # Load Add-ons
+        await self.sys_addons.load()
 
         # rest api views
-        self.api.register_host(self.host_control, self.hardware)
+        await self.sys_api.load()
-        self.api.register_network(self.host_control)
-        self.api.register_supervisor(
-            self.supervisor, self.snapshots, self.addons, self.host_control,
-            self.updater)
-        self.api.register_homeassistant(self.homeassistant)
-        self.api.register_addons(self.addons)
-        self.api.register_security()
-        self.api.register_snapshots(self.snapshots)
-        self.api.register_panel()
 
-        # schedule api session cleanup
+        # load last available data
-        self.scheduler.register_task(
+        await self.sys_updater.load()
-            api_sessions_cleanup(self.config), RUN_CLEANUP_API_SESSIONS,
-            now=True)
 
-        # Load homeassistant
+        # load last available data
-        await self.homeassistant.prepare()
+        await self.sys_snapshots.load()
 
-        # Load addons
+        # load services
-        await self.addons.prepare()
+        await self.sys_services.load()
-
-        # schedule addon update task
-        self.scheduler.register_task(
-            self.addons.reload, RUN_RELOAD_ADDONS_TASKS, now=True)
-        self.scheduler.register_task(
-            addons_update(self.loop, self.addons), RUN_UPDATE_ADDONS_TASKS)
-
-        # schedule self update task
-        self.scheduler.register_task(
-            hassio_update(self.supervisor, self.updater),
-            RUN_UPDATE_SUPERVISOR_TASKS)
-
-        # schedule snapshot update tasks
-        self.scheduler.register_task(
-            self.snapshots.reload, RUN_RELOAD_SNAPSHOTS_TASKS, now=True)
 
         # start dns forwarding
-        self.loop.create_task(self.dns.start())
+        self.sys_create_task(self.sys_dns.start())
-
-        # start addon mark as initialize
-        await self.addons.auto_boot(STARTUP_INITIALIZE)
 
     async def start(self):
         """Start HassIO orchestration."""
         # on release channel, try update itself
-        # on beta channel, only read new versions
+        # on dev mode, only read new versions
-        await asyncio.wait(
+        if not self.sys_dev and self.sys_supervisor.need_update:
-            [hassio_update(self.supervisor, self.updater)()],
+            if await self.sys_supervisor.update():
-            loop=self.loop
+                return
-        )
+        else:
+            _LOGGER.info("Ignore Hass.io auto updates on dev channel")
 
         # start api
-        await self.api.start()
+        await self.sys_api.start()
-        _LOGGER.info("Start hassio api on %s", self.docker.network.supervisor)
+        _LOGGER.info("Start API on %s", self.sys_docker.network.supervisor)
+
+        # start addon mark as initialize
+        await self.sys_addons.boot(STARTUP_INITIALIZE)
 
         try:
             # HomeAssistant is already running / supervisor have only reboot
-            if self.hardware.last_boot == self.config.last_boot:
+            if self.sys_hardware.last_boot == self.sys_config.last_boot:
-                _LOGGER.info("HassIO reboot detected")
+                _LOGGER.info("Hass.io reboot detected")
                 return
 
+            # reset register services / discovery
+            self.sys_services.reset()
+
             # start addon mark as system
-            await self.addons.auto_boot(STARTUP_SYSTEM)
+            await self.sys_addons.boot(STARTUP_SYSTEM)
 
             # start addon mark as services
-            await self.addons.auto_boot(STARTUP_SERVICES)
+            await self.sys_addons.boot(STARTUP_SERVICES)
 
             # run HomeAssistant
-            if self.homeassistant.boot:
+            if self.sys_homeassistant.boot:
-                await self.homeassistant.run()
+                await self.sys_homeassistant.start()
 
             # start addon mark as application
-            await self.addons.auto_boot(STARTUP_APPLICATION)
+            await self.sys_addons.boot(STARTUP_APPLICATION)
 
             # store new last boot
-            self.config.last_boot = self.hardware.last_boot
+            self.sys_config.last_boot = self.sys_hardware.last_boot
+            self.sys_config.save_data()
 
         finally:
-            # schedule homeassistant watchdog
+            # Add core tasks into scheduler
-            self.scheduler.register_task(
+            await self.sys_tasks.load()
-                homeassistant_watchdog(self.loop, self.homeassistant),
-                RUN_WATCHDOG_HOMEASSISTANT)
 
             # If landingpage / run upgrade in background
-            if self.homeassistant.version == 'landingpage':
+            if self.sys_homeassistant.version == 'landingpage':
-                self.loop.create_task(self.homeassistant.install())
+                self.sys_create_task(self.sys_homeassistant.install())
 
-    async def stop(self, exit_code=0):
+            _LOGGER.info("Hass.io is up and running")
+
+    async def stop(self):
         """Stop a running orchestration."""
         # don't process scheduler anymore
-        self.scheduler.suspend = True
+        self.sys_scheduler.suspend = True
 
-        # process stop tasks
+        # process async stop tasks
-        self.websession.close()
+        await asyncio.wait([
-        await asyncio.wait([self.api.stop(), self.dns.stop()], loop=self.loop)
+            self.sys_api.stop(),
+            self.sys_dns.stop(),
+            self.sys_websession.close(),
+            self.sys_websession_ssl.close()
+        ])
 
-        self.exit_code = exit_code
+    async def shutdown(self):
-        self.loop.stop()
+        """Shutdown all running containers in correct order."""
+        await self.sys_addons.shutdown(STARTUP_APPLICATION)
+
+        # Close Home Assistant
+        with suppress(HassioError):
+            await self.sys_homeassistant.stop()
+
+        await self.sys_addons.shutdown(STARTUP_SERVICES)
+        await self.sys_addons.shutdown(STARTUP_SYSTEM)
+        await self.sys_addons.shutdown(STARTUP_INITIALIZE)

hassio/coresys.py

@@ -0,0 +1,269 @@
+"""Handle core shared data."""
+
+import aiohttp
+
+from .const import CHANNEL_DEV
+from .config import CoreConfig
+from .docker import DockerAPI
+from .misc.dns import DNSForward
+from .misc.hardware import Hardware
+from .misc.scheduler import Scheduler
+
+
+class CoreSys:
+    """Class that handle all shared data."""
+
+    def __init__(self, loop):
+        """Initialize coresys."""
+        # Static attributes
+        self.exit_code = 0
+
+        # External objects
+        self._loop = loop
+        self._websession = aiohttp.ClientSession(loop=loop)
+        self._websession_ssl = aiohttp.ClientSession(
+            connector=aiohttp.TCPConnector(verify_ssl=False), loop=loop)
+
+        # Global objects
+        self._config = CoreConfig()
+        self._hardware = Hardware()
+        self._docker = DockerAPI()
+        self._scheduler = Scheduler(loop=loop)
+        self._dns = DNSForward(loop=loop)
+
+        # Internal objects pointers
+        self._core = None
+        self._homeassistant = None
+        self._supervisor = None
+        self._addons = None
+        self._api = None
+        self._updater = None
+        self._snapshots = None
+        self._tasks = None
+        self._host = None
+        self._dbus = None
+        self._services = None
+        self._discovery = None
+
+    @property
+    def arch(self):
+        """Return running arch of hass.io system."""
+        if self._supervisor:
+            return self._supervisor.arch
+        return None
+
+    @property
+    def machine(self):
+        """Return running machine type of hass.io system."""
+        if self._homeassistant:
+            return self._homeassistant.machine
+        return None
+
+    @property
+    def dev(self):
+        """Return True if we run dev modus."""
+        return self._updater.channel == CHANNEL_DEV
+
+    @property
+    def loop(self):
+        """Return loop object."""
+        return self._loop
+
+    @property
+    def websession(self):
+        """Return websession object."""
+        return self._websession
+
+    @property
+    def websession_ssl(self):
+        """Return websession object with disabled SSL."""
+        return self._websession_ssl
+
+    @property
+    def config(self):
+        """Return CoreConfig object."""
+        return self._config
+
+    @property
+    def hardware(self):
+        """Return Hardware object."""
+        return self._hardware
+
+    @property
+    def docker(self):
+        """Return DockerAPI object."""
+        return self._docker
+
+    @property
+    def scheduler(self):
+        """Return Scheduler object."""
+        return self._scheduler
+
+    @property
+    def dns(self):
+        """Return DNSForward object."""
+        return self._dns
+
+    @property
+    def core(self):
+        """Return HassIO object."""
+        return self._core
+
+    @core.setter
+    def core(self, value):
+        """Set a HassIO object."""
+        if self._core:
+            raise RuntimeError("HassIO already set!")
+        self._core = value
+
+    @property
+    def homeassistant(self):
+        """Return HomeAssistant object."""
+        return self._homeassistant
+
+    @homeassistant.setter
+    def homeassistant(self, value):
+        """Set a HomeAssistant object."""
+        if self._homeassistant:
+            raise RuntimeError("HomeAssistant already set!")
+        self._homeassistant = value
+
+    @property
+    def supervisor(self):
+        """Return Supervisor object."""
+        return self._supervisor
+
+    @supervisor.setter
+    def supervisor(self, value):
+        """Set a Supervisor object."""
+        if self._supervisor:
+            raise RuntimeError("Supervisor already set!")
+        self._supervisor = value
+
+    @property
+    def api(self):
+        """Return API object."""
+        return self._api
+
+    @api.setter
+    def api(self, value):
+        """Set a API object."""
+        if self._api:
+            raise RuntimeError("API already set!")
+        self._api = value
+
+    @property
+    def updater(self):
+        """Return Updater object."""
+        return self._updater
+
+    @updater.setter
+    def updater(self, value):
+        """Set a Updater object."""
+        if self._updater:
+            raise RuntimeError("Updater already set!")
+        self._updater = value
+
+    @property
+    def addons(self):
+        """Return AddonManager object."""
+        return self._addons
+
+    @addons.setter
+    def addons(self, value):
+        """Set a AddonManager object."""
+        if self._addons:
+            raise RuntimeError("AddonManager already set!")
+        self._addons = value
+
+    @property
+    def snapshots(self):
+        """Return SnapshotManager object."""
+        return self._snapshots
+
+    @snapshots.setter
+    def snapshots(self, value):
+        """Set a SnapshotManager object."""
+        if self._snapshots:
+            raise RuntimeError("SnapshotsManager already set!")
+        self._snapshots = value
+
+    @property
+    def tasks(self):
+        """Return Tasks object."""
+        return self._tasks
+
+    @tasks.setter
+    def tasks(self, value):
+        """Set a Tasks object."""
+        if self._tasks:
+            raise RuntimeError("Tasks already set!")
+        self._tasks = value
+
+    @property
+    def services(self):
+        """Return ServiceManager object."""
+        return self._services
+
+    @services.setter
+    def services(self, value):
+        """Set a ServiceManager object."""
+        if self._services:
+            raise RuntimeError("Services already set!")
+        self._services = value
+
+    @property
+    def discovery(self):
+        """Return ServiceManager object."""
+        return self._discovery
+
+    @discovery.setter
+    def discovery(self, value):
+        """Set a Discovery object."""
+        if self._discovery:
+            raise RuntimeError("Discovery already set!")
+        self._discovery = value
+
+    @property
+    def dbus(self):
+        """Return DBusManager object."""
+        return self._dbus
+
+    @dbus.setter
+    def dbus(self, value):
+        """Set a DBusManager object."""
+        if self._dbus:
+            raise RuntimeError("DBusManager already set!")
+        self._dbus = value
+
+    @property
+    def host(self):
+        """Return HostManager object."""
+        return self._host
+
+    @host.setter
+    def host(self, value):
+        """Set a HostManager object."""
+        if self._host:
+            raise RuntimeError("HostManager already set!")
+        self._host = value
+
+    def run_in_executor(self, funct, *args):
+        """Wrapper for executor pool."""
+        return self._loop.run_in_executor(None, funct, *args)
+
+    def create_task(self, coroutine):
+        """Wrapper for async task."""
+        return self._loop.create_task(coroutine)
+
+
+class CoreSysAttributes:
+    """Inheret basic CoreSysAttributes."""
+
+    coresys = None
+
+    def __getattr__(self, name):
+        """Mapping to coresys."""
+        if name.startswith("sys_") and hasattr(self.coresys, name[4:]):
+            return getattr(self.coresys, name[4:])
+        raise AttributeError()

hassio/dbus/__init__.py

@@ -0,0 +1,30 @@
+"""DBus interface objects."""
+
+from .systemd import Systemd
+from .hostname import Hostname
+from ..coresys import CoreSysAttributes
+
+
+class DBusManager(CoreSysAttributes):
+    """DBus Interface handler."""
+
+    def __init__(self, coresys):
+        """Initialize DBus  Interface."""
+        self.coresys = coresys
+        self._systemd = Systemd()
+        self._hostname = Hostname()
+
+    @property
+    def systemd(self):
+        """Return Systemd Interface."""
+        return self._systemd
+
+    @property
+    def hostname(self):
+        """Return hostname Interface."""
+        return self._hostname
+
+    async def load(self):
+        """Connect interfaces to dbus."""
+        await self.systemd.connect()
+        await self.hostname.connect()

hassio/dbus/hostname.py

@@ -0,0 +1,39 @@
+"""DBus interface for hostname."""
+import logging
+
+from .interface import DBusInterface
+from .utils import dbus_connected
+from ..exceptions import DBusError
+from ..utils.gdbus import DBus
+
+_LOGGER = logging.getLogger(__name__)
+
+DBUS_NAME = 'org.freedesktop.hostname1'
+DBUS_OBJECT = '/org/freedesktop/hostname1'
+
+
+class Hostname(DBusInterface):
+    """Handle DBus interface for hostname/system."""
+
+    async def connect(self):
+        """Connect do bus."""
+        try:
+            self.dbus = await DBus.connect(DBUS_NAME, DBUS_OBJECT)
+        except DBusError:
+            _LOGGER.warning("Can't connect to hostname")
+
+    @dbus_connected
+    def set_static_hostname(self, hostname):
+        """Change local hostname.
+
+        Return a coroutine.
+        """
+        return self.dbus.SetStaticHostname(hostname)
+
+    @dbus_connected
+    def get_properties(self):
+        """Return local host informations.
+
+        Return a coroutine.
+        """
+        return self.dbus.get_properties(DBUS_NAME)

hassio/dbus/interface.py

@@ -0,0 +1,18 @@
+"""Interface class for dbus wrappers."""
+
+
+class DBusInterface:
+    """Handle DBus interface for hostname/system."""
+
+    def __init__(self):
+        """Initialize systemd."""
+        self.dbus = None
+
+    @property
+    def is_connected(self):
+        """Return True, if they is connected to dbus."""
+        return self.dbus is not None
+
+    async def connect(self):
+        """Connect do bus."""
+        raise NotImplementedError()

hassio/dbus/systemd.py

@@ -0,0 +1,39 @@
+"""Interface to Systemd over dbus."""
+import logging
+
+from .interface import DBusInterface
+from .utils import dbus_connected
+from ..exceptions import DBusError
+from ..utils.gdbus import DBus
+
+_LOGGER = logging.getLogger(__name__)
+
+DBUS_NAME = 'org.freedesktop.systemd1'
+DBUS_OBJECT = '/org/freedesktop/systemd1'
+
+
+class Systemd(DBusInterface):
+    """Systemd function handler."""
+
+    async def connect(self):
+        """Connect do bus."""
+        try:
+            self.dbus = await DBus.connect(DBUS_NAME, DBUS_OBJECT)
+        except DBusError:
+            _LOGGER.warning("Can't connect to systemd")
+
+    @dbus_connected
+    def reboot(self):
+        """Reboot host computer.
+
+        Return a coroutine.
+        """
+        return self.dbus.Manager.Reboot()
+
+    @dbus_connected
+    def power_off(self):
+        """Power off host computer.
+
+        Return a coroutine.
+        """
+        return self.dbus.Manager.PowerOff()

hassio/dbus/utils.py

@@ -0,0 +1,14 @@
+"""Utils for dbus."""
+
+from ..exceptions import DBusNotConnectedError
+
+
+def dbus_connected(method):
+    """Wrapper for check if dbus is connected."""
+    def wrap_dbus(api, *args, **kwargs):
+        """Check if dbus is connected before call a method."""
+        if api.dbus is None:
+            raise DBusNotConnectedError()
+        return method(api, *args, **kwargs)
+
+    return wrap_dbus

hassio/dock/addon.py

@@ -1,276 +0,0 @@
-"""Init file for HassIO addon docker object."""
-import logging
-
-import docker
-import requests
-
-from .interface import DockerInterface
-from .util import docker_process
-from ..addons.build import AddonBuild
-from ..const import (
-    MAP_CONFIG, MAP_SSL, MAP_ADDONS, MAP_BACKUP, MAP_SHARE)
-
-_LOGGER = logging.getLogger(__name__)
-
-AUDIO_DEVICE = "/dev/snd:/dev/snd:rwm"
-
-
-class DockerAddon(DockerInterface):
-    """Docker hassio wrapper for HomeAssistant."""
-
-    def __init__(self, config, loop, api, addon):
-        """Initialize docker homeassistant wrapper."""
-        super().__init__(
-            config, loop, api, image=addon.image, timeout=addon.timeout)
-        self.addon = addon
-
-    @property
-    def name(self):
-        """Return name of docker container."""
-        return "addon_{}".format(self.addon.slug)
-
-    @property
-    def hostname(self):
-        """Return slug/id of addon."""
-        return self.addon.slug.replace('_', '-')
-
-    @property
-    def environment(self):
-        """Return environment for docker add-on."""
-        addon_env = self.addon.environment or {}
-        if self.addon.with_audio:
-            addon_env.update({
-                'ALSA_OUTPUT': self.addon.audio_output,
-                'ALSA_INPUT': self.addon.audio_input,
-            })
-
-        return {
-            **addon_env,
-            'TZ': self.config.timezone,
-        }
-
-    @property
-    def devices(self):
-        """Return needed devices."""
-        devices = self.addon.devices or []
-
-        # use audio devices
-        if self.addon.with_audio and AUDIO_DEVICE not in devices:
-            devices.append(AUDIO_DEVICE)
-
-        # Return None if no devices is present
-        if devices:
-            return devices
-        return None
-
-    @property
-    def ports(self):
-        """Filter None from addon ports."""
-        if not self.addon.ports:
-            return None
-
-        return {
-            container_port: host_port
-            for container_port, host_port in self.addon.ports.items()
-            if host_port
-        }
-
-    @property
-    def tmpfs(self):
-        """Return tmpfs for docker add-on."""
-        options = self.addon.tmpfs
-        if options:
-            return {"/tmpfs": "{}".format(options)}
-        return None
-
-    @property
-    def network_mapping(self):
-        """Return hosts mapping."""
-        return {
-            'homeassistant': self.docker.network.gateway,
-        }
-
-    @property
-    def network_mode(self):
-        """Return network mode for addon."""
-        if self.addon.host_network:
-            return 'host'
-        return None
-
-    @property
-    def volumes(self):
-        """Generate volumes for mappings."""
-        volumes = {
-            str(self.addon.path_extern_data): {
-                'bind': '/data', 'mode': 'rw'
-            }}
-
-        addon_mapping = self.addon.map_volumes
-
-        # setup config mappings
-        if MAP_CONFIG in addon_mapping:
-            volumes.update({
-                str(self.config.path_extern_config): {
-                    'bind': '/config', 'mode': addon_mapping[MAP_CONFIG]
-                }})
-
-        if MAP_SSL in addon_mapping:
-            volumes.update({
-                str(self.config.path_extern_ssl): {
-                    'bind': '/ssl', 'mode': addon_mapping[MAP_SSL]
-                }})
-
-        if MAP_ADDONS in addon_mapping:
-            volumes.update({
-                str(self.config.path_extern_addons_local): {
-                    'bind': '/addons', 'mode': addon_mapping[MAP_ADDONS]
-                }})
-
-        if MAP_BACKUP in addon_mapping:
-            volumes.update({
-                str(self.config.path_extern_backup): {
-                    'bind': '/backup', 'mode': addon_mapping[MAP_BACKUP]
-                }})
-
-        if MAP_SHARE in addon_mapping:
-            volumes.update({
-                str(self.config.path_extern_share): {
-                    'bind': '/share', 'mode': addon_mapping[MAP_SHARE]
-                }})
-
-        # init other hardware mappings
-        if self.addon.with_gpio:
-            volumes.update({
-                '/sys/class/gpio': {
-                    'bind': '/sys/class/gpio', 'mode': "rw"
-                }})
-
-        return volumes
-
-    def _run(self):
-        """Run docker image.
-
-        Need run inside executor.
-        """
-        if self._is_running():
-            return True
-
-        # cleanup
-        self._stop()
-
-        # write config
-        if not self.addon.write_options():
-            return False
-
-        ret = self.docker.run(
-            self.image,
-            name=self.name,
-            hostname=self.hostname,
-            detach=True,
-            network_mode=self.network_mode,
-            ports=self.ports,
-            extra_hosts=self.network_mapping,
-            devices=self.devices,
-            cap_add=self.addon.privileged,
-            environment=self.environment,
-            volumes=self.volumes,
-            tmpfs=self.tmpfs
-        )
-
-        if ret:
-            _LOGGER.info("Start docker addon %s with version %s",
-                         self.image, self.version)
-
-        return ret
-
-    def _install(self, tag):
-        """Pull docker image or build it.
-
-        Need run inside executor.
-        """
-        if self.addon.need_build:
-            return self._build(tag)
-
-        return super()._install(tag)
-
-    def _build(self, tag):
-        """Build a docker container.
-
-        Need run inside executor.
-        """
-        build_env = AddonBuild(self.config, self.addon)
-
-        _LOGGER.info("Start build %s:%s", self.image, tag)
-        try:
-            image = self.docker.images.build(**build_env.get_docker_args(tag))
-
-            image.tag(self.image, tag='latest')
-            self.process_metadata(image.attrs, force=True)
-
-        except (docker.errors.DockerException) as err:
-            _LOGGER.error("Can't build %s:%s -> %s", self.image, tag, err)
-            return False
-
-        _LOGGER.info("Build %s:%s done", self.image, tag)
-        return True
-
-    @docker_process
-    def export_image(self, path):
-        """Export current images into a tar file."""
-        return self.loop.run_in_executor(None, self._export_image, path)
-
-    def _export_image(self, tar_file):
-        """Export current images into a tar file.
-
-        Need run inside executor.
-        """
-        try:
-            image = self.docker.api.get_image(self.image)
-        except docker.errors.DockerException as err:
-            _LOGGER.error("Can't fetch image %s -> %s", self.image, err)
-            return False
-
-        try:
-            with tar_file.open("wb") as write_tar:
-                for chunk in image.stream():
-                    write_tar.write(chunk)
-        except (OSError, requests.exceptions.ReadTimeout) as err:
-            _LOGGER.error("Can't write tar file %s -> %s", tar_file, err)
-            return False
-
-        _LOGGER.info("Export image %s to %s", self.image, tar_file)
-        return True
-
-    @docker_process
-    def import_image(self, path, tag):
-        """Import a tar file as image."""
-        return self.loop.run_in_executor(None, self._import_image, path, tag)
-
-    def _import_image(self, tar_file, tag):
-        """Import a tar file as image.
-
-        Need run inside executor.
-        """
-        try:
-            with tar_file.open("rb") as read_tar:
-                self.docker.api.load_image(read_tar)
-
-            image = self.docker.images.get(self.image)
-            image.tag(self.image, tag=tag)
-        except (docker.errors.DockerException, OSError) as err:
-            _LOGGER.error("Can't import image %s -> %s", self.image, err)
-            return False
-
-        _LOGGER.info("Import image %s and tag %s", tar_file, tag)
-        self.process_metadata(image.attrs, force=True)
-        self._cleanup()
-        return True
-
-    def _restart(self):
-        """Restart docker container.
-
-        Addons prepare some thing on start and that is normaly not repeatable.
-        Need run inside executor.
-        """
-        self._stop()
-        return self._run()

hassio/dock/supervisor.py

@@ -1,78 +0,0 @@
-"""Init file for HassIO docker object."""
-import logging
-import os
-
-import docker
-
-from .interface import DockerInterface
-from .util import docker_process
-from ..const import RESTART_EXIT_CODE
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class DockerSupervisor(DockerInterface):
-    """Docker hassio wrapper for HomeAssistant."""
-
-    def __init__(self, config, loop, api, stop_callback, image=None):
-        """Initialize docker base wrapper."""
-        super().__init__(config, loop, api, image=image)
-        self.stop_callback = stop_callback
-
-    @property
-    def name(self):
-        """Return name of docker container."""
-        return os.environ['SUPERVISOR_NAME']
-
-    def _attach(self):
-        """Attach to running docker container.
-
-        Need run inside executor.
-        """
-        try:
-            container = self.docker.containers.get(self.name)
-        except docker.errors.DockerException:
-            return False
-
-        self.process_metadata(container.attrs)
-        _LOGGER.info("Attach to supervisor %s with version %s",
-                     self.image, self.version)
-
-        # if already attach
-        if container in self.docker.network.containers:
-            return True
-
-        # attach to network
-        return self.docker.network.attach_container(
-            container, alias=['hassio'], ipv4=self.docker.network.supervisor)
-
-    @docker_process
-    async def update(self, tag):
-        """Update a supervisor docker image."""
-        _LOGGER.info("Update supervisor docker to %s:%s", self.image, tag)
-
-        if await self.loop.run_in_executor(None, self._install, tag):
-            self.loop.create_task(self.stop_callback(RESTART_EXIT_CODE))
-            return True
-
-        return False
-
-    async def run(self):
-        """Run docker image."""
-        raise RuntimeError("Not support on supervisor docker container!")
-
-    async def install(self, tag):
-        """Pull docker image."""
-        raise RuntimeError("Not support on supervisor docker container!")
-
-    async def stop(self):
-        """Stop/remove docker container."""
-        raise RuntimeError("Not support on supervisor docker container!")
-
-    async def remove(self):
-        """Remove docker image."""
-        raise RuntimeError("Not support on supervisor docker container!")
-
-    async def restart(self):
-        """Restart docker container."""
-        raise RuntimeError("Not support on supervisor docker container!")

hassio/dock/util.py

@@ -1,20 +0,0 @@
-"""HassIO docker utilitys."""
-import logging
-
-_LOGGER = logging.getLogger(__name__)
-
-
-# pylint: disable=protected-access
-def docker_process(method):
-    """Wrap function with only run once."""
-    async def wrap_api(api, *args, **kwargs):
-        """Return api wrapper."""
-        if api._lock.locked():
-            _LOGGER.error(
-                "Can't excute %s while a task is in progress", method.__name__)
-            return False
-
-        async with api._lock:
-            return await method(api, *args, **kwargs)
-
-    return wrap_api

hassio/docker/__init__.py

@@ -2,6 +2,7 @@
 from contextlib import suppress
 import logging
 
+import attr
 import docker
 
 from .network import DockerNetwork
@@ -9,8 +10,11 @@ from ..const import SOCKET_DOCKER
 
 _LOGGER = logging.getLogger(__name__)
 
+# pylint: disable=invalid-name
+CommandReturn = attr.make_class('CommandReturn', ['exit_code', 'output'])
 
-class DockerAPI(object):
+
+class DockerAPI:
     """Docker hassio wrapper.
 
     This class is not AsyncIO safe!
@@ -19,7 +23,8 @@ class DockerAPI(object):
     def __init__(self):
         """Initialize docker base wrapper."""
         self.docker = docker.DockerClient(
-            base_url="unix:/{}".format(str(SOCKET_DOCKER)), version='auto')
+            base_url="unix:/{}".format(str(SOCKET_DOCKER)),
+            version='auto', timeout=900)
         self.network = DockerNetwork(self.docker)
 
     @property
@@ -47,8 +52,10 @@ class DockerAPI(object):
         hostname = kwargs.get('hostname')
 
         # setup network
+        kwargs['dns_search'] = ["."]
         if network_mode:
             kwargs['dns'] = [str(self.network.supervisor)]
+            kwargs['dns_opt'] = ["ndots:0"]
         else:
             kwargs['network'] = None
 
@@ -56,7 +63,7 @@ class DockerAPI(object):
         try:
             container = self.docker.containers.create(image, **kwargs)
         except docker.errors.DockerException as err:
-            _LOGGER.error("Can't create container from %s -> %s", name, err)
+            _LOGGER.error("Can't create container from %s: %s", name, err)
             return False
 
         # attach network
@@ -71,7 +78,7 @@ class DockerAPI(object):
         try:
             container.start()
         except docker.errors.DockerException as err:
-            _LOGGER.error("Can't start %s -> %s", name, err)
+            _LOGGER.error("Can't start %s: %s", name, err)
             return False
 
         return True
@@ -94,15 +101,15 @@ class DockerAPI(object):
             )
 
             # wait until command is done
-            exit_code = container.wait()
+            result = container.wait()
             output = container.logs(stdout=stdout, stderr=stderr)
 
         except docker.errors.DockerException as err:
-            _LOGGER.error("Can't execute command -> %s", err)
+            _LOGGER.error("Can't execute command: %s", err)
-            return (None, b"")
+            return CommandReturn(None, b"")
 
         # cleanup container
         with suppress(docker.errors.DockerException):
             container.remove(force=True)
 
-        return (exit_code, output)
+        return CommandReturn(result.get('StatusCode'), output)

hassio/docker/addon.py

@@ -0,0 +1,385 @@
+"""Init file for HassIO addon docker object."""
+import logging
+import os
+
+import docker
+import requests
+
+from .interface import DockerInterface
+from ..addons.build import AddonBuild
+from ..const import (
+    MAP_CONFIG, MAP_SSL, MAP_ADDONS, MAP_BACKUP, MAP_SHARE, ENV_TOKEN,
+    ENV_TIME, SECURITY_PROFILE, SECURITY_DISABLE)
+from ..utils import process_lock
+
+_LOGGER = logging.getLogger(__name__)
+
+AUDIO_DEVICE = "/dev/snd:/dev/snd:rwm"
+
+
+class DockerAddon(DockerInterface):
+    """Docker hassio wrapper for HomeAssistant."""
+
+    def __init__(self, coresys, slug):
+        """Initialize docker homeassistant wrapper."""
+        super().__init__(coresys)
+        self._id = slug
+
+    @property
+    def addon(self):
+        """Return addon of docker image."""
+        return self.sys_addons.get(self._id)
+
+    @property
+    def image(self):
+        """Return name of docker image."""
+        return self.addon.image
+
+    @property
+    def timeout(self):
+        """Return timeout for docker actions."""
+        return self.addon.timeout
+
+    @property
+    def version(self):
+        """Return version of docker image."""
+        if not self.addon.legacy:
+            return super().version
+        return self.addon.version_installed
+
+    @property
+    def arch(self):
+        """Return arch of docker image."""
+        if not self.addon.legacy:
+            return super().arch
+        return self.sys_arch
+
+    @property
+    def name(self):
+        """Return name of docker container."""
+        return "addon_{}".format(self.addon.slug)
+
+    @property
+    def ipc(self):
+        """Return the IPC namespace."""
+        if self.addon.host_ipc:
+            return 'host'
+        return None
+
+    @property
+    def hostname(self):
+        """Return slug/id of addon."""
+        return self.addon.slug.replace('_', '-')
+
+    @property
+    def environment(self):
+        """Return environment for docker add-on."""
+        addon_env = self.addon.environment or {}
+
+        # Need audio settings
+        if self.addon.with_audio:
+            addon_env.update({
+                'ALSA_OUTPUT': self.addon.audio_output,
+                'ALSA_INPUT': self.addon.audio_input,
+            })
+
+        return {
+            **addon_env,
+            ENV_TIME: self.sys_config.timezone,
+            ENV_TOKEN: self.addon.uuid,
+        }
+
+    @property
+    def devices(self):
+        """Return needed devices."""
+        devices = self.addon.devices or []
+
+        # Use audio devices
+        if self.addon.with_audio and AUDIO_DEVICE not in devices:
+            devices.append(AUDIO_DEVICE)
+
+        # Auto mapping UART devices
+        if self.addon.auto_uart:
+            for device in self.sys_hardware.serial_devices:
+                devices.append(f"{device}:{device}:rwm")
+
+        # Return None if no devices is present
+        return devices or None
+
+    @property
+    def ports(self):
+        """Filter None from addon ports."""
+        if not self.addon.ports:
+            return None
+
+        return {
+            container_port: host_port
+            for container_port, host_port in self.addon.ports.items()
+            if host_port
+        }
+
+    @property
+    def security_opt(self):
+        """Controlling security opt."""
+        security = []
+
+        # AppArmor
+        if self.addon.apparmor == SECURITY_DISABLE:
+            security.append("apparmor:unconfined")
+        elif self.addon.apparmor == SECURITY_PROFILE:
+            security.append(f"apparmor={self.addon.slug}")
+
+        # Seccomp
+        if self.addon.seccomp == SECURITY_DISABLE:
+            security.append("seccomp=unconfined")
+        elif self.addon.seccomp == SECURITY_PROFILE:
+            security.append(f"seccomp={self.addon.path_seccomp}")
+
+        return security or None
+
+    @property
+    def tmpfs(self):
+        """Return tmpfs for docker add-on."""
+        options = self.addon.tmpfs
+        if options:
+            return {"/tmpfs": f"{options}"}
+        return None
+
+    @property
+    def network_mapping(self):
+        """Return hosts mapping."""
+        return {
+            'homeassistant': self.sys_docker.network.gateway,
+            'hassio': self.sys_docker.network.supervisor,
+        }
+
+    @property
+    def network_mode(self):
+        """Return network mode for addon."""
+        if self.addon.host_network:
+            return 'host'
+        return None
+
+    @property
+    def volumes(self):
+        """Generate volumes for mappings."""
+        volumes = {
+            str(self.addon.path_extern_data): {
+                'bind': "/data", 'mode': 'rw'
+            }}
+
+        addon_mapping = self.addon.map_volumes
+
+        # setup config mappings
+        if MAP_CONFIG in addon_mapping:
+            volumes.update({
+                str(self.sys_config.path_extern_config): {
+                    'bind': "/config", 'mode': addon_mapping[MAP_CONFIG]
+                }})
+
+        if MAP_SSL in addon_mapping:
+            volumes.update({
+                str(self.sys_config.path_extern_ssl): {
+                    'bind': "/ssl", 'mode': addon_mapping[MAP_SSL]
+                }})
+
+        if MAP_ADDONS in addon_mapping:
+            volumes.update({
+                str(self.sys_config.path_extern_addons_local): {
+                    'bind': "/addons", 'mode': addon_mapping[MAP_ADDONS]
+                }})
+
+        if MAP_BACKUP in addon_mapping:
+            volumes.update({
+                str(self.sys_config.path_extern_backup): {
+                    'bind': "/backup", 'mode': addon_mapping[MAP_BACKUP]
+                }})
+
+        if MAP_SHARE in addon_mapping:
+            volumes.update({
+                str(self.sys_config.path_extern_share): {
+                    'bind': "/share", 'mode': addon_mapping[MAP_SHARE]
+                }})
+
+        # Init other hardware mappings
+        if self.addon.with_gpio:
+            volumes.update({
+                "/sys/class/gpio": {
+                    'bind': "/sys/class/gpio", 'mode': 'rw'
+                },
+                "/sys/devices/platform/soc": {
+                    'bind': "/sys/devices/platform/soc", 'mode': 'rw'
+                },
+            })
+
+        # Host dbus system
+        if self.addon.host_dbus:
+            volumes.update({
+                "/var/run/dbus": {
+                    'bind': "/var/run/dbus", 'mode': 'rw'
+                }})
+
+        # ALSA configuration
+        if self.addon.with_audio:
+            volumes.update({
+                str(self.addon.path_extern_asound): {
+                    'bind': "/etc/asound.conf", 'mode': 'ro'
+                }})
+
+        return volumes
+
+    def _run(self):
+        """Run docker image.
+
+        Need run inside executor.
+        """
+        if self._is_running():
+            return True
+
+        # cleanup
+        self._stop()
+
+        ret = self.sys_docker.run(
+            self.image,
+            name=self.name,
+            hostname=self.hostname,
+            detach=True,
+            init=True,
+            ipc_mode=self.ipc,
+            stdin_open=self.addon.with_stdin,
+            network_mode=self.network_mode,
+            ports=self.ports,
+            extra_hosts=self.network_mapping,
+            devices=self.devices,
+            cap_add=self.addon.privileged,
+            security_opt=self.security_opt,
+            environment=self.environment,
+            volumes=self.volumes,
+            tmpfs=self.tmpfs
+        )
+
+        if ret:
+            _LOGGER.info("Start docker addon %s with version %s",
+                         self.image, self.version)
+
+        return ret
+
+    def _install(self, tag):
+        """Pull docker image or build it.
+
+        Need run inside executor.
+        """
+        if self.addon.need_build:
+            return self._build(tag)
+
+        return super()._install(tag)
+
+    def _build(self, tag):
+        """Build a docker container.
+
+        Need run inside executor.
+        """
+        build_env = AddonBuild(self.coresys, self._id)
+
+        _LOGGER.info("Start build %s:%s", self.image, tag)
+        try:
+            image, log = self.sys_docker.images.build(
+                **build_env.get_docker_args(tag))
+
+            _LOGGER.debug("Build %s:%s done: %s", self.image, tag, log)
+            image.tag(self.image, tag='latest')
+
+            # Update meta data
+            self._meta = image.attrs
+
+        except (docker.errors.DockerException) as err:
+            _LOGGER.error("Can't build %s:%s: %s", self.image, tag, err)
+            return False
+
+        _LOGGER.info("Build %s:%s done", self.image, tag)
+        return True
+
+    @process_lock
+    def export_image(self, path):
+        """Export current images into a tar file."""
+        return self.sys_run_in_executor(self._export_image, path)
+
+    def _export_image(self, tar_file):
+        """Export current images into a tar file.
+
+        Need run inside executor.
+        """
+        try:
+            image = self.sys_docker.api.get_image(self.image)
+        except docker.errors.DockerException as err:
+            _LOGGER.error("Can't fetch image %s: %s", self.image, err)
+            return False
+
+        _LOGGER.info("Export image %s to %s", self.image, tar_file)
+        try:
+            with tar_file.open("wb") as write_tar:
+                for chunk in image:
+                    write_tar.write(chunk)
+        except (OSError, requests.exceptions.ReadTimeout) as err:
+            _LOGGER.error("Can't write tar file %s: %s", tar_file, err)
+            return False
+
+        _LOGGER.info("Export image %s done", self.image)
+        return True
+
+    @process_lock
+    def import_image(self, path, tag):
+        """Import a tar file as image."""
+        return self.sys_run_in_executor(self._import_image, path, tag)
+
+    def _import_image(self, tar_file, tag):
+        """Import a tar file as image.
+
+        Need run inside executor.
+        """
+        try:
+            with tar_file.open("rb") as read_tar:
+                self.sys_docker.api.load_image(read_tar, quiet=True)
+
+            image = self.sys_docker.images.get(self.image)
+            image.tag(self.image, tag=tag)
+        except (docker.errors.DockerException, OSError) as err:
+            _LOGGER.error("Can't import image %s: %s", self.image, err)
+            return False
+
+        _LOGGER.info("Import image %s and tag %s", tar_file, tag)
+        self._meta = image.attrs
+        self._cleanup()
+        return True
+
+    @process_lock
+    def write_stdin(self, data):
+        """Write to add-on stdin."""
+        return self.sys_run_in_executor(self._write_stdin, data)
+
+    def _write_stdin(self, data):
+        """Write to add-on stdin.
+
+        Need run inside executor.
+        """
+        if not self._is_running():
+            return False
+
+        try:
+            # load needed docker objects
+            container = self.sys_docker.containers.get(self.name)
+            socket = container.attach_socket(params={'stdin': 1, 'stream': 1})
+        except docker.errors.DockerException as err:
+            _LOGGER.error("Can't attach to %s stdin: %s", self.name, err)
+            return False
+
+        try:
+            # write to stdin
+            data += b"\n"
+            os.write(socket.fileno(), data)
+            socket.close()
+        except OSError as err:
+            _LOGGER.error("Can't write to %s stdin: %s", self.name, err)
+            return False
+
+        return True

hassio/docker/homeassistant.py

@@ -4,6 +4,7 @@ import logging
 import docker
 
 from .interface import DockerInterface
+from ..const import ENV_TOKEN, ENV_TIME, LABEL_MACHINE
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -13,10 +14,17 @@ HASS_DOCKER_NAME = 'homeassistant'
 class DockerHomeAssistant(DockerInterface):
     """Docker hassio wrapper for HomeAssistant."""
 
-    def __init__(self, config, loop, api, data):
+    @property
-        """Initialize docker homeassistant wrapper."""
+    def machine(self):
-        super().__init__(config, loop, api, image=data.image)
+        """Return machine of Home-Assistant docker image."""
-        self.data = data
+        if self._meta and LABEL_MACHINE in self._meta['Config']['Labels']:
+            return self._meta['Config']['Labels'][LABEL_MACHINE]
+        return None
+
+    @property
+    def image(self):
+        """Return name of docker image."""
+        return self.sys_homeassistant.image
 
     @property
     def name(self):
@@ -26,14 +34,10 @@ class DockerHomeAssistant(DockerInterface):
     @property
     def devices(self):
         """Create list of special device to map into docker."""
-        if not self.data.devices:
-            return
-
         devices = []
-        for device in self.data.devices:
+        for device in self.sys_hardware.serial_devices:
-            devices.append("/dev/{0}:/dev/{0}:rwm".format(device))
+            devices.append(f"{device}:{device}:rwm")
-
+        return devices or None
-        return devices
 
     def _run(self):
         """Run docker image.
@@ -41,29 +45,31 @@ class DockerHomeAssistant(DockerInterface):
         Need run inside executor.
         """
         if self._is_running():
-            return
+            return False
 
         # cleanup
         self._stop()
 
-        ret = self.docker.run(
+        ret = self.sys_docker.run(
             self.image,
             name=self.name,
             hostname=self.name,
             detach=True,
             privileged=True,
+            init=True,
             devices=self.devices,
             network_mode='host',
             environment={
-                'HASSIO': self.docker.network.supervisor,
+                'HASSIO': self.sys_docker.network.supervisor,
-                'TZ': self.config.timezone,
+                ENV_TIME: self.sys_config.timezone,
+                ENV_TOKEN: self.sys_homeassistant.uuid,
             },
             volumes={
-                str(self.config.path_extern_config):
+                str(self.sys_config.path_extern_config):
                     {'bind': '/config', 'mode': 'rw'},
-                str(self.config.path_extern_ssl):
+                str(self.sys_config.path_extern_ssl):
                     {'bind': '/ssl', 'mode': 'ro'},
-                str(self.config.path_extern_share):
+                str(self.sys_config.path_extern_share):
                     {'bind': '/share', 'mode': 'rw'},
             }
         )
@@ -79,26 +85,26 @@ class DockerHomeAssistant(DockerInterface):
 
         Need run inside executor.
         """
-        return self.docker.run_command(
+        return self.sys_docker.run_command(
             self.image,
             command,
             detach=True,
             stdout=True,
             stderr=True,
             environment={
-                'TZ': self.config.timezone,
+                ENV_TIME: self.sys_config.timezone,
             },
             volumes={
-                str(self.config.path_extern_config):
+                str(self.sys_config.path_extern_config):
                     {'bind': '/config', 'mode': 'ro'},
-                str(self.config.path_extern_ssl):
+                str(self.sys_config.path_extern_ssl):
                     {'bind': '/ssl', 'mode': 'ro'},
             }
         )
 
     def is_initialize(self):
         """Return True if docker container exists."""
-        return self.loop.run_in_executor(None, self._is_initialize)
+        return self.sys_run_in_executor(self._is_initialize)
 
     def _is_initialize(self):
         """Return True if docker container exists.
@@ -106,7 +112,7 @@ class DockerHomeAssistant(DockerInterface):
         Need run inside executor.
         """
         try:
-            self.docker.containers.get(self.name)
+            self.sys_docker.containers.get(self.name)
         except docker.errors.DockerException:
             return False
 

hassio/docker/interface.py

@@ -5,59 +5,63 @@ import logging
 
 import docker
 
-from .util import docker_process
+from .stats import DockerStats
 from ..const import LABEL_VERSION, LABEL_ARCH
+from ..coresys import CoreSysAttributes
+from ..utils import process_lock
 
 _LOGGER = logging.getLogger(__name__)
 
 
-class DockerInterface(object):
+class DockerInterface(CoreSysAttributes):
     """Docker hassio interface."""
 
-    def __init__(self, config, loop, api, image=None, timeout=30):
+    def __init__(self, coresys):
         """Initialize docker base wrapper."""
-        self.config = config
+        self.coresys = coresys
-        self.loop = loop
+        self._meta = None
-        self.docker = api
+        self.lock = asyncio.Lock(loop=coresys.loop)
 
-        self.image = image
+    @property
-        self.timeout = timeout
+    def timeout(self):
-        self.version = None
+        """Return timeout for docker actions."""
-        self.arch = None
+        return 30
-        self._lock = asyncio.Lock(loop=loop)
 
     @property
     def name(self):
         """Return name of docker container."""
         return None
 
+    @property
+    def image(self):
+        """Return name of docker image."""
+        if not self._meta:
+            return None
+        return self._meta['Config']['Image']
+
+    @property
+    def version(self):
+        """Return version of docker image."""
+        if self._meta and LABEL_VERSION in self._meta['Config']['Labels']:
+            return self._meta['Config']['Labels'][LABEL_VERSION]
+        return None
+
+    @property
+    def arch(self):
+        """Return arch of docker image."""
+        if self._meta and LABEL_ARCH in self._meta['Config']['Labels']:
+            return self._meta['Config']['Labels'][LABEL_ARCH]
+        return None
+
     @property
     def in_progress(self):
         """Return True if a task is in progress."""
-        return self._lock.locked()
+        return self.lock.locked()
 
-    def process_metadata(self, metadata, force=False):
+    @process_lock
-        """Read metadata and set it to object."""
-        # read image
-        if not self.image:
-            self.image = metadata['Config']['Image']
-
-        # read version
-        need_version = force or not self.version
-        if need_version and LABEL_VERSION in metadata['Config']['Labels']:
-            self.version = metadata['Config']['Labels'][LABEL_VERSION]
-        elif need_version:
-            _LOGGER.warning("Can't read version from %s", self.name)
-
-        # read arch
-        need_arch = force or not self.arch
-        if need_arch and LABEL_ARCH in metadata['Config']['Labels']:
-            self.arch = metadata['Config']['Labels'][LABEL_ARCH]
-
-    @docker_process
     def install(self, tag):
         """Pull docker image."""
-        return self.loop.run_in_executor(None, self._install, tag)
+        return self.sys_run_in_executor(self._install, tag)
 
     def _install(self, tag):
         """Pull docker image.
@@ -66,10 +70,10 @@ class DockerInterface(object):
         """
         try:
             _LOGGER.info("Pull image %s tag %s.", self.image, tag)
-            image = self.docker.images.pull("{}:{}".format(self.image, tag))
+            image = self.sys_docker.images.pull(f"{self.image}:{tag}")
 
             image.tag(self.image, tag='latest')
-            self.process_metadata(image.attrs, force=True)
+            self._meta = image.attrs
         except docker.errors.APIError as err:
             _LOGGER.error("Can't install %s:%s -> %s.", self.image, tag, err)
             return False
@@ -79,7 +83,7 @@ class DockerInterface(object):
 
     def exists(self):
         """Return True if docker image exists in local repo."""
-        return self.loop.run_in_executor(None, self._exists)
+        return self.sys_run_in_executor(self._exists)
 
     def _exists(self):
         """Return True if docker image exists in local repo.
@@ -87,8 +91,9 @@ class DockerInterface(object):
         Need run inside executor.
         """
         try:
-            self.docker.images.get(self.image)
+            image = self.sys_docker.images.get(self.image)
-        except docker.errors.DockerException:
+            assert f"{self.image}:{self.version}" in image.tags
+        except (docker.errors.DockerException, AssertionError):
             return False
 
         return True
@@ -98,7 +103,7 @@ class DockerInterface(object):
 
         Return a Future.
         """
-        return self.loop.run_in_executor(None, self._is_running)
+        return self.sys_run_in_executor(self._is_running)
 
     def _is_running(self):
         """Return True if docker is Running.
@@ -106,8 +111,8 @@ class DockerInterface(object):
         Need run inside executor.
         """
         try:
-            container = self.docker.containers.get(self.name)
+            container = self.sys_docker.containers.get(self.name)
-            image = self.docker.images.get(self.image)
+            image = self.sys_docker.images.get(self.image)
         except docker.errors.DockerException:
             return False
 
@@ -121,10 +126,10 @@ class DockerInterface(object):
 
         return True
 
-    @docker_process
+    @process_lock
     def attach(self):
         """Attach to running docker container."""
-        return self.loop.run_in_executor(None, self._attach)
+        return self.sys_run_in_executor(self._attach)
 
     def _attach(self):
         """Attach to running docker container.
@@ -133,22 +138,21 @@ class DockerInterface(object):
         """
         try:
             if self.image:
-                obj_data = self.docker.images.get(self.image).attrs
+                self._meta = self.sys_docker.images.get(self.image).attrs
             else:
-                obj_data = self.docker.containers.get(self.name).attrs
+                self._meta = self.sys_docker.containers.get(self.name).attrs
         except docker.errors.DockerException:
             return False
 
-        self.process_metadata(obj_data)
         _LOGGER.info(
             "Attach to image %s with version %s", self.image, self.version)
 
         return True
 
-    @docker_process
+    @process_lock
     def run(self):
         """Run docker image."""
-        return self.loop.run_in_executor(None, self._run)
+        return self.sys_run_in_executor(self._run)
 
     def _run(self):
         """Run docker image.
@@ -157,10 +161,10 @@ class DockerInterface(object):
         """
         raise NotImplementedError()
 
-    @docker_process
+    @process_lock
     def stop(self):
         """Stop/remove docker container."""
-        return self.loop.run_in_executor(None, self._stop)
+        return self.sys_run_in_executor(self._stop)
 
     def _stop(self):
         """Stop/remove and remove docker container.
@@ -168,7 +172,7 @@ class DockerInterface(object):
         Need run inside executor.
         """
         try:
-            container = self.docker.containers.get(self.name)
+            container = self.sys_docker.containers.get(self.name)
         except docker.errors.DockerException:
             return False
 
@@ -183,10 +187,10 @@ class DockerInterface(object):
 
         return True
 
-    @docker_process
+    @process_lock
     def remove(self):
         """Remove docker images."""
-        return self.loop.run_in_executor(None, self._remove)
+        return self.sys_run_in_executor(self._remove)
 
     def _remove(self):
         """remove docker images.
@@ -201,27 +205,24 @@ class DockerInterface(object):
 
         try:
             with suppress(docker.errors.ImageNotFound):
-                self.docker.images.remove(
+                self.sys_docker.images.remove(
-                    image="{}:latest".format(self.image), force=True)
+                    image=f"{self.image}:latest", force=True)
 
             with suppress(docker.errors.ImageNotFound):
-                self.docker.images.remove(
+                self.sys_docker.images.remove(
-                    image="{}:{}".format(self.image, self.version), force=True)
+                    image=f"{self.image}:{self.version}", force=True)
 
         except docker.errors.DockerException as err:
-            _LOGGER.warning("Can't remove image %s -> %s", self.image, err)
+            _LOGGER.warning("Can't remove image %s: %s", self.image, err)
             return False
 
-        # clean metadata
+        self._meta = None
-        self.version = None
-        self.arch = None
-
         return True
 
-    @docker_process
+    @process_lock
     def update(self, tag):
         """Update a docker image."""
-        return self.loop.run_in_executor(None, self._update, tag)
+        return self.sys_run_in_executor(self._update, tag)
 
     def _update(self, tag):
         """Update a docker image.
@@ -246,7 +247,7 @@ class DockerInterface(object):
 
         Return a Future.
         """
-        return self.loop.run_in_executor(None, self._logs)
+        return self.sys_run_in_executor(self._logs)
 
     def _logs(self):
         """Return docker logs of container.
@@ -254,44 +255,19 @@ class DockerInterface(object):
         Need run inside executor.
         """
         try:
-            container = self.docker.containers.get(self.name)
+            container = self.sys_docker.containers.get(self.name)
         except docker.errors.DockerException:
             return b""
 
         try:
             return container.logs(tail=100, stdout=True, stderr=True)
         except docker.errors.DockerException as err:
-            _LOGGER.warning("Can't grap logs from %s -> %s", self.image, err)
+            _LOGGER.warning("Can't grap logs from %s: %s", self.image, err)
 
-    @docker_process
+    @process_lock
-    def restart(self):
-        """Restart docker container."""
-        return self.loop.run_in_executor(None, self._restart)
-
-    def _restart(self):
-        """Restart docker container.
-
-        Need run inside executor.
-        """
-        try:
-            container = self.docker.containers.get(self.name)
-        except docker.errors.DockerException:
-            return False
-
-        _LOGGER.info("Restart %s", self.image)
-
-        try:
-            container.restart(timeout=self.timeout)
-        except docker.errors.DockerException as err:
-            _LOGGER.warning("Can't restart %s -> %s", self.image, err)
-            return False
-
-        return True
-
-    @docker_process
     def cleanup(self):
         """Check if old version exists and cleanup."""
-        return self.loop.run_in_executor(None, self._cleanup)
+        return self.sys_run_in_executor(self._cleanup)
 
     def _cleanup(self):
         """Check if old version exists and cleanup.
@@ -299,25 +275,25 @@ class DockerInterface(object):
         Need run inside executor.
         """
         try:
-            latest = self.docker.images.get(self.image)
+            latest = self.sys_docker.images.get(self.image)
         except docker.errors.DockerException:
             _LOGGER.warning("Can't find %s for cleanup", self.image)
             return False
 
-        for image in self.docker.images.list(name=self.image):
+        for image in self.sys_docker.images.list(name=self.image):
             if latest.id == image.id:
                 continue
 
             with suppress(docker.errors.DockerException):
                 _LOGGER.info("Cleanup docker images: %s", image.tags)
-                self.docker.images.remove(image.id, force=True)
+                self.sys_docker.images.remove(image.id, force=True)
 
         return True
 
-    @docker_process
+    @process_lock
     def execute_command(self, command):
         """Create a temporary container and run command."""
-        return self.loop.run_in_executor(None, self._execute_command, command)
+        return self.sys_run_in_executor(self._execute_command, command)
 
     def _execute_command(self, command):
         """Create a temporary container and run command.
@@ -325,3 +301,24 @@ class DockerInterface(object):
         Need run inside executor.
         """
         raise NotImplementedError()
+
+    def stats(self):
+        """Read and return stats from container."""
+        return self.sys_run_in_executor(self._stats)
+
+    def _stats(self):
+        """Create a temporary container and run command.
+
+        Need run inside executor.
+        """
+        try:
+            container = self.sys_docker.containers.get(self.name)
+        except docker.errors.DockerException:
+            return None
+
+        try:
+            stats = container.stats(stream=False)
+            return DockerStats(stats)
+        except docker.errors.DockerException as err:
+            _LOGGER.error("Can't read stats from %s: %s", self.name, err)
+            return None

hassio/docker/network.py

@@ -8,8 +8,11 @@ from ..const import DOCKER_NETWORK_MASK, DOCKER_NETWORK, DOCKER_NETWORK_RANGE
 _LOGGER = logging.getLogger(__name__)
 
 
-class DockerNetwork(object):
+class DockerNetwork:
-    """Internal HassIO Network."""
+    """Internal HassIO Network.
+
+    This class is not AsyncIO safe!
+    """
 
     def __init__(self, dock):
         """Initialize internal hassio network."""
@@ -52,7 +55,8 @@ class DockerNetwork(object):
         ipam_config = docker.types.IPAMConfig(pool_configs=[ipam_pool])
 
         return self.docker.networks.create(
-            DOCKER_NETWORK, driver='bridge', ipam=ipam_config, options={
+            DOCKER_NETWORK, driver='bridge', ipam=ipam_config,
+            enable_ipv6=False, options={
                 "com.docker.network.bridge.name": DOCKER_NETWORK,
             })
 
@@ -66,7 +70,7 @@ class DockerNetwork(object):
         try:
             self.network.connect(container, aliases=alias, ipv4_address=ipv4)
         except docker.errors.APIError as err:
-            _LOGGER.error("Can't link container to hassio-net -> %s", err)
+            _LOGGER.error("Can't link container to hassio-net: %s", err)
             return False
 
         self.network.reload()
@@ -86,4 +90,4 @@ class DockerNetwork(object):
 
         except docker.errors.APIError as err:
             _LOGGER.warning(
-                "Can't disconnect container from default -> %s", err)
+                "Can't disconnect container from default: %s", err)

hassio/docker/stats.py

@@ -0,0 +1,90 @@
+"""Calc & represent docker stats data."""
+from contextlib import suppress
+
+
+class DockerStats:
+    """Hold stats data from container inside."""
+
+    def __init__(self, stats):
+        """Initialize docker stats."""
+        self._cpu = 0.0
+        self._network_rx = 0
+        self._network_tx = 0
+        self._blk_read = 0
+        self._blk_write = 0
+
+        try:
+            self._memory_usage = stats['memory_stats']['usage']
+            self._memory_limit = stats['memory_stats']['limit']
+        except KeyError:
+            self._memory_usage = 0
+            self._memory_limit = 0
+
+        with suppress(KeyError):
+            self._calc_cpu_percent(stats)
+
+        with suppress(KeyError):
+            self._calc_network(stats['networks'])
+
+        with suppress(KeyError):
+            self._calc_block_io(stats['blkio_stats'])
+
+    def _calc_cpu_percent(self, stats):
+        """Calculate CPU percent."""
+        cpu_delta = stats['cpu_stats']['cpu_usage']['total_usage'] - \
+            stats['precpu_stats']['cpu_usage']['total_usage']
+        system_delta = stats['cpu_stats']['system_cpu_usage'] - \
+            stats['precpu_stats']['system_cpu_usage']
+
+        if system_delta > 0.0 and cpu_delta > 0.0:
+            self._cpu = (cpu_delta / system_delta) * \
+                len(stats['cpu_stats']['cpu_usage']['percpu_usage']) * 100.0
+
+    def _calc_network(self, networks):
+        """Calculate Network IO stats."""
+        for _, stats in networks.items():
+            self._network_rx += stats['rx_bytes']
+            self._network_tx += stats['tx_bytes']
+
+    def _calc_block_io(self, blkio):
+        """Calculate block IO stats."""
+        for stats in blkio['io_service_bytes_recursive']:
+            if stats['op'] == 'Read':
+                self._blk_read += stats['value']
+            elif stats['op'] == 'Write':
+                self._blk_write += stats['value']
+
+    @property
+    def cpu_percent(self):
+        """Return CPU percent."""
+        return self._cpu
+
+    @property
+    def memory_usage(self):
+        """Return memory usage."""
+        return self._memory_usage
+
+    @property
+    def memory_limit(self):
+        """Return memory limit."""
+        return self._memory_limit
+
+    @property
+    def network_rx(self):
+        """Return network rx stats."""
+        return self._network_rx
+
+    @property
+    def network_tx(self):
+        """Return network rx stats."""
+        return self._network_tx
+
+    @property
+    def blk_read(self):
+        """Return block IO read stats."""
+        return self._blk_read
+
+    @property
+    def blk_write(self):
+        """Return block IO write stats."""
+        return self._blk_write

hassio/docker/supervisor.py

@@ -0,0 +1,42 @@
+"""Init file for HassIO docker object."""
+import logging
+import os
+
+import docker
+
+from .interface import DockerInterface
+from ..coresys import CoreSysAttributes
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class DockerSupervisor(DockerInterface, CoreSysAttributes):
+    """Docker hassio wrapper for HomeAssistant."""
+
+    @property
+    def name(self):
+        """Return name of docker container."""
+        return os.environ['SUPERVISOR_NAME']
+
+    def _attach(self):
+        """Attach to running docker container.
+
+        Need run inside executor.
+        """
+        try:
+            container = self.sys_docker.containers.get(self.name)
+        except docker.errors.DockerException:
+            return False
+
+        self._meta = container.attrs
+        _LOGGER.info("Attach to supervisor %s with version %s",
+                     self.image, self.version)
+
+        # if already attach
+        if container in self.sys_docker.network.containers:
+            return True
+
+        # attach to network
+        return self.sys_docker.network.attach_container(
+            container, alias=['hassio'],
+            ipv4=self.sys_docker.network.supervisor)

hassio/exceptions.py

@@ -0,0 +1,49 @@
+"""Core Exceptions."""
+
+
+class HassioError(Exception):
+    """Root exception."""
+    pass
+
+
+class HassioInternalError(HassioError):
+    """Internal Hass.io error they can't handle."""
+    pass
+
+
+class HassioNotSupportedError(HassioError):
+    """Function is not supported."""
+    pass
+
+
+# Host
+
+class HostError(HassioError):
+    """Internal Host error."""
+    pass
+
+
+class HostNotSupportedError(HassioNotSupportedError):
+    """Host function is not supprted."""
+    pass
+
+
+# utils/gdbus
+
+class DBusError(HassioError):
+    """DBus generic error."""
+    pass
+
+
+class DBusNotConnectedError(HostNotSupportedError):
+    """DBus is not connected and call a method."""
+
+
+class DBusFatalError(DBusError):
+    """DBus call going wrong."""
+    pass
+
+
+class DBusParseError(DBusError):
+    """DBus parse error."""
+    pass

hassio/homeassistant.py

@@ -3,75 +3,156 @@ import asyncio
 import logging
 import os
 import re
+import socket
+import time
+
+import aiohttp
+from aiohttp.hdrs import CONTENT_TYPE
+import attr
 
 from .const import (
-    FILE_HASSIO_HOMEASSISTANT, ATTR_DEVICES, ATTR_IMAGE, ATTR_LAST_VERSION,
+    FILE_HASSIO_HOMEASSISTANT, ATTR_IMAGE, ATTR_LAST_VERSION, ATTR_UUID,
-    ATTR_VERSION, ATTR_BOOT)
+    ATTR_BOOT, ATTR_PASSWORD, ATTR_PORT, ATTR_SSL, ATTR_WATCHDOG,
-from .dock.homeassistant import DockerHomeAssistant
+    ATTR_WAIT_BOOT, HEADER_HA_ACCESS, CONTENT_TYPE_JSON)
-from .tools import JsonConfig, convert_to_ascii
+from .coresys import CoreSysAttributes
+from .docker.homeassistant import DockerHomeAssistant
+from .utils import convert_to_ascii, process_lock
+from .utils.json import JsonConfig
 from .validate import SCHEMA_HASS_CONFIG
 
 _LOGGER = logging.getLogger(__name__)
 
 RE_YAML_ERROR = re.compile(r"homeassistant\.util\.yaml")
 
+# pylint: disable=invalid-name
+ConfigResult = attr.make_class('ConfigResult', ['valid', 'log'])
 
-class HomeAssistant(JsonConfig):
+
+class HomeAssistant(JsonConfig, CoreSysAttributes):
     """Hass core object for handle it."""
 
-    def __init__(self, config, loop, docker, updater):
+    def __init__(self, coresys):
         """Initialize hass object."""
         super().__init__(FILE_HASSIO_HOMEASSISTANT, SCHEMA_HASS_CONFIG)
-        self.config = config
+        self.coresys = coresys
-        self.loop = loop
+        self.instance = DockerHomeAssistant(coresys)
-        self.updater = updater
+        self.lock = asyncio.Lock(loop=coresys.loop)
-        self.docker = DockerHomeAssistant(config, loop, docker, self)
 
-    async def prepare(self):
+    async def load(self):
         """Prepare HomeAssistant object."""
-        if not await self.docker.exists():
+        if await self.instance.attach():
+            return
+
         _LOGGER.info("No HomeAssistant docker %s found.", self.image)
-            if self.is_custom_image:
-                await self.install()
-            else:
         await self.install_landingpage()
-        else:
+
-            await self.docker.attach()
+    @property
+    def machine(self):
+        """Return System Machines."""
+        return self.instance.machine
+
+    @property
+    def api_ip(self):
+        """Return IP of HomeAssistant instance."""
+        return self.sys_docker.network.gateway
+
+    @property
+    def api_port(self):
+        """Return network port to home-assistant instance."""
+        return self._data[ATTR_PORT]
+
+    @api_port.setter
+    def api_port(self, value):
+        """Set network port for home-assistant instance."""
+        self._data[ATTR_PORT] = value
+
+    @property
+    def api_password(self):
+        """Return password for home-assistant instance."""
+        return self._data.get(ATTR_PASSWORD)
+
+    @api_password.setter
+    def api_password(self, value):
+        """Set password for home-assistant instance."""
+        self._data[ATTR_PASSWORD] = value
+
+    @property
+    def api_ssl(self):
+        """Return if we need ssl to home-assistant instance."""
+        return self._data[ATTR_SSL]
+
+    @api_ssl.setter
+    def api_ssl(self, value):
+        """Set SSL for home-assistant instance."""
+        self._data[ATTR_SSL] = value
+
+    @property
+    def api_url(self):
+        """Return API url to Home-Assistant."""
+        return "{}://{}:{}".format(
+            'https' if self.api_ssl else 'http', self.api_ip, self.api_port
+        )
+
+    @property
+    def watchdog(self):
+        """Return True if the watchdog should protect Home-Assistant."""
+        return self._data[ATTR_WATCHDOG]
+
+    @watchdog.setter
+    def watchdog(self, value):
+        """Return True if the watchdog should protect Home-Assistant."""
+        self._data[ATTR_WATCHDOG] = value
+
+    @property
+    def wait_boot(self):
+        """Return time to wait for Home-Assistant startup."""
+        return self._data[ATTR_WAIT_BOOT]
+
+    @wait_boot.setter
+    def wait_boot(self, value):
+        """Set time to wait for Home-Assistant startup."""
+        self._data[ATTR_WAIT_BOOT] = value
 
     @property
     def version(self):
         """Return version of running homeassistant."""
-        return self.docker.version
+        return self.instance.version
 
     @property
     def last_version(self):
         """Return last available version of homeassistant."""
         if self.is_custom_image:
             return self._data.get(ATTR_LAST_VERSION)
-        return self.updater.version_homeassistant
+        return self.sys_updater.version_homeassistant
+
+    @last_version.setter
+    def last_version(self, value):
+        """Set last available version of homeassistant."""
+        if value:
+            self._data[ATTR_LAST_VERSION] = value
+        else:
+            self._data.pop(ATTR_LAST_VERSION, None)
 
     @property
     def image(self):
         """Return image name of hass containter."""
-        if ATTR_IMAGE in self._data:
+        if self._data.get(ATTR_IMAGE):
             return self._data[ATTR_IMAGE]
         return os.environ['HOMEASSISTANT_REPOSITORY']
 
+    @image.setter
+    def image(self, value):
+        """Set image name of hass containter."""
+        if value:
+            self._data[ATTR_IMAGE] = value
+        else:
+            self._data.pop(ATTR_IMAGE, None)
+
     @property
     def is_custom_image(self):
         """Return True if a custom image is used."""
-        return ATTR_IMAGE in self._data
+        return all(attr in self._data for attr in
-
+                   (ATTR_IMAGE, ATTR_LAST_VERSION))
-    @property
-    def devices(self):
-        """Return extend device mapping."""
-        return self._data[ATTR_DEVICES]
-
-    @devices.setter
-    def devices(self, value):
-        """Set extend device mapping."""
-        self._data[ATTR_DEVICES] = value
-        self.save()
 
     @property
     def boot(self):
@@ -82,130 +163,208 @@ class HomeAssistant(JsonConfig):
     def boot(self, value):
         """Set home-assistant boot options."""
         self._data[ATTR_BOOT] = value
-        self.save()
 
-    def set_custom(self, image, version):
+    @property
-        """Set a custom image for homeassistant."""
+    def uuid(self):
-        # reset
+        """Return a UUID of this HomeAssistant."""
-        if image is None and version is None:
+        return self._data[ATTR_UUID]
-            self._data.pop(ATTR_IMAGE, None)
-            self._data.pop(ATTR_VERSION, None)
-
-            self.docker.image = self.image
-        else:
-            if image:
-                self._data[ATTR_IMAGE] = image
-                self.docker.image = image
-            if version:
-                self._data[ATTR_VERSION] = version
-        self.save()
 
+    @process_lock
     async def install_landingpage(self):
         """Install a landingpage."""
         _LOGGER.info("Setup HomeAssistant landingpage")
         while True:
-            if await self.docker.install('landingpage'):
+            if await self.instance.install('landingpage'):
                 break
             _LOGGER.warning("Fails install landingpage, retry after 60sec")
-            await asyncio.sleep(60, loop=self.loop)
+            await asyncio.sleep(60)
 
-        # run landingpage after installation
+        # Run landingpage after installation
-        await self.docker.run()
+        await self._start()
 
+    @process_lock
     async def install(self):
         """Install a landingpage."""
         _LOGGER.info("Setup HomeAssistant")
         while True:
             # read homeassistant tag and install it
             if not self.last_version:
-                await self.updater.fetch_data()
+                await self.sys_updater.reload()
 
             tag = self.last_version
-            if tag and await self.docker.install(tag):
+            if tag and await self.instance.install(tag):
                 break
             _LOGGER.warning("Error on install HomeAssistant. Retry in 60sec")
-            await asyncio.sleep(60, loop=self.loop)
+            await asyncio.sleep(60)
 
         # finishing
         _LOGGER.info("HomeAssistant docker now installed")
         if self.boot:
-            await self.docker.run()
+            await self._start()
-        await self.docker.cleanup()
+        await self.instance.cleanup()
 
+    @process_lock
     async def update(self, version=None):
         """Update HomeAssistant version."""
         version = version or self.last_version
-        running = await self.docker.is_running()
+        running = await self.instance.is_running()
+        exists = await self.instance.exists()
 
-        if version == self.docker.version:
+        if exists and version == self.instance.version:
-            _LOGGER.warning("Version %s is already installed", version)
+            _LOGGER.info("Version %s is already installed", version)
             return False
 
         try:
-            return await self.docker.update(version)
+            return await self.instance.update(version)
         finally:
             if running:
-                await self.docker.run()
+                await self._start()
 
-    def run(self):
+    async def _start(self):
+        """Start HomeAssistant docker & wait."""
+        if not await self.instance.run():
+            return False
+        return await self._block_till_run()
+
+    @process_lock
+    def start(self):
         """Run HomeAssistant docker.
 
         Return a coroutine.
         """
-        return self.docker.run()
+        return self._start()
 
+    @process_lock
     def stop(self):
         """Stop HomeAssistant docker.
 
         Return a coroutine.
         """
-        return self.docker.stop()
+        return self.instance.stop()
 
-    def restart(self):
+    @process_lock
-        """Restart HomeAssistant docker.
+    async def restart(self):
-
+        """Restart HomeAssistant docker."""
-        Return a coroutine.
+        await self.instance.stop()
-        """
+        return await self._start()
-        return self.docker.restart()
 
     def logs(self):
         """Get HomeAssistant docker logs.
 
         Return a coroutine.
         """
-        return self.docker.logs()
+        return self.instance.logs()
+
+    def stats(self):
+        """Return stats of HomeAssistant.
+
+        Return a coroutine.
+        """
+        return self.instance.stats()
 
     def is_running(self):
         """Return True if docker container is running.
 
         Return a coroutine.
         """
-        return self.docker.is_running()
+        return self.instance.is_running()
 
     def is_initialize(self):
         """Return True if a docker container is exists.
 
         Return a coroutine.
         """
-        return self.docker.is_initialize()
+        return self.instance.is_initialize()
 
     @property
     def in_progress(self):
         """Return True if a task is in progress."""
-        return self.docker.in_progress
+        return self.instance.in_progress or self.lock.locked()
 
     async def check_config(self):
         """Run homeassistant config check."""
-        exit_code, log = await self.docker.execute_command(
+        result = await self.instance.execute_command(
             "python3 -m homeassistant -c /config --script check_config"
         )
 
         # if not valid
-        if exit_code is None:
+        if result.exit_code is None:
-            return (False, "")
+            return ConfigResult(False, "")
 
         # parse output
-        log = convert_to_ascii(log)
+        log = convert_to_ascii(result.output)
-        if exit_code != 0 or RE_YAML_ERROR.search(log):
+        if result.exit_code != 0 or RE_YAML_ERROR.search(log):
-            return (False, log)
+            return ConfigResult(False, log)
-        return (True, log)
+        return ConfigResult(True, log)
+
+    async def check_api_state(self):
+        """Check if Home-Assistant up and running."""
+        url = f"{self.api_url}/api/"
+        header = {CONTENT_TYPE: CONTENT_TYPE_JSON}
+
+        if self.api_password:
+            header.update({HEADER_HA_ACCESS: self.api_password})
+
+        try:
+            # pylint: disable=bad-continuation
+            async with self.sys_websession_ssl.get(
+                    url, headers=header, timeout=30) as request:
+                status = request.status
+
+        except (asyncio.TimeoutError, aiohttp.ClientError):
+            return False
+
+        if status not in (200, 201):
+            _LOGGER.warning("Home-Assistant API config missmatch")
+        return True
+
+    async def send_event(self, event_type, event_data=None):
+        """Send event to Home-Assistant."""
+        url = f"{self.api_url}/api/events/{event_type}"
+        header = {CONTENT_TYPE: CONTENT_TYPE_JSON}
+
+        if self.api_password:
+            header.update({HEADER_HA_ACCESS: self.api_password})
+
+        try:
+            # pylint: disable=bad-continuation
+            async with self.sys_websession_ssl.post(
+                    url, headers=header, timeout=30,
+                    json=event_data) as request:
+                status = request.status
+
+        except (asyncio.TimeoutError, aiohttp.ClientError) as err:
+            _LOGGER.warning(
+                "Home-Assistant event %s fails: %s", event_type, err)
+            return False
+
+        if status not in (200, 201):
+            _LOGGER.warning("Home-Assistant event %s fails", event_type)
+            return False
+        return True
+
+    async def _block_till_run(self):
+        """Block until Home-Assistant is booting up or startup timeout."""
+        start_time = time.monotonic()
+
+        def check_port():
+            """Check if port is mapped."""
+            sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            try:
+                result = sock.connect_ex((str(self.api_ip), self.api_port))
+                sock.close()
+
+                if result == 0:
+                    return True
+                return False
+            except OSError:
+                pass
+
+        while time.monotonic() - start_time < self.wait_boot:
+            if await self.sys_run_in_executor(check_port):
+                _LOGGER.info("Detect a running Home-Assistant instance")
+                return True
+            await asyncio.sleep(10)
+
+        _LOGGER.warning("Don't wait anymore of Home-Assistant startup!")
+        return False

hassio/host/__init__.py

@@ -0,0 +1,58 @@
+"""Host function like audio/dbus/systemd."""
+
+from .alsa import AlsaAudio
+from .control import SystemControl
+from .info import InfoCenter
+from ..const import FEATURES_REBOOT, FEATURES_SHUTDOWN, FEATURES_HOSTNAME
+from ..coresys import CoreSysAttributes
+
+
+class HostManager(CoreSysAttributes):
+    """Manage supported function from host."""
+
+    def __init__(self, coresys):
+        """Initialize Host manager."""
+        self.coresys = coresys
+        self._alsa = AlsaAudio(coresys)
+        self._control = SystemControl(coresys)
+        self._info = InfoCenter(coresys)
+
+    @property
+    def alsa(self):
+        """Return host ALSA handler."""
+        return self._alsa
+
+    @property
+    def control(self):
+        """Return host control handler."""
+        return self._control
+
+    @property
+    def info(self):
+        """Return host info handler."""
+        return self._info
+
+    @property
+    def supperted_features(self):
+        """Return a list of supported host features."""
+        features = []
+
+        if self.sys_dbus.systemd.is_connected:
+            features.extend([
+                FEATURES_REBOOT,
+                FEATURES_SHUTDOWN,
+            ])
+
+        if self.sys_dbus.hostname.is_connected:
+            features.append(FEATURES_HOSTNAME)
+
+        return features
+
+    async def load(self):
+        """Load host functions."""
+        if self.sys_dbus.hostname.is_connected:
+            await self.info.update()
+
+    def reload(self):
+        """Reload host information."""
+        return self.load()

hassio/host/alsa.py

@@ -0,0 +1,137 @@
+"""Host Audio-support."""
+import logging
+import json
+from pathlib import Path
+from string import Template
+
+import attr
+
+from ..const import ATTR_INPUT, ATTR_OUTPUT, ATTR_DEVICES, ATTR_NAME
+from ..coresys import CoreSysAttributes
+
+_LOGGER = logging.getLogger(__name__)
+
+# pylint: disable=invalid-name
+DefaultConfig = attr.make_class('DefaultConfig', ['input', 'output'])
+
+
+class AlsaAudio(CoreSysAttributes):
+    """Handle Audio ALSA host data."""
+
+    def __init__(self, coresys):
+        """Initialize Alsa audio system."""
+        self.coresys = coresys
+        self._data = {
+            ATTR_INPUT: {},
+            ATTR_OUTPUT: {},
+        }
+        self._cache = 0
+        self._default = None
+
+    @property
+    def input_devices(self):
+        """Return list of ALSA input devices."""
+        self._update_device()
+        return self._data[ATTR_INPUT]
+
+    @property
+    def output_devices(self):
+        """Return list of ALSA output devices."""
+        self._update_device()
+        return self._data[ATTR_OUTPUT]
+
+    def _update_device(self):
+        """Update Internal device DB."""
+        current_id = hash(frozenset(self.sys_hardware.audio_devices))
+
+        # Need rebuild?
+        if current_id == self._cache:
+            return
+
+        # Clean old stuff
+        self._data[ATTR_INPUT].clear()
+        self._data[ATTR_OUTPUT].clear()
+
+        # Init database
+        _LOGGER.info("Update ALSA device list")
+        database = self._audio_database()
+
+        # Process devices
+        for dev_id, dev_data in self.sys_hardware.audio_devices.items():
+            for chan_id, chan_type in dev_data[ATTR_DEVICES].items():
+                alsa_id = f"{dev_id},{chan_id}"
+                dev_name = dev_data[ATTR_NAME]
+
+                # Lookup type
+                if chan_type.endswith('playback'):
+                    key = ATTR_OUTPUT
+                elif chan_type.endswith('capture'):
+                    key = ATTR_INPUT
+                else:
+                    _LOGGER.warning("Unknown channel type: %s", chan_type)
+                    continue
+
+                # Use name from DB or a generic name
+                self._data[key][alsa_id] = database.get(
+                    self.sys_machine, {}).get(
+                        dev_name, {}).get(alsa_id, f"{dev_name}: {chan_id}")
+
+        self._cache = current_id
+
+    @staticmethod
+    def _audio_database():
+        """Read local json audio data into dict."""
+        json_file = Path(__file__).parent.joinpath('audiodb.json')
+
+        try:
+            # pylint: disable=no-member
+            with json_file.open('r') as database:
+                return json.loads(database.read())
+        except (ValueError, OSError) as err:
+            _LOGGER.warning("Can't read audio DB: %s", err)
+
+        return {}
+
+    @property
+    def default(self):
+        """Generate ALSA default setting."""
+        # Init defaults
+        if self._default is None:
+            database = self._audio_database()
+            alsa_input = database.get(self.sys_machine, {}).get(ATTR_INPUT)
+            alsa_output = database.get(self.sys_machine, {}).get(ATTR_OUTPUT)
+
+            self._default = DefaultConfig(alsa_input, alsa_output)
+
+        # Search exists/new output
+        if self._default.output is None and self.output_devices:
+            self._default.output = next(iter(self.output_devices))
+            _LOGGER.info("Detect output device %s", self._default.output)
+
+        # Search exists/new input
+        if self._default.input is None and self.input_devices:
+            self._default.input = next(iter(self.input_devices))
+            _LOGGER.info("Detect input device %s", self._default.input)
+
+        return self._default
+
+    def asound(self, alsa_input=None, alsa_output=None):
+        """Generate a asound data."""
+        alsa_input = alsa_input or self.default.input
+        alsa_output = alsa_output or self.default.output
+
+        # Read Template
+        asound_file = Path(__file__).parent.joinpath('asound.tmpl')
+        try:
+            # pylint: disable=no-member
+            with asound_file.open('r') as asound:
+                asound_data = asound.read()
+        except OSError as err:
+            _LOGGER.error("Can't read asound.tmpl: %s", err)
+            return ""
+
+        # Process Template
+        asound_template = Template(asound_data)
+        return asound_template.safe_substitute(
+            input=alsa_input, output=alsa_output
+        )

hassio/host/asound.tmpl

@@ -0,0 +1,17 @@
+pcm.!default {
+  type asym
+  capture.pcm "mic"
+  playback.pcm "speaker"
+}
+pcm.mic {
+  type plug
+  slave {
+    pcm "hw:$input"
+  }
+}
+pcm.speaker {
+  type plug
+  slave {
+    pcm "hw:$output"
+  }
+}

hassio/host/audiodb.json

@@ -0,0 +1,18 @@
+{
+    "raspberrypi3": {
+        "bcm2835 - bcm2835 ALSA": {
+            "0,0": "Raspberry Jack",
+            "0,1": "Raspberry HDMI"
+        },
+        "output": "0,0",
+        "input": null
+    },
+    "raspberrypi2": {
+        "output": "0,0",
+        "input": null
+    },
+    "raspberrypi": {
+        "output": "0,0",
+        "input": null
+    }
+}

hassio/host/control.py

@@ -0,0 +1,51 @@
+"""Power control for host."""
+import logging
+
+from ..coresys import CoreSysAttributes
+from ..exceptions import HostNotSupportedError
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class SystemControl(CoreSysAttributes):
+    """Handle host power controls."""
+
+    def __init__(self, coresys):
+        """Initialize host power handling."""
+        self.coresys = coresys
+
+    def _check_systemd(self):
+        """Check if systemd is connect or raise error."""
+        if not self.sys_dbus.systemd.is_connected:
+            _LOGGER.error("No systemd dbus connection available")
+            raise HostNotSupportedError()
+
+    async def reboot(self):
+        """Reboot host system."""
+        self._check_systemd()
+
+        _LOGGER.info("Initialize host reboot over systemd")
+        try:
+            await self.sys_core.shutdown()
+        finally:
+            await self.sys_dbus.systemd.reboot()
+
+    async def shutdown(self):
+        """Shutdown host system."""
+        self._check_systemd()
+
+        _LOGGER.info("Initialize host power off over systemd")
+        try:
+            await self.sys_core.shutdown()
+        finally:
+            await self.sys_dbus.systemd.power_off()
+
+    async def set_hostname(self, hostname):
+        """Set local a new Hostname."""
+        if not self.sys_dbus.systemd.is_connected:
+            _LOGGER.error("No hostname dbus connection available")
+            raise HostNotSupportedError()
+
+        _LOGGER.info("Set Hostname %s", hostname)
+        await self.sys_dbus.hostname.set_static_hostname(hostname)
+        await self.sys_host.info.update()

hassio/host/info.py

@@ -0,0 +1,58 @@
+"""Power control for host."""
+import logging
+
+from ..coresys import CoreSysAttributes
+from ..exceptions import HassioError, HostNotSupportedError
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class InfoCenter(CoreSysAttributes):
+    """Handle local system information controls."""
+
+    def __init__(self, coresys):
+        """Initialize system center handling."""
+        self.coresys = coresys
+        self._data = {}
+
+    @property
+    def hostname(self):
+        """Return local hostname."""
+        return self._data.get('StaticHostname') or None
+
+    @property
+    def chassis(self):
+        """Return local chassis type."""
+        return self._data.get('Chassis') or None
+
+    @property
+    def deployment(self):
+        """Return local deployment type."""
+        return self._data.get('Deployment') or None
+
+    @property
+    def kernel(self):
+        """Return local kernel version."""
+        return self._data.get('KernelRelease') or None
+
+    @property
+    def operating_system(self):
+        """Return local operating system."""
+        return self._data.get('OperatingSystemPrettyName') or None
+
+    @property
+    def cpe(self):
+        """Return local CPE."""
+        return self._data.get('OperatingSystemCPEName') or None
+
+    async def update(self):
+        """Update properties over dbus."""
+        if not self.sys_dbus.systemd.is_connected:
+            _LOGGER.error("No hostname dbus connection available")
+            raise HostNotSupportedError()
+
+        _LOGGER.info("Update local host information")
+        try:
+            self._data = await self.sys_dbus.hostname.get_properties()
+        except HassioError:
+            _LOGGER.warning("Can't update host system information!")

hassio/host_control.py

@@ -1,124 +0,0 @@
-"""Host control for HassIO."""
-import asyncio
-import json
-import logging
-
-import async_timeout
-
-from .const import (
-    SOCKET_HC, ATTR_LAST_VERSION, ATTR_VERSION, ATTR_TYPE, ATTR_FEATURES,
-    ATTR_HOSTNAME, ATTR_OS)
-
-_LOGGER = logging.getLogger(__name__)
-
-TIMEOUT = 15
-UNKNOWN = 'unknown'
-
-FEATURES_SHUTDOWN = 'shutdown'
-FEATURES_REBOOT = 'reboot'
-FEATURES_UPDATE = 'update'
-FEATURES_HOSTNAME = 'hostname'
-FEATURES_NETWORK_INFO = 'network_info'
-FEATURES_NETWORK_CONTROL = 'network_control'
-
-
-class HostControl(object):
-    """Client for host control."""
-
-    def __init__(self, loop):
-        """Initialize HostControl socket client."""
-        self.loop = loop
-        self.active = False
-        self.version = UNKNOWN
-        self.last_version = UNKNOWN
-        self.type = UNKNOWN
-        self.features = []
-        self.hostname = UNKNOWN
-        self.os_info = UNKNOWN
-
-        if SOCKET_HC.is_socket():
-            self.active = True
-
-    async def _send_command(self, command):
-        """Send command to host.
-
-        Is a coroutine.
-        """
-        if not self.active:
-            return
-
-        reader, writer = await asyncio.open_unix_connection(
-            str(SOCKET_HC), loop=self.loop)
-
-        try:
-            # send
-            _LOGGER.info("Send '%s' to HostControl.", command)
-
-            with async_timeout.timeout(TIMEOUT, loop=self.loop):
-                writer.write("{}\n".format(command).encode())
-                data = await reader.readline()
-
-            response = data.decode().rstrip()
-            _LOGGER.info("Receive from HostControl: %s.", response)
-
-            if response == "OK":
-                return True
-            elif response == "ERROR":
-                return False
-            elif response == "WRONG":
-                return None
-            else:
-                try:
-                    return json.loads(response)
-                except json.JSONDecodeError:
-                    _LOGGER.warning("Json parse error from HostControl '%s'.",
-                                    response)
-
-        except asyncio.TimeoutError:
-            _LOGGER.error("Timeout from HostControl!")
-
-        finally:
-            writer.close()
-
-    async def load(self):
-        """Load Info from host.
-
-        Return a coroutine.
-        """
-        info = await self._send_command("info")
-        if not info:
-            return
-
-        self.version = info.get(ATTR_VERSION, UNKNOWN)
-        self.last_version = info.get(ATTR_LAST_VERSION, UNKNOWN)
-        self.type = info.get(ATTR_TYPE, UNKNOWN)
-        self.features = info.get(ATTR_FEATURES, [])
-        self.hostname = info.get(ATTR_HOSTNAME, UNKNOWN)
-        self.os_info = info.get(ATTR_OS, UNKNOWN)
-
-    def reboot(self):
-        """Reboot the host system.
-
-        Return a coroutine.
-        """
-        return self._send_command("reboot")
-
-    def shutdown(self):
-        """Shutdown the host system.
-
-        Return a coroutine.
-        """
-        return self._send_command("shutdown")
-
-    def update(self, version=None):
-        """Update the host system.
-
-        Return a coroutine.
-        """
-        if version:
-            return self._send_command("update {}".format(version))
-        return self._send_command("update")
-
-    def set_hostname(self, hostname):
-        """Update hostname on host."""
-        return self._send_command("hostname {}".format(hostname))

hassio/misc/__init__.py

@@ -0,0 +1 @@
+"""Special object and tools for Hass.io."""

hassio/misc/dns.py

@@ -8,11 +8,12 @@ _LOGGER = logging.getLogger(__name__)
 COMMAND = "socat UDP-RECVFROM:53,fork UDP-SENDTO:127.0.0.11:53"
 
 
-class DNSForward(object):
+class DNSForward:
     """Manage DNS forwarding to internal DNS."""
 
-    def __init__(self):
+    def __init__(self, loop):
         """Initialize DNS forwarding."""
+        self.loop = loop
         self.proc = None
 
     async def start(self):
@@ -23,9 +24,10 @@ class DNSForward(object):
                 stdin=asyncio.subprocess.DEVNULL,
                 stdout=asyncio.subprocess.DEVNULL,
                 stderr=asyncio.subprocess.DEVNULL,
+                loop=self.loop
             )
         except OSError as err:
-            _LOGGER.error("Can't start DNS forwarding -> %s", err)
+            _LOGGER.error("Can't start DNS forwarding: %s", err)
         else:
             _LOGGER.info("Start DNS port forwarding for host add-ons")
 

hassio/misc/hardware.py

@@ -6,7 +6,7 @@ import re
 
 import pyudev
 
-from .const import ATTR_NAME, ATTR_TYPE, ATTR_DEVICES
+from ..const import ATTR_NAME, ATTR_TYPE, ATTR_DEVICES
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -19,8 +19,11 @@ RE_DEVICES = re.compile(r"\[.*(\d+)- (\d+).*\]: ([\w ]*)")
 PROC_STAT = Path("/proc/stat")
 RE_BOOT_TIME = re.compile(r"btime (\d+)")
 
+GPIO_DEVICES = Path("/sys/class/gpio")
+RE_TTY = re.compile(r"tty[A-Z]+")
 
-class Hardware(object):
+
+class Hardware:
     """Represent a interface to procfs, sysfs and udev."""
 
     def __init__(self):
@@ -32,10 +35,10 @@ class Hardware(object):
         """Return all serial and connected devices."""
         dev_list = set()
         for device in self.context.list_devices(subsystem='tty'):
-            if 'ID_VENDOR' in device:
+            if 'ID_VENDOR' in device or RE_TTY.search(device.device_node):
                 dev_list.add(device.device_node)
 
-        return list(dev_list)
+        return dev_list
 
     @property
     def input_devices(self):
@@ -45,7 +48,7 @@ class Hardware(object):
             if 'NAME' in device:
                 dev_list.add(device['NAME'].replace('"', ''))
 
-        return list(dev_list)
+        return dev_list
 
     @property
     def disk_devices(self):
@@ -55,19 +58,23 @@ class Hardware(object):
             if device.device_node.startswith('/dev/sd'):
                 dev_list.add(device.device_node)
 
-        return list(dev_list)
+        return dev_list
 
     @property
     def audio_devices(self):
         """Return all available audio interfaces."""
+        if not ASOUND_CARDS.exists():
+            _LOGGER.info("No audio devices found")
+            return {}
+
         try:
             with ASOUND_CARDS.open('r') as cards_file:
                 cards = cards_file.read()
             with ASOUND_DEVICES.open('r') as devices_file:
                 devices = devices_file.read()
         except OSError as err:
-            _LOGGER.error("Can't read asound data -> %s", err)
+            _LOGGER.error("Can't read asound data: %s", err)
-            return
+            return {}
 
         audio_list = {}
 
@@ -90,6 +97,15 @@ class Hardware(object):
 
         return audio_list
 
+    @property
+    def gpio_devices(self):
+        """Return list of GPIO interface on device."""
+        dev_list = set()
+        for interface in GPIO_DEVICES.glob("gpio*"):
+            dev_list.add(interface.name)
+
+        return dev_list
+
     @property
     def last_boot(self):
         """Return last boot time."""
@@ -97,13 +113,13 @@ class Hardware(object):
             with PROC_STAT.open("r") as stat_file:
                 stats = stat_file.read()
         except OSError as err:
-            _LOGGER.error("Can't read stat data -> %s", err)
+            _LOGGER.error("Can't read stat data: %s", err)
-            return
+            return None
 
         # parse stat file
         found = RE_BOOT_TIME.search(stats)
         if not found:
             _LOGGER.error("Can't found last boot time!")
-            return
+            return None
 
         return datetime.utcfromtimestamp(int(found.group(1)))

hassio/misc/scheduler.py

@@ -0,0 +1,75 @@
+"""Schedule for HassIO."""
+import logging
+from datetime import date, datetime, time, timedelta
+
+_LOGGER = logging.getLogger(__name__)
+
+INTERVAL = 'interval'
+REPEAT = 'repeat'
+CALL = 'callback'
+TASK = 'task'
+
+
+class Scheduler:
+    """Schedule task inside HassIO."""
+
+    def __init__(self, loop):
+        """Initialize task schedule."""
+        self.loop = loop
+        self._data = {}
+        self.suspend = False
+
+    def register_task(self, coro_callback, interval, repeat=True):
+        """Schedule a coroutine.
+
+        The coroutien need to be a callback without arguments.
+        """
+        task_id = hash(coro_callback)
+
+        # generate data
+        opts = {
+            CALL: coro_callback,
+            INTERVAL: interval,
+            REPEAT: repeat,
+        }
+
+        # schedule task
+        self._data[task_id] = opts
+        self._schedule_task(interval, task_id)
+
+        return task_id
+
+    def _run_task(self, task_id):
+        """Run a scheduled task."""
+        data = self._data[task_id]
+
+        if not self.suspend:
+            self.loop.create_task(data[CALL]())
+
+        if data[REPEAT]:
+            self._schedule_task(data[INTERVAL], task_id)
+        else:
+            self._data.pop(task_id)
+
+    def _schedule_task(self, interval, task_id):
+        """Schedule a task on loop."""
+        if isinstance(interval, (int, float)):
+            job = self.loop.call_later(interval, self._run_task, task_id)
+        elif isinstance(interval, time):
+            today = datetime.combine(date.today(), interval)
+            tomorrow = datetime.combine(
+                date.today() + timedelta(days=1), interval)
+
+            # check if we run it today or next day
+            if today > datetime.today():
+                calc = today
+            else:
+                calc = tomorrow
+
+            job = self.loop.call_at(calc.timestamp(), self._run_task, task_id)
+        else:
+            _LOGGER.fatal("Unknow interval %s (type: %s) for scheduler %s",
+                          interval, type(interval), task_id)
+
+        # Store job
+        self._data[task_id][TASK] = job

hassio/scheduler.py

@@ -1,56 +0,0 @@
-"""Schedule for HassIO."""
-import logging
-
-_LOGGER = logging.getLogger(__name__)
-
-SEC = 'seconds'
-REPEAT = 'repeat'
-CALL = 'callback'
-TASK = 'task'
-
-
-class Scheduler(object):
-    """Schedule task inside HassIO."""
-
-    def __init__(self, loop):
-        """Initialize task schedule."""
-        self.loop = loop
-        self._data = {}
-        self.suspend = False
-
-    def register_task(self, coro_callback, seconds, repeat=True,
-                      now=False):
-        """Schedule a coroutine.
-
-        The coroutien need to be a callback without arguments.
-        """
-        idx = hash(coro_callback)
-
-        # generate data
-        opts = {
-            CALL: coro_callback,
-            SEC: seconds,
-            REPEAT: repeat,
-        }
-        self._data[idx] = opts
-
-        # schedule task
-        if now:
-            self._run_task(idx)
-        else:
-            task = self.loop.call_later(seconds, self._run_task, idx)
-            self._data[idx][TASK] = task
-
-        return idx
-
-    def _run_task(self, idx):
-        """Run a scheduled task."""
-        data = self._data.pop(idx)
-
-        if not self.suspend:
-            self.loop.create_task(data[CALL]())
-
-        if data[REPEAT]:
-            task = self.loop.call_later(data[SEC], self._run_task, idx)
-            data[TASK] = task
-            self._data[idx] = data

hassio/services/__init__.py

@@ -0,0 +1,44 @@
+"""Handle internal services discovery."""
+
+from .discovery import Discovery  # noqa
+from .mqtt import MQTTService
+from .data import ServicesData
+from ..const import SERVICE_MQTT
+from ..coresys import CoreSysAttributes
+
+
+AVAILABLE_SERVICES = {
+    SERVICE_MQTT: MQTTService
+}
+
+
+class ServiceManager(CoreSysAttributes):
+    """Handle internal services discovery."""
+
+    def __init__(self, coresys):
+        """Initialize Services handler."""
+        self.coresys = coresys
+        self.data = ServicesData()
+        self.services_obj = {}
+
+    @property
+    def list_services(self):
+        """Return a list of services."""
+        return list(self.services_obj.values())
+
+    def get(self, slug):
+        """Return service object from slug."""
+        return self.services_obj.get(slug)
+
+    async def load(self):
+        """Load available services."""
+        for slug, service in AVAILABLE_SERVICES.items():
+            self.services_obj[slug] = service(self.coresys)
+
+        # Read exists discovery messages
+        self.sys_discovery.load()
+
+    def reset(self):
+        """Reset available data."""
+        self.data.reset_data()
+        self.sys_discovery.load()

hassio/services/data.py

@@ -0,0 +1,23 @@
+"""Handle service data for persistent supervisor reboot."""
+
+from .validate import SCHEMA_SERVICES_FILE
+from ..const import FILE_HASSIO_SERVICES, ATTR_DISCOVERY, SERVICE_MQTT
+from ..utils.json import JsonConfig
+
+
+class ServicesData(JsonConfig):
+    """Class to handle services data."""
+
+    def __init__(self):
+        """Initialize services data."""
+        super().__init__(FILE_HASSIO_SERVICES, SCHEMA_SERVICES_FILE)
+
+    @property
+    def discovery(self):
+        """Return discovery data for home-assistant."""
+        return self._data[ATTR_DISCOVERY]
+
+    @property
+    def mqtt(self):
+        """Return settings for mqtt service."""
+        return self._data[SERVICE_MQTT]

hassio/services/discovery.py

@@ -0,0 +1,107 @@
+"""Handle discover message for Home-Assistant."""
+import logging
+from uuid import uuid4
+
+from ..const import ATTR_UUID
+from ..coresys import CoreSysAttributes
+
+_LOGGER = logging.getLogger(__name__)
+
+EVENT_DISCOVERY_ADD = 'hassio_discovery_add'
+EVENT_DISCOVERY_DEL = 'hassio_discovery_del'
+
+
+class Discovery(CoreSysAttributes):
+    """Home-Assistant Discovery handler."""
+
+    def __init__(self, coresys):
+        """Initialize discovery handler."""
+        self.coresys = coresys
+        self.message_obj = {}
+
+    def load(self):
+        """Load exists discovery message into storage."""
+        messages = {}
+        for message in self._data:
+            discovery = Message(**message)
+            messages[discovery.uuid] = discovery
+
+        self.message_obj = messages
+
+    def save(self):
+        """Write discovery message into data file."""
+        messages = []
+        for message in self.message_obj.values():
+            messages.append(message.raw())
+
+        self._data.clear()
+        self._data.extend(messages)
+        self.sys_services.data.save_data()
+
+    def get(self, uuid):
+        """Return discovery message."""
+        return self.message_obj.get(uuid)
+
+    @property
+    def _data(self):
+        """Return discovery data."""
+        return self.sys_services.data.discovery
+
+    @property
+    def list_messages(self):
+        """Return list of available discovery messages."""
+        return self.message_obj.values()
+
+    def send(self, provider, component, platform=None, config=None):
+        """Send a discovery message to Home-Assistant."""
+        message = Message(provider, component, platform, config)
+
+        # Allready exists?
+        for exists_message in self.message_obj:
+            if exists_message == message:
+                _LOGGER.warning("Found douplicate discovery message from %s",
+                                provider)
+                return exists_message
+
+        _LOGGER.info("Send discovery to Home-Assistant %s/%s from %s",
+                     component, platform, provider)
+        self.message_obj[message.uuid] = message
+        self.save()
+
+        # send event to Home-Assistant
+        self.sys_create_task(self.sys_homeassistant.send_event(
+            EVENT_DISCOVERY_ADD, {ATTR_UUID: message.uuid}))
+
+        return message
+
+    def remove(self, message):
+        """Remove a discovery message from Home-Assistant."""
+        self.message_obj.pop(message.uuid, None)
+        self.save()
+
+        # send event to Home-Assistant
+        self.sys_create_task(self.sys_homeassistant.send_event(
+            EVENT_DISCOVERY_DEL, {ATTR_UUID: message.uuid}))
+
+
+class Message:
+    """Represent a single Discovery message."""
+
+    def __init__(self, provider, component, platform, config, uuid=None):
+        """Initialize discovery message."""
+        self.provider = provider
+        self.component = component
+        self.platform = platform
+        self.config = config
+        self.uuid = uuid or uuid4().hex
+
+    def raw(self):
+        """Return raw discovery message."""
+        return self.__dict__
+
+    def __eq__(self, other):
+        """Compare with other message."""
+        for attribute in ('provider', 'component', 'platform', 'config'):
+            if getattr(self, attribute) != getattr(other, attribute):
+                return False
+        return True

hassio/services/interface.py

@@ -0,0 +1,54 @@
+"""Interface for single service."""
+
+from ..coresys import CoreSysAttributes
+
+
+class ServiceInterface(CoreSysAttributes):
+    """Interface class for service integration."""
+
+    def __init__(self, coresys):
+        """Initialize service interface."""
+        self.coresys = coresys
+
+    @property
+    def slug(self):
+        """Return slug of this service."""
+        return None
+
+    @property
+    def _data(self):
+        """Return data of this service."""
+        return None
+
+    @property
+    def schema(self):
+        """Return data schema of this service."""
+        return None
+
+    @property
+    def provider(self):
+        """Return name of service provider."""
+        return None
+
+    @property
+    def enabled(self):
+        """Return True if the service is in use."""
+        return bool(self._data)
+
+    def save(self):
+        """Save changes."""
+        self.sys_services.data.save_data()
+
+    def get_service_data(self):
+        """Return the requested service data."""
+        if self.enabled:
+            return self._data
+        return None
+
+    def set_service_data(self, provider, data):
+        """Write the data into service object."""
+        raise NotImplementedError()
+
+    def del_service_data(self, provider):
+        """Remove the data from service object."""
+        raise NotImplementedError()

hassio/services/mqtt.py

@@ -0,0 +1,89 @@
+"""Provide MQTT Service."""
+import logging
+
+from .interface import ServiceInterface
+from .validate import SCHEMA_SERVICE_MQTT
+from ..const import (
+    ATTR_PROVIDER, SERVICE_MQTT, ATTR_HOST, ATTR_PORT, ATTR_USERNAME,
+    ATTR_PASSWORD, ATTR_PROTOCOL, ATTR_DISCOVERY_ID)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class MQTTService(ServiceInterface):
+    """Provide mqtt services."""
+
+    @property
+    def slug(self):
+        """Return slug of this service."""
+        return SERVICE_MQTT
+
+    @property
+    def _data(self):
+        """Return data of this service."""
+        return self.sys_services.data.mqtt
+
+    @property
+    def schema(self):
+        """Return data schema of this service."""
+        return SCHEMA_SERVICE_MQTT
+
+    @property
+    def provider(self):
+        """Return name of service provider."""
+        return self._data.get(ATTR_PROVIDER)
+
+    @property
+    def hass_config(self):
+        """Return Home-Assistant mqtt config."""
+        if not self.enabled:
+            return None
+
+        hass_config = {
+            'host': self._data[ATTR_HOST],
+            'port': self._data[ATTR_PORT],
+            'protocol': self._data[ATTR_PROTOCOL]
+        }
+        if ATTR_USERNAME in self._data:
+            hass_config['user']: self._data[ATTR_USERNAME]
+        if ATTR_PASSWORD in self._data:
+            hass_config['password']: self._data[ATTR_PASSWORD]
+
+        return hass_config
+
+    def set_service_data(self, provider, data):
+        """Write the data into service object."""
+        if self.enabled:
+            _LOGGER.error("It is already a mqtt in use from %s", self.provider)
+            return False
+
+        self._data.update(data)
+        self._data[ATTR_PROVIDER] = provider
+
+        if provider == 'homeassistant':
+            _LOGGER.info("Use mqtt settings from Home-Assistant")
+            self.save()
+            return True
+
+        # discover mqtt to homeassistant
+        message = self.sys_discovery.send(
+            provider, SERVICE_MQTT, None, self.hass_config)
+
+        self._data[ATTR_DISCOVERY_ID] = message.uuid
+        self.save()
+        return True
+
+    def del_service_data(self, provider):
+        """Remove the data from service object."""
+        if not self.enabled:
+            _LOGGER.warning("Can't remove not exists services.")
+            return False
+
+        discovery_id = self._data.get(ATTR_DISCOVERY_ID)
+        if discovery_id:
+            self.sys_discovery.remove(
+                self.sys_discovery.get(discovery_id))
+
+        self._data.clear()
+        self.save()
+        return True

hassio/services/validate.py

@@ -0,0 +1,44 @@
+"""Validate services schema."""
+
+import voluptuous as vol
+
+from ..const import (
+    SERVICE_MQTT, ATTR_HOST, ATTR_PORT, ATTR_PASSWORD, ATTR_USERNAME, ATTR_SSL,
+    ATTR_PROVIDER, ATTR_PROTOCOL, ATTR_DISCOVERY, ATTR_COMPONENT, ATTR_UUID,
+    ATTR_PLATFORM, ATTR_CONFIG, ATTR_DISCOVERY_ID)
+from ..validate import NETWORK_PORT
+
+
+SCHEMA_DISCOVERY = vol.Schema([
+    vol.Schema({
+        vol.Required(ATTR_UUID): vol.Match(r"^[0-9a-f]{32}$"),
+        vol.Required(ATTR_PROVIDER): vol.Coerce(str),
+        vol.Required(ATTR_COMPONENT): vol.Coerce(str),
+        vol.Required(ATTR_PLATFORM): vol.Any(None, vol.Coerce(str)),
+        vol.Required(ATTR_CONFIG): vol.Any(None, dict),
+    }, extra=vol.REMOVE_EXTRA)
+])
+
+
+# pylint: disable=no-value-for-parameter
+SCHEMA_SERVICE_MQTT = vol.Schema({
+    vol.Required(ATTR_HOST): vol.Coerce(str),
+    vol.Required(ATTR_PORT): NETWORK_PORT,
+    vol.Optional(ATTR_USERNAME): vol.Coerce(str),
+    vol.Optional(ATTR_PASSWORD): vol.Coerce(str),
+    vol.Optional(ATTR_SSL, default=False): vol.Boolean(),
+    vol.Optional(ATTR_PROTOCOL, default='3.1.1'):
+        vol.All(vol.Coerce(str), vol.In(['3.1', '3.1.1'])),
+})
+
+
+SCHEMA_CONFIG_MQTT = SCHEMA_SERVICE_MQTT.extend({
+    vol.Required(ATTR_PROVIDER): vol.Coerce(str),
+    vol.Optional(ATTR_DISCOVERY_ID): vol.Match(r"^[0-9a-f]{32}$"),
+})
+
+
+SCHEMA_SERVICES_FILE = vol.Schema({
+    vol.Optional(SERVICE_MQTT, default=dict): vol.Any({}, SCHEMA_CONFIG_MQTT),
+    vol.Optional(ATTR_DISCOVERY, default=list): vol.Any([], SCHEMA_DISCOVERY),
+}, extra=vol.REMOVE_EXTRA)

hassio/snapshots/__init__.py

@@ -1,310 +1,342 @@
 """Snapshot system control."""
 import asyncio
-from datetime import datetime
 import logging
 from pathlib import Path
-import tarfile
 
 from .snapshot import Snapshot
-from .util import create_slug
+from .utils import create_slug
 from ..const import (
-    ATTR_SLUG, FOLDER_HOMEASSISTANT, SNAPSHOT_FULL, SNAPSHOT_PARTIAL)
+    FOLDER_HOMEASSISTANT, SNAPSHOT_FULL, SNAPSHOT_PARTIAL)
+from ..coresys import CoreSysAttributes
+from ..utils.dt import utcnow
 
 _LOGGER = logging.getLogger(__name__)
 
 
-class SnapshotsManager(object):
+class SnapshotManager(CoreSysAttributes):
     """Manage snapshots."""
 
-    def __init__(self, config, loop, sheduler, addons, homeassistant):
+    def __init__(self, coresys):
         """Initialize a snapshot manager."""
-        self.config = config
+        self.coresys = coresys
-        self.loop = loop
+        self.snapshots_obj = {}
-        self.sheduler = sheduler
+        self.lock = asyncio.Lock(loop=coresys.loop)
-        self.addons = addons
-        self.homeassistant = homeassistant
-        self.snapshots = {}
-        self._lock = asyncio.Lock(loop=loop)
 
     @property
     def list_snapshots(self):
         """Return a list of all snapshot object."""
-        return set(self.snapshots.values())
+        return set(self.snapshots_obj.values())
 
     def get(self, slug):
         """Return snapshot object."""
-        return self.snapshots.get(slug)
+        return self.snapshots_obj.get(slug)
 
-    def _create_snapshot(self, name, sys_type):
+    def _create_snapshot(self, name, sys_type, password):
         """Initialize a new snapshot object from name."""
-        date_str = datetime.utcnow().isoformat()
+        date_str = utcnow().isoformat()
         slug = create_slug(name, date_str)
-        tar_file = Path(self.config.path_backup, "{}.tar".format(slug))
+        tar_file = Path(self.sys_config.path_backup, f"{slug}.tar")
 
         # init object
-        snapshot = Snapshot(self.config, self.loop, tar_file)
+        snapshot = Snapshot(self.coresys, tar_file)
-        snapshot.create(slug, name, date_str, sys_type)
+        snapshot.new(slug, name, date_str, sys_type, password)
 
         # set general data
-        snapshot.snapshot_homeassistant(self.homeassistant)
+        snapshot.store_homeassistant()
-        snapshot.repositories = self.config.addons_repositories
+        snapshot.store_repositories()
 
         return snapshot
 
+    def load(self):
+        """Load exists snapshots data.
+
+        Return a coroutine.
+        """
+        return self.reload()
+
     async def reload(self):
         """Load exists backups."""
-        self.snapshots = {}
+        self.snapshots_obj = {}
 
         async def _load_snapshot(tar_file):
             """Internal function to load snapshot."""
-            snapshot = Snapshot(self.config, self.loop, tar_file)
+            snapshot = Snapshot(self.coresys, tar_file)
             if await snapshot.load():
-                self.snapshots[snapshot.slug] = snapshot
+                self.snapshots_obj[snapshot.slug] = snapshot
 
         tasks = [_load_snapshot(tar_file) for tar_file in
-                 self.config.path_backup.glob("*.tar")]
+                 self.sys_config.path_backup.glob("*.tar")]
 
         _LOGGER.info("Found %d snapshot files", len(tasks))
         if tasks:
-            await asyncio.wait(tasks, loop=self.loop)
+            await asyncio.wait(tasks)
 
     def remove(self, snapshot):
         """Remove a snapshot."""
         try:
-            snapshot.tar_file.unlink()
+            snapshot.tarfile.unlink()
-            self.snapshots.pop(snapshot.slug, None)
+            self.snapshots_obj.pop(snapshot.slug, None)
+            _LOGGER.info("Removed snapshot file %s", snapshot.slug)
+
         except OSError as err:
-            _LOGGER.error("Can't remove snapshot %s -> %s", snapshot.slug, err)
+            _LOGGER.error("Can't remove snapshot %s: %s", snapshot.slug, err)
             return False
 
         return True
 
-    async def do_snapshot_full(self, name=""):
+    async def import_snapshot(self, tar_file):
-        """Create a full snapshot."""
+        """Check snapshot tarfile and import it."""
-        if self._lock.locked():
+        snapshot = Snapshot(self.coresys, tar_file)
-            _LOGGER.error("It is already a snapshot/restore process running")
-            return False
 
-        snapshot = self._create_snapshot(name, SNAPSHOT_FULL)
+        # Read meta data
+        if not await snapshot.load():
+            return None
+
+        # Allready exists?
+        if snapshot.slug in self.snapshots_obj:
+            _LOGGER.error("Snapshot %s allready exists!", snapshot.slug)
+            return None
+
+        # Move snapshot to backup
+        tar_origin = Path(self.sys_config.path_backup, f"{snapshot.slug}.tar")
+        try:
+            snapshot.tarfile.rename(tar_origin)
+
+        except OSError as err:
+            _LOGGER.error("Can't move snapshot file to storage: %s", err)
+            return None
+
+        # Load new snapshot
+        snapshot = Snapshot(self.coresys, tar_origin)
+        if not await snapshot.load():
+            return None
+        _LOGGER.info("Success import %s", snapshot.slug)
+
+        self.snapshots_obj[snapshot.slug] = snapshot
+        return snapshot
+
+    async def do_snapshot_full(self, name="", password=None):
+        """Create a full snapshot."""
+        if self.lock.locked():
+            _LOGGER.error("It is already a snapshot/restore process running")
+            return None
+
+        snapshot = self._create_snapshot(name, SNAPSHOT_FULL, password)
         _LOGGER.info("Full-Snapshot %s start", snapshot.slug)
         try:
-            self.sheduler.suspend = True
+            self.sys_scheduler.suspend = True
-            await self._lock.acquire()
+            await self.lock.acquire()
 
             async with snapshot:
-                # snapshot addons
+                # Snapshot add-ons
-                tasks = []
+                _LOGGER.info("Snapshot %s store Add-ons", snapshot.slug)
-                for addon in self.addons.list_addons:
+                await snapshot.store_addons()
-                    if not addon.is_installed:
-                        continue
-                    tasks.append(snapshot.import_addon(addon))
 
-                if tasks:
+                # Snapshot folders
-                    _LOGGER.info("Full-Snapshot %s run %d addons",
+                _LOGGER.info("Snapshot %s store folders", snapshot.slug)
-                                 snapshot.slug, len(tasks))
-                    await asyncio.wait(tasks, loop=self.loop)
-
-                # snapshot folders
-                _LOGGER.info("Full-Snapshot %s store folders", snapshot.slug)
                 await snapshot.store_folders()
 
-            _LOGGER.info("Full-Snapshot %s done", snapshot.slug)
+        except Exception:  # pylint: disable=broad-except
-            self.snapshots[snapshot.slug] = snapshot
+            _LOGGER.exception("Snapshot %s error", snapshot.slug)
-            return True
+            return None
 
-        except (OSError, ValueError, tarfile.TarError) as err:
+        else:
-            _LOGGER.info("Full-Snapshot %s error -> %s", snapshot.slug, err)
+            _LOGGER.info("Full-Snapshot %s done", snapshot.slug)
-            return False
+            self.snapshots_obj[snapshot.slug] = snapshot
+            return snapshot
 
         finally:
-            self.sheduler.suspend = False
+            self.sys_scheduler.suspend = False
-            self._lock.release()
+            self.lock.release()
 
-    async def do_snapshot_partial(self, name="", addons=None, folders=None):
+    async def do_snapshot_partial(self, name="", addons=None, folders=None,
+                                  password=None):
         """Create a partial snapshot."""
-        if self._lock.locked():
+        if self.lock.locked():
             _LOGGER.error("It is already a snapshot/restore process running")
-            return False
+            return None
 
         addons = addons or []
         folders = folders or []
-        snapshot = self._create_snapshot(name, SNAPSHOT_PARTIAL)
+        snapshot = self._create_snapshot(name, SNAPSHOT_PARTIAL, password)
 
         _LOGGER.info("Partial-Snapshot %s start", snapshot.slug)
         try:
-            self.sheduler.suspend = True
+            self.sys_scheduler.suspend = True
-            await self._lock.acquire()
+            await self.lock.acquire()
 
             async with snapshot:
-                # snapshot addons
+                # Snapshot add-ons
-                tasks = []
+                addon_list = []
-                for slug in addons:
+                for addon_slug in addons:
-                    addon = self.addons.get(slug)
+                    addon = self.sys_addons.get(addon_slug)
-                    if addon.is_installed:
+                    if addon and addon.is_installed:
-                        tasks.append(snapshot.import_addon(addon))
+                        addon_list.append(addon)
+                        continue
+                    _LOGGER.warning(
+                        "Add-on %s not found/installed", addon_slug)
 
-                if tasks:
+                if addon_list:
-                    _LOGGER.info("Partial-Snapshot %s run %d addons",
+                    _LOGGER.info("Snapshot %s store Add-ons", snapshot.slug)
-                                 snapshot.slug, len(tasks))
+                    await snapshot.store_addons(addon_list)
-                    await asyncio.wait(tasks, loop=self.loop)
 
-                # snapshot folders
+                # Snapshot folders
-                _LOGGER.info("Partial-Snapshot %s store folders %s",
+                if folders:
-                             snapshot.slug, folders)
+                    _LOGGER.info("Snapshot %s store folders", snapshot.slug)
                     await snapshot.store_folders(folders)
 
-            _LOGGER.info("Partial-Snapshot %s done", snapshot.slug)
+        except Exception:  # pylint: disable=broad-except
-            self.snapshots[snapshot.slug] = snapshot
+            _LOGGER.exception("Snapshot %s error", snapshot.slug)
-            return True
+            return None
 
-        except (OSError, ValueError, tarfile.TarError) as err:
+        else:
-            _LOGGER.info("Partial-Snapshot %s error -> %s", snapshot.slug, err)
+            _LOGGER.info("Partial-Snapshot %s done", snapshot.slug)
-            return False
+            self.snapshots_obj[snapshot.slug] = snapshot
+            return snapshot
 
         finally:
-            self.sheduler.suspend = False
+            self.sys_scheduler.suspend = False
-            self._lock.release()
+            self.lock.release()
 
-    async def do_restore_full(self, snapshot):
+    async def do_restore_full(self, snapshot, password=None):
         """Restore a snapshot."""
-        if self._lock.locked():
+        if self.lock.locked():
             _LOGGER.error("It is already a snapshot/restore process running")
             return False
 
         if snapshot.sys_type != SNAPSHOT_FULL:
-            _LOGGER.error(
+            _LOGGER.error("Restore %s is only a partial snapshot!",
-                "Full-Restore %s is only a partial snapshot!", snapshot.slug)
+                          snapshot.slug)
+            return False
+
+        if snapshot.protected and not snapshot.set_password(password):
+            _LOGGER.error("Invalid password for snapshot %s", snapshot.slug)
             return False
 
         _LOGGER.info("Full-Restore %s start", snapshot.slug)
         try:
-            self.sheduler.suspend = True
+            self.sys_scheduler.suspend = True
-            await self._lock.acquire()
+            await self.lock.acquire()
 
             async with snapshot:
-                # stop system
                 tasks = []
-                tasks.append(self.homeassistant.stop())
 
-                for addon in self.addons.list_addons:
+                # Stop Home-Assistant / Add-ons
-                    if addon.is_installed:
+                await self.sys_core.shutdown()
-                        tasks.append(addon.stop())
 
-                await asyncio.wait(tasks, loop=self.loop)
+                # Restore folders
-
+                _LOGGER.info("Restore %s run folders", snapshot.slug)
-                # restore folders
-                _LOGGER.info("Full-Restore %s restore folders", snapshot.slug)
                 await snapshot.restore_folders()
 
-                # start homeassistant restore
+                # Start homeassistant restore
-                snapshot.restore_homeassistant(self.homeassistant)
+                _LOGGER.info("Restore %s run Home-Assistant", snapshot.slug)
-                task_hass = self.loop.create_task(
+                snapshot.restore_homeassistant()
-                    self.homeassistant.update(snapshot.homeassistant_version))
+                task_hass = self.sys_create_task(self.sys_homeassistant.update(
+                    snapshot.homeassistant_version))
 
-                # restore repositories
+                # Restore repositories
-                await self.addons.load_repositories(snapshot.repositories)
+                _LOGGER.info("Restore %s run Repositories", snapshot.slug)
+                await snapshot.restore_repositories()
 
-                # restore addons
+                # Delete delta add-ons
-                tasks = []
+                tasks.clear()
-                actual_addons = \
+                for addon in self.sys_addons.list_installed:
-                    set(addon.slug for addon in self.addons.list_addons
+                    if addon.slug not in snapshot.addon_list:
-                        if addon.is_installed)
-                restore_addons = \
-                    set(data[ATTR_SLUG] for data in snapshot.addons)
-                remove_addons = actual_addons - restore_addons
-
-                _LOGGER.info("Full-Restore %s restore addons %s, remove %s",
-                             snapshot.slug, restore_addons, remove_addons)
-
-                for slug in remove_addons:
-                    addon = self.addons.get(slug)
-                    if addon:
                         tasks.append(addon.uninstall())
-                    else:
-                        _LOGGER.warning("Can't remove addon %s", slug)
-
-                for slug in restore_addons:
-                    addon = self.addons.get(slug)
-                    if addon:
-                        tasks.append(snapshot.export_addon(addon))
-                    else:
-                        _LOGGER.warning("Can't restore addon %s", slug)
 
                 if tasks:
-                    _LOGGER.info("Full-Restore %s restore addons tasks %d",
+                    _LOGGER.info("Restore %s remove add-ons", snapshot.slug)
-                                 snapshot.slug, len(tasks))
+                    await asyncio.wait(tasks)
-                    await asyncio.wait(tasks, loop=self.loop)
+
+                # Restore add-ons
+                _LOGGER.info("Restore %s old add-ons", snapshot.slug)
+                await snapshot.restore_addons()
 
                 # finish homeassistant task
-                _LOGGER.info("Full-Restore %s wait until homeassistant ready",
+                _LOGGER.info("Restore %s wait until homeassistant ready",
                              snapshot.slug)
                 await task_hass
-                await self.homeassistant.run()
+                await self.sys_homeassistant.start()
 
+        except Exception:  # pylint: disable=broad-except
+            _LOGGER.exception("Restore %s error", snapshot.slug)
+            return False
+
+        else:
             _LOGGER.info("Full-Restore %s done", snapshot.slug)
             return True
 
-        except (OSError, ValueError, tarfile.TarError) as err:
-            _LOGGER.info("Full-Restore %s error -> %s", slug, err)
-            return False
-
         finally:
-            self.sheduler.suspend = False
+            self.sys_scheduler.suspend = False
-            self._lock.release()
+            self.lock.release()
 
     async def do_restore_partial(self, snapshot, homeassistant=False,
-                                 addons=None, folders=None):
+                                 addons=None, folders=None, password=None):
         """Restore a snapshot."""
-        if self._lock.locked():
+        if self.lock.locked():
             _LOGGER.error("It is already a snapshot/restore process running")
             return False
 
+        if snapshot.protected and not snapshot.set_password(password):
+            _LOGGER.error("Invalid password for snapshot %s", snapshot.slug)
+            return False
+
         addons = addons or []
         folders = folders or []
 
         _LOGGER.info("Partial-Restore %s start", snapshot.slug)
         try:
-            self.sheduler.suspend = True
+            self.sys_scheduler.suspend = True
-            await self._lock.acquire()
+            await self.lock.acquire()
 
             async with snapshot:
-                tasks = []
+                # Stop Home-Assistant if they will be restored later
-
+                if homeassistant and FOLDER_HOMEASSISTANT in folders:
-                if FOLDER_HOMEASSISTANT in folders:
+                    await self.sys_homeassistant.stop()
-                    await self.homeassistant.stop()
 
+                # Process folders
                 if folders:
-                    _LOGGER.info("Partial-Restore %s restore folders %s",
+                    _LOGGER.info("Restore %s run folders", snapshot.slug)
-                                 snapshot.slug, folders)
                     await snapshot.restore_folders(folders)
 
+                # Process Home-Assistant
+                task_hass = None
                 if homeassistant:
-                    snapshot.restore_homeassistant(self.homeassistant)
+                    _LOGGER.info("Restore %s run Home-Assistant",
-                    tasks.append(self.homeassistant.update(
+                                 snapshot.slug)
+                    snapshot.restore_homeassistant()
+                    task_hass = self.sys_create_task(
+                        self.sys_homeassistant.update(
                             snapshot.homeassistant_version))
 
+                # Process Add-ons
+                addon_list = []
                 for slug in addons:
-                    addon = self.addons.get(slug)
+                    addon = self.sys_addons.get(slug)
                     if addon:
-                        tasks.append(snapshot.export_addon(addon))
+                        addon_list.append(addon)
-                    else:
+                        continue
-                        _LOGGER.warning("Can't restore addon %s", slug)
+                    _LOGGER.warning("Can't restore addon %s", snapshot.slug)
 
-                if tasks:
+                if addon_list:
-                    _LOGGER.info("Partial-Restore %s run %d tasks",
+                    _LOGGER.info("Restore %s old add-ons", snapshot.slug)
-                                 snapshot.slug, len(tasks))
+                    await snapshot.restore_addons(addon_list)
-                    await asyncio.wait(tasks, loop=self.loop)
 
                 # make sure homeassistant run agen
-                await self.homeassistant.run()
+                if task_hass:
+                    _LOGGER.info("Restore %s wait for Home-Assistant",
+                                 snapshot.slug)
+                    await task_hass
+                await self.sys_homeassistant.start()
 
+        except Exception:  # pylint: disable=broad-except
+            _LOGGER.exception("Restore %s error", snapshot.slug)
+            return False
+
+        else:
             _LOGGER.info("Partial-Restore %s done", snapshot.slug)
             return True
 
-        except (OSError, ValueError, tarfile.TarError) as err:
-            _LOGGER.info("Partial-Restore %s error -> %s", slug, err)
-            return False
-
         finally:
-            self.sheduler.suspend = False
+            self.sys_scheduler.suspend = False
-            self._lock.release()
+            self.lock.release()

hassio/snapshots/snapshot.py

@@ -1,35 +1,44 @@
 """Represent a snapshot file."""
 import asyncio
+from base64 import b64decode, b64encode
 import json
 import logging
 from pathlib import Path
 import tarfile
 from tempfile import TemporaryDirectory
 
+from Crypto.Cipher import AES
+from Crypto.Util import Padding
 import voluptuous as vol
 from voluptuous.humanize import humanize_error
 
 from .validate import SCHEMA_SNAPSHOT, ALL_FOLDERS
-from .util import remove_folder
+from .utils import (
+    remove_folder, password_to_key, password_for_validating, key_to_iv)
 from ..const import (
     ATTR_SLUG, ATTR_NAME, ATTR_DATE, ATTR_ADDONS, ATTR_REPOSITORIES,
-    ATTR_HOMEASSISTANT, ATTR_FOLDERS, ATTR_VERSION, ATTR_TYPE, ATTR_DEVICES,
+    ATTR_HOMEASSISTANT, ATTR_FOLDERS, ATTR_VERSION, ATTR_TYPE, ATTR_IMAGE,
-    ATTR_IMAGE)
+    ATTR_PORT, ATTR_SSL, ATTR_PASSWORD, ATTR_WATCHDOG, ATTR_BOOT, ATTR_CRYPTO,
-from ..tools import write_json_file
+    ATTR_LAST_VERSION, ATTR_PROTECTED, ATTR_WAIT_BOOT, ATTR_SIZE,
+    CRYPTO_AES128)
+from ..coresys import CoreSysAttributes
+from ..utils.json import write_json_file
+from ..utils.tar import SecureTarFile
 
 _LOGGER = logging.getLogger(__name__)
 
 
-class Snapshot(object):
+class Snapshot(CoreSysAttributes):
     """A signle hassio snapshot."""
 
-    def __init__(self, config, loop, tar_file):
+    def __init__(self, coresys, tar_file):
         """Initialize a snapshot."""
-        self.loop = loop
+        self.coresys = coresys
-        self.config = config
+        self._tarfile = tar_file
-        self.tar_file = tar_file
         self._data = {}
         self._tmp = None
+        self._key = None
+        self._aes = None
 
     @property
     def slug(self):
@@ -51,11 +60,21 @@ class Snapshot(object):
         """Return snapshot date."""
         return self._data[ATTR_DATE]
 
+    @property
+    def protected(self):
+        """Return snapshot date."""
+        return self._data.get(ATTR_PROTECTED) is not None
+
     @property
     def addons(self):
         """Return snapshot date."""
         return self._data[ATTR_ADDONS]
 
+    @property
+    def addon_list(self):
+        """Return a list of addons slugs."""
+        return [addon_data[ATTR_SLUG] for addon_data in self.addons]
+
     @property
     def folders(self):
         """Return list of saved folders."""
@@ -76,39 +95,29 @@ class Snapshot(object):
         """Return snapshot homeassistant version."""
         return self._data[ATTR_HOMEASSISTANT].get(ATTR_VERSION)
 
-    @homeassistant_version.setter
-    def homeassistant_version(self, value):
-        """Set snapshot homeassistant version."""
-        self._data[ATTR_HOMEASSISTANT][ATTR_VERSION] = value
-
     @property
-    def homeassistant_devices(self):
+    def homeassistant(self):
-        """Return snapshot homeassistant devices."""
+        """Return snapshot homeassistant data."""
-        return self._data[ATTR_HOMEASSISTANT].get(ATTR_DEVICES)
+        return self._data[ATTR_HOMEASSISTANT]
-
-    @homeassistant_devices.setter
-    def homeassistant_devices(self, value):
-        """Set snapshot homeassistant devices."""
-        self._data[ATTR_HOMEASSISTANT][ATTR_DEVICES] = value
-
-    @property
-    def homeassistant_image(self):
-        """Return snapshot homeassistant custom image."""
-        return self._data[ATTR_HOMEASSISTANT].get(ATTR_IMAGE)
-
-    @homeassistant_image.setter
-    def homeassistant_image(self, value):
-        """Set snapshot homeassistant custom image."""
-        self._data[ATTR_HOMEASSISTANT][ATTR_IMAGE] = value
 
     @property
     def size(self):
         """Return snapshot size."""
-        if not self.tar_file.is_file():
+        if not self.tarfile.is_file():
             return 0
-        return self.tar_file.stat().st_size / 1048576  # calc mbyte
+        return round(self.tarfile.stat().st_size / 1048576, 2)  # calc mbyte
 
-    def create(self, slug, name, date, sys_type):
+    @property
+    def is_new(self):
+        """Return True if there is new."""
+        return not self.tarfile.exists()
+
+    @property
+    def tarfile(self):
+        """Return path to Snapshot tarfile."""
+        return self._tarfile
+
+    def new(self, slug, name, date, sys_type, password=None):
         """Initialize a new snapshot."""
         # init metadata
         self._data[ATTR_SLUG] = slug
@@ -116,62 +125,78 @@ class Snapshot(object):
         self._data[ATTR_DATE] = date
         self._data[ATTR_TYPE] = sys_type
 
-        # init other constructs
+        # Add defaults
-        self._data[ATTR_HOMEASSISTANT] = {}
+        self._data = SCHEMA_SNAPSHOT(self._data)
-        self._data[ATTR_ADDONS] = []
-        self._data[ATTR_REPOSITORIES] = []
-        self._data[ATTR_FOLDERS] = []
 
-    def snapshot_homeassistant(self, homeassistant):
+        # Set password
-        """Read all data from homeassistant object."""
+        if password:
-        self.homeassistant_version = homeassistant.version
+            self._key = password_to_key(password)
-        self.homeassistant_devices = homeassistant.devices
+            self._aes = AES.new(
+                self._key, AES.MODE_CBC, iv=key_to_iv(self._key))
+            self._data[ATTR_PROTECTED] = password_for_validating(password)
+            self._data[ATTR_CRYPTO] = CRYPTO_AES128
 
-        # custom image
+    def set_password(self, password):
-        if homeassistant.is_custom_image:
+        """Set the password for a exists snapshot."""
-            self.homeassistant_image = homeassistant.image
+        if not password:
+            return False
 
-    def restore_homeassistant(self, homeassistant):
+        validating = password_for_validating(password)
-        """Write all data to homeassistant object."""
+        if validating != self._data[ATTR_PROTECTED]:
-        homeassistant.devices = self.homeassistant_devices
+            return False
 
-        # custom image
+        self._key = password_to_key(password)
-        if self.homeassistant_image:
+        self._aes = AES.new(self._key, AES.MODE_CBC, iv=key_to_iv(self._key))
-            homeassistant.set_custom(
+        return True
-                self.homeassistant_image, self.homeassistant_version)
+
+    def _encrypt_data(self, data):
+        """Make data secure."""
+        if not self._key or data is None:
+            return data
+
+        return b64encode(
+            self._aes.encrypt(Padding.pad(data.encode(), 16))).decode()
+
+    def _decrypt_data(self, data):
+        """Make data readable."""
+        if not self._key or data is None:
+            return data
+
+        return Padding.unpad(
+            self._aes.decrypt(b64decode(data)), 16).decode()
 
     async def load(self):
         """Read snapshot.json from tar file."""
-        if not self.tar_file.is_file():
+        if not self.tarfile.is_file():
-            _LOGGER.error("No tarfile %s", self.tar_file)
+            _LOGGER.error("No tarfile %s", self.tarfile)
             return False
 
         def _load_file():
             """Read snapshot.json."""
-            with tarfile.open(self.tar_file, "r:") as snapshot:
+            with tarfile.open(self.tarfile, "r:") as snapshot:
                 json_file = snapshot.extractfile("./snapshot.json")
                 return json_file.read()
 
         # read snapshot.json
         try:
-            raw = await self.loop.run_in_executor(None, _load_file)
+            raw = await self.sys_run_in_executor(_load_file)
         except (tarfile.TarError, KeyError) as err:
             _LOGGER.error(
-                "Can't read snapshot tarfile %s -> %s", self.tar_file, err)
+                "Can't read snapshot tarfile %s: %s", self.tarfile, err)
             return False
 
         # parse data
         try:
             raw_dict = json.loads(raw)
         except json.JSONDecodeError as err:
-            _LOGGER.error("Can't read data for %s -> %s", self.tar_file, err)
+            _LOGGER.error("Can't read data for %s: %s", self.tarfile, err)
             return False
 
         # validate
         try:
             self._data = SCHEMA_SNAPSHOT(raw_dict)
         except vol.Invalid as err:
-            _LOGGER.error("Can't validate data for %s -> %s", self.tar_file,
+            _LOGGER.error("Can't validate data for %s: %s", self.tarfile,
                           humanize_error(raw_dict, err))
             return False
 
@@ -179,122 +204,220 @@ class Snapshot(object):
 
     async def __aenter__(self):
         """Async context to open a snapshot."""
-        self._tmp = TemporaryDirectory(dir=str(self.config.path_tmp))
+        self._tmp = TemporaryDirectory(dir=str(self.sys_config.path_tmp))
 
         # create a snapshot
-        if not self.tar_file.is_file():
+        if not self.tarfile.is_file():
             return self
 
         # extract a exists snapshot
         def _extract_snapshot():
             """Extract a snapshot."""
-            with tarfile.open(self.tar_file, "r:") as tar:
+            with tarfile.open(self.tarfile, "r:") as tar:
                 tar.extractall(path=self._tmp.name)
 
-        await self.loop.run_in_executor(None, _extract_snapshot)
+        await self.sys_run_in_executor(_extract_snapshot)
 
     async def __aexit__(self, exception_type, exception_value, traceback):
         """Async context to close a snapshot."""
         # exists snapshot or exception on build
-        if self.tar_file.is_file() or exception_type is not None:
+        if self.tarfile.is_file() or exception_type is not None:
-            return self._tmp.cleanup()
+            self._tmp.cleanup()
+            return
 
         # validate data
         try:
             self._data = SCHEMA_SNAPSHOT(self._data)
         except vol.Invalid as err:
-            _LOGGER.error("Invalid data for %s -> %s", self.tar_file,
+            _LOGGER.error("Invalid data for %s: %s", self.tarfile,
                           humanize_error(self._data, err))
             raise ValueError("Invalid config") from None
 
         # new snapshot, build it
         def _create_snapshot():
             """Create a new snapshot."""
-            with tarfile.open(self.tar_file, "w:") as tar:
+            with tarfile.open(self.tarfile, "w:") as tar:
                 tar.add(self._tmp.name, arcname=".")
 
-        if write_json_file(Path(self._tmp.name, "snapshot.json"), self._data):
+        try:
-            await self.loop.run_in_executor(None, _create_snapshot)
+            write_json_file(Path(self._tmp.name, "snapshot.json"), self._data)
-        else:
+            await self.sys_run_in_executor(_create_snapshot)
-            _LOGGER.error("Can't write snapshot.json")
+        except (OSError, json.JSONDecodeError) as err:
-
+            _LOGGER.error("Can't write snapshot: %s", err)
+        finally:
             self._tmp.cleanup()
-        self._tmp = None
 
-    async def import_addon(self, addon):
+    async def store_addons(self, addon_list=None):
-        """Add a addon into snapshot."""
+        """Add a list of add-ons into snapshot."""
-        snapshot_file = Path(self._tmp.name, "{}.tar.gz".format(addon.slug))
+        addon_list = addon_list or self.sys_addons.list_installed
 
-        if not await addon.snapshot(snapshot_file):
+        async def _addon_save(addon):
+            """Task to store a add-on into snapshot."""
+            addon_file = SecureTarFile(
+                Path(self._tmp.name, f"{addon.slug}.tar.gz"),
+                'w', key=self._key)
+
+            # Take snapshot
+            if not await addon.snapshot(addon_file):
                 _LOGGER.error("Can't make snapshot from %s", addon.slug)
-            return False
+                return
 
-        # store to config
+            # Store to config
             self._data[ATTR_ADDONS].append({
                 ATTR_SLUG: addon.slug,
                 ATTR_NAME: addon.name,
                 ATTR_VERSION: addon.version_installed,
+                ATTR_SIZE: addon_file.size,
             })
 
-        return True
+        # Run tasks
+        tasks = [_addon_save(addon) for addon in addon_list]
+        if tasks:
+            await asyncio.wait(tasks)
 
-    async def export_addon(self, addon):
+    async def restore_addons(self, addon_list=None):
-        """Restore a addon from snapshot."""
+        """Restore a list add-on from snapshot."""
-        snapshot_file = Path(self._tmp.name, "{}.tar.gz".format(addon.slug))
+        if not addon_list:
+            addon_list = []
+            for addon_slug in self.addon_list:
+                addon = self.sys_addons.get(addon_slug)
+                if addon:
+                    addon_list.append(addon)
 
-        if not await addon.restore(snapshot_file):
+        async def _addon_restore(addon):
+            """Task to restore a add-on into snapshot."""
+            addon_file = SecureTarFile(
+                Path(self._tmp.name, f"{addon.slug}.tar.gz"),
+                'r', key=self._key)
+
+            # If exists inside snapshot
+            if not addon_file.path.exists():
+                _LOGGER.error("Can't find snapshot for %s", addon.slug)
+                return
+
+            # Performe a restore
+            if not await addon.restore(addon_file):
                 _LOGGER.error("Can't restore snapshot for %s", addon.slug)
-            return False
+                return
 
-        return True
+        # Run tasks
+        tasks = [_addon_restore(addon) for addon in addon_list]
+        if tasks:
+            await asyncio.wait(tasks)
 
     async def store_folders(self, folder_list=None):
         """Backup hassio data into snapshot."""
-        folder_list = folder_list or ALL_FOLDERS
+        folder_list = set(folder_list or ALL_FOLDERS)
 
         def _folder_save(name):
             """Intenal function to snapshot a folder."""
             slug_name = name.replace("/", "_")
-            snapshot_tar = Path(self._tmp.name, "{}.tar.gz".format(slug_name))
+            tar_name = Path(self._tmp.name, f"{slug_name}.tar.gz")
-            origin_dir = Path(self.config.path_hassio, name)
+            origin_dir = Path(self.sys_config.path_hassio, name)
 
+            # Check if exsits
+            if not origin_dir.is_dir():
+                _LOGGER.warning("Can't find snapshot folder %s", name)
+                return
+
+            # Take snapshot
             try:
-                with tarfile.open(snapshot_tar, "w:gz",
+                _LOGGER.info("Snapshot folder %s", name)
-                                  compresslevel=1) as tar_file:
+                with SecureTarFile(tar_name, 'w', key=self._key) as tar_file:
                     tar_file.add(origin_dir, arcname=".")
 
+                _LOGGER.info("Snapshot folder %s done", name)
                 self._data[ATTR_FOLDERS].append(name)
-            except tarfile.TarError as err:
+            except (tarfile.TarError, OSError) as err:
-                _LOGGER.warning("Can't snapshot folder %s -> %s", name, err)
+                _LOGGER.warning("Can't snapshot folder %s: %s", name, err)
 
-        # run tasks
+        # Run tasks
-        tasks = [self.loop.run_in_executor(None, _folder_save, folder)
+        tasks = [self.sys_run_in_executor(_folder_save, folder)
                  for folder in folder_list]
         if tasks:
-            await asyncio.wait(tasks, loop=self.loop)
+            await asyncio.wait(tasks)
 
     async def restore_folders(self, folder_list=None):
         """Backup hassio data into snapshot."""
-        folder_list = folder_list or ALL_FOLDERS
+        folder_list = set(folder_list or self.folders)
 
         def _folder_restore(name):
             """Intenal function to restore a folder."""
             slug_name = name.replace("/", "_")
-            snapshot_tar = Path(self._tmp.name, "{}.tar.gz".format(slug_name))
+            tar_name = Path(self._tmp.name, f"{slug_name}.tar.gz")
-            origin_dir = Path(self.config.path_hassio, name)
+            origin_dir = Path(self.sys_config.path_hassio, name)
 
-            # clean old stuff
+            # Check if exists inside snapshot
+            if not tar_name.exists():
+                _LOGGER.warning("Can't find restore folder %s", name)
+                return
+
+            # Clean old stuff
             if origin_dir.is_dir():
                 remove_folder(origin_dir)
 
+            # Performe a restore
             try:
-                with tarfile.open(snapshot_tar, "r:gz") as tar_file:
+                _LOGGER.info("Restore folder %s", name)
+                with SecureTarFile(tar_name, 'r', key=self._key) as tar_file:
                     tar_file.extractall(path=origin_dir)
-            except tarfile.TarError as err:
+                _LOGGER.info("Restore folder %s done", name)
-                _LOGGER.warning("Can't restore folder %s -> %s", name, err)
+            except (tarfile.TarError, OSError) as err:
+                _LOGGER.warning("Can't restore folder %s: %s", name, err)
 
-        # run tasks
+        # Run tasks
-        tasks = [self.loop.run_in_executor(None, _folder_restore, folder)
+        tasks = [self.sys_run_in_executor(_folder_restore, folder)
                  for folder in folder_list]
         if tasks:
-            await asyncio.wait(tasks, loop=self.loop)
+            await asyncio.wait(tasks)
+
+    def store_homeassistant(self):
+        """Read all data from homeassistant object."""
+        self.homeassistant[ATTR_VERSION] = self.sys_homeassistant.version
+        self.homeassistant[ATTR_WATCHDOG] = self.sys_homeassistant.watchdog
+        self.homeassistant[ATTR_BOOT] = self.sys_homeassistant.boot
+        self.homeassistant[ATTR_WAIT_BOOT] = self.sys_homeassistant.wait_boot
+
+        # Custom image
+        if self.sys_homeassistant.is_custom_image:
+            self.homeassistant[ATTR_IMAGE] = self.sys_homeassistant.image
+            self.homeassistant[ATTR_LAST_VERSION] = \
+                self.sys_homeassistant.last_version
+
+        # API/Proxy
+        self.homeassistant[ATTR_PORT] = self.sys_homeassistant.api_port
+        self.homeassistant[ATTR_SSL] = self.sys_homeassistant.api_ssl
+        self.homeassistant[ATTR_PASSWORD] = \
+            self._encrypt_data(self.sys_homeassistant.api_password)
+
+    def restore_homeassistant(self):
+        """Write all data to homeassistant object."""
+        self.sys_homeassistant.watchdog = self.homeassistant[ATTR_WATCHDOG]
+        self.sys_homeassistant.boot = self.homeassistant[ATTR_BOOT]
+        self.sys_homeassistant.wait_boot = self.homeassistant[ATTR_WAIT_BOOT]
+
+        # Custom image
+        if self.homeassistant.get(ATTR_IMAGE):
+            self.sys_homeassistant.image = self.homeassistant[ATTR_IMAGE]
+            self.sys_homeassistant.last_version = \
+                self.homeassistant[ATTR_LAST_VERSION]
+
+        # API/Proxy
+        self.sys_homeassistant.api_port = self.homeassistant[ATTR_PORT]
+        self.sys_homeassistant.api_ssl = self.homeassistant[ATTR_SSL]
+        self.sys_homeassistant.api_password = \
+            self._decrypt_data(self.homeassistant[ATTR_PASSWORD])
+
+        # save
+        self.sys_homeassistant.save_data()
+
+    def store_repositories(self):
+        """Store repository list into snapshot."""
+        self.repositories = self.sys_config.addons_repositories
+
+    def restore_repositories(self):
+        """Restore repositories from snapshot.
+
+        Return a coroutine.
+        """
+        return self.sys_addons.load_repositories(self.repositories)

hassio/snapshots/util.py

@@ -1,21 +0,0 @@
-"""Util addons functions."""
-import hashlib
-import shutil
-
-
-def create_slug(name, date_str):
-    """Generate a hash from repository."""
-    key = "{} - {}".format(date_str, name).lower().encode()
-    return hashlib.sha1(key).hexdigest()[:8]
-
-
-def remove_folder(folder):
-    """Remove folder data but not the folder itself."""
-    for obj in folder.iterdir():
-        try:
-            if obj.is_dir():
-                shutil.rmtree(str(obj), ignore_errors=True)
-            else:
-                obj.unlink()
-        except (OSError, shutil.Error):
-            pass

hassio/snapshots/utils.py

@@ -0,0 +1,49 @@
+"""Util addons functions."""
+import hashlib
+import shutil
+import re
+
+RE_DIGITS = re.compile(r"\d+")
+
+
+def password_to_key(password):
+    """Generate a AES Key from password."""
+    password = password.encode()
+    for _ in range(100):
+        password = hashlib.sha256(password).digest()
+    return password[:16]
+
+
+def password_for_validating(password):
+    """Generate a SHA256 hash from password."""
+    for _ in range(100):
+        password = hashlib.sha256(password.encode()).hexdigest()
+    try:
+        return str(sum(map(int, RE_DIGITS.findall(password))))[0]
+    except (ValueError, IndexError):
+        return "0"
+
+
+def key_to_iv(key):
+    """Generate a iv from Key."""
+    for _ in range(100):
+        key = hashlib.sha256(key).digest()
+    return key[:16]
+
+
+def create_slug(name, date_str):
+    """Generate a hash from repository."""
+    key = "{} - {}".format(date_str, name).lower().encode()
+    return hashlib.sha1(key).hexdigest()[:8]
+
+
+def remove_folder(folder):
+    """Remove folder data but not the folder itself."""
+    for obj in folder.iterdir():
+        try:
+            if obj.is_dir():
+                shutil.rmtree(str(obj), ignore_errors=True)
+            else:
+                obj.unlink()
+        except (OSError, shutil.Error):
+            pass

hassio/snapshots/validate.py

@@ -4,29 +4,53 @@ import voluptuous as vol
 
 from ..const import (
     ATTR_REPOSITORIES, ATTR_ADDONS, ATTR_NAME, ATTR_SLUG, ATTR_DATE,
-    ATTR_VERSION, ATTR_HOMEASSISTANT, ATTR_FOLDERS, ATTR_TYPE, ATTR_DEVICES,
+    ATTR_VERSION, ATTR_HOMEASSISTANT, ATTR_FOLDERS, ATTR_TYPE, ATTR_IMAGE,
-    ATTR_IMAGE, FOLDER_SHARE, FOLDER_HOMEASSISTANT, FOLDER_ADDONS, FOLDER_SSL,
+    ATTR_PASSWORD, ATTR_PORT, ATTR_SSL, ATTR_WATCHDOG, ATTR_BOOT, ATTR_SIZE,
-    SNAPSHOT_FULL, SNAPSHOT_PARTIAL)
+    ATTR_LAST_VERSION, ATTR_WAIT_BOOT, ATTR_PROTECTED, ATTR_CRYPTO,
-from ..validate import HASS_DEVICES
+    FOLDER_SHARE, FOLDER_HOMEASSISTANT, FOLDER_ADDONS, FOLDER_SSL,
+    SNAPSHOT_FULL, SNAPSHOT_PARTIAL, CRYPTO_AES128)
+from ..validate import NETWORK_PORT, REPOSITORIES, DOCKER_IMAGE
 
 ALL_FOLDERS = [FOLDER_HOMEASSISTANT, FOLDER_SHARE, FOLDER_ADDONS, FOLDER_SSL]
 
+
+def unique_addons(addons_list):
+    """Validate that a add-on is unique."""
+    single = set([addon[ATTR_SLUG] for addon in addons_list])
+
+    if len(single) != len(addons_list):
+        raise vol.Invalid("Invalid addon list on snapshot!")
+    return addons_list
+
+
 # pylint: disable=no-value-for-parameter
 SCHEMA_SNAPSHOT = vol.Schema({
     vol.Required(ATTR_SLUG): vol.Coerce(str),
     vol.Required(ATTR_TYPE): vol.In([SNAPSHOT_FULL, SNAPSHOT_PARTIAL]),
     vol.Required(ATTR_NAME): vol.Coerce(str),
     vol.Required(ATTR_DATE): vol.Coerce(str),
-    vol.Required(ATTR_HOMEASSISTANT): vol.Schema({
+    vol.Inclusive(ATTR_PROTECTED, 'encrypted'):
-        vol.Required(ATTR_VERSION): vol.Coerce(str),
+        vol.All(vol.Coerce(str), vol.Length(min=1, max=1)),
-        vol.Optional(ATTR_DEVICES, default=[]): HASS_DEVICES,
+    vol.Inclusive(ATTR_CRYPTO, 'encrypted'): CRYPTO_AES128,
-        vol.Optional(ATTR_IMAGE): vol.Coerce(str),
+    vol.Optional(ATTR_HOMEASSISTANT, default=dict): vol.Schema({
-    }),
+        vol.Optional(ATTR_VERSION): vol.Coerce(str),
-    vol.Optional(ATTR_FOLDERS, default=[]): [vol.In(ALL_FOLDERS)],
+        vol.Inclusive(ATTR_IMAGE, 'custom_hass'): DOCKER_IMAGE,
-    vol.Optional(ATTR_ADDONS, default=[]): [vol.Schema({
+        vol.Inclusive(ATTR_LAST_VERSION, 'custom_hass'): vol.Coerce(str),
+        vol.Optional(ATTR_BOOT, default=True): vol.Boolean(),
+        vol.Optional(ATTR_SSL, default=False): vol.Boolean(),
+        vol.Optional(ATTR_PORT, default=8123): NETWORK_PORT,
+        vol.Optional(ATTR_PASSWORD): vol.Any(None, vol.Coerce(str)),
+        vol.Optional(ATTR_WATCHDOG, default=True): vol.Boolean(),
+        vol.Optional(ATTR_WAIT_BOOT, default=600):
+            vol.All(vol.Coerce(int), vol.Range(min=60)),
+    }, extra=vol.REMOVE_EXTRA),
+    vol.Optional(ATTR_FOLDERS, default=list):
+        vol.All([vol.In(ALL_FOLDERS)], vol.Unique()),
+    vol.Optional(ATTR_ADDONS, default=list): vol.All([vol.Schema({
         vol.Required(ATTR_SLUG): vol.Coerce(str),
         vol.Required(ATTR_NAME): vol.Coerce(str),
         vol.Required(ATTR_VERSION): vol.Coerce(str),
-    })],
+        vol.Optional(ATTR_SIZE, default=0): vol.Coerce(float),
-    vol.Optional(ATTR_REPOSITORIES, default=[]): [vol.Url()],
+    }, extra=vol.REMOVE_EXTRA)], unique_addons),
+    vol.Optional(ATTR_REPOSITORIES, default=list): REPOSITORIES,
 }, extra=vol.ALLOW_EXTRA)

hassio/supervisor.py

@@ -0,0 +1,82 @@
+"""HomeAssistant control object."""
+import logging
+
+from .coresys import CoreSysAttributes
+from .docker.supervisor import DockerSupervisor
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class Supervisor(CoreSysAttributes):
+    """Hass core object for handle it."""
+
+    def __init__(self, coresys):
+        """Initialize hass object."""
+        self.coresys = coresys
+        self.instance = DockerSupervisor(coresys)
+
+    async def load(self):
+        """Prepare HomeAssistant object."""
+        if not await self.instance.attach():
+            _LOGGER.fatal("Can't setup supervisor docker container!")
+        await self.instance.cleanup()
+
+    @property
+    def need_update(self):
+        """Return True if a update is available."""
+        return self.version != self.last_version
+
+    @property
+    def version(self):
+        """Return version of running homeassistant."""
+        return self.instance.version
+
+    @property
+    def last_version(self):
+        """Return last available version of homeassistant."""
+        return self.sys_updater.version_hassio
+
+    @property
+    def image(self):
+        """Return image name of hass containter."""
+        return self.instance.image
+
+    @property
+    def arch(self):
+        """Return arch of hass.io containter."""
+        return self.instance.arch
+
+    async def update(self, version=None):
+        """Update HomeAssistant version."""
+        version = version or self.last_version
+
+        if version == self.sys_supervisor.version:
+            _LOGGER.warning("Version %s is already installed", version)
+            return
+
+        _LOGGER.info("Update supervisor to version %s", version)
+        if await self.instance.install(version):
+            self.sys_loop.call_later(1, self.sys_loop.stop)
+            return True
+
+        _LOGGER.error("Update of hass.io fails!")
+        return False
+
+    @property
+    def in_progress(self):
+        """Return True if a task is in progress."""
+        return self.instance.in_progress
+
+    def logs(self):
+        """Get Supervisor docker logs.
+
+        Return a coroutine.
+        """
+        return self.instance.logs()
+
+    def stats(self):
+        """Return stats of Supervisor.
+
+        Return a coroutine.
+        """
+        return self.instance.stats()

hassio/tasks.py

@@ -1,29 +1,61 @@
 """Multible tasks."""
 import asyncio
-from datetime import datetime
 import logging
 
+from .coresys import CoreSysAttributes
+
 _LOGGER = logging.getLogger(__name__)
 
 
-def api_sessions_cleanup(config):
+class Tasks(CoreSysAttributes):
-    """Create scheduler task for cleanup api sessions."""
+    """Handle Tasks inside HassIO."""
-    async def _api_sessions_cleanup():
-        """Cleanup old api sessions."""
-        now = datetime.now()
-        for session, until_valid in config.security_sessions.items():
-            if now >= until_valid:
-                config.drop_security_session(session)
 
-    return _api_sessions_cleanup
+    RUN_UPDATE_SUPERVISOR = 29100
+    RUN_UPDATE_ADDONS = 57600
 
+    RUN_RELOAD_ADDONS = 21600
+    RUN_RELOAD_SNAPSHOTS = 72000
+    RUN_RELOAD_HOST = 72000
+    RUN_RELOAD_UPDATER = 21600
 
-def addons_update(loop, addons):
+    RUN_WATCHDOG_HOMEASSISTANT_DOCKER = 15
-    """Create scheduler task for auto update addons."""
+    RUN_WATCHDOG_HOMEASSISTANT_API = 300
-    async def _addons_update():
+
+    def __init__(self, coresys):
+        """Initialize Tasks."""
+        self.coresys = coresys
+        self.jobs = set()
+        self._data = {}
+
+    async def load(self):
+        """Add Tasks to scheduler."""
+        self.jobs.add(self.sys_scheduler.register_task(
+            self._update_addons, self.RUN_UPDATE_ADDONS))
+        self.jobs.add(self.sys_scheduler.register_task(
+            self._update_supervisor, self.RUN_UPDATE_SUPERVISOR))
+
+        self.jobs.add(self.sys_scheduler.register_task(
+            self.sys_addons.reload, self.RUN_RELOAD_ADDONS))
+        self.jobs.add(self.sys_scheduler.register_task(
+            self.sys_updater.reload, self.RUN_RELOAD_UPDATER))
+        self.jobs.add(self.sys_scheduler.register_task(
+            self.sys_snapshots.reload, self.RUN_RELOAD_SNAPSHOTS))
+        self.jobs.add(self.sys_scheduler.register_task(
+            self.sys_host.load, self.RUN_RELOAD_HOST))
+
+        self.jobs.add(self.sys_scheduler.register_task(
+            self._watchdog_homeassistant_docker,
+            self.RUN_WATCHDOG_HOMEASSISTANT_DOCKER))
+        self.jobs.add(self.sys_scheduler.register_task(
+            self._watchdog_homeassistant_api,
+            self.RUN_WATCHDOG_HOMEASSISTANT_API))
+
+        _LOGGER.info("All core tasks are scheduled")
+
+    async def _update_addons(self):
         """Check if a update is available of a addon and update it."""
         tasks = []
-        for addon in addons.list_addons:
+        for addon in self.sys_addons.list_addons:
             if not addon.is_installed or not addon.auto_update:
                 continue
 
@@ -38,42 +70,61 @@ def addons_update(loop, addons):
 
         if tasks:
             _LOGGER.info("Addon auto update process %d tasks", len(tasks))
-            await asyncio.wait(tasks, loop=loop)
+            await asyncio.wait(tasks)
 
-    return _addons_update
+    async def _update_supervisor(self):
-
-
-def hassio_update(supervisor, updater):
-    """Create scheduler task for update of supervisor hassio."""
-    async def _hassio_update():
         """Check and run update of supervisor hassio."""
-        await updater.fetch_data()
+        if not self.sys_supervisor.need_update:
-        if updater.version_hassio == supervisor.version:
             return
 
         # don't perform a update on beta/dev channel
-        if updater.beta_channel:
+        if self.sys_dev:
-            _LOGGER.warning("Ignore Hass.IO update on beta upstream!")
+            _LOGGER.warning("Ignore Hass.io update on dev channel!")
             return
 
-        _LOGGER.info("Found new HassIO version %s.", updater.version_hassio)
+        _LOGGER.info("Found new Hass.io version")
-        await supervisor.update(updater.version_hassio)
+        await self.sys_supervisor.update()
 
-    return _hassio_update
+    async def _watchdog_homeassistant_docker(self):
-
+        """Check running state of docker and start if they is close."""
-
-def homeassistant_watchdog(loop, homeassistant):
-    """Create scheduler task for montoring running state."""
-    async def _homeassistant_watchdog():
-        """Check running state and start if they is close."""
         # if Home-Assistant is active
-        if not await homeassistant.is_initialize():
+        if not await self.sys_homeassistant.is_initialize() or \
+                not self.sys_homeassistant.watchdog:
             return
 
-        # If Home-Assistant is running
+        # if Home-Assistant is running
-        if homeassistant.in_progress or await homeassistant.is_running():
+        if self.sys_homeassistant.in_progress or \
+                await self.sys_homeassistant.is_running():
             return
 
-        loop.create_task(homeassistant.run())
+        _LOGGER.warning("Watchdog found a problem with Home-Assistant docker!")
+        await self.sys_homeassistant.start()
 
-    return _homeassistant_watchdog
+    async def _watchdog_homeassistant_api(self):
+        """Create scheduler task for montoring running state of API.
+
+        Try 2 times to call API before we restart Home-Assistant. Maybe we had
+        a delay in our system.
+        """
+        retry_scan = self._data.get('HASS_WATCHDOG_API', 0)
+
+        # If Home-Assistant is active
+        if not await self.sys_homeassistant.is_initialize() or \
+                not self.sys_homeassistant.watchdog:
+            return
+
+        # If Home-Assistant API is up
+        if self.sys_homeassistant.in_progress or \
+                await self.sys_homeassistant.check_api_state():
+            return
+
+        # Look like we run into a problem
+        retry_scan += 1
+        if retry_scan == 1:
+            self._data['HASS_WATCHDOG_API'] = retry_scan
+            _LOGGER.warning("Watchdog miss API response from Home-Assistant")
+            return
+
+        _LOGGER.error("Watchdog found a problem with Home-Assistant API!")
+        await self.sys_homeassistant.restart()
+        self._data['HASS_WATCHDOG_API'] = 0

hassio/tools.py

@@ -1,167 +0,0 @@
-"""Tools file for HassIO."""
-import asyncio
-from contextlib import suppress
-from datetime import datetime, timedelta, timezone
-import json
-import logging
-import re
-
-import aiohttp
-import async_timeout
-import pytz
-import voluptuous as vol
-from voluptuous.humanize import humanize_error
-
-_LOGGER = logging.getLogger(__name__)
-
-FREEGEOIP_URL = "https://freegeoip.io/json/"
-
-RE_STRING = re.compile(r"\x1b(\[.*?[@-~]|\].*?(\x07|\x1b\\))")
-
-# Copyright (c) Django Software Foundation and individual contributors.
-# All rights reserved.
-# https://github.com/django/django/blob/master/LICENSE
-DATETIME_RE = re.compile(
-    r'(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})'
-    r'[T ](?P<hour>\d{1,2}):(?P<minute>\d{1,2})'
-    r'(?::(?P<second>\d{1,2})(?:\.(?P<microsecond>\d{1,6})\d{0,6})?)?'
-    r'(?P<tzinfo>Z|[+-]\d{2}(?::?\d{2})?)?$'
-)
-
-
-def write_json_file(jsonfile, data):
-    """Write a json file."""
-    try:
-        json_str = json.dumps(data, indent=2)
-        with jsonfile.open('w') as conf_file:
-            conf_file.write(json_str)
-    except (OSError, json.JSONDecodeError):
-        return False
-
-    return True
-
-
-def read_json_file(jsonfile):
-    """Read a json file and return a dict."""
-    with jsonfile.open('r') as cfile:
-        return json.loads(cfile.read())
-
-
-async def fetch_timezone(websession):
-    """Read timezone from freegeoip."""
-    data = {}
-    with suppress(aiohttp.ClientError, asyncio.TimeoutError,
-                  json.JSONDecodeError, KeyError):
-        with async_timeout.timeout(10, loop=websession.loop):
-            async with websession.get(FREEGEOIP_URL) as request:
-                data = await request.json()
-
-    return data.get('time_zone', 'UTC')
-
-
-def convert_to_ascii(raw):
-    """Convert binary to ascii and remove colors."""
-    return RE_STRING.sub("", raw.decode())
-
-
-# Copyright (c) Django Software Foundation and individual contributors.
-# All rights reserved.
-# https://github.com/django/django/blob/master/LICENSE
-def parse_datetime(dt_str):
-    """Parse a string and return a datetime.datetime.
-
-    This function supports time zone offsets. When the input contains one,
-    the output uses a timezone with a fixed offset from UTC.
-    Raises ValueError if the input is well formatted but not a valid datetime.
-    Returns None if the input isn't well formatted.
-    """
-    match = DATETIME_RE.match(dt_str)
-    if not match:
-        return None
-    kws = match.groupdict()  # type: Dict[str, Any]
-    if kws['microsecond']:
-        kws['microsecond'] = kws['microsecond'].ljust(6, '0')
-    tzinfo_str = kws.pop('tzinfo')
-
-    tzinfo = None  # type: Optional[dt.tzinfo]
-    if tzinfo_str == 'Z':
-        tzinfo = pytz.utc
-    elif tzinfo_str is not None:
-        offset_mins = int(tzinfo_str[-2:]) if len(tzinfo_str) > 3 else 0
-        offset_hours = int(tzinfo_str[1:3])
-        offset = timedelta(hours=offset_hours, minutes=offset_mins)
-        if tzinfo_str[0] == '-':
-            offset = -offset
-        tzinfo = timezone(offset)
-    else:
-        tzinfo = None
-    kws = {k: int(v) for k, v in kws.items() if v is not None}
-    kws['tzinfo'] = tzinfo
-    return datetime(**kws)
-
-
-class JsonConfig(object):
-    """Hass core object for handle it."""
-
-    def __init__(self, json_file, schema):
-        """Initialize hass object."""
-        self._file = json_file
-        self._schema = schema
-        self._data = {}
-
-        # init or load data
-        if self._file.is_file():
-            try:
-                self._data = read_json_file(self._file)
-            except (OSError, json.JSONDecodeError):
-                _LOGGER.warning("Can't read %s", self._file)
-                self._data = {}
-
-        # validate
-        try:
-            self._data = self._schema(self._data)
-        except vol.Invalid as ex:
-            _LOGGER.error("Can't parse %s -> %s",
-                          self._file, humanize_error(self._data, ex))
-            # reset data to default
-            self._data = self._schema({})
-
-    def save(self):
-        """Store data to config file."""
-        # validate
-        try:
-            self._data = self._schema(self._data)
-        except vol.Invalid as ex:
-            _LOGGER.error("Can't parse data -> %s",
-                          humanize_error(self._data, ex))
-            return False
-
-        # write
-        if not write_json_file(self._file, self._data):
-            _LOGGER.error("Can't store config in %s", self._file)
-            return False
-        return True
-
-
-class AsyncThrottle(object):
-    """
-    Decorator that prevents a function from being called more than once every
-    time period.
-    """
-    def __init__(self, delta):
-        """Initialize async throttle."""
-        self.throttle_period = delta
-        self.time_of_last_call = datetime.min
-
-    def __call__(self, method):
-        """Throttle function"""
-        async def wrapper(*args, **kwargs):
-            """Throttle function wrapper"""
-            now = datetime.now()
-            time_since_last_call = now - self.time_of_last_call
-
-            if time_since_last_call > self.throttle_period:
-                self.time_of_last_call = now
-                return await method(*args, **kwargs)
-
-        return wrapper

hassio/updater.py

@@ -1,30 +1,37 @@
 """Fetch last versions from webserver."""
 import asyncio
+from contextlib import suppress
 from datetime import timedelta
 import json
 import logging
 
 import aiohttp
-import async_timeout
 
 from .const import (
     URL_HASSIO_VERSION, FILE_HASSIO_UPDATER, ATTR_HOMEASSISTANT, ATTR_HASSIO,
-    ATTR_BETA_CHANNEL)
+    ATTR_CHANNEL)
-from .tools import AsyncThrottle, JsonConfig
+from .coresys import CoreSysAttributes
+from .utils import AsyncThrottle
+from .utils.json import JsonConfig
 from .validate import SCHEMA_UPDATER_CONFIG
 
 _LOGGER = logging.getLogger(__name__)
 
 
-class Updater(JsonConfig):
+class Updater(JsonConfig, CoreSysAttributes):
     """Fetch last versions from version.json."""
 
-    def __init__(self, config, loop, websession):
+    def __init__(self, coresys):
         """Initialize updater."""
         super().__init__(FILE_HASSIO_UPDATER, SCHEMA_UPDATER_CONFIG)
-        self.config = config
+        self.coresys = coresys
-        self.loop = loop
+
-        self.websession = websession
+    def load(self):
+        """Update internal data.
+
+        Return a coroutine.
+        """
+        return self.reload()
 
     @property
     def version_homeassistant(self):
@@ -37,50 +44,48 @@ class Updater(JsonConfig):
         return self._data.get(ATTR_HASSIO)
 
     @property
-    def upstream(self):
+    def channel(self):
-        """Return Upstream branch for version."""
+        """Return upstream channel of hassio instance."""
-        if self.beta_channel:
+        return self._data[ATTR_CHANNEL]
-            return 'dev'
-        return 'master'
 
-    @property
+    @channel.setter
-    def beta_channel(self):
+    def channel(self, value):
-        """Return True if we run in beta upstream."""
+        """Set upstream mode."""
-        return self._data[ATTR_BETA_CHANNEL]
+        self._data[ATTR_CHANNEL] = value
-
-    @beta_channel.setter
-    def beta_channel(self, value):
-        """Set beta upstream mode."""
-        self._data[ATTR_BETA_CHANNEL] = bool(value)
-        self.save()
 
     @AsyncThrottle(timedelta(seconds=60))
-    async def fetch_data(self):
+    async def reload(self):
         """Fetch current versions from github.
 
         Is a coroutine.
         """
-        url = URL_HASSIO_VERSION.format(self.upstream)
+        url = URL_HASSIO_VERSION.format(channel=self.channel)
         try:
             _LOGGER.info("Fetch update data from %s", url)
-            with async_timeout.timeout(10, loop=self.loop):
+            async with self.sys_websession.get(url, timeout=10) as request:
-                async with self.websession.get(url) as request:
                 data = await request.json(content_type=None)
 
         except (aiohttp.ClientError, asyncio.TimeoutError, KeyError) as err:
-            _LOGGER.warning("Can't fetch versions from %s -> %s", url, err)
+            _LOGGER.warning("Can't fetch versions from %s: %s", url, err)
             return
 
         except json.JSONDecodeError as err:
-            _LOGGER.warning("Can't parse versions from %s -> %s", url, err)
+            _LOGGER.warning("Can't parse versions from %s: %s", url, err)
             return
 
         # data valid?
-        if not data:
+        if not data or data.get(ATTR_CHANNEL) != self.channel:
             _LOGGER.warning("Invalid data from %s", url)
             return
 
-        # update versions
+        # update supervisor versions
-        self._data[ATTR_HOMEASSISTANT] = data.get('homeassistant')
+        with suppress(KeyError):
-        self._data[ATTR_HASSIO] = data.get('hassio')
+            self._data[ATTR_HASSIO] = data['supervisor']
-        self.save()
+
+        # update Home Assistant version
+        machine = self.sys_machine or 'default'
+        with suppress(KeyError):
+            self._data[ATTR_HOMEASSISTANT] = \
+                data['homeassistant'][machine]
+
+        self.save_data()

hassio/utils/__init__.py

@@ -0,0 +1,51 @@
+"""Tools file for HassIO."""
+from datetime import datetime
+import logging
+import re
+
+_LOGGER = logging.getLogger(__name__)
+RE_STRING = re.compile(r"\x1b(\[.*?[@-~]|\].*?(\x07|\x1b\\))")
+
+
+def convert_to_ascii(raw):
+    """Convert binary to ascii and remove colors."""
+    return RE_STRING.sub("", raw.decode())
+
+
+def process_lock(method):
+    """Wrap function with only run once."""
+    async def wrap_api(api, *args, **kwargs):
+        """Return api wrapper."""
+        if api.lock.locked():
+            _LOGGER.error(
+                "Can't excute %s while a task is in progress", method.__name__)
+            return False
+
+        async with api.lock:
+            return await method(api, *args, **kwargs)
+
+    return wrap_api
+
+
+class AsyncThrottle:
+    """
+    Decorator that prevents a function from being called more than once every
+    time period.
+    """
+    def __init__(self, delta):
+        """Initialize async throttle."""
+        self.throttle_period = delta
+        self.time_of_last_call = datetime.min
+
+    def __call__(self, method):
+        """Throttle function"""
+        async def wrapper(*args, **kwargs):
+            """Throttle function wrapper"""
+            now = datetime.now()
+            time_since_last_call = now - self.time_of_last_call
+
+            if time_since_last_call > self.throttle_period:
+                self.time_of_last_call = now
+                return await method(*args, **kwargs)
+
+        return wrapper

hassio/utils/dt.py

@@ -0,0 +1,83 @@
+"""Tools file for HassIO."""
+import asyncio
+from datetime import datetime, timedelta, timezone
+import logging
+import re
+
+import aiohttp
+import async_timeout
+import pytz
+
+UTC = pytz.utc
+
+_LOGGER = logging.getLogger(__name__)
+
+FREEGEOIP_URL = "https://freegeoip.net/json/"
+
+# Copyright (c) Django Software Foundation and individual contributors.
+# All rights reserved.
+# https://github.com/django/django/blob/master/LICENSE
+DATETIME_RE = re.compile(
+    r'(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})'
+    r'[T ](?P<hour>\d{1,2}):(?P<minute>\d{1,2})'
+    r'(?::(?P<second>\d{1,2})(?:\.(?P<microsecond>\d{1,6})\d{0,6})?)?'
+    r'(?P<tzinfo>Z|[+-]\d{2}(?::?\d{2})?)?$'
+)
+
+
+async def fetch_timezone(websession):
+    """Read timezone from freegeoip."""
+    data = {}
+    try:
+        with async_timeout.timeout(10):
+            async with websession.get(FREEGEOIP_URL) as request:
+                data = await request.json()
+
+    except (aiohttp.ClientError, asyncio.TimeoutError, KeyError) as err:
+        _LOGGER.warning("Can't fetch freegeoip data: %s", err)
+
+    except ValueError as err:
+        _LOGGER.warning("Error on parse freegeoip data: %s", err)
+
+    return data.get('time_zone', 'UTC')
+
+
+# Copyright (c) Django Software Foundation and individual contributors.
+# All rights reserved.
+# https://github.com/django/django/blob/master/LICENSE
+def parse_datetime(dt_str):
+    """Parse a string and return a datetime.datetime.
+
+    This function supports time zone offsets. When the input contains one,
+    the output uses a timezone with a fixed offset from UTC.
+    Raises ValueError if the input is well formatted but not a valid datetime.
+    Returns None if the input isn't well formatted.
+    """
+    match = DATETIME_RE.match(dt_str)
+    if not match:
+        return None
+    kws = match.groupdict()  # type: Dict[str, Any]
+    if kws['microsecond']:
+        kws['microsecond'] = kws['microsecond'].ljust(6, '0')
+    tzinfo_str = kws.pop('tzinfo')
+
+    tzinfo = None  # type: Optional[dt.tzinfo]
+    if tzinfo_str == 'Z':
+        tzinfo = UTC
+    elif tzinfo_str is not None:
+        offset_mins = int(tzinfo_str[-2:]) if len(tzinfo_str) > 3 else 0
+        offset_hours = int(tzinfo_str[1:3])
+        offset = timedelta(hours=offset_hours, minutes=offset_mins)
+        if tzinfo_str[0] == '-':
+            offset = -offset
+        tzinfo = timezone(offset)
+    else:
+        tzinfo = None
+    kws = {k: int(v) for k, v in kws.items() if v is not None}
+    kws['tzinfo'] = tzinfo
+    return datetime(**kws)
+
+
+def utcnow():
+    """Returns current timestamp including timezone."""
+    return datetime.now(UTC)

hassio/utils/gdbus.py

@@ -0,0 +1,174 @@
+"""DBus implementation with glib."""
+import asyncio
+import logging
+import json
+import shlex
+import re
+import xml.etree.ElementTree as ET
+
+from ..exceptions import DBusFatalError, DBusParseError
+
+_LOGGER = logging.getLogger(__name__)
+
+# Use to convert GVariant into json
+RE_GVARIANT_TYPE = re.compile(
+    r"(?:boolean|byte|int16|uint16|int32|uint32|handle|int64|uint64|double|"
+    r"string|objectpath|signature) ")
+RE_GVARIANT_TULPE = re.compile(r"^\((.*),\)$")
+RE_GVARIANT_VARIANT = re.compile(
+    r"(?<=(?: |{|\[))<((?:'|\").*?(?:'|\")|\d+(?:\.\d+)?)>(?=(?:|]|}|,))")
+RE_GVARIANT_STRING = re.compile(r"(?<=(?: |{|\[))'(.*?)'(?=(?:|]|}|,))")
+
+# Commands for dbus
+INTROSPECT = ("gdbus introspect --system --dest {bus} "
+              "--object-path {object} --xml")
+CALL = ("gdbus call --system --dest {bus} --object-path {object} "
+        "--method {method} {args}")
+
+DBUS_METHOD_GETALL = 'org.freedesktop.DBus.Properties.GetAll'
+
+
+class DBus:
+    """DBus handler."""
+
+    def __init__(self, bus_name, object_path):
+        """Initialize dbus object."""
+        self.bus_name = bus_name
+        self.object_path = object_path
+        self.methods = set()
+
+    @staticmethod
+    async def connect(bus_name, object_path):
+        """Read object data."""
+        self = DBus(bus_name, object_path)
+        await self._init_proxy()  # pylint: disable=protected-access
+
+        _LOGGER.info("Connect to dbus: %s - %s", bus_name, object_path)
+        return self
+
+    async def _init_proxy(self):
+        """Read interface data."""
+        command = shlex.split(INTROSPECT.format(
+            bus=self.bus_name,
+            object=self.object_path
+        ))
+
+        # Ask data
+        _LOGGER.info("Introspect %s on %s", self.bus_name, self.object_path)
+        data = await self._send(command)
+
+        # Parse XML
+        try:
+            xml = ET.fromstring(data)
+        except ET.ParseError as err:
+            _LOGGER.error("Can't parse introspect data: %s", err)
+            raise DBusParseError() from None
+
+        # Read available methods
+        _LOGGER.debug("data: %s", data)
+        for interface in xml.findall("./interface"):
+            interface_name = interface.get('name')
+            for method in interface.findall("./method"):
+                method_name = method.get('name')
+                self.methods.add(f"{interface_name}.{method_name}")
+
+    @staticmethod
+    def _gvariant(raw):
+        """Parse GVariant input to python."""
+        raw = RE_GVARIANT_TYPE.sub("", raw)
+        raw = RE_GVARIANT_TULPE.sub(r"[\1]", raw)
+        raw = RE_GVARIANT_VARIANT.sub(r"\1", raw)
+        raw = RE_GVARIANT_STRING.sub(r'"\1"', raw)
+
+        # No data
+        if raw.startswith("()"):
+            return {}
+
+        try:
+            return json.loads(raw)
+        except json.JSONDecodeError as err:
+            _LOGGER.error("Can't parse '%s': %s", raw, err)
+            raise DBusParseError() from None
+
+    async def call_dbus(self, method, *args):
+        """Call a dbus method."""
+        command = shlex.split(CALL.format(
+            bus=self.bus_name,
+            object=self.object_path,
+            method=method,
+            args=" ".join(map(str, args))
+        ))
+
+        # Run command
+        _LOGGER.info("Call %s on %s", method, self.object_path)
+        data = await self._send(command)
+
+        # Parse and return data
+        return self._gvariant(data)
+
+    async def get_properties(self, interface):
+        """Read all properties from interface."""
+        try:
+            return (await self.call_dbus(DBUS_METHOD_GETALL, interface))[0]
+        except IndexError:
+            _LOGGER.error("No attributes returned for %s", interface)
+            raise DBusFatalError from None
+
+    async def _send(self, command):
+        """Send command over dbus."""
+        # Run command
+        _LOGGER.debug("Send dbus command: %s", command)
+        try:
+            proc = await asyncio.create_subprocess_exec(
+                *command,
+                stdin=asyncio.subprocess.DEVNULL,
+                stdout=asyncio.subprocess.PIPE,
+                stderr=asyncio.subprocess.PIPE
+            )
+
+            data, error = await proc.communicate()
+        except OSError as err:
+            _LOGGER.error("DBus fatal error: %s", err)
+            raise DBusFatalError() from None
+
+        # Success?
+        if proc.returncode != 0:
+            _LOGGER.error("DBus return error: %s", error)
+            raise DBusFatalError()
+
+        # End
+        return data.decode()
+
+    def __getattr__(self, name):
+        """Mapping to dbus method."""
+        return getattr(DBusCallWrapper(self, self.bus_name), name)
+
+
+class DBusCallWrapper:
+    """Wrapper a DBus interface for a call."""
+
+    def __init__(self, dbus, interface):
+        """Initialize wrapper."""
+        self.dbus = dbus
+        self.interface = interface
+
+    def __call__(self):
+        """Should never be called."""
+        _LOGGER.error("DBus method %s not exists!", self.interface)
+        raise DBusFatalError()
+
+    def __getattr__(self, name):
+        """Mapping to dbus method."""
+        interface = f"{self.interface}.{name}"
+
+        if interface not in self.dbus.methods:
+            return DBusCallWrapper(self.dbus, interface)
+
+        def _method_wrapper(*args):
+            """Wrap method.
+
+            Return a coroutine
+            """
+            return self.dbus.call_dbus(interface, *args)
+
+        return _method_wrapper

hassio/utils/json.py

@@ -0,0 +1,81 @@
+"""Tools file for HassIO."""
+import json
+import logging
+
+import voluptuous as vol
+from voluptuous.humanize import humanize_error
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def write_json_file(jsonfile, data):
+    """Write a json file."""
+    json_str = json.dumps(data, indent=2)
+    with jsonfile.open('w') as conf_file:
+        conf_file.write(json_str)
+
+
+def read_json_file(jsonfile):
+    """Read a json file and return a dict."""
+    with jsonfile.open('r') as cfile:
+        return json.loads(cfile.read())
+
+
+class JsonConfig:
+    """Hass core object for handle it."""
+
+    def __init__(self, json_file, schema):
+        """Initialize hass object."""
+        self._file = json_file
+        self._schema = schema
+        self._data = {}
+
+        self.read_data()
+
+    def reset_data(self):
+        """Reset json file to default."""
+        try:
+            self._data = self._schema({})
+        except vol.Invalid as ex:
+            _LOGGER.error("Can't reset %s: %s",
+                          self._file, humanize_error(self._data, ex))
+
+    def read_data(self):
+        """Read json file & validate."""
+        if self._file.is_file():
+            try:
+                self._data = read_json_file(self._file)
+            except (OSError, json.JSONDecodeError):
+                _LOGGER.warning("Can't read %s", self._file)
+                self._data = {}
+
+        # Validate
+        try:
+            self._data = self._schema(self._data)
+        except vol.Invalid as ex:
+            _LOGGER.error("Can't parse %s: %s",
+                          self._file, humanize_error(self._data, ex))
+
+            # Reset data to default
+            _LOGGER.warning("Reset %s to default", self._file)
+            self._data = self._schema({})
+
+    def save_data(self):
+        """Store data to config file."""
+        # Validate
+        try:
+            self._data = self._schema(self._data)
+        except vol.Invalid as ex:
+            _LOGGER.error("Can't parse data: %s",
+                          humanize_error(self._data, ex))
+
+            # Load last valid data
+            _LOGGER.warning("Reset %s to last version", self._file)
+            self.read_data()
+            return
+
+        # write
+        try:
+            write_json_file(self._file, self._data)
+        except (OSError, json.JSONDecodeError) as err:
+            _LOGGER.error("Can't store config in %s: %s", self._file, err)

hassio/utils/tar.py

@@ -0,0 +1,88 @@
+"""Tarfile fileobject handler for encrypted files."""
+import tarfile
+import hashlib
+
+from Crypto.Cipher import AES
+from Crypto.Random import get_random_bytes
+from Crypto.Util.Padding import pad
+
+BLOCK_SIZE = 16
+
+MOD_READ = 'r'
+MOD_WRITE = 'w'
+
+
+class SecureTarFile:
+    """Handle encrypted files for tarfile library."""
+
+    def __init__(self, name, mode, key=None, gzip=True):
+        """Initialize encryption handler."""
+        self._file = None
+        self._mode = mode
+        self._name = name
+
+        # Tarfile options
+        self._tar = None
+        self._tar_mode = f"{mode}|gz" if gzip else f"{mode}|"
+
+        # Encryption/Decription
+        self._aes = None
+        self._key = key
+
+    def __enter__(self):
+        """Start context manager tarfile."""
+        if not self._key:
+            self._tar = tarfile.open(name=str(self._name), mode=self._tar_mode)
+            return self._tar
+
+        # Encrypted/Decryped Tarfile
+        self._file = self._name.open(f"{self._mode}b")
+
+        # Extract IV for CBC
+        if self._mode == MOD_READ:
+            cbc_rand = self._file.read(16)
+        else:
+            cbc_rand = get_random_bytes(16)
+            self._file.write(cbc_rand)
+        self._aes = AES.new(
+            self._key, AES.MODE_CBC, iv=_generate_iv(self._key, cbc_rand))
+
+        self._tar = tarfile.open(fileobj=self, mode=self._tar_mode)
+        return self._tar
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        """Close file."""
+        if self._tar:
+            self._tar.close()
+        if self._file:
+            self._file.close()
+
+    def write(self, data):
+        """Write data."""
+        if len(data) % BLOCK_SIZE != 0:
+            data = pad(data, BLOCK_SIZE)
+        self._file.write(self._aes.encrypt(data))
+
+    def read(self, size=0):
+        """Read data."""
+        return self._aes.decrypt(self._file.read(size))
+
+    @property
+    def path(self):
+        """Return path object of tarfile."""
+        return self._name
+
+    @property
+    def size(self):
+        """Return snapshot size."""
+        if not self._name.is_file():
+            return 0
+        return round(self._name.stat().st_size / 1048576, 2)  # calc mbyte
+
+
+def _generate_iv(key, salt):
+    """Generate a iv from data."""
+    temp_iv = key + salt
+    for _ in range(100):
+        temp_iv = hashlib.sha256(temp_iv).digest()
+    return temp_iv[:16]

hassio/validate.py

@@ -1,18 +1,41 @@
 """Validate functions."""
-import voluptuous as vol
+import uuid
+import re
 
+import voluptuous as vol
 import pytz
 
 from .const import (
-    ATTR_DEVICES, ATTR_IMAGE, ATTR_LAST_VERSION, ATTR_SESSIONS, ATTR_PASSWORD,
+    ATTR_IMAGE, ATTR_LAST_VERSION, ATTR_CHANNEL, ATTR_TIMEZONE,
-    ATTR_TOTP, ATTR_SECURITY, ATTR_BETA_CHANNEL, ATTR_TIMEZONE,
+    ATTR_ADDONS_CUSTOM_LIST, ATTR_PASSWORD, ATTR_HOMEASSISTANT, ATTR_HASSIO,
-    ATTR_ADDONS_CUSTOM_LIST, ATTR_AUDIO_OUTPUT, ATTR_AUDIO_INPUT,
+    ATTR_BOOT, ATTR_LAST_BOOT, ATTR_SSL, ATTR_PORT, ATTR_WATCHDOG,
-    ATTR_HOMEASSISTANT, ATTR_HASSIO, ATTR_BOOT, ATTR_LAST_BOOT)
+    ATTR_WAIT_BOOT, ATTR_UUID, CHANNEL_STABLE, CHANNEL_BETA, CHANNEL_DEV)
 
 
+RE_REPOSITORY = re.compile(r"^(?P<url>[^#]+)(?:#(?P<branch>[\w\-]+))?$")
+
 NETWORK_PORT = vol.All(vol.Coerce(int), vol.Range(min=1, max=65535))
-HASS_DEVICES = [vol.Match(r"^[^/]*$")]
+WAIT_BOOT = vol.All(vol.Coerce(int), vol.Range(min=1, max=60))
-ALSA_CHANNEL = vol.Match(r"\d+,\d+")
+DOCKER_IMAGE = vol.Match(r"^[\w{}]+/[\-\w{}]+$")
+ALSA_DEVICE = vol.Any(None, vol.Match(r"\d+,\d+"))
+CHANNELS = vol.In([CHANNEL_STABLE, CHANNEL_BETA, CHANNEL_DEV])
+
+
+def validate_repository(repository):
+    """Validate a valide repository."""
+    data = RE_REPOSITORY.match(repository)
+    if not data:
+        raise vol.Invalid("No valid repository format!")
+
+    # Validate URL
+    # pylint: disable=no-value-for-parameter
+    vol.Url()(data.group('url'))
+
+    return repository
+
+
+# pylint: disable=no-value-for-parameter
+REPOSITORIES = vol.All([validate_repository], vol.Unique())
 
 
 def validate_timezone(timezone):
@@ -28,11 +51,12 @@ def validate_timezone(timezone):
     return timezone
 
 
+# pylint: disable=inconsistent-return-statements
 def convert_to_docker_ports(data):
     """Convert data into docker port list."""
     # dynamic ports
     if data is None:
-        return
+        return None
 
     # single port
     if isinstance(data, int):
@@ -57,31 +81,33 @@ DOCKER_PORTS = vol.Schema({
 
 # pylint: disable=no-value-for-parameter
 SCHEMA_HASS_CONFIG = vol.Schema({
-    vol.Optional(ATTR_DEVICES, default=[]): HASS_DEVICES,
+    vol.Optional(ATTR_UUID, default=lambda: uuid.uuid4().hex):
+        vol.Match(r"^[0-9a-f]{32}$"),
     vol.Optional(ATTR_BOOT, default=True): vol.Boolean(),
-    vol.Inclusive(ATTR_IMAGE, 'custom_hass'): vol.Coerce(str),
+    vol.Inclusive(ATTR_IMAGE, 'custom_hass'): DOCKER_IMAGE,
     vol.Inclusive(ATTR_LAST_VERSION, 'custom_hass'): vol.Coerce(str),
-})
+    vol.Optional(ATTR_PORT, default=8123): NETWORK_PORT,
+    vol.Optional(ATTR_PASSWORD): vol.Any(None, vol.Coerce(str)),
+    vol.Optional(ATTR_SSL, default=False): vol.Boolean(),
+    vol.Optional(ATTR_WATCHDOG, default=True): vol.Boolean(),
+    vol.Optional(ATTR_WAIT_BOOT, default=600):
+        vol.All(vol.Coerce(int), vol.Range(min=60)),
+}, extra=vol.REMOVE_EXTRA)
 
 
-# pylint: disable=no-value-for-parameter
 SCHEMA_UPDATER_CONFIG = vol.Schema({
-    vol.Optional(ATTR_BETA_CHANNEL, default=False): vol.Boolean(),
+    vol.Optional(ATTR_CHANNEL, default=CHANNEL_STABLE): CHANNELS,
     vol.Optional(ATTR_HOMEASSISTANT): vol.Coerce(str),
     vol.Optional(ATTR_HASSIO): vol.Coerce(str),
-})
+}, extra=vol.REMOVE_EXTRA)
 
 
 # pylint: disable=no-value-for-parameter
 SCHEMA_HASSIO_CONFIG = vol.Schema({
     vol.Optional(ATTR_TIMEZONE, default='UTC'): validate_timezone,
     vol.Optional(ATTR_LAST_BOOT): vol.Coerce(str),
-    vol.Optional(ATTR_ADDONS_CUSTOM_LIST, default=[]): [vol.Url()],
+    vol.Optional(ATTR_ADDONS_CUSTOM_LIST, default=[
-    vol.Optional(ATTR_SECURITY, default=False): vol.Boolean(),
+        "https://github.com/hassio-addons/repository",
-    vol.Optional(ATTR_TOTP): vol.Coerce(str),
+    ]): REPOSITORIES,
-    vol.Optional(ATTR_PASSWORD): vol.Coerce(str),
+    vol.Optional(ATTR_WAIT_BOOT, default=5): WAIT_BOOT,
-    vol.Optional(ATTR_SESSIONS, default={}):
-        vol.Schema({vol.Coerce(str): vol.Coerce(str)}),
-    vol.Optional(ATTR_AUDIO_OUTPUT): ALSA_CHANNEL,
-    vol.Optional(ATTR_AUDIO_INPUT): ALSA_CHANNEL,
 }, extra=vol.REMOVE_EXTRA)

misc/hassio.xml

@@ -1 +1 @@
-<mxfile userAgent="Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.81 Safari/537.36" version="6.5.6" editor="www.draw.io" type="device"><diagram name="Page-1">5Vptc6M2EP41/ng3gHj9mPiSy820c5n6Q3sfsVBsNTJyhYid/voKkABZkOBY+KYtmYnR6pVn99ld1l6A5e74laX77a80Q2ThOdlxAb4sPC8OY/G/Erw2At9xG8GG4awR9QQr/DeSQkdKS5yhQhvIKSUc73UhpHmOINdkKWP0oA97okTfdZ9ukCFYwZSY0t9xxrdS6oZJ1/GA8GYrt469sOlYp/B5w2iZy/0WHniqr6Z7l6q15IMW2zSjh54I3C3AklHKm7vdcYlIBa2CrZl3P9LbnpuhnE+Z4DUTXlJSInXikIipt09UrCAOyF8lKOFfJVUdn4paZTdigNjtKD5ERw206DtIYKrenLJdSrrJ4m5TfX5fqX3E2Zqtmg4JS7urd9hijlb7FFbtg7A2MWjLd0S03Oo0mJAlJZTVowXYKIRQyAvO6DPq9Tj1Jc+/kutLvF4Q4+g4CqHbKkbYO6I7xNmrGKImJKCZIm09SKRuD53l+Arobc9oQjkulca6aZfuFCZupM6G9QcM/X3LcaW31WvB0e5CNGGG1vF6CE0QggRkrb7sAhhNBNCzAKBvAPiFwmfELkUOokCQ/trI+SZy3hBywAJyoYHcw9JArXaFqJpRUe9MLscQDXN5HQd+4NjB0A8DHcPQxDBwTAgDCxAmBl4oE3FINinjW7qheUruOumtjmgPPXTE/I9K/DkKZPOH6srFwZq+QDV/yBX+RJy/ygiclpwKUbfxL5Tu5RrNUavzvQ20eBxaMihHRTJ4p2yDeM9uTHUwRFKOX/TVLwFX5RK20fXeQDcB3im+deMRMSweALGfBbp/JdCj0Xxi3UX48xIMN6wSjNMEYlXuEXvBhXAJagOm+h7Sovj2fTTBaMXr0aSjMwP3fbdluKflMgybVEN3aFmA4sy347ZAoLstMJB1uPGA33JtRE3Xm4Nbbo9Yyou13NJ4VbuxeUnkqveOHouiK7EIzOO6NHh1dE/iQtc89VyFwIPfVK9YQgCJYBqGSnyPidpzqm5QnpmLCWFvqcFMfrm0qlgvvlZQUm8cvaxJrPLpRjy6wLByU9dxRSmKn6CtLFR3Rd5A/t56HS1/9224ovDKXHE/O3qQ/+zG8aWBfiKtPmjxwLR4d0Sn1i3enyVUSJ30srCJCPYcTk5zpHmb8xQ2Vl+AJXtp+WpPYdeKPa5ZUrjJMpoXhhqLbbqvbveMQlQU73sn3ZVN9lX34qr9fZMTCt07XhiBxANhEHtx7PhgpqRqyJN5bmB6ssSCI1O1nDmJ0rVOHdWlqYAkU59uc7zoXEAAOfWR4vq9Q5WqneE0Wq3Q0FJO6hdSz1ynobKxTm0U7dNMs5PYJCjk1KxYKX6WO9IMALcVOzAUyKdrRB5pgTmmuRiyppzTnRhAqo7btoitVVbrMna3xg3Bm2oup+fRvCvEnpZu5QYWiHxS0wEDNR0wkJBYqciaNJ5AUifSWOq/x1LX5OgUOk5Ity8PgO97LQshEng/L0SqvXsMPBwOpvcmBO+LWg2SiZDQMrs4Tl6FQInuz3xnIKeP5iovgLcLo9K4P5DEn8mRmTLEXqzt3hyaQ3qj0faDNPFNmjTmaz+S+icmc+pN7YVAMP6tjfNQrkcjIUzZ5fQL62uAfkH1Z4d+CThJJ4boN1TdsxLBopnY17f7yGaWOT9lP8i+YAb2TVZjYJDkK+bbuekxFp2QmwUomocevnppvQo94v9LcEpCnaOR5dgU/idjk/m9+G9oX71qUYbReBXl30s+Vf6dgXyi2f0WqlFG93szcPcP</diagram></mxfile>
+<mxfile userAgent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36" version="7.9.5" editor="www.draw.io" type="device"><diagram name="Page-1" id="535f6c39-9b73-04c2-941c-82630de90f1a">5VrLcqM4FP0aLzsFiOcycefRVTPVqfFippdYKLYmMvII4cd8/QiQDEKQ4Bicnmp7Yevqybk691zJnoH55vDI4u36d5ogMnOs5DADX2eOY1vAER+F5VhZ3DCoDCuGE9moNizwv0j1lNYcJyjTGnJKCcdb3QhpmiLINVvMGN3rzV4o0WfdxitkGBYwJqb1T5zwtbTaflRXPCG8WsupQ8evKpYxfF0xmqdyvpkDXspXVb2J1VjyQbN1nNB9wwTuZ2DOKOXVt81hjkiBrYKt6vfQU3taN0MpH9JB+mkXkxypFftEdL17oWIEsUB+lKD4/+RUVXzJSpfdigZitoP4EBUl0KJuL4EpalPKNjGpO4tvq+Lz+0LNI9ZWTVVVSFhOszr7NeZosY1hUd6L7SYarfmGiJJdrAYTMqeEsrK1ABv5EAp7xhl9RY0aq3zJ9S/k+B14SdMOMY4ODZPE7xHRDeLsKJqo2ghUXeRe9yLp2329c1wF9LqxaXzZLpabdXUaunaY+CJ91u0/YPjvW4oLvy2OGUebC9GECVqGyy40gQ8ikJz8NS6AwUAAnREAdA0Av1L4itilyEHkCdJfGznXRM7pQg6MgJxvIPc0N1ArQyEqehTUO5PLIUTdXF6GnutZ42Do+p6OoW9i6FkmhN4IEEYGXigROiSLlPE1XdE0Jve19U5HtIEeOmD+V2G+CTxZ/KGqUrGwqs5TxR9yhL8R50epwHHOqTDVE/9G6VaO0Qt1RnMG5fKlyvOYrRDXtknxYG+6gyESc7zTBfgScFUuMTa6zhvoRiLxaeFbFp4Rw+IBELsS6O5ngR705hPLWuHPSzBsv0gw2gnEIt8itsOZCAlqAqbqnuIs+/a9N8E4mZe9SUe9Dez3w5YRnuZz369SDT2gJR4KE3ecsAU8PWyBjqzDDjvilj2GatrOFNyyG8RSUezELY1XZRgbSqJMMIPfFqcCYYBEbA4MlfkBE7WKQVyz1WmkQbbgs8gGpolwmhd0J7Tkoy62A9xAzIe6EKWJOZgwNobqTPjn80sc64Sfpl0qHjSSKzHKl1vx6ALDIppdJ2LFKHyBYyWresRyOtL8U3DS0nx3jIjlX5kr9o2l5wI3dhhemg8MpFWDLilNkcaVN9NmjRHAZITal9dnhDuJ4kifNZK5kRAe7tC+awqYs92Jzx922Kdpk2veTHzAgRoIvd4832d9InK52zrx/rjrrqE1pqduk4SmmeGvbB1vi69bRiHKsvd1RhelwarzIF6lcleHAMFSy/EDEDnA90InDC0XTJRFd2mSY3umJkUjSJK6vJsypNWltuRcmtTJsNck2Sgn2/FClez6THF50JQuV2ei9rlJjVDRUnZyGjfnZ45TUdkYp9wUp6cZtk9Ck6CQU/OKUvEz35CqAbgrqIChQD5eIvJMM8wxTUWTJeWcbkQDUlTcnX610K7Sy98t6jFuCV4VfTk9j+b1zXv7rl5OMAKRW5d4oOMSD3SklqNcwZs0HkBSK9BY6r7HUtvk6BA6XkXzztTxQYqofkH8KZIZtZgGA/f7vRm9CcHbrHSDZCIkNE8u1smrECjS45lrdZzOgqnuk8DbN+Fyc3/gOHYmRybK5RtaW58Bq0U6vWo7jCauSRO1WydXUre1ZdrRdDwJBP0/01lP+bJXCWHMLqefX7466OcV73HoF4FWOtFFv67r3FEULJiIfc19H4yZZU5P2WHs867BvsFu9AySPGK+npoefeqE7MRDwTT0cNWh9Sr0CH8VcYp8naPBZdrk/xraZP4R4g+0LY5alGHUf4vy/yWfusifgHyiWP/5rXJG/Q9DcP8f</diagram></mxfile>

misc/security.xml

@@ -1 +0,0 @@
-<mxfile userAgent="Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:53.0) Gecko/20100101 Firefox/53.0" version="6.5.8" editor="www.draw.io" type="device"><diagram name="Page-1">5Vxdd5s4EP01fmwOkgCbx9hp2j7sNrvpnnYfiVFsTjDyghwn++tXGMmAxileEB9O+9BjBhjM3GHmzjXKhCw2L58Sf7v+jQU0mmAreJmQmwnGU4eI/zPDa24gyM0NqyQMchMqDPfhv1QaLWndhQFNKwdyxiIebqvGJYtjuuQVm58kbF897JFF1atu/RUFhvulH0Hr9zDg69w6w25h/0zD1VpdGblevufBXz6tEraL5fUmmDwe/uW7N77yJW80XfsB25dM5OOELBLGeP5p87KgURZaFbb8vNs39h6/d0Jjfs4JOD/h2Y928tZvwyTlwnTP/YTLL8lfVWA4fRF+52u+iYQBiY8pT9gTXbCIJcISs1gcOX8Mo0gz+VG4isXmUnwzKuzzZ5rwUIT8Wu7YhEGQXWa+X4ec3m/9ZXbNvcivzCGL+b38Go7aztMGeWIb3rcMRXYV+lIyyTh8omxDefIqDpF7ySw/Q6asKxHaF/gjS9rWJewVkr5MudXRcRF28UFG/jQKBKDwVypipAe/FPUtC2N+uKIznzg3mYUmobhwFtoblvA1W7HYj+4KawcxQhgGyT0Vo5mBINkgSJ/9NB1hkDAiw0XJAVFaiyhdffk6wkDZ7oCBckGg2JbGh1uKs2b2drT0wvXAOGcbsYPGwXXWfDJbxJZPP4uSqK4ryiuZTYNKU4JhK4VFRSChkc/D52rbOhUW6e0uQ7pAwNOeZ1sLbMp2yZLKk8ptRPMjoNMc4aqj/HaBowNIxzs8C7cpwE2ckdLlLgm5uNPbMH5kvaLnDIYenmrPj9sQPuLUODIH3wzCNxVxFtdz/9llrGcexiEvtibkOiNwfpTS7KjpTVtsD085mQd+uqaBPE/slmRilm29hPyH+PzBurIcuf232LauCFH7S5XwxvpZpuQQVDKlyaPfMlNsy60AjK2mmYJrHJnLFA9kip8+ZfsP+WHdfe8+E856/kk/EOqsApOGECJS48gchGqcK2GYUm4Sw8vss7hpoT5GVDlyvM6wg6NhtdGyLQ9ZLAi4G2WF+kHMK+7qULK1gr4VBHTPkkAv6nrJt7b70iFGir1Kj/K4iC6vsWPPUGMHjgzmCxxiq/mS0jQVCfNGvvyvZOk1VxQdQFcWmlbowNRtRQfsMacc0XWNpikHHL2RcgIG/7V0mJxJWyYlFA306lSk5Rv5Jg94oq+mM66egDSqW31xSm16J9OmGTOrcWSwSEF5xMi43xGSA1FL0rTd6NQSODKIJNRvfmfJxodQvmPJGlfZoN2nZo2gEHMZorWDYJQ6UxkR1DsuRLXuN0xw2L8c2brXSGE4Ug+mW6vkHn6gdpqKIbpw7RDcVcc6JtpolGv11I1g3HAcQ+MGcGQQwBOKyBnaNU/E0XhROY4zvn2fGrfKqUZ1wrDK7TSWTXCNI4NJBWWTXOYejb6tiF7fU4jbVIHQpxDgyCB6UF/IZ4Xete3x9GK3aSnXxW3X7kzcPvHrfzdi5SAypVuVKV3itqros1EzhykyxByAoz6FylOvNbx7obI3XqANbNPG70nMahwZrFBQOBizUjkUSZjqM3VTkgAcGYQSihuXoZR5fQobBAobF6KU9RsmqCJcjlLWb6TguD6YUqaSe3h27plSyrzulDJS9ypB70qZeupGwHc9U0oZcGQQwPqf3dsoZflxFy6UkTZlwrBQ5pkSyoAjgzkFf7ovhLLbb1+/3XWfDGfVCnzubGyYCiPLlGAGPRmEESovZcXMCJAX2pqRZUo5Q1Z30hmpW4DRjXSWdYVDLzgcNcu64gVqaSrZRsotEDIlpkFPfapppH6VyftT03ojD/qqvebLjmZ1ngyWLSjCjFlPG4xEIFOCGvRkDky1TPHEy3+iSooiia2TPOLXeRVw5kqeVWoauKtXAW2oSY1U4LQ1noQ9G4SpuwXsGIRptAqnM2ScoPwzZolz0FBBouMvRTvwOT3WQJ2GywJZEHAzHLrgzIpB54wZ2a0Ys32iOaoHaQDGfHyd+rjQXWld7ZfMqwbaQb+E5Kc6s0mVzeDANsR6LNIy1fCJVDt3CUYXw5lWWWyvYaoRp85Tn8OZA8nbH39+WLCAts2YrtZTnVtuWg9Wem1pysXJTAPcsc8DvAmckPyNHM5z9ZbWo5UOgtvw+UWkzpNBOCFJ/ZKvzv7lJiqtPx8LV3l1lXpNp+VIJTaLv/mWo1b8XT3y8T8=</diagram></mxfile>

setup.py

@@ -12,7 +12,7 @@ setup(
     url='https://home-assistant.io/',
     description=('Open-source private cloud os for Home-Assistant'
                  ' based on ResinOS'),
-    long_description=('A maintenainless private cloud operator system that'
+    long_description=('A maintainless private cloud operator system that'
                       'setup a Home-Assistant instance. Based on ResinOS'),
     classifiers=[
         'Intended Audience :: End Users/Desktop',
@@ -24,30 +24,31 @@ setup(
         'Topic :: Scientific/Engineering :: Atmospheric Science',
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
-        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
     keywords=['docker', 'home-assistant', 'api'],
     zip_safe=False,
     platforms='any',
     packages=[
         'hassio',
-        'hassio.dock',
+        'hassio.docker',
-        'hassio.api',
         'hassio.addons',
+        'hassio.api',
+        'hassio.misc',
+        'hassio.utils',
         'hassio.snapshots'
     ],
     include_package_data=True,
     install_requires=[
-        'async_timeout',
+        'attr==0.3.1',
-        'aiohttp',
+        'async_timeout==3.0.0',
-        'docker',
+        'aiohttp==3.2.1',
-        'colorlog',
+        'docker==3.3.0',
-        'voluptuous',
+        'colorlog==3.1.2',
-        'gitpython',
+        'voluptuous==0.11.1',
-        'pyotp',
+        'gitpython==2.1.10',
-        'pyqrcode',
+        'pytz==2018.4',
-        'pytz',
+        'pyudev==0.21.0',
-        'pyudev',
+        'pycryptodome==3.4.11'
-        'deepmerge'
     ]
 )

tox.ini

@@ -2,8 +2,6 @@
 envlist = lint
 
 [testenv]
-setenv =
-    PYTHONPATH = {toxinidir}:{toxinidir}/hassio
 deps =
     flake8
     pylint
@@ -13,4 +11,4 @@ basepython = python3
 ignore_errors = True
 commands =
      flake8 hassio
-     pylint hassio
+     pylint --rcfile pylintrc hassio

version.json

@@ -1,8 +1,4 @@
 {
-    "hassio": "0.65",
+    "hassio": "105",
-    "homeassistant": "0.54",
+    "homeassistant": "0.70.0"
-    "resinos": "1.1",
-    "resinhup": "0.3",
-    "generic": "0.3",
-    "cluster": "0.1"
 }