Merge pull request #1472 from home-assistant/dev

Release 197

.devcontainer/Dockerfile

@@ -0,0 +1,43 @@
+FROM python:3.7
+
+WORKDIR /workspaces
+
+# 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 docker
+# https://docs.docker.com/engine/installation/linux/docker-ce/ubuntu/
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        apt-transport-https \
+        ca-certificates \
+        curl \
+        software-properties-common \
+        gpg-agent \
+    && curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \
+    && add-apt-repository "deb https://download.docker.com/linux/debian $(lsb_release -cs) stable" \
+    && apt-get update && apt-get install -y --no-install-recommends \
+        docker-ce \
+        docker-ce-cli \
+        containerd.io \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install Python dependencies from requirements.txt if it exists
+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

@@ -0,0 +1,31 @@
+// See https://aka.ms/vscode-remote/devcontainer.json for format details.
+{
+	"name": "Hass.io dev",
+	"context": "..",
+	"dockerFile": "Dockerfile",
+	"appPort": "9123:8123",
+	"runArgs": [
+		"-e",
+		"GIT_EDITOR=code --wait",
+		"--privileged"
+	],
+	"extensions": [
+		"ms-python.python",
+		"visualstudioexptteam.vscodeintellicode",
+		"esbenp.prettier-vscode"
+	],
+	"settings": {
+		"python.pythonPath": "/usr/local/bin/python",
+		"python.linting.pylintEnabled": true,
+		"python.linting.enabled": true,
+		"python.formatting.provider": "black",
+		"python.formatting.blackArgs": [
+			"--target-version",
+			"py37"
+		],
+		"editor.formatOnPaste": false,
+		"editor.formatOnSave": true,
+		"editor.formatOnType": true,
+		"files.trimTrailingWhitespace": true
+	}
+}

.dockerignore

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

.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

.github/main.workflow

@@ -1,16 +0,0 @@
-workflow "tox" {
-  on = "push"
-  resolves = [
-    "Python 3.7",
-    "Json Files",
-  ]
-}
-
-action "Python 3.7" {
-  uses = "home-assistant/actions/py37-tox@master"
-}
-
-action "Json Files" {
-  uses = "home-assistant/actions/jq@master"
-  args = "**/*.json"
-}

.github/stale.yml

@@ -0,0 +1,17 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.gitignore

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

.hadolint.yaml

@@ -0,0 +1,5 @@
+ignored:
+  - DL3018
+  - DL3006
+  - DL3013
+  - SC2155

.vscode/tasks.json

@@ -0,0 +1,92 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Run Testenv",
+            "type": "shell",
+            "command": "./scripts/test_env.sh",
+            "group": {
+                "kind": "test",
+                "isDefault": true,
+            },
+            "presentation": {
+                "reveal": "always",
+                "panel": "new"
+            },
+            "problemMatcher": []
+        },
+        {
+            "label": "Run Testenv CLI",
+            "type": "shell",
+            "command": "docker run --rm -ti -v /etc/machine-id:/etc/machine-id --network=hassio --add-host hassio:172.30.32.2 homeassistant/amd64-hassio-cli:dev",
+            "group": {
+                "kind": "test",
+                "isDefault": true,
+            },
+            "presentation": {
+                "reveal": "always",
+                "panel": "new"
+            },
+            "problemMatcher": []
+        },
+        {
+            "label": "Update UI",
+            "type": "shell",
+            "command": "./scripts/update-frontend.sh",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "presentation": {
+                "reveal": "always",
+                "panel": "new"
+            },
+            "problemMatcher": []
+        },
+        {
+            "label": "Pytest",
+            "type": "shell",
+            "command": "pytest --timeout=10 tests",
+            "group": {
+                "kind": "test",
+                "isDefault": true,
+            },
+            "presentation": {
+                "reveal": "always",
+                "panel": "new"
+            },
+            "problemMatcher": []
+        },
+        {
+            "label": "Flake8",
+            "type": "shell",
+            "command": "flake8 hassio tests",
+            "group": {
+                "kind": "test",
+                "isDefault": true,
+            },
+            "presentation": {
+                "reveal": "always",
+                "panel": "new"
+            },
+            "problemMatcher": []
+        },
+        {
+            "label": "Pylint",
+            "type": "shell",
+            "command": "pylint hassio",
+            "dependsOn": [
+                "Install all Requirements"
+            ],
+            "group": {
+                "kind": "test",
+                "isDefault": true,
+            },
+            "presentation": {
+                "reveal": "always",
+                "panel": "new"
+            },
+            "problemMatcher": []
+        }
+    ]
+}

API.md

@@ -8,8 +8,8 @@ On error / Code 400:
 
 ```json
 {
-    "result": "error",
-    "message": ""
+  "result": "error",
+  "message": ""
 }
 ```
 
@@ -17,8 +17,8 @@ On success / Code 200:
 
 ```json
 {
-    "result": "ok",
-    "data": { }
+  "result": "ok",
+  "data": {}
 }
 ```
 
@@ -36,28 +36,30 @@ The addons from `addons` are only installed one.
 
 ```json
 {
-    "version": "INSTALL_VERSION",
-    "last_version": "LAST_VERSION",
-    "arch": "armhf|aarch64|i386|amd64",
-    "channel": "stable|beta|dev",
-    "timezone": "TIMEZONE",
-    "wait_boot": "int",
-    "addons": [
-        {
-            "name": "xy bla",
-            "slug": "xy",
-            "description": "description",
-            "repository": "12345678|null",
-            "version": "LAST_VERSION",
-            "installed": "INSTALL_VERSION",
-            "icon": "bool",
-            "logo": "bool",
-            "state": "started|stopped",
-        }
-    ],
-    "addons_repositories": [
-        "REPO_URL"
-    ]
+  "version": "INSTALL_VERSION",
+  "last_version": "LAST_VERSION",
+  "arch": "armhf|aarch64|i386|amd64",
+  "channel": "stable|beta|dev",
+  "timezone": "TIMEZONE",
+  "logging": "debug|info|warning|error|critical",
+  "ip_address": "ip address",
+  "wait_boot": "int",
+  "debug": "bool",
+  "debug_block": "bool",
+  "addons": [
+    {
+      "name": "xy bla",
+      "slug": "xy",
+      "description": "description",
+      "repository": "12345678|null",
+      "version": "LAST_VERSION",
+      "installed": "INSTALL_VERSION",
+      "icon": "bool",
+      "logo": "bool",
+      "state": "started|stopped"
+    }
+  ],
+  "addons_repositories": ["REPO_URL"]
 }
 ```
 
@@ -67,7 +69,7 @@ Optional:
 
 ```json
 {
-    "version": "VERSION"
+  "version": "VERSION"
 }
 ```
 
@@ -75,12 +77,13 @@ Optional:
 
 ```json
 {
-    "channel": "stable|beta|dev",
-    "timezone": "TIMEZONE",
-    "wait_boot": "int",
-    "addons_repositories": [
-        "REPO_URL"
-    ]
+  "channel": "stable|beta|dev",
+  "timezone": "TIMEZONE",
+  "wait_boot": "int",
+  "debug": "bool",
+  "debug_block": "bool",
+  "logging": "debug|info|warning|error|critical",
+  "addons_repositories": ["REPO_URL"]
 }
 ```
 
@@ -93,33 +96,39 @@ Reload addons/version.
 Output is the raw docker log.
 
 - GET `/supervisor/stats`
+
 ```json
 {
-    "cpu_percent": 0.0,
-    "memory_usage": 283123,
-    "memory_limit": 329392,
-    "network_tx": 0,
-    "network_rx": 0,
-    "blk_read": 0,
-    "blk_write": 0
+  "cpu_percent": 0.0,
+  "memory_usage": 283123,
+  "memory_limit": 329392,
+  "memory_percent": 1.4,
+  "network_tx": 0,
+  "network_rx": 0,
+  "blk_read": 0,
+  "blk_write": 0
 }
 ```
 
+- GET `/supervisor/repair`
+
+Repair overlayfs issue and restore lost images
+
 ### Snapshot
 
 - GET `/snapshots`
 
 ```json
 {
-    "snapshots": [
-        {
-            "slug": "SLUG",
-            "date": "ISO",
-            "name": "Custom name",
-            "type": "full|partial",
-            "protected": "bool"
-        }
-    ]
+  "snapshots": [
+    {
+      "slug": "SLUG",
+      "date": "ISO",
+      "name": "Custom name",
+      "type": "full|partial",
+      "protected": "bool"
+    }
+  ]
 }
 ```
 
@@ -128,9 +137,10 @@ Output is the raw docker log.
 - POST `/snapshots/new/upload`
 
 return:
+
 ```json
 {
-    "slug": ""
+  "slug": ""
 }
 ```
 
@@ -138,15 +148,16 @@ return:
 
 ```json
 {
-    "name": "Optional",
-    "password": "Optional"
+  "name": "Optional",
+  "password": "Optional"
 }
 ```
 
 return:
+
 ```json
 {
-    "slug": ""
+  "slug": ""
 }
 ```
 
@@ -154,17 +165,18 @@ return:
 
 ```json
 {
-    "name": "Optional",
-    "addons": ["ADDON_SLUG"],
-    "folders": ["FOLDER_NAME"],
-    "password": "Optional"
+  "name": "Optional",
+  "addons": ["ADDON_SLUG"],
+  "folders": ["FOLDER_NAME"],
+  "password": "Optional"
 }
 ```
 
 return:
+
 ```json
 {
-    "slug": ""
+  "slug": ""
 }
 ```
 
@@ -174,23 +186,23 @@ return:
 
 ```json
 {
-    "slug": "SNAPSHOT ID",
-    "type": "full|partial",
-    "name": "custom snapshot name / description",
-    "date": "ISO",
-    "size": "SIZE_IN_MB",
-    "protected": "bool",
-    "homeassistant": "version",
-    "addons": [
-        {
-            "slug": "ADDON_SLUG",
-            "name": "NAME",
-            "version": "INSTALLED_VERSION",
-            "size": "SIZE_IN_MB"
-        }
-    ],
-    "repositories": ["URL"],
-    "folders": ["NAME"]
+  "slug": "SNAPSHOT ID",
+  "type": "full|partial",
+  "name": "custom snapshot name / description",
+  "date": "ISO",
+  "size": "SIZE_IN_MB",
+  "protected": "bool",
+  "homeassistant": "version",
+  "addons": [
+    {
+      "slug": "ADDON_SLUG",
+      "name": "NAME",
+      "version": "INSTALLED_VERSION",
+      "size": "SIZE_IN_MB"
+    }
+  ],
+  "repositories": ["URL"],
+  "folders": ["NAME"]
 }
 ```
 
@@ -202,7 +214,7 @@ return:
 
 ```json
 {
-    "password": "Optional"
+  "password": "Optional"
 }
 ```
 
@@ -210,10 +222,10 @@ return:
 
 ```json
 {
-    "homeassistant": "bool",
-    "addons": ["ADDON_SLUG"],
-    "folders": ["FOLDER_NAME"],
-    "password": "Optional"
+  "homeassistant": "bool",
+  "addons": ["ADDON_SLUG"],
+  "folders": ["FOLDER_NAME"],
+  "password": "Optional"
 }
 ```
 
@@ -229,13 +241,13 @@ return:
 
 ```json
 {
-    "hostname": "hostname|null",
-    "features": ["shutdown", "reboot", "hostname", "services", "hassos"],
-    "operating_system": "HassOS XY|Ubuntu 16.4|null",
-    "kernel": "4.15.7|null",
-    "chassis": "specific|null",
-    "deployment": "stable|beta|dev|null",
-    "cpe": "xy|null",
+  "hostname": "hostname|null",
+  "features": ["shutdown", "reboot", "hostname", "services", "hassos"],
+  "operating_system": "HassOS XY|Ubuntu 16.4|null",
+  "kernel": "4.15.7|null",
+  "chassis": "specific|null",
+  "deployment": "stable|beta|dev|null",
+  "cpe": "xy|null"
 }
 ```
 
@@ -243,7 +255,7 @@ return:
 
 ```json
 {
-    "hostname": "",
+  "hostname": ""
 }
 ```
 
@@ -252,15 +264,16 @@ return:
 #### Services
 
 - GET `/host/services`
+
 ```json
 {
-    "services": [
-        {
-            "name": "xy.service",
-            "description": "XY ...",
-            "state": "active|"
-        }
-    ]
+  "services": [
+    {
+      "name": "xy.service",
+      "description": "XY ...",
+      "state": "active|"
+    }
+  ]
 }
 ```
 
@@ -273,27 +286,31 @@ return:
 ### HassOS
 
 - GET `/hassos/info`
+
 ```json
 {
-    "version": "2.3",
-    "version_cli": "7",
-    "version_latest": "2.4",
-    "version_cli_latest": "8",
-    "board": "ova|rpi"
+  "version": "2.3",
+  "version_cli": "7",
+  "version_latest": "2.4",
+  "version_cli_latest": "8",
+  "board": "ova|rpi",
+  "boot": "rauc boot slot"
 }
 ```
 
 - POST `/hassos/update`
+
 ```json
 {
-    "version": "optional"
+  "version": "optional"
 }
 ```
 
 - POST `/hassos/update/cli`
+
 ```json
 {
-    "version": "optional"
+  "version": "optional"
 }
 ```
 
@@ -304,6 +321,7 @@ Load host configs from a USB stick.
 ### Hardware
 
 - GET `/hardware/info`
+
 ```json
 {
     "serial": ["/dev/xy"],
@@ -324,37 +342,43 @@ Load host configs from a USB stick.
 ```
 
 - GET `/hardware/audio`
+
 ```json
 {
-    "audio": {
-        "input": {
-            "0,0": "Mic"
-        },
-        "output": {
-            "1,0": "Jack",
-            "1,1": "HDMI"
-        }
+  "audio": {
+    "input": {
+      "0,0": "Mic"
+    },
+    "output": {
+      "1,0": "Jack",
+      "1,1": "HDMI"
     }
+  }
 }
 ```
 
+- POST `/hardware/trigger`
+
+Trigger an udev reload
+
 ### Home Assistant
 
 - GET `/homeassistant/info`
 
 ```json
 {
-    "version": "INSTALL_VERSION",
-    "last_version": "LAST_VERSION",
-    "arch": "arch",
-    "machine": "Image machine type",
-    "image": "str",
-    "custom": "bool -> if custom image",
-    "boot": "bool",
-    "port": 8123,
-    "ssl": "bool",
-    "watchdog": "bool",
-    "wait_boot": 600
+  "version": "INSTALL_VERSION",
+  "last_version": "LAST_VERSION",
+  "arch": "arch",
+  "machine": "Image machine type",
+  "ip_address": "ip address",
+  "image": "str",
+  "custom": "bool -> if custom image",
+  "boot": "bool",
+  "port": 8123,
+  "ssl": "bool",
+  "watchdog": "bool",
+  "wait_boot": 600
 }
 ```
 
@@ -364,7 +388,7 @@ Optional:
 
 ```json
 {
-    "version": "VERSION"
+  "version": "VERSION"
 }
 ```
 
@@ -382,14 +406,13 @@ Output is the raw Docker log.
 
 ```json
 {
-    "image": "Optional|null",
-    "last_version": "Optional for custom image|null",
-    "port": "port for access hass",
-    "ssl": "bool",
-    "password": "",
-    "refresh_token": "",
-    "watchdog": "bool",
-    "wait_boot": 600
+  "image": "Optional|null",
+  "last_version": "Optional for custom image|null",
+  "port": "port for access hass",
+  "ssl": "bool",
+  "refresh_token": "",
+  "watchdog": "bool",
+  "wait_boot": 600
 }
 ```
 
