matterbridge 3.1.8-dev-20250725-d6e57e3 → 3.1.8-dev-20250725-aa6ff9e

package/CHANGELOG.md

@@ -12,13 +12,19 @@ If you like this project and find it useful, please consider giving it a star on
 
 ### Added
 
-- [certification]: Improved certification management in pairing.json.
-- [workflow]: Update permissions and change GitHub token for Docker build trigger
+- [certification]: Improved certification management in pairing.json. Added pemToBuffer function for converting PEM strings to Uint8Array.
+- [workflow]: Update permissions and change GitHub token for Docker build triggers.
+- [frontend]: Added Changelog button when a new version is installed.
+- [frontend]: Added restart plugin in childbridge mode.
 
 ### Changed
 
 - [package]: Updated dependencies.
 
+### Fixed
+
+- [switch]: Added conditional handling for momentary switch events in MatterbridgeEndpoint for single press only switches.
+
 <a href="https://www.buymeacoffee.com/luligugithub">
   <img src="bmc-button.svg" alt="Buy me a coffee" width="80">
 </a>

package/dist/frontend.js

@@ -315,7 +315,7 @@ export class Frontend extends EventEmitter {
         });
         this.expressApp.get('/api/plugins', async (req, res) => {
             this.log.debug('The frontend sent /api/plugins');
-            res.json(this.getBaseRegisteredPlugins());
+            res.json(this.getPlugins());
         });
         this.expressApp.get('/api/devices', async (req, res) => {
             this.log.debug('The frontend sent /api/devices');
@@ -783,7 +783,7 @@ export class Frontend extends EventEmitter {
         });
         return attributes.trimStart().trimEnd();
     }
-    getBaseRegisteredPlugins() {
+    getPlugins() {
         if (this.matterbridge.hasCleanupStarted)
             return [];
         const baseRegisteredPlugins = [];
@@ -814,11 +814,11 @@ export class Frontend extends EventEmitter {
                 schemaJson: plugin.schemaJson,
                 hasWhiteList: plugin.configJson?.whiteList !== undefined,
                 hasBlackList: plugin.configJson?.blackList !== undefined,
-                paired: plugin.serverNode?.state.commissioning.commissioned,
-                qrPairingCode: this.matterbridge.matterbridgeInformation.matterbridgeEndAdvertise ? undefined : plugin.serverNode?.state.commissioning.pairingCodes.qrPairingCode,
-                manualPairingCode: this.matterbridge.matterbridgeInformation.matterbridgeEndAdvertise ? undefined : plugin.serverNode?.state.commissioning.pairingCodes.manualPairingCode,
-                fabricInformations: plugin.serverNode ? this.matterbridge.sanitizeFabricInformations(Object.values(plugin.serverNode?.state.commissioning.fabrics)) : undefined,
-                sessionInformations: plugin.serverNode ? this.matterbridge.sanitizeSessionInformation(Object.values(plugin.serverNode?.state.sessions.sessions)) : undefined,
+                paired: plugin.serverNode && plugin.serverNode.lifecycle.isOnline ? plugin.serverNode.state.commissioning.commissioned : undefined,
+                qrPairingCode: this.matterbridge.matterbridgeInformation.matterbridgeEndAdvertise ? undefined : plugin.serverNode && plugin.serverNode.lifecycle.isOnline ? plugin.serverNode.state.commissioning.pairingCodes.qrPairingCode : undefined,
+                manualPairingCode: this.matterbridge.matterbridgeInformation.matterbridgeEndAdvertise ? undefined : plugin.serverNode && plugin.serverNode.lifecycle.isOnline ? plugin.serverNode.state.commissioning.pairingCodes.manualPairingCode : undefined,
+                fabricInformations: plugin.serverNode && plugin.serverNode.lifecycle.isOnline ? this.matterbridge.sanitizeFabricInformations(Object.values(plugin.serverNode.state.commissioning.fabrics)) : undefined,
+                sessionInformations: plugin.serverNode && plugin.serverNode.lifecycle.isOnline ? this.matterbridge.sanitizeSessionInformation(Object.values(plugin.serverNode.state.sessions.sessions)) : undefined,
             });
         }
         return baseRegisteredPlugins;
