Bump version to 206

.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

@@ -1,48 +1,31 @@
+// See https://aka.ms/vscode-remote/devcontainer.json for format details.
 {
-  "name": "Supervisor dev",
-  "image": "ghcr.io/home-assistant/devcontainer:supervisor",
-  "containerEnv": {
-    "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}"
-  },
-  "remoteEnv": {
-    "PATH": "${containerEnv:VIRTUAL_ENV}/bin:${containerEnv:PATH}"
-  },
-  "appPort": ["9123:8123", "7357:4357"],
-  "postCreateCommand": "bash devcontainer_setup",
-  "postStartCommand": "bash devcontainer_bootstrap",
-  "runArgs": ["-e", "GIT_EDITOR=code --wait", "--privileged"],
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        "charliermarsh.ruff",
-        "ms-python.pylint",
-        "ms-python.vscode-pylance",
-        "visualstudioexptteam.vscodeintellicode",
-        "redhat.vscode-yaml",
-        "esbenp.prettier-vscode",
-        "GitHub.vscode-pull-request-github"
-      ],
-      "settings": {
-        "python.defaultInterpreterPath": "/home/vscode/.local/ha-venv/bin/python",
-        "python.pythonPath": "/home/vscode/.local/ha-venv/bin/python",
-        "python.terminal.activateEnvInCurrentTerminal": true,
-        "python.testing.pytestArgs": ["--no-cov"],
-        "pylint.importStrategy": "fromEnvironment",
-        "editor.formatOnPaste": false,
-        "editor.formatOnSave": true,
-        "editor.formatOnType": true,
-        "files.trimTrailingWhitespace": true,
-        "terminal.integrated.profiles.linux": {
-          "zsh": {
-            "path": "/usr/bin/zsh"
-          }
-        },
-        "terminal.integrated.defaultProfile.linux": "zsh",
-        "[python]": {
-          "editor.defaultFormatter": "charliermarsh.ruff"
-        }
-      }
-    }
-  },
-  "mounts": ["type=volume,target=/var/lib/docker"]
-}
+	"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

@@ -14,10 +14,10 @@
 # virtualenv
 venv/
 
-# Data
-home-assistant-polymer/
-script/
-tests/
+# HA
+home-assistant-polymer/*
+misc/*
+script/*
 
 # Test ENV
 data/

.github/ISSUE_TEMPLATE.md

@@ -1,69 +1,29 @@
----
-name: Report a bug with the Supervisor on a supported System
-about: Report an issue related to the Home Assistant Supervisor.
-labels: bug
----
-
 <!-- READ THIS FIRST:
 - If you need additional help with this template please refer to https://www.home-assistant.io/help/reporting_issues/
+- Make sure you are running the latest version of Home Assistant before reporting an issue: https://github.com/home-assistant/home-assistant/releases
+- Do not report issues for components here, plaese refer to https://github.com/home-assistant/home-assistant/issues
 - This is for bugs only. Feature and enhancement requests should go in our community forum: https://community.home-assistant.io/c/feature-requests
 - Provide as many details as possible. Paste logs, configuration sample and code into the backticks. Do not delete any text from this template!
-- If you have a problem with an add-on, make an issue in it's repository.
+- If you have a problem with a Add-on, make a issue on there repository.
 -->
 
+**Home Assistant release with the issue:**
 <!--
-Important: You can only fill a bug repport for an supported system! If you run an unsupported installation. This report would be closed without comment.
+- Frontend -> Developer tools -> Info
+- Or use this command: hass --version
 -->
 
-### Describe the issue
-
-<!-- Provide as many details as possible. -->
-
-### Steps to reproduce
-
-<!-- What do you do to encounter the issue. -->
-
-1. ...
-2. ...
-3. ...
-
-### Enviroment details
-
-<!-- You can find these details in the system tab of the supervisor panel, or by using the `ha` CLI. -->
-
-- **Operating System:**: xxx
-- **Supervisor version:**: xxx
-- **Home Assistant version**: xxx
-
-### Supervisor logs
-
-<details>
-<summary>Supervisor logs</summary>
+**Operating environment (HassOS/Generic):**
 <!--
-- Frontend -> Supervisor -> System
-- Or use this command: ha supervisor logs
-- Logs are more than just errors, even if you don't think it's important, it is.
+Please provide details about your environment.
 -->
 
-```
-Paste supervisor logs here
-
-```
-
-</details>
-
-### System Information
-
-<details>
-<summary>System Information</summary>
+**Supervisor logs:**
 <!--
-- Use this command: ha info
+- Frontend -> Hass.io -> System
+- Or use this command: hassio su logs
 -->
 
-```
-Paste system info here
 
-```
-
-</details>
+**Description of problem:**
 

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,96 +0,0 @@
-name: Bug Report Form
-description: Report an issue related to the Home Assistant Supervisor.
-labels: bug
-body:
-  - type: markdown
-    attributes:
-      value: |
-        This issue form is for reporting bugs with **supported** setups only!
-
-        If you have a feature or enhancement request, please use the [feature request][fr] section of our [Community Forum][fr].
-
-        [fr]: https://community.home-assistant.io/c/feature-requests
-  - type: textarea
-    validations:
-      required: true
-    attributes:
-      label: Describe the issue you are experiencing
-      description: Provide a clear and concise description of what the bug is.
-  - type: markdown
-    attributes:
-      value: |
-        ## Environment
-  - type: dropdown
-    validations:
-      required: true
-    attributes:
-      label: What type of installation are you running?
-      description: >
-        If you don't know, can be found in [Settings -> System -> Repairs -> System Information](https://my.home-assistant.io/redirect/system_health/).
-        It is listed as the `Installation Type` value.
-      options:
-        - Home Assistant OS
-        - Home Assistant Supervised
-  - type: dropdown
-    validations:
-      required: true
-    attributes:
-      label: Which operating system are you running on?
-      options:
-        - Home Assistant Operating System
-        - Debian
-        - Other (e.g., Raspbian/Raspberry Pi OS/Fedora)
-  - type: markdown
-    attributes:
-      value: |
-        # Details
-  - type: textarea
-    validations:
-      required: true
-    attributes:
-      label: Steps to reproduce the issue
-      description: |
-        Please tell us exactly how to reproduce your issue.
-        Provide clear and concise step by step instructions and add code snippets if needed.
-      value: |
-        1.
-        2.
-        3.
-        ...
-  - type: textarea
-    validations:
-      required: true
-    attributes:
-      label: Anything in the Supervisor logs that might be useful for us?
-      description: >
-        Supervisor Logs can be found in [Settings -> System -> Logs](https://my.home-assistant.io/redirect/logs/)
-        then choose `Supervisor` in the top right.
-
-        [![Open your Home Assistant instance and show your Supervisor system logs.](https://my.home-assistant.io/badges/supervisor_logs.svg)](https://my.home-assistant.io/redirect/supervisor_logs/)
-      render: txt
-  - type: textarea
-    validations:
-      required: true
-    attributes:
-      label: System Health information
-      description: >
-        System Health information can be found in the top right menu in [Settings -> System -> Repairs](https://my.home-assistant.io/redirect/repairs/).
-        Click the copy button at the bottom of the pop-up and paste it here.
-        
-        [![Open your Home Assistant instance and show health information about your system.](https://my.home-assistant.io/badges/system_health.svg)](https://my.home-assistant.io/redirect/system_health/)
-  - type: textarea
-    attributes:
-      label: Supervisor diagnostics
-      placeholder: "drag-and-drop the diagnostics data file here (do not copy-and-paste the content)"
-      description: >-
-        Supervisor diagnostics can be found in [Settings -> Integrations](https://my.home-assistant.io/redirect/integrations/).
-        Find the card that says `Home Assistant Supervisor`, open its menu and select 'Download diagnostics'.
-        
-        **Please drag-and-drop the downloaded file into the textbox below. Do not copy and paste its contents.**
-  - type: textarea
-    attributes:
-      label: Additional information
-      description: >
-        If you have any additional information for us, use the field below.
-        Please note, you can attach screenshots or screen recordings here, by
-        dragging and dropping files in the field below.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,25 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Report a bug/issues with an unsupported Supervisor
-    url: https://community.home-assistant.io
-    about: The Community guide can help or was updated to solve your issue
-
-  - name: Report a bug for the Supervisor panel
-    url: https://github.com/home-assistant/frontend/issues
-    about: The Supervisor panel is a part of the Home Assistant frontend
-
-  - name: Report incorrect or missing information on our developer documentation
-    url: https://github.com/home-assistant/developers.home-assistant.io/issues
-    about: Our documentation has its own issue tracker. Please report issues with the website there.
-
-  - name: Request a feature for the Supervisor
-    url: https://community.home-assistant.io/c/feature-requests
-    about: Request an new feature for the Supervisor.
-
-  - name: I have a question or need support
-    url: https://www.home-assistant.io/help
-    about: We use GitHub for tracking bugs, check our website for resources on getting help.
-
-  - name: I'm unsure where to go?
-    url: https://www.home-assistant.io/join-chat
-    about: If you are unsure where to go, then joining our chat is recommended; Just ask!

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,74 +0,0 @@
-<!--
-  You are amazing! Thanks for contributing to our project!
-  Please, DO NOT DELETE ANY TEXT from this template! (unless instructed).
--->
-
-## Proposed change
-
-<!--
-  Describe the big picture of your changes here to communicate to the
-  maintainers why we should accept this pull request. If it fixes a bug
-  or resolves a feature request, be sure to link to that issue in the
-  additional information section.
--->
-
-## Type of change
-
-<!--
-  What type of change does your PR introduce to Home Assistant?
-  NOTE: Please, check only 1! box!
-  If your PR requires multiple boxes to be checked, you'll most likely need to
-  split it into multiple PRs. This makes things easier and faster to code review.
--->
-
-- [ ] Dependency upgrade
-- [ ] Bugfix (non-breaking change which fixes an issue)
-- [ ] New feature (which adds functionality to the supervisor)
-- [ ] Breaking change (fix/feature causing existing functionality to break)
-- [ ] Code quality improvements to existing code or addition of tests
-
-## Additional information
-
-<!--
-  Details are important, and help maintainers processing your PR.
-  Please be sure to fill out additional details, if applicable.
--->
-
-- This PR fixes or closes issue: fixes #
-- This PR is related to issue:
-- Link to documentation pull request:
-- Link to cli pull request:
-- Link to client library pull request:
-
-## Checklist
-
-<!--
-  Put an `x` in the boxes that apply. You can also fill these out after
-  creating the PR. If you're unsure about any of them, don't hesitate to ask.
-  We're here to help! This is simply a reminder of what we are going to look
-  for before merging your code.
--->
-
-- [ ] The code change is tested and works locally.
-- [ ] Local tests pass. **Your PR cannot be merged unless tests pass**
-- [ ] There is no commented out code in this PR.
-- [ ] I have followed the [development checklist][dev-checklist]
-- [ ] The code has been formatted using Ruff (`ruff format supervisor tests`)
-- [ ] Tests have been added to verify that the new code works.
-
-If API endpoints or add-on configuration are added/changed:
-
-- [ ] Documentation added/updated for [developers.home-assistant.io][docs-repository]
-- [ ] [CLI][cli-repository] updated (if necessary)
-- [ ] [Client library][client-library-repository] updated (if necessary)
-
-<!--
-  Thank you for contributing <3
-
-  Below, some useful links you could explore:
--->
-
-[dev-checklist]: https://developers.home-assistant.io/docs/en/development_checklist.html
-[docs-repository]: https://github.com/home-assistant/developers.home-assistant
-[cli-repository]: https://github.com/home-assistant/cli
-[client-library-repository]: https://github.com/home-assistant-libs/python-supervisor-client/

.github/dependabot.yml

@@ -1,14 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: pip
-  directory: "/"
-  schedule:
-    interval: daily
-    time: "06:00"
-  open-pull-requests-limit: 10
-- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-    interval: daily
-    time: "06:00"
-  open-pull-requests-limit: 10

.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/release-drafter.yml

@@ -1,50 +1,4 @@
-change-template: "- #$NUMBER $TITLE @$AUTHOR"
-sort-direction: ascending
-
-categories:
-  - title: ":boom: Breaking Changes"
-    label: "breaking-change"
-
-  - title: ":wrench: Build"
-    label: "build"
-
-  - title: ":boar: Chore"
-    label: "chore"
-
-  - title: ":sparkles: New Features"
-    label: "new-feature"
-
-  - title: ":zap: Performance"
-    label: "performance"
-
-  - title: ":recycle: Refactor"
-    label: "refactor"
-
-  - title: ":green_heart: CI"
-    label: "ci"
-
-  - title: ":bug: Bug Fixes"
-    label: "bugfix"
-
-  - title: ":white_check_mark: Test"
-    label: "test"
-
-  - title: ":arrow_up: Dependency Updates"
-    label: "dependencies"
-    collapse-after: 1
-
-include-labels:
-  - "breaking-change"
-  - "build"
-  - "chore"
-  - "performance"
-  - "refactor"
-  - "new-feature"
-  - "bugfix"
-  - "dependencies"
-  - "test"
-  - "ci"
-
 template: |
+  ## What's Changed
 
   $CHANGES

.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

.github/workflows/builder.yml

@@ -1,380 +0,0 @@
-name: Build supervisor
-
-on:
-  workflow_dispatch:
-    inputs:
-      channel:
-        description: "Channel"
-        required: true
-        default: "dev"
-      version:
-        description: "Version"
-        required: true
-      publish:
-        description: "Publish"
-        required: true
-        default: "false"
-      stable:
-        description: "Stable"
-        required: true
-        default: "false"
-  pull_request:
-    branches: ["main"]
-  release:
-    types: ["published"]
-  push:
-    branches: ["main"]
-    paths:
-      - "rootfs/**"
-      - "supervisor/**"
-      - build.yaml
-      - Dockerfile
-      - requirements.txt
-      - setup.py
-
-env:
-  DEFAULT_PYTHON: "3.12"
-  BUILD_NAME: supervisor
-  BUILD_TYPE: supervisor
-
-concurrency:
-  group: "${{ github.workflow }}-${{ github.ref }}"
-  cancel-in-progress: true
-
-jobs:
-  init:
-    name: Initialize build
-    runs-on: ubuntu-latest
-    outputs:
-      architectures: ${{ steps.info.outputs.architectures }}
-      version: ${{ steps.version.outputs.version }}
-      channel: ${{ steps.version.outputs.channel }}
-      publish: ${{ steps.version.outputs.publish }}
-      requirements: ${{ steps.requirements.outputs.changed }}
-    steps:
-      - name: Checkout the repository
-        uses: actions/checkout@v4.2.1
-        with:
-          fetch-depth: 0
-
-      - name: Get information
-        id: info
-        uses: home-assistant/actions/helpers/info@master
-
-      - name: Get version
-        id: version
-        uses: home-assistant/actions/helpers/version@master
-        with:
-          type: ${{ env.BUILD_TYPE }}
-
-      - name: Get changed files
-        id: changed_files
-        if: steps.version.outputs.publish == 'false'
-        uses: masesgroup/retrieve-changed-files@v3.0.0
-
-      - name: Check if requirements files changed
-        id: requirements
-        run: |
-          if [[ "${{ steps.changed_files.outputs.all }}" =~ (requirements.txt|build.yaml) ]]; then
-            echo "changed=true" >> "$GITHUB_OUTPUT"
-          fi
-
-  build:
-    name: Build ${{ matrix.arch }} supervisor
-    needs: init
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      id-token: write
-      packages: write
-    strategy:
-      matrix:
-        arch: ${{ fromJson(needs.init.outputs.architectures) }}
-    steps:
-      - name: Checkout the repository
-        uses: actions/checkout@v4.2.1
-        with:
-          fetch-depth: 0
-
-      - name: Write env-file
-        if: needs.init.outputs.requirements == 'true'
-        run: |
-          (
-            # Fix out of memory issues with rust
-            echo "CARGO_NET_GIT_FETCH_WITH_CLI=true"
-          ) > .env_file
-
-      - name: Build wheels
-        if: needs.init.outputs.requirements == 'true'
-        uses: home-assistant/wheels@2024.07.1
-        with:
-          abi: cp312
-          tag: musllinux_1_2
-          arch: ${{ matrix.arch }}
-          wheels-key: ${{ secrets.WHEELS_KEY }}
-          apk: "libffi-dev;openssl-dev;yaml-dev"
-          skip-binary: aiohttp
-          env-file: true
-          requirements: "requirements.txt"
-
-      - name: Set version
-        if: needs.init.outputs.publish == 'true'
-        uses: home-assistant/actions/helpers/version@master
-        with:
-          type: ${{ env.BUILD_TYPE }}
-
-      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        if: needs.init.outputs.publish == 'true'
-        uses: actions/setup-python@v5.2.0
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-
-      - name: Install Cosign
-        if: needs.init.outputs.publish == 'true'
-        uses: sigstore/cosign-installer@v3.7.0
-        with:
-          cosign-release: "v2.4.0"
-
-      - name: Install dirhash and calc hash
-        if: needs.init.outputs.publish == 'true'
-        run: |
-          pip3 install setuptools dirhash
-          dir_hash="$(dirhash "${{ github.workspace }}/supervisor" -a sha256 --match "*.py")"
-          echo "${dir_hash}" > rootfs/supervisor.sha256
-
-      - name: Sign supervisor SHA256
-        if: needs.init.outputs.publish == 'true'
-        run: |
-          cosign sign-blob --yes rootfs/supervisor.sha256 --bundle rootfs/supervisor.sha256.sig
-
-      - name: Login to GitHub Container Registry
-        if: needs.init.outputs.publish == 'true'
-        uses: docker/login-action@v3.3.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set build arguments
-        if: needs.init.outputs.publish == 'false'
-        run: echo "BUILD_ARGS=--test" >> $GITHUB_ENV
-
-      - name: Build supervisor
-        uses: home-assistant/builder@2024.08.2
-        with:
-          args: |
-            $BUILD_ARGS \
-            --${{ matrix.arch }} \
-            --target /data \
-            --cosign \
-            --generic ${{ needs.init.outputs.version }}
-        env:
-          CAS_API_KEY: ${{ secrets.CAS_TOKEN }}
-
-  version:
-    name: Update version
-    needs: ["init", "run_supervisor"]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout the repository
-        if: needs.init.outputs.publish == 'true'
-        uses: actions/checkout@v4.2.1
-
-      - name: Initialize git
-        if: needs.init.outputs.publish == 'true'
-        uses: home-assistant/actions/helpers/git-init@master
-        with:
-          name: ${{ secrets.GIT_NAME }}
-          email: ${{ secrets.GIT_EMAIL }}
-          token: ${{ secrets.GIT_TOKEN }}
-
-      - name: Update version file
-        if: needs.init.outputs.publish == 'true'
-        uses: home-assistant/actions/helpers/version-push@master
-        with:
-          key: ${{ env.BUILD_NAME }}
-          version: ${{ needs.init.outputs.version }}
-          channel: ${{ needs.init.outputs.channel }}
-
-  run_supervisor:
-    runs-on: ubuntu-latest
-    name: Run the Supervisor
-    needs: ["build", "init"]
-    timeout-minutes: 60
-    steps:
-      - name: Checkout the repository
-        uses: actions/checkout@v4.2.1
-
-      - name: Build the Supervisor
-        if: needs.init.outputs.publish != 'true'
-        uses: home-assistant/builder@2024.08.2
-        with:
-          args: |
-            --test \
-            --amd64 \
-            --target /data \
-            --generic runner
-
-      - name: Pull Supervisor
-        if: needs.init.outputs.publish == 'true'
-        run: |
-          docker pull ghcr.io/home-assistant/amd64-hassio-supervisor:${{ needs.init.outputs.version }}
-          docker tag ghcr.io/home-assistant/amd64-hassio-supervisor:${{ needs.init.outputs.version }} ghcr.io/home-assistant/amd64-hassio-supervisor:runner
-
-      - name: Create the Supervisor
-        run: |
-          mkdir -p /tmp/supervisor/data
-          docker create --name hassio_supervisor \
-            --privileged \
-            --security-opt seccomp=unconfined \
-            --security-opt apparmor=unconfined \
-            -v /run/docker.sock:/run/docker.sock \
-            -v /run/dbus:/run/dbus \
-            -v /tmp/supervisor/data:/data \
-            -v /etc/machine-id:/etc/machine-id:ro \
-            -e SUPERVISOR_SHARE="/tmp/supervisor/data" \
-            -e SUPERVISOR_NAME=hassio_supervisor \
-            -e SUPERVISOR_DEV=1 \
-            -e SUPERVISOR_MACHINE="qemux86-64" \
-          ghcr.io/home-assistant/amd64-hassio-supervisor:runner
-
-      - name: Start the Supervisor
-        run: docker start hassio_supervisor
-
-      - name: Wait for Supervisor to come up
-        run: |
-          SUPERVISOR=$(docker inspect --format='{{.NetworkSettings.IPAddress}}' hassio_supervisor)
-          ping="error"
-          while [ "$ping" != "ok" ]; do
-            ping=$(curl -sSL "http://$SUPERVISOR/supervisor/ping" | jq -r '.result')
-            sleep 5
-          done
-
-      - name: Check the Supervisor
-        run: |
-          echo "Checking supervisor info"
-          test=$(docker exec hassio_cli ha supervisor info --no-progress --raw-json | jq -r '.result')
-          if [ "$test" != "ok" ]; then
-            exit 1
-          fi
-
-          echo "Checking supervisor network info"
-          test=$(docker exec hassio_cli ha network info --no-progress --raw-json | jq -r '.result')
-          if [ "$test" != "ok" ]; then
-            exit 1
-          fi
-
-      - name: Check the Store / Addon
-        run: |
-          echo "Install Core SSH Add-on"
-          test=$(docker exec hassio_cli ha addons install core_ssh --no-progress --raw-json | jq -r '.result')
-          if [ "$test" != "ok" ]; then
-            exit 1
-          fi
-
-          # Make sure it actually installed
-          test=$(docker exec hassio_cli ha addons info core_ssh --no-progress --raw-json | jq -r '.data.version')
-          if [[ "$test" == "null" ]]; then
-            exit 1
-          fi
-
-          echo "Start Core SSH Add-on"
-          test=$(docker exec hassio_cli ha addons start core_ssh --no-progress --raw-json | jq -r '.result')
-          if [ "$test" != "ok" ]; then
-            exit 1
-          fi
-
-          # Make sure its state is started
-          test="$(docker exec hassio_cli ha addons info core_ssh --no-progress --raw-json | jq -r '.data.state')"
-          if [ "$test" != "started" ]; then
-            exit 1
-          fi
-
-      - name: Check the Supervisor code sign
-        if: needs.init.outputs.publish == 'true'
-        run: |
-          echo "Enable Content-Trust"
-          test=$(docker exec hassio_cli ha security options --content-trust=true --no-progress --raw-json | jq -r '.result')
-          if [ "$test" != "ok" ]; then
-            exit 1
-          fi
-
-          echo "Run supervisor health check"
-          test=$(docker exec hassio_cli ha resolution healthcheck --no-progress --raw-json | jq -r '.result')
-          if [ "$test" != "ok" ]; then
-            exit 1
-          fi
-
-          echo "Check supervisor unhealthy"
-          test=$(docker exec hassio_cli ha resolution info --no-progress --raw-json | jq -r '.data.unhealthy[]')
-          if [ "$test" != "" ]; then
-            exit 1
-          fi
-
-          echo "Check supervisor supported"
-          test=$(docker exec hassio_cli ha resolution info --no-progress --raw-json | jq -r '.data.unsupported[]')
-          if [[ "$test" =~ source_mods ]]; then
-            exit 1
-          fi
-
-      - name: Create full backup
-        id: backup
-        run: |
-          test=$(docker exec hassio_cli ha backups new --no-progress --raw-json)
-          if [ "$(echo $test | jq -r '.result')" != "ok" ]; then
-            exit 1
-          fi
-          echo "slug=$(echo $test | jq -r '.data.slug')" >> "$GITHUB_OUTPUT"
-
-      - name: Uninstall SSH add-on
-        run: |
-          test=$(docker exec hassio_cli ha addons uninstall core_ssh --no-progress --raw-json | jq -r '.result')
-          if [ "$test" != "ok" ]; then
-            exit 1
-          fi
-
-      - name: Restart supervisor
-        run: |
-          test=$(docker exec hassio_cli ha supervisor restart --no-progress --raw-json | jq -r '.result')
-          if [ "$test" != "ok" ]; then
-            exit 1
-          fi
-
-      - name: Wait for Supervisor to come up
-        run: |
-          SUPERVISOR=$(docker inspect --format='{{.NetworkSettings.IPAddress}}' hassio_supervisor)
-          ping="error"
-          while [ "$ping" != "ok" ]; do
-            ping=$(curl -sSL "http://$SUPERVISOR/supervisor/ping" | jq -r '.result')
-            sleep 5
-          done
-
-      - name: Restore SSH add-on from backup
-        run: |
-          test=$(docker exec hassio_cli ha backups restore ${{ steps.backup.outputs.slug }} --addons core_ssh --no-progress --raw-json | jq -r '.result')
-          if [ "$test" != "ok" ]; then
-            exit 1
-          fi
-
-          # Make sure it actually installed
-          test=$(docker exec hassio_cli ha addons info core_ssh --no-progress --raw-json | jq -r '.data.version')
-          if [[ "$test" == "null" ]]; then
-            exit 1
-          fi
-
-          # Make sure its state is started
-          test="$(docker exec hassio_cli ha addons info core_ssh --no-progress --raw-json | jq -r '.data.state')"
-          if [ "$test" != "started" ]; then
-            exit 1
-          fi
-
-      - name: Restore SSL directory from backup
-        run: |
-          test=$(docker exec hassio_cli ha backups restore ${{ steps.backup.outputs.slug }} --folders ssl --no-progress --raw-json | jq -r '.result')
-          if [ "$test" != "ok" ]; then
-            exit 1
-          fi
-
-      - name: Get supervisor logs on failiure
-        if: ${{ cancelled() || failure() }}
-        run: docker logs hassio_supervisor

.github/workflows/check_pr_labels.yml

@@ -1,19 +0,0 @@
-name: Check PR
-
-on:
-  pull_request:
-    branches: ["main"]
-    types: [labeled, unlabeled, synchronize]
-
-jobs:
-  init:
-    name: Check labels
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check labels
-        run: |
-          labels=$(jq -r '.pull_request.labels[] | .name' ${{github.event_path }})
-          echo "$labels"
-          if [ "$labels" == "cla-signed" ]; then
-            exit 1
-          fi

.github/workflows/ci.yaml

@@ -1,377 +0,0 @@
-name: CI
-
-# yamllint disable-line rule:truthy
-on:
-  push:
-    branches:
-      - main
-  pull_request: ~
-
-env:
-  DEFAULT_PYTHON: "3.12"
-  PRE_COMMIT_CACHE: ~/.cache/pre-commit
-
-concurrency:
-  group: "${{ github.workflow }}-${{ github.ref }}"
-  cancel-in-progress: true
-
-jobs:
-  # Separate job to pre-populate the base dependency cache
-  # This prevent upcoming jobs to do the same individually
-  prepare:
-    runs-on: ubuntu-latest
-    outputs:
-      python-version: ${{ steps.python.outputs.python-version }}
-    name: Prepare Python dependencies
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.1
-      - name: Set up Python
-        id: python
-        uses: actions/setup-python@v5.2.0
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-      - name: Restore Python virtual environment
-        id: cache-venv
-        uses: actions/cache@v4.1.1
-        with:
-          path: venv
-          key: |
-            ${{ runner.os }}-venv-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
-      - name: Create Python virtual environment
-        if: steps.cache-venv.outputs.cache-hit != 'true'
-        run: |
-          python -m venv venv
-          . venv/bin/activate
-          pip install -U pip setuptools
-          pip install -r requirements.txt -r requirements_tests.txt
-      - name: Restore pre-commit environment from cache
-        id: cache-precommit
-        uses: actions/cache@v4.1.1
-        with:
-          path: ${{ env.PRE_COMMIT_CACHE }}
-          lookup-only: true
-          key: |
-            ${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pre-commit-
-      - name: Install pre-commit dependencies
-        if: steps.cache-precommit.outputs.cache-hit != 'true'
-        run: |
-          . venv/bin/activate
-          pre-commit install-hooks
-
-  lint-ruff-format:
-    name: Check ruff-format
-    runs-on: ubuntu-latest
-    needs: prepare
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.1
-      - name: Set up Python ${{ needs.prepare.outputs.python-version }}
-        uses: actions/setup-python@v5.2.0
-        id: python
-        with:
-          python-version: ${{ needs.prepare.outputs.python-version }}
-      - name: Restore Python virtual environment
-        id: cache-venv
-        uses: actions/cache@v4.1.1
-        with:
-          path: venv
-          key: |
-            ${{ runner.os }}-venv-${{ needs.prepare.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
-      - name: Fail job if Python cache restore failed
-        if: steps.cache-venv.outputs.cache-hit != 'true'
-        run: |
-          echo "Failed to restore Python virtual environment from cache"
-          exit 1
-      - name: Restore pre-commit environment from cache
-        id: cache-precommit
-        uses: actions/cache@v4.1.1
-        with:
-          path: ${{ env.PRE_COMMIT_CACHE }}
-          key: |
-            ${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
-      - name: Fail job if cache restore failed
-        if: steps.cache-venv.outputs.cache-hit != 'true'
-        run: |
-          echo "Failed to restore Python virtual environment from cache"
-          exit 1
-      - name: Run ruff-format
-        run: |
-          . venv/bin/activate
-          pre-commit run --hook-stage manual ruff-format --all-files --show-diff-on-failure
-        env:
-          RUFF_OUTPUT_FORMAT: github
-
-  lint-ruff:
-    name: Check ruff
-    runs-on: ubuntu-latest
-    needs: prepare
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.1
-      - name: Set up Python ${{ needs.prepare.outputs.python-version }}
-        uses: actions/setup-python@v5.2.0
-        id: python
-        with:
-          python-version: ${{ needs.prepare.outputs.python-version }}
-      - name: Restore Python virtual environment
-        id: cache-venv
-        uses: actions/cache@v4.1.1
-        with:
-          path: venv
-          key: |
-            ${{ runner.os }}-venv-${{ needs.prepare.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
-      - name: Fail job if Python cache restore failed
-        if: steps.cache-venv.outputs.cache-hit != 'true'
-        run: |
-          echo "Failed to restore Python virtual environment from cache"
-          exit 1
-      - name: Restore pre-commit environment from cache
-        id: cache-precommit
-        uses: actions/cache@v4.1.1
-        with:
-          path: ${{ env.PRE_COMMIT_CACHE }}
-          key: |
-            ${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
-      - name: Fail job if cache restore failed
-        if: steps.cache-venv.outputs.cache-hit != 'true'
-        run: |
-          echo "Failed to restore Python virtual environment from cache"
-          exit 1
-      - name: Run ruff
-        run: |
-          . venv/bin/activate
-          pre-commit run --hook-stage manual ruff --all-files --show-diff-on-failure
-        env:
-          RUFF_OUTPUT_FORMAT: github
-
-  lint-dockerfile:
-    name: Check Dockerfile
-    runs-on: ubuntu-latest
-    needs: prepare
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.1
-      - name: Register hadolint problem matcher
-        run: |
-          echo "::add-matcher::.github/workflows/matchers/hadolint.json"
-      - name: Check Dockerfile
-        uses: docker://hadolint/hadolint:v1.18.0
-        with:
-          args: hadolint Dockerfile
-
-  lint-executable-shebangs:
-    name: Check executables
-    runs-on: ubuntu-latest
-    needs: prepare
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.1
-      - name: Set up Python ${{ needs.prepare.outputs.python-version }}
-        uses: actions/setup-python@v5.2.0
-        id: python
-        with:
-          python-version: ${{ needs.prepare.outputs.python-version }}
-      - name: Restore Python virtual environment
-        id: cache-venv
-        uses: actions/cache@v4.1.1
-        with:
-          path: venv
-          key: |
-            ${{ runner.os }}-venv-${{ needs.prepare.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
-      - name: Fail job if Python cache restore failed
-        if: steps.cache-venv.outputs.cache-hit != 'true'
-        run: |
-          echo "Failed to restore Python virtual environment from cache"
-          exit 1
-      - name: Restore pre-commit environment from cache
-        id: cache-precommit
-        uses: actions/cache@v4.1.1
-        with:
-          path: ${{ env.PRE_COMMIT_CACHE }}
-          key: |
-            ${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
-      - name: Fail job if cache restore failed
-        if: steps.cache-venv.outputs.cache-hit != 'true'
-        run: |
-          echo "Failed to restore Python virtual environment from cache"
-          exit 1
-      - name: Register check executables problem matcher
-        run: |
-          echo "::add-matcher::.github/workflows/matchers/check-executables-have-shebangs.json"
-      - name: Run executables check
-        run: |
-          . venv/bin/activate
-          pre-commit run --hook-stage manual check-executables-have-shebangs --all-files
-
-  lint-json:
-    name: Check JSON
-    runs-on: ubuntu-latest
-    needs: prepare
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.1
-      - name: Set up Python ${{ needs.prepare.outputs.python-version }}
-        uses: actions/setup-python@v5.2.0
-        id: python
-        with:
-          python-version: ${{ needs.prepare.outputs.python-version }}
-      - name: Restore Python virtual environment
-        id: cache-venv
-        uses: actions/cache@v4.1.1
-        with:
-          path: venv
-          key: |
-            ${{ runner.os }}-venv-${{ needs.prepare.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
-      - name: Fail job if Python cache restore failed
-        if: steps.cache-venv.outputs.cache-hit != 'true'
-        run: |
-          echo "Failed to restore Python virtual environment from cache"
-          exit 1
-      - name: Restore pre-commit environment from cache
-        id: cache-precommit
-        uses: actions/cache@v4.1.1
-        with:
-          path: ${{ env.PRE_COMMIT_CACHE }}
-          key: |
-            ${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
-      - name: Fail job if cache restore failed
-        if: steps.cache-venv.outputs.cache-hit != 'true'
-        run: |
-          echo "Failed to restore Python virtual environment from cache"
-          exit 1
-      - name: Register check-json problem matcher
-        run: |
-          echo "::add-matcher::.github/workflows/matchers/check-json.json"
-      - name: Run check-json
-        run: |
-          . venv/bin/activate
-          pre-commit run --hook-stage manual check-json --all-files
-
-  lint-pylint:
-    name: Check pylint
-    runs-on: ubuntu-latest
-    needs: prepare
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.1
-      - name: Set up Python ${{ needs.prepare.outputs.python-version }}
-        uses: actions/setup-python@v5.2.0
-        id: python
-        with:
-          python-version: ${{ needs.prepare.outputs.python-version }}
-      - name: Restore Python virtual environment
-        id: cache-venv
-        uses: actions/cache@v4.1.1
-        with:
-          path: venv
-          key: |
-            ${{ runner.os }}-venv-${{ needs.prepare.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
-      - name: Fail job if Python cache restore failed
-        if: steps.cache-venv.outputs.cache-hit != 'true'
-        run: |
-          echo "Failed to restore Python virtual environment from cache"
-          exit 1
-      - name: Register pylint problem matcher
-        run: |
-          echo "::add-matcher::.github/workflows/matchers/pylint.json"
-      - name: Run pylint
-        run: |
-          . venv/bin/activate
-          pylint supervisor tests
-
-  pytest:
-    runs-on: ubuntu-latest
-    needs: prepare
-    name: Run tests Python ${{ needs.prepare.outputs.python-version }}
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.1
-      - name: Set up Python ${{ needs.prepare.outputs.python-version }}
-        uses: actions/setup-python@v5.2.0
-        id: python
-        with:
-          python-version: ${{ needs.prepare.outputs.python-version }}
-      - name: Install Cosign
-        uses: sigstore/cosign-installer@v3.7.0
-        with:
-          cosign-release: "v2.4.0"
-      - name: Restore Python virtual environment
-        id: cache-venv
-        uses: actions/cache@v4.1.1
-        with:
-          path: venv
-          key: |
-            ${{ runner.os }}-venv-${{ needs.prepare.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
-      - name: Fail job if Python cache restore failed
-        if: steps.cache-venv.outputs.cache-hit != 'true'
-        run: |
-          echo "Failed to restore Python virtual environment from cache"
-          exit 1
-      - name: Install additional system dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y --no-install-recommends libpulse0 libudev1 dbus-daemon
-      - name: Register Python problem matcher
-        run: |
-          echo "::add-matcher::.github/workflows/matchers/python.json"
-      - name: Install Pytest Annotation plugin
-        run: |
-          . venv/bin/activate
-          # Ideally this should be part of our dependencies
-          # However this plugin is fairly new and doesn't run correctly
-          # on a non-GitHub environment.
-          pip install pytest-github-actions-annotate-failures
-      - name: Run pytest
-        run: |
-          . venv/bin/activate
-          pytest \
-            -qq \
-            --timeout=10 \
-            --durations=10 \
-            --cov supervisor \
-            -o console_output_style=count \
-            tests
-      - name: Upload coverage artifact
-        uses: actions/upload-artifact@v4.4.3
-        with:
-          name: coverage-${{ matrix.python-version }}
-          path: .coverage
-          include-hidden-files: true
-
-  coverage:
-    name: Process test coverage
-    runs-on: ubuntu-latest
-    needs: ["pytest", "prepare"]
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.1
-      - name: Set up Python ${{ needs.prepare.outputs.python-version }}
-        uses: actions/setup-python@v5.2.0
-        id: python
-        with:
-          python-version: ${{ needs.prepare.outputs.python-version }}
-      - name: Restore Python virtual environment
-        id: cache-venv
-        uses: actions/cache@v4.1.1
-        with:
-          path: venv
-          key: |
-            ${{ runner.os }}-venv-${{ needs.prepare.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
-      - name: Fail job if Python cache restore failed
-        if: steps.cache-venv.outputs.cache-hit != 'true'
-        run: |
-          echo "Failed to restore Python virtual environment from cache"
-          exit 1
-      - name: Download all coverage artifacts
-        uses: actions/download-artifact@v4.1.8
-      - name: Combine coverage results
-        run: |
-          . venv/bin/activate
-          coverage combine coverage*/.coverage*
-          coverage report
-          coverage xml
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4.6.0

