matterbridge 3.0.0-edge.13 → 3.0.0-edge.14

package/CHANGELOG.md

@@ -67,8 +67,13 @@ Modified clusters:
 - [matter.js]: Update to 0.13.0-alpha.0-20250415-475996bb5.
 - [matter.js]: Update to 0.13.0-alpha.0-20250418-8cfc0b832.
 - [matter.js]: Update to 0.13.0-alpha.0-20250420-9f45e4f77.
+- [matter.js]: Update to 0.13.0-alpha.0-20250422-0d27f26be.
+- [matter.js]: Update to 0.13.0-alpha.0-20250423-8917d1d1d.
+- [matter.js]: Update to 0.13.0-alpha.0-20250424-4760af1f3.
+- [matter.js]: Update to 0.13.0-alpha.0-20250425-94b33ff98.
 - [help]: Updated cli help screen.
 - [logger]: Improved frontend logger cleaning.
+- [parameter]: Added getIntArrayParameter and getStringArrayParameter.
 
 ### Fixed
 

package/README-DOCKER.md

@@ -38,7 +38,7 @@ docker exec -it matterbridge curl -v http://localhost:8283/health
 
 This will create the required directories in your home directory if they don't exist
 
-```
+```bash
 cd ~
 mkdir -p ./Matterbridge
 mkdir -p ./.matterbridge
@@ -51,7 +51,7 @@ You may need to adapt the script to your setup.
 
 If you don't want to use sudo with docker commands, run this command:
 
-```
+```bash
 sudo groupadd docker
 sudo usermod -aG docker $USER
 ```
@@ -62,7 +62,7 @@ After adding your user to the docker group, you need to log out and log back in
 
 The container must have full access to the host network (needed for mdns).
 
-```
+```bash
 sudo docker run --name matterbridge \
   -v /home/<USER>/Matterbridge:/root/Matterbridge \
   -v /home/<USER>/.matterbridge:/root/.matterbridge \
@@ -95,55 +95,55 @@ copy it in the home directory or edit the existing one to add the matterbridge s
 
 Then start docker compose with:
 
-```
+```bash
 docker compose up -d
 ```
 
 ### Stop with docker compose
 
-```
+```bash
 docker compose down
 ```
 
 ### Update with docker compose
 
-```
+```bash
 docker compose pull
 ```
 
 ### Inspect the container
 
-```
+```bash
 docker container inspect matterbridge
 ```
 
 ### Start the Docker container
 
-```
+```bash
 docker start matterbridge
 ```
 
 ### Stop the Docker container
 
-```
+```bash
 docker stop matterbridge
 ```
 
 ### Restart the Docker container
 
-```
+```bash
 docker restart matterbridge
 ```
 
 ### Shows the logs
 
-```
+```bash
 docker logs matterbridge
 ```
 
 ### Shows the logs for a time interval
 
-```
+```bash
 docker logs \
   --since "2025-04-19T00:00:00" \
   --until "2025-04-19T00:02:00" \
@@ -152,6 +152,6 @@ docker logs \
 
 ### Shows the logs real time (tail)
 
-```
+```bash
 docker logs --tail 1000 -f matterbridge
 ```

package/README-SERVICE.md

@@ -20,7 +20,7 @@
 
 This will create the required directories if they don't exist
 
-```
+```bash
 cd ~
 mkdir -p ./Matterbridge
 mkdir -p ./.matterbridge
@@ -31,7 +31,7 @@ sudo chown -R $USER:$USER ./Matterbridge ./.matterbridge
 
 Create a systemctl configuration file for Matterbridge
 
-```
+```bash
 sudo nano /etc/systemd/system/matterbridge.service
 ```
 
@@ -53,8 +53,6 @@ WorkingDirectory=/home/<USER>/Matterbridge
 StandardOutput=inherit
 StandardError=inherit
 Restart=always
-RestartSec=10s
-TimeoutStopSec=30s
 User=<USER>
 Group=<USER>
 
@@ -70,45 +68,53 @@ add this:
 AmbientCapabilities=CAP_NET_BIND_SERVICE
 ```
 
-If you modify it after, then run:
+If you use the matterbridge-bthome plugin add this:
 
 ```
+[Service]
+AmbientCapabilities=CAP_NET_BIND_SERVICE CAP_NET_RAW CAP_NET_ADMIN
+```
+
+If you modify it after, then run:
+
+```bash
 sudo systemctl daemon-reload
+sudo systemctl restart matterbridge.service
 ```
 
 ### Start Matterbridge
 
-```
+```bash
 sudo systemctl start matterbridge
 ```
 
 ### Stop Matterbridge
 
-```
+```bash
 sudo systemctl stop matterbridge
 ```
 
 ### Show Matterbridge status
 
