matterbridge 1.1.10 → 1.1.11

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.1.11] - 2024-03-15
+
+### Added
+
+- [frontend]: Frontend got updated to 0.8.3.
+
 ## [1.1.10] - 2024-03-15
 
 ### Added

package/dist/matterbridge.d.ts

@@ -41,13 +41,24 @@ interface SystemInformation {
  */
 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;
+    };
     homeDirectory: string;
     rootDirectory: string;
     matterbridgeDirectory: string;
     matterbridgePluginDirectory: string;
+    globalModulesDirectory: string;
     matterbridgeVersion: string;
     matterbridgeLatestVersion: string;
-    globalModulesDir: string;
     bridgeMode: 'bridge' | 'childbridge' | 'controller' | '';
     debugEnabled: boolean;
     private log;

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

@@ -30,7 +30,7 @@ import EventEmitter from 'events';
 import express from 'express';
 import os from 'os';
 import path from 'path';
-import { CommissioningServer, MatterServer } from '@project-chip/matter-node.js';
+import { CommissioningController, CommissioningServer, MatterServer } from '@project-chip/matter-node.js';
 import { BasicInformationCluster, BridgedDeviceBasicInformationCluster, ClusterServer } from '@project-chip/matter-node.js/cluster';
 import { DeviceTypeId, VendorId } from '@project-chip/matter-node.js/datatype';
 import { Aggregator, DeviceTypes } from '@project-chip/matter-node.js/device';
@@ -59,13 +59,24 @@ export class Matterbridge extends EventEmitter {
         freeMemory: '',
         systemUptime: '',
     };
+    matterbridgeInformation = {
+        homeDirectory: '',
+        rootDirectory: '',
+        matterbridgeDirectory: '',
+        matterbridgePluginDirectory: '',
+        globalModulesDirectory: '',
+        matterbridgeVersion: '',
+        matterbridgeLatestVersion: '',
+        bridgeMode: '',
+        debugEnabled: false,
+    };
     homeDirectory = '';
     rootDirectory = '';
     matterbridgeDirectory = '';
     matterbridgePluginDirectory = '';
+    globalModulesDirectory = '';
     matterbridgeVersion = '';
     matterbridgeLatestVersion = '';
-    globalModulesDir = '';
     bridgeMode = '';
     debugEnabled = false;
     log;
@@ -272,6 +283,12 @@ export class Matterbridge extends EventEmitter {
             MatterbridgeDevice.bridgeMode = 'childbridge';
             await this.testStartMatterBridge(); // No await do it asyncronously
         }