@@ -404,15 +427,17 @@ Proxy to real home-assistant instance.
 Proxy to real websocket instance.
 
 - GET `/homeassistant/stats`
+
 ```json
 {
-    "cpu_percent": 0.0,
-    "memory_usage": 283123,
-    "memory_limit": 329392,
-    "network_tx": 0,
-    "network_rx": 0,
-    "blk_read": 0,
-    "blk_write": 0
+  "cpu_percent": 0.0,
+  "memory_usage": 283123,
+  "memory_limit": 329392,
+  "memory_percent": 1.4,
+  "network_tx": 0,
+  "network_rx": 0,
+  "blk_read": 0,
+  "blk_write": 0
 }
 ```
 
@@ -426,31 +451,33 @@ Get all available addons.
 
 ```json
 {
-    "addons": [
-        {
-            "name": "xy bla",
-            "slug": "xy",
-            "description": "description",
-            "repository": "core|local|REP_ID",
-            "version": "LAST_VERSION",
-            "installed": "none|INSTALL_VERSION",
-            "detached": "bool",
-            "available": "bool",
-            "build": "bool",
-            "url": "null|url",
-            "icon": "bool",
-            "logo": "bool"
-        }
-    ],
-    "repositories": [
-        {
-            "slug": "12345678",
-            "name": "Repitory Name|unknown",
-            "source": "URL_OF_REPOSITORY",
-            "url": "WEBSITE|REPOSITORY",
-            "maintainer": "BLA BLU <fla@dld.ch>|unknown"
-        }
-    ]
+  "addons": [
+    {
+      "name": "xy bla",
+      "slug": "xy",
+      "description": "description",
+      "advanced": "bool",
+      "stage": "stable|experimental|deprecated",
+      "repository": "core|local|REP_ID",
+      "version": "LAST_VERSION",
+      "installed": "none|INSTALL_VERSION",
+      "detached": "bool",
+      "available": "bool",
+      "build": "bool",
+      "url": "null|url",
+      "icon": "bool",
+      "logo": "bool"
+    }
+  ],
+  "repositories": [
+    {
+      "slug": "12345678",
+      "name": "Repitory Name|unknown",
+      "source": "URL_OF_REPOSITORY",
+      "url": "WEBSITE|REPOSITORY",
+      "maintainer": "BLA BLU <fla@dld.ch>|unknown"
+    }
+  ]
 }
 ```
 
@@ -459,53 +486,68 @@ Get all available addons.
 
 ```json
 {
-    "name": "xy bla",
-    "slug": "xdssd_xybla",
-    "description": "description",
-    "long_description": "null|markdown",
-    "auto_update": "bool",
-    "url": "null|url of addon",
-    "detached": "bool",
-    "available": "bool",
-    "arch": ["armhf", "aarch64", "i386", "amd64"],
-    "machine": "[raspberrypi2, tinker]",
-    "repository": "12345678|null",
-    "version": "null|VERSION_INSTALLED",
-    "last_version": "LAST_VERSION",
-    "state": "none|started|stopped",
-    "boot": "auto|manual",
-    "build": "bool",
-    "options": "{}",
-    "network": "{}|null",
-    "host_network": "bool",
-    "host_pid": "bool",
-    "host_ipc": "bool",
-    "host_dbus": "bool",
-    "privileged": ["NET_ADMIN", "SYS_ADMIN"],
-    "apparmor": "disable|default|profile",
-    "devices": ["/dev/xy"],
-    "auto_uart": "bool",
-    "icon": "bool",
-    "logo": "bool",
-    "changelog": "bool",
-    "hassio_api": "bool",
-    "hassio_role": "default|homeassistant|manager|admin",
-    "homeassistant_api": "bool",
-    "auth_api": "bool",
-    "full_access": "bool",
-    "protected": "bool",
-    "rating": "1-6",
-    "stdin": "bool",
-    "webui": "null|http(s)://[HOST]:port/xy/zx",
-    "gpio": "bool",
-    "kernel_modules": "bool",
-    "devicetree": "bool",
-    "docker_api": "bool",
-    "audio": "bool",
-    "audio_input": "null|0,0",
-    "audio_output": "null|0,0",
-    "services_role": "['service:access']",
-    "discovery": "['service']"
+  "name": "xy bla",
+  "slug": "xdssd_xybla",
+  "hostname": "xdssd-xybla",
+  "dns": [],
+  "description": "description",
+  "long_description": "null|markdown",
+  "auto_update": "bool",
+  "url": "null|url of addon",
+  "detached": "bool",
+  "available": "bool",
+  "advanced": "bool",
+  "stage": "stable|experimental|deprecated",
+  "arch": ["armhf", "aarch64", "i386", "amd64"],
+  "machine": "[raspberrypi2, tinker]",
+  "homeassistant": "null|min Home Assistant version",
+  "repository": "12345678|null",
+  "version": "null|VERSION_INSTALLED",
+  "last_version": "LAST_VERSION",
+  "state": "none|started|stopped",
+  "boot": "auto|manual",
+  "build": "bool",
+  "options": "{}",
+  "schema": "{}|null",
+  "network": "{}|null",
+  "network_description": "{}|null",
+  "host_network": "bool",
+  "host_pid": "bool",
+  "host_ipc": "bool",
+  "host_dbus": "bool",
+  "privileged": ["NET_ADMIN", "SYS_ADMIN"],
+  "apparmor": "disable|default|profile",
+  "devices": ["/dev/xy"],
+  "udev": "bool",
+  "auto_uart": "bool",
+  "icon": "bool",
+  "logo": "bool",
+  "changelog": "bool",
+  "documentation": "bool",
+  "hassio_api": "bool",
+  "hassio_role": "default|homeassistant|manager|admin",
+  "homeassistant_api": "bool",
+  "auth_api": "bool",
+  "full_access": "bool",
+  "protected": "bool",
+  "rating": "1-6",
+  "stdin": "bool",
+  "webui": "null|http(s)://[HOST]:port/xy/zx",
+  "gpio": "bool",
+  "kernel_modules": "bool",
+  "devicetree": "bool",
+  "docker_api": "bool",
+  "audio": "bool",
+  "audio_input": "null|0,0",
+  "audio_output": "null|0,0",
+  "services_role": "['service:access']",
+  "discovery": "['service']",
+  "ip_address": "ip address",
+  "ingress": "bool",
+  "ingress_entry": "null|/api/hassio_ingress/slug",
+  "ingress_url": "null|/api/hassio_ingress/slug/entry.html",
+  "ingress_port": "null|int",
+  "ingress_panel": "null|bool"
 }
 ```
 
@@ -515,18 +557,21 @@ Get all available addons.
 
 - GET `/addons/{addon}/changelog`
 
+- GET `/addons/{addon}/documentation`
+
 - POST `/addons/{addon}/options`
 
 ```json
 {
-    "boot": "auto|manual",
-    "auto_update": "bool",
-    "network": {
-      "CONTAINER": "port|[ip, port]"
-    },
-    "options": {},
-    "audio_output": "null|0,0",
-    "audio_input": "null|0,0"
+  "boot": "auto|manual",
+  "auto_update": "bool",
+  "network": {
+    "CONTAINER": "port|[ip, port]"
+  },
+  "options": {},
+  "audio_output": "null|0,0",
+  "audio_input": "null|0,0",
+  "ingress_panel": "bool"
 }
 ```
 
@@ -538,7 +583,7 @@ This function is not callable by itself.
 
 ```json
 {
-    "protected": "bool",
+  "protected": "bool"
 }
 ```
 
@@ -567,56 +612,96 @@ Only supported for local build addons
 Write data to add-on stdin
 
 - GET `/addons/{addon}/stats`
+
 ```json
 {
-    "cpu_percent": 0.0,
-    "memory_usage": 283123,
-    "memory_limit": 329392,
-    "network_tx": 0,
-    "network_rx": 0,
-    "blk_read": 0,
-    "blk_write": 0
+  "cpu_percent": 0.0,
+  "memory_usage": 283123,
+  "memory_limit": 329392,
+  "memory_percent": 1.4,
+  "network_tx": 0,
+  "network_rx": 0,
+  "blk_read": 0,
+  "blk_write": 0
 }
 ```
 
+### ingress
+
+- POST `/ingress/session`
+
+Create a new Session for access to ingress service.
+
+```json
+{
+  "session": "token"
+}
+```
+
+- GET `/ingress/panels`
+
+Return a list of enabled panels.
+
+```json
+{
+  "panels": {
+    "addon_slug": {
+      "enable": "boolean",
+      "icon": "mdi:...",
+      "title": "title",
+      "admin": "boolean"
+    }
+  }
+}
+```
+
+- VIEW `/ingress/{token}`
+
+Ingress WebUI for this Add-on. The addon need support HASS Auth!
+Need ingress session as cookie.
+
 ### discovery
 
 - GET `/discovery`
+
 ```json
 {
-    "discovery": [
-        {
-            "addon": "slug",
-            "service": "name",
-            "uuid": "uuid",
-            "config": {}
-        }
-    ]
+  "discovery": [
+    {
+      "addon": "slug",
+      "service": "name",
+      "uuid": "uuid",
+      "config": {}
+    }
+  ]
 }
 ```
 
 - GET `/discovery/{UUID}`
+
 ```json
 {
-    "addon": "slug",
-    "service": "name",
-    "uuid": "uuid",
-    "config": {}
+  "addon": "slug",
+  "service": "name",
+  "uuid": "uuid",
+  "config": {}
 }
 ```
 
 - POST `/discovery`
+
 ```json
 {
-    "service": "name",
-    "config": {}
+  "service": "name",
+  "config": {}
 }
 ```
 
 return:
+
 ```json
 {
-    "uuid": "uuid"
+  "uuid": "uuid"
 }
 ```
 
@@ -625,60 +710,144 @@ return:
 ### Services
 
 - GET `/services`
+
 ```json
 {
-    "services": [
-        {
-            "slug": "name",
-            "available": "bool",
-            "providers": "list"
-        }
-    ]
+  "services": [
+    {
+      "slug": "name",
+      "available": "bool",
+      "providers": "list"
+    }
+  ]
 }
 ```
 
 #### MQTT
 
 - GET `/services/mqtt`
+
 ```json
 {
-    "addon": "name",
-    "host": "xy",
-    "port": "8883",
-    "ssl": "bool",
-    "username": "optional",
-    "password": "optional",
-    "protocol": "3.1.1"
+  "addon": "name",
+  "host": "xy",
+  "port": "8883",
+  "ssl": "bool",
+  "username": "optional",
+  "password": "optional",
+  "protocol": "3.1.1"
 }
 ```
 
 - POST `/services/mqtt`
+
 ```json
 {
-    "host": "xy",
-    "port": "8883",
-    "ssl": "bool|optional",
-    "username": "optional",
-    "password": "optional",
-    "protocol": "3.1.1"
+  "host": "xy",
+  "port": "8883",
+  "ssl": "bool|optional",
+  "username": "optional",
+  "password": "optional",
+  "protocol": "3.1.1"
 }
 ```
 
 - DEL `/services/mqtt`
 
+#### MySQL
+
+- GET `/services/mysql`
+
+```json
+{
+  "addon": "name",
+  "host": "xy",
+  "port": "8883",
+  "username": "optional",
+  "password": "optional"
+}
+```
+
+- POST `/services/mysql`
+
+```json
+{
+  "host": "xy",
+  "port": "8883",
+  "username": "optional",
+  "password": "optional"
+}
+```
+
+- DEL `/services/mysql`
+
 ### Misc
 
 - GET `/info`
+
 ```json
 {
-    "supervisor": "version",
-    "homeassistant": "version",
-    "hassos": "null|version",
-    "hostname": "name",
-    "machine": "type",
-    "arch": "arch",
-    "supported_arch": ["arch1", "arch2"],
-    "channel": "stable|beta|dev"
+  "supervisor": "version",
+  "homeassistant": "version",
+  "hassos": "null|version",
+  "hostname": "name",
+  "machine": "type",
+  "arch": "arch",
+  "supported_arch": ["arch1", "arch2"],
+  "channel": "stable|beta|dev",
+  "logging": "debug|info|warning|error|critical",
+  "timezone": "Europe/Zurich"
+}
+```
+
+### DNS
+
+- GET `/dns/info`
+
+```json
+{
+  "host": "ip-address",
+  "version": "1",
+  "latest_version": "2",
+  "servers": ["dns://8.8.8.8"],
+  "locals": ["dns://xy"]
+}
+```
+
+- POST `/dns/options`
+
+```json
+{
+  "servers": ["dns://8.8.8.8"]
+}
+```
+
+- POST `/dns/update`
+
+```json
+{
+  "version": "VERSION"
+}
+```
+
+- POST `/dns/restart`
+
+- POST `/dns/reset`
+
+- GET `/dns/logs`
+
+- GET `/dns/stats`
+
+```json
+{
+  "cpu_percent": 0.0,
+  "memory_usage": 283123,
+  "memory_limit": 329392,
+  "memory_percent": 1.4,
+  "network_tx": 0,
+  "network_rx": 0,
+  "blk_read": 0,
+  "blk_write": 0
 }
 ```
 
@@ -690,6 +859,16 @@ supervisor.
 You can call post `/auth`
 
 We support:
+
 - Json `{ "user|name": "...", "password": "..." }`
 - application/x-www-form-urlencoded `user|name=...&password=...`
 - BasicAuth
+
+* POST `/auth/reset`
+
+```json
+{
+  "username": "xy",
+  "password": "new-password"
+}
+```

Dockerfile

@@ -9,25 +9,29 @@ RUN apk add --no-cache \
     git \
     socat \
     glib \
-    libstdc++ \
+    eudev \
     eudev-libs
 
+ARG BUILD_ARCH
+WORKDIR /usr/src
+
 # Install requirements
-COPY requirements.txt /usr/src/
-RUN apk add --no-cache --virtual .build-dependencies \
-    make \
-    g++ \
-    openssl-dev \
-    libffi-dev \
-    musl-dev \
-    && export MAKEFLAGS="-j$(nproc)" \
-    && pip3 install --no-cache-dir -r /usr/src/requirements.txt \
-    && apk del .build-dependencies \
-    && rm -f /usr/src/requirements.txt
+COPY requirements.txt .
+RUN export MAKEFLAGS="-j$(nproc)" \
+    && 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 /usr/src/hassio \
-    && rm -rf /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" ]

README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://dev.azure.com/home-assistant/Hass.io/_apis/build/status/hassio?branchName=dev)](https://dev.azure.com/home-assistant/Hass.io/_build/latest?definitionId=2&branchName=dev)
+
 # Hass.io
 
 ## First private cloud solution for home automation
@@ -18,9 +20,9 @@ Installation instructions can be found at <https://home-assistant.io/hassio>.
 
 The development of the supervisor is a bit tricky. Not difficult but tricky.
 
-- You can use the builder to build your supervisor: https://github.com/home-assistant/hassio-build/tree/master/builder
+- You can use the builder to build your supervisor: https://github.com/home-assistant/hassio-builder
 - Go into a HassOS device or VM and pull your supervisor.
-- Set the developer modus on updater.json
+- Set the developer modus with cli `hassio supervisor options --channel=dev`
 - Tag it as `homeassistant/xy-hassio-supervisor:latest`
 - Restart the service like `systemctl restart hassos-supervisor | journalctl -fu hassos-supervisor`
 - Test your changes

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:
+    exclude:
+      - "*"
+  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"

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/__main__.py

@@ -6,14 +6,16 @@ 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
-        asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
+
+        uvloop.install()
     except ImportError:
         pass
 
@@ -37,7 +39,9 @@ if __name__ == "__main__":
 
     _LOGGER.info("Initialize Hass.io setup")
     coresys = loop.run_until_complete(bootstrap.initialize_coresys())
