Merge pull request #1168 from home-assistant/dev

Release 170

.devcontainer/Dockerfile

@@ -0,0 +1,27 @@
+FROM python:3.7
+
+WORKDIR /workspace
+
+# install Node/Yarn for Frontent
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        curl \
+        git \
+        apt-utils \
+        apt-transport-https \
+    && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+    && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+    && apt-get update && apt-get install -y --no-install-recommends \
+        nodejs \
+        yarn \
+    && curl -o - https://raw.githubusercontent.com/creationix/nvm/v0.34.0/install.sh | bash \
+    && rm -rf /var/lib/apt/lists/*
+ENV NVM_DIR /root/.nvm
+
+# Install Python dependencies from requirements.txt if it exists
+COPY requirements.txt requirements_tests.txt /workspace/
+RUN pip install -r requirements.txt \
+    && pip3 install -r requirements_tests.txt \
+    && pip install black tox
+
+# Set the default shell to bash instead of sh
+ENV SHELL /bin/bash

.devcontainer/devcontainer.json

@@ -0,0 +1,22 @@
+// See https://aka.ms/vscode-remote/devcontainer.json for format details.
+{
+	"name": "Hass.io dev",
+	"context": "..",
+	"dockerFile": "Dockerfile",
+	"runArgs": [
+		"-e", "GIT_EDTIOR='code --wait'"
+	],
+	"extensions": [
+		"ms-python.python"
+	],
+	"settings": {
+		"python.pythonPath": "/usr/local/bin/python",
+		"python.linting.pylintEnabled": true,
+		"python.linting.enabled": true,
+		"python.formatting.provider": "black",
+		"editor.formatOnPaste": false,
+		"editor.formatOnSave": true,
+		"editor.formatOnType": true,
+		"files.trimTrailingWhitespace": true
+	}
+}

.dockerignore

@@ -1,13 +1,20 @@
 # General files
 .git
 .github
+.devcontainer
+.vscode
 
 # Test related files
 .tox
 
 # Temporary files
 **/__pycache__
+.pytest_cache
 
 # virtualenv
 venv/
-ENV/
+
+# HA
+home-assistant-polymer/*
+misc/*
+script/*

.gitignore

@@ -92,4 +92,6 @@ ENV/
 .pylint.d/
 
 # VS Code
-.vscode/
+.vscode/*
+!.vscode/cSpell.json
+!.vscode/tasks.json

.vscode/tasks.json

@@ -0,0 +1,19 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Update UI",
+            "type": "shell",
+            "command": "./script/update-frontend.sh",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "presentation": {
+                "reveal": "always",
+                "panel": "new"
+            },
+            "problemMatcher": []
+        }
+    ]
+}

API.md

@@ -730,7 +730,8 @@ return:
     "arch": "arch",
     "supported_arch": ["arch1", "arch2"],
     "channel": "stable|beta|dev",
-    "logging": "debug|info|warning|error|critical"
+    "logging": "debug|info|warning|error|critical",
+    "timezone": "Europe/Zurich"
 }
 ```
 

Dockerfile

@@ -1,8 +1,6 @@
 ARG BUILD_FROM
 FROM $BUILD_FROM
 
-ARG BUILD_ARCH
-
 # Install base
 RUN apk add --no-cache \
     openssl \
@@ -12,17 +10,29 @@ RUN apk add --no-cache \
     socat \
     glib \
     libstdc++ \
+    eudev \
     eudev-libs
 
+ARG BUILD_ARCH
+WORKDIR /usr/src
+
 # Install requirements
-COPY requirements.txt /usr/src/
+COPY requirements.txt .
 RUN export MAKEFLAGS="-j$(nproc)" \
-    && pip3 install --no-cache-dir --find-links https://wheels.hass.io/alpine-3.9/${BUILD_ARCH}/ \
-        -r /usr/src/requirements.txt \
-    && rm -f /usr/src/requirements.txt
+    && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links \
+        "https://wheels.home-assistant.io/alpine-$(cut -d '.' -f 1-2 < /etc/alpine-release)/${BUILD_ARCH}/" \
+        -r ./requirements.txt \
+    && rm -f requirements.txt
 
 # Install HassIO
-COPY . /usr/src/hassio
-RUN pip3 install --no-cache-dir -e /usr/src/hassio
+COPY . hassio
+RUN pip3 install --no-cache-dir -e ./hassio \
+    && python3 -m compileall ./hassio/hassio
 
+
+# Initialize udev daemon, handle CMD
+COPY entry.sh /bin/
+ENTRYPOINT ["/bin/entry.sh"]
+
+WORKDIR /
 CMD [ "python3", "-m", "hassio" ]

azure-pipelines.yml

@@ -1,6 +1,7 @@
 # https://dev.azure.com/home-assistant
 
 trigger:
+  batch: true
   branches:
     include:
     - master
@@ -11,146 +12,157 @@ trigger:
     exclude:
     - untagged*
 pr:
-- dev
-
+  - dev
 variables:
+  - name: basePythonTag
+    value: '3.7-alpine3.10'
   - name: versionHadolint
     value: 'v1.16.3'
   - name: versionBuilder
-    value: '3.2'
+    value: '4.4'
   - name: versionWheels
-    value: '0.3'
+    value: '1.0-3.7-alpine3.10'
   - group: docker
   - group: wheels
 
-jobs:
 
-- job: 'Tox'
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - task: UsePythonVersion@0
-    displayName: 'Use Python $(python.version)'
-    inputs:
-      versionSpec: '3.7'
-  - script: pip install tox
-    displayName: 'Install Tox'
-  - script: tox
-    displayName: 'Run Tox'
+stages:
 
+- stage: 'Test'
+  jobs:
+  - job: 'Tox'
+    pool:
+      vmImage: 'ubuntu-latest'
+    steps:
+    - task: UsePythonVersion@0
+      displayName: 'Use Python 3.7'
+      inputs:
+        versionSpec: '3.7'
+    - script: pip install tox
+      displayName: 'Install Tox'
+    - script: tox
+      displayName: 'Run Tox'
+  - job: 'Black'
+    pool:
+      vmImage: 'ubuntu-latest'
+    steps:
+    - task: UsePythonVersion@0
+      displayName: 'Use Python $(python.version)'
+      inputs:
+        versionSpec: '3.7'
+    - script: pip install black
+      displayName: 'Install black'
+    - script: black --check hassio tests
+      displayName: 'Run Black'
+  - job: 'JQ'
+    pool:
+      vmImage: 'ubuntu-latest'
+    steps:
+    - script: sudo apt-get install -y jq
+      displayName: 'Install JQ'
+    - bash: |
+        shopt -s globstar
+        cat **/*.json | jq '.'
+      displayName: 'Run JQ'
+  - job: 'Hadolint'
+    pool:
+      vmImage: 'ubuntu-latest'
+    steps:
+    - script: sudo docker pull hadolint/hadolint:$(versionHadolint)
+      displayName: 'Install Hadolint'
+    - script: |
+        sudo docker run --rm -i \
+          -v $(pwd)/.hadolint.yaml:/.hadolint.yaml:ro \
+          hadolint/hadolint:$(versionHadolint) < Dockerfile
+      displayName: 'Run Hadolint'
 