-```
+```bash
 sudo systemctl status matterbridge.service
 ```
 
 ### Enable Matterbridge to start automatically on boot
 
-```
+```bash
 sudo systemctl enable matterbridge.service
 ```
 
 ### Disable Matterbridge from starting automatically on boot
 
-```
+```bash
 sudo systemctl disable matterbridge.service
 ```
 
 ### View the log of Matterbridge in real time (this will show the log with colors)
 
-```
+```bash
 sudo journalctl -u matterbridge.service -n 1000 -f --output cat
 ```
 
@@ -116,13 +122,13 @@ sudo journalctl -u matterbridge.service -n 1000 -f --output cat
 
 Check the space used
 
-```
+```bash
 sudo journalctl --disk-usage
 ```
 
 remove all log older then 3 days
 
-```
+```bash
 sudo journalctl --rotate
 sudo journalctl --vacuum-time=3d
 ```
@@ -131,13 +137,13 @@ sudo journalctl --vacuum-time=3d
 
 If you want to make the setting permanent to prevent the journal logs to grow too much, run
 
-```
+```bash
 sudo nano /etc/systemd/journald.conf
 ```
 
 add
 
-```
+```bash
 Compress=yes            # Compress logs
 MaxRetentionSec=3days   # Keep logs for a maximum of 3 days.
 MaxFileSec=1day         # Rotate logs daily within the 3-day retention period.
@@ -148,7 +154,7 @@ RuntimeMaxUse=100M      # Limit runtime logs in /run/log/journal to 100 MB.
 
 save it and run
 
-```
+```bash
 sudo systemctl restart systemd-journald
 ```
 
@@ -156,7 +162,7 @@ sudo systemctl restart systemd-journald
 
 Run the following command to verify if you can install Matterbridge globally without being prompted for a password:
 
-```
+```bash
 sudo npm install -g matterbridge
 ```
 
@@ -164,7 +170,7 @@ If you are not prompted for a password, no further action is required.
 
 If that is not the case, open the sudoers file for editing using visudo
 
-```
+```bash
 sudo visudo
 ```
 
@@ -176,8 +182,8 @@ verify the presence of of a line
 
 exit and create a configuration file for sudoers
 
-```
-sudo nano  /etc/sudoers.d/matterbridge
+```bash
+sudo nano /etc/sudoers.d/matterbridge
 ```
 
 add this line replacing USER with your user name (e.g. radxa ALL=(ALL) NOPASSWD: ALL)
@@ -194,6 +200,6 @@ or if you prefers to only give access to npm without password try with (e.g. rad
 
 save the file and reload the settings with:
 
-```
+```bash
 sudo visudo -c
 ```

package/dist/frontend.js

@@ -11,7 +11,7 @@ import { AnsiLogger, stringify, debugStringify, CYAN, db, er, nf, rs, UNDERLINE,
 import { createZip, deepCopy, isValidArray, isValidNumber, isValidObject, isValidString } from './utils/export.js';
 import { plg } from './matterbridgeTypes.js';
 import { hasParameter } from './utils/export.js';
-import { BridgedDeviceBasicInformation } from '@matter/main/clusters';
+import { BridgedDeviceBasicInformation, PowerSource } from '@matter/main/clusters';
 export const WS_ID_LOG = 0;
 export const WS_ID_REFRESH_NEEDED = 1;
 export const WS_ID_RESTART_NEEDED = 2;
@@ -918,6 +918,28 @@ export class Frontend {
             return true;
         return false;
     }
+    getPowerSource(device) {
+        if (!device.lifecycle.isReady || device.construction.status !== Lifecycle.Status.Active)
+            return undefined;
+        const powerSource = (device) => {
+            const featureMap = device.getAttribute(PowerSource.Cluster.id, 'featureMap');
+            if (featureMap.wired) {
+                const wiredCurrentType = device.getAttribute(PowerSource.Cluster.id, 'wiredCurrentType');
+                return ['ac', 'dc'][wiredCurrentType];
+            }
+            if (featureMap.battery) {
+                const batChargeLevel = device.getAttribute(PowerSource.Cluster.id, 'batChargeLevel');
+                return ['ok', 'warning', 'critical'][batChargeLevel];
+            }
+            return;
+        };
+        if (device.hasClusterServer(PowerSource.Cluster.id))
+            return powerSource(device);
+        for (const child of device.getChildEndpoints()) {
+            if (child.hasClusterServer(PowerSource.Cluster.id))
+                return powerSource(child);
+        }
+    }
     getClusterTextFromDevice(device) {
         if (!device.lifecycle.isReady || device.construction.status !== Lifecycle.Status.Active)
             return '';
@@ -1243,6 +1265,7 @@ export class Frontend {
                         configUrl: device.configUrl,
                         uniqueId: device.uniqueId,
                         reachable: this.getReachability(device),
+                        powerSource: this.getPowerSource(device),
                         cluster: cluster,
                     });
                 });