+    loop.run_until_complete(coresys.core.connect())
 
+    bootstrap.supervisor_debugger(coresys)
     bootstrap.migrate_system_env(coresys)
 
     _LOGGER.info("Setup HassIO")

hassio/addons/__init__.py

@@ -1,158 +1,331 @@
 """Init file for Hass.io add-ons."""
 import asyncio
+from contextlib import suppress
 import logging
+import tarfile
+from typing import Dict, List, Optional, Union
 
+from ..const import BOOT_AUTO, STATE_STARTED
+from ..coresys import CoreSys, CoreSysAttributes
+from ..exceptions import (
+    AddonsError,
+    AddonsNotSupportedError,
+    CoreDNSError,
+    DockerAPIError,
+    HomeAssistantAPIError,
+    HostAppArmorError,
+)
+from ..store.addon import AddonStore
 from .addon import Addon
-from .repository import Repository
 from .data import AddonsData
-from ..const import REPOSITORY_CORE, REPOSITORY_LOCAL, BOOT_AUTO, STATE_STARTED
-from ..coresys import CoreSysAttributes
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER: logging.Logger = logging.getLogger(__name__)
 
-BUILTIN_REPOSITORIES = set((REPOSITORY_CORE, REPOSITORY_LOCAL))
+AnyAddon = Union[Addon, AddonStore]
 
 
 class AddonManager(CoreSysAttributes):
     """Manage add-ons inside Hass.io."""
 
-    def __init__(self, coresys):
+    def __init__(self, coresys: CoreSys):
         """Initialize Docker base wrapper."""
-        self.coresys = coresys
-        self.data = AddonsData(coresys)
-        self.addons_obj = {}
-        self.repositories_obj = {}
+        self.coresys: CoreSys = coresys
+        self.data: AddonsData = AddonsData(coresys)
+        self.local: Dict[str, Addon] = {}
+        self.store: Dict[str, AddonStore] = {}
 
     @property
-    def list_addons(self):
+    def all(self) -> List[AnyAddon]:
         """Return a list of all add-ons."""
-        return list(self.addons_obj.values())
+        addons = {**self.store, **self.local}
+        return list(addons.values())
 
     @property
-    def list_installed(self):
-        """Return a list of installed add-ons."""
-        return [addon for addon in self.addons_obj.values()
-                if addon.is_installed]
+    def installed(self) -> List[Addon]:
+        """Return a list of all installed add-ons."""
+        return list(self.local.values())
 
-    @property
-    def list_repositories(self):
-        """Return list of add-on repositories."""
-        return list(self.repositories_obj.values())
+    def get(self, addon_slug: str) -> Optional[AnyAddon]:
+        """Return an add-on from slug.
 
-    def get(self, addon_slug):
-        """Return an add-on from slug."""
-        return self.addons_obj.get(addon_slug)
+        Prio:
+          1 - Local
+          2 - Store
+        """
+        if addon_slug in self.local:
+            return self.local[addon_slug]
+        return self.store.get(addon_slug)
 
-    def from_token(self, token):
+    def from_token(self, token: str) -> Optional[Addon]:
         """Return an add-on from Hass.io token."""
-        for addon in self.list_addons:
-            if addon.is_installed and token == addon.hassio_token:
+        for addon in self.installed:
+            if token == addon.hassio_token:
                 return addon
         return None
 
-    async def load(self):
+    async def load(self) -> None:
         """Start up add-on management."""
-        self.data.reload()
-
-        # Init Hass.io built-in repositories
-        repositories = \
-            set(self.sys_config.addons_repositories) | BUILTIN_REPOSITORIES
-
-        # Init custom repositories and load add-ons
-        await self.load_repositories(repositories)
-
-    async def reload(self):
-        """Update add-ons from repository and reload list."""
-        tasks = [repository.update() for repository in
-                 self.repositories_obj.values()]
-        if tasks:
-            await asyncio.wait(tasks)
-
-        # read data from repositories
-        self.data.reload()
-
-        # update addons
-        await self.load_addons()
-
-    async def load_repositories(self, list_repositories):
-        """Add a new custom repository."""
-        new_rep = set(list_repositories)
-        old_rep = set(self.repositories_obj)
-
-        # add new repository
-        async def _add_repository(url):
-            """Helper function to async add repository."""
-            repository = Repository(self.coresys, url)
-            if not await repository.load():
-                _LOGGER.error("Can't load from repository %s", url)
-                return
-            self.repositories_obj[url] = repository
-
-            # don't add built-in repository to config
-            if url not in BUILTIN_REPOSITORIES:
-                self.sys_config.add_addon_repository(url)
-
-        tasks = [_add_repository(url) for url in new_rep - old_rep]
-        if tasks:
-            await asyncio.wait(tasks)
-
-        # del new repository
-        for url in old_rep - new_rep - BUILTIN_REPOSITORIES:
-            self.repositories_obj.pop(url).remove()
-            self.sys_config.drop_addon_repository(url)
-
-        # update data
-        self.data.reload()
-        await self.load_addons()
-
-    async def load_addons(self):
-        """Update/add internal add-on store."""
-        all_addons = set(self.data.system) | set(self.data.cache)
-
-        # calc diff
-        add_addons = all_addons - set(self.addons_obj)
-        del_addons = set(self.addons_obj) - all_addons
-
-        _LOGGER.info("Load add-ons: %d all - %d new - %d remove",
-                     len(all_addons), len(add_addons), len(del_addons))
-
-        # new addons
         tasks = []
-        for addon_slug in add_addons:
-            addon = Addon(self.coresys, addon_slug)
-
+        for slug in self.data.system:
+            addon = self.local[slug] = Addon(self.coresys, slug)
             tasks.append(addon.load())
-            self.addons_obj[addon_slug] = addon
 
+        # Run initial tasks
+        _LOGGER.info("Found %d installed add-ons", len(tasks))
         if tasks:
             await asyncio.wait(tasks)
 
-        # remove
-        for addon_slug in del_addons:
-            self.addons_obj.pop(addon_slug)
+        # Sync DNS
+        await self.sync_dns()
 
-    async def boot(self, stage):
+    async def boot(self, stage: str) -> None:
         """Boot add-ons with mode auto."""
         tasks = []
-        for addon in self.addons_obj.values():
-            if addon.is_installed and addon.boot == BOOT_AUTO and \
-                    addon.startup == stage:
-                tasks.append(addon.start())
+        for addon in self.installed:
+            if addon.boot != BOOT_AUTO or addon.startup != stage:
+                continue
+            tasks.append(addon.start())
 
-        _LOGGER.info("Startup %s run %d add-ons", stage, len(tasks))
+        _LOGGER.info("Phase '%s' start %d add-ons", stage, len(tasks))
         if tasks:
             await asyncio.wait(tasks)
             await asyncio.sleep(self.sys_config.wait_boot)
 
-    async def shutdown(self, stage):
+    async def shutdown(self, stage: str) -> None:
         """Shutdown addons."""
         tasks = []
-        for addon in self.addons_obj.values():
-            if addon.is_installed and \
-                    await addon.state() == STATE_STARTED and \
-                    addon.startup == stage:
-                tasks.append(addon.stop())
+        for addon in self.installed:
+            if await addon.state() != STATE_STARTED or addon.startup != stage:
+                continue
+            tasks.append(addon.stop())
 
-        _LOGGER.info("Shutdown %s stop %d add-ons", stage, len(tasks))
+        _LOGGER.info("Phase '%s' stop %d add-ons", stage, len(tasks))
         if tasks:
             await asyncio.wait(tasks)
+
+    async def install(self, slug: str) -> None:
+        """Install an add-on."""
+        if slug in self.local:
+            _LOGGER.warning("Add-on %s is already installed", slug)
+            return
+        store = self.store.get(slug)
+
+        if not store:
+            _LOGGER.error("Add-on %s not exists", slug)
+            raise AddonsError()
+
+        if not store.available:
+            _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)
+            addon.path_data.mkdir()
+
+        # Setup/Fix AppArmor profile
+        await addon.install_apparmor()
+
+        try:
+            await addon.instance.install(store.version, store.image)
+        except DockerAPIError:
+            self.data.uninstall(addon)
+            raise AddonsError() from None
+        else:
+            self.local[slug] = addon
+            _LOGGER.info("Add-on '%s' successfully installed", slug)
+
+    async def uninstall(self, slug: str) -> None:
+        """Remove an add-on."""
+        if slug not in self.local:
+            _LOGGER.warning("Add-on %s is not installed", slug)
+            return
+        addon = self.local.get(slug)
+
+        try:
+            await addon.instance.remove()
+        except DockerAPIError:
+            raise AddonsError() from None
+
+        await addon.remove_data()
+
+        # Cleanup audio settings
+        if addon.path_asound.exists():
+            with suppress(OSError):
+                addon.path_asound.unlink()
+
+        # Cleanup AppArmor profile
+        with suppress(HostAppArmorError):
+            await addon.uninstall_apparmor()
+
+        # Cleanup Ingress panel from sidebar
+        if addon.ingress_panel:
+            addon.ingress_panel = False
+            with suppress(HomeAssistantAPIError):
+                await self.sys_ingress.update_hass_panel(addon)
+
+        # 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)
+
+        _LOGGER.info("Add-on '%s' successfully removed", slug)
+
+    async def update(self, slug: str) -> None:
+        """Update add-on."""
+        if slug not in self.local:
+            _LOGGER.error("Add-on %s is not installed", slug)
+            raise AddonsError()
+        addon = self.local.get(slug)
+
+        if addon.is_detached:
+            _LOGGER.error("Add-on %s is not available inside store", slug)
+            raise AddonsError()
+        store = self.store.get(slug)
+
+        if addon.version == store.version:
+            _LOGGER.warning("No update available for add-on %s", slug)
+            return
+
+        # Check if available, Maybe something have changed
+        if not store.available:
+            _LOGGER.error("Add-on %s not supported on that platform", slug)
+            raise AddonsNotSupportedError()
+
+        # Update instance
+        last_state = await addon.state()
+        try:
+            await addon.instance.update(store.version, store.image)
+
+            # Cleanup
+            with suppress(DockerAPIError):
+                await addon.instance.cleanup()
+        except DockerAPIError:
+            raise AddonsError() from None
+        else:
+            self.data.update(store)
+            _LOGGER.info("Add-on '%s' successfully updated", slug)
+
+        # Setup/Fix AppArmor profile
+        await addon.install_apparmor()
+
+        # restore state
+        if last_state == STATE_STARTED:
+            await addon.start()
+
+    async def rebuild(self, slug: str) -> None:
+        """Perform a rebuild of local build add-on."""
+        if slug not in self.local:
+            _LOGGER.error("Add-on %s is not installed", slug)
+            raise AddonsError()
+        addon = self.local.get(slug)
+
+        if addon.is_detached:
+            _LOGGER.error("Add-on %s is not available inside store", slug)
+            raise AddonsError()
+        store = self.store.get(slug)
+
+        # Check if a rebuild is possible now
+        if addon.version != store.version:
+            _LOGGER.error("Version changed, use Update instead Rebuild")
+            raise AddonsError()
+        if not addon.need_build:
+            _LOGGER.error("Can't rebuild a image based add-on")
+            raise AddonsNotSupportedError()
+
+        # remove docker container but not addon config
+        last_state = await addon.state()
+        try:
+            await addon.instance.remove()
+            await addon.instance.install(addon.version)
+        except DockerAPIError:
+            raise AddonsError() from None
+        else:
+            self.data.update(store)
+            _LOGGER.info("Add-on '%s' successfully rebuilt", slug)
+
+        # restore state
+        if last_state == STATE_STARTED:
+            await addon.start()
+
+    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", slug)
+            addon = Addon(self.coresys, slug)
+        else:
+            _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
+
+        _LOGGER.info("Detect new Add-on after restore %s", slug)
+        self.local[slug] = addon
+
+    async def repair(self) -> None:
+        """Repair local add-ons."""
+        needs_repair: List[Addon] = []
+
+        # Evaluate Add-ons to repair
+        for addon in self.installed:
+            if await addon.instance.exists():
+                continue
+            needs_repair.append(addon)
+
+        _LOGGER.info("Found %d add-ons to repair", len(needs_repair))
+        if not needs_repair:
+            return
+
+        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
+                if not addon.need_build:
+                    await addon.instance.install(addon.version, addon.image)
+                    continue
+
+                # Need local lookup
+                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:
+                        await addon.instance.install(addon.version, addon.image)
+                        continue
+
+            _LOGGER.error("Can't repair %s", addon.slug)
+            with suppress(AddonsError):
+                await self.uninstall(addon.slug)
+
+    async def sync_dns(self) -> None:
+        """Sync add-ons DNS names."""
+        # Update hosts
+        for addon in self.installed:
+            if not await addon.instance.is_running():
+                continue
+            self.sys_dns.add_host(
+                ipv4=addon.ip_address, names=[addon.hostname], write=False
+            )
+
+        # Write hosts files
+        with suppress(CoreDNSError):
+            self.sys_dns.write_hosts()

hassio/addons/build.py

@@ -9,34 +9,31 @@ from ..utils.json import JsonConfig
 from .validate import SCHEMA_BUILD_CONFIG
 
 if TYPE_CHECKING:
-    from .addon import Addon
+    from . import AnyAddon
 
 
 class AddonBuild(JsonConfig, CoreSysAttributes):
     """Handle build options for add-ons."""
 
-    def __init__(self, coresys: CoreSys, slug: str) -> None:
+    def __init__(self, coresys: CoreSys, addon: AnyAddon) -> None:
         """Initialize Hass.io add-on builder."""
         self.coresys: CoreSys = coresys