+        if (hasParameter('controller')) {
+            this.bridgeMode = 'controller';
+            this.log.info('Creating mattercontrollerContext: mattercontrollerContext');
+            this.mattercontrollerContext = this.storageManager?.createContext('mattercontrollerContext');
+            await this.startMatterBridge();
+        }
         if (hasParameter('bridge')) {
             this.bridgeMode = 'bridge';
             MatterbridgeDevice.bridgeMode = 'bridge';
@@ -326,8 +343,8 @@ export class Matterbridge extends EventEmitter {
         }
         if (!packageJsonExists) {
             this.log.debug(`Package.json not found at ${packageJsonPath}`);
-            this.log.debug(`Trying at ${this.globalModulesDir}`);
-            packageJsonPath = path.join(this.globalModulesDir, pluginPath);
+            this.log.debug(`Trying at ${this.globalModulesDirectory}`);
+            packageJsonPath = path.join(this.globalModulesDirectory, pluginPath);
             //this.log.debug(`Got ${packageJsonPath}`);
         }
         try {
@@ -449,7 +466,7 @@ export class Matterbridge extends EventEmitter {
             this.log.info(message);
             process.removeAllListeners('SIGINT');
             process.removeAllListeners('SIGTERM');
-            // Callint the shutdown functions with a reason
+            // Calling the shutdown functions with a reason
             for (const plugin of this.registeredPlugins) {
                 if (plugin.platform)
                     await plugin.platform.onShutdown('Matterbridge is closing: ' + message);
@@ -487,17 +504,20 @@ export class Matterbridge extends EventEmitter {
                 // Closing storage
                 await this.stopStorage();
                 // Serialize registeredDevices
-                if (this.nodeContext) {
+                if (this.nodeStorage && this.nodeContext) {
                     this.log.info('Saving registered devices...');
                     const serializedRegisteredDevices = [];
                     this.registeredDevices.forEach((registeredDevice) => {
                         serializedRegisteredDevices.push(registeredDevice.device.serialize(registeredDevice.plugin));
                     });
-                    //console.log('serializedRegisteredDevices:', serializedRegisteredDevices);
                     await this.nodeContext.set('devices', serializedRegisteredDevices);
                     this.log.info('Saved registered devices');
                     // Clear nodeContext and nodeStorage (they just need 1000ms to write the data to disk)
+                    this.log.debug('Closing node storage context...');
+                    this.nodeContext.close();
                     this.nodeContext = undefined;
+                    this.log.debug('Closing node storage manager...');
+                    this.nodeStorage.close();
                     this.nodeStorage = undefined;
                 }
                 else {
@@ -505,6 +525,7 @@ export class Matterbridge extends EventEmitter {
                 }
                 this.registeredPlugins = [];
                 this.registeredDevices = [];
+                this.log.info('Waiting for matter to deliver last messages...');
                 const cleanupTimeout2 = setTimeout(async () => {
                     if (restart) {
                         this.log.info('Cleanup completed. Restarting...');
@@ -934,13 +955,33 @@ export class Matterbridge extends EventEmitter {
             await this.cleanup('No matter server initialized');
             return;
         }
+        if (this.bridgeMode === 'controller') {
+            this.log.info('Creating matter commissioning controller');
+            this.commissioningController = new CommissioningController({
+                autoConnect: false,
+            });
+            this.log.info('Adding matter commissioning controller to matter server');
+            await this.matterServer.addCommissioningController(this.commissioningController);
+            this.log.info('Starting matter server');
+            await this.matterServer.start();
+            this.log.info('Matter server started');
+            if (hasParameter('discover')) {
+                const discover = await this.commissioningController.discoverCommissionableDevices({ productId: 0x8000, deviceType: 0xfff1 });
+                console.log(discover);
+            }
+            this.log.info(`Commissioning controller is already commisioned: ${this.commissioningController.isCommissioned()}`);
+            const nodes = this.commissioningController.getCommissionedNodes();
+            nodes.forEach(async (nodeId) => {
+                this.log.warn(`Connecting to commissioned node: ${nodeId}`);
+            });
+        }
         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
             this.log.debug(`Creating commissioning server context for ${plg}Matterbridge${db}`);
             this.matterbridgeContext = this.createCommissioningServerContext('Matterbridge', 'Matterbridge', DeviceTypes.AGGREGATOR.code, 0xfff1, 'Matterbridge', 0x8000, 'Matterbridge aggregator');
             if (!this.matterbridgeContext) {
-                this.log.error(`Error creating storage context${er}`);
+                this.log.error(`Error creating storage context for ${plg}Matterbridge${er}`);
                 return;
             }
             this.log.debug(`Creating commissioning server for ${plg}Matterbridge${db}`);
@@ -951,8 +992,9 @@ 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('Starting matter server');
+            this.log.debug('Starting matter server...');
             await this.startMatterServer();
+            this.log.info('Matter server started');
             this.showCommissioningQRCode(this.commissioningServer, this.matterbridgeContext, 'Matterbridge');
         }
         if (this.bridgeMode === 'childbridge') {
@@ -1018,7 +1060,7 @@ export class Matterbridge extends EventEmitter {
                 });
                 if (!allStarted)
                     return;
-                this.log.info('Starting matter server');
+                this.log.info('Starting matter server...');
                 // Setting reachability to true
                 this.registeredPlugins.forEach((plugin) => {
                     if (!plugin.enabled)
@@ -1035,13 +1077,13 @@ export class Matterbridge extends EventEmitter {
                     });
                 });
                 await this.startMatterServer();
+                this.log.info('Matter server started');
                 for (const plugin of this.registeredPlugins) {
                     this.showCommissioningQRCode(plugin.commissioningServer, plugin.storageContext, plugin.name);
                 }
                 Logger.defaultLogLevel = this.debugEnabled ? Level.DEBUG : Level.INFO;
                 clearInterval(startMatterInterval);
             }, 1000);
-            return;
         }
     }
     async startMatterServer() {
@@ -1107,9 +1149,9 @@ export class Matterbridge extends EventEmitter {
         storageContext.set('serialNumber', storageContext.get('serialNumber', random));
         storageContext.set('uniqueId', storageContext.get('uniqueId', random));
         storageContext.set('softwareVersion', softwareVersion ?? 1);
-        storageContext.set('softwareVersionString', softwareVersionString ?? '1.0.0');
+        storageContext.set('softwareVersionString', softwareVersionString ?? '1.0');
         storageContext.set('hardwareVersion', hardwareVersion ?? 1);
-        storageContext.set('hardwareVersionString', hardwareVersionString ?? '1.0.0');
+        storageContext.set('hardwareVersionString', hardwareVersionString ?? '1.0');
         return storageContext;
     }
     /**
@@ -1444,16 +1486,20 @@ export class Matterbridge extends EventEmitter {
         this.log.debug(`- System Uptime: ${this.systemInformation.systemUptime}`);
         // Home directory
         this.homeDirectory = os.homedir();
+        this.matterbridgeInformation.homeDirectory = this.homeDirectory;
         this.log.debug(`Home Directory: ${this.homeDirectory}`);
         // Package root directory
         const currentFileDirectory = path.dirname(fileURLToPath(import.meta.url));
         this.rootDirectory = path.resolve(currentFileDirectory, '../');
+        this.matterbridgeInformation.rootDirectory = this.rootDirectory;
         this.log.debug(`Root Directory: ${this.rootDirectory}`);
         // Global node_modules directory
-        this.globalModulesDir = await this.getGlobalNodeModules();
-        this.log.debug(`Global node_modules Directory: ${this.globalModulesDir}`);
+        this.globalModulesDirectory = await this.getGlobalNodeModules();
+        this.matterbridgeInformation.globalModulesDirectory = this.globalModulesDirectory;
+        this.log.debug(`Global node_modules Directory: ${this.globalModulesDirectory}`);
         // Create the data directory .matterbridge in the home directory
         this.matterbridgeDirectory = path.join(this.homeDirectory, '.matterbridge');
+        this.matterbridgeInformation.matterbridgeDirectory = this.matterbridgeDirectory;
         try {
             await fs.access(this.matterbridgeDirectory);
         }
@@ -1477,6 +1523,7 @@ export class Matterbridge extends EventEmitter {
         this.log.debug(`Matterbridge Directory: ${this.matterbridgeDirectory}`);
         // Create the data directory .matterbridge in the home directory
         this.matterbridgePluginDirectory = path.join(this.homeDirectory, 'Matterbridge');
+        this.matterbridgeInformation.matterbridgePluginDirectory = this.matterbridgePluginDirectory;
         try {
             await fs.access(this.matterbridgePluginDirectory);
         }
@@ -1501,8 +1548,10 @@ export class Matterbridge extends EventEmitter {
         // Matterbridge version
         const packageJson = JSON.parse(await fs.readFile(path.join(this.rootDirectory, 'package.json'), 'utf-8'));
         this.matterbridgeVersion = packageJson.version;
+        this.matterbridgeInformation.matterbridgeVersion = this.matterbridgeVersion;
         this.log.debug(`Matterbridge Version: ${this.matterbridgeVersion}`);
         this.matterbridgeLatestVersion = await this.getLatestVersion('matterbridge');
+        this.matterbridgeInformation.matterbridgeLatestVersion = this.matterbridgeLatestVersion;
         this.log.debug(`Matterbridge Latest Version: ${this.matterbridgeLatestVersion}`);
         if (this.matterbridgeVersion !== this.matterbridgeLatestVersion) {
             this.log.warn(`Matterbridge is out of date. Current version: ${this.matterbridgeVersion}, Latest version: ${this.matterbridgeLatestVersion}`);
@@ -1583,6 +1632,13 @@ export class Matterbridge extends EventEmitter {
             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);
+        });
         // Endpoint to provide plugins
         this.expressApp.get('/api/plugins', (req, res) => {
             this.log.debug('The frontend sent /api/plugins');
@@ -1703,27 +1759,33 @@ export class Matterbridge extends EventEmitter {
             }
             // Handle the command enableplugin from Home
             if (command === 'enableplugin') {
-                const plugin = this.findPlugin(param);
+                const plugins = await this.nodeContext?.get('plugins');
+                if (!plugins)
+                    return;
+                const plugin = plugins.find((plugin) => plugin.name === param);
                 if (plugin) {
                     plugin.enabled = true;
                     plugin.loaded = undefined;
                     plugin.started = undefined;
                     plugin.configured = undefined;
                     plugin.connected = undefined;
-                    await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
+                    await this.nodeContext?.set('plugins', plugins);
                     this.log.info(`Enabled plugin ${plg}${param}${nf}`);
                 }
             }
             // Handle the command disableplugin from Home
             if (command === 'disableplugin') {
-                const plugin = this.findPlugin(param);
+                const plugins = await this.nodeContext?.get('plugins');
+                if (!plugins)
+                    return;
+                const plugin = plugins.find((plugin) => plugin.name === param);
                 if (plugin) {
                     plugin.enabled = false;
                     plugin.loaded = undefined;
                     plugin.started = undefined;
                     plugin.configured = undefined;
                     plugin.connected = undefined;
-                    await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
+                    await this.nodeContext?.set('plugins', plugins);
                     this.log.info(`Disabled plugin ${plg}${param}${nf}`);
                 }
             }