@matterbridge/core 3.6.2-dev-20260317-e291a17 → 3.7.0-dev-20260318-5bb831c

package/dist/matterbridgeEndpoint.d.ts

@@ -1,4 +1,4 @@
-import { AtLeastOne, NamedHandler } from '@matter/general';
+import { AtLeastOne } from '@matter/general';
 import { ActionContext, Behavior, Endpoint, ServerNode } from '@matter/node';
 import { ClusterType } from '@matter/types/cluster';
 import { AirQuality } from '@matter/types/clusters/air-quality';
@@ -24,7 +24,8 @@ import { ClusterId, EndpointNumber } from '@matter/types/datatype';
 import { Semtag } from '@matter/types/globals';
 import { AnsiLogger, LogLevel } from 'node-ansi-logger';
 import { DeviceTypeDefinition } from './matterbridgeDeviceTypes.js';
-import { CommandHandlerFunction, MatterbridgeEndpointCommands, MatterbridgeEndpointOptions, SerializedMatterbridgeEndpoint } from './matterbridgeEndpointTypes.js';
+import { CommandHandler, CommandHandlerData, CommandHandlerFunction, CommandHandlers } from './matterbridgeEndpointCommandHandler.js';
+import { MatterbridgeEndpointOptions, SerializedMatterbridgeEndpoint } from './matterbridgeEndpointTypes.js';
 type BehaviorCommandName<T extends Behavior.Type> = {
     [K in keyof CommandsOfBehavior<T>]: K;
 }[keyof CommandsOfBehavior<T>] & string;
