matterbridge 3.4.0-dev-20251121-a354bec → 3.4.0-dev-20251123-62db0d7

package/dist/broadcastServer.js

@@ -88,6 +88,10 @@ export class BroadcastServer extends EventEmitter {
                         this.log.debug(`Fetch response: ${debugStringify(msg)}`);
                     resolve(msg);
                 }
+                else if (this.isWorkerResponse(msg, message.type) && msg.id !== message.id) {
+                    if (this.verbose)
+                        this.log.debug(`Fetch received unrelated response: ${debugStringify(msg)}`);
+                }
             };
             this.on('broadcast_message', responseHandler);
             this.request(message);

package/dist/jestutils/jestHelpers.js

@@ -184,7 +184,7 @@ export async function createMatterbridgeEnvironment(name) {
     matterbridge = await Matterbridge.loadInstance(false);
     expect(matterbridge).toBeDefined();
     expect(matterbridge).toBeInstanceOf(Matterbridge);
-    matterbridge.matterbridgeVersion = '3.3.0';
+    matterbridge.matterbridgeVersion = '3.4.0';
     matterbridge.bridgeMode = 'bridge';
     matterbridge.rootDirectory = path.join('jest', name);
     matterbridge.homeDirectory = path.join('jest', name);
@@ -310,6 +310,13 @@ export function createTestEnvironment(name) {
     new MdnsService(environment);
     return environment;
 }
+export async function destroyTestEnvironment() {
+    const mdns = environment.get(MdnsService);
+    if (mdns && typeof mdns[Symbol.asyncDispose] === 'function')
+        await mdns[Symbol.asyncDispose]();
+    if (mdns && typeof mdns.close === 'function')
+        await mdns.close();
+}
 export async function flushAsync(ticks = 3, microTurns = 10, pause = 250) {
     for (let i = 0; i < ticks; i++)
         await new Promise((resolve) => setImmediate(resolve));

package/dist/matterbridgePlatform.js

@@ -122,25 +122,13 @@ export class MatterbridgePlatform {
         this.log.debug(`The plugin ${CYAN}${config.name}${db} doesn't override onConfigChanged. Received new config.`);
     }
     saveConfig(config) {
-        const plugin = this.matterbridge.plugins.get(this.name);
-        if (!plugin) {
-            throw new Error(`Plugin ${this.name} not found`);
-        }
-        this.matterbridge.plugins.saveConfigFromJson(plugin, config);
+        this.#server.request({ type: 'plugins_saveconfigfromjson', src: 'platform', dst: 'plugins', params: { name: this.name, config } });
     }
-    getSchema() {
-        const plugin = this.matterbridge.plugins.get(this.name);
-        if (!plugin || !isValidObject(plugin.schemaJson)) {
-            throw new Error(`Plugin ${this.name} not found`);
-        }
-        return plugin.schemaJson;
+    async getSchema() {
+        return (await this.#server.fetch({ type: 'plugins_getschema', src: 'platform', dst: 'plugins', params: { name: this.name } })).response.schema;
     }
     setSchema(schema) {
-        const plugin = this.matterbridge.plugins.get(this.name);
-        if (!plugin) {
-            throw new Error(`Plugin ${this.name} not found`);
-        }
-        plugin.schemaJson = schema;
+        this.#server.request({ type: 'plugins_setschema', src: 'platform', dst: 'plugins', params: { name: this.name, schema } });
     }
     wssSendRestartRequired(snackbar = true, fixed = false) {
         this.#server.request({ type: 'frontend_restartrequired', src: 'platform', dst: 'frontend', params: { snackbar, fixed } });
@@ -183,7 +171,7 @@ export class MatterbridgePlatform {
         if (this.matterbridge.bridgeMode === 'bridge') {
             aggregator = this.matterbridge.aggregatorNode;
         }
-        else if (this.matterbridge.bridgeMode === 'childbridge') {
+        else if (this.matterbridge.bridgeMode === 'childbridge' && this.type === 'DynamicPlatform') {
             aggregator = this.matterbridge.plugins.get(this.name)?.aggregatorNode;
         }
         if (aggregator) {
@@ -197,6 +185,7 @@ export class MatterbridgePlatform {
                 return true;
             }
         }
+        this.log.warn(`Virtual device ${name} not created. Virtual devices are only supported in bridge mode and childbridge mode with a DynamicPlatform.`);
         return false;
     }
     async registerDevice(device) {

package/dist/pluginManager.js

@@ -51,6 +51,7 @@ export class PluginManager extends EventEmitter {
                             this.server.respond({ ...msg, response: { plugin: this.toApiPlugin(plugin) } });
                         }
                         else {
+                            this.log.debug(`***Plugin ${plg}${msg.params.name}${db} not found in plugins_get`);
                             this.server.respond({ ...msg, response: { plugin: undefined } });
                         }
                     }
@@ -158,6 +159,41 @@ export class PluginManager extends EventEmitter {
                         }
                     }
                     break;
+                case 'plugins_getschema':
+                    {
+                        const plugin = this.get(msg.params.name);
+                        if (plugin) {
+                            this.server.respond({ ...msg, response: { schema: plugin.schemaJson } });
+                        }
+                        else {
+                            this.server.respond({ ...msg, response: { schema: undefined } });
+                        }
+                    }
+                    break;
+                case 'plugins_setschema':
+                    {
+                        const plugin = this.get(msg.params.name);
+                        if (plugin) {
+                            plugin.schemaJson = msg.params.schema;
+                            this.server.respond({ ...msg, response: { success: true } });
+                        }
+                        else {
+                            this.server.respond({ ...msg, response: { success: false } });
+                        }
+                    }
+                    break;
+                case 'plugins_saveconfigfromjson':
+                    {
+                        const plugin = this.get(msg.params.name);
+                        if (plugin) {
+                            this.saveConfigFromJson(plugin, msg.params.config, msg.params.restartRequired);
+                            this.server.respond({ ...msg, response: { success: true } });
+                        }
+                        else {
+                            this.server.respond({ ...msg, response: { success: false } });
+                        }
+                    }
+                    break;
                 default:
                     if (this.verbose)
                         this.log.debug(`Unknown broadcast message ${CYAN}${msg.type}${db} from ${CYAN}${msg.src}${db}`);

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge",
-  "version": "3.4.0-dev-20251121-a354bec",
+  "version": "3.4.0-dev-20251123-62db0d7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "3.4.0-dev-20251121-a354bec",
+      "version": "3.4.0-dev-20251123-62db0d7",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "0.15.6",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "3.4.0-dev-20251121-a354bec",
+  "version": "3.4.0-dev-20251123-62db0d7",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",

package/scripts/fetch-chip.mjs

@@ -11,13 +11,14 @@ import https from 'node:https';
  *  - ZCL_OUT: output path for zcl.json (default: chip/zcl.json)
  *  - ZCL_BRANCH: connectedhomeip branch to fetch from (default: v1.4-branch)
  */
-const OUT_PATH = process.env.ZCL_OUT || 'chip/zcl.json';
 // Single branch strategy from online only
-const BRANCH = process.env.ZCL_BRANCH || 'v1.4-branch';
-const ZCL_BASE = `https://raw.githubusercontent.com/project-chip/connectedhomeip/${BRANCH}/src/app/zap-templates/zcl/`;
-const ZCL_JSON_URL = ZCL_BASE + 'zcl.json';
-const XML_BASE = ZCL_BASE + 'data-model/chip/';
-const MANUFACTURERS_URL = ZCL_BASE + 'data-model/manufacturers.xml';
+const BRANCH = process.env.ZCL_BRANCH || 'v1.4.2-branch';
+const OUT_ZCL_PATH = process.env.ZCL_OUT || `chip/${BRANCH}/zcl.json`;
+const OUT_MANUFACTURERS_PATH = process.env.MANUFACTURERS_OUT || `chip/${BRANCH}/manufacturers.xml`;
+const ZCL_BASE_URL = `https://raw.githubusercontent.com/project-chip/connectedhomeip/${BRANCH}/src/app/zap-templates/zcl/`;
+const ZCL_JSON_URL = ZCL_BASE_URL + 'zcl.json';
+const MANUFACTURERS_URL = ZCL_BASE_URL + 'data-model/manufacturers.xml';
+const XML_BASE_URL = ZCL_BASE_URL + 'data-model/chip/';
 
 function fetchUrl(url) {
   return new Promise((resolve, reject) => {
@@ -37,7 +38,7 @@ function fetchUrl(url) {
 }
 
 async function main() {
-  await mkdir(dirname(OUT_PATH), { recursive: true });
+  await mkdir(dirname(OUT_ZCL_PATH), { recursive: true });
   // Always fetch online from the specified branch
   const data = await fetchUrl(ZCL_JSON_URL);
 
@@ -52,15 +53,14 @@ async function main() {
     process.stderr.write('Warning: zcl.json does not contain expected ZAP ZCL properties (xmlFile). Saving anyway for manual inspection.\n');
   }
 
-  await writeFile(OUT_PATH, JSON.stringify(parsed, null, 2));
-  process.stderr.write(`Saved ${OUT_PATH}.\n`);
+  await writeFile(OUT_ZCL_PATH, JSON.stringify(parsed, null, 2));
+  process.stderr.write(`Saved ${OUT_ZCL_PATH}. Branch=${BRANCH}\n`);
 
   // Also fetch manufacturers.xml to chip/manufacturers.xml from the same branch
   try {
-    const outManu = 'chip/manufacturers.xml';
     const manuContent = await fetchUrl(MANUFACTURERS_URL);
-    await writeFile(outManu, manuContent);
-    process.stderr.write('Saved chip/manufacturers.xml.\n');
+    await writeFile(OUT_MANUFACTURERS_PATH, manuContent);
+    process.stderr.write(`Saved ${OUT_MANUFACTURERS_PATH}. Branch=${BRANCH}\n`);
   } catch (e) {
     process.stderr.write(`Warning: failed to fetch manufacturers.xml (${e.message}).\n`);
   }
@@ -70,14 +70,14 @@ async function main() {
   if (xmlFiles.length === 0) {
     process.stderr.write('No xmlFile entries found; skipping XML fetch.\n');
   } else {
-    const outXmlBase = 'chip/xml';
+    const outXmlBase = `chip/${BRANCH}/xml`;
     await mkdir(outXmlBase, { recursive: true });
     let ok = 0;
     let fail = 0;
     for (const fileName of xmlFiles) {
       const relative = fileName.trim();
       try {
-        const url = XML_BASE + relative;
+        const url = XML_BASE_URL + relative;
         const content = await fetchUrl(url);
         const outPath = pathJoin(outXmlBase, relative.replaceAll('/', pathSep));
         await mkdir(dirname(outPath), { recursive: true });