matter-all-in-one-addon 2.3.13 → 2.3.18
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 +18 -12
- package/dist/camera/browser-preview.js +12 -10
- package/dist/camera/browser-preview.js.map +1 -1
- package/dist/camera/homekit/homekit-camera-recording.delegate.d.ts +5 -0
- package/dist/camera/homekit/homekit-camera-recording.delegate.js +14 -0
- package/dist/camera/homekit/homekit-camera-recording.delegate.js.map +1 -1
- package/dist/camera/homekit/homekit-camera-stream.delegate.d.ts +8 -2
- package/dist/camera/homekit/homekit-camera-stream.delegate.js +113 -49
- package/dist/camera/homekit/homekit-camera-stream.delegate.js.map +1 -1
- package/dist/camera/homekit/homekit-camera.accessory.js +17 -3
- package/dist/camera/homekit/homekit-camera.accessory.js.map +1 -1
- package/dist/camera/homekit/tuya-hap-talkback.d.ts +1 -0
- package/dist/camera/homekit/tuya-hap-talkback.js +11 -8
- package/dist/camera/homekit/tuya-hap-talkback.js.map +1 -1
- package/dist/camera/matter/camera-endpoint.builder.js +31 -18
- package/dist/camera/matter/camera-endpoint.builder.js.map +1 -1
- package/dist/converters/binary_sensor.converter.d.ts +1 -1
- package/dist/converters/binary_sensor.converter.js +2 -2
- package/dist/converters/climate.converter.d.ts +14 -1
- package/dist/converters/climate.converter.js +44 -2
- package/dist/converters/climate.converter.js.map +1 -1
- package/dist/converters/sensor.converter.js +6 -6
- package/dist/converters/sensor.converter.js.map +1 -1
- package/dist/device-profiles.js +33 -2
- package/dist/device-profiles.js.map +1 -1
- package/dist/device-registry.js +12 -0
- package/dist/device-registry.js.map +1 -1
- package/dist/entities/air_quality.entity.js +24 -1
- package/dist/entities/air_quality.entity.js.map +1 -1
- package/dist/entities/base.entity.js +25 -5
- package/dist/entities/base.entity.js.map +1 -1
- package/dist/entities/climate.entity.d.ts +23 -0
- package/dist/entities/climate.entity.js +174 -0
- package/dist/entities/climate.entity.js.map +1 -0
- package/dist/entities/closure.entity.js +24 -1
- package/dist/entities/closure.entity.js.map +1 -1
- package/dist/entities/composite-device.entity.js +23 -7
- package/dist/entities/composite-device.entity.js.map +1 -1
- package/dist/entities/cooktop.entity.d.ts +1 -0
- package/dist/entities/cooktop.entity.js +18 -3
- package/dist/entities/cooktop.entity.js.map +1 -1
- package/dist/entities/energy_tariff.entity.js +16 -4
- package/dist/entities/energy_tariff.entity.js.map +1 -1
- package/dist/entities/humidifier.entity.d.ts +3 -0
- package/dist/entities/humidifier.entity.js +61 -45
- package/dist/entities/humidifier.entity.js.map +1 -1
- package/dist/entities/lock.entity.js +9 -5
- package/dist/entities/lock.entity.js.map +1 -1
- package/dist/entities/oven.entity.d.ts +2 -0
- package/dist/entities/oven.entity.js +50 -8
- package/dist/entities/oven.entity.js.map +1 -1
- package/dist/entities/soil_sensor.entity.js +2 -1
- package/dist/entities/soil_sensor.entity.js.map +1 -1
- package/dist/entities/vacuum.entity.js +4 -4
- package/dist/entities/vacuum.entity.js.map +1 -1
- package/dist/entities/valve.entity.js +29 -5
- package/dist/entities/valve.entity.js.map +1 -1
- package/dist/frontend/assets/CameraConfigModal-DnDZbkpj.js +6 -0
- package/dist/frontend/assets/CameraUiModal-DVCgRtyT.js +1 -0
- package/dist/frontend/assets/DeviceModal-DFgXDEzB.js +5 -0
- package/dist/frontend/assets/QRCodeDisplay-B3RFLtWz.js +8 -0
- package/dist/frontend/assets/ScryptedModal-DZ4B2NLt.js +1 -0
- package/dist/frontend/assets/SettingsModal-BBflJWuJ.js +2 -0
- package/dist/frontend/assets/clipboard-CnKYMNaq.js +1 -0
- package/dist/frontend/assets/index-CONl6ATp.js +10 -0
- package/dist/frontend/index.html +1 -1
- package/dist/hap/hap-generic-accessory.d.ts +6 -0
- package/dist/hap/hap-generic-accessory.js +641 -26
- package/dist/hap/hap-generic-accessory.js.map +1 -1
- package/dist/homeAssistant.d.ts +1 -0
- package/dist/homeAssistant.js +40 -1
- package/dist/homeAssistant.js.map +1 -1
- package/dist/mqtt/mqtt-client.d.ts +2 -0
- package/dist/mqtt/mqtt-client.js +44 -2
- package/dist/mqtt/mqtt-client.js.map +1 -1
- package/dist/mqtt/mqtt.entity.d.ts +12 -0
- package/dist/mqtt/mqtt.entity.js +231 -82
- package/dist/mqtt/mqtt.entity.js.map +1 -1
- package/dist/platform.d.ts +2 -0
- package/dist/platform.js +111 -37
- package/dist/platform.js.map +1 -1
- package/dist/proxy.js +13 -1
- package/dist/proxy.js.map +1 -1
- package/dist/utils/hap-firmware.js +1 -1
- package/dist/utils/hap-firmware.js.map +1 -1
- package/dist/utils/matter-command-response.js +64 -44
- package/dist/utils/matter-command-response.js.map +1 -1
- package/dist/utils/matter-reset-storage.d.ts +2 -0
- package/dist/utils/matter-reset-storage.js +74 -0
- package/dist/utils/matter-reset-storage.js.map +1 -0
- package/dist/utils/measurements.d.ts +8 -0
- package/dist/utils/measurements.js +42 -0
- package/dist/utils/measurements.js.map +1 -0
- package/package.json +17 -17
- package/dist/frontend/assets/index-1k-iTL-m.js +0 -26
|
@@ -9,6 +9,16 @@ import { BaseEntity } from "./base.entity.js";
|
|
|
9
9
|
import { safeSetAttribute, safeUpdateAttribute, } from "../utils/matter-attributes.js";
|
|
10
10
|
export class HumidifierEntity extends BaseEntity {
|
|
11
11
|
static matterTypeLabel = "Humidifier";
|
|
12
|
+
syncing = 0;
|
|
13
|
+
get isUpdatingFromHa() {
|
|
14
|
+
return this.syncing > 0 || super.isUpdatingFromHa;
|
|
15
|
+
}
|
|
16
|
+
async callServiceTracked(domain, service, data) {
|
|
17
|
+
if (["set_mode", "set_humidity"].includes(service) &&
|
|
18
|
+
this.state.state === "off")
|
|
19
|
+
await super.callServiceTracked(domain, "turn_on");
|
|
20
|
+
await super.callServiceTracked(domain, service, data);
|
|
21
|
+
}
|
|
12
22
|
constructor(platform, state, deviceType) {
|
|
13
23
|
super(platform, state, deviceType);
|
|
14
24
|
}
|
|
@@ -128,53 +138,59 @@ export class HumidifierEntity extends BaseEntity {
|
|
|
128
138
|
this.state = newState;
|
|
129
139
|
if (!this.endpoint)
|
|
130
140
|
return;
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
141
|
+
this.syncing++;
|
|
142
|
+
try {
|
|
143
|
+
const syncFunc = isInitialSync ? safeSetAttribute : safeUpdateAttribute;
|
|
144
|
+
const isOn = newState.state === "on";
|
|
145
|
+
// Update OnOff
|
|
146
|
+
await syncFunc(this.endpoint, OnOff.id, "onOff", isOn, this.platform.log);
|
|
147
|
+
// Update FanControl attributes
|
|
148
|
+
if (this.endpoint.hasAttributeServer(FanControl.id, "percentSetting")) {
|
|
149
|
+
const minHum = newState.attributes.min_humidity ?? 40;
|
|
150
|
+
const maxHum = newState.attributes.max_humidity ?? 80;
|
|
151
|
+
const currentTarget = newState.attributes.humidity;
|
|
152
|
+
const mode = (newState.attributes.mode || "").toLowerCase();
|
|
153
|
+
let percent = 0;
|
|
154
|
+
if (isOn) {
|
|
155
|
+
if (typeof currentTarget === "number" && maxHum > minHum) {
|
|
156
|
+
percent = Math.round(((currentTarget - minHum) / (maxHum - minHum)) * 100);
|
|
157
|
+
}
|
|
158
|
+
else if (mode.includes("high") ||
|
|
159
|
+
mode.includes("alto") ||
|
|
160
|
+
mode === "3") {
|
|
161
|
+
percent = 100;
|
|
162
|
+
}
|
|
163
|
+
else if (mode.includes("med") ||
|
|
164
|
+
mode.includes("medio") ||
|
|
165
|
+
mode === "2") {
|
|
166
|
+
percent = 66;
|
|
167
|
+
}
|
|
168
|
+
else if (mode.includes("low") ||
|
|
169
|
+
mode.includes("bajo") ||
|
|
170
|
+
mode === "1") {
|
|
171
|
+
percent = 33;
|
|
172
|
+
}
|
|
173
|
+
else {
|
|
174
|
+
percent = 50;
|
|
175
|
+
}
|
|
176
|
+
percent = Math.min(100, Math.max(1, percent));
|
|
163
177
|
}
|
|
164
|
-
|
|
178
|
+
await syncFunc(this.endpoint, FanControl.id, "percentSetting", percent, this.platform.log);
|
|
179
|
+
await syncFunc(this.endpoint, FanControl.id, "percentCurrent", percent, this.platform.log);
|
|
180
|
+
const fanMode = isOn
|
|
181
|
+
? mode.includes("auto")
|
|
182
|
+
? 5
|
|
183
|
+
: percent > 66
|
|
184
|
+
? 3
|
|
185
|
+
: percent > 33
|
|
186
|
+
? 2
|
|
187
|
+
: 1
|
|
188
|
+
: 0;
|
|
189
|
+
await syncFunc(this.endpoint, FanControl.id, "fanMode", fanMode, this.platform.log);
|
|
165
190
|
}
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
? mode.includes("auto")
|
|
170
|
-
? 5
|
|
171
|
-
: percent > 66
|
|
172
|
-
? 3
|
|
173
|
-
: percent > 33
|
|
174
|
-
? 2
|
|
175
|
-
: 1
|
|
176
|
-
: 0;
|
|
177
|
-
await syncFunc(this.endpoint, FanControl.id, "fanMode", fanMode, this.platform.log);
|
|
191
|
+
}
|
|
192
|
+
finally {
|
|
193
|
+
this.syncing--;
|
|
178
194
|
}
|
|
179
195
|
}
|
|
180
196
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"humidifier.entity.js","sourceRoot":"","sources":["../../src/entities/humidifier.entity.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAEjE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EACL,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,+BAA+B,CAAC;AAEvC,MAAM,OAAO,gBAAiB,SAAQ,UAAU;IAC9C,MAAM,CAAU,eAAe,GAAG,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"humidifier.entity.js","sourceRoot":"","sources":["../../src/entities/humidifier.entity.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAEjE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EACL,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,+BAA+B,CAAC;AAEvC,MAAM,OAAO,gBAAiB,SAAQ,UAAU;IAC9C,MAAM,CAAU,eAAe,GAAG,YAAY,CAAC;IACvC,OAAO,GAAG,CAAC,CAAC;IACpB,IAAuB,gBAAgB;QACrC,OAAO,IAAI,CAAC,OAAO,GAAG,CAAC,IAAI,KAAK,CAAC,gBAAgB,CAAC;IACpD,CAAC;IACkB,KAAK,CAAC,kBAAkB,CACzC,MAAc,EACd,OAAe,EACf,IAA0B;QAE1B,IACE,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC9C,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,KAAK;YAE1B,MAAM,KAAK,CAAC,kBAAkB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACpD,MAAM,KAAK,CAAC,kBAAkB,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACxD,CAAC;IAED,YACE,QAAa,EACb,KAAgB,EAChB,UAAgC;QAEhC,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IACrC,CAAC;IAED;;;OAGG;IACgB,qBAAqB;QACtC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;OAEG;IACgB,uBAAuB,CACxC,QAA+B;QAE/B,MAAM,cAAc,GAAG,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC;QACjD,IAAI,CAAC,cAAc;YAAE,OAAO;QAE5B,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE1C,MAAM,MAAM,GAAG,GAAG,EAAE;YAClB,IAAI,CAAC,YAAY,EAAE,CAAC;YACpB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,2BAA2B,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YACpE,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACtC,KAAK,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACzE,CAAC,CAAC;QAEF,MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,IAAI,CAAC,YAAY,EAAE,CAAC;YACpB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YACrE,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YACvC,KAAK,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAC1E,CAAC,CAAC;QAEF,MAAM,MAAM,GAAG,GAAG,EAAE;YAClB,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;gBAC9B,OAAO,EAAE,CAAC;YACZ,CAAC;iBAAM,CAAC;gBACN,MAAM,EAAE,CAAC;YACX,CAAC;QACH,CAAC,CAAC;QAEF,cAAc,CAAC,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/C,cAAc,CAAC,iBAAiB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACjD,cAAc,CAAC,iBAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAEnD,+EAA+E;QAC/E,IAAI,cAAc,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE,EAAE,gBAAgB,CAAC,EAAE,CAAC;YACvE,cAAc,CAAC,kBAAkB,CAC/B,UAAU,CAAC,EAAE,EACb,gBAAgB,EAChB,CAAC,QAAgB,EAAE,EAAE;gBACnB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CACrB,qCAAqC,IAAI,CAAC,QAAQ,OAAO,QAAQ,EAAE,CACpE,CAAC;gBACF,IAAI,IAAI,CAAC,gBAAgB;oBAAE,OAAO;gBAClC,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;gBAE/C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,YAAY,IAAI,EAAE,CAAC;gBACxD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,YAAY,IAAI,EAAE,CAAC;gBACxD,MAAM,cAAc,GAClB,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,eAAe,IAAI,EAAE,CAAC;gBAE9C,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;oBACnB,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;oBACvC,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;gBAC/D,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;oBACtC,iCAAiC;oBACjC,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBAC9B,IAAI,UAA8B,CAAC;wBACnC,IAAI,QAAQ,GAAG,EAAE;4BACf,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;6BAC7D,IAAI,QAAQ,GAAG,EAAE;4BACpB,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;;4BAEhE,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;wBAEjE,IAAI,CAAC,UAAU,EAAE,CAAC;4BAChB,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;wBAC5D,CAAC;wBAED,IAAI,UAAU,EAAE,CAAC;4BACf,IAAI,CAAC,oBAAoB,CACvB,MAAM,EACN,UAAU,EACV,EAAE,IAAI,EAAE,UAAU,EAAE,EACpB,EAAE,CACH,CAAC;4BACF,OAAO;wBACT,CAAC;oBACH,CAAC;oBAED,qDAAqD;oBACrD,IACE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,YAAY,KAAK,SAAS;wBAChD,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,YAAY,KAAK,SAAS;wBAChD,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,KAAK,QAAQ,EAClD,CAAC;wBACD,MAAM,cAAc,GAClB,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC;wBAC5D,IAAI,CAAC,oBAAoB,CACvB,MAAM,EACN,cAAc,EACd,EAAE,QAAQ,EAAE,cAAc,EAAE,EAC5B,EAAE,CACH,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;oBAC9D,CAAC;gBACH,CAAC;YACH,CAAC,CACF,CAAC;YAEF,cAAc,CAAC,kBAAkB,CAC/B,UAAU,CAAC,EAAE,EACb,SAAS,EACT,CAAC,OAAe,EAAE,EAAE;gBAClB,IAAI,OAAO,OAAO,KAAK,QAAQ;oBAAE,OAAO;gBACxC,IAAI,IAAI,CAAC,gBAAgB;oBAAE,OAAO;gBAClC,MAAM,cAAc,GAClB,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,eAAe,IAAI,EAAE,CAAC;gBAE9C,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;oBAClB,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;oBACxC,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;oBACvC,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;gBAC/D,CAAC;qBAAM,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;oBACzB,YAAY;oBACZ,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;oBACtC,MAAM,QAAQ,GACZ,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC;oBACxD,IAAI,CAAC,oBAAoB,CACvB,MAAM,EACN,UAAU,EACV,EAAE,IAAI,EAAE,QAAQ,EAAE,EAClB,EAAE,CACH,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,cAAc;oBACd,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;oBACtC,MAAM,UAAU,GACd,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC;oBAC3D,IAAI,CAAC,oBAAoB,CACvB,MAAM,EACN,UAAU,EACV,EAAE,IAAI,EAAE,UAAU,EAAE,EACpB,EAAE,CACH,CAAC;gBACJ,CAAC;YACH,CAAC,CACF,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;OAEG;IACa,KAAK,CAAC,WAAW,CAC/B,QAAmB,EACnB,aAAa,GAAG,KAAK;QAErB,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC;QACtB,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,OAAO;QAC3B,IAAI,CAAC,OAAO,EAAE,CAAC;QACf,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,mBAAmB,CAAC;YACxE,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,KAAK,IAAI,CAAC;YAErC,eAAe;YACf,MAAM,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YAE1E,+BAA+B;YAC/B,IAAI,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE,EAAE,gBAAgB,CAAC,EAAE,CAAC;gBACtE,MAAM,MAAM,GAAG,QAAQ,CAAC,UAAU,CAAC,YAAY,IAAI,EAAE,CAAC;gBACtD,MAAM,MAAM,GAAG,QAAQ,CAAC,UAAU,CAAC,YAAY,IAAI,EAAE,CAAC;gBACtD,MAAM,aAAa,GAAG,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC;gBACnD,MAAM,IAAI,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;gBAE5D,IAAI,OAAO,GAAG,CAAC,CAAC;gBAChB,IAAI,IAAI,EAAE,CAAC;oBACT,IAAI,OAAO,aAAa,KAAK,QAAQ,IAAI,MAAM,GAAG,MAAM,EAAE,CAAC;wBACzD,OAAO,GAAG,IAAI,CAAC,KAAK,CAClB,CAAC,CAAC,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,GAAG,GAAG,CACrD,CAAC;oBACJ,CAAC;yBAAM,IACL,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;wBACrB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;wBACrB,IAAI,KAAK,GAAG,EACZ,CAAC;wBACD,OAAO,GAAG,GAAG,CAAC;oBAChB,CAAC;yBAAM,IACL,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;wBACpB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;wBACtB,IAAI,KAAK,GAAG,EACZ,CAAC;wBACD,OAAO,GAAG,EAAE,CAAC;oBACf,CAAC;yBAAM,IACL,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;wBACpB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;wBACrB,IAAI,KAAK,GAAG,EACZ,CAAC;wBACD,OAAO,GAAG,EAAE,CAAC;oBACf,CAAC;yBAAM,CAAC;wBACN,OAAO,GAAG,EAAE,CAAC;oBACf,CAAC;oBACD,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;gBAChD,CAAC;gBAED,MAAM,QAAQ,CACZ,IAAI,CAAC,QAAQ,EACb,UAAU,CAAC,EAAE,EACb,gBAAgB,EAChB,OAAO,EACP,IAAI,CAAC,QAAQ,CAAC,GAAG,CAClB,CAAC;gBACF,MAAM,QAAQ,CACZ,IAAI,CAAC,QAAQ,EACb,UAAU,CAAC,EAAE,EACb,gBAAgB,EAChB,OAAO,EACP,IAAI,CAAC,QAAQ,CAAC,GAAG,CAClB,CAAC;gBACF,MAAM,OAAO,GAAG,IAAI;oBAClB,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;wBACrB,CAAC,CAAC,CAAC;wBACH,CAAC,CAAC,OAAO,GAAG,EAAE;4BACZ,CAAC,CAAC,CAAC;4BACH,CAAC,CAAC,OAAO,GAAG,EAAE;gCACZ,CAAC,CAAC,CAAC;gCACH,CAAC,CAAC,CAAC;oBACT,CAAC,CAAC,CAAC,CAAC;gBACN,MAAM,QAAQ,CACZ,IAAI,CAAC,QAAQ,EACb,UAAU,CAAC,EAAE,EACb,SAAS,EACT,OAAO,EACP,IAAI,CAAC,QAAQ,CAAC,GAAG,CAClB,CAAC;YACJ,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,CAAC;IACH,CAAC;CACF"}
|
|
@@ -9,10 +9,13 @@ export class LockEntity extends BaseEntity {
|
|
|
9
9
|
return [DoorLock.id];
|
|
10
10
|
}
|
|
11
11
|
async addCustomClusterServers() {
|
|
12
|
-
const isLocked = this.state.state === "locked" || this.state.state === "locking";
|
|
13
12
|
// Create DoorLock cluster server with mandatory features for Apple HomeKit
|
|
14
13
|
// Apple HomeKit requires ActuatorEnabled and OperatingMode to be set.
|
|
15
|
-
this.endpoint.createDefaultDoorLockClusterServer(
|
|
14
|
+
this.endpoint.createDefaultDoorLockClusterServer(this.state.state === "locked"
|
|
15
|
+
? DoorLock.LockState.Locked
|
|
16
|
+
: ["unlocked", "open"].includes(this.state.state)
|
|
17
|
+
? DoorLock.LockState.Unlocked
|
|
18
|
+
: DoorLock.LockState.NotFullyLocked, DoorLock.LockType.DeadBolt);
|
|
16
19
|
// The helper provides the mandatory attributes. Their final values are
|
|
17
20
|
// applied by updateState(initial=true), after Matterbridge has activated
|
|
18
21
|
// the endpoint; writing here produces an "inactive state" error.
|
|
@@ -34,10 +37,11 @@ export class LockEntity extends BaseEntity {
|
|
|
34
37
|
}
|
|
35
38
|
async updateState(newState, isInitialSync = false) {
|
|
36
39
|
this.state = newState;
|
|
37
|
-
const
|
|
38
|
-
const matterState = isLocked
|
|
40
|
+
const matterState = newState.state === "locked"
|
|
39
41
|
? DoorLock.LockState.Locked
|
|
40
|
-
:
|
|
42
|
+
: newState.state === "unlocked" || newState.state === "open"
|
|
43
|
+
? DoorLock.LockState.Unlocked
|
|
44
|
+
: DoorLock.LockState.NotFullyLocked;
|
|
41
45
|
if (isInitialSync) {
|
|
42
46
|
await safeSetAttribute(this.endpoint, DoorLock.id, "actuatorEnabled", true, this.platform.log);
|
|
43
47
|
await safeSetAttribute(this.endpoint, DoorLock.id, "operatingMode", DoorLock.OperatingMode.Normal, this.platform.log);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lock.entity.js","sourceRoot":"","sources":["../../src/entities/lock.entity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,OAAO,EACL,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,+BAA+B,CAAC;AAGvC,MAAM,OAAO,UAAW,SAAQ,UAAU;IACxC,YACE,QAA+B,EAC/B,KAAgB,EAChB,UAAgC;QAEhC,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IACrC,CAAC;IAEkB,qBAAqB;QACtC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACvB,CAAC;IAEkB,KAAK,CAAC,uBAAuB;QAC9C,
|
|
1
|
+
{"version":3,"file":"lock.entity.js","sourceRoot":"","sources":["../../src/entities/lock.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,8 +13,10 @@ export declare class OvenEntity extends BaseEntity {
|
|
|
13
13
|
cabinet: any;
|
|
14
14
|
constructor(platform: any, state: HassState, deviceType: DeviceTypeDefinition);
|
|
15
15
|
createEndpoint(): Promise<MatterbridgeEndpoint>;
|
|
16
|
+
adoptEndpoint(endpoint: MatterbridgeEndpoint): void;
|
|
16
17
|
updateState(newState: HassState, isInitialSync?: boolean): Promise<void>;
|
|
17
18
|
private syncState;
|
|
18
19
|
protected registerCommandHandlers(_endpoint?: MatterbridgeEndpoint): void;
|
|
20
|
+
private relatedEntity;
|
|
19
21
|
static matterTypeLabel: "Oven";
|
|
20
22
|
}
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
import { Oven } from "matterbridge/devices";
|
|
8
8
|
import { BaseEntity } from "./base.entity.js";
|
|
9
9
|
import { safeSetAttribute, safeUpdateAttribute, } from "../utils/matter-attributes.js";
|
|
10
|
-
import { MATTER_BRIDGE_VENDOR_ID, MATTER_BRIDGE_VENDOR_NAME, } from "../utils/matter-device-identity.js";
|
|
10
|
+
import { getHaDeviceModel, MATTER_BRIDGE_VENDOR_ID, MATTER_BRIDGE_VENDOR_NAME, } from "../utils/matter-device-identity.js";
|
|
11
11
|
import { TemperatureControl, TemperatureMeasurement, OvenCavityOperationalState, } from "matterbridge/matter/clusters";
|
|
12
12
|
export class OvenEntity extends BaseEntity {
|
|
13
13
|
cabinet; // reference to the child cavity endpoint
|
|
@@ -25,7 +25,7 @@ export class OvenEntity extends BaseEntity {
|
|
|
25
25
|
this.endpoint.vendorId = MATTER_BRIDGE_VENDOR_ID;
|
|
26
26
|
this.endpoint.vendorName = MATTER_BRIDGE_VENDOR_NAME;
|
|
27
27
|
this.endpoint.productId = 0x8000;
|
|
28
|
-
this.endpoint.productName =
|
|
28
|
+
this.endpoint.productName = getHaDeviceModel(this.platform, this.entityId, "Oven");
|
|
29
29
|
this.applyMatterbridgeFirmware();
|
|
30
30
|
// Add a single cavity cabinet to control the oven
|
|
31
31
|
this.cabinet = this.endpoint.addCabinet("Horno", // Cabinet name
|
|
@@ -43,6 +43,14 @@ export class OvenEntity extends BaseEntity {
|
|
|
43
43
|
this.registerCommandHandlers();
|
|
44
44
|
return this.endpoint;
|
|
45
45
|
}
|
|
46
|
+
adoptEndpoint(endpoint) {
|
|
47
|
+
const child = endpoint.getChildEndpointById("Horno") ??
|
|
48
|
+
endpoint.getChildEndpointByOriginalId("Horno");
|
|
49
|
+
if (!child)
|
|
50
|
+
throw new Error("Retained appliance node is missing its child endpoint; preserving its pairing");
|
|
51
|
+
this.cabinet = child;
|
|
52
|
+
super.adoptEndpoint(endpoint);
|
|
53
|
+
}
|
|
46
54
|
async updateState(newState, isInitialSync = false) {
|
|
47
55
|
if (!this.endpoint || !this.cabinet)
|
|
48
56
|
return;
|
|
@@ -55,7 +63,8 @@ export class OvenEntity extends BaseEntity {
|
|
|
55
63
|
// Determine operational state (0 = Stopped, 1 = Running)
|
|
56
64
|
const isRunning = state.state === "on" ||
|
|
57
65
|
state.state === "cooking" ||
|
|
58
|
-
state.state === "running"
|
|
66
|
+
state.state === "running" ||
|
|
67
|
+
state.state === "heat";
|
|
59
68
|
await syncFunc(this.cabinet, OvenCavityOperationalState.id, "operationalState", isRunning ? 1 : 0, this.platform.log);
|
|
60
69
|
// Extract temperature attributes from Samsung / HA Oven states
|
|
61
70
|
// Typically: target_temp/temperature and current_temperature/current_temp
|
|
@@ -78,10 +87,24 @@ export class OvenEntity extends BaseEntity {
|
|
|
78
87
|
if (!this.cabinet)
|
|
79
88
|
return;
|
|
80
89
|
this.cabinet.addCommandHandler("OvenMode.changeToMode", async (data) => {
|
|
81
|
-
this.
|
|
90
|
+
this.assertOnline();
|
|
91
|
+
const mode = (data?.request ?? data)?.newMode;
|
|
92
|
+
const names = {
|
|
93
|
+
1: ["bake"],
|
|
94
|
+
2: ["convection"],
|
|
95
|
+
};
|
|
96
|
+
const select = this.relatedEntity("select", (s) => s.attributes?.options?.some((v) => names[mode]?.includes(v.toLowerCase())));
|
|
97
|
+
if (!select)
|
|
98
|
+
throw new Error("Oven mode is not supported by the HA device");
|
|
99
|
+
const option = select.attributes.options.find((v) => names[mode]?.includes(v.toLowerCase()));
|
|
100
|
+
await this.platform.ha.callService("select", "select_option", select.entity_id, { option });
|
|
101
|
+
return { status: 0 };
|
|
82
102
|
});
|
|
83
103
|
this.cabinet.addCommandHandler("TemperatureControl.setTargetTemperature", async (data) => {
|
|
84
|
-
|
|
104
|
+
this.assertOnline();
|
|
105
|
+
const { targetTemperature } = data?.request ?? data;
|
|
106
|
+
if (!Number.isFinite(targetTemperature))
|
|
107
|
+
throw new Error("Invalid oven target temperature");
|
|
85
108
|
const targetC = Math.round(targetTemperature / 100);
|
|
86
109
|
this.platform.log?.info?.(`[OvenEntity] setTargetTemperature commanded: ${targetC}C`);
|
|
87
110
|
const [domain] = this.entityId.split(".");
|
|
@@ -93,9 +116,15 @@ export class OvenEntity extends BaseEntity {
|
|
|
93
116
|
}
|
|
94
117
|
else {
|
|
95
118
|
// Check for a target temperature number helper matching the oven ID
|
|
96
|
-
const
|
|
97
|
-
|
|
98
|
-
|
|
119
|
+
const related = this.relatedEntity("number", (s) => s.attributes?.device_class === "temperature");
|
|
120
|
+
if (!related)
|
|
121
|
+
throw new Error("No target temperature control is associated with this oven");
|
|
122
|
+
const numEntityId = related.entity_id;
|
|
123
|
+
const attrs = related.attributes;
|
|
124
|
+
if (targetC < Number(attrs.min ?? -Infinity) ||
|
|
125
|
+
targetC > Number(attrs.max ?? Infinity))
|
|
126
|
+
throw new Error("Oven temperature outside device limits");
|
|
127
|
+
if (related) {
|
|
99
128
|
await this.platform.ha?.callService("number", "set_value", numEntityId, {
|
|
100
129
|
value: targetC,
|
|
101
130
|
});
|
|
@@ -108,6 +137,19 @@ export class OvenEntity extends BaseEntity {
|
|
|
108
137
|
}
|
|
109
138
|
});
|
|
110
139
|
}
|
|
140
|
+
relatedEntity(domain, predicate) {
|
|
141
|
+
const id = this.platform.ha?.hassEntities?.get(this.entityId)?.device_id;
|
|
142
|
+
if (!id)
|
|
143
|
+
return;
|
|
144
|
+
for (const [entityId, entry] of this.platform.ha?.hassEntities ?? []) {
|
|
145
|
+
const st = this.platform.ha?.hassStates?.get(entityId);
|
|
146
|
+
if (entry.device_id === id &&
|
|
147
|
+
entityId.startsWith(domain + ".") &&
|
|
148
|
+
st &&
|
|
149
|
+
predicate(st))
|
|
150
|
+
return st;
|
|
151
|
+
}
|
|
152
|
+
}
|
|
111
153
|
static matterTypeLabel = "Oven";
|
|
112
154
|
}
|
|
113
155
|
//# sourceMappingURL=oven.entity.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oven.entity.js","sourceRoot":"","sources":["../../src/entities/oven.entity.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EACL,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,uBAAuB,EACvB,yBAAyB,GAC1B,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EACtB,0BAA0B,GAC3B,MAAM,8BAA8B,CAAC;AAEtC,MAAM,OAAO,UAAW,SAAQ,UAAU;IAEjC,OAAO,CAAO,CAAC,yCAAyC;IAE/D,YACE,QAAa,EACb,KAAgB,EAChB,UAAgC;QAEhC,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IACrC,CAAC;IAEe,KAAK,CAAC,cAAc;QAClC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,aAAa,IAAI,IAAI,CAAC,QAAQ,CAAC;QAErE,MAAM,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAEnD,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC;QACxD,MAAM,YAAY,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAElD,IAAI,CAAC,QAAQ,GAAG,IAAI,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAEnD,IAAI,CAAC,QAAQ,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAChD,IAAI,CAAC,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAC;QAC9B,IAAI,CAAC,QAAQ,CAAC,QAAQ,GAAG,uBAAuB,CAAC;QACjD,IAAI,CAAC,QAAQ,CAAC,UAAU,GAAG,yBAAyB,CAAC;QACrD,IAAI,CAAC,QAAQ,CAAC,SAAS,GAAG,MAAM,CAAC;QACjC,IAAI,CAAC,QAAQ,CAAC,WAAW,GAAG,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"oven.entity.js","sourceRoot":"","sources":["../../src/entities/oven.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { toCelsius } from "../utils/measurements.js";
|
|
1
2
|
import { BaseEntity } from "./base.entity.js";
|
|
2
3
|
import { safeSetAttribute, safeUpdateAttribute, } from "../utils/matter-attributes.js";
|
|
3
4
|
const RelativeHumidityMeasurementId = 0x0405;
|
|
@@ -27,7 +28,7 @@ export class SoilSensorEntity extends BaseEntity {
|
|
|
27
28
|
}
|
|
28
29
|
else if (deviceClass === "temperature") {
|
|
29
30
|
// Matter uses hundredths of a degree Celsius
|
|
30
|
-
const mappedTemp = Math.round(rawValue * 100);
|
|
31
|
+
const mappedTemp = Math.round(toCelsius(rawValue, state.attributes.unit_of_measurement) * 100);
|
|
31
32
|
if (isInitialSync) {
|
|
32
33
|
await safeSetAttribute(this.endpoint, TemperatureMeasurementId, "measuredValue", mappedTemp, this.platform.log);
|
|
33
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"soil_sensor.entity.js","sourceRoot":"","sources":["../../src/entities/soil_sensor.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,OAAO,EACL,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,+BAA+B,CAAC;AAEvC,MAAM,6BAA6B,GAAG,MAA0B,CAAC;AACjE,MAAM,wBAAwB,GAAG,MAA0B,CAAC;AAE5D,MAAM,OAAO,gBAAiB,SAAQ,UAAU;IAC3B,qBAAqB;QACtC,MAAM,QAAQ,GAAG,KAAK,CAAC,qBAAqB,EAAE,CAAC;QAC/C,QAAQ,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QAC7C,QAAQ,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACxC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEe,KAAK,CAAC,WAAW,CAC/B,KAAgB,EAChB,aAAa,GAAG,KAAK;QAErB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,KAAK,CAAC,QAAQ,CAAC;YAAE,OAAO;QAE5B,MAAM,WAAW,GAAG,KAAK,CAAC,UAAU,CAAC,YAAY,CAAC;QAElD,IAAI,WAAW,KAAK,UAAU,EAAE,CAAC;YAC/B,0EAA0E;YAC1E,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,GAAG,CAAC,CAAC;YAClD,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,gBAAgB,CACpB,IAAI,CAAC,QAAQ,EACb,6BAA6B,EAC7B,eAAe,EACf,cAAc,EACd,IAAI,CAAC,QAAQ,CAAC,GAAG,CAClB,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,mBAAmB,CACvB,IAAI,CAAC,QAAQ,EACb,6BAA6B,EAC7B,eAAe,EACf,cAAc,EACd,IAAI,CAAC,QAAQ,CAAC,GAAG,CAClB,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,IAAI,WAAW,KAAK,aAAa,EAAE,CAAC;YACzC,6CAA6C;YAC7C,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,GAAG,
|
|
1
|
+
{"version":3,"file":"soil_sensor.entity.js","sourceRoot":"","sources":["../../src/entities/soil_sensor.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,OAAO,EACL,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,+BAA+B,CAAC;AAEvC,MAAM,6BAA6B,GAAG,MAA0B,CAAC;AACjE,MAAM,wBAAwB,GAAG,MAA0B,CAAC;AAE5D,MAAM,OAAO,gBAAiB,SAAQ,UAAU;IAC3B,qBAAqB;QACtC,MAAM,QAAQ,GAAG,KAAK,CAAC,qBAAqB,EAAE,CAAC;QAC/C,QAAQ,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QAC7C,QAAQ,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACxC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEe,KAAK,CAAC,WAAW,CAC/B,KAAgB,EAChB,aAAa,GAAG,KAAK;QAErB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,KAAK,CAAC,QAAQ,CAAC;YAAE,OAAO;QAE5B,MAAM,WAAW,GAAG,KAAK,CAAC,UAAU,CAAC,YAAY,CAAC;QAElD,IAAI,WAAW,KAAK,UAAU,EAAE,CAAC;YAC/B,0EAA0E;YAC1E,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,GAAG,CAAC,CAAC;YAClD,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,gBAAgB,CACpB,IAAI,CAAC,QAAQ,EACb,6BAA6B,EAC7B,eAAe,EACf,cAAc,EACd,IAAI,CAAC,QAAQ,CAAC,GAAG,CAClB,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,mBAAmB,CACvB,IAAI,CAAC,QAAQ,EACb,6BAA6B,EAC7B,eAAe,EACf,cAAc,EACd,IAAI,CAAC,QAAQ,CAAC,GAAG,CAClB,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,IAAI,WAAW,KAAK,aAAa,EAAE,CAAC;YACzC,6CAA6C;YAC7C,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAC3B,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,UAAU,CAAC,mBAAmB,CAAC,GAAG,GAAG,CAChE,CAAC;YACF,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,gBAAgB,CACpB,IAAI,CAAC,QAAQ,EACb,wBAAwB,EACxB,eAAe,EACf,UAAU,EACV,IAAI,CAAC,QAAQ,CAAC,GAAG,CAClB,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,mBAAmB,CACvB,IAAI,CAAC,QAAQ,EACb,wBAAwB,EACxB,eAAe,EACf,UAAU,EACV,IAAI,CAAC,QAAQ,CAAC,GAAG,CAClB,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;CACF"}
|
|
@@ -14,7 +14,7 @@ import { BaseEntity } from "./base.entity.js";
|
|
|
14
14
|
import { isUnavailable } from "../utils/ha-state.js";
|
|
15
15
|
import { buildVacuumUpdate, buildVacuumMatterMeta, getSupportedVacuumCleanModes, } from "../converters/vacuum.converter.js";
|
|
16
16
|
import { safeSetAttribute, safeUpdateAttribute, } from "../utils/matter-attributes.js";
|
|
17
|
-
import { MATTER_BRIDGE_VENDOR_ID, MATTER_BRIDGE_VENDOR_NAME, } from "../utils/matter-device-identity.js";
|
|
17
|
+
import { getHaDeviceModel, MATTER_BRIDGE_VENDOR_ID, MATTER_BRIDGE_VENDOR_NAME, } from "../utils/matter-device-identity.js";
|
|
18
18
|
export { buildVacuumMatterMeta };
|
|
19
19
|
// Mode IDs used as currentMode values
|
|
20
20
|
const RUN_MODE_ID_IDLE = 1;
|
|
@@ -391,12 +391,12 @@ export class VacuumEntity extends BaseEntity {
|
|
|
391
391
|
// These properties populate the standalone ServerNode Basic Information
|
|
392
392
|
// cluster that Apple Home reads. Setting only the endpoint cluster below is
|
|
393
393
|
// insufficient because Matterbridge creates the node before attaching it.
|
|
394
|
-
this.endpoint.productName = ROPVOCNIC_MODEL;
|
|
394
|
+
this.endpoint.productName = getHaDeviceModel(this.platform, this.entityId, ROPVOCNIC_MODEL);
|
|
395
395
|
this.applyMatterbridgeFirmware();
|
|
396
396
|
safeSetAttribute(this.endpoint, "basicInformation", "vendorName", MATTER_BRIDGE_VENDOR_NAME, this.platform.log);
|
|
397
|
-
safeSetAttribute(this.endpoint, "basicInformation", "productName",
|
|
397
|
+
safeSetAttribute(this.endpoint, "basicInformation", "productName", this.endpoint.productName, this.platform.log);
|
|
398
398
|
safeSetAttribute(this.endpoint, "basicInformation", "nodeLabel", uniqueName, this.platform.log);
|
|
399
|
-
safeSetAttribute(this.endpoint, "basicInformation", "softwareVersionString",
|
|
399
|
+
safeSetAttribute(this.endpoint, "basicInformation", "softwareVersionString", this.endpoint.softwareVersionString, this.platform.log);
|
|
400
400
|
this.registerCommandHandlers();
|
|
401
401
|
return this.endpoint;
|
|
402
402
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vacuum.entity.js","sourceRoot":"","sources":["../../src/entities/vacuum.entity.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"vacuum.entity.js","sourceRoot":"","sources":["../../src/entities/vacuum.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,11 +20,18 @@ export class ValveEntity extends BaseEntity {
|
|
|
20
20
|
if (!this.endpoint)
|
|
21
21
|
return;
|
|
22
22
|
const updateFn = isInitialSync ? safeSetAttribute : safeUpdateAttribute;
|
|
23
|
-
const
|
|
24
|
-
|
|
25
|
-
|
|
23
|
+
const valveStates = {
|
|
24
|
+
closed: 0,
|
|
25
|
+
open: 1,
|
|
26
|
+
opening: 2,
|
|
27
|
+
closing: 2,
|
|
28
|
+
};
|
|
29
|
+
const valveState = valveStates[state.state];
|
|
30
|
+
if (valveState !== undefined) {
|
|
31
|
+
await updateFn(this.endpoint, ValveConfigurationAndControlId, "currentState", valveState, this.platform.log);
|
|
32
|
+
}
|
|
26
33
|
const position = state.attributes?.current_position;
|
|
27
|
-
if (position
|
|
34
|
+
if (typeof position === "number" && Number.isFinite(position)) {
|
|
28
35
|
const level = Math.max(0, Math.min(100, Math.round(Number(position))));
|
|
29
36
|
await updateFn(this.endpoint, ValveConfigurationAndControlId, "currentLevel", level, this.platform.log);
|
|
30
37
|
}
|
|
@@ -34,8 +41,24 @@ export class ValveEntity extends BaseEntity {
|
|
|
34
41
|
if (!targetEndpoint)
|
|
35
42
|
return;
|
|
36
43
|
targetEndpoint.addCommandHandler("open", async (data) => {
|
|
37
|
-
|
|
44
|
+
this.assertOnline();
|
|
45
|
+
const request = data?.request ?? data ?? {};
|
|
46
|
+
// Generic HA valves cannot guarantee timed closing. HAP uses its persisted deadline.
|
|
47
|
+
if (request.openDuration !== undefined && request.openDuration !== null)
|
|
48
|
+
throw new Error("Timed opening is not supported by this HA valve endpoint");
|
|
49
|
+
const position = request.targetLevel;
|
|
50
|
+
if (position !== undefined &&
|
|
51
|
+
position !== null &&
|
|
52
|
+
(!Number.isFinite(position) || position < 0 || position > 100))
|
|
53
|
+
throw new Error("Invalid valve level");
|
|
38
54
|
if (position !== undefined && position !== null) {
|
|
55
|
+
const features = this.state.attributes?.supported_features;
|
|
56
|
+
if (typeof features === "number" && !(features & 4)) {
|
|
57
|
+
if (position !== 100)
|
|
58
|
+
throw new Error("Valve does not support positioning");
|
|
59
|
+
await this.platform.ha?.callService("valve", "open_valve", this.entityId);
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
39
62
|
await this.platform.ha?.callService("valve", "set_valve_position", this.entityId, { position: Number(position) });
|
|
40
63
|
}
|
|
41
64
|
else {
|
|
@@ -43,6 +66,7 @@ export class ValveEntity extends BaseEntity {
|
|
|
43
66
|
}
|
|
44
67
|
});
|
|
45
68
|
targetEndpoint.addCommandHandler("close", async () => {
|
|
69
|
+
this.assertOnline();
|
|
46
70
|
await this.platform.ha?.callService("valve", "close_valve", this.entityId);
|
|
47
71
|
});
|
|
48
72
|
}
|