Merge pull request #2141 from home-assistant/dev

Release 248

.devcontainer/Dockerfile

@@ -0,0 +1,49 @@
+FROM mcr.microsoft.com/vscode/devcontainers/python:0-3.8
+
+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/nvm-sh/nvm/v0.35.3/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 tools
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        jq \
+        dbus \
+        network-manager \
+        libpulse0 \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install Python dependencies from requirements.txt if it exists
+COPY requirements.txt requirements_tests.txt ./
+RUN pip3 install -U setuptools pip \
+    && pip3 install -r requirements.txt -r requirements_tests.txt \
+    && pip3 install tox \
+    && rm -f requirements.txt requirements_tests.txt

.devcontainer/devcontainer.json

@@ -0,0 +1,32 @@
+{
+  "name": "Supervisor dev",
+  "context": "..",
+  "dockerFile": "Dockerfile",
+  "appPort": "9123:8123",
+  "postCreateCommand": "pre-commit install",
+  "runArgs": ["-e", "GIT_EDITOR=code --wait", "--privileged"],
+  "extensions": [
+    "ms-python.python",
+    "ms-python.vscode-pylance",
+    "visualstudioexptteam.vscodeintellicode",
+    "esbenp.prettier-vscode"
+  ],
+  "settings": {
+    "terminal.integrated.shell.linux": "/bin/bash",
+    "editor.formatOnPaste": false,
+    "editor.formatOnSave": true,
+    "editor.formatOnType": true,
+    "files.trimTrailingWhitespace": true,
+    "python.pythonPath": "/usr/local/bin/python3",
+    "python.linting.pylintEnabled": true,
+    "python.linting.enabled": true,
+    "python.formatting.provider": "black",
+    "python.formatting.blackArgs": ["--target-version", "py38"],
+    "python.formatting.blackPath": "/usr/local/bin/black",
+    "python.linting.banditPath": "/usr/local/bin/bandit",
+    "python.linting.flake8Path": "/usr/local/bin/flake8",
+    "python.linting.mypyPath": "/usr/local/bin/mypy",
+    "python.linting.pylintPath": "/usr/local/bin/pylint",
+    "python.linting.pydocstylePath": "/usr/local/bin/pydocstyle"
+  }
+}

.dockerignore

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

.github/ISSUE_TEMPLATE.md

@@ -1,15 +1,15 @@
 <!-- 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
+- Make sure you are running the latest version of Home Assistant before reporting an issue: https://github.com/home-assistant/core/releases
+- Do not report issues for integrations here, please refer to https://github.com/home-assistant/core/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 a Add-on, make a issue on there repository.
+- If you have a problem with an add-on, make an issue in its repository.
 -->
 
 **Home Assistant release with the issue:**
 <!--
-- Frontend -> Developer tools -> Info
+- Frontend -> Configuration -> Info
 - Or use this command: hass --version
 -->
 
@@ -20,10 +20,9 @@ Please provide details about your environment.
 
 **Supervisor logs:**
 <!--
-- Frontend -> Hass.io -> System
-- Or use this command: hassio su logs
+- Frontend -> Supervisor -> System
+- Or use this command: ha supervisor logs
 -->
 
 
 **Description of problem:**
-

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,68 @@
+<!--
+  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:
+
+## 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 Black (`black --fast supervisor tests`)
+- [ ] Tests have been added to verify that the new code works.
+
+If API endpoints of add-on configuration are added/changed:
+
+- [ ] Documentation added/updated for [developers.home-assistant.io][docs-repository]
+
+<!--
+  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

.github/dependabot.yml

@@ -0,0 +1,14 @@
+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/stale.yml

@@ -0,0 +1,18 @@
+# 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
+  - rfc
+# Label to use when marking an issue as stale
+staleLabel: stale
+# 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/ci.yaml

