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

package/dist/devices/closure.d.ts

@@ -1,295 +1,18 @@
-import { ClusterBehavior } from '@matter/node';
-import { ClusterType } from '@matter/types';
-import { ClosureControl } from '../clusters/closure-control.js';
+import { ClosureControlServer } from '@matter/node/behaviors/closure-control';
+import { ClosureControl } from '@matter/types/clusters/closure-control';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
-export declare namespace ClosureControlServer {
-    interface State {
-        mainState: ClosureControl.MainState;
-        currentErrorList: ClosureControl.ClosureError[];
-        overallCurrentState: ClosureControl.OverallCurrentState | null;
-        overallTargetState: ClosureControl.OverallTargetState | null;
-        countdownTime: number | null;
-    }
-}
-declare const ClosureControlServer_base: ClusterBehavior.Type<import("@matter/types").ClusterComposer.WithFeatures<ClusterType.Of<{
-    readonly id: 260;
-    readonly name: "ClosureControl";
-    readonly revision: 1;
-    readonly features: {
-        readonly positioning: import("@matter/types").BitFlag;
-        readonly motionLatching: import("@matter/types").BitFlag;
-        readonly instantaneous: import("@matter/types").BitFlag;
-        readonly speed: import("@matter/types").BitFlag;
-        readonly ventilation: import("@matter/types").BitFlag;
-        readonly pedestrian: import("@matter/types").BitFlag;
-        readonly calibration: import("@matter/types").BitFlag;
-        readonly protection: import("@matter/types").BitFlag;
-        readonly manuallyOperable: import("@matter/types").BitFlag;
-    };
-    readonly attributes: {
-        readonly mainState: import("@matter/types").Attribute<ClosureControl.MainState, any>;
-        readonly currentErrorList: import("@matter/types").Attribute<ClosureControl.ClosureError[], any>;
-        readonly overallCurrentState: import("@matter/types").Attribute<import("@matter/types").TypeFromFields<{
-            position: import("@matter/types").OptionalFieldType<ClosureControl.CurrentPosition | null>;
-            latch: import("@matter/types").OptionalFieldType<boolean | null>;
-            speed: import("@matter/types").OptionalFieldType<import("@matter/types").ThreeLevelAuto>;
-            secureState: import("@matter/types").OptionalFieldType<boolean | null>;
-        }> | null, any>;
-        readonly overallTargetState: import("@matter/types").Attribute<import("@matter/types").TypeFromFields<{
-            position: import("@matter/types").OptionalFieldType<ClosureControl.TargetPosition | null>;
-            latch: import("@matter/types").OptionalFieldType<boolean | null>;
-            speed: import("@matter/types").OptionalFieldType<import("@matter/types").ThreeLevelAuto>;
-        }> | null, any>;
-    };
-    readonly commands: {
-        readonly moveTo: import("@matter/types").Command<import("@matter/types").TypeFromFields<{
-            position: import("@matter/types").OptionalFieldType<ClosureControl.TargetPosition>;
-            latch: import("@matter/types").OptionalFieldType<boolean>;
-            speed: import("@matter/types").OptionalFieldType<import("@matter/types").ThreeLevelAuto>;
-        }>, void, any>;
-    };
-    readonly events: {
-        readonly operationalError: import("@matter/types").Event<import("@matter/types").TypeFromFields<{
-            errorState: import("@matter/types").FieldType<ClosureControl.ClosureError[]>;
-        }>, any>;
-        readonly secureStateChanged: import("@matter/types").Event<import("@matter/types").TypeFromFields<{
-            secureValue: import("@matter/types").FieldType<boolean>;
-        }>, any>;
-    };
-    readonly extensions: readonly [{
-        readonly flags: {
-            readonly instantaneous: false;
-        };
-        readonly component: {
-            readonly commands: {
-                readonly stop: import("@matter/types").Command<void, void, any>;
-            };
-            readonly events: {
-                readonly movementCompleted: import("@matter/types").Event<void, any>;
-            };
-        };
-    }, {
-        readonly flags: {
-            readonly motionLatching: true;
-        };
-        readonly component: {
-            readonly attributes: {
-                readonly latchControlModes: import("@matter/types").FixedAttribute<import("@matter/types").TypeFromPartialBitSchema<{
-                    remoteLatching: import("@matter/types").BitFlag;
-                    remoteUnlatching: import("@matter/types").BitFlag;
-                }>, any>;
-            };
-        };
-    }, {
-        readonly flags: {
-            readonly calibration: true;
-        };
-        readonly component: {
-            readonly commands: {
-                readonly calibrate: import("@matter/types").Command<void, void, any>;
-            };
-        };
-    }, {
-        readonly flags: {
-            readonly manuallyOperable: true;
-        };
-        readonly component: {
-            readonly events: {
-                readonly engageStateChanged: import("@matter/types").Event<import("@matter/types").TypeFromFields<{
-                    engageValue: import("@matter/types").FieldType<boolean>;
-                }>, any>;
-            };
-        };
-    }, {
-        readonly flags: {
-            readonly positioning: true;
-            readonly instantaneous: false;
-        };
-        readonly component: {
-            readonly attributes: {
-                readonly countdownTime: import("@matter/types").Attribute<number | null, any>;
-            };
-        };
-    }, {
-        readonly flags: {
-            readonly positioning: false;
-            readonly motionLatching: false;
-        };
-        readonly component: false;
-    }, {
-        readonly flags: {
-            readonly speed: true;
-            readonly positioning: false;
-        };
-        readonly component: false;
-    }, {
-        readonly flags: {
-            readonly speed: true;
-            readonly instantaneous: true;
-        };
-        readonly component: false;
-    }, {
-        readonly flags: {
-            readonly ventilation: true;
-            readonly positioning: false;
-        };
-        readonly component: false;
-    }, {
-        readonly flags: {
-            readonly pedestrian: true;
-            readonly positioning: false;
-        };
-        readonly component: false;
-    }, {
-        readonly flags: {
-            readonly calibration: true;
-            readonly positioning: false;
-        };
-        readonly component: false;
-    }];
-}>, readonly [ClosureControl.Feature.Positioning]>, ClusterBehavior.Type<ClusterType.Of<{
-    readonly id: 260;
-    readonly name: "ClosureControl";
-    readonly revision: 1;
-    readonly features: {
-        readonly positioning: import("@matter/types").BitFlag;
-        readonly motionLatching: import("@matter/types").BitFlag;
-        readonly instantaneous: import("@matter/types").BitFlag;
-        readonly speed: import("@matter/types").BitFlag;
-        readonly ventilation: import("@matter/types").BitFlag;
-        readonly pedestrian: import("@matter/types").BitFlag;
-        readonly calibration: import("@matter/types").BitFlag;
-        readonly protection: import("@matter/types").BitFlag;
-        readonly manuallyOperable: import("@matter/types").BitFlag;
-    };
-    readonly attributes: {
-        readonly mainState: import("@matter/types").Attribute<ClosureControl.MainState, any>;
-        readonly currentErrorList: import("@matter/types").Attribute<ClosureControl.ClosureError[], any>;
-        readonly overallCurrentState: import("@matter/types").Attribute<import("@matter/types").TypeFromFields<{
-            position: import("@matter/types").OptionalFieldType<ClosureControl.CurrentPosition | null>;
-            latch: import("@matter/types").OptionalFieldType<boolean | null>;
-            speed: import("@matter/types").OptionalFieldType<import("@matter/types").ThreeLevelAuto>;
-            secureState: import("@matter/types").OptionalFieldType<boolean | null>;
-        }> | null, any>;
-        readonly overallTargetState: import("@matter/types").Attribute<import("@matter/types").TypeFromFields<{
-            position: import("@matter/types").OptionalFieldType<ClosureControl.TargetPosition | null>;
-            latch: import("@matter/types").OptionalFieldType<boolean | null>;
-            speed: import("@matter/types").OptionalFieldType<import("@matter/types").ThreeLevelAuto>;
-        }> | null, any>;
-    };
-    readonly commands: {
-        readonly moveTo: import("@matter/types").Command<import("@matter/types").TypeFromFields<{
-            position: import("@matter/types").OptionalFieldType<ClosureControl.TargetPosition>;
-            latch: import("@matter/types").OptionalFieldType<boolean>;
-            speed: import("@matter/types").OptionalFieldType<import("@matter/types").ThreeLevelAuto>;
-        }>, void, any>;
-    };
-    readonly events: {
-        readonly operationalError: import("@matter/types").Event<import("@matter/types").TypeFromFields<{
-            errorState: import("@matter/types").FieldType<ClosureControl.ClosureError[]>;
-        }>, any>;
-        readonly secureStateChanged: import("@matter/types").Event<import("@matter/types").TypeFromFields<{
-            secureValue: import("@matter/types").FieldType<boolean>;
-        }>, any>;
-    };
-    readonly extensions: readonly [{
-        readonly flags: {
-            readonly instantaneous: false;
-        };
-        readonly component: {
-            readonly commands: {
-                readonly stop: import("@matter/types").Command<void, void, any>;
-            };
-            readonly events: {
-                readonly movementCompleted: import("@matter/types").Event<void, any>;
-            };
-        };
-    }, {
-        readonly flags: {
-            readonly motionLatching: true;
-        };
-        readonly component: {
-            readonly attributes: {
-                readonly latchControlModes: import("@matter/types").FixedAttribute<import("@matter/types").TypeFromPartialBitSchema<{
-                    remoteLatching: import("@matter/types").BitFlag;
-                    remoteUnlatching: import("@matter/types").BitFlag;
-                }>, any>;
-            };
-        };
-    }, {
-        readonly flags: {
-            readonly calibration: true;
-        };
-        readonly component: {
-            readonly commands: {
-                readonly calibrate: import("@matter/types").Command<void, void, any>;
-            };
-        };
-    }, {
-        readonly flags: {
-            readonly manuallyOperable: true;
-        };
-        readonly component: {
-            readonly events: {
-                readonly engageStateChanged: import("@matter/types").Event<import("@matter/types").TypeFromFields<{
-                    engageValue: import("@matter/types").FieldType<boolean>;
-                }>, any>;
-            };
-        };
-    }, {
-        readonly flags: {
-            readonly positioning: true;
-            readonly instantaneous: false;
-        };
-        readonly component: {
-            readonly attributes: {
-                readonly countdownTime: import("@matter/types").Attribute<number | null, any>;
-            };
-        };
-    }, {
-        readonly flags: {
-            readonly positioning: false;
-            readonly motionLatching: false;
-        };
-        readonly component: false;
-    }, {
-        readonly flags: {
-            readonly speed: true;
-            readonly positioning: false;
-        };
-        readonly component: false;
-    }, {
-        readonly flags: {
-            readonly speed: true;
-            readonly instantaneous: true;
-        };
-        readonly component: false;
-    }, {
-        readonly flags: {
-            readonly ventilation: true;
-            readonly positioning: false;
-        };
-        readonly component: false;
-    }, {
-        readonly flags: {
-            readonly pedestrian: true;
-            readonly positioning: false;
-        };
-        readonly component: false;
-    }, {
-        readonly flags: {
-            readonly calibration: true;
-            readonly positioning: false;
-        };
-        readonly component: false;
-    }];
-}>, typeof ClusterBehavior, {
-    components: never[];
-}>, {
-    components: never[];
-}>;
-export declare class ClosureControlServer extends ClosureControlServer_base {
-    state: ClosureControlServer.State;
+declare const MatterbridgeClosureControlServer_base: import("@matter/node").ClusterBehavior.Type<typeof ClosureControlServer, import("@matter/types").ClusterType.WithSupportedFeatures<ClosureControl, {
+    speed: true;
+    positioning: true;
+    motionLatching: true;
+    instantaneous: false;
+    ventilation: false;
+    pedestrian: false;
+    calibration: false;
+    protection: false;
+    manuallyOperable: false;
+}>, import("@matter/types").ClusterType.Concrete, new () => {}, "closureControl">;
+export declare class MatterbridgeClosureControlServer extends MatterbridgeClosureControlServer_base {
     moveTo: (request: ClosureControl.MoveToRequest) => Promise<void>;
     stop: () => Promise<void>;
 }

package/dist/devices/closure.js

@@ -1,17 +1,10 @@
-import { AttributeElement, ClusterElement, ClusterModel, CommandElement, DatatypeElement, EventElement, FieldElement } from '@matter/main/model';
-import { ClusterBehavior } from '@matter/node';
-import { ClusterType } from '@matter/types';
+import { ClosureControlServer } from '@matter/node/behaviors/closure-control';
+import { ClosureControl } from '@matter/types/clusters/closure-control';
+import { ThreeLevelAuto } from '@matter/types/globals';
 import { MatterbridgeServer } from '../behaviors/matterbridgeServer.js';
-import { ClosureControl } from '../clusters/closure-control.js';
 import { closure } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
-const ClosureControlSchema = ClusterElement({
-    id: ClosureControl.Cluster.id,
-    name: ClosureControl.Cluster.name,
-    classification: 'application',
-}, AttributeElement({ id: 0xfffd, name: 'ClusterRevision', type: 'ClusterRevision', conformance: 'M', default: ClosureControl.Base.revision }), AttributeElement({ id: 0xfffc, name: 'FeatureMap', type: 'FeatureMap', conformance: 'M' }, FieldElement({ name: 'POS', constraint: '0', title: 'Positioning' }), FieldElement({ name: 'ML', constraint: '1', title: 'MotionLatching' }), FieldElement({ name: 'INS', constraint: '2', title: 'Instantaneous' }), FieldElement({ name: 'SPD', constraint: '3', title: 'Speed' }), FieldElement({ name: 'VNT', constraint: '4', title: 'Ventilation' }), FieldElement({ name: 'PED', constraint: '5', title: 'Pedestrian' }), FieldElement({ name: 'CAL', constraint: '6', title: 'Calibration' }), FieldElement({ name: 'PRT', constraint: '7', title: 'Protection' }), FieldElement({ name: 'MAN', constraint: '8', title: 'ManuallyOperable' })), AttributeElement({ name: 'CountdownTime', id: 0x0000, type: 'uint32', conformance: 'POS', default: null, quality: 'X' }), AttributeElement({ name: 'MainState', id: 0x0001, type: 'MainStateEnum', conformance: 'M', constraint: 'desc' }), AttributeElement({ name: 'CurrentErrorList', id: 0x0002, type: 'list', conformance: 'M', default: [] }, FieldElement({ name: 'entry', type: 'ClosureErrorEnum' })), AttributeElement({ name: 'OverallCurrentState', id: 0x0003, type: 'OverallCurrentStateStruct', conformance: 'M', default: null, quality: 'X' }), AttributeElement({ name: 'OverallTargetState', id: 0x0004, type: 'OverallTargetStateStruct', conformance: 'M', default: null, quality: 'X' }), CommandElement({ name: 'Stop', id: 0x0000, conformance: 'M', direction: 'request', response: 'status' }), CommandElement({ name: 'MoveTo', id: 0x0001, conformance: 'M', direction: 'request', response: 'status' }, FieldElement({ name: 'Position', id: 0, type: 'TargetPositionEnum', conformance: 'O' }), FieldElement({ name: 'Latch', id: 1, type: 'bool', conformance: 'O' }), FieldElement({ name: 'Speed', id: 2, type: 'ThreeLevelAutoEnum', conformance: 'O' })), EventElement({ name: 'OperationalError', id: 0x0000, conformance: 'M', priority: 'critical' }, FieldElement({ name: 'ErrorState', id: 0, type: 'list', conformance: 'M', constraint: 'max 10' }, FieldElement({ name: 'entry', type: 'ClosureErrorEnum' }))), EventElement({ name: 'MovementCompleted', id: 0x0001, conformance: 'M', priority: 'info' }), EventElement({ name: 'SecureStateChanged', id: 0x0003, conformance: 'M', priority: 'info' }, FieldElement({ name: 'SecureValue', id: 0, type: 'bool', conformance: 'M' })), DatatypeElement({ name: 'ClosureErrorEnum', type: 'enum8' }, FieldElement({ name: 'PhysicallyBlocked', id: 0, conformance: 'M' }), FieldElement({ name: 'BlockedBySensor', id: 1, conformance: 'M' }), FieldElement({ name: 'TemperatureLimited', id: 2, conformance: 'M' }), FieldElement({ name: 'MaintenanceRequired', id: 3, conformance: 'M' }), FieldElement({ name: 'InternalInterference', id: 4, conformance: 'M' })), DatatypeElement({ name: 'CurrentPositionEnum', type: 'enum8' }, FieldElement({ name: 'FullyClosed', id: 0, conformance: 'M' }), FieldElement({ name: 'FullyOpened', id: 1, conformance: 'M' }), FieldElement({ name: 'PartiallyOpened', id: 2, conformance: 'M' }), FieldElement({ name: 'OpenedForPedestrian', id: 3, conformance: 'M' }), FieldElement({ name: 'OpenedForVentilation', id: 4, conformance: 'M' }), FieldElement({ name: 'OpenedAtSignature', id: 5, conformance: 'M' })), DatatypeElement({ name: 'MainStateEnum', type: 'enum8' }, FieldElement({ name: 'Stopped', id: 0, conformance: 'M' }), FieldElement({ name: 'Moving', id: 1, conformance: 'M' }), FieldElement({ name: 'WaitingForMotion', id: 2, conformance: 'M' }), FieldElement({ name: 'Error', id: 3, conformance: 'M' }), FieldElement({ name: 'Calibrating', id: 4, conformance: 'M' }), FieldElement({ name: 'Protected', id: 5, conformance: 'M' }), FieldElement({ name: 'Disengaged', id: 6, conformance: 'M' }), FieldElement({ name: 'SetupRequired', id: 7, conformance: 'M' })), DatatypeElement({ name: 'TargetPositionEnum', type: 'enum8' }, FieldElement({ name: 'MoveToFullyClosed', id: 0, conformance: 'M' }), FieldElement({ name: 'MoveToFullyOpen', id: 1, conformance: 'M' }), FieldElement({ name: 'MoveToPedestrianPosition', id: 2, conformance: 'M' }), FieldElement({ name: 'MoveToVentilationPosition', id: 3, conformance: 'M' }), FieldElement({ name: 'MoveToSignaturePosition', id: 4, conformance: 'M' })), DatatypeElement({ name: 'OverallCurrentStateStruct', type: 'struct' }, FieldElement({ name: 'Position', id: 0, type: 'CurrentPositionEnum', conformance: 'O', default: null, quality: 'X' }), FieldElement({ name: 'Latch', id: 1, type: 'bool', conformance: 'O', default: null, quality: 'X' }), FieldElement({ name: 'Speed', id: 2, type: 'ThreeLevelAutoEnum', conformance: 'O' }), FieldElement({ name: 'SecureState', id: 3, type: 'bool', conformance: 'O', default: null, quality: 'X' })), DatatypeElement({ name: 'OverallTargetStateStruct', type: 'struct' }, FieldElement({ name: 'Position', id: 0, type: 'TargetPositionEnum', conformance: 'O', default: null, quality: 'X' }), FieldElement({ name: 'Latch', id: 1, type: 'bool', conformance: 'O', default: null, quality: 'X' }), FieldElement({ name: 'Speed', id: 2, type: 'ThreeLevelAutoEnum', conformance: 'O' })));
-const ClosureControlBehavior = ClusterBehavior.for(ClusterType(ClosureControl.Base), new ClusterModel(ClosureControlSchema));
-export class ClosureControlServer extends ClosureControlBehavior.with(ClosureControl.Feature.Positioning) {
+export class MatterbridgeClosureControlServer extends ClosureControlServer.with(ClosureControl.Feature.Positioning, ClosureControl.Feature.MotionLatching, ClosureControl.Feature.Speed) {
     moveTo = async (request) => {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`MoveTo (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
@@ -27,7 +20,7 @@ export class ClosureControlServer extends ClosureControlBehavior.with(ClosureCon
             ...previousTarget,
             ...(request?.position !== undefined ? { position: request.position } : null),
             ...(request?.latch !== undefined ? { latch: request.latch } : null),
-            ...(request?.speed !== undefined ? { speed: request.speed } : null),
+            speed: request?.speed ?? previousTarget.speed ?? ThreeLevelAuto.Auto,
         };
         this.state.overallTargetState = nextTarget;
         this.state.mainState = ClosureControl.MainState.Moving;
@@ -50,7 +43,7 @@ export class Closure extends MatterbridgeEndpoint {
         super([closure], { id: `${name.replaceAll(' ', '')}-${serial.replaceAll(' ', '')}` });
         this.createDefaultIdentifyClusterServer();
         this.createDefaultBasicInformationClusterServer(name, serial, 0xfff1, 'Matterbridge', 0x8000, 'Matterbridge Closure');
-        this.behaviors.require(ClosureControlServer, {
+        this.behaviors.require(MatterbridgeClosureControlServer, {
             mainState: options.mainState ?? ClosureControl.MainState.Stopped,
             currentErrorList: [],
             overallCurrentState: null,