package/dist/utils/parameter.js

@@ -1,3 +1,10 @@
+export function hasParameter(name) {
+    const commandArguments = process.argv.slice(2);
+    let markerIncluded = commandArguments.includes(`-${name}`);
+    if (!markerIncluded)
+        markerIncluded = commandArguments.includes(`--${name}`);
+    return markerIncluded;
+}
 import { isValidNumber } from './export.js';
 export function getParameter(name) {
     const commandArguments = process.argv.slice(2);
@@ -8,13 +15,6 @@ export function getParameter(name) {
         return undefined;
     return commandArguments[markerIndex + 1];
 }
-export function hasParameter(name) {
-    const commandArguments = process.argv.slice(2);
-    let markerIncluded = commandArguments.includes(`-${name}`);
-    if (!markerIncluded)
-        markerIncluded = commandArguments.includes(`--${name}`);
-    return markerIncluded;
-}
 export function getIntParameter(name) {
     const value = getParameter(name);
     if (value === undefined)
@@ -24,3 +24,35 @@ export function getIntParameter(name) {
         return undefined;
     return intValue;
 }
+export function getIntArrayParameter(name) {
+    const commandArguments = process.argv.slice(2);
+    let markerIndex = commandArguments.indexOf(`--${name}`);
+    if (markerIndex < 0)
+        markerIndex = commandArguments.indexOf(`-${name}`);
+    if (markerIndex < 0)
+        return undefined;
+    const intValues = [];
+    for (let i = markerIndex + 1; i < commandArguments.length && !commandArguments[i].startsWith('-'); i++) {
+        const intValue = parseInt(commandArguments[i], 10);
+        if (isValidNumber(intValue))
+            intValues.push(intValue);
+    }
+    if (intValues.length === 0)
+        return undefined;
+    return intValues;
+}
+export function getStringArrayParameter(name) {
+    const commandArguments = process.argv.slice(2);
+    let markerIndex = commandArguments.indexOf(`--${name}`);
+    if (markerIndex < 0)
+        markerIndex = commandArguments.indexOf(`-${name}`);
+    if (markerIndex < 0)
+        return undefined;
+    const values = [];
+    for (let i = markerIndex + 1; i < commandArguments.length && !commandArguments[i].startsWith('-'); i++) {
+        values.push(commandArguments[i]);
+    }
+    if (values.length === 0)
+        return undefined;
+    return values;
+}

package/frontend/build/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "./static/css/main.944b63c3.css",
-    "main.js": "./static/js/main.cf5d7dfe.js",
+    "main.js": "./static/js/main.13560e6f.js",
     "static/js/453.d855a71b.chunk.js": "./static/js/453.d855a71b.chunk.js",
     "static/media/roboto-latin-700-normal.woff2": "./static/media/roboto-latin-700-normal.c4d6cab43bec89049809.woff2",
     "static/media/roboto-latin-500-normal.woff2": "./static/media/roboto-latin-500-normal.599f66a60bdf974e578e.woff2",
@@ -77,11 +77,11 @@
     "static/media/roboto-greek-ext-300-normal.woff": "./static/media/roboto-greek-ext-300-normal.60729cafbded24073dfb.woff",
     "index.html": "./index.html",
     "main.944b63c3.css.map": "./static/css/main.944b63c3.css.map",
-    "main.cf5d7dfe.js.map": "./static/js/main.cf5d7dfe.js.map",
+    "main.13560e6f.js.map": "./static/js/main.13560e6f.js.map",
     "453.d855a71b.chunk.js.map": "./static/js/453.d855a71b.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.944b63c3.css",
-    "static/js/main.cf5d7dfe.js"
+    "static/js/main.13560e6f.js"
   ]
 }

package/frontend/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><base href="./"><link rel="icon" href="./matterbridge 32x32.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Matterbridge</title><link rel="manifest" href="./manifest.json"/><script defer="defer" src="./static/js/main.cf5d7dfe.js"></script><link href="./static/css/main.944b63c3.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><base href="./"><link rel="icon" href="./matterbridge 32x32.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Matterbridge</title><link rel="manifest" href="./manifest.json"/><script defer="defer" src="./static/js/main.13560e6f.js"></script><link href="./static/css/main.944b63c3.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>