matterbridge 3.4.1-dev-20251129-ff1e22f → 3.4.1-dev-20251130-ae6b492

package/CHANGELOG.md

@@ -35,6 +35,7 @@ Advantages:
 - [matterbridge]: Added addVirtualEndpoint() to match Matterbridge thread module.
 - [BroadcastServer]: Backport BroadcastServer v.2.0.0 from Matterbridge thread module.
 - [MatterbridgePrefix]: Added worker thread to get global node_modules.
+- [PluginManager]: Improved the resolve method to resolve automatically also in the plugin directory Usefull for developing with DevContainer.
 
 ### Changed
 

package/dist/deviceManager.js

@@ -41,10 +41,11 @@ export class DeviceManager {
         this.log.debug('Matterbridge device manager started');
     }
     destroy() {
+        this.server.off('broadcast_message', this.msgHandler.bind(this));
         this.server.close();
     }
     async msgHandler(msg) {
-        if (this.server.isWorkerRequest(msg) && (msg.dst === 'all' || msg.dst === 'devices')) {
+        if (this.server.isWorkerRequest(msg)) {
             if (this.verbose)
                 this.log.debug(`Received request message ${CYAN}${msg.type}${db} from ${CYAN}${msg.src}${db}: ${debugStringify(msg)}${db}`);
             switch (msg.type) {

package/dist/frontend.js

@@ -43,10 +43,11 @@ export class Frontend extends EventEmitter {
         this.server.on('broadcast_message', this.msgHandler.bind(this));
     }
     destroy() {
+        this.server.off('broadcast_message', this.msgHandler.bind(this));
         this.server.close();
     }
     async msgHandler(msg) {
-        if (this.server.isWorkerRequest(msg) && (msg.dst === 'all' || msg.dst === 'frontend')) {
+        if (this.server.isWorkerRequest(msg)) {
             if (this.verbose)
                 this.log.debug(`Received broadcast request ${CYAN}${msg.type}${db} from ${CYAN}${msg.src}${db}: ${debugStringify(msg)}${db}`);
             switch (msg.type) {
@@ -102,7 +103,7 @@ export class Frontend extends EventEmitter {
                         this.log.debug(`Unknown broadcast request ${CYAN}${msg.type}${db} from ${CYAN}${msg.src}${db}`);
             }
         }
-        if (this.server.isWorkerResponse(msg) && msg.result && (msg.dst === 'all' || msg.dst === 'frontend')) {
+        if (this.server.isWorkerResponse(msg) && msg.result) {
             if (this.verbose)
                 this.log.debug(`Received broadcast response ${CYAN}${msg.type}${db} from ${CYAN}${msg.src}${db}: ${debugStringify(msg)}${db}`);
             switch (msg.type) {

package/dist/matterbridge.js

@@ -827,7 +827,7 @@ export class Matterbridge extends EventEmitter {
         else {
             this.log.debug(`Global node_modules Directory: ${this.globalModulesDirectory}`);
             const { createESMWorker } = await import('./workers.js');
-            createESMWorker('NpmGlobalPrefix', './dist/workerGlobalPrefix.js');
+            createESMWorker('NpmGlobalPrefix', path.join(this.rootDirectory, 'dist/workerGlobalPrefix.js'));
         }
         this.log.debug(`Reading matterbridge package.json...`);
         const packageJson = JSON.parse(await fs.promises.readFile(path.join(this.rootDirectory, 'package.json'), 'utf-8'));

package/dist/pluginManager.js

@@ -21,10 +21,11 @@ export class PluginManager extends EventEmitter {
         this.log.debug('Matterbridge plugin manager started');
     }
     destroy() {
+        this.server.off('broadcast_message', this.msgHandler.bind(this));
         this.server.close();
     }
     async msgHandler(msg) {
-        if (this.server.isWorkerRequest(msg) && (msg.dst === 'all' || msg.dst === 'plugins')) {
+        if (this.server.isWorkerRequest(msg)) {
             if (this.verbose)
                 this.log.debug(`Received request message ${CYAN}${msg.type}${db} from ${CYAN}${msg.src}${db}: ${debugStringify(msg)}${db}`);
             switch (msg.type) {
@@ -364,6 +365,14 @@ export class PluginManager extends EventEmitter {
             packageJsonPath = path.join(this.matterbridge.globalModulesDirectory, nameOrPath);
             this.log.debug(`Trying at ${plg}${packageJsonPath}${db}`);
         }
+        try {
+            await promises.access(packageJsonPath);
+        }
+        catch {
+            this.log.debug(`Package.json not found at ${plg}${packageJsonPath}${db}`);
+            packageJsonPath = path.join(this.matterbridge.matterbridgePluginDirectory, nameOrPath);
+            this.log.debug(`Trying at ${plg}${packageJsonPath}${db}`);
+        }
         try {
             const packageJson = JSON.parse(await promises.readFile(packageJsonPath, 'utf8'));
             if (!packageJson.name) {
@@ -975,7 +984,6 @@ export class PluginManager extends EventEmitter {
     async loadConfig(plugin) {
         const { default: path } = await import('node:path');
         const { promises } = await import('node:fs');
-        const { shelly_config, somfytahoma_config, zigbee2mqtt_config } = await import('./defaultConfigSchema.js');
         const configFile = path.join(this.matterbridge.matterbridgeDirectory, `${plugin.name}.config.json`);
         const defaultConfigFile = plugin.path.replace('package.json', `${plugin.name}.config.json`);
         try {
@@ -1004,14 +1012,7 @@ export class PluginManager extends EventEmitter {
                 }
                 catch (_err) {
                     this.log.debug(`Default config file ${defaultConfigFile} for plugin ${plg}${plugin.name}${db} does not exist, creating new config file...`);
-                    if (plugin.name === 'matterbridge-zigbee2mqtt')
-                        config = zigbee2mqtt_config;
-                    else if (plugin.name === 'matterbridge-somfy-tahoma')
-                        config = somfytahoma_config;
-                    else if (plugin.name === 'matterbridge-shelly')
-                        config = shelly_config;
-                    else
-                        config = { name: plugin.name, type: plugin.type, version: '1.0.0', debug: false, unregisterOnShutdown: false };
+                    config = { name: plugin.name, type: plugin.type, version: '1.0.0', debug: false, unregisterOnShutdown: false };
                 }
                 try {
                     await promises.writeFile(configFile, JSON.stringify(config, null, 2), 'utf8');