.github/workflows/lock.yml

@@ -1,20 +0,0 @@
-name: Lock
-
-# yamllint disable-line rule:truthy
-on:
-  schedule:
-    - cron: "0 0 * * *"
-
-jobs:
-  lock:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/lock-threads@v5.0.1
-        with:
-          github-token: ${{ github.token }}
-          issue-inactive-days: "30"
-          exclude-issue-created-before: "2020-10-01T00:00:00Z"
-          issue-lock-reason: ""
-          pr-inactive-days: "1"
-          exclude-pr-created-before: "2020-11-01T00:00:00Z"
-          pr-lock-reason: ""

.github/workflows/matchers/check-executables-have-shebangs.json

@@ -1,14 +0,0 @@
-{
-  "problemMatcher": [
-    {
-      "owner": "check-executables-have-shebangs",
-      "pattern": [
-        {
-          "regexp": "^(.+):\\s(.+)$",
-          "file": 1,
-          "message": 2
-        }
-      ]
-    }
-  ]
-}

.github/workflows/matchers/check-json.json

@@ -1,16 +0,0 @@
-{
-  "problemMatcher": [
-    {
-      "owner": "check-json",
-      "pattern": [
-        {
-          "regexp": "^(.+):\\s(.+\\sline\\s(\\d+)\\scolumn\\s(\\d+).+)$",
-          "file": 1,
-          "message": 2,
-          "line": 3,
-          "column": 4
-        }
-      ]
-    }
-  ]
-}

.github/workflows/matchers/hadolint.json

@@ -1,16 +0,0 @@
-{
-  "problemMatcher": [
-    {
-      "owner": "hadolint",
-      "pattern": [
-        {
-          "regexp": "^(.+):(\\d+)\\s+((DL\\d{4}).+)$",
-          "file": 1,
-          "line": 2,
-          "message": 3,
-          "code": 4
-        }
-      ]
-    }
-  ]
-}

.github/workflows/matchers/pylint.json

@@ -1,32 +0,0 @@
-{
-  "problemMatcher": [
-    {
-      "owner": "pylint-error",
-      "severity": "error",
-      "pattern": [
-        {
-          "regexp": "^(.+):(\\d+):(\\d+):\\s(([EF]\\d{4}):\\s.+)$",
-          "file": 1,
-          "line": 2,
-          "column": 3,
-          "message": 4,
-          "code": 5
-        }
-      ]
-    },
-    {
-      "owner": "pylint-warning",
-      "severity": "warning",
-      "pattern": [
-        {
-          "regexp": "^(.+):(\\d+):(\\d+):\\s(([CRW]\\d{4}):\\s.+)$",
-          "file": 1,
-          "line": 2,
-          "column": 3,
-          "message": 4,
-          "code": 5
-        }
-      ]
-    }
-  ]
-}

.github/workflows/matchers/python.json

@@ -1,18 +0,0 @@
-{
-  "problemMatcher": [
-    {
-      "owner": "python",
-      "pattern": [
-        {
-          "regexp": "^\\s*File\\s\\\"(.*)\\\",\\sline\\s(\\d+),\\sin\\s(.*)$",
-          "file": 1,
-          "line": 2
-        },
-        {
-          "regexp": "^\\s*raise\\s(.*)\\(\\'(.*)\\'\\)$",
-          "message": 2
-        }
-      ]
-    }
-  ]
-}

.github/workflows/release-drafter.yml

