homebridge 2.3.1-beta.7 → 2.3.1-beta.9

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.
@@ -33,7 +33,8 @@ export declare class AccessoryQuery {
33
33
  */
34
34
  private getDeviceTypeName;
35
35
  /**
36
- * Get current cluster state for an accessory or part
36
+ * Get current cluster state for an accessory or part, enriched with each
37
+ * cluster's featureMap - see {@link withFeatureMaps}
37
38
  */
38
39
  private getCurrentState;
39
40
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"AccessoryQuery.d.ts","sourceRoot":"","sources":["../../../src/matter/server/AccessoryQuery.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAA;AAC3F,OAAO,KAAK,EAAE,uBAAuB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAM3E,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBADjB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,uBAAuB,CAAC,EACjD,iBAAiB,EAAE,MAAM,oBAAoB,GAAG,IAAI;IAGvE;;OAEG;IACH,cAAc,IAAI,eAAe,EAAE;IAQnC;;OAEG;IACH,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS;IAWvD;;;OAGG;IACH,uBAAuB,IAAI,yBAAyB,EAAE;IAWtD;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,yBAAyB,GAAG,SAAS;IAIvE;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;OAEG;IACH,OAAO,CAAC,eAAe;IAcvB;;OAEG;IACH,kBAAkB,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,GAAG,EAAE;IA2BzF;;OAEG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS;CAmBhD"}
1
+ {"version":3,"file":"AccessoryQuery.d.ts","sourceRoot":"","sources":["../../../src/matter/server/AccessoryQuery.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAA;AAC3F,OAAO,KAAK,EAAE,uBAAuB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AA6C3E,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBADjB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,uBAAuB,CAAC,EACjD,iBAAiB,EAAE,MAAM,oBAAoB,GAAG,IAAI;IAGvE;;OAEG;IACH,cAAc,IAAI,eAAe,EAAE;IAQnC;;OAEG;IACH,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS;IAWvD;;;OAGG;IACH,uBAAuB,IAAI,yBAAyB,EAAE;IAWtD;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,yBAAyB,GAAG,SAAS;IAIvE;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;;OAGG;IACH,OAAO,CAAC,eAAe;IAgBvB;;OAEG;IACH,kBAAkB,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,GAAG,EAAE;IA2BzF;;OAEG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS;CAmBhD"}
@@ -5,6 +5,41 @@
5
5
  */
6
6
  import { Logger } from '../../logger.js';
7
7
  const log = Logger.withPrefix('Matter/Server');
8
+ /**
9
+ * Add each cluster's featureMap to the declared cluster state.
10
+ *
11
+ * The declared clusters are what the PLUGIN asked for, so on their own they
12
+ * cannot tell a consumer which features the cluster ended up with - a
13
+ * thermostat with and without AutoMode declares the same setpoints, and the
14
+ * deadband is optional either way. The featureMap (named booleans, e.g.
15
+ * `{ heating: true, cooling: true, autoMode: false }`) comes off the live
16
+ * endpoint and settles that.
17
+ *
18
+ * Features never change after registration and the UI merges later state
19
+ * updates into the cluster object rather than replacing it, so sending the map
20
+ * once is enough.
21
+ */
22
+ function withFeatureMaps(clusters, endpoint) {
23
+ const endpointState = endpoint?.state;
24
+ if (!endpointState) {
25
+ // Not registered yet (or restored without a live endpoint) - serve the
26
+ // declared state as-is and let the consumer fall back
27
+ return clusters;
28
+ }
29
+ const enriched = {};
30
+ for (const [clusterName, state] of Object.entries(clusters)) {
31
+ try {
32
+ const featureMap = endpointState[clusterName]?.featureMap;
33
+ enriched[clusterName] = featureMap !== undefined ? { featureMap, ...state } : state;
34
+ }
35
+ catch {
36
+ // Reading a behavior's state can throw while the endpoint is still
37
+ // initialising - the declared state alone is still correct
38
+ enriched[clusterName] = state;
39
+ }
40
+ }
41
+ return enriched;
42
+ }
8
43
  export class AccessoryQuery {
9
44
  accessories;
10
45
  getAccessoryCache;
@@ -63,7 +98,8 @@ export class AccessoryQuery {
63
98
  return deviceType.name || 'Unknown';
64
99
  }
65
100
  /**
66
- * Get current cluster state for an accessory or part
101
+ * Get current cluster state for an accessory or part, enriched with each
102
+ * cluster's featureMap - see {@link withFeatureMaps}
67
103
  */
68
104
  getCurrentState(uuid, partId) {
69
105
  const accessory = this.accessories.get(uuid);
@@ -71,10 +107,12 @@ export class AccessoryQuery {
71
107
  return {};
72
108
  }
73
109
  if (partId) {
110
+ // A part carries its own endpoint, so its clusters are enriched the same
111
+ // way - a thermostat exposed as a part needs the features just as much
74
112
  const part = accessory._parts?.find(p => p.id === partId);
75
- return part?.clusters || {};
113
+ return part ? withFeatureMaps(part.clusters || {}, part.endpoint) : {};
76
114
  }
77
- return accessory.clusters || {};
115
+ return withFeatureMaps(accessory.clusters || {}, accessory.endpoint);
78
116
  }
79
117
  /**
80
118
  * Collect all accessories for UI display
@@ -1 +1 @@
1
- {"version":3,"file":"AccessoryQuery.js","sourceRoot":"","sources":["../../../src/matter/server/AccessoryQuery.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AccessoryQuery.js","sourceRoot":"","sources":["../../../src/matter/server/AccessoryQuery.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "homebridge",
3
3
  "type": "module",
4
- "version": "2.3.1-beta.7",
4
+ "version": "2.3.1-beta.9",
5
5
  "description": "HomeKit support for the impatient",
6
6
  "author": "Nick Farina",
7
7
  "license": "Apache-2.0",