@@ -1112,6 +1112,32 @@ export class Frontend extends EventEmitter {
                 this.wssSendRefreshRequired('devices');
                 client.send(JSON.stringify({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true }));
             }
+            else if (data.method === '/api/restartplugin') {
+                if (!isValidString(data.params.pluginName, 10) || !this.matterbridge.plugins.has(data.params.pluginName)) {
+                    client.send(JSON.stringify({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Wrong parameter pluginName in /api/restartplugin' }));
+                    return;
+                }
+                const plugin = this.matterbridge.plugins.get(data.params.pluginName);
+                await this.matterbridge.plugins.shutdown(plugin, 'The plugin is restarting.', false, true);
+                if (plugin.serverNode) {
+                    await this.matterbridge.stopServerNode(plugin.serverNode);
+                    plugin.serverNode = undefined;
+                }
+                for (const device of this.matterbridge.devices) {
+                    if (device.plugin === plugin.name) {
+                        this.log.debug(`Removing device ${device.deviceName} from plugin ${plugin.name}`);
+                        this.matterbridge.devices.remove(device);
+                    }
+                }
+                await this.matterbridge.plugins.load(plugin, true, 'The plugin has been restarted', true);
+                if (plugin.serverNode) {
+                    await this.matterbridge.startServerNode(plugin.serverNode);
+                }
+                this.wssSendSnackbarMessage(`Restarted plugin ${data.params.pluginName}`, 5, 'success');
+                this.wssSendRefreshRequired('plugins');
+                this.wssSendRefreshRequired('devices');
+                client.send(JSON.stringify({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true }));
+            }
             else if (data.method === '/api/savepluginconfig') {
                 if (!isValidString(data.params.pluginName, 10) || !this.matterbridge.plugins.has(data.params.pluginName)) {
                     client.send(JSON.stringify({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Wrong parameter pluginName in /api/savepluginconfig' }));
@@ -1220,7 +1246,7 @@ export class Frontend extends EventEmitter {
                 client.send(JSON.stringify({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, response: await this.getApiSettings() }));
             }
             else if (data.method === '/api/plugins') {
-                const response = this.getBaseRegisteredPlugins();
+                const response = this.getPlugins();
                 client.send(JSON.stringify({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, response }));
             }
             else if (data.method === '/api/devices') {

package/dist/matterbridgeEndpoint.js

@@ -61,7 +61,7 @@ import { AnsiLogger, CYAN, YELLOW, db, debugStringify, hk, or, zb } from './logg
 import { bridgedNode } from './matterbridgeDeviceTypes.js';
 import { isValidNumber, isValidObject, isValidString } from './utils/export.js';
 import { MatterbridgeServer, MatterbridgeIdentifyServer, MatterbridgeOnOffServer, MatterbridgeLevelControlServer, MatterbridgeColorControlServer, MatterbridgeLiftWindowCoveringServer, MatterbridgeLiftTiltWindowCoveringServer, MatterbridgeThermostatServer, MatterbridgeFanControlServer, MatterbridgeDoorLockServer, MatterbridgeModeSelectServer, MatterbridgeValveConfigurationAndControlServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeBooleanStateConfigurationServer, MatterbridgeSwitchServer, MatterbridgeOperationalStateServer, MatterbridgeDeviceEnergyManagementModeServer, MatterbridgeDeviceEnergyManagementServer, MatterbridgeActivatedCarbonFilterMonitoringServer, MatterbridgeHepaFilterMonitoringServer, } from './matterbridgeBehaviors.js';
-import { addClusterServers, addFixedLabel, addOptionalClusterServers, addRequiredClusterServers, addUserLabel, createUniqueId, getBehavior, getBehaviourTypesFromClusterClientIds, getBehaviourTypesFromClusterServerIds, getDefaultOperationalStateClusterServer, getDefaultFlowMeasurementClusterServer, getDefaultIlluminanceMeasurementClusterServer, getDefaultPressureMeasurementClusterServer, getDefaultRelativeHumidityMeasurementClusterServer, getDefaultTemperatureMeasurementClusterServer, getDefaultOccupancySensingClusterServer, lowercaseFirstLetter, updateAttribute, getClusterId, getAttributeId, setAttribute, getAttribute, checkNotLatinCharacters, generateUniqueId, subscribeAttribute, invokeBehaviorCommand, triggerEvent, } from './matterbridgeEndpointHelpers.js';
+import { addClusterServers, addFixedLabel, addOptionalClusterServers, addRequiredClusterServers, addUserLabel, createUniqueId, getBehavior, getBehaviourTypesFromClusterClientIds, getBehaviourTypesFromClusterServerIds, getDefaultOperationalStateClusterServer, getDefaultFlowMeasurementClusterServer, getDefaultIlluminanceMeasurementClusterServer, getDefaultPressureMeasurementClusterServer, getDefaultRelativeHumidityMeasurementClusterServer, getDefaultTemperatureMeasurementClusterServer, getDefaultOccupancySensingClusterServer, lowercaseFirstLetter, updateAttribute, getClusterId, getAttributeId, setAttribute, getAttribute, checkNotLatinCharacters, generateUniqueId, subscribeAttribute, invokeBehaviorCommand, triggerEvent, featuresFor, } from './matterbridgeEndpointHelpers.js';
 export class MatterbridgeEndpoint extends Endpoint {
     static bridgeMode = '';
     static logLevel = "info";
@@ -1027,9 +1027,11 @@ export class MatterbridgeEndpoint extends Endpoint {
                 await this.setAttribute(Switch.Cluster.id, 'currentPosition', 1, log);
                 await this.triggerEvent(Switch.Cluster.id, 'initialPress', { newPosition: 1 }, log);
                 await this.setAttribute(Switch.Cluster.id, 'currentPosition', 0, log);
-                await this.triggerEvent(Switch.Cluster.id, 'shortRelease', { previousPosition: 1 }, log);
-                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 0, log);
-                await this.triggerEvent(Switch.Cluster.id, 'multiPressComplete', { previousPosition: 1, totalNumberOfPressesCounted: 1 }, log);
+                if (featuresFor(this, 'Switch').momentarySwitchRelease) {
+                    await this.triggerEvent(Switch.Cluster.id, 'shortRelease', { previousPosition: 1 }, log);
+                    await this.setAttribute(Switch.Cluster.id, 'currentPosition', 0, log);
+                    await this.triggerEvent(Switch.Cluster.id, 'multiPressComplete', { previousPosition: 1, totalNumberOfPressesCounted: 1 }, log);
+                }
             }
             if (event === 'Double') {
                 log?.info(`${db}Trigger endpoint ${or}${this.id}:${this.number}${db} event ${hk}Switch.DoublePress${db}`);

package/dist/utils/hex.js

@@ -1,3 +1,4 @@
+import { createPublicKey, createPrivateKey, X509Certificate } from 'node:crypto';
 export function bufferToHex(buffer) {
     if (!(buffer instanceof ArrayBuffer || ArrayBuffer.isView(buffer))) {
         throw new TypeError('Expected input to be an ArrayBuffer or ArrayBufferView');
@@ -25,3 +26,93 @@ export function hexToBuffer(hex) {
     }
     return result;
 }
+export function pemToBuffer(pem, validate = false) {
+    if (typeof pem !== 'string') {
+        throw new TypeError('Expected a string for PEM input');
+    }
+    const cleaned = pem.trim();
+    if (!cleaned.includes('-----BEGIN') || !cleaned.includes('-----END')) {
+        throw new Error('Invalid PEM format: missing BEGIN/END markers');
+    }
+    const lines = cleaned.split('\n');
+    const base64Lines = [];
+    let inContent = false;
+    for (const line of lines) {
+        const trimmedLine = line.trim();
+        if (trimmedLine.startsWith('-----BEGIN')) {
+            inContent = true;
+            continue;
+        }
+        if (trimmedLine.startsWith('-----END')) {
+            inContent = false;
+            break;
+        }
+        if (inContent && trimmedLine.length > 0) {
+            base64Lines.push(trimmedLine);
+        }
+    }
+    if (base64Lines.length === 0) {
+        throw new Error('Invalid PEM format: no content found between BEGIN/END markers');
+    }
+    const base64String = base64Lines.join('');
+    if (!/^[A-Za-z0-9+/]*={0,2}$/.test(base64String)) {
+        throw new Error('Invalid PEM format: contains invalid base64 characters');
+    }
+    try {
+        const buffer = Buffer.from(base64String, 'base64');
+        const result = new Uint8Array(buffer);
+        if (validate) {
+            try {
+                const pemType = cleaned.match(/-----BEGIN\s+([^-]+)-----/)?.[1]?.trim();
+                if (pemType?.includes('CERTIFICATE')) {
+                    const cert = new X509Certificate(pem);
+                    if (cert.validFrom && cert.validTo) {
+                        const now = Date.now();
+                        const from = Date.parse(cert.validFrom);
+                        const to = Date.parse(cert.validTo);
+                        if (now < from || now > to) {
+                            throw new Error('Certificate is not currently valid');
+                        }
+                    }
+                    if (!cert.subject || !cert.issuer) {
+                        throw new Error('Certificate missing subject or issuer');
+                    }
+                }
+                else if (pemType?.includes('PRIVATE KEY')) {
+                    createPrivateKey({ key: pem, format: 'pem' });
+                }
+                else if (pemType?.includes('PUBLIC KEY')) {
+                    createPublicKey({ key: pem, format: 'pem' });
+                }
+            }
+            catch (validationError) {
+                throw new Error(`PEM validation failed: ${validationError instanceof Error ? validationError.message : String(validationError)}`);
+            }
+        }
+        return result;
+    }
+    catch (error) {
+        throw new Error(`Failed to decode base64 content: ${error instanceof Error ? error.message : String(error)}`);
+    }
+}
+export function extractPrivateKeyRaw(pemPrivateKey) {
+    if (typeof pemPrivateKey !== 'string') {
+        throw new TypeError('Expected a string for PEM private key input');
+    }
+    const keyBlock = /-----BEGIN (?:EC )?PRIVATE KEY-----[^-]+-----END (?:EC )?PRIVATE KEY-----/s.exec(pemPrivateKey);
+    if (!keyBlock) {
+        throw new Error('No EC PRIVATE KEY block found in the supplied PEM');
+    }
+    try {
+        const privateKey = createPrivateKey(keyBlock[0]);
+        const pkcs8Der = privateKey.export({ format: 'der', type: 'pkcs8' });
+        if (pkcs8Der.length < 32) {
+            throw new Error('Invalid private key: DER data too short');
+        }
+        const rawPrivateKey = pkcs8Der.subarray(pkcs8Der.length - 32);
+        return new Uint8Array(rawPrivateKey);
+    }
+    catch (error) {
+        throw new Error(`Failed to extract private key: ${error instanceof Error ? error.message : String(error)}`);
+    }
+}

package/frontend/build/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "./static/css/main.944b63c3.css",
-    "main.js": "./static/js/main.1d25e0d8.js",
+    "main.js": "./static/js/main.bb47a7dc.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.1d25e0d8.js.map": "./static/js/main.1d25e0d8.js.map",
+    "main.bb47a7dc.js.map": "./static/js/main.bb47a7dc.js.map",
     "453.d855a71b.chunk.js.map": "./static/js/453.d855a71b.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.944b63c3.css",
-    "static/js/main.1d25e0d8.js"
+    "static/js/main.bb47a7dc.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.1d25e0d8.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.bb47a7dc.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>