-        self._id: str = slug
+        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."""
-
-    @property
-    def addon(self) -> Addon:
-        """Return add-on of build data."""
-        return self.sys_addons.get(self._id)
+        raise RuntimeError()
 
     @property
     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:
@@ -51,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

@@ -1,38 +1,34 @@
 """Init file for Hass.io add-on data."""
+from copy import deepcopy
 import logging
-from pathlib import Path
-
-import voluptuous as vol
-from voluptuous.humanize import humanize_error
+from typing import Any, Dict
 
 from ..const import (
-    ATTR_LOCATON,
-    ATTR_REPOSITORY,
-    ATTR_SLUG,
+    ATTR_IMAGE,
+    ATTR_OPTIONS,
     ATTR_SYSTEM,
     ATTR_USER,
+    ATTR_VERSION,
     FILE_HASSIO_ADDONS,
-    REPOSITORY_CORE,
-    REPOSITORY_LOCAL,
 )
-from ..coresys import CoreSysAttributes
-from ..exceptions import JsonFileError
-from ..utils.json import JsonConfig, read_json_file
-from .utils import extract_hash_from_path
-from .validate import SCHEMA_ADDON_CONFIG, SCHEMA_ADDONS_FILE, SCHEMA_REPOSITORY_CONFIG
+from ..coresys import CoreSys, CoreSysAttributes
+from ..utils.json import JsonConfig
+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]
 
 
 class AddonsData(JsonConfig, CoreSysAttributes):
-    """Hold data for Add-ons inside Hass.io."""
+    """Hold data for installed Add-ons inside Hass.io."""
 
-    def __init__(self, coresys):
+    def __init__(self, coresys: CoreSys):
         """Initialize data holder."""
         super().__init__(FILE_HASSIO_ADDONS, SCHEMA_ADDONS_FILE)
-        self.coresys = coresys
-        self._repositories = {}
-        self._cache = {}
+        self.coresys: CoreSys = coresys
 
     @property
     def user(self):
@@ -44,93 +40,34 @@ class AddonsData(JsonConfig, CoreSysAttributes):
         """Return local add-on data."""
         return self._data[ATTR_SYSTEM]
 
-    @property
-    def cache(self):
-        """Return add-on data from cache/repositories."""
-        return self._cache
+    def install(self, addon: AddonStore) -> None:
+        """Set addon as installed."""
+        self.system[addon.slug] = deepcopy(addon.data)
+        self.user[addon.slug] = {
+            ATTR_OPTIONS: {},
+            ATTR_VERSION: addon.version,
+            ATTR_IMAGE: addon.image,
+        }
+        self.save_data()
 
-    @property
-    def repositories(self):
-        """Return add-on data from repositories."""
-        return self._repositories
+    def uninstall(self, addon: Addon) -> None:
+        """Set add-on as uninstalled."""
+        self.system.pop(addon.slug, None)
+        self.user.pop(addon.slug, None)
+        self.save_data()
 
-    def reload(self):
-        """Read data from add-on repository."""
-        self._cache = {}
-        self._repositories = {}
+    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.save_data()
 
-        # read core repository
-        self._read_addons_folder(self.sys_config.path_addons_core, REPOSITORY_CORE)
+    def restore(self, slug: str, user: Config, system: Config, image: str) -> None:
+        """Restore data to add-on."""
+        self.user[slug] = deepcopy(user)
+        self.system[slug] = deepcopy(system)
 
-        # read local repository
-        self._read_addons_folder(self.sys_config.path_addons_local, REPOSITORY_LOCAL)
-
-        # add built-in repositories information
-        self._set_builtin_repositories()
-
-        # read custom git repositories
-        for repository_element in self.sys_config.path_addons_git.iterdir():
-            if repository_element.is_dir():
-                self._read_git_repository(repository_element)
-
-    def _read_git_repository(self, path):
-        """Process a custom repository folder."""
-        slug = extract_hash_from_path(path)
-
-        # exists repository json
-        repository_file = Path(path, "repository.json")
-        try:
-            repository_info = SCHEMA_REPOSITORY_CONFIG(read_json_file(repository_file))
-        except JsonFileError:
-            _LOGGER.warning(
-                "Can't read repository information from %s", repository_file
-            )
-            return
-        except vol.Invalid:
-            _LOGGER.warning("Repository parse error %s", repository_file)
-            return
-
-        # process data
-        self._repositories[slug] = repository_info
-        self._read_addons_folder(path, slug)
-
-    def _read_addons_folder(self, path, repository):
-        """Read data from add-ons folder."""
-        for addon in path.glob("**/config.json"):
-            try:
-                addon_config = read_json_file(addon)
-            except JsonFileError:
-                _LOGGER.warning("Can't read %s from repository %s", addon, repository)
-                continue
-
-            # validate
-            try:
-                addon_config = SCHEMA_ADDON_CONFIG(addon_config)
-            except vol.Invalid as ex:
-                _LOGGER.warning(
-                    "Can't read %s: %s", addon, humanize_error(addon_config, ex)
-                )
-                continue
-
-            # Generate slug
-            addon_slug = "{}_{}".format(repository, addon_config[ATTR_SLUG])
-
-            # store
-            addon_config[ATTR_REPOSITORY] = repository
-            addon_config[ATTR_LOCATON] = str(addon.parent)
-            self._cache[addon_slug] = addon_config
-
-    def _set_builtin_repositories(self):
-        """Add local built-in repository into dataset."""
-        try:
-            builtin_file = Path(__file__).parent.joinpath("built-in.json")
-            builtin_data = read_json_file(builtin_file)
-        except JsonFileError:
-            _LOGGER.warning("Can't read built-in json")
-            return
-
-        # core repository
-        self._repositories[REPOSITORY_CORE] = builtin_data[REPOSITORY_CORE]
-
-        # local repository
-        self._repositories[REPOSITORY_LOCAL] = builtin_data[REPOSITORY_LOCAL]
+        self.user[slug][ATTR_IMAGE] = image
+        self.save_data()

hassio/addons/model.py

@@ -0,0 +1,554 @@
+"""Init file for Hass.io add-ons."""
+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,
+    ATTR_AUTH_API,
+    ATTR_AUTO_UART,
+    ATTR_BOOT,
+    ATTR_DESCRIPTON,
+    ATTR_DEVICES,
+    ATTR_DEVICETREE,
+    ATTR_DISCOVERY,
+    ATTR_DOCKER_API,
+    ATTR_ENVIRONMENT,
+    ATTR_FULL_ACCESS,
+    ATTR_GPIO,
+    ATTR_HASSIO_API,
+    ATTR_HASSIO_ROLE,
+    ATTR_HOMEASSISTANT,
+    ATTR_HOMEASSISTANT_API,
+    ATTR_HOST_DBUS,
+    ATTR_HOST_IPC,
+    ATTR_HOST_NETWORK,
+    ATTR_HOST_PID,
+    ATTR_IMAGE,
+    ATTR_INGRESS,
+    ATTR_KERNEL_MODULES,
+    ATTR_LEGACY,
+    ATTR_LOCATON,
+    ATTR_MACHINE,
+    ATTR_MAP,
+    ATTR_NAME,
+    ATTR_OPTIONS,
+    ATTR_PANEL_ADMIN,
+    ATTR_PANEL_ICON,
+    ATTR_PANEL_TITLE,
+    ATTR_PORTS,
+    ATTR_PORTS_DESCRIPTION,
+    ATTR_PRIVILEGED,
+    ATTR_REPOSITORY,
+    ATTR_SCHEMA,
+    ATTR_SERVICES,
+    ATTR_SLUG,
+    ATTR_SNAPSHOT_EXCLUDE,
+    ATTR_STAGE,
+    ATTR_STARTUP,
+    ATTR_STDIN,
+    ATTR_TIMEOUT,
+    ATTR_TMPFS,
+    ATTR_UDEV,
+    ATTR_URL,
+    ATTR_VERSION,
+    ATTR_WEBUI,
+    SECURITY_DEFAULT,
+    SECURITY_DISABLE,
+    SECURITY_PROFILE,
+    AddonStages,
+)
+from ..coresys import CoreSysAttributes
+from .validate import RE_SERVICE, RE_VOLUME, schema_ui_options, validate_options
+
+Data = Dict[str, Any]
+
+
+class AddonModel(CoreSysAttributes):
+    """Add-on Data layout."""
+
+    slug: str = None
+
+    @property
+    def data(self) -> Data:
+        """Return Add-on config/data."""
+        raise NotImplementedError()
+
+    @property
+    def is_installed(self) -> bool:
+        """Return True if an add-on is installed."""
+        raise NotImplementedError()
+
+    @property
+    def is_detached(self) -> bool:
+        """Return True if add-on is detached."""
+        raise NotImplementedError()
+
+    @property
+    def available(self) -> bool:
+        """Return True if this add-on is available on this platform."""
+        return self._available(self.data)
+
+    @property
+    def options(self) -> Dict[str, Any]:
+        """Return options with local changes."""
+        return self.data[ATTR_OPTIONS]
+
+    @property
+    def boot(self) -> bool:
+        """Return boot config with prio local settings."""
+        return self.data[ATTR_BOOT]
+
+    @property
+    def auto_update(self) -> Optional[bool]:
+        """Return if auto update is enable."""
+        return None
+
+    @property
+    def name(self) -> str:
+        """Return name of add-on."""
+        return self.data[ATTR_NAME]
+
+    @property
+    def hostname(self) -> str:
+        """Return slug/id of add-on."""
+        return self.slug.replace("_", "-")
+
+    @property
+    def dns(self) -> List[str]:
+        """Return list of DNS name for that add-on."""
+        return []
+
+    @property
+    def timeout(self) -> int:
+        """Return timeout of addon for docker stop."""
+        return self.data[ATTR_TIMEOUT]
+
+    @property
+    def uuid(self) -> Optional[str]:
+        """Return an API token for this add-on."""
+        return None
+
+    @property
+    def hassio_token(self) -> Optional[str]:
+        """Return access token for Hass.io API."""
+        return None
+
+    @property
+    def ingress_token(self) -> Optional[str]:
+        """Return access token for Hass.io API."""
+        return None
+
+    @property
+    def ingress_entry(self) -> Optional[str]:
+        """Return ingress external URL."""
+        return None
+
+    @property
+    def description(self) -> str:
+        """Return description of add-on."""
+        return self.data[ATTR_DESCRIPTON]
+
+    @property
+    def long_description(self) -> Optional[str]:
+        """Return README.md as long_description."""
+        readme = Path(self.path_location, "README.md")
+
+        # If readme not exists
+        if not readme.exists():
+            return None
+
+        # Return data
+        with readme.open("r") as readme_file:
+            return readme_file.read()
+
+    @property
+    def repository(self) -> str:
+        """Return repository of add-on."""
+        return self.data[ATTR_REPOSITORY]
+
+    @property
+    def latest_version(self) -> str:
+        """Return latest version of add-on."""
+        return self.data[ATTR_VERSION]
+
+    @property
+    def version(self) -> str:
+        """Return version of add-on."""
+        return self.data[ATTR_VERSION]
+
+    @property
+    def protected(self) -> bool:
+        """Return if add-on is in protected mode."""
+        return True
+
+    @property
+    def startup(self) -> Optional[str]:
+        """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."""
+        services_list = self.data.get(ATTR_SERVICES, [])
+
+        services = {}
+        for data in services_list:
+            service = RE_SERVICE.match(data)
+            services[service.group("service")] = service.group("rights")
+
+        return services
+
+    @property
+    def discovery(self) -> List[str]:
+        """Return list of discoverable components/platforms."""
+        return self.data.get(ATTR_DISCOVERY, [])
+
+    @property
+    def ports_description(self) -> Optional[Dict[str, str]]:
+        """Return descriptions of ports."""
+        return self.data.get(ATTR_PORTS_DESCRIPTION)
+
+    @property
+    def ports(self) -> Optional[Dict[str, Optional[int]]]:
+        """Return ports of add-on."""
+        return self.data.get(ATTR_PORTS)
+
+    @property
+    def ingress_url(self) -> Optional[str]:
+        """Return URL to ingress url."""
+        return None
+
+    @property
+    def webui(self) -> Optional[str]:
+        """Return URL to webui or None."""
+        return self.data.get(ATTR_WEBUI)
+
+    @property
+    def ingress_port(self) -> Optional[int]:
+        """Return Ingress port."""
+        return None
+
+    @property
+    def panel_icon(self) -> str:
+        """Return panel icon for Ingress frame."""
+        return self.data[ATTR_PANEL_ICON]
+
+    @property
+    def panel_title(self) -> str:
+        """Return panel icon for Ingress frame."""
+        return self.data.get(ATTR_PANEL_TITLE, self.name)
+
+    @property
+    def panel_admin(self) -> str:
+        """Return panel icon for Ingress frame."""
+        return self.data[ATTR_PANEL_ADMIN]
+
+    @property
+    def host_network(self) -> bool:
+        """Return True if add-on run on host network."""
+        return self.data[ATTR_HOST_NETWORK]
+
+    @property
+    def host_pid(self) -> bool:
+        """Return True if add-on run on host PID namespace."""
+        return self.data[ATTR_HOST_PID]
+
+    @property
+    def host_ipc(self) -> bool:
+        """Return True if add-on run on host IPC namespace."""
+        return self.data[ATTR_HOST_IPC]
+
+    @property
+    def host_dbus(self) -> bool:
+        """Return True if add-on run on host D-BUS."""
+        return self.data[ATTR_HOST_DBUS]
+
+    @property
+    def devices(self) -> Optional[List[str]]:
+        """Return devices of add-on."""
+        return self.data.get(ATTR_DEVICES, [])
+
+    @property
+    def auto_uart(self) -> bool:
+        """Return True if we should map all UART device."""
+        return self.data[ATTR_AUTO_UART]
+
+    @property
+    def tmpfs(self) -> Optional[str]:
+        """Return tmpfs of add-on."""
+        return self.data.get(ATTR_TMPFS)
+
+    @property
+    def environment(self) -> Optional[Dict[str, str]]:
+        """Return environment of add-on."""
+        return self.data.get(ATTR_ENVIRONMENT)
+
+    @property
+    def privileged(self) -> List[str]:
+        """Return list of privilege."""
+        return self.data.get(ATTR_PRIVILEGED, [])
+
+    @property
+    def apparmor(self) -> str:
+        """Return True if AppArmor is enabled."""
+        if not self.data.get(ATTR_APPARMOR):
+            return SECURITY_DISABLE
+        elif self.sys_host.apparmor.exists(self.slug):
+            return SECURITY_PROFILE
+        return SECURITY_DEFAULT
+
+    @property
+    def legacy(self) -> bool:
+        """Return if the add-on don't support Home Assistant labels."""
+        return self.data[ATTR_LEGACY]
+
+    @property
+    def access_docker_api(self) -> bool:
+        """Return if the add-on need read-only Docker API access."""
+        return self.data[ATTR_DOCKER_API]
+
+    @property
+    def access_hassio_api(self) -> bool:
+        """Return True if the add-on access to Hass.io REASTful API."""
+        return self.data[ATTR_HASSIO_API]
+
+    @property
+    def access_homeassistant_api(self) -> bool:
+        """Return True if the add-on access to Home Assistant API proxy."""
+        return self.data[ATTR_HOMEASSISTANT_API]
+
+    @property
+    def hassio_role(self) -> str:
+        """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."""
+        return self.data[ATTR_STDIN]
+
+    @property
+    def with_ingress(self) -> bool:
+        """Return True if the add-on access support ingress."""
+        return self.data[ATTR_INGRESS]
+
+    @property
+    def ingress_panel(self) -> Optional[bool]:
+        """Return True if the add-on access support ingress."""
+        return None
+
+    @property
+    def with_gpio(self) -> bool:
+        """Return True if the add-on access to GPIO interface."""
+        return self.data[ATTR_GPIO]
+
+    @property
+    def with_udev(self) -> bool:
+        """Return True if the add-on have his own udev."""
+        return self.data[ATTR_UDEV]
+
+    @property
+    def with_kernel_modules(self) -> bool:
+        """Return True if the add-on access to kernel modules."""
+        return self.data[ATTR_KERNEL_MODULES]
+
+    @property
+    def with_full_access(self) -> bool:
+        """Return True if the add-on want full access to hardware."""
+        return self.data[ATTR_FULL_ACCESS]
+
+    @property
+    def with_devicetree(self) -> bool:
+        """Return True if the add-on read access to devicetree."""
+        return self.data[ATTR_DEVICETREE]
+
+    @property
+    def access_auth_api(self) -> bool:
+        """Return True if the add-on access to login/auth backend."""
+        return self.data[ATTR_AUTH_API]
+
+    @property
+    def with_audio(self) -> bool:
+        """Return True if the add-on access to audio."""
+        return self.data[ATTR_AUDIO]
+
+    @property
+    def homeassistant_version(self) -> Optional[str]:
+        """Return min Home Assistant version they needed by Add-on."""
+        return self.data.get(ATTR_HOMEASSISTANT)
+
+    @property
+    def url(self) -> Optional[str]:
+        """Return URL of add-on."""
+        return self.data.get(ATTR_URL)
+
+    @property
+    def with_icon(self) -> bool:
+        """Return True if an icon exists."""
+        return self.path_icon.exists()
+
+    @property
+    def with_logo(self) -> bool:
+        """Return True if a logo exists."""
+        return self.path_logo.exists()
+
+    @property
+    def with_changelog(self) -> bool:
+        """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."""
+        return self.data[ATTR_ARCH]
+
+    @property
+    def supported_machine(self) -> List[str]:
+        """Return list of supported machine."""
+        return self.data.get(ATTR_MACHINE, [])
+
+    @property
+    def image(self) -> str:
+        """Generate image name from data."""
+        return self._image(self.data)
+
+    @property
+    def need_build(self) -> bool:
+        """Return True if this  add-on need a local build."""
+        return ATTR_IMAGE not in self.data
+
+    @property
+    def map_volumes(self) -> Dict[str, str]:
+        """Return a dict of {volume: policy} from add-on."""
+        volumes = {}
+        for volume in self.data[ATTR_MAP]:
+            result = RE_VOLUME.match(volume)
+            volumes[result.group(1)] = result.group(2) or "ro"
+
+        return volumes
+
+    @property
+    def path_location(self) -> Path:
+        """Return path to this add-on."""
+        return Path(self.data[ATTR_LOCATON])
+
+    @property
+    def path_icon(self) -> Path:
+        """Return path to add-on icon."""
+        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")
+
+    @property
+    def path_changelog(self) -> Path:
+        """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."""
+        return Path(self.path_location, "apparmor.txt")
+
+    @property
+    def schema(self) -> vol.Schema:
+        """Create a schema for add-on options."""
+        raw_schema = self.data[ATTR_SCHEMA]
+
+        if isinstance(raw_schema, bool):
+            return vol.Schema(dict)
+        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."""
+        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."""
+        # Architecture
+        if not self.sys_arch.is_supported(config[ATTR_ARCH]):
+            return False
+
+        # Machine / Hardware
+        machine = config.get(ATTR_MACHINE)
+        if machine and self.sys_machine not in machine:
+            return False
+
+        # Home Assistant
+        version = config.get(ATTR_HOMEASSISTANT) or self.sys_homeassistant.version
+        if pkg_version.parse(self.sys_homeassistant.version) < pkg_version.parse(
+            version
+        ):
+            return False
+
+        return True
+
+    def _image(self, config) -> str:
+        """Generate image name from data."""
+        # Repository with Dockerhub images
+        if ATTR_IMAGE in config:
+            arch = self.sys_arch.match(config[ATTR_ARCH])
+            return config[ATTR_IMAGE].format(arch=arch)
+
+        # local build
+        return f"{config[ATTR_REPOSITORY]}/{self.sys_arch.default}-addon-{config[ATTR_SLUG]}"
+
+    def install(self) -> Awaitable[None]:
+        """Install this add-on."""
+        return self.sys_addons.install(self.slug)
+
+    def uninstall(self) -> Awaitable[None]:
+        """Uninstall this add-on."""
+        return self.sys_addons.uninstall(self.slug)
+
+    def update(self) -> Awaitable[None]:
+        """Update this add-on."""
+        return self.sys_addons.update(self.slug)
+
+    def rebuild(self) -> Awaitable[None]:
+        """Rebuild this add-on."""
+        return self.sys_addons.rebuild(self.slug)

