matterbridge 1.2.8 → 1.2.9

package/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.2.9] - 2024-04-19
+
+### Added
+
+- [Matterbridge]: Added call to set reachability at start.
+- [frontend]: Added filter for log level and search criteria in the Logs page.
+- [frontend]: Added colors to the logs in the Home page and in the Logs page.
+- [frontend]: Frontend updated to 0.8.7.
+
+### Fixed
+
+- [logs]: Fixed wss for some browser that didn't connect to wss.
+
 ## [1.2.8] - 2024-04-16
 
 ### Changed
@@ -10,7 +23,7 @@ All notable changes to this project will be documented in this file.
 ### Added
 
 - [frontend]: Added logs in the Home page and in the Log page.
-- [frontend]: Frontend got updated to 0.8.5.
+- [frontend]: Frontend got updated to 0.8.6.
 - [frontend]: Added log for update and plugin install.
 - [extension]: Started implementation of zigbee2MQTT internal extension.
 

package/README.md

@@ -104,6 +104,9 @@ Home page:
 Devices page:
 ![See the screenshot here](https://github.com/Luligu/matterbridge/blob/main/Screenshot%20devices.jpg)
 
+Logs page:
+![See the screenshot here](https://github.com/Luligu/matterbridge/blob/main/Screenshot%20logs.jpg)
+
 ## Plugins
 
 ### Accessory platform example

package/dist/matterbridge.d.ts

@@ -40,22 +40,23 @@ interface SystemInformation {
     freeMemory: string;
     systemUptime: string;
 }
+interface MatterbridgeInformation {
+    homeDirectory: string;
+    rootDirectory: string;
+    matterbridgeDirectory: string;
+    matterbridgePluginDirectory: string;
+    globalModulesDirectory: string;
+    matterbridgeVersion: string;
+    matterbridgeLatestVersion: string;
+    bridgeMode: string;
+    debugEnabled: boolean;
+}
 /**
  * Represents the Matterbridge application.
  */
 export declare class Matterbridge extends EventEmitter {
     systemInformation: SystemInformation;
-    matterbridgeInformation: {
-        homeDirectory: string;
-        rootDirectory: string;
-        matterbridgeDirectory: string;
-        matterbridgePluginDirectory: string;
-        globalModulesDirectory: string;
-        matterbridgeVersion: string;
-        matterbridgeLatestVersion: string;
-        bridgeMode: string;
-        debugEnabled: boolean;
-    };
+    matterbridgeInformation: MatterbridgeInformation;
     homeDirectory: string;
     rootDirectory: string;
     matterbridgeDirectory: string;
@@ -158,13 +159,6 @@ export declare class Matterbridge extends EventEmitter {
      * @returns A promise that resolves when the cleanup is completed.
      */
     private cleanup;
-    /**
-     * Sets the reachable attribute of a device.
-     *
-     * @param device - The device for which to set the reachable attribute.
-     * @param reachable - The value to set for the reachable attribute.
-     */
-    private setReachableAttribute;
     /**
      * Adds a device to the Matterbridge.
      * @param pluginName - The name of the plugin.
@@ -327,6 +321,26 @@ export declare class Matterbridge extends EventEmitter {
      * @returns The found plugin, or undefined if not found.
      */
     private findPlugin;
+    /**
+     * Sets the reachability of a commissioning server and trigger.
+     *
+     * @param {CommissioningServer} commissioningServer - The commissioning server to set the reachability for.
+     * @param {boolean} reachable - The new reachability status.
+     */
+    private setCommissioningServerReachability;
+    /**
+     * Sets the reachability of the specified matter aggregator and its bridged devices and trigger.
+     * @param {Aggregator} matterAggregator - The matter aggregator to set the reachability for.
+     * @param {boolean} reachable - A boolean indicating the reachability status to set.
+     */
+    private setAggregatorReachability;
+    /**
+     * Sets the reachability of a device and trigger.
+     *
+     * @param {MatterbridgeDevice} device - The device to set the reachability for.
+     * @param {boolean} reachable - The new reachability status of the device.
+     */
+    private setDeviceReachability;
     /**
      * Creates a matter commissioning server.
      *
@@ -384,6 +398,13 @@ export declare class Matterbridge extends EventEmitter {
      * @returns A promise that resolves when the child process exits successfully, or rejects if there is an error.
      */
     private spawnCommand;
+    /**
+     * Sends a WebSocket message to all connected clients.
+     *
+     * @param {string} type - The type of the message: Matterbridge, Plugin, Device, ...
+     * @param {string} subType - The subtype of the message: debug info warn error ....
+     * @param {string} message - The content of the message.
+     */
     private wssSendMessage;
     /**
      * Initializes the frontend of Matterbridge.

package/dist/matterbridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"matterbridge.d.ts","sourceRoot":"","sources":["../src/matterbridge.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"matterbridge.d.ts","sourceRoot":"","sources":["../src/matterbridge.ts"],"names":[],"mappings":"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"}

package/dist/matterbridge.js

@@ -26,6 +26,7 @@ import { AnsiLogger, BRIGHT, RESET, UNDERLINE, UNDERLINEOFF, YELLOW, db, debugSt
 import { fileURLToPath, pathToFileURL } from 'url';
 import { promises as fs } from 'fs';
 import { exec, spawn } from 'child_process';
+import https from 'https';
 import EventEmitter from 'events';
 import express from 'express';
 import os from 'os';
@@ -128,6 +129,8 @@ export class Matterbridge extends EventEmitter {
      * @returns A Promise that resolves when the initialization is complete.
      */
     async initializeAsExtension(dataPath, debugEnabled) {
+        // Set the bridge mode
+        this.bridgeMode = 'bridge';
         // Set the first port to use
         this.port = 5560;
         // Set Matterbridge logger
@@ -140,6 +143,19 @@ export class Matterbridge extends EventEmitter {
         this.nodeStorage = new NodeStorageManager({ dir: path.join(this.matterbridgeDirectory, 'node_storage'), logging: false });
         this.log.debug('Creating node storage context for matterbridge: matterbridge');
         this.nodeContext = await this.nodeStorage.createStorage('matterbridge');
+        const plugin = {
+            path: '',
+            type: 'DynamicPlatform',
+            name: 'MatterbridgeExtension',
+            version: '1.0.0',
+            description: 'Matterbridge extension',
+            author: 'https://github.com/Luligu',
+            enabled: false,
+            registeredDevices: 0,
+            addedDevices: 0,
+        };
+        this.registeredPlugins.push(plugin);
+        await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
         // Log system info and create .matterbridge directory
         await this.logNodeAndSystemInfo();
         this.matterbridgeDirectory = dataPath;
@@ -154,7 +170,7 @@ export class Matterbridge extends EventEmitter {
         await this.matterbridgeContext.set('softwareVersion', 1);
         await this.matterbridgeContext.set('softwareVersionString', this.matterbridgeVersion);
         await this.matterbridgeContext.set('hardwareVersion', 0);
-        await this.matterbridgeContext.set('hardwareVersionString', '0.0.1');
+        await this.matterbridgeContext.set('hardwareVersionString', '1.0.0'); // Update with the extension version
         this.createMatterServer(this.storageManager);
         this.log.debug(`Creating commissioning server for ${plg}Matterbridge${db}`);
         this.commissioningServer = await this.createCommisioningServer(this.matterbridgeContext, 'Matterbridge');
@@ -166,10 +182,17 @@ export class Matterbridge extends EventEmitter {
         await this.matterServer?.addCommissioningServer(this.commissioningServer, { uniqueStorageKey: 'Matterbridge' });
         this.log.debug(`Setting reachability to true for ${plg}Matterbridge${db}`);
         this.commissioningServer.setReachability(true);
-        this.log.debug('Starting matter server...');
         await this.startMatterServer();
         this.log.info('Matter server started');
         await this.showCommissioningQRCode(this.commissioningServer, this.matterbridgeContext, this.nodeContext, 'Matterbridge');
+        // Set reachability to true and trigger event after 60 seconds
+        setTimeout(() => {
+            this.log.info(`*Setting reachability to true for ${plg}Matterbridge${db}`);
+            if (this.commissioningServer)
+                this.setCommissioningServerReachability(this.commissioningServer, true);
+            if (this.matterAggregator)
+                this.setAggregatorReachability(this.matterAggregator, true);
+        }, 60 * 1000);
     }
     /**
      * Close the Matterbridge instance as extension for zigbee2mqtt.
@@ -582,6 +605,7 @@ export class Matterbridge extends EventEmitter {
             this.log.info(message);
             process.removeAllListeners('SIGINT');
             process.removeAllListeners('SIGTERM');
+            this.log.debug('All listeners removed');
             // Calling the shutdown functions with a reason
             for (const plugin of this.registeredPlugins) {
                 if (!plugin.enabled)
@@ -637,11 +661,13 @@ export class Matterbridge extends EventEmitter {
             if (this.expressServer) {
                 this.expressServer.close();
                 this.expressServer = undefined;
+                this.log.debug('Express server closed successfully');
             }
             // Remove listeners
             if (this.expressApp) {
                 this.expressApp.removeAllListeners();
                 this.expressApp = undefined;
+                this.log.debug('Frontend closed successfully');
             }
             // Close the WebSocket server
             if (this.webSocketServer) {
@@ -715,20 +741,6 @@ export class Matterbridge extends EventEmitter {
             //cleanupTimeout1.unref();
         }
     }
-    /**
-     * Sets the reachable attribute of a device.
-     *
-     * @param device - The device for which to set the reachable attribute.
-     * @param reachable - The value to set for the reachable attribute.
-     */
-    setReachableAttribute(device, reachable) {
-        const basicInformationCluster = device.getClusterServer(BasicInformationCluster);
-        if (!basicInformationCluster) {
-            this.log.error('setReachableAttribute BasicInformationCluster needs to be set!');
-            return;
-        }
-        basicInformationCluster.setReachableAttribute(reachable);
-    }
     /**
      * Adds a device to the Matterbridge.
      * @param pluginName - The name of the plugin.
@@ -824,7 +836,7 @@ export class Matterbridge extends EventEmitter {
             return;
         }
         if (this.bridgeMode === 'childbridge' && !plugin.connected) {
-            this.log.warn(`Removing bridged device ${dev}${device.deviceName}${wr} (${dev}${device.name}${wr}) plugin ${plg}${pluginName}${wr} not connected`);
+            this.log.info(`Removing bridged device ${dev}${device.deviceName}${wr} (${dev}${device.name}${wr}) plugin ${plg}${pluginName}${wr} not connected`);
             return;
         }
         // Remove the device from matterbridge aggregator in bridge mode
@@ -1505,20 +1517,17 @@ export class Matterbridge extends EventEmitter {
                 await this.matterServer?.addCommissioningServer(this.commissioningServer, { uniqueStorageKey: 'Matterbridge' });
                 this.log.debug(`Setting reachability to true for ${plg}Matterbridge${db}`);
                 this.commissioningServer.setReachability(true);
-                this.log.debug('Starting matter server...');
                 await this.startMatterServer();
                 this.log.info('Matter server started');
                 await this.showCommissioningQRCode(this.commissioningServer, this.matterbridgeContext, this.nodeContext, 'Matterbridge');
                 //if (hasParameter('advertise')) await this.commissioningServer.advertise();
-                /*
-                setInterval(() => {
-                  this.matterAggregator?.getBridgedDevices().forEach((device) => {
-                    this.log.info(`Bridged device: ${dev}${device.name}${nf}`);
-                    device.getClusterServer(BridgedDeviceBasicInformationCluster)?.setReachableAttribute(true);
-                    device.getClusterServer(BridgedDeviceBasicInformationCluster)?.triggerReachableChangedEvent({ reachableNewValue: true });
-                  });
-                }, 30 * 1000);
-                */
+                setTimeout(() => {
+                    this.log.info(`*Setting reachability to true for ${plg}Matterbridge${db}`);
+                    if (this.commissioningServer)
+                        this.setCommissioningServerReachability(this.commissioningServer, true);
+                    if (this.matterAggregator)
+                        this.setAggregatorReachability(this.matterAggregator, true);
+                }, 60 * 1000);
             }, 1000);
         }
         if (this.bridgeMode === 'childbridge') {
@@ -1555,6 +1564,8 @@ export class Matterbridge extends EventEmitter {
                                 plugin.commissioningServer = await this.createCommisioningServer(plugin.storageContext, plugin.name);
                             this.log.debug(`Adding device ${dev}${registeredDevice.device.name}${db} to commissioning server for plugin ${plg}${plugin.name}${db}`);
                             plugin.commissioningServer.addDevice(registeredDevice.device);
+                            if (!plugin.device)
+                                plugin.device = registeredDevice.device;
                         }
                         this.log.debug(`Adding commissioning server to matter server for plugin ${plg}${plugin.name}${db}`);
                         await this.matterServer?.addCommissioningServer(plugin.commissioningServer, { uniqueStorageKey: plugin.name });
@@ -1595,21 +1606,6 @@ export class Matterbridge extends EventEmitter {
                     return;
                 clearInterval(startMatterInterval);
                 this.log.info('Starting matter server...');
-                // Setting reachability to true
-                this.registeredPlugins.forEach((plugin) => {
-                    if (!plugin.enabled)
-                        return;
-                    this.log.debug(`Setting reachability to true for ${plg}${plugin.name}${db}`);
-                    plugin.commissioningServer?.setReachability(true);
-                    this.registeredDevices.forEach((registeredDevice) => {
-                        if (registeredDevice.plugin === plugin.name) {
-                            if (plugin.type === 'AccessoryPlatform')
-                                this.setReachableAttribute(registeredDevice.device, true);
-                            if (plugin.type === 'DynamicPlatform')
-                                registeredDevice.device.setBridgedDeviceReachability(true);
-                        }
-                    });
-                });
                 await this.startMatterServer();
                 this.log.info('Matter server started');
                 for (const plugin of this.registeredPlugins) {
@@ -1628,6 +1624,14 @@ export class Matterbridge extends EventEmitter {
                         continue;
                     }
                     await this.showCommissioningQRCode(plugin.commissioningServer, plugin.storageContext, plugin.nodeContext, plugin.name);
+                    // Setting reachability to true
+                    this.log.info(`*Setting reachability to true for ${plg}${plugin.name}${db}`);
+                    if (plugin.commissioningServer)
+                        this.setCommissioningServerReachability(plugin.commissioningServer, true);
+                    if (plugin.type === 'AccessoryPlatform' && plugin.device)
+                        this.setDeviceReachability(plugin.device, true);
+                    if (plugin.type === 'DynamicPlatform' && plugin.aggregator)
+                        this.setAggregatorReachability(plugin.aggregator, true);
                 }
                 Logger.defaultLogLevel = this.debugEnabled ? Level.DEBUG : Level.INFO;
                 //clearInterval(startMatterInterval);
@@ -1644,7 +1648,7 @@ export class Matterbridge extends EventEmitter {
             await this.cleanup('No matter server initialized');
             return;
         }
-        this.log.debug('Starting matter server');
+        this.log.debug('Starting matter server...');
         await this.matterServer.start();
         this.log.debug('Started matter server');
     }
@@ -1764,6 +1768,49 @@ export class Matterbridge extends EventEmitter {
         }
         return plugin;
     }
+    /**
+     * Sets the reachability of a commissioning server and trigger.
+     *
+     * @param {CommissioningServer} commissioningServer - The commissioning server to set the reachability for.
+     * @param {boolean} reachable - The new reachability status.
+     */
+    setCommissioningServerReachability(commissioningServer, reachable) {
+        const basicInformationCluster = commissioningServer?.getRootClusterServer(BasicInformationCluster);
+        if (basicInformationCluster && basicInformationCluster.attributes.reachable !== undefined)
+            basicInformationCluster.setReachableAttribute(reachable);
+        if (basicInformationCluster && basicInformationCluster.triggerReachableChangedEvent)
+            basicInformationCluster.triggerReachableChangedEvent({ reachableNewValue: reachable });
+    }
+    /**
+     * Sets the reachability of the specified matter aggregator and its bridged devices and trigger.
+     * @param {Aggregator} matterAggregator - The matter aggregator to set the reachability for.
+     * @param {boolean} reachable - A boolean indicating the reachability status to set.
+     */
+    setAggregatorReachability(matterAggregator, reachable) {
+        const basicInformationCluster = matterAggregator.getClusterServer(BasicInformationCluster);
+        if (basicInformationCluster && basicInformationCluster.attributes.reachable !== undefined)
+            basicInformationCluster.setReachableAttribute(reachable);
+        if (basicInformationCluster && basicInformationCluster.triggerReachableChangedEvent)
+            basicInformationCluster.triggerReachableChangedEvent({ reachableNewValue: reachable });
+        matterAggregator.getBridgedDevices().forEach((device) => {
+            this.log.debug(`*Setting reachability to true for bridged device: ${dev}${device.name}${nf}`);
+            device.getClusterServer(BridgedDeviceBasicInformationCluster)?.setReachableAttribute(reachable);
+            device.getClusterServer(BridgedDeviceBasicInformationCluster)?.triggerReachableChangedEvent({ reachableNewValue: reachable });
+        });
+    }
+    /**
+     * Sets the reachability of a device and trigger.
+     *
+     * @param {MatterbridgeDevice} device - The device to set the reachability for.
+     * @param {boolean} reachable - The new reachability status of the device.
+     */
+    setDeviceReachability(device, reachable) {
+        const basicInformationCluster = device.getClusterServer(BasicInformationCluster);
+        if (basicInformationCluster && basicInformationCluster.attributes.reachable !== undefined)
+            basicInformationCluster.setReachableAttribute(reachable);
+        if (basicInformationCluster && basicInformationCluster.triggerReachableChangedEvent)
+            basicInformationCluster.triggerReachableChangedEvent({ reachableNewValue: reachable });
+    }
     /**
      * Creates a matter commissioning server.
      *
@@ -1816,7 +1863,14 @@ export class Matterbridge extends EventEmitter {
                 info.forEach((session) => {
                     this.log.debug(`***Active session changed on fabric ${fabricIndex} ${session.fabric?.rootVendorId}/${session.fabric?.label} for ${plg}${pluginName}${nf}`, debugStringify(session));
                     if (session.isPeerActive === true && session.secure === true && session.numberOfActiveSubscriptions >= 1) {
-                        this.log.info(`***Controller ${session.fabric?.rootVendorId}/${session.fabric?.label} connected to ${plg}${pluginName}${nf}`);
+                        let controllerName = '';
+                        if (session.fabric?.rootVendorId === 4937)
+                            controllerName = 'AppleHome';
+                        if (session.fabric?.rootVendorId === 4362)
+                            controllerName = 'SmartThings';
+                        if (session.fabric?.rootVendorId === 4939)
+                            controllerName = 'HomeAssistant';
+                        this.log.info(`***Controller ${session.fabric?.rootVendorId}${controllerName !== '' ? '(' + controllerName + ')' : ''}/${session.fabric?.label} connected to ${plg}${pluginName}${nf}`);
                         connected = true;
                     }
                 });
@@ -2249,18 +2303,25 @@ export class Matterbridge extends EventEmitter {
                 childProcess.stdout.on('data', (data) => {
                     const message = data.toString().trim();
                     //this.log.info('\n' + message);
-                    this.wssSendMessage('spawn', 'stdout', message);
+                    this.wssSendMessage('Matterbridge:spawn', 'spawn', message);
                 });
             }
             if (childProcess.stderr) {
                 childProcess.stderr.on('data', (data) => {
                     const message = data.toString().trim();
                     //this.log.debug('\n' + message);
-                    this.wssSendMessage('spawn', 'stderr', message);
+                    this.wssSendMessage('Matterbridge:spawn', 'spawn', message);
                 });
             }
         });
     }
+    /**
+     * Sends a WebSocket message to all connected clients.
+     *
+     * @param {string} type - The type of the message: Matterbridge, Plugin, Device, ...
+     * @param {string} subType - The subtype of the message: debug info warn error ....
+     * @param {string} message - The content of the message.
+     */
     wssSendMessage(type, subType, message) {
         // Remove ANSI escape codes from the message
         // eslint-disable-next-line no-control-regex
@@ -2280,17 +2341,44 @@ export class Matterbridge extends EventEmitter {
      */
     async initializeFrontend(port = 8283) {
         this.log.debug(`Initializing the frontend on port ${YELLOW}${port}${db} static ${UNDERLINE}${path.join(this.rootDirectory, 'frontend/build')}${UNDERLINEOFF}${rs}`);
-        // Create a WebSocket server
-        this.webSocketServer = new WebSocketServer({ port: 8284 });
+        const wssPort = 8284;
+        const useHttps = false;
+        //const wssHost = (useHttps ? 'wss://' : 'ws://') + `${os.hostname().toLowerCase()}:${wssPort}`;
+        const wssHost = (useHttps ? 'wss://' : 'ws://') + `${this.systemInformation.ipv4Address}:${wssPort}`;
+        if (!useHttps) {
+            // Create a WebSocket server no certificate required
+            this.webSocketServer = new WebSocketServer({ port: wssPort });
+            this.log.info(`WebSocket server listening on ${UNDERLINE}${wssHost}${UNDERLINEOFF}${rs}`);
+        }
+        else {
+            // Define the options for HTTPS server
+            // openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout mykey.key -out mycert.pem -config openssl.cnf
+            // For wss connect the browser to https://laptop5_luca:8284/ https://192.168.1.189/log and accept the certificate
+            const serverOptions = {
+                cert: await fs.readFile(path.join(this.rootDirectory, 'frontend/certificates/mycert.pem')), // Ensure the path is correct
+                key: await fs.readFile(path.join(this.rootDirectory, 'frontend/certificates/mykey.key')), // Ensure the path is correct
+                // cert: await fs.readFile(path.join(this.rootDirectory, 'frontend/certificates/laptop5_luca.pem')), // Ensure the path is correct
+                // key: await fs.readFile(path.join(this.rootDirectory, 'frontend/certificates/laptop5_luca.key')), // Ensure the path is correct
+            };
+            // Create an HTTPS server
+            const httpsServer = https.createServer(serverOptions);
+            // Attach WebSocket server to HTTPS server
+            this.webSocketServer = new WebSocketServer({ server: httpsServer });
+            // Listen on a specific port
+            httpsServer.listen(wssPort, () => {
+                this.log.info(`WebSocket server listening on ${UNDERLINE}${wssHost}${UNDERLINEOFF}${rs}`);
+            });
+        }
         this.webSocketServer.on('connection', (ws) => {
-            this.log.debug('WebSocketServer client connected');
+            this.log.info('WebSocketServer client connected');
             this.log.setGlobalCallback(this.wssSendMessage.bind(this));
             this.log.debug('WebSocketServer activated logger callback');
+            this.wssSendMessage('Matterbridge', 'info', 'WebSocketServer client connected to Matterbridge');
             ws.on('message', (message) => {
-                this.log.debug(`WebSocketServer received message => ${message}`);
+                this.log.info(`WebSocketServer received message => ${message}`);
             });
             ws.on('close', () => {
-                this.log.debug('WebSocketServer client disconnected');
+                this.log.info('WebSocketServer client disconnected');
                 if (this.webSocketServer?.clients.size === 0) {
                     this.log.setGlobalCallback(undefined);
                     this.log.debug('WebSocketServer deactivated logger callback');
@@ -2303,7 +2391,7 @@ export class Matterbridge extends EventEmitter {
         // Serve React build directory
         this.expressApp = express();
         this.expressApp.use(express.static(path.join(this.rootDirectory, 'frontend/build')));
-        // Endpoint to provide login code
+        // Endpoint to validate login code
         this.expressApp.post('/api/login', express.json(), async (req, res) => {
             const { password } = req.body;
             this.log.debug('The frontend sent /api/login', password);
@@ -2323,63 +2411,30 @@ export class Matterbridge extends EventEmitter {
                 res.json({ valid: false });
             }
         });
-        // Endpoint to provide host
-        this.expressApp.get('/api/wsshost', express.json(), async (req, res) => {
-            this.log.debug('The frontend sent /api/wsshost');
-            res.json({ host: os.hostname() });
-        });
-        // Endpoint to provide port
-        this.expressApp.get('/api/wssport', express.json(), async (req, res) => {
-            this.log.debug('The frontend sent /api/wssport');
-            res.json({ port: 8284 });
-        });
-        // Endpoint to provide manual pairing code
-        this.expressApp.get('/api/pairing-code', (req, res) => {
-            this.log.debug('The frontend sent /api/pairing-code');
+        // Endpoint to provide settings
+        this.expressApp.get('/api/settings', express.json(), async (req, res) => {
             if (!this.matterbridgeContext) {
-                this.log.error('/api/pairing-code matterbridgeContext not found');
-                res.json([]);
-                return;
-            }
-            try {
-                const qrData = { qrPairingCode: this.matterbridgeContext.get('qrPairingCode'), manualPairingCode: this.matterbridgeContext.get('manualPairingCode') };
-                res.json(qrData);
-            }
-            catch (error) {
-                if (this.bridgeMode === 'bridge')
-                    this.log.error('qrPairingCode for /api/qr-code not found');
+                this.log.error('/api/settings matterbridgeContext not found');
                 res.json({});
-            }
-        });
-        // Endpoint to provide QR pairing code
-        this.expressApp.get('/api/qr-code', (req, res) => {
-            this.log.debug('The frontend sent /api/qr-code');
-            if (!this.matterbridgeContext) {
-                this.log.error('/api/qr-code matterbridgeContext not found');
-                res.json([]);
                 return;
             }
+            let qrPairingCode = '';
+            let manualPairingCode = '';
             try {
-                const qrData = { qrPairingCode: this.matterbridgeContext.get('qrPairingCode'), manualPairingCode: this.matterbridgeContext.get('manualPairingCode') };
-                res.json(qrData);
+                qrPairingCode = await this.matterbridgeContext.get('qrPairingCode');
+                manualPairingCode = await this.matterbridgeContext.get('manualPairingCode');
             }
             catch (error) {
                 if (this.bridgeMode === 'bridge')
-                    this.log.error('qrPairingCode for /api/qr-code not found');
+                    this.log.error('pairingCode for /api/settings not found');
                 res.json({});
             }
-        });
-        // Endpoint to provide system information
-        this.expressApp.get('/api/system-info', (req, res) => {
-            this.log.debug('The frontend sent /api/system-info');
-            res.json(this.systemInformation);
-        });
-        // Endpoint to provide matterbridge information
-        this.expressApp.get('/api/matterbridge-info', (req, res) => {
-            this.log.debug('The frontend sent /api/matterbridge-info');
             this.matterbridgeInformation.bridgeMode = this.bridgeMode;
             this.matterbridgeInformation.debugEnabled = this.debugEnabled;
-            res.json(this.matterbridgeInformation);
+            const response = { wssHost, qrPairingCode, manualPairingCode, systemInformation: this.systemInformation, matterbridgeInformation: this.matterbridgeInformation };
+            this.log.debug('The frontend sent /api/settings');
+            this.log.debug('Response:', debugStringify(response));
+            res.json(response);
         });
         // Endpoint to provide plugins
         this.expressApp.get('/api/plugins', (req, res) => {
@@ -2469,7 +2524,7 @@ export class Matterbridge extends EventEmitter {
             // Handle the command setpassword from Settings
             if (command === 'setpassword') {
                 const password = param.slice(1, -1); // Remove the first and last characters
-                this.log.info('setpassword', param, password);
+                this.log.debug('setpassword', param, password);
                 await this.nodeContext?.set('password', password);
             }
             // Handle the command debugLevel from Settings
@@ -2504,15 +2559,12 @@ export class Matterbridge extends EventEmitter {
             // Handle the command update from Header
             if (command === 'update') {
                 this.log.info('Updating matterbridge...');
-                //this.wssSendMessage('cmd', 'update', 'Updating matterbridge');
                 try {
                     await this.spawnCommand('npm', ['install', '-g', 'matterbridge', '--loglevel=verbose']);
                     this.log.info('Matterbridge has been updated. Full restart required.');
-                    //this.wssSendMessage('cmd', 'update', 'Matterbridge has been updated. Full restart required.');
                 }
                 catch (error) {
                     this.log.error('Error updating matterbridge');
-                    //this.wssSendMessage('cmd', 'update', 'Error updating matterbridge');
                     res.json({ message: 'Command received' });
                     return;
                 }
@@ -2522,15 +2574,12 @@ export class Matterbridge extends EventEmitter {
             if (command === 'installplugin') {
                 param = param.replace(/\*/g, '\\');
                 this.log.info(`Installing plugin ${plg}${param}${db}...`);
-                //this.wssSendMessage('cmd', 'installplugin', `Installing plugin ${param}`);
                 try {
                     await this.spawnCommand('npm', ['install', '-g', param, '--loglevel=verbose']);
                     this.log.info(`Plugin ${plg}${param}${nf} installed. Full restart required.`);
-                    //this.wssSendMessage('cmd', 'installplugin', `Plugin ${param} installed. Full restart required.`);
                 }
                 catch (error) {
                     this.log.error(`Error installing plugin ${plg}${param}${er}`);
-                    //this.wssSendMessage('cmd', 'installplugin', `Error installing plugin${param}`);
                     res.json({ message: 'Command received' });
                     return;
                 }
@@ -2653,9 +2702,26 @@ export class Matterbridge extends EventEmitter {
             this.log.debug('The frontend sent *', req.url);
             res.sendFile(path.join(this.rootDirectory, 'frontend/build/index.html'));
         });
-        this.expressServer = this.expressApp.listen(port, () => {
-            this.log.info(`The frontend is running on ${UNDERLINE}http://localhost:${port}${UNDERLINEOFF}${rs}`);
-        });
+        if (!useHttps) {
+            // Listen on HTTP
+            this.expressServer = this.expressApp.listen(port, () => {
+                this.log.info(`The frontend is running on ${UNDERLINE}http://localhost:${port}${UNDERLINEOFF}${rs}`);
+            });
+        }
+        else {
+            // SSL certificate and private key paths
+            const options = {
+                cert: await fs.readFile(path.join(this.rootDirectory, 'frontend/certificates/laptop5_luca.pem')), // Ensure the path is correct
+                key: await fs.readFile(path.join(this.rootDirectory, 'frontend/certificates/laptop5_luca.key')), // Ensure the path is correct
+            };
+            // Create HTTPS server
+            const httpsServer = https.createServer(options, this.expressApp);
+            // Specify the port to listen on, for example 443 for default HTTPS
+            const PORT = 443;
+            httpsServer.listen(PORT, () => {
+                this.log.info(`The frontend is running on ${UNDERLINE}https://localhost:${PORT}${UNDERLINEOFF}${rs}`);
+            });
+        }
         this.log.debug(`Frontend initialized on port ${YELLOW}${port}${db} static ${UNDERLINE}${path.join(this.rootDirectory, 'frontend/build')}${UNDERLINEOFF}${rs}`);
     }
     /**