-- job: 'JQ'
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - script: sudo apt-get install -y jq
-    displayName: 'Install JQ'
-  - bash: |
-      shopt -s globstar
-      cat **/*.json | jq '.'
-    displayName: 'Run JQ'
+- stage: 'Wheels'
+  jobs:
+  - job: 'Wheels'
+    condition: eq(variables['Build.SourceBranchName'], 'dev')
+    timeoutInMinutes: 360
+    pool:
+      vmImage: 'ubuntu-latest'
+    strategy:
+      maxParallel: 5
+      matrix:
+        amd64:
+          buildArch: 'amd64'
+        i386:
+          buildArch: 'i386'
+        armhf:
+          buildArch: 'armhf'
+        armv7:
+          buildArch: 'armv7'
+        aarch64:
+          buildArch: 'aarch64'
+    steps:
+    - script: |
+        sudo apt-get update
+        sudo apt-get install -y --no-install-recommends \
+          qemu-user-static \
+          binfmt-support \
+          curl
 
+        sudo mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc
+        sudo update-binfmts --enable qemu-arm
+        sudo update-binfmts --enable qemu-aarch64
+      displayName: 'Initial cross build'
+    - script: |
+        mkdir -p .ssh
+        echo -e "-----BEGIN RSA PRIVATE KEY-----\n$(wheelsSSH)\n-----END RSA PRIVATE KEY-----" >> .ssh/id_rsa
+        ssh-keyscan -H $(wheelsHost) >> .ssh/known_hosts
+        chmod 600 .ssh/*
+      displayName: 'Install ssh key'
+    - script: sudo docker pull homeassistant/$(buildArch)-wheels:$(versionWheels)
+      displayName: 'Install wheels builder'
+    - script: |
+        sudo docker run --rm -v $(pwd):/data:ro -v $(pwd)/.ssh:/root/.ssh:rw \
+          homeassistant/$(buildArch)-wheels:$(versionWheels) \
+          --apk "build-base;libffi-dev;openssl-dev" \
+          --index $(wheelsIndex) \
+          --requirement requirements.txt \
+          --upload rsync \
+          --remote wheels@$(wheelsHost):/opt/wheels
+      displayName: 'Run wheels build'
 
-- job: 'Hadolint'
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - script: sudo docker pull hadolint/hadolint:$(versionHadolint)
-    displayName: 'Install Hadolint'
-  - script: |
-      sudo docker run --rm -i \
-        -v $(pwd)/.hadolint.yaml:/.hadolint.yaml:ro \
-        hadolint/hadolint:$(versionHadolint) < Dockerfile
-    displayName: 'Run Hadolint'
+- stage: 'Deploy'
+  jobs:
+  - job: 'VersionValidate'
+    condition: or(startsWith(variables['Build.SourceBranch'], 'refs/tags'), eq(variables['Build.SourceBranchName'], 'dev'))
+    pool:
+      vmImage: 'ubuntu-latest'
+    steps:
+    - task: UsePythonVersion@0
+      displayName: 'Use Python 3.7'
+      inputs:
+        versionSpec: '3.7'
+    - script: |
+        setup_version="$(python setup.py -V)"
+        branch_version="$(Build.SourceBranchName)"
 
-
-- job: 'Wheels'
-  condition: eq(variables['Build.SourceBranchName'], 'dev')
-  timeoutInMinutes: 360
-  pool:
-    vmImage: 'ubuntu-16.04'
-  strategy:
-    maxParallel: 3
-    matrix:
-      amd64:
-        buildArch: 'amd64'
-      i386:
-        buildArch: 'i386'
-      armhf:
-        buildArch: 'armhf'
-      armv7:
-        buildArch: 'armv7'
-      aarch64:
-        buildArch: 'aarch64'
-  steps:
-  - script: |
-      sudo apt-get install -y --no-install-recommends \
-        qemu-user-static \
-        binfmt-support
-      
-      sudo mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc
-      sudo update-binfmts --enable qemu-arm
-      sudo update-binfmts --enable qemu-aarch64
-    displayName: 'Initial cross build'
-  - script: |
-      mkdir -p .ssh
-      echo -e "-----BEGIN RSA PRIVATE KEY-----\n$(wheelsSSH)\n-----END RSA PRIVATE KEY-----" >> .ssh/id_rsa
-      ssh-keyscan -H $(wheelsHost) >> .ssh/known_hosts
-      chmod 600 .ssh/*
-    displayName: 'Install ssh key'
-  - script: sudo docker pull homeassistant/$(buildArch)-wheels:$(versionWheels)
-    displayName: 'Install wheels builder'
-  - script: |
-      sudo docker run --rm -v $(pwd):/data:ro -v $(pwd)/.ssh:/root/.ssh:rw \
-        homeassistant/$(buildArch)-wheels:$(versionWheels) \
-        --apk "build-base;libffi-dev;openssl-dev" \
-        --index https://wheels.hass.io \
-        --requirement requirements.txt \
-        --upload rsync \
-        --remote wheels@$(wheelsHost):/opt/wheels
-    displayName: 'Run wheels build'
-
-
-- job: 'ReleaseDEV'
-  condition: and(eq(variables['Build.SourceBranchName'], 'dev'), succeeded('JQ'), succeeded('Tox'), succeeded('Hadolint'), succeeded('Wheels'))
-  dependsOn:
-  - 'JQ'
-  - 'Tox'
-  - 'Hadolint'
-  - 'Wheels'
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - script: sudo docker login -u $(dockerUser) -p $(dockerPassword)
-    displayName: 'Docker hub login'
-  - script: sudo docker pull homeassistant/amd64-builder:$(versionBuilder)
-    displayName: 'Install Builder'
-  - script: |
-      sudo docker run --rm --privileged \
-        -v ~/.docker:/root/.docker \
-        -v /run/docker.sock:/run/docker.sock:rw -v $(pwd):/data:ro \
-        homeassistant/amd64-builder:$(versionBuilder) \
-        --supervisor --all -t /data --version dev --docker-hub homeassistant
-    displayName: 'Build DEV'
-
-
-- job: 'Release'
-  condition: and(startsWith(variables['Build.SourceBranch'], 'refs/tags'), succeeded('JQ'), succeeded('Tox'), succeeded('Hadolint'))
-  dependsOn:
-  - 'JQ'
-  - 'Tox'
-  - 'Hadolint'
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - script: sudo docker login -u $(dockerUser) -p $(dockerPassword)
-    displayName: 'Docker hub login'
-  - script: sudo docker pull homeassistant/amd64-builder:$(versionBuilder)
-    displayName: 'Install Builder'
-  - script: |
-      sudo docker run --rm --privileged \
-        -v ~/.docker:/root/.docker \
-        -v /run/docker.sock:/run/docker.sock:rw -v $(pwd):/data:ro \
-        homeassistant/amd64-builder:$(versionBuilder) \
-        --supervisor --all -t /data --docker-hub homeassistant
-    displayName: 'Build Release'
+        if [ "${branch_version}" == "dev" ]; then
+          exit 0
+        elif [ "${setup_version}" != "${branch_version}" ]; then
+          echo "Version of tag ${branch_version} don't match with ${setup_version}!"
+          exit 1
+        fi
+      displayName: 'Check version of branch/tag'
+  - job: 'Release'
+    dependsOn:
+    - 'VersionValidate'
+    pool:
+      vmImage: 'ubuntu-latest'
+    steps:
+    - script: sudo docker login -u $(dockerUser) -p $(dockerPassword)
+      displayName: 'Docker hub login'
+    - script: sudo docker pull homeassistant/amd64-builder:$(versionBuilder)
+      displayName: 'Install Builder'
+    - script: |
+        sudo docker run --rm --privileged \
+          -v ~/.docker:/root/.docker \
+          -v /run/docker.sock:/run/docker.sock:rw -v $(pwd):/data:ro \
+          homeassistant/amd64-builder:$(versionBuilder) \
+          --supervisor $(basePythonTag) --version $(Build.SourceBranchName) \
+          --all -t /data --docker-hub homeassistant
+      displayName: 'Build Release'

entry.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+
+udevd --daemon
+udevadm trigger
+
+if CMD="$(command -v "$1")"; then
+  shift
+  exec "$CMD" "$@"
+else
+  echo "Command not found: $1"
+  exit 1
+fi

hassio/addons/__init__.py

@@ -110,16 +110,14 @@ class AddonManager(CoreSysAttributes):
             raise AddonsError()
 
         if not store.available:
-            _LOGGER.error(
-                "Add-on %s not supported on that platform", slug)
+            _LOGGER.error("Add-on %s not supported on that platform", slug)
             raise AddonsNotSupportedError()
 
         self.data.install(store)
         addon = Addon(self.coresys, slug)
 
         if not addon.path_data.is_dir():
-            _LOGGER.info(
-                "Create Home Assistant add-on data folder %s", addon.path_data)
+            _LOGGER.info("Create Home Assistant add-on data folder %s", addon.path_data)
             addon.path_data.mkdir()
 
         # Setup/Fix AppArmor profile
@@ -179,8 +177,7 @@ class AddonManager(CoreSysAttributes):
 
         # Check if available, Maybe something have changed
         if not store.available:
-            _LOGGER.error(
-                "Add-on %s not supported on that platform", slug)
+            _LOGGER.error("Add-on %s not supported on that platform", slug)
             raise AddonsNotSupportedError()
 
         # Update instance

hassio/addons/addon.py

@@ -59,7 +59,8 @@ _LOGGER = logging.getLogger(__name__)
 
 RE_WEBUI = re.compile(
     r"^(?:(?P<s_prefix>https?)|\[PROTO:(?P<t_proto>\w+)\])"
-    r":\/\/\[HOST\]:\[PORT:(?P<t_port>\d+)\](?P<s_suffix>.*)$")
+    r":\/\/\[HOST\]:\[PORT:(?P<t_port>\d+)\](?P<s_suffix>.*)$"
+)
 
 
 class Addon(AddonModel):
@@ -121,10 +122,7 @@ class Addon(AddonModel):
     @property
     def options(self) -> Dict[str, Any]:
         """Return options with local changes."""
-        return {
-            **self.data[ATTR_OPTIONS],
-            **self.persist[ATTR_OPTIONS]
-        }
+        return {**self.data[ATTR_OPTIONS], **self.persist[ATTR_OPTIONS]}
 
     @options.setter
     def options(self, value: Optional[Dict[str, Any]]):
@@ -231,10 +229,10 @@ class Addon(AddonModel):
         webui = RE_WEBUI.match(url)
 
         # extract arguments
-        t_port = webui.group('t_port')
-        t_proto = webui.group('t_proto')
-        s_prefix = webui.group('s_prefix') or ""
-        s_suffix = webui.group('s_suffix') or ""
+        t_port = webui.group("t_port")
+        t_proto = webui.group("t_proto")
+        s_prefix = webui.group("s_prefix") or ""
+        s_suffix = webui.group("s_suffix") or ""
 
         # search host port for this docker port
         if self.ports is None:
@@ -248,7 +246,7 @@ class Addon(AddonModel):
 
         # lookup the correct protocol from config
         if t_proto:
-            proto = 'https' if self.options[t_proto] else 'http'
+            proto = "https" if self.options[t_proto] else "http"
         else:
             proto = s_prefix
 
@@ -353,8 +351,11 @@ class Addon(AddonModel):
             schema(options)
             write_json_file(self.path_options, options)
         except vol.Invalid as ex:
-            _LOGGER.error("Add-on %s have wrong options: %s", self.slug,
-                          humanize_error(options, ex))
+            _LOGGER.error(
+                "Add-on %s have wrong options: %s",
+                self.slug,
+                humanize_error(options, ex),
+            )
         except JsonFileError:
             _LOGGER.error("Add-on %s can't write options", self.slug)
         else:
@@ -381,10 +382,11 @@ class Addon(AddonModel):
     def write_asound(self):
         """Write asound config to file and return True on success."""
         asound_config = self.sys_host.alsa.asound(
-            alsa_input=self.audio_input, alsa_output=self.audio_output)
+            alsa_input=self.audio_input, alsa_output=self.audio_output
+        )
 
         try:
-            with self.path_asound.open('w') as config_file:
+            with self.path_asound.open("w") as config_file:
                 config_file.write(asound_config)
         except OSError as err:
             _LOGGER.error("Add-on %s can't write asound: %s", self.slug, err)
@@ -408,7 +410,7 @@ class Addon(AddonModel):
 
         # Need install/update
         with TemporaryDirectory(dir=self.sys_config.path_tmp) as tmp_folder:
-            profile_file = Path(tmp_folder, 'apparmor.txt')
+            profile_file = Path(tmp_folder, "apparmor.txt")
 
             adjust_profile(self.slug, self.path_apparmor, profile_file)
             await self.sys_host.apparmor.load_profile(self.slug, profile_file)
@@ -430,14 +432,10 @@ class Addon(AddonModel):
             return True
 
         # merge options
-        options = {
-            **self.persist[ATTR_OPTIONS],
-            **default_options,
-        }
+        options = {**self.persist[ATTR_OPTIONS], **default_options}
 
         # create voluptuous
-        new_schema = \
-            vol.Schema(vol.All(dict, validate_options(new_raw_schema)))
+        new_schema = vol.Schema(vol.All(dict, validate_options(new_raw_schema)))
 
         # validate
         try:
@@ -525,7 +523,7 @@ class Addon(AddonModel):
             # store local image
             if self.need_build:
                 try:
-                    await self.instance.export_image(Path(temp, 'image.tar'))
+                    await self.instance.export_image(Path(temp, "image.tar"))
                 except DockerAPIError:
                     raise AddonsError() from None
 
@@ -538,14 +536,14 @@ class Addon(AddonModel):
 
             # Store local configs/state
             try:
-                write_json_file(Path(temp, 'addon.json'), data)
+                write_json_file(Path(temp, "addon.json"), data)
             except JsonFileError:
                 _LOGGER.error("Can't save meta for %s", self.slug)
                 raise AddonsError() from None
 
             # Store AppArmor Profile
             if self.sys_host.apparmor.exists(self.slug):
-                profile = Path(temp, 'apparmor.txt')
+                profile = Path(temp, "apparmor.txt")
                 try:
                     self.sys_host.apparmor.backup_profile(self.slug, profile)
                 except HostAppArmorError:
@@ -585,7 +583,7 @@ class Addon(AddonModel):
 
             # Read snapshot data
             try:
-                data = read_json_file(Path(temp, 'addon.json'))
+                data = read_json_file(Path(temp, "addon.json"))
             except JsonFileError:
                 raise AddonsError() from None
 
@@ -593,8 +591,11 @@ class Addon(AddonModel):
             try:
                 data = SCHEMA_ADDON_SNAPSHOT(data)
             except vol.Invalid as err:
-                _LOGGER.error("Can't validate %s, snapshot data: %s",
-                              self.slug, humanize_error(data, err))
+                _LOGGER.error(
+                    "Can't validate %s, snapshot data: %s",
+                    self.slug,
+                    humanize_error(data, err),
+                )
                 raise AddonsError() from None
 
             # If available
@@ -605,14 +606,16 @@ class Addon(AddonModel):
             # Restore local add-on informations
             _LOGGER.info("Restore config for addon %s", self.slug)
             restore_image = self._image(data[ATTR_SYSTEM])
-            self.sys_addons.data.restore(self.slug, data[ATTR_USER], data[ATTR_SYSTEM], restore_image)
+            self.sys_addons.data.restore(
+                self.slug, data[ATTR_USER], data[ATTR_SYSTEM], restore_image
+            )
 
             # Check version / restore image
             version = data[ATTR_VERSION]
             if not await self.instance.exists():
                 _LOGGER.info("Restore/Install image for addon %s", self.slug)
 
-                image_file = Path(temp, 'image.tar')
+                image_file = Path(temp, "image.tar")
                 if image_file.is_file():
                     with suppress(DockerAPIError):
                         await self.instance.import_image(image_file, version)
@@ -643,11 +646,10 @@ class Addon(AddonModel):
                 raise AddonsError() from None
 
             # Restore AppArmor
-            profile_file = Path(temp, 'apparmor.txt')
+            profile_file = Path(temp, "apparmor.txt")
             if profile_file.exists():
                 try:
-                    await self.sys_host.apparmor.load_profile(
-                        self.slug, profile_file)
+                    await self.sys_host.apparmor.load_profile(self.slug, profile_file)
                 except HostAppArmorError:
                     _LOGGER.error("Can't restore AppArmor profile")
                     raise AddonsError() from None

hassio/addons/build.py

@@ -21,7 +21,8 @@ class AddonBuild(JsonConfig, CoreSysAttributes):
         self.addon = addon
 
         super().__init__(
-            Path(self.addon.path_location, 'build.json'), SCHEMA_BUILD_CONFIG)
+            Path(self.addon.path_location, "build.json"), SCHEMA_BUILD_CONFIG
+        )
 
     def save_data(self):
         """Ignore save function."""
@@ -31,8 +32,8 @@ class AddonBuild(JsonConfig, CoreSysAttributes):
     def base_image(self) -> str:
         """Base images for this add-on."""
         return self._data[ATTR_BUILD_FROM].get(
-            self.sys_arch.default,
-            f"homeassistant/{self.sys_arch.default}-base:latest")
+            self.sys_arch.default, f"homeassistant/{self.sys_arch.default}-base:latest"
+        )
 
     @property
     def squash(self) -> bool:
@@ -47,28 +48,28 @@ class AddonBuild(JsonConfig, CoreSysAttributes):
     def get_docker_args(self, version):
         """Create a dict with Docker build arguments."""
         args = {
-            'path': str(self.addon.path_location),
-            'tag': f"{self.addon.image}:{version}",
-            'pull': True,
-            'forcerm': True,
-            'squash': self.squash,
-            'labels': {
-                'io.hass.version': version,
-                'io.hass.arch': self.sys_arch.default,
-                'io.hass.type': META_ADDON,
-                'io.hass.name': self._fix_label('name'),
-                'io.hass.description': self._fix_label('description'),
+            "path": str(self.addon.path_location),
+            "tag": f"{self.addon.image}:{version}",
+            "pull": True,
+            "forcerm": True,
+            "squash": self.squash,
+            "labels": {
+                "io.hass.version": version,
+                "io.hass.arch": self.sys_arch.default,
+                "io.hass.type": META_ADDON,
+                "io.hass.name": self._fix_label("name"),
+                "io.hass.description": self._fix_label("description"),
             },
-            'buildargs': {
-                'BUILD_FROM': self.base_image,
-                'BUILD_VERSION': version,
-                'BUILD_ARCH': self.sys_arch.default,
+            "buildargs": {
+                "BUILD_FROM": self.base_image,
+                "BUILD_VERSION": version,
+                "BUILD_ARCH": self.sys_arch.default,
                 **self.additional_args,
-            }
+            },
         }
 
         if self.addon.url:
-            args['labels']['io.hass.url'] = self.addon.url
+            args["labels"]["io.hass.url"] = self.addon.url
 
         return args
 

hassio/addons/data.py

@@ -59,10 +59,9 @@ class AddonsData(JsonConfig, CoreSysAttributes):
     def update(self, addon: AddonStore) -> None:
         """Update version of add-on."""
         self.system[addon.slug] = deepcopy(addon.data)
-        self.user[addon.slug].update({
-            ATTR_VERSION: addon.version,
-            ATTR_IMAGE: addon.image,
-        })
+        self.user[addon.slug].update(
+            {ATTR_VERSION: addon.version, ATTR_IMAGE: addon.image}
+        )
         self.save_data()
 
     def restore(self, slug: str, user: Config, system: Config, image: str) -> None:

hassio/addons/model.py

@@ -59,7 +59,7 @@ from ..const import (
     SECURITY_PROFILE,
 )
 from ..coresys import CoreSysAttributes
-from .validate import MACHINE_ALL, RE_SERVICE, RE_VOLUME, validate_options
+from .validate import RE_SERVICE, RE_VOLUME, validate_options
 
 Data = Dict[str, Any]
 
@@ -142,14 +142,14 @@ class AddonModel(CoreSysAttributes):
     @property
     def long_description(self) -> Optional[str]:
         """Return README.md as long_description."""
-        readme = Path(self.path_location, 'README.md')
+        readme = Path(self.path_location, "README.md")
 
         # If readme not exists
         if not readme.exists():
             return None
 
         # Return data
-        with readme.open('r') as readme_file:
+        with readme.open("r") as readme_file:
             return readme_file.read()
 
     @property
@@ -185,7 +185,7 @@ class AddonModel(CoreSysAttributes):
         services = {}
         for data in services_list:
             service = RE_SERVICE.match(data)
-            services[service.group('service')] = service.group('rights')
+            services[service.group("service")] = service.group("rights")
 
         return services
 
@@ -391,7 +391,7 @@ class AddonModel(CoreSysAttributes):
     @property
     def supported_machine(self) -> List[str]:
         """Return list of supported machine."""
-        return self.data.get(ATTR_MACHINE, MACHINE_ALL)
+        return self.data.get(ATTR_MACHINE, [])
 
     @property
     def image(self) -> str:
@@ -409,7 +409,7 @@ class AddonModel(CoreSysAttributes):
         volumes = {}
         for volume in self.data[ATTR_MAP]:
             result = RE_VOLUME.match(volume)
-            volumes[result.group(1)] = result.group(2) or 'ro'
+            volumes[result.group(1)] = result.group(2) or "ro"
 
         return volumes
 
@@ -421,22 +421,22 @@ class AddonModel(CoreSysAttributes):
     @property
     def path_icon(self) -> Path:
         """Return path to add-on icon."""
-        return Path(self.path_location, 'icon.png')
+        return Path(self.path_location, "icon.png")
 
     @property
     def path_logo(self) -> Path:
         """Return path to add-on logo."""
-        return Path(self.path_location, 'logo.png')
+        return Path(self.path_location, "logo.png")
 
     @property
     def path_changelog(self) -> Path:
         """Return path to add-on changelog."""
-        return Path(self.path_location, 'CHANGELOG.md')
+        return Path(self.path_location, "CHANGELOG.md")
 
     @property
     def path_apparmor(self) -> Path:
         """Return path to custom AppArmor profile."""
-        return Path(self.path_location, 'apparmor.txt')
+        return Path(self.path_location, "apparmor.txt")
 
     @property
     def schema(self) -> vol.Schema:
@@ -449,9 +449,9 @@ class AddonModel(CoreSysAttributes):
 
     def __eq__(self, other):
         """Compaired add-on objects."""
-        if self.slug == other.slug:
-            return True
-        return False
+        if not isinstance(other, AddonModel):
+            return False
+        return self.slug == other.slug
 
     def _available(self, config) -> bool:
         """Return True if this add-on is available on this platform."""
@@ -460,8 +460,8 @@ class AddonModel(CoreSysAttributes):
             return False
 
         # Machine / Hardware
-        machine = config.get(ATTR_MACHINE) or MACHINE_ALL
-        if self.sys_machine not in machine:
+        machine = config.get(ATTR_MACHINE)
+        if machine and self.sys_machine not in machine:
             return False
 
         # Home Assistant

hassio/addons/validate.py

@@ -39,12 +39,9 @@ from ..const import (
     ATTR_IMAGE,
     ATTR_INGRESS,
     ATTR_INGRESS_ENTRY,
+    ATTR_INGRESS_PANEL,
     ATTR_INGRESS_PORT,
     ATTR_INGRESS_TOKEN,
-    ATTR_INGRESS_PANEL,
-    ATTR_PANEL_ADMIN,
-    ATTR_PANEL_ICON,
-    ATTR_PANEL_TITLE,
     ATTR_KERNEL_MODULES,
     ATTR_LEGACY,
     ATTR_LOCATON,
@@ -53,6 +50,9 @@ from ..const import (
     ATTR_NAME,
     ATTR_NETWORK,
     ATTR_OPTIONS,
+    ATTR_PANEL_ADMIN,
+    ATTR_PANEL_ICON,
+    ATTR_PANEL_TITLE,
     ATTR_PORTS,
     ATTR_PORTS_DESCRIPTION,
     ATTR_PRIVILEGED,
@@ -100,14 +100,14 @@ _LOGGER = logging.getLogger(__name__)
 RE_VOLUME = re.compile(r"^(config|ssl|addons|backup|share)(?::(rw|ro))?$")
 RE_SERVICE = re.compile(r"^(?P<service>mqtt):(?P<rights>provide|want|need)$")
 
-V_STR = 'str'
-V_INT = 'int'
-V_FLOAT = 'float'
-V_BOOL = 'bool'
-V_EMAIL = 'email'
-V_URL = 'url'
-V_PORT = 'port'
-V_MATCH = 'match'
+V_STR = "str"
+V_INT = "int"
+V_FLOAT = "float"
+V_BOOL = "bool"
+V_EMAIL = "email"
+V_URL = "url"
+V_PORT = "port"
+V_MATCH = "match"
 
 RE_SCHEMA_ELEMENT = re.compile(
     r"^(?:"
@@ -118,18 +118,30 @@ RE_SCHEMA_ELEMENT = re.compile(
     r")\??$"
 )
 
-RE_DOCKER_IMAGE = re.compile(
-    r"^([a-zA-Z\-\.:\d{}]+/)*?([\-\w{}]+)/([\-\w{}]+)$")
+RE_DOCKER_IMAGE = re.compile(r"^([a-zA-Z\-\.:\d{}]+/)*?([\-\w{}]+)/([\-\w{}]+)$")
 RE_DOCKER_IMAGE_BUILD = re.compile(
-    r"^([a-zA-Z\-\.:\d{}]+/)*?([\-\w{}]+)/([\-\w{}]+)(:[\.\-\w{}]+)?$")
+    r"^([a-zA-Z\-\.:\d{}]+/)*?([\-\w{}]+)/([\-\w{}]+)(:[\.\-\w{}]+)?$"
+)
 
 SCHEMA_ELEMENT = vol.Match(RE_SCHEMA_ELEMENT)
 
 
 MACHINE_ALL = [
-    'intel-nuc', 'odroid-c2', 'odroid-xu', 'orangepi-prime', 'qemux86',
-    'qemux86-64', 'qemuarm', 'qemuarm-64', 'raspberrypi', 'raspberrypi2',
-    'raspberrypi3', 'raspberrypi3-64', 'tinker',
+    "intel-nuc",
+    "odroid-c2",
+    "odroid-xu",
+    "orangepi-prime",
+    "qemux86",
+    "qemux86-64",
+    "qemuarm",
+    "qemuarm-64",
+    "raspberrypi",
+    "raspberrypi2",
+    "raspberrypi3",
+    "raspberrypi3-64",
+    "raspberrypi4",
+    "raspberrypi4-64",
+    "tinker",
 ]
 
 
@@ -143,130 +155,157 @@ def _simple_startup(value):
 
 
 # pylint: disable=no-value-for-parameter
-SCHEMA_ADDON_CONFIG = vol.Schema({
-    vol.Required(ATTR_NAME): vol.Coerce(str),
-    vol.Required(ATTR_VERSION): vol.Coerce(str),
-    vol.Required(ATTR_SLUG): vol.Coerce(str),
-    vol.Required(ATTR_DESCRIPTON): vol.Coerce(str),
-    vol.Required(ATTR_ARCH): [vol.In(ARCH_ALL)],
-    vol.Optional(ATTR_MACHINE): [vol.In(MACHINE_ALL)],
-    vol.Optional(ATTR_URL): vol.Url(),
-    vol.Required(ATTR_STARTUP):
-        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_PORTS_DESCRIPTION): DOCKER_PORTS_DESCRIPTION,
-    vol.Optional(ATTR_WEBUI):
-        vol.Match(r"^(?:https?|\[PROTO:\w+\]):\/\/\[HOST\]:\[PORT:\d+\].*$"),
-    vol.Optional(ATTR_INGRESS, default=False): vol.Boolean(),
-    vol.Optional(ATTR_INGRESS_PORT, default=8099): vol.Any(NETWORK_PORT, vol.Equal(0)),
-    vol.Optional(ATTR_INGRESS_ENTRY): vol.Coerce(str),
-    vol.Optional(ATTR_PANEL_ICON, default="mdi:puzzle"): vol.Coerce(str),
-    vol.Optional(ATTR_PANEL_TITLE): vol.Coerce(str),
-    vol.Optional(ATTR_PANEL_ADMIN, default=True): vol.Boolean(),
-    vol.Optional(ATTR_HOMEASSISTANT): vol.Maybe(vol.Coerce(str)),
-    vol.Optional(ATTR_HOST_NETWORK, default=False): vol.Boolean(),
-    vol.Optional(ATTR_HOST_PID, default=False): vol.Boolean(),
-    vol.Optional(ATTR_HOST_IPC, default=False): vol.Boolean(),
-    vol.Optional(ATTR_HOST_DBUS, default=False): vol.Boolean(),
-    vol.Optional(ATTR_DEVICES): [vol.Match(r"^(.*):(.*):([rwm]{1,3})$")],
-    vol.Optional(ATTR_AUTO_UART, default=False): vol.Boolean(),
-    vol.Optional(ATTR_TMPFS):
-        vol.Match(r"^size=(\d)*[kmg](,uid=\d{1,4})?(,rw)?$"),
-    vol.Optional(ATTR_MAP, default=list): [vol.Match(RE_VOLUME)],
-    vol.Optional(ATTR_ENVIRONMENT): {vol.Match(r"\w*"): vol.Coerce(str)},
-    vol.Optional(ATTR_PRIVILEGED): [vol.In(PRIVILEGED_ALL)],
-    vol.Optional(ATTR_APPARMOR, default=True): vol.Boolean(),
-    vol.Optional(ATTR_FULL_ACCESS, default=False): vol.Boolean(),
-    vol.Optional(ATTR_AUDIO, default=False): vol.Boolean(),
-    vol.Optional(ATTR_GPIO, default=False): vol.Boolean(),
-    vol.Optional(ATTR_DEVICETREE, default=False): vol.Boolean(),
-    vol.Optional(ATTR_KERNEL_MODULES, default=False): vol.Boolean(),
-    vol.Optional(ATTR_HASSIO_API, default=False): vol.Boolean(),
-    vol.Optional(ATTR_HASSIO_ROLE, default=ROLE_DEFAULT): vol.In(ROLE_ALL),
-    vol.Optional(ATTR_HOMEASSISTANT_API, default=False): vol.Boolean(),
-    vol.Optional(ATTR_STDIN, default=False): vol.Boolean(),
-    vol.Optional(ATTR_LEGACY, default=False): vol.Boolean(),
-    vol.Optional(ATTR_DOCKER_API, default=False): vol.Boolean(),
-    vol.Optional(ATTR_AUTH_API, default=False): vol.Boolean(),
-    vol.Optional(ATTR_SERVICES): [vol.Match(RE_SERVICE)],
-    vol.Optional(ATTR_DISCOVERY): [valid_discovery_service],
-    vol.Required(ATTR_OPTIONS): dict,
-    vol.Required(ATTR_SCHEMA): vol.Any(vol.Schema({
-        vol.Coerce(str): vol.Any(SCHEMA_ELEMENT, [
-            vol.Any(
-                SCHEMA_ELEMENT,
-                {vol.Coerce(str): vol.Any(SCHEMA_ELEMENT, [SCHEMA_ELEMENT])}
+SCHEMA_ADDON_CONFIG = vol.Schema(
+    {
+        vol.Required(ATTR_NAME): vol.Coerce(str),
+        vol.Required(ATTR_VERSION): vol.Coerce(str),
+        vol.Required(ATTR_SLUG): vol.Coerce(str),
+        vol.Required(ATTR_DESCRIPTON): vol.Coerce(str),
+        vol.Required(ATTR_ARCH): [vol.In(ARCH_ALL)],
+        vol.Optional(ATTR_MACHINE): [vol.In(MACHINE_ALL)],
+        vol.Optional(ATTR_URL): vol.Url(),
+        vol.Required(ATTR_STARTUP): 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_PORTS_DESCRIPTION): DOCKER_PORTS_DESCRIPTION,
+        vol.Optional(ATTR_WEBUI): vol.Match(
+            r"^(?:https?|\[PROTO:\w+\]):\/\/\[HOST\]:\[PORT:\d+\].*$"
+        ),
+        vol.Optional(ATTR_INGRESS, default=False): vol.Boolean(),
+        vol.Optional(ATTR_INGRESS_PORT, default=8099): vol.Any(
+            NETWORK_PORT, vol.Equal(0)
+        ),
+        vol.Optional(ATTR_INGRESS_ENTRY): vol.Coerce(str),
+        vol.Optional(ATTR_PANEL_ICON, default="mdi:puzzle"): vol.Coerce(str),
+        vol.Optional(ATTR_PANEL_TITLE): vol.Coerce(str),
+        vol.Optional(ATTR_PANEL_ADMIN, default=True): vol.Boolean(),
+        vol.Optional(ATTR_HOMEASSISTANT): vol.Maybe(vol.Coerce(str)),
+        vol.Optional(ATTR_HOST_NETWORK, default=False): vol.Boolean(),
+        vol.Optional(ATTR_HOST_PID, default=False): vol.Boolean(),
+        vol.Optional(ATTR_HOST_IPC, default=False): vol.Boolean(),
+        vol.Optional(ATTR_HOST_DBUS, default=False): vol.Boolean(),
+        vol.Optional(ATTR_DEVICES): [vol.Match(r"^(.*):(.*):([rwm]{1,3})$")],
+        vol.Optional(ATTR_AUTO_UART, default=False): vol.Boolean(),
+        vol.Optional(ATTR_TMPFS): vol.Match(r"^size=(\d)*[kmg](,uid=\d{1,4})?(,rw)?$"),
+        vol.Optional(ATTR_MAP, default=list): [vol.Match(RE_VOLUME)],
+        vol.Optional(ATTR_ENVIRONMENT): {vol.Match(r"\w*"): vol.Coerce(str)},
+        vol.Optional(ATTR_PRIVILEGED): [vol.In(PRIVILEGED_ALL)],
+        vol.Optional(ATTR_APPARMOR, default=True): vol.Boolean(),
+        vol.Optional(ATTR_FULL_ACCESS, default=False): vol.Boolean(),
+        vol.Optional(ATTR_AUDIO, default=False): vol.Boolean(),
+        vol.Optional(ATTR_GPIO, default=False): vol.Boolean(),
+        vol.Optional(ATTR_DEVICETREE, default=False): vol.Boolean(),
+        vol.Optional(ATTR_KERNEL_MODULES, default=False): vol.Boolean(),
+        vol.Optional(ATTR_HASSIO_API, default=False): vol.Boolean(),
+        vol.Optional(ATTR_HASSIO_ROLE, default=ROLE_DEFAULT): vol.In(ROLE_ALL),
+        vol.Optional(ATTR_HOMEASSISTANT_API, default=False): vol.Boolean(),
+        vol.Optional(ATTR_STDIN, default=False): vol.Boolean(),
+        vol.Optional(ATTR_LEGACY, default=False): vol.Boolean(),
+        vol.Optional(ATTR_DOCKER_API, default=False): vol.Boolean(),
+        vol.Optional(ATTR_AUTH_API, default=False): vol.Boolean(),
+        vol.Optional(ATTR_SERVICES): [vol.Match(RE_SERVICE)],
+        vol.Optional(ATTR_DISCOVERY): [valid_discovery_service],
+        vol.Required(ATTR_OPTIONS): dict,
+        vol.Required(ATTR_SCHEMA): vol.Any(
+            vol.Schema(
+                {
+                    vol.Coerce(str): vol.Any(
+                        SCHEMA_ELEMENT,
+                        [
+                            vol.Any(
+                                SCHEMA_ELEMENT,
+                                {
+                                    vol.Coerce(str): vol.Any(
+                                        SCHEMA_ELEMENT, [SCHEMA_ELEMENT]
+                                    )
+                                },
+                            )
+                        ],
+                        vol.Schema(
+                            {vol.Coerce(str): vol.Any(SCHEMA_ELEMENT, [SCHEMA_ELEMENT])}
+                        ),
+                    )
+                }
             ),
-        ], vol.Schema({
-            vol.Coerce(str): vol.Any(SCHEMA_ELEMENT, [SCHEMA_ELEMENT])
-        }))
-    }), False),
-    vol.Optional(ATTR_IMAGE):
-        vol.Match(RE_DOCKER_IMAGE),
-    vol.Optional(ATTR_TIMEOUT, default=10):
-        vol.All(vol.Coerce(int), vol.Range(min=10, max=120)),
-}, extra=vol.REMOVE_EXTRA)
-
-
-# pylint: disable=no-value-for-parameter
-SCHEMA_BUILD_CONFIG = vol.Schema({
-    vol.Optional(ATTR_BUILD_FROM, default=dict): vol.Schema({
-        vol.In(ARCH_ALL): vol.Match(RE_DOCKER_IMAGE_BUILD),
-    }),
-    vol.Optional(ATTR_SQUASH, default=False): vol.Boolean(),
-    vol.Optional(ATTR_ARGS, default=dict): vol.Schema({
-        vol.Coerce(str): vol.Coerce(str)
-    }),
-}, extra=vol.REMOVE_EXTRA)
-
-
-# pylint: disable=no-value-for-parameter
-SCHEMA_ADDON_USER = vol.Schema({
-    vol.Required(ATTR_VERSION): vol.Coerce(str),
-    vol.Optional(ATTR_IMAGE): vol.Coerce(str),
-    vol.Optional(ATTR_UUID, default=lambda: uuid.uuid4().hex): UUID_MATCH,
-    vol.Optional(ATTR_ACCESS_TOKEN): TOKEN,
-    vol.Optional(ATTR_INGRESS_TOKEN, default=secrets.token_urlsafe): vol.Coerce(str),
-    vol.Optional(ATTR_OPTIONS, default=dict): dict,
-    vol.Optional(ATTR_AUTO_UPDATE, default=False): vol.Boolean(),
-    vol.Optional(ATTR_BOOT):
-        vol.In([BOOT_AUTO, BOOT_MANUAL]),
-    vol.Optional(ATTR_NETWORK): DOCKER_PORTS,
-    vol.Optional(ATTR_AUDIO_OUTPUT): ALSA_DEVICE,
-    vol.Optional(ATTR_AUDIO_INPUT): ALSA_DEVICE,
-    vol.Optional(ATTR_PROTECTED, default=True): vol.Boolean(),
-    vol.Optional(ATTR_INGRESS_PANEL, default=False): vol.Boolean(),
-}, extra=vol.REMOVE_EXTRA)
-
-
-SCHEMA_ADDON_SYSTEM = SCHEMA_ADDON_CONFIG.extend({
-    vol.Required(ATTR_LOCATON): vol.Coerce(str),
-    vol.Required(ATTR_REPOSITORY): vol.Coerce(str),
-})
-
-
-SCHEMA_ADDONS_FILE = vol.Schema({
-    vol.Optional(ATTR_USER, default=dict): {
-        vol.Coerce(str): SCHEMA_ADDON_USER,
+            False,
+        ),
+        vol.Optional(ATTR_IMAGE): vol.Match(RE_DOCKER_IMAGE),
+        vol.Optional(ATTR_TIMEOUT, default=10): vol.All(
+            vol.Coerce(int), vol.Range(min=10, max=120)
+        ),
     },
-    vol.Optional(ATTR_SYSTEM, default=dict): {
-        vol.Coerce(str): SCHEMA_ADDON_SYSTEM,
+    extra=vol.REMOVE_EXTRA,
+)
+
+
+# pylint: disable=no-value-for-parameter
+SCHEMA_BUILD_CONFIG = vol.Schema(
+    {
+        vol.Optional(ATTR_BUILD_FROM, default=dict): vol.Schema(
+            {vol.In(ARCH_ALL): vol.Match(RE_DOCKER_IMAGE_BUILD)}
+        ),
+        vol.Optional(ATTR_SQUASH, default=False): vol.Boolean(),
+        vol.Optional(ATTR_ARGS, default=dict): vol.Schema(
+            {vol.Coerce(str): vol.Coerce(str)}
+        ),
+    },
+    extra=vol.REMOVE_EXTRA,
+)
+
+
+# pylint: disable=no-value-for-parameter
+SCHEMA_ADDON_USER = vol.Schema(
+    {
+        vol.Required(ATTR_VERSION): vol.Coerce(str),
+        vol.Optional(ATTR_IMAGE): vol.Coerce(str),
+        vol.Optional(ATTR_UUID, default=lambda: uuid.uuid4().hex): UUID_MATCH,
+        vol.Optional(ATTR_ACCESS_TOKEN): TOKEN,
+        vol.Optional(ATTR_INGRESS_TOKEN, default=secrets.token_urlsafe): vol.Coerce(
+            str
+        ),
+        vol.Optional(ATTR_OPTIONS, default=dict): dict,
+        vol.Optional(ATTR_AUTO_UPDATE, default=False): vol.Boolean(),
+        vol.Optional(ATTR_BOOT): vol.In([BOOT_AUTO, BOOT_MANUAL]),
+        vol.Optional(ATTR_NETWORK): DOCKER_PORTS,
+        vol.Optional(ATTR_AUDIO_OUTPUT): ALSA_DEVICE,
+        vol.Optional(ATTR_AUDIO_INPUT): ALSA_DEVICE,
+        vol.Optional(ATTR_PROTECTED, default=True): vol.Boolean(),
+        vol.Optional(ATTR_INGRESS_PANEL, default=False): vol.Boolean(),
+    },
+    extra=vol.REMOVE_EXTRA,
+)
+
+
+SCHEMA_ADDON_SYSTEM = SCHEMA_ADDON_CONFIG.extend(
+    {
+        vol.Required(ATTR_LOCATON): vol.Coerce(str),
+        vol.Required(ATTR_REPOSITORY): vol.Coerce(str),
     }
-})
+)
 
 
-SCHEMA_ADDON_SNAPSHOT = vol.Schema({
-    vol.Required(ATTR_USER): SCHEMA_ADDON_USER,
-    vol.Required(ATTR_SYSTEM): SCHEMA_ADDON_SYSTEM,
-    vol.Required(ATTR_STATE): vol.In([STATE_STARTED, STATE_STOPPED]),
-    vol.Required(ATTR_VERSION): vol.Coerce(str),
-}, extra=vol.REMOVE_EXTRA)
+SCHEMA_ADDONS_FILE = vol.Schema(
+    {
+        vol.Optional(ATTR_USER, default=dict): {vol.Coerce(str): SCHEMA_ADDON_USER},
+        vol.Optional(ATTR_SYSTEM, default=dict): {vol.Coerce(str): SCHEMA_ADDON_SYSTEM},
+    }
+)
+
+
+SCHEMA_ADDON_SNAPSHOT = vol.Schema(
+    {
+        vol.Required(ATTR_USER): SCHEMA_ADDON_USER,
+        vol.Required(ATTR_SYSTEM): SCHEMA_ADDON_SYSTEM,
+        vol.Required(ATTR_STATE): vol.In([STATE_STARTED, STATE_STOPPED]),
+        vol.Required(ATTR_VERSION): vol.Coerce(str),
+    },
+    extra=vol.REMOVE_EXTRA,
+)
 
 
 def validate_options(raw_schema):
     """Validate schema."""
+
     def validate(struct):
         """Create schema validator for add-ons options."""
         options = {}
@@ -292,7 +331,7 @@ def validate_options(raw_schema):
             except (IndexError, KeyError):
                 raise vol.Invalid(f"Type error for {key}") from None
 
-        _check_missing_options(raw_schema, options, 'root')
+        _check_missing_options(raw_schema, options, "root")
         return options
 
     return validate
@@ -311,7 +350,7 @@ def _single_validate(typ, value, key):
 
     # prepare range
     range_args = {}
-    for group_name in ('i_min', 'i_max', 'f_min', 'f_max'):
+    for group_name in ("i_min", "i_max", "f_min", "f_max"):
         group_value = match.group(group_name)
         if group_value:
             range_args[group_name[2:]] = float(group_value)
@@ -331,7 +370,7 @@ def _single_validate(typ, value, key):
     elif typ.startswith(V_PORT):
         return NETWORK_PORT(value)
     elif typ.startswith(V_MATCH):
-        return vol.Match(match.group('match'))(str(value))
+        return vol.Match(match.group("match"))(str(value))
 
     raise vol.Invalid(f"Fatal error for {key} type {typ}")
 
@@ -363,8 +402,7 @@ def _nested_validate_dict(typ, data_dict, key):
 
         # Nested?
         if isinstance(typ[c_key], list):
-            options[c_key] = _nested_validate_list(typ[c_key][0],
-                                                   c_value, c_key)
+            options[c_key] = _nested_validate_list(typ[c_key][0], c_value, c_key)
         else:
             options[c_key] = _single_validate(typ[c_key], c_value, c_key)
 
@@ -376,7 +414,6 @@ def _check_missing_options(origin, exists, root):
     """Check if all options are exists."""
     missing = set(origin) - set(exists)
     for miss_opt in missing:
-        if isinstance(origin[miss_opt], str) and \
-                origin[miss_opt].endswith("?"):
+        if isinstance(origin[miss_opt], str) and origin[miss_opt].endswith("?"):
             continue
         raise vol.Invalid(f"Missing option {miss_opt} in {root}")

hassio/api/__init__.py

@@ -32,7 +32,8 @@ class RestAPI(CoreSysAttributes):
         self.coresys: CoreSys = coresys
         self.security: SecurityMiddleware = SecurityMiddleware(coresys)
         self.webapp: web.Application = web.Application(
-            middlewares=[self.security.token_validation])
+            middlewares=[self.security.token_validation]
+        )
 
         # service stuff
         self._runner: web.AppRunner = web.AppRunner(self.webapp)
@@ -60,205 +61,224 @@ class RestAPI(CoreSysAttributes):
         api_host = APIHost()
         api_host.coresys = self.coresys
 
-        self.webapp.add_routes([
-            web.get('/host/info', api_host.info),
-            web.post('/host/reboot', api_host.reboot),
-            web.post('/host/shutdown', api_host.shutdown),
-            web.post('/host/reload', api_host.reload),
-            web.post('/host/options', api_host.options),
-            web.get('/host/services', api_host.services),
-            web.post('/host/services/{service}/stop', api_host.service_stop),
-            web.post('/host/services/{service}/start', api_host.service_start),
-            web.post('/host/services/{service}/restart',
-                     api_host.service_restart),
-            web.post('/host/services/{service}/reload',
-                     api_host.service_reload),
-        ])
+        self.webapp.add_routes(
+            [
+                web.get("/host/info", api_host.info),
+                web.post("/host/reboot", api_host.reboot),
+                web.post("/host/shutdown", api_host.shutdown),
+                web.post("/host/reload", api_host.reload),
+                web.post("/host/options", api_host.options),
+                web.get("/host/services", api_host.services),
+                web.post("/host/services/{service}/stop", api_host.service_stop),
+                web.post("/host/services/{service}/start", api_host.service_start),
+                web.post("/host/services/{service}/restart", api_host.service_restart),
+                web.post("/host/services/{service}/reload", api_host.service_reload),
+            ]
+        )
 
     def _register_hassos(self) -> None:
         """Register HassOS functions."""
         api_hassos = APIHassOS()
         api_hassos.coresys = self.coresys
 
-        self.webapp.add_routes([
-            web.get('/hassos/info', api_hassos.info),
-            web.post('/hassos/update', api_hassos.update),
-            web.post('/hassos/update/cli', api_hassos.update_cli),
-            web.post('/hassos/config/sync', api_hassos.config_sync),
-        ])
+        self.webapp.add_routes(
+            [
+                web.get("/hassos/info", api_hassos.info),
+                web.post("/hassos/update", api_hassos.update),
+                web.post("/hassos/update/cli", api_hassos.update_cli),
+                web.post("/hassos/config/sync", api_hassos.config_sync),
+            ]
+        )
 
     def _register_hardware(self) -> None:
         """Register hardware functions."""
         api_hardware = APIHardware()
         api_hardware.coresys = self.coresys
 
-        self.webapp.add_routes([
-            web.get('/hardware/info', api_hardware.info),
-            web.get('/hardware/audio', api_hardware.audio),
-        ])
+        self.webapp.add_routes(
+            [
+                web.get("/hardware/info", api_hardware.info),
+                web.get("/hardware/audio", api_hardware.audio),
+            ]
+        )
 
     def _register_info(self) -> None:
         """Register info functions."""
         api_info = APIInfo()
         api_info.coresys = self.coresys
 
-        self.webapp.add_routes([
-            web.get('/info', api_info.info),
-        ])
+        self.webapp.add_routes([web.get("/info", api_info.info)])
 
     def _register_auth(self) -> None:
         """Register auth functions."""
         api_auth = APIAuth()
         api_auth.coresys = self.coresys
 
-        self.webapp.add_routes([
-            web.post('/auth', api_auth.auth),
-        ])
+        self.webapp.add_routes([web.post("/auth", api_auth.auth)])
 
     def _register_supervisor(self) -> None:
         """Register Supervisor functions."""
         api_supervisor = APISupervisor()
         api_supervisor.coresys = self.coresys
 
-        self.webapp.add_routes([
-            web.get('/supervisor/ping', api_supervisor.ping),
-            web.get('/supervisor/info', api_supervisor.info),
-            web.get('/supervisor/stats', api_supervisor.stats),
-            web.get('/supervisor/logs', api_supervisor.logs),
-            web.post('/supervisor/update', api_supervisor.update),
-            web.post('/supervisor/reload', api_supervisor.reload),
-            web.post('/supervisor/options', api_supervisor.options),
-        ])
+        self.webapp.add_routes(
+            [
+                web.get("/supervisor/ping", api_supervisor.ping),
+                web.get("/supervisor/info", api_supervisor.info),
+                web.get("/supervisor/stats", api_supervisor.stats),
+                web.get("/supervisor/logs", api_supervisor.logs),
+                web.post("/supervisor/update", api_supervisor.update),
+                web.post("/supervisor/reload", api_supervisor.reload),
+                web.post("/supervisor/options", api_supervisor.options),
+            ]
+        )
 
     def _register_homeassistant(self) -> None:
         """Register Home Assistant functions."""
         api_hass = APIHomeAssistant()
         api_hass.coresys = self.coresys
 
-        self.webapp.add_routes([
-            web.get('/homeassistant/info', api_hass.info),
-            web.get('/homeassistant/logs', api_hass.logs),
-            web.get('/homeassistant/stats', api_hass.stats),
-            web.post('/homeassistant/options', api_hass.options),
-            web.post('/homeassistant/update', api_hass.update),
-            web.post('/homeassistant/restart', api_hass.restart),
-            web.post('/homeassistant/stop', api_hass.stop),
-            web.post('/homeassistant/start', api_hass.start),
-            web.post('/homeassistant/check', api_hass.check),
-            web.post('/homeassistant/rebuild', api_hass.rebuild),
-        ])
+        self.webapp.add_routes(
+            [
+                web.get("/homeassistant/info", api_hass.info),
+                web.get("/homeassistant/logs", api_hass.logs),
+                web.get("/homeassistant/stats", api_hass.stats),
+                web.post("/homeassistant/options", api_hass.options),
+                web.post("/homeassistant/update", api_hass.update),
+                web.post("/homeassistant/restart", api_hass.restart),
+                web.post("/homeassistant/stop", api_hass.stop),
+                web.post("/homeassistant/start", api_hass.start),
+                web.post("/homeassistant/check", api_hass.check),
+                web.post("/homeassistant/rebuild", api_hass.rebuild),
+            ]
+        )
 
     def _register_proxy(self) -> None:
         """Register Home Assistant API Proxy."""
         api_proxy = APIProxy()
         api_proxy.coresys = self.coresys
 
-        self.webapp.add_routes([
-            web.get('/homeassistant/api/websocket', api_proxy.websocket),
-            web.get('/homeassistant/websocket', api_proxy.websocket),
-            web.get('/homeassistant/api/stream', api_proxy.stream),
-            web.post('/homeassistant/api/{path:.+}', api_proxy.api),
-            web.get('/homeassistant/api/{path:.+}', api_proxy.api),
-            web.get('/homeassistant/api/', api_proxy.api),
-        ])
+        self.webapp.add_routes(
+            [
+                web.get("/homeassistant/api/websocket", api_proxy.websocket),
+                web.get("/homeassistant/websocket", api_proxy.websocket),
+                web.get("/homeassistant/api/stream", api_proxy.stream),
+                web.post("/homeassistant/api/{path:.+}", api_proxy.api),
+                web.get("/homeassistant/api/{path:.+}", api_proxy.api),
+                web.get("/homeassistant/api/", api_proxy.api),
+            ]
+        )
 
     def _register_addons(self) -> None:
         """Register Add-on functions."""
         api_addons = APIAddons()
         api_addons.coresys = self.coresys
 
-        self.webapp.add_routes([
-            web.get('/addons', api_addons.list),
-            web.post('/addons/reload', api_addons.reload),
-            web.get('/addons/{addon}/info', api_addons.info),
-            web.post('/addons/{addon}/install', api_addons.install),
-            web.post('/addons/{addon}/uninstall', api_addons.uninstall),
-            web.post('/addons/{addon}/start', api_addons.start),
-            web.post('/addons/{addon}/stop', api_addons.stop),
-            web.post('/addons/{addon}/restart', api_addons.restart),
-            web.post('/addons/{addon}/update', api_addons.update),
-            web.post('/addons/{addon}/options', api_addons.options),
-            web.post('/addons/{addon}/rebuild', api_addons.rebuild),
-            web.get('/addons/{addon}/logs', api_addons.logs),
-            web.get('/addons/{addon}/icon', api_addons.icon),
-            web.get('/addons/{addon}/logo', api_addons.logo),
-            web.get('/addons/{addon}/changelog', api_addons.changelog),
-            web.post('/addons/{addon}/stdin', api_addons.stdin),
-            web.post('/addons/{addon}/security', api_addons.security),
-            web.get('/addons/{addon}/stats', api_addons.stats),
-        ])
+        self.webapp.add_routes(
+            [
+                web.get("/addons", api_addons.list),
+                web.post("/addons/reload", api_addons.reload),
+                web.get("/addons/{addon}/info", api_addons.info),
+                web.post("/addons/{addon}/install", api_addons.install),
+                web.post("/addons/{addon}/uninstall", api_addons.uninstall),
+                web.post("/addons/{addon}/start", api_addons.start),
+                web.post("/addons/{addon}/stop", api_addons.stop),
+                web.post("/addons/{addon}/restart", api_addons.restart),
+                web.post("/addons/{addon}/update", api_addons.update),
+                web.post("/addons/{addon}/options", api_addons.options),
+                web.post("/addons/{addon}/rebuild", api_addons.rebuild),
+                web.get("/addons/{addon}/logs", api_addons.logs),
+                web.get("/addons/{addon}/icon", api_addons.icon),
+                web.get("/addons/{addon}/logo", api_addons.logo),
+                web.get("/addons/{addon}/changelog", api_addons.changelog),
+                web.post("/addons/{addon}/stdin", api_addons.stdin),
+                web.post("/addons/{addon}/security", api_addons.security),
+                web.get("/addons/{addon}/stats", api_addons.stats),
+            ]
+        )
 
     def _register_ingress(self) -> None:
         """Register Ingress functions."""
         api_ingress = APIIngress()
         api_ingress.coresys = self.coresys
 
-        self.webapp.add_routes([
-            web.post('/ingress/session', api_ingress.create_session),
-            web.get('/ingress/panels', api_ingress.panels),
-            web.view('/ingress/{token}/{path:.*}', api_ingress.handler),
-        ])
+        self.webapp.add_routes(
+            [
+                web.post("/ingress/session", api_ingress.create_session),
+                web.get("/ingress/panels", api_ingress.panels),
+                web.view("/ingress/{token}/{path:.*}", api_ingress.handler),
+            ]
+        )
 
     def _register_snapshots(self) -> None:
         """Register snapshots functions."""
         api_snapshots = APISnapshots()
         api_snapshots.coresys = self.coresys
 
-        self.webapp.add_routes([
-            web.get('/snapshots', api_snapshots.list),
-            web.post('/snapshots/reload', api_snapshots.reload),
-            web.post('/snapshots/new/full', api_snapshots.snapshot_full),
-            web.post('/snapshots/new/partial', api_snapshots.snapshot_partial),
-            web.post('/snapshots/new/upload', api_snapshots.upload),
-            web.get('/snapshots/{snapshot}/info', api_snapshots.info),
-            web.post('/snapshots/{snapshot}/remove', api_snapshots.remove),
-            web.post('/snapshots/{snapshot}/restore/full',
-                     api_snapshots.restore_full),
-            web.post('/snapshots/{snapshot}/restore/partial',
-                     api_snapshots.restore_partial),
-            web.get('/snapshots/{snapshot}/download', api_snapshots.download),
-        ])
+        self.webapp.add_routes(
+            [
+                web.get("/snapshots", api_snapshots.list),
+                web.post("/snapshots/reload", api_snapshots.reload),
+                web.post("/snapshots/new/full", api_snapshots.snapshot_full),
+                web.post("/snapshots/new/partial", api_snapshots.snapshot_partial),
+                web.post("/snapshots/new/upload", api_snapshots.upload),
+                web.get("/snapshots/{snapshot}/info", api_snapshots.info),
+                web.post("/snapshots/{snapshot}/remove", api_snapshots.remove),
+                web.post(
+                    "/snapshots/{snapshot}/restore/full", api_snapshots.restore_full
+                ),
+                web.post(
+                    "/snapshots/{snapshot}/restore/partial",
+                    api_snapshots.restore_partial,
+                ),
+                web.get("/snapshots/{snapshot}/download", api_snapshots.download),
+            ]
+        )
 
     def _register_services(self) -> None:
         """Register services functions."""
         api_services = APIServices()
         api_services.coresys = self.coresys
 
-        self.webapp.add_routes([
-            web.get('/services', api_services.list),
-            web.get('/services/{service}', api_services.get_service),
-            web.post('/services/{service}', api_services.set_service),
-            web.delete('/services/{service}', api_services.del_service),
-        ])
+        self.webapp.add_routes(
+            [
+                web.get("/services", api_services.list),
+                web.get("/services/{service}", api_services.get_service),
+                web.post("/services/{service}", api_services.set_service),
+                web.delete("/services/{service}", api_services.del_service),
+            ]
+        )
 
     def _register_discovery(self) -> None:
         """Register discovery functions."""
         api_discovery = APIDiscovery()
         api_discovery.coresys = self.coresys
 
-        self.webapp.add_routes([
-            web.get('/discovery', api_discovery.list),
-            web.get('/discovery/{uuid}', api_discovery.get_discovery),
-            web.delete('/discovery/{uuid}', api_discovery.del_discovery),
-            web.post('/discovery', api_discovery.set_discovery),
-        ])
+        self.webapp.add_routes(
+            [
+                web.get("/discovery", api_discovery.list),
+                web.get("/discovery/{uuid}", api_discovery.get_discovery),
+                web.delete("/discovery/{uuid}", api_discovery.del_discovery),
+                web.post("/discovery", api_discovery.set_discovery),
+            ]
+        )
 
     def _register_panel(self) -> None:
         """Register panel for Home Assistant."""
         panel_dir = Path(__file__).parent.joinpath("panel")
-        self.webapp.add_routes([web.static('/app', panel_dir)])
+        self.webapp.add_routes([web.static("/app", panel_dir)])
 
     async def start(self) -> None:
         """Run RESTful API webserver."""
         await self._runner.setup()
         self._site = web.TCPSite(
-            self._runner, host="0.0.0.0", port=80, shutdown_timeout=5)
+            self._runner, host="0.0.0.0", port=80, shutdown_timeout=5
+        )
 
         try:
             await self._site.start()
         except OSError as err:
-            _LOGGER.fatal("Failed to create HTTP server at 0.0.0.0:80 -> %s",
-                          err)
+            _LOGGER.fatal("Failed to create HTTP server at 0.0.0.0:80 -> %s", err)
         else:
             _LOGGER.info("Start API on %s", self.sys_docker.network.supervisor)
 

hassio/api/addons.py

@@ -91,35 +91,35 @@ from .utils import api_process, api_process_raw, api_validate
 
 _LOGGER = logging.getLogger(__name__)
 
-SCHEMA_VERSION = vol.Schema({
-    vol.Optional(ATTR_VERSION): vol.Coerce(str),
-})
+SCHEMA_VERSION = vol.Schema({vol.Optional(ATTR_VERSION): vol.Coerce(str)})
 
 # pylint: disable=no-value-for-parameter
-SCHEMA_OPTIONS = vol.Schema({
-    vol.Optional(ATTR_BOOT): vol.In([BOOT_AUTO, BOOT_MANUAL]),
-    vol.Optional(ATTR_NETWORK): vol.Any(None, DOCKER_PORTS),
-    vol.Optional(ATTR_AUTO_UPDATE): vol.Boolean(),
-    vol.Optional(ATTR_AUDIO_OUTPUT): ALSA_DEVICE,
-    vol.Optional(ATTR_AUDIO_INPUT): ALSA_DEVICE,
-    vol.Optional(ATTR_INGRESS_PANEL): vol.Boolean(),
-})
+SCHEMA_OPTIONS = vol.Schema(
+    {
+        vol.Optional(ATTR_BOOT): vol.In([BOOT_AUTO, BOOT_MANUAL]),
+        vol.Optional(ATTR_NETWORK): vol.Any(None, DOCKER_PORTS),
+        vol.Optional(ATTR_AUTO_UPDATE): vol.Boolean(),
+        vol.Optional(ATTR_AUDIO_OUTPUT): ALSA_DEVICE,
+        vol.Optional(ATTR_AUDIO_INPUT): ALSA_DEVICE,
+        vol.Optional(ATTR_INGRESS_PANEL): vol.Boolean(),
+    }
+)
 
 # pylint: disable=no-value-for-parameter
-SCHEMA_SECURITY = vol.Schema({
-    vol.Optional(ATTR_PROTECTED): vol.Boolean(),
-})
+SCHEMA_SECURITY = vol.Schema({vol.Optional(ATTR_PROTECTED): vol.Boolean()})
 
 
 class APIAddons(CoreSysAttributes):
     """Handle RESTful API for add-on functions."""
 
-    def _extract_addon(self, request: web.Request, check_installed: bool = True) -> AnyAddon:
+    def _extract_addon(
+        self, request: web.Request, check_installed: bool = True
+    ) -> AnyAddon:
         """Return addon, throw an exception it it doesn't exist."""
-        addon_slug = request.match_info.get('addon')
+        addon_slug = request.match_info.get("addon")
 
         # Lookup itself
-        if addon_slug == 'self':
+        if addon_slug == "self":
             return request.get(REQUEST_FROM)
 
         addon = self.sys_addons.get(addon_slug)
@@ -136,35 +136,36 @@ class APIAddons(CoreSysAttributes):
         """Return all add-ons or repositories."""
         data_addons = []
         for addon in self.sys_addons.all:
-            data_addons.append({
-                ATTR_NAME: addon.name,
-                ATTR_SLUG: addon.slug,
-                ATTR_DESCRIPTON: addon.description,
-                ATTR_VERSION: addon.latest_version,
-                ATTR_INSTALLED: addon.version if addon.is_installed else None,
-                ATTR_AVAILABLE: addon.available,
-                ATTR_DETACHED: addon.is_detached,
-                ATTR_REPOSITORY: addon.repository,
-                ATTR_BUILD: addon.need_build,
-                ATTR_URL: addon.url,
-                ATTR_ICON: addon.with_icon,
-                ATTR_LOGO: addon.with_logo,
-            })
+            data_addons.append(
+                {
+                    ATTR_NAME: addon.name,
+                    ATTR_SLUG: addon.slug,
+                    ATTR_DESCRIPTON: addon.description,
+                    ATTR_VERSION: addon.latest_version,
+                    ATTR_INSTALLED: addon.version if addon.is_installed else None,
+                    ATTR_AVAILABLE: addon.available,
+                    ATTR_DETACHED: addon.is_detached,
+                    ATTR_REPOSITORY: addon.repository,
+                    ATTR_BUILD: addon.need_build,
+                    ATTR_URL: addon.url,
+                    ATTR_ICON: addon.with_icon,
+                    ATTR_LOGO: addon.with_logo,
+                }
+            )
 
         data_repositories = []
         for repository in self.sys_store.all:
-            data_repositories.append({
-                ATTR_SLUG: repository.slug,
-                ATTR_NAME: repository.name,
-                ATTR_SOURCE: repository.source,
-                ATTR_URL: repository.url,
-                ATTR_MAINTAINER: repository.maintainer,
-            })
+            data_repositories.append(
+                {
+                    ATTR_SLUG: repository.slug,
+                    ATTR_NAME: repository.name,
+                    ATTR_SOURCE: repository.source,
+                    ATTR_URL: repository.url,
+                    ATTR_MAINTAINER: repository.maintainer,
+                }
+            )
 
-        return {
-            ATTR_ADDONS: data_addons,
-            ATTR_REPOSITORIES: data_repositories,
-        }
+        return {ATTR_ADDONS: data_addons, ATTR_REPOSITORIES: data_repositories}
 
     @api_process
     async def reload(self, request: web.Request) -> None:
@@ -234,19 +235,21 @@ class APIAddons(CoreSysAttributes):
         }
 
         if addon.is_installed:
-            data.update({
-                ATTR_STATE: await addon.state(),
-                ATTR_WEBUI: addon.webui,
-                ATTR_INGRESS_ENTRY: addon.ingress_entry,
-                ATTR_INGRESS_URL: addon.ingress_url,
-                ATTR_INGRESS_PORT: addon.ingress_port,
-                ATTR_INGRESS_PANEL: addon.ingress_panel,
-                ATTR_AUDIO_INPUT: addon.audio_input,
-                ATTR_AUDIO_OUTPUT: addon.audio_output,
-                ATTR_AUTO_UPDATE: addon.auto_update,
-                ATTR_IP_ADDRESS: str(addon.ip_address),
-                ATTR_VERSION: addon.version,
-            })
+            data.update(
+                {
+                    ATTR_STATE: await addon.state(),
+                    ATTR_WEBUI: addon.webui,
+                    ATTR_INGRESS_ENTRY: addon.ingress_entry,
+                    ATTR_INGRESS_URL: addon.ingress_url,
+                    ATTR_INGRESS_PORT: addon.ingress_port,
+                    ATTR_INGRESS_PANEL: addon.ingress_panel,
+                    ATTR_AUDIO_INPUT: addon.audio_input,
+                    ATTR_AUDIO_OUTPUT: addon.audio_output,
+                    ATTR_AUTO_UPDATE: addon.auto_update,
+                    ATTR_IP_ADDRESS: str(addon.ip_address),
+                    ATTR_VERSION: addon.version,
+                }
+            )
 
         return data
 
@@ -255,9 +258,9 @@ class APIAddons(CoreSysAttributes):
         """Store user options for add-on."""
         addon = self._extract_addon(request)
 
-        addon_schema = SCHEMA_OPTIONS.extend({
-            vol.Optional(ATTR_OPTIONS): vol.Any(None, addon.schema),
-        })
+        addon_schema = SCHEMA_OPTIONS.extend(
+            {vol.Optional(ATTR_OPTIONS): vol.Any(None, addon.schema)}
+        )
         body = await api_validate(addon_schema, request)
 
         if ATTR_OPTIONS in body:
@@ -288,7 +291,7 @@ class APIAddons(CoreSysAttributes):
             _LOGGER.warning("Protected flag changing for %s!", addon.slug)
             addon.protected = body[ATTR_PROTECTED]
 
-        addon.save_data()
+        addon.save_persist()
 
     @api_process
     async def stats(self, request: web.Request) -> Dict[str, Any]:
@@ -376,7 +379,7 @@ class APIAddons(CoreSysAttributes):
         if not addon.with_icon:
             raise APIError("No icon found!")
 
-        with addon.path_icon.open('rb') as png:
+        with addon.path_icon.open("rb") as png:
             return png.read()
 
     @api_process_raw(CONTENT_TYPE_PNG)
@@ -386,7 +389,7 @@ class APIAddons(CoreSysAttributes):
         if not addon.with_logo:
             raise APIError("No logo found!")
 
-        with addon.path_logo.open('rb') as png:
+        with addon.path_logo.open("rb") as png:
             return png.read()
 
     @api_process_raw(CONTENT_TYPE_TEXT)
@@ -396,7 +399,7 @@ class APIAddons(CoreSysAttributes):
         if not addon.with_changelog:
             raise APIError("No changelog found!")
 
-        with addon.path_changelog.open('r') as changelog:
+        with addon.path_changelog.open("r") as changelog:
             return changelog.read()
 
     @api_process
@@ -415,7 +418,7 @@ def _pretty_devices(addon: AnyAddon) -> List[str]:
     dev_list = addon.devices
     if not dev_list:
         return None
-    return [row.split(':')[0] for row in dev_list]
+    return [row.split(":")[0] for row in dev_list]
 
 
 def _pretty_services(addon: AnyAddon) -> List[str]:

hassio/api/auth.py

@@ -29,8 +29,8 @@ class APIAuth(CoreSysAttributes):
 
         Return a coroutine.
         """
-        username = data.get('username') or data.get('user')
-        password = data.get('password')
+        username = data.get("username") or data.get("user")
+        password = data.get("password")
 
         return self.sys_auth.check_login(addon, username, password)
 
@@ -56,6 +56,6 @@ class APIAuth(CoreSysAttributes):
             data = await request.post()
             return await self._process_dict(request, addon, data)
 
-        raise HTTPUnauthorized(headers={
-            WWW_AUTHENTICATE: "Basic realm=\"Hass.io Authentication\""
-        })
+        raise HTTPUnauthorized(
+            headers={WWW_AUTHENTICATE: 'Basic realm="Hass.io Authentication"'}
+        )

hassio/api/hardware.py

@@ -3,7 +3,13 @@ import logging
 
 from .utils import api_process
 from ..const import (
-    ATTR_SERIAL, ATTR_DISK, ATTR_GPIO, ATTR_AUDIO, ATTR_INPUT, ATTR_OUTPUT)
+    ATTR_SERIAL,
+    ATTR_DISK,
+    ATTR_GPIO,
+    ATTR_AUDIO,
+    ATTR_INPUT,
+    ATTR_OUTPUT,
+)
 from ..coresys import CoreSysAttributes
 
 _LOGGER = logging.getLogger(__name__)

hassio/api/host.py

@@ -6,18 +6,25 @@ import voluptuous as vol
 
 from .utils import api_process, api_validate
 from ..const import (
-    ATTR_HOSTNAME, ATTR_FEATURES, ATTR_KERNEL, ATTR_OPERATING_SYSTEM,
-    ATTR_CHASSIS, ATTR_DEPLOYMENT, ATTR_STATE, ATTR_NAME, ATTR_DESCRIPTON,
-    ATTR_SERVICES, ATTR_CPE)
+    ATTR_HOSTNAME,
+    ATTR_FEATURES,
+    ATTR_KERNEL,
+    ATTR_OPERATING_SYSTEM,
+    ATTR_CHASSIS,
+    ATTR_DEPLOYMENT,
+    ATTR_STATE,
+    ATTR_NAME,
+    ATTR_DESCRIPTON,
+    ATTR_SERVICES,
+    ATTR_CPE,
+)
 from ..coresys import CoreSysAttributes
 
 _LOGGER = logging.getLogger(__name__)
 
-SERVICE = 'service'
+SERVICE = "service"
 
-SCHEMA_OPTIONS = vol.Schema({
-    vol.Optional(ATTR_HOSTNAME): vol.Coerce(str),
-})
+SCHEMA_OPTIONS = vol.Schema({vol.Optional(ATTR_HOSTNAME): vol.Coerce(str)})
 
 
 class APIHost(CoreSysAttributes):
@@ -44,7 +51,8 @@ class APIHost(CoreSysAttributes):
         # hostname
         if ATTR_HOSTNAME in body:
             await asyncio.shield(
-                self.sys_host.control.set_hostname(body[ATTR_HOSTNAME]))
+                self.sys_host.control.set_hostname(body[ATTR_HOSTNAME])
+            )
 
     @api_process
     def reboot(self, request):
@@ -66,15 +74,15 @@ class APIHost(CoreSysAttributes):
         """Return list of available services."""
         services = []
         for unit in self.sys_host.services:
-            services.append({
-                ATTR_NAME: unit.name,
-                ATTR_DESCRIPTON: unit.description,
-                ATTR_STATE: unit.state,
-            })
+            services.append(
+                {
+                    ATTR_NAME: unit.name,
+                    ATTR_DESCRIPTON: unit.description,
+                    ATTR_STATE: unit.state,
+                }
+            )
 
-        return {
-            ATTR_SERVICES: services
-        }
+        return {ATTR_SERVICES: services}
 
     @api_process
     def service_start(self, request):

hassio/api/info.py

@@ -14,6 +14,7 @@ from ..const import (
     ATTR_MACHINE,
     ATTR_SUPERVISOR,
     ATTR_SUPPORTED_ARCH,
+    ATTR_TIMEZONE,
 )
 from ..coresys import CoreSysAttributes
 from .utils import api_process
@@ -37,4 +38,5 @@ class APIInfo(CoreSysAttributes):
             ATTR_SUPPORTED_ARCH: self.sys_arch.supported,
             ATTR_CHANNEL: self.sys_updater.channel,
             ATTR_LOGGING: self.sys_config.logging,
+            ATTR_TIMEZONE: self.sys_timezone,
         }

hassio/api/ingress.py

@@ -158,7 +158,12 @@ class APIIngress(CoreSysAttributes):
         source_header = _init_header(request, addon)
 
         async with self.sys_websession.request(
-            request.method, url, headers=source_header, params=request.query, data=data
+            request.method,
+            url,
+            headers=source_header,
+            params=request.query,
+            allow_redirects=False,
+            data=data,
         ) as result:
             headers = _response_header(result)
 

hassio/api/panel/chunk.3a63ad36bccf4ea567fa.js

@@ -1 +0,0 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([[7],{102:function(n,r,t){"use strict";t.r(r),t.d(r,"marked",function(){return a}),t.d(r,"filterXSS",function(){return c});var e=t(121),i=t.n(e),o=t(123),u=t.n(o),a=i.a,c=u.a}}]);

hassio/api/panel/chunk.510634470d399e194ace.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"chunk.510634470d399e194ace.js","sourceRoot":""}

hassio/api/panel/chunk.564a2f7b1c38ddaa4ce0.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"chunk.564a2f7b1c38ddaa4ce0.js","sourceRoot":""}

hassio/api/panel/chunk.598ae99dfd641ab3a30c.js.LICENSE

@@ -8,18 +8,6 @@ Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 */
 