@@ -0,0 +1,432 @@
+name: CI
+
+# yamllint disable-line rule:truthy
+on:
+  push:
+    branches:
+      - dev
+      - master
+  pull_request: ~
+
+env:
+  DEFAULT_PYTHON: 3.8
+  PRE_COMMIT_HOME: ~/.cache/pre-commit
+
+jobs:
+  # Separate job to pre-populate the base dependency cache
+  # This prevent upcoming jobs to do the same individually
+  prepare:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.8]
+    name: Prepare Python ${{ matrix.python-version }} dependencies
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        id: python
+        uses: actions/setup-python@v2.1.4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Restore Python virtual environment
+        id: cache-venv
+        uses: actions/cache@v2
+        with:
+          path: venv
+          key: |
+            ${{ runner.os }}-venv-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-venv-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements.txt') }}
+            ${{ runner.os }}-venv-${{ steps.python.outputs.python-version }}-
+      - 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@v2
+        with:
+          path: ${{ env.PRE_COMMIT_HOME }}
+          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-black:
+    name: Check black
+    runs-on: ubuntu-latest
+    needs: prepare
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@v2
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        uses: actions/setup-python@v2.1.4
+        id: python
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+      - name: Restore Python virtual environment
+        id: cache-venv
+        uses: actions/cache@v2
+        with:
+          path: venv
+          key: |
+            ${{ runner.os }}-venv-${{ steps.python.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: Run black
+        run: |
+          . venv/bin/activate
+          black --target-version py38 --check supervisor tests setup.py
+
+  lint-dockerfile:
+    name: Check Dockerfile
+    runs-on: ubuntu-latest
+    needs: prepare
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@v2
+      - 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@v2
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        uses: actions/setup-python@v2.1.4
+        id: python
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+      - name: Restore Python virtual environment
+        id: cache-venv
+        uses: actions/cache@v2
+        with:
+          path: venv
+          key: |
+            ${{ runner.os }}-venv-${{ steps.python.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@v2
+        with:
+          path: ${{ env.PRE_COMMIT_HOME }}
+          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-flake8:
+    name: Check flake8
+    runs-on: ubuntu-latest
+    needs: prepare
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@v2
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        uses: actions/setup-python@v2.1.4
+        id: python
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+      - name: Restore Python virtual environment
+        id: cache-venv
+        uses: actions/cache@v2
+        with:
+          path: venv
+          key: |
+            ${{ runner.os }}-venv-${{ steps.python.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 flake8 problem matcher
+        run: |
+          echo "::add-matcher::.github/workflows/matchers/flake8.json"
+      - name: Run flake8
+        run: |
+          . venv/bin/activate
+          flake8 supervisor tests
+
+  lint-isort:
+    name: Check isort
+    runs-on: ubuntu-latest
+    needs: prepare
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@v2
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        uses: actions/setup-python@v2.1.4
+        id: python
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+      - name: Restore Python virtual environment
+        id: cache-venv
+        uses: actions/cache@v2
+        with:
+          path: venv
+          key: |
+            ${{ runner.os }}-venv-${{ steps.python.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@v2
+        with:
+          path: ${{ env.PRE_COMMIT_HOME }}
+          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 isort
+        run: |
+          . venv/bin/activate
+          pre-commit run --hook-stage manual isort --all-files --show-diff-on-failure
+
+  lint-json:
+    name: Check JSON
+    runs-on: ubuntu-latest
+    needs: prepare
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@v2
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        uses: actions/setup-python@v2.1.4
+        id: python
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+      - name: Restore Python virtual environment
+        id: cache-venv
+        uses: actions/cache@v2
+        with:
+          path: venv
+          key: |
+            ${{ runner.os }}-venv-${{ steps.python.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@v2
+        with:
+          path: ${{ env.PRE_COMMIT_HOME }}
+          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@v2
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        uses: actions/setup-python@v2.1.4
+        id: python
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+      - name: Restore Python virtual environment
+        id: cache-venv
+        uses: actions/cache@v2
+        with:
+          path: venv
+          key: |
+            ${{ runner.os }}-venv-${{ steps.python.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
+
+  lint-pyupgrade:
+    name: Check pyupgrade
+    runs-on: ubuntu-latest
+    needs: prepare
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@v2
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        uses: actions/setup-python@v2.1.4
+        id: python
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+      - name: Restore Python virtual environment
+        id: cache-venv
+        uses: actions/cache@v2
+        with:
+          path: venv
+          key: |
+            ${{ runner.os }}-venv-${{ steps.python.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@v2
+        with:
+          path: ${{ env.PRE_COMMIT_HOME }}
+          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 pyupgrade
+        run: |
+          . venv/bin/activate
+          pre-commit run --hook-stage manual pyupgrade --all-files --show-diff-on-failure
+
+  pytest:
+    runs-on: ubuntu-latest
+    needs: prepare
+    strategy:
+      matrix:
+        python-version: [3.8]
+    name: Run tests Python ${{ matrix.python-version }}
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2.1.4
+        id: python
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Restore Python virtual environment
+        id: cache-venv
+        uses: actions/cache@v2
+        with:
+          path: venv
+          key: |
+            ${{ runner.os }}-venv-${{ steps.python.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
+      - 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@v2.2.0
+        with:
+          name: coverage-${{ matrix.python-version }}
+          path: .coverage
+
+  coverage:
+    name: Process test coverage
+    runs-on: ubuntu-latest
+    needs: pytest
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@v2
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        uses: actions/setup-python@v2.1.4
+        id: python
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+      - name: Restore Python virtual environment
+        id: cache-venv
+        uses: actions/cache@v2
+        with:
+          path: venv
+          key: |
+            ${{ runner.os }}-venv-${{ steps.python.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@v2
+      - 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@v1.0.13

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

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

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

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

.github/workflows/matchers/flake8.json

@@ -0,0 +1,30 @@
+{
+  "problemMatcher": [
+    {
+      "owner": "flake8-error",
+      "severity": "error",
+      "pattern": [
+        {
+          "regexp": "^(.*):(\\d+):(\\d+):\\s(E\\d{3}\\s.*)$",
+          "file": 1,
+          "line": 2,
+          "column": 3,
+          "message": 4
+        }
+      ]
+    },
+    {
+      "owner": "flake8-warning",
+      "severity": "warning",
+      "pattern": [
+        {
+          "regexp": "^(.*):(\\d+):(\\d+):\\s([CDFNW]\\d{3}\\s.*)$",
+          "file": 1,
+          "line": 2,
+          "column": 3,
+          "message": 4
+        }
+      ]
+    }
+  ]
+}

.github/workflows/matchers/hadolint.json

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

.github/workflows/matchers/pylint.json

@@ -0,0 +1,32 @@
+{
+  "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

@@ -0,0 +1,18 @@
+{
+  "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

@@ -0,0 +1,15 @@
+name: Release Drafter
+
+on:
+  push:
+    # branches to consider in the event; optional, defaults to all
+    branches:
+      - dev
+
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: release-drafter/release-drafter@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sentry.yaml

@@ -0,0 +1,21 @@
+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@v2
+      - name: Sentry Release
+        uses: getsentry/action-release@v1.1
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+        with:
+          environment: production

.gitignore

@@ -92,4 +92,11 @@ ENV/
 .pylint.d/
 
 # VS Code
-.vscode/
+.vscode/*
+!.vscode/cSpell.json
+!.vscode/tasks.json
+!.vscode/launch.json
+
+# mypy
+/.mypy_cache/*
+/.dmypy.json

.hadolint.yaml

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

.pre-commit-config.yaml

@@ -0,0 +1,34 @@
+repos:
+  - repo: https://github.com/psf/black
+    rev: 20.8b1
+    hooks:
+      - id: black
+        args:
+          - --safe
+          - --quiet
+          - --target-version
+          - py38
+        files: ^((supervisor|tests)/.+)?[^/]+\.py$
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 3.8.3
+    hooks:
+      - id: flake8
+        additional_dependencies:
+          - flake8-docstrings==1.5.0
+          - pydocstyle==5.0.2
+        files: ^(supervisor|script|tests)/.+\.py$
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.1.0
+    hooks:
+      - id: check-executables-have-shebangs
+        stages: [manual]
+      - id: check-json
+  - repo: https://github.com/pre-commit/mirrors-isort
+    rev: v4.3.21
+    hooks:
+      - id: isort
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v2.6.2
+    hooks:
+      - id: pyupgrade
+        args: [--py37-plus]

.vscode/launch.json

@@ -0,0 +1,18 @@
+{
+  "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"
+        }
+      ]
+    }
+  ]
+}

.vscode/tasks.json

@@ -0,0 +1,90 @@
+{
+  "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 exec -ti hassio_cli /usr/bin/cli.sh",
+      "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 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": []
+    }
+  ]
+}

API.md

@@ -1,724 +0,0 @@
-# Hass.io
-
-## Hass.io 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 set the `X-HASSIO-KEY` they will be available for Add-ons/HomeAssistant with environment `HASSIO_TOKEN`.
-
-### Hass.io
-
-- 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",
-    "addons": [
-        {
-            "name": "xy bla",
-            "slug": "xy",
-            "description": "description",
-            "repository": "12345678|null",
-            "version": "LAST_VERSION",
-            "installed": "INSTALL_VERSION",
-            "icon": "bool",
-            "logo": "bool",
-            "state": "started|stopped",
-        }
-    ],
-    "addons_repositories": [
-        "REPO_URL"
-    ]
-}
-```
-
-- POST `/supervisor/update`
-
-Optional:
-
-```json
-{
-    "version": "VERSION"
-}
-```
-
-- POST `/supervisor/options`
-
-```json
-{
-    "channel": "stable|beta|dev",
-    "timezone": "TIMEZONE",
-    "wait_boot": "int",
-    "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,
-    "network_tx": 0,
-    "network_rx": 0,
-    "blk_read": 0,
-    "blk_write": 0
-}
-```
-
-### 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 `/hassos/info`
-```json
-{
-    "version": "2.3",
-    "version_cli": "7",
-    "version_latest": "2.4",
-    "version_cli_latest": "8",
-    "board": "ova|rpi"
-}
-```
-
-- POST `/hassos/update`
-```json
-{
-    "version": "optional"
-}
-```
-
-- POST `/hassos/update/cli`
-```json
-{
-    "version": "optional"
-}
-```
-
-- POST `/hassos/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"
-        }
-    }
-}
-```
-
-### Home Assistant
-
-- GET `/homeassistant/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 `/homeassistant/update`
-
-Optional:
-
-```json
-{
-    "version": "VERSION"
-}
-```
-
-- GET `/homeassistant/logs`
-
-Output is the raw Docker log.
-
-- POST `/homeassistant/restart`
-- POST `/homeassistant/check`
-- POST `/homeassistant/start`
-- POST `/homeassistant/stop`
-- POST `/homeassistant/rebuild`
-
-- POST `/homeassistant/options`
-
-```json
-{
-    "image": "Optional|null",
-    "last_version": "Optional for custom image|null",
-    "port": "port for access hass",
-    "ssl": "bool",
-    "password": "",
-    "refresh_token": "",
-    "watchdog": "bool",
-    "wait_boot": 600
-}
-```
-
-Image with `null` and last_version with `null` reset this options.
-
-- POST/GET `/homeassistant/api`
-
-Proxy to real home-assistant instance.
-
-- GET `/homeassistant/websocket`
-
-Proxy to real websocket instance.
-
-- GET `/homeassistant/stats`
-```json
-{
-    "cpu_percent": 0.0,
-    "memory_usage": 283123,
-    "memory_limit": 329392,
-    "network_tx": 0,
-    "network_rx": 0,
-    "blk_read": 0,
-    "blk_write": 0
-}
-```
-
-### RESTful for API addons
-
-If an add-on will call itself, you can use `/addons/self/...`.
-
-- GET `/addons`
-
-Get all available addons.
-
-```json
-{
-    "addons": [
-        {
-            "name": "xy bla",
-            "slug": "xy",
-            "description": "description",
-            "repository": "core|local|REP_ID",
-            "version": "LAST_VERSION",
-            "installed": "none|INSTALL_VERSION",
-            "detached": "bool",
-            "available": "bool",
-            "build": "bool",
-            "url": "null|url",
-            "icon": "bool",
-            "logo": "bool"
-        }
-    ],
-    "repositories": [
-        {
-            "slug": "12345678",
-            "name": "Repitory Name|unknown",
-            "source": "URL_OF_REPOSITORY",
-            "url": "WEBSITE|REPOSITORY",
-            "maintainer": "BLA BLU <fla@dld.ch>|unknown"
-        }
-    ]
-}
-```
-
-- POST `/addons/reload`
-- GET `/addons/{addon}/info`
-
-```json
-{
-    "name": "xy bla",
-    "slug": "xdssd_xybla",
-    "description": "description",
-    "long_description": "null|markdown",
-    "auto_update": "bool",
-    "url": "null|url of addon",
-    "detached": "bool",
-    "available": "bool",
-    "arch": ["armhf", "aarch64", "i386", "amd64"],
-    "machine": "[raspberrypi2, tinker]",
-    "homeassistant": "null|min Home Assistant version",
-    "repository": "12345678|null",
-    "version": "null|VERSION_INSTALLED",
-    "last_version": "LAST_VERSION",
-    "state": "none|started|stopped",
-    "boot": "auto|manual",
-    "build": "bool",
-    "options": "{}",
-    "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"],
-    "auto_uart": "bool",
-    "icon": "bool",
-    "logo": "bool",
-    "changelog": "bool",
-    "hassio_api": "bool",
-    "hassio_role": "default|homeassistant|manager|admin",
-    "homeassistant_api": "bool",
-    "auth_api": "bool",
-    "full_access": "bool",
-    "protected": "bool",
-    "rating": "1-6",
-    "stdin": "bool",
-    "webui": "null|http(s)://[HOST]:port/xy/zx",
-    "gpio": "bool",
-    "kernel_modules": "bool",
-    "devicetree": "bool",
-    "docker_api": "bool",
-    "audio": "bool",
-    "audio_input": "null|0,0",
-    "audio_output": "null|0,0",
-    "services_role": "['service:access']",
-    "discovery": "['service']",
-    "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"
-}
-```
-
-- GET `/addons/{addon}/icon`
-
-- GET `/addons/{addon}/logo`
-
-- GET `/addons/{addon}/changelog`
-
-- 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"
-}
-```
-
-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,
-    "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"
-}
-```
-
-- 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`
-
-### 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"
-}
-```
-
-### 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

Dockerfile

@@ -1,33 +1,40 @@
 ARG BUILD_FROM
 FROM $BUILD_FROM
 
+ENV \
+    S6_SERVICES_GRACETIME=10000 \
+    SUPERVISOR_API=http://localhost
+
 # Install base
-RUN apk add --no-cache \
-    openssl \
-    libffi \
-    musl \
-    git \
-    socat \
-    glib \
-    libstdc++ \
-    eudev-libs
+RUN \
+    apk add --no-cache \
+        eudev \
+        eudev-libs \
+        git \
+        glib \
+        libffi \
+        libpulse \
+        musl \
+        openssl
+
+ARG BUILD_ARCH
+WORKDIR /usr/src
 
 # Install requirements
-COPY requirements.txt /usr/src/
-RUN apk add --no-cache --virtual .build-dependencies \
-    make \
-    g++ \
-    openssl-dev \
-    libffi-dev \
-    musl-dev \
-    && export MAKEFLAGS="-j$(nproc)" \
-    && pip3 install --no-cache-dir -r /usr/src/requirements.txt \
-    && apk del .build-dependencies \
-    && rm -f /usr/src/requirements.txt
+COPY requirements.txt .
+RUN \
+    export MAKEFLAGS="-j$(nproc)" \
+    && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links \
+        "https://wheels.home-assistant.io/alpine-$(cut -d '.' -f 1-2 < /etc/alpine-release)/${BUILD_ARCH}/" \
+        -r ./requirements.txt \
+    && rm -f requirements.txt
 
-# Install HassIO
-COPY . /usr/src/hassio
-RUN pip3 install --no-cache-dir /usr/src/hassio \
-    && rm -rf /usr/src/hassio
+# Install Home Assistant Supervisor
+COPY . supervisor
+RUN \
+    pip3 install --no-cache-dir -e ./supervisor \
+    && python3 -m compileall ./supervisor/supervisor
 
-CMD [ "python3", "-m", "hassio" ]
+
+WORKDIR /
+COPY rootfs /

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 2017 Pascal Vizeli
+   Copyright [yyyy] [name of copyright owner]
 
    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 hassio
+graft supervisor
 recursive-exclude * *.py[co]

README.md

@@ -1,28 +1,26 @@
-# Hass.io
+# Home Assistant Supervisor
 
 ## First private cloud solution for home automation
 
-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)
+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.
 
 ## Installation
 
-Installation instructions can be found at <https://home-assistant.io/hassio>.
+Installation instructions can be found at https://home-assistant.io/hassio.
 
 ## Development
 
-The development of the supervisor is a bit tricky. Not difficult but tricky.
+The development of the Supervisor is not difficult but tricky.
 
-- You can use the builder to build your supervisor: https://github.com/home-assistant/hassio-build/tree/master/builder
-- Go into a HassOS device or VM and pull your supervisor.
-- Set the developer modus on updater.json
+- You can use the builder to create your Supervisor: https://github.com/home-assistant/hassio-builder
+- Access a HassOS device or VM and pull your Supervisor.
+- Set the developer modus with the CLI tool: `ha supervisor options --channel=dev`
 - Tag it as `homeassistant/xy-hassio-supervisor:latest`
-- Restart the service like `systemctl restart hassos-supervisor | journalctl -fu hassos-supervisor`
+- Restart the service with `systemctl restart hassos-supervisor | journalctl -fu hassos-supervisor`
 - Test your changes
 
-Small Bugfix or improvements, make a PR. Significant change makes first an RFC.
+For small bugfixes or improvements, make a PR. For significant changes open a RFC first, please. Thanks.

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.8"
+        inputs:
+          versionSpec: "3.8"
+      - 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,27 @@
+# https://dev.azure.com/home-assistant
+
+trigger:
+  batch: true
+  branches:
+    include:
+      - dev
+pr: none
+variables:
+  - name: versionWheels
+    value: '1.13.0-3.8-alpine3.12'
+resources:
+  repositories:
+    - repository: azure
+      type: github
+      name: 'home-assistant/ci-azure'
+      endpoint: 'home-assistant'
+
+
+jobs:
+- template: templates/azp-job-wheels.yaml@azure
+  parameters:
+    builderVersion: '$(versionWheels)'
+    builderApk: 'build-base;libffi-dev;openssl-dev'
+    builderPip: 'Cython'
+    skipBinary: 'aiohttp'
+    wheelsRequirement: 'requirements.txt'

azure-pipelines.yml

@@ -1,45 +0,0 @@
-# Python package
-# Create and test a Python package on multiple Python versions.
-# Add steps that analyze code, save the dist with the build record, publish to a PyPI-compatible index, and more:
-# https://docs.microsoft.com/azure/devops/pipelines/languages/python
-
-trigger:
-- master
-- dev
-
-pr:
-- dev
-
-jobs:
-
-- job: "Tox"
-
-  pool:
-    vmImage: 'ubuntu-16.04'
-
-  steps:
-  - task: UsePythonVersion@0
-    displayName: 'Use Python $(python.version)'
-    inputs:
-      versionSpec: '3.7'
-
-  - script: pip install tox
-    displayName: 'Install Tox'
-
-  - script: tox
-    displayName: 'Run Tox'
-
-
-- job: "JQ"
-
-  pool:
-    vmImage: 'ubuntu-16.04'
-
-  steps:
-  - script: sudo apt-get install -y jq
-    displayName: 'Install JQ'
-
-  - bash: |
-      shopt -s globstar
-      cat **/*.json | jq '.'
-    displayName: 'Run JQ'

build.json

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

codecov.yaml

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

hassio/__init__.py

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

hassio/addons/__init__.py

@@ -1,158 +0,0 @@
-"""Init file for Hass.io add-ons."""
-import asyncio
-import logging
-
-from .addon import Addon
-from .repository import Repository
-from .data import AddonsData
-from ..const import REPOSITORY_CORE, REPOSITORY_LOCAL, BOOT_AUTO, STATE_STARTED
-from ..coresys import CoreSysAttributes
-
-_LOGGER = logging.getLogger(__name__)
-
-BUILTIN_REPOSITORIES = set((REPOSITORY_CORE, REPOSITORY_LOCAL))
-
-
-class AddonManager(CoreSysAttributes):
-    """Manage add-ons inside Hass.io."""
-
-    def __init__(self, coresys):
-        """Initialize Docker base wrapper."""
-        self.coresys = coresys
-        self.data = AddonsData(coresys)
-        self.addons_obj = {}
-        self.repositories_obj = {}
-
-    @property
-    def list_addons(self):
-        """Return a list of all add-ons."""
-        return list(self.addons_obj.values())
-
-    @property
-    def list_installed(self):
-        """Return a list of installed add-ons."""
-        return [addon for addon in self.addons_obj.values()
-                if addon.is_installed]
-
-    @property
-    def list_repositories(self):
-        """Return list of add-on repositories."""
-        return list(self.repositories_obj.values())
-
-    def get(self, addon_slug):
-        """Return an add-on from slug."""
-        return self.addons_obj.get(addon_slug)
-
-    def from_token(self, token):
-        """Return an add-on from Hass.io token."""
-        for addon in self.list_addons:
-            if addon.is_installed and token == addon.hassio_token:
-                return addon
-        return None
-
-    async def load(self):
-        """Start up add-on management."""
-        self.data.reload()
-
-        # Init Hass.io built-in repositories
-        repositories = \
-            set(self.sys_config.addons_repositories) | BUILTIN_REPOSITORIES
-
-        # Init custom repositories and load add-ons
-        await self.load_repositories(repositories)
-
-    async def reload(self):
-        """Update add-ons from repository and reload list."""
-        tasks = [repository.update() for repository in
-                 self.repositories_obj.values()]
-        if tasks:
-            await asyncio.wait(tasks)
-
-        # read data from repositories
-        self.data.reload()
-
-        # update addons
-        await self.load_addons()
-
-    async def load_repositories(self, list_repositories):
-        """Add a new custom repository."""
-        new_rep = set(list_repositories)
-        old_rep = set(self.repositories_obj)
-
-        # add new repository
-        async def _add_repository(url):
-            """Helper function to async add repository."""
-            repository = Repository(self.coresys, url)
-            if not await repository.load():
-                _LOGGER.error("Can't load from repository %s", url)
-                return
-            self.repositories_obj[url] = repository
-
-            # don't add built-in repository to config
-            if url not in BUILTIN_REPOSITORIES:
-                self.sys_config.add_addon_repository(url)
-
-        tasks = [_add_repository(url) for url in new_rep - old_rep]
-        if tasks:
-            await asyncio.wait(tasks)
-
-        # del new repository
-        for url in old_rep - new_rep - BUILTIN_REPOSITORIES:
-            self.repositories_obj.pop(url).remove()
-            self.sys_config.drop_addon_repository(url)
-
-        # update data
-        self.data.reload()
-        await self.load_addons()
-
-    async def load_addons(self):
-        """Update/add internal add-on store."""
-        all_addons = set(self.data.system) | set(self.data.cache)
-
-        # calc diff
-        add_addons = all_addons - set(self.addons_obj)
-        del_addons = set(self.addons_obj) - all_addons
-
-        _LOGGER.info("Load add-ons: %d all - %d new - %d remove",
-                     len(all_addons), len(add_addons), len(del_addons))
-
-        # new addons
-        tasks = []
-        for addon_slug in add_addons:
-            addon = Addon(self.coresys, addon_slug)
-
-            tasks.append(addon.load())
-            self.addons_obj[addon_slug] = addon
-
-        if tasks:
-            await asyncio.wait(tasks)
-
-        # remove
-        for addon_slug in del_addons:
-            self.addons_obj.pop(addon_slug)
-
-    async def boot(self, stage):
-        """Boot add-ons with mode auto."""
-        tasks = []
-        for addon in self.addons_obj.values():
-            if addon.is_installed and addon.boot == BOOT_AUTO and \
-                    addon.startup == stage:
-                tasks.append(addon.start())
-
-        _LOGGER.info("Startup %s run %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):
-        """Shutdown addons."""
-        tasks = []
-        for addon in self.addons_obj.values():
-            if addon.is_installed and \
-                    await addon.state() == STATE_STARTED and \
-                    addon.startup == stage:
-                tasks.append(addon.stop())
-
-        _LOGGER.info("Shutdown %s stop %d add-ons", stage, len(tasks))
-        if tasks:
-            await asyncio.wait(tasks)

hassio/addons/git.py

@@ -1,155 +0,0 @@
-"""Init file for Hass.io add-on Git."""
-import asyncio
-import logging
-import functools as ft
-from pathlib import Path
-import shutil
-
-import git
-
-from .utils import get_hash_from_repository
-from ..const import URL_HASSIO_ADDONS, ATTR_URL, ATTR_BRANCH
-from ..coresys import CoreSysAttributes
-from ..validate import RE_REPOSITORY
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class GitRepo(CoreSysAttributes):
-    """Manage Add-on Git repository."""
-
-    def __init__(self, coresys, path, url):
-        """Initialize Git base wrapper."""
-        self.coresys = coresys
-        self.repo = None
-        self.path = path
-        self.lock = asyncio.Lock(loop=coresys.loop)
-
-        self._data = RE_REPOSITORY.match(url).groupdict()
-
-    @property
-    def url(self):
-        """Return repository URL."""
-        return self._data[ATTR_URL]
-
-    @property
-    def branch(self):
-        """Return repository branch."""
-        return self._data[ATTR_BRANCH]
-
-    async def load(self):
-        """Init Git add-on repository."""
-        if not self.path.is_dir():
-            return await self.clone()
-
-        async with self.lock:
-            try:
-                _LOGGER.info("Load add-on %s repository", self.path)
-                self.repo = await self.sys_run_in_executor(
-                    git.Repo, str(self.path))
-
-            except (git.InvalidGitRepositoryError, git.NoSuchPathError,
-                    git.GitCommandError) as err:
-                _LOGGER.error("Can't load %s repo: %s.", self.path, err)
-                self._remove()
-                return False
-
-            return True
-
-    async def clone(self):
-        """Clone git add-on repository."""
-        async with self.lock:
-            git_args = {
-                attribute: value
-                for attribute, value in (
-                    ('recursive', True),
-                    ('branch', self.branch),
-                    ('depth', 1),
-                    ('shallow-submodules', True)
-                ) if value is not None
-            }
-
-            try:
-                _LOGGER.info("Clone add-on %s repository", self.url)
-                self.repo = await self.sys_run_in_executor(ft.partial(
-                    git.Repo.clone_from, self.url, str(self.path),
-                    **git_args
-                ))
-
-            except (git.InvalidGitRepositoryError, git.NoSuchPathError,
-                    git.GitCommandError) as err:
-                _LOGGER.error("Can't clone %s repository: %s.", self.url, err)
-                self._remove()
-                return False
-
-            return True
-
-    async def pull(self):
-        """Pull Git add-on repo."""
-        if self.lock.locked():
-            _LOGGER.warning("It is already a task in progress")
-            return False
-
-        async with self.lock:
-            _LOGGER.info("Update add-on %s repository", self.url)
-            branch = self.repo.active_branch.name
-
-            try:
-                # Download data
-                await self.sys_run_in_executor(ft.partial(
-                    self.repo.remotes.origin.fetch, **{
-                        'update-shallow': True,
-                        'depth': 1,
-                    }))
-
-                # Jump on top of that
-                await self.sys_run_in_executor(ft.partial(
-                    self.repo.git.reset, f"origin/{branch}", hard=True))
-
-                # Cleanup old data
-                await self.sys_run_in_executor(ft.partial(
-                    self.repo.git.clean, "-xdf"))
-
-            except (git.InvalidGitRepositoryError, git.NoSuchPathError,
-                    git.GitCommandError) as err:
-                _LOGGER.error("Can't update %s repo: %s.", self.url, err)
-                return False
-
-            return True
-
-    def _remove(self):
-        """Remove a repository."""
-        if not self.path.is_dir():
-            return
-
-        def log_err(funct, path, _):
-            """Log error."""
-            _LOGGER.warning("Can't remove %s", path)
-
-        shutil.rmtree(str(self.path), onerror=log_err)
-
-
-class GitRepoHassIO(GitRepo):
-    """Hass.io add-ons repository."""
-
-    def __init__(self, coresys):
-        """Initialize Git Hass.io add-on repository."""
-        super().__init__(
-            coresys, coresys.config.path_addons_core, URL_HASSIO_ADDONS)
-
-
-class GitRepoCustom(GitRepo):
-    """Custom add-ons repository."""
-
-    def __init__(self, coresys, url):
-        """Initialize custom Git Hass.io addo-n repository."""
-        path = Path(
-            coresys.config.path_addons_git,
-            get_hash_from_repository(url))
-
-        super().__init__(coresys, path, url)
-
-    def remove(self):
-        """Remove a custom repository."""
-        _LOGGER.info("Remove custom add-on repository %s", self.url)
-        self._remove()

hassio/addons/validate.py

@@ -1,383 +0,0 @@
-"""Validate add-ons options schema."""
-import logging
-import re
-import secrets
-import uuid
-
-import voluptuous as vol
-
-from ..const import (
-    ARCH_ALL,
-    ATTR_ACCESS_TOKEN,
-    ATTR_APPARMOR,
-    ATTR_ARCH,
-    ATTR_ARGS,
-    ATTR_AUDIO,
-    ATTR_AUDIO_INPUT,
-    ATTR_AUDIO_OUTPUT,
-    ATTR_AUTH_API,
-    ATTR_AUTO_UART,
-    ATTR_AUTO_UPDATE,
-    ATTR_BOOT,
-    ATTR_BUILD_FROM,
-    ATTR_DESCRIPTON,
-    ATTR_DEVICES,
-    ATTR_DEVICETREE,
-    ATTR_DISCOVERY,
-    ATTR_DOCKER_API,
-    ATTR_ENVIRONMENT,
-    ATTR_FULL_ACCESS,
-    ATTR_GPIO,
-    ATTR_HASSIO_API,
-    ATTR_HASSIO_ROLE,
-    ATTR_HOMEASSISTANT,
-    ATTR_HOMEASSISTANT_API,
-    ATTR_HOST_DBUS,
-    ATTR_HOST_IPC,
-    ATTR_HOST_NETWORK,
-    ATTR_HOST_PID,
-    ATTR_IMAGE,
-    ATTR_INGRESS,
-    ATTR_INGRESS_ENTRY,
-    ATTR_INGRESS_PORT,
-    ATTR_INGRESS_TOKEN,
-    ATTR_KERNEL_MODULES,
-    ATTR_LEGACY,
-    ATTR_LOCATON,
-    ATTR_MACHINE,
-    ATTR_MAINTAINER,
-    ATTR_MAP,
-    ATTR_NAME,
-    ATTR_NETWORK,
-    ATTR_OPTIONS,
-    ATTR_PORTS,
-    ATTR_PORTS_DESCRIPTION,
-    ATTR_PRIVILEGED,
-    ATTR_PROTECTED,
-    ATTR_REPOSITORY,
-    ATTR_SCHEMA,
-    ATTR_SERVICES,
-    ATTR_SLUG,
-    ATTR_SQUASH,
-    ATTR_STARTUP,
-    ATTR_STATE,
-    ATTR_STDIN,
-    ATTR_SYSTEM,
-    ATTR_TIMEOUT,
-    ATTR_TMPFS,
-    ATTR_URL,
-    ATTR_USER,
-    ATTR_UUID,
-    ATTR_VERSION,
-    ATTR_WEBUI,
-    BOOT_AUTO,
-    BOOT_MANUAL,
-    PRIVILEGED_ALL,
-    ROLE_ALL,
-    ROLE_DEFAULT,
-    STARTUP_ALL,
-    STARTUP_APPLICATION,
-    STARTUP_SERVICES,
-    STATE_STARTED,
-    STATE_STOPPED,
-)
-from ..discovery.validate import valid_discovery_service
-from ..validate import (
-    ALSA_DEVICE,
-    DOCKER_PORTS,
-    DOCKER_PORTS_DESCRIPTION,
-    NETWORK_PORT,
-    TOKEN,
-    UUID_MATCH,
-)
-
-_LOGGER = logging.getLogger(__name__)
-
-
-RE_VOLUME = re.compile(r"^(config|ssl|addons|backup|share)(?::(rw|ro))?$")
-RE_SERVICE = re.compile(r"^(?P<service>mqtt):(?P<rights>provide|want|need)$")
-
-V_STR = 'str'
-V_INT = 'int'
-V_FLOAT = 'float'
-V_BOOL = 'bool'
-V_EMAIL = 'email'
-V_URL = 'url'
-V_PORT = 'port'
-V_MATCH = 'match'
-
-RE_SCHEMA_ELEMENT = re.compile(
-    r"^(?:"
-    r"|str|bool|email|url|port"
-    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")\??$"
-)
-
-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-xu', 'orangepi-prime', 'qemux86',
-    'qemux86-64', 'qemuarm', 'qemuarm-64', 'raspberrypi', 'raspberrypi2',
-    'raspberrypi3', 'raspberrypi3-64', '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_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_HOMEASSISTANT): vol.Maybe(vol.Coerce(str)),
-    vol.Optional(ATTR_HOST_NETWORK, default=False): vol.Boolean(),
-    vol.Optional(ATTR_HOST_PID, default=False): vol.Boolean(),
-    vol.Optional(ATTR_HOST_IPC, default=False): vol.Boolean(),
-    vol.Optional(ATTR_HOST_DBUS, default=False): vol.Boolean(),
-    vol.Optional(ATTR_DEVICES): [vol.Match(r"^(.*):(.*):([rwm]{1,3})$")],
-    vol.Optional(ATTR_AUTO_UART, default=False): vol.Boolean(),
-    vol.Optional(ATTR_TMPFS):
-        vol.Match(r"^size=(\d)*[kmg](,uid=\d{1,4})?(,rw)?$"),
-    vol.Optional(ATTR_MAP, default=list): [vol.Match(RE_VOLUME)],
-    vol.Optional(ATTR_ENVIRONMENT): {vol.Match(r"\w*"): vol.Coerce(str)},
-    vol.Optional(ATTR_PRIVILEGED): [vol.In(PRIVILEGED_ALL)],
-    vol.Optional(ATTR_APPARMOR, default=True): vol.Boolean(),
-    vol.Optional(ATTR_FULL_ACCESS, default=False): vol.Boolean(),
-    vol.Optional(ATTR_AUDIO, default=False): vol.Boolean(),
-    vol.Optional(ATTR_GPIO, default=False): vol.Boolean(),
-    vol.Optional(ATTR_DEVICETREE, default=False): vol.Boolean(),
-    vol.Optional(ATTR_KERNEL_MODULES, default=False): vol.Boolean(),
-    vol.Optional(ATTR_HASSIO_API, default=False): vol.Boolean(),
-    vol.Optional(ATTR_HASSIO_ROLE, default=ROLE_DEFAULT): vol.In(ROLE_ALL),
-    vol.Optional(ATTR_HOMEASSISTANT_API, default=False): vol.Boolean(),
-    vol.Optional(ATTR_STDIN, default=False): vol.Boolean(),
-    vol.Optional(ATTR_LEGACY, default=False): vol.Boolean(),
-    vol.Optional(ATTR_DOCKER_API, default=False): vol.Boolean(),
-    vol.Optional(ATTR_AUTH_API, default=False): vol.Boolean(),
-    vol.Optional(ATTR_SERVICES): [vol.Match(RE_SERVICE)],
-    vol.Optional(ATTR_DISCOVERY): [valid_discovery_service],
-    vol.Required(ATTR_OPTIONS): dict,
-    vol.Required(ATTR_SCHEMA): vol.Any(vol.Schema({
-        vol.Coerce(str): vol.Any(SCHEMA_ELEMENT, [
-            vol.Any(
-                SCHEMA_ELEMENT,
-                {vol.Coerce(str): vol.Any(SCHEMA_ELEMENT, [SCHEMA_ELEMENT])}
-            ),
-        ], vol.Schema({
-            vol.Coerce(str): vol.Any(SCHEMA_ELEMENT, [SCHEMA_ELEMENT])
-        }))
-    }), False),
-    vol.Optional(ATTR_IMAGE):
-        vol.Match(RE_DOCKER_IMAGE),
-    vol.Optional(ATTR_TIMEOUT, default=10):
-        vol.All(vol.Coerce(int), vol.Range(min=10, max=120)),
-}, extra=vol.REMOVE_EXTRA)
-
-
-# pylint: disable=no-value-for-parameter
-SCHEMA_REPOSITORY_CONFIG = vol.Schema({
-    vol.Required(ATTR_NAME): vol.Coerce(str),
-    vol.Optional(ATTR_URL): vol.Url(),
-    vol.Optional(ATTR_MAINTAINER): vol.Coerce(str),
-}, extra=vol.REMOVE_EXTRA)
-
-
-# pylint: disable=no-value-for-parameter
-SCHEMA_BUILD_CONFIG = vol.Schema({
-    vol.Optional(ATTR_BUILD_FROM, default=dict): vol.Schema({
-        vol.In(ARCH_ALL): vol.Match(RE_DOCKER_IMAGE_BUILD),
-    }),
-    vol.Optional(ATTR_SQUASH, default=False): vol.Boolean(),
-    vol.Optional(ATTR_ARGS, default=dict): vol.Schema({
-        vol.Coerce(str): vol.Coerce(str)
-    }),
-}, extra=vol.REMOVE_EXTRA)
-
-
-# pylint: disable=no-value-for-parameter
-SCHEMA_ADDON_USER = vol.Schema({
-    vol.Required(ATTR_VERSION): vol.Coerce(str),
-    vol.Optional(ATTR_IMAGE): vol.Coerce(str),
-    vol.Optional(ATTR_UUID, default=lambda: uuid.uuid4().hex): UUID_MATCH,
-    vol.Optional(ATTR_ACCESS_TOKEN): 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(),
-}, 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(raw_schema):
-    """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(typ[0], value, key)
-                elif isinstance(typ, dict):
-                    # nested value dict
-                    options[key] = _nested_validate_dict(typ, value, key)
-                else:
-                    # normal value
-                    options[key] = _single_validate(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(typ, value, key):
-    """Validate a single element."""
-    # if required argument
-    if value is None:
-        raise vol.Invalid(f"Missing required option '{key}'")
-
-    # parse extend data from type
-    match = RE_SCHEMA_ELEMENT.match(typ)
-
-    # prepare range
-    range_args = {}
-    for group_name in ('i_min', 'i_max', 'f_min', 'f_max'):
-        group_value = match.group(group_name)
-        if group_value:
-            range_args[group_name[2:]] = float(group_value)
-
-    if typ.startswith(V_STR):
-        return str(value)
-    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))
-
-    raise vol.Invalid(f"Fatal error for {key} type {typ}")
-
-
-def _nested_validate_list(typ, data_list, key):
-    """Validate nested items."""
-    options = []
-
-    for element in data_list:
-        # Nested?
-        if isinstance(typ, dict):
-            c_options = _nested_validate_dict(typ, element, key)
-            options.append(c_options)
-        else:
-            options.append(_single_validate(typ, element, key))
-
-    return options
-
-
-def _nested_validate_dict(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(typ[c_key][0],
-                                                   c_value, c_key)
-        else:
-            options[c_key] = _single_validate(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}")

hassio/api/__init__.py

@@ -1,296 +0,0 @@
-"""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 .hardware import APIHardware
-from .hassos import APIHassOS
-from .homeassistant import APIHomeAssistant
-from .host import APIHost
-from .info import APIInfo
-from .ingress import APIIngress
-from .proxy import APIProxy
-from .security import SecurityMiddleware
-from .services import APIServices
-from .snapshots import APISnapshots
-from .supervisor import APISupervisor
-
-_LOGGER = logging.getLogger(__name__)
-
-
-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(
-            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()
-
-    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('/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),
-        ])
-
-    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),
-        ])
-
-    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),
-        ])
-
-    def _register_homeassistant(self) -> None:
-        """Register Home Assistant functions."""
-        api_hass = APIHomeAssistant()
-        api_hass.coresys = self.coresys
-
-        self.webapp.add_routes([
-            web.get('/homeassistant/info', api_hass.info),
-            web.get('/homeassistant/logs', api_hass.logs),
-            web.get('/homeassistant/stats', api_hass.stats),
-            web.post('/homeassistant/options', api_hass.options),
-            web.post('/homeassistant/update', api_hass.update),
-            web.post('/homeassistant/restart', api_hass.restart),
-            web.post('/homeassistant/stop', api_hass.stop),
-            web.post('/homeassistant/start', api_hass.start),
-            web.post('/homeassistant/check', api_hass.check),
-            web.post('/homeassistant/rebuild', api_hass.rebuild),
-        ])
-
-    def _register_proxy(self) -> None:
-        """Register Home Assistant API Proxy."""
-        api_proxy = APIProxy()
-        api_proxy.coresys = self.coresys
-
-        self.webapp.add_routes([
-            web.get('/homeassistant/api/websocket', api_proxy.websocket),
-            web.get('/homeassistant/websocket', api_proxy.websocket),
-            web.get('/homeassistant/api/stream', api_proxy.stream),
-            web.post('/homeassistant/api/{path:.+}', api_proxy.api),
-            web.get('/homeassistant/api/{path:.+}', api_proxy.api),
-            web.get('/homeassistant/api/', api_proxy.api),
-        ])
-
-    def _register_addons(self) -> None:
-        """Register Add-on functions."""
-        api_addons = APIAddons()
-        api_addons.coresys = self.coresys
-
-        self.webapp.add_routes([
-            web.get('/addons', api_addons.list),
-            web.post('/addons/reload', api_addons.reload),
-            web.get('/addons/{addon}/info', api_addons.info),
-            web.post('/addons/{addon}/install', api_addons.install),
-            web.post('/addons/{addon}/uninstall', api_addons.uninstall),
-            web.post('/addons/{addon}/start', api_addons.start),
-            web.post('/addons/{addon}/stop', api_addons.stop),
-            web.post('/addons/{addon}/restart', api_addons.restart),
-            web.post('/addons/{addon}/update', api_addons.update),
-            web.post('/addons/{addon}/options', api_addons.options),
-            web.post('/addons/{addon}/rebuild', api_addons.rebuild),
-            web.get('/addons/{addon}/logs', api_addons.logs),
-            web.get('/addons/{addon}/icon', api_addons.icon),
-            web.get('/addons/{addon}/logo', api_addons.logo),
-            web.get('/addons/{addon}/changelog', api_addons.changelog),
-            web.post('/addons/{addon}/stdin', api_addons.stdin),
-            web.post('/addons/{addon}/security', api_addons.security),
-            web.get('/addons/{addon}/stats', api_addons.stats),
-        ])
-
-    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.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_panel(self) -> None:
-        """Register panel for Home Assistant."""
-        panel_dir = Path(__file__).parent.joinpath("panel")
-
-        def create_response(panel_file):
-            """Create a function to generate a response."""
-            path = panel_dir.joinpath(f"{panel_file!s}.html")
-            return lambda request: web.FileResponse(path)
-
-        # This route is for backwards compatibility with HA < 0.58
-        self.webapp.add_routes(
-            [web.get('/panel', create_response('hassio-main-es5'))])
-
-        # This route is for backwards compatibility with HA 0.58 - 0.61
-        self.webapp.add_routes([
-            web.get('/panel_es5', create_response('hassio-main-es5')),
-            web.get('/panel_latest', create_response('hassio-main-latest')),
-        ])
-
-        # This route is for backwards compatibility with HA 0.62 - 0.70
-        self.webapp.add_routes([
-            web.get('/app-es5/index.html', create_response('index')),
-            web.get('/app-es5/hassio-app.html', create_response('hassio-app')),
-        ])
-
-        # This route is for HA > 0.70
-        self.webapp.add_routes([web.static('/app', panel_dir)])
-
-    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/auth.py

@@ -1,61 +0,0 @@
-"""Init file for Hass.io auth/SSO RESTful API."""
-import logging
-
-from aiohttp import BasicAuth
-from aiohttp.web_exceptions import HTTPUnauthorized
-from aiohttp.hdrs import CONTENT_TYPE, AUTHORIZATION, WWW_AUTHENTICATE
-
-from .utils import api_process
-from ..const import REQUEST_FROM, CONTENT_TYPE_JSON, CONTENT_TYPE_URL
-from ..coresys import CoreSysAttributes
-from ..exceptions import APIForbidden
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class APIAuth(CoreSysAttributes):
-    """Handle RESTful API for auth functions."""
-
-    def _process_basic(self, request, addon):
-        """Process login request with basic auth.
-
-        Return a coroutine.
-        """
-        auth = BasicAuth.decode(request.headers[AUTHORIZATION])
-        return self.sys_auth.check_login(addon, auth.login, auth.password)
-
-    def _process_dict(self, request, addon, data):
-        """Process login with dict data.
-
-        Return a coroutine.
-        """
-        username = data.get('username') or data.get('user')
-        password = data.get('password')
-
-        return self.sys_auth.check_login(addon, username, password)
-
-    @api_process
-    async def auth(self, request):
-        """Process login request."""
-        addon = request[REQUEST_FROM]
-
-        if not addon.access_auth_api:
-            raise APIForbidden("Can't use Home Assistant auth!")
-
-        # BasicAuth
-        if AUTHORIZATION in request.headers:
-            return await self._process_basic(request, addon)
-
-        # Json
-        if request.headers.get(CONTENT_TYPE) == CONTENT_TYPE_JSON:
-            data = await request.json()
-            return await self._process_dict(request, addon, data)
-
-        # URL encoded
-        if request.headers.get(CONTENT_TYPE) == CONTENT_TYPE_URL:
-            data = await request.post()
-            return await self._process_dict(request, addon, data)
-
-        raise HTTPUnauthorized(headers={
-            WWW_AUTHENTICATE: "Basic realm=\"Hass.io Authentication\""
-        })

hassio/api/hardware.py

@@ -1,34 +0,0 @@
-"""Init file for Hass.io hardware RESTful API."""
-import logging
-
-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.getLogger(__name__)
-
-
-class APIHardware(CoreSysAttributes):
-    """Handle RESTful API for hardware functions."""
-
-    @api_process
-    async def info(self, request):
-        """Show hardware info."""
-        return {
-            ATTR_SERIAL: list(self.sys_hardware.serial_devices),
-            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):
-        """Show ALSA audio devices."""
-        return {
-            ATTR_AUDIO: {
-                ATTR_INPUT: self.sys_host.alsa.input_devices,
-                ATTR_OUTPUT: self.sys_host.alsa.output_devices,
-            }
-        }

hassio/api/hassos.py

@@ -1,57 +0,0 @@
-"""Init file for Hass.io HassOS RESTful API."""
-import asyncio
-import logging
-from typing import Any, Awaitable, Dict
-
-import voluptuous as vol
-from aiohttp import web
-
-from ..const import (
-    ATTR_BOARD,
-    ATTR_VERSION,
-    ATTR_VERSION_CLI,
-    ATTR_VERSION_CLI_LATEST,
-    ATTR_VERSION_LATEST,
-)
-from ..coresys import CoreSysAttributes
-from .utils import api_process, api_validate
-
-_LOGGER = logging.getLogger(__name__)
-
-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,
-        }
-
-    @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/panel/chunk.3a63ad36bccf4ea567fa.js

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

hassio/api/panel/entrypoint.js

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

hassio/api/panel/index.html

@@ -1,38 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Hass.io</title>
-    <meta name='viewport' content='width=device-width, user-scalable=no'>
-    <style>
-      body {
-        height: 100vh;
-        margin: 0;
-        padding: 0;
-      }
-    </style>
-    <script src='/frontend_es5/custom-elements-es5-adapter.js'></script>
-  </head>
-  <body>
-    <hassio-app></hassio-app>
-    <script>
-    function addScript(src) {
-      var e = document.createElement('script');
-      e.src = src;
-      document.write(e.outerHTML);
-    }
-    var webComponentsSupported = (
-      'customElements' in window &&
-      'import' in document.createElement('link') &&
-      'content' in document.createElement('template'));
-    if (!webComponentsSupported) {
-      addScript('/static/webcomponents-lite.js');
-    }
-    </script>
-    <!--
-      Disabled while we make Home Assistant able to serve the right files.
-      <script src="./app.js"></script>
-    -->
-    <link rel='import' href='./hassio-app.html'>
-  </body>
-</html>

hassio/api/utils.py

@@ -1,95 +0,0 @@
-"""Init file for Hass.io util for RESTful API."""
-import json
-import logging
-
-from aiohttp import web
-import voluptuous as vol
-from voluptuous.humanize import humanize_error
-
-from ..const import (
-    JSON_RESULT, JSON_DATA, JSON_MESSAGE, RESULT_OK, RESULT_ERROR,
-    CONTENT_TYPE_BINARY)
-from ..exceptions import HassioError, APIError, APIForbidden
-
-_LOGGER = logging.getLogger(__name__)
-
-
-def json_loads(data):
-    """Extract json from string with support for '' and None."""
-    if not data:
-        return {}
-    try:
-        return json.loads(data)
-    except json.JSONDecodeError:
-        raise APIError("Invalid json")
-
-
-def api_process(method):
-    """Wrap function with true/false calls to rest api."""
-    async def wrap_api(api, *args, **kwargs):
-        """Return API information."""
-        try:
-            answer = await method(api, *args, **kwargs)
-        except (APIError, APIForbidden) as err:
-            return api_return_error(message=str(err))
-        except HassioError:
-            return api_return_error(message="Unknown Error, see logs")
-
-        if isinstance(answer, dict):
-            return api_return_ok(data=answer)
-        if isinstance(answer, web.Response):
-            return answer
-        elif isinstance(answer, bool) and not answer:
-            return api_return_error()
-        return api_return_ok()
-
-    return wrap_api
-
-
-def api_process_raw(content):
-    """Wrap content_type into function."""
-    def wrap_method(method):
-        """Wrap function with raw output to rest api."""
-        async def wrap_api(api, *args, **kwargs):
-            """Return api information."""
-            try:
-                msg_data = await method(api, *args, **kwargs)
-                msg_type = content
-            except (APIError, APIForbidden) as err:
-                msg_data = str(err).encode()
-                msg_type = CONTENT_TYPE_BINARY
-            except HassioError:
-                msg_data = b''
-                msg_type = CONTENT_TYPE_BINARY
-
-            return web.Response(body=msg_data, content_type=msg_type)
-
-        return wrap_api
-    return wrap_method
-
-
-def api_return_error(message=None):
-    """Return an API error message."""
-    return web.json_response({
-        JSON_RESULT: RESULT_ERROR,
-        JSON_MESSAGE: message,
-    }, status=400)
-
-
-def api_return_ok(data=None):
-    """Return an API ok answer."""
-    return web.json_response({
-        JSON_RESULT: RESULT_OK,
-        JSON_DATA: data or {},
-    })
-
-
-async def api_validate(schema, request):
-    """Validate request data with schema."""
-    data = await request.json(loads=json_loads)
-    try:
-        data = schema(data)
-    except vol.Invalid as ex:
-        raise APIError(humanize_error(data, ex)) from None
-
-    return data

hassio/arch.json

@@ -1,49 +0,0 @@
-{
-    "raspberrypi": [
-        "armhf"
-    ],
-    "raspberrypi2": [
-        "armv7",
-        "armhf"
-    ],
-    "raspberrypi3": [
-        "armv7",
-        "armhf"
-    ],
-    "raspberrypi3-64": [
-        "aarch64",
-        "armv7",
-        "armhf"
-    ],
-    "tinker": [
-        "armv7",
-        "armhf"
-    ],
-    "odroid-c2": [
-        "aarch64"
-    ],
-    "odroid-xu": [
-        "armv7",
-        "armhf"
-    ],
-    "orangepi-prime": [
-        "aarch64"
-    ],
-    "qemux86": [
-        "i386"
-    ],
-    "qemux86-64": [
-        "amd64",
-        "i386"
-    ],
-    "qemuarm": [
-        "armhf"
-    ],
-    "qemuarm-64": [
-        "aarch64"
-    ],
-    "intel-nuc": [
-        "amd64",
-        "i386"
-    ]
-}

hassio/auth.py

@@ -1,95 +0,0 @@
-"""Manage SSO for Add-ons with Home Assistant user."""
-import logging
-import hashlib
-
-from .const import (
-    FILE_HASSIO_AUTH, ATTR_PASSWORD, ATTR_USERNAME, ATTR_ADDON)
-from .coresys import CoreSysAttributes
-from .utils.json import JsonConfig
-from .validate import SCHEMA_AUTH_CONFIG
-from .exceptions import AuthError, HomeAssistantAPIError
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class Auth(JsonConfig, CoreSysAttributes):
-    """Manage SSO for Add-ons with Home Assistant user."""
-
-    def __init__(self, coresys):
-        """Initialize updater."""
-        super().__init__(FILE_HASSIO_AUTH, SCHEMA_AUTH_CONFIG)
-        self.coresys = coresys
-
-    def _check_cache(self, username, password):
-        """Check password in cache."""
-        username_h = _rehash(username)
-        password_h = _rehash(password, username)
-
-        if self._data.get(username_h) == password_h:
-            _LOGGER.info("Cache hit for %s", username)
-            return True
-
-        _LOGGER.warning("No cache hit for %s", username)
-        return False
-
-    def _update_cache(self, username, password):
-        """Cache a username, password."""
-        username_h = _rehash(username)
-        password_h = _rehash(password, username)
-
-        if self._data.get(username_h) == password_h:
-            return
-
-        self._data[username_h] = password_h
-        self.save_data()
-
-    def _dismatch_cache(self, username, password):
-        """Remove user from cache."""
-        username_h = _rehash(username)
-        password_h = _rehash(password, username)
-
-        if self._data.get(username_h) != password_h:
-            return
-
-        self._data.pop(username_h, None)
-        self.save_data()
-
-    async def check_login(self, addon, username, password):
-        """Check username login."""
-        if password is None:
-            _LOGGER.error("None as password is not supported!")
-            raise AuthError()
-        _LOGGER.info("Auth request from %s for %s", addon.slug, username)
-
-        # Check API state
-        if not await self.sys_homeassistant.check_api_state():
-            _LOGGER.info("Home Assistant not running, check cache")
-            return self._check_cache(username, password)
-
-        try:
-            async with self.sys_homeassistant.make_request(
-                    'post', 'api/hassio_auth', json={
-                        ATTR_USERNAME: username,
-                        ATTR_PASSWORD: password,
-                        ATTR_ADDON: addon.slug,
-                    }) as req:
-
-                if req.status == 200:
-                    _LOGGER.info("Success login from %s", username)
-                    self._update_cache(username, password)
-                    return True
-
-                _LOGGER.warning("Wrong login from %s", username)
-                self._dismatch_cache(username, password)
-                return False
-        except HomeAssistantAPIError:
-            _LOGGER.error("Can't request auth on Home Assistant!")
-
-        raise AuthError()
-
-
-def _rehash(value, salt2=""):
-    """Rehash a value."""
-    for idx in range(1, 20):
-        value = hashlib.sha256(f"{value}{idx}{salt2}".encode()).hexdigest()
-    return value

hassio/bootstrap.py

@@ -1,209 +0,0 @@
-"""Bootstrap Hass.io."""
-import logging
-import os
-from pathlib import Path
-import shutil
-import signal
-
-from colorlog import ColoredFormatter
-
-from .addons import AddonManager
-from .api import RestAPI
-from .arch import CpuArch
-from .auth import Auth
-from .const import SOCKET_DOCKER
-from .core import HassIO
-from .coresys import CoreSys
-from .dbus import DBusManager
-from .discovery import Discovery
-from .hassos import HassOS
-from .homeassistant import HomeAssistant
-from .host import HostManager
-from .ingress import Ingress
-from .services import ServiceManager
-from .snapshots import SnapshotManager
-from .supervisor import Supervisor
-from .tasks import Tasks
-from .updater import Updater
-
-_LOGGER = logging.getLogger(__name__)
-
-ENV_SHARE = "SUPERVISOR_SHARE"
-ENV_NAME = "SUPERVISOR_NAME"
-ENV_REPO = "HOMEASSISTANT_REPOSITORY"
-
-MACHINE_ID = Path("/etc/machine-id")
-
-
-async def initialize_coresys():
-    """Initialize HassIO coresys/objects."""
-    coresys = CoreSys()
-
-    # Initialize core objects
-    coresys.core = HassIO(coresys)
-    coresys.arch = CpuArch(coresys)
-    coresys.auth = Auth(coresys)
-    coresys.updater = Updater(coresys)
-    coresys.api = RestAPI(coresys)
-    coresys.supervisor = Supervisor(coresys)
-    coresys.homeassistant = HomeAssistant(coresys)
-    coresys.addons = AddonManager(coresys)
-    coresys.snapshots = SnapshotManager(coresys)
-    coresys.host = HostManager(coresys)
-    coresys.ingress = Ingress(coresys)
-    coresys.tasks = Tasks(coresys)
-    coresys.services = ServiceManager(coresys)
-    coresys.discovery = Discovery(coresys)
-    coresys.dbus = DBusManager(coresys)
-    coresys.hassos = HassOS(coresys)
-
-    # bootstrap config
-    initialize_system_data(coresys)
-
-    # Set Machine/Host ID
-    if MACHINE_ID.exists():
-        coresys.machine_id = MACHINE_ID.read_text().strip()
-
-    return coresys
-
-
-def initialize_system_data(coresys):
-    """Set up the default configuration and create folders."""
-    config = coresys.config
-
-    # Home Assistant configuration folder
-    if not config.path_homeassistant.is_dir():
-        _LOGGER.info(
-            "Create Home Assistant configuration folder %s", config.path_homeassistant
-        )
-        config.path_homeassistant.mkdir()
-
-    # hassio ssl folder
-    if not config.path_ssl.is_dir():
-        _LOGGER.info("Create Hass.io SSL/TLS folder %s", config.path_ssl)
-        config.path_ssl.mkdir()
-
-    # hassio addon data folder
-    if not config.path_addons_data.is_dir():
-        _LOGGER.info("Create Hass.io Add-on data folder %s", config.path_addons_data)
-        config.path_addons_data.mkdir(parents=True)
-
-    if not config.path_addons_local.is_dir():
-        _LOGGER.info(
-            "Create Hass.io Add-on local repository folder %s", config.path_addons_local
-        )
-        config.path_addons_local.mkdir(parents=True)
-
-    if not config.path_addons_git.is_dir():
-        _LOGGER.info(
-            "Create Hass.io Add-on git repositories folder %s", config.path_addons_git
-        )
-        config.path_addons_git.mkdir(parents=True)
-
-    # hassio tmp folder
-    if not config.path_tmp.is_dir():
-        _LOGGER.info("Create Hass.io temp folder %s", config.path_tmp)
-        config.path_tmp.mkdir(parents=True)
-
-    # hassio backup folder
-    if not config.path_backup.is_dir():
-        _LOGGER.info("Create Hass.io backup folder %s", config.path_backup)
-        config.path_backup.mkdir()
-
-    # share folder
-    if not config.path_share.is_dir():
-        _LOGGER.info("Create Hass.io share folder %s", config.path_share)
-        config.path_share.mkdir()
-
-    # apparmor folder
-    if not config.path_apparmor.is_dir():
-        _LOGGER.info("Create Hass.io Apparmor folder %s", config.path_apparmor)
-        config.path_apparmor.mkdir()
-
-    # Update log level
-    coresys.config.modify_log_level()
-
-
-def migrate_system_env(coresys):
-    """Cleanup some stuff after update."""
-    config = coresys.config
-
-    # hass.io 0.37 -> 0.38
-    old_build = Path(config.path_hassio, "addons/build")
-    if old_build.is_dir():
-        try:
-            old_build.rmdir()
-        except OSError:
-            _LOGGER.warning("Can't cleanup old Add-on build directory")
-
-
-def initialize_logging():
-    """Setup the logging."""
-    logging.basicConfig(level=logging.INFO)
-    fmt = "%(asctime)s %(levelname)s (%(threadName)s) [%(name)s] %(message)s"
-    colorfmt = f"%(log_color)s{fmt}%(reset)s"
-    datefmt = "%y-%m-%d %H:%M:%S"
-
-    # suppress overly verbose logs from libraries that aren't helpful
-    logging.getLogger("aiohttp.access").setLevel(logging.WARNING)
-
-    logging.getLogger().handlers[0].setFormatter(
-        ColoredFormatter(
-            colorfmt,
-            datefmt=datefmt,
-            reset=True,
-            log_colors={
-                "DEBUG": "cyan",
-                "INFO": "green",
-                "WARNING": "yellow",
-                "ERROR": "red",
-                "CRITICAL": "red",
-            },
-        )
-    )
-
-
-def check_environment():
-    """Check if all environment are exists."""
-    # check environment variables
-    for key in (ENV_SHARE, ENV_NAME, ENV_REPO):
-        try:
-            os.environ[key]
-        except KeyError:
-            _LOGGER.fatal("Can't find %s in env!", key)
-            return False
-
-    # check docker socket
-    if not SOCKET_DOCKER.is_socket():
-        _LOGGER.fatal("Can't find Docker socket!")
-        return False
-
-    # check socat exec
-    if not shutil.which("socat"):
-        _LOGGER.fatal("Can't find socat!")
-        return False
-
-    # check socat exec
-    if not shutil.which("gdbus"):
-        _LOGGER.fatal("Can't find gdbus!")
-        return False
-
-    return True
-
-
-def reg_signal(loop):
-    """Register SIGTERM and SIGKILL to stop system."""
-    try:
-        loop.add_signal_handler(signal.SIGTERM, lambda: loop.call_soon(loop.stop))
-    except (ValueError, RuntimeError):
-        _LOGGER.warning("Could not bind to SIGTERM")
-
-    try:
-        loop.add_signal_handler(signal.SIGHUP, lambda: loop.call_soon(loop.stop))
-    except (ValueError, RuntimeError):
-        _LOGGER.warning("Could not bind to SIGHUP")
-
-    try:
-        loop.add_signal_handler(signal.SIGINT, lambda: loop.call_soon(loop.stop))
-    except (ValueError, RuntimeError):
-        _LOGGER.warning("Could not bind to SIGINT")

hassio/config.py

@@ -1,228 +0,0 @@
-"""Bootstrap Hass.io."""
-from datetime import datetime
-import logging
-import os
-import re
-from pathlib import Path, PurePath
-
-import pytz
-
-from .const import (
-    FILE_HASSIO_CONFIG,
-    HASSIO_DATA,
-    ATTR_TIMEZONE,
-    ATTR_ADDONS_CUSTOM_LIST,
-    ATTR_LAST_BOOT,
-    ATTR_WAIT_BOOT,
-    ATTR_LOGGING,
-)
-from .utils.dt import parse_datetime
-from .utils.json import JsonConfig
-from .validate import SCHEMA_HASSIO_CONFIG
-
-_LOGGER = logging.getLogger(__name__)
-
-HOMEASSISTANT_CONFIG = PurePath("homeassistant")
-
-HASSIO_SSL = PurePath("ssl")
-
-ADDONS_CORE = PurePath("addons/core")
-ADDONS_LOCAL = PurePath("addons/local")
-ADDONS_GIT = PurePath("addons/git")
-ADDONS_DATA = PurePath("addons/data")
-
-BACKUP_DATA = PurePath("backup")
-SHARE_DATA = PurePath("share")
-TMP_DATA = PurePath("tmp")
-APPARMOR_DATA = PurePath("apparmor")
-
-DEFAULT_BOOT_TIME = datetime.utcfromtimestamp(0).isoformat()
-
-RE_TIMEZONE = re.compile(r"time_zone: (?P<timezone>[\w/\-+]+)")
-
-
-class CoreConfig(JsonConfig):
-    """Hold all core config data."""
-
-    def __init__(self):
-        """Initialize config object."""
-        super().__init__(FILE_HASSIO_CONFIG, SCHEMA_HASSIO_CONFIG)
-
-    @property
-    def timezone(self):
-        """Return system timezone."""
-        config_file = Path(self.path_homeassistant, "configuration.yaml")
-        try:
-            assert config_file.exists()
-            configuration = config_file.read_text()
-
-            data = RE_TIMEZONE.search(configuration)
-            assert data
-
-            timezone = data.group("timezone")
-            pytz.timezone(timezone)
-        except (pytz.exceptions.UnknownTimeZoneError, OSError, AssertionError):
-            _LOGGER.debug("Can't parse Home Assistant timezone")
-            return self._data[ATTR_TIMEZONE]
-
-        return timezone
-
-    @timezone.setter
-    def timezone(self, value):
-        """Set system timezone."""
-        self._data[ATTR_TIMEZONE] = value
-
-    @property
-    def wait_boot(self) -> int:
-        """Return wait time for auto boot stages."""
-        return self._data[ATTR_WAIT_BOOT]
-
-    @wait_boot.setter
-    def wait_boot(self, value: int):
-        """Set wait boot time."""
-        self._data[ATTR_WAIT_BOOT] = value
-
-    @property
-    def logging(self) -> str:
-        """Return log level of system."""
-        return self._data[ATTR_LOGGING]
-
-    @logging.setter
-    def logging(self, value: str):
-        """Set system log level."""
-        self._data[ATTR_LOGGING] = value
-        self.modify_log_level()
-
-    def modify_log_level(self) -> None:
-        """Change log level."""
-        lvl = getattr(logging, self.logging.upper())
-        logging.basicConfig(level=lvl)
-
-    @property
-    def last_boot(self):
-        """Return last boot datetime."""
-        boot_str = self._data.get(ATTR_LAST_BOOT, DEFAULT_BOOT_TIME)
-
-        boot_time = parse_datetime(boot_str)
-        if not boot_time:
-            return datetime.utcfromtimestamp(1)
-        return boot_time
-
-    @last_boot.setter
-    def last_boot(self, value):
-        """Set last boot datetime."""
-        self._data[ATTR_LAST_BOOT] = value.isoformat()
-
-    @property
-    def path_hassio(self):
-        """Return Hass.io data path."""
-        return HASSIO_DATA
-
-    @property
-    def path_extern_hassio(self):
-        """Return Hass.io data path external for Docker."""
-        return PurePath(os.environ["SUPERVISOR_SHARE"])
-
-    @property
-    def path_extern_homeassistant(self):
-        """Return config path external for Docker."""
-        return str(PurePath(self.path_extern_hassio, HOMEASSISTANT_CONFIG))
-
-    @property
-    def path_homeassistant(self):
-        """Return config path inside supervisor."""
-        return Path(HASSIO_DATA, HOMEASSISTANT_CONFIG)
-
-    @property
-    def path_extern_ssl(self):
-        """Return SSL path external for Docker."""
-        return str(PurePath(self.path_extern_hassio, HASSIO_SSL))
-
-    @property
-    def path_ssl(self):
-        """Return SSL path inside supervisor."""
-        return Path(HASSIO_DATA, HASSIO_SSL)
-
-    @property
-    def path_addons_core(self):
-        """Return git path for core Add-ons."""
-        return Path(HASSIO_DATA, ADDONS_CORE)
-
-    @property
-    def path_addons_git(self):
-        """Return path for Git Add-on."""
-        return Path(HASSIO_DATA, ADDONS_GIT)
-
-    @property
-    def path_addons_local(self):
-        """Return path for custom Add-ons."""
-        return Path(HASSIO_DATA, ADDONS_LOCAL)
-
-    @property
-    def path_extern_addons_local(self):
-        """Return path for custom Add-ons."""
-        return PurePath(self.path_extern_hassio, ADDONS_LOCAL)
-
-    @property
-    def path_addons_data(self):
-        """Return root Add-on data folder."""
-        return Path(HASSIO_DATA, ADDONS_DATA)
-
-    @property
-    def path_extern_addons_data(self):
-        """Return root add-on data folder external for Docker."""
-        return PurePath(self.path_extern_hassio, ADDONS_DATA)
-
-    @property
-    def path_tmp(self):
-        """Return Hass.io temp folder."""
-        return Path(HASSIO_DATA, TMP_DATA)
-
-    @property
-    def path_extern_tmp(self):
-        """Return Hass.io temp folder for Docker."""
-        return PurePath(self.path_extern_hassio, TMP_DATA)
-
-    @property
-    def path_backup(self):
-        """Return root backup data folder."""
-        return Path(HASSIO_DATA, BACKUP_DATA)
-
-    @property
-    def path_extern_backup(self):
-        """Return root backup data folder external for Docker."""
-        return PurePath(self.path_extern_hassio, BACKUP_DATA)
-
-    @property
-    def path_share(self):
-        """Return root share data folder."""
-        return Path(HASSIO_DATA, SHARE_DATA)
-
-    @property
-    def path_apparmor(self):
-        """Return root Apparmor profile folder."""
-        return Path(HASSIO_DATA, APPARMOR_DATA)
-
-    @property
-    def path_extern_share(self):
-        """Return root share data folder external for Docker."""
-        return PurePath(self.path_extern_hassio, SHARE_DATA)
-
-    @property
-    def addons_repositories(self):
-        """Return list of custom Add-on repositories."""
-        return self._data[ATTR_ADDONS_CUSTOM_LIST]
-
-    def add_addon_repository(self, repo):
-        """Add a custom repository to list."""
-        if repo in self._data[ATTR_ADDONS_CUSTOM_LIST]:
-            return
-
-        self._data[ATTR_ADDONS_CUSTOM_LIST].append(repo)
-
-    def drop_addon_repository(self, repo):
-        """Remove a custom repository from list."""
-        if repo not in self._data[ATTR_ADDONS_CUSTOM_LIST]:
-            return
-
-        self._data[ATTR_ADDONS_CUSTOM_LIST].remove(repo)

hassio/core.py

@@ -1,155 +0,0 @@
-"""Main file for Hass.io."""
-from contextlib import suppress
-import asyncio
-import logging
-
-import async_timeout
-
-from .coresys import CoreSysAttributes
-from .const import (
-    STARTUP_SYSTEM,
-    STARTUP_SERVICES,
-    STARTUP_APPLICATION,
-    STARTUP_INITIALIZE,
-)
-from .exceptions import HassioError, HomeAssistantError
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class HassIO(CoreSysAttributes):
-    """Main object of Hass.io."""
-
-    def __init__(self, coresys):
-        """Initialize Hass.io object."""
-        self.coresys = coresys
-
-    async def setup(self):
-        """Setup HassIO orchestration."""
-        # Load Supervisor
-        await self.sys_supervisor.load()
-
-        # Load DBus
-        await self.sys_dbus.load()
-
-        # Load Host
-        await self.sys_host.load()
-
-        # Load Home Assistant
-        await self.sys_homeassistant.load()
-
-        # Load CPU/Arch
-        await self.sys_arch.load()
-
-        # Load HassOS
-        await self.sys_hassos.load()
-
-        # Load Add-ons
-        await self.sys_addons.load()
-
-        # rest api views
-        await self.sys_api.load()
-
-        # load last available data
-        await self.sys_updater.load()
-
-        # load last available data
-        await self.sys_snapshots.load()
-
-        # load services
-        await self.sys_services.load()
-
-        # Load discovery
-        await self.sys_discovery.load()
-
-        # Load ingress
-        await self.sys_ingress.load()
-
-        # start dns forwarding
-        self.sys_create_task(self.sys_dns.start())
-
-    async def start(self):
-        """Start Hass.io orchestration."""
-        # on release channel, try update itself
-        if self.sys_supervisor.need_update:
-            if self.sys_dev:
-                _LOGGER.warning("Ignore Hass.io updates on dev!")
-            elif await self.sys_supervisor.update():
-                return
-
-        # start api
-        await self.sys_api.start()
-
-        # start addon mark as initialize
-        await self.sys_addons.boot(STARTUP_INITIALIZE)
-
-        try:
-            # HomeAssistant is already running / supervisor have only reboot
-            if self.sys_hardware.last_boot == self.sys_config.last_boot:
-                _LOGGER.info("Hass.io reboot detected")
-                return
-
-            # reset register services / discovery
-            self.sys_services.reset()
-
-            # start addon mark as system
-            await self.sys_addons.boot(STARTUP_SYSTEM)
-
-            # start addon mark as services
-            await self.sys_addons.boot(STARTUP_SERVICES)
-
-            # run HomeAssistant
-            if self.sys_homeassistant.boot:
-                with suppress(HomeAssistantError):
-                    await self.sys_homeassistant.start()
-
-            # start addon mark as application
-            await self.sys_addons.boot(STARTUP_APPLICATION)
-
-            # store new last boot
-            self.sys_config.last_boot = self.sys_hardware.last_boot
-            self.sys_config.save_data()
-
-        finally:
-            # Add core tasks into scheduler
-            await self.sys_tasks.load()
-
-            # If landingpage / run upgrade in background
-            if self.sys_homeassistant.version == "landingpage":
-                self.sys_create_task(self.sys_homeassistant.install())
-
-            _LOGGER.info("Hass.io is up and running")
-
-    async def stop(self):
-        """Stop a running orchestration."""
-        # don't process scheduler anymore
-        self.sys_scheduler.suspend = True
-
-        # process async stop tasks
-        try:
-            with async_timeout.timeout(10):
-                await asyncio.wait(
-                    [
-                        self.sys_api.stop(),
-                        self.sys_dns.stop(),
-                        self.sys_websession.close(),
-                        self.sys_websession_ssl.close(),
-                        self.sys_ingress.unload(),
-                    ]
-                )
-        except asyncio.TimeoutError:
-            _LOGGER.warning("Force Shutdown!")
-
-        _LOGGER.info("Hass.io is down")
-
-    async def shutdown(self):
-        """Shutdown all running containers in correct order."""
-        await self.sys_addons.shutdown(STARTUP_APPLICATION)
-
-        # Close Home Assistant
-        with suppress(HassioError):
-            await self.sys_homeassistant.stop()
-
-        await self.sys_addons.shutdown(STARTUP_SERVICES)
-        await self.sys_addons.shutdown(STARTUP_SYSTEM)
-        await self.sys_addons.shutdown(STARTUP_INITIALIZE)

hassio/dbus/__init__.py

@@ -1,39 +0,0 @@
-"""D-Bus interface objects."""
-
-from .systemd import Systemd
-from .hostname import Hostname
-from .rauc import Rauc
-from ..coresys import CoreSysAttributes
-
-
-class DBusManager(CoreSysAttributes):
-    """A DBus Interface handler."""
-
-    def __init__(self, coresys):
-        """Initialize D-Bus interface."""
-        self.coresys = coresys
-
-        self._systemd = Systemd()
-        self._hostname = Hostname()
-        self._rauc = Rauc()
-
-    @property
-    def systemd(self):
-        """Return the systemd interface."""
-        return self._systemd
-
-    @property
-    def hostname(self):
-        """Return the hostname interface."""
-        return self._hostname
-
-    @property
-    def rauc(self):
-        """Return the rauc interface."""
-        return self._rauc
-
-    async def load(self):
-        """Connect interfaces to D-Bus."""
-        await self.systemd.connect()
-        await self.hostname.connect()
-        await self.rauc.connect()

hassio/dbus/hostname.py

@@ -1,39 +0,0 @@
-"""D-Bus interface for hostname."""
-import logging
-
-from .interface import DBusInterface
-from .utils import dbus_connected
-from ..exceptions import DBusError
-from ..utils.gdbus import DBus
-
-_LOGGER = logging.getLogger(__name__)
-
-DBUS_NAME = 'org.freedesktop.hostname1'
-DBUS_OBJECT = '/org/freedesktop/hostname1'
-
-
-class Hostname(DBusInterface):
-    """Handle D-Bus interface for hostname/system."""
-
-    async def connect(self):
-        """Connect to system's D-Bus."""
-        try:
-            self.dbus = await DBus.connect(DBUS_NAME, DBUS_OBJECT)
-        except DBusError:
-            _LOGGER.warning("Can't connect to hostname")
-
-    @dbus_connected
-    def set_static_hostname(self, hostname):
-        """Change local hostname.
-
-        Return a coroutine.
-        """
-        return self.dbus.SetStaticHostname(hostname, False)
-
-    @dbus_connected
-    def get_properties(self):
-        """Return local host informations.
-
-        Return a coroutine.
-        """
-        return self.dbus.get_properties(DBUS_NAME)

hassio/dbus/rauc.py

@@ -1,55 +0,0 @@
-"""D-Bus interface for rauc."""
-import logging
-
-from .interface import DBusInterface
-from .utils import dbus_connected
-from ..exceptions import DBusError
-from ..utils.gdbus import DBus
-
-_LOGGER = logging.getLogger(__name__)
-
-DBUS_NAME = 'de.pengutronix.rauc'
-DBUS_OBJECT = '/'
-
-
-class Rauc(DBusInterface):
-    """Handle D-Bus interface for rauc."""
-
-    async def connect(self):
-        """Connect to D-Bus."""
-        try:
-            self.dbus = await DBus.connect(DBUS_NAME, DBUS_OBJECT)
-        except DBusError:
-            _LOGGER.warning("Can't connect to rauc")
-
-    @dbus_connected
-    def install(self, raucb_file):
-        """Install rauc bundle file.
-
-        Return a coroutine.
-        """
-        return self.dbus.Installer.Install(raucb_file)
-
-    @dbus_connected
-    def get_slot_status(self):
-        """Get slot status.
-
-        Return a coroutine.
-        """
-        return self.dbus.Installer.GetSlotStatus()
-
-    @dbus_connected
-    def get_properties(self):
-        """Return rauc informations.
-
-        Return a coroutine.
-        """
-        return self.dbus.get_properties(f"{DBUS_NAME}.Installer")
-
-    @dbus_connected
-    def signal_completed(self):
-        """Return a signal wrapper for completed signal.
-
-        Return a coroutine.
-        """
-        return self.dbus.wait_signal(f"{DBUS_NAME}.Installer.Completed")

hassio/docker/__init__.py

@@ -1,137 +0,0 @@
-"""Init file for Hass.io Docker object."""
-import logging
-from contextlib import suppress
-from typing import Any, Dict, Optional
-
-import attr
-import docker
-
-from ..const import SOCKET_DOCKER
-from ..exceptions import DockerAPIError
-from .network import DockerNetwork
-
-_LOGGER = logging.getLogger(__name__)
-
-
-@attr.s(frozen=True)
-class CommandReturn:
-    """Return object from command run."""
-
-    exit_code: int = attr.ib()
-    output: bytes = attr.ib()
-
-
-class DockerAPI:
-    """Docker Hass.io wrapper.
-
-    This class is not AsyncIO safe!
-    """
-
-    def __init__(self):
-        """Initialize Docker base wrapper."""
-        self.docker: docker.DockerClient = docker.DockerClient(
-            base_url="unix:/{}".format(str(SOCKET_DOCKER)), version="auto", timeout=900
-        )
-        self.network: DockerNetwork = DockerNetwork(self.docker)
-
-    @property
-    def images(self) -> docker.models.images.ImageCollection:
-        """Return API images."""
-        return self.docker.images
-
-    @property
-    def containers(self) -> docker.models.containers.ContainerCollection:
-        """Return API containers."""
-        return self.docker.containers
-
-    @property
-    def api(self) -> docker.APIClient:
-        """Return API containers."""
-        return self.docker.api
-
-    def run(
-        self, image: str, **kwargs: Dict[str, Any]
-    ) -> docker.models.containers.Container:
-        """"Create a Docker container and run it.
-
-        Need run inside executor.
-        """
-        name = kwargs.get("name", image)
-        network_mode = kwargs.get("network_mode")
-        hostname = kwargs.get("hostname")
-
-        # Setup network
-        kwargs["dns_search"] = ["."]
-        if network_mode:
-            kwargs["dns"] = [str(self.network.supervisor)]
-            kwargs["dns_opt"] = ["ndots:0"]
-        else:
-            kwargs["network"] = None
-
-        # Create container
-        try:
-            container = self.docker.containers.create(
-                image, use_config_proxy=False, **kwargs
-            )
-        except docker.errors.DockerException as err:
-            _LOGGER.error("Can't create container from %s: %s", name, err)
-            raise DockerAPIError() from None
-
-        # Attach network
-        if not network_mode:
-            alias = [hostname] if hostname else None
-            try:
-                self.network.attach_container(container, alias=alias)
-            except DockerAPIError:
-                _LOGGER.warning("Can't attach %s to hassio-net!", name)
-            else:
-                with suppress(DockerAPIError):
-                    self.network.detach_default_bridge(container)
-
-        # Run container
-        try:
-            container.start()
-        except docker.errors.DockerException as err:
-            _LOGGER.error("Can't start %s: %s", name, err)
-            raise DockerAPIError() from None
-
-        # Update metadata
-        with suppress(docker.errors.DockerException):
-            container.reload()
-
-        return container
-
-    def run_command(
-        self, image: str, command: Optional[str] = None, **kwargs: Dict[str, Any]
-    ) -> CommandReturn:
-        """Create a temporary container and run command.
-
-        Need run inside executor.
-        """
-        stdout = kwargs.get("stdout", True)
-        stderr = kwargs.get("stderr", True)
-
-        _LOGGER.info("Run command '%s' on %s", command, image)
-        try:
-            container = self.docker.containers.run(
-                image,
-                command=command,
-                network=self.network.name,
-                use_config_proxy=False,
-                **kwargs
-            )
-
-            # wait until command is done
-            result = container.wait()
-            output = container.logs(stdout=stdout, stderr=stderr)
-
-        except docker.errors.DockerException as err:
-            _LOGGER.error("Can't execute command: %s", err)
-            raise DockerAPIError() from None
-
-        finally:
-            # cleanup container
-            with suppress(docker.errors.DockerException):
-                container.remove(force=True)
-
-        return CommandReturn(result.get("StatusCode"), output)

hassio/docker/hassos_cli.py

@@ -1,38 +0,0 @@
-"""HassOS Cli docker object."""
-import logging
-
-import docker
-
-from ..coresys import CoreSysAttributes
-from .interface import DockerInterface
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class DockerHassOSCli(DockerInterface, CoreSysAttributes):
-    """Docker Hass.io wrapper for HassOS Cli."""
-
-    @property
-    def image(self):
-        """Return name of HassOS CLI image."""
-        return f"homeassistant/{self.sys_arch.supervisor}-hassio-cli"
-
-    def _stop(self, remove_container=True):
-        """Don't need stop."""
-        return True
-
-    def _attach(self):
-        """Attach to running Docker container.
-        Need run inside executor.
-        """
-        try:
-            image = self.sys_docker.images.get(self.image)
-
-        except docker.errors.DockerException:
-            _LOGGER.warning("Can't find a HassOS CLI %s", self.image)
-
-        else:
-            self._meta = image.attrs
-            _LOGGER.info(
-                "Found HassOS CLI %s with version %s", self.image, self.version
-            )

hassio/docker/interface.py

@@ -1,403 +0,0 @@
-"""Interface class for Hass.io Docker object."""
-import asyncio
-from contextlib import suppress
-import logging
-from typing import Any, Dict, Optional, Awaitable
-
-import docker
-
-from ..const import LABEL_ARCH, LABEL_VERSION
-from ..coresys import CoreSys, CoreSysAttributes
-from ..exceptions import DockerAPIError
-from ..utils import process_lock
-from .stats import DockerStats
-from . import CommandReturn
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class DockerInterface(CoreSysAttributes):
-    """Docker Hass.io interface."""
-
-    def __init__(self, coresys: CoreSys):
-        """Initialize Docker base wrapper."""
-        self.coresys: CoreSys = coresys
-        self._meta: Optional[Dict[str, Any]] = None
-        self.lock: asyncio.Lock = asyncio.Lock(loop=coresys.loop)
-
-    @property
-    def timeout(self) -> str:
-        """Return timeout for Docker actions."""
-        return 30
-
-    @property
-    def name(self) -> Optional[str]:
-        """Return name of Docker container."""
-        return None
-
-    @property
-    def meta_config(self) -> Dict[str, Any]:
-        """Return meta data of configuration for container/image."""
-        if not self._meta:
-            return {}
-        return self._meta.get("Config", {})
-
-    @property
-    def meta_labels(self) -> Dict[str, str]:
-        """Return meta data of labels for container/image."""
-        return self.meta_config.get("Labels") or {}
-
-    @property
-    def image(self) -> Optional[str]:
-        """Return name of Docker image."""
-        return self.meta_config.get("Image")
-
-    @property
-    def version(self) -> Optional[str]:
-        """Return version of Docker image."""
-        return self.meta_labels.get(LABEL_VERSION)
-
-    @property
-    def arch(self) -> Optional[str]:
-        """Return arch of Docker image."""
-        return self.meta_labels.get(LABEL_ARCH)
-
-    @property
-    def in_progress(self) -> bool:
-        """Return True if a task is in progress."""
-        return self.lock.locked()
-
-    @process_lock
-    def install(self, tag: str, image: Optional[str] = None):
-        """Pull docker image."""
-        return self.sys_run_in_executor(self._install, tag, image)
-
-    def _install(self, tag: str, image: Optional[str] = None) -> None:
-        """Pull Docker image.
-
-        Need run inside executor.
-        """
-        image = image or self.image
-
-        try:
-            _LOGGER.info("Pull image %s tag %s.", image, tag)
-            docker_image = self.sys_docker.images.pull(f"{image}:{tag}")
-
-            _LOGGER.info("Tag image %s with version %s as latest", image, tag)
-            docker_image.tag(image, tag="latest")
-        except docker.errors.APIError as err:
-            _LOGGER.error("Can't install %s:%s -> %s.", image, tag, err)
-            raise DockerAPIError() from None
-        else:
-            self._meta = docker_image.attrs
-
-    def exists(self) -> Awaitable[bool]:
-        """Return True if Docker image exists in local repository."""
-        return self.sys_run_in_executor(self._exists)
-
-    def _exists(self) -> bool:
-        """Return True if Docker image exists in local repository.
-
-        Need run inside executor.
-        """
-        try:
-            docker_image = self.sys_docker.images.get(self.image)
-            assert f"{self.image}:{self.version}" in docker_image.tags
-        except (docker.errors.DockerException, AssertionError):
-            return False
-
-        return True
-
-    def is_running(self) -> Awaitable[bool]:
-        """Return True if Docker is running.
-
-        Return a Future.
-        """
-        return self.sys_run_in_executor(self._is_running)
-
-    def _is_running(self) -> bool:
-        """Return True if Docker is running.
-
-        Need run inside executor.
-        """
-        try:
-            docker_container = self.sys_docker.containers.get(self.name)
-            docker_image = self.sys_docker.images.get(self.image)
-        except docker.errors.DockerException:
-            return False
-
-        # container is not running
-        if docker_container.status != "running":
-            return False
-
-        # we run on an old image, stop and start it
-        if docker_container.image.id != docker_image.id:
-            return False
-
-        return True
-
-    @process_lock
-    def attach(self):
-        """Attach to running Docker container."""
-        return self.sys_run_in_executor(self._attach)
-
-    def _attach(self) -> None:
-        """Attach to running docker container.
-
-        Need run inside executor.
-        """
-        try:
-            if self.image:
-                self._meta = self.sys_docker.images.get(self.image).attrs
-            self._meta = self.sys_docker.containers.get(self.name).attrs
-        except docker.errors.DockerException:
-            pass
-
-        # Successfull?
-        if not self._meta:
-            raise DockerAPIError() from None
-        _LOGGER.info("Attach to %s with version %s", self.image, self.version)
-
-    @process_lock
-    def run(self) -> Awaitable[None]:
-        """Run Docker image."""
-        return self.sys_run_in_executor(self._run)
-
-    def _run(self) -> None:
-        """Run Docker image.
-
-        Need run inside executor.
-        """
-        raise NotImplementedError()
-
-    @process_lock
-    def stop(self, remove_container=True) -> Awaitable[None]:
-        """Stop/remove Docker container."""
-        return self.sys_run_in_executor(self._stop, remove_container)
-
-    def _stop(self, remove_container=True) -> None:
-        """Stop/remove Docker container.
-
-        Need run inside executor.
-        """
-        try:
-            docker_container = self.sys_docker.containers.get(self.name)
-        except docker.errors.DockerException:
-            raise DockerAPIError() from None
-
-        if docker_container.status == "running":
-            _LOGGER.info("Stop %s application", self.name)
-            with suppress(docker.errors.DockerException):
-                docker_container.stop(timeout=self.timeout)
-
-        if remove_container:
-            with suppress(docker.errors.DockerException):
-                _LOGGER.info("Clean %s application", self.name)
-                docker_container.remove(force=True)
-
-    @process_lock
-    def start(self) -> Awaitable[None]:
-        """Start Docker container."""
-        return self.sys_run_in_executor(self._start)
-
-    def _start(self) -> None:
-        """Start docker container.
-
-        Need run inside executor.
-        """
-        try:
-            docker_container = self.sys_docker.containers.get(self.name)
-        except docker.errors.DockerException:
-            raise DockerAPIError() from None
-
-        _LOGGER.info("Start %s", self.image)
-        try:
-            docker_container.start()
-        except docker.errors.DockerException as err:
-            _LOGGER.error("Can't start %s: %s", self.image, err)
-            raise DockerAPIError() from None
-
-    @process_lock
-    def remove(self) -> Awaitable[None]:
-        """Remove Docker images."""
-        return self.sys_run_in_executor(self._remove)
-
-    def _remove(self) -> None:
-        """remove docker images.
-
-        Need run inside executor.
-        """
-        # Cleanup container
-        with suppress(DockerAPIError):
-            self._stop()
-
-        _LOGGER.info("Remove image %s with latest and %s", self.image, self.version)
-
-        try:
-            with suppress(docker.errors.ImageNotFound):
-                self.sys_docker.images.remove(image=f"{self.image}:latest", force=True)
-
-            with suppress(docker.errors.ImageNotFound):
-                self.sys_docker.images.remove(
-                    image=f"{self.image}:{self.version}", force=True
-                )
-
-        except docker.errors.DockerException as err:
-            _LOGGER.warning("Can't remove image %s: %s", self.image, err)
-            raise DockerAPIError() from None
-
-        self._meta = None
-
-    @process_lock
-    def update(self, tag: str, image: Optional[str] = None) -> Awaitable[None]:
-        """Update a Docker image."""
-        return self.sys_run_in_executor(self._update, tag, image)
-
-    def _update(self, tag: str, image: Optional[str] = None) -> None:
-        """Update a docker image.
-
-        Need run inside executor.
-        """
-        image = image or self.image
-
-        _LOGGER.info(
-            "Update image %s:%s to %s:%s", self.image, self.version, image, tag
-        )
-
-        # Update docker image
-        self._install(tag, image)
-
-        # Stop container & cleanup
-        with suppress(DockerAPIError):
-            try:
-                self._stop()
-            finally:
-                self._cleanup()
-
-    def logs(self) -> Awaitable[bytes]:
-        """Return Docker logs of container.
-
-        Return a Future.
-        """
-        return self.sys_run_in_executor(self._logs)
-
-    def _logs(self) -> bytes:
-        """Return Docker logs of container.
-
-        Need run inside executor.
-        """
-        try:
-            docker_container = self.sys_docker.containers.get(self.name)
-        except docker.errors.DockerException:
-            return b""
-
-        try:
-            return docker_container.logs(tail=100, stdout=True, stderr=True)
-        except docker.errors.DockerException as err:
-            _LOGGER.warning("Can't grep logs from %s: %s", self.image, err)
-
-    @process_lock
-    def cleanup(self) -> Awaitable[None]:
-        """Check if old version exists and cleanup."""
-        return self.sys_run_in_executor(self._cleanup)
-
-    def _cleanup(self) -> None:
-        """Check if old version exists and cleanup.
-
-        Need run inside executor.
-        """
-        try:
-            latest = self.sys_docker.images.get(self.image)
-        except docker.errors.DockerException:
-            _LOGGER.warning("Can't find %s for cleanup", self.image)
-            raise DockerAPIError() from None
-
-        for image in self.sys_docker.images.list(name=self.image):
-            if latest.id == image.id:
-                continue
-
-            with suppress(docker.errors.DockerException):
-                _LOGGER.info("Cleanup images: %s", image.tags)
-                self.sys_docker.images.remove(image.id, force=True)
-
-    @process_lock
-    def restart(self) -> Awaitable[None]:
-        """Restart docker container."""
-        return self.sys_loop.run_in_executor(None, self._restart)
-
-    def _restart(self) -> None:
-        """Restart docker container.
-
-        Need run inside executor.
-        """
-        try:
-            container = self.sys_docker.containers.get(self.name)
-        except docker.errors.DockerException:
-            raise DockerAPIError() from None
-
-        _LOGGER.info("Restart %s", self.image)
-        try:
-            container.restart(timeout=self.timeout)
-        except docker.errors.DockerException as err:
-            _LOGGER.warning("Can't restart %s: %s", self.image, err)
-            raise DockerAPIError() from None
-
-    @process_lock
-    def execute_command(self, command: str) -> Awaitable[CommandReturn]:
-        """Create a temporary container and run command."""
-        return self.sys_run_in_executor(self._execute_command, command)
-
-    def _execute_command(self, command: str) -> CommandReturn:
-        """Create a temporary container and run command.
-
-        Need run inside executor.
-        """
-        raise NotImplementedError()
-
-    def stats(self) -> Awaitable[DockerStats]:
-        """Read and return stats from container."""
-        return self.sys_run_in_executor(self._stats)
-
-    def _stats(self) -> DockerStats:
-        """Create a temporary container and run command.
-
-        Need run inside executor.
-        """
-        try:
-            docker_container = self.sys_docker.containers.get(self.name)
-        except docker.errors.DockerException:
-            raise DockerAPIError() from None
-
-        try:
-            stats = docker_container.stats(stream=False)
-            return DockerStats(stats)
-        except docker.errors.DockerException as err:
-            _LOGGER.error("Can't read stats from %s: %s", self.name, err)
-            raise DockerAPIError() from None
-
-    def is_fails(self) -> Awaitable[bool]:
-        """Return True if Docker is failing state.
-
-        Return a Future.
-        """
-        return self.sys_run_in_executor(self._is_fails)
-
-    def _is_fails(self) -> bool:
-        """Return True if Docker is failing state.
-
-        Need run inside executor.
-        """
-        try:
-            docker_container = self.sys_docker.containers.get(self.name)
-        except docker.errors.DockerException:
-            return False
-
-        # container is not running
-        if docker_container.status != "exited":
-            return False
-
-        # Check return value
-        if int(docker_container.attrs["State"]["ExitCode"]) != 0:
-            return True
-
-        return False

hassio/docker/supervisor.py

@@ -1,51 +0,0 @@
-"""Init file for Hass.io Docker object."""
-from ipaddress import IPv4Address
-import logging
-import os
-
-import docker
-
-from ..coresys import CoreSysAttributes
-from ..exceptions import DockerAPIError
-from .interface import DockerInterface
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class DockerSupervisor(DockerInterface, CoreSysAttributes):
-    """Docker Hass.io wrapper for Supervisor."""
-
-    @property
-    def name(self) -> str:
-        """Return name of Docker container."""
-        return os.environ["SUPERVISOR_NAME"]
-
-    @property
-    def ip_address(self) -> IPv4Address:
-        """Return IP address of this container."""
-        return self.sys_docker.network.supervisor
-
-    def _attach(self) -> None:
-        """Attach to running docker container.
-
-        Need run inside executor.
-        """
-        try:
-            docker_container = self.sys_docker.containers.get(self.name)
-        except docker.errors.DockerException:
-            raise DockerAPIError() from None
-
-        self._meta = docker_container.attrs
-        _LOGGER.info(
-            "Attach to Supervisor %s with version %s", self.image, self.version
-        )
-
-        # If already attach
-        if docker_container in self.sys_docker.network.containers:
-            return
-
-        # Attach to network
-        _LOGGER.info("Connect Supervisor to Hass.io Network")
-        self.sys_docker.network.attach_container(
-            docker_container, alias=["hassio"], ipv4=self.sys_docker.network.supervisor
-        )