diff --git a/matter-server/docker-compose.yml b/matter-server/docker-compose.yml index ce82c91b5..e73882ff5 100644 --- a/matter-server/docker-compose.yml +++ b/matter-server/docker-compose.yml @@ -2,8 +2,15 @@ version: "3.7" services: server: - image: ghcr.io/matter-js/python-matter-server:8.1.2@sha256:6827e352011e2d8c2bde771e446fcf72acc49150ef66bad978816bac1762aad3 + image: ghcr.io/matter-js/matterjs-server:1.4.0@sha256:54232d0d3e7dff5a54759469d2753399270412b4c30c55b31750a4595e4cb236 restart: on-failure + user: "1000:1000" + environment: + STORAGE_PATH: /data + PORT: "5580" + VENDOR_ID: "65521" + FABRIC_ID: "1" + NOBLE_BINDINGS: dbus # Required for mDNS to work correctly network_mode: host # UI at default port 5580 diff --git a/matter-server/hooks/pre-start b/matter-server/hooks/pre-start new file mode 100755 index 000000000..dd956e05a --- /dev/null +++ b/matter-server/hooks/pre-start @@ -0,0 +1,25 @@ +#!/usr/bin/env bash +set -euo pipefail + +APP_DIR="${APP_DATA_DIR:-$(readlink -f "$(dirname "${BASH_SOURCE[0]}")/..")}" +DATA_DIR="$(readlink -m "${APP_DATA_ROOT:-${APP_DIR}/data}")" +mkdir -p "${DATA_DIR}" +BACKUP_DIR="${DATA_DIR}/.matterjs-python-backup" +[[ ! -L "${BACKUP_DIR}" ]] +if [[ -e "${DATA_DIR}/chip.json" && ! -f "${BACKUP_DIR}/data.tar" ]]; then + mkdir -p "${BACKUP_DIR}" + chmod 0700 "${BACKUP_DIR}" + chown 0:0 "${BACKUP_DIR}" + # Keep a complete, private, immutable-by-convention snapshot before migration. + # tar preserves ownership/modes and does not follow symbolic links. + rm -f "${BACKUP_DIR}/data.tar.partial" + (umask 077; tar --exclude='./.matterjs-python-backup' --exclude='./.matterjs-prepared' \ + -cf "${BACKUP_DIR}/data.tar.partial" -C "${DATA_DIR}" .) + tar -tf "${BACKUP_DIR}/data.tar.partial" > /dev/null + mv "${BACKUP_DIR}/data.tar.partial" "${BACKUP_DIR}/data.tar" +fi +# Do not follow symlinks or change the protected rollback snapshot. +find -P "${DATA_DIR}" -path "${BACKUP_DIR}" -prune -o \ + -exec chown --no-dereference 1000:1000 {} + +find -P "${DATA_DIR}" -path "${BACKUP_DIR}" -prune -o \ + ! -type l -exec chmod u+rwX {} + diff --git a/matter-server/umbrel-app.yml b/matter-server/umbrel-app.yml index 48f9e38f1..10354447d 100644 --- a/matter-server/umbrel-app.yml +++ b/matter-server/umbrel-app.yml @@ -1,46 +1,41 @@ -manifestVersion: 1 +manifestVersion: 1.1 id: matter-server storage: dataRoot: data name: Matter Server tagline: A Matter Controller Server over WebSockets category: automation -version: "8.1.2-patch.1" +version: "1.4.0" port: 5580 description: >- - 🛜 This project implements a Matter Controller Server over WebSockets using the official Matter (formerly CHIP) SDK as a base and provides both a server and client implementation. + 🛜 Matter Server connects Matter devices to Home Assistant and other compatible applications through a WebSocket API. Built on matter.js and maintained by the Open Home Foundation, it supports commissioning, device control, firmware updates, and network diagnostics. - 🏠 The goal of this project is primarily to have Matter support in Home Assistant but its universal approach makes it suitable to be used in other projects too. -developer: Home Assistant -website: https://home-assistant.io -repo: https://github.com/matter-js/python-matter-server + 🏠 The built-in dashboard lets you manage devices and explore Thread and Wi-Fi networks. Home Assistant can connect to the server at ws://umbrel.local:5580/ws; replace umbrel.local with your Umbrel's hostname or IP address if needed. Only allow trusted clients on your local network to access this port. +developer: Open Home Foundation +website: https://www.openhomefoundation.org/ +repo: https://github.com/matter-js/matterjs-server submitter: al-lac submission: https://github.com/getumbrel/umbrel-apps/pull/1866 -support: https://community.home-assistant.io/ +support: https://github.com/matter-js/matterjs-server/issues gallery: - 1.jpg - 2.jpg - 3.jpg releaseNotes: >- - This update adds support for new storage management and configuration options being introduced with umbrelOS 2.0. + Matter Server now runs on the Open Home Foundation's matter.js implementation, replacing the retired Python server. Version numbers now follow the new project, so this update goes from 8.1.2 to 1.4.0. - Previous Matter Server 8.1.2 release notes: + ⚠️ Your existing fabric and paired devices are migrated automatically on first start, which may take several minutes; you should not need to re-pair them. Back up your Umbrel before updating, as rolling back requires restoring that backup. - This release includes several improvements and bug fixes. + Key improvements: + - Enables the Matter network map in Home Assistant 2026.9 + - Adds Thread and Wi-Fi network diagnostics and saved network credential management + - Improves sleepy-device support, device connections, and firmware updates + - Lets you upload local OTA firmware files from the dashboard - Key updates: - - Dashboard now includes fallback for unknown endpoint device types - - Fixed motion sensitivity and attribute type handling - - Added low power mode support for Heiman devices - - Added siren and mute functionality for Heiman smoke alarms - - Improved handling of non-string label data - - Documentation updates for Docker image references - - - Full release notes are available at https://github.com/home-assistant-libs/python-matter-server/releases + Full release notes are available at https://github.com/matter-js/matterjs-server/blob/v1.4.0/CHANGELOG.md dependencies: [] path: ""