matterbridge 1.2.9 → 1.2.10

package/CHANGELOG.md

@@ -2,10 +2,21 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.2.10] - 2024-04-22
+
+### Added
+
+- [extension]: Finalized implementation of zigbee2MQTT internal extension v. 1.0.0.
+
+
 ## [1.2.9] - 2024-04-19
 
 ### Added
 
+- [Matterbridge]: Added call to set reachability at start.
+
+### 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.

package/README.md

@@ -85,7 +85,7 @@ matterbridge -help
 
 ## Frontend
 
-Matterbridge has a frontend available on http://localhost:3000
+Matterbridge has a frontend available on http://localhost:8283
 
 You can change the default port by adding the frontend parameter when you launch it.
 

package/dist/matterbridge.d.ts

@@ -65,6 +65,7 @@ export declare class Matterbridge extends EventEmitter {
     matterbridgeVersion: string;
     matterbridgeLatestVersion: string;
     bridgeMode: 'bridge' | 'childbridge' | 'controller' | '';
+    restartMode: 'service' | 'docker' | '';
     debugEnabled: boolean;
     private port;
     private log;
@@ -98,13 +99,14 @@ export declare class Matterbridge extends EventEmitter {
      *
      * @returns A Promise that resolves when the initialization is complete.
      */
-    initializeAsExtension(dataPath: string, debugEnabled: boolean): Promise<void>;
+    startExtension(dataPath: string, debugEnabled: boolean, extensionVersion: string, port?: number): Promise<boolean>;
     /**
      * Close the Matterbridge instance as extension for zigbee2mqtt.
      *
      * @returns A Promise that resolves when the initialization is complete.
      */
-    closeAsExtension(): Promise<void>;
+    stopExtension(): Promise<void>;
+    isExtensionCommissioned(): boolean;
     /**
      * Initializes the Matterbridge application.
      *

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

@@ -82,6 +82,7 @@ export class Matterbridge extends EventEmitter {
     matterbridgeVersion = '';
     matterbridgeLatestVersion = '';
     bridgeMode = '';
+    restartMode = '';
     debugEnabled = false;
     port = 5540;
     log;
@@ -128,11 +129,11 @@ export class Matterbridge extends EventEmitter {
      *
      * @returns A Promise that resolves when the initialization is complete.
      */
-    async initializeAsExtension(dataPath, debugEnabled) {
+    async startExtension(dataPath, debugEnabled, extensionVersion, port = 5560) {
         // Set the bridge mode
         this.bridgeMode = 'bridge';
         // Set the first port to use
-        this.port = 5560;
+        this.port = port;
         // Set Matterbridge logger
         this.debugEnabled = debugEnabled;
         this.log = new AnsiLogger({ logName: 'Matterbridge', logTimestampFormat: 4 /* TimestampFormat.TIME_MILLIS */, logDebug: this.debugEnabled });
@@ -164,14 +165,16 @@ export class Matterbridge extends EventEmitter {
         Logger.format = Format.ANSI;
         // Start the storage and create matterbridgeContext
         await this.startStorage('json', path.join(this.matterbridgeDirectory, 'matterbridge.json'));
-        this.matterbridgeContext = await this.createCommissioningServerContext('Matterbridge', 'Matterbridge', DeviceTypes.AGGREGATOR.code, 0xfff1, 'Matterbridge', 0x8000, 'Matterbridge aggregator');
-        if (!this.storageManager || !this.matterbridgeContext)
-            return;
+        if (!this.storageManager)
+            return false;
+        this.matterbridgeContext = await this.createCommissioningServerContext('Matterbridge', 'Matterbridge zigbee2MQTT', DeviceTypes.AGGREGATOR.code, 0xfff1, 'Matterbridge', 0x8000, 'zigbee2MQTT Matter extension');
+        if (!this.matterbridgeContext)
+            return false;
         await this.matterbridgeContext.set('softwareVersion', 1);
         await this.matterbridgeContext.set('softwareVersionString', this.matterbridgeVersion);
-        await this.matterbridgeContext.set('hardwareVersion', 0);
-        await this.matterbridgeContext.set('hardwareVersionString', '1.0.0'); // Update with the extension version
-        this.createMatterServer(this.storageManager);
+        await this.matterbridgeContext.set('hardwareVersion', 1);
+        await this.matterbridgeContext.set('hardwareVersionString', extensionVersion); // Update with the extension version
+        this.matterServer = this.createMatterServer(this.storageManager);
         this.log.debug(`Creating commissioning server for ${plg}Matterbridge${db}`);
         this.commissioningServer = await this.createCommisioningServer(this.matterbridgeContext, 'Matterbridge');
         this.log.debug(`Creating matter aggregator for ${plg}Matterbridge${db}`);
@@ -179,9 +182,7 @@ export class Matterbridge extends EventEmitter {
         this.log.debug('Adding matterbridge aggregator to commissioning server');
         this.commissioningServer.addDevice(this.matterAggregator);
         this.log.debug('Adding matterbridge commissioning server to matter server');
-        await this.matterServer?.addCommissioningServer(this.commissioningServer, { uniqueStorageKey: 'Matterbridge' });
-        this.log.debug(`Setting reachability to true for ${plg}Matterbridge${db}`);
-        this.commissioningServer.setReachability(true);
+        await this.matterServer.addCommissioningServer(this.commissioningServer, { uniqueStorageKey: 'Matterbridge' });
         await this.startMatterServer();
         this.log.info('Matter server started');
         await this.showCommissioningQRCode(this.commissioningServer, this.matterbridgeContext, this.nodeContext, 'Matterbridge');
@@ -193,17 +194,26 @@ export class Matterbridge extends EventEmitter {
             if (this.matterAggregator)
                 this.setAggregatorReachability(this.matterAggregator, true);
         }, 60 * 1000);
+        return this.commissioningServer.isCommissioned();
     }
     /**
      * Close the Matterbridge instance as extension for zigbee2mqtt.
      *
      * @returns A Promise that resolves when the initialization is complete.
      */
-    async closeAsExtension() {
+    async stopExtension() {
         // Closing matter
         await this.stopMatter();
+        // Clearing the session manager
+        // this.matterbridgeContext?.createContext('SessionManager').clear();
         // Closing storage
         await this.stopStorage();
+        this.log.info('Matter server stopped');
+    }
+    isExtensionCommissioned() {
+        if (!this.commissioningServer)
+            return false;
+        return this.commissioningServer.isCommissioned();
     }
     /**
      * Initializes the Matterbridge application.
@@ -243,6 +253,11 @@ export class Matterbridge extends EventEmitter {
         }
         // Set the first port to use
         this.port = getIntParameter('port') ?? 5540;
+        // Set the restart mode
+        if (hasParameter('service'))
+            this.restartMode = 'service';
+        if (hasParameter('docker'))
+            this.restartMode = 'docker';
         // Set Matterbridge logger
         if (hasParameter('debug'))
             this.debugEnabled = true;
@@ -277,7 +292,8 @@ export class Matterbridge extends EventEmitter {
         await this.logNodeAndSystemInfo();
         this.log.info(
         // eslint-disable-next-line max-len
-        `Matterbridge version ${this.matterbridgeVersion} mode ${hasParameter('bridge') ? 'bridge' : ''}${hasParameter('childbridge') ? 'childbridge' : ''}${hasParameter('controller') ? 'controller' : ''} running on ${this.systemInformation.osType} ${this.systemInformation.osRelease} ${this.systemInformation.osPlatform} ${this.systemInformation.osArch}`);
+        `Matterbridge version ${this.matterbridgeVersion} mode ${hasParameter('bridge') ? 'bridge' : ''}${hasParameter('childbridge') ? 'childbridge' : ''}${hasParameter('controller') ? 'controller' : ''} ` +
+            `${this.restartMode !== '' ? 'restart mode ' + this.restartMode + ' ' : ''}running on ${this.systemInformation.osType} ${this.systemInformation.osRelease} ${this.systemInformation.osPlatform} ${this.systemInformation.osArch}`);
         // Check node version and throw error
         requireMinNodeVersion(18);
         // Register SIGINT SIGTERM signal handlers
@@ -983,12 +999,7 @@ export class Matterbridge extends EventEmitter {
             return;
         }
         this.log.debug('Starting matterbridge in mode', this.bridgeMode);
-        this.createMatterServer(this.storageManager);
-        if (!this.matterServer) {
-            this.log.error('No matter server initialized');
-            await this.cleanup('No matter server initialized');
-            return;
-        }
+        this.matterServer = this.createMatterServer(this.storageManager);
         this.log.debug('***Starting startMatterbridge interval for Matterbridge');
         let failCount = 0;
         const startInterval = setInterval(async () => {
@@ -1164,7 +1175,7 @@ export class Matterbridge extends EventEmitter {
             return Promise.reject(new Error(`Plugin ${plg}${plugin.name}${er} not loaded or no platform`));
         }
         if (plugin.started) {
-            this.log.warn(`Plugin ${plg}${plugin.name}${wr} already started`);
+            this.log.debug(`Plugin ${plg}${plugin.name}${db} already started`);
             return Promise.resolve();
         }
         this.log.info(`Starting plugin ${plg}${plugin.name}${db} type ${typ}${plugin.type}${db}`);
@@ -1304,12 +1315,7 @@ export class Matterbridge extends EventEmitter {
             return;
         }
         this.log.debug('Starting matterbridge in mode', this.bridgeMode);
-        this.createMatterServer(this.storageManager);
-        if (!this.matterServer) {
-            this.log.error('No matter server initialized');
-            await this.cleanup('No matter server initialized');
-            return;
-        }
+        this.matterServer = this.createMatterServer(this.storageManager);
         this.log.info('Creating matter commissioning controller');
         this.commissioningController = new CommissioningController({
             autoConnect: false,
@@ -1466,12 +1472,7 @@ export class Matterbridge extends EventEmitter {
             return;
         }
         this.log.debug('Starting matterbridge in mode', this.bridgeMode);
-        this.createMatterServer(this.storageManager);
-        if (!this.matterServer) {
-            this.log.error('No matter server initialized');
-            await this.cleanup('No matter server initialized');
-            return;
-        }
+        this.matterServer = this.createMatterServer(this.storageManager);
         if (this.bridgeMode === 'bridge') {
             // Plugins are loaded by loadPlugin on startup and plugin.loaded is set to true
             // Plugins are started and configured by callback when Matterbridge is commissioned
@@ -1515,8 +1516,6 @@ export class Matterbridge extends EventEmitter {
                 this.commissioningServer.addDevice(this.matterAggregator);
                 this.log.debug('Adding matterbridge commissioning server to matter server');
                 await this.matterServer?.addCommissioningServer(this.commissioningServer, { uniqueStorageKey: 'Matterbridge' });
-                this.log.debug(`Setting reachability to true for ${plg}Matterbridge${db}`);
-                this.commissioningServer.setReachability(true);
                 await this.startMatterServer();
                 this.log.info('Matter server started');
                 await this.showCommissioningQRCode(this.commissioningServer, this.matterbridgeContext, this.nodeContext, 'Matterbridge');
@@ -1727,8 +1726,8 @@ export class Matterbridge extends EventEmitter {
         if (!commissioningServer.isCommissioned()) {
             this.log.info(`***The commissioning server on port ${commissioningServer.getPort()} for ${plg}${pluginName}${nf} is not commissioned. Pair it scanning the QR code ...`);
             const { qrPairingCode, manualPairingCode } = commissioningServer.getPairingCode();
-            storageContext.set('qrPairingCode', qrPairingCode);
-            storageContext.set('manualPairingCode', manualPairingCode);
+            await storageContext.set('qrPairingCode', qrPairingCode);
+            await storageContext.set('manualPairingCode', manualPairingCode);
             await nodeContext.set('qrPairingCode', qrPairingCode);
             await nodeContext.set('manualPairingCode', manualPairingCode);
             const QrCode = new QrCodeSchema();
@@ -1861,7 +1860,7 @@ export class Matterbridge extends EventEmitter {
                 const info = commissioningServer.getActiveSessionInformation(fabricIndex);
                 let connected = false;
                 info.forEach((session) => {
-                    this.log.debug(`***Active session changed on fabric ${fabricIndex} ${session.fabric?.rootVendorId}/${session.fabric?.label} for ${plg}${pluginName}${nf}`, debugStringify(session));
+                    this.log.info(`***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) {
                         let controllerName = '';
                         if (session.fabric?.rootVendorId === 4937)
@@ -1870,7 +1869,7 @@ export class Matterbridge extends EventEmitter {
                             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}`);
+                        this.log.info(`***Controller ${session.fabric?.rootVendorId}${controllerName !== '' ? '(' + controllerName + ')' : ''}/${session.fabric?.label} connected to ${plg}${pluginName}${nf} on session ${session.name}`);
                         connected = true;
                     }
                 });
@@ -1928,7 +1927,7 @@ export class Matterbridge extends EventEmitter {
                 const info = commissioningServer.getCommissionedFabricInformation(fabricIndex);
                 this.log.debug(`***Commissioning changed on fabric ${fabricIndex} for ${plg}${pluginName}${nf}`, debugStringify(info));
                 if (info.length === 0) {
-                    this.log.warn(`***Commissioning removed from fabric ${fabricIndex} for ${plg}${pluginName}${nf}. Resetting the commissioning server ...`);
+                    this.log.warn(`***Commissioning removed from fabric ${fabricIndex} for ${plg}${pluginName}${wr}. Resetting the commissioning server ...`);
                     await commissioningServer.factoryReset();
                     if (pluginName === 'Matterbridge') {
                         await this.matterbridgeContext?.clearAll();
@@ -1943,6 +1942,7 @@ export class Matterbridge extends EventEmitter {
                             }
                         }
                     }
+                    this.log.warn(`***Restart to activate the pairing for ${plg}${pluginName}${wr}`);
                 }
             },
         });
@@ -1956,8 +1956,9 @@ export class Matterbridge extends EventEmitter {
      */
     createMatterServer(storageManager) {
         this.log.debug('Creating matter server');
-        this.matterServer = new MatterServer(storageManager, { mdnsAnnounceInterface: undefined });
+        const matterServer = new MatterServer(storageManager, { mdnsAnnounceInterface: undefined });
         this.log.debug('Created matter server');
+        return matterServer;
     }
     /**
      * Creates a Matter Aggregator.
@@ -2495,7 +2496,7 @@ export class Matterbridge extends EventEmitter {
                             }
                             catch (error) {
                                 attributeValue = 'Unavailable';
-                                this.log.debug(`****${error} in clusterServer: ${clusterServer.name}(${clusterServer.id}) attribute: ${key}(${value.id})`);
+                                this.log.debug(`GetLocal value ${error} in clusterServer: ${clusterServer.name}(${clusterServer.id}) attribute: ${key}(${value.id})`);
                                 //console.log(error);
                             }
                             data.push({
@@ -2765,6 +2766,8 @@ export class Matterbridge extends EventEmitter {
                 attributes += `Humidity: ${clusterServer.getMeasuredValueAttribute() / 100}% `;
             if (clusterServer.name === 'PressureMeasurement')
                 attributes += `Pressure: ${clusterServer.getMeasuredValueAttribute()} `;
+            if (clusterServer.name === 'FlowMeasurement')
+                attributes += `Pressure: ${clusterServer.getMeasuredValueAttribute()} `;
         });
         return attributes;
     }
@@ -2781,34 +2784,22 @@ function restartProcess() {
     stdio: 'inherit',
   });
 
+  // Handle errors
+  newProcess.on('error', (err) => {
+    console.error('Failed to start new process:', err);
+  });
+
   // Unreference the new process so that the current process can exit
   newProcess.unref();
 
   // Exit the current process
+  cleanup();
   process.exit();
 }
 
-import * as WebSocket from 'ws';
 
-const wss = new WebSocket.Server({ port: 8080 });
-
-wss.on('connection', ws => {
-  ws.on('message', message => {
-    console.log(`Received message => ${message}`)
-  });
-
-  // Send a message to the frontend
-  ws.send('Hello from backend!');
-});
-
-const ws = new WebSocket('ws://localhost:8080');
-
-ws.onmessage = (event) => {
-  console.log(`Received message => ${event.data}`);
-};
-
-*/
 /*
+How frontend was created
 npx create-react-app matterbridge-frontend
 cd matterbridge-frontend
 npm install react-router-dom