build: update version

* Add DNS resolution notes to README

Added DNS resolution notes and instructions for using system resolver.

.github/FUNDING.yaml

@@ -0,0 +1 @@
+github: leukipp

.gitignore

@@ -1,3 +1,4 @@
 node_modules/
 docs/
 out/
+build.json

HARDWARE.md

@@ -29,25 +29,238 @@ If you are running Linux with a graphical user interface (Wayland or X11), you s
 ### HDMI
 | Device                    | System                                 | Display                                                                                                               | Status |
 | ------------------------- | -------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | ------ |
-| Raspberry Pi 4 (arm64)    | Raspberry Pi OS (64-bit), Wayland, X11 | [LAFVIN 5" Touch Display (800x480)](https://www.amazon.de/gp/product/B0BWJ8YP7S)                                      | 🟨      |
+| Raspberry Pi 4 (arm64)    | Raspberry Pi OS (64-bit), Wayland, X11 | [LAFVIN Touch Display 5" (800x480)](https://www.amazon.de/gp/product/B0BWJ8YP7S)                                      | 🟨      |
-| Raspberry Pi 4 (arm64)    | Raspberry Pi OS (64-bit), Wayland, X11 | [Waveshare 8" CAPLCD (768x1024)](https://www.waveshare.com/wiki/8inch_768x1024_LCD)                                   | 🟨      |
+| Raspberry Pi 4 (arm64)    | Raspberry Pi OS (64-bit), Wayland, X11 | [Waveshare 7EP-CAPLCD 7" (1280x800)](https://www.waveshare.com/7ep-caplcd.htm)                                        | 🟨      |
-| Raspberry Pi 4 (arm64)    | Raspberry Pi OS (64-bit), Wayland, X11 | [Waveshare 7" 7EP-CAPLCD (1280x800)](https://www.waveshare.com/7ep-caplcd.htm)                                        | 🟨      |
+| Raspberry Pi 4 (arm64)    | Raspberry Pi OS (64-bit), Wayland, X11 | [Waveshare CAPLCD 8" (768x1024)](https://www.waveshare.com/wiki/8inch_768x1024_LCD)                                   | 🟨      |
 | Raspberry Pi 4 (arm64)    | Raspberry Pi OS (64-bit), Wayland, X11 | [Hannspree HT225 21.5" (1920x1080)](https://www.hannspree.eu/product/HT-225-HPB)                                      | 🟨      |
-| Raspberry Pi 400 (arm64)  | Raspberry Pi OS (64-bit), Wayland, X11 | [UPerfect Vertical Touch 15.6" (1920x1080)](https://uperfect.com/products/uperfect-y-vertical-monitor-15-6)           | 🟨      |
 | Raspberry Pi CM 4 (arm64) | Raspberry Pi OS (64-bit), Wayland, X11 | [Lenovo ThinkCentre 23.8" (1920x1080)](https://psref.lenovo.com/Detail/ThinkCentre_Tiny_In_One_24_Gen_5?M=12NBGAT1EU) | 🟨      |
-| Raspberry Pi 5 (arm64)    | Raspberry Pi OS (64-bit), Wayland, X11 | [GeeekPi 10.1" Capacitive Touch (1280x800)](https://www.amazon.nl/dp/B0DHV6DZC1)                                      | 🟨      |
+| Raspberry Pi 400 (arm64)  | Raspberry Pi OS (64-bit), Wayland, X11 | [UPerfect Vertical Touch 15.6" (1920x1080)](https://uperfect.com/products/uperfect-y-vertical-monitor-15-6)           | 🟨      |
-| Raspberry Pi 5 (arm64)    | Raspberry Pi OS (64-bit), Wayland, X11 | [Prechen Portable Touch 18.5" FHD (1920x1080)](https://www.amazon.de/dp/B0CT2KLDBQ)                                   | 🟨      |
+| Raspberry Pi 5 (arm64)    | Raspberry Pi OS (64-bit), Wayland, X11 | [GeeekPi Capacitive Touch 10.1" (1280x800)](https://www.amazon.nl/dp/B0DHV6DZC1)                                      | 🟨      |
-| Raspberry Pi 5 (arm64)    | Raspberry Pi OS (64-bit), Wayland, X11 | [Akntzcs Portable Touch 16" HD (1920x1200)](https://www.amazon.com/dp/B0CTGW6MQ6)                                     | 🟨      |
 | Raspberry Pi 5 (arm64)    | Raspberry Pi OS (64-bit), Wayland, X11 | [ELECROW Portable Monitor 10.1" (1280x800)](https://www.amazon.co.uk/dp/B0BHHQLKPY)                                   | 🟨      |
+| Raspberry Pi 5 (arm64)    | Raspberry Pi OS (64-bit), Wayland, X11 | [Waveshare Capacitive Touch 14" (2160x1440)](https://www.waveshare.com/14inch-2160x1440-lcd.htm)                      | 🟨      |
+| Raspberry Pi 5 (arm64)    | Raspberry Pi OS (64-bit), Wayland, X11 | [Akntzcs Portable Touch HD 16" (1920x1200)](https://www.amazon.com/dp/B0CTGW6MQ6)                                     | 🟨      |
+| Raspberry Pi 5 (arm64)    | Raspberry Pi OS (64-bit), Wayland, X11 | [Prechen Portable Touch FHD 18.5" (1920x1080)](https://www.amazon.de/dp/B0CT2KLDBQ)                                   | 🟨      |
 | Raspberry Pi 5 (arm64)    | Raspberry Pi OS (64-bit), Wayland, X11 | Generic Non-Touch                                                                                                     | 🟨      |
 | Generic PC (x64)          | Debian KDE (64-bit), Wayland, X11      | Generic Non-Touch                                                                                                     | 🟧      |
+| Generic PC (x64)          | Ubuntu XFCE (64-bit), X11              | Generic Non-Touch                                                                                                     | 🟧      |
 | Generic PC (x64)          | Ubuntu GNOME (64-bit), X11             | Generic Non-Touch                                                                                                     | 🟧      |
 | Generic PC (x64)          | Ubuntu GNOME (64-bit), Wayland         | Generic Non-Touch                                                                                                     | 🟥      |
 
+## Features
+**Minimal features** are designed to run on any system without issues:
+- A webview kiosk window launched in fullscreen mode and loading the specified `--web-url` website should not cause any problems.
+
+**Extended features** become available when the `--mqtt-*` arguments are provided and the hardware is supported:
+- If your hardware is not fully compatible there should be no crashes, but you may miss some sensors.
+
+Hardware support is verified during application startup and can be checked in the terminal or in the log file under the `Supported` section.
+The necessary requirements for MQTT sensors to work are listed here:
+| Name                 | Requirements                                                                                                  | References                                                                                                   |
+| -------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------ |
+| App (Update)         | Requires `sudo` rights, `.deb` install and `touchkio.service` running .                                       | [#70](https://github.com/leukipp/touchkio/issues/70), [#77](https://github.com/leukipp/touchkio/issues/77)   |
+| Display (Status)     | Working `wlopm`, `kscreen-doctor` or `xset` command.                                                          | [#38](https://github.com/leukipp/touchkio/issues/38), [#57](https://github.com/leukipp/touchkio/issues/57)   |
+| Display (Brightness) | Requires `sudo` rights, device under `/sys/class/backlight/*/brightness` exists or working `ddcutil` command. | [#30](https://github.com/leukipp/touchkio/issues/30), [#101](https://github.com/leukipp/touchkio/issues/101) |
+| Keyboard             | Raspberry Pi OS (Wayland) with `squeekboard` running.                                                         | [#7](https://github.com/leukipp/touchkio/issues/7), [#85](https://github.com/leukipp/touchkio/issues/85)     |
+| Battery              | Device under `/sys/class/power_supply/*/capacity` exists.                                                     | [#33](https://github.com/leukipp/touchkio/issues/33)                                                         |
+| Volume               | Device (non-dummy) `pactl get-default-sink` exists.                                                           | [#82](https://github.com/leukipp/touchkio/issues/82)                                                         |
+| Reboot               | Requires password-less `sudo` rights.                                                                         | [#39](https://github.com/leukipp/touchkio/issues/39)                                                         |
+| Shutdown             | Requires password-less `sudo` rights.                                                                         | [#39](https://github.com/leukipp/touchkio/issues/39)                                                         |
+
+## FAQ
+
+### Operating System
+
+<details><summary>I have installed Ubuntu GNOME.</summary>
+
+  - On some Debian based systems (e.g. Ubuntu GNOME), the display status control is only available when using X11 (`xset`).
+  - GNOME is the least supported window manager.
+    - It's recommended to switch to KDE wayland, if you want better support for display status control (`kscreen-doctor`).
+
+</details>
+
+<details><summary>I have installed Raspberry Pi OS on a RPI3.</summary>
+
+  - Raspberry Pi 3 devices have produced a bunch of issues in the past.
+    - [RPI 3B wayland rendering issue](ttps://github.com/leukipp/touchkio/issues/104).
+    - [RPI 3b+ thermostat card issue](https://github.com/leukipp/touchkio/issues/17).
+    - [Webpage cards don't work (Pi3b+)](https://github.com/leukipp/touchkio/issues/24).
+ - It looks like the GPU is not properly supported by Electron.
+    - Running `touchkio --disable-gpu` may improve the situation, but upgrading the hardware is the best solution.
+
+</details>
+
+<details><summary>I want to update APT packages automatically.</summary>
+
+  - The **Package Upgrades** MQTT sensor will show if `apt` package upgrades are available, but updates are [intentionally](https://github.com/leukipp/touchkio/issues/7) not triggered by TouchKio.
+  - It's recommended to keep your system up to date for security and compatibility, as TouchKio primarily supports the latest OS versions. 
+    - Consider configuring `sudo apt install unattended-upgrades` for automatic updates.
+
+</details>
+
+### Display
+
+<details><summary>Display status can't be controlled through MQTT.</summary>
+
+  - The following commands are currently implemented to modify the display status. Make sure that one of these works for your display when you run it directly on the terminal, otherwise the MQTT switch will not work either.
+    - `wlopm --[on,off] \*` (Raspberry Pi OS, Wayland)
+    - `kscreen-doctor --dpms [on,off]` (Debian KDE, Wayland)
+    - `xset dpms force [on,off]` (Generic, X11)
+
+</details>
+
+<details><summary>Display brightness can't be controlled through MQTT.</summary>
+
+  - Have a look at the [features](https://github.com/leukipp/touchkio/blob/main/HARDWARE.md#features) section to check if all requirements are fulfilled.
+    - The **Display** MQTT control is a light entity with brightness support. So make sure to to [click on the entity](https://github.com/leukipp/touchkio/issues/75) to check for brightness support.
+  - HDMI screens typically do not offer brightness control out of the box, so additional setup steps are required.
+    - Brightness support for [ddcutil](https://github.com/leukipp/touchkio/issues/101#issuecomment-3521247263) is build-in and checked on application startup.
+    - Alternatively installing [ddcci-driver-linux](https://github.com/leukipp/touchkio/issues/132#issue-3659009749) or [ddcci-dkms](https://github.com/leukipp/touchkio/issues/101#issuecomment-3571523927) may also work.
+
+</details>
+
+<details><summary>Turning HDMI screen off via MQTT causes it to turn back on.</summary>
+
+  - There are certain HDMI screens (e.g. Viewsonic) where the MQTT display status command doesn't work as expected. 
+    - The screen [immediately turns on again](https://github.com/leukipp/touchkio/issues/38), which may be caused by incompatible HDMI cables being used.
+
+</details>
+
+### Touch
+
+<details><summary>Automated screen blanking on inactivity.</summary>
+
+  - You can use Raspberry Pi's build-in [screen blanking](https://www.raspberrypi.com/documentation/computers/configuration.html#screen-blanking-3) functionality, however, if the screen is turned on through Home Assistant after being automatically turned off, it will remain on indefinitely.
+    - It's recommended to either use the built-in screen blanking feature or implement a Home Assistant [automation](https://www.home-assistant.io/docs/automation/basics) (e.g. presence detection or **Last Active** MQTT sensor) to manage the screen status.
+
+</details>
+
+<details><summary>Touch in multitouch mode not waking the screen.</summary>
+
+  - It's recommended to use **Mouse Emulation** for touch screens, otherwise touch based [screen wake-up](https://github.com/leukipp/touchkio/issues/127) from display off state will fail, especially if build-in [screen blanking](https://www.raspberrypi.com/documentation/computers/configuration.html#screen-blanking-3) is disabled.
+
+</details>
+
+<details><summary>Touch events may propagate through a display that is turned off.</summary>
+
+  - It's recommended to use **Mouse Emulation** for touch screens, otherwise Home Assistant actions could be triggered [unintentionally](https://github.com/leukipp/touchkio/issues/61) on touch.
+
+</details>
+
+### Network
+
+<details><summary>Connecting via https/mqtts with a self-signed certificate.</summary>
+
+  - When connecting to a service with a [custom certificate](https://github.com/leukipp/touchkio/issues/42#issuecomment-3041870215), ensure the specified FQDN matches.
+    - Using the `--ignore-certificate-errors` flag is [not recommended](https://github.com/leukipp/touchkio/issues/76) for browsing external sites.
+
+</details>
+
+<details><summary>Local DNS entries in /etc/hosts are ignored.</summary>
+
+  - Electron bypasses the system resolver stack, ignoring `/etc/hosts` and local DNS servers.
+    - To use the system resolver, modify `~/.config/systemd/user/touchkio.service` to disable these features:
+    ```bash
+    ExecStart=/usr/bin/touchkio --disable-features=UseDNSHttps,AsyncDns
+    ```
+
+</details>
+
+<details><summary>During VNC access the display turns gray.</summary>
+
+  - On Raspberry Pi OS the display command may fail with `ERROR: Setting power mode for output '[DSI-*,HDMI-*]' failed`.
+    - This can happen if you have `wayvnc` running for remote access and is caused by a [known bug](https://github.com/leukipp/touchkio/issues/78).
+
+</details>
+
+### Media
+
+<details><summary>I need Music and Voice Assistant.</summary>
+
+  - Not planned, look for [alternatives](https://github.com/leukipp/touchkio/issues/88#issuecomment-3366659265).
+
+</details>
+
+<details><summary>I need a camera stream from the device.</summary>
+
+  - Not planned, look for [alternatives](https://github.com/leukipp/touchkio/issues/130#issuecomment-3591770594).
+
+</details>
+
+<details><summary>I need additional MQTT entities to control hardware.</summary>
+
+  - Not planned, look for [alternatives](https://github.com/leukipp/touchkio/issues/138#issuecomment-3591784725).
+
+</details>
+
+### Dependencies
+
+<details><summary>Some of the MQTT controls are missing.</summary>
+
+  - Certain [features](https://github.com/leukipp/touchkio/blob/main/HARDWARE.md#features) from the MQTT integration may require elevated privileges to work correctly.
+    - Test if your local user has the [necessary permissions](https://github.com/leukipp/touchkio/issues/39) to run `sudo -n true` without being [prompted for a password](https://github.com/leukipp/touchkio/issues/116#issuecomment-3471566411).
+
+</details>
+
+<details><summary>The ddcutil command doesn't seem to be used.</summary>
+
+  - Currently `ddcutil` is only used for brightness control of HDMI screens.
+    - Make sure that your screen is supporting [continuous](https://github.com/leukipp/touchkio/issues/101#issuecomment-3521247263) adjustments of brightness values.
+
+</details>
+
+<details><summary>The on-screen keyboard doesn't automatically pop-out.</summary>
+
+  - Most of the available on-screen keyboards will not render above any [fullscreen window](https://forums.raspberrypi.com/viewtopic.php?p=2327148).
+  - There is a [workaround](https://github.com/leukipp/touchkio/issues/85) for `squeekboard`, which will only work on Raspberry Pi OS.
+    - If the on-screen keyboard still doesn't [automatically pop-out](https://github.com/leukipp/touchkio/issues/4) when entering a text field inside the webview you can use the side [widget](https://github.com/leukipp/touchkio/issues/16) to toggle the visibility.
+
+</details>
+
+### Errors
+
+<details><summary>Terminal is full with "ERROR:gbm_wrapper.cc" messages.</summary>
+
+  - On the terminal you may see some _ERROR:gbm_wrapper.cc_ messages.
+    - This appears to be a [known issue](https://github.com/electron/electron/issues/42322) that currently lacks a fix, but the webview still works.
+
+</details>
+
+<details><summary>CPU and RAM usage increases without reason.</summary>
+
+  - This was [especially observed](https://github.com/leukipp/touchkio/issues/123) when the screen is permanently on and renders a dashboard with interactive elements (e.g. custom lovelace cards).  
+    - Switching to another **Page Url** or turning the **Display** off during idle times improves resource usage.  
+    - Alternatively a timed **Refresh** of the webview via MQTT can also help.
+
+</details>
+
+<details><summary>Error message "GPU Process abnormal-exit".</summary>
+
+  - _GPU Process abnormal-exit (code 512)_ means that the Electron GPU process crashed, probably caused by some issues inside the webview.
+    - Disabling the GPU via `touchkio --disable-gpu` may help.
+ 
+</details>
+
+<details><summary>Error message "Render Process killed".</summary>
+
+  - _Render Process killed (code 9)_ will lead to a temporary [white screen](https://github.com/leukipp/touchkio/issues/115).
+  - The problem likely stems from Electron’s calculated RAM limit (~2GB) and the dashboard using too much memory.
+    - Although there are flags to [increase the limit](https://github.com/leukipp/touchkio/issues/36#issuecomment-3406441947), a standard webview shouldn’t require that much RAM.
+
+</details>
+
 ## Contributions
 In case your hardware is not listed above don't worry, give it a try.
 Running `touchkio --web-url=https://demo.home-assistant.io` will most likely just work.
-The only problems that may arise are when controlling the display or keyboard via the Home Assistant integration.
+The only problems that may arise are when controlling the display via the Home Assistant integration.
+
+There is a possibility to test `pre-releases` if you would like to try upcoming versions before the official release is published.
+These early builds are available to a smaller group of users who have chosen to take part in testing.
+
+If you are interested in long-term testing, check out the related [help request](https://github.com/leukipp/touchkio/issues/96).
+When a [pre-release](https://github.com/leukipp/touchkio/releases) is available and you want to test it on-demand, run:
+```bash
+bash <(wget -qO- https://raw.githubusercontent.com/leukipp/touchkio/main/install.sh) update early
+```
 
 - If you encounter any problems, please create a new [issue](https://github.com/leukipp/touchkio/issues).
 - If you encounter any problems and are able to fix it yourself, feel free to create a [pull request](https://github.com/leukipp/touchkio/pulls).

README.md

@@ -1,4 +1,10 @@
 # TouchKio
+[![build](https://img.shields.io/github/actions/workflow/status/leukipp/touchkio/release.yaml?style=flat-square)](https://github.com/leukipp/touchkio/actions)
+[![date](https://img.shields.io/github/release-date/leukipp/touchkio?style=flat-square)](https://github.com/leukipp/touchkio/releases)
+[![platform](https://img.shields.io/badge/platform-%20arm64%20|%20x64%20-teal?style=flat-square)](https://github.com/leukipp/touchkio/releases)
+[![downloads](https://img.shields.io/github/downloads/leukipp/touchkio/total?style=flat-square)](https://github.com/leukipp/touchkio/releases)
+[![sponsor](https://img.shields.io/github/sponsors/leukipp?color=red&logo=github&style=flat-square)](https://github.com/sponsors/leukipp)
+
 **TouchKio** is a Node.js application that utilizes Electron to create a kiosk mode window specifically designed for a Home Assistant dashboard.
 This tool is packaged as a **.deb** file, making it easy to launch the kiosk application on any Debian based Linux [hardware](https://github.com/leukipp/touchkio/blob/main/HARDWARE.md) (e.g. **Raspberry Pi**) equipped with a **DSI or HDMI** Touch Display.
 Additional releases for other Linux systems are available as **.zip** file.
@@ -12,18 +18,22 @@ Moreover, the device running the **kiosk application** also offers several **Hom
 - [x] Fast and easy setup.
 - [x] Remember login credentials.
 - [x] Touch optimized web browsing.
+- [x] Dynamic window status bar layout.
 - [x] Side panel widget for kiosk control.
 - [x] Navigation bar to switch between pages.
-- [x] Configurable browser zoom and theme support. 
+- [x] Adjustable browser zoom and theme support.
 - [x] Extended touch screen wake-up functionality.
 - [x] Remote controllable via MQTT.
-  - [x] Manage kiosk window status.
   - [x] Toggle the on-screen keyboard.
   - [x] Touch display power and brightness.
+  - [x] Manage kiosk window status and zoom.
+  - [x] Screenshot image of the kiosk webview.
+  - [x] Show network interfaces and addresses.
+  - [x] List all available system package upgrades.
   - [x] Multi-webpage switching and url navigation.
-  - [x] Monitor temperature, processor and memory usage.
+  - [x] Volume control for connected audio outputs.
   - [x] Execute system reboot and shutdown commands.
-  - [x] Show available system package upgrades.
+  - [x] Monitor battery, temperature, processor and memory usage.
 
 The kiosk application can be executed with command line arguments to load a **Home Assistant dashboard in fullscreen** mode.
 Additionally, a **MQTT endpoint** can be defined, allowing the application to provide controls and sensors for the Linux device and the connected Touch Display.
@@ -42,11 +52,12 @@ This setup allows seamless communication between your kiosk device and Home Assi
 For a comprehensive guide on setting up MQTT with Home Assistant, please refer to the official documentation available here: https://www.home-assistant.io/integrations/mqtt.
 
 ## Installation
-On the first run of the application, you may encounter a **setup procedure** and the Home Assistant **login screen**.
+On the first run of the application, you will encounter a **setup procedure (CLI)** and the Home Assistant **login screen (UI)**.
-It's recommended to create a **dedicated user** (local access only) for your kiosk device.
+It's recommended to create a dedicated Home Assistant user (local access only) for your kiosk device.
 
 You might also need a physical keyboard or remote VNC access to input these credentials once.
 If your hardware is [supported](https://github.com/leukipp/touchkio/blob/main/HARDWARE.md) you may be able to activate the on-screen keyboard using the side [widget](https://github.com/leukipp/touchkio/issues/16).
+After the first login the Home Assistant credentials should be stored inside the `~/.config/touchkio/Cache` folder.
 
 #### Option 1 - The easy way
 Run this command to download and install the latest **.deb** (arm64 or x64) release.
@@ -56,7 +67,6 @@ bash <(wget -qO- https://raw.githubusercontent.com/leukipp/touchkio/main/install
 ```
 Make sure that you run this with your **standard user** and not with root (sudo).
 If you are paranoid, or smart, or both, have a look into the [install.sh](https://github.com/leukipp/touchkio/blob/main/install.sh) script before executing external code on your machine.
-This command can also be re-run to **update** an existing installation to the latest version.
 
 The systemd **user service** is enabled by default and the kiosk application should start automatically the next time you boot.
 If you need manual control use:
@@ -70,9 +80,8 @@ systemctl --user start|stop|status|restart touchkio.service
 When connected via SSH, it's necessary to export the display variables first, as outlined in the [development](https://github.com/leukipp/touchkio?tab=readme-ov-file#development) section.
 The [install.sh](https://github.com/leukipp/touchkio/blob/main/install.sh) script mentioned above performs the following tasks (and you just have to do it manually):
 - [Download](https://github.com/leukipp/touchkio/releases/latest) the latest version file that is suitable for your architecture (arm64 or x64).
-  - Debian (**deb**): Open a terminal and execute the following command to install the application, e.g:
+  - Debian (**deb**): Open a terminal and execute the following command to install the application, e.g: `sudo apt install ./touchkio_1.x.x_arm64.deb && touchkio --setup`
-`sudo apt install ./touchkio_1.x.x_arm64.deb && touchkio --setup`
+  - Others (**zip**): Extract the archive and run the binary, e.g: `unzip touchkio-linux-x64-1.x.x.zip && cd touchkio-linux-x64 && ./touchkio --setup`
-  - Others (**zip**): Extract the archive and run the binary, e.g:  `unzip touchkio-linux-x64-1.x.x.zip && cd touchkio-linux-x64 && ./touchkio --setup`
 - If you just want to load a Home Assistant dashboard without further control you are good to go, e.g: `touchkio --web-url=https://demo.home-assistant.io`
   - The `--web-url` doesn't necessarily need to be a Home Assistant url, any kind of website can be shown in kiosk mode.
   - Only when using the MQTT integration via `--mqtt-*`, a running Home Assistant instance is required.
@@ -89,6 +98,15 @@ yarn build
 
 </div></details>
 
+#### Update
+If you have already installed TouchKio and want to upgrade to the latest version, simply install the newer version over the existing one.
+
+The [install.sh](https://github.com/leukipp/touchkio/blob/main/install.sh) script can also be run to update an existing installation to the **latest version**.
+The setup procedure can be skipped to use the existing default arguments from the configuration file:
+```bash
+bash <(wget -qO- https://raw.githubusercontent.com/leukipp/touchkio/main/install.sh) update
+```
+
 ## Configuration
 Running `touchkio --setup` will prompt you to enter arguments that will be used when the application starts without any specified arguments.
 These default arguments are stored in `~/.config/touchkio/Arguments.json`, where they can also be modified.
@@ -143,7 +161,7 @@ touchkio --web-url=http://192.168.1.42:8123 --mqtt-url=mqtt://192.168.1.42:1883
 ## User Interface
 TouchKio provides a simple webview window designed specifically for Touch Displays. Electron apps are known to be resource intensive due to their architecture and the inclusion of a full web browser environment. If you just run the kiosk application without other heavy loads, everything should run smoothly.
 
-### Controls
+### Touch Controls
 Additional controls can be found along the right edge of the kiosk application. For more details, you may want to have a closer look here:
 | Name         | Description                                              |
 | ------------ | -------------------------------------------------------- |
@@ -154,14 +172,14 @@ Additional controls can be found along the right edge of the kiosk application.
 
 ### Keyboard Shortcuts
 The application also supports basic shortcuts to enhance navigation and usability for users who prefer or require non-touch input methods:
-| Name                        | Description                 |
+| Name                        | Description                  |
-| --------------------------- | --------------------------- |
+| --------------------------- | ---------------------------- |
-| `Control+Left`              | Navigate to previous page   |
+| `Control+Left`              | Navigate to previous page    |
-| `Control+Right`             | Navigate to next page       |
+| `Control+Right`             | Navigate to next page        |
-| `Control+Num_Subtract`      | Decrease the page zoom      |
+| `Control+Num_Subtract`      | Decrease the page zoom       |
-| `Control+Num_Add`           | Increase the page zoom      |
+| `Control+Num_Add`           | Increase the page zoom       |
-| `Alt+Left`/`Mouse+Back`     | Navigate back in history    |
+| `Alt+Left`/`Mouse+Back`     | Navigate backward in history |
-| `Alt+Right`/`Mouse+Forward` | Navigate forward in history |
+| `Alt+Right`/`Mouse+Forward` | Navigate forward in history  |
 
 ## Development
 To create your own local build, you first need to install [Node.js](https://pimylifeup.com/raspberry-pi-nodejs) and [Yarn](https://classic.yarnpkg.com/lang/en/docs/install).
@@ -216,19 +234,21 @@ While using external sensors that directly integrate with Home Assistant and by
 
 <details><summary>Don't waste your time reading this.</summary><div></br>
 
-The Raspberry Pi's **build-in on-screen keyboard** named `squeekboard` (it squeaks because some *Rust* got inside), is specifically designed for Wayland environments and features a **D-Bus interface** that allows applications to show or hide the keyboard as needed.
+The Raspberry Pi's **build-in on-screen keyboard** named `squeekboard` (it squeaks because some _Rust_ got inside), is specifically designed for Wayland environments and features a **D-Bus interface** that allows applications to show or hide the keyboard as needed.
 The kiosk application interacts with squeekboard via the `D-Bus` object path `/sm/puri/OSK0`, enabling the keyboard to be hidden or shown based on **MQTT** user input or system events.
 
 The Raspberry Pi's **build-in screen blanking** function uses the command `swayidle -w timeout 600 'wlopm --off \*' resume 'wlopm --on \*' &` inside `~/.config/labwc/autostart` to blank the screen after **10 minutes**.
-The `wlopm --off \*` command changes the `bl_power` value to **4**, when setting the value to **0** the screen will turn on again.
+The `wlopm --off \*` command changes the `/sys/class/backlight/*/bl_power` value to **4**, when setting the value to **0** the screen will turn on again.
 However, `swayidle` still seems to consider the screen to be off and as a result it will not turn off again unless there is some interaction in the meantime.
 
 When using the MQTT integration, the kiosk application must be able to **detect changes** made on the **device** itself.
-I managed to achieve this for the `brightness` file by implementing a simple `fs.watch(..)` file listener.
+I managed to achieve this for the `/sys/class/backlight/*/brightness` file by implementing a simple `fs.watch(..)` file listener.
-However, I found that it **never triggered** for the `bl_power` file.
+However, I found that it **never triggered** for the `/sys/class/backlight/*/bl_power` or the `/sys/class/drm/*/dpms` file.
 Although the file content changes, none of the filesystem listeners where fired.
 This could be due to `swayidle`/`wlopm` performing write actions at a deeper level that are not detectable by file listeners.
-As a result, I went for a **polling solution**, checking the state of the file **every second** for any changes.
+
+As a result, I went for a **polling solution**, checking the state of the `/sys/class/backlight/*/brightness` and `/sys/class/drm/*/dpms` file **every second** for any changes.
+In case `ddcutil` is installed the file `~/.config/touchkio/Cache/Brightness.vcp` will be written/monitored to support brightness support for HDMI screens.
 While I understand this is not ideal, it's necessary to ensure proper functionality.
 
 The display power status and brightness can be adjusted via the MQTT integration.
@@ -242,9 +262,10 @@ Implementing stronger **security measures** would complicate the setup process a
 When using the kiosk application without initializing the default arguments, you will need to provide them with every command.
 This means that the password may be stored as plain text in various files, such as `touchkio.service`, `~/.bash_history`, etc.
 
-To resolve the issue where the first **touch** on a **turned-off screen** triggers a **click event**  (which could inadvertently activate Home Assistant actions), a workaround needed to be implemented.
+To address the problem where the first **touch** on a **turned-off screen** may trigger a **click event** (which could inadvertently activate Home Assistant actions), a workaround needed to be implemented.
-When the screen **turns off** the **focus** is removed from the kiosk window.
+When the screen **turns on/off**, the timestamps of these events are recorded.
-This way, the first click only turns the screen on and focuses the window, allowing subsequent clicks to work as expected.
+If a touch event is detected and the **timestamp** of the **last screen-off** is more recent than the **last screen-on** timestamp, the touch event is discarded and the screen is turned on instead.
+From that point onward, subsequent touch interactions will function normally as expected.
 
 Additionally, to address the problem that scrolling only works with the **web browser scrollbar** on the right, the application is configured to **simulate a touch device** using `Emulation.setEmitTouchEventsForMouse`.
 This adjustment provides a user experience similar to that of a proper mobile device.
@@ -252,33 +273,26 @@ This adjustment provides a user experience similar to that of a proper mobile de
 </div></details>
 
 ## Issues
-Please have a look into the [hardware](https://github.com/leukipp/touchkio/blob/main/HARDWARE.md) documentation if you ran into any issues. 
+### Please review the hardware [FAQ](https://github.com/leukipp/touchkio/blob/main/HARDWARE.md#faq) section first if you encounter any issues.
 
-**Minimal features** are designed to run on any system without issues:
+For basic debugging **(TouchKio)**, stop the service and launch `touchkio` directly on the terminal to monitor the log output in real-time.
-- A webview kiosk window launched in fullscreen mode and loading the specified `--web-url` website should not cause any problems.
+This output is also written into `~/.config/touchkio/logs/main.log` for review.
 
-**Extended features** become available when the `--mqtt-*` arguments are provided and the hardware is supported:
+For extended logging **(Electron)** you can run `touchkio --enable-logging`, which will write an additional log file into `~/.config/touchkio/logs/electron.log`.
-- If your hardware is not fully compatible there should be no crashes, but you may miss some sensors.
+Refer to the [--log-level=[0-3]](https://www.electronjs.org/docs/latest/api/command-line-switches#--log-leveln) and [--v=[0-3]](https://www.electronjs.org/docs/latest/api/command-line-switches#--vlog_level) options to adjust the logging verbosity.
-    - On some Debian based systems (e.g. Ubuntu GNOME), the display status control may only be available when using X11.
-- The following commands are currently implemented to modify the display status.
-  - `wlopm --[on]/[off] *` (Raspberry Pi OS, Wayland) 
-  - `kscreen-doctor --dpms [on]/[off]` (Debian KDE, Wayland) 
-  - `xset dpms force [on]/[off]` (Generic, X11) 
 
-**Known Issues** that are by-design or for which there isn't a solution so far:
+If you need to debug the webview **(Chrome DevTools)** use `touchkio --app-debug`.
-- You can use Raspberry Pi's build-in [screen blanking](https://www.raspberrypi.com/documentation/computers/configuration.html#screen-blanking-3) functionality, however, if the screen is turned on through Home Assistant after being automatically turned off, it will remain on indefinitely.
+
-  - It's recommended to either use the built-in screen blanking feature or implement a Home Assistant automation (e.g. presence detection) to manage the screen status.
+In case of undocumented problems, please [create an issue](https://github.com/leukipp/touchkio/issues) and include the output of `touchkio --version`, additional information about your system (such as operating system, hardware, etc.), and any relevant log files.
-- When using a Raspberry Pi, the on-screen keyboard doesn't automatically pop-out when entering a text field inside the webview.
-  - As a current [workaround](https://github.com/leukipp/touchkio/issues/4) you can use the side [widget](https://github.com/leukipp/touchkio/issues/16) to toggle the keyboard visibility.
-- Certain commands from the MQTT integration may require elevated privileges to work correctly.
-  - Ensure that your local user has the [necessary permissions](https://github.com/leukipp/touchkio/issues/39) to run `sudo` without being prompted for a password. 
-- On the terminal you may see some *ERROR:gbm_wrapper.cc* messages.
-  -  This appears to be a [known issue](https://github.com/electron/electron/issues/42322) that currently lacks a fix, but the webview still works.
 
 ## Credits
+[Inspired by](https://www.jeffgeerling.com/blog/2024/home-assistant-and-carplay-pi-touch-display-2) the one and only Raspberry Pi Master, Jeff Geerling ([@geerlingguy](https://github.com/geerlingguy)).
+
 Thanks to Sebastian ([@pdsccode](https://github.com/pdsccode)) for his contributions on issues and [community](https://community.home-assistant.io/t/kiosk-mode-for-raspberry-pi-with-touch-display/821196) discussions.
 
-[Inspired by](https://www.jeffgeerling.com/blog/2024/home-assistant-and-carplay-pi-touch-display-2) the one and only Raspberry Pi Master, Jeff Geerling ([@geerlingguy](https://github.com/geerlingguy)).
+If you are looking for hardware or a well-designed mounting solution for the Raspberry Pi Display, check out the [blog post](https://www.thestockpot.net/videos/home-assistant-wall-display) from Dillan Stock ([@TheStockPot-AU](https://www.youtube.com/channel/UCmlzNHg8QiWVutUyFOV2UdQ)).
+
+[![What My Smart Home Was Missing](https://img.youtube.com/vi/uTxURzmrVtA/maxresdefault.jpg)](https://www.youtube.com/watch?v=uTxURzmrVtA)
 
 ## License
 [MIT](https://github.com/leukipp/touchkio/blob/main/LICENSE)

forge.config.js

@@ -1,4 +1,22 @@
 const fs = require("fs");
+const jszip = require("jszip");
+const crypto = require("crypto");
+const path = require("path");
+
+const date = new Date().toISOString();
+
+const generateBuildFile = (platform, arch, maker) => {
+  const package = fs.readFileSync(path.join(__dirname, "package.json"), "utf8");
+  const hash = crypto.createHash("sha256").update(package);
+  const data = {
+    id: hash.digest("hex").slice(-6),
+    platform: platform,
+    arch: arch,
+    maker: maker,
+    date: date,
+  };
+  return JSON.stringify(data, null, 2);
+};
 
 module.exports = {
   packagerConfig: {
@@ -33,10 +51,25 @@ module.exports = {
     },
   ],
   hooks: {
+    postPackage: async (config, results) => {
+      for (const outputPath of results.outputPaths) {
+        const [name, platform, arch] = path.basename(outputPath).split("-");
+        const buildFile = path.join(outputPath, "resources", "app", "build.json");
+        fs.writeFileSync(buildFile, generateBuildFile(platform, arch, "deb"), { encoding: "utf8" });
+      }
+    },
     postMake: async (config, results) => {
       for (const result of results) {
         const artifacts = [];
-        result.artifacts.forEach((artifact) => {
+        for (const artifact of result.artifacts) {
+          if (artifact.includes(".zip")) {
+            const [name, platform, arch] = path.basename(artifact).split("-");
+            const buildFile = path.join(`${name}-${platform}-${arch}`, "resources", "app", "build.json");
+            const options = { type: "nodebuffer", compression: "DEFLATE", compressionOptions: { level: 9 } };
+            const zip = await jszip.loadAsync(fs.readFileSync(artifact));
+            zip.file(buildFile, generateBuildFile(platform, arch, "zip"));
+            fs.writeFileSync(artifact, await zip.generateAsync(options));
+          }
           if (artifact.includes("amd64")) {
             const renamed = artifact.replace("amd64", "x64");
             fs.renameSync(artifact, renamed);
@@ -44,7 +77,7 @@ module.exports = {
           } else {
             artifacts.push(artifact);
           }
-        });
+        }
         result.artifacts = artifacts;
       }
     },

html/navigation.html

@@ -1,6 +1,7 @@
 <!doctype html>
 <html>
   <head>
+    <meta http-equiv="Content-Security-Policy" content="default-src 'unsafe-inline'" />
     <style>
       [data-theme="dark"] {
         --primary-color: rgba(225, 225, 225, 1);
@@ -32,8 +33,8 @@
         align-items: center;
         width: 100vw;
         height: 100vh;
-        padding: 0 30px;
+        padding: 0 10px;
-        column-gap: 20px;
+        column-gap: 10px;
         list-style-type: none;
         border-top: 1px solid var(--border-color);
         background: var(--background-color);
@@ -74,6 +75,7 @@
         padding: 6px 10px;
         border-radius: 4px;
         font-size: 18px;
+        font-family: sans-serif;
         outline: none;
         border: none;
         cursor: text;
@@ -132,7 +134,7 @@
       </li>
       <li class="separator"></li>
       <li class="dynamic">
-        <input id="url" type="text" spellcheck="false" />
+        <input id="url" type="text" spellcheck="false" readonly="true" />
       </li>
       <li class="separator"></li>
       <li>
@@ -187,6 +189,9 @@
           });
         });
         document.querySelectorAll("input").forEach((input) => {
+          input.addEventListener("blur", (e) => {
+            ipcRenderer.send("input-blur", { id: e.target.id });
+          });
           input.addEventListener("focus", (e) => {
             ipcRenderer.send("input-focus", { id: e.target.id });
           });
@@ -205,16 +210,21 @@
         ipcRenderer.on("button-hidden", (e, button) => {
           document.getElementById(button.id).parentNode.classList.toggle("hidden", button.hidden);
         });
-        ipcRenderer.on("input-blur", (e, input) => {
+        ipcRenderer.on("input-readonly", (e, input) => {
-          document.getElementById(input.id).blur();
+          document.getElementById(input.id).readOnly = input.readonly;
-        });
-        ipcRenderer.on("input-select", (e, input) => {
-          document.getElementById(input.id).select();
         });
         ipcRenderer.on("input-text", (e, input) => {
           document.getElementById(input.id).value = input.text;
           document.getElementById(input.id).placeholder = input.placeholder;
         });
+        ipcRenderer.on("input-select", (e, input) => {
+          window.getSelection()?.removeAllRanges();
+          if (input.select) {
+            document.getElementById(input.id).select();
+          } else {
+            document.getElementById(input.id).blur();
+          }
+        });
         ipcRenderer.on("data-theme", (e, data) => {
           document.documentElement.setAttribute("data-theme", data.theme);
         });

html/pager.html

@@ -1,11 +1,22 @@
 <!doctype html>
 <html>
   <head>
+    <meta http-equiv="Content-Security-Policy" content="default-src 'unsafe-inline'" />
     <style>
+      [data-theme="dark"] {
+        --background-color: rgba(225, 225, 225, 0.15);
+        --previous-cursor: w-resize;
+        --next-cursor: e-resize;
+      }
+      [data-theme="light"] {
+        --background-color: rgba(33, 33, 33, 0.15);
+        --previous-cursor: w-resize;
+        --next-cursor: e-resize;
+      }
       [data-theme="hidden"] {
-        --primary-color: rgba(0, 0, 0, 0);
-        --border-color: rgba(0, 0, 0, 0);
         --background-color: rgba(0, 0, 0, 0);
+        --previous-cursor: none;
+        --next-cursor: none;
       }
       ::-webkit-scrollbar {
         display: none;
@@ -28,24 +39,31 @@
         width: 100vw;
         height: 100vh;
         list-style-type: none;
-        background: var(--background-color);
       }
       li {
         display: flex;
         align-items: center;
         flex: 0 0 auto;
       }
+      li:not(.disabled) #previous {
+        cursor: var(--previous-cursor);
+      }
+      li:not(.disabled) #next {
+        cursor: var(--next-cursor);
+      }
       button {
         width: 100vw;
         height: 50vh;
         border: none;
+        cursor: not-allowed;
         background-color: transparent;
       }
-      #previous {
+      button:not(:active) {
-        cursor: w-resize;
+        transition: background-color 500ms step-end;
       }
-      #next {
+      menu:has(button:active) button {
-        cursor: e-resize;
+        background-color: var(--background-color);
+        transition-duration: 0ms;
       }
     </style>
   </head>
@@ -63,13 +81,16 @@
 
       const registerSendEvents = () => {
         document.querySelectorAll("button").forEach((button) => {
-          button.addEventListener("click", (e) => {
+          button.addEventListener("pointerdown", (e) => {
             ipcRenderer.send("button-click", { id: e.target.id });
           });
         });
       };
 
       const registerReceiveEvents = () => {
+        ipcRenderer.on("button-disabled", (e, button) => {
+          document.getElementById(button.id).parentNode.classList.toggle("disabled", button.disabled);
+        });
         ipcRenderer.on("data-theme", (e, data) => {
           document.documentElement.setAttribute("data-theme", data.theme);
         });

html/status.html

@@ -0,0 +1,162 @@
+<!doctype html>
+<html>
+  <head>
+    <meta http-equiv="Content-Security-Policy" content="default-src 'unsafe-inline'" />
+    <style>
+      [data-theme="dark"] {
+        --primary-color: rgba(229, 229, 229, 1);
+        --background-color: rgba(66, 67, 68, 1);
+        --minimize-color: rgba(52, 199, 89, 1);
+        --fullscreen-color: rgba(255, 149, 0, 1);
+        --terminate-color: rgba(255, 59, 48, 1);
+      }
+      [data-theme="light"] {
+        --primary-color: rgba(26, 26, 26, 1);
+        --background-color: rgba(237, 236, 235, 1);
+        --minimize-color: rgba(52, 199, 89, 1);
+        --fullscreen-color: rgba(255, 149, 0, 1);
+        --terminate-color: rgba(255, 59, 48, 1);
+      }
+      ::-webkit-scrollbar {
+        display: none;
+      }
+      * {
+        margin: 0;
+        padding: 0;
+        cursor: pointer;
+      }
+      body {
+        display: flex;
+        align-items: center;
+        width: 100vw;
+        height: 100vh;
+        background: var(--background-color);
+      }
+      header {
+        display: flex;
+        align-items: center;
+        flex: 1 1 0%;
+        height: 100vh;
+        -webkit-app-region: drag;
+      }
+      h1 {
+        position: absolute;
+        transform: translate(-50%, -50%);
+        top: 50%;
+        left: 50%;
+        font-size: 18px;
+        font-weight: 500;
+        font-family: sans-serif;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        text-align: center;
+        user-select: none;
+        color: var(--primary-color);
+      }
+      menu {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        flex: 0 0 auto;
+        height: 100vh;
+        min-width: 116px;
+        padding: 0px 10px;
+        column-gap: 10px;
+        list-style-type: none;
+        background: var(--background-color);
+        position: relative;
+        z-index: 1;
+      }
+      li {
+        display: flex;
+        align-items: center;
+        flex: 0 0 auto;
+      }
+      li.disabled {
+        opacity: 0.5;
+        cursor: not-allowed;
+        pointer-events: none;
+      }
+      button {
+        width: 32px;
+        height: 32px;
+        border: none;
+        background-color: transparent;
+      }
+      svg {
+        pointer-events: none;
+      }
+      #minimize > svg {
+        fill: var(--minimize-color);
+      }
+      #fullscreen > svg {
+        fill: var(--fullscreen-color);
+      }
+      #terminate > svg {
+        fill: var(--terminate-color);
+      }
+    </style>
+  </head>
+  <body>
+    <header>
+      <h1 id="title">TouchKio</h1>
+    </header>
+    <menu>
+      <li>
+        <button id="minimize">
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+            <title>minus-circle</title>
+            <path d="M17,13H7V11H17M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
+          </svg>
+        </button>
+      </li>
+      <li>
+        <button id="fullscreen">
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+            <title>chevron-up-circle</title>
+            <path
+              d="M22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2A10,10 0 0,1 22,12M7.4,15.4L12,10.8L16.6,15.4L18,14L12,8L6,14L7.4,15.4Z"
+            />
+          </svg>
+        </button>
+      </li>
+      <li>
+        <button id="terminate">
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+            <title>close-circle</title>
+            <path
+              d="M12,2C17.53,2 22,6.47 22,12C22,17.53 17.53,22 12,22C6.47,22 2,17.53 2,12C2,6.47 6.47,2 12,2M15.59,7L12,10.59L8.41,7L7,8.41L10.59,12L7,15.59L8.41,17L12,13.41L15.59,17L17,15.59L13.41,12L17,8.41L15.59,7Z"
+            />
+          </svg>
+        </button>
+      </li>
+    </menu>
+    <script>
+      const { ipcRenderer } = require("electron");
+
+      const registerSendEvents = () => {
+        document.querySelectorAll("button").forEach((button) => {
+          button.addEventListener("click", (e) => {
+            ipcRenderer.send("button-click", { id: e.target.id });
+          });
+        });
+      };
+
+      const registerReceiveEvents = () => {
+        ipcRenderer.on("button-disabled", (e, button) => {
+          document.getElementById(button.id).parentNode.classList.toggle("disabled", button.disabled);
+        });
+        ipcRenderer.on("text-content", (e, text) => {
+          document.getElementById(text.id).textContent = text.content;
+        });
+        ipcRenderer.on("data-theme", (e, data) => {
+          document.documentElement.setAttribute("data-theme", data.theme);
+        });
+      };
+
+      registerSendEvents();
+      registerReceiveEvents();
+    </script>
+  </body>
+</html>

html/widget.html

@@ -1,6 +1,7 @@
 <!doctype html>
 <html>
   <head>
+    <meta http-equiv="Content-Security-Policy" content="default-src 'unsafe-inline'" />
     <style>
       [data-theme="dark"] {
         --primary-color: rgba(225, 225, 225, 1);
@@ -68,16 +69,6 @@
   </head>
   <body>
     <menu>
-      <li>
-        <button id="keyboard">
-          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-            <title>keyboard-close-outline</title>
-            <path
-              d="M12 23L16 19H8M4 3C2.9 3 2 3.9 2 5V15C2 16.1 2.9 17 4 17H20C21.1 17 22 16.1 22 15V5C22 3.9 21.1 3 20 3H4M4 5H20V15H4V5M5 6V8H7V6H5M8 6V8H10V6H8M11 6V8H13V6H11M14 6V8H16V6H14M17 6V8H19V6H17M5 9V11H7V9H5M8 9V11H10V9H8M11 9V11H13V9H11M14 9V11H16V9H14M17 9V11H19V9H17M8 12V14H16V12H8Z"
-            />
-          </svg>
-        </button>
-      </li>
       <li>
         <button id="fullscreen">
           <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
@@ -89,11 +80,21 @@
         </button>
       </li>
       <li>
-        <button id="minimize">
+        <button id="theme">
           <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-            <title>image-size-select-small</title>
+            <title>compare</title>
             <path
-              d="M23,15H21V17H23V15M23,11H21V13H23V11M23,19H21V21C22,21 23,20 23,19M15,3H13V5H15V3M23,7H21V9H23V7M21,3V5H23C23,4 22,3 21,3M3,21H11V15H1V19A2,2 0 0,0 3,21M3,7H1V9H3V7M15,19H13V21H15V19M19,3H17V5H19V3M19,19H17V21H19V19M3,3C2,3 1,4 1,5H3V3M3,11H1V13H3V11M11,3H9V5H11V3M7,3H5V5H7V3Z"
+              d="M19,3H14V5H19V18L14,12V21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3M10,18H5L10,12M10,3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H10V23H12V1H10V3Z"
+            />
+          </svg>
+        </button>
+      </li>
+      <li>
+        <button id="keyboard">
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+            <title>keyboard-close-outline</title>
+            <path
+              d="M12 23L16 19H8M4 3C2.9 3 2 3.9 2 5V15C2 16.1 2.9 17 4 17H20C21.1 17 22 16.1 22 15V5C22 3.9 21.1 3 20 3H4M4 5H20V15H4V5M5 6V8H7V6H5M8 6V8H10V6H8M11 6V8H13V6H11M14 6V8H16V6H14M17 6V8H19V6H17M5 9V11H7V9H5M8 9V11H10V9H8M11 9V11H13V9H11M14 9V11H16V9H14M17 9V11H19V9H17M8 12V14H16V12H8Z"
             />
           </svg>
         </button>

index.js

@@ -5,50 +5,183 @@ const readline = require("readline/promises");
 const integration = require("./js/integration");
 const hardware = require("./js/hardware");
 const webview = require("./js/webview");
-const { app } = require("electron");
+const log = require("electron-log");
+const { app, powerMonitor } = require("electron");
+const Events = require("events");
 
+global.APP = global.APP || {};
 global.ARGS = global.ARGS || {};
+global.EVENTS = global.EVENTS || new Events();
 
+// Check display environment variable
 if (!process.env.DISPLAY) {
   console.error(`\n$DISPLAY variable not set to run the GUI application, are you connected via SSH?\n`);
   console.error(`If you have installed the service use:`);
   console.error(`  systemctl --user start touchkio.service`);
   console.error(`Alternatively export the variables first:`);
   console.error(`  export DISPLAY=":0" && export WAYLAND_DISPLAY="wayland-0" && touchkio\n`);
+  process.exit(1);
 }
 
+// Delete electron log file
+const elog = path.join(app.getPath("logs"), "electron.log");
+try {
+  if (fs.existsSync(elog)) {
+    fs.unlinkSync(elog);
+  }
+  console.debug = () => {};
+} catch (error) {
+  console.error("Failed to delete electron log file:", error.message);
+}
+app.commandLine.appendSwitch("log-file", elog);
+
 /**
  * This promise resolves when the app has finished initializing,
  * allowing to safely create browser windows and perform other
  * initialization tasks.
  */
 app.whenReady().then(async () => {
-  const lock = app.requestSingleInstanceLock();
+  if (!(await initApp()) || !(await initArgs()) || !(await initLog())) {
-  if (!lock) {
+    return;
-    console.error("TouchKio is already running");
-    return app.quit();
   }
+
+  // Show used arguments
+  const args = Object.assign({}, ARGS);
+  if ("mqtt_password" in args) {
+    args.mqtt_password = "*".repeat((args.mqtt_password || "").length);
+  }
+  console.info(`Arguments: ${JSON.stringify(args, null, 2)}`);
+  process.stdout.write("\n");
+
+  // Chained init functions
+  const chained = [
+    ["webview.js", webview.init],
+    ["hardware.js", hardware.init],
+    ["integration.js", integration.init],
+  ];
+  for (const [name, init] of chained) {
+    console.debug(`${name}: init()`);
+    if (!(await init())) {
+      console.debug(`${name}: init() --> aborted`);
+      break;
+    }
+  }
+});
+
+/**
+ * Initializes the global app object.
+ *
+ * @returns {bool} Returns true if the initialization was successful.
+ */
+const initApp = async () => {
+  const packageJsonPath = path.join(app.getAppPath(), "package.json");
+  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
+
+  const buildJsonPath = path.join(app.getAppPath(), "build.json");
+  const buildFileExists = fs.existsSync(buildJsonPath);
+
+  // Set required app infos
+  APP.name = app.getName();
+  APP.title = packageJson.title;
+  APP.version = app.getVersion();
+  APP.path = app.getAppPath();
+  APP.icon = path.join(app.getAppPath(), "img", "icon.png");
+  APP.log = path.join(app.getPath("logs"), "main.log");
+  APP.cache = path.join(app.getPath("userData"), "Cache");
+  APP.config = app.getPath("userData");
+
+  // Set additional update infos
+  APP.homepage = `https://github.com/${packageJson.author}/${packageJson.name}`;
+  APP.releases = {
+    url: `https://api.github.com/repos/${packageJson.author}/${packageJson.name}/releases`,
+    latest: null,
+  };
+  APP.issues = `https://github.com/${packageJson.author}/${packageJson.name}/issues`;
+  APP.scripts = {
+    install: `https://raw.githubusercontent.com/${packageJson.author}/${packageJson.name}/main/install.sh`,
+  };
+
+  // Set additional build infos
+  APP.build = {};
+  if (buildFileExists) {
+    APP.build = JSON.parse(fs.readFileSync(buildJsonPath, "utf8"));
+  }
+
+  // Request single app instance lock
+  if (!app.requestSingleInstanceLock()) {
+    console.error(`${APP.title} is already running`);
+    return app.exit(1);
+  }
+
+  // Register app quit events
+  app.on("before-quit", () => {
+    APP.exiting = true;
+  });
+  app.on("will-quit", (e) => {
+    e.preventDefault();
+    process.exitCode = process.exitCode !== 0 ? 1 : 0;
+    const level = process.exitCode === 0 ? "warn" : "error";
+    console[level](`${APP.title} Terminated (${process.exitCode})`);
+    app.exit(process.exitCode);
+  });
+
+  // Register process exit events
+  ["SIGINT", "SIGTERM", "SIGQUIT", "SIGTRAP", "exit"].forEach((signal) => {
+    process.on(signal, () => {
+      process.exitCode = 0;
+      APP.exiting = true;
+      app.quit();
+    });
+  });
+  powerMonitor.on("shutdown", () => {
+    process.exitCode = 0;
+    APP.exiting = true;
+    app.quit();
+  });
+
+  return true;
+};
+
+/**
+ * Initializes the global args object.
+ *
+ * @returns {bool} Returns true if the initialization was successful.
+ */
+const initArgs = async () => {
   let args = parseArgs(process);
   let argsProvided = !!Object.keys(args).length;
 
-  let argsFilePath = path.join(app.getPath("userData"), "Arguments.json");
+  let argsFilePath = path.join(APP.config, "Arguments.json");
   let argsFileExists = fs.existsSync(argsFilePath);
 
+  let argsFileHashPath = path.join(APP.cache, "Arguments.hash");
+  let argsFileHashExists = fs.existsSync(argsFileHashPath);
+
   // Show version and release info
   if ("help" in args || "version" in args) {
-    console.log(`${app.getName()}-v${app.getVersion()}, https://github.com/leukipp/touchkio`);
+    let build = "";
-    return app.quit();
+    if (APP.build.id) {
+      build = ` (${APP.build.id}), built on ${APP.build.date} (${APP.build.platform}-${APP.build.arch}-${APP.build.maker})`;
+    }
+    console.info(`${APP.name}-v${APP.version}${build}\n${APP.homepage}`);
+    return app.exit(0);
   }
 
   // Setup arguments from file path
-  if ("setup" in args || (!argsProvided && !argsFileExists)) {
+  if ((!argsProvided && !argsFileExists) || "setup" in args) {
     await sleep(3000);
     do {
       args = await promptArgs(process);
     } while (!Object.keys(args).length);
     writeArgs(argsFilePath, args);
-  } else if (!argsProvided && argsFileExists) {
+  } else if (argsFileExists) {
-    args = readArgs(argsFilePath);
+    args = { ...readArgs(argsFilePath), ...args };
+  }
+
+  // Check arguments object
+  if (!Object.keys(args).length) {
+    console.error(`No arguments provided`);
+    return app.exit(1);
   }
 
   // Split url arguments
@@ -56,19 +189,87 @@ app.whenReady().then(async () => {
   if (!Array.isArray(args.web_url)) {
     args.web_url = args.web_url.split(",").map((url) => url.trim());
   }
-  global.ARGS = args;
 
-  // Show used arguments
+  // Calculate arguments hash
-  console.log(`Arguments: ${JSON.stringify(global.ARGS, null, 2)}\n`);
+  const argsFileHash = crypto.createHash("sha256").update(JSON.stringify(args)).digest("hex");
-
+  const argsUpdated = argsFileHashExists && argsFileHash !== fs.readFileSync(argsFileHashPath, "utf8");
-  // Chained init functions
+  if (argsUpdated && !("app_reset" in args)) {
-  const chained = [webview.init, hardware.init, integration.init];
+    args.app_reset = "arguments";
-  for (const init of chained) {
-    if (!(await init())) {
-      break;
-    }
   }
-});
+  fs.writeFileSync(argsFileHashPath, argsFileHash);
+
+  // Set global arguments
+  ARGS = args;
+
+  return true;
+};
+
+/**
+ * Initializes the global log object.
+ *
+ * @returns {bool} Returns true if the initialization was successful.
+ */
+const initLog = async () => {
+  try {
+    if (fs.existsSync(APP.log)) {
+      fs.unlinkSync(APP.log);
+    }
+  } catch (error) {
+    console.error("Failed to delete main log file:", error.message);
+  }
+
+  // Set log level and path
+  const level = "enable_logging" in ARGS ? "silly" : "app_debug" in ARGS ? "debug" : "verbose";
+  log.transports.file.level = level;
+  log.transports.console.level = level;
+  log.transports.file.resolvePathFn = () => {
+    return APP.log;
+  };
+
+  // Catch unhandled errors
+  log.errorHandler.startCatching({
+    showDialog: false,
+    onError({ error, versions }) {
+      if (!error?.message?.includes("Object has been destroyed")) {
+        const build = { ...APP.build, ...versions };
+        const whoopsie = "💥 Whoopsie!";
+        const section2 = `# Description\n- Hardware information?\n- How to reproduce?\n- Additional logs?\n`;
+        const section3 = `# Error\n\`\`\`bash\n${new Date().toISOString()}: ${error.stack}\n\`\`\`\n`;
+        const section4 = `# Application\n\`\`\`json\n${JSON.stringify(build, null, 2)}\n\`\`\`\n`;
+        const title = encodeURIComponent(`${whoopsie} - ${error}`);
+        const body = encodeURIComponent(`${section2}\n${section3}\n${section4}`);
+        console.error(`${whoopsie} -`, error, build);
+        console.info(`🪲 Report issue --> ${APP.issues}/new?title=${title}&body=${body}`);
+      }
+      app.quit();
+    },
+  });
+
+  // Emit console log
+  APP.logs = [];
+  log.hooks.push((message, transport, type) => {
+    const data = message.data.map((d) => (typeof d === "object" ? String(d?.message) || JSON.stringify(d) : String(d)));
+    const text = data.filter((s) => s && s.trim()).join(" ");
+    if (!text.startsWith("(node:") && type === "console") {
+      APP.logs.unshift({
+        time: message.date,
+        level: message.level,
+        text: text,
+      });
+      if (APP.logs.length > 10) {
+        APP.logs.splice(10);
+      }
+      EVENTS.emit("consoleLog", APP.logs[0]);
+    }
+    return message;
+  });
+
+  // Overwrite console log
+  Object.assign(console, log.functions);
+  console.silly("Welcome To The Jungle!");
+
+  return true;
+};
 
 /**
  * Parses command-line arguments from the given process object.
@@ -155,34 +356,41 @@ const promptArgs = async (proc) => {
   // Prompt questions and wait for the answers
   let args = {};
   let ignore = [];
-  for (const { key, question, fallback } of prompts) {
+  try {
-    if (key === "mqtt") {
+    for (const { key, question, fallback } of prompts) {
-      const prompt = `${question} (${fallback}): `;
+      if (key === "mqtt") {
-      const answer = await read.question(prompt);
+        const prompt = `${question} (${fallback}): `;
-      const value = (answer.trim() || fallback.match(/[YN]/)[0]).toLowerCase();
+        const answer = await read.question(prompt);
-      if (!["y", "yes"].includes(value)) {
+        const value = (answer.trim() || fallback.match(/[YN]/)[0]).toLowerCase();
-        ignore = ignore.concat(["mqtt_url", "mqtt_user", "mqtt_password", "mqtt_discovery"]);
+        if (!["y", "yes"].includes(value)) {
-      }
+          ignore = ignore.concat(["mqtt_url", "mqtt_user", "mqtt_password", "mqtt_discovery"]);
-    } else if (key === "check") {
+        }
-      const json = JSON.stringify(args, null, 2);
+      } else if (key === "check") {
-      const prompt = `${question}\n${json}\n(${fallback}): `;
+        const json = JSON.stringify(args, null, 2);
-      const answer = await read.question(prompt);
+        const prompt = `${question}\n${json}\n(${fallback}): `;
-      const value = (answer.trim() || fallback.match(/[YN]/)[0]).toLowerCase();
+        const answer = await read.question(prompt);
-      if (!["y", "yes"].includes(value)) {
+        const value = (answer.trim() || fallback.match(/[YN]/)[0]).toLowerCase();
-        args = {};
+        if (!["y", "yes"].includes(value)) {
-      }
+          args = {};
-    } else if (!ignore.includes(key)) {
+        }
-      const prompt = `${question} (${fallback}): `;
+      } else if (!ignore.includes(key)) {
-      const answer = await read.question(prompt);
+        const prompt = `${question} (${fallback}): `;
-      const value = answer.trim() || fallback;
+        const answer = await read.question(prompt);
-      if (key === "web_url") {
+        const value = answer.trim() || fallback;
-        args[key] = value.split(",").map((v) => v.trim());
+        if (key === "web_url") {
-      } else {
+          args[key] = value.split(",").map((v) => v.trim());
-        args[key] = value;
+        } else {
+          args[key] = value;
+        }
       }
     }
+  } catch (error) {
+    console.error(`\n${error.message}`);
+    args = {};
+    app.exit(1);
+  } finally {
+    read.close();
   }
-  read.close();
 
   return args;
 };
@@ -194,11 +402,15 @@ const promptArgs = async (proc) => {
  * @param {Object} args - The arguments object.
  */
 const writeArgs = (path, args) => {
-  const argc = Object.assign({}, args);
+  try {
-  if ("mqtt_password" in argc) {
+    const argc = Object.assign({}, args);
-    argc.mqtt_password = encrypt(argc.mqtt_password);
+    if ("mqtt_password" in argc) {
+      argc.mqtt_password = encrypt(argc.mqtt_password);
+    }
+    fs.writeFileSync(path, JSON.stringify(argc, null, 2));
+  } catch (error) {
+    console.error(`Failed to write ${path}:`, error.message);
   }
-  fs.writeFileSync(path, JSON.stringify(argc, null, 2));
 };
 
 /**
@@ -208,11 +420,16 @@ const writeArgs = (path, args) => {
  * @returns {Object} The arguments object.
  */
 const readArgs = (path) => {
-  const args = JSON.parse(fs.readFileSync(path));
+  try {
-  if ("mqtt_password" in args) {
+    const args = JSON.parse(fs.readFileSync(path, "utf8"));
-    args.mqtt_password = decrypt(args.mqtt_password);
+    if ("mqtt_password" in args) {
+      args.mqtt_password = decrypt(args.mqtt_password);
+    }
+    return args;
+  } catch (error) {
+    console.error(`Failed to parse ${path}:`, error.message);
   }
-  return args;
+  return {};
 };
 
 /**
@@ -223,7 +440,7 @@ const readArgs = (path) => {
  */
 const encrypt = (value) => {
   const iv = crypto.randomBytes(16);
-  const key = crypto.scryptSync(hardware.getMachineId(), app.getName(), 32);
+  const key = crypto.scryptSync(hardware.getMachineId(), APP.name, 32);
   const cipher = crypto.createCipheriv("aes-256-cbc", key, iv);
   let encrypted = cipher.update(value, "utf8", "hex");
   encrypted += cipher.final("hex");
@@ -239,7 +456,7 @@ const encrypt = (value) => {
 const decrypt = (value) => {
   const p = Buffer.from(value, "base64").toString("utf8").split(":");
   const iv = Buffer.from(p.shift(), "hex");
-  const key = crypto.scryptSync(hardware.getMachineId(), app.getName(), 32);
+  const key = crypto.scryptSync(hardware.getMachineId(), APP.name, 32);
   const decipher = crypto.createDecipheriv("aes-256-cbc", key, iv);
   const buffer = Buffer.from(p.join(":"), "hex");
   let decrypted = decipher.update(buffer, "binary", "utf8");

install.sh

@@ -1,68 +1,60 @@
 #!/usr/bin/env bash
 
+# Read arguments
+ARG_EARLY=false
+ARG_UPDATE=false
+for arg in "$@"; do
+  case "$arg" in
+    early) ARG_EARLY=true ;;
+    update) ARG_UPDATE=true ;;
+  esac
+done
+
 # Determine system architecture
 echo -e "Determining system architecture..."
 
 BITS=$(getconf LONG_BIT)
 case "$(uname -m)" in
-    aarch64)
+    x86_64) ARCH="x64" ;;
-        ARCH="arm64"
+    aarch64) ARCH="arm64" ;;
-        ;;
+    *) { echo "Architecture $(uname -m) running $BITS-bit operating system is not supported."; exit 1; } ;;
-    x86_64)
-        ARCH="x64"
-        ;;
-    *)
-        echo "Architecture $(uname -m) running $BITS-bit operating system is not supported."
-        exit 1
-        ;;
 esac
 
-if [ "$BITS" -ne 64 ]; then
+[ "$BITS" -eq 64 ] || { echo "Architecture $ARCH running $BITS-bit operating system is not supported."; exit 1; }
-    echo "Architecture $ARCH running $BITS-bit operating system is not supported."
-    exit 1
-fi
-
 echo "Architecture $ARCH running $BITS-bit operating system is supported."
 
 # Download the latest .deb package
 echo -e "\nDownloading the latest release..."
 
-DEB_URL=$(wget -qO- https://api.github.com/repos/leukipp/touchkio/releases/latest | \
-grep -o "\"browser_download_url\": \"[^\"]*_${ARCH}\.deb\"" | \
-sed 's/"browser_download_url": "//;s/"//g')
-
 TMP_DIR=$(mktemp -d)
-DEB_PATH="${TMP_DIR}/$(basename "$DEB_URL")"
 chmod 755 "$TMP_DIR"
 
-if [ -z "$DEB_URL" ]; then
+JSON=$(wget -qO- "https://api.github.com/repos/leukipp/touchkio/releases" | tr -d '\r\n')
-    echo "Download url for .deb file not found."
+if $ARG_EARLY; then
-    exit 1
+  DEB_REG='"prerelease":\s*(true|false).*?"browser_download_url":\s*"\K[^\"]*_'$ARCH'\.deb'
+else
+  DEB_REG='"prerelease":\s*false.*?"browser_download_url":\s*"\K[^\"]*_'$ARCH'\.deb'
 fi
 
-if ! wget --show-progress -q -O "$DEB_PATH" "$DEB_URL"; then
+DEB_URL=$(echo "$JSON" | grep -oP "$DEB_REG" | head -n 1)
-    echo "Failed to download the .deb file."
+DEB_PATH="${TMP_DIR}/$(basename "$DEB_URL")"
-    exit 1
+
-fi
+[ -z "$DEB_URL" ] && { echo "Download url for .deb file not found."; exit 1; }
+wget --show-progress -q -O "$DEB_PATH" "$DEB_URL" || { echo "Failed to download the .deb file."; exit 1; }
 
 # Install the latest .deb package
 echo -e "\nInstalling the latest release..."
 
-if ! command -v apt &> /dev/null; then
+command -v apt &> /dev/null || { echo "Package manager apt was not found."; exit 1; }
-    echo "Package manager apt was not found."
+sudo apt install -y "$DEB_PATH" || { echo "Installation of .deb file failed."; exit 1; }
-    exit 1
-fi
-
-if ! sudo apt install "$DEB_PATH"; then
-    echo "Installation of .deb file failed."
-    exit 1
-fi
 
 # Create the systemd user service
 echo -e "\nCreating systemd user service..."
 
-SERVICE_FILE="$HOME/.config/systemd/user/touchkio.service"
+SERVICE_NAME="touchkio.service"
-mkdir -p "$(dirname "$SERVICE_FILE")" || { echo "Failed to create directory for $SERVICE_FILE"; exit 1; }
+SERVICE_FILE="$HOME/.config/systemd/user/$SERVICE_NAME"
+mkdir -p "$(dirname "$SERVICE_FILE")" || { echo "Failed to create directory for $SERVICE_FILE."; exit 1; }
+
 SERVICE_CONTENT="[Unit]
 Description=TouchKio
 After=graphical.target
@@ -76,20 +68,28 @@ RestartSec=5s
 [Install]
 WantedBy=default.target"
 
+if $ARG_UPDATE; then
+  if systemctl --user --quiet is-active "${SERVICE_NAME}"; then
+    systemctl --user restart "${SERVICE_NAME}"
+    echo "Existing $SERVICE_NAME restarted."
+  else
+    echo "Existing $SERVICE_NAME not running, start touchkio manually."
+  fi
+  exit 0
+fi
+
 SERVICE_CREATE=true
 if [ -f "$SERVICE_FILE" ]; then
     read -p "Service $SERVICE_FILE exists, overwrite? (y/N) " overwrite
-    if [[ ! ${overwrite:-n} == [Yy]* ]]; then
+    [[ ${overwrite:-n} == [Yy]* ]] || SERVICE_CREATE=false
-        SERVICE_CREATE=false
-    fi
 fi
 
-if [ "$SERVICE_CREATE" = true ]; then
+if $SERVICE_CREATE; then
-    echo "$SERVICE_CONTENT" > "$SERVICE_FILE" || { echo "Failed to write to $SERVICE_FILE"; exit 1; }
+    echo "$SERVICE_CONTENT" > "$SERVICE_FILE" || { echo "Failed to write to $SERVICE_FILE."; exit 1; }
-    systemctl --user enable "$(basename "$SERVICE_FILE")" || { echo "Failed to enable service $SERVICE_FILE"; exit 1; }
+    systemctl --user enable "$(basename "$SERVICE_FILE")" || { echo "Failed to enable service $SERVICE_FILE."; exit 1; }
-    echo "Service $SERVICE_FILE enabled"
+    echo "Service $SERVICE_FILE enabled."
 else
-    echo "Service $SERVICE_FILE not created"
+    echo "Service $SERVICE_FILE not created."
 fi
 
 # Export display variables
@@ -97,20 +97,21 @@ echo -e "\nExporting display variables..."
 
 if [ -z "$DISPLAY" ]; then
     export DISPLAY=":0"
-    echo "DISPLAY was not set, defaulting to \"$DISPLAY\""
+    echo "DISPLAY was not set, defaulting to \"$DISPLAY\"."
 else
-    echo "DISPLAY is set to \"$DISPLAY\""
+    echo "DISPLAY is set to \"$DISPLAY\"."
 fi
+
 if [ -z "$WAYLAND_DISPLAY" ]; then
     export WAYLAND_DISPLAY="wayland-0"
-    echo "WAYLAND_DISPLAY was not set, defaulting to \"$WAYLAND_DISPLAY\""
+    echo "WAYLAND_DISPLAY was not set, defaulting to \"$WAYLAND_DISPLAY\"."
 else
-    echo "WAYLAND_DISPLAY is set to \"$WAYLAND_DISPLAY\""
+    echo "WAYLAND_DISPLAY is set to \"$WAYLAND_DISPLAY\"."
 fi
 
 # Start the setup mode
-echo ""
+read -p $'\nStart touchkio setup? (Y/n) ' setup
-read -p "Start touchkio setup? (Y/n) " setup
+
 if [[ ${setup:-y} == [Yy]* ]]; then
     echo "/usr/bin/touchkio --setup"
     /usr/bin/touchkio --setup
@@ -118,3 +119,5 @@ else
     echo "/usr/bin/touchkio"
     /usr/bin/touchkio
 fi
+
+exit 0

js/integration.js

@@ -1,11 +1,9 @@
 const mqtt = require("mqtt");
 const hardware = require("./hardware");
 const { app } = require("electron");
-const Events = require("events");
 
 global.INTEGRATION = global.INTEGRATION || {
   initialized: false,
-  events: new Events(),
 };
 
 /**
@@ -39,33 +37,43 @@ const init = async () => {
   // Init globals
   INTEGRATION.discovery = discovery;
   INTEGRATION.node = `rpi_${deviceId}`;
-  INTEGRATION.root = `${app.getName()}/${INTEGRATION.node}`;
+  INTEGRATION.root = `${APP.name}/${INTEGRATION.node}`;
   INTEGRATION.device = {
-    name: `TouchKio ${deviceName}`,
+    name: `${APP.title} ${deviceName}`,
     model: model,
     manufacturer: vendor,
     serial_number: serialNumber,
     identifiers: [INTEGRATION.node],
-    sw_version: `${app.getName()}-v${app.getVersion()}`,
+    sw_version: `${APP.name}-v${APP.version}`,
+    configuration_url: APP.homepage,
   };
 
-  // Connection settings
+  // Init options
-  const options = user === null || password === null ? null : { username: user, password: password };
+  const masked = password === null ? null : "*".repeat(password.length);
-  const masked = password === null ? "null" : "*".repeat(password.length);
+  const options = user === null || password === null ? {} : { username: user, password: password };
-  console.log("MQTT Connecting:", `${user}:${masked}@${url.toString()}`);
+  options.will = { topic: `${INTEGRATION.root}/kiosk/state`, payload: "Terminated", qos: 1, retain: true };
+  options.rejectUnauthorized = !("ignore_certificate_errors" in ARGS);
+
+  // Client connect
+  console.info("MQTT Connecting:", `${user}:${masked}@${url.toString()}`);
   INTEGRATION.client = mqtt.connect(url.toString(), options);
+  INTEGRATION.client.setMaxListeners(20);
 
   // Client connected
   INTEGRATION.client
     .once("connect", () => {
-      console.log(`MQTT Connected: ${url.toString()}\n`);
+      console.info(`MQTT Connected: ${url.toString()}`);
+      process.stdout.write("\n");
 
       // Init client controls
+      initApp();
       initShutdown();
       initReboot();
       initRefresh();
       initKiosk();
+      initTheme();
       initDisplay();
+      initVolume();
       initKeyboard();
       initPageNumber();
       initPageZoom();
@@ -75,6 +83,7 @@ const init = async () => {
       initModel();
       initSerialNumber();
       initHostName();
+      initNetworkAddress();
       initUpTime();
       initMemorySize();
       initMemoryUsage();
@@ -82,33 +91,62 @@ const init = async () => {
       initProcessorTemperature();
       initBatteryLevel();
       initPackageUpgrades();
-      initHeartbeat();
       initLastActive();
 
+      // Init client diagnostic
+      initScreenshot();
+      initHeartbeat();
+      initErrors();
+      initVersion();
+
       // Integration initialized
       INTEGRATION.initialized = true;
+
+      // Register global events
+      EVENTS.on("updateApp", updateApp);
+      EVENTS.on("updateStatus", updateKiosk);
+      EVENTS.on("updateVolume", updateVolume);
+      EVENTS.on("updateKeyboard", updateKeyboard);
+      EVENTS.on("updatePage", () => {
+        updatePageNumber();
+        updatePageZoom();
+        updatePageUrl();
+        updateTheme();
+      });
+      EVENTS.on("updateDisplay", () => {
+        updateDisplay();
+        updateLastActive();
+      });
+      EVENTS.on("updateScreenshot", updateScreenshot);
+      EVENTS.on("consoleLog", updateErrors);
     })
     .on("error", (error) => {
       console.error("MQTT", error.message);
     });
 
-  // Update sensor states from events
-  HARDWARE.events.on("updateDisplay", updateDisplay);
-  HARDWARE.events.on("updateKeyboard", updateKeyboard);
-
   // Update time sensors periodically (30s)
   setInterval(() => {
-    updateHeartbeat();
+    if (APP.exiting) {
+      return;
+    }
     updateLastActive();
+    updateHeartbeat();
+    updateErrors();
   }, 30 * 1000);
 
   // Update system sensors periodically (1min)
   setInterval(() => {
+    if (APP.exiting) {
+      return;
+    }
     update();
   }, 60 * 1000);
 
-  // Update package sensors periodically (60min)
+  // Update upgrade sensors periodically (1h)
   setInterval(() => {
+    if (APP.exiting) {
+      return;
+    }
     updatePackageUpgrades();
   }, 3600 * 1000);
 
@@ -119,15 +157,12 @@ const init = async () => {
  * Updates the shared integration properties.
  */
 const update = async () => {
-  if (!INTEGRATION.initialized) {
+  if (!INTEGRATION.initialized || APP.exiting) {
     return;
   }
+  console.debug("integration.js: update()");
 
-  // Update client sensors
+  updateNetworkAddress();
-  updateKiosk();
-  updatePageNumber();
-  updatePageZoom();
-  updatePageUrl();
   updateUpTime();
   updateLastActive();
   updateMemoryUsage();
@@ -136,6 +171,23 @@ const update = async () => {
   updateBatteryLevel();
 };
 
+/**
+ * Removes the auto-discovery config via the mqtt connection.
+ *
+ *  @param {string} type - The entity type name.
+ *  @param {Object} config - The configuration object.
+ *  @returns {Object} Instance of the mqtt client.
+ */
+const removeConfig = (type, config) => {
+  if (type === null || config === null) {
+    return INTEGRATION.client;
+  }
+  const path = config.unique_id.replace(`${INTEGRATION.node}_`, "");
+  const root = `${INTEGRATION.discovery}/${type}/${INTEGRATION.node}/${path}/config`;
+  console.debug(`integration.js: removeConfig(${path})`);
+  return INTEGRATION.client.publish(root, JSON.stringify({}), { qos: 1, retain: true });
+};
+
 /**
  * Publishes the auto-discovery config via the mqtt connection.
  *
@@ -149,6 +201,7 @@ const publishConfig = (type, config) => {
   }
   const path = config.unique_id.replace(`${INTEGRATION.node}_`, "");
   const root = `${INTEGRATION.discovery}/${type}/${INTEGRATION.node}/${path}/config`;
+  console.debug(`integration.js: publishConfig(${path})`);
   return INTEGRATION.client.publish(root, JSON.stringify(config), { qos: 1, retain: true });
 };
 
@@ -182,6 +235,63 @@ const publishState = (path, state) => {
   return INTEGRATION.client.publish(root, `${state}`, { qos: 1, retain: true });
 };
 
+/**
+ * Initializes the app update entity and handles the execute logic.
+ */
+const initApp = () => {
+  const root = `${INTEGRATION.root}/app`;
+  const config = {
+    name: "App",
+    unique_id: `${INTEGRATION.node}_app`,
+    command_topic: `${root}/install`,
+    state_topic: `${root}/version/state`,
+    payload_install: "app_early" in ARGS ? "update early" : "update",
+    device: INTEGRATION.device,
+  };
+  if (!HARDWARE.support.appUpdate) {
+    removeConfig("update", config);
+    return;
+  }
+  publishConfig("update", config)
+    .on("message", (topic, message) => {
+      if (topic === config.command_topic) {
+        console.info("Update App...");
+        hardware.setDisplayStatus("ON", () => {
+          const args = ["-c", `bash <(wget -qO- ${APP.scripts.install}) ${message.toString()}`];
+          hardware.execScriptCommand("bash", args, (progress, error) => {
+            if (progress) {
+              console.info(`Progress: ${progress}%`);
+            }
+            updateApp(progress);
+          });
+        });
+      }
+    })
+    .subscribe(config.command_topic);
+  updateApp();
+};
+
+/**
+ * Updates the app update entity via the mqtt connection.
+ */
+const updateApp = async (progress = 0) => {
+  const latest = APP.releases.latest;
+  if (!HARDWARE.support.appUpdate || !latest || !latest.summary) {
+    return;
+  }
+  const summary = latest.summary.length > 250 ? latest.summary.slice(0, 250) + "..." : latest.summary;
+  const version = {
+    title: latest.title,
+    latest_version: latest.version,
+    installed_version: APP.version,
+    release_summary: summary,
+    release_url: latest.url,
+    update_percentage: progress || null,
+    in_progress: progress && progress > 0 && progress < 100,
+  };
+  publishState("app/version", JSON.stringify(version));
+};
+
 /**
  * Initializes the shutdown button and handles the execute logic.
  */
@@ -194,12 +304,17 @@ const initShutdown = () => {
     icon: "mdi:power",
     device: INTEGRATION.device,
   };
+  if (!HARDWARE.support.sudoRights) {
+    removeConfig("button", config);
+    return;
+  }
   publishConfig("button", config)
     .on("message", (topic, message) => {
       if (topic === config.command_topic) {
-        console.log("Shutdown system...");
+        console.verbose("Shutdown system...");
-        hardware.setDisplayStatus("ON");
+        hardware.setDisplayStatus("ON", () => {
-        hardware.shutdownSystem();
+          hardware.shutdownSystem();
+        });
       }
     })
     .subscribe(config.command_topic);
@@ -217,12 +332,17 @@ const initReboot = () => {
     icon: "mdi:restart",
     device: INTEGRATION.device,
   };
+  if (!HARDWARE.support.sudoRights) {
+    removeConfig("button", config);
+    return;
+  }
   publishConfig("button", config)
     .on("message", (topic, message) => {
       if (topic === config.command_topic) {
-        console.log("Rebooting system...");
+        console.verbose("Rebooting system...");
-        hardware.setDisplayStatus("ON");
+        hardware.setDisplayStatus("ON", () => {
-        hardware.rebootSystem();
+          hardware.rebootSystem();
+        });
       }
     })
     .subscribe(config.command_topic);
@@ -243,9 +363,10 @@ const initRefresh = () => {
   publishConfig("button", config)
     .on("message", (topic, message) => {
       if (topic === config.command_topic) {
-        console.log("Refreshing webview...");
+        console.verbose("Refreshing webview...");
-        hardware.setDisplayStatus("ON");
+        hardware.setDisplayStatus("ON", () => {
-        WEBVIEW.events.emit("reloadView");
+          EVENTS.emit("reloadView");
+        });
       }
     })
     .subscribe(config.command_topic);
@@ -270,32 +391,10 @@ const initKiosk = () => {
     .on("message", (topic, message) => {
       if (topic === config.command_topic) {
         const status = message.toString();
-        console.log("Set Kiosk Status:", status);
+        console.verbose("Set Kiosk Status:", status);
-        hardware.setDisplayStatus("ON");
+        hardware.setDisplayStatus("ON", () => {
-        switch (status) {
+          WEBVIEW.window.setStatus(status);
-          case "Framed":
+        });
-            WEBVIEW.window.restore();
-            WEBVIEW.window.unmaximize();
-            WEBVIEW.window.setFullScreen(false);
-            break;
-          case "Fullscreen":
-            WEBVIEW.window.restore();
-            WEBVIEW.window.unmaximize();
-            WEBVIEW.window.setFullScreen(true);
-            break;
-          case "Maximized":
-            WEBVIEW.window.restore();
-            WEBVIEW.window.setFullScreen(false);
-            WEBVIEW.window.maximize();
-            break;
-          case "Minimized":
-            WEBVIEW.window.restore();
-            WEBVIEW.window.setFullScreen(false);
-            WEBVIEW.window.minimize();
-            break;
-          case "Terminated":
-            app.quit();
-        }
       }
     })
     .subscribe(config.command_topic);
@@ -305,53 +404,91 @@ const initKiosk = () => {
 /**
  * Updates the kiosk status via the mqtt connection.
  */
-const updateKiosk = () => {
+const updateKiosk = async () => {
-  const kiosk = WEBVIEW.status;
+  const kiosk = WEBVIEW.tracker.window.status;
   publishState("kiosk", kiosk);
 };
 
+/**
+ * Initializes the application theme and handles the execute logic.
+ */
+const initTheme = () => {
+  const root = `${INTEGRATION.root}/theme`;
+  const config = {
+    name: "Theme",
+    unique_id: `${INTEGRATION.node}_theme`,
+    command_topic: `${root}/set`,
+    state_topic: `${root}/state`,
+    value_template: "{{ value }}",
+    options: ["Light", "Dark"],
+    icon: "mdi:compare",
+    device: INTEGRATION.device,
+  };
+  publishConfig("select", config)
+    .on("message", (topic, message) => {
+      if (topic === config.command_topic) {
+        const theme = message.toString().toLowerCase();
+        console.verbose("Set Application Theme:", theme);
+        WEBVIEW.theme.set(theme);
+      }
+    })
+    .subscribe(config.command_topic);
+  updateTheme();
+};
+
+/**
+ * Updates the application theme via the mqtt connection.
+ */
+const updateTheme = async () => {
+  const theme = WEBVIEW.theme.get();
+  publishState("theme", theme.charAt(0).toUpperCase() + theme.slice(1));
+};
+
 /**
  * Initializes the display status, brightness and handles the execute logic.
  */
 const initDisplay = () => {
-  if (!HARDWARE.support.displayStatus) {
-    return;
-  }
   const root = `${INTEGRATION.root}/display`;
   const config = {
     name: "Display",
     unique_id: `${INTEGRATION.node}_display`,
     command_topic: `${root}/power/set`,
     state_topic: `${root}/power/state`,
+    supported_color_modes: ["onoff"],
     icon: "mdi:monitor-shimmer",
     platform: "light",
     device: INTEGRATION.device,
     ...(HARDWARE.support.displayBrightness && {
+      supported_color_modes: ["brightness"],
       brightness_command_topic: `${root}/brightness/set`,
       brightness_state_topic: `${root}/brightness/state`,
       brightness_scale: 100,
     }),
   };
+  if (!HARDWARE.support.displayStatus) {
+    removeConfig("light", config);
+    return;
+  }
   publishConfig("light", config)
     .on("message", (topic, message) => {
       if (topic === config.command_topic) {
         const status = message.toString();
-        console.log("Set Display Status:", status);
+        console.verbose("Set Display Status:", status);
         hardware.setDisplayStatus(status, (reply, error) => {
-          if (error) {
+          if (!error) {
-            console.warn("Failed:", error);
-          } else {
             hardware.update();
+          } else {
+            console.warn("Command Failed:", error);
           }
         });
       } else if (topic === config.brightness_command_topic) {
         const brightness = parseInt(message, 10);
-        console.log("Set Display Brightness:", brightness);
+        console.verbose("Set Display Brightness:", brightness);
         hardware.setDisplayBrightness(brightness, (reply, error) => {
-          if (error) {
+          if (!error) {
-            console.warn("Failed:", error);
-          } else {
             hardware.update();
+          } else {
+            console.warn("Command Failed:", error);
           }
         });
       }
@@ -364,20 +501,59 @@ const initDisplay = () => {
 /**
  * Updates the display status, brightness via the mqtt connection.
  */
-const updateDisplay = () => {
+const updateDisplay = async () => {
   const status = hardware.getDisplayStatus();
   const brightness = hardware.getDisplayBrightness();
-  publishState("display/power", status);
   publishState("display/brightness", brightness);
+  publishState("display/power", status);
+};
+
+/**
+ * Initializes the audio volume and handles the execute logic.
+ */
+const initVolume = () => {
+  const root = `${INTEGRATION.root}/volume`;
+  const config = {
+    name: "Volume",
+    unique_id: `${INTEGRATION.node}_volume`,
+    command_topic: `${root}/set`,
+    state_topic: `${root}/state`,
+    value_template: "{{ value | int }}",
+    mode: "slider",
+    min: 0,
+    max: 100,
+    unit_of_measurement: "%",
+    icon: "mdi:volume-high",
+    device: INTEGRATION.device,
+  };
+  if (!HARDWARE.support.audioVolume) {
+    removeConfig("number", config);
+    return;
+  }
+  publishConfig("number", config)
+    .on("message", (topic, message) => {
+      if (topic === config.command_topic) {
+        const volume = parseInt(message, 10);
+        console.verbose("Set Audio Volume:", volume);
+        hardware.setAudioVolume(volume);
+      }
+    })
+    .subscribe(config.command_topic);
+  updateVolume();
+};
+
+/**
+ * Updates the audio volume via the mqtt connection.
+ */
+const updateVolume = async () => {
+  const volume = hardware.getAudioVolume();
+  publishState("volume", volume);
 };
 
 /**
  * Initializes the keyboard visibility and handles the execute logic.
  */
 const initKeyboard = () => {
-  if (!HARDWARE.support.keyboardVisibility) {
-    return;
-  }
   const root = `${INTEGRATION.root}/keyboard`;
   const config = {
     name: "Keyboard",
@@ -387,24 +563,18 @@ const initKeyboard = () => {
     icon: "mdi:keyboard-close-outline",
     device: INTEGRATION.device,
   };
+  if (!HARDWARE.support.keyboardVisibility) {
+    removeConfig("switch", config);
+    return;
+  }
   publishConfig("switch", config)
     .on("message", (topic, message) => {
       if (topic === config.command_topic) {
         const status = message.toString();
-        console.log("Set Keyboard Visibility:", status);
+        console.verbose("Set Keyboard Visibility:", status);
-        hardware.setKeyboardVisibility(status);
+        hardware.setDisplayStatus("ON", () => {
-        switch (status) {
+          hardware.setKeyboardVisibility(status);
-          case "OFF":
+        });
-            WEBVIEW.window.restore();
-            WEBVIEW.window.unmaximize();
-            WEBVIEW.window.setFullScreen(true);
-            break;
-          case "ON":
-            WEBVIEW.window.restore();
-            WEBVIEW.window.setFullScreen(false);
-            WEBVIEW.window.maximize();
-            break;
-        }
       }
     })
     .subscribe(config.command_topic);
@@ -414,7 +584,7 @@ const initKeyboard = () => {
 /**
  * Updates the keyboard visibility via the mqtt connection.
  */
-const updateKeyboard = () => {
+const updateKeyboard = async () => {
   const visibility = hardware.getKeyboardVisibility();
   publishState("keyboard", visibility);
 };
@@ -423,9 +593,6 @@ const updateKeyboard = () => {
  * Initializes the page number and handles the execute logic.
  */
 const initPageNumber = () => {
-  if (WEBVIEW.viewUrls.length < 3) {
-    return;
-  }
   const root = `${INTEGRATION.root}/page_number`;
   const config = {
     name: "Page Number",
@@ -440,13 +607,19 @@ const initPageNumber = () => {
     icon: "mdi:page-next",
     device: INTEGRATION.device,
   };
+  if (WEBVIEW.viewUrls.length <= 2) {
+    removeConfig("number", config);
+    return;
+  }
   publishConfig("number", config)
     .on("message", (topic, message) => {
       if (topic === config.command_topic) {
         const number = parseInt(message, 10);
-        console.log("Set Page Number:", number);
+        if (WEBVIEW.viewActive && number) {
-        WEBVIEW.viewActive = number || 1;
+          console.verbose("Set Page Number:", number);
-        WEBVIEW.events.emit("updateView");
+          WEBVIEW.viewActive = number;
+          EVENTS.emit("updateView");
+        }
       }
     })
     .subscribe(config.command_topic);
@@ -456,8 +629,8 @@ const initPageNumber = () => {
 /**
  * Updates the page number via the mqtt connection.
  */
-const updatePageNumber = () => {
+const updatePageNumber = async () => {
-  const pageNumber = WEBVIEW.viewActive || 1;
+  const pageNumber = WEBVIEW.viewUrls.length <= 2 ? null : WEBVIEW.viewActive || 1;
   publishState("page_number", pageNumber);
 };
 
@@ -472,9 +645,10 @@ const initPageZoom = () => {
     command_topic: `${root}/set`,
     state_topic: `${root}/state`,
     value_template: "{{ value | int }}",
-    mode: "slider",
+    mode: "box",
     min: 25,
     max: 400,
+    step: 5,
     unit_of_measurement: "%",
     icon: "mdi:magnify-plus",
     device: INTEGRATION.device,
@@ -483,9 +657,11 @@ const initPageZoom = () => {
     .on("message", (topic, message) => {
       if (topic === config.command_topic) {
         const zoom = parseInt(message, 10);
-        console.log("Set Page Zoom:", zoom);
+        if (WEBVIEW.viewActive && zoom) {
-        WEBVIEW.views[WEBVIEW.viewActive || 1].webContents.setZoomFactor(zoom / 100.0);
+          console.verbose("Set Page Zoom:", zoom);
-        WEBVIEW.events.emit("updateView");
+          WEBVIEW.zoom.set(zoom);
+          EVENTS.emit("updateView");
+        }
       }
     })
     .subscribe(config.command_topic);
@@ -495,8 +671,8 @@ const initPageZoom = () => {
 /**
  * Updates the page zoom via the mqtt connection.
  */
-const updatePageZoom = () => {
+const updatePageZoom = async () => {
-  const pageZoom = Math.round(WEBVIEW.views[WEBVIEW.viewActive || 1].webContents.getZoomFactor() * 100.0);
+  const pageZoom = WEBVIEW.zoom.get();
   publishState("page_zoom", pageZoom);
 };
 
@@ -519,8 +695,10 @@ const initPageUrl = () => {
     .on("message", (topic, message) => {
       if (topic === config.command_topic) {
         const url = message.toString();
-        console.log("Set Page Url:", url);
+        if (WEBVIEW.viewActive && url) {
-        WEBVIEW.views[WEBVIEW.viewActive || 1].webContents.loadURL(url);
+          console.verbose("Set Page Url:", url);
+          WEBVIEW.views[WEBVIEW.viewActive].webContents.loadURL(url);
+        }
       }
     })
     .subscribe(config.command_topic);
@@ -530,11 +708,11 @@ const initPageUrl = () => {
 /**
  * Updates the page url via the mqtt connection.
  */
-const updatePageUrl = () => {
+const updatePageUrl = async () => {
   const defaultUrl = WEBVIEW.viewUrls[WEBVIEW.viewActive || 1];
   const currentUrl = WEBVIEW.views[WEBVIEW.viewActive || 1].webContents.getURL();
   const pageUrl = !currentUrl || currentUrl.startsWith("data:") ? defaultUrl : currentUrl;
-  publishState("page_url", pageUrl);
+  publishState("page_url", pageUrl.length < 255 ? pageUrl : null);
 };
 
 /**
@@ -546,6 +724,7 @@ const initModel = () => {
     name: "Model",
     unique_id: `${INTEGRATION.node}_model`,
     state_topic: `${root}/state`,
+    json_attributes_topic: `${root}/attributes`,
     value_template: "{{ value }}",
     icon: "mdi:raspberry-pi",
     device: INTEGRATION.device,
@@ -557,9 +736,10 @@ const initModel = () => {
 /**
  * Updates the model sensor via the mqtt connection.
  */
-const updateModel = () => {
+const updateModel = async () => {
   const model = hardware.getModel();
   publishState("model", model);
+  publishAttributes("model", HARDWARE.support);
 };
 
 /**
@@ -582,11 +762,41 @@ const initSerialNumber = () => {
 /**
  * Updates the serial number sensor via the mqtt connection.
  */
-const updateSerialNumber = () => {
+const updateSerialNumber = async () => {
   const serialNumber = hardware.getSerialNumber();
   publishState("serial_number", serialNumber);
 };
 
+/**
+ * Initializes the network address sensor.
+ */
+const initNetworkAddress = () => {
+  const root = `${INTEGRATION.root}/network_address`;
+  const config = {
+    name: "Network Address",
+    unique_id: `${INTEGRATION.node}_network_address`,
+    state_topic: `${root}/state`,
+    json_attributes_topic: `${root}/attributes`,
+    value_template: "{{ value }}",
+    icon: "mdi:ip-network",
+    device: INTEGRATION.device,
+  };
+  publishConfig("sensor", config);
+  updateNetworkAddress();
+};
+
+/**
+ * Updates the network address sensor via the mqtt connection.
+ */
+const updateNetworkAddress = async () => {
+  const networkAddresses = hardware.getNetworkAddresses();
+  const [name] = Object.keys(networkAddresses);
+  const [family] = name ? Object.keys(networkAddresses[name]) : [];
+  const networkAddress = networkAddresses[name]?.[family]?.[0] || null;
+  publishState("network_address", networkAddress);
+  publishAttributes("network_address", networkAddresses);
+};
+
 /**
  * Initializes the host name sensor.
  */
@@ -607,7 +817,7 @@ const initHostName = () => {
 /**
  * Updates the host name sensor via the mqtt connection.
  */
-const updateHostName = () => {
+const updateHostName = async () => {
   const hostName = hardware.getHostName();
   publishState("host_name", hostName);
 };
@@ -621,6 +831,7 @@ const initUpTime = () => {
     name: "Up Time",
     unique_id: `${INTEGRATION.node}_up_time`,
     state_topic: `${root}/state`,
+    json_attributes_topic: `${root}/attributes`,
     value_template: "{{ (value | float) | round(0) }}",
     unit_of_measurement: "min",
     icon: "mdi:timeline-clock",
@@ -633,9 +844,13 @@ const initUpTime = () => {
 /**
  * Updates the up time sensor via the mqtt connection.
  */
-const updateUpTime = () => {
+const updateUpTime = async () => {
   const upTime = hardware.getUpTime();
+  const bootTime = {
+    boot: new Date(new Date().getTime() - upTime * 60 * 1000),
+  };
   publishState("up_time", upTime);
+  publishAttributes("up_time", bootTime);
 };
 
 /**
@@ -659,7 +874,7 @@ const initMemorySize = () => {
 /**
  * Updates the memory size sensor via the mqtt connection.
  */
-const updateMemorySize = () => {
+const updateMemorySize = async () => {
   const memorySize = hardware.getMemorySize();
   publishState("memory_size", memorySize);
 };
@@ -685,7 +900,7 @@ const initMemoryUsage = () => {
 /**
  * Updates the memory usage sensor via the mqtt connection.
  */
-const updateMemoryUsage = () => {
+const updateMemoryUsage = async () => {
   const memoryUsage = hardware.getMemoryUsage();
   publishState("memory_usage", memoryUsage);
 };
@@ -711,7 +926,7 @@ const initProcessorUsage = () => {
 /**
  * Updates the processor usage sensor via the mqtt connection.
  */
-const updateProcessorUsage = () => {
+const updateProcessorUsage = async () => {
   const processorUsage = hardware.getProcessorUsage();
   publishState("processor_usage", processorUsage);
 };
@@ -737,7 +952,7 @@ const initProcessorTemperature = () => {
 /**
  * Updates the processor temperature sensor via the mqtt connection.
  */
-const updateProcessorTemperature = () => {
+const updateProcessorTemperature = async () => {
   const processorTemperature = hardware.getProcessorTemperature();
   publishState("processor_temperature", processorTemperature);
 };
@@ -746,9 +961,6 @@ const updateProcessorTemperature = () => {
  * Initializes the battery level sensor.
  */
 const initBatteryLevel = () => {
-  if (!HARDWARE.support.batteryLevel) {
-    return;
-  }
   const root = `${INTEGRATION.root}/battery_level`;
   const config = {
     name: "Battery Level",
@@ -759,6 +971,10 @@ const initBatteryLevel = () => {
     icon: "mdi:battery-medium",
     device: INTEGRATION.device,
   };
+  if (!HARDWARE.support.batteryLevel) {
+    removeConfig("sensor", config);
+    return;
+  }
   publishConfig("sensor", config);
   updateBatteryLevel();
 };
@@ -766,7 +982,7 @@ const initBatteryLevel = () => {
 /**
  * Updates the battery level sensor via the mqtt connection.
  */
-const updateBatteryLevel = () => {
+const updateBatteryLevel = async () => {
   const batteryLevel = hardware.getBatteryLevel();
   publishState("battery_level", batteryLevel);
 };
@@ -792,41 +1008,16 @@ const initPackageUpgrades = () => {
 /**
  * Updates the package upgrades sensor via the mqtt connection.
  */
-const updatePackageUpgrades = () => {
+const updatePackageUpgrades = async () => {
   const packages = hardware.checkPackageUpgrades();
-  const attributes = {
+  const upgrades = {
-    total: packages.length,
+    packages: packages.map((pkg) => {
-    packages: packages.map((pkg) => pkg.replace(/\s*\[.*?\]\s*/g, "").trim()),
+      const [name, version] = pkg.replace(/\s*\[.*?\]\s*/g, "").split(/\s+/, 2);
+      return { [name]: version };
+    }),
   };
-  publishAttributes("package_upgrades", attributes);
+  publishState("package_upgrades", packages.length);
-  publishState("package_upgrades", attributes.total);
+  publishAttributes("package_upgrades", upgrades);
-};
-
-/**
- * Initializes the heartbeat sensor.
- */
-const initHeartbeat = () => {
-  const root = `${INTEGRATION.root}/heartbeat`;
-  const config = {
-    name: "Heartbeat",
-    unique_id: `${INTEGRATION.node}_heartbeat`,
-    state_topic: `${root}/state`,
-    value_template: "{{ value }}",
-    icon: "mdi:heart-flash",
-    device: INTEGRATION.device,
-  };
-  publishConfig("sensor", config);
-  updateHeartbeat();
-};
-
-/**
- * Updates the heartbeat sensor via the mqtt connection.
- */
-const updateHeartbeat = () => {
-  const now = new Date();
-  const local = new Date(now.getTime() - now.getTimezoneOffset() * 60 * 1000);
-  const heartbeat = local.toISOString().replace(/\.\d{3}Z$/, "");
-  publishState("heartbeat", heartbeat);
 };
 
 /**
@@ -838,6 +1029,7 @@ const initLastActive = () => {
     name: "Last Active",
     unique_id: `${INTEGRATION.node}_last_active`,
     state_topic: `${root}/state`,
+    json_attributes_topic: `${root}/attributes`,
     value_template: "{{ (value | float) | round(0) }}",
     unit_of_measurement: "min",
     icon: "mdi:gesture-tap-hold",
@@ -850,11 +1042,138 @@ const initLastActive = () => {
 /**
  * Updates the last active sensor via the mqtt connection.
  */
-const updateLastActive = () => {
+const updateLastActive = async () => {
   const now = new Date();
-  const then = WEBVIEW.pointer.time;
+  const then = WEBVIEW.tracker.pointer.time;
-  const lastActive = Math.abs(now - then) / (1000 * 60);
+  const lastActive = (now - then) / (1000 * 60);
+  const tracker = {
+    ...WEBVIEW.tracker.pointer.position,
+    ...WEBVIEW.tracker.display,
+  };
   publishState("last_active", lastActive);
+  publishAttributes("last_active", tracker);
+};
+
+/**
+ * Initializes the page screenshot.
+ */
+const initScreenshot = () => {
+  const root = `${INTEGRATION.root}/screenshot`;
+  const config = {
+    name: "Screenshot",
+    unique_id: `${INTEGRATION.node}_screenshot`,
+    image_topic: `${root}/state`,
+    image_encoding: "b64",
+    content_type: "image/png",
+    entity_category: "diagnostic",
+    icon: "mdi:image-area",
+    device: INTEGRATION.device,
+  };
+  publishConfig("image", config);
+  updateScreenshot();
+};
+
+/**
+ * Updates the page screenshot via the mqtt connection.
+ */
+const updateScreenshot = async () => {
+  const screenshot = WEBVIEW.tracker.screenshot;
+  publishState("screenshot", screenshot);
+};
+
+/**
+ * Initializes the heartbeat sensor.
+ */
+const initHeartbeat = () => {
+  const root = `${INTEGRATION.root}/heartbeat`;
+  const config = {
+    name: "Heartbeat",
+    unique_id: `${INTEGRATION.node}_heartbeat`,
+    state_topic: `${root}/state`,
+    json_attributes_topic: `${root}/attributes`,
+    value_template: "{{ value }}",
+    entity_category: "diagnostic",
+    icon: "mdi:heart-flash",
+    device: INTEGRATION.device,
+  };
+  publishConfig("sensor", config);
+  updateHeartbeat();
+};
+
+/**
+ * Updates the heartbeat sensor via the mqtt connection.
+ */
+const updateHeartbeat = async () => {
+  const now = new Date();
+  const local = new Date(now.getTime() - now.getTimezoneOffset() * 60 * 1000);
+  const heartbeat = local.toISOString().replace(/\.\d{3}Z$/, "");
+  const attributes = { date: now };
+  publishState("heartbeat", heartbeat);
+  publishAttributes("heartbeat", attributes);
+};
+
+/**
+ * Initializes the error log sensor.
+ */
+const initErrors = () => {
+  const root = `${INTEGRATION.root}/errors`;
+  const config = {
+    name: "Errors",
+    unique_id: `${INTEGRATION.node}_errors`,
+    state_topic: `${root}/state`,
+    json_attributes_topic: `${root}/attributes`,
+    value_template: "{{ value | int }}",
+    entity_category: "diagnostic",
+    icon: "mdi:alert-circle",
+    device: INTEGRATION.device,
+  };
+  publishConfig("sensor", config);
+  updateErrors();
+};
+
+/**
+ * Updates the error log sensor via the mqtt connection.
+ */
+const updateErrors = async () => {
+  const logs = APP.logs.slice().reverse();
+  const errors = logs.filter((log) => log.level === "error");
+  const history = logs.reduce((acc, log) => {
+    const time = log.time.toISOString().slice(0, 16);
+    if (!acc[time]) {
+      acc[time] = [];
+    }
+    acc[time].push({ [log.level.toUpperCase()]: log.text });
+    return acc;
+  }, {});
+  publishState("errors", errors.length);
+  publishAttributes("errors", history);
+};
+
+/**
+ * Initializes the version sensor.
+ */
+const initVersion = () => {
+  const root = `${INTEGRATION.root}/version`;
+  const config = {
+    name: "Version",
+    unique_id: `${INTEGRATION.node}_version`,
+    state_topic: `${root}/state`,
+    json_attributes_topic: `${root}/attributes`,
+    value_template: "{{ value }}",
+    entity_category: "diagnostic",
+    icon: "mdi:application-braces",
+    device: INTEGRATION.device,
+  };
+  publishConfig("sensor", config);
+  updateVersion();
+};
+
+/**
+ * Updates the version sensor via the mqtt connection.
+ */
+const updateVersion = async () => {
+  publishState("version", APP.version);
+  publishAttributes("version", APP.build);
 };
 
 module.exports = {

package.json

@@ -1,28 +1,31 @@
 {
     "name": "touchkio",
+    "title": "TouchKio",
     "description": "Home Assistant Touch Kiosk",
     "homepage": "https://github.com/leukipp/touchkio",
     "author": "leukipp",
-    "version": "1.2.1",
+    "version": "1.4.1",
     "license": "MIT",
     "main": "index.js",
     "scripts": {
-        "start": "electron . --web-url=https://demo.home-assistant.io,https://demo.immichkiosk.app --app-debug=false --trace-warnings",
+        "start": "electron . --web-url=https://demo.home-assistant.io,https://demo.immichkiosk.app --trace-warnings",
         "build": "electron-forge make"
     },
     "prettier": {
         "printWidth": 120
     },
     "devDependencies": {
-        "@electron-forge/cli": "^7.8.3",
+        "@electron-forge/cli": "^7.10.2",
-        "@electron-forge/maker-deb": "^7.8.3",
+        "@electron-forge/maker-deb": "^7.10.2",
-        "@electron-forge/maker-zip": "^7.8.3",
+        "@electron-forge/maker-zip": "^7.10.2",
-        "@electron-forge/publisher-github": "^7.8.3",
+        "@electron-forge/publisher-github": "^7.10.2",
-        "electron": "^37.4.0",
+        "electron": "^39.2.4",
+        "jszip": "^3.10.1",
         "prettier": "^3.6.2"
     },
     "dependencies": {
-        "axios": "^1.11.0",
+        "axios": "^1.13.2",
-        "mqtt": "^5.14.0"
+        "electron-log": "^5.4.3",
+        "mqtt": "^5.14.1"
     }
 }