homebridge 2.5.0 → 2.5.1-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +11 -11
- package/dist/matter/MatterAPIImpl.d.ts +7 -0
- package/dist/matter/MatterAPIImpl.d.ts.map +1 -1
- package/dist/matter/MatterBridgeManager.d.ts.map +1 -1
- package/dist/matter/MatterBridgeManager.js +3 -20
- package/dist/matter/MatterBridgeManager.js.map +1 -1
- package/dist/matter/behaviors/ConcentrationMeasurementBehavior.d.ts +10 -5
- package/dist/matter/behaviors/ConcentrationMeasurementBehavior.d.ts.map +1 -1
- package/dist/matter/behaviors/ConcentrationMeasurementBehavior.js +10 -5
- package/dist/matter/behaviors/ConcentrationMeasurementBehavior.js.map +1 -1
- package/dist/matter/behaviors/DeviceEnergyManagementBehavior.d.ts +4 -3
- package/dist/matter/behaviors/DeviceEnergyManagementBehavior.d.ts.map +1 -1
- package/dist/matter/behaviors/DeviceEnergyManagementBehavior.js +10 -2
- package/dist/matter/behaviors/DeviceEnergyManagementBehavior.js.map +1 -1
- package/dist/matter/behaviors/EnergyEvseBehavior.d.ts +4 -3
- package/dist/matter/behaviors/EnergyEvseBehavior.d.ts.map +1 -1
- package/dist/matter/behaviors/EnergyEvseBehavior.js +10 -2
- package/dist/matter/behaviors/EnergyEvseBehavior.js.map +1 -1
- package/dist/matter/behaviors/LevelControlBehavior.d.ts +21 -0
- package/dist/matter/behaviors/LevelControlBehavior.d.ts.map +1 -1
- package/dist/matter/behaviors/LevelControlBehavior.js +88 -0
- package/dist/matter/behaviors/LevelControlBehavior.js.map +1 -1
- package/dist/matter/behaviors/RvcCleanModeBehavior.d.ts +6 -1
- package/dist/matter/behaviors/RvcCleanModeBehavior.d.ts.map +1 -1
- package/dist/matter/behaviors/RvcCleanModeBehavior.js +28 -0
- package/dist/matter/behaviors/RvcCleanModeBehavior.js.map +1 -1
- package/dist/matter/behaviors/RvcRunModeBehavior.d.ts +1 -1
- package/dist/matter/behaviors/RvcRunModeBehavior.d.ts.map +1 -1
- package/dist/matter/behaviors/RvcRunModeBehavior.js +7 -0
- package/dist/matter/behaviors/RvcRunModeBehavior.js.map +1 -1
- package/dist/matter/behaviors/WaterHeaterBehavior.d.ts +5 -4
- package/dist/matter/behaviors/WaterHeaterBehavior.d.ts.map +1 -1
- package/dist/matter/behaviors/WaterHeaterBehavior.js +11 -3
- package/dist/matter/behaviors/WaterHeaterBehavior.js.map +1 -1
- package/dist/matter/clusterHandlerMap.d.ts +3 -0
- package/dist/matter/clusterHandlerMap.d.ts.map +1 -1
- package/dist/matter/clusterStateMap.d.ts +52 -35
- package/dist/matter/clusterStateMap.d.ts.map +1 -1
- package/dist/matter/server/AccessoryManager.d.ts.map +1 -1
- package/dist/matter/server/AccessoryManager.js +5 -1
- package/dist/matter/server/AccessoryManager.js.map +1 -1
- package/dist/matter/server/AccessoryQuery.d.ts +10 -0
- package/dist/matter/server/AccessoryQuery.d.ts.map +1 -1
- package/dist/matter/server/AccessoryQuery.js +29 -0
- package/dist/matter/server/AccessoryQuery.js.map +1 -1
- package/dist/matter/server/BehaviorMap.d.ts +5 -4
- package/dist/matter/server/BehaviorMap.d.ts.map +1 -1
- package/dist/matter/server/BehaviorMap.js +5 -4
- package/dist/matter/server/BehaviorMap.js.map +1 -1
- package/dist/matter/server.d.ts +1 -0
- package/dist/matter/server.d.ts.map +1 -1
- package/dist/matter/server.js +3 -0
- package/dist/matter/server.js.map +1 -1
- package/dist/matter/serverHelpers.d.ts +29 -0
- package/dist/matter/serverHelpers.d.ts.map +1 -1
- package/dist/matter/serverHelpers.js +115 -0
- package/dist/matter/serverHelpers.js.map +1 -1
- package/dist/matter/types.d.ts +7 -0
- package/dist/matter/types.d.ts.map +1 -1
- package/dist/matter/types.js +7 -0
- package/dist/matter/types.js.map +1 -1
- package/package.json +2 -2
|
@@ -14,6 +14,22 @@ export class HomebridgeLevelControlServer extends LevelControlServer {
|
|
|
14
14
|
getRegistry() {
|
|
15
15
|
return getRegistryManager(this.endpoint).getRegistry(this.endpoint.id);
|
|
16
16
|
}
|
|
17
|
+
/**
|
|
18
|
+
* Run the plugin's handler for a level command that also switches on or off.
|
|
19
|
+
*
|
|
20
|
+
* Plugins rarely register these exact names: the docs and examples only show
|
|
21
|
+
* moveToLevelWithOnOff. So fall back to the plain command's handler, which
|
|
22
|
+
* takes the same request, and with neither let matter.js carry on as it did
|
|
23
|
+
* before these were routed, rather than fail a command that used to work
|
|
24
|
+
*/
|
|
25
|
+
async runWithOnOffHandler(commandName, fallbackName, request) {
|
|
26
|
+
const endpointId = this.endpoint.id;
|
|
27
|
+
const registry = this.getRegistry();
|
|
28
|
+
const handlerName = [commandName, fallbackName].find(name => registry.getHandler(endpointId, 'levelControl', name));
|
|
29
|
+
if (handlerName) {
|
|
30
|
+
await registry.executeHandler(endpointId, 'levelControl', handlerName, request);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
17
33
|
/**
|
|
18
34
|
* Handle moveToLevel command
|
|
19
35
|
*/
|
|
@@ -164,5 +180,77 @@ export class HomebridgeLevelControlServer extends LevelControlServer {
|
|
|
164
180
|
throw new StatusResponseError(`Failed to set level with on/off: ${message}`, Status.Failure);
|
|
165
181
|
}
|
|
166
182
|
}
|
|
183
|
+
/**
|
|
184
|
+
* Handle moveWithOnOff command
|
|
185
|
+
*/
|
|
186
|
+
async moveWithOnOff(request) {
|
|
187
|
+
try {
|
|
188
|
+
// Execute user handler, falling back to the plain move handler
|
|
189
|
+
await this.runWithOnOffHandler('moveWithOnOff', 'move', request);
|
|
190
|
+
// Only reached if handler succeeded
|
|
191
|
+
await super.moveWithOnOff(request);
|
|
192
|
+
}
|
|
193
|
+
catch (error) {
|
|
194
|
+
// If user handler already threw a StatusResponseError, propagate it as-is
|
|
195
|
+
// This sends a proper Matter protocol error response to the controller
|
|
196
|
+
if (MatterStatus.isMatterProtocolError(error)) {
|
|
197
|
+
throw error;
|
|
198
|
+
}
|
|
199
|
+
// For other errors, wrap in appropriate StatusResponseError
|
|
200
|
+
// This prevents the endpoint from crashing and keeps the device online
|
|
201
|
+
const message = error instanceof Error
|
|
202
|
+
? error.message
|
|
203
|
+
: String(error);
|
|
204
|
+
throw new StatusResponseError(`Failed to move level with on/off: ${message}`, Status.Failure);
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
/**
|
|
208
|
+
* Handle stepWithOnOff command
|
|
209
|
+
*/
|
|
210
|
+
async stepWithOnOff(request) {
|
|
211
|
+
try {
|
|
212
|
+
// Execute user handler, falling back to the plain step handler
|
|
213
|
+
await this.runWithOnOffHandler('stepWithOnOff', 'step', request);
|
|
214
|
+
// Only reached if handler succeeded
|
|
215
|
+
await super.stepWithOnOff(request);
|
|
216
|
+
}
|
|
217
|
+
catch (error) {
|
|
218
|
+
// If user handler already threw a StatusResponseError, propagate it as-is
|
|
219
|
+
// This sends a proper Matter protocol error response to the controller
|
|
220
|
+
if (MatterStatus.isMatterProtocolError(error)) {
|
|
221
|
+
throw error;
|
|
222
|
+
}
|
|
223
|
+
// For other errors, wrap in appropriate StatusResponseError
|
|
224
|
+
// This prevents the endpoint from crashing and keeps the device online
|
|
225
|
+
const message = error instanceof Error
|
|
226
|
+
? error.message
|
|
227
|
+
: String(error);
|
|
228
|
+
throw new StatusResponseError(`Failed to step level with on/off: ${message}`, Status.Failure);
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
/**
|
|
232
|
+
* Handle stopWithOnOff command
|
|
233
|
+
*/
|
|
234
|
+
async stopWithOnOff(request) {
|
|
235
|
+
try {
|
|
236
|
+
// Execute user handler, falling back to the plain stop handler
|
|
237
|
+
await this.runWithOnOffHandler('stopWithOnOff', 'stop', request);
|
|
238
|
+
// Only reached if handler succeeded
|
|
239
|
+
await super.stopWithOnOff(request);
|
|
240
|
+
}
|
|
241
|
+
catch (error) {
|
|
242
|
+
// If user handler already threw a StatusResponseError, propagate it as-is
|
|
243
|
+
// This sends a proper Matter protocol error response to the controller
|
|
244
|
+
if (MatterStatus.isMatterProtocolError(error)) {
|
|
245
|
+
throw error;
|
|
246
|
+
}
|
|
247
|
+
// For other errors, wrap in appropriate StatusResponseError
|
|
248
|
+
// This prevents the endpoint from crashing and keeps the device online
|
|
249
|
+
const message = error instanceof Error
|
|
250
|
+
? error.message
|
|
251
|
+
: String(error);
|
|
252
|
+
throw new StatusResponseError(`Failed to stop level change with on/off: ${message}`, Status.Failure);
|
|
253
|
+
}
|
|
254
|
+
}
|
|
167
255
|
}
|
|
168
256
|
//# sourceMappingURL=LevelControlBehavior.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LevelControlBehavior.js","sourceRoot":"","sources":["../../../src/matter/behaviors/LevelControlBehavior.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"LevelControlBehavior.js","sourceRoot":"","sources":["../../../src/matter/behaviors/LevelControlBehavior.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Handles robotic vacuum cleaner cleaning mode changes
|
|
5
5
|
*/
|
|
6
|
-
import type { ModeBase } from '@matter/main/clusters';
|
|
7
6
|
import { RvcCleanModeServer } from '@matter/main/behaviors/rvc-clean-mode';
|
|
7
|
+
import { ModeBase } from '@matter/main/clusters';
|
|
8
8
|
/**
|
|
9
9
|
* Custom RvcCleanMode Server that calls plugin handlers
|
|
10
10
|
*/
|
|
@@ -13,6 +13,11 @@ export declare class HomebridgeRvcCleanModeServer extends RvcCleanModeServer {
|
|
|
13
13
|
* Get the registry for this behavior's endpoint
|
|
14
14
|
*/
|
|
15
15
|
private getRegistry;
|
|
16
|
+
/**
|
|
17
|
+
* Whether the RvcRunMode cluster's current mode carries the Idle tag.
|
|
18
|
+
* An endpoint without a run mode cluster counts as idle - there is nothing to check against.
|
|
19
|
+
*/
|
|
20
|
+
private isRunModeIdle;
|
|
16
21
|
/**
|
|
17
22
|
* Handle change to mode command
|
|
18
23
|
* Changes the vacuum's cleaning mode (e.g., quick clean, deep clean, spot clean)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RvcCleanModeBehavior.d.ts","sourceRoot":"","sources":["../../../src/matter/behaviors/RvcCleanModeBehavior.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"RvcCleanModeBehavior.d.ts","sourceRoot":"","sources":["../../../src/matter/behaviors/RvcCleanModeBehavior.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAA;AAE1E,OAAO,EAAE,QAAQ,EAAc,MAAM,uBAAuB,CAAA;AAM5D;;GAEG;AACH,qBAAa,4BAA6B,SAAQ,kBAAkB;IAClE;;OAEG;IACH,OAAO,CAAC,WAAW;IAInB;;;OAGG;IACH,OAAO,CAAC,aAAa;IAUrB;;;;;;OAMG;IACY,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,mBAAmB,GAAG,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC;CA8C3G"}
|
|
@@ -3,7 +3,10 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Handles robotic vacuum cleaner cleaning mode changes
|
|
5
5
|
*/
|
|
6
|
+
import { ModeUtils } from '@matter/main/behaviors/mode-base';
|
|
6
7
|
import { RvcCleanModeServer } from '@matter/main/behaviors/rvc-clean-mode';
|
|
8
|
+
import { RvcRunModeBehavior } from '@matter/main/behaviors/rvc-run-mode';
|
|
9
|
+
import { ModeBase, RvcRunMode } from '@matter/main/clusters';
|
|
7
10
|
import { Status, StatusResponseError } from '@matter/main/types';
|
|
8
11
|
import { MatterStatus } from '../errors.js';
|
|
9
12
|
import { getRegistryManager } from './EndpointContext.js';
|
|
@@ -17,6 +20,19 @@ export class HomebridgeRvcCleanModeServer extends RvcCleanModeServer {
|
|
|
17
20
|
getRegistry() {
|
|
18
21
|
return getRegistryManager(this.endpoint).getRegistry(this.endpoint.id);
|
|
19
22
|
}
|
|
23
|
+
/**
|
|
24
|
+
* Whether the RvcRunMode cluster's current mode carries the Idle tag.
|
|
25
|
+
* An endpoint without a run mode cluster counts as idle - there is nothing to check against.
|
|
26
|
+
*/
|
|
27
|
+
isRunModeIdle() {
|
|
28
|
+
const runMode = this.agent.maybeGet(RvcRunModeBehavior);
|
|
29
|
+
if (!runMode) {
|
|
30
|
+
return true;
|
|
31
|
+
}
|
|
32
|
+
const { currentMode, supportedModes } = runMode.state;
|
|
33
|
+
const current = supportedModes.find(({ mode }) => mode === currentMode);
|
|
34
|
+
return current?.modeTags.some(({ value }) => value === RvcRunMode.ModeTag.Idle) ?? false;
|
|
35
|
+
}
|
|
20
36
|
/**
|
|
21
37
|
* Handle change to mode command
|
|
22
38
|
* Changes the vacuum's cleaning mode (e.g., quick clean, deep clean, spot clean)
|
|
@@ -27,6 +43,18 @@ export class HomebridgeRvcCleanModeServer extends RvcCleanModeServer {
|
|
|
27
43
|
async changeToMode(request) {
|
|
28
44
|
const endpointId = this.endpoint.id;
|
|
29
45
|
const registry = this.getRegistry();
|
|
46
|
+
// matter.js only checks the mode in super.changeToMode, after the handler has run
|
|
47
|
+
const modeCheck = ModeUtils.assertModeChange(this.state.supportedModes, this.state.currentMode, request.newMode);
|
|
48
|
+
if (modeCheck.status !== ModeBase.ModeChangeStatus.Success) {
|
|
49
|
+
return modeCheck;
|
|
50
|
+
}
|
|
51
|
+
// Without DirectModeChange the spec only allows clean-mode changes while the run mode is idle
|
|
52
|
+
if (!this.features.directModeChange && !this.isRunModeIdle()) {
|
|
53
|
+
return {
|
|
54
|
+
status: ModeBase.ModeChangeStatus.InvalidInMode,
|
|
55
|
+
statusText: 'Cannot change clean mode while the device is not idle',
|
|
56
|
+
};
|
|
57
|
+
}
|
|
30
58
|
try {
|
|
31
59
|
// Execute user handler
|
|
32
60
|
await registry.executeHandler(endpointId, 'rvcCleanMode', 'changeToMode', request);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RvcCleanModeBehavior.js","sourceRoot":"","sources":["../../../src/matter/behaviors/RvcCleanModeBehavior.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"RvcCleanModeBehavior.js","sourceRoot":"","sources":["../../../src/matter/behaviors/RvcCleanModeBehavior.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Handles robotic vacuum cleaner run mode changes
|
|
5
5
|
*/
|
|
6
|
-
import type { ModeBase } from '@matter/main/clusters';
|
|
7
6
|
import { RvcRunModeServer } from '@matter/main/behaviors/rvc-run-mode';
|
|
7
|
+
import { ModeBase } from '@matter/main/clusters';
|
|
8
8
|
/**
|
|
9
9
|
* Custom RvcRunMode Server that calls plugin handlers
|
|
10
10
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RvcRunModeBehavior.d.ts","sourceRoot":"","sources":["../../../src/matter/behaviors/RvcRunModeBehavior.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"RvcRunModeBehavior.d.ts","sourceRoot":"","sources":["../../../src/matter/behaviors/RvcRunModeBehavior.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAA;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAMhD;;GAEG;AACH,qBAAa,0BAA2B,SAAQ,gBAAgB;IAC9D;;OAEG;IACH,OAAO,CAAC,WAAW;IAInB;;;;;;OAMG;IACY,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,mBAAmB,GAAG,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC;CAsC3G"}
|
|
@@ -3,7 +3,9 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Handles robotic vacuum cleaner run mode changes
|
|
5
5
|
*/
|
|
6
|
+
import { ModeUtils } from '@matter/main/behaviors/mode-base';
|
|
6
7
|
import { RvcRunModeServer } from '@matter/main/behaviors/rvc-run-mode';
|
|
8
|
+
import { ModeBase } from '@matter/main/clusters';
|
|
7
9
|
import { Status, StatusResponseError } from '@matter/main/types';
|
|
8
10
|
import { MatterStatus } from '../errors.js';
|
|
9
11
|
import { getRegistryManager } from './EndpointContext.js';
|
|
@@ -27,6 +29,11 @@ export class HomebridgeRvcRunModeServer extends RvcRunModeServer {
|
|
|
27
29
|
async changeToMode(request) {
|
|
28
30
|
const endpointId = this.endpoint.id;
|
|
29
31
|
const registry = this.getRegistry();
|
|
32
|
+
// matter.js only checks the mode in super.changeToMode, after the handler has run
|
|
33
|
+
const modeCheck = ModeUtils.assertModeChange(this.state.supportedModes, this.state.currentMode, request.newMode);
|
|
34
|
+
if (modeCheck.status !== ModeBase.ModeChangeStatus.Success) {
|
|
35
|
+
return modeCheck;
|
|
36
|
+
}
|
|
30
37
|
try {
|
|
31
38
|
// Execute user handler
|
|
32
39
|
await registry.executeHandler(endpointId, 'rvcRunMode', 'changeToMode', request);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RvcRunModeBehavior.js","sourceRoot":"","sources":["../../../src/matter/behaviors/RvcRunModeBehavior.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"RvcRunModeBehavior.js","sourceRoot":"","sources":["../../../src/matter/behaviors/RvcRunModeBehavior.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAA;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAEhE,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD;;GAEG;AACH,MAAM,OAAO,0BAA2B,SAAQ,gBAAgB;IAC9D;;OAEG;IACK,WAAW;QACjB,OAAO,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IACxE,CAAC;IAED;;;;;;OAMG;IACM,KAAK,CAAC,YAAY,CAAC,OAAqC;QAC/D,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAA;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,CAAA;QAEnC,kFAAkF;QAClF,MAAM,SAAS,GAAG,SAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;QAChH,IAAI,SAAS,CAAC,MAAM,KAAK,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;YAC3D,OAAO,SAAS,CAAA;QAClB,CAAC;QAED,IAAI,CAAC;YACH,uBAAuB;YACvB,MAAM,QAAQ,CAAC,cAAc,CAAC,UAAU,EAAE,YAAY,EAAE,cAAc,EAAE,OAAO,CAAC,CAAA;YAEhF,+DAA+D;YAC/D,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;YAEhD,+DAA+D;YAC/D,IAAI,OAAO,EAAE,OAAO,KAAK,SAAS,EAAE,CAAC;gBACnC,QAAQ,CAAC,gBAAgB,CAAC,UAAU,EAAE,YAAY,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;YACvF,CAAC;YAED,OAAO,MAAM,CAAA;QACf,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,0EAA0E;YAC1E,uEAAuE;YACvE,IAAI,YAAY,CAAC,qBAAqB,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC9C,MAAM,KAAK,CAAA;YACb,CAAC;YAED,4DAA4D;YAC5D,uEAAuE;YACvE,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK;gBACpC,CAAC,CAAC,KAAK,CAAC,OAAO;gBACf,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACjB,MAAM,IAAI,mBAAmB,CAAC,8BAA8B,OAAO,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;QACxF,CAAC;IACH,CAAC;CACF"}
|
|
@@ -5,16 +5,17 @@
|
|
|
5
5
|
* (boost), the two clusters a Matter water heater carries alongside its
|
|
6
6
|
* heating-only thermostat.
|
|
7
7
|
*/
|
|
8
|
-
import type { ModeBase } from '@matter/main/clusters';
|
|
9
8
|
import { WaterHeaterManagementServer } from '@matter/main/behaviors/water-heater-management';
|
|
10
9
|
import { WaterHeaterModeServer } from '@matter/main/behaviors/water-heater-mode';
|
|
10
|
+
import { ModeBase } from '@matter/main/clusters';
|
|
11
11
|
import { WaterHeaterManagement } from '@matter/main/clusters/water-heater-management';
|
|
12
12
|
/**
|
|
13
13
|
* Custom WaterHeaterMode Server that calls plugin handlers.
|
|
14
14
|
*
|
|
15
|
-
*
|
|
16
|
-
*
|
|
17
|
-
*
|
|
15
|
+
* This tells the plugin first - otherwise a mode picked in a controller changed
|
|
16
|
+
* the cluster and never reached the heater. matter.js's base server validates
|
|
17
|
+
* the mode and records it, but only after the plugin has been told, so the mode
|
|
18
|
+
* is checked here first and the plugin only hears about a mode the device lists.
|
|
18
19
|
*/
|
|
19
20
|
export declare class HomebridgeWaterHeaterModeServer extends WaterHeaterModeServer {
|
|
20
21
|
private getRegistry;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WaterHeaterBehavior.d.ts","sourceRoot":"","sources":["../../../src/matter/behaviors/WaterHeaterBehavior.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;
|
|
1
|
+
{"version":3,"file":"WaterHeaterBehavior.d.ts","sourceRoot":"","sources":["../../../src/matter/behaviors/WaterHeaterBehavior.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAE,2BAA2B,EAAE,MAAM,gDAAgD,CAAA;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAA;AAChF,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAA;AAqBrF;;;;;;;GAOG;AACH,qBAAa,+BAAgC,SAAQ,qBAAqB;IACxE,OAAO,CAAC,WAAW;IAIJ,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,mBAAmB,GAAG,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC;CAyB3G;AAED;;;;;;;GAOG;AACH,qBAAa,kCAAmC,SAAQ,2BAA2B;IAClE,KAAK,CAAC,OAAO,EAAE,qBAAqB,CAAC,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjE,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAM5C;AAED;;;GAGG;AACH,qBAAa,qCAAsC,SAAQ,kCAAkC;IAC3F,OAAO,CAAC,WAAW;IAIJ,KAAK,CAAC,OAAO,EAAE,qBAAqB,CAAC,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAajE,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAY5C"}
|
|
@@ -5,8 +5,10 @@
|
|
|
5
5
|
* (boost), the two clusters a Matter water heater carries alongside its
|
|
6
6
|
* heating-only thermostat.
|
|
7
7
|
*/
|
|
8
|
+
import { ModeUtils } from '@matter/main/behaviors/mode-base';
|
|
8
9
|
import { WaterHeaterManagementServer } from '@matter/main/behaviors/water-heater-management';
|
|
9
10
|
import { WaterHeaterModeServer } from '@matter/main/behaviors/water-heater-mode';
|
|
11
|
+
import { ModeBase } from '@matter/main/clusters';
|
|
10
12
|
import { WaterHeaterManagement } from '@matter/main/clusters/water-heater-management';
|
|
11
13
|
import { Status, StatusResponseError } from '@matter/main/types';
|
|
12
14
|
import { MatterStatus } from '../errors.js';
|
|
@@ -28,9 +30,10 @@ function asStatusError(error, action) {
|
|
|
28
30
|
/**
|
|
29
31
|
* Custom WaterHeaterMode Server that calls plugin handlers.
|
|
30
32
|
*
|
|
31
|
-
*
|
|
32
|
-
*
|
|
33
|
-
*
|
|
33
|
+
* This tells the plugin first - otherwise a mode picked in a controller changed
|
|
34
|
+
* the cluster and never reached the heater. matter.js's base server validates
|
|
35
|
+
* the mode and records it, but only after the plugin has been told, so the mode
|
|
36
|
+
* is checked here first and the plugin only hears about a mode the device lists.
|
|
34
37
|
*/
|
|
35
38
|
export class HomebridgeWaterHeaterModeServer extends WaterHeaterModeServer {
|
|
36
39
|
getRegistry() {
|
|
@@ -39,6 +42,11 @@ export class HomebridgeWaterHeaterModeServer extends WaterHeaterModeServer {
|
|
|
39
42
|
async changeToMode(request) {
|
|
40
43
|
const endpointId = this.endpoint.id;
|
|
41
44
|
const registry = this.getRegistry();
|
|
45
|
+
// matter.js only checks the mode in super.changeToMode, after the handler has run
|
|
46
|
+
const modeCheck = ModeUtils.assertModeChange(this.state.supportedModes, this.state.currentMode, request.newMode);
|
|
47
|
+
if (modeCheck.status !== ModeBase.ModeChangeStatus.Success) {
|
|
48
|
+
return modeCheck;
|
|
49
|
+
}
|
|
42
50
|
try {
|
|
43
51
|
await registry.executeHandler(endpointId, 'waterHeaterMode', 'changeToMode', request);
|
|
44
52
|
// Only reached if the handler succeeded
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WaterHeaterBehavior.js","sourceRoot":"","sources":["../../../src/matter/behaviors/WaterHeaterBehavior.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;
|
|
1
|
+
{"version":3,"file":"WaterHeaterBehavior.js","sourceRoot":"","sources":["../../../src/matter/behaviors/WaterHeaterBehavior.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,9 @@ export interface LevelControlHandlers {
|
|
|
27
27
|
step?: MatterCommandHandler<LevelControl.StepRequest>;
|
|
28
28
|
stop?: MatterCommandHandler<LevelControl.StopRequest>;
|
|
29
29
|
moveToLevelWithOnOff?: MatterCommandHandler<LevelControl.MoveToLevelRequest>;
|
|
30
|
+
moveWithOnOff?: MatterCommandHandler<LevelControl.MoveRequest>;
|
|
31
|
+
stepWithOnOff?: MatterCommandHandler<LevelControl.StepRequest>;
|
|
32
|
+
stopWithOnOff?: MatterCommandHandler<LevelControl.StopRequest>;
|
|
30
33
|
}
|
|
31
34
|
/**
|
|
32
35
|
* ColorControl cluster handler methods
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clusterHandlerMap.d.ts","sourceRoot":"","sources":["../../src/matter/clusterHandlerMap.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,sBAAsB,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,4BAA4B,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAE/R,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEtD;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,EAAE,CAAC,EAAE,oBAAoB,CAAA;IACzB,GAAG,CAAC,EAAE,oBAAoB,CAAA;IAC1B,MAAM,CAAC,EAAE,oBAAoB,CAAA;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,WAAW,CAAC,EAAE,oBAAoB,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAA;IACnE,IAAI,CAAC,EAAE,oBAAoB,CAAC,YAAY,CAAC,WAAW,CAAC,CAAA;IACrD,IAAI,CAAC,EAAE,oBAAoB,CAAC,YAAY,CAAC,WAAW,CAAC,CAAA;IACrD,IAAI,CAAC,EAAE,oBAAoB,CAAC,YAAY,CAAC,WAAW,CAAC,CAAA;IACrD,oBAAoB,CAAC,EAAE,oBAAoB,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"clusterHandlerMap.d.ts","sourceRoot":"","sources":["../../src/matter/clusterHandlerMap.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,29 @@
|
|
|
10
10
|
* @matter/main/clusters where possible.
|
|
11
11
|
*/
|
|
12
12
|
import type { ColorControlState, DeviceEnergyManagementState, DoorLockState, ElectricalEnergyMeasurementState, ElectricalPowerMeasurementState, EnergyEvseState, EnergyModeState, FanControlState, LevelControlState, MeterIdentificationState, OnOffState, PowerSourceState, RvcCleanModeState, RvcOperationalState, RvcRunModeState, ServiceAreaState, ThermostatState, ValveConfigurationAndControlState, WaterHeaterManagementState, WaterHeaterModeState, WindowCoveringState } from './clusterTypes.js';
|
|
13
|
+
/**
|
|
14
|
+
* The shape every concentration measurement cluster shares.
|
|
15
|
+
*
|
|
16
|
+
* Homebridge turns on the cluster's features from the attributes declared at
|
|
17
|
+
* registration: a reading or unit brings NumericMeasurement, and levelValue
|
|
18
|
+
* brings LevelIndication. A numeric reading also needs measurementUnit.
|
|
19
|
+
*/
|
|
20
|
+
interface ConcentrationMeasurementState {
|
|
21
|
+
measuredValue: number | null;
|
|
22
|
+
minMeasuredValue?: number | null;
|
|
23
|
+
maxMeasuredValue?: number | null;
|
|
24
|
+
peakMeasuredValue?: number | null;
|
|
25
|
+
peakMeasuredValueWindow?: number;
|
|
26
|
+
averageMeasuredValue?: number | null;
|
|
27
|
+
averageMeasuredValueWindow?: number;
|
|
28
|
+
uncertainty?: number;
|
|
29
|
+
/** 0 = ppm, 1 = ppb, 2 = ppt, 3 = mg/m³, 4 = µg/m³, 5 = ng/m³, 6 = particles/m³, 7 = Bq/m³ */
|
|
30
|
+
measurementUnit?: number;
|
|
31
|
+
/** 0 = air (assumed when left out), 1 = water, 2 = soil */
|
|
32
|
+
measurementMedium: number;
|
|
33
|
+
/** 0 = unknown, 1 = low, 2 = medium, 3 = high, 4 = critical */
|
|
34
|
+
levelValue?: number;
|
|
35
|
+
}
|
|
13
36
|
/**
|
|
14
37
|
* Maps known cluster names to their typed state interfaces.
|
|
15
38
|
*
|
|
@@ -54,6 +77,24 @@ export interface ClusterStateMap {
|
|
|
54
77
|
minMeasuredValue?: number | null;
|
|
55
78
|
maxMeasuredValue?: number | null;
|
|
56
79
|
};
|
|
80
|
+
flowMeasurement: {
|
|
81
|
+
measuredValue: number | null;
|
|
82
|
+
minMeasuredValue?: number | null;
|
|
83
|
+
maxMeasuredValue?: number | null;
|
|
84
|
+
tolerance?: number;
|
|
85
|
+
};
|
|
86
|
+
/** The scaled attributes turn on the Extended feature, for a resolution finer than 1 kPa */
|
|
87
|
+
pressureMeasurement: {
|
|
88
|
+
measuredValue: number | null;
|
|
89
|
+
minMeasuredValue?: number | null;
|
|
90
|
+
maxMeasuredValue?: number | null;
|
|
91
|
+
tolerance?: number;
|
|
92
|
+
scaledValue?: number | null;
|
|
93
|
+
minScaledValue?: number | null;
|
|
94
|
+
maxScaledValue?: number | null;
|
|
95
|
+
scaledTolerance?: number;
|
|
96
|
+
scale?: number;
|
|
97
|
+
};
|
|
57
98
|
occupancySensing: {
|
|
58
99
|
occupancy: {
|
|
59
100
|
occupied: boolean;
|
|
@@ -74,41 +115,16 @@ export interface ClusterStateMap {
|
|
|
74
115
|
airQuality: {
|
|
75
116
|
airQuality: number;
|
|
76
117
|
};
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
maxMeasuredValue?: number | null;
|
|
88
|
-
measurementMedium: number;
|
|
89
|
-
measurementUnit?: number;
|
|
90
|
-
};
|
|
91
|
-
ozoneConcentrationMeasurement: {
|
|
92
|
-
measuredValue: number | null;
|
|
93
|
-
minMeasuredValue?: number | null;
|
|
94
|
-
maxMeasuredValue?: number | null;
|
|
95
|
-
measurementMedium: number;
|
|
96
|
-
measurementUnit?: number;
|
|
97
|
-
};
|
|
98
|
-
pm10ConcentrationMeasurement: {
|
|
99
|
-
measuredValue: number | null;
|
|
100
|
-
minMeasuredValue?: number | null;
|
|
101
|
-
maxMeasuredValue?: number | null;
|
|
102
|
-
measurementMedium: number;
|
|
103
|
-
measurementUnit?: number;
|
|
104
|
-
};
|
|
105
|
-
pm25ConcentrationMeasurement: {
|
|
106
|
-
measuredValue: number | null;
|
|
107
|
-
minMeasuredValue?: number | null;
|
|
108
|
-
maxMeasuredValue?: number | null;
|
|
109
|
-
measurementMedium: number;
|
|
110
|
-
measurementUnit?: number;
|
|
111
|
-
};
|
|
118
|
+
carbonDioxideConcentrationMeasurement: ConcentrationMeasurementState;
|
|
119
|
+
carbonMonoxideConcentrationMeasurement: ConcentrationMeasurementState;
|
|
120
|
+
formaldehydeConcentrationMeasurement: ConcentrationMeasurementState;
|
|
121
|
+
nitrogenDioxideConcentrationMeasurement: ConcentrationMeasurementState;
|
|
122
|
+
ozoneConcentrationMeasurement: ConcentrationMeasurementState;
|
|
123
|
+
pm1ConcentrationMeasurement: ConcentrationMeasurementState;
|
|
124
|
+
pm10ConcentrationMeasurement: ConcentrationMeasurementState;
|
|
125
|
+
pm25ConcentrationMeasurement: ConcentrationMeasurementState;
|
|
126
|
+
radonConcentrationMeasurement: ConcentrationMeasurementState;
|
|
127
|
+
totalVolatileOrganicCompoundsConcentrationMeasurement: ConcentrationMeasurementState;
|
|
112
128
|
switch: {
|
|
113
129
|
currentPosition: number;
|
|
114
130
|
numberOfPositions?: number;
|
|
@@ -125,4 +141,5 @@ export interface ClusterStateMap {
|
|
|
125
141
|
identifyType: number;
|
|
126
142
|
};
|
|
127
143
|
}
|
|
144
|
+
export {};
|
|
128
145
|
//# sourceMappingURL=clusterStateMap.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clusterStateMap.d.ts","sourceRoot":"","sources":["../../src/matter/clusterStateMap.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EACV,iBAAiB,EACjB,2BAA2B,EAC3B,aAAa,EACb,gCAAgC,EAChC,+BAA+B,EAC/B,eAAe,EACf,eAAe,EACf,eAAe,EACf,iBAAiB,EACjB,wBAAwB,EACxB,UAAU,EACV,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACnB,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,iCAAiC,EACjC,0BAA0B,EAC1B,oBAAoB,EACpB,mBAAmB,EACpB,MAAM,mBAAmB,CAAA;AAE1B;;;;;;;;;;;;;;;GAeG;AACH,MAAM,WAAW,eAAe;IAE9B,KAAK,EAAE,UAAU,CAAA;IACjB,YAAY,EAAE,iBAAiB,CAAA;IAC/B,YAAY,EAAE,iBAAiB,CAAA;IAC/B,QAAQ,EAAE,aAAa,CAAA;IACvB,cAAc,EAAE,mBAAmB,CAAA;IACnC,UAAU,EAAE,eAAe,CAAA;IAC3B,UAAU,EAAE,eAAe,CAAA;IAG3B,mBAAmB,EAAE,mBAAmB,CAAA;IACxC,UAAU,EAAE,eAAe,CAAA;IAC3B,YAAY,EAAE,iBAAiB,CAAA;IAC/B,WAAW,EAAE,gBAAgB,CAAA;IAG7B,WAAW,EAAE,gBAAgB,CAAA;IAG7B,sBAAsB,EAAE;QAAE,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;IAC5H,2BAA2B,EAAE;QAAE,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;IACjI,sBAAsB,EAAE;QAAE,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;IAC5H,
|
|
1
|
+
{"version":3,"file":"clusterStateMap.d.ts","sourceRoot":"","sources":["../../src/matter/clusterStateMap.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccessoryManager.d.ts","sourceRoot":"","sources":["../../../src/matter/server/AccessoryManager.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAgB,UAAU,EAAE,MAAM,cAAc,CAAA;AAG5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAE9E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,KAAK,EACV,uBAAuB,EAEvB,eAAe,EAGhB,MAAM,aAAa,CAAA;AAKpB,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"AccessoryManager.d.ts","sourceRoot":"","sources":["../../../src/matter/server/AccessoryManager.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAgB,UAAU,EAAE,MAAM,cAAc,CAAA;AAG5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAE9E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,KAAK,EACV,uBAAuB,EAEvB,eAAe,EAGhB,MAAM,aAAa,CAAA;AAKpB,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AA0EvC,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,kBAAkB,CAAA;IAC1B,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAA;IACjD,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,eAAe,EAAE,eAAe,CAAA;IAChC,cAAc,EAAE,oBAAoB,GAAG,IAAI,CAAA;IAC3C,aAAa,EAAE,MAAM,UAAU,GAAG,IAAI,CAAA;IACtC,aAAa,EAAE,MAAM,QAAQ,CAAC,cAAc,wBAAwB,EAAE,kBAAkB,CAAC,GAAG,IAAI,CAAA;IAChG,YAAY,EAAE,MAAM,OAAO,CAAA;IAC3B,oBAAoB,EAAE,MAAM,OAAO,CAAA;IACnC,cAAc,EAAE,MAAM,OAAO,CAAA;CAC9B;AA+DD,qBAAa,gBAAgB;IAC3B;;;OAGG;IACG,iBAAiB,CACrB,iBAAiB,EAAE,MAAM,EACzB,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,eAAe,EAC1B,IAAI,EAAE,oBAAoB,GACzB,OAAO,CAAC,IAAI,CAAC;IA4OhB;;OAEG;IACG,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuDlF;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAkC1B;;;;;;;;;;;;;;OAcG;YACW,iBAAiB;IA+F/B;;;;;;;;;OASG;IACH,OAAO,CAAC,eAAe;IAcvB;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAsH7B;;OAEG;YACW,oBAAoB;IA0NlC;;OAEG;IACH,OAAO,CAAC,YAAY;IAcpB;;OAEG;IACH,OAAO,CAAC,qBAAqB;IA8D7B;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAkBjC;;;;;;;;;OASG;YACW,mBAAmB;IAsDjC;;;OAGG;YACW,oBAAoB;IA4ClC;;;;;;;OAOG;YACW,0BAA0B;IASxC;;OAEG;YACW,6BAA6B;IAyC3C;;OAEG;YACW,sBAAsB;IA+BpC;;;;;;OAMG;YACW,0BAA0B;CAgCzC"}
|
|
@@ -14,7 +14,7 @@ import { Logger } from '../../logger.js';
|
|
|
14
14
|
import { setRegistryManager } from '../behaviors/EndpointContext.js';
|
|
15
15
|
import { HomebridgeRvcCleanModeServer, HomebridgeServiceAreaServer } from '../behaviors/index.js';
|
|
16
16
|
import { declaredClusterFeatures } from '../clusterFeatures.js';
|
|
17
|
-
import { applyDeviceEnergyManagementFeatures, applyElectricalMeasurementClusters, applyElectricalMeasurementDefaults, applyEnergyEvseFeatures, applyFanAutoFeature, applyLevelControlLightingFloor, applyRoomAirConditionerAutoMode, applySmokeCoAlarmFeatures, applyThermostatFeatures, applyWindowCoveringFeatures, CLUSTER_IDS, detectBehaviorFeatures, detectElectricalMeasurementClusters, detectSmokeCoAlarmFeatures, detectThermostatFeatures, detectWindowCoveringFeatures, determineColorControlFeaturesFromClusters, determineColorControlFeaturesFromHandlers, extractColorControlFeatures, extractDeclaredFeatures, extractLevelControlFeatures, extractThermostatFeatures, validateAccessoryRequiredFields, } from '../serverHelpers.js';
|
|
17
|
+
import { applyDeviceEnergyManagementFeatures, applyElectricalMeasurementClusters, applyElectricalMeasurementDefaults, applyEnergyEvseFeatures, applyFanAutoFeature, applyLevelControlLightingFloor, applyOptionalMeasurementClusters, applyRoomAirConditionerAutoMode, applySmokeCoAlarmFeatures, applyThermostatFeatures, applyWindowCoveringFeatures, CLUSTER_IDS, detectBehaviorFeatures, detectElectricalMeasurementClusters, detectSmokeCoAlarmFeatures, detectThermostatFeatures, detectWindowCoveringFeatures, determineColorControlFeaturesFromClusters, determineColorControlFeaturesFromHandlers, extractColorControlFeatures, extractDeclaredFeatures, extractLevelControlFeatures, extractThermostatFeatures, validateAccessoryRequiredFields, } from '../serverHelpers.js';
|
|
18
18
|
import { devices, deviceTypes, MatterDeviceError, } from '../types.js';
|
|
19
19
|
import { stripVendorFromLabel } from '../utils.js';
|
|
20
20
|
import { CORE_CLUSTER_BEHAVIOR_MAP } from './BehaviorMap.js';
|
|
@@ -452,6 +452,10 @@ export class AccessoryManager {
|
|
|
452
452
|
+ 'electricalPowerMeasurement or electricalEnergyMeasurement cluster state - '
|
|
453
453
|
+ 'the endpoint will expose no measurement clusters.');
|
|
454
454
|
}
|
|
455
|
+
// A device type carries only its mandatory clusters, so the optional
|
|
456
|
+
// readings a plugin declares - an air quality sensor's PM2.5, a
|
|
457
|
+
// thermostat's humidity - need composing too, see applyOptionalMeasurementClusters
|
|
458
|
+
deviceType = applyOptionalMeasurementClusters(deviceType, accessory);
|
|
455
459
|
const features = this.detectClusterFeatures(accessory, deviceType);
|
|
456
460
|
// Now that we know whether LevelControl keeps its Lighting feature, make
|
|
457
461
|
// sure the declared levels are legal for it.
|