matterbridge 1.1.7 → 1.1.8

package/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.1.8] - 2024-03-15
+
+### Added
+
+- [cli]: Resolve the plugin name from absolute or relative path or from globally installed modules (see the help).
+- [frontend]: Added some fancy stuff still not visible.
+
+### Fixed
+
+- [install]: Fixed the error caused when the controllers disconnect and connect again.
+
+## [1.1.7] - 2024-03-14
+
+### Fixed
+
+- [install]: Fixed the install error (thanks https://github.com/khaidakin).
+
 ## [1.1.6] - 2024-03-14
 
 ### Added

package/README.md

@@ -114,7 +114,7 @@ Matterbridge can run as many plugins as you want.
 
 ### Example plugins to show the usage of history in matter
 
-[Contact plugin with history](https://github.com/Luligu/matterbridge-eve-door)
+[Door plugin with history](https://github.com/Luligu/matterbridge-eve-door)
 
 [Motion plugin with history](https://github.com/Luligu/matterbridge-eve-motion)
 

package/dist/matterbridge.d.ts

@@ -43,6 +43,7 @@ export declare class Matterbridge {
     rootDirectory: string;
     matterbridgeDirectory: string;
     matterbridgeVersion: string;
+    globalModulesDir: string;
     bridgeMode: 'bridge' | 'childbridge' | 'controller' | '';
     debugEnabled: boolean;
     private log;
@@ -84,6 +85,7 @@ export declare class Matterbridge {
      * @returns {Promise<void>} A promise that resolves when the command line arguments have been processed.
      */
     private parseCommandLine;
+    private resolvePluginName;
     /**
      * Loads a plugin from the specified package.json file path.
      * @param packageJsonPath - The path to the package.json file of the plugin.

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

@@ -25,6 +25,7 @@ import { NodeStorageManager } from 'node-persist-manager';
 import { AnsiLogger, BRIGHT, RESET, UNDERLINE, UNDERLINEOFF, YELLOW, db, debugStringify, stringify, er, nf, rs, wr } from 'node-ansi-logger';
 import { fileURLToPath, pathToFileURL } from 'url';
 import { promises as fs } from 'fs';
+import { execSync } from 'child_process';
 import express from 'express';
 import os from 'os';
 import path from 'path';
@@ -61,6 +62,7 @@ export class Matterbridge {
     rootDirectory = '';
     matterbridgeDirectory = '';
     matterbridgeVersion = '';
+    globalModulesDir = '';
     bridgeMode = '';
     debugEnabled = false;
     log;
@@ -124,10 +126,14 @@ export class Matterbridge {
       - frontend [port]:       start the frontend on the given port (default 3000)
       - debug:                 enable debug mode (default false)
       - list:                  list the registered plugins
-      - add [plugin path]:     register the plugin
-      - remove [plugin path]:  remove the plugin
-      - enable [plugin path]:  enable the plugin
-      - disable [plugin path]: disable the plugin\n`);
+      - add [plugin path]:     register the plugin from the given absolute or relative path
+      - add [plugin name]:     register the globally installed plugin with the given name
+      - remove [plugin path]:  remove the plugin from the given absolute or relative path
+      - remove [plugin name]:  remove the globally installed plugin with the given name
+      - enable [plugin path]:  enable the plugin from the given absolute or relative path
+      - enable [plugin name]:  enable the globally installed plugin with the given name
+      - disable [plugin path]: disable the plugin from the given absolute or relative path
+      - disable [plugin name]: disable the globally installed plugin with the given name\n`);
             process.exit(0);
         }
         // set Matterbridge logger
@@ -215,7 +221,7 @@ export class Matterbridge {
         if (hasParameter('test')) {
             this.bridgeMode = 'childbridge';
             MatterbridgeDevice.bridgeMode = 'childbridge';
-            this.testStartMatterBridge(); // No await do it asyncronously
+            await this.testStartMatterBridge(); // No await do it asyncronously
         }
         if (hasParameter('bridge')) {
             this.bridgeMode = 'bridge';
@@ -227,6 +233,8 @@ export class Matterbridge {
                 plugin.started = false;
                 plugin.configured = false;
                 plugin.connected = undefined;
+                plugin.qrPairingCode = undefined;
+                plugin.manualPairingCode = undefined;
                 this.loadPlugin(plugin); // No await do it asyncronously
             }
             await this.startMatterBridge();
@@ -241,11 +249,49 @@ export class Matterbridge {
                 plugin.started = false;
                 plugin.configured = false;
                 plugin.connected = false;
+                plugin.qrPairingCode = (await plugin.nodeContext?.get('qrPairingCode', undefined)) ?? undefined;
+                plugin.manualPairingCode = (await plugin.nodeContext?.get('manualPairingCode', undefined)) ?? undefined;
                 this.loadPlugin(plugin, true, 'Matterbridge is starting'); // No await do it asyncronously
             }
             await this.startMatterBridge();
         }
     }
+    async resolvePluginName(pluginPath) {
+        if (!pluginPath.endsWith('package.json'))
+            pluginPath = path.join(pluginPath, 'package.json');
+        // Resolve the package.json of the plugin
+        let packageJsonPath = path.resolve(pluginPath);
+        this.log.debug(`Loading plugin from ${plg}${packageJsonPath}${db}`);
+        // Check if the package.json file exists
+        let packageJsonExists = false;
+        try {
+            await fs.access(packageJsonPath);
+            packageJsonExists = true;
+        }
+        catch {
+            packageJsonExists = false;
+        }
+        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(`Got ${packageJsonPath}`);
+        }
+        try {
+            // Load the package.json of the plugin
+            const packageJson = JSON.parse(await fs.readFile(packageJsonPath, 'utf8'));
+            if (!packageJson.name) {
+                this.log.debug(`Package.json name not found at ${packageJsonPath}`);
+                return null;
+            }
+            this.log.debug(`Package.json name: ${plg}${packageJson.name}${db} description: "${nf}${packageJson.description}${db}" found at "${nf}${packageJsonPath}${db}"`);
+            return packageJsonPath;
+        }
+        catch (err) {
+            this.log.debug(`Failed to load plugin from ${plg}${packageJsonPath}${er}: ${err}`);
+            return null;
+        }
+    }
     /**
      * Loads a plugin from the specified package.json file path.
      * @param packageJsonPath - The path to the package.json file of the plugin.
@@ -253,10 +299,7 @@ export class Matterbridge {
      * @returns A Promise that resolves when the plugin is loaded successfully, or rejects with an error if loading fails.
      */
     async executeCommandLine(packageJsonPath, mode) {
-        if (!packageJsonPath.endsWith('package.json'))
-            packageJsonPath = path.join(packageJsonPath, 'package.json');
-        // Resolve the package.json of the plugin
-        packageJsonPath = path.resolve(packageJsonPath);
+        packageJsonPath = (await this.resolvePluginName(packageJsonPath)) ?? packageJsonPath;
         this.log.debug(`Loading plugin from ${plg}${packageJsonPath}${db}`);
         try {
             // Load the package.json of the plugin
@@ -405,14 +448,14 @@ export class Matterbridge {
      * @returns A Promise that resolves when the device is added successfully.
      */
     async addDevice(pluginName, device) {
-        this.log.info(`Adding device ${dev}${device.name}${nf} for plugin ${plg}${pluginName}${nf}`);
+        this.log.debug(`Adding device ${dev}${device.name}${db} for plugin ${plg}${pluginName}${db}`);
         // Check if the plugin is registered
         const plugin = this.registeredPlugins.find((plugin) => plugin.name === pluginName);
         if (!plugin) {
             this.log.error(`addDevice error: device ${dev}${device.name}${nf} plugin ${plg}${pluginName}${er} not found`);
             return;
         }
-        // Add and register the device to the matterbridge in bridge mode
+        // Register and add the device to matterbridge aggregator in bridge mode
         if (this.bridgeMode === 'bridge') {
             this.matterAggregator.addBridgedDevice(device);
             this.registeredDevices.push({ plugin: pluginName, device, added: true });
@@ -437,14 +480,14 @@ export class Matterbridge {
      * @returns {Promise<void>} - A promise that resolves when the storage process is started.
      */
     async addBridgedDevice(pluginName, device) {
-        this.log.info(`Adding bridged device ${dev}${device.name}${nf} for plugin ${plg}${pluginName}${nf}`);
+        this.log.debug(`Adding bridged device ${db}${device.name}${nf} for plugin ${plg}${pluginName}${db}`);
         // Check if the plugin is registered
         const plugin = this.registeredPlugins.find((plugin) => plugin.name === pluginName);
         if (!plugin) {
             this.log.error(`addBridgedDevice error: device ${dev}${device.name}${nf} plugin ${plg}${pluginName}${er} not found`);
             return;
         }
-        // Add and register the device to the matterbridge in bridge mode
+        // Register and add the device to matterbridge aggregator in bridge mode
         if (this.bridgeMode === 'bridge') {
             this.matterAggregator.addBridgedDevice(device);
             this.registeredDevices.push({ plugin: pluginName, device, added: true });
@@ -529,37 +572,50 @@ export class Matterbridge {
         this.log.debug('Storage closed');
     }
     async testStartMatterBridge() {
+        /*
+        this.log.error('****Start forEach registeredPlugin');
+        this.registeredPlugins
+          .filter((plugin) => plugin.enabled === true)
+          .forEach(async (plugin) => {
+            plugin.loaded = false;
+            plugin.started = false;
+            plugin.configured = false;
+            plugin.connected = undefined;
+            this.log.error(`****Starting registeredPlugin ${plugin.name}`);
+            this.loadPlugin(plugin, true, 'Matterbridge is starting');
+          });
+        this.log.error('****Stop forEach registeredPlugin');
+        */
+        /*
         for (const plugin of this.registeredPlugins) {
-            if (!plugin.enabled)
-                continue;
-            // No await do it asyncronously
-            this.loadPlugin(plugin)
-                .then(() => {
-                // No await do it asyncronously
-                this.startPlugin(plugin)
-                    .then(() => { })
-                    .catch((err) => {
-                    this.log.error(`Failed to start plugin ${plg}${plugin.name}${er}: ${err}`);
+          if (!plugin.enabled) continue;
+          // No await do it asyncronously
+          this.loadPlugin(plugin)
+            .then(() => {
+              // No await do it asyncronously
+              this.startPlugin(plugin)
+                .then(() => {})
+                .catch((err) => {
+                  this.log.error(`Failed to start plugin ${plg}${plugin.name}${er}: ${err}`);
                 });
             })
-                .catch((err) => {
-                this.log.error(`Failed to load plugin ${plg}${plugin.name}${er}: ${err}`);
+            .catch((err) => {
+              this.log.error(`Failed to load plugin ${plg}${plugin.name}${er}: ${err}`);
             });
         }
         for (const plugin of this.registeredPlugins) {
-            if (!plugin.enabled)
-                continue;
-            // Start the interval to check if the plugin is loaded and started
-            let times = 0;
-            const interval = setInterval(() => {
-                times++;
-                this.log.info(`Waiting ${times} secs for plugin ${plg}${plugin.name}${db} to load (${plugin.loaded}) and start (${plugin.started}) and send devices ...`);
-                if (!plugin.loaded || !plugin.started)
-                    return;
-                this.log.info(`Plugin ${plg}${plugin.name}${db} sent ${plugin.registeredDevices} devices`);
-                clearInterval(interval);
-            }, 1000);
+          if (!plugin.enabled) continue;
+          // Start the interval to check if the plugin is loaded and started
+          let times = 0;
+          const interval = setInterval(() => {
+            times++;
+            this.log.info(`Waiting ${times} secs for plugin ${plg}${plugin.name}${db} to load (${plugin.loaded}) and start (${plugin.started}) and send devices ...`);
+            if (!plugin.loaded || !plugin.started) return;
+            this.log.info(`Plugin ${plg}${plugin.name}${db} sent ${plugin.registeredDevices} devices`);
+            clearInterval(interval);
+          }, 1000);
         }
+        */
     }
     async startPlugin(plugin, message, configure = false) {
         if (!plugin.loaded || !plugin.platform) {
@@ -707,10 +763,10 @@ export class Matterbridge {
                     return;
                 // Start the interval to check if the plugins is started
                 // TODO set a counter or a timeout
-                this.log.info(`**Starting startMatterBridge interval for plugin ${plg}${plugin.name}${db} loaded: ${plugin.loaded} started: ${plugin.started}...`);
+                this.log.debug(`*Starting startMatterBridge interval for plugin ${plg}${plugin.name}${db} loaded: ${plugin.loaded} started: ${plugin.started}...`);
                 const startInterval = setInterval(async () => {
                     if (!plugin.loaded || !plugin.started) {
-                        this.log.info(`***Returning in startMatterBridge interval for plugin ${plg}${plugin.name}${db} loaded: ${plugin.loaded} started: ${plugin.started}...`);
+                        this.log.info(`**Waiting in startMatterBridge interval for plugin ${plg}${plugin.name}${db} loaded: ${plugin.loaded} started: ${plugin.started}...`);
                         return;
                     }
                     if (plugin.type === 'AccessoryPlatform') {
@@ -744,19 +800,20 @@ export class Matterbridge {
             });
             // Start the interval to check if all plugins are loaded and started and so start the matter server
             // TODO set a counter or a timeout
-            this.log.info('**Starting start matter interval...');
+            this.log.debug('*Starting start matter interval...');
             const startMatterInterval = setInterval(async () => {
                 let allStarted = true;
                 this.registeredPlugins.forEach((plugin) => {
                     if (!plugin.enabled)
                         return;
-                    this.log.info(`**Waiting in start matter server interval for plugin ${plg}${plugin.name}${db} to load (${plugin.loaded}) and start (${plugin.started}) ...`);
                     if (plugin.enabled && (!plugin.loaded || !plugin.started))
                         allStarted = false;
+                    if (!allStarted)
+                        this.log.info(`**Waiting in start matter server interval for plugin ${plg}${plugin.name}${db} to load (${plugin.loaded}) and start (${plugin.started}) ...`);
                 });
                 if (!allStarted)
                     return;
-                this.log.info('**Starting matter server in start matter server interval...');
+                this.log.info('Starting matter server');
                 // Setting reachability to true
                 this.registeredPlugins.forEach((plugin) => {
                     if (!plugin.enabled)
@@ -862,9 +919,15 @@ export class Matterbridge {
             storageContext.set('manualPairingCode', manualPairingCode);
             const QrCode = new QrCodeSchema();
             this.log.info(`Pairing code:\n\n${QrCode.encode(qrPairingCode)}\nManual pairing code: ${manualPairingCode}\n`);
+            if (this.bridgeMode === 'bridge') {
+                await this.nodeContext?.set('qrPairingCode', qrPairingCode);
+                await this.nodeContext?.set('manualPairingCode', manualPairingCode);
+            }
             if (this.bridgeMode === 'childbridge') {
                 const plugin = this.findPlugin(pluginName);
                 if (plugin) {
+                    await plugin.nodeContext?.set('qrPairingCode', qrPairingCode);
+                    await plugin.nodeContext?.set('manualPairingCode', manualPairingCode);
                     await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
                     plugin.paired = false;
                 }
@@ -872,9 +935,19 @@ export class Matterbridge {
         }
         else {
             this.log.info(`***The commissioning server for ${plg}${pluginName}${nf} is already commissioned. Waiting for controllers to connect ...`);
+            if (this.bridgeMode === 'bridge') {
+                const qrPairingCode = storageContext.get('qrPairingCode', '');
+                const manualPairingCode = storageContext.get('manualPairingCode', '');
+                await this.nodeContext?.set('qrPairingCode', qrPairingCode);
+                await this.nodeContext?.set('manualPairingCode', manualPairingCode);
+            }
             if (this.bridgeMode === 'childbridge') {
                 const plugin = this.findPlugin(pluginName);
-                if (plugin) {
+                if (plugin && plugin.storageContext && plugin.nodeContext) {
+                    plugin.qrPairingCode = plugin.storageContext.get('qrPairingCode', '');
+                    plugin.manualPairingCode = plugin.storageContext.get('manualPairingCode', '');
+                    await plugin.nodeContext.set('qrPairingCode', plugin.qrPairingCode);
+                    await plugin.nodeContext.set('manualPairingCode', plugin.manualPairingCode);
                     await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
                     plugin.paired = true;
                 }
@@ -960,7 +1033,7 @@ export class Matterbridge {
                             for (const plugin of this.registeredPlugins) {
                                 if (!plugin.enabled)
                                     continue;
-                                this.startPlugin(plugin, 'Matterbridge is commissioned and controllers are connected', true); // No await do it asyncronously
+                                this.startPlugin(plugin, 'Matterbridge is commissioned and controllers are connected', true); // No await do it asyncronously with also configurePlugin
                                 //this.configurePlugin(plugin); // No await do it asyncronously
                             }
                             Logger.defaultLogLevel = this.debugEnabled ? Level.DEBUG : Level.INFO;
@@ -968,7 +1041,7 @@ export class Matterbridge {
                         if (this.bridgeMode === 'childbridge') {
                             //Logger.defaultLogLevel = Level.INFO;
                             const plugin = this.findPlugin(name);
-                            if (plugin && plugin.type === 'DynamicPlatform') {
+                            if (plugin && plugin.type === 'DynamicPlatform' && plugin.configured !== true) {
                                 for (const registeredDevice of this.registeredDevices) {
                                     if (registeredDevice.plugin === name) {
                                         this.log.info(`Adding bridged device ${dev}${registeredDevice.device.name}${nf} to aggregator for plugin ${plg}${plugin.name}${db}`);
@@ -985,7 +1058,7 @@ export class Matterbridge {
                                 }
                             }
                             for (const plugin of this.registeredPlugins) {
-                                if (plugin.name === name && plugin.platform) {
+                                if (plugin.name === name && plugin.platform && plugin.configured !== true) {
                                     this.configurePlugin(plugin); // No await do it asyncronously
                                 }
                             }
@@ -1122,6 +1195,9 @@ export class Matterbridge {
         const currentFileDirectory = path.dirname(fileURLToPath(import.meta.url));
         this.rootDirectory = path.resolve(currentFileDirectory, '../');
         this.log.debug(`Root Directory: ${this.rootDirectory}`);
+        // Global node_modules directory
+        this.globalModulesDir = execSync('npm root -g').toString().trim();
+        this.log.debug(`Global node_modules Directory: ${this.globalModulesDir}`);
         // Create the data directory .matterbridge in the home directory
         this.matterbridgeDirectory = path.join(this.homeDirectory, '.matterbridge');
         try {
@@ -1157,6 +1233,8 @@ export class Matterbridge {
             paired: plugin.paired,
             connected: plugin.connected,
             registeredDevices: plugin.registeredDevices,
+            qrPairingCode: plugin.qrPairingCode,
+            manualPairingCode: plugin.manualPairingCode,
         }));
         return baseRegisteredPlugins;
     }
@@ -1336,6 +1414,7 @@ export class Matterbridge {
 /*
 TO IMPLEMENT
 import * as WebSocket from 'ws';
+const globalModulesDir = require('global-modules');
 
 const wss = new WebSocket.Server({ port: 8080 });