@matterbridge/core 3.8.0-dev-20260604-901f3fc → 3.8.0-dev-20260605-48352af

package/dist/matterbridgeEndpoint.js

@@ -167,6 +167,16 @@ export class MatterbridgeEndpoint extends Endpoint {
             descriptor: options.tagList ? { tagList: options.tagList, deviceTypeList } : { deviceTypeList },
         };
         super(endpointV8, optionsV8);
+        const typeBehaviors = this.type.behaviors;
+        const origInject = this.behaviors.inject.bind(this.behaviors);
+        Object.defineProperty(this.behaviors, 'inject', {
+            configurable: true,
+            writable: true,
+            value: (type, options, notify = true) => {
+                origInject(type, options, notify);
+                typeBehaviors[type.id] = type;
+            },
+        });
         Object.defineProperty(this, MATTERBRIDGE_ENDPOINT_BRAND, {
             value: true,
             writable: false,

package/dist/matterbridgeEndpointCommandHandler.js

@@ -26,7 +26,7 @@ export class CommandHandler {
     }
     removeHandler(command, handler) {
         this.handler = this.handler.filter(({ command: registeredCommand, handler: registeredHandler }) => {
-            return registeredCommand !== command && registeredHandler !== handler;
+            return registeredCommand !== command || registeredHandler !== handler;
         });
     }
 }

package/dist/matterbridgeEndpointHelpers.d.ts

@@ -39,7 +39,7 @@ export declare function defaultFor<T extends Behavior.Type>(type: T, options?: B
 export declare function getBehaviourTypesFromClusterServerIds(clusterServerList: ClusterId[]): Behavior.Type[];
 export declare function getBehaviourTypesFromClusterClientIds(clusterClientList: ClusterId[]): Behavior.Type[];
 export declare function getBehaviourTypeFromClusterServerId(clusterId: ClusterId): Behavior.Type;
-export declare function getBehaviourTypeFromClusterClientId(_clusterId: ClusterId): void;
+export declare function getBehaviourTypeFromClusterClientId(clusterId: ClusterId): ClusterBehavior.Type | undefined;
 export declare function getBehavior(endpoint: MatterbridgeEndpoint, cluster: Behavior.Type | ClusterType | ClusterId | string): Behavior.Type | undefined;
 export declare function invokeBehaviorCommand(endpoint: MatterbridgeEndpoint, cluster: Behavior.Type | ClusterType | ClusterId | string, command: CommandHandlers, params?: Record<string, boolean | number | bigint | string | object | null>): Promise<boolean>;
 export declare function invokeSubscribeHandler(endpoint: MatterbridgeEndpoint, cluster: Behavior.Type | ClusterType | ClusterId | string, attribute: string, newValue: unknown, oldValue: unknown): Promise<boolean>;

package/dist/matterbridgeEndpointHelpers.js

@@ -9,30 +9,41 @@ import { BooleanStateServer } from '@matter/node/behaviors/boolean-state';
 import { BridgedDeviceBasicInformationServer } from '@matter/node/behaviors/bridged-device-basic-information';
 import { CarbonDioxideConcentrationMeasurementServer } from '@matter/node/behaviors/carbon-dioxide-concentration-measurement';
 import { CarbonMonoxideConcentrationMeasurementServer } from '@matter/node/behaviors/carbon-monoxide-concentration-measurement';
+import { ColorControlClient } from '@matter/node/behaviors/color-control';
+import { DoorLockClient } from '@matter/node/behaviors/door-lock';
 import { ElectricalEnergyMeasurementServer } from '@matter/node/behaviors/electrical-energy-measurement';
+import { ElectricalGridConditionsClient } from '@matter/node/behaviors/electrical-grid-conditions';
 import { ElectricalPowerMeasurementServer } from '@matter/node/behaviors/electrical-power-measurement';
+import { FanControlClient } from '@matter/node/behaviors/fan-control';
 import { FixedLabelServer } from '@matter/node/behaviors/fixed-label';
-import { FlowMeasurementServer } from '@matter/node/behaviors/flow-measurement';
+import { FlowMeasurementClient, FlowMeasurementServer } from '@matter/node/behaviors/flow-measurement';
 import { FormaldehydeConcentrationMeasurementServer } from '@matter/node/behaviors/formaldehyde-concentration-measurement';
-import { GroupsServer } from '@matter/node/behaviors/groups';
-import { IlluminanceMeasurementServer } from '@matter/node/behaviors/illuminance-measurement';
+import { GroupsClient, GroupsServer } from '@matter/node/behaviors/groups';
+import { IdentifyClient } from '@matter/node/behaviors/identify';
+import { IlluminanceMeasurementClient, IlluminanceMeasurementServer } from '@matter/node/behaviors/illuminance-measurement';
+import { LevelControlClient } from '@matter/node/behaviors/level-control';
 import { NitrogenDioxideConcentrationMeasurementServer } from '@matter/node/behaviors/nitrogen-dioxide-concentration-measurement';
-import { OccupancySensingServer } from '@matter/node/behaviors/occupancy-sensing';
+import { OccupancySensingClient, OccupancySensingServer } from '@matter/node/behaviors/occupancy-sensing';
+import { OnOffClient } from '@matter/node/behaviors/on-off';
+import { OtaSoftwareUpdateProviderClient } from '@matter/node/behaviors/ota-software-update-provider';
+import { OtaSoftwareUpdateRequestorClient } from '@matter/node/behaviors/ota-software-update-requestor';
 import { OzoneConcentrationMeasurementServer } from '@matter/node/behaviors/ozone-concentration-measurement';
 import { Pm1ConcentrationMeasurementServer } from '@matter/node/behaviors/pm1-concentration-measurement';
 import { Pm10ConcentrationMeasurementServer } from '@matter/node/behaviors/pm10-concentration-measurement';
 import { Pm25ConcentrationMeasurementServer } from '@matter/node/behaviors/pm25-concentration-measurement';
 import { PowerSourceServer } from '@matter/node/behaviors/power-source';
 import { PowerTopologyServer } from '@matter/node/behaviors/power-topology';
-import { PressureMeasurementServer } from '@matter/node/behaviors/pressure-measurement';
-import { PumpConfigurationAndControlServer } from '@matter/node/behaviors/pump-configuration-and-control';
+import { PressureMeasurementClient, PressureMeasurementServer } from '@matter/node/behaviors/pressure-measurement';
+import { PumpConfigurationAndControlClient, PumpConfigurationAndControlServer } from '@matter/node/behaviors/pump-configuration-and-control';
 import { RadonConcentrationMeasurementServer } from '@matter/node/behaviors/radon-concentration-measurement';
-import { RelativeHumidityMeasurementServer } from '@matter/node/behaviors/relative-humidity-measurement';
-import { ScenesManagementServer } from '@matter/node/behaviors/scenes-management';
+import { RelativeHumidityMeasurementClient, RelativeHumidityMeasurementServer } from '@matter/node/behaviors/relative-humidity-measurement';
+import { ScenesManagementClient, ScenesManagementServer } from '@matter/node/behaviors/scenes-management';
 import { SwitchServer } from '@matter/node/behaviors/switch';
-import { TemperatureMeasurementServer } from '@matter/node/behaviors/temperature-measurement';
+import { TemperatureMeasurementClient, TemperatureMeasurementServer } from '@matter/node/behaviors/temperature-measurement';
+import { ThermostatClient } from '@matter/node/behaviors/thermostat';
 import { TotalVolatileOrganicCompoundsConcentrationMeasurementServer } from '@matter/node/behaviors/total-volatile-organic-compounds-concentration-measurement';
 import { UserLabelServer } from '@matter/node/behaviors/user-label';
+import { WindowCoveringClient } from '@matter/node/behaviors/window-covering';
 import { getClusterNameById } from '@matter/types/cluster';
 import { AirQuality } from '@matter/types/clusters/air-quality';
 import { BasicInformation } from '@matter/types/clusters/basic-information';
@@ -46,6 +57,7 @@ import { DeviceEnergyManagement } from '@matter/types/clusters/device-energy-man
 import { DeviceEnergyManagementMode } from '@matter/types/clusters/device-energy-management-mode';
 import { DoorLock } from '@matter/types/clusters/door-lock';
 import { ElectricalEnergyMeasurement } from '@matter/types/clusters/electrical-energy-measurement';
+import { ElectricalGridConditions } from '@matter/types/clusters/electrical-grid-conditions';
 import { ElectricalPowerMeasurement } from '@matter/types/clusters/electrical-power-measurement';
 import { FanControl } from '@matter/types/clusters/fan-control';
 import { FixedLabel } from '@matter/types/clusters/fixed-label';
@@ -60,6 +72,8 @@ import { NitrogenDioxideConcentrationMeasurement } from '@matter/types/clusters/
 import { OccupancySensing } from '@matter/types/clusters/occupancy-sensing';
 import { OnOff } from '@matter/types/clusters/on-off';
 import { OperationalState } from '@matter/types/clusters/operational-state';
+import { OtaSoftwareUpdateProvider } from '@matter/types/clusters/ota-software-update-provider';
+import { OtaSoftwareUpdateRequestor } from '@matter/types/clusters/ota-software-update-requestor';
 import { OzoneConcentrationMeasurement } from '@matter/types/clusters/ozone-concentration-measurement';
 import { Pm1ConcentrationMeasurement } from '@matter/types/clusters/pm1-concentration-measurement';
 import { Pm10ConcentrationMeasurement } from '@matter/types/clusters/pm10-concentration-measurement';
@@ -83,7 +97,7 @@ 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';
-import { BLUE, CYAN, db, debugStringify, er, hk, or, YELLOW, zb } from 'node-ansi-logger';
+import { BLUE, CYAN, db, debugStringify, er, hk, nf, or, wr, YELLOW, zb } from 'node-ansi-logger';
 import { MatterbridgeBindingServer } from './behaviors/bindingServer.js';
 import { MatterbridgeBooleanStateConfigurationServer } from './behaviors/booleanStateConfigurationServer.js';
 import { MatterbridgeColorControlServer } from './behaviors/colorControlServer.js';
@@ -218,7 +232,10 @@ export function getBehaviourTypesFromClusterServerIds(clusterServerList) {
 }
 export function getBehaviourTypesFromClusterClientIds(clusterClientList) {
     const behaviorTypes = [];
-    clusterClientList.forEach((_clusterId) => {
+    clusterClientList.forEach((clusterId) => {
+        const behaviorType = getBehaviourTypeFromClusterClientId(clusterId);
+        if (behaviorType)
+            behaviorTypes.push(behaviorType);
     });
     return behaviorTypes;
 }
@@ -315,7 +332,48 @@ export function getBehaviourTypeFromClusterServerId(clusterId) {
         return MatterbridgeDeviceEnergyManagementModeServer;
     return MatterbridgeIdentifyServer;
 }
-export function getBehaviourTypeFromClusterClientId(_clusterId) {
+export function getBehaviourTypeFromClusterClientId(clusterId) {
+    if (clusterId === Identify.id)
+        return IdentifyClient;
+    if (clusterId === Groups.id)
+        return GroupsClient;
+    if (clusterId === OnOff.id)
+        return OnOffClient;
+    if (clusterId === LevelControl.id)
+        return LevelControlClient;
+    if (clusterId === ColorControl.id)
+        return ColorControlClient;
+    if (clusterId === OccupancySensing.id)
+        return OccupancySensingClient;
+    if (clusterId === ScenesManagement.id)
+        return ScenesManagementClient;
+    if (clusterId === DoorLock.id)
+        return DoorLockClient;
+    if (clusterId === ElectricalGridConditions.id)
+        return ElectricalGridConditionsClient;
+    if (clusterId === FanControl.id)
+        return FanControlClient;
+    if (clusterId === FlowMeasurement.id)
+        return FlowMeasurementClient;
+    if (clusterId === IlluminanceMeasurement.id)
+        return IlluminanceMeasurementClient;
+    if (clusterId === OtaSoftwareUpdateProvider.id)
+        return OtaSoftwareUpdateProviderClient;
+    if (clusterId === OtaSoftwareUpdateRequestor.id)
+        return OtaSoftwareUpdateRequestorClient;
+    if (clusterId === PressureMeasurement.id)
+        return PressureMeasurementClient;
+    if (clusterId === PumpConfigurationAndControl.id)
+        return PumpConfigurationAndControlClient;
+    if (clusterId === RelativeHumidityMeasurement.id)
+        return RelativeHumidityMeasurementClient;
+    if (clusterId === TemperatureMeasurement.id)
+        return TemperatureMeasurementClient;
+    if (clusterId === Thermostat.id)
+        return ThermostatClient;
+    if (clusterId === WindowCovering.id)
+        return WindowCoveringClient;
+    return undefined;
 }
 export function getBehavior(endpoint, cluster) {
     let behavior;
@@ -497,10 +555,23 @@ export function addClusterClients(endpoint, clientList) {
         return;
     if (!endpoint.behaviors.has(MatterbridgeBindingServer)) {
         endpoint.behaviors.require(MatterbridgeBindingServer, { clientList });
-        return;
     }
-    const existing = endpoint.behaviors.optionsFor(MatterbridgeBindingServer)?.clientList ?? [];
-    endpoint.behaviors.inject(MatterbridgeBindingServer, { clientList: [...new Set([...existing, ...clientList])] });
+    else {
+        const existing = endpoint.behaviors.optionsFor(MatterbridgeBindingServer)?.clientList ?? [];
+        endpoint.behaviors.inject(MatterbridgeBindingServer, { clientList: [...new Set([...existing, ...clientList])] });
+    }
+    const clientClusters = endpoint.type.clientClusters;
+    for (const clusterId of clientList) {
+        const key = lowercaseFirstLetter(getClusterNameById(clusterId));
+        const value = getBehaviourTypeFromClusterClientId(clusterId);
+        if (!value) {
+            endpoint.log.warn(`addClusterClients: no client behavior found for clusterId ${hk}0x${clusterId.toString(16).padStart(4, '0')}${wr}`);
+        }
+        if (!clientClusters[key] && value) {
+            clientClusters[key] = value;
+            endpoint.log.info(`addClusterClients: added client behavior for clusterId ${hk}0x${clusterId.toString(16).padStart(4, '0')}${nf}`);
+        }
+    }
 }
 export function addRequiredClusterClients(endpoint) {
     const requiredClientList = [];

package/package.json

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