-/**
- * @fileoverview
- * @suppress {checkPrototypalTypes}
- * @license Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
- * This code may only be used under the BSD style license found at
- * http://polymer.github.io/LICENSE.txt The complete set of authors may be found
- * at http://polymer.github.io/AUTHORS.txt The complete set of contributors may
- * be found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by
- * Google as part of the polymer project is also subject to an additional IP
- * rights grant found at http://polymer.github.io/PATENTS.txt
- */
-
 /**
 @license
 Copyright (c) 2015 The Polymer Project Authors. All rights reserved.

hassio/api/panel/chunk.5dd33a3a20657ed46a19.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["webpack:///./src/ingress-view/hassio-ingress-view.ts"],"names":["customElement","HassioIngressView","property","this","_addon","html","_templateObject2","name","ingress_url","_templateObject","changedProps","_get","_getPrototypeOf","prototype","call","has","addon","route","path","substr","oldRoute","get","oldAddon","undefined","_fetchData","_callee","addonSlug","_ref","_ref2","regeneratorRuntime","wrap","_context","prev","next","Promise","all","fetchHassioAddonInfo","hass","catch","Error","createHassioSession","sent","_slicedToArray","ingress","t0","console","error","alert","message","history","back","stop","css","_templateObject3","LitElement"],"mappings":"4gSAmBCA,YAAc,0CACTC,smBACHC,kEACAA,mEACAA,4EAED,WACE,OAAKC,KAAKC,OAMHC,YAAPC,IAC0BH,KAAKC,OAAOG,KACpBJ,KAAKC,OAAOI,aAPrBH,YAAPI,0CAYJ,SAAkBC,GAGhB,GAFAC,EAAAC,EApBEX,EAoBFY,WAAA,eAAAV,MAAAW,KAAAX,KAAmBO,GAEdA,EAAaK,IAAI,SAAtB,CAIA,IAAMC,EAAQb,KAAKc,MAAMC,KAAKC,OAAO,GAE/BC,EAAWV,EAAaW,IAAI,SAC5BC,EAAWF,EAAWA,EAASF,KAAKC,OAAO,QAAKI,EAElDP,GAASA,IAAUM,GACrBnB,KAAKqB,WAAWR,0FAIpB,SAAAS,EAAyBC,GAAzB,IAAAC,EAAAC,EAAAZ,EAAA,OAAAa,mBAAAC,KAAA,SAAAC,GAAA,cAAAA,EAAAC,KAAAD,EAAAE,MAAA,cAAAF,EAAAC,KAAA,EAAAD,EAAAE,KAAA,EAE0BC,QAAQC,IAAI,CAChCC,YAAqBjC,KAAKkC,KAAMX,GAAWY,MAAM,WAC/C,MAAM,IAAIC,MAAM,iCAElBC,YAAoBrC,KAAKkC,MAAMC,MAAM,WACnC,MAAM,IAAIC,MAAM,2CAPxB,UAAAZ,EAAAI,EAAAU,KAAAb,EAAAc,EAAAf,EAAA,IAEWX,EAFXY,EAAA,IAWee,QAXf,CAAAZ,EAAAE,KAAA,cAYY,IAAIM,MAAM,wCAZtB,OAeIpC,KAAKC,OAASY,EAflBe,EAAAE,KAAA,iBAAAF,EAAAC,KAAA,GAAAD,EAAAa,GAAAb,EAAA,SAkBIc,QAAQC,MAARf,EAAAa,IACAG,MAAMhB,EAAAa,GAAII,SAAW,mCACrBC,QAAQC,OApBZ,yBAAAnB,EAAAoB,SAAA1B,EAAAtB,KAAA,yRAwBA,WACE,OAAOiD,YAAPC,UA7D4BC","file":"chunk.5dd33a3a20657ed46a19.js","sourcesContent":["import {\n  LitElement,\n  customElement,\n  property,\n  TemplateResult,\n  html,\n  PropertyValues,\n  CSSResult,\n  css,\n} from \"lit-element\";\nimport { HomeAssistant, Route } from \"../../../src/types\";\nimport {\n  createHassioSession,\n  HassioAddonDetails,\n  fetchHassioAddonInfo,\n} from \"../../../src/data/hassio\";\nimport \"../../../src/layouts/hass-loading-screen\";\nimport \"../../../src/layouts/hass-subpage\";\n\n@customElement(\"hassio-ingress-view\")\nclass HassioIngressView extends LitElement {\n  @property() public hass!: HomeAssistant;\n  @property() public route!: Route;\n  @property() private _addon?: HassioAddonDetails;\n\n  protected render(): TemplateResult | void {\n    if (!this._addon) {\n      return html`\n        <hass-loading-screen></hass-loading-screen>\n      `;\n    }\n\n    return html`\n      <hass-subpage .header=${this._addon.name} hassio>\n        <iframe src=${this._addon.ingress_url}></iframe>\n      </hass-subpage>\n    `;\n  }\n\n  protected updated(changedProps: PropertyValues) {\n    super.firstUpdated(changedProps);\n\n    if (!changedProps.has(\"route\")) {\n      return;\n    }\n\n    const addon = this.route.path.substr(1);\n\n    const oldRoute = changedProps.get(\"route\") as this[\"route\"] | undefined;\n    const oldAddon = oldRoute ? oldRoute.path.substr(1) : undefined;\n\n    if (addon && addon !== oldAddon) {\n      this._fetchData(addon);\n    }\n  }\n\n  private async _fetchData(addonSlug: string) {\n    try {\n      const [addon] = await Promise.all([\n        fetchHassioAddonInfo(this.hass, addonSlug).catch(() => {\n          throw new Error(\"Failed to fetch add-on info\");\n        }),\n        createHassioSession(this.hass).catch(() => {\n          throw new Error(\"Failed to create an ingress session\");\n        }),\n      ]);\n\n      if (!addon.ingress) {\n        throw new Error(\"This add-on does not support ingress\");\n      }\n\n      this._addon = addon;\n    } catch (err) {\n      // tslint:disable-next-line\n      console.error(err);\n      alert(err.message || \"Unknown error starting ingress.\");\n      history.back();\n    }\n  }\n\n  static get styles(): CSSResult {\n    return css`\n      iframe {\n        display: block;\n        width: 100%;\n        height: 100%;\n        border: 0;\n      }\n      paper-icon-button {\n        color: var(--text-primary-color);\n      }\n    `;\n  }\n}\n\ndeclare global {\n  interface HTMLElementTagNameMap {\n    \"hassio-ingress-view\": HassioIngressView;\n  }\n}\n"],"sourceRoot":""}

hassio/api/panel/chunk.659084fef4e3b7b66a76.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"chunk.659084fef4e3b7b66a76.js","sourceRoot":""}

hassio/api/panel/chunk.6685a7f98b13655ab808.js.LICENSE

@@ -34,27 +34,6 @@ part of the polymer project is also subject to an additional IP rights grant
 found at http://polymer.github.io/PATENTS.txt
 */
 
