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

package/dist/matterbridgeEndpoint.d.ts

@@ -1,6 +1,6 @@
 import { AtLeastOne } from '@matter/general';
 import { ActionContext, Behavior, Endpoint, ServerNode } from '@matter/node';
-import { ClusterType } from '@matter/types/cluster';
+import { ClusterType, type ClusterTyping } from '@matter/types/cluster';
 import { AirQuality } from '@matter/types/clusters/air-quality';
 import { ColorControl } from '@matter/types/clusters/color-control';
 import { ConcentrationMeasurement } from '@matter/types/clusters/concentration-measurement';
@@ -26,22 +26,34 @@ import { AnsiLogger, LogLevel } from 'node-ansi-logger';
 import { DeviceTypeDefinition } from './matterbridgeDeviceTypes.js';
 import { CommandHandler, CommandHandlerData, CommandHandlerExecutionResult, 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;
+type FirstCommandParam<Params extends unknown[]> = Params extends [] ? undefined : Params[0];
 type BehaviorCluster<T extends Behavior.Type> = T extends {
     cluster: infer C extends ClusterType;
-} ? C : ClusterType.Unknown;
-type ClusterEventName<T extends ClusterType> = keyof ClusterType.EventsOf<T> & string;
-type ClusterEventPayload<T extends ClusterType, E extends string> = E extends keyof ClusterType.EventsOf<T> ? ClusterType.EventsOf<T>[E] extends {
-    schema: infer S extends import('@matter/types/tlv').TlvSchema<unknown>;
-} ? import('@matter/types/tlv').TypeFromSchema<S> : never : never;
-type BehaviorEventName<T extends Behavior.Type> = ClusterEventName<BehaviorCluster<T>>;
-type BehaviorEventPayload<T extends Behavior.Type, E extends string> = ClusterEventPayload<BehaviorCluster<T>, E>;
-type CommandsOfBehavior<T extends Behavior.Type> = {
-    [K in keyof InstanceType<T> as InstanceType<T>[K] extends (...args: infer _P) => infer _R ? K : never]: InstanceType<T>[K] extends (...args: infer P) => infer R ? (input: P[0], context?: ActionContext) => Promise<Awaited<R>> : never;
-};
-type BehaviorCommandParams<T extends Behavior.Type, C extends BehaviorCommandName<T>> = CommandsOfBehavior<T>[C] extends (input: infer P, context?: ActionContext) => Promise<unknown> ? P : never;
+} ? C : ClusterType;
+type CommandsOfBehavior<T extends Behavior.Type> = BehaviorCluster<T>['Typing'] extends {
+    Commands: infer Commands;
+} ? Commands : Record<string, never>;
+type BehaviorCommandName<T extends Behavior.Type> = keyof CommandsOfBehavior<T> & string;
+type BehaviorCommandParams<T extends Behavior.Type, C extends BehaviorCommandName<T>> = CommandsOfBehavior<T>[C] extends (...args: infer P) => unknown ? FirstCommandParam<P> : never;
+type BehaviorInterface<T extends Behavior.Type> = T extends {
+    Interface: infer N extends ClusterTyping;
+} ? N : ClusterTyping;
+type BehaviorEvents<T extends Behavior.Type> = NonNullable<BehaviorInterface<T>['Events']>;
+type BehaviorEventName<T extends Behavior.Type> = keyof BehaviorEvents<T> & string;
+type BehaviorEventPayload<T extends Behavior.Type, E extends string> = E extends BehaviorEventName<T> ? BehaviorEvents<T>[E] : never;
+type ClusterAttributesOf<T extends ClusterType> = T['Typing'] extends {
+    Attributes: infer Attributes;
+} ? Attributes : {};
+type ClusterCommandsOf<T extends ClusterType> = T['Typing'] extends {
+    Commands: infer Commands;
+} ? Commands : Record<string, never>;
+type ClusterCommandName<T extends ClusterType> = keyof ClusterCommandsOf<T> & string;
+type ClusterCommandParams<T extends ClusterType, C extends ClusterCommandName<T>> = ClusterCommandsOf<T>[C] extends (...args: infer P) => unknown ? FirstCommandParam<P> : never;
+type ClusterEventsOf<T extends ClusterType> = T['Typing'] extends {
+    Events: infer Events;
+} ? Events : Record<string, never>;
+type ClusterEventName<T extends ClusterType> = keyof ClusterEventsOf<T> & string;
+type ClusterEventPayload<T extends ClusterType, E extends string> = E extends keyof ClusterEventsOf<T> ? ClusterEventsOf<T>[E] : never;
 export declare function isMatterbridgeEndpoint(value: unknown): value is MatterbridgeEndpoint;
 export declare function assertMatterbridgeEndpoint(value: unknown, context?: string): asserts value is MatterbridgeEndpoint;
 export declare class MatterbridgeEndpoint extends Endpoint {
@@ -76,22 +88,22 @@ export declare class MatterbridgeEndpoint extends Endpoint {
     hasAttributeServer(cluster: Behavior.Type | ClusterType | ClusterId | string, attribute: string): boolean;
     getClusterServerOptions(cluster: Behavior.Type | ClusterType | ClusterId | string): Record<string, boolean | number | bigint | string | object | null> | undefined;
     getAttribute<T extends Behavior.Type, A extends keyof Behavior.StateOf<T>>(cluster: T, attribute: A, log?: AnsiLogger): Behavior.StateOf<T>[A] | undefined;
-    getAttribute<T extends ClusterType, A extends keyof ClusterType.AttributeValues<T>>(cluster: T, attribute: A, log?: AnsiLogger): ClusterType.AttributeValues<T>[A] | undefined;
+    getAttribute<T extends ClusterType, A extends keyof ClusterAttributesOf<T>>(cluster: T, attribute: A, log?: AnsiLogger): ClusterAttributesOf<T>[A] | undefined;
     getAttribute(cluster: ClusterId | string, attribute: string, log?: AnsiLogger): any;
     setAttribute<T extends Behavior.Type, A extends keyof Behavior.StateOf<T>>(clusterId: T, attribute: A, value: Behavior.StateOf<T>[A], log?: AnsiLogger): Promise<boolean>;
-    setAttribute<T extends ClusterType, A extends keyof ClusterType.AttributeValues<T>>(clusterId: T, attribute: A, value: ClusterType.AttributeValues<T>[A], log?: AnsiLogger): Promise<boolean>;
+    setAttribute<T extends ClusterType, A extends keyof ClusterAttributesOf<T>>(clusterId: T, attribute: A, value: ClusterAttributesOf<T>[A], log?: AnsiLogger): Promise<boolean>;
     setAttribute(clusterId: ClusterId | string, attribute: string, value: boolean | number | bigint | string | object | null, log?: AnsiLogger): Promise<boolean>;
     updateAttribute<T extends Behavior.Type, A extends keyof Behavior.StateOf<T>>(cluster: T, attribute: A, value: Behavior.StateOf<T>[A], log?: AnsiLogger): Promise<boolean>;
-    updateAttribute<T extends ClusterType, A extends keyof ClusterType.AttributeValues<T>>(cluster: T, attribute: A, value: ClusterType.AttributeValues<T>[A], log?: AnsiLogger): Promise<boolean>;
+    updateAttribute<T extends ClusterType, A extends keyof ClusterAttributesOf<T>>(cluster: T, attribute: A, value: ClusterAttributesOf<T>[A], log?: AnsiLogger): Promise<boolean>;
     updateAttribute(cluster: ClusterId | string, attribute: string, value: boolean | number | bigint | string | object | null, log?: AnsiLogger): Promise<boolean>;
     subscribeAttribute<T extends Behavior.Type, A extends keyof Behavior.StateOf<T>>(cluster: T, attribute: A, listener: (newValue: Behavior.StateOf<T>[A], oldValue: Behavior.StateOf<T>[A], context: ActionContext) => void, log?: AnsiLogger): Promise<boolean>;
-    subscribeAttribute<T extends ClusterType, A extends keyof ClusterType.AttributeValues<T>>(cluster: T, attribute: A, listener: (newValue: ClusterType.AttributeValues<T>[A], oldValue: ClusterType.AttributeValues<T>[A], context: ActionContext) => void, log?: AnsiLogger): Promise<boolean>;
+    subscribeAttribute<T extends ClusterType, A extends keyof ClusterAttributesOf<T>>(cluster: T, attribute: A, listener: (newValue: ClusterAttributesOf<T>[A], oldValue: ClusterAttributesOf<T>[A], context: ActionContext) => void, log?: AnsiLogger): Promise<boolean>;
     subscribeAttribute(cluster: ClusterId | string, attribute: string, listener: (newValue: any, oldValue: any, context: ActionContext) => void, log?: AnsiLogger): Promise<boolean>;
     setCluster<T extends Behavior.Type>(cluster: T, value: Behavior.StateOf<T>, log?: AnsiLogger): Promise<boolean>;
-    setCluster<T extends ClusterType>(cluster: T, value: ClusterType.AttributeValues<T>, log?: AnsiLogger): Promise<boolean>;
+    setCluster<T extends ClusterType>(cluster: T, value: ClusterAttributesOf<T>, log?: AnsiLogger): Promise<boolean>;
     setCluster(cluster: ClusterId | string, value: Record<string, boolean | number | bigint | string | object | undefined | null>, log?: AnsiLogger): Promise<boolean>;
     getCluster<T extends Behavior.Type>(cluster: T, log?: AnsiLogger): Behavior.StateOf<T> | undefined;
-    getCluster<T extends ClusterType>(cluster: T, log?: AnsiLogger): ClusterType.AttributeValues<T> | undefined;
+    getCluster<T extends ClusterType>(cluster: T, log?: AnsiLogger): ClusterAttributesOf<T> | undefined;
     getCluster(cluster: ClusterId | string, log?: AnsiLogger): Record<string, boolean | number | bigint | string | object | undefined | null> | undefined;
     triggerEvent<T extends Behavior.Type, E extends BehaviorEventName<T>>(cluster: T, event: E, payload: BehaviorEventPayload<T, E>, log?: AnsiLogger): Promise<boolean>;
     triggerEvent<T extends ClusterType, E extends ClusterEventName<T>>(cluster: T, event: E, payload: ClusterEventPayload<T, E>, log?: AnsiLogger): Promise<boolean>;
@@ -103,9 +115,7 @@ export declare class MatterbridgeEndpoint extends Endpoint {
     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<CommandHandlerExecutionResult<C>>;
     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<T extends ClusterType, C extends ClusterCommandName<T>>(cluster: T, command: C, params?: ClusterCommandParams<T, C>): Promise<void>;
     invokeBehaviorCommand(cluster: ClusterId | string, command: CommandHandlers, params?: Record<string, boolean | number | bigint | string | object | null>): Promise<void>;
     addRequiredClusterServers(): MatterbridgeEndpoint;
     addOptionalClusterServers(): MatterbridgeEndpoint;
@@ -158,7 +168,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?: Uint8Array | null, 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, presets?: Thermostat.Preset[], presetTypes?: Thermostat.PresetType[]): 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

@@ -905,7 +905,10 @@ 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 = null, 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, presets = [], presetTypes = [
+        { presetScenario: Thermostat.PresetScenario.Occupied, numberOfPresets: 2, presetTypeFeatures: { automatic: false, supportsNames: true } },
+        { presetScenario: Thermostat.PresetScenario.Unoccupied, numberOfPresets: 2, presetTypeFeatures: { automatic: false, supportsNames: true } },
+    ]) {
         this.behaviors.require(MatterbridgeThermostatServer.with(Thermostat.Feature.Heating, Thermostat.Feature.Cooling, Thermostat.Feature.AutoMode, ...(occupied !== undefined ? [Thermostat.Feature.Occupancy] : []), Thermostat.Feature.Presets), {
             localTemperature: localTemperature * 100,
             externalMeasuredIndoorTemperature: localTemperature * 100,
@@ -928,9 +931,9 @@ export class MatterbridgeEndpoint extends Endpoint {
             ...(occupied !== undefined ? { unoccupiedCoolingSetpoint: unoccupiedCoolingSetpoint !== undefined ? unoccupiedCoolingSetpoint * 100 : 2700 } : {}),
             ...(occupied !== undefined ? { occupancy: { occupied } } : {}),
             ...(occupied !== undefined ? { externallyMeasuredOccupancy: true } : {}),
-            numberOfPresets: Math.max(Array.isArray(presetsList) ? presetsList.length : 0, 10),
+            numberOfPresets: Math.max(Array.isArray(presets) ? presets.length : 0, 10),
             activePresetHandle: activePresetHandle ? Uint8Array.from([activePresetHandle]) : null,
-            presets: (presetsList ?? []).map((p) => ({
+            presets: (presets ?? []).map((p) => ({
                 presetHandle: p.presetHandle ? Uint8Array.from(p.presetHandle) : null,
                 presetScenario: p.presetScenario,
                 name: p.name,
@@ -1139,9 +1142,7 @@ export class MatterbridgeEndpoint extends Endpoint {
         this.behaviors.require(MatterbridgeSmokeCoAlarmServer.with(SmokeCoAlarm.Feature.SmokeAlarm, SmokeCoAlarm.Feature.CoAlarm).enable({
             events: {
                 smokeAlarm: true,
-                interconnectSmokeAlarm: false,
                 coAlarm: true,
-                interconnectCoAlarm: false,
                 lowBattery: true,
                 hardwareFault: true,
                 endOfService: true,
@@ -1166,7 +1167,6 @@ export class MatterbridgeEndpoint extends Endpoint {
         this.behaviors.require(MatterbridgeSmokeCoAlarmServer.with(SmokeCoAlarm.Feature.SmokeAlarm).enable({
             events: {
                 smokeAlarm: true,
-                interconnectSmokeAlarm: false,
                 lowBattery: true,
                 hardwareFault: true,
                 endOfService: true,
@@ -1190,7 +1190,6 @@ export class MatterbridgeEndpoint extends Endpoint {
         this.behaviors.require(MatterbridgeSmokeCoAlarmServer.with(SmokeCoAlarm.Feature.CoAlarm).enable({
             events: {
                 coAlarm: true,
-                interconnectCoAlarm: false,
                 lowBattery: true,
                 hardwareFault: true,
                 endOfService: true,

package/dist/matterbridgeEndpointCommandHandler.d.ts

@@ -1,6 +1,6 @@
 import { HandlerFunction } from '@matter/general';
-import { ActionContext } from '@matter/node';
-import type { Attribute } from '@matter/types/cluster';
+import { ActionContext } from '@matter/main';
+import type { ClusterType } from '@matter/types/cluster';
 import { ActivatedCarbonFilterMonitoring } from '@matter/types/clusters/activated-carbon-filter-monitoring';
 import { BooleanStateConfiguration } from '@matter/types/clusters/boolean-state-configuration';
 import { ColorControl } from '@matter/types/clusters/color-control';
@@ -118,7 +118,7 @@ type OptionalKeys<T> = {
         optional: true;
     } ? K : never;
 }[keyof T];
-type AttributeValue<T> = T extends Attribute<infer JsType, infer _F> ? JsType : never;
+type AttributeValue<T> = T extends ClusterType.Attribute<infer JsType> ? JsType : never;
 export type ClusterAttributeValues<T extends Record<string, unknown>> = {
     -readonly [K in Exclude<keyof T, OptionalKeys<T>>]: AttributeValue<T[K]>;
 } & {
@@ -411,62 +411,6 @@ export type CommandHandlerDataMap = {
         attributes: ClusterAttributeValues<(typeof DoorLock.Complete)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
-    'DoorLock.setPinCode': {
-        command: 'setPinCode';
-        request: DoorLock.SetPinCodeRequest;
-        cluster: 'doorLock';
-        attributes: ClusterAttributeValues<(typeof DoorLock.Complete)['attributes']>;
-        endpoint: MatterbridgeEndpoint;
-    };
-    'DoorLock.getPinCode': {
-        command: 'getPinCode';
-        request: DoorLock.GetPinCodeRequest;
-        cluster: 'doorLock';
-        attributes: ClusterAttributeValues<(typeof DoorLock.Complete)['attributes']>;
-        endpoint: MatterbridgeEndpoint;
-    };
-    'DoorLock.clearPinCode': {
-        command: 'clearPinCode';
-        request: DoorLock.ClearPinCodeRequest;
-        cluster: 'doorLock';
-        attributes: ClusterAttributeValues<(typeof DoorLock.Complete)['attributes']>;
-        endpoint: MatterbridgeEndpoint;
-    };
-    'DoorLock.clearAllPinCodes': {
-        command: 'clearAllPinCodes';
-        request: {};
-        cluster: 'doorLock';
-        attributes: ClusterAttributeValues<(typeof DoorLock.Complete)['attributes']>;
-        endpoint: MatterbridgeEndpoint;
-    };
-    'DoorLock.setUserStatus': {
-        command: 'setUserStatus';
-        request: DoorLock.SetUserStatusRequest;
-        cluster: 'doorLock';
-        attributes: ClusterAttributeValues<(typeof DoorLock.Complete)['attributes']>;
-        endpoint: MatterbridgeEndpoint;
-    };
-    'DoorLock.getUserStatus': {
-        command: 'getUserStatus';
-        request: DoorLock.GetUserStatusRequest;
-        cluster: 'doorLock';
-        attributes: ClusterAttributeValues<(typeof DoorLock.Complete)['attributes']>;
-        endpoint: MatterbridgeEndpoint;
-    };
-    'DoorLock.setUserType': {
-        command: 'setUserType';
-        request: DoorLock.SetUserTypeRequest;
-        cluster: 'doorLock';
-        attributes: ClusterAttributeValues<(typeof DoorLock.Complete)['attributes']>;
-        endpoint: MatterbridgeEndpoint;
-    };
-    'DoorLock.getUserType': {
-        command: 'getUserType';
-        request: DoorLock.GetUserTypeRequest;
-        cluster: 'doorLock';
-        attributes: ClusterAttributeValues<(typeof DoorLock.Complete)['attributes']>;
-        endpoint: MatterbridgeEndpoint;
-    };
     'DoorLock.setUser': {
         command: 'setUser';
         request: DoorLock.SetUserRequest;