Update API for hass api v2 (#14)

* Update API for hass api v2

* fix lint

* Refactory the old version of host_control

* cleanup

* Cleanup name inside addons/data

* Cleanup name inside addons/data p2

* Rename api list

* Fix path bug

* Fix wrong config set

Author: pvizeli

API.md

@@ -2,7 +2,7 @@
 
 ## HassIO REST API
 
-Interface for HomeAssistant to controll things from supervisor.
+Interface for HomeAssistant to control things from supervisor.
 
 On error:
 ```json
@@ -29,13 +29,13 @@ On success
 ```json
 {
     "version": "INSTALL_VERSION",
-    "current": "CURRENT_VERSION",
-    "beta": "true|false",
+    "last_version": "CURRENT_VERSION",
+    "beta_channel": "true|false",
     "addons": [
         {
             "name": "xy bla",
             "slug": "xy",
-            "version": "CURRENT_VERSION",
+            "version": "LAST_VERSION",
             "installed": "none|INSTALL_VERSION",
             "dedicated": "bool",
             "description": "description"
@@ -55,7 +55,7 @@ Optional:
 - `/supervisor/option`
 ```json
 {
-    "beta": "true|false"
+    "beta_channel": "true|false"
 }
 ```
 
@@ -74,13 +74,13 @@ Output the raw docker log
 - `/host/reboot`
 
 - `/host/info`
-See HostControll info command.
+See HostControl info command.
 ```json
 {
-    "os": "",
+    "type": "",
     "version": "",
-    "current": "",
-    "level": "",
+    "last_version": "",
+    "features": ["shutdown", "reboot", "update", "network_info", "network_control"],
     "hostname": "",
 }
 ```
@@ -116,7 +116,7 @@ Optional:
 ```json
 {
     "version": "INSTALL_VERSION",
-    "current": "CURRENT_VERSION"
+    "last_version": "LAST_VERSION"
 }
 ```
 
@@ -138,7 +138,7 @@ Output the raw docker log
 ```json
 {
     "version": "VERSION",
-    "current": "CURRENT_VERSION",
+    "last_version": "LAST_VERSION",
     "state": "started|stopped",
     "boot": "auto|manual",
     "options": {},
@@ -149,7 +149,7 @@ Output the raw docker log
 ```json
 {
     "boot": "auto|manual",
-    "options": {}, 
+    "options": {},
 }
 ```
 
@@ -179,14 +179,14 @@ Optional:
 
 Output the raw docker log
 
-## Host Controll
+## Host Control
 
 Communicate over unix socket with a host daemon.
 
 - commands
 ```
 # info
--> {'os', 'version', 'current', 'level', 'hostname'}
+-> {'type', 'version', 'last_version', 'features', 'hostname'}
 # reboot
 # shutdown
 # host-update [v]
@@ -200,10 +200,12 @@ Communicate over unix socket with a host daemon.
 # network int route xy
 ```
 
-level:
-- 1: power functions
-- 2: host update
-- 4: network functions
+features:
+- shutdown
+- reboot
+- update
+- network_info
+- network_control
 
 Answer:
 ```

README.md

@@ -1,7 +1,7 @@
 # HassIO
 First private cloud solution for home automation.
 
-It is a docker image (supervisor) they manage HomeAssistant docker and give a interface to controll itself over UI. It have a own eco system with addons to extend the functionality in a easy way.
+It is a docker image (supervisor) they manage HomeAssistant docker and give a interface to control itself over UI. It have a own eco system with addons to extend the functionality in a easy way.
 
 [HassIO-Addons](https://github.com/pvizeli/hassio-addons) | [HassIO-Build](https://github.com/pvizeli/hassio-build)
 
@@ -33,8 +33,8 @@ After extracting the archive, flash it to a drive using [Etcher](https://etcher.
 ## History
 - **0.1**: First techpreview with dumy supervisor (ResinOS 2.0.0-RC5)
 - **0.2**: Fix some bugs and update it to HassIO 0.2
-- **0.3**: Update HostControll and feature for HassIO 0.3 (ResinOS 2.0.0 / need reflash)
-- **0.4**: Update HostControll and bring resinos OTA (resinhub) back (ResinOS 2.0.0-rev3)
+- **0.3**: Update HostControl and feature for HassIO 0.3 (ResinOS 2.0.0 / need reflash)
+- **0.4**: Update HostControl and bring resinos OTA (resinhub) back (ResinOS 2.0.0-rev3)
 
 ## Configuring the image
 You can configure the WiFi network that the image should connect to after flashing using [`resin-device-toolbox`](https://resinos.io/docs/raspberrypi3/gettingstarted/#install-resin-device-toolbox).

hassio/addons/__init__.py

@@ -78,7 +78,7 @@ async def install(self, addon, version=None):
         addon_docker = DockerAddon(
             self.config, self.loop, self.dock, self, addon)
 
-        version = version or self.get_version(addon)
+        version = version or self.get_last_version(addon)
         if not await addon_docker.install(version):
             return False
 
@@ -144,7 +144,7 @@ async def update(self, addon, version=None):
             _LOGGER.error("No docker found for addon %s", addon)
             return False
 
-        version = version or self.get_version(addon)
+        version = version or self.get_last_version(addon)
         is_running = self.dockers[addon].is_running()
 
         # update

hassio/addons/data.py

@@ -28,7 +28,7 @@ def __init__(self, config):
         """Initialize data holder."""
         super().__init__(FILE_HASSIO_ADDONS)
         self.config = config
-        self._addons_data = self._data.get(SYSTEM, {})
+        self._system_data = self._data.get(SYSTEM, {})
         self._user_data = self._data.get(USER, {})
         self._current_data = {}
         self.arch = None
@@ -37,7 +37,7 @@ def save(self):
         """Store data to config file."""
         self._data = {
             USER: self._user_data,
-            SYSTEM: self._addons_data,
+            SYSTEM: self._system_data,
         }
         super().save()
 
@@ -69,13 +69,13 @@ def _read_addons_folder(self, folder):
     @property
     def list_installed(self):
         """Return a list of installed addons."""
-        return set(self._addons_data.keys())
+        return set(self._system_data.keys())
 
     @property
-    def list(self):
-        """Return a list of available addons."""
+    def list_api(self):
+        """Return a list of available addons for api."""
         data = []
-        all_addons = {**self._addons_data, **self._current_data}
+        all_addons = {**self._system_data, **self._current_data}
         dedicated = self.list_removed
 
         for addon, values in all_addons.items():
@@ -95,12 +95,12 @@ def list(self):
     def list_startup(self, start_type):
         """Get list of installed addon with need start by type."""
         addon_list = set()
-        for addon in self._addons_data.keys():
+        for addon in self._system_data.keys():
             if self.get_boot(addon) != BOOT_AUTO:
                 continue
 
             try:
-                if self._addons_data[addon][ATTR_STARTUP] == start_type:
+                if self._system_data[addon][ATTR_STARTUP] == start_type:
                     addon_list.add(addon)
             except KeyError:
                 _LOGGER.warning("Orphaned addon detect %s", addon)
@@ -112,30 +112,27 @@ def list_startup(self, start_type):
     def list_removed(self):
         """Return local addons they not support from repo."""
         addon_list = set()
-        for addon in self._addons_data.keys():
+        for addon in self._system_data.keys():
             if addon not in self._current_data:
                 addon_list.add(addon)
 
         return addon_list
 
     def exists_addon(self, addon):
         """Return True if a addon exists."""
-        return addon in self._current_data or addon in self._addons_data
+        return addon in self._current_data or addon in self._system_data
 
     def is_installed(self, addon):
         """Return True if a addon is installed."""
-        return addon in self._addons_data
+        return addon in self._system_data
 
     def version_installed(self, addon):
         """Return installed version."""
-        if ATTR_VERSION not in self._user_data[addon]:
-            return self._addons_data[addon][ATTR_VERSION]
-
         return self._user_data[addon][ATTR_VERSION]
 
     def set_addon_install(self, addon, version):
         """Set addon as installed."""
-        self._addons_data[addon] = self._current_data[addon]
+        self._system_data[addon] = self._current_data[addon]
         self._user_data[addon] = {
             ATTR_OPTIONS: {},
             ATTR_VERSION: version,
@@ -144,13 +141,13 @@ def set_addon_install(self, addon, version):
 
     def set_addon_uninstall(self, addon):
         """Set addon as uninstalled."""
-        self._addons_data.pop(addon, None)
+        self._system_data.pop(addon, None)
         self._user_data.pop(addon, None)
         self.save()
 
     def set_addon_update(self, addon, version):
         """Update version of addon."""
-        self._addons_data[addon] = self._current_data[addon]
+        self._system_data[addon] = self._current_data[addon]
         self._user_data[addon][ATTR_VERSION] = version
         self.save()
 
@@ -167,7 +164,7 @@ def set_boot(self, addon, boot):
     def get_options(self, addon):
         """Return options with local changes."""
         return {
-            **self._addons_data[addon][ATTR_OPTIONS],
+            **self._system_data[addon][ATTR_OPTIONS],
             **self._user_data[addon][ATTR_OPTIONS],
         }
 
@@ -176,29 +173,29 @@ def get_boot(self, addon):
         if ATTR_BOOT in self._user_data[addon]:
             return self._user_data[addon][ATTR_BOOT]
 
-        return self._addons_data[addon][ATTR_BOOT]
+        return self._system_data[addon][ATTR_BOOT]
 
     def get_name(self, addon):
         """Return name of addon."""
-        return self._addons_data[addon][ATTR_NAME]
+        return self._system_data[addon][ATTR_NAME]
 
     def get_description(self, addon):
         """Return description of addon."""
-        return self._addons_data[addon][ATTR_DESCRIPTON]
+        return self._system_data[addon][ATTR_DESCRIPTON]
 
-    def get_version(self, addon):
+    def get_last_version(self, addon):
         """Return version of addon."""
         if addon not in self._current_data:
             return self.version_installed(addon)
         return self._current_data[addon][ATTR_VERSION]
 
     def get_ports(self, addon):
         """Return ports of addon."""
-        return self._addons_data[addon].get(ATTR_PORTS)
+        return self._system_data[addon].get(ATTR_PORTS)
 
     def get_image(self, addon):
         """Return image name of addon."""
-        addon_data = self._addons_data.get(addon, self._current_data[addon])
+        addon_data = self._system_data.get(addon, self._current_data[addon])
 
         if ATTR_IMAGE not in addon_data:
             return "{}/{}-addon-{}".format(DOCKER_REPO, self.arch, addon)
@@ -207,11 +204,11 @@ def get_image(self, addon):
 
     def need_config(self, addon):
         """Return True if config map is needed."""
-        return self._addons_data[addon][ATTR_MAP_CONFIG]
+        return self._system_data[addon][ATTR_MAP_CONFIG]
 
     def need_ssl(self, addon):
         """Return True if ssl map is needed."""
-        return self._addons_data[addon][ATTR_MAP_SSL]
+        return self._system_data[addon][ATTR_MAP_SSL]
 
     def path_data(self, addon):
         """Return addon data path inside supervisor."""
@@ -241,7 +238,7 @@ def write_addon_options(self, addon):
 
     def get_schema(self, addon):
         """Create a schema for addon options."""
-        raw_schema = self._addons_data[addon][ATTR_SCHEMA]
+        raw_schema = self._system_data[addon][ATTR_SCHEMA]
 
         schema = vol.Schema(vol.All(dict, validate_options(raw_schema)))
         return schema

hassio/api/__init__.py

@@ -25,26 +25,26 @@ def __init__(self, config, loop):
         self._handler = None
         self.server = None
 
-    def register_host(self, host_controll):
-        """Register hostcontroll function."""
-        api_host = APIHost(self.config, self.loop, host_controll)
+    def register_host(self, host_control):
+        """Register hostcontrol function."""
+        api_host = APIHost(self.config, self.loop, host_control)
 
         self.webapp.router.add_get('/host/info', api_host.info)
         self.webapp.router.add_get('/host/reboot', api_host.reboot)
         self.webapp.router.add_get('/host/shutdown', api_host.shutdown)
         self.webapp.router.add_get('/host/update', api_host.update)
 
-    def register_network(self, host_controll):
+    def register_network(self, host_control):
         """Register network function."""
-        api_net = APINetwork(self.config, self.loop, host_controll)
+        api_net = APINetwork(self.config, self.loop, host_control)
 
         self.webapp.router.add_get('/network/info', api_net.info)
         self.webapp.router.add_get('/network/options', api_net.options)
 
-    def register_supervisor(self, supervisor, addons):
+    def register_supervisor(self, supervisor, addons, host_control):
         """Register supervisor function."""
         api_supervisor = APISupervisor(
-            self.config, self.loop, supervisor, addons)
+            self.config, self.loop, supervisor, addons, host_control)
 
         self.webapp.router.add_get('/supervisor/ping', api_supervisor.ping)
         self.webapp.router.add_get('/supervisor/info', api_supervisor.info)