Merge pull request #1512 from home-assistant/dev

Release 201

.devcontainer/Dockerfile

@@ -34,10 +34,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     && rm -rf /var/lib/apt/lists/*
 
 # Install Python dependencies from requirements.txt if it exists
-COPY requirements.txt requirements_tests.txt /workspaces/
-RUN pip install -r requirements.txt \
-    && pip3 install -r requirements_tests.txt \
-    && pip install black tox
+COPY requirements.txt requirements_tests.txt ./
+RUN pip3 install -r requirements.txt -r requirements_tests.txt \
+    && pip3 install tox \
+    && rm -f requirements.txt requirements_tests.txt
 
 # Set the default shell to bash instead of sh
 ENV SHELL /bin/bash

.devcontainer/devcontainer.json

@@ -6,11 +6,13 @@
 	"appPort": "9123:8123",
 	"runArgs": [
 		"-e",
-		"GIT_EDITOR='code --wait'",
+		"GIT_EDITOR=code --wait",
 		"--privileged"
 	],
 	"extensions": [
-		"ms-python.python"
+		"ms-python.python",
+		"visualstudioexptteam.vscodeintellicode",
+		"esbenp.prettier-vscode"
 	],
 	"settings": {
 		"python.pythonPath": "/usr/local/bin/python",

.github/lock.yml

@@ -0,0 +1,27 @@
+# Configuration for Lock Threads - https://github.com/dessant/lock-threads
+
+# Number of days of inactivity before a closed issue or pull request is locked
+daysUntilLock: 1
+
+# Skip issues and pull requests created before a given timestamp. Timestamp must
+# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
+skipCreatedBefore: 2020-01-01
+
+# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
+exemptLabels: []
+
+# Label to add before locking, such as `outdated`. Set to `false` to disable
+lockLabel: false
+
+# Comment to post before locking. Set to `false` to disable
+lockComment: false
+
+# Assign `resolved` as the reason for locking. Set to `false` to disable
+setLockReason: false
+
+# Limit to only `issues` or `pulls`
+only: pulls
+
+# Optionally, specify configuration settings just for `issues` or `pulls`
+issues:
+   daysUntilLock: 30

Dockerfile

@@ -9,7 +9,6 @@ RUN apk add --no-cache \
     git \
     socat \
     glib \
-    libstdc++ \
     eudev \
     eudev-libs
 

azure-pipelines-ci.yml

@@ -0,0 +1,48 @@
+# https://dev.azure.com/home-assistant
+
+trigger:
+  batch: true
+  branches:
+    include:
+      - master
+      - dev
+pr:
+  - dev
+variables:
+  - name: versionHadolint
+    value: "v1.16.3"
+
+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: "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"

azure-pipelines-release.yml

@@ -0,0 +1,56 @@
+# https://dev.azure.com/home-assistant
+
+trigger:
+  batch: true
+  branches:
+    include:
+      - dev
+  tags:
+    include:
+      - "*"
+pr: none
+variables:
+  - name: basePythonTag
+    value: "3.7-alpine3.11"
+  - name: versionBuilder
+    value: "6.9"
+  - group: docker
+
+jobs:
+  - job: "VersionValidate"
+    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)"
+
+          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"

azure-pipelines-wheels.yml

@@ -0,0 +1,60 @@
+# https://dev.azure.com/home-assistant
+
+trigger:
+  batch: true
+  branches:
+    include:
+      - dev
+pr: none
+variables:
+  - name: versionWheels
+    value: "1.6-3.7-alpine3.11"
+  - group: wheels
+
+jobs:
+  - job: "Wheels"
+    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"

azure-pipelines.yml

@@ -1,168 +0,0 @@
-# https://dev.azure.com/home-assistant
-
-trigger:
-  batch: true
-  branches:
-    include:
-    - master
-    - dev
-  tags:
-    include:
-    - '*'
-    exclude:
-    - untagged*
-pr:
-  - dev
-variables:
-  - name: basePythonTag
-    value: '3.7-alpine3.10'
-  - name: versionHadolint
-    value: 'v1.16.3'
-  - name: versionBuilder
-    value: '4.4'
-  - name: versionWheels
-    value: '1.0-3.7-alpine3.10'
-  - group: docker
-  - group: wheels
-
-
-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 --target-version py37 --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'
-
-- 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'
-
-- 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)"
-
-        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'

hassio/__main__.py

@@ -6,12 +6,13 @@ import sys
 
 from hassio import bootstrap
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER: logging.Logger = logging.getLogger(__name__)
 
 
 def initialize_event_loop():
     """Attempt to use uvloop."""
     try:
+        # pylint: disable=import-outside-toplevel
         import uvloop
 
         uvloop.install()

hassio/addons/__init__.py

@@ -19,7 +19,7 @@ from ..store.addon import AddonStore
 from .addon import Addon
 from .data import AddonsData
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER: logging.Logger = logging.getLogger(__name__)
 
 AnyAddon = Union[Addon, AddonStore]
 
@@ -166,8 +166,17 @@ class AddonManager(CoreSysAttributes):
             with suppress(HomeAssistantAPIError):
                 await self.sys_ingress.update_hass_panel(addon)
 
-        # Cleanup internal data
-        addon.remove_discovery()
+        # Cleanup discovery data
+        for message in self.sys_discovery.list_messages:
+            if message.addon != addon.slug:
+                continue
+            self.sys_discovery.remove(message)
+
+        # Cleanup services data
+        for service in self.sys_services.list_services:
+            if addon.slug not in service.active:
+                continue
+            service.del_service_data(addon)
 
         self.data.uninstall(addon)
         self.local.pop(slug)
@@ -245,7 +254,7 @@ class AddonManager(CoreSysAttributes):
             raise AddonsError() from None
         else:
             self.data.update(store)
-            _LOGGER.info("Add-on '%s' successfully rebuilded", slug)
+            _LOGGER.info("Add-on '%s' successfully rebuilt", slug)
 
         # restore state
         if last_state == STATE_STARTED:
@@ -254,20 +263,23 @@ class AddonManager(CoreSysAttributes):
     async def restore(self, slug: str, tar_file: tarfile.TarFile) -> None:
         """Restore state of an add-on."""
         if slug not in self.local:
-            _LOGGER.debug("Add-on %s is not local available for restore")
+            _LOGGER.debug("Add-on %s is not local available for restore", slug)
             addon = Addon(self.coresys, slug)
         else:
-            _LOGGER.debug("Add-on %s is local available for restore")
+            _LOGGER.debug("Add-on %s is local available for restore", slug)
             addon = self.local[slug]
 
         await addon.restore(tar_file)
 
         # Check if new
-        if slug in self.local:
-            return
+        if slug not in self.local:
+            _LOGGER.info("Detect new Add-on after restore %s", slug)
+            self.local[slug] = addon
 
-        _LOGGER.info("Detect new Add-on after restore %s", slug)
-        self.local[slug] = addon
+        # Update ingress
+        if addon.with_ingress:
+            with suppress(HomeAssistantAPIError):
+                await self.sys_ingress.update_hass_panel(addon)
 
     async def repair(self) -> None:
         """Repair local add-ons."""
@@ -285,6 +297,9 @@ class AddonManager(CoreSysAttributes):
 
         for addon in needs_repair:
             _LOGGER.info("Start repair for add-on: %s", addon.slug)
+            await self.sys_run_in_executor(
+                self.sys_docker.network.stale_cleanup, addon.instance.name
+            )
 
             with suppress(DockerAPIError, KeyError):
                 # Need pull a image again
@@ -293,7 +308,7 @@ class AddonManager(CoreSysAttributes):
                     continue
 
                 # Need local lookup
-                elif addon.need_build and not addon.is_detached:
+                if addon.need_build and not addon.is_detached:
                     store = self.store[addon.slug]
                     # If this add-on is available for rebuild
                     if addon.version == store.version:

hassio/addons/addon.py

@@ -51,11 +51,12 @@ from ..exceptions import (
 )
 from ..utils.apparmor import adjust_profile
 from ..utils.json import read_json_file, write_json_file
+from ..utils.tar import exclude_filter, secure_path
 from .model import AddonModel, Data
 from .utils import remove_data
 from .validate import SCHEMA_ADDON_SNAPSHOT, validate_options
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER: logging.Logger = logging.getLogger(__name__)
 
 RE_WEBUI = re.compile(
     r"^(?:(?P<s_prefix>https?)|\[PROTO:(?P<t_proto>\w+)\])"
@@ -345,13 +346,16 @@ class Addon(AddonModel):
         """Save data of add-on."""
         self.sys_addons.data.save_data()
 
-    def write_options(self):
+    async def write_options(self):
         """Return True if add-on options is written to data."""
         schema = self.schema
         options = self.options
 
+        # Update secrets for validation
+        await self.sys_secrets.reload()
+
         try:
-            schema(options)
+            options = schema(options)
             write_json_file(self.path_options, options)
         except vol.Invalid as ex:
             _LOGGER.error(
@@ -367,13 +371,6 @@ class Addon(AddonModel):
 
         raise AddonsError()
 
-    def remove_discovery(self):
-        """Remove all discovery message from add-on."""
-        for message in self.sys_discovery.list_messages:
-            if message.addon != self.slug:
-                continue
-            self.sys_discovery.remove(message)
-
     async def remove_data(self):
         """Remove add-on data."""
         if not self.path_data.is_dir():
@@ -438,7 +435,9 @@ class Addon(AddonModel):
         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(self.coresys, new_raw_schema))
+        )
 
         # validate
         try:
@@ -465,12 +464,13 @@ class Addon(AddonModel):
         self.save_persist()
 
         # Options
-        self.write_options()
+        await self.write_options()
 
         # Sound
         if self.with_audio:
             self.write_asound()
 
+        # Start Add-on
         try:
             await self.instance.run()
         except DockerAPIError:
@@ -519,7 +519,7 @@ class Addon(AddonModel):
 
     async def snapshot(self, tar_file: tarfile.TarFile) -> None:
         """Snapshot state of an add-on."""
-        with TemporaryDirectory(dir=str(self.sys_config.path_tmp)) as temp:
+        with TemporaryDirectory(dir=self.sys_config.path_tmp) as temp:
             # store local image
             if self.need_build:
                 try:
@@ -554,8 +554,15 @@ class Addon(AddonModel):
             def _write_tarfile():
                 """Write tar inside loop."""
                 with tar_file as snapshot:
+                    # Snapshot system
                     snapshot.add(temp, arcname=".")
-                    snapshot.add(self.path_data, arcname="data")
+
+                    # Snapshot data
+                    snapshot.add(
+                        self.path_data,
+                        arcname="data",
+                        filter=exclude_filter(self.snapshot_exclude),
+                    )
 
             try:
                 _LOGGER.info("Build snapshot for add-on %s", self.slug)
@@ -568,12 +575,12 @@ class Addon(AddonModel):
 
     async def restore(self, tar_file: tarfile.TarFile) -> None:
         """Restore state of an add-on."""
-        with TemporaryDirectory(dir=str(self.sys_config.path_tmp)) as temp:
+        with TemporaryDirectory(dir=self.sys_config.path_tmp) as temp:
             # extract snapshot
             def _extract_tarfile():
                 """Extract tar snapshot."""
                 with tar_file as snapshot:
-                    snapshot.extractall(path=Path(temp))
+                    snapshot.extractall(path=Path(temp), members=secure_path(snapshot))
 
             try:
                 await self.sys_run_in_executor(_extract_tarfile)
@@ -634,7 +641,7 @@ class Addon(AddonModel):
             # Restore data
             def _restore_data():
                 """Restore data."""
-                shutil.copytree(str(Path(temp, "data")), str(self.path_data))
+                shutil.copytree(Path(temp, "data"), self.path_data)
 
             _LOGGER.info("Restore data for addon %s", self.slug)
             if self.path_data.is_dir():

hassio/addons/data.py

@@ -17,7 +17,7 @@ from ..store.addon import AddonStore
 from .addon import Addon
 from .validate import SCHEMA_ADDONS_FILE
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER: logging.Logger = logging.getLogger(__name__)
 
 Config = Dict[str, Any]
 

hassio/addons/model.py

@@ -1,11 +1,12 @@
 """Init file for Hass.io add-ons."""
-from distutils.version import StrictVersion
 from pathlib import Path
 from typing import Any, Awaitable, Dict, List, Optional
 
+from packaging import version as pkg_version
 import voluptuous as vol
 
 from ..const import (
+    ATTR_ADVANCED,
     ATTR_APPARMOR,
     ATTR_ARCH,
     ATTR_AUDIO,
@@ -47,6 +48,8 @@ from ..const import (
     ATTR_SCHEMA,
     ATTR_SERVICES,
     ATTR_SLUG,
+    ATTR_SNAPSHOT_EXCLUDE,
+    ATTR_STAGE,
     ATTR_STARTUP,
     ATTR_STDIN,
     ATTR_TIMEOUT,
@@ -54,13 +57,15 @@ from ..const import (
     ATTR_UDEV,
     ATTR_URL,
     ATTR_VERSION,
+    ATTR_VIDEO,
     ATTR_WEBUI,
     SECURITY_DEFAULT,
     SECURITY_DISABLE,
     SECURITY_PROFILE,
+    AddonStages,
 )
 from ..coresys import CoreSysAttributes
-from .validate import RE_SERVICE, RE_VOLUME, validate_options
+from .validate import RE_SERVICE, RE_VOLUME, schema_ui_options, validate_options
 
 Data = Dict[str, Any]
 
@@ -188,6 +193,16 @@ class AddonModel(CoreSysAttributes):
         """Return startup type of add-on."""
         return self.data.get(ATTR_STARTUP)
 
+    @property
+    def advanced(self) -> bool:
+        """Return advanced mode of add-on."""
+        return self.data[ATTR_ADVANCED]
+
+    @property
+    def stage(self) -> AddonStages:
+        """Return stage mode of add-on."""
+        return self.data[ATTR_STAGE]
+
     @property
     def services_role(self) -> Dict[str, str]:
         """Return dict of services with rights."""
@@ -324,6 +339,11 @@ class AddonModel(CoreSysAttributes):
         """Return Hass.io role for API."""
         return self.data[ATTR_HASSIO_ROLE]
 
+    @property
+    def snapshot_exclude(self) -> List[str]:
+        """Return Exclude list for snapshot."""
+        return self.data.get(ATTR_SNAPSHOT_EXCLUDE, [])
+
     @property
     def with_stdin(self) -> bool:
         """Return True if the add-on access use stdin input."""
@@ -374,6 +394,11 @@ class AddonModel(CoreSysAttributes):
         """Return True if the add-on access to audio."""
         return self.data[ATTR_AUDIO]
 
+    @property
+    def with_video(self) -> bool:
+        """Return True if the add-on access to video."""
+        return self.data[ATTR_VIDEO]
+
     @property
     def homeassistant_version(self) -> Optional[str]:
         """Return min Home Assistant version they needed by Add-on."""
@@ -399,6 +424,11 @@ class AddonModel(CoreSysAttributes):
         """Return True if a changelog exists."""
         return self.path_changelog.exists()
 
+    @property
+    def with_documentation(self) -> bool:
+        """Return True if a documentation exists."""
+        return self.path_documentation.exists()
+
     @property
     def supported_arch(self) -> List[str]:
         """Return list of supported arch."""
@@ -449,6 +479,11 @@ class AddonModel(CoreSysAttributes):
         """Return path to add-on changelog."""
         return Path(self.path_location, "CHANGELOG.md")
 
+    @property
+    def path_documentation(self) -> Path:
+        """Return path to add-on changelog."""
+        return Path(self.path_location, "DOCS.md")
+
     @property
     def path_apparmor(self) -> Path:
         """Return path to custom AppArmor profile."""
@@ -461,7 +496,16 @@ class AddonModel(CoreSysAttributes):
 
         if isinstance(raw_schema, bool):
             return vol.Schema(dict)
-        return vol.Schema(vol.All(dict, validate_options(raw_schema)))
+        return vol.Schema(vol.All(dict, validate_options(self.coresys, raw_schema)))
+
+    @property
+    def schema_ui(self) -> Optional[List[Dict[str, Any]]]:
+        """Create a UI schema for add-on options."""
+        raw_schema = self.data[ATTR_SCHEMA]
+
+        if isinstance(raw_schema, bool):
+            return None
+        return schema_ui_options(raw_schema)
 
     def __eq__(self, other):
         """Compaired add-on objects."""
@@ -482,7 +526,9 @@ class AddonModel(CoreSysAttributes):
 
         # Home Assistant
         version = config.get(ATTR_HOMEASSISTANT) or self.sys_homeassistant.version
-        if StrictVersion(self.sys_homeassistant.version) < StrictVersion(version):
+        if pkg_version.parse(self.sys_homeassistant.version) < pkg_version.parse(
+            version
+        ):
             return False
 
         return True

hassio/addons/utils.py

@@ -22,7 +22,7 @@ from ..const import (
 if TYPE_CHECKING:
     from .model import AddonModel
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER: logging.Logger = logging.getLogger(__name__)
 
 
 def rating_security(addon: AddonModel) -> int:
@@ -39,8 +39,10 @@ def rating_security(addon: AddonModel) -> int:
     elif addon.apparmor == SECURITY_PROFILE:
         rating += 1
 
-    # Home Assistant Login
-    if addon.access_auth_api:
+    # Home Assistant Login & Ingress
+    if addon.with_ingress:
+        rating += 2
+    elif addon.access_auth_api:
         rating += 1
 
     # Privileged options

hassio/addons/validate.py

@@ -2,6 +2,7 @@
 import logging
 import re
 import secrets
+from typing import Any, Dict, List
 import uuid
 
 import voluptuous as vol
@@ -9,6 +10,7 @@ import voluptuous as vol
 from ..const import (
     ARCH_ALL,
     ATTR_ACCESS_TOKEN,
+    ATTR_ADVANCED,
     ATTR_APPARMOR,
     ATTR_ARCH,
     ATTR_ARGS,
@@ -61,7 +63,9 @@ from ..const import (
     ATTR_SCHEMA,
     ATTR_SERVICES,
     ATTR_SLUG,
+    ATTR_SNAPSHOT_EXCLUDE,
     ATTR_SQUASH,
+    ATTR_STAGE,
     ATTR_STARTUP,
     ATTR_STATE,
     ATTR_STDIN,
@@ -73,6 +77,7 @@ from ..const import (
     ATTR_USER,
     ATTR_UUID,
     ATTR_VERSION,
+    ATTR_VIDEO,
     ATTR_WEBUI,
     BOOT_AUTO,
     BOOT_MANUAL,
@@ -84,41 +89,59 @@ from ..const import (
     STARTUP_SERVICES,
     STATE_STARTED,
     STATE_STOPPED,
+    AddonStages,
 )
+from ..coresys import CoreSys
 from ..discovery.validate import valid_discovery_service
 from ..validate import (
-    ALSA_DEVICE,
     DOCKER_PORTS,
     DOCKER_PORTS_DESCRIPTION,
-    NETWORK_PORT,
-    TOKEN,
-    UUID_MATCH,
+    alsa_device,
+    network_port,
+    token,
+    uuid_match,
 )
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER: logging.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)$")
+RE_SERVICE = re.compile(r"^(?P<service>mqtt|mysql):(?P<rights>provide|want|need)$")
 
 V_STR = "str"
 V_INT = "int"
 V_FLOAT = "float"
 V_BOOL = "bool"
+V_PASSWORD = "password"
 V_EMAIL = "email"
 V_URL = "url"
 V_PORT = "port"
 V_MATCH = "match"
+V_LIST = "list"
 
 RE_SCHEMA_ELEMENT = re.compile(
     r"^(?:"
-    r"|str|bool|email|url|port"
+    r"|bool|email|url|port"
+    r"|str(?:\((?P<s_min>\d+)?,(?P<s_max>\d+)?\))?"
+    r"|password(?:\((?P<p_min>\d+)?,(?P<p_max>\d+)?\))?"
     r"|int(?:\((?P<i_min>\d+)?,(?P<i_max>\d+)?\))?"
     r"|float(?:\((?P<f_min>[\d\.]+)?,(?P<f_max>[\d\.]+)?\))?"
     r"|match\((?P<match>.*)\)"
+    r"|list\((?P<list>.+)\)"
     r")\??$"
 )
 
+_SCHEMA_LENGTH_PARTS = (
+    "i_min",
+    "i_max",
+    "f_min",
+    "f_max",
+    "s_min",
+    "s_max",
+    "p_min",
+    "p_max",
+)
+
 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{}]+)?$"
@@ -130,18 +153,18 @@ SCHEMA_ELEMENT = vol.Match(RE_SCHEMA_ELEMENT)
 MACHINE_ALL = [
     "intel-nuc",
     "odroid-c2",
+    "odroid-n2",
     "odroid-xu",
-    "orangepi-prime",
-    "qemux86",
-    "qemux86-64",
-    "qemuarm",
     "qemuarm-64",
+    "qemuarm",
+    "qemux86-64",
+    "qemux86",
     "raspberrypi",
     "raspberrypi2",
-    "raspberrypi3",
     "raspberrypi3-64",
-    "raspberrypi4",
+    "raspberrypi3",
     "raspberrypi4-64",
+    "raspberrypi4",
     "tinker",
 ]
 
@@ -167,6 +190,8 @@ SCHEMA_ADDON_CONFIG = vol.Schema(
         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_ADVANCED, default=False): vol.Boolean(),
+        vol.Optional(ATTR_STAGE, default=AddonStages.STABLE): vol.Coerce(AddonStages),
         vol.Optional(ATTR_PORTS): DOCKER_PORTS,
         vol.Optional(ATTR_PORTS_DESCRIPTION): DOCKER_PORTS_DESCRIPTION,
         vol.Optional(ATTR_WEBUI): vol.Match(
@@ -174,7 +199,7 @@ SCHEMA_ADDON_CONFIG = vol.Schema(
         ),
         vol.Optional(ATTR_INGRESS, default=False): vol.Boolean(),
         vol.Optional(ATTR_INGRESS_PORT, default=8099): vol.Any(
-            NETWORK_PORT, vol.Equal(0)
+            network_port, vol.Equal(0)
         ),
         vol.Optional(ATTR_INGRESS_ENTRY): vol.Coerce(str),
         vol.Optional(ATTR_PANEL_ICON, default="mdi:puzzle"): vol.Coerce(str),
@@ -195,6 +220,7 @@ SCHEMA_ADDON_CONFIG = vol.Schema(
         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_VIDEO, 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(),
@@ -207,6 +233,7 @@ SCHEMA_ADDON_CONFIG = vol.Schema(
         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.Optional(ATTR_SNAPSHOT_EXCLUDE): [vol.Coerce(str)],
         vol.Required(ATTR_OPTIONS): dict,
         vol.Required(ATTR_SCHEMA): vol.Any(
             vol.Schema(
@@ -260,8 +287,8 @@ 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_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
         ),
@@ -269,8 +296,8 @@ SCHEMA_ADDON_USER = vol.Schema(
         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_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(),
     },
@@ -305,7 +332,7 @@ SCHEMA_ADDON_SNAPSHOT = vol.Schema(
 )
 
 
-def validate_options(raw_schema):
+def validate_options(coresys: CoreSys, raw_schema: Dict[str, Any]):
     """Validate schema."""
 
     def validate(struct):
@@ -323,13 +350,13 @@ def validate_options(raw_schema):
             try:
                 if isinstance(typ, list):
                     # nested value list
-                    options[key] = _nested_validate_list(typ[0], value, key)
+                    options[key] = _nested_validate_list(coresys, typ[0], value, key)
                 elif isinstance(typ, dict):
                     # nested value dict
-                    options[key] = _nested_validate_dict(typ, value, key)
+                    options[key] = _nested_validate_dict(coresys, typ, value, key)
                 else:
                     # normal value
-                    options[key] = _single_validate(typ, value, key)
+                    options[key] = _single_validate(coresys, typ, value, key)
             except (IndexError, KeyError):
                 raise vol.Invalid(f"Type error for {key}") from None
 
@@ -341,24 +368,31 @@ def validate_options(raw_schema):
 
 # pylint: disable=no-value-for-parameter
 # pylint: disable=inconsistent-return-statements
-def _single_validate(typ, value, key):
+def _single_validate(coresys: CoreSys, typ: str, value: Any, key: str):
     """Validate a single element."""
     # if required argument
     if value is None:
         raise vol.Invalid(f"Missing required option '{key}'")
 
+    # Lookup secret
+    if str(value).startswith("!secret "):
+        secret: str = value.partition(" ")[2]
+        value = coresys.secrets.get(secret)
+        if value is None:
+            raise vol.Invalid(f"Unknown secret {secret}")
+
     # parse extend data from type
     match = RE_SCHEMA_ELEMENT.match(typ)
 
     # prepare range
     range_args = {}
-    for group_name in ("i_min", "i_max", "f_min", "f_max"):
+    for group_name in _SCHEMA_LENGTH_PARTS:
         group_value = match.group(group_name)
         if group_value:
             range_args[group_name[2:]] = float(group_value)
 
-    if typ.startswith(V_STR):
-        return str(value)
+    if typ.startswith(V_STR) or typ.startswith(V_PASSWORD):
+        return vol.All(str(value), vol.Range(**range_args))(value)
     elif typ.startswith(V_INT):
         return vol.All(vol.Coerce(int), vol.Range(**range_args))(value)
     elif typ.startswith(V_FLOAT):
@@ -370,29 +404,31 @@ def _single_validate(typ, value, key):
     elif typ.startswith(V_URL):
         return vol.Url()(value)
     elif typ.startswith(V_PORT):
-        return NETWORK_PORT(value)
+        return network_port(value)
     elif typ.startswith(V_MATCH):
         return vol.Match(match.group("match"))(str(value))
+    elif typ.startswith(V_LIST):
+        return vol.In(match.group("list").split("|"))(str(value))
 
     raise vol.Invalid(f"Fatal error for {key} type {typ}")
 
 
-def _nested_validate_list(typ, data_list, key):
+def _nested_validate_list(coresys, typ, data_list, key):
     """Validate nested items."""
     options = []
 
     for element in data_list:
         # Nested?
         if isinstance(typ, dict):
-            c_options = _nested_validate_dict(typ, element, key)
+            c_options = _nested_validate_dict(coresys, typ, element, key)
             options.append(c_options)
         else:
-            options.append(_single_validate(typ, element, key))
+            options.append(_single_validate(coresys, typ, element, key))
 
     return options
 
 
-def _nested_validate_dict(typ, data_dict, key):
+def _nested_validate_dict(coresys, typ, data_dict, key):
     """Validate nested items."""
     options = {}
 
@@ -404,9 +440,11 @@ 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(
+                coresys, typ[c_key][0], c_value, c_key
+            )
         else:
-            options[c_key] = _single_validate(typ[c_key], c_value, c_key)
+            options[c_key] = _single_validate(coresys, typ[c_key], c_value, c_key)
 
     _check_missing_options(typ, options, key)
     return options
@@ -419,3 +457,117 @@ def _check_missing_options(origin, exists, root):
         if isinstance(origin[miss_opt], str) and origin[miss_opt].endswith("?"):
             continue
         raise vol.Invalid(f"Missing option {miss_opt} in {root}")
+
+
+def schema_ui_options(raw_schema: Dict[str, Any]) -> List[Dict[str, Any]]:
+    """Generate UI schema."""
+    ui_schema = []
+
+    # read options
+    for key, value in raw_schema.items():
+        if isinstance(value, list):
+            # nested value list
+            _nested_ui_list(ui_schema, value, key)
+        elif isinstance(value, dict):
+            # nested value dict
+            _nested_ui_dict(ui_schema, value, key)
+        else:
+            # normal value
+            _single_ui_option(ui_schema, value, key)
+
+    return ui_schema
+
+
+def _single_ui_option(
+    ui_schema: List[Dict[str, Any]], value: str, key: str, multiple: bool = False
+) -> None:
+    """Validate a single element."""
+    ui_node = {"name": key}
+
+    # If multiple
+    if multiple:
+        ui_node["multiple"] = True
+
+    # Parse extend data from type
+    match = RE_SCHEMA_ELEMENT.match(value)
+
+    # Prepare range
+    for group_name in _SCHEMA_LENGTH_PARTS:
+        group_value = match.group(group_name)
+        if not group_value:
+            continue
+        if group_name[2:] == "min":
+            ui_node["lengthMin"] = float(group_value)
+        elif group_name[2:] == "max":
+            ui_node["lengthMax"] = float(group_value)
+
+    # If required
+    if value.endswith("?"):
+        ui_node["optional"] = True
+    else:
+        ui_node["required"] = True
+
+    # Data types
+    if value.startswith(V_STR):
+        ui_node["type"] = "string"
+    elif value.startswith(V_PASSWORD):
+        ui_node["type"] = "string"
+        ui_node["format"] = "password"
+    elif value.startswith(V_INT):
+        ui_node["type"] = "integer"
+    elif value.startswith(V_FLOAT):
+        ui_node["type"] = "float"
+    elif value.startswith(V_BOOL):
+        ui_node["type"] = "boolean"
+    elif value.startswith(V_EMAIL):
+        ui_node["type"] = "string"
+        ui_node["format"] = "email"
+    elif value.startswith(V_URL):
+        ui_node["type"] = "string"
+        ui_node["format"] = "url"
+    elif value.startswith(V_PORT):
+        ui_node["type"] = "integer"
+    elif value.startswith(V_MATCH):
+        ui_node["type"] = "string"
+    elif value.startswith(V_LIST):
+        ui_node["type"] = "select"
+        ui_node["options"] = match.group("list").split("|")
+
+    ui_schema.append(ui_node)
+
+
+def _nested_ui_list(
+    ui_schema: List[Dict[str, Any]], option_list: List[Any], key: str
+) -> None:
+    """UI nested list items."""
+    try:
+        element = option_list[0]
+    except IndexError:
+        _LOGGER.error("Invalid schema %s", key)
+        return
+
+    if isinstance(element, dict):
+        _nested_ui_dict(ui_schema, element, key, multiple=True)
+    else:
+        _single_ui_option(ui_schema, element, key, multiple=True)
+
+
+def _nested_ui_dict(
+    ui_schema: List[Dict[str, Any]],
+    option_dict: Dict[str, Any],
+    key: str,
+    multiple: bool = False,
+) -> None:
+    """UI nested dict items."""
+    ui_node = {"name": key, "type": "schema", "optional": True, "multiple": multiple}
+
+    nested_schema = []
+    for c_key, c_value in option_dict.items():
+        # Nested?
+        if isinstance(c_value, list):
+            _nested_ui_list(nested_schema, c_value, c_key)
+        else:
+            _single_ui_option(nested_schema, c_value, c_key)
+
+    ui_node["schema"] = nested_schema
+    ui_schema.append(ui_node)

hassio/api/__init__.py

@@ -22,7 +22,10 @@ from .services import APIServices
 from .snapshots import APISnapshots
 from .supervisor import APISupervisor
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER: logging.Logger = logging.getLogger(__name__)
+
+
+MAX_CLIENT_SIZE: int = 1024 ** 2 * 16
 
 
 class RestAPI(CoreSysAttributes):
@@ -33,7 +36,8 @@ class RestAPI(CoreSysAttributes):
         self.coresys: CoreSys = coresys
         self.security: SecurityMiddleware = SecurityMiddleware(coresys)
         self.webapp: web.Application = web.Application(
-            middlewares=[self.security.token_validation]
+            client_max_size=MAX_CLIENT_SIZE,
+            middlewares=[self.security.token_validation],
         )
 
         # service stuff
@@ -85,6 +89,11 @@ class RestAPI(CoreSysAttributes):
 
         self.webapp.add_routes(
             [
+                web.get("/os/info", api_hassos.info),
+                web.post("/os/update", api_hassos.update),
+                web.post("/os/update/cli", api_hassos.update_cli),
+                web.post("/os/config/sync", api_hassos.config_sync),
+                # Remove with old Hass.io fallback
                 web.get("/hassos/info", api_hassos.info),
                 web.post("/hassos/update", api_hassos.update),
                 web.post("/hassos/update/cli", api_hassos.update_cli),
@@ -101,6 +110,7 @@ class RestAPI(CoreSysAttributes):
             [
                 web.get("/hardware/info", api_hardware.info),
                 web.get("/hardware/audio", api_hardware.audio),
+                web.post("/hardware/trigger", api_hardware.trigger),
             ]
         )
 
@@ -116,7 +126,9 @@ class RestAPI(CoreSysAttributes):
         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), web.post("/auth/reset", api_auth.reset)]
+        )
 
     def _register_supervisor(self) -> None:
         """Register Supervisor functions."""
@@ -143,6 +155,17 @@ class RestAPI(CoreSysAttributes):
 
         self.webapp.add_routes(
             [
+                web.get("/core/info", api_hass.info),
+                web.get("/core/logs", api_hass.logs),
+                web.get("/core/stats", api_hass.stats),
+                web.post("/core/options", api_hass.options),
+                web.post("/core/update", api_hass.update),
+                web.post("/core/restart", api_hass.restart),
+                web.post("/core/stop", api_hass.stop),
+                web.post("/core/start", api_hass.start),
+                web.post("/core/check", api_hass.check),
+                web.post("/core/rebuild", api_hass.rebuild),
+                # Remove with old Hass.io fallback
                 web.get("/homeassistant/info", api_hass.info),
                 web.get("/homeassistant/logs", api_hass.logs),
                 web.get("/homeassistant/stats", api_hass.stats),
@@ -163,6 +186,13 @@ class RestAPI(CoreSysAttributes):
 
         self.webapp.add_routes(
             [
+                web.get("/core/api/websocket", api_proxy.websocket),
+                web.get("/core/websocket", api_proxy.websocket),
+                web.get("/core/api/stream", api_proxy.stream),
+                web.post("/core/api/{path:.+}", api_proxy.api),
+                web.get("/core/api/{path:.+}", api_proxy.api),
+                web.get("/core/api/", api_proxy.api),
+                # Remove with old Hass.io fallback
                 web.get("/homeassistant/api/websocket", api_proxy.websocket),
                 web.get("/homeassistant/websocket", api_proxy.websocket),
                 web.get("/homeassistant/api/stream", api_proxy.stream),
@@ -194,6 +224,7 @@ class RestAPI(CoreSysAttributes):
                 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.get("/addons/{addon}/documentation", api_addons.documentation),
                 web.post("/addons/{addon}/stdin", api_addons.stdin),
                 web.post("/addons/{addon}/security", api_addons.security),
                 web.get("/addons/{addon}/stats", api_addons.stats),
@@ -279,6 +310,7 @@ class RestAPI(CoreSysAttributes):
                 web.post("/dns/update", api_dns.update),
                 web.post("/dns/options", api_dns.options),
                 web.post("/dns/restart", api_dns.restart),
+                web.post("/dns/reset", api_dns.reset),
             ]
         )
 

hassio/api/addons.py

@@ -5,13 +5,13 @@ from typing import Any, Awaitable, Dict, List
 
 from aiohttp import web
 import voluptuous as vol
-from voluptuous.humanize import humanize_error
 
 from ..addons import AnyAddon
-from ..docker.stats import DockerStats
+from ..addons.addon import Addon
 from ..addons.utils import rating_security
 from ..const import (
     ATTR_ADDONS,
+    ATTR_ADVANCED,
     ATTR_APPARMOR,
     ATTR_ARCH,
     ATTR_AUDIO,
@@ -33,6 +33,7 @@ from ..const import (
     ATTR_DISCOVERY,
     ATTR_DNS,
     ATTR_DOCKER_API,
+    ATTR_DOCUMENTATION,
     ATTR_FULL_ACCESS,
     ATTR_GPIO,
     ATTR_HASSIO_API,
@@ -72,14 +73,17 @@ from ..const import (
     ATTR_RATING,
     ATTR_REPOSITORIES,
     ATTR_REPOSITORY,
+    ATTR_SCHEMA,
     ATTR_SERVICES,
     ATTR_SLUG,
     ATTR_SOURCE,
+    ATTR_STAGE,
     ATTR_STATE,
     ATTR_STDIN,
     ATTR_UDEV,
     ATTR_URL,
     ATTR_VERSION,
+    ATTR_VIDEO,
     ATTR_WEBUI,
     BOOT_AUTO,
     BOOT_MANUAL,
@@ -90,11 +94,12 @@ from ..const import (
     STATE_NONE,
 )
 from ..coresys import CoreSysAttributes
+from ..docker.stats import DockerStats
 from ..exceptions import APIError
-from ..validate import ALSA_DEVICE, DOCKER_PORTS
+from ..validate import DOCKER_PORTS, alsa_device
 from .utils import api_process, api_process_raw, api_validate
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER: logging.Logger = logging.getLogger(__name__)
 
 SCHEMA_VERSION = vol.Schema({vol.Optional(ATTR_VERSION): vol.Coerce(str)})
 
@@ -104,8 +109,8 @@ 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_AUDIO_OUTPUT): alsa_device,
+        vol.Optional(ATTR_AUDIO_INPUT): alsa_device,
         vol.Optional(ATTR_INGRESS_PANEL): vol.Boolean(),
     }
 )
@@ -125,7 +130,10 @@ class APIAddons(CoreSysAttributes):
 
         # Lookup itself
         if addon_slug == "self":
-            return request.get(REQUEST_FROM)
+            addon = request.get(REQUEST_FROM)
+            if not isinstance(addon, Addon):
+                raise APIError("Self is not an Addon")
+            return addon
 
         addon = self.sys_addons.get(addon_slug)
         if not addon:
@@ -146,6 +154,8 @@ class APIAddons(CoreSysAttributes):
                     ATTR_NAME: addon.name,
                     ATTR_SLUG: addon.slug,
                     ATTR_DESCRIPTON: addon.description,
+                    ATTR_ADVANCED: addon.advanced,
+                    ATTR_STAGE: addon.stage,
                     ATTR_VERSION: addon.latest_version,
                     ATTR_INSTALLED: addon.version if addon.is_installed else None,
                     ATTR_AVAILABLE: addon.available,
@@ -189,6 +199,8 @@ class APIAddons(CoreSysAttributes):
             ATTR_DNS: addon.dns,
             ATTR_DESCRIPTON: addon.description,
             ATTR_LONG_DESCRIPTION: addon.long_description,
+            ATTR_ADVANCED: addon.advanced,
+            ATTR_STAGE: addon.stage,
             ATTR_AUTO_UPDATE: None,
             ATTR_REPOSITORY: addon.repository,
             ATTR_VERSION: None,
@@ -197,6 +209,7 @@ class APIAddons(CoreSysAttributes):
             ATTR_RATING: rating_security(addon),
             ATTR_BOOT: addon.boot,
             ATTR_OPTIONS: addon.options,
+            ATTR_SCHEMA: addon.schema_ui,
             ATTR_ARCH: addon.supported_arch,
             ATTR_MACHINE: addon.supported_machine,
             ATTR_HOMEASSISTANT: addon.homeassistant_version,
@@ -218,6 +231,7 @@ class APIAddons(CoreSysAttributes):
             ATTR_ICON: addon.with_icon,
             ATTR_LOGO: addon.with_logo,
             ATTR_CHANGELOG: addon.with_changelog,
+            ATTR_DOCUMENTATION: addon.with_documentation,
             ATTR_STDIN: addon.with_stdin,
             ATTR_WEBUI: None,
             ATTR_HASSIO_API: addon.access_hassio_api,
@@ -229,6 +243,7 @@ class APIAddons(CoreSysAttributes):
             ATTR_DEVICETREE: addon.with_devicetree,
             ATTR_UDEV: addon.with_udev,
             ATTR_DOCKER_API: addon.access_docker_api,
+            ATTR_VIDEO: addon.with_video,
             ATTR_AUDIO: addon.with_audio,
             ATTR_AUDIO_INPUT: None,
             ATTR_AUDIO_OUTPUT: None,
@@ -266,11 +281,16 @@ class APIAddons(CoreSysAttributes):
         """Store user options for add-on."""
         addon: AnyAddon = self._extract_addon(request)
 
+        # Update secrets for validation
+        await self.sys_secrets.reload()
+
+        # Extend schema with add-on specific validation
         addon_schema = SCHEMA_OPTIONS.extend(
             {vol.Optional(ATTR_OPTIONS): vol.Any(None, addon.schema)}
         )
-        body: Dict[str, Any] = await api_validate(addon_schema, request)
 
+        # Validate/Process Body
+        body = await api_validate(addon_schema, request, origin=[ATTR_OPTIONS])
         if ATTR_OPTIONS in body:
             addon.options = body[ATTR_OPTIONS]
         if ATTR_BOOT in body:
@@ -334,14 +354,6 @@ class APIAddons(CoreSysAttributes):
     def start(self, request: web.Request) -> Awaitable[None]:
         """Start add-on."""
         addon: AnyAddon = self._extract_addon(request)
-
-        # check options
-        options = addon.options
-        try:
-            addon.schema(options)
-        except vol.Invalid as ex:
-            raise APIError(humanize_error(options, ex)) from None
-
         return asyncio.shield(addon.start())
 
     @api_process
@@ -411,6 +423,16 @@ class APIAddons(CoreSysAttributes):
         with addon.path_changelog.open("r") as changelog:
             return changelog.read()
 
+    @api_process_raw(CONTENT_TYPE_TEXT)
+    async def documentation(self, request: web.Request) -> str:
+        """Return documentation from add-on."""
+        addon: AnyAddon = self._extract_addon(request, check_installed=False)
+        if not addon.with_documentation:
+            raise APIError("No documentation found!")
+
+        with addon.path_documentation.open("r") as documentation:
+            return documentation.read()
+
     @api_process
     async def stdin(self, request: web.Request) -> None:
         """Write to stdin of add-on."""

hassio/api/auth.py

@@ -1,22 +1,39 @@
 """Init file for Hass.io auth/SSO RESTful API."""
+import asyncio
 import logging
+from typing import Dict
 
-from aiohttp import BasicAuth
+from aiohttp import BasicAuth, web
+from aiohttp.hdrs import AUTHORIZATION, CONTENT_TYPE, WWW_AUTHENTICATE
 from aiohttp.web_exceptions import HTTPUnauthorized
-from aiohttp.hdrs import CONTENT_TYPE, AUTHORIZATION, WWW_AUTHENTICATE
+import voluptuous as vol
 
-from .utils import api_process
-from ..const import REQUEST_FROM, CONTENT_TYPE_JSON, CONTENT_TYPE_URL
+from ..addons.addon import Addon
+from ..const import (
+    ATTR_PASSWORD,
+    ATTR_USERNAME,
+    CONTENT_TYPE_JSON,
+    CONTENT_TYPE_URL,
+    REQUEST_FROM,
+)
 from ..coresys import CoreSysAttributes
 from ..exceptions import APIForbidden
+from .utils import api_process, api_validate
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER: logging.Logger = logging.getLogger(__name__)
+
+SCHEMA_PASSWORD_RESET = vol.Schema(
+    {
+        vol.Required(ATTR_USERNAME): vol.Coerce(str),
+        vol.Required(ATTR_PASSWORD): vol.Coerce(str),
+    }
+)
 
 
 class APIAuth(CoreSysAttributes):
     """Handle RESTful API for auth functions."""
 
-    def _process_basic(self, request, addon):
+    def _process_basic(self, request: web.Request, addon: Addon) -> bool:
         """Process login request with basic auth.
 
         Return a coroutine.
@@ -24,7 +41,9 @@ class APIAuth(CoreSysAttributes):
         auth = BasicAuth.decode(request.headers[AUTHORIZATION])
         return self.sys_auth.check_login(addon, auth.login, auth.password)
 
-    def _process_dict(self, request, addon, data):
+    def _process_dict(
+        self, request: web.Request, addon: Addon, data: Dict[str, str]
+    ) -> bool:
         """Process login with dict data.
 
         Return a coroutine.
@@ -35,7 +54,7 @@ class APIAuth(CoreSysAttributes):
         return self.sys_auth.check_login(addon, username, password)
 
     @api_process
-    async def auth(self, request):
+    async def auth(self, request: web.Request) -> bool:
         """Process login request."""
         addon = request[REQUEST_FROM]
 
@@ -59,3 +78,11 @@ class APIAuth(CoreSysAttributes):
         raise HTTPUnauthorized(
             headers={WWW_AUTHENTICATE: 'Basic realm="Hass.io Authentication"'}
         )
+
+    @api_process
+    async def reset(self, request: web.Request) -> None:
+        """Process reset password request."""
+        body: Dict[str, str] = await api_validate(SCHEMA_PASSWORD_RESET, request)
+        await asyncio.shield(
+            self.sys_auth.change_password(body[ATTR_USERNAME], body[ATTR_PASSWORD])
+        )

hassio/api/dns.py

@@ -12,9 +12,10 @@ from ..const import (
     ATTR_CPU_PERCENT,
     ATTR_HOST,
     ATTR_LATEST_VERSION,
+    ATTR_LOCALS,
     ATTR_MEMORY_LIMIT,
-    ATTR_MEMORY_USAGE,
     ATTR_MEMORY_PERCENT,
+    ATTR_MEMORY_USAGE,
     ATTR_NETWORK_RX,
     ATTR_NETWORK_TX,
     ATTR_SERVERS,
@@ -23,13 +24,13 @@ from ..const import (
 )
 from ..coresys import CoreSysAttributes
 from ..exceptions import APIError
-from ..validate import DNS_SERVER_LIST
+from ..validate import dns_server_list
 from .utils import api_process, api_process_raw, api_validate
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER: logging.Logger = logging.getLogger(__name__)
 
 # pylint: disable=no-value-for-parameter
-SCHEMA_OPTIONS = vol.Schema({vol.Optional(ATTR_SERVERS): DNS_SERVER_LIST})
+SCHEMA_OPTIONS = vol.Schema({vol.Optional(ATTR_SERVERS): dns_server_list})
 
 SCHEMA_VERSION = vol.Schema({vol.Optional(ATTR_VERSION): vol.Coerce(str)})
 
@@ -45,6 +46,7 @@ class APICoreDNS(CoreSysAttributes):
             ATTR_LATEST_VERSION: self.sys_dns.latest_version,
             ATTR_HOST: str(self.sys_docker.network.dns),
             ATTR_SERVERS: self.sys_dns.servers,
+            ATTR_LOCALS: self.sys_host.network.dns_servers,
         }
 
     @api_process
@@ -93,3 +95,8 @@ class APICoreDNS(CoreSysAttributes):
     def restart(self, request: web.Request) -> Awaitable[None]:
         """Restart CoreDNS plugin."""
         return asyncio.shield(self.sys_dns.restart())
+
+    @api_process
+    def reset(self, request: web.Request) -> Awaitable[None]:
+        """Reset CoreDNS plugin."""
+        return asyncio.shield(self.sys_dns.reset())

hassio/api/hardware.py

@@ -1,5 +1,9 @@
 """Init file for Hass.io hardware RESTful API."""
+import asyncio
 import logging
+from typing import Any, Dict
+
+from aiohttp import web
 
 from .utils import api_process
 from ..const import (
@@ -12,14 +16,14 @@ from ..const import (
 )
 from ..coresys import CoreSysAttributes
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER: logging.Logger = logging.getLogger(__name__)
 
 
 class APIHardware(CoreSysAttributes):
     """Handle RESTful API for hardware functions."""
 
     @api_process
-    async def info(self, request):
+    async def info(self, request: web.Request) -> Dict[str, Any]:
         """Show hardware info."""
         return {
             ATTR_SERIAL: list(
@@ -32,7 +36,7 @@ class APIHardware(CoreSysAttributes):
         }
 
     @api_process
-    async def audio(self, request):
+    async def audio(self, request: web.Request) -> Dict[str, Any]:
         """Show ALSA audio devices."""
         return {
             ATTR_AUDIO: {
@@ -40,3 +44,8 @@ class APIHardware(CoreSysAttributes):
                 ATTR_OUTPUT: self.sys_host.alsa.output_devices,
             }
         }
+
+    @api_process
+    def trigger(self, request: web.Request) -> None:
+        """Trigger a udev device reload."""
+        return asyncio.shield(self.sys_hardware.udev_trigger())

hassio/api/hassos.py

@@ -3,11 +3,12 @@ import asyncio
 import logging
 from typing import Any, Awaitable, Dict
 
-import voluptuous as vol
 from aiohttp import web
+import voluptuous as vol
 
 from ..const import (
     ATTR_BOARD,
+    ATTR_BOOT,
     ATTR_VERSION,
     ATTR_VERSION_CLI,
     ATTR_VERSION_CLI_LATEST,
@@ -16,7 +17,7 @@ from ..const import (
 from ..coresys import CoreSysAttributes
 from .utils import api_process, api_validate
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER: logging.Logger = logging.getLogger(__name__)
 
 SCHEMA_VERSION = vol.Schema({vol.Optional(ATTR_VERSION): vol.Coerce(str)})
 
@@ -33,6 +34,7 @@ class APIHassOS(CoreSysAttributes):
             ATTR_VERSION_LATEST: self.sys_hassos.version_latest,
             ATTR_VERSION_CLI_LATEST: self.sys_hassos.version_cli_latest,
             ATTR_BOARD: self.sys_hassos.board,
+            ATTR_BOOT: self.sys_dbus.rauc.boot_slot,
         }
 
     @api_process

hassio/api/homeassistant.py

@@ -21,7 +21,6 @@ from ..const import (
     ATTR_MEMORY_PERCENT,
     ATTR_NETWORK_RX,
     ATTR_NETWORK_TX,
-    ATTR_PASSWORD,
     ATTR_PORT,
     ATTR_REFRESH_TOKEN,
     ATTR_SSL,
@@ -33,19 +32,18 @@ from ..const import (
 )
 from ..coresys import CoreSysAttributes
 from ..exceptions import APIError
-from ..validate import DOCKER_IMAGE, NETWORK_PORT
+from ..validate import docker_image, network_port
 from .utils import api_process, api_process_raw, api_validate
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER: logging.Logger = logging.getLogger(__name__)
 
 # pylint: disable=no-value-for-parameter
 SCHEMA_OPTIONS = vol.Schema(
     {
         vol.Optional(ATTR_BOOT): vol.Boolean(),
-        vol.Inclusive(ATTR_IMAGE, "custom_hass"): vol.Maybe(DOCKER_IMAGE),
+        vol.Inclusive(ATTR_IMAGE, "custom_hass"): vol.Maybe(docker_image),
         vol.Inclusive(ATTR_LAST_VERSION, "custom_hass"): vol.Maybe(vol.Coerce(str)),
-        vol.Optional(ATTR_PORT): NETWORK_PORT,
-        vol.Optional(ATTR_PASSWORD): vol.Maybe(vol.Coerce(str)),
+        vol.Optional(ATTR_PORT): network_port,
         vol.Optional(ATTR_SSL): vol.Boolean(),
         vol.Optional(ATTR_WATCHDOG): vol.Boolean(),
         vol.Optional(ATTR_WAIT_BOOT): vol.All(vol.Coerce(int), vol.Range(min=60)),
@@ -92,10 +90,6 @@ class APIHomeAssistant(CoreSysAttributes):
         if ATTR_PORT in body:
             self.sys_homeassistant.api_port = body[ATTR_PORT]
 
-        if ATTR_PASSWORD in body:
-            self.sys_homeassistant.api_password = body[ATTR_PASSWORD]
-            self.sys_homeassistant.refresh_token = None
-
         if ATTR_SSL in body:
             self.sys_homeassistant.api_ssl = body[ATTR_SSL]
 
@@ -107,7 +101,6 @@ class APIHomeAssistant(CoreSysAttributes):
 
         if ATTR_REFRESH_TOKEN in body:
             self.sys_homeassistant.refresh_token = body[ATTR_REFRESH_TOKEN]
-            self.sys_homeassistant.api_password = None
 
         self.sys_homeassistant.save_data()
 

hassio/api/host.py

@@ -20,7 +20,7 @@ from ..const import (
 )
 from ..coresys import CoreSysAttributes
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER: logging.Logger = logging.getLogger(__name__)
 
 SERVICE = "service"
 

hassio/api/info.py

@@ -19,7 +19,7 @@ from ..const import (
 from ..coresys import CoreSysAttributes
 from .utils import api_process
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER: logging.Logger = logging.getLogger(__name__)
 
 
 class APIInfo(CoreSysAttributes):

hassio/api/ingress.py

@@ -23,12 +23,13 @@ from ..const import (
     ATTR_ENABLE,
     COOKIE_INGRESS,
     HEADER_TOKEN,
+    HEADER_TOKEN_OLD,
     REQUEST_FROM,
 )
 from ..coresys import CoreSysAttributes
 from .utils import api_process
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER: logging.Logger = logging.getLogger(__name__)
 
 
 class APIIngress(CoreSysAttributes):
@@ -204,7 +205,16 @@ def _init_header(
 
     # filter flags
     for name, value in request.headers.items():
-        if name in (hdrs.CONTENT_LENGTH, hdrs.CONTENT_ENCODING, istr(HEADER_TOKEN)):
+        if name in (
+            hdrs.CONTENT_LENGTH,
+            hdrs.CONTENT_ENCODING,
+            hdrs.SEC_WEBSOCKET_EXTENSIONS,
+            hdrs.SEC_WEBSOCKET_PROTOCOL,
+            hdrs.SEC_WEBSOCKET_VERSION,
+            hdrs.SEC_WEBSOCKET_KEY,
+            istr(HEADER_TOKEN),
+            istr(HEADER_TOKEN_OLD),
+        ):
             continue
         headers[name] = value
 

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

@@ -1 +0,0 @@
-{"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.7f8cce5798f837214ef8.js

@@ -1,2 +0,0 @@
-(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

@@ -1 +0,0 @@
-{"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.87b1d37fc9b8a6f7e2a6.js.LICENSE

@@ -0,0 +1,16 @@
+/**
+@license
+Copyright 2018 Google Inc. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/

hassio/api/panel/chunk.92a11ac1b80e0d7839d2.js

@@ -0,0 +1,2 @@
+(self.webpackJsonp=self.webpackJsonp||[]).push([[2],{176:function(e,r,n){"use strict";n.r(r),n.d(r,"codeMirror",function(){return c}),n.d(r,"codeMirrorCss",function(){return i});var a=n(54),o=n.n(a),s=n(169),t=(n(170),n(171),n(11));o.a.commands.save=function(e){Object(t.a)(e.getWrapperElement(),"editor-save")};var c=o.a,i=s.a}}]);
+//# sourceMappingURL=chunk.92a11ac1b80e0d7839d2.js.map

hassio/api/panel/chunk.92a11ac1b80e0d7839d2.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["webpack:///./src/resources/codemirror.ts"],"names":["__webpack_require__","r","__webpack_exports__","d","codeMirror","codeMirrorCss","codemirror__WEBPACK_IMPORTED_MODULE_0__","codemirror__WEBPACK_IMPORTED_MODULE_0___default","n","codemirror_lib_codemirror_css__WEBPACK_IMPORTED_MODULE_1__","_common_dom_fire_event__WEBPACK_IMPORTED_MODULE_4__","_CodeMirror","commands","save","cm","fireEvent","getWrapperElement","_codeMirrorCss"],"mappings":"sFAAAA,EAAAC,EAAAC,GAAAF,EAAAG,EAAAD,EAAA,+BAAAE,IAAAJ,EAAAG,EAAAD,EAAA,kCAAAG,IAAA,IAAAC,EAAAN,EAAA,IAAAO,EAAAP,EAAAQ,EAAAF,GAAAG,EAAAT,EAAA,KAAAU,GAAAV,EAAA,KAAAA,EAAA,KAAAA,EAAA,KAQAW,IAAYC,SAASC,KAAO,SAACC,GAC3BC,YAAUD,EAAGE,oBAAqB,gBAE7B,IAAMZ,EAAkBO,IAClBN,EAAqBY","file":"chunk.92a11ac1b80e0d7839d2.js","sourcesContent":["// @ts-ignore\nimport _CodeMirror, { Editor } from \"codemirror\";\n// @ts-ignore\nimport _codeMirrorCss from \"codemirror/lib/codemirror.css\";\nimport \"codemirror/mode/yaml/yaml\";\nimport \"codemirror/mode/jinja2/jinja2\";\nimport { fireEvent } from \"../common/dom/fire_event\";\n\n_CodeMirror.commands.save = (cm: Editor) => {\n  fireEvent(cm.getWrapperElement(), \"editor-save\");\n};\nexport const codeMirror: any = _CodeMirror;\nexport const codeMirrorCss: any = _codeMirrorCss;\n"],"sourceRoot":""}

hassio/api/panel/chunk.990ee58006b248f55d23.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["webpack:///./hassio/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","addonSlug","_ref","_ref2","regeneratorRuntime","async","_context","prev","next","awrap","Promise","all","fetchHassioAddonInfo","hass","Error","createHassioSession","sent","_slicedToArray","ingress","t0","console","error","alert","message","history","back","stop","css","_templateObject3","LitElement"],"mappings":"6/RAmBCA,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,4CAIpB,SAAyBS,GAAzB,IAAAC,EAAAC,EAAAX,EAAA,OAAAY,mBAAAC,MAAA,SAAAC,GAAA,cAAAA,EAAAC,KAAAD,EAAAE,MAAA,cAAAF,EAAAC,KAAA,EAAAD,EAAAE,KAAA,EAAAJ,mBAAAK,MAE0BC,QAAQC,IAAI,CAChCC,YAAqBjC,KAAKkC,KAAMZ,GAAhC,MAAiD,WAC/C,MAAM,IAAIa,MAAM,iCAElBC,YAAoBpC,KAAKkC,MAAzB,MAAqC,WACnC,MAAM,IAAIC,MAAM,4CAPxB,UAAAZ,EAAAI,EAAAU,KAAAb,EAAAc,EAAAf,EAAA,IAEWV,EAFXW,EAAA,IAWee,QAXf,CAAAZ,EAAAE,KAAA,cAYY,IAAIM,MAAM,wCAZtB,OAeInC,KAAKC,OAASY,EAflBc,EAAAE,KAAA,iBAAAF,EAAAC,KAAA,GAAAD,EAAAa,GAAAb,EAAA,SAkBIc,QAAQC,MAARf,EAAAa,IACAG,MAAMhB,EAAAa,GAAII,SAAW,mCACrBC,QAAQC,OApBZ,yBAAAnB,EAAAoB,SAAA,KAAA/C,KAAA,qDAwBA,WACE,OAAOgD,YAAPC,UA7D4BC","file":"chunk.990ee58006b248f55d23.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 { createHassioSession } from \"../../../src/data/hassio/supervisor\";\nimport {\n  HassioAddonDetails,\n  fetchHassioAddonInfo,\n} from \"../../../src/data/hassio/addon\";\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 {\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.9d371c8143226d4eaaee.js.LICENSE

@@ -0,0 +1,10 @@
+/**
+@license
+Copyright (c) 2015 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
+*/

hassio/api/panel/chunk.9d7374dae6137783dda4.js.LICENSE

@@ -1,31 +0,0 @@
-/**
-@license
-Copyright (c) 2015 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.
-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) 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
-*/