-/**
-@license
-Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
-*/
-
-/**
-@license
-Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at
-http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
-http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
-found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
-part of the polymer project is also subject to an additional IP rights grant
-found at http://polymer.github.io/PATENTS.txt
-*/
-
 /**
 @license
 Copyright 2018 Google Inc. All Rights Reserved.
@@ -133,6 +112,27 @@ and limitations under the License.
  * THE SOFTWARE.
  */
 
+/**
+@license
+Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
 /**
  * @license
  * Copyright (c) 2018 The Polymer Project Authors. All rights reserved.
@@ -178,3 +178,12 @@ found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
 part of the polymer project is also subject to an additional IP rights grant
 found at http://polymer.github.io/PATENTS.txt
 */
+
+/*!
+ * Fuse.js v3.4.4 - Lightweight fuzzy-search (http://fusejs.io)
+ * 
+ * Copyright (c) 2012-2017 Kirollos Risk (http://kiro.me)
+ * All Rights Reserved. Apache Software License 2.0
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */

hassio/api/panel/chunk.6e9c87e51920a9c354e5.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"chunk.6e9c87e51920a9c354e5.js","sourceRoot":""}

hassio/api/panel/chunk.7f8cce5798f837214ef8.js

@@ -0,0 +1,2 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([[9],{101:function(n,r,t){"use strict";t.r(r),t.d(r,"marked",function(){return a}),t.d(r,"filterXSS",function(){return c});var e=t(124),i=t.n(e),o=t(126),u=t.n(o),a=i.a,c=u.a}}]);
+//# sourceMappingURL=chunk.7f8cce5798f837214ef8.js.map