@@ -1,44 +0,0 @@
-name: Release Drafter
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  update_release_draft:
-    runs-on: ubuntu-latest
-    name: Release Drafter
-    steps:
-      - name: Checkout the repository
-        uses: actions/checkout@v4.2.1
-        with:
-          fetch-depth: 0
-
-      - name: Find Next Version
-        id: version
-        run: |
-          declare -i newpost
-          latest=$(git describe --tags $(git rev-list --tags --max-count=1))
-          latestpre=$(echo "$latest" | awk '{split($0,a,"."); print a[1] "." a[2]}')
-          datepre=$(date --utc '+%Y.%m')
-
-
-          if [[ "$latestpre" == "$datepre" ]]; then
-              latestpost=$(echo "$latest" | awk '{split($0,a,"."); print a[3]}')
-              newpost=$latestpost+1
-          else
-              newpost=0
-          fi
-
-          echo Current version:    $latest
-          echo New target version: $datepre.$newpost
-          echo "version=$datepre.$newpost" >> "$GITHUB_OUTPUT"
-
-      - name: Run Release Drafter
-        uses: release-drafter/release-drafter@v6.0.0
-        with:
-          tag: ${{ steps.version.outputs.version }}
-          name: ${{ steps.version.outputs.version }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sentry.yaml

@@ -1,21 +0,0 @@
-name: Sentry Release
-
-# yamllint disable-line rule:truthy
-on:
-  release:
-    types: [published, prereleased]
-
-jobs:
-  createSentryRelease:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.1
-      - name: Sentry Release
-        uses: getsentry/action-release@v1.7.0
-        env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
-          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
-        with:
-          environment: production

.github/workflows/stale.yml

@@ -1,39 +0,0 @@
-name: Stale
-
-# yamllint disable-line rule:truthy
-on:
-  schedule:
-    - cron: "0 * * * *"
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v9.0.0
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          days-before-stale: 30
-          days-before-close: 7
-          stale-issue-label: "stale"
-          exempt-issue-labels: "no-stale,Help%20wanted,help-wanted,pinned,rfc,security"
-          stale-issue-message: >
-            There hasn't been any activity on this issue recently. Due to the
-            high number of incoming GitHub notifications, we have to clean some
-            of the old issues, as many of them have already been resolved with
-            the latest updates.
-
-            Please make sure to update to the latest version and check if that
-            solves the issue. Let us know if that works for you by
-            adding a comment 👍
-
-            This issue has now been marked as stale and will be closed if no
-            further activity occurs. Thank you for your contributions.
-
-          stale-pr-label: "stale"
-          exempt-pr-labels: "no-stale,pinned,rfc,security"
-          stale-pr-message: >
-            There hasn't been any activity on this pull request recently. This
-            pull request has been automatically marked as stale because of that
-            and will be closed if no further activity occurs within 7 days.
-
-            Thank you for your contributions.

.gitignore

@@ -95,8 +95,3 @@ ENV/
 .vscode/*
 !.vscode/cSpell.json
 !.vscode/tasks.json
-!.vscode/launch.json
-
-# mypy
-/.mypy_cache/*
-/.dmypy.json

.hadolint.yaml

@@ -1,7 +1,5 @@
 ignored:
-  - DL3003
+  - DL3018
   - DL3006
   - DL3013
-  - DL3018
-  - DL3042
   - SC2155

.pre-commit-config.yaml

@@ -1,15 +0,0 @@
-repos:
-  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.7
-    hooks:
-      - id: ruff
-        args:
-          - --fix
-      - id: ruff-format
-        files: ^((supervisor|tests)/.+)?[^/]+\.py$
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
-    hooks:
-      - id: check-executables-have-shebangs
-        stages: [manual]
-      - id: check-json

.vcnignore

@@ -1,21 +0,0 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# Distribution / packaging
-*.egg-info/
-
-# General files
-.git
-.github
-.devcontainer
-.vscode
-.tox
-
-# Data
-home-assistant-polymer/
-script/
-tests/
-data/
-venv/

.vscode/launch.json

@@ -1,25 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "Supervisor remote debug",
-      "type": "python",
-      "request": "attach",
-      "port": 33333,
-      "host": "172.30.32.2",
-      "pathMappings": [
-        {
-          "localRoot": "${workspaceFolder}",
-          "remoteRoot": "/usr/src/supervisor"
-        }
-      ]
-    },
-    {
-      "name": "Debug Tests",
-      "type": "python",
-      "request": "test",
-      "console": "internalConsole",
-      "justMyCode": false
-    }
-  ]
-}

.vscode/tasks.json

@@ -1,111 +1,92 @@
 {
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "Run Supervisor",
-      "type": "shell",
-      "command": "supervisor_run",
-      "group": {
-        "kind": "test",
-        "isDefault": true
-      },
-      "presentation": {
-        "reveal": "always",
-        "panel": "new"
-      },
-      "problemMatcher": []
-    },
-    {
-      "label": "Run Supervisor CLI",
-      "type": "shell",
-      "command": "docker exec -ti hassio_cli /usr/bin/cli.sh",
-      "group": {
-        "kind": "test",
-        "isDefault": true
-      },
-      "presentation": {
-        "reveal": "always",
-        "panel": "new"
-      },
-      "problemMatcher": []
-    },
-    {
-      "label": "Update Supervisor Panel",
-      "type": "shell",
-      "command": "LOKALISE_TOKEN='${input:localiseToken}' ./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": "Ruff Check",
-      "type": "shell",
-      "command": "ruff check --fix supervisor tests",
-      "group": {
-        "kind": "test",
-        "isDefault": true
-      },
-      "presentation": {
-        "reveal": "always",
-        "panel": "new"
-      },
-      "problemMatcher": []
-    },
-    {
-      "label": "Ruff Format",
-      "type": "shell",
-      "command": "ruff format supervisor tests",
-      "group": {
-        "kind": "test",
-        "isDefault": true
-      },
-      "presentation": {
-        "reveal": "always",
-        "panel": "new"
-      },
-      "problemMatcher": []
-    },
-    {
-      "label": "Pylint",
-      "type": "shell",
-      "command": "pylint supervisor",
-      "dependsOn": ["Install all Requirements"],
-      "group": {
-        "kind": "test",
-        "isDefault": true
-      },
-      "presentation": {
-        "reveal": "always",
-        "panel": "new"
-      },
-      "problemMatcher": []
-    }
-  ],
-  "inputs": [
-    {
-      "id": "localiseToken",
-      "type": "promptString",
-      "description": "Paste your lokalise token to download frontend translations"
-    }
-  ]
-}
+    "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

@@ -0,0 +1,876 @@
+# Supervisor
+
+## Supervisor RESTful API
+
+Interface for Home Assistant to control things from supervisor.
+
+On error / Code 400:
+
+```json
+{
+  "result": "error",
+  "message": ""
+}
+```
+
+On success / Code 200:
+
+```json
+{
+  "result": "ok",
+  "data": {}
+}
+```
+
+For access to API you need use a authorization header with a `Bearer` token.
+They are available for Add-ons and the Home Assistant using the `SUPERVISOR_TOKEN` environment variable.
+
+### Supervisor
+
+- GET `/supervisor/ping`
+
+This API call don't need a token.
+
+- GET `/supervisor/info`
+
+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",
+  "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": "LATEST_VERSION",
+      "installed": "INSTALL_VERSION",
+      "icon": "bool",
+      "logo": "bool",
+      "state": "started|stopped"
+    }
+  ],
+  "addons_repositories": ["REPO_URL"]
+}
+```
+
+- POST `/supervisor/update`
+
+Optional:
+
+```json
+{
+  "version": "VERSION"
+}
+```
+
+- POST `/supervisor/options`
+
+```json
+{
+  "channel": "stable|beta|dev",
+  "timezone": "TIMEZONE",
+  "wait_boot": "int",
+  "debug": "bool",
+  "debug_block": "bool",
+  "logging": "debug|info|warning|error|critical",
+  "addons_repositories": ["REPO_URL"]
+}
+```
+
+- POST `/supervisor/reload`
+
+Reload addons/version.
+
+- GET `/supervisor/logs`
+
+Output is the raw docker log.
+
+- GET `/supervisor/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
+}
+```
+
+- 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"
+    }
+  ]
+}
+```
+
+- POST `/snapshots/reload`
+
+- POST `/snapshots/new/upload`
+
+return:
+
+```json
+{
+  "slug": ""
+}
+```
+
+- POST `/snapshots/new/full`
+
+```json
+{
+  "name": "Optional",
+  "password": "Optional"
+}
+```
+
+return:
+
+```json
+{
+  "slug": ""
+}
+```
+
+- POST `/snapshots/new/partial`
+
+```json
+{
+  "name": "Optional",
+  "addons": ["ADDON_SLUG"],
+  "folders": ["FOLDER_NAME"],
+  "password": "Optional"
+}
+```
+
+return:
+
+```json
+{
+  "slug": ""
+}
+```
+
+- POST `/snapshots/reload`
+
+- GET `/snapshots/{slug}/info`
+
+```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"]
+}
+```
+
+- POST `/snapshots/{slug}/remove`
+
+- GET `/snapshots/{slug}/download`
+
+- POST `/snapshots/{slug}/restore/full`
+
+```json
+{
+  "password": "Optional"
+}
+```
+
+- POST `/snapshots/{slug}/restore/partial`
+
+```json
+{
+  "homeassistant": "bool",
+  "addons": ["ADDON_SLUG"],
+  "folders": ["FOLDER_NAME"],
+  "password": "Optional"
+}
+```
+
+### Host
+
+- POST `/host/reload`
+
+- POST `/host/shutdown`
+
+- POST `/host/reboot`
+
+- GET `/host/info`
+
+```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"
+}
+```
+
+- POST `/host/options`
+
+```json
+{
+  "hostname": ""
+}
+```
+
+- POST `/host/reload`
+
+#### Services
+
+- GET `/host/services`
+
+```json
+{
+  "services": [
+    {
+      "name": "xy.service",
+      "description": "XY ...",
+      "state": "active|"
+    }
+  ]
+}
+```
+
+- POST `/host/service/{unit}/stop`
+
+- POST `/host/service/{unit}/start`
+
+- POST `/host/service/{unit}/reload`
+
+### HassOS
+
+- GET `/os/info`
+
+```json
+{
+  "version": "2.3",
+  "version_cli": "7",
+  "version_latest": "2.4",
+  "version_cli_latest": "8",
+  "board": "ova|rpi",
+  "boot": "rauc boot slot"
+}
+```
+
+- POST `/os/update`
+
+```json
+{
+  "version": "optional"
+}
+```
+
+- POST `/os/update/cli`
+
+```json
+{
+  "version": "optional"
+}
+```
+
+- POST `/os/config/sync`
+
+Load host configs from a USB stick.
+
+### Hardware
+
+- GET `/hardware/info`
+
+```json
+{
+    "serial": ["/dev/xy"],
+    "input": ["Input device name"],
+    "disk": ["/dev/sdax"],
+    "gpio": ["gpiochip0", "gpiochip100"],
+    "audio": {
+        "CARD_ID": {
+            "name": "xy",
+            "type": "microphone",
+            "devices": [
+                "chan_id": "channel ID",
+                "chan_type": "type of device"
+            ]
+        }
+    }
+}
+```
+
+- GET `/hardware/audio`
+
+```json
+{
+  "audio": {
+    "input": {
+      "0,0": "Mic"
+    },
+    "output": {
+      "1,0": "Jack",
+      "1,1": "HDMI"
+    }
+  }
+}
+```
+
+- POST `/hardware/trigger`
+
+Trigger an udev reload
+
+### Home Assistant
+
+- GET `/core/info`
+
+```json
+{
+  "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
+}
+```
+
+- POST `/core/update`
+
+Optional:
+
+```json
+{
+  "version": "VERSION"
+}
+```
+
+- GET `/core/logs`
+
+Output is the raw Docker log.
+
+- POST `/core/restart`
+- POST `/core/check`
+- POST `/core/start`
+- POST `/core/stop`
+- POST `/core/rebuild`
+
+- POST `/core/options`
+
+```json
+{
+  "image": "Optional|null",
+  "last_version": "Optional for custom image|null",
+  "port": "port for access core",
+  "ssl": "bool",
+  "refresh_token": "",
+  "watchdog": "bool",
+  "wait_boot": 600
+}
+```
+
+Image with `null` and last_version with `null` reset this options.
+
+- POST/GET `/core/api`
+
+Proxy to the Home Assistant Core instance.
+
+- GET `/core/websocket`
+
+Proxy to Home Assistant Core websocket.
+
+- GET `/core/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
+}
+```
+
+### RESTful for API add-ons
+
+If an add-on will call itself, you can use `/addons/self/...`.
+
+- GET `/addons`
+
+Get all available add-ons.
+
+```json
+{
+  "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"
+    }
+  ]
+}
+```
+
+- POST `/addons/reload`
+- GET `/addons/{addon}/info`
+
+```json
+{
+  "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 Core 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",
+  "video": "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"
+}
+```
+
+- GET `/addons/{addon}/icon`
+
+- GET `/addons/{addon}/logo`
+
+- 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",
+  "ingress_panel": "bool"
+}
+```
+
+Reset custom network/audio/options, set it `null`.
+
+- POST `/addons/{addon}/security`
+
+This function is not callable by itself.
+
+```json
+{
+  "protected": "bool"
+}
+```
+
+- POST `/addons/{addon}/start`
+
+- POST `/addons/{addon}/stop`
+
+- POST `/addons/{addon}/install`
+
+- POST `/addons/{addon}/uninstall`
+
+- POST `/addons/{addon}/update`
+
+- GET `/addons/{addon}/logs`
+
+Output is the raw Docker log.
+
+- POST `/addons/{addon}/restart`
+
+- POST `/addons/{addon}/rebuild`
+
+Only supported for local build addons
+
+- POST `/addons/{addon}/stdin`
+
+Write data to add-on stdin
+
+- GET `/addons/{addon}/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
+}
+```
+
+### 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": {}
+    }
+  ]
+}
+```
+
+- GET `/discovery/{UUID}`
+
+```json
+{
+  "addon": "slug",
+  "service": "name",
+  "uuid": "uuid",
+  "config": {}
+}
+```
+
+- POST `/discovery`
+
+```json
+{
+  "service": "name",
+  "config": {}
+}
+```
+
+return:
+
+```json
+{
+  "uuid": "uuid"
+}
+```
+
+- DEL `/discovery/{UUID}`
+
+### Services
+
+- GET `/services`
+
+```json
+{
+  "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"
+}
+```
+
+- POST `/services/mqtt`
+
+```json
+{
+  "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",
+  "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
+}
+```
+
+### Auth / SSO API
+
+You can use the user system on homeassistant. We handle this auth system on
+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

@@ -1,51 +1,37 @@
 ARG BUILD_FROM
-FROM ${BUILD_FROM}
-
-ENV \
-    S6_SERVICES_GRACETIME=10000 \
-    SUPERVISOR_API=http://localhost \
-    CRYPTOGRAPHY_OPENSSL_NO_LEGACY=1 \
-    UV_SYSTEM_PYTHON=true
-
-ARG \
-    COSIGN_VERSION \
-    BUILD_ARCH
+FROM $BUILD_FROM
 
 # Install base
+RUN apk add --no-cache \
+    openssl \
+    libffi \
+    musl \
+    git \
+    socat \
+    glib \
+    eudev \
+    eudev-libs
+
+ARG BUILD_ARCH
 WORKDIR /usr/src
-RUN \
-    set -x \
-    && apk add --no-cache \
-        findutils \
-        eudev \
-        eudev-libs \
-        git \
-        libffi \
-        libpulse \
-        musl \
-        openssl \
-        yaml \
-    \
-    && curl -Lso /usr/bin/cosign "https://github.com/home-assistant/cosign/releases/download/${COSIGN_VERSION}/cosign_${BUILD_ARCH}" \
-    && chmod a+x /usr/bin/cosign \
-    && pip3 install uv==0.2.21
 
 # Install requirements
 COPY requirements.txt .
-RUN \
-    if [ "${BUILD_ARCH}" = "i386" ]; then \
-        linux32 uv pip install --no-build -r requirements.txt; \
-    else \
-        uv pip install --no-build -r requirements.txt; \
-    fi \
+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 Home Assistant Supervisor
-COPY . supervisor
-RUN \
-    pip3 install -e ./supervisor \
-    && python3 -m compileall ./supervisor/supervisor
+# Install 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 /
-COPY rootfs /
+CMD [ "python3", "-m", "hassio" ]

LICENSE

@@ -178,7 +178,7 @@
    APPENDIX: How to apply the Apache License to your work.
 
       To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
+      boilerplate notice, with the fields enclosed by brackets "{}"
       replaced with your own identifying information. (Don't include
       the brackets!)  The text should be enclosed in the appropriate
       comment syntax for the file format. We also recommend that a
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2017 Pascal Vizeli
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

MANIFEST.in

@@ -1,3 +1,3 @@
 include LICENSE.md
-graft supervisor
+graft hassio
 recursive-exclude * *.py[co]

README.md

@@ -1,34 +1,30 @@
-# Home Assistant Supervisor
+[![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
 
-Home Assistant (former Hass.io) is a container-based system for managing your
-Home Assistant Core installation and related applications. The system is
-controlled via Home Assistant which communicates with the Supervisor. The
-Supervisor provides an API to manage the installation. This includes changing
-network settings or installing and updating software.
+Hass.io is a Docker-based system for managing your Home Assistant installation
+and related applications. The system is controlled via Home Assistant which
+communicates with the Supervisor. The Supervisor provides an API to manage the
+installation. This includes changing network settings or installing
+and updating software.
+
+![](misc/hassio.png?raw=true)
 
 ## Installation
 
-Installation instructions can be found at https://home-assistant.io/getting-started.
+Installation instructions can be found at <https://home-assistant.io/hassio>.
 
 ## Development
 
-For small changes and bugfixes you can just follow this, but for significant changes open a RFC first.
-Development instructions can be found [here][development].
+The development of the supervisor is a bit tricky. Not difficult but tricky.
 
-## Release
+- 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 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
 
-Releases are done in 3 stages (channels) with this structure:
-
-1. Pull requests are merged to the `main` branch.
-2. A new build is pushed to the `dev` stage.
-3. Releases are published.
-4. A new build is pushed to the `beta` stage.
-5. The [`stable.json`][stable] file is updated.
-6. The build that was pushed to `beta` will now be pushed to `stable`.
-
-[development]: https://developers.home-assistant.io/docs/supervisor/development
-[stable]: https://github.com/home-assistant/version/blob/master/stable.json
-
-[![Home Assistant - A project from the Open Home Foundation](https://www.openhomefoundation.org/badges/home-assistant.png)](https://www.openhomefoundation.org/)
+Small Bugfix or improvements, make a PR. Significant change makes first an RFC.

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,53 @@
+# https://dev.azure.com/home-assistant
+
+trigger:
+  batch: true
+  branches:
+    include:
+      - dev
+  tags:
+    include:
+      - "*"
+pr: none
+variables:
+  - name: versionBuilder
+    value: "7.0"
+  - 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) \
+            --generic $(Build.SourceBranchName) --all -t /data
+        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"

build.json

@@ -0,0 +1,13 @@
+{
+  "image": "homeassistant/{arch}-hassio-supervisor",
+  "build_from": {
+    "aarch64": "homeassistant/aarch64-base-python:3.7-alpine3.11",
+    "armhf": "homeassistant/armhf-base-python:3.7-alpine3.11",
+    "armv7": "homeassistant/armv7-base-python:3.7-alpine3.11",
+    "amd64": "homeassistant/amd64-base-python:3.7-alpine3.11",
+    "i386": "homeassistant/i386-base-python:3.7-alpine3.11"
+  },
+  "labels": {
+    "io.hass.type": "supervisor"
+  }
+}

build.yaml

@@ -1,24 +0,0 @@
-image: ghcr.io/home-assistant/{arch}-hassio-supervisor
-build_from:
-  aarch64: ghcr.io/home-assistant/aarch64-base-python:3.12-alpine3.20
-  armhf: ghcr.io/home-assistant/armhf-base-python:3.12-alpine3.20
-  armv7: ghcr.io/home-assistant/armv7-base-python:3.12-alpine3.20
-  amd64: ghcr.io/home-assistant/amd64-base-python:3.12-alpine3.20
-  i386: ghcr.io/home-assistant/i386-base-python:3.12-alpine3.20
-codenotary:
-  signer: notary@home-assistant.io
-  base_image: notary@home-assistant.io
-cosign:
-  base_identity: https://github.com/home-assistant/docker-base/.*
-  identity: https://github.com/home-assistant/supervisor/.*
-args:
-  COSIGN_VERSION: 2.4.0
-labels:
-  io.hass.type: supervisor
-  org.opencontainers.image.title: Home Assistant Supervisor
-  org.opencontainers.image.description: Container-based system for managing Home Assistant Core installation
-  org.opencontainers.image.source: https://github.com/home-assistant/supervisor
-  org.opencontainers.image.authors: The Home Assistant Authors
-  org.opencontainers.image.url: https://www.home-assistant.io/
-  org.opencontainers.image.documentation: https://www.home-assistant.io/docs/
-  org.opencontainers.image.licenses: Apache License 2.0

codecov.yaml

@@ -1,11 +0,0 @@
-codecov:
-  branch: dev
-coverage:
-  status:
-    project:
-      default:
-        target: 40
-        threshold: 0.09
-comment: false
-github_checks:
-    annotations: false

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

@@ -0,0 +1 @@
+"""Init file for Hass.io."""

hassio/__main__.py

@@ -0,0 +1,63 @@
+"""Main file for Hass.io."""
+import asyncio
+from concurrent.futures import ThreadPoolExecutor
+import logging
+import sys
+
+from hassio import bootstrap
+
+_LOGGER: logging.Logger = logging.getLogger(__name__)
+
+
+def initialize_event_loop():
+    """Attempt to use uvloop."""
+    try:
+        # pylint: disable=import-outside-toplevel
+        import uvloop
+
+        uvloop.install()
+    except ImportError:
+        pass
+
+    return asyncio.get_event_loop()
+
+
+# pylint: disable=invalid-name
+if __name__ == "__main__":
+    bootstrap.initialize_logging()
+
+    # Init async event loop
+    loop = initialize_event_loop()
+
+    # Check if all information are available to setup Hass.io
+    if not bootstrap.check_environment():
+        sys.exit(1)
+
+    # init executor pool
+    executor = ThreadPoolExecutor(thread_name_prefix="SyncWorker")
+    loop.set_default_executor(executor)
+
+    _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")
+    loop.run_until_complete(coresys.core.setup())
+
+    loop.call_soon_threadsafe(loop.create_task, coresys.core.start())
+    loop.call_soon_threadsafe(bootstrap.reg_signal, loop)
+
+    try:
+        _LOGGER.info("Run Hass.io")
+        loop.run_forever()
+    finally:
+        _LOGGER.info("Stopping Hass.io")
+        loop.run_until_complete(coresys.core.stop())
+        executor.shutdown(wait=False)
+        loop.close()
+
+    _LOGGER.info("Close Hass.io")
+    sys.exit(0)

hassio/addons/__init__.py

@@ -0,0 +1,334 @@
+"""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 .data import AddonsData
+
+_LOGGER: logging.Logger = logging.getLogger(__name__)
+
+AnyAddon = Union[Addon, AddonStore]
+
+
+class AddonManager(CoreSysAttributes):
+    """Manage add-ons inside Hass.io."""
+
+    def __init__(self, coresys: CoreSys):
+        """Initialize Docker base wrapper."""
+        self.coresys: CoreSys = coresys
+        self.data: AddonsData = AddonsData(coresys)
+        self.local: Dict[str, Addon] = {}
+        self.store: Dict[str, AddonStore] = {}
+
+    @property
+    def all(self) -> List[AnyAddon]:
+        """Return a list of all add-ons."""
+        addons = {**self.store, **self.local}
+        return list(addons.values())
+
+    @property
+    def installed(self) -> List[Addon]:
+        """Return a list of all installed add-ons."""
+        return list(self.local.values())
+
+    def get(self, addon_slug: str) -> Optional[AnyAddon]:
+        """Return an add-on from 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: str) -> Optional[Addon]:
+        """Return an add-on from Hass.io token."""
+        for addon in self.installed:
+            if token == addon.hassio_token:
+                return addon
+        return None
+
+    async def load(self) -> None:
+        """Start up add-on management."""
+        tasks = []
+        for slug in self.data.system:
+            addon = self.local[slug] = Addon(self.coresys, slug)
+            tasks.append(addon.load())
+
+        # Run initial tasks
+        _LOGGER.info("Found %d installed add-ons", len(tasks))
+        if tasks:
+            await asyncio.wait(tasks)
+
+        # Sync DNS
+        await self.sync_dns()
+
+    async def boot(self, stage: str) -> None:
+        """Boot add-ons with mode auto."""
+        tasks = []
+        for addon in self.installed:
+            if addon.boot != BOOT_AUTO or addon.startup != stage:
+                continue
+            tasks.append(addon.start())
+
+        _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: str) -> None:
+        """Shutdown addons."""
+        tasks = []
+        for addon in self.installed:
+            if await addon.state() != STATE_STARTED or addon.startup != stage:
+                continue
+            tasks.append(addon.stop())
+
+        _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 not in self.local:
+            _LOGGER.info("Detect new Add-on after restore %s", slug)
+            self.local[slug] = addon
+
+        # Update ingress
+        if addon.with_ingress:
+            with suppress(HomeAssistantAPIError):
+                await self.sys_ingress.update_hass_panel(addon)
+
+    async def repair(self) -> None:
+        """Repair local add-ons."""
+        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/addon.py

@@ -0,0 +1,668 @@
+"""Init file for Hass.io add-ons."""
+from contextlib import suppress
+from copy import deepcopy
+from ipaddress import IPv4Address
+import logging
+from pathlib import Path, PurePath
+import re
+import secrets
+import shutil
+import tarfile
+from tempfile import TemporaryDirectory
+from typing import Any, Awaitable, Dict, List, Optional
+
+import voluptuous as vol
+from voluptuous.humanize import humanize_error
+
+from ..const import (
+    ATTR_ACCESS_TOKEN,
+    ATTR_AUDIO_INPUT,
+    ATTR_AUDIO_OUTPUT,
+    ATTR_AUTO_UPDATE,
+    ATTR_BOOT,
+    ATTR_IMAGE,
+    ATTR_INGRESS_ENTRY,
+    ATTR_INGRESS_PANEL,
+    ATTR_INGRESS_PORT,
+    ATTR_INGRESS_TOKEN,
+    ATTR_NETWORK,
+    ATTR_OPTIONS,
+    ATTR_PORTS,
+    ATTR_PROTECTED,
+    ATTR_SCHEMA,
+    ATTR_STATE,
+    ATTR_SYSTEM,
+    ATTR_USER,
+    ATTR_UUID,
+    ATTR_VERSION,
+    DNS_SUFFIX,
+    STATE_STARTED,
+    STATE_STOPPED,
+)
+from ..coresys import CoreSys
+from ..docker.addon import DockerAddon
+from ..docker.stats import DockerStats
+from ..exceptions import (
+    AddonsError,
+    AddonsNotSupportedError,
+    DockerAPIError,
+    HostAppArmorError,
+    JsonFileError,
+)
+from ..utils.apparmor import adjust_profile
+from ..utils.json import read_json_file, write_json_file
+from ..utils.tar import exclude_filter, secure_path
+from .model import AddonModel, Data
+from .utils import remove_data
+from .validate import SCHEMA_ADDON_SNAPSHOT, validate_options
+
+_LOGGER: logging.Logger = logging.getLogger(__name__)
+
+RE_WEBUI = re.compile(
+    r"^(?:(?P<s_prefix>https?)|\[PROTO:(?P<t_proto>\w+)\])"
+    r":\/\/\[HOST\]:\[PORT:(?P<t_port>\d+)\](?P<s_suffix>.*)$"
+)
+
+
+class Addon(AddonModel):
+    """Hold data for add-on inside Hass.io."""
+
+    def __init__(self, coresys: CoreSys, slug: str):
+        """Initialize data holder."""
+        self.coresys: CoreSys = coresys
+        self.instance: DockerAddon = DockerAddon(coresys, self)
+        self.slug: str = slug
+
+    async def load(self) -> None:
+        """Async initialize of object."""
+        with suppress(DockerAPIError):
+            await self.instance.attach(tag=self.version)
+
+    @property
+    def ip_address(self) -> IPv4Address:
+        """Return IP of Add-on instance."""
+        return self.instance.ip_address
+
+    @property
+    def data(self) -> Data:
+        """Return add-on data/config."""
+        return self.sys_addons.data.system[self.slug]
+
+    @property
+    def data_store(self) -> Data:
+        """Return add-on data from store."""
+        return self.sys_store.data.addons.get(self.slug, self.data)
+
+    @property
+    def persist(self) -> Data:
+        """Return add-on data/config."""
+        return self.sys_addons.data.user[self.slug]
+
+    @property
+    def is_installed(self) -> bool:
+        """Return True if an add-on is installed."""
+        return True
+
+    @property
+    def is_detached(self) -> bool:
+        """Return True if add-on is detached."""
+        return self.slug not in self.sys_store.data.addons
+
+    @property
+    def available(self) -> bool:
+        """Return True if this add-on is available on this platform."""
+        return self._available(self.data_store)
+
+    @property
+    def version(self) -> Optional[str]:
+        """Return installed version."""
+        return self.persist[ATTR_VERSION]
+
+    @property
+    def dns(self) -> List[str]:
+        """Return list of DNS name for that add-on."""
+        return [f"{self.hostname}.{DNS_SUFFIX}"]
+
+    @property
+    def options(self) -> Dict[str, Any]:
+        """Return options with local changes."""
+        return {**self.data[ATTR_OPTIONS], **self.persist[ATTR_OPTIONS]}
+
+    @options.setter
+    def options(self, value: Optional[Dict[str, Any]]):
+        """Store user add-on options."""
+        if value is None:
+            self.persist[ATTR_OPTIONS] = {}
+        else:
+            self.persist[ATTR_OPTIONS] = deepcopy(value)
+
+    @property
+    def boot(self) -> bool:
+        """Return boot config with prio local settings."""
+        return self.persist.get(ATTR_BOOT, super().boot)
+
+    @boot.setter
+    def boot(self, value: bool):
+        """Store user boot options."""
+        self.persist[ATTR_BOOT] = value
+
+    @property
+    def auto_update(self) -> bool:
+        """Return if auto update is enable."""
+        return self.persist.get(ATTR_AUTO_UPDATE, super().auto_update)
+
+    @auto_update.setter
+    def auto_update(self, value: bool):
+        """Set auto update."""
+        self.persist[ATTR_AUTO_UPDATE] = value
+
+    @property
+    def uuid(self) -> str:
+        """Return an API token for this add-on."""
+        return self.persist[ATTR_UUID]
+
+    @property
+    def hassio_token(self) -> Optional[str]:
+        """Return access token for Hass.io API."""
+        return self.persist.get(ATTR_ACCESS_TOKEN)
+
+    @property
+    def ingress_token(self) -> Optional[str]:
+        """Return access token for Hass.io API."""
+        return self.persist.get(ATTR_INGRESS_TOKEN)
+
+    @property
+    def ingress_entry(self) -> Optional[str]:
+        """Return ingress external URL."""
+        if self.with_ingress:
+            return f"/api/hassio_ingress/{self.ingress_token}"
+        return None
+
+    @property
+    def latest_version(self) -> str:
+        """Return version of add-on."""
+        return self.data_store[ATTR_VERSION]
+
+    @property
+    def protected(self) -> bool:
+        """Return if add-on is in protected mode."""
+        return self.persist[ATTR_PROTECTED]
+
+    @protected.setter
+    def protected(self, value: bool):
+        """Set add-on in protected mode."""
+        self.persist[ATTR_PROTECTED] = value
+
+    @property
+    def ports(self) -> Optional[Dict[str, Optional[int]]]:
+        """Return ports of add-on."""
+        return self.persist.get(ATTR_NETWORK, super().ports)
+
+    @ports.setter
+    def ports(self, value: Optional[Dict[str, Optional[int]]]):
+        """Set custom ports of add-on."""
+        if value is None:
+            self.persist.pop(ATTR_NETWORK, None)
+            return
+
+        # Secure map ports to value
+        new_ports = {}
+        for container_port, host_port in value.items():
+            if container_port in self.data.get(ATTR_PORTS, {}):
+                new_ports[container_port] = host_port
+
+        self.persist[ATTR_NETWORK] = new_ports
+
+    @property
+    def ingress_url(self) -> Optional[str]:
+        """Return URL to ingress url."""
+        if not self.with_ingress:
+            return None
+
+        url = f"/api/hassio_ingress/{self.ingress_token}/"
+        if ATTR_INGRESS_ENTRY in self.data:
+            return f"{url}{self.data[ATTR_INGRESS_ENTRY]}"
+        return url
+
+    @property
+    def webui(self) -> Optional[str]:
+        """Return URL to webui or None."""
+        url = super().webui
+        if not url:
+            return None
+        webui = RE_WEBUI.match(url)
+
+        # extract arguments
+        t_port = webui.group("t_port")
+        t_proto = webui.group("t_proto")
+        s_prefix = webui.group("s_prefix") or ""
+        s_suffix = webui.group("s_suffix") or ""
+
+        # search host port for this docker port
+        if self.ports is None:
+            port = t_port
+        else:
+            port = self.ports.get(f"{t_port}/tcp", t_port)
+
+        # for interface config or port lists
+        if isinstance(port, (tuple, list)):
+            port = port[-1]
+
+        # lookup the correct protocol from config
+        if t_proto:
+            proto = "https" if self.options[t_proto] else "http"
+        else:
+            proto = s_prefix
+
+        return f"{proto}://[HOST]:{port}{s_suffix}"
+
+    @property
+    def ingress_port(self) -> Optional[int]:
+        """Return Ingress port."""
+        if not self.with_ingress:
+            return None
+
+        port = self.data[ATTR_INGRESS_PORT]
+        if port == 0:
+            return self.sys_ingress.get_dynamic_port(self.slug)
+        return port
+
+    @property
+    def ingress_panel(self) -> Optional[bool]:
+        """Return True if the add-on access support ingress."""
+        return self.persist[ATTR_INGRESS_PANEL]
+
+    @ingress_panel.setter
+    def ingress_panel(self, value: bool):
+        """Return True if the add-on access support ingress."""
+        self.persist[ATTR_INGRESS_PANEL] = value
+
+    @property
+    def audio_output(self) -> Optional[str]:
+        """Return ALSA config for output or None."""
+        if not self.with_audio:
+            return None
+        return self.persist.get(ATTR_AUDIO_OUTPUT, self.sys_host.alsa.default.output)
+
+    @audio_output.setter
+    def audio_output(self, value: Optional[str]):
+        """Set/reset audio output settings."""
+        if value is None:
+            self.persist.pop(ATTR_AUDIO_OUTPUT, None)
+        else:
+            self.persist[ATTR_AUDIO_OUTPUT] = value
+
+    @property
+    def audio_input(self) -> Optional[str]:
+        """Return ALSA config for input or None."""
+        if not self.with_audio:
+            return None
+        return self.persist.get(ATTR_AUDIO_INPUT, self.sys_host.alsa.default.input)
+
+    @audio_input.setter
+    def audio_input(self, value: Optional[str]):
+        """Set/reset audio input settings."""
+        if value is None:
+            self.persist.pop(ATTR_AUDIO_INPUT, None)
+        else:
+            self.persist[ATTR_AUDIO_INPUT] = value
+
+    @property
+    def image(self):
+        """Return image name of add-on."""
+        return self.persist.get(ATTR_IMAGE)
+
+    @property
+    def need_build(self):
+        """Return True if this  add-on need a local build."""
+        return ATTR_IMAGE not in self.data
+
+    @property
+    def path_data(self):
+        """Return add-on data path inside Supervisor."""
+        return Path(self.sys_config.path_addons_data, self.slug)
+
+    @property
+    def path_extern_data(self):
+        """Return add-on data path external for Docker."""
+        return PurePath(self.sys_config.path_extern_addons_data, self.slug)
+
+    @property
+    def path_options(self):
+        """Return path to add-on options."""
+        return Path(self.path_data, "options.json")
+
+    @property
+    def path_asound(self):
+        """Return path to asound config."""
+        return Path(self.sys_config.path_tmp, f"{self.slug}_asound")
+
+    @property
+    def path_extern_asound(self):
+        """Return path to asound config for Docker."""
+        return Path(self.sys_config.path_extern_tmp, f"{self.slug}_asound")
+
+    def save_persist(self):
+        """Save data of add-on."""
+        self.sys_addons.data.save_data()
+
+    async def write_options(self):
+        """Return True if add-on options is written to data."""
+        schema = self.schema
+        options = self.options
+
+        # Update secrets for validation
+        await self.sys_secrets.reload()
+
+        try:
+            options = schema(options)
+            write_json_file(self.path_options, options)
+        except vol.Invalid as ex:
+            _LOGGER.error(
+                "Add-on %s have wrong options: %s",
+                self.slug,
+                humanize_error(options, ex),
+            )
+        except JsonFileError:
+            _LOGGER.error("Add-on %s can't write options", self.slug)
+        else:
+            _LOGGER.debug("Add-on %s write options: %s", self.slug, options)
+            return
+
+        raise AddonsError()
+
+    async def remove_data(self):
+        """Remove add-on data."""
+        if not self.path_data.is_dir():
+            return
+
+        _LOGGER.info("Remove add-on data folder %s", self.path_data)
+        await remove_data(self.path_data)
+
+    def write_asound(self):
+        """Write asound config to file and return True on success."""
+        asound_config = self.sys_host.alsa.asound(
+            alsa_input=self.audio_input, alsa_output=self.audio_output
+        )
+
+        try:
+            with self.path_asound.open("w") as config_file:
+                config_file.write(asound_config)
+        except OSError as err:
+            _LOGGER.error("Add-on %s can't write asound: %s", self.slug, err)
+            raise AddonsError()
+
+        _LOGGER.debug("Add-on %s write asound: %s", self.slug, self.path_asound)
+
+    async def install_apparmor(self) -> None:
+        """Install or Update AppArmor profile for Add-on."""
+        exists_local = self.sys_host.apparmor.exists(self.slug)
+        exists_addon = self.path_apparmor.exists()
+
+        # Nothing to do
+        if not exists_local and not exists_addon:
+            return
+
+        # Need removed
+        if exists_local and not exists_addon:
+            await self.sys_host.apparmor.remove_profile(self.slug)
+            return
+
+        # Need install/update
+        with TemporaryDirectory(dir=self.sys_config.path_tmp) as tmp_folder:
+            profile_file = Path(tmp_folder, "apparmor.txt")
+
+            adjust_profile(self.slug, self.path_apparmor, profile_file)
+            await self.sys_host.apparmor.load_profile(self.slug, profile_file)
+
+    async def uninstall_apparmor(self) -> None:
+        """Remove AppArmor profile for Add-on."""
+        if not self.sys_host.apparmor.exists(self.slug):
+            return
+        await self.sys_host.apparmor.remove_profile(self.slug)
+
+    def test_update_schema(self) -> bool:
+        """Check if the existing configuration is valid after update."""
+        # load next schema
+        new_raw_schema = self.data_store[ATTR_SCHEMA]
+        default_options = self.data_store[ATTR_OPTIONS]
+
+        # if disabled
+        if isinstance(new_raw_schema, bool):
+            return True
+
+        # merge options
+        options = {**self.persist[ATTR_OPTIONS], **default_options}
+
+        # create voluptuous
+        new_schema = vol.Schema(
+            vol.All(dict, validate_options(self.coresys, new_raw_schema))
+        )
+
+        # validate
+        try:
+            new_schema(options)
+        except vol.Invalid:
+            _LOGGER.warning("Add-on %s new schema is not compatible", self.slug)
+            return False
+        return True
+
+    async def state(self) -> str:
+        """Return running state of add-on."""
+        if await self.instance.is_running():
+            return STATE_STARTED
+        return STATE_STOPPED
+
+    async def start(self) -> None:
+        """Set options and start add-on."""
+        if await self.instance.is_running():
+            _LOGGER.warning("%s already running!", self.slug)
+            return
+
+        # Access Token
+        self.persist[ATTR_ACCESS_TOKEN] = secrets.token_hex(56)
+        self.save_persist()
+
+        # Options
+        await self.write_options()
+
+        # Sound
+        if self.with_audio:
+            self.write_asound()
+
+        # Start Add-on
+        try:
+            await self.instance.run()
+        except DockerAPIError:
+            raise AddonsError() from None
+
+    async def stop(self) -> None:
+        """Stop add-on."""
+        try:
+            return await self.instance.stop()
+        except DockerAPIError:
+            raise AddonsError() from None
+
+    async def restart(self) -> None:
+        """Restart add-on."""
+        with suppress(AddonsError):
+            await self.stop()
+        await self.start()
+
+    def logs(self) -> Awaitable[bytes]:
+        """Return add-ons log output.
+
+        Return a coroutine.
+        """
+        return self.instance.logs()
+
+    async def stats(self) -> DockerStats:
+        """Return stats of container."""
+        try:
+            return await self.instance.stats()
+        except DockerAPIError:
+            raise AddonsError() from None
+
+    async def write_stdin(self, data):
+        """Write data to add-on stdin.
+
+        Return a coroutine.
+        """
+        if not self.with_stdin:
+            _LOGGER.error("Add-on don't support write to stdin!")
+            raise AddonsNotSupportedError()
+
+        try:
+            return await self.instance.write_stdin(data)
+        except DockerAPIError:
+            raise AddonsError() from None
+
+    async def snapshot(self, tar_file: tarfile.TarFile) -> None:
+        """Snapshot state of an add-on."""
+        with TemporaryDirectory(dir=self.sys_config.path_tmp) as temp:
+            # store local image
+            if self.need_build:
+                try:
+                    await self.instance.export_image(Path(temp, "image.tar"))
+                except DockerAPIError:
+                    raise AddonsError() from None
+
+            data = {
+                ATTR_USER: self.persist,
+                ATTR_SYSTEM: self.data,
+                ATTR_VERSION: self.version,
+                ATTR_STATE: await self.state(),
+            }
+
+            # Store local configs/state
+            try:
+                write_json_file(Path(temp, "addon.json"), data)
+            except JsonFileError:
+                _LOGGER.error("Can't save meta for %s", self.slug)
+                raise AddonsError() from None
+
+            # Store AppArmor Profile
+            if self.sys_host.apparmor.exists(self.slug):
+                profile = Path(temp, "apparmor.txt")
+                try:
+                    self.sys_host.apparmor.backup_profile(self.slug, profile)
+                except HostAppArmorError:
+                    _LOGGER.error("Can't backup AppArmor profile")
+                    raise AddonsError() from None
+
+            # write into tarfile
+            def _write_tarfile():
+                """Write tar inside loop."""
+                with tar_file as snapshot:
+                    # Snapshot system
+                    snapshot.add(temp, arcname=".")
+
+                    # Snapshot data
+                    snapshot.add(
+                        self.path_data,
+                        arcname="data",
+                        filter=exclude_filter(self.snapshot_exclude),
+                    )
+
+            try:
+                _LOGGER.info("Build snapshot for add-on %s", self.slug)
+                await self.sys_run_in_executor(_write_tarfile)
+            except (tarfile.TarError, OSError) as err:
+                _LOGGER.error("Can't write tarfile %s: %s", tar_file, err)
+                raise AddonsError() from None
+
+        _LOGGER.info("Finish snapshot for addon %s", self.slug)
+
+    async def restore(self, tar_file: tarfile.TarFile) -> None:
+        """Restore state of an add-on."""
+        with TemporaryDirectory(dir=self.sys_config.path_tmp) as temp:
+            # extract snapshot
+            def _extract_tarfile():
+                """Extract tar snapshot."""
+                with tar_file as snapshot:
+                    snapshot.extractall(path=Path(temp), members=secure_path(snapshot))
+
+            try:
+                await self.sys_run_in_executor(_extract_tarfile)
+            except tarfile.TarError as err:
+                _LOGGER.error("Can't read tarfile %s: %s", tar_file, err)
+                raise AddonsError() from None
+
+            # Read snapshot data
+            try:
+                data = read_json_file(Path(temp, "addon.json"))
+            except JsonFileError:
+                raise AddonsError() from None
+
+            # Validate
+            try:
+                data = SCHEMA_ADDON_SNAPSHOT(data)
+            except vol.Invalid as err:
+                _LOGGER.error(
+                    "Can't validate %s, snapshot data: %s",
+                    self.slug,
+                    humanize_error(data, err),
+                )
+                raise AddonsError() from None
+
+            # If available
+            if not self._available(data[ATTR_SYSTEM]):
+                _LOGGER.error("Add-on %s is not available for this Platform", self.slug)
+                raise AddonsNotSupportedError()
+
+            # Restore local add-on informations
+            _LOGGER.info("Restore config for addon %s", self.slug)
+            restore_image = self._image(data[ATTR_SYSTEM])
+            self.sys_addons.data.restore(
+                self.slug, data[ATTR_USER], data[ATTR_SYSTEM], restore_image
+            )
+
+            # Check version / restore image
+            version = data[ATTR_VERSION]
+            if not await self.instance.exists():
+                _LOGGER.info("Restore/Install image for addon %s", self.slug)
+
+                image_file = Path(temp, "image.tar")
+                if image_file.is_file():
+                    with suppress(DockerAPIError):
+                        await self.instance.import_image(image_file)
+                else:
+                    with suppress(DockerAPIError):
+                        await self.instance.install(version, restore_image)
+                        await self.instance.cleanup()
+            elif self.instance.version != version or self.legacy:
+                _LOGGER.info("Restore/Update image for addon %s", self.slug)
+                with suppress(DockerAPIError):
+                    await self.instance.update(version, restore_image)
+            else:
+                with suppress(DockerAPIError):
+                    await self.instance.stop()
+
+            # Restore data
+            def _restore_data():
+                """Restore data."""
+                shutil.copytree(Path(temp, "data"), self.path_data)
+
+            _LOGGER.info("Restore data for addon %s", self.slug)
+            if self.path_data.is_dir():
+                await remove_data(self.path_data)
+            try:
+                await self.sys_run_in_executor(_restore_data)
+            except shutil.Error as err:
+                _LOGGER.error("Can't restore origin data: %s", err)
+                raise AddonsError() from None
+
+            # Restore AppArmor
+            profile_file = Path(temp, "apparmor.txt")
+            if profile_file.exists():
+                try:
+                    await self.sys_host.apparmor.load_profile(self.slug, profile_file)
+                except HostAppArmorError:
+                    _LOGGER.error("Can't restore AppArmor profile")
+                    raise AddonsError() from None
+
+            # Run add-on
+            if data[ATTR_STATE] == STATE_STARTED:
+                return await self.start()
+
+        _LOGGER.info("Finish restore for add-on %s", self.slug)

hassio/addons/build.py

@@ -0,0 +1,79 @@
+"""Hass.io add-on build environment."""
+from __future__ import annotations
+from pathlib import Path
+from typing import TYPE_CHECKING, Dict
+
+from ..const import ATTR_ARGS, ATTR_BUILD_FROM, ATTR_SQUASH, META_ADDON
+from ..coresys import CoreSys, CoreSysAttributes
+from ..utils.json import JsonConfig
+from .validate import SCHEMA_BUILD_CONFIG
+
+if TYPE_CHECKING:
+    from . import AnyAddon
+
+
+class AddonBuild(JsonConfig, CoreSysAttributes):
+    """Handle build options for add-ons."""
+
+    def __init__(self, coresys: CoreSys, addon: AnyAddon) -> None:
+        """Initialize Hass.io add-on builder."""
+        self.coresys: CoreSys = coresys
+        self.addon = addon
+
+        super().__init__(
+            Path(self.addon.path_location, "build.json"), SCHEMA_BUILD_CONFIG
+        )
+
+    def save_data(self):
+        """Ignore save function."""
+        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"
+        )
+
+    @property
+    def squash(self) -> bool:
+        """Return True or False if squash is active."""
+        return self._data[ATTR_SQUASH]
+
+    @property
+    def additional_args(self) -> Dict[str, str]:
+        """Return additional Docker build arguments."""
+        return self._data[ATTR_ARGS]
+
+    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"),
+            },
+            "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
+
+        return args
+
+    def _fix_label(self, label_name: str) -> str:
+        """Remove characters they are not supported."""
+        label = getattr(self.addon, label_name, "")
+        return label.replace("'", "")

hassio/addons/data.py

@@ -1,7 +1,7 @@
-"""Init file for Supervisor add-on data."""
-
+"""Init file for Hass.io add-on data."""
 from copy import deepcopy
-from typing import Any
+import logging
+from typing import Any, Dict
 
 from ..const import (
     ATTR_IMAGE,
@@ -12,16 +12,18 @@ from ..const import (
     FILE_HASSIO_ADDONS,
 )
 from ..coresys import CoreSys, CoreSysAttributes
+from ..utils.json import JsonConfig
 from ..store.addon import AddonStore
-from ..utils.common import FileConfiguration
 from .addon import Addon
 from .validate import SCHEMA_ADDONS_FILE
 
-Config = dict[str, Any]
+_LOGGER: logging.Logger = logging.getLogger(__name__)
+
+Config = Dict[str, Any]
 
 
-class AddonsData(FileConfiguration, CoreSysAttributes):
-    """Hold data for installed Add-ons inside Supervisor."""
+class AddonsData(JsonConfig, CoreSysAttributes):
+    """Hold data for installed Add-ons inside Hass.io."""
 
     def __init__(self, coresys: CoreSys):
         """Initialize data holder."""

hassio/addons/model.py

@@ -1,17 +1,9 @@
-"""Init file for Supervisor add-ons."""
-
-from abc import ABC, abstractmethod
-from collections import defaultdict
-from collections.abc import Awaitable, Callable
-from contextlib import suppress
-from datetime import datetime
-import logging
+"""Init file for Hass.io add-ons."""
 from pathlib import Path
-from typing import Any
+from typing import Any, Awaitable, Dict, List, Optional
 
-from awesomeversion import AwesomeVersion, AwesomeVersionException
-
-from supervisor.utils.dt import utc_from_timestamp
+from packaging import version as pkg_version
+import voluptuous as vol
 
 from ..const import (
     ATTR_ADVANCED,
@@ -19,9 +11,7 @@ from ..const import (
     ATTR_ARCH,
     ATTR_AUDIO,
     ATTR_AUTH_API,
-    ATTR_BACKUP_EXCLUDE,
-    ATTR_BACKUP_POST,
-    ATTR_BACKUP_PRE,
+    ATTR_AUTO_UART,
     ATTR_BOOT,
     ATTR_DESCRIPTON,
     ATTR_DEVICES,
@@ -39,12 +29,8 @@ from ..const import (
     ATTR_HOST_IPC,
     ATTR_HOST_NETWORK,
     ATTR_HOST_PID,
-    ATTR_HOST_UTS,
     ATTR_IMAGE,
     ATTR_INGRESS,
-    ATTR_INGRESS_STREAM,
-    ATTR_INIT,
-    ATTR_JOURNALD,
     ATTR_KERNEL_MODULES,
     ATTR_LEGACY,
     ATTR_LOCATON,
@@ -58,87 +44,51 @@ from ..const import (
     ATTR_PORTS,
     ATTR_PORTS_DESCRIPTION,
     ATTR_PRIVILEGED,
-    ATTR_REALTIME,
     ATTR_REPOSITORY,
     ATTR_SCHEMA,
     ATTR_SERVICES,
     ATTR_SLUG,
+    ATTR_SNAPSHOT_EXCLUDE,
     ATTR_STAGE,
     ATTR_STARTUP,
     ATTR_STDIN,
     ATTR_TIMEOUT,
     ATTR_TMPFS,
-    ATTR_TRANSLATIONS,
-    ATTR_TYPE,
-    ATTR_UART,
     ATTR_UDEV,
     ATTR_URL,
-    ATTR_USB,
     ATTR_VERSION,
-    ATTR_VERSION_TIMESTAMP,
     ATTR_VIDEO,
-    ATTR_WATCHDOG,
     ATTR_WEBUI,
     SECURITY_DEFAULT,
     SECURITY_DISABLE,
     SECURITY_PROFILE,
-    AddonBoot,
-    AddonBootConfig,
-    AddonStage,
-    AddonStartup,
+    AddonStages,
 )
-from ..coresys import CoreSys
-from ..docker.const import Capabilities
-from ..exceptions import AddonsNotSupportedError
-from ..jobs.const import JOB_GROUP_ADDON
-from ..jobs.job_group import JobGroup
-from ..utils import version_is_new_enough
-from .configuration import FolderMapping
-from .const import (
-    ATTR_BACKUP,
-    ATTR_BREAKING_VERSIONS,
-    ATTR_CODENOTARY,
-    ATTR_PATH,
-    ATTR_READ_ONLY,
-    AddonBackupMode,
-    MappingType,
-)
-from .options import AddonOptions, UiOptions
-from .validate import RE_SERVICE
+from ..coresys import CoreSysAttributes
+from .validate import RE_SERVICE, RE_VOLUME, schema_ui_options, validate_options
 
-_LOGGER: logging.Logger = logging.getLogger(__name__)
-
-Data = dict[str, Any]
+Data = Dict[str, Any]
 
 
-class AddonModel(JobGroup, ABC):
+class AddonModel(CoreSysAttributes):
     """Add-on Data layout."""
 
-    def __init__(self, coresys: CoreSys, slug: str):
-        """Initialize data holder."""
-        super().__init__(
-            coresys, JOB_GROUP_ADDON.format_map(defaultdict(str, slug=slug)), slug
-        )
-        self.slug: str = slug
-        self._path_icon_exists: bool = False
-        self._path_logo_exists: bool = False
-        self._path_changelog_exists: bool = False
-        self._path_documentation_exists: bool = False
+    slug: str = None
 
     @property
-    @abstractmethod
     def data(self) -> Data:
-        """Return add-on config/data."""
+        """Return Add-on config/data."""
+        raise NotImplementedError()
 
     @property
-    @abstractmethod
     def is_installed(self) -> bool:
         """Return True if an add-on is installed."""
+        raise NotImplementedError()
 
     @property
-    @abstractmethod
     def is_detached(self) -> bool:
         """Return True if add-on is detached."""
+        raise NotImplementedError()
 
     @property
     def available(self) -> bool:
@@ -146,22 +96,17 @@ class AddonModel(JobGroup, ABC):
         return self._available(self.data)
 
     @property
-    def options(self) -> dict[str, Any]:
+    def options(self) -> Dict[str, Any]:
         """Return options with local changes."""
         return self.data[ATTR_OPTIONS]
 
     @property
-    def boot_config(self) -> AddonBootConfig:
-        """Return boot config."""
+    def boot(self) -> bool:
+        """Return boot config with prio local settings."""
         return self.data[ATTR_BOOT]
 
     @property
-    def boot(self) -> AddonBoot:
-        """Return boot config with prio local settings unless config is forced."""
-        return AddonBoot(self.data[ATTR_BOOT])
-
-    @property
-    def auto_update(self) -> bool | None:
+    def auto_update(self) -> Optional[bool]:
         """Return if auto update is enable."""
         return None
 
@@ -176,7 +121,7 @@ class AddonModel(JobGroup, ABC):
         return self.slug.replace("_", "-")
 
     @property
-    def dns(self) -> list[str]:
+    def dns(self) -> List[str]:
         """Return list of DNS name for that add-on."""
         return []
 
@@ -186,22 +131,22 @@ class AddonModel(JobGroup, ABC):
         return self.data[ATTR_TIMEOUT]
 
     @property
-    def uuid(self) -> str | None:
+    def uuid(self) -> Optional[str]:
         """Return an API token for this add-on."""
         return None
 
     @property
-    def supervisor_token(self) -> str | None:
-        """Return access token for Supervisor API."""
+    def hassio_token(self) -> Optional[str]:
+        """Return access token for Hass.io API."""
         return None
 
     @property
-    def ingress_token(self) -> str | None:
-        """Return access token for Supervisor API."""
+    def ingress_token(self) -> Optional[str]:
+        """Return access token for Hass.io API."""
         return None
 
     @property
-    def ingress_entry(self) -> str | None:
+    def ingress_entry(self) -> Optional[str]:
         """Return ingress external URL."""
         return None
 
@@ -211,7 +156,7 @@ class AddonModel(JobGroup, ABC):
         return self.data[ATTR_DESCRIPTON]
 
     @property
-    def long_description(self) -> str | None:
+    def long_description(self) -> Optional[str]:
         """Return README.md as long_description."""
         readme = Path(self.path_location, "README.md")
 
@@ -220,7 +165,8 @@ class AddonModel(JobGroup, ABC):
             return None
 
         # Return data
-        return readme.read_text(encoding="utf-8")
+        with readme.open("r") as readme_file:
+            return readme_file.read()
 
     @property
     def repository(self) -> str:
@@ -228,22 +174,12 @@ class AddonModel(JobGroup, ABC):
         return self.data[ATTR_REPOSITORY]
 
     @property
-    def translations(self) -> dict:
-        """Return add-on translations."""
-        return self.data[ATTR_TRANSLATIONS]
-
-    @property
-    def latest_version(self) -> AwesomeVersion:
+    def latest_version(self) -> str:
         """Return latest version of add-on."""
         return self.data[ATTR_VERSION]
 
     @property
-    def latest_version_timestamp(self) -> datetime:
-        """Return when latest version was first seen."""
-        return utc_from_timestamp(self.data[ATTR_VERSION_TIMESTAMP])
-
-    @property
-    def version(self) -> AwesomeVersion:
+    def version(self) -> str:
         """Return version of add-on."""
         return self.data[ATTR_VERSION]
 
@@ -253,9 +189,9 @@ class AddonModel(JobGroup, ABC):
         return True
 
     @property
-    def startup(self) -> AddonStartup:
+    def startup(self) -> Optional[str]:
         """Return startup type of add-on."""
-        return self.data[ATTR_STARTUP]
+        return self.data.get(ATTR_STARTUP)
 
     @property
     def advanced(self) -> bool:
@@ -263,55 +199,49 @@ class AddonModel(JobGroup, ABC):
         return self.data[ATTR_ADVANCED]
 
     @property
-    def stage(self) -> AddonStage:
+    def stage(self) -> AddonStages:
         """Return stage mode of add-on."""
         return self.data[ATTR_STAGE]
 
     @property
-    def services_role(self) -> dict[str, str]:
+    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)
-            if service:
-                services[service.group("service")] = service.group("rights")
+            services[service.group("service")] = service.group("rights")
 
         return services
 
     @property
-    def discovery(self) -> list[str]:
+    def discovery(self) -> List[str]:
         """Return list of discoverable components/platforms."""
         return self.data.get(ATTR_DISCOVERY, [])
 
     @property
-    def ports_description(self) -> dict[str, str] | None:
+    def ports_description(self) -> Optional[Dict[str, str]]:
         """Return descriptions of ports."""
         return self.data.get(ATTR_PORTS_DESCRIPTION)
 
     @property
-    def ports(self) -> dict[str, int | None] | None:
+    def ports(self) -> Optional[Dict[str, Optional[int]]]:
         """Return ports of add-on."""
         return self.data.get(ATTR_PORTS)
 
     @property
-    def ingress_url(self) -> str | None:
+    def ingress_url(self) -> Optional[str]:
         """Return URL to ingress url."""
         return None
 
     @property
-    def webui(self) -> str | None:
+    def webui(self) -> Optional[str]:
         """Return URL to webui or None."""
         return self.data.get(ATTR_WEBUI)
 
     @property
-    def watchdog(self) -> str | None:
-        """Return URL to for watchdog or None."""
-        return self.data.get(ATTR_WATCHDOG)
-
-    @property
-    def ingress_port(self) -> int | None:
+    def ingress_port(self) -> Optional[int]:
         """Return Ingress port."""
         return None
 
@@ -345,28 +275,33 @@ class AddonModel(JobGroup, ABC):
         """Return True if add-on run on host IPC namespace."""
         return self.data[ATTR_HOST_IPC]
 
-    @property
-    def host_uts(self) -> bool:
-        """Return True if add-on run on host UTS namespace."""
-        return self.data[ATTR_HOST_UTS]
-
     @property
     def host_dbus(self) -> bool:
         """Return True if add-on run on host D-BUS."""
         return self.data[ATTR_HOST_DBUS]
 
     @property
-    def static_devices(self) -> list[Path]:
-        """Return static devices of add-on."""
-        return [Path(node) for node in self.data.get(ATTR_DEVICES, [])]
+    def devices(self) -> Optional[List[str]]:
+        """Return devices of add-on."""
+        return self.data.get(ATTR_DEVICES, [])
 
     @property
-    def environment(self) -> dict[str, str] | None:
+    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[Capabilities]:
+    def privileged(self) -> List[str]:
         """Return list of privilege."""
         return self.data.get(ATTR_PRIVILEGED, [])
 
@@ -391,7 +326,7 @@ class AddonModel(JobGroup, ABC):
 
     @property
     def access_hassio_api(self) -> bool:
-        """Return True if the add-on access to Supervisor REASTful API."""
+        """Return True if the add-on access to Hass.io REASTful API."""
         return self.data[ATTR_HASSIO_API]
 
     @property
@@ -401,33 +336,13 @@ class AddonModel(JobGroup, ABC):
 
     @property
     def hassio_role(self) -> str:
-        """Return Supervisor role for API."""
+        """Return Hass.io role for API."""
         return self.data[ATTR_HASSIO_ROLE]
 
     @property
-    def backup_exclude(self) -> list[str]:
-        """Return Exclude list for backup."""
-        return self.data.get(ATTR_BACKUP_EXCLUDE, [])
-
-    @property
-    def backup_pre(self) -> str | None:
-        """Return pre-backup command."""
-        return self.data.get(ATTR_BACKUP_PRE)
-
-    @property
-    def backup_post(self) -> str | None:
-        """Return post-backup command."""
-        return self.data.get(ATTR_BACKUP_POST)
-
-    @property
-    def backup_mode(self) -> AddonBackupMode:
-        """Return if backup is hot/cold."""
-        return self.data[ATTR_BACKUP]
-
-    @property
-    def default_init(self) -> bool:
-        """Return True if the add-on have no own init."""
-        return self.data[ATTR_INIT]
+    def snapshot_exclude(self) -> List[str]:
+        """Return Exclude list for snapshot."""
+        return self.data.get(ATTR_SNAPSHOT_EXCLUDE, [])
 
     @property
     def with_stdin(self) -> bool:
@@ -440,30 +355,15 @@ class AddonModel(JobGroup, ABC):
         return self.data[ATTR_INGRESS]
 
     @property
-    def ingress_panel(self) -> bool | None:
+    def ingress_panel(self) -> Optional[bool]:
         """Return True if the add-on access support ingress."""
         return None
 
-    @property
-    def ingress_stream(self) -> bool:
-        """Return True if post requests to ingress should be streamed."""
-        return self.data[ATTR_INGRESS_STREAM]
-
     @property
     def with_gpio(self) -> bool:
         """Return True if the add-on access to GPIO interface."""
         return self.data[ATTR_GPIO]
 
-    @property
-    def with_usb(self) -> bool:
-        """Return True if the add-on need USB access."""
-        return self.data[ATTR_USB]
-
-    @property
-    def with_uart(self) -> bool:
-        """Return True if we should map all UART device."""
-        return self.data[ATTR_UART]
-
     @property
     def with_udev(self) -> bool:
         """Return True if the add-on have his own udev."""
@@ -474,11 +374,6 @@ class AddonModel(JobGroup, ABC):
         """Return True if the add-on access to kernel modules."""
         return self.data[ATTR_KERNEL_MODULES]
 
-    @property
-    def with_realtime(self) -> bool:
-        """Return True if the add-on need realtime schedule functions."""
-        return self.data[ATTR_REALTIME]
-
     @property
     def with_full_access(self) -> bool:
         """Return True if the add-on want full access to hardware."""
@@ -489,11 +384,6 @@ class AddonModel(JobGroup, ABC):
         """Return True if the add-on read access to devicetree."""
         return self.data[ATTR_DEVICETREE]
 
-    @property
-    def with_tmpfs(self) -> str | None:
-        """Return if tmp is in memory of add-on."""
-        return self.data[ATTR_TMPFS]
-
     @property
     def access_auth_api(self) -> bool:
         """Return True if the add-on access to login/auth backend."""
@@ -510,55 +400,47 @@ class AddonModel(JobGroup, ABC):
         return self.data[ATTR_VIDEO]
 
     @property
-    def homeassistant_version(self) -> str | None:
+    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) -> str | None:
+    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
+        return self.path_icon.exists()
 
     @property
     def with_logo(self) -> bool:
         """Return True if a logo exists."""
-        return self._path_logo_exists
+        return self.path_logo.exists()
 
     @property
     def with_changelog(self) -> bool:
         """Return True if a changelog exists."""
-        return self._path_changelog_exists
+        return self.path_changelog.exists()
 
     @property
     def with_documentation(self) -> bool:
         """Return True if a documentation exists."""
-        return self._path_documentation_exists
+        return self.path_documentation.exists()
 
     @property
-    def supported_arch(self) -> list[str]:
+    def supported_arch(self) -> List[str]:
         """Return list of supported arch."""
         return self.data[ATTR_ARCH]
 
     @property
-    def supported_machine(self) -> list[str]:
+    def supported_machine(self) -> List[str]:
         """Return list of supported machine."""
         return self.data.get(ATTR_MACHINE, [])
 
     @property
-    def arch(self) -> str:
-        """Return architecture to use for the addon's image."""
-        if ATTR_IMAGE in self.data:
-            return self.sys_arch.match(self.data[ATTR_ARCH])
-
-        return self.sys_arch.default
-
-    @property
-    def image(self) -> str | None:
+    def image(self) -> str:
         """Generate image name from data."""
         return self._image(self.data)
 
@@ -568,13 +450,12 @@ class AddonModel(JobGroup, ABC):
         return ATTR_IMAGE not in self.data
 
     @property
-    def map_volumes(self) -> dict[MappingType, FolderMapping]:
-        """Return a dict of {MappingType: FolderMapping} from add-on."""
+    def map_volumes(self) -> Dict[str, str]:
+        """Return a dict of {volume: policy} from add-on."""
         volumes = {}
         for volume in self.data[ATTR_MAP]:
-            volumes[MappingType(volume[ATTR_TYPE])] = FolderMapping(
-                volume.get(ATTR_PATH), volume[ATTR_READ_ONLY]
-            )
+            result = RE_VOLUME.match(volume)
+            volumes[result.group(1)] = result.group(2) or "ro"
 
         return volumes
 
@@ -609,57 +490,22 @@ class AddonModel(JobGroup, ABC):
         return Path(self.path_location, "apparmor.txt")
 
     @property
-    def schema(self) -> AddonOptions:
-        """Return Addon options validation object."""
+    def schema(self) -> vol.Schema:
+        """Create a schema for add-on options."""
         raw_schema = self.data[ATTR_SCHEMA]
-        if isinstance(raw_schema, bool):
-            raw_schema = {}
 
-        return AddonOptions(self.coresys, raw_schema, self.name, self.slug)
+        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) -> list[dict[any, any]] | None:
+    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 UiOptions(self.coresys)(raw_schema)
-
-    @property
-    def with_journald(self) -> bool:
-        """Return True if the add-on accesses the system journal."""
-        return self.data[ATTR_JOURNALD]
-
-    @property
-    def signed(self) -> bool:
-        """Return True if the image is signed."""
-        return ATTR_CODENOTARY in self.data
-
-    @property
-    def codenotary(self) -> str | None:
-        """Return Signer email address for CAS."""
-        return self.data.get(ATTR_CODENOTARY)
-
-    @property
-    def breaking_versions(self) -> list[AwesomeVersion]:
-        """Return breaking versions of addon."""
-        return self.data[ATTR_BREAKING_VERSIONS]
-
-    def refresh_path_cache(self) -> Awaitable[None]:
-        """Refresh cache of existing paths."""
-
-        def check_paths():
-            self._path_icon_exists = self.path_icon.exists()
-            self._path_logo_exists = self.path_logo.exists()
-            self._path_changelog_exists = self.path_changelog.exists()
-            self._path_documentation_exists = self.path_documentation.exists()
-
-        return self.sys_run_in_executor(check_paths)
-
-    def validate_availability(self) -> None:
-        """Validate if addon is available for current system."""
-        return self._validate_availability(self.data, logger=_LOGGER.error)
+        return schema_ui_options(raw_schema)
 
     def __eq__(self, other):
         """Compaired add-on objects."""
@@ -667,43 +513,22 @@ class AddonModel(JobGroup, ABC):
             return False
         return self.slug == other.slug
 
-    def _validate_availability(
-        self, config, *, logger: Callable[..., None] | None = None
-    ) -> None:
-        """Validate if addon is available for current system."""
+    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]):
-            raise AddonsNotSupportedError(
-                f"Add-on {self.slug} not supported on this platform, supported architectures: {', '.join(config[ATTR_ARCH])}",
-                logger,
-            )
+            return False
 
         # Machine / Hardware
         machine = config.get(ATTR_MACHINE)
-        if machine and (
-            f"!{self.sys_machine}" in machine or self.sys_machine not in machine
-        ):
-            raise AddonsNotSupportedError(
-                f"Add-on {self.slug} not supported on this machine, supported machine types: {', '.join(machine)}",
-                logger,
-            )
+        if machine and self.sys_machine not in machine:
+            return False
 
         # Home Assistant
-        version: AwesomeVersion | None = config.get(ATTR_HOMEASSISTANT)
-        with suppress(AwesomeVersionException, TypeError):
-            if version and not version_is_new_enough(
-                self.sys_homeassistant.version, version
-            ):
-                raise AddonsNotSupportedError(
-                    f"Add-on {self.slug} not supported on this system, requires Home Assistant version {version} or greater",
-                    logger,
-                )
-
-    def _available(self, config) -> bool:
-        """Return True if this add-on is available on this platform."""
-        try:
-            self._validate_availability(config)
-        except AddonsNotSupportedError:
+        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
@@ -717,3 +542,19 @@ class AddonModel(JobGroup, ABC):
 
         # 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

@@ -1,5 +1,4 @@
 """Util add-ons functions."""
-
 from __future__ import annotations
 
 import asyncio
@@ -7,8 +6,18 @@ import logging
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from ..const import ROLE_ADMIN, ROLE_MANAGER, SECURITY_DISABLE, SECURITY_PROFILE
-from ..docker.const import Capabilities
+from ..const import (
+    PRIVILEGED_DAC_READ_SEARCH,
+    PRIVILEGED_NET_ADMIN,
+    PRIVILEGED_SYS_ADMIN,
+    PRIVILEGED_SYS_MODULE,
+    PRIVILEGED_SYS_PTRACE,
+    PRIVILEGED_SYS_RAWIO,
+    ROLE_ADMIN,
+    ROLE_MANAGER,
+    SECURITY_DISABLE,
+    SECURITY_PROFILE,
+)
 
 if TYPE_CHECKING:
     from .model import AddonModel
@@ -17,10 +26,10 @@ _LOGGER: logging.Logger = logging.getLogger(__name__)
 
 
 def rating_security(addon: AddonModel) -> int:
-    """Return 1-8 for security rating.
+    """Return 1-6 for security rating.
 
     1 = not secure
-    8 = high secure
+    6 = high secure
     """
     rating = 5
 
@@ -36,31 +45,21 @@ def rating_security(addon: AddonModel) -> int:
     elif addon.access_auth_api:
         rating += 1
 
-    # Signed
-    if addon.signed:
-        rating += 1
-
     # Privileged options
-    if (
-        any(
-            privilege in addon.privileged
-            for privilege in (
-                Capabilities.BPF,
-                Capabilities.DAC_READ_SEARCH,
-                Capabilities.NET_ADMIN,
-                Capabilities.NET_RAW,
-                Capabilities.PERFMON,
-                Capabilities.SYS_ADMIN,
-                Capabilities.SYS_MODULE,
-                Capabilities.SYS_PTRACE,
-                Capabilities.SYS_RAWIO,
-            )
+    if any(
+        privilege in addon.privileged
+        for privilege in (
+            PRIVILEGED_NET_ADMIN,
+            PRIVILEGED_SYS_ADMIN,
+            PRIVILEGED_SYS_RAWIO,
+            PRIVILEGED_SYS_PTRACE,
+            PRIVILEGED_SYS_MODULE,
+            PRIVILEGED_DAC_READ_SEARCH,
         )
-        or addon.with_kernel_modules
     ):
         rating += -1
 
-    # API Supervisor role
+    # API Hass.io role
     if addon.hassio_role == ROLE_MANAGER:
         rating += -1
     elif addon.hassio_role == ROLE_ADMIN:
@@ -74,15 +73,15 @@ def rating_security(addon: AddonModel) -> int:
     if addon.host_pid:
         rating += -2
 
-    # UTS host namespace allows to set hostname only with SYS_ADMIN
-    if addon.host_uts and Capabilities.SYS_ADMIN in addon.privileged:
-        rating += -1
+    # Full Access
+    if addon.with_full_access:
+        rating += -2
 
-    # Docker Access & full Access
-    if addon.access_docker_api or addon.with_full_access:
+    # Docker Access
+    if addon.access_docker_api:
         rating = 1
 
-    return max(min(8, rating), 1)
+    return max(min(6, rating), 1)
 
 
 async def remove_data(folder: Path) -> None:

hassio/addons/validate.py

@@ -0,0 +1,573 @@
+"""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_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_VIDEO,
+    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 (
+    DOCKER_PORTS,
+    DOCKER_PORTS_DESCRIPTION,
+    alsa_device,
+    network_port,
+    token,
+    uuid_match,
+)
+
+_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|mysql):(?P<rights>provide|want|need)$")
+
+V_STR = "str"
+V_INT = "int"
+V_FLOAT = "float"
+V_BOOL = "bool"
+V_PASSWORD = "password"
+V_EMAIL = "email"
+V_URL = "url"
+V_PORT = "port"
+V_MATCH = "match"
+V_LIST = "list"
+
+RE_SCHEMA_ELEMENT = re.compile(
+    r"^(?:"
+    r"|bool|email|url|port"
+    r"|str(?:\((?P<s_min>\d+)?,(?P<s_max>\d+)?\))?"
+    r"|password(?:\((?P<p_min>\d+)?,(?P<p_max>\d+)?\))?"
+    r"|int(?:\((?P<i_min>\d+)?,(?P<i_max>\d+)?\))?"
+    r"|float(?:\((?P<f_min>[\d\.]+)?,(?P<f_max>[\d\.]+)?\))?"
+    r"|match\((?P<match>.*)\)"
+    r"|list\((?P<list>.+)\)"
+    r")\??$"
+)
+
+_SCHEMA_LENGTH_PARTS = (
+    "i_min",
+    "i_max",
+    "f_min",
+    "f_max",
+    "s_min",
+    "s_max",
+    "p_min",
+    "p_max",
+)
+
+RE_DOCKER_IMAGE = re.compile(r"^([a-zA-Z\-\.:\d{}]+/)*?([\-\w{}]+)/([\-\w{}]+)$")
+RE_DOCKER_IMAGE_BUILD = re.compile(
+    r"^([a-zA-Z\-\.:\d{}]+/)*?([\-\w{}]+)/([\-\w{}]+)(:[\.\-\w{}]+)?$"
+)
+
+SCHEMA_ELEMENT = vol.Match(RE_SCHEMA_ELEMENT)
+
+
+MACHINE_ALL = [
+    "intel-nuc",
+    "odroid-c2",
+    "odroid-n2",
+    "odroid-xu",
+    "qemuarm-64",
+    "qemuarm",
+    "qemux86-64",
+    "qemux86",
+    "raspberrypi",
+    "raspberrypi2",
+    "raspberrypi3-64",
+    "raspberrypi3",
+    "raspberrypi4-64",
+    "raspberrypi4",
+    "tinker",
+]
+
+
+def _simple_startup(value):
+    """Simple startup schema."""
+    if value == "before":
+        return STARTUP_SERVICES
+    if value == "after":
+        return STARTUP_APPLICATION
+    return 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_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_VIDEO, default=False): vol.Boolean(),
+        vol.Optional(ATTR_GPIO, default=False): vol.Boolean(),
+        vol.Optional(ATTR_DEVICETREE, default=False): vol.Boolean(),
+        vol.Optional(ATTR_KERNEL_MODULES, default=False): vol.Boolean(),
+        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])}
+                        ),
+                    )
+                }
+            ),
+            False,
+        ),
+        vol.Optional(ATTR_IMAGE): vol.Match(RE_DOCKER_IMAGE),
+        vol.Optional(ATTR_TIMEOUT, default=10): vol.All(
+            vol.Coerce(int), vol.Range(min=10, max=120)
+        ),
+    },
+    extra=vol.REMOVE_EXTRA,
+)
+
+
+# pylint: disable=no-value-for-parameter
+SCHEMA_BUILD_CONFIG = vol.Schema(
+    {
+        vol.Optional(ATTR_BUILD_FROM, default=dict): vol.Schema(
+            {vol.In(ARCH_ALL): vol.Match(RE_DOCKER_IMAGE_BUILD)}
+        ),
+        vol.Optional(ATTR_SQUASH, default=False): vol.Boolean(),
+        vol.Optional(ATTR_ARGS, default=dict): vol.Schema(
+            {vol.Coerce(str): vol.Coerce(str)}
+        ),
+    },
+    extra=vol.REMOVE_EXTRA,
+)
+
+
+# pylint: disable=no-value-for-parameter
+SCHEMA_ADDON_USER = vol.Schema(
+    {
+        vol.Required(ATTR_VERSION): vol.Coerce(str),
+        vol.Optional(ATTR_IMAGE): vol.Coerce(str),
+        vol.Optional(ATTR_UUID, default=lambda: uuid.uuid4().hex): uuid_match,
+        vol.Optional(ATTR_ACCESS_TOKEN): token,
+        vol.Optional(ATTR_INGRESS_TOKEN, default=secrets.token_urlsafe): vol.Coerce(
+            str
+        ),
+        vol.Optional(ATTR_OPTIONS, default=dict): dict,
+        vol.Optional(ATTR_AUTO_UPDATE, default=False): vol.Boolean(),
+        vol.Optional(ATTR_BOOT): vol.In([BOOT_AUTO, BOOT_MANUAL]),
+        vol.Optional(ATTR_NETWORK): DOCKER_PORTS,
+        vol.Optional(ATTR_AUDIO_OUTPUT): alsa_device,
+        vol.Optional(ATTR_AUDIO_INPUT): alsa_device,
+        vol.Optional(ATTR_PROTECTED, default=True): vol.Boolean(),
+        vol.Optional(ATTR_INGRESS_PANEL, default=False): vol.Boolean(),
+    },
+    extra=vol.REMOVE_EXTRA,
+)
+
+
+SCHEMA_ADDON_SYSTEM = SCHEMA_ADDON_CONFIG.extend(
+    {
+        vol.Required(ATTR_LOCATON): vol.Coerce(str),
+        vol.Required(ATTR_REPOSITORY): vol.Coerce(str),
+    }
+)
+
+
+SCHEMA_ADDONS_FILE = vol.Schema(
+    {
+        vol.Optional(ATTR_USER, default=dict): {vol.Coerce(str): SCHEMA_ADDON_USER},
+        vol.Optional(ATTR_SYSTEM, default=dict): {vol.Coerce(str): SCHEMA_ADDON_SYSTEM},
+    }
+)
+
+
+SCHEMA_ADDON_SNAPSHOT = vol.Schema(
+    {
+        vol.Required(ATTR_USER): SCHEMA_ADDON_USER,
+        vol.Required(ATTR_SYSTEM): SCHEMA_ADDON_SYSTEM,
+        vol.Required(ATTR_STATE): vol.In([STATE_STARTED, STATE_STOPPED]),
+        vol.Required(ATTR_VERSION): vol.Coerce(str),
+    },
+    extra=vol.REMOVE_EXTRA,
+)
+
+
+def validate_options(coresys: CoreSys, raw_schema: Dict[str, Any]):
+    """Validate schema."""
+
+    def validate(struct):
+        """Create schema validator for add-ons options."""
+        options = {}
+
+        # read options
+        for key, value in struct.items():
+            # Ignore unknown options / remove from list
+            if key not in raw_schema:
+                _LOGGER.warning("Unknown options %s", key)
+                continue
+
+            typ = raw_schema[key]
+            try:
+                if isinstance(typ, list):
+                    # nested value list
+                    options[key] = _nested_validate_list(coresys, typ[0], value, key)
+                elif isinstance(typ, dict):
+                    # nested value dict
+                    options[key] = _nested_validate_dict(coresys, typ, value, key)
+                else:
+                    # normal value
+                    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")
+        return options
+
+    return validate
+
+
+# pylint: disable=no-value-for-parameter
+# pylint: disable=inconsistent-return-statements
+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 _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) 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):
+        return vol.All(vol.Coerce(float), vol.Range(**range_args))(value)
+    elif typ.startswith(V_BOOL):
+        return vol.Boolean()(value)
+    elif typ.startswith(V_EMAIL):
+        return vol.Email()(value)
+    elif typ.startswith(V_URL):
+        return vol.Url()(value)
+    elif typ.startswith(V_PORT):
+        return network_port(value)
+    elif typ.startswith(V_MATCH):
+        return vol.Match(match.group("match"))(str(value))
+    elif typ.startswith(V_LIST):
+        return vol.In(match.group("list").split("|"))(str(value))
+
+    raise vol.Invalid(f"Fatal error for {key} type {typ}")
+
+
+def _nested_validate_list(coresys, typ, data_list, key):
+    """Validate nested items."""
+    options = []
+
+    for element in data_list:
+        # Nested?
+        if isinstance(typ, dict):
+            c_options = _nested_validate_dict(coresys, typ, element, key)
+            options.append(c_options)
+        else:
+            options.append(_single_validate(coresys, typ, element, key))
+
+    return options
+
+
+def _nested_validate_dict(coresys, typ, data_dict, key):
+    """Validate nested items."""
+    options = {}
+
+    for c_key, c_value in data_dict.items():
+        # Ignore unknown options / remove from list
+        if c_key not in typ:
+            _LOGGER.warning("Unknown options %s", c_key)
+            continue
+
+        # Nested?
+        if isinstance(typ[c_key], list):
+            options[c_key] = _nested_validate_list(
+                coresys, typ[c_key][0], c_value, c_key
+            )
+        else:
+            options[c_key] = _single_validate(coresys, typ[c_key], c_value, c_key)
+
+    _check_missing_options(typ, options, key)
+    return options
+
+
+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("?"):
+            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

@@ -0,0 +1,345 @@
+"""Init file for Hass.io RESTful API."""
+import logging
+from pathlib import Path
+from typing import Optional
+
+from aiohttp import web
+
+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.Logger = logging.getLogger(__name__)
+
+
+MAX_CLIENT_SIZE: int = 1024 ** 2 * 16
+
+
+class RestAPI(CoreSysAttributes):
+    """Handle RESTful API for Hass.io."""
+
+    def __init__(self, coresys: CoreSys):
+        """Initialize Docker base wrapper."""
+        self.coresys: CoreSys = coresys
+        self.security: SecurityMiddleware = SecurityMiddleware(coresys)
+        self.webapp: web.Application = web.Application(
+            client_max_size=MAX_CLIENT_SIZE,
+            middlewares=[self.security.token_validation],
+        )
+
+        # service stuff
+        self._runner: web.AppRunner = web.AppRunner(self.webapp)
+        self._site: Optional[web.TCPSite] = None
+
+    async def load(self) -> None:
+        """Register REST API Calls."""
+        self._register_supervisor()
+        self._register_host()
+        self._register_hassos()
+        self._register_hardware()
+        self._register_homeassistant()
+        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),
+            ]
+        )
+
+    def _register_hassos(self) -> None:
+        """Register HassOS functions."""
+        api_hassos = APIHassOS()
+        api_hassos.coresys = self.coresys
+
+        self.webapp.add_routes(
+            [
+                web.get("/os/info", api_hassos.info),
+                web.post("/os/update", api_hassos.update),
+                web.post("/os/update/cli", api_hassos.update_cli),
+                web.post("/os/config/sync", api_hassos.config_sync),
+                # Remove with old Hass.io fallback
+                web.get("/hassos/info", api_hassos.info),
+                web.post("/hassos/update", api_hassos.update),
+                web.post("/hassos/update/cli", api_hassos.update_cli),
+                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),
+                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)])
+
+    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), 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),
+                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("/core/info", api_hass.info),
+                web.get("/core/logs", api_hass.logs),
+                web.get("/core/stats", api_hass.stats),
+                web.post("/core/options", api_hass.options),
+                web.post("/core/update", api_hass.update),
+                web.post("/core/restart", api_hass.restart),
+                web.post("/core/stop", api_hass.stop),
+                web.post("/core/start", api_hass.start),
+                web.post("/core/check", api_hass.check),
+                web.post("/core/rebuild", api_hass.rebuild),
+                # Remove with old Hass.io fallback
+                web.get("/homeassistant/info", api_hass.info),
+                web.get("/homeassistant/logs", api_hass.logs),
+                web.get("/homeassistant/stats", api_hass.stats),
+                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("/core/api/websocket", api_proxy.websocket),
+                web.get("/core/websocket", api_proxy.websocket),
+                web.get("/core/api/stream", api_proxy.stream),
+                web.post("/core/api/{path:.+}", api_proxy.api),
+                web.get("/core/api/{path:.+}", api_proxy.api),
+                web.get("/core/api/", api_proxy.api),
+                # Remove with old Hass.io fallback
+                web.get("/homeassistant/api/websocket", api_proxy.websocket),
+                web.get("/homeassistant/websocket", api_proxy.websocket),
+                web.get("/homeassistant/api/stream", api_proxy.stream),
+                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.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),
+            ]
+        )
+
+    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),
+            ]
+        )
+
+    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),
+            ]
+        )
+
+    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")
+        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
+        )
+
+        try:
+            await self._site.start()
+        except OSError as 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)
+
+    async def stop(self) -> None:
+        """Stop RESTful API webserver."""
+        if not self._site:
+            return
+
+        # Shutdown running API
+        await self._site.stop()
+        await self._runner.cleanup()
+
+        _LOGGER.info("Stop API on %s", self.sys_docker.network.supervisor)

hassio/api/addons.py

@@ -0,0 +1,460 @@
+"""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 ..addons import AnyAddon
+from ..addons.addon import Addon
+from ..addons.utils import rating_security
+from ..const import (
+    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,
+    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_VIDEO,
+    ATTR_WEBUI,
+    BOOT_AUTO,
+    BOOT_MANUAL,
+    CONTENT_TYPE_BINARY,
+    CONTENT_TYPE_PNG,
+    CONTENT_TYPE_TEXT,
+    REQUEST_FROM,
+    STATE_NONE,
+)
+from ..coresys import CoreSysAttributes
+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.Logger = logging.getLogger(__name__)
+
+SCHEMA_VERSION = vol.Schema({vol.Optional(ATTR_VERSION): vol.Coerce(str)})
+
+# pylint: disable=no-value-for-parameter
+SCHEMA_OPTIONS = vol.Schema(
+    {
+        vol.Optional(ATTR_BOOT): vol.In([BOOT_AUTO, BOOT_MANUAL]),
+        vol.Optional(ATTR_NETWORK): vol.Any(None, DOCKER_PORTS),
+        vol.Optional(ATTR_AUTO_UPDATE): vol.Boolean(),
+        vol.Optional(ATTR_AUDIO_OUTPUT): alsa_device,
+        vol.Optional(ATTR_AUDIO_INPUT): alsa_device,
+        vol.Optional(ATTR_INGRESS_PANEL): vol.Boolean(),
+    }
+)
+
+# pylint: disable=no-value-for-parameter
+SCHEMA_SECURITY = vol.Schema({vol.Optional(ATTR_PROTECTED): vol.Boolean()})
+
+
+class APIAddons(CoreSysAttributes):
+    """Handle RESTful API for add-on functions."""
+
+    def _extract_addon(
+        self, request: web.Request, check_installed: bool = True
+    ) -> AnyAddon:
+        """Return addon, throw an exception it it doesn't exist."""
+        addon_slug: str = request.match_info.get("addon")
+
+        # Lookup itself
+        if addon_slug == "self":
+            addon = request.get(REQUEST_FROM)
+            if not isinstance(addon, Addon):
+                raise APIError("Self is not an Addon")
+            return addon
+
+        addon = self.sys_addons.get(addon_slug)
+        if not addon:
+            raise APIError("Addon does not exist")
+
+        if check_installed and not addon.is_installed:
+            raise APIError("Addon is not installed")
+
+        return addon
+
+    @api_process
+    async def list(self, request: web.Request) -> Dict[str, Any]:
+        """Return all add-ons or repositories."""
+        data_addons = []
+        for addon in self.sys_addons.all:
+            data_addons.append(
+                {
+                    ATTR_NAME: addon.name,
+                    ATTR_SLUG: addon.slug,
+                    ATTR_DESCRIPTON: addon.description,
+                    ATTR_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_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}
+
+    @api_process
+    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: web.Request) -> Dict[str, Any]:
+        """Return add-on information."""
+        addon: AnyAddon = self._extract_addon(request, check_installed=False)
+
+        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_ADVANCED: addon.advanced,
+            ATTR_STAGE: addon.stage,
+            ATTR_AUTO_UPDATE: None,
+            ATTR_REPOSITORY: addon.repository,
+            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,
+            ATTR_HOST_DBUS: addon.host_dbus,
+            ATTR_PRIVILEGED: addon.privileged,
+            ATTR_FULL_ACCESS: addon.with_full_access,
+            ATTR_APPARMOR: addon.apparmor,
+            ATTR_DEVICES: _pretty_devices(addon),
+            ATTR_ICON: addon.with_icon,
+            ATTR_LOGO: addon.with_logo,
+            ATTR_CHANGELOG: addon.with_changelog,
+            ATTR_DOCUMENTATION: addon.with_documentation,
+            ATTR_STDIN: addon.with_stdin,
+            ATTR_WEBUI: None,
+            ATTR_HASSIO_API: addon.access_hassio_api,
+            ATTR_HASSIO_ROLE: addon.hassio_role,
+            ATTR_AUTH_API: addon.access_auth_api,
+            ATTR_HOMEASSISTANT_API: addon.access_homeassistant_api,
+            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_VIDEO: addon.with_video,
+            ATTR_AUDIO: addon.with_audio,
+            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: web.Request) -> None:
+        """Store user options for add-on."""
+        addon: AnyAddon = self._extract_addon(request)
+
+        # Update secrets for validation
+        await self.sys_secrets.reload()
+
+        # Extend schema with add-on specific validation
+        addon_schema = SCHEMA_OPTIONS.extend(
+            {vol.Optional(ATTR_OPTIONS): vol.Any(None, addon.schema)}
+        )
+
+        # 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:
+            addon.boot = body[ATTR_BOOT]
+        if ATTR_AUTO_UPDATE in body:
+            addon.auto_update = body[ATTR_AUTO_UPDATE]
+        if ATTR_NETWORK in body:
+            addon.ports = body[ATTR_NETWORK]
+        if ATTR_AUDIO_INPUT in body:
+            addon.audio_input = body[ATTR_AUDIO_INPUT]
+        if ATTR_AUDIO_OUTPUT in body:
+            addon.audio_output = body[ATTR_AUDIO_OUTPUT]
+        if ATTR_INGRESS_PANEL in body:
+            addon.ingress_panel = body[ATTR_INGRESS_PANEL]
+            await self.sys_ingress.update_hass_panel(addon)
+
+        addon.save_persist()
+
+    @api_process
+    async def security(self, request: web.Request) -> None:
+        """Store security options for add-on."""
+        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_persist()
+
+    @api_process
+    async def stats(self, request: web.Request) -> Dict[str, Any]:
+        """Return resource information."""
+        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,
+            ATTR_BLK_WRITE: stats.blk_write,
+        }
+
+    @api_process
+    def install(self, request: web.Request) -> Awaitable[None]:
+        """Install add-on."""
+        addon: AnyAddon = self._extract_addon(request, check_installed=False)
+        return asyncio.shield(addon.install())
+
+    @api_process
+    def uninstall(self, request: web.Request) -> Awaitable[None]:
+        """Uninstall add-on."""
+        addon: AnyAddon = self._extract_addon(request)
+        return asyncio.shield(addon.uninstall())
+
+    @api_process
+    def start(self, request: web.Request) -> Awaitable[None]:
+        """Start add-on."""
+        addon: AnyAddon = self._extract_addon(request)
+        return asyncio.shield(addon.start())
+
+    @api_process
+    def stop(self, request: web.Request) -> Awaitable[None]:
+        """Stop add-on."""
+        addon: AnyAddon = self._extract_addon(request)
+        return asyncio.shield(addon.stop())
+
+    @api_process
+    def update(self, request: web.Request) -> Awaitable[None]:
+        """Update add-on."""
+        addon: AnyAddon = self._extract_addon(request)
+
+        if addon.latest_version == addon.version:
+            raise APIError("No update available!")
+
+        return asyncio.shield(addon.update())
+
+    @api_process
+    def restart(self, request: web.Request) -> Awaitable[None]:
+        """Restart add-on."""
+        addon: AnyAddon = self._extract_addon(request)
+        return asyncio.shield(addon.restart())
+
+    @api_process
+    def rebuild(self, request: web.Request) -> Awaitable[None]:
+        """Rebuild local build add-on."""
+        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: web.Request) -> Awaitable[bytes]:
+        """Return logs from add-on."""
+        addon: AnyAddon = self._extract_addon(request)
+        return addon.logs()
+
+    @api_process_raw(CONTENT_TYPE_PNG)
+    async def icon(self, request: web.Request) -> bytes:
+        """Return icon from add-on."""
+        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:
+            return png.read()
+
+    @api_process_raw(CONTENT_TYPE_PNG)
+    async def logo(self, request: web.Request) -> bytes:
+        """Return logo from add-on."""
+        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:
+            return png.read()
+
+    @api_process_raw(CONTENT_TYPE_TEXT)
+    async def changelog(self, request: web.Request) -> str:
+        """Return changelog from add-on."""
+        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:
+            return changelog.read()
+
+    @api_process_raw(CONTENT_TYPE_TEXT)
+    async def documentation(self, request: web.Request) -> str:
+        """Return documentation from add-on."""
+        addon: AnyAddon = self._extract_addon(request, check_installed=False)
+        if not addon.with_documentation:
+            raise APIError("No documentation found!")
+
+        with addon.path_documentation.open("r") as documentation:
+            return documentation.read()
+
+    @api_process
+    async def stdin(self, request: web.Request) -> None:
+        """Write to stdin of add-on."""
+        addon: AnyAddon = self._extract_addon(request)
+        if not addon.with_stdin:
+            raise APIError("STDIN not supported by add-on")
+
+        data = await request.read()
+        await asyncio.shield(addon.write_stdin(data))
+
+
+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]
+
+
+def _pretty_services(addon: AnyAddon) -> List[str]:
+    """Return a simplified services role list."""
+    services = []
+    for name, access in addon.services_role.items():
+        services.append(f"{name}:{access}")
+    return services

hassio/api/auth.py

@@ -1,8 +1,7 @@
-"""Init file for Supervisor auth/SSO RESTful API."""
-
+"""Init file for Hass.io auth/SSO RESTful API."""
 import asyncio
 import logging
-from typing import Any
+from typing import Dict
 
 from aiohttp import BasicAuth, web
 from aiohttp.hdrs import AUTHORIZATION, CONTENT_TYPE, WWW_AUTHENTICATE
@@ -10,34 +9,26 @@ from aiohttp.web_exceptions import HTTPUnauthorized
 import voluptuous as vol
 
 from ..addons.addon import Addon
-from ..const import ATTR_NAME, ATTR_PASSWORD, ATTR_USERNAME, REQUEST_FROM
-from ..coresys import CoreSysAttributes
-from ..exceptions import APIForbidden
-from ..utils.json import json_loads
-from .const import (
-    ATTR_GROUP_IDS,
-    ATTR_IS_ACTIVE,
-    ATTR_IS_OWNER,
-    ATTR_LOCAL_ONLY,
-    ATTR_USERS,
+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.Logger = logging.getLogger(__name__)
 
 SCHEMA_PASSWORD_RESET = vol.Schema(
     {
-        vol.Required(ATTR_USERNAME): str,
-        vol.Required(ATTR_PASSWORD): str,
+        vol.Required(ATTR_USERNAME): vol.Coerce(str),
+        vol.Required(ATTR_PASSWORD): vol.Coerce(str),
     }
 )
 
-REALM_HEADER: dict[str, str] = {
-    WWW_AUTHENTICATE: 'Basic realm="Home Assistant Authentication"'
-}
-
 
 class APIAuth(CoreSysAttributes):
     """Handle RESTful API for auth functions."""
@@ -51,7 +42,7 @@ class APIAuth(CoreSysAttributes):
         return self.sys_auth.check_login(addon, auth.login, auth.password)
 
     def _process_dict(
-        self, request: web.Request, addon: Addon, data: dict[str, str]
+        self, request: web.Request, addon: Addon, data: Dict[str, str]
     ) -> bool:
         """Process login with dict data.
 
@@ -72,13 +63,11 @@ class APIAuth(CoreSysAttributes):
 
         # BasicAuth
         if AUTHORIZATION in request.headers:
-            if not await self._process_basic(request, addon):
-                raise HTTPUnauthorized(headers=REALM_HEADER)
-            return True
+            return await self._process_basic(request, addon)
 
         # Json
         if request.headers.get(CONTENT_TYPE) == CONTENT_TYPE_JSON:
-            data = await request.json(loads=json_loads)
+            data = await request.json()
             return await self._process_dict(request, addon, data)
 
         # URL encoded
@@ -86,35 +75,14 @@ class APIAuth(CoreSysAttributes):
             data = await request.post()
             return await self._process_dict(request, addon, data)
 
-        raise HTTPUnauthorized(headers=REALM_HEADER)
+        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)
+        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])
         )
-
-    @api_process
-    async def cache(self, request: web.Request) -> None:
-        """Process cache reset request."""
-        self.sys_auth.reset_data()
-
-    @api_process
-    async def list_users(self, request: web.Request) -> dict[str, list[dict[str, Any]]]:
-        """List users on the Home Assistant instance."""
-        return {
-            ATTR_USERS: [
-                {
-                    ATTR_USERNAME: user[ATTR_USERNAME],
-                    ATTR_NAME: user[ATTR_NAME],
-                    ATTR_IS_OWNER: user[ATTR_IS_OWNER],
-                    ATTR_IS_ACTIVE: user[ATTR_IS_ACTIVE],
-                    ATTR_LOCAL_ONLY: user[ATTR_LOCAL_ONLY],
-                    ATTR_GROUP_IDS: user[ATTR_GROUP_IDS],
-                }
-                for user in await self.sys_auth.list_users()
-                if user[ATTR_USERNAME]
-            ]
-        }

hassio/api/discovery.py

@@ -1,30 +1,24 @@
-"""Init file for Supervisor network RESTful API."""
-
-import logging
-
+"""Init file for Hass.io network RESTful API."""
 import voluptuous as vol
 
-from ..addons.addon import Addon
+from .utils import api_process, api_validate
 from ..const import (
     ATTR_ADDON,
+    ATTR_UUID,
     ATTR_CONFIG,
     ATTR_DISCOVERY,
     ATTR_SERVICE,
-    ATTR_SERVICES,
-    ATTR_UUID,
     REQUEST_FROM,
-    AddonState,
 )
 from ..coresys import CoreSysAttributes
 from ..exceptions import APIError, APIForbidden
-from .utils import api_process, api_validate, require_home_assistant
+from ..discovery.validate import valid_discovery_service
 
-_LOGGER: logging.Logger = logging.getLogger(__name__)
 
 SCHEMA_DISCOVERY = vol.Schema(
     {
-        vol.Required(ATTR_SERVICE): str,
-        vol.Required(ATTR_CONFIG): dict,
+        vol.Required(ATTR_SERVICE): valid_discovery_service,
+        vol.Optional(ATTR_CONFIG): vol.Maybe(dict),
     }
 )
 
@@ -39,48 +33,38 @@ class APIDiscovery(CoreSysAttributes):
             raise APIError("Discovery message not found")
         return message
 
+    def _check_permission_ha(self, request):
+        """Check permission for API call / Home Assistant."""
+        if request[REQUEST_FROM] != self.sys_homeassistant:
+            raise APIForbidden("Only HomeAssistant can use this API!")
+
     @api_process
-    @require_home_assistant
     async def list(self, request):
-        """Show registered and available services."""
-        # Get available discovery
-        discovery = [
-            {
-                ATTR_ADDON: message.addon,
-                ATTR_SERVICE: message.service,
-                ATTR_UUID: message.uuid,
-                ATTR_CONFIG: message.config,
-            }
-            for message in self.sys_discovery.list_messages
-            if (addon := self.sys_addons.get(message.addon, local_only=True))
-            and addon.state == AddonState.STARTED
-        ]
+        """Show register services."""
+        self._check_permission_ha(request)
 
-        # Get available services/add-ons
-        services = {}
-        for addon in self.sys_addons.all:
-            for name in addon.discovery:
-                services.setdefault(name, []).append(addon.slug)
+        discovery = []
+        for message in self.sys_discovery.list_messages:
+            discovery.append(
+                {
+                    ATTR_ADDON: message.addon,
+                    ATTR_SERVICE: message.service,
+                    ATTR_UUID: message.uuid,
+                    ATTR_CONFIG: message.config,
+                }
+            )
 
-        return {ATTR_DISCOVERY: discovery, ATTR_SERVICES: services}
+        return {ATTR_DISCOVERY: discovery}
 
     @api_process
     async def set_discovery(self, request):
         """Write data into a discovery pipeline."""
         body = await api_validate(SCHEMA_DISCOVERY, request)
-        addon: Addon = request[REQUEST_FROM]
-        service = body[ATTR_SERVICE]
+        addon = request[REQUEST_FROM]
 
         # Access?
         if body[ATTR_SERVICE] not in addon.discovery:
-            _LOGGER.error(
-                "Add-on %s attempted to send discovery for service %s which is not listed in its config. Please report this to the maintainer of the add-on",
-                addon.name,
-                service,
-            )
-            raise APIForbidden(
-                "Add-ons must list services they provide via discovery in their config!"
-            )
+            raise APIForbidden(f"Can't use discovery!")
 
         # Process discovery message
         message = self.sys_discovery.send(addon, **body)
@@ -88,11 +72,13 @@ class APIDiscovery(CoreSysAttributes):
         return {ATTR_UUID: message.uuid}
 
     @api_process
-    @require_home_assistant
     async def get_discovery(self, request):
         """Read data into a discovery message."""
         message = self._extract_message(request)
 
+        # HomeAssistant?
+        self._check_permission_ha(request)
+
         return {
             ATTR_ADDON: message.addon,
             ATTR_SERVICE: message.service,
@@ -108,7 +94,7 @@ class APIDiscovery(CoreSysAttributes):
 
         # Permission
         if message.addon != addon.slug:
-            raise APIForbidden("Can't remove discovery message")
+            raise APIForbidden(f"Can't remove discovery message")
 
         self.sys_discovery.remove(message)
         return True

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

@@ -0,0 +1,51 @@
+"""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,
+)
+from ..coresys import CoreSysAttributes
+
+_LOGGER: logging.Logger = logging.getLogger(__name__)
+
+
+class APIHardware(CoreSysAttributes):
+    """Handle RESTful API for hardware functions."""
+
+    @api_process
+    async def info(self, request: web.Request) -> Dict[str, Any]:
+        """Show hardware info."""
+        return {
+            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),
+            ATTR_AUDIO: self.sys_hardware.audio_devices,
+        }
+
+    @api_process
+    async def audio(self, request: web.Request) -> Dict[str, Any]:
+        """Show ALSA audio devices."""
+        return {
+            ATTR_AUDIO: {
+                ATTR_INPUT: self.sys_host.alsa.input_devices,
+                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

@@ -0,0 +1,59 @@
+"""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 ..const import (
+    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.Logger = logging.getLogger(__name__)
+
+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: web.Request) -> Dict[str, Any]:
+        """Return HassOS information."""
+        return {
+            ATTR_VERSION: self.sys_hassos.version,
+            ATTR_VERSION_CLI: self.sys_hassos.version_cli,
+            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: web.Request) -> None:
+        """Update HassOS."""
+        body = await api_validate(SCHEMA_VERSION, request)
+        version = body.get(ATTR_VERSION, self.sys_hassos.version_latest)
+
+        await asyncio.shield(self.sys_hassos.update(version))
+
+    @api_process
+    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)
+
+        await asyncio.shield(self.sys_hassos.update_cli(version))
+
+    @api_process
+    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

@@ -0,0 +1,163 @@
+"""Init file for Hass.io Home Assistant RESTful API."""
+import asyncio
+import logging
+from typing import Coroutine, Dict, Any
+
+import voluptuous as vol
+from aiohttp import web
+
+from ..const import (
+    ATTR_ARCH,
+    ATTR_BLK_READ,
+    ATTR_BLK_WRITE,
+    ATTR_BOOT,
+    ATTR_CPU_PERCENT,
+    ATTR_CUSTOM,
+    ATTR_IMAGE,
+    ATTR_LAST_VERSION,
+    ATTR_MACHINE,
+    ATTR_MEMORY_LIMIT,
+    ATTR_MEMORY_USAGE,
+    ATTR_MEMORY_PERCENT,
+    ATTR_NETWORK_RX,
+    ATTR_NETWORK_TX,
+    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 .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_BOOT): vol.Boolean(),
+        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)),
+        vol.Optional(ATTR_REFRESH_TOKEN): vol.Maybe(vol.Coerce(str)),
+    }
+)
+
+SCHEMA_VERSION = vol.Schema({vol.Optional(ATTR_VERSION): vol.Coerce(str)})
+
+
+class APIHomeAssistant(CoreSysAttributes):
+    """Handle RESTful API for Home Assistant functions."""
+
+    @api_process
+    async def info(self, request: web.Request) -> Dict[str, Any]:
+        """Return host information."""
+        return {
+            ATTR_VERSION: self.sys_homeassistant.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,
+            ATTR_BOOT: self.sys_homeassistant.boot,
+            ATTR_PORT: self.sys_homeassistant.api_port,
+            ATTR_SSL: self.sys_homeassistant.api_ssl,
+            ATTR_WATCHDOG: self.sys_homeassistant.watchdog,
+            ATTR_WAIT_BOOT: self.sys_homeassistant.wait_boot,
+        }
+
+    @api_process
+    async def options(self, request: web.Request) -> None:
+        """Set Home Assistant options."""
+        body = await api_validate(SCHEMA_OPTIONS, request)
+
+        if ATTR_IMAGE in body and ATTR_LAST_VERSION in body:
+            self.sys_homeassistant.image = body[ATTR_IMAGE]
+            self.sys_homeassistant.latest_version = body[ATTR_LAST_VERSION]
+
+        if ATTR_BOOT in body:
+            self.sys_homeassistant.boot = body[ATTR_BOOT]
+
+        if ATTR_PORT in body:
+            self.sys_homeassistant.api_port = body[ATTR_PORT]
+
+        if ATTR_SSL in body:
+            self.sys_homeassistant.api_ssl = body[ATTR_SSL]
+
+        if ATTR_WATCHDOG in body:
+            self.sys_homeassistant.watchdog = body[ATTR_WATCHDOG]
+
+        if ATTR_WAIT_BOOT in body:
+            self.sys_homeassistant.wait_boot = body[ATTR_WAIT_BOOT]
+
+        if ATTR_REFRESH_TOKEN in body:
+            self.sys_homeassistant.refresh_token = body[ATTR_REFRESH_TOKEN]
+
+        self.sys_homeassistant.save_data()
+
+    @api_process
+    async def stats(self, request: web.Request) -> Dict[Any, str]:
+        """Return resource information."""
+        stats = await self.sys_homeassistant.stats()
+        if not stats:
+            raise APIError("No stats available")
+
+        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 Home Assistant."""
+        body = await api_validate(SCHEMA_VERSION, request)
+        version = body.get(ATTR_VERSION, self.sys_homeassistant.latest_version)
+
+        await asyncio.shield(self.sys_homeassistant.update(version))
+
+    @api_process
+    def stop(self, request: web.Request) -> Coroutine:
+        """Stop Home Assistant."""
+        return asyncio.shield(self.sys_homeassistant.stop())
+
+    @api_process
+    def start(self, request: web.Request) -> Coroutine:
+        """Start Home Assistant."""
+        return asyncio.shield(self.sys_homeassistant.start())
+
+    @api_process
+    def restart(self, request: web.Request) -> Coroutine:
+        """Restart Home Assistant."""
+        return asyncio.shield(self.sys_homeassistant.restart())
+
+    @api_process
+    def rebuild(self, request: web.Request) -> Coroutine:
+        """Rebuild Home Assistant."""
+        return asyncio.shield(self.sys_homeassistant.rebuild())
+
+    @api_process_raw(CONTENT_TYPE_BINARY)
+    def logs(self, request: web.Request) -> Coroutine:
+        """Return Home Assistant Docker logs."""
+        return self.sys_homeassistant.logs()
+
+    @api_process
+    async def check(self, request: web.Request) -> None:
+        """Check configuration of Home Assistant."""
+        result = await self.sys_homeassistant.check_config()
+        if not result.valid:
+            raise APIError(result.log)

hassio/api/host.py

@@ -0,0 +1,109 @@
+"""Init file for Hass.io host RESTful API."""
+import asyncio
+import logging
+
+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,
+)
+from ..coresys import CoreSysAttributes
+
+_LOGGER: logging.Logger = logging.getLogger(__name__)
+
+SERVICE = "service"
+
+SCHEMA_OPTIONS = vol.Schema({vol.Optional(ATTR_HOSTNAME): vol.Coerce(str)})
+
+
+class APIHost(CoreSysAttributes):
+    """Handle RESTful API for host functions."""
+
+    @api_process
+    async def info(self, request):
+        """Return host information."""
+        return {
+            ATTR_CHASSIS: self.sys_host.info.chassis,
+            ATTR_CPE: self.sys_host.info.cpe,
+            ATTR_FEATURES: self.sys_host.supperted_features,
+            ATTR_HOSTNAME: self.sys_host.info.hostname,
+            ATTR_OPERATING_SYSTEM: self.sys_host.info.operating_system,
+            ATTR_DEPLOYMENT: self.sys_host.info.deployment,
+            ATTR_KERNEL: self.sys_host.info.kernel,
+        }
+
+    @api_process
+    async def options(self, request):
+        """Edit host settings."""
+        body = await api_validate(SCHEMA_OPTIONS, request)
+
+        # hostname
+        if ATTR_HOSTNAME in body:
+            await asyncio.shield(
+                self.sys_host.control.set_hostname(body[ATTR_HOSTNAME])
+            )
+
+    @api_process
+    def reboot(self, request):
+        """Reboot host."""
+        return asyncio.shield(self.sys_host.control.reboot())
+
+    @api_process
+    def shutdown(self, request):
+        """Poweroff host."""
+        return asyncio.shield(self.sys_host.control.shutdown())
+
+    @api_process
+    def reload(self, request):
+        """Reload host data."""
+        return asyncio.shield(self.sys_host.reload())
+
+    @api_process
+    async def services(self, request):
+        """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,
+                }
+            )
+
+        return {ATTR_SERVICES: services}
+
+    @api_process
+    def service_start(self, request):
+        """Start a service."""
+        unit = request.match_info.get(SERVICE)
+        return asyncio.shield(self.sys_host.services.start(unit))
+
+    @api_process
+    def service_stop(self, request):
+        """Stop a service."""
+        unit = request.match_info.get(SERVICE)
+        return asyncio.shield(self.sys_host.services.stop(unit))
+
+    @api_process
+    def service_reload(self, request):
+        """Reload a service."""
+        unit = request.match_info.get(SERVICE)
+        return asyncio.shield(self.sys_host.services.reload(unit))
+
+    @api_process
+    def service_restart(self, request):
+        """Restart a service."""
+        unit = request.match_info.get(SERVICE)
+        return asyncio.shield(self.sys_host.services.restart(unit))

hassio/api/info.py

@@ -0,0 +1,42 @@
+"""Init file for Hass.io info RESTful API."""
+import logging
+from typing import Any, Dict
+
+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.Logger = logging.getLogger(__name__)
+
+
+class APIInfo(CoreSysAttributes):
+    """Handle RESTful API for info functions."""
+
+    @api_process
+    async def info(self, request: web.Request) -> Dict[str, Any]:
+        """Show system info."""
+        return {
+            ATTR_SUPERVISOR: self.sys_supervisor.version,
+            ATTR_HOMEASSISTANT: self.sys_homeassistant.version,
+            ATTR_HASSOS: self.sys_hassos.version,
+            ATTR_HOSTNAME: self.sys_host.info.hostname,
+            ATTR_MACHINE: self.sys_machine,
+            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

@@ -1,86 +1,40 @@
-"""Supervisor Add-on ingress service."""
-
+"""Hass.io Add-on ingress service."""
 import asyncio
 from ipaddress import ip_address
 import logging
-from typing import Any
+from typing import Any, Dict, Union
 
 import aiohttp
-from aiohttp import ClientTimeout, hdrs, web
+from aiohttp import hdrs, web
 from aiohttp.web_exceptions import (
     HTTPBadGateway,
     HTTPServiceUnavailable,
     HTTPUnauthorized,
 )
 from multidict import CIMultiDict, istr
-import voluptuous as vol
 
 from ..addons.addon import Addon
 from ..const import (
     ATTR_ADMIN,
-    ATTR_ENABLE,
     ATTR_ICON,
-    ATTR_PANELS,
     ATTR_SESSION,
-    ATTR_SESSION_DATA_USER_ID,
     ATTR_TITLE,
-    HEADER_REMOTE_USER_DISPLAY_NAME,
-    HEADER_REMOTE_USER_ID,
-    HEADER_REMOTE_USER_NAME,
+    ATTR_PANELS,
+    ATTR_ENABLE,
+    COOKIE_INGRESS,
     HEADER_TOKEN,
     HEADER_TOKEN_OLD,
-    IngressSessionData,
-    IngressSessionDataUser,
+    REQUEST_FROM,
 )
 from ..coresys import CoreSysAttributes
-from ..exceptions import HomeAssistantAPIError
-from .const import COOKIE_INGRESS
-from .utils import api_process, api_validate, require_home_assistant
+from .utils import api_process
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)
 
-VALIDATE_SESSION_DATA = vol.Schema({ATTR_SESSION: str})
-
-"""Expected optional payload of create session request"""
-SCHEMA_INGRESS_CREATE_SESSION_DATA = vol.Schema(
-    {
-        vol.Optional(ATTR_SESSION_DATA_USER_ID): str,
-    }
-)
-
-
-# from https://github.com/aio-libs/aiohttp/blob/8ae650bee4add9f131d49b96a0a150311ea58cd1/aiohttp/helpers.py#L1059C1-L1079C1
-def must_be_empty_body(method: str, code: int) -> bool:
-    """Check if a request must return an empty body."""
-    return (
-        status_code_must_be_empty_body(code)
-        or method_must_be_empty_body(method)
-        or (200 <= code < 300 and method.upper() == hdrs.METH_CONNECT)
-    )
-
-
-def method_must_be_empty_body(method: str) -> bool:
-    """Check if a method must return an empty body."""
-    # https://datatracker.ietf.org/doc/html/rfc9112#section-6.3-2.1
-    # https://datatracker.ietf.org/doc/html/rfc9112#section-6.3-2.2
-    return method.upper() == hdrs.METH_HEAD
-
-
-def status_code_must_be_empty_body(code: int) -> bool:
-    """Check if a status code must return an empty body."""
-    # https://datatracker.ietf.org/doc/html/rfc9112#section-6.3-2.1
-    return code in {204, 304} or 100 <= code < 200
-
 
 class APIIngress(CoreSysAttributes):
     """Ingress view to handle add-on webui routing."""
 
-    _list_of_users: list[IngressSessionDataUser]
-
-    def __init__(self) -> None:
-        """Initialize APIIngress."""
-        self._list_of_users = []
-
     def _extract_addon(self, request: web.Request) -> Addon:
         """Return addon, throw an exception it it doesn't exist."""
         token = request.match_info.get("token")
@@ -93,12 +47,17 @@ class APIIngress(CoreSysAttributes):
 
         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]:
+    async def panels(self, request: web.Request) -> Dict[str, Any]:
         """Create a list of panel data."""
         addons = {}
         for addon in self.sys_ingress.addons:
@@ -112,39 +71,18 @@ class APIIngress(CoreSysAttributes):
         return {ATTR_PANELS: addons}
 
     @api_process
-    @require_home_assistant
-    async def create_session(self, request: web.Request) -> dict[str, Any]:
+    async def create_session(self, request: web.Request) -> Dict[str, Any]:
         """Create a new session."""
-        schema_ingress_config_session_data = await api_validate(
-            SCHEMA_INGRESS_CREATE_SESSION_DATA, request
-        )
-        data: IngressSessionData | None = None
+        self._check_ha_access(request)
 
-        if ATTR_SESSION_DATA_USER_ID in schema_ingress_config_session_data:
-            user = await self._find_user_by_id(
-                schema_ingress_config_session_data[ATTR_SESSION_DATA_USER_ID]
-            )
-            if user:
-                data = IngressSessionData(user)
-
-        session = self.sys_ingress.create_session(data)
+        session = self.sys_ingress.create_session()
         return {ATTR_SESSION: session}
 
-    @api_process
-    @require_home_assistant
-    async def validate_session(self, request: web.Request) -> dict[str, Any]:
-        """Validate session and extending how long it's valid for."""
-        data = await api_validate(VALIDATE_SESSION_DATA, request)
-
-        # Check Ingress Session
-        if not self.sys_ingress.validate_session(data[ATTR_SESSION]):
-            _LOGGER.warning("No valid ingress session %s", data[ATTR_SESSION])
-            raise HTTPUnauthorized()
-
     async def handler(
         self, request: web.Request
-    ) -> web.Response | web.StreamResponse | web.WebSocketResponse:
-        """Route data to Supervisor ingress service."""
+    ) -> 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)
@@ -155,26 +93,21 @@ class APIIngress(CoreSysAttributes):
         # Process requests
         addon = self._extract_addon(request)
         path = request.match_info.get("path")
-        session_data = self.sys_ingress.get_session_data(session)
         try:
             # Websocket
             if _is_websocket(request):
-                return await self._handle_websocket(request, addon, path, session_data)
+                return await self._handle_websocket(request, addon, path)
 
             # Request
-            return await self._handle_request(request, addon, path, session_data)
+            return await self._handle_request(request, addon, path)
 
         except aiohttp.ClientError as err:
             _LOGGER.error("Ingress error: %s", err)
 
-        raise HTTPBadGateway()
+        raise HTTPBadGateway() from None
 
     async def _handle_websocket(
-        self,
-        request: web.Request,
-        addon: Addon,
-        path: str,
-        session_data: IngressSessionData | None,
+        self, request: web.Request, addon: Addon, path: str
     ) -> web.WebSocketResponse:
         """Ingress route for websocket."""
         if hdrs.SEC_WEBSOCKET_PROTOCOL in request.headers:
@@ -192,11 +125,11 @@ class APIIngress(CoreSysAttributes):
 
         # Preparing
         url = self._create_url(addon, path)
-        source_header = _init_header(request, addon, session_data)
+        source_header = _init_header(request, addon)
 
         # Support GET query
         if request.query_string:
-            url = f"{url}?{request.query_string}"
+            url = "{}?{}".format(url, request.query_string)
 
         # Start proxy
         async with self.sys_websession.ws_connect(
@@ -209,8 +142,8 @@ class APIIngress(CoreSysAttributes):
             # Proxy requests
             await asyncio.wait(
                 [
-                    self.sys_create_task(_websocket_forward(ws_server, ws_client)),
-                    self.sys_create_task(_websocket_forward(ws_client, ws_server)),
+                    _websocket_forward(ws_server, ws_client),
+                    _websocket_forward(ws_client, ws_server),
                 ],
                 return_when=asyncio.FIRST_COMPLETED,
             )
@@ -218,25 +151,12 @@ class APIIngress(CoreSysAttributes):
         return ws_server
 
     async def _handle_request(
-        self,
-        request: web.Request,
-        addon: Addon,
-        path: str,
-        session_data: IngressSessionData | None,
-    ) -> web.Response | web.StreamResponse:
+        self, request: web.Request, addon: Addon, path: str
+    ) -> Union[web.Response, web.StreamResponse]:
         """Ingress route for request."""
         url = self._create_url(addon, path)
-        source_header = _init_header(request, addon, session_data)
-
-        # Passing the raw stream breaks requests for some webservers
-        # since we just need it for POST requests really, for all other methods
-        # we read the bytes and pass that to the request to the add-on
-        # add-ons needs to add support with that in the configuration
-        data = (
-            request.content
-            if request.method == "POST" and addon.ingress_stream
-            else await request.read()
-        )
+        data = await request.read()
+        source_header = _init_header(request, addon)
 
         async with self.sys_websession.request(
             request.method,
@@ -245,22 +165,12 @@ class APIIngress(CoreSysAttributes):
             params=request.query,
             allow_redirects=False,
             data=data,
-            timeout=ClientTimeout(total=None),
-            skip_auto_headers={hdrs.CONTENT_TYPE},
         ) as result:
             headers = _response_header(result)
-            # Avoid parsing content_type in simple cases for better performance
-            if maybe_content_type := result.headers.get(hdrs.CONTENT_TYPE):
-                content_type = (maybe_content_type.partition(";"))[0].strip()
-            else:
-                content_type = result.content_type
+
             # Simple request
             if (
-                # empty body responses should not be streamed,
-                # otherwise aiohttp < 3.9.0 may generate
-                # an invalid "0\r\n\r\n" chunk instead of an empty response.
-                must_be_empty_body(request.method, result.status)
-                or hdrs.CONTENT_LENGTH in result.headers
+                hdrs.CONTENT_LENGTH in result.headers
                 and int(result.headers.get(hdrs.CONTENT_LENGTH, 0)) < 4_194_000
             ):
                 # Return Response
@@ -268,72 +178,42 @@ class APIIngress(CoreSysAttributes):
                 return web.Response(
                     headers=headers,
                     status=result.status,
-                    content_type=content_type,
+                    content_type=result.content_type,
                     body=body,
                 )
 
             # Stream response
             response = web.StreamResponse(status=result.status, headers=headers)
-            response.content_type = content_type
+            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,
-                ConnectionResetError,
-            ) as err:
+            except (aiohttp.ClientError, aiohttp.ClientPayloadError) as err:
                 _LOGGER.error("Stream error with %s: %s", url, err)
 
             return response
 
-    async def _find_user_by_id(self, user_id: str) -> IngressSessionDataUser | None:
-        """Find user object by the user's ID."""
-        try:
-            list_of_users = await self.sys_homeassistant.get_users()
-        except (HomeAssistantAPIError, TypeError) as err:
-            _LOGGER.error(
-                "%s error occurred while requesting list of users: %s", type(err), err
-            )
-            return None
-
-        if list_of_users is not None:
-            self._list_of_users = list_of_users
-
-        return next((user for user in self._list_of_users if user.id == user_id), None)
-
 
 def _init_header(
-    request: web.Request, addon: Addon, session_data: IngressSessionData | None
-) -> CIMultiDict | dict[str, str]:
+    request: web.Request, addon: str
+) -> Union[CIMultiDict, Dict[str, str]]:
     """Create initial header."""
     headers = {}
 
-    if session_data is not None:
-        headers[HEADER_REMOTE_USER_ID] = session_data.user.id
-        if session_data.user.username is not None:
-            headers[HEADER_REMOTE_USER_NAME] = session_data.user.username
-        if session_data.user.display_name is not None:
-            headers[HEADER_REMOTE_USER_DISPLAY_NAME] = session_data.user.display_name
-
     # filter flags
     for name, value in request.headers.items():
         if name in (
             hdrs.CONTENT_LENGTH,
             hdrs.CONTENT_ENCODING,
-            hdrs.TRANSFER_ENCODING,
             hdrs.SEC_WEBSOCKET_EXTENSIONS,
             hdrs.SEC_WEBSOCKET_PROTOCOL,
             hdrs.SEC_WEBSOCKET_VERSION,
             hdrs.SEC_WEBSOCKET_KEY,
             istr(HEADER_TOKEN),
             istr(HEADER_TOKEN_OLD),
-            istr(HEADER_REMOTE_USER_ID),
-            istr(HEADER_REMOTE_USER_NAME),
-            istr(HEADER_REMOTE_USER_DISPLAY_NAME),
         ):
             continue
         headers[name] = value
@@ -346,7 +226,7 @@ def _init_header(
     return headers
 
 
-def _response_header(response: aiohttp.ClientResponse) -> dict[str, str]:
+def _response_header(response: aiohttp.ClientResponse) -> Dict[str, str]:
     """Create response header."""
     headers = {}
 

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