Fix version merge conflict

* Expose new function to add-ons

* Rename `hassio` to `hassio_api`

* fix lint

* done

API.md

@@ -1,10 +1,11 @@
-# HassIO Server
+# Hass.io Server
 
-## HassIO REST API
+## Hass.io RESTful API
 
-Interface for HomeAssistant to control things from supervisor.
+Interface for Home Assistant to control things from supervisor.
 
 On error:
+
 ```json
 {
     "result": "error",
@@ -12,7 +13,8 @@ On error:
 }
 ```
 
-On success
+On success:
+
 ```json
 {
     "result": "ok",
@@ -20,10 +22,9 @@ On success
 }
 ```
 
-### HassIO
+### Hass.io
 
 - GET `/supervisor/ping`
-
 - GET `/supervisor/info`
 
 The addons from `addons` are only installed one.
@@ -40,13 +41,11 @@ The addons from `addons` are only installed one.
             "name": "xy bla",
             "slug": "xy",
             "description": "description",
-            "arch": ["armhf", "aarch64", "i386", "amd64"],
             "repository": "12345678|null",
             "version": "LAST_VERSION",
             "installed": "INSTALL_VERSION",
-            "detached": "bool",
-            "build": "bool",
-            "url": "null|url"
+            "logo": "bool",
+            "state": "started|stopped",
         }
     ],
     "addons_repositories": [
@@ -55,12 +54,10 @@ The addons from `addons` are only installed one.
 }
 ```
 
-- GET `/supervisor/addons`
-
-Get all available addons. Will be delete soon. Look to `/addons`
-
 - POST `/supervisor/update`
+
 Optional:
+
 ```json
 {
     "version": "VERSION"
@@ -68,6 +65,7 @@ Optional:
 ```
 
 - POST `/supervisor/options`
+
 ```json
 {
     "beta_channel": "true|false",
@@ -84,11 +82,12 @@ Reload addons/version.
 
 - GET `/supervisor/logs`
 
-Output the raw docker log
+Output is the raw docker log.
 
 ### Security
 
 - GET `/security/info`
+
 ```json
 {
     "initialize": "bool",
@@ -97,6 +96,7 @@ Output the raw docker log
 ```
 
 - POST `/security/options`
+
 ```json
 {
     "password": "xy"
@@ -104,6 +104,7 @@ Output the raw docker log
 ```
 
 - POST `/security/totp`
+
 ```json
 {
     "password": "xy"
@@ -123,6 +124,7 @@ Return QR-Code
 ### Backup/Snapshot
 
 - GET `/snapshots`
+
 ```json
 {
     "snapshots": [
@@ -138,6 +140,7 @@ Return QR-Code
 - POST `/snapshots/reload`
 
 - POST `/snapshots/new/full`
+
 ```json
 {
     "name": "Optional"
@@ -145,6 +148,7 @@ Return QR-Code
 ```
 
 - POST `/snapshots/new/partial`
+
 ```json
 {
     "name": "Optional",
@@ -156,6 +160,7 @@ Return QR-Code
 - POST `/snapshots/reload`
 
 - GET `/snapshots/{slug}/info`
+
 ```json
 {
     "slug": "SNAPSHOT ID",
@@ -180,10 +185,9 @@ Return QR-Code
 ```
 
 - POST `/snapshots/{slug}/remove`
-
 - POST `/snapshots/{slug}/restore/full`
-
 - POST `/snapshots/{slug}/restore/partial`
+
 ```json
 {
     "homeassistant": "bool",
@@ -193,36 +197,68 @@ Return QR-Code
 ```
 
 ### Host
+
 - POST `/host/reload`
-
 - POST `/host/shutdown`
-
 - POST `/host/reboot`
-
 - GET `/host/info`
-See HostControl info command.
+
 ```json
 {
     "type": "",
     "version": "",
     "last_version": "",
-    "features": ["shutdown", "reboot", "update", "network_info", "network_control"],
+    "features": ["shutdown", "reboot", "update", "hostname", "network_info", "network_control"],
     "hostname": "",
-    "os": ""
+    "os": "",
+    "audio": {
+        "input": "0,0",
+        "output": "0,0"
+    }
+}
+```
+
+- POST `/host/options`
+
+```json
+{
+    "audio_input": "0,0",
+    "audio_output": "0,0"
 }
 ```
 
 - POST `/host/update`
+
 Optional:
+
 ```json
 {
     "version": "VERSION"
 }
 ```
 
+- GET `/host/hardware`
+```json
+{
+    "serial": ["/dev/xy"],
+    "input": ["Input device name"],
+    "disk": ["/dev/sdax"],
+    "audio": {
+        "CARD_ID": {
+            "name": "xy",
+            "type": "microphone",
+            "devices": {
+                "DEV_ID": "type of device"
+            }
+        }
+    }
+}
+```
+
 ### Network
 
 - GET `/network/info`
+
 ```json
 {
     "hostname": ""
@@ -230,18 +266,14 @@ Optional:
 ```
 
 - POST `/network/options`
+
 ```json
 {
     "hostname": "",
-    "mode": "dhcp|fixed",
-    "ssid": "",
-    "ip": "",
-    "netmask": "",
-    "gateway": ""
 }
 ```
 
-### HomeAssistant
+### Home Assistant
 
 - GET `/homeassistant/info`
 
@@ -256,7 +288,9 @@ Optional:
 ```
 
 - POST `/homeassistant/update`
+
 Optional:
+
 ```json
 {
     "version": "VERSION"
@@ -265,11 +299,11 @@ Optional:
 
 - GET `/homeassistant/logs`
 
-Output the raw docker log
+Output is the raw Docker log.
 
 - POST `/homeassistant/restart`
-
 - POST `/homeassistant/options`
+
 ```json
 {
     "devices": [],
@@ -280,11 +314,11 @@ Output the raw docker log
 
 Image with `null` and last_version with `null` reset this options.
 
-### REST API addons
+### RESTful for API addons
 
 - GET `/addons`
 
-Get all available addons
+Get all available addons.
 
 ```json
 {
@@ -299,7 +333,12 @@ Get all available addons
             "installed": "none|INSTALL_VERSION",
             "detached": "bool",
             "build": "bool",
-            "url": "null|url"
+            "privileged": ["NET_ADMIN", "SYS_ADMIN"],
+            "devices": ["/dev/xy"],
+            "url": "null|url",
+            "logo": "bool",
+            "audio": "bool",
+            "hassio_api": "bool"
         }
     ],
     "repositories": [
@@ -315,8 +354,8 @@ Get all available addons
 ```
 
 - POST `/addons/reload`
-
 - GET `/addons/{addon}/info`
+
 ```json
 {
     "name": "xy bla",
@@ -332,11 +371,22 @@ Get all available addons
     "build": "bool",
     "options": "{}",
     "network": "{}|null",
-    "host_network": "bool"
+    "host_network": "bool",
+    "privileged": ["NET_ADMIN", "SYS_ADMIN"],
+    "devices": ["/dev/xy"],
+    "logo": "bool",
+    "hassio_api": "bool",
+    "webui": "null|http(s)://[HOST]:port/xy/zx",
+    "audio": "bool",
+    "audio_input": "null|0,0",
+    "audio_output": "null|0,0"
 }
 ```
 
+- GET `/addons/{addon}/logo`
+
 - POST `/addons/{addon}/options`
+
 ```json
 {
     "boot": "auto|manual",
@@ -345,17 +395,21 @@ Get all available addons
       "CONTAINER": "port|[ip, port]"
     },
     "options": {},
+    "audio_output": "null|0,0",
+    "audio_input": "null|0,0"
 }
 ```
 
-For reset custom network settings, set it `null`.
+For reset custom network/audio settings, set it `null`.
 
 - POST `/addons/{addon}/start`
 
 - POST `/addons/{addon}/stop`
 
 - POST `/addons/{addon}/install`
+
 Optional:
+
 ```json
 {
     "version": "VERSION"
@@ -365,7 +419,9 @@ Optional:
 - POST `/addons/{addon}/uninstall`
 
 - POST `/addons/{addon}/update`
+
 Optional:
+
 ```json
 {
     "version": "VERSION"
@@ -374,15 +430,16 @@ Optional:
 
 - GET `/addons/{addon}/logs`
 
-Output the raw docker log
+Output is the raw Docker log.
 
 - POST `/addons/{addon}/restart`
 
 ## Host Control
 
-Communicate over unix socket with a host daemon.
+Communicate over UNIX socket with a host daemon.
 
 - commands
+
 ```
 # info
 -> {'type', 'version', 'last_version', 'features', 'hostname'}
@@ -401,7 +458,8 @@ Communicate over unix socket with a host daemon.
 # network int route xy
 ```
 
-features:
+Features:
+
 - shutdown
 - reboot
 - update

LICENSE

@@ -1,29 +1,201 @@
-BSD 3-Clause License
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-Copyright (c) 2017, Pascal Vizeli
-All rights reserved.
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+   1. Definitions.
 
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
 
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
 
-* Neither the name of the copyright holder nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2017 Pascal Vizeli
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,13 +1,13 @@
-# HassIO
+# Hass.io
+
 ### 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.
 
 ![](misc/hassio.png?raw=true)
 
-[HassIO-Addons](https://github.com/home-assistant/hassio-addons) | [HassIO-Build](https://github.com/home-assistant/hassio-build)
-
-**HassIO is under active development and is not ready yet for production use.**
+- [Hass.io Addons](https://github.com/home-assistant/hassio-addons)
+- [Hass.io Build](https://github.com/home-assistant/hassio-build)
 
 ## Installation
 

hassio/addons/__init__.py

@@ -78,7 +78,7 @@ class AddonManager(object):
 
             # don't add built-in repository to config
             if url not in BUILTIN_REPOSITORIES:
-                self.config.addons_repositories = url
+                self.config.add_addon_repository(url)
 
         tasks = [_add_repository(url) for url in new_rep - old_rep]
         if tasks:

hassio/addons/addon.py

@@ -19,7 +19,8 @@ from ..const import (
     ATTR_URL, ATTR_ARCH, ATTR_LOCATON, ATTR_DEVICES, ATTR_ENVIRONMENT,
     ATTR_HOST_NETWORK, ATTR_TMPFS, ATTR_PRIVILEGED, ATTR_STARTUP,
     STATE_STARTED, STATE_STOPPED, STATE_NONE, ATTR_USER, ATTR_SYSTEM,
-    ATTR_STATE, ATTR_TIMEOUT, ATTR_AUTO_UPDATE, ATTR_NETWORK)
+    ATTR_STATE, ATTR_TIMEOUT, ATTR_AUTO_UPDATE, ATTR_NETWORK, ATTR_WEBUI,
+    ATTR_HASSIO_API, ATTR_AUDIO, ATTR_AUDIO_OUTPUT, ATTR_AUDIO_INPUT)
 from .util import check_installed
 from ..dock.addon import DockerAddon
 from ..tools import write_json_file, read_json_file
@@ -27,6 +28,7 @@ from ..tools import write_json_file, read_json_file
 _LOGGER = logging.getLogger(__name__)
 
 RE_VOLUME = re.compile(MAP_VOLUME)
+RE_WEBUI = re.compile(r"^(.*\[HOST\]:)\[PORT:(\d+)\](.*)$")
 
 
 class Addon(object):
@@ -130,7 +132,8 @@ class Addon(object):
     @property
     def auto_update(self):
         """Return if auto update is enable."""
-        return self.data.user[self._id][ATTR_AUTO_UPDATE]
+        if ATTR_AUTO_UPDATE in self.data.user.get(self._id, {}):
+            return self.data.user[self._id][ATTR_AUTO_UPDATE]
 
     @auto_update.setter
     def auto_update(self, value):
@@ -196,6 +199,25 @@ class Addon(object):
 
         self.data.save()
 
+    @property
+    def webui(self):
+        """Return URL to webui or None."""
+        if ATTR_WEBUI not in self._mesh:
+            return
+
+        webui = self._mesh[ATTR_WEBUI]
+        dock_port = RE_WEBUI.sub(r"\2", webui)
+        if self.ports is None:
+            real_port = dock_port
+        else:
+            real_port = self.ports.get("{}/tcp".format(dock_port), dock_port)
+
+        # for interface config or port lists
+        if isinstance(real_port, (tuple, list)):
+            real_port = real_port[-1]
+
+        return RE_WEBUI.sub(r"\g<1>{}\g<3>".format(real_port), webui)
+
     @property
     def network_mode(self):
         """Return network mode of addon."""
@@ -223,11 +245,66 @@ class Addon(object):
         """Return list of privilege."""
         return self._mesh.get(ATTR_PRIVILEGED)
 
+    @property
+    def use_hassio_api(self):
+        """Return True if the add-on access to hassio api."""
+        return self._mesh[ATTR_HASSIO_API]
+
+    @property
+    def with_audio(self):
+        """Return True if the add-on access to audio."""
+        return self._mesh[ATTR_AUDIO]
+
+    @property
+    def audio_output(self):
+        """Return ALSA config for output or None."""
+        if not self.with_audio:
+            return
+
+        setting = self.config.audio_output
+        if self.is_installed and ATTR_AUDIO_OUTPUT in self.data.user[self._id]:
+            setting = self.data.user[self._id][ATTR_AUDIO_OUTPUT]
+        return setting
+
+    @audio_output.setter
+    def audio_output(self, value):
+        """Set/remove custom audio output settings."""
+        if value is None:
+            self.data.user[self._id].pop(ATTR_AUDIO_OUTPUT, None)
+        else:
+            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
+
+        setting = self.config.audio_input
+        if self.is_installed and ATTR_AUDIO_INPUT in self.data.user[self._id]:
+            setting = self.data.user[self._id][ATTR_AUDIO_INPUT]
+        return setting
+
+    @audio_input.setter
+    def audio_input(self, value):
+        """Set/remove custom audio input settings."""
+        if value is None:
+            self.data.user[self._id].pop(ATTR_AUDIO_INPUT, None)
+        else:
+            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_logo(self):
+        """Return True if a logo exists."""
+        return self.path_logo.exists()
+
     @property
     def supported_arch(self):
         """Return list of supported arch."""
@@ -273,15 +350,20 @@ class Addon(object):
         return PurePath(self.config.path_extern_addons_data, self._id)
 
     @property
-    def path_addon_options(self):
+    def path_options(self):
         """Return path to addons options."""
         return Path(self.path_data, "options.json")
 
     @property
-    def path_addon_location(self):
+    def path_location(self):
         """Return path to this addon."""
         return Path(self._mesh[ATTR_LOCATON])
 
+    @property
+    def path_logo(self):
+        """Return path to addon logo."""
+        return Path(self.path_location, 'logo.png')
+
     def write_options(self):
         """Return True if addon options is written to data."""
         schema = self.schema
@@ -289,7 +371,7 @@ class Addon(object):
 
         try:
             schema(options)
-            return write_json_file(self.path_addon_options, options)
+            return write_json_file(self.path_options, options)
         except vol.Invalid as ex:
             _LOGGER.error("Addon %s have wrong options -> %s", self._id,
                           humanize_error(options, ex))
@@ -305,6 +387,36 @@ class Addon(object):
             return vol.Schema(dict)
         return vol.Schema(vol.All(dict, validate_options(raw_schema)))
 
+    def test_udpate_schema(self):
+        """Check if the exists config valid after update."""
+        if not self.is_installed or self.is_detached:
+            return True
+
+        # load next schema
+        new_raw_schema = self.data.cache[self._id][ATTR_SCHEMA]
+        default_options = self.data.cache[self._id][ATTR_OPTIONS]
+
+        # if disabled
+        if isinstance(new_raw_schema, bool):
+            return True
+
+        # merge options
+        options = {
+            **self.data.user[self._id][ATTR_OPTIONS],
+            **default_options,
+        }
+
+        # create voluptuous
+        new_schema = \
+            vol.Schema(vol.All(dict, validate_options(new_raw_schema)))
+
+        # validate
+        try:
+            new_schema(options)
+        except vol.Invalid:
+            return False
+        return True
+
     async def install(self, version=None):
         """Install a addon."""
         if self.config.arch not in self.supported_arch:
@@ -352,14 +464,20 @@ class Addon(object):
         return STATE_STOPPED
 
     @check_installed
-    async def start(self):
-        """Set options and start addon."""
-        return await self.addon_docker.run()
+    def start(self):
+        """Set options and start addon.
+
+        Return a coroutine.
+        """
+        return self.addon_docker.run()
 
     @check_installed
-    async def stop(self):
-        """Stop addon."""
-        return await self.addon_docker.stop()
+    def stop(self):
+        """Stop addon.
+
+        Return a coroutine.
+        """
+        return self.addon_docker.stop()
 
     @check_installed
     async def update(self, version=None):
@@ -369,7 +487,7 @@ class Addon(object):
         if version == self.version_installed:
             _LOGGER.warning(
                 "Addon %s is already installed in %s", self._id, version)
-            return True
+            return False
 
         if not await self.addon_docker.update(version):
             return False
@@ -378,14 +496,20 @@ class Addon(object):
         return True
 
     @check_installed
-    async def restart(self):
-        """Restart addon."""
-        return await self.addon_docker.restart()
+    def restart(self):
+        """Restart addon.
+
+        Return a coroutine.
+        """
+        return self.addon_docker.restart()
 
     @check_installed
-    async def logs(self):
-        """Return addons log output."""
-        return await self.addon_docker.logs()
+    def logs(self):
+        """Return addons log output.
+
+        Return a coroutine.
+        """
+        return self.addon_docker.logs()
 
     @check_installed
     async def snapshot(self, tar_file):

hassio/addons/data.py

@@ -118,7 +118,7 @@ class Data(JsonConfig):
                 addon_config[ATTR_LOCATON] = str(addon.parent)
                 self._cache[addon_slug] = addon_config
 
-            except OSError:
+            except (OSError, json.JSONDecodeError):
                 _LOGGER.warning("Can't read %s", addon)
 
             except vol.Invalid as ex:

hassio/addons/validate.py

@@ -10,8 +10,9 @@ from ..const import (
     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_AUTO_UPDATE)
-from ..validate import NETWORK_PORT, DOCKER_PORTS
+    ATTR_AUTO_UPDATE, ATTR_WEBUI, ATTR_AUDIO, ATTR_AUDIO_INPUT,
+    ATTR_AUDIO_OUTPUT, ATTR_HASSIO_API)
+from ..validate import NETWORK_PORT, DOCKER_PORTS, ALSA_CHANNEL
 
 
 MAP_VOLUME = r"^(config|ssl|addons|backup|share)(?::(rw|:ro))?$"
@@ -35,16 +36,15 @@ STARTUP_ALL = [
     STARTUP_APPLICATION
 ]
 
-PRIVILEGE_ALL = [
-    "NET_ADMIN"
+PRIVILEGED_ALL = [
+    "NET_ADMIN",
+    "SYS_ADMIN",
+    "SYS_RAWIO"
 ]
 
 
-def _migrate_startup(value):
-    """Migrate startup schema.
-
-    REMOVE after 0.50-
-    """
+def _simple_startup(value):
+    """Simple startup schema."""
     if value == "before":
         return STARTUP_SERVICES
     if value == "after":
@@ -61,17 +61,21 @@ SCHEMA_ADDON_CONFIG = vol.Schema({
     vol.Optional(ATTR_URL): vol.Url(),
     vol.Optional(ATTR_ARCH, default=ARCH_ALL): [vol.In(ARCH_ALL)],
     vol.Required(ATTR_STARTUP):
-        vol.All(_migrate_startup, vol.In(STARTUP_ALL)),
+        vol.All(_simple_startup, vol.In(STARTUP_ALL)),
     vol.Required(ATTR_BOOT):
         vol.In([BOOT_AUTO, BOOT_MANUAL]),
     vol.Optional(ATTR_PORTS): DOCKER_PORTS,
+    vol.Optional(ATTR_WEBUI):
+        vol.Match(r"^(?:https?):\/\/\[HOST\]:\[PORT:\d+\].*$"),
     vol.Optional(ATTR_HOST_NETWORK, default=False): vol.Boolean(),
     vol.Optional(ATTR_DEVICES): [vol.Match(r"^(.*):(.*):([rwm]{1,3})$")],
     vol.Optional(ATTR_TMPFS):
         vol.Match(r"^size=(\d)*[kmg](,uid=\d{1,4})?(,rw)?$"),
     vol.Optional(ATTR_MAP, default=[]): [vol.Match(MAP_VOLUME)],
     vol.Optional(ATTR_ENVIRONMENT): {vol.Match(r"\w*"): vol.Coerce(str)},
-    vol.Optional(ATTR_PRIVILEGED): [vol.In(PRIVILEGE_ALL)],
+    vol.Optional(ATTR_PRIVILEGED): [vol.In(PRIVILEGED_ALL)],
+    vol.Optional(ATTR_AUDIO, default=False): vol.Boolean(),
+    vol.Optional(ATTR_HASSIO_API, default=False): vol.Boolean(),
     vol.Required(ATTR_OPTIONS): dict,
     vol.Required(ATTR_SCHEMA): vol.Any(vol.Schema({
         vol.Coerce(str): vol.Any(ADDON_ELEMENT, [
@@ -95,11 +99,13 @@ SCHEMA_REPOSITORY_CONFIG = vol.Schema({
 # pylint: disable=no-value-for-parameter
 SCHEMA_ADDON_USER = vol.Schema({
     vol.Required(ATTR_VERSION): vol.Coerce(str),
-    vol.Required(ATTR_OPTIONS): dict,
+    vol.Optional(ATTR_OPTIONS, default={}): 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_INPUT): ALSA_CHANNEL,
 })
 
 

hassio/api/__init__.py

@@ -28,14 +28,16 @@ class RestAPI(object):
         self._handler = None
         self.server = None
 
-    def register_host(self, host_control):
+    def register_host(self, host_control, hardware):
         """Register hostcontrol function."""
-        api_host = APIHost(self.config, self.loop, host_control)
+        api_host = APIHost(self.config, self.loop, host_control, hardware)
 
         self.webapp.router.add_get('/host/info', api_host.info)
+        self.webapp.router.add_get('/host/hardware', api_host.hardware)
         self.webapp.router.add_post('/host/reboot', api_host.reboot)
         self.webapp.router.add_post('/host/shutdown', api_host.shutdown)
         self.webapp.router.add_post('/host/update', api_host.update)
+        self.webapp.router.add_post('/host/options', api_host.options)
 
     def register_network(self, host_control):
         """Register network function."""
@@ -45,16 +47,14 @@ class RestAPI(object):
         self.webapp.router.add_post('/network/options', api_net.options)
 
     def register_supervisor(self, supervisor, snapshots, addons, host_control,
-                            websession):
+                            updater):
         """Register supervisor function."""
         api_supervisor = APISupervisor(
             self.config, self.loop, supervisor, snapshots, addons,
-            host_control, websession)
+            host_control, updater)
 
         self.webapp.router.add_get('/supervisor/ping', api_supervisor.ping)
         self.webapp.router.add_get('/supervisor/info', api_supervisor.info)
-        self.webapp.router.add_get(
-            '/supervisor/addons', api_supervisor.available_addons)
         self.webapp.router.add_post(
             '/supervisor/update', api_supervisor.update)
         self.webapp.router.add_post(
@@ -94,6 +94,7 @@ class RestAPI(object):
         self.webapp.router.add_post(
             '/addons/{addon}/options', api_addons.options)
         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."""

hassio/api/addons.py

@@ -11,7 +11,9 @@ from ..const import (
     ATTR_URL, ATTR_DESCRIPTON, ATTR_DETACHED, ATTR_NAME, ATTR_REPOSITORY,
     ATTR_BUILD, ATTR_AUTO_UPDATE, ATTR_NETWORK, ATTR_HOST_NETWORK, ATTR_SLUG,
     ATTR_SOURCE, ATTR_REPOSITORIES, ATTR_ADDONS, ATTR_ARCH, ATTR_MAINTAINER,
-    ATTR_INSTALLED, BOOT_AUTO, BOOT_MANUAL)
+    ATTR_INSTALLED, ATTR_LOGO, ATTR_WEBUI, ATTR_DEVICES, ATTR_PRIVILEGED,
+    ATTR_AUDIO, ATTR_AUDIO_INPUT, ATTR_AUDIO_OUTPUT, ATTR_HASSIO_API,
+    BOOT_AUTO, BOOT_MANUAL, CONTENT_TYPE_PNG, CONTENT_TYPE_BINARY)
 from ..validate import DOCKER_PORTS
 
 _LOGGER = logging.getLogger(__name__)
@@ -48,6 +50,14 @@ class APIAddons(object):
 
         return addon
 
+    @staticmethod
+    def _pretty_devices(addon):
+        """Return a simplified device list."""
+        dev_list = addon.devices
+        if not dev_list:
+            return
+        return [row.split(':')[0] for row in dev_list]
+
     @api_process
     async def list(self, request):
         """Return all addons / repositories ."""
@@ -63,7 +73,12 @@ 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_LOGO: addon.with_logo,
+                ATTR_HASSIO_API: addon.use_hassio_api,
+                ATTR_AUDIO: addon.with_audio,
             })
 
         data_repositories = []
@@ -82,9 +97,10 @@ class APIAddons(object):
         }
 
     @api_process
-    def reload(self, request):
+    async def reload(self, request):
         """Reload all addons data."""
-        return self.addons.reload()
+        await asyncio.shield(self.addons.reload(), loop=self.loop)
+        return True
 
     @api_process
     async def info(self, request):
@@ -106,6 +122,14 @@ class APIAddons(object):
             ATTR_BUILD: addon.need_build,
             ATTR_NETWORK: addon.ports,
             ATTR_HOST_NETWORK: addon.network_mode == 'host',
+            ATTR_PRIVILEGED: addon.privileged,
+            ATTR_DEVICES: self._pretty_devices(addon),
+            ATTR_LOGO: addon.with_logo,
+            ATTR_WEBUI: addon.webui,
+            ATTR_HASSIO_API: addon.use_hassio_api,
+            ATTR_AUDIO: addon.with_audio,
+            ATTR_AUDIO_INPUT: addon.audio_input,
+            ATTR_AUDIO_OUTPUT: addon.audio_output,
         }
 
     @api_process
@@ -127,6 +151,10 @@ class APIAddons(object):
             addon.auto_update = body[ATTR_AUTO_UPDATE]
         if ATTR_NETWORK in body:
             addon.ports = body[ATTR_NETWORK]
+        if ATTR_AUDIO_INPUT in body:
+            addon.audio_input = body[ATTR_AUDIO_INPUT]
+        if ATTR_AUDIO_OUTPUT in body:
+            addon.audio_output = body[ATTR_AUDIO_OUTPUT]
 
         return True
 
@@ -135,20 +163,26 @@ class APIAddons(object):
         """Install addon."""
         body = await api_validate(SCHEMA_VERSION, request)
         addon = self._extract_addon(request, check_installed=False)
-        version = body.get(ATTR_VERSION)
+        version = body.get(ATTR_VERSION, addon.last_version)
 
         return await asyncio.shield(
             addon.install(version=version), loop=self.loop)
 
     @api_process
-    async def uninstall(self, request):
-        """Uninstall addon."""
+    def uninstall(self, request):
+        """Uninstall addon.
+
+        Return a coroutine.
+        """
         addon = self._extract_addon(request)
-        return await asyncio.shield(addon.uninstall(), loop=self.loop)
+        return asyncio.shield(addon.uninstall(), loop=self.loop)
 
     @api_process
-    async def start(self, request):
-        """Start addon."""
+    def start(self, request):
+        """Start addon.
+
+        Return a coroutine.
+        """
         addon = self._extract_addon(request)
 
         # check options
@@ -158,32 +192,54 @@ class APIAddons(object):
         except vol.Invalid as ex:
             raise RuntimeError(humanize_error(options, ex)) from None
 
-        return await asyncio.shield(addon.start(), loop=self.loop)
+        return asyncio.shield(addon.start(), loop=self.loop)
 
     @api_process
-    async def stop(self, request):
-        """Stop addon."""
+    def stop(self, request):
+        """Stop addon.
+
+        Return a coroutine.
+        """
         addon = self._extract_addon(request)
-        return await asyncio.shield(addon.stop(), loop=self.loop)
+        return asyncio.shield(addon.stop(), loop=self.loop)
 
     @api_process
     async def update(self, request):
         """Update addon."""
         body = await api_validate(SCHEMA_VERSION, request)
         addon = self._extract_addon(request)
-        version = body.get(ATTR_VERSION)
+        version = body.get(ATTR_VERSION, addon.last_version)
+
+        if version == addon.version_installed:
+            raise RuntimeError("Version %s is already in use", version)
 
         return await asyncio.shield(
             addon.update(version=version), loop=self.loop)
 
     @api_process
-    async def restart(self, request):
-        """Restart addon."""
-        addon = self._extract_addon(request)
-        return await asyncio.shield(addon.restart(), loop=self.loop)
+    def restart(self, request):
+        """Restart addon.
 
-    @api_process_raw
+        Return a coroutine.
+        """
+        addon = self._extract_addon(request)
+        return asyncio.shield(addon.restart(), loop=self.loop)
+
+    @api_process_raw(CONTENT_TYPE_BINARY)
     def logs(self, request):
-        """Return logs from addon."""
+        """Return logs from addon.
+
+        Return a coroutine.
+        """
         addon = self._extract_addon(request)
         return addon.logs()
+
+    @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!")
+
+        with addon.path_logo.open('rb') as png:
+            return png.read()

hassio/api/homeassistant.py

@@ -6,7 +6,8 @@ import voluptuous as vol
 
 from .util import api_process, api_process_raw, api_validate
 from ..const import (
-    ATTR_VERSION, ATTR_LAST_VERSION, ATTR_DEVICES, ATTR_IMAGE, ATTR_CUSTOM)
+    ATTR_VERSION, ATTR_LAST_VERSION, ATTR_DEVICES, ATTR_IMAGE, ATTR_CUSTOM,
+    CONTENT_TYPE_BINARY)
 from ..validate import HASS_DEVICES
 
 _LOGGER = logging.getLogger(__name__)
@@ -62,24 +63,23 @@ class APIHomeAssistant(object):
     async def update(self, request):
         """Update homeassistant."""
         body = await api_validate(SCHEMA_VERSION, request)
-        version = body.get(ATTR_VERSION, self.config.last_homeassistant)
+        version = body.get(ATTR_VERSION, self.homeassistant.last_version)
 
-        if self.homeassistant.in_progress:
-            raise RuntimeError("Other task is in progress")
+        if version == self.homeassistant.version:
+            raise RuntimeError("Version {} is already in use".format(version))
 
         return await asyncio.shield(
             self.homeassistant.update(version), loop=self.loop)
 
     @api_process
-    async def restart(self, request):
-        """Restart homeassistant."""
-        if self.homeassistant.in_progress:
-            raise RuntimeError("Other task is in progress")
+    def restart(self, request):
+        """Restart homeassistant.
 
-        return await asyncio.shield(
-            self.homeassistant.restart(), loop=self.loop)
+        Return a coroutine.
+        """
+        return asyncio.shield(self.homeassistant.restart(), loop=self.loop)
 
-    @api_process_raw
+    @api_process_raw(CONTENT_TYPE_BINARY)
     def logs(self, request):
         """Return homeassistant docker logs.
 

hassio/api/host.py

@@ -7,7 +7,9 @@ import voluptuous as vol
 from .util import api_process_hostcontrol, api_process, api_validate
 from ..const import (
     ATTR_VERSION, ATTR_LAST_VERSION, ATTR_TYPE, ATTR_HOSTNAME, ATTR_FEATURES,
-    ATTR_OS)
+    ATTR_OS, ATTR_SERIAL, ATTR_INPUT, ATTR_DISK, ATTR_AUDIO, ATTR_AUDIO_INPUT,
+    ATTR_AUDIO_OUTPUT)
+from ..validate import ALSA_CHANNEL
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -15,15 +17,21 @@ SCHEMA_VERSION = vol.Schema({
     vol.Optional(ATTR_VERSION): vol.Coerce(str),
 })
 
+SCHEMA_OPTIONS = vol.Schema({
+    vol.Optional(ATTR_AUDIO_OUTPUT): ALSA_CHANNEL,
+    vol.Optional(ATTR_AUDIO_INPUT): ALSA_CHANNEL,
+})
+
 
 class APIHost(object):
     """Handle rest api for host functions."""
 
-    def __init__(self, config, loop, host_control):
+    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):
@@ -37,14 +45,32 @@ class APIHost(object):
             ATTR_OS: self.host_control.os_info,
         }
 
+    @api_process
+    async def options(self, request):
+        """Process host options."""
+        body = await api_validate(SCHEMA_OPTIONS, request)
+
+        if ATTR_AUDIO_OUTPUT in body:
+            self.config.audio_output = body[ATTR_AUDIO_OUTPUT]
+        if ATTR_AUDIO_INPUT in body:
+            self.config.audio_input = body[ATTR_AUDIO_INPUT]
+
+        return True
+
     @api_process_hostcontrol
     def reboot(self, request):
-        """Reboot host."""
+        """Reboot host.
+
+        Return a coroutine.
+        """
         return self.host_control.reboot()
 
     @api_process_hostcontrol
     def shutdown(self, request):
-        """Poweroff host."""
+        """Poweroff host.
+
+        Return a coroutine.
+        """
         return self.host_control.shutdown()
 
     @api_process_hostcontrol
@@ -54,7 +80,17 @@ class APIHost(object):
         version = body.get(ATTR_VERSION, self.host_control.last_version)
 
         if version == self.host_control.version:
-            raise RuntimeError("Version is already in use")
+            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):
+        """Return local hardware infos."""
+        return {
+            ATTR_SERIAL: self.local_hw.serial_devices,
+            ATTR_INPUT: self.local_hw.input_devices,
+            ATTR_DISK: self.local_hw.disk_devices,
+            ATTR_AUDIO: self.local_hw.audio_devices,
+        }

hassio/api/security.py

@@ -98,5 +98,5 @@ class APISecurity(object):
         session = hashlib.sha256(os.urandom(54)).hexdigest()
 
         # store session
-        self.config.security_sessions = (session, valid_until)
+        self.config.add_security_session(session, valid_until)
         return {ATTR_SESSION: session}

hassio/api/snapshots.py

@@ -63,9 +63,10 @@ class APISnapshots(object):
         }
 
     @api_process
-    def reload(self, request):
+    async def reload(self, request):
         """Reload snapshot list."""
-        return asyncio.shield(self.snapshots.reload(), loop=self.loop)
+        await asyncio.shield(self.snapshots.reload(), loop=self.loop)
+        return True
 
     @api_process
     async def info(self, request):
@@ -110,10 +111,13 @@ class APISnapshots(object):
             self.snapshots.do_snapshot_partial(**body), loop=self.loop)
 
     @api_process
-    async def restore_full(self, request):
-        """Full-Restore a snapshot."""
+    def restore_full(self, request):
+        """Full-Restore a snapshot.
+
+        Return a coroutine.
+        """
         snapshot = self._extract_snapshot(request)
-        return await asyncio.shield(
+        return asyncio.shield(
             self.snapshots.do_restore_full(snapshot), loop=self.loop)
 
     @api_process
@@ -124,7 +128,8 @@ class APISnapshots(object):
 
         return await asyncio.shield(
             self.snapshots.do_restore_partial(snapshot, **body),
-            loop=self.loop)
+            loop=self.loop
+        )
 
     @api_process
     async def remove(self, request):

hassio/api/supervisor.py

@@ -6,12 +6,11 @@ import voluptuous as vol
 
 from .util import api_process, api_process_raw, api_validate
 from ..const import (
-    ATTR_ADDONS, ATTR_VERSION, ATTR_LAST_VERSION, ATTR_BETA_CHANNEL,
-    HASSIO_VERSION, ATTR_ADDONS_REPOSITORIES, ATTR_REPOSITORIES,
-    ATTR_REPOSITORY, ATTR_DESCRIPTON, ATTR_NAME, ATTR_SLUG, ATTR_INSTALLED,
-    ATTR_DETACHED, ATTR_SOURCE, ATTR_MAINTAINER, ATTR_URL, ATTR_ARCH,
-    ATTR_BUILD, ATTR_TIMEZONE)
-from ..tools import validate_timezone
+    ATTR_ADDONS, ATTR_VERSION, ATTR_LAST_VERSION, ATTR_BETA_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)
+from ..validate import validate_timezone
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -31,7 +30,7 @@ class APISupervisor(object):
     """Handle rest api for supervisor functions."""
 
     def __init__(self, config, loop, supervisor, snapshots, addons,
-                 host_control, websession):
+                 host_control, updater):
         """Initialize supervisor rest api part."""
         self.config = config
         self.loop = loop
@@ -39,43 +38,7 @@ class APISupervisor(object):
         self.addons = addons
         self.snapshots = snapshots
         self.host_control = host_control
-        self.websession = websession
-
-    def _addons_list(self, only_installed=False):
-        """Return a list of addons."""
-        data = []
-        for addon in self.addons.list_addons:
-            if only_installed and not addon.is_installed:
-                continue
-
-            data.append({
-                ATTR_NAME: addon.name,
-                ATTR_SLUG: addon.slug,
-                ATTR_DESCRIPTON: addon.description,
-                ATTR_VERSION: addon.last_version,
-                ATTR_INSTALLED: addon.version_installed,
-                ATTR_ARCH: addon.supported_arch,
-                ATTR_DETACHED: addon.is_detached,
-                ATTR_REPOSITORY: addon.repository,
-                ATTR_BUILD: addon.need_build,
-                ATTR_URL: addon.url,
-            })
-
-        return data
-
-    def _repositories_list(self):
-        """Return a list of addons repositories."""
-        data = []
-        for repository in self.addons.list_repositories:
-            data.append({
-                ATTR_SLUG: repository.slug,
-                ATTR_NAME: repository.name,
-                ATTR_SOURCE: repository.source,
-                ATTR_URL: repository.url,
-                ATTR_MAINTAINER: repository.maintainer,
-            })
-
-        return data
+        self.updater = updater
 
     @api_process
     async def ping(self, request):
@@ -85,31 +48,37 @@ class APISupervisor(object):
     @api_process
     async def info(self, request):
         """Return host information."""
+        list_addons = []
+        for addon in self.addons.list_addons:
+            if addon.is_installed:
+                list_addons.append({
+                    ATTR_NAME: addon.name,
+                    ATTR_SLUG: addon.slug,
+                    ATTR_DESCRIPTON: addon.description,
+                    ATTR_STATE: await addon.state(),
+                    ATTR_VERSION: addon.last_version,
+                    ATTR_INSTALLED: addon.version_installed,
+                    ATTR_REPOSITORY: addon.repository,
+                    ATTR_LOGO: addon.with_logo,
+                })
+
         return {
             ATTR_VERSION: HASSIO_VERSION,
-            ATTR_LAST_VERSION: self.config.last_hassio,
-            ATTR_BETA_CHANNEL: self.config.upstream_beta,
+            ATTR_LAST_VERSION: self.updater.version_hassio,
+            ATTR_BETA_CHANNEL: self.updater.beta_channel,
             ATTR_ARCH: self.config.arch,
             ATTR_TIMEZONE: self.config.timezone,
-            ATTR_ADDONS: self._addons_list(only_installed=True),
+            ATTR_ADDONS: list_addons,
             ATTR_ADDONS_REPOSITORIES: self.config.addons_repositories,
         }
 
-    @api_process
-    async def available_addons(self, request):
-        """Return information for all available addons."""
-        return {
-            ATTR_ADDONS: self._addons_list(),
-            ATTR_REPOSITORIES: self._repositories_list(),
-        }
-
     @api_process
     async def options(self, request):
         """Set supervisor options."""
         body = await api_validate(SCHEMA_OPTIONS, request)
 
         if ATTR_BETA_CHANNEL in body:
-            self.config.upstream_beta = body[ATTR_BETA_CHANNEL]
+            self.updater.beta_channel = body[ATTR_BETA_CHANNEL]
 
         if ATTR_TIMEZONE in body:
             self.config.timezone = body[ATTR_TIMEZONE]
@@ -124,10 +93,10 @@ class APISupervisor(object):
     async def update(self, request):
         """Update supervisor OS."""
         body = await api_validate(SCHEMA_VERSION, request)
-        version = body.get(ATTR_VERSION, self.config.last_hassio)
+        version = body.get(ATTR_VERSION, self.updater.version_hassio)
 
         if version == self.supervisor.version:
-            raise RuntimeError("Version is already in use")
+            raise RuntimeError("Version {} is already in use".format(version))
 
         return await asyncio.shield(
             self.supervisor.update(version), loop=self.loop)
@@ -138,7 +107,7 @@ class APISupervisor(object):
         tasks = [
             self.addons.reload(),
             self.snapshots.reload(),
-            self.config.fetch_update_infos(self.websession),
+            self.updater.fetch_data(),
             self.host_control.load()
         ]
         results, _ = await asyncio.shield(
@@ -150,7 +119,7 @@ class APISupervisor(object):
 
         return True
 
-    @api_process_raw
+    @api_process_raw(CONTENT_TYPE_BINARY)
     def logs(self, request):
         """Return supervisor docker logs.
 

hassio/api/util.py

@@ -9,7 +9,8 @@ import voluptuous as vol
 from voluptuous.humanize import humanize_error
 
 from ..const import (
-    JSON_RESULT, JSON_DATA, JSON_MESSAGE, RESULT_OK, RESULT_ERROR)
+    JSON_RESULT, JSON_DATA, JSON_MESSAGE, RESULT_OK, RESULT_ERROR,
+    CONTENT_TYPE_BINARY)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -65,18 +66,23 @@ def api_process_hostcontrol(method):
     return wrap_hostcontrol
 
 
-def api_process_raw(method):
-    """Wrap function with raw output to rest api."""
-    async def wrap_api(api, *args, **kwargs):
-        """Return api information."""
-        try:
-            message = await method(api, *args, **kwargs)
-        except RuntimeError as err:
-            message = str(err).encode()
+def api_process_raw(content):
+    """Wrap content_type into function."""
+    def wrap_method(method):
+        """Wrap function with raw output to rest api."""
+        async def wrap_api(api, *args, **kwargs):
+            """Return api information."""
+            try:
+                msg_data = await method(api, *args, **kwargs)
+                msg_type = content
+            except RuntimeError as err:
+                msg_data = str(err).encode()
+                msg_type = CONTENT_TYPE_BINARY
 
-        return web.Response(body=message)
+            return web.Response(body=msg_data, content_type=msg_type)
 
-    return wrap_api
+        return wrap_api
+    return wrap_method
 
 
 def api_return_error(message=None):

hassio/config.py

@@ -4,121 +4,60 @@ import logging
 import os
 from pathlib import Path, PurePath
 
-import voluptuous as vol
-
-from .const import FILE_HASSIO_CONFIG, HASSIO_DATA
-from .tools import fetch_last_versions, JsonConfig, validate_timezone
+from .const import (
+    FILE_HASSIO_CONFIG, HASSIO_DATA, ATTR_SECURITY, ATTR_SESSIONS,
+    ATTR_PASSWORD, ATTR_TOTP, ATTR_TIMEZONE, ATTR_API_ENDPOINT,
+    ATTR_ADDONS_CUSTOM_LIST, ATTR_AUDIO_INPUT, ATTR_AUDIO_OUTPUT)
+from .tools import JsonConfig
+from .validate import SCHEMA_HASSIO_CONFIG
 
 _LOGGER = logging.getLogger(__name__)
 
 DATETIME_FORMAT = "%Y%m%d %H:%M:%S"
 
 HOMEASSISTANT_CONFIG = PurePath("homeassistant")
-HOMEASSISTANT_LAST = 'homeassistant_last'
 
 HASSIO_SSL = PurePath("ssl")
-HASSIO_LAST = 'hassio_last'
 
 ADDONS_CORE = PurePath("addons/core")
 ADDONS_LOCAL = PurePath("addons/local")
 ADDONS_GIT = PurePath("addons/git")
 ADDONS_DATA = PurePath("addons/data")
-ADDONS_CUSTOM_LIST = 'addons_custom_list'
 
 BACKUP_DATA = PurePath("backup")
 SHARE_DATA = PurePath("share")
 TMP_DATA = PurePath("tmp")
 
-UPSTREAM_BETA = 'upstream_beta'
-API_ENDPOINT = 'api_endpoint'
-TIMEZONE = 'timezone'
-
-SECURITY_INITIALIZE = 'security_initialize'
-SECURITY_TOTP = 'security_totp'
-SECURITY_PASSWORD = 'security_password'
-SECURITY_SESSIONS = 'security_sessions'
-
-
-# pylint: disable=no-value-for-parameter
-SCHEMA_CONFIG = vol.Schema({
-    vol.Optional(UPSTREAM_BETA, default=False): vol.Boolean(),
-    vol.Optional(API_ENDPOINT): vol.Coerce(str),
-    vol.Optional(TIMEZONE, default='UTC'): validate_timezone,
-    vol.Optional(HOMEASSISTANT_LAST): vol.Coerce(str),
-    vol.Optional(HASSIO_LAST): vol.Coerce(str),
-    vol.Optional(ADDONS_CUSTOM_LIST, default=[]): [vol.Url()],
-    vol.Optional(SECURITY_INITIALIZE, default=False): vol.Boolean(),
-    vol.Optional(SECURITY_TOTP): vol.Coerce(str),
-    vol.Optional(SECURITY_PASSWORD): vol.Coerce(str),
-    vol.Optional(SECURITY_SESSIONS, default={}):
-        {vol.Coerce(str): vol.Coerce(str)},
-}, extra=vol.REMOVE_EXTRA)
-
 
 class CoreConfig(JsonConfig):
     """Hold all core config data."""
 
     def __init__(self):
         """Initialize config object."""
-        super().__init__(FILE_HASSIO_CONFIG, SCHEMA_CONFIG)
+        super().__init__(FILE_HASSIO_CONFIG, SCHEMA_HASSIO_CONFIG)
         self.arch = None
 
-    async def fetch_update_infos(self, websession):
-        """Read current versions from web."""
-        last = await fetch_last_versions(websession, beta=self.upstream_beta)
-
-        if last:
-            self._data.update({
-                HOMEASSISTANT_LAST: last.get('homeassistant'),
-                HASSIO_LAST: last.get('hassio'),
-            })
-            self.save()
-            return True
-
-        return False
-
     @property
     def api_endpoint(self):
         """Return IP address of api endpoint."""
-        return self._data[API_ENDPOINT]
+        return self._data[ATTR_API_ENDPOINT]
 
     @api_endpoint.setter
     def api_endpoint(self, value):
         """Store IP address of api endpoint."""
-        self._data[API_ENDPOINT] = value
-
-    @property
-    def upstream_beta(self):
-        """Return True if we run in beta upstream."""
-        return self._data[UPSTREAM_BETA]
-
-    @upstream_beta.setter
-    def upstream_beta(self, value):
-        """Set beta upstream mode."""
-        self._data[UPSTREAM_BETA] = bool(value)
-        self.save()
+        self._data[ATTR_API_ENDPOINT] = value
 
     @property
     def timezone(self):
         """Return system timezone."""
-        return self._data[TIMEZONE]
+        return self._data[ATTR_TIMEZONE]
 
     @timezone.setter
     def timezone(self, value):
         """Set system timezone."""
-        self._data[TIMEZONE] = value
+        self._data[ATTR_TIMEZONE] = value
         self.save()
 
-    @property
-    def last_homeassistant(self):
-        """Actual version of homeassistant."""
-        return self._data.get(HOMEASSISTANT_LAST)
-
-    @property
-    def last_hassio(self):
-        """Actual version of hassio."""
-        return self._data.get(HASSIO_LAST)
-
     @property
     def path_hassio(self):
         """Return hassio data path."""
@@ -207,73 +146,95 @@ class CoreConfig(JsonConfig):
     @property
     def addons_repositories(self):
         """Return list of addons custom repositories."""
-        return self._data[ADDONS_CUSTOM_LIST]
+        return self._data[ATTR_ADDONS_CUSTOM_LIST]
 
-    @addons_repositories.setter
-    def addons_repositories(self, repo):
+    def add_addon_repository(self, repo):
         """Add a custom repository to list."""
-        if repo in self._data[ADDONS_CUSTOM_LIST]:
+        if repo in self._data[ATTR_ADDONS_CUSTOM_LIST]:
             return
 
-        self._data[ADDONS_CUSTOM_LIST].append(repo)
+        self._data[ATTR_ADDONS_CUSTOM_LIST].append(repo)
         self.save()
 
     def drop_addon_repository(self, repo):
         """Remove a custom repository from list."""
-        if repo not in self._data[ADDONS_CUSTOM_LIST]:
+        if repo not in self._data[ATTR_ADDONS_CUSTOM_LIST]:
             return
 
-        self._data[ADDONS_CUSTOM_LIST].remove(repo)
+        self._data[ATTR_ADDONS_CUSTOM_LIST].remove(repo)
         self.save()
 
     @property
     def security_initialize(self):
         """Return is security was initialize."""
-        return self._data[SECURITY_INITIALIZE]
+        return self._data[ATTR_SECURITY]
 
     @security_initialize.setter
     def security_initialize(self, value):
         """Set is security initialize."""
-        self._data[SECURITY_INITIALIZE] = value
+        self._data[ATTR_SECURITY] = value
         self.save()
 
     @property
     def security_totp(self):
         """Return the TOTP key."""
-        return self._data.get(SECURITY_TOTP)
+        return self._data.get(ATTR_TOTP)
 
     @security_totp.setter
     def security_totp(self, value):
         """Set the TOTP key."""
-        self._data[SECURITY_TOTP] = value
+        self._data[ATTR_TOTP] = value
         self.save()
 
     @property
     def security_password(self):
         """Return the password key."""
-        return self._data.get(SECURITY_PASSWORD)
+        return self._data.get(ATTR_PASSWORD)
 
     @security_password.setter
     def security_password(self, value):
         """Set the password key."""
-        self._data[SECURITY_PASSWORD] = value
+        self._data[ATTR_PASSWORD] = value
         self.save()
 
     @property
     def security_sessions(self):
         """Return api sessions."""
-        return {session: datetime.strptime(until, DATETIME_FORMAT) for
-                session, until in self._data[SECURITY_SESSIONS].items()}
+        return {
+            session: datetime.strptime(until, DATETIME_FORMAT) for
+            session, until in self._data[ATTR_SESSIONS].items()
+        }
 
-    @security_sessions.setter
-    def security_sessions(self, value):
+    def add_security_session(self, session, valid):
         """Set the a new session."""
-        session, valid = value
-        if valid is None:
-            self._data[SECURITY_SESSIONS].pop(session, None)
-        else:
-            self._data[SECURITY_SESSIONS].update(
-                {session: valid.strftime(DATETIME_FORMAT)}
-            )
-
+        self._data[ATTR_SESSIONS].update(
+            {session: valid.strftime(DATETIME_FORMAT)}
+        )
+        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

@@ -1,12 +1,10 @@
 """Const file for HassIO."""
 from pathlib import Path
 
-HASSIO_VERSION = '0.45'
+HASSIO_VERSION = '0.51'
 
 URL_HASSIO_VERSION = ('https://raw.githubusercontent.com/home-assistant/'
-                      'hassio/master/version.json')
-URL_HASSIO_VERSION_BETA = ('https://raw.githubusercontent.com/home-assistant/'
-                           'hassio/dev/version.json')
+                      'hassio/{}/version.json')
 
 URL_HASSIO_ADDONS = 'https://github.com/home-assistant/hassio-addons'
 
@@ -25,6 +23,7 @@ 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")
 
 SOCKET_DOCKER = Path("/var/run/docker.sock")
 SOCKET_HC = Path("/var/run/hassio-hc.sock")
@@ -44,6 +43,9 @@ JSON_MESSAGE = 'message'
 RESULT_ERROR = 'error'
 RESULT_OK = 'ok'
 
+CONTENT_TYPE_BINARY = 'application/octet-stream'
+CONTENT_TYPE_PNG = 'image/png'
+
 ATTR_DATE = 'date'
 ATTR_ARCH = 'arch'
 ATTR_HOSTNAME = 'hostname'
@@ -63,12 +65,14 @@ ATTR_STARTUP = 'startup'
 ATTR_BOOT = 'boot'
 ATTR_PORTS = 'ports'
 ATTR_MAP = 'map'
+ATTR_WEBUI = 'webui'
 ATTR_OPTIONS = 'options'
 ATTR_INSTALLED = 'installed'
 ATTR_DETACHED = 'detached'
 ATTR_STATE = 'state'
 ATTR_SCHEMA = 'schema'
 ATTR_IMAGE = 'image'
+ATTR_LOGO = 'logo'
 ATTR_ADDONS_REPOSITORIES = 'addons_repositories'
 ATTR_REPOSITORY = 'repository'
 ATTR_REPOSITORIES = 'repositories'
@@ -78,6 +82,7 @@ ATTR_PASSWORD = 'password'
 ATTR_TOTP = 'totp'
 ATTR_INITIALIZE = 'initialize'
 ATTR_SESSION = 'session'
+ATTR_SESSIONS = 'sessions'
 ATTR_LOCATON = 'location'
 ATTR_BUILD = 'build'
 ATTR_DEVICES = 'devices'
@@ -90,12 +95,24 @@ ATTR_USER = 'user'
 ATTR_SYSTEM = 'system'
 ATTR_SNAPSHOTS = 'snapshots'
 ATTR_HOMEASSISTANT = 'homeassistant'
+ATTR_HASSIO = 'hassio'
+ATTR_HASSIO_API = 'hassio_api'
 ATTR_FOLDERS = 'folders'
 ATTR_SIZE = 'size'
 ATTR_TYPE = 'type'
 ATTR_TIMEOUT = 'timeout'
 ATTR_AUTO_UPDATE = 'auto_update'
 ATTR_CUSTOM = 'custom'
+ATTR_AUDIO = 'audio'
+ATTR_AUDIO_INPUT = 'audio_input'
+ATTR_AUDIO_OUTPUT = 'audio_output'
+ATTR_INPUT = 'input'
+ATTR_OUTPUT = 'output'
+ATTR_DISK = 'disk'
+ATTR_SERIAL = 'serial'
+ATTR_SECURITY = 'security'
+ATTR_API_ENDPOINT = 'api_endpoint'
+ATTR_ADDONS_CUSTOM_LIST = 'addons_custom_list'
 
 STARTUP_INITIALIZE = 'initialize'
 STARTUP_SYSTEM = 'system'

hassio/core.py

@@ -14,10 +14,12 @@ from .const import (
     RUN_CLEANUP_API_SESSIONS, STARTUP_SYSTEM, STARTUP_SERVICES,
     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.supervisor import DockerSupervisor
 from .snapshots import SnapshotsManager
+from .updater import Updater
 from .tasks import (
     hassio_update, homeassistant_watchdog, api_sessions_cleanup, addons_update)
 from .tools import get_local_ip, fetch_timezone
@@ -34,8 +36,10 @@ class HassIO(object):
         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.dock = docker.DockerClient(
             base_url="unix:/{}".format(str(SOCKET_DOCKER)), version='auto')
 
@@ -44,7 +48,7 @@ class HassIO(object):
 
         # init homeassistant
         self.homeassistant = HomeAssistant(
-            config, loop, self.dock, self.websession)
+            config, loop, self.dock, self.updater)
 
         # init HostControl
         self.host_control = HostControl(loop)
@@ -81,11 +85,11 @@ class HassIO(object):
             self.host_control.load, RUN_UPDATE_INFO_TASKS)
 
         # rest api views
-        self.api.register_host(self.host_control)
+        self.api.register_host(self.host_control, self.hardware)
         self.api.register_network(self.host_control)
         self.api.register_supervisor(
             self.supervisor, self.snapshots, self.addons, self.host_control,
-            self.websession)
+            self.updater)
         self.api.register_homeassistant(self.homeassistant)
         self.api.register_addons(self.addons)
         self.api.register_security()
@@ -111,7 +115,7 @@ class HassIO(object):
 
         # schedule self update task
         self.scheduler.register_task(
-            hassio_update(self.config, self.supervisor, self.websession),
+            hassio_update(self.supervisor, self.updater),
             RUN_UPDATE_SUPERVISOR_TASKS)
 
         # schedule snapshot update tasks
@@ -126,7 +130,7 @@ class HassIO(object):
         # on release channel, try update itself
         # on beta channel, only read new versions
         await asyncio.wait(
-            [hassio_update(self.config, self.supervisor, self.websession)()],
+            [hassio_update(self.supervisor, self.updater)()],
             loop=self.loop
         )
 

hassio/dock/addon.py

@@ -32,6 +32,11 @@ class DockerAddon(DockerBase):
     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,
@@ -46,6 +51,16 @@ class DockerAddon(DockerBase):
             return {"/tmpfs": "{}".format(options)}
         return None
 
+    @property
+    def mapping(self):
+        """Return hosts mapping."""
+        if not self.addon.use_hassio_api:
+            return None
+
+        return {
+            'hassio': self.config.api_endpoint,
+        }
+
     @property
     def volumes(self):
         """Generate volumes for mappings."""
@@ -107,9 +122,11 @@ class DockerAddon(DockerBase):
             self.dock.containers.run(
                 self.image,
                 name=self.name,
+                hostname=self.addon.slug,
                 detach=True,
                 network_mode=self.addon.network_mode,
                 ports=self.addon.ports,
+                extra_hosts=self.mapping,
                 devices=self.addon.devices,
                 cap_add=self.addon.privileged,
                 environment=self.environment,
@@ -144,7 +161,7 @@ class DockerAddon(DockerBase):
         try:
             # prepare temporary addon build folder
             try:
-                source = self.addon.path_addon_location
+                source = self.addon.path_location
                 shutil.copytree(str(source), str(build_dir))
             except shutil.Error as err:
                 _LOGGER.error("Can't copy %s to temporary build folder -> %s",

hassio/dock/homeassistant.py

@@ -50,6 +50,7 @@ class DockerHomeAssistant(DockerBase):
             self.dock.containers.run(
                 self.image,
                 name=self.name,
+                hostname=self.name,
                 detach=True,
                 privileged=True,
                 devices=self.devices,

hassio/hardware.py

@@ -0,0 +1,87 @@
+"""Read hardware info from system."""
+import logging
+from pathlib import Path
+import re
+
+import pyudev
+
+from .const import ATTR_NAME, ATTR_TYPE, ATTR_DEVICES
+
+_LOGGER = logging.getLogger(__name__)
+
+ASOUND_CARDS = Path("/proc/asound/cards")
+RE_CARDS = re.compile(r"(\d+) \[(\w*) *\]: (.*\w)")
+
+ASOUND_DEVICES = Path("/proc/asound/devices")
+RE_DEVICES = re.compile(r"\[.*(\d+)- (\d+).*\]: ([\w ]*)")
+
+
+class Hardware(object):
+    """Represent a interface to procfs, sysfs and udev."""
+
+    def __init__(self):
+        """Init hardware object."""
+        self.context = pyudev.Context()
+
+    @property
+    def serial_devices(self):
+        """Return all serial and connected devices."""
+        dev_list = set()
+        for device in self.context.list_devices(subsystem='tty'):
+            if 'ID_VENDOR' in device:
+                dev_list.add(device.device_node)
+
+        return list(dev_list)
+
+    @property
+    def input_devices(self):
+        """Return all input devices."""
+        dev_list = set()
+        for device in self.context.list_devices(subsystem='input'):
+            if 'NAME' in device:
+                dev_list.add(device['NAME'].replace('"', ''))
+
+        return list(dev_list)
+
+    @property
+    def disk_devices(self):
+        """Return all disk devices."""
+        dev_list = set()
+        for device in self.context.list_devices(subsystem='block'):
+            if device.device_node.startswith('/dev/sd'):
+                dev_list.add(device.device_node)
+
+        return list(dev_list)
+
+    @property
+    def audio_devices(self):
+        """Return all available audio interfaces."""
+        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)
+            return
+
+        audio_list = {}
+
+        # parse cards
+        for match in RE_CARDS.finditer(cards):
+            audio_list[match.group(1)] = {
+                ATTR_NAME: match.group(3),
+                ATTR_TYPE: match.group(2),
+                ATTR_DEVICES: {},
+            }
+
+        # parse devices
+        for match in RE_DEVICES.finditer(devices):
+            try:
+                audio_list[match.group(1)][ATTR_DEVICES][match.group(2)] = \
+                    match.group(3)
+            except KeyError:
+                _LOGGER.warning("Wrong audio device found %s", match.group(0))
+                continue
+
+        return audio_list

hassio/homeassistant.py

@@ -16,12 +16,12 @@ _LOGGER = logging.getLogger(__name__)
 class HomeAssistant(JsonConfig):
     """Hass core object for handle it."""
 
-    def __init__(self, config, loop, dock, websession):
+    def __init__(self, config, loop, dock, updater):
         """Initialize hass object."""
         super().__init__(FILE_HASSIO_HOMEASSISTANT, SCHEMA_HASS_CONFIG)
         self.config = config
         self.loop = loop
-        self.websession = websession
+        self.updater = updater
         self.docker = DockerHomeAssistant(config, loop, dock, self)
 
     async def prepare(self):
@@ -45,7 +45,7 @@ class HomeAssistant(JsonConfig):
         """Return last available version of homeassistant."""
         if self.is_custom_image:
             return self._data.get(ATTR_LAST_VERSION)
-        return self.config.last_homeassistant
+        return self.updater.version_homeassistant
 
     @property
     def image(self):
@@ -101,7 +101,7 @@ class HomeAssistant(JsonConfig):
         while True:
             # read homeassistant tag and install it
             if not self.last_version:
-                await self.config.fetch_update_infos(self.websession)
+                await self.updater.fetch_data()
 
             tag = self.last_version
             if tag and await self.docker.install(tag):
@@ -113,13 +113,15 @@ class HomeAssistant(JsonConfig):
         _LOGGER.info("HomeAssistant docker now installed")
         await self.docker.cleanup()
 
-    def update(self, version=None):
-        """Update HomeAssistant version.
-
-        Return a coroutine.
-        """
+    async def update(self, version=None):
+        """Update HomeAssistant version."""
         version = version or self.last_version
-        return self.docker.update(version)
+
+        if version == self.docker.version:
+            _LOGGER.warning("Version %s is already installed", version)
+            return False
+
+        return await self.docker.update(version)
 
     def run(self):
         """Run HomeAssistant docker.

hassio/tasks.py

@@ -13,7 +13,7 @@ def api_sessions_cleanup(config):
         now = datetime.now()
         for session, until_valid in config.security_sessions.items():
             if now >= until_valid:
-                config.security_sessions = (session, None)
+                config.drop_security_session(session)
 
     return _api_sessions_cleanup
 
@@ -27,8 +27,14 @@ def addons_update(loop, addons):
             if not addon.is_installed or not addon.auto_update:
                 continue
 
-            if addon.version_installed != addon.version:
+            if addon.version_installed == addon.last_version:
+                continue
+
+            if addon.test_udpate_schema():
                 tasks.append(addon.update())
+            else:
+                _LOGGER.warning(
+                    "Addon %s will be ignore, schema tests fails", addon.slug)
 
         if tasks:
             _LOGGER.info("Addon auto update process %d tasks", len(tasks))
@@ -37,21 +43,21 @@ def addons_update(loop, addons):
     return _addons_update
 
 
-def hassio_update(config, supervisor, websession):
+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 config.fetch_update_infos(websession)
-        if config.last_hassio == supervisor.version:
+        await updater.fetch_data()
+        if updater.version_hassio == supervisor.version:
             return
 
         # don't perform a update on beta/dev channel
-        if config.upstream_beta:
+        if updater.beta_channel:
             _LOGGER.warning("Ignore Hass.IO update on beta upstream!")
             return
 
-        _LOGGER.info("Found new HassIO version %s.", config.last_hassio)
-        await supervisor.update(config.last_hassio)
+        _LOGGER.info("Found new HassIO version %s.", updater.version_hassio)
+        await supervisor.update(updater.version_hassio)
 
     return _hassio_update
 

hassio/tools.py

@@ -1,41 +1,21 @@
 """Tools file for HassIO."""
 import asyncio
 from contextlib import suppress
+from datetime import datetime
 import json
 import logging
 import socket
 
 import aiohttp
 import async_timeout
-import pytz
 import voluptuous as vol
 from voluptuous.humanize import humanize_error
 
-from .const import URL_HASSIO_VERSION, URL_HASSIO_VERSION_BETA
-
 _LOGGER = logging.getLogger(__name__)
 
 FREEGEOIP_URL = "https://freegeoip.io/json/"
 
 
-async def fetch_last_versions(websession, beta=False):
-    """Fetch current versions from github.
-
-    Is a coroutine.
-    """
-    url = URL_HASSIO_VERSION_BETA if beta else URL_HASSIO_VERSION
-    try:
-        with async_timeout.timeout(10, loop=websession.loop):
-            async with websession.get(url) as request:
-                return 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)
-
-    except json.JSONDecodeError as err:
-        _LOGGER.warning("Can't parse versions from %s! %s", url, err)
-
-
 def get_local_ip(loop):
     """Retrieve local IP address.
 
@@ -76,19 +56,6 @@ def read_json_file(jsonfile):
         return json.loads(cfile.read())
 
 
-def validate_timezone(timezone):
-    """Validate voluptuous timezone."""
-    try:
-        pytz.timezone(timezone)
-    except pytz.exceptions.UnknownTimeZoneError:
-        raise vol.Invalid(
-            "Invalid time zone passed in. Valid options can be found here: "
-            "http://en.wikipedia.org/wiki/List_of_tz_database_time_zones") \
-                from None
-
-    return timezone
-
-
 async def fetch_timezone(websession):
     """Read timezone from freegeoip."""
     data = {}
@@ -140,3 +107,27 @@ class JsonConfig(object):
             _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

@@ -0,0 +1,86 @@
+"""Fetch last versions from webserver."""
+import asyncio
+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)
+from .tools import AsyncThrottle, JsonConfig
+from .validate import SCHEMA_UPDATER_CONFIG
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class Updater(JsonConfig):
+    """Fetch last versions from version.json."""
+
+    def __init__(self, config, loop, websession):
+        """Initialize updater."""
+        super().__init__(FILE_HASSIO_UPDATER, SCHEMA_UPDATER_CONFIG)
+        self.config = config
+        self.loop = loop
+        self.websession = websession
+
+    @property
+    def version_homeassistant(self):
+        """Return last version of homeassistant."""
+        return self._data.get(ATTR_HOMEASSISTANT)
+
+    @property
+    def version_hassio(self):
+        """Return last version of hassio."""
+        return self._data.get(ATTR_HASSIO)
+
+    @property
+    def upstream(self):
+        """Return Upstream branch for version."""
+        if self.beta_channel:
+            return 'dev'
+        return 'master'
+
+    @property
+    def beta_channel(self):
+        """Return True if we run in beta upstream."""
+        return self._data[ATTR_BETA_CHANNEL]
+
+    @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):
+        """Fetch current versions from github.
+
+        Is a coroutine.
+        """
+        url = URL_HASSIO_VERSION.format(self.upstream)
+        try:
+            _LOGGER.info("Fetch update data from %s", url)
+            with async_timeout.timeout(10, loop=self.loop):
+                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)
+            return
+
+        except json.JSONDecodeError as err:
+            _LOGGER.warning("Can't parse versions from %s -> %s", url, err)
+            return
+
+        # data valid?
+        if not data:
+            _LOGGER.warning("Invalid data from %s", url)
+            return
+
+        # update versions
+        self._data[ATTR_HOMEASSISTANT] = data.get('homeassistant')
+        self._data[ATTR_HASSIO] = data.get('hassio')
+        self.save()

hassio/validate.py

@@ -1,11 +1,31 @@
 """Validate functions."""
 import voluptuous as vol
 
-from .const import ATTR_DEVICES, ATTR_IMAGE, ATTR_LAST_VERSION
+import pytz
+
+from .const import (
+    ATTR_DEVICES, ATTR_IMAGE, ATTR_LAST_VERSION, ATTR_SESSIONS, ATTR_PASSWORD,
+    ATTR_TOTP, ATTR_SECURITY, ATTR_BETA_CHANNEL, ATTR_TIMEZONE,
+    ATTR_API_ENDPOINT, ATTR_ADDONS_CUSTOM_LIST, ATTR_AUDIO_OUTPUT,
+    ATTR_AUDIO_INPUT, ATTR_HOMEASSISTANT, ATTR_HASSIO)
 
 
 NETWORK_PORT = vol.All(vol.Coerce(int), vol.Range(min=1, max=65535))
 HASS_DEVICES = [vol.Match(r"^[^/]*$")]
+ALSA_CHANNEL = vol.Match(r"\d+,\d+")
+
+
+def validate_timezone(timezone):
+    """Validate voluptuous timezone."""
+    try:
+        pytz.timezone(timezone)
+    except pytz.exceptions.UnknownTimeZoneError:
+        raise vol.Invalid(
+            "Invalid time zone passed in. Valid options can be found here: "
+            "http://en.wikipedia.org/wiki/List_of_tz_database_time_zones") \
+                from None
+
+    return timezone
 
 
 def convert_to_docker_ports(data):
@@ -40,3 +60,26 @@ SCHEMA_HASS_CONFIG = vol.Schema({
     vol.Inclusive(ATTR_IMAGE, 'custom_hass'): vol.Coerce(str),
     vol.Inclusive(ATTR_LAST_VERSION, 'custom_hass'): vol.Coerce(str),
 })
+
+
+# pylint: disable=no-value-for-parameter
+SCHEMA_UPDATER_CONFIG = vol.Schema({
+    vol.Optional(ATTR_BETA_CHANNEL, default=False): vol.Boolean(),
+    vol.Optional(ATTR_HOMEASSISTANT): vol.Coerce(str),
+    vol.Optional(ATTR_HASSIO): vol.Coerce(str),
+})
+
+
+# pylint: disable=no-value-for-parameter
+SCHEMA_HASSIO_CONFIG = vol.Schema({
+    vol.Optional(ATTR_API_ENDPOINT): vol.Coerce(str),
+    vol.Optional(ATTR_TIMEZONE, default='UTC'): validate_timezone,
+    vol.Optional(ATTR_ADDONS_CUSTOM_LIST, default=[]): [vol.Url()],
+    vol.Optional(ATTR_SECURITY, default=False): vol.Boolean(),
+    vol.Optional(ATTR_TOTP): vol.Coerce(str),
+    vol.Optional(ATTR_PASSWORD): vol.Coerce(str),
+    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)

setup.py

@@ -46,6 +46,7 @@ setup(
         'gitpython',
         'pyotp',
         'pyqrcode',
-        'pytz'
+        'pytz',
+        'pyudev'
     ]
 )

version.json

@@ -1,8 +1,8 @@
 {
-    "hassio": "0.45",
-    "homeassistant": "0.49",
-    "resinos": "0.8",
-    "resinhup": "0.1",
+    "hassio": "0.51",
+    "homeassistant": "0.50.2",
+    "resinos": "1.0",
+    "resinhup": "0.3",
     "generic": "0.3",
     "cluster": "0.1"
 }