hassio/addons/utils.py

@@ -2,10 +2,8 @@
 from __future__ import annotations
 
 import asyncio
-import hashlib
 import logging
 from pathlib import Path
-import re
 from typing import TYPE_CHECKING
 
 from ..const import (
@@ -22,13 +20,12 @@ from ..const import (
 )
 
 if TYPE_CHECKING:
-    from .addon import Addon
+    from .model import AddonModel
 
-RE_SHA1 = re.compile(r"[a-f0-9]{8}")
-_LOGGER = logging.getLogger(__name__)
+_LOGGER: logging.Logger = logging.getLogger(__name__)
 
 
-def rating_security(addon: Addon) -> int:
+def rating_security(addon: AddonModel) -> int:
     """Return 1-6 for security rating.
 
     1 = not secure
@@ -42,8 +39,10 @@ def rating_security(addon: Addon) -> 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
@@ -85,34 +84,6 @@ def rating_security(addon: Addon) -> int:
     return max(min(6, rating), 1)
 
 
-def get_hash_from_repository(name: str) -> str:
-    """Generate a hash from repository."""
-    key = name.lower().encode()
-    return hashlib.sha1(key).hexdigest()[:8]
-
-
-def extract_hash_from_path(path: Path) -> str:
-    """Extract repo id from path."""
-    repository_dir = path.parts[-1]
-
-    if not RE_SHA1.match(repository_dir):
-        return get_hash_from_repository(repository_dir)
-    return repository_dir
-
-
-def check_installed(method):
-    """Wrap function with check if add-on is installed."""
-
-    async def wrap_check(addon, *args, **kwargs):
-        """Return False if not installed or the function."""
-        if not addon.is_installed:
-            _LOGGER.error("Addon %s is not installed", addon.slug)
-            return False
-        return await method(addon, *args, **kwargs)
-
-    return wrap_check
-
-
 async def remove_data(folder: Path) -> None:
     """Remove folder and reset privileged."""
     try:

hassio/addons/validate.py

@@ -1,66 +1,170 @@
 """Validate add-ons options schema."""
 import logging
 import re
+import secrets
+from typing import Any, Dict, List
 import uuid
 
 import voluptuous as vol
 
 from ..const import (
-    ARCH_ALL, ATTR_ACCESS_TOKEN, ATTR_APPARMOR, ATTR_ARCH, ATTR_ARGS,
-    ATTR_AUDIO, ATTR_AUDIO_INPUT, ATTR_AUDIO_OUTPUT, ATTR_AUTH_API,
-    ATTR_AUTO_UART, ATTR_AUTO_UPDATE, ATTR_BOOT, ATTR_BUILD_FROM,
-    ATTR_DESCRIPTON, ATTR_DEVICES, ATTR_DEVICETREE, ATTR_DISCOVERY,
-    ATTR_DOCKER_API, ATTR_ENVIRONMENT, ATTR_FULL_ACCESS, ATTR_GPIO,
-    ATTR_HASSIO_API, ATTR_HASSIO_ROLE, ATTR_HOMEASSISTANT_API, ATTR_HOST_DBUS,
-    ATTR_HOST_IPC, ATTR_HOST_NETWORK, ATTR_HOST_PID, ATTR_IMAGE,
-    ATTR_KERNEL_MODULES, ATTR_LEGACY, ATTR_LOCATON, ATTR_MACHINE,
-    ATTR_MAINTAINER, ATTR_MAP, ATTR_NAME, ATTR_NETWORK, ATTR_OPTIONS,
-    ATTR_PORTS, ATTR_PRIVILEGED, ATTR_PROTECTED, ATTR_REPOSITORY, ATTR_SCHEMA,
-    ATTR_SERVICES, ATTR_SLUG, ATTR_SQUASH, ATTR_STARTUP, ATTR_STATE,
-    ATTR_STDIN, ATTR_SYSTEM, ATTR_TIMEOUT, ATTR_TMPFS, ATTR_URL, ATTR_USER,
-    ATTR_UUID, ATTR_VERSION, ATTR_WEBUI, BOOT_AUTO, BOOT_MANUAL,
-    PRIVILEGED_ALL, ROLE_ALL, ROLE_DEFAULT, STARTUP_ALL, STARTUP_APPLICATION,
-    STARTUP_SERVICES, STATE_STARTED, STATE_STOPPED)
+    ARCH_ALL,
+    ATTR_ACCESS_TOKEN,
+    ATTR_ADVANCED,
+    ATTR_APPARMOR,
+    ATTR_ARCH,
+    ATTR_ARGS,
+    ATTR_AUDIO,
+    ATTR_AUDIO_INPUT,
+    ATTR_AUDIO_OUTPUT,
+    ATTR_AUTH_API,
+    ATTR_AUTO_UART,
+    ATTR_AUTO_UPDATE,
+    ATTR_BOOT,
+    ATTR_BUILD_FROM,
+    ATTR_DESCRIPTON,
+    ATTR_DEVICES,
+    ATTR_DEVICETREE,
+    ATTR_DISCOVERY,
+    ATTR_DOCKER_API,
+    ATTR_ENVIRONMENT,
+    ATTR_FULL_ACCESS,
+    ATTR_GPIO,
+    ATTR_HASSIO_API,
+    ATTR_HASSIO_ROLE,
+    ATTR_HOMEASSISTANT,
+    ATTR_HOMEASSISTANT_API,
+    ATTR_HOST_DBUS,
+    ATTR_HOST_IPC,
+    ATTR_HOST_NETWORK,
+    ATTR_HOST_PID,
+    ATTR_IMAGE,
+    ATTR_INGRESS,
+    ATTR_INGRESS_ENTRY,
+    ATTR_INGRESS_PANEL,
+    ATTR_INGRESS_PORT,
+    ATTR_INGRESS_TOKEN,
+    ATTR_KERNEL_MODULES,
+    ATTR_LEGACY,
+    ATTR_LOCATON,
+    ATTR_MACHINE,
+    ATTR_MAP,
+    ATTR_NAME,
+    ATTR_NETWORK,
+    ATTR_OPTIONS,
+    ATTR_PANEL_ADMIN,
+    ATTR_PANEL_ICON,
+    ATTR_PANEL_TITLE,
+    ATTR_PORTS,
+    ATTR_PORTS_DESCRIPTION,
+    ATTR_PRIVILEGED,
+    ATTR_PROTECTED,
+    ATTR_REPOSITORY,
+    ATTR_SCHEMA,
+    ATTR_SERVICES,
+    ATTR_SLUG,
+    ATTR_SNAPSHOT_EXCLUDE,
+    ATTR_SQUASH,
+    ATTR_STAGE,
+    ATTR_STARTUP,
+    ATTR_STATE,
+    ATTR_STDIN,
+    ATTR_SYSTEM,
+    ATTR_TIMEOUT,
+    ATTR_TMPFS,
+    ATTR_UDEV,
+    ATTR_URL,
+    ATTR_USER,
+    ATTR_UUID,
+    ATTR_VERSION,
+    ATTR_WEBUI,
+    BOOT_AUTO,
+    BOOT_MANUAL,
+    PRIVILEGED_ALL,
+    ROLE_ALL,
+    ROLE_DEFAULT,
+    STARTUP_ALL,
+    STARTUP_APPLICATION,
+    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, NETWORK_PORT, SHA256, UUID_MATCH)
+    DOCKER_PORTS,
+    DOCKER_PORTS_DESCRIPTION,
+    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_EMAIL = 'email'
-V_URL = 'url'
-V_PORT = 'port'
-V_MATCH = 'match'
+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")\??$"
 )
 
-RE_DOCKER_IMAGE = re.compile(
-    r"^([a-zA-Z\-\.:\d{}]+/)*?([\-\w{}]+)/([\-\w{}]+)$")
+_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{}]+)?$")
+    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-n2",
+    "odroid-xu",
+    "qemuarm-64",
+    "qemuarm",
+    "qemux86-64",
+    "qemux86",
+    "raspberrypi",
+    "raspberrypi2",
+    "raspberrypi3-64",
+    "raspberrypi3",
+    "raspberrypi4-64",
+    "raspberrypi4",
+    "tinker",
 ]
 
 
@@ -74,128 +178,161 @@ 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_WEBUI):
-        vol.Match(r"^(?:https?|\[PROTO:\w+\]):\/\/\[HOST\]:\[PORT:\d+\].*$"),
-    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_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(
+            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_UDEV, 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.Optional(ATTR_SNAPSHOT_EXCLUDE): [vol.Coerce(str)],
+        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_REPOSITORY_CONFIG = vol.Schema({
-    vol.Required(ATTR_NAME): vol.Coerce(str),
-    vol.Optional(ATTR_URL): vol.Url(),
-    vol.Optional(ATTR_MAINTAINER): vol.Coerce(str),
-}, extra=vol.REMOVE_EXTRA)
-
-
-# pylint: disable=no-value-for-parameter
-SCHEMA_BUILD_CONFIG = vol.Schema({
-    vol.Optional(ATTR_BUILD_FROM, default=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): SHA256,
-    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(),
-}, 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},
+    }
+)
 
 
-def validate_options(raw_schema):
+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(coresys: CoreSys, raw_schema: Dict[str, Any]):
     """Validate schema."""
+
     def validate(struct):
         """Create schema validator for add-ons options."""
         options = {}
@@ -211,17 +348,17 @@ 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
 
-        _check_missing_options(raw_schema, options, 'root')
+        _check_missing_options(raw_schema, options, "root")
         return options
 
     return validate
@@ -229,24 +366,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):
@@ -258,29 +402,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))
+        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 = {}
 
@@ -292,10 +438,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
@@ -305,7 +452,120 @@ 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}")
+
+
+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

@@ -9,18 +9,23 @@ from ..coresys import CoreSys, CoreSysAttributes
 from .addons import APIAddons
 from .auth import APIAuth
 from .discovery import APIDiscovery
+from .dns import APICoreDNS
 from .hardware import APIHardware
 from .hassos import APIHassOS
 from .homeassistant import APIHomeAssistant
 from .host import APIHost
 from .info import APIInfo
+from .ingress import APIIngress
 from .proxy import APIProxy
 from .security import SecurityMiddleware
 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):
@@ -31,7 +36,9 @@ 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
         self._runner: web.AppRunner = web.AppRunner(self.webapp)
@@ -47,228 +54,259 @@ class RestAPI(CoreSysAttributes):
         self._register_proxy()
         self._register_panel()
         self._register_addons()
+        self._register_ingress()
         self._register_snapshots()
         self._register_discovery()
         self._register_services()
         self._register_info()
         self._register_auth()
+        self._register_dns()
 
     def _register_host(self) -> None:
         """Register hostcontrol functions."""
         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),
+                web.post("/hardware/trigger", api_hardware.trigger),
+            ]
+        )
 
     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), web.post("/auth/reset", api_auth.reset)]
+        )
 
     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),
+                web.post("/supervisor/repair", api_supervisor.repair),
+            ]
+        )
 
     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.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),
+            ]
+        )
+
+    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),
+            ]
+        )
 
     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_dns(self) -> None:
+        """Register DNS functions."""
+        api_dns = APICoreDNS()
+        api_dns.coresys = self.coresys
+
+        self.webapp.add_routes(
+            [
+                web.get("/dns/info", api_dns.info),
+                web.get("/dns/stats", api_dns.stats),
+                web.get("/dns/logs", api_dns.logs),
+                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),
+            ]
+        )
 
     def _register_panel(self) -> None:
         """Register panel for Home Assistant."""
         panel_dir = Path(__file__).parent.joinpath("panel")
-
-        def create_response(panel_file):
-            """Create a function to generate a response."""
-            path = panel_dir.joinpath(f"{panel_file!s}.html")
-            return lambda request: web.FileResponse(path)
-
-        # This route is for backwards compatibility with HA < 0.58
-        self.webapp.add_routes(
-            [web.get('/panel', create_response('hassio-main-es5'))])
-
-        # This route is for backwards compatibility with HA 0.58 - 0.61
-        self.webapp.add_routes([
-            web.get('/panel_es5', create_response('hassio-main-es5')),
-            web.get('/panel_latest', create_response('hassio-main-latest')),
-        ])
-
-        # This route is for backwards compatibility with HA 0.62 - 0.70
-        self.webapp.add_routes([
-            web.get('/app-es5/index.html', create_response('index')),
-            web.get('/app-es5/hassio-app.html', create_response('hassio-app')),
-        ])
-
-        # This route is for HA > 0.70
-        self.webapp.add_routes([web.static('/app', panel_dir)])
+        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

@@ -1,62 +1,133 @@
 """Init file for Hass.io Home Assistant RESTful API."""
 import asyncio
 import logging
+from typing import Any, Awaitable, Dict, List
 
+from aiohttp import web
 import voluptuous as vol
-from voluptuous.humanize import humanize_error
 
-from .utils import api_process, api_process_raw, api_validate
+from ..addons import AnyAddon
 from ..addons.utils import rating_security
 from ..const import (
-    ATTR_VERSION, ATTR_LAST_VERSION, ATTR_STATE, ATTR_BOOT, ATTR_OPTIONS,
-    ATTR_URL, ATTR_DESCRIPTON, ATTR_DETACHED, ATTR_NAME, ATTR_REPOSITORY,
-    ATTR_BUILD, ATTR_AUTO_UPDATE, ATTR_NETWORK, ATTR_HOST_NETWORK, ATTR_SLUG,
-    ATTR_SOURCE, ATTR_REPOSITORIES, ATTR_ADDONS, ATTR_ARCH, ATTR_MAINTAINER,
-    ATTR_INSTALLED, ATTR_LOGO, ATTR_WEBUI, ATTR_DEVICES, ATTR_PRIVILEGED,
-    ATTR_AUDIO, ATTR_AUDIO_INPUT, ATTR_AUDIO_OUTPUT, ATTR_HASSIO_API,
-    ATTR_GPIO, ATTR_HOMEASSISTANT_API, ATTR_STDIN, BOOT_AUTO, BOOT_MANUAL,
-    ATTR_CHANGELOG, ATTR_HOST_IPC, ATTR_HOST_DBUS, ATTR_LONG_DESCRIPTION,
-    ATTR_CPU_PERCENT, ATTR_MEMORY_LIMIT, ATTR_MEMORY_USAGE, ATTR_NETWORK_TX,
-    ATTR_NETWORK_RX, ATTR_BLK_READ, ATTR_BLK_WRITE, ATTR_ICON, ATTR_SERVICES,
-    ATTR_DISCOVERY, ATTR_APPARMOR, ATTR_DEVICETREE, ATTR_DOCKER_API,
-    ATTR_FULL_ACCESS, ATTR_PROTECTED, ATTR_RATING, ATTR_HOST_PID,
-    ATTR_HASSIO_ROLE, ATTR_MACHINE, ATTR_AVAILABLE, ATTR_AUTH_API,
+    ATTR_ADDONS,
+    ATTR_ADVANCED,
+    ATTR_APPARMOR,
+    ATTR_ARCH,
+    ATTR_AUDIO,
+    ATTR_AUDIO_INPUT,
+    ATTR_AUDIO_OUTPUT,
+    ATTR_AUTH_API,
+    ATTR_AUTO_UPDATE,
+    ATTR_AVAILABLE,
+    ATTR_BLK_READ,
+    ATTR_BLK_WRITE,
+    ATTR_BOOT,
+    ATTR_BUILD,
+    ATTR_CHANGELOG,
+    ATTR_CPU_PERCENT,
+    ATTR_DESCRIPTON,
+    ATTR_DETACHED,
+    ATTR_DEVICES,
+    ATTR_DEVICETREE,
+    ATTR_DISCOVERY,
+    ATTR_DNS,
+    ATTR_DOCKER_API,
+    ATTR_DOCUMENTATION,
+    ATTR_FULL_ACCESS,
+    ATTR_GPIO,
+    ATTR_HASSIO_API,
+    ATTR_HASSIO_ROLE,
+    ATTR_HOMEASSISTANT,
+    ATTR_HOMEASSISTANT_API,
+    ATTR_HOST_DBUS,
+    ATTR_HOST_IPC,
+    ATTR_HOST_NETWORK,
+    ATTR_HOST_PID,
+    ATTR_HOSTNAME,
+    ATTR_ICON,
+    ATTR_INGRESS,
+    ATTR_INGRESS_ENTRY,
+    ATTR_INGRESS_PANEL,
+    ATTR_INGRESS_PORT,
+    ATTR_INGRESS_URL,
+    ATTR_INSTALLED,
+    ATTR_IP_ADDRESS,
     ATTR_KERNEL_MODULES,
-    CONTENT_TYPE_PNG, CONTENT_TYPE_BINARY, CONTENT_TYPE_TEXT, REQUEST_FROM)
+    ATTR_LAST_VERSION,
+    ATTR_LOGO,
+    ATTR_LONG_DESCRIPTION,
+    ATTR_MACHINE,
+    ATTR_MAINTAINER,
+    ATTR_MEMORY_LIMIT,
+    ATTR_MEMORY_PERCENT,
+    ATTR_MEMORY_USAGE,
+    ATTR_NAME,
+    ATTR_NETWORK,
+    ATTR_NETWORK_DESCRIPTION,
+    ATTR_NETWORK_RX,
+    ATTR_NETWORK_TX,
+    ATTR_OPTIONS,
+    ATTR_PRIVILEGED,
+    ATTR_PROTECTED,
+    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_WEBUI,
+    BOOT_AUTO,
+    BOOT_MANUAL,
+    CONTENT_TYPE_BINARY,
+    CONTENT_TYPE_PNG,
+    CONTENT_TYPE_TEXT,
+    REQUEST_FROM,
+    STATE_NONE,
+)
 from ..coresys import CoreSysAttributes
-from ..validate import DOCKER_PORTS, ALSA_DEVICE
+from ..docker.stats import DockerStats
 from ..exceptions import APIError
+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),
-})
+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,
-})
+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, check_installed=True):
+    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: str = 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)
@@ -69,72 +140,81 @@ class APIAddons(CoreSysAttributes):
         return addon
 
     @api_process
-    async def list(self, request):
+    async def list(self, request: web.Request) -> Dict[str, Any]:
         """Return all add-ons or repositories."""
         data_addons = []
-        for addon in self.sys_addons.list_addons:
-            data_addons.append({
-                ATTR_NAME: addon.name,
-                ATTR_SLUG: addon.slug,
-                ATTR_DESCRIPTON: addon.description,
-                ATTR_VERSION: addon.last_version,
-                ATTR_INSTALLED: addon.version_installed,
-                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,
-            })
+        for addon in self.sys_addons.all:
+            data_addons.append(
+                {
+                    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,
+                    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_addons.list_repositories:
-            data_repositories.append({
-                ATTR_SLUG: repository.slug,
-                ATTR_NAME: repository.name,
-                ATTR_SOURCE: repository.source,
-                ATTR_URL: repository.url,
-                ATTR_MAINTAINER: repository.maintainer,
-            })
+        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,
+                }
+            )
 
-        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):
-        """Reload all add-on data."""
-        await asyncio.shield(self.sys_addons.reload())
-        return True
+    async def reload(self, request: web.Request) -> None:
+        """Reload all add-on data from store."""
+        await asyncio.shield(self.sys_store.reload())
 
     @api_process
-    async def info(self, request):
+    async def info(self, request: web.Request) -> Dict[str, Any]:
         """Return add-on information."""
-        addon = self._extract_addon(request, check_installed=False)
+        addon: AnyAddon = self._extract_addon(request, check_installed=False)
 
-        return {
+        data = {
             ATTR_NAME: addon.name,
             ATTR_SLUG: addon.slug,
+            ATTR_HOSTNAME: addon.hostname,
+            ATTR_DNS: addon.dns,
             ATTR_DESCRIPTON: addon.description,
             ATTR_LONG_DESCRIPTION: addon.long_description,
-            ATTR_VERSION: addon.version_installed,
-            ATTR_AUTO_UPDATE: addon.auto_update,
+            ATTR_ADVANCED: addon.advanced,
+            ATTR_STAGE: addon.stage,
+            ATTR_AUTO_UPDATE: None,
             ATTR_REPOSITORY: addon.repository,
-            ATTR_LAST_VERSION: addon.last_version,
-            ATTR_STATE: await addon.state(),
+            ATTR_VERSION: None,
+            ATTR_LAST_VERSION: addon.latest_version,
             ATTR_PROTECTED: addon.protected,
             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,
             ATTR_URL: addon.url,
+            ATTR_STATE: STATE_NONE,
             ATTR_DETACHED: addon.is_detached,
             ATTR_AVAILABLE: addon.available,
             ATTR_BUILD: addon.need_build,
             ATTR_NETWORK: addon.ports,
+            ATTR_NETWORK_DESCRIPTION: addon.ports_description,
             ATTR_HOST_NETWORK: addon.host_network,
             ATTR_HOST_PID: addon.host_pid,
             ATTR_HOST_IPC: addon.host_ipc,
@@ -146,8 +226,9 @@ class APIAddons(CoreSysAttributes):
             ATTR_ICON: addon.with_icon,
             ATTR_LOGO: addon.with_logo,
             ATTR_CHANGELOG: addon.with_changelog,
-            ATTR_WEBUI: addon.webui,
+            ATTR_DOCUMENTATION: addon.with_documentation,
             ATTR_STDIN: addon.with_stdin,
+            ATTR_WEBUI: None,
             ATTR_HASSIO_API: addon.access_hassio_api,
             ATTR_HASSIO_ROLE: addon.hassio_role,
             ATTR_AUTH_API: addon.access_auth_api,
@@ -155,25 +236,55 @@ class APIAddons(CoreSysAttributes):
             ATTR_GPIO: addon.with_gpio,
             ATTR_KERNEL_MODULES: addon.with_kernel_modules,
             ATTR_DEVICETREE: addon.with_devicetree,
+            ATTR_UDEV: addon.with_udev,
             ATTR_DOCKER_API: addon.access_docker_api,
             ATTR_AUDIO: addon.with_audio,
-            ATTR_AUDIO_INPUT: addon.audio_input,
-            ATTR_AUDIO_OUTPUT: addon.audio_output,
+            ATTR_AUDIO_INPUT: None,
+            ATTR_AUDIO_OUTPUT: None,
             ATTR_SERVICES: _pretty_services(addon),
             ATTR_DISCOVERY: addon.discovery,
+            ATTR_IP_ADDRESS: None,
+            ATTR_INGRESS: addon.with_ingress,
+            ATTR_INGRESS_ENTRY: None,
+            ATTR_INGRESS_URL: None,
+            ATTR_INGRESS_PORT: None,
+            ATTR_INGRESS_PANEL: None,
         }
 
+        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,
+                }
+            )
+
+        return data
+
     @api_process
-    async def options(self, request):
+    async def options(self, request: web.Request) -> None:
         """Store user options for add-on."""
-        addon = self._extract_addon(request)
+        addon: AnyAddon = self._extract_addon(request)
 
-        addon_schema = SCHEMA_OPTIONS.extend({
-            vol.Optional(ATTR_OPTIONS): vol.Any(None, addon.schema),
-        })
+        # Update secrets for validation
+        await self.sys_secrets.reload()
 
-        body = await api_validate(addon_schema, request)
+        # Extend schema with add-on specific validation
+        addon_schema = SCHEMA_OPTIONS.extend(
+            {vol.Optional(ATTR_OPTIONS): vol.Any(None, addon.schema)}
+        )
 
+        # 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:
@@ -186,36 +297,35 @@ class APIAddons(CoreSysAttributes):
             addon.audio_input = body[ATTR_AUDIO_INPUT]
         if ATTR_AUDIO_OUTPUT in body:
             addon.audio_output = body[ATTR_AUDIO_OUTPUT]
+        if ATTR_INGRESS_PANEL in body:
+            addon.ingress_panel = body[ATTR_INGRESS_PANEL]
+            await self.sys_ingress.update_hass_panel(addon)
 
-        addon.save_data()
-        return True
+        addon.save_persist()
 
     @api_process
-    async def security(self, request):
+    async def security(self, request: web.Request) -> None:
         """Store security options for add-on."""
-        addon = self._extract_addon(request)
-        body = await api_validate(SCHEMA_SECURITY, request)
+        addon: AnyAddon = self._extract_addon(request)
+        body: Dict[str, Any] = await api_validate(SCHEMA_SECURITY, request)
 
         if ATTR_PROTECTED in body:
             _LOGGER.warning("Protected flag changing for %s!", addon.slug)
             addon.protected = body[ATTR_PROTECTED]
 
-        addon.save_data()
-        return True
+        addon.save_persist()
 
     @api_process
-    async def stats(self, request):
+    async def stats(self, request: web.Request) -> Dict[str, Any]:
         """Return resource information."""
-        addon = self._extract_addon(request)
-        stats = await addon.stats()
-
-        if not stats:
-            raise APIError("No stats available")
+        addon: AnyAddon = self._extract_addon(request)
+        stats: DockerStats = await addon.stats()
 
         return {
             ATTR_CPU_PERCENT: stats.cpu_percent,
             ATTR_MEMORY_USAGE: stats.memory_usage,
             ATTR_MEMORY_LIMIT: stats.memory_limit,
+            ATTR_MEMORY_PERCENT: stats.memory_percent,
             ATTR_NETWORK_RX: stats.network_rx,
             ATTR_NETWORK_TX: stats.network_tx,
             ATTR_BLK_READ: stats.blk_read,
@@ -223,118 +333,120 @@ class APIAddons(CoreSysAttributes):
         }
 
     @api_process
-    def install(self, request):
+    def install(self, request: web.Request) -> Awaitable[None]:
         """Install add-on."""
-        addon = self._extract_addon(request, check_installed=False)
+        addon: AnyAddon = self._extract_addon(request, check_installed=False)
         return asyncio.shield(addon.install())
 
     @api_process
-    def uninstall(self, request):
+    def uninstall(self, request: web.Request) -> Awaitable[None]:
         """Uninstall add-on."""
-        addon = self._extract_addon(request)
+        addon: AnyAddon = self._extract_addon(request)
         return asyncio.shield(addon.uninstall())
 
     @api_process
-    def start(self, request):
+    def start(self, request: web.Request) -> Awaitable[None]:
         """Start add-on."""
-        addon = 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
-
+        addon: AnyAddon = self._extract_addon(request)
         return asyncio.shield(addon.start())
 
     @api_process
-    def stop(self, request):
+    def stop(self, request: web.Request) -> Awaitable[None]:
         """Stop add-on."""
-        addon = self._extract_addon(request)
+        addon: AnyAddon = self._extract_addon(request)
         return asyncio.shield(addon.stop())
 
     @api_process
-    def update(self, request):
+    def update(self, request: web.Request) -> Awaitable[None]:
         """Update add-on."""
-        addon = self._extract_addon(request)
+        addon: AnyAddon = self._extract_addon(request)
 
-        if addon.last_version == addon.version_installed:
+        if addon.latest_version == addon.version:
             raise APIError("No update available!")
 
         return asyncio.shield(addon.update())
 
     @api_process
-    def restart(self, request):
+    def restart(self, request: web.Request) -> Awaitable[None]:
         """Restart add-on."""
-        addon = self._extract_addon(request)
+        addon: AnyAddon = self._extract_addon(request)
         return asyncio.shield(addon.restart())
 
     @api_process
-    def rebuild(self, request):
+    def rebuild(self, request: web.Request) -> Awaitable[None]:
         """Rebuild local build add-on."""
-        addon = self._extract_addon(request)
+        addon: AnyAddon = self._extract_addon(request)
         if not addon.need_build:
             raise APIError("Only local build addons are supported")
 
         return asyncio.shield(addon.rebuild())
 
     @api_process_raw(CONTENT_TYPE_BINARY)
-    def logs(self, request):
+    def logs(self, request: web.Request) -> Awaitable[bytes]:
         """Return logs from add-on."""
-        addon = self._extract_addon(request)
+        addon: AnyAddon = self._extract_addon(request)
         return addon.logs()
 
     @api_process_raw(CONTENT_TYPE_PNG)
-    async def icon(self, request):
+    async def icon(self, request: web.Request) -> bytes:
         """Return icon from add-on."""
-        addon = self._extract_addon(request, check_installed=False)
+        addon: AnyAddon = self._extract_addon(request, check_installed=False)
         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)
-    async def logo(self, request):
+    async def logo(self, request: web.Request) -> bytes:
         """Return logo from add-on."""
-        addon = self._extract_addon(request, check_installed=False)
+        addon: AnyAddon = self._extract_addon(request, check_installed=False)
         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)
-    async def changelog(self, request):
+    async def changelog(self, request: web.Request) -> str:
         """Return changelog from add-on."""
-        addon = self._extract_addon(request, check_installed=False)
+        addon: AnyAddon = self._extract_addon(request, check_installed=False)
         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_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):
+    async def stdin(self, request: web.Request) -> None:
         """Write to stdin of add-on."""
-        addon = self._extract_addon(request)
+        addon: AnyAddon = self._extract_addon(request)
         if not addon.with_stdin:
             raise APIError("STDIN not supported by add-on")
 
         data = await request.read()
-        return await asyncio.shield(addon.write_stdin(data))
+        await asyncio.shield(addon.write_stdin(data))
 
 
-def _pretty_devices(addon):
+def _pretty_devices(addon: AnyAddon) -> List[str]:
     """Return a simplified device list."""
     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):
+def _pretty_services(addon: AnyAddon) -> List[str]:
     """Return a simplified services role list."""
     services = []
     for name, access in addon.services_role.items():

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,18 +41,20 @@ 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.
         """
-        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)
 
     @api_process