hassio/api/panel/chunk.7f8cce5798f837214ef8.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["webpack:///../src/resources/load_markdown.js"],"names":["__webpack_require__","r","__webpack_exports__","d","marked","filterXSS","marked__WEBPACK_IMPORTED_MODULE_0__","marked__WEBPACK_IMPORTED_MODULE_0___default","n","xss__WEBPACK_IMPORTED_MODULE_1__","xss__WEBPACK_IMPORTED_MODULE_1___default","marked_","filterXSS_"],"mappings":"0FAAAA,EAAAC,EAAAC,GAAAF,EAAAG,EAAAD,EAAA,2BAAAE,IAAAJ,EAAAG,EAAAD,EAAA,8BAAAG,IAAA,IAAAC,EAAAN,EAAA,KAAAO,EAAAP,EAAAQ,EAAAF,GAAAG,EAAAT,EAAA,KAAAU,EAAAV,EAAAQ,EAAAC,GAGaL,EAASO,IACTN,EAAYO","file":"chunk.7f8cce5798f837214ef8.js","sourcesContent":["import marked_ from \"marked\";\nimport filterXSS_ from \"xss\";\n\nexport const marked = marked_;\nexport const filterXSS = filterXSS_;\n"],"sourceRoot":""}

hassio/api/panel/chunk.a7e5fb452cd1b3a5faef.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"chunk.a7e5fb452cd1b3a5faef.js","sourceRoot":""}

