homebridge 2.3.1-beta.7 → 2.3.1-beta.8

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.
@@ -34,6 +34,16 @@ export declare class AccessoryQuery {
34
34
  private getDeviceTypeName;
35
35
  /**
36
36
  * Get current cluster state for an accessory or part
37
+ *
38
+ * The clusters object is what the PLUGIN declared, so on its own it cannot
39
+ * tell a consumer which features the cluster ended up with - a thermostat
40
+ * with and without AutoMode declares the same setpoints, and the deadband is
41
+ * optional either way. The UI needs the features to know which controls to
42
+ * offer, so each cluster is enriched with the live endpoint's featureMap
43
+ * (named booleans, e.g. `{ heating: true, cooling: true, autoMode: false }`).
44
+ * Features never change after registration, and the UI merges later state
45
+ * updates into the cluster object rather than replacing it, so sending the
46
+ * map here is enough.
37
47
  */
38
48
  private getCurrentState;
39
49
  /**
@@ -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;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;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,eAAe;IAiCvB;;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"}
@@ -64,6 +64,16 @@ export class AccessoryQuery {
64
64
  }
65
65
  /**
66
66
  * Get current cluster state for an accessory or part
67
+ *
68
+ * The clusters object is what the PLUGIN declared, so on its own it cannot
69
+ * tell a consumer which features the cluster ended up with - a thermostat
70
+ * with and without AutoMode declares the same setpoints, and the deadband is
71
+ * optional either way. The UI needs the features to know which controls to
72
+ * offer, so each cluster is enriched with the live endpoint's featureMap
73
+ * (named booleans, e.g. `{ heating: true, cooling: true, autoMode: false }`).
74
+ * Features never change after registration, and the UI merges later state
75
+ * updates into the cluster object rather than replacing it, so sending the
76
+ * map here is enough.
67
77
  */
68
78
  getCurrentState(uuid, partId) {
69
79
  const accessory = this.accessories.get(uuid);
@@ -74,7 +84,26 @@ export class AccessoryQuery {
74
84
  const part = accessory._parts?.find(p => p.id === partId);
75
85
  return part?.clusters || {};
76
86
  }
77
- return accessory.clusters || {};
87
+ const clusters = accessory.clusters || {};
88
+ const endpointState = accessory.endpoint?.state;
89
+ if (!endpointState) {
90
+ // Not registered yet (or restored without a live endpoint) - serve the
91
+ // declared state as-is and let the consumer fall back
92
+ return clusters;
93
+ }
94
+ const enriched = {};
95
+ for (const [clusterName, state] of Object.entries(clusters)) {
96
+ try {
97
+ const featureMap = endpointState[clusterName]?.featureMap;
98
+ enriched[clusterName] = featureMap !== undefined ? { featureMap, ...state } : state;
99
+ }
100
+ catch {
101
+ // Reading a behavior's state can throw while the endpoint is still
102
+ // initialising - the declared state alone is still correct
103
+ enriched[clusterName] = state;
104
+ }
105
+ }
106
+ return enriched;
78
107
  }
79
108
  /**
80
109
  * 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.8",
5
5
  "description": "HomeKit support for the impatient",
6
6
  "author": "Nick Farina",
7
7
  "license": "Apache-2.0",