-    async def auth(self, request):
+    async def auth(self, request: web.Request) -> bool:
         """Process login request."""
         addon = request[REQUEST_FROM]
 
@@ -56,6 +75,14 @@ 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"'}
+        )
+
+    @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

@@ -0,0 +1,102 @@
+"""Init file for Hass.io DNS RESTful API."""
+import asyncio
+import logging
+from typing import Any, Awaitable, Dict
+
+from aiohttp import web
+import voluptuous as vol
+
+from ..const import (
+    ATTR_BLK_READ,
+    ATTR_BLK_WRITE,
+    ATTR_CPU_PERCENT,
+    ATTR_HOST,
+    ATTR_LATEST_VERSION,
+    ATTR_LOCALS,
+    ATTR_MEMORY_LIMIT,
+    ATTR_MEMORY_PERCENT,
+    ATTR_MEMORY_USAGE,
+    ATTR_NETWORK_RX,
+    ATTR_NETWORK_TX,
+    ATTR_SERVERS,
+    ATTR_VERSION,
+    CONTENT_TYPE_BINARY,
+)
+from ..coresys import CoreSysAttributes
+from ..exceptions import APIError
+from ..validate import dns_server_list
+from .utils import api_process, api_process_raw, api_validate
+
+_LOGGER: logging.Logger = logging.getLogger(__name__)
+
+# pylint: disable=no-value-for-parameter
+SCHEMA_OPTIONS = vol.Schema({vol.Optional(ATTR_SERVERS): dns_server_list})
+
+SCHEMA_VERSION = vol.Schema({vol.Optional(ATTR_VERSION): vol.Coerce(str)})
+
+
+class APICoreDNS(CoreSysAttributes):
+    """Handle RESTful API for DNS functions."""
+
+    @api_process
+    async def info(self, request: web.Request) -> Dict[str, Any]:
+        """Return DNS information."""
+        return {
+            ATTR_VERSION: self.sys_dns.version,
+            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
+    async def options(self, request: web.Request) -> None:
+        """Set DNS options."""
+        body = await api_validate(SCHEMA_OPTIONS, request)
+
+        if ATTR_SERVERS in body:
+            self.sys_dns.servers = body[ATTR_SERVERS]
+            self.sys_create_task(self.sys_dns.restart())
+
+        self.sys_dns.save_data()
+
+    @api_process
+    async def stats(self, request: web.Request) -> Dict[str, Any]:
+        """Return resource information."""
+        stats = await self.sys_dns.stats()
+
+        return {
+            ATTR_CPU_PERCENT: stats.cpu_percent,
+            ATTR_MEMORY_USAGE: stats.memory_usage,
+            ATTR_MEMORY_LIMIT: stats.memory_limit,
+            ATTR_MEMORY_PERCENT: stats.memory_percent,
+            ATTR_NETWORK_RX: stats.network_rx,
+            ATTR_NETWORK_TX: stats.network_tx,
+            ATTR_BLK_READ: stats.blk_read,
+            ATTR_BLK_WRITE: stats.blk_write,
+        }
+
+    @api_process
+    async def update(self, request: web.Request) -> None:
+        """Update DNS plugin."""
+        body = await api_validate(SCHEMA_VERSION, request)
+        version = body.get(ATTR_VERSION, self.sys_dns.latest_version)
+
+        if version == self.sys_dns.version:
+            raise APIError("Version {} is already in use".format(version))
+        await asyncio.shield(self.sys_dns.update(version))
+
+    @api_process_raw(CONTENT_TYPE_BINARY)
+    def logs(self, request: web.Request) -> Awaitable[bytes]:
+        """Return DNS Docker logs."""
+        return self.sys_dns.logs()
+
+    @api_process
+    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,22 +1,34 @@
 """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 (
-    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__)
+_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(self.sys_hardware.serial_devices),
+            ATTR_SERIAL: list(
+                self.sys_hardware.serial_devices | self.sys_hardware.serial_by_id
+            ),
             ATTR_INPUT: list(self.sys_hardware.input_devices),
             ATTR_DISK: list(self.sys_hardware.disk_devices),
             ATTR_GPIO: list(self.sys_hardware.gpio_devices),
@@ -24,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: {
@@ -32,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

@@ -1,27 +1,32 @@
 """Init file for Hass.io HassOS RESTful API."""
 import asyncio
 import logging
+from typing import Any, Awaitable, Dict
 
+from aiohttp import web
 import voluptuous as vol
 
-from .utils import api_process, api_validate
 from ..const import (
-    ATTR_VERSION, ATTR_BOARD, ATTR_VERSION_LATEST, ATTR_VERSION_CLI,
-    ATTR_VERSION_CLI_LATEST)
+    ATTR_BOARD,
+    ATTR_BOOT,
+    ATTR_VERSION,
+    ATTR_VERSION_CLI,
+    ATTR_VERSION_CLI_LATEST,
+    ATTR_VERSION_LATEST,
+)
 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),
-})
+SCHEMA_VERSION = vol.Schema({vol.Optional(ATTR_VERSION): vol.Coerce(str)})
 
 
 class APIHassOS(CoreSysAttributes):
     """Handle RESTful API for HassOS functions."""
 
     @api_process
-    async def info(self, request):
+    async def info(self, request: web.Request) -> Dict[str, Any]:
         """Return HassOS information."""
         return {
             ATTR_VERSION: self.sys_hassos.version,
@@ -29,10 +34,11 @@ 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
-    async def update(self, request):
+    async def update(self, request: web.Request) -> None:
         """Update HassOS."""
         body = await api_validate(SCHEMA_VERSION, request)
         version = body.get(ATTR_VERSION, self.sys_hassos.version_latest)
@@ -40,7 +46,7 @@ class APIHassOS(CoreSysAttributes):
         await asyncio.shield(self.sys_hassos.update(version))
 
     @api_process
-    async def update_cli(self, request):
+    async def update_cli(self, request: web.Request) -> None:
         """Update HassOS CLI."""
         body = await api_validate(SCHEMA_VERSION, request)
         version = body.get(ATTR_VERSION, self.sys_hassos.version_cli_latest)
@@ -48,6 +54,6 @@ class APIHassOS(CoreSysAttributes):
         await asyncio.shield(self.sys_hassos.update_cli(version))
 
     @api_process
-    def config_sync(self, request):
+    def config_sync(self, request: web.Request) -> Awaitable[None]:
         """Trigger config reload on HassOS."""
         return asyncio.shield(self.sys_hassos.config_sync())

hassio/api/homeassistant.py

@@ -18,32 +18,32 @@ from ..const import (
     ATTR_MACHINE,
     ATTR_MEMORY_LIMIT,
     ATTR_MEMORY_USAGE,
+    ATTR_MEMORY_PERCENT,
     ATTR_NETWORK_RX,
     ATTR_NETWORK_TX,
-    ATTR_PASSWORD,
     ATTR_PORT,
     ATTR_REFRESH_TOKEN,
     ATTR_SSL,
     ATTR_VERSION,
     ATTR_WAIT_BOOT,
     ATTR_WATCHDOG,
+    ATTR_IP_ADDRESS,
     CONTENT_TYPE_BINARY,
 )
 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(vol.Coerce(str)),
-        vol.Inclusive(ATTR_LAST_VERSION, "custom_hass"): vol.Any(None, DOCKER_IMAGE),
-        vol.Optional(ATTR_PORT): NETWORK_PORT,
-        vol.Optional(ATTR_PASSWORD): vol.Maybe(vol.Coerce(str)),
+        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_SSL): vol.Boolean(),
         vol.Optional(ATTR_WATCHDOG): vol.Boolean(),
         vol.Optional(ATTR_WAIT_BOOT): vol.All(vol.Coerce(int), vol.Range(min=60)),
@@ -62,8 +62,9 @@ class APIHomeAssistant(CoreSysAttributes):
         """Return host information."""
         return {
             ATTR_VERSION: self.sys_homeassistant.version,
-            ATTR_LAST_VERSION: self.sys_homeassistant.last_version,
+            ATTR_LAST_VERSION: self.sys_homeassistant.latest_version,
             ATTR_MACHINE: self.sys_homeassistant.machine,
+            ATTR_IP_ADDRESS: str(self.sys_homeassistant.ip_address),
             ATTR_ARCH: self.sys_homeassistant.arch,
             ATTR_IMAGE: self.sys_homeassistant.image,
             ATTR_CUSTOM: self.sys_homeassistant.is_custom_image,
@@ -81,7 +82,7 @@ class APIHomeAssistant(CoreSysAttributes):
 
         if ATTR_IMAGE in body and ATTR_LAST_VERSION in body:
             self.sys_homeassistant.image = body[ATTR_IMAGE]
-            self.sys_homeassistant.last_version = body[ATTR_LAST_VERSION]
+            self.sys_homeassistant.latest_version = body[ATTR_LAST_VERSION]
 
         if ATTR_BOOT in body:
             self.sys_homeassistant.boot = body[ATTR_BOOT]
@@ -89,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]
 
@@ -118,6 +115,7 @@ class APIHomeAssistant(CoreSysAttributes):
             ATTR_CPU_PERCENT: stats.cpu_percent,
             ATTR_MEMORY_USAGE: stats.memory_usage,
             ATTR_MEMORY_LIMIT: stats.memory_limit,
+            ATTR_MEMORY_PERCENT: stats.memory_percent,
             ATTR_NETWORK_RX: stats.network_rx,
             ATTR_NETWORK_TX: stats.network_tx,
             ATTR_BLK_READ: stats.blk_read,
@@ -128,7 +126,7 @@ class APIHomeAssistant(CoreSysAttributes):
     async def update(self, request: web.Request) -> None:
         """Update Home Assistant."""
         body = await api_validate(SCHEMA_VERSION, request)
-        version = body.get(ATTR_VERSION, self.sys_homeassistant.last_version)
+        version = body.get(ATTR_VERSION, self.sys_homeassistant.latest_version)
 
         await asyncio.shield(self.sys_homeassistant.update(version))
 

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__)
+_LOGGER: logging.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

@@ -1,20 +1,32 @@
 """Init file for Hass.io info RESTful API."""
 import logging
+from typing import Any, Dict
 
-from ..const import (ATTR_ARCH, ATTR_CHANNEL, ATTR_HASSOS, ATTR_HOMEASSISTANT,
-                     ATTR_HOSTNAME, ATTR_MACHINE, ATTR_SUPERVISOR,
-                     ATTR_SUPPORTED_ARCH)
+from aiohttp import web
+
+from ..const import (
+    ATTR_ARCH,
+    ATTR_CHANNEL,
+    ATTR_HASSOS,
+    ATTR_HOMEASSISTANT,
+    ATTR_HOSTNAME,
+    ATTR_LOGGING,
+    ATTR_MACHINE,
+    ATTR_SUPERVISOR,
+    ATTR_SUPPORTED_ARCH,
+    ATTR_TIMEZONE,
+)
 from ..coresys import CoreSysAttributes
 from .utils import api_process
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER: logging.Logger = logging.getLogger(__name__)
 
 
 class APIInfo(CoreSysAttributes):
     """Handle RESTful API for info functions."""
 
     @api_process
-    async def info(self, request):
+    async def info(self, request: web.Request) -> Dict[str, Any]:
         """Show system info."""
         return {
             ATTR_SUPERVISOR: self.sys_supervisor.version,
@@ -25,4 +37,6 @@ class APIInfo(CoreSysAttributes):
             ATTR_ARCH: self.sys_arch.default,
             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

@@ -0,0 +1,271 @@
+"""Hass.io Add-on ingress service."""
+import asyncio
+from ipaddress import ip_address
+import logging
+from typing import Any, Dict, Union
+
+import aiohttp
+from aiohttp import hdrs, web
+from aiohttp.web_exceptions import (
+    HTTPBadGateway,
+    HTTPServiceUnavailable,
+    HTTPUnauthorized,
+)
+from multidict import CIMultiDict, istr
+
+from ..addons.addon import Addon
+from ..const import (
+    ATTR_ADMIN,
+    ATTR_ICON,
+    ATTR_SESSION,
+    ATTR_TITLE,
+    ATTR_PANELS,
+    ATTR_ENABLE,
+    COOKIE_INGRESS,
+    HEADER_TOKEN,
+    REQUEST_FROM,
+)
+from ..coresys import CoreSysAttributes
+from .utils import api_process
+
+_LOGGER: logging.Logger = logging.getLogger(__name__)
+
+
+class APIIngress(CoreSysAttributes):
+    """Ingress view to handle add-on webui routing."""
+
+    def _extract_addon(self, request: web.Request) -> Addon:
+        """Return addon, throw an exception it it doesn't exist."""
+        token = request.match_info.get("token")
+
+        # Find correct add-on
+        addon = self.sys_ingress.get(token)
+        if not addon:
+            _LOGGER.warning("Ingress for %s not available", token)
+            raise HTTPServiceUnavailable()
+
+        return addon
+
+    def _check_ha_access(self, request: web.Request) -> None:
+        if request[REQUEST_FROM] != self.sys_homeassistant:
+            _LOGGER.warning("Ingress is only available behind Home Assistant")
+            raise HTTPUnauthorized()
+
+    def _create_url(self, addon: Addon, path: str) -> str:
+        """Create URL to container."""
+        return f"http://{addon.ip_address}:{addon.ingress_port}/{path}"
+
+    @api_process
+    async def panels(self, request: web.Request) -> Dict[str, Any]:
+        """Create a list of panel data."""
+        addons = {}
+        for addon in self.sys_ingress.addons:
+            addons[addon.slug] = {
+                ATTR_TITLE: addon.panel_title,
+                ATTR_ICON: addon.panel_icon,
+                ATTR_ADMIN: addon.panel_admin,
+                ATTR_ENABLE: addon.ingress_panel,
+            }
+
+        return {ATTR_PANELS: addons}
+
+    @api_process
+    async def create_session(self, request: web.Request) -> Dict[str, Any]:
+        """Create a new session."""
+        self._check_ha_access(request)
+
+        session = self.sys_ingress.create_session()
+        return {ATTR_SESSION: session}
+
+    async def handler(
+        self, request: web.Request
+    ) -> Union[web.Response, web.StreamResponse, web.WebSocketResponse]:
+        """Route data to Hass.io ingress service."""
+        self._check_ha_access(request)
+
+        # Check Ingress Session
+        session = request.cookies.get(COOKIE_INGRESS)
+        if not self.sys_ingress.validate_session(session):
+            _LOGGER.warning("No valid ingress session %s", session)
+            raise HTTPUnauthorized()
+
+        # Process requests
+        addon = self._extract_addon(request)
+        path = request.match_info.get("path")
+        try:
+            # Websocket
+            if _is_websocket(request):
+                return await self._handle_websocket(request, addon, path)
+
+            # Request
+            return await self._handle_request(request, addon, path)
+
+        except aiohttp.ClientError as err:
+            _LOGGER.error("Ingress error: %s", err)
+
+        raise HTTPBadGateway() from None
+
+    async def _handle_websocket(
+        self, request: web.Request, addon: Addon, path: str
+    ) -> web.WebSocketResponse:
+        """Ingress route for websocket."""
+        if hdrs.SEC_WEBSOCKET_PROTOCOL in request.headers:
+            req_protocols = [
+                str(proto.strip())
+                for proto in request.headers[hdrs.SEC_WEBSOCKET_PROTOCOL].split(",")
+            ]
+        else:
+            req_protocols = ()
+
+        ws_server = web.WebSocketResponse(
+            protocols=req_protocols, autoclose=False, autoping=False
+        )
+        await ws_server.prepare(request)
+
+        # Preparing
+        url = self._create_url(addon, path)
+        source_header = _init_header(request, addon)
+
+        # Support GET query
+        if request.query_string:
+            url = "{}?{}".format(url, request.query_string)
+
+        # Start proxy
+        async with self.sys_websession.ws_connect(
+            url,
+            headers=source_header,
+            protocols=req_protocols,
+            autoclose=False,
+            autoping=False,
+        ) as ws_client:
+            # Proxy requests
+            await asyncio.wait(
+                [
+                    _websocket_forward(ws_server, ws_client),
+                    _websocket_forward(ws_client, ws_server),
+                ],
+                return_when=asyncio.FIRST_COMPLETED,
+            )
+
+        return ws_server
+
+    async def _handle_request(
+        self, request: web.Request, addon: Addon, path: str
+    ) -> Union[web.Response, web.StreamResponse]:
+        """Ingress route for request."""
+        url = self._create_url(addon, path)
+        data = await request.read()
+        source_header = _init_header(request, addon)
+
+        async with self.sys_websession.request(
+            request.method,
+            url,
+            headers=source_header,
+            params=request.query,
+            allow_redirects=False,
+            data=data,
+        ) as result:
+            headers = _response_header(result)
+
+            # Simple request
+            if (
+                hdrs.CONTENT_LENGTH in result.headers
+                and int(result.headers.get(hdrs.CONTENT_LENGTH, 0)) < 4_194_000
+            ):
+                # Return Response
+                body = await result.read()
+                return web.Response(
+                    headers=headers,
+                    status=result.status,
+                    content_type=result.content_type,
+                    body=body,
+                )
+
+            # Stream response
+            response = web.StreamResponse(status=result.status, headers=headers)
+            response.content_type = result.content_type
+
+            try:
+                await response.prepare(request)
+                async for data in result.content.iter_chunked(4096):
+                    await response.write(data)
+
+            except (aiohttp.ClientError, aiohttp.ClientPayloadError) as err:
+                _LOGGER.error("Stream error with %s: %s", url, err)
+
+            return response
+
+
+def _init_header(
+    request: web.Request, addon: str
+) -> Union[CIMultiDict, Dict[str, str]]:
+    """Create initial header."""
+    headers = {}
+
+    # filter flags
+    for name, value in request.headers.items():
+        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),
+        ):
+            continue
+        headers[name] = value
+
+    # Update X-Forwarded-For
+    forward_for = request.headers.get(hdrs.X_FORWARDED_FOR)
+    connected_ip = ip_address(request.transport.get_extra_info("peername")[0])
+    headers[hdrs.X_FORWARDED_FOR] = f"{forward_for}, {connected_ip!s}"
+
+    return headers
+
+
+def _response_header(response: aiohttp.ClientResponse) -> Dict[str, str]:
+    """Create response header."""
+    headers = {}
+
+    for name, value in response.headers.items():
+        if name in (
+            hdrs.TRANSFER_ENCODING,
+            hdrs.CONTENT_LENGTH,
+            hdrs.CONTENT_TYPE,
+            hdrs.CONTENT_ENCODING,
+        ):
+            continue
+        headers[name] = value
+
+    return headers
+
+
+def _is_websocket(request: web.Request) -> bool:
+    """Return True if request is a websocket."""
+    headers = request.headers
+
+    if (
+        "upgrade" in headers.get(hdrs.CONNECTION, "").lower()
+        and headers.get(hdrs.UPGRADE, "").lower() == "websocket"
+    ):
+        return True
+    return False
+
+
+async def _websocket_forward(ws_from, ws_to):
+    """Handle websocket message directly."""
+    try:
+        async for msg in ws_from:
+            if msg.type == aiohttp.WSMsgType.TEXT:
+                await ws_to.send_str(msg.data)
+            elif msg.type == aiohttp.WSMsgType.BINARY:
+                await ws_to.send_bytes(msg.data)
+            elif msg.type == aiohttp.WSMsgType.PING:
+                await ws_to.ping()
+            elif msg.type == aiohttp.WSMsgType.PONG:
+                await ws_to.pong()
+            elif ws_to.closed:
+                await ws_to.close(code=ws_to.close_code, message=msg.extra)
+    except RuntimeError:
+        _LOGGER.warning("Ingress Websocket runtime error")

