@matterbridge/core 3.7.10 → 3.8.0-dev-20260524-92c5fdd

package/dist/matterbridgeEndpointHelpers.js

@@ -2,6 +2,7 @@ if (process.argv.includes('--loader') || process.argv.includes('-loader'))
     console.log('\u001B[32mMatterbridgeEndpointHelpers loaded.\u001B[40;0m');
 import { createHash } from 'node:crypto';
 import { Lifecycle } from '@matter/general';
+import { ClusterBehavior } from '@matter/node';
 import { AirQualityServer } from '@matter/node/behaviors/air-quality';
 import { BasicInformationServer } from '@matter/node/behaviors/basic-information';
 import { BooleanStateServer } from '@matter/node/behaviors/boolean-state';
@@ -78,6 +79,7 @@ import { TotalVolatileOrganicCompoundsConcentrationMeasurement } from '@matter/t
 import { UserLabel } from '@matter/types/clusters/user-label';
 import { ValveConfigurationAndControl } from '@matter/types/clusters/valve-configuration-and-control';
 import { WindowCovering } from '@matter/types/clusters/window-covering';
+import { NodeId } from '@matter/types/datatype';
 import { MeasurementType } from '@matter/types/globals';
 import { deepEqual } from '@matterbridge/utils/deep-equal';
 import { isValidArray } from '@matterbridge/utils/validate';
@@ -173,7 +175,9 @@ export function featuresFor(endpoint, cluster) {
         return {};
     }
     const supportedBehavior = endpoint.behaviors.supported[lowercaseFirstLetter(behaviorId)];
-    return supportedBehavior?.cluster.supportedFeatures ?? {};
+    if (!supportedBehavior || !ClusterBehavior.isType(supportedBehavior))
+        return {};
+    return supportedBehavior.features ?? {};
 }
 export async function internalFor(endpoint, cluster) {
     const behaviorId = getBehavior(endpoint, cluster)?.id;
@@ -344,8 +348,17 @@ export async function invokeBehaviorCommand(endpoint, cluster, command, params)
             invoked = false;
             return;
         }
-        const result = params === undefined ? handler.call(behavior) : handler.call(behavior, params);
-        await Promise.resolve(result);
+        void behavior?.['state'];
+        const injectedSubject = { kind: 'node', id: NodeId(100) };
+        const patchedContext = new Proxy(agent.context, { get: (t, k) => (k === 'fabric' ? 1 : k === 'subject' ? injectedSubject : Reflect.get(t, k, t)) });
+        Object.defineProperty(behavior, 'context', { configurable: true, value: patchedContext });
+        try {
+            const result = params === undefined ? handler.call(behavior) : handler.call(behavior, params);
+            await Promise.resolve(result);
+        }
+        finally {
+            delete behavior.context;
+        }
     });
     return invoked;
 }
@@ -514,8 +527,10 @@ export function getClusterId(endpoint, cluster) {
     return endpoint.behaviors.supported[lowercaseFirstLetter(cluster)]?.schema?.id;
 }
 export function getAttributeId(endpoint, cluster, attribute) {
-    const clusterBehavior = endpoint.behaviors.supported[lowercaseFirstLetter(cluster)];
-    return clusterBehavior?.cluster?.attributes[lowercaseFirstLetter(attribute)]?.id;
+    const supportedBehavior = endpoint.behaviors.supported[lowercaseFirstLetter(cluster)];
+    if (!supportedBehavior || !ClusterBehavior.isType(supportedBehavior))
+        return undefined;
+    return supportedBehavior.schema.attributes(lowercaseFirstLetter(attribute))?.id;
 }
 export function getAttribute(endpoint, cluster, attribute, log) {
     const clusterName = getBehavior(endpoint, cluster)?.id;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matterbridge/core",
-  "version": "3.7.10",
+  "version": "3.8.0-dev-20260524-92c5fdd",
   "description": "Matterbridge core library",
   "author": "https://github.com/Luligu",
   "homepage": "https://matterbridge.io/",
@@ -129,11 +129,11 @@
     "CHANGELOG.md"
   ],
   "dependencies": {
-    "@matter/main": "0.16.11",
-    "@matterbridge/dgram": "3.7.10",
-    "@matterbridge/thread": "3.7.10",
-    "@matterbridge/types": "3.7.10",
-    "@matterbridge/utils": "3.7.10",
+    "@matter/main": "0.17.0",
+    "@matterbridge/dgram": "3.8.0-dev-20260524-92c5fdd",
+    "@matterbridge/thread": "3.8.0-dev-20260524-92c5fdd",
+    "@matterbridge/types": "3.8.0-dev-20260524-92c5fdd",
+    "@matterbridge/utils": "3.8.0-dev-20260524-92c5fdd",
     "escape-html": "1.0.3",
     "express": "5.2.1",
     "express-rate-limit": "8.5.2",