@@ -58,7 +59,7 @@ export declare class MatterbridgeEndpoint extends Endpoint {
     name: string | undefined;
     deviceType: number | undefined;
     readonly deviceTypes: Map<number, DeviceTypeDefinition>;
-    readonly commandHandler: NamedHandler<MatterbridgeEndpointCommands>;
+    readonly commandHandler: CommandHandler;
     constructor(definition: DeviceTypeDefinition | AtLeastOne<DeviceTypeDefinition>, options?: MatterbridgeEndpointOptions, debug?: boolean);
     static loadInstance(definition: DeviceTypeDefinition | AtLeastOne<DeviceTypeDefinition>, options?: MatterbridgeEndpointOptions, debug?: boolean): Promise<MatterbridgeEndpoint>;
     getDeviceTypes(): DeviceTypeDefinition[];
@@ -87,13 +88,14 @@ export declare class MatterbridgeEndpoint extends Endpoint {
     addClusterServers(serverList: ClusterId[]): this;
     addFixedLabel(label: string, value: string): Promise<this>;
     addUserLabel(label: string, value: string): Promise<this>;
-    addCommandHandler(command: keyof MatterbridgeEndpointCommands, handler: CommandHandlerFunction): this;
-    executeCommandHandler(command: keyof MatterbridgeEndpointCommands, request?: Record<string, boolean | number | bigint | string | object | null>, cluster?: string, attributes?: Record<string, boolean | number | bigint | string | object | null>, endpoint?: MatterbridgeEndpoint): Promise<void>;
+    addCommandHandler<C extends CommandHandlers>(command: C, handler: CommandHandlerFunction<C>): this;
+    removeCommandHandler<C extends CommandHandlers>(command: C, handler: CommandHandlerFunction<C>): this;
+    executeCommandHandler<C extends CommandHandlers>(command: C, request: CommandHandlerData<C>['request'], cluster: CommandHandlerData<C>['cluster'], attributes: CommandHandlerData<C>['attributes'], endpoint: CommandHandlerData<C>['endpoint']): Promise<void>;
     invokeBehaviorCommand<T extends Behavior.Type, C extends BehaviorCommandName<T>>(cluster: T, command: C, params?: BehaviorCommandParams<T, C>): Promise<void>;
     invokeBehaviorCommand<T extends ClusterType, C extends keyof ClusterType.CommandsOf<T>>(cluster: T, command: C, params?: ClusterType.CommandsOf<T>[C] extends {
         requestSchema: infer S extends import('@matter/types/tlv').TlvSchema<unknown>;
     } ? import('@matter/types/tlv').TypeFromSchema<S> : never): Promise<void>;
-    invokeBehaviorCommand(cluster: ClusterId | string, command: keyof MatterbridgeEndpointCommands, params?: Record<string, boolean | number | bigint | string | object | null>): Promise<void>;
+    invokeBehaviorCommand(cluster: ClusterId | string, command: CommandHandlers, params?: Record<string, boolean | number | bigint | string | object | null>): Promise<void>;
     addRequiredClusterServers(): MatterbridgeEndpoint;
     addOptionalClusterServers(): MatterbridgeEndpoint;
     getAllClusterServers(): Behavior.Type[];
@@ -145,7 +147,7 @@ export declare class MatterbridgeEndpoint extends Endpoint {
     setWindowCoveringTargetAndCurrentPosition(liftPosition: number, tiltPosition?: number): Promise<void>;
     createDefaultThermostatClusterServer(localTemperature?: number, occupiedHeatingSetpoint?: number, occupiedCoolingSetpoint?: number, minSetpointDeadBand?: number, minHeatSetpointLimit?: number, maxHeatSetpointLimit?: number, minCoolSetpointLimit?: number, maxCoolSetpointLimit?: number, unoccupiedHeatingSetpoint?: number | undefined, unoccupiedCoolingSetpoint?: number | undefined, occupied?: boolean | undefined, outdoorTemperature?: number | null | undefined): this;
     createDefaultHeatingThermostatClusterServer(localTemperature?: number, occupiedHeatingSetpoint?: number, minHeatSetpointLimit?: number, maxHeatSetpointLimit?: number, unoccupiedHeatingSetpoint?: number | undefined, occupied?: boolean | undefined, outdoorTemperature?: number | null | undefined): this;
-    createDefaultPresetsThermostatClusterServer(localTemperature?: number, occupiedHeatingSetpoint?: number, occupiedCoolingSetpoint?: number, minSetpointDeadBand?: number, minHeatSetpointLimit?: number, maxHeatSetpointLimit?: number, minCoolSetpointLimit?: number, maxCoolSetpointLimit?: number, unoccupiedHeatingSetpoint?: number | undefined, unoccupiedCoolingSetpoint?: number | undefined, occupied?: boolean | undefined, outdoorTemperature?: number | null | undefined, activePresetHandle?: number | undefined, presetsList?: Thermostat.Preset[] | null | undefined, presetTypes?: Thermostat.PresetType[] | null | undefined): this;
+    createDefaultPresetsThermostatClusterServer(localTemperature?: number, occupiedHeatingSetpoint?: number, occupiedCoolingSetpoint?: number, minSetpointDeadBand?: number, minHeatSetpointLimit?: number, maxHeatSetpointLimit?: number, minCoolSetpointLimit?: number, maxCoolSetpointLimit?: number, unoccupiedHeatingSetpoint?: number | undefined, unoccupiedCoolingSetpoint?: number | undefined, occupied?: boolean | undefined, outdoorTemperature?: number | null | undefined, activePresetHandle?: Uint8Array | null, presetsList?: Thermostat.Preset[] | null | undefined, presetTypes?: Thermostat.PresetType[] | null | undefined): this;
     createDefaultCoolingThermostatClusterServer(localTemperature?: number, occupiedCoolingSetpoint?: number, minCoolSetpointLimit?: number, maxCoolSetpointLimit?: number, unoccupiedCoolingSetpoint?: number | undefined, occupied?: boolean | undefined, outdoorTemperature?: number | null | undefined): this;
     createDefaultThermostatUserInterfaceConfigurationClusterServer(temperatureDisplayMode?: ThermostatUserInterfaceConfiguration.TemperatureDisplayMode, keypadLockout?: ThermostatUserInterfaceConfiguration.KeypadLockout, scheduleProgrammingVisibility?: ThermostatUserInterfaceConfiguration.ScheduleProgrammingVisibility): this;
     createDefaultFanControlClusterServer(fanMode?: FanControl.FanMode, fanModeSequence?: FanControl.FanModeSequence, percentSetting?: number, percentCurrent?: number): this;

package/dist/matterbridgeEndpoint.js

@@ -1,6 +1,6 @@
 if (process.argv.includes('--loader') || process.argv.includes('-loader'))
     console.log('\u001B[32mMatterbridgeEndpoint loaded.\u001B[40;0m');
-import { Lifecycle, NamedHandler, UINT16_MAX, UINT32_MAX } from '@matter/general';
+import { Lifecycle, UINT16_MAX, UINT32_MAX } from '@matter/general';
 import { Endpoint, MutableEndpoint, SupportedBehaviors } from '@matter/node';
 import { AirQualityServer } from '@matter/node/behaviors/air-quality';
 import { BooleanStateServer } from '@matter/node/behaviors/boolean-state';
@@ -63,6 +63,7 @@ import { inspectError } from '@matterbridge/utils/error';
 import { isValidNumber, isValidObject, isValidString } from '@matterbridge/utils/validate';
 import { AnsiLogger, CYAN, db, debugStringify, hk, or, YELLOW, zb } from 'node-ansi-logger';
 import { MatterbridgeActivatedCarbonFilterMonitoringServer, MatterbridgeBooleanStateConfigurationServer, MatterbridgeColorControlServer, MatterbridgeDeviceEnergyManagementModeServer, MatterbridgeDeviceEnergyManagementServer, MatterbridgeDoorLockServer, MatterbridgeEnhancedColorControlServer, MatterbridgeFanControlServer, MatterbridgeHepaFilterMonitoringServer, MatterbridgeIdentifyServer, MatterbridgeLevelControlServer, MatterbridgeLiftTiltWindowCoveringServer, MatterbridgeLiftWindowCoveringServer, MatterbridgeModeSelectServer, MatterbridgeOnOffServer, MatterbridgeOperationalStateServer, MatterbridgePowerSourceServer, MatterbridgePresetThermostatServer, MatterbridgeServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeSwitchServer, MatterbridgeThermostatServer, MatterbridgeValveConfigurationAndControlServer, } from './matterbridgeBehaviorsServer.js';
+import { CommandHandler } from './matterbridgeEndpointCommandHandler.js';
 import { addClusterServers, addFixedLabel, addOptionalClusterServers, addRequiredClusterServers, addUserLabel, checkNotLatinCharacters, createUniqueId, featuresFor, generateUniqueId, getApparentElectricalPowerMeasurementClusterServer, getAttribute, getAttributeId, getBehavior, getBehaviourTypesFromClusterClientIds, getBehaviourTypesFromClusterServerIds, getCluster, getClusterId, getDefaultDeviceEnergyManagementClusterServer, getDefaultDeviceEnergyManagementModeClusterServer, getDefaultElectricalEnergyMeasurementClusterServer, getDefaultElectricalPowerMeasurementClusterServer, getDefaultFlowMeasurementClusterServer, getDefaultIlluminanceMeasurementClusterServer, getDefaultOccupancySensingClusterServer, getDefaultOperationalStateClusterServer, getDefaultPowerSourceBatteryClusterServer, getDefaultPowerSourceRechargeableBatteryClusterServer, getDefaultPowerSourceReplaceableBatteryClusterServer, getDefaultPowerSourceWiredClusterServer, getDefaultPressureMeasurementClusterServer, getDefaultRelativeHumidityMeasurementClusterServer, getDefaultTemperatureMeasurementClusterServer, invokeBehaviorCommand, lowercaseFirstLetter, setAttribute, setCluster, subscribeAttribute, triggerEvent, updateAttribute, } from './matterbridgeEndpointHelpers.js';
 const MATTERBRIDGE_ENDPOINT_BRAND = Symbol('MatterbridgeEndpoint.brand');
 export function isMatterbridgeEndpoint(value) {
@@ -104,7 +105,7 @@ export class MatterbridgeEndpoint extends Endpoint {
     name = undefined;
     deviceType = undefined;
     deviceTypes = new Map();
-    commandHandler = new NamedHandler();
+    commandHandler = new CommandHandler();
     constructor(definition, options = {}, debug = false) {
         let deviceTypeList = [];
         const originalId = options.id;
@@ -237,8 +238,12 @@ export class MatterbridgeEndpoint extends Endpoint {
         this.commandHandler.addHandler(command, handler);
         return this;
     }
+    removeCommandHandler(command, handler) {
+        this.commandHandler.removeHandler(command, handler);
+        return this;
+    }
     async executeCommandHandler(command, request, cluster, attributes, endpoint) {
-        await this.commandHandler.executeHandler(command, { request, cluster, attributes, endpoint });
+        await this.commandHandler.executeHandler(command, { command, request, cluster, attributes, endpoint });
     }
     async invokeBehaviorCommand(cluster, command, params) {
         await invokeBehaviorCommand(this, cluster, command, params);
@@ -887,7 +892,7 @@ export class MatterbridgeEndpoint extends Endpoint {
         });
         return this;
     }
-    createDefaultPresetsThermostatClusterServer(localTemperature = 23, occupiedHeatingSetpoint = 21, occupiedCoolingSetpoint = 25, minSetpointDeadBand = 0, minHeatSetpointLimit = 0, maxHeatSetpointLimit = 50, minCoolSetpointLimit = 0, maxCoolSetpointLimit = 50, unoccupiedHeatingSetpoint = undefined, unoccupiedCoolingSetpoint = undefined, occupied = undefined, outdoorTemperature = undefined, activePresetHandle = undefined, presetsList = undefined, presetTypes = undefined) {
+    createDefaultPresetsThermostatClusterServer(localTemperature = 23, occupiedHeatingSetpoint = 21, occupiedCoolingSetpoint = 25, minSetpointDeadBand = 0, minHeatSetpointLimit = 0, maxHeatSetpointLimit = 50, minCoolSetpointLimit = 0, maxCoolSetpointLimit = 50, unoccupiedHeatingSetpoint = undefined, unoccupiedCoolingSetpoint = undefined, occupied = undefined, outdoorTemperature = undefined, activePresetHandle = null, presetsList = undefined, presetTypes = undefined) {
         this.behaviors.require(MatterbridgePresetThermostatServer.with(Thermostat.Feature.Heating, Thermostat.Feature.Cooling, Thermostat.Feature.AutoMode, ...(occupied !== undefined ? [Thermostat.Feature.Occupancy] : []), Thermostat.Feature.Presets), {
             localTemperature: localTemperature * 100,
             externalMeasuredIndoorTemperature: localTemperature * 100,
@@ -911,9 +916,9 @@ export class MatterbridgeEndpoint extends Endpoint {
             ...(occupied !== undefined ? { occupancy: { occupied } } : {}),
             ...(occupied !== undefined ? { externallyMeasuredOccupancy: true } : {}),
             numberOfPresets: Math.max(Array.isArray(presetsList) ? presetsList.length : 0, 10),
-            activePresetHandle: activePresetHandle !== undefined ? Uint8Array.from([activePresetHandle]) : null,
+            activePresetHandle: activePresetHandle ? Uint8Array.from([activePresetHandle]) : null,
             presets: (presetsList ?? []).map((p) => ({
-                presetHandle: Uint8Array.from(p.presetHandle || [0]),
+                presetHandle: p.presetHandle ? Uint8Array.from(p.presetHandle) : null,
                 presetScenario: p.presetScenario,
                 name: p.name,
                 coolingSetpoint: p.coolingSetpoint,