hassio/api/panel/chunk.00de7352e51443687ebb.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.0c4f6887f9b7e7b11ef5.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.170381dce1aef5f33cec.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.2c1fb1dea4fa88f96920.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"chunk.2c1fb1dea4fa88f96920.js","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.b2dce600432c76a53d8c.js

@@ -0,0 +1,2 @@
+(self.webpackJsonp=self.webpackJsonp||[]).push([[12],[,function(o,t){var n=document.createElement("template");n.setAttribute("style","display: none;"),n.innerHTML='<style>\n@font-face {\nfont-family: "Roboto";\nsrc:\n  local("Roboto Thin"),\n  local("Roboto-Thin"),\n  url(/static/fonts/roboto/Roboto-Thin.woff2) format("woff2");\nfont-weight: 100;\nfont-style: normal;\n}\n@font-face {\nfont-family: "Roboto";\nsrc:\n  local("Roboto Thin Italic"),\n  local("Roboto-ThinItalic"),\n  url(/static/fonts/roboto/Roboto-ThinItalic.woff2) format("woff2");\nfont-weight: 100;\nfont-style: italic;\n}\n@font-face {\nfont-family: "Roboto";\nsrc:\n  local("Roboto Light"),\n  local("Roboto-Light"),\n  url(/static/fonts/roboto/Roboto-Light.woff2) format("woff2");\nfont-weight: 300;\nfont-style: normal;\n}\n@font-face {\nfont-family: "Roboto";\nsrc:\n  local("Roboto Light Italic"),\n  local("Roboto-LightItalic"),\n  url(/static/fonts/roboto/Roboto-LightItalic.woff2) format("woff2");\nfont-weight: 300;\nfont-style: italic;\n}\n@font-face {\nfont-family: "Roboto";\nsrc:\n  local("Roboto Regular"),\n  local("Roboto-Regular"),\n  url(/static/fonts/roboto/Roboto-Regular.woff2) format("woff2");\nfont-weight: 400;\nfont-style: normal;\n}\n@font-face {\nfont-family: "Roboto";\nsrc:\n  local("Roboto Italic"),\n  local("Roboto-Italic"),\n  url(/static/fonts/roboto/Roboto-RegularItalic.woff2) format("woff2");\nfont-weight: 400;\nfont-style: italic;\n}\n@font-face {\nfont-family: "Roboto";\nsrc:\n  local("Roboto Medium"),\n  local("Roboto-Medium"),\n  url(/static/fonts/roboto/Roboto-Medium.woff2) format("woff2");\nfont-weight: 500;\nfont-style: normal;\n}\n@font-face {\nfont-family: "Roboto";\nsrc:\n  local("Roboto Medium Italic"),\n  local("Roboto-MediumItalic"),\n  url(/static/fonts/roboto/Roboto-MediumItalic.woff2) format("woff2");\nfont-weight: 500;\nfont-style: italic;\n}\n@font-face {\nfont-family: "Roboto";\nsrc:\n  local("Roboto Bold"),\n  local("Roboto-Bold"),\n  url(/static/fonts/roboto/Roboto-Bold.woff2) format("woff2");\nfont-weight: 700;\nfont-style: normal;\n}\n@font-face {\nfont-family: "Roboto";\nsrc:\n  local("Roboto Bold Italic"),\n  local("Roboto-BoldItalic"),\n  url(/static/fonts/roboto/Roboto-BoldItalic.woff2) format("woff2");\nfont-weight: 700;\nfont-style: italic;\n}\n@font-face {\nfont-family: "Roboto";\nsrc:\n  local("Roboto Black"),\n  local("Roboto-Black"),\n  url(/static/fonts/roboto/Roboto-Black.woff2) format("woff2");\nfont-weight: 900;\nfont-style: normal;\n}\n@font-face {\nfont-family: "Roboto";\nsrc:\n  local("Roboto Black Italic"),\n  local("Roboto-BlackItalic"),\n  url(/static/fonts/roboto/Roboto-BlackItalic.woff2) format("woff2");\nfont-weight: 900;\nfont-style: italic;\n}\n</style>',document.head.appendChild(n.content)}]]);
+//# sourceMappingURL=chunk.b2dce600432c76a53d8c.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["webpack:///./src/resources/roboto.js"],"names":["documentContainer","document","createElement","setAttribute","innerHTML","head","appendChild","content"],"mappings":"qEAAA,IAAMA,EAAoBC,SAASC,cAAc,YACjDF,EAAkBG,aAAa,QAAS,kBAExCH,EAAkBI,UAAlB,6gFA+GAH,SAASI,KAAKC,YAAYN,EAAkBO","file":"chunk.b2dce600432c76a53d8c.js","sourcesContent":["const documentContainer = document.createElement(\"template\");\ndocumentContainer.setAttribute(\"style\", \"display: none;\");\n\ndocumentContainer.innerHTML = `<style>\n@font-face {\nfont-family: \"Roboto\";\nsrc:\n  local(\"Roboto Thin\"),\n  local(\"Roboto-Thin\"),\n  url(/static/fonts/roboto/Roboto-Thin.woff2) format(\"woff2\");\nfont-weight: 100;\nfont-style: normal;\n}\n@font-face {\nfont-family: \"Roboto\";\nsrc:\n  local(\"Roboto Thin Italic\"),\n  local(\"Roboto-ThinItalic\"),\n  url(/static/fonts/roboto/Roboto-ThinItalic.woff2) format(\"woff2\");\nfont-weight: 100;\nfont-style: italic;\n}\n@font-face {\nfont-family: \"Roboto\";\nsrc:\n  local(\"Roboto Light\"),\n  local(\"Roboto-Light\"),\n  url(/static/fonts/roboto/Roboto-Light.woff2) format(\"woff2\");\nfont-weight: 300;\nfont-style: normal;\n}\n@font-face {\nfont-family: \"Roboto\";\nsrc:\n  local(\"Roboto Light Italic\"),\n  local(\"Roboto-LightItalic\"),\n  url(/static/fonts/roboto/Roboto-LightItalic.woff2) format(\"woff2\");\nfont-weight: 300;\nfont-style: italic;\n}\n@font-face {\nfont-family: \"Roboto\";\nsrc:\n  local(\"Roboto Regular\"),\n  local(\"Roboto-Regular\"),\n  url(/static/fonts/roboto/Roboto-Regular.woff2) format(\"woff2\");\nfont-weight: 400;\nfont-style: normal;\n}\n@font-face {\nfont-family: \"Roboto\";\nsrc:\n  local(\"Roboto Italic\"),\n  local(\"Roboto-Italic\"),\n  url(/static/fonts/roboto/Roboto-RegularItalic.woff2) format(\"woff2\");\nfont-weight: 400;\nfont-style: italic;\n}\n@font-face {\nfont-family: \"Roboto\";\nsrc:\n  local(\"Roboto Medium\"),\n  local(\"Roboto-Medium\"),\n  url(/static/fonts/roboto/Roboto-Medium.woff2) format(\"woff2\");\nfont-weight: 500;\nfont-style: normal;\n}\n@font-face {\nfont-family: \"Roboto\";\nsrc:\n  local(\"Roboto Medium Italic\"),\n  local(\"Roboto-MediumItalic\"),\n  url(/static/fonts/roboto/Roboto-MediumItalic.woff2) format(\"woff2\");\nfont-weight: 500;\nfont-style: italic;\n}\n@font-face {\nfont-family: \"Roboto\";\nsrc:\n  local(\"Roboto Bold\"),\n  local(\"Roboto-Bold\"),\n  url(/static/fonts/roboto/Roboto-Bold.woff2) format(\"woff2\");\nfont-weight: 700;\nfont-style: normal;\n}\n@font-face {\nfont-family: \"Roboto\";\nsrc:\n  local(\"Roboto Bold Italic\"),\n  local(\"Roboto-BoldItalic\"),\n  url(/static/fonts/roboto/Roboto-BoldItalic.woff2) format(\"woff2\");\nfont-weight: 700;\nfont-style: italic;\n}\n@font-face {\nfont-family: \"Roboto\";\nsrc:\n  local(\"Roboto Black\"),\n  local(\"Roboto-Black\"),\n  url(/static/fonts/roboto/Roboto-Black.woff2) format(\"woff2\");\nfont-weight: 900;\nfont-style: normal;\n}\n@font-face {\nfont-family: \"Roboto\";\nsrc:\n  local(\"Roboto Black Italic\"),\n  local(\"Roboto-BlackItalic\"),\n  url(/static/fonts/roboto/Roboto-BlackItalic.woff2) format(\"woff2\");\nfont-weight: 900;\nfont-style: italic;\n}\n</style>`;\n\ndocument.head.appendChild(documentContainer.content);\n\n/**\n@license\nCopyright (c) 2015 The Polymer Project Authors. All rights reserved.\nThis code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt\nThe complete set of authors may be found at http://polymer.github.io/AUTHORS.txt\nThe complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt\nCode distributed by Google as part of the polymer project is also\nsubject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt\n*/\n/*\n  FIXME(polymer-modulizer): the above comments were extracted\n  from HTML and may be out of place here. Review them and\n  then delete this comment!\n*/\n"],"sourceRoot":""}

hassio/api/panel/chunk.b74ddf4cacc7d5de8a55.js

@@ -1 +0,0 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([[4],{110: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(101),i=t.n(e),o=t(103),u=t.n(o),a=i.a,c=u.a}}]);

hassio/api/panel/chunk.d4931d72592ad48ba2be.js.LICENSE

@@ -1,3 +1,28 @@
+/**
+ * @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) 2019 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.
@@ -9,6 +34,23 @@ 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.
+
+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.
+*/
+
 /**
 @license
 Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
@@ -30,9 +72,24 @@ part of the polymer project is also subject to an additional IP rights grant
 found at http://polymer.github.io/PATENTS.txt
 */
 
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. 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
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
 /**
  * @license
- * Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+ * Copyright (c) 2018 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
@@ -45,21 +102,50 @@ found at http://polymer.github.io/PATENTS.txt
  */
 
 /**
-@license
-Copyright 2018 Google Inc. All Rights Reserved.
+ * @license
+ * Copyright 2019 Google Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
 
-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.
-*/
+/**
+ * @license
+ * Copyright 2018 Google Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
 
 /**
  * @license
@@ -84,42 +170,6 @@ limitations under the License.
  * THE SOFTWARE.
  */
 
-/**
-@license
-Copyright (c) 2019 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.
- * 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
-*/
-
 /**
 @license
 Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -140,3 +190,23 @@ The complete set of contributors may be found at http://polymer.github.io/CONTRI
 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
+*/
+
+/*!
+ * 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
+ */