hassio/api/panel/chunk.f15d7f41c0d302cbbc7a.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"chunk.f15d7f41c0d302cbbc7a.js","sourceRoot":""}

hassio/api/panel/entrypoint.js

@@ -1 +1,2 @@
-!function(e){function n(n){for(var t,o,a=n[0],i=n[1],c=0,u=[];c<a.length;c++)o=a[c],r[o]&&u.push(r[o][0]),r[o]=0;for(t in i)Object.prototype.hasOwnProperty.call(i,t)&&(e[t]=i[t]);for(f&&f(n);u.length;)u.shift()()}var t={},r={4:0};function o(n){if(t[n])return t[n].exports;var r=t[n]={i:n,l:!1,exports:{}};return e[n].call(r.exports,r,r.exports,o),r.l=!0,r.exports}o.e=function(e){var n=[],t=r[e];if(0!==t)if(t)n.push(t[2]);else{var a=new Promise(function(n,o){t=r[e]=[n,o]});n.push(t[2]=a);var i,c=document.createElement("script");c.charset="utf-8",c.timeout=120,o.nc&&c.setAttribute("nonce",o.nc),c.src=function(e){return o.p+"chunk."+{0:"564a2f7b1c38ddaa4ce0",1:"659084fef4e3b7b66a76",2:"510634470d399e194ace",3:"f15d7f41c0d302cbbc7a",5:"5d31a1778f717ac8b063",6:"b60fb48c5280275dd7e2",7:"3a63ad36bccf4ea567fa",8:"a571dfa106202cc57af6",9:"a7e5fb452cd1b3a5faef",10:"b3340b3df270d20af4a1",11:"6e9c87e51920a9c354e5",12:"1b30ffdc501071af245c",13:"739b67c99ab56cdbd75d"}[e]+".js"}(e),i=function(n){c.onerror=c.onload=null,clearTimeout(f);var t=r[e];if(0!==t){if(t){var o=n&&("load"===n.type?"missing":n.type),a=n&&n.target&&n.target.src,i=new Error("Loading chunk "+e+" failed.\n("+o+": "+a+")");i.type=o,i.request=a,t[1](i)}r[e]=void 0}};var f=setTimeout(function(){i({type:"timeout",target:c})},12e4);c.onerror=c.onload=i,document.head.appendChild(c)}return Promise.all(n)},o.m=e,o.c=t,o.d=function(e,n,t){o.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:t})},o.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.t=function(e,n){if(1&n&&(e=o(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(o.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var r in e)o.d(t,r,function(n){return e[n]}.bind(null,r));return t},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="/api/hassio/app/",o.oe=function(e){throw console.error(e),e};var a=window.webpackJsonp=window.webpackJsonp||[],i=a.push.bind(a);a.push=n,a=a.slice();for(var c=0;c<a.length;c++)n(a[c]);var f=i;o(o.s=0)}([function(e,n,t){window.loadES5Adapter().then(function(){Promise.all([t.e(1),t.e(5)]).then(t.bind(null,2)),Promise.all([t.e(1),t.e(9),t.e(6)]).then(t.bind(null,1))});var r=document.createElement("style");r.innerHTML="\nbody {\n  font-family: Roboto, sans-serif;\n  -moz-osx-font-smoothing: grayscale;\n  -webkit-font-smoothing: antialiased;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  height: 100vh;\n}\n",document.head.appendChild(r)}]);
+!function(e){function n(n){for(var t,o,a=n[0],i=n[1],f=0,c=[];f<a.length;f++)o=a[f],r[o]&&c.push(r[o][0]),r[o]=0;for(t in i)Object.prototype.hasOwnProperty.call(i,t)&&(e[t]=i[t]);for(u&&u(n);c.length;)c.shift()()}var t={},r={4:0};function o(n){if(t[n])return t[n].exports;var r=t[n]={i:n,l:!1,exports:{}};return e[n].call(r.exports,r,r.exports,o),r.l=!0,r.exports}o.e=function(e){var n=[],t=r[e];if(0!==t)if(t)n.push(t[2]);else{var a=new Promise(function(n,o){t=r[e]=[n,o]});n.push(t[2]=a);var i,f=document.createElement("script");f.charset="utf-8",f.timeout=120,o.nc&&f.setAttribute("nonce",o.nc),f.src=function(e){return o.p+"chunk."+{0:"7f411ffa9df152cb8f05",1:"598ae99dfd641ab3a30c",2:"af7784dbf07df8e24819",3:"b15efbd4fb2c8cac0ad4",5:"87d3a6d0178fb26762cf",6:"6f4702eafe52425373ed",7:"5dd33a3a20657ed46a19",8:"7c785f796f428abae18d",9:"7f8cce5798f837214ef8",10:"04bcaa18b59728e10be9",11:"9d7374dae6137783dda4",12:"6685a7f98b13655ab808",13:"f1156b978f6f3143a651"}[e]+".js"}(e),i=function(n){f.onerror=f.onload=null,clearTimeout(u);var t=r[e];if(0!==t){if(t){var o=n&&("load"===n.type?"missing":n.type),a=n&&n.target&&n.target.src,i=new Error("Loading chunk "+e+" failed.\n("+o+": "+a+")");i.type=o,i.request=a,t[1](i)}r[e]=void 0}};var u=setTimeout(function(){i({type:"timeout",target:f})},12e4);f.onerror=f.onload=i,document.head.appendChild(f)}return Promise.all(n)},o.m=e,o.c=t,o.d=function(e,n,t){o.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:t})},o.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.t=function(e,n){if(1&n&&(e=o(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(o.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var r in e)o.d(t,r,function(n){return e[n]}.bind(null,r));return t},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="/api/hassio/app/",o.oe=function(e){throw console.error(e),e};var a=window.webpackJsonp=window.webpackJsonp||[],i=a.push.bind(a);a.push=n,a=a.slice();for(var f=0;f<a.length;f++)n(a[f]);var u=i;o(o.s=0)}([function(e,n,t){window.loadES5Adapter().then(function(){Promise.all([t.e(1),t.e(6)]).then(t.bind(null,2)),Promise.all([t.e(1),t.e(12),t.e(8)]).then(t.bind(null,1))});var r=document.createElement("style");r.innerHTML="\nbody {\n  font-family: Roboto, sans-serif;\n  -moz-osx-font-smoothing: grayscale;\n  -webkit-font-smoothing: antialiased;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  height: 100vh;\n}\n",document.head.appendChild(r)}]);
+//# sourceMappingURL=entrypoint.js.map

hassio/api/proxy.py

@@ -12,8 +12,7 @@ import async_timeout
 
 from ..const import HEADER_HA_ACCESS
 from ..coresys import CoreSysAttributes
-from ..exceptions import (
-    HomeAssistantAuthError, HomeAssistantAPIError, APIError)
+from ..exceptions import HomeAssistantAuthError, HomeAssistantAPIError, APIError
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -21,11 +20,11 @@ _LOGGER = logging.getLogger(__name__)
 class APIProxy(CoreSysAttributes):
     """API Proxy for Home Assistant."""
 
-    def _check_access(self, request):
+    def _check_access(self, request: web.Request):
         """Check the Hass.io token."""
         if AUTHORIZATION in request.headers:
             bearer = request.headers[AUTHORIZATION]
-            hassio_token = bearer.split(' ')[-1]
+            hassio_token = bearer.split(" ")[-1]
         else:
             hassio_token = request.headers.get(HEADER_HA_ACCESS)
 
@@ -41,7 +40,7 @@ class APIProxy(CoreSysAttributes):
         raise HTTPUnauthorized()
 
     @asynccontextmanager
-    async def _api_client(self, request, path, timeout=300):
+    async def _api_client(self, request: web.Request, path: str, timeout: int = 300):
         """Return a client request with proxy origin for Home Assistant."""
         try:
             # read data
@@ -54,10 +53,12 @@ class APIProxy(CoreSysAttributes):
                 content_type = None
 
             async with self.sys_homeassistant.make_request(
-                    request.method.lower(), f'api/{path}',
-                    content_type=content_type,
-                    data=data,
-                    timeout=timeout,
+                request.method.lower(),
+                f"api/{path}",
+                content_type=content_type,
+                data=data,
+                timeout=timeout,
+                params=request.query,
             ) as resp:
                 yield resp
                 return
@@ -73,12 +74,12 @@ class APIProxy(CoreSysAttributes):
 
         raise HTTPBadGateway()
 
-    async def stream(self, request):
+    async def stream(self, request: web.Request):
         """Proxy HomeAssistant EventStream Requests."""
         self._check_access(request)
 
         _LOGGER.info("Home Assistant EventStream start")
-        async with self._api_client(request, 'stream', timeout=None) as client:
+        async with self._api_client(request, "stream", timeout=None) as client:
             response = web.StreamResponse()
             response.content_type = request.headers.get(CONTENT_TYPE)
             try:
@@ -92,18 +93,16 @@ class APIProxy(CoreSysAttributes):
             _LOGGER.info("Home Assistant EventStream close")
             return response
 
-    async def api(self, request):
+    async def api(self, request: web.Request):
         """Proxy Home Assistant API Requests."""
         self._check_access(request)
 
         # Normal request
-        path = request.match_info.get('path', '')
+        path = request.match_info.get("path", "")
         async with self._api_client(request, path) as client:
             data = await client.read()
             return web.Response(
-                body=data,
-                status=client.status,
-                content_type=client.content_type
+                body=data, status=client.status, content_type=client.content_type
             )
 
     async def _websocket_client(self):
@@ -112,39 +111,46 @@ class APIProxy(CoreSysAttributes):
 
         try:
             client = await self.sys_websession_ssl.ws_connect(
-                url, heartbeat=30, verify_ssl=False)
+                url, heartbeat=30, verify_ssl=False
+            )
 
             # Handle authentication
             data = await client.receive_json()
 
-            if data.get('type') == 'auth_ok':
+            if data.get("type") == "auth_ok":
                 return client
 
-            if data.get('type') != 'auth_required':
+            if data.get("type") != "auth_required":
                 # Invalid protocol
-                _LOGGER.error(
-                    "Got unexpected response from HA WebSocket: %s", data)
+                _LOGGER.error("Got unexpected response from HA WebSocket: %s", data)
                 raise APIError()
 
             if self.sys_homeassistant.refresh_token:
                 await self.sys_homeassistant.ensure_access_token()
-                await client.send_json({
-                    'type': 'auth',
-                    'access_token': self.sys_homeassistant.access_token,
-                })
+                await client.send_json(
+                    {
+                        "type": "auth",
+                        "access_token": self.sys_homeassistant.access_token,
+                    }
+                )
             else:
-                await client.send_json({
-                    'type': 'auth',
-                    'api_password': self.sys_homeassistant.api_password,
-                })
+                await client.send_json(
+                    {
+                        "type": "auth",
+                        "api_password": self.sys_homeassistant.api_password,
+                    }
+                )
 
             data = await client.receive_json()
 
-            if data.get('type') == 'auth_ok':
+            if data.get("type") == "auth_ok":
                 return client
 
             # Renew the Token is invalid
-            if data.get('type') == 'invalid_auth' and self.sys_homeassistant.refresh_token:
+            if (
+                data.get("type") == "invalid_auth"
+                and self.sys_homeassistant.refresh_token
+            ):
                 self.sys_homeassistant.access_token = None
                 return await self._websocket_client()
 
@@ -157,7 +163,7 @@ class APIProxy(CoreSysAttributes):
 
         raise APIError()
 
-    async def websocket(self, request):
+    async def websocket(self, request: web.Request):
         """Initialize a WebSocket API connection."""
         _LOGGER.info("Home Assistant WebSocket API request initialize")
 
@@ -167,30 +173,27 @@ class APIProxy(CoreSysAttributes):
 
         # handle authentication
         try:
-            await server.send_json({
-                'type': 'auth_required',
-                'ha_version': self.sys_homeassistant.version,
-            })
+            await server.send_json(
+                {"type": "auth_required", "ha_version": self.sys_homeassistant.version}
+            )
 
             # Check API access
             response = await server.receive_json()
-            hassio_token = response.get('api_password') or response.get('access_token')
+            hassio_token = response.get("api_password") or response.get("access_token")
             addon = self.sys_addons.from_token(hassio_token)
 
             if not addon or not addon.access_homeassistant_api:
                 _LOGGER.warning("Unauthorized WebSocket access!")
-                await server.send_json({
-                    'type': 'auth_invalid',
-                    'message': 'Invalid access',
-                })
+                await server.send_json(
+                    {"type": "auth_invalid", "message": "Invalid access"}
+                )
                 return server
 
             _LOGGER.info("WebSocket access from %s", addon.slug)
 
-            await server.send_json({
-                'type': 'auth_ok',
-                'ha_version': self.sys_homeassistant.version,
-            })
+            await server.send_json(
+                {"type": "auth_ok", "ha_version": self.sys_homeassistant.version}
+            )
         except (RuntimeError, ValueError) as err:
             _LOGGER.error("Can't initialize handshake: %s", err)
             return server
@@ -207,16 +210,13 @@ class APIProxy(CoreSysAttributes):
             server_read = None
             while not server.closed and not client.closed:
                 if not client_read:
-                    client_read = self.sys_create_task(
-                        client.receive_str())
+                    client_read = self.sys_create_task(client.receive_str())
                 if not server_read:
-                    server_read = self.sys_create_task(
-                        server.receive_str())
+                    server_read = self.sys_create_task(server.receive_str())
 
                 # wait until data need to be processed
                 await asyncio.wait(
-                    [client_read, server_read],
-                    return_when=asyncio.FIRST_COMPLETED
+                    [client_read, server_read], return_when=asyncio.FIRST_COMPLETED
                 )
 
                 # server

hassio/api/services.py

@@ -2,8 +2,13 @@
 
 from .utils import api_process, api_validate
 from ..const import (
-    ATTR_AVAILABLE, ATTR_PROVIDERS, ATTR_SLUG, ATTR_SERVICES, REQUEST_FROM,
-    PROVIDE_SERVICE)
+    ATTR_AVAILABLE,
+    ATTR_PROVIDERS,
+    ATTR_SLUG,
+    ATTR_SERVICES,
+    REQUEST_FROM,
+    PROVIDE_SERVICE,
+)
 from ..coresys import CoreSysAttributes
 from ..exceptions import APIError, APIForbidden
 
@@ -13,7 +18,7 @@ class APIServices(CoreSysAttributes):
 
     def _extract_service(self, request):
         """Return service, throw an exception if it doesn't exist."""
-        service = self.sys_services.get(request.match_info.get('service'))
+        service = self.sys_services.get(request.match_info.get("service"))
         if not service:
             raise APIError("Service does not exist")
 
@@ -24,11 +29,13 @@ class APIServices(CoreSysAttributes):
         """Show register services."""
         services = []
         for service in self.sys_services.list_services:
-            services.append({
-                ATTR_SLUG: service.slug,
-                ATTR_AVAILABLE: service.enabled,
-                ATTR_PROVIDERS: service.providers,
-            })
+            services.append(
+                {
+                    ATTR_SLUG: service.slug,
+                    ATTR_AVAILABLE: service.enabled,
+                    ATTR_PROVIDERS: service.providers,
+                }
+            )
 
         return {ATTR_SERVICES: services}