homebridge-plugin-klares4 2.0.0-beta.6 → 2.0.0-beta.7
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 +2 -2
- package/config.schema.json +54 -1
- package/dist/accessories/zone-accessory.d.ts +4 -0
- package/dist/accessories/zone-accessory.d.ts.map +1 -1
- package/dist/accessories/zone-accessory.js +24 -17
- package/dist/accessories/zone-accessory.js.map +1 -1
- package/dist/types/websocket.types.d.ts +5 -0
- package/dist/types/websocket.types.d.ts.map +1 -1
- package/dist/websocket-client/command-service.d.ts +1 -0
- package/dist/websocket-client/command-service.d.ts.map +1 -1
- package/dist/websocket-client/command-service.js +3 -4
- package/dist/websocket-client/command-service.js.map +1 -1
- package/dist/websocket-client/state.d.ts.map +1 -1
- package/dist/websocket-client/state.js +1 -0
- package/dist/websocket-client/state.js.map +1 -1
- package/dist/websocket-client/thermostat-command-id-resolver.d.ts +2 -1
- package/dist/websocket-client/thermostat-command-id-resolver.d.ts.map +1 -1
- package/dist/websocket-client/thermostat-command-id-resolver.js +7 -1
- package/dist/websocket-client/thermostat-command-id-resolver.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -107,7 +107,7 @@ The plugin can be fully configured via the Homebridge UI graphical interface. Re
|
|
|
107
107
|
| `heartbeatInterval` | number | 30000 | Heartbeat interval (ms) |
|
|
108
108
|
| `commandTimeoutMs` | number | 8000 | API command response timeout (ms) |
|
|
109
109
|
| `allowInsecureTls` | boolean | false | Disable TLS certificate validation (trusted LAN only) |
|
|
110
|
-
| `domusThermostat` | object | enabled/freshness defaults | DOMUS thermostat mapping, manual overrides, freshness fallback |
|
|
110
|
+
| `domusThermostat` | object | enabled/freshness defaults | DOMUS thermostat mapping, manual sensor/command overrides, freshness fallback |
|
|
111
111
|
| `debug` | boolean | false | Detailed logging |
|
|
112
112
|
| `excludeZones` | string[] | [] | Zones to exclude |
|
|
113
113
|
| `excludeOutputs` | string[] | [] | Outputs to exclude |
|
|
@@ -398,7 +398,7 @@ Il plugin puo essere configurato completamente tramite l'interfaccia grafica di
|
|
|
398
398
|
| `maxSeconds` | number | 30 | Tempo max tapparelle (secondi) |
|
|
399
399
|
| `reconnectInterval` | number | 5000 | Intervallo riconnessione (ms) |
|
|
400
400
|
| `heartbeatInterval` | number | 30000 | Intervallo heartbeat (ms) |
|
|
401
|
-
| `domusThermostat` | object | default attivi | Mapping termostati DOMUS, override manuali e fallback freshness |
|
|
401
|
+
| `domusThermostat` | object | default attivi | Mapping termostati DOMUS, override manuali (sensori + command ID) e fallback freshness |
|
|
402
402
|
| `debug` | boolean | false | Logging dettagliato |
|
|
403
403
|
| `excludeZones` | string[] | [] | Zone da escludere |
|
|
404
404
|
| `excludeOutputs` | string[] | [] | Output da escludere |
|
package/config.schema.json
CHANGED
|
@@ -256,7 +256,8 @@
|
|
|
256
256
|
"default": {
|
|
257
257
|
"enabled": true,
|
|
258
258
|
"sensorFreshnessMs": 300000,
|
|
259
|
-
"manualPairs": []
|
|
259
|
+
"manualPairs": [],
|
|
260
|
+
"manualCommandPairs": []
|
|
260
261
|
},
|
|
261
262
|
"properties": {
|
|
262
263
|
"enabled": {
|
|
@@ -297,6 +298,31 @@
|
|
|
297
298
|
"domusSensorId"
|
|
298
299
|
]
|
|
299
300
|
}
|
|
301
|
+
},
|
|
302
|
+
"manualCommandPairs": {
|
|
303
|
+
"title": "Override Manuale ID Comando",
|
|
304
|
+
"type": "array",
|
|
305
|
+
"items": {
|
|
306
|
+
"type": "object",
|
|
307
|
+
"properties": {
|
|
308
|
+
"thermostatOutputId": {
|
|
309
|
+
"title": "Thermostat Output ID",
|
|
310
|
+
"type": "string",
|
|
311
|
+
"pattern": "^(thermostat_)?[0-9]+$",
|
|
312
|
+
"placeholder": "21 o thermostat_21"
|
|
313
|
+
},
|
|
314
|
+
"commandThermostatId": {
|
|
315
|
+
"title": "Thermostat Command ID",
|
|
316
|
+
"type": "string",
|
|
317
|
+
"pattern": "^(thermostat_)?[0-9]+$",
|
|
318
|
+
"placeholder": "4"
|
|
319
|
+
}
|
|
320
|
+
},
|
|
321
|
+
"required": [
|
|
322
|
+
"thermostatOutputId",
|
|
323
|
+
"commandThermostatId"
|
|
324
|
+
]
|
|
325
|
+
}
|
|
300
326
|
}
|
|
301
327
|
}
|
|
302
328
|
},
|
|
@@ -589,6 +615,33 @@
|
|
|
589
615
|
]
|
|
590
616
|
}
|
|
591
617
|
]
|
|
618
|
+
},
|
|
619
|
+
{
|
|
620
|
+
"key": "domusThermostat.manualCommandPairs",
|
|
621
|
+
"type": "array",
|
|
622
|
+
"title": "Override ID Comando",
|
|
623
|
+
"orderable": true,
|
|
624
|
+
"buttonText": "+ Aggiungi Pair",
|
|
625
|
+
"condition": {
|
|
626
|
+
"functionBody": "return !model.domusThermostat || model.domusThermostat.enabled !== false;"
|
|
627
|
+
},
|
|
628
|
+
"items": [
|
|
629
|
+
{
|
|
630
|
+
"type": "fieldset",
|
|
631
|
+
"items": [
|
|
632
|
+
{
|
|
633
|
+
"key": "domusThermostat.manualCommandPairs[].thermostatOutputId",
|
|
634
|
+
"title": "Thermostat Output ID",
|
|
635
|
+
"placeholder": "21 o thermostat_21"
|
|
636
|
+
},
|
|
637
|
+
{
|
|
638
|
+
"key": "domusThermostat.manualCommandPairs[].commandThermostatId",
|
|
639
|
+
"title": "Thermostat Command ID",
|
|
640
|
+
"placeholder": "4"
|
|
641
|
+
}
|
|
642
|
+
]
|
|
643
|
+
}
|
|
644
|
+
]
|
|
592
645
|
}
|
|
593
646
|
]
|
|
594
647
|
},
|
|
@@ -10,6 +10,10 @@ export declare class ZoneAccessory {
|
|
|
10
10
|
private readonly accessory;
|
|
11
11
|
private service;
|
|
12
12
|
device: KseniaZone;
|
|
13
|
+
private lastOpen;
|
|
14
|
+
private lastArmed;
|
|
15
|
+
private lastFault;
|
|
16
|
+
private lastBypassed;
|
|
13
17
|
constructor(platform: Lares4Platform, accessory: PlatformAccessory);
|
|
14
18
|
getContactState(): Promise<CharacteristicValue>;
|
|
15
19
|
getStatusActive(): Promise<CharacteristicValue>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zone-accessory.d.ts","sourceRoot":"","sources":["../../src/accessories/zone-accessory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,iBAAiB,EAAW,MAAM,YAAY,CAAC;AAClF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C;;;GAGG;AACH,qBAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"zone-accessory.d.ts","sourceRoot":"","sources":["../../src/accessories/zone-accessory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,iBAAiB,EAAW,MAAM,YAAY,CAAC;AAClF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C;;;GAGG;AACH,qBAAa,aAAa;IASlB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAT9B,OAAO,CAAC,OAAO,CAAU;IAClB,MAAM,EAAE,UAAU,CAAC;IAC1B,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,YAAY,CAAU;gBAGT,QAAQ,EAAE,cAAc,EACxB,SAAS,EAAE,iBAAiB;IA4CpC,eAAe,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAK/C,eAAe,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAI/C,cAAc,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAK9C,iBAAiB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAK9D,OAAO,CAAC,qBAAqB;IAsBtB,YAAY,CAAC,SAAS,EAAE,UAAU,GAAG,IAAI;IAsDhD,OAAO,CAAC,mBAAmB;CAS9B"}
|
|
@@ -10,6 +10,10 @@ class ZoneAccessory {
|
|
|
10
10
|
this.platform = platform;
|
|
11
11
|
this.accessory = accessory;
|
|
12
12
|
this.device = accessory.context.device;
|
|
13
|
+
this.lastOpen = this.device.status.open;
|
|
14
|
+
this.lastArmed = this.device.status.armed;
|
|
15
|
+
this.lastFault = this.device.status.fault;
|
|
16
|
+
this.lastBypassed = this.device.status.bypassed;
|
|
13
17
|
const accessoryInfoService = this.accessory.getService(this.platform.Service.AccessoryInformation);
|
|
14
18
|
if (accessoryInfoService) {
|
|
15
19
|
accessoryInfoService
|
|
@@ -58,28 +62,31 @@ class ZoneAccessory {
|
|
|
58
62
|
this.service.updateCharacteristic(this.platform.Characteristic.StatusTampered, this.device.status.bypassed ? 1 : 0);
|
|
59
63
|
}
|
|
60
64
|
updateStatus(newDevice) {
|
|
61
|
-
const oldDevice = this.device;
|
|
62
65
|
this.device = newDevice;
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
+
const newOpen = newDevice.status.open;
|
|
67
|
+
const newArmed = newDevice.status.armed;
|
|
68
|
+
const newFault = newDevice.status.fault;
|
|
69
|
+
const newBypassed = newDevice.status.bypassed;
|
|
70
|
+
this.service.updateCharacteristic(this.platform.Characteristic.ContactSensorState, newOpen ? 1 : 0);
|
|
71
|
+
if (this.lastOpen !== newOpen) {
|
|
72
|
+
this.platform.log.info(`${this.device.name}: ${newOpen ? 'Open' : 'Closed'}`);
|
|
66
73
|
}
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
this.platform.log.info(`${this.device.name}: ${
|
|
74
|
+
this.service.updateCharacteristic(this.platform.Characteristic.StatusActive, newArmed);
|
|
75
|
+
if (this.lastArmed !== newArmed) {
|
|
76
|
+
this.platform.log.info(`${this.device.name}: ${newArmed ? 'Armed' : 'Disarmed'}`);
|
|
70
77
|
}
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
this.platform.log.warn(`${this.device.name}: Fault detected`);
|
|
75
|
-
}
|
|
78
|
+
this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, newFault ? 1 : 0);
|
|
79
|
+
if (this.lastFault !== newFault && newFault) {
|
|
80
|
+
this.platform.log.warn(`${this.device.name}: Fault detected`);
|
|
76
81
|
}
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
this.platform.log.warn(`${this.device.name}: Zone bypassed`);
|
|
81
|
-
}
|
|
82
|
+
this.service.updateCharacteristic(this.platform.Characteristic.StatusTampered, newBypassed ? 1 : 0);
|
|
83
|
+
if (this.lastBypassed !== newBypassed && newBypassed) {
|
|
84
|
+
this.platform.log.warn(`${this.device.name}: Zone bypassed`);
|
|
82
85
|
}
|
|
86
|
+
this.lastOpen = newOpen;
|
|
87
|
+
this.lastArmed = newArmed;
|
|
88
|
+
this.lastFault = newFault;
|
|
89
|
+
this.lastBypassed = newBypassed;
|
|
83
90
|
this.platform.log.debug(`Updated zone state ${this.device.name}: ${this.getZoneStatusString()}`);
|
|
84
91
|
}
|
|
85
92
|
getZoneStatusString() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zone-accessory.js","sourceRoot":"","sources":["../../src/accessories/zone-accessory.ts"],"names":[],"mappings":";;;AAIA;;;GAGG;AACH,MAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"zone-accessory.js","sourceRoot":"","sources":["../../src/accessories/zone-accessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -75,9 +75,14 @@ export interface DomusThermostatManualPair {
|
|
|
75
75
|
thermostatOutputId: string;
|
|
76
76
|
domusSensorId: string;
|
|
77
77
|
}
|
|
78
|
+
export interface DomusThermostatManualCommandPair {
|
|
79
|
+
thermostatOutputId: string;
|
|
80
|
+
commandThermostatId: string;
|
|
81
|
+
}
|
|
78
82
|
export interface DomusThermostatConfig {
|
|
79
83
|
enabled?: boolean;
|
|
80
84
|
manualPairs?: DomusThermostatManualPair[];
|
|
85
|
+
manualCommandPairs?: DomusThermostatManualCommandPair[];
|
|
81
86
|
sensorFreshnessMs?: number;
|
|
82
87
|
}
|
|
83
88
|
export interface KseniaMessagePayload {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket.types.d.ts","sourceRoot":"","sources":["../../src/types/websocket.types.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"websocket.types.d.ts","sourceRoot":"","sources":["../../src/types/websocket.types.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,6 +30,7 @@ export declare class CommandService {
|
|
|
30
30
|
setThermostatMode(thermostatId: string, mode: ThermostatMode): Promise<void>;
|
|
31
31
|
setThermostatTemperature(thermostatId: string, temperature: number): Promise<void>;
|
|
32
32
|
private resolveThermostatCommandId;
|
|
33
|
+
private getManualThermostatCommandId;
|
|
33
34
|
private primeThermostatConfigCache;
|
|
34
35
|
triggerScenario(scenarioId: string): Promise<void>;
|
|
35
36
|
private sendKseniaCommand;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-service.d.ts","sourceRoot":"","sources":["../../src/websocket-client/command-service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAqB,MAAM,eAAe,CAAC;AAE5D,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAIxD,OAAO,KAAK,EAAuC,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAC5F,OAAO,KAAK,EAAwB,mBAAmB,EAAsB,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAEnH,UAAU,kBAAkB;IACxB,KAAK,EAAE,oBAAoB,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,QAAQ,CAAC;IACnB,OAAO,EAAE,sBAAsB,CAAC;IAChC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,WAAW,EAAE,WAAW,CAAC;IACzB,cAAc,EAAE,CAAC,SAAS,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;CAChF;
|
|
1
|
+
{"version":3,"file":"command-service.d.ts","sourceRoot":"","sources":["../../src/websocket-client/command-service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAqB,MAAM,eAAe,CAAC;AAE5D,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAIxD,OAAO,KAAK,EAAuC,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAC5F,OAAO,KAAK,EAAwB,mBAAmB,EAAsB,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAEnH,UAAU,kBAAkB;IACxB,KAAK,EAAE,oBAAoB,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,QAAQ,CAAC;IACnB,OAAO,EAAE,sBAAsB,CAAC;IAChC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,WAAW,EAAE,WAAW,CAAC;IACzB,cAAc,EAAE,CAAC,SAAS,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;CAChF;AAAC,qBAAa,cAAc;IACb,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,kBAAkB;IACrD,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAyC;IACnF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,yBAAyB,CAAQ;IAC5C,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBjC,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IA2BlC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAexD,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB5D,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB3D,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAezC,iBAAiB,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAiC5E,wBAAwB,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAmCjF,0BAA0B;IAWxC,OAAO,CAAC,4BAA4B;YACtB,0BAA0B;IAiB3B,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAcjD,iBAAiB;IAwC/B,OAAO,CAAC,YAAY;YAON,cAAc;CAC/B"}
|
|
@@ -203,12 +203,14 @@ class CommandService {
|
|
|
203
203
|
return (0, thermostat_command_id_resolver_1.resolveThermostatCommandId)({
|
|
204
204
|
outputThermostatId,
|
|
205
205
|
cachedCommandId: this.deps.state.thermostatCommandIdByOutputId.get(outputThermostatId),
|
|
206
|
+
manualCommandId: this.getManualThermostatCommandId(outputThermostatId),
|
|
206
207
|
mappedDomusSensorId: this.deps.state.thermostatToDomus.get(outputThermostatId),
|
|
207
208
|
primeConfig: (candidateId) => this.primeThermostatConfigCache(candidateId),
|
|
208
209
|
rememberCommandId: (resolvedCommandId) => { this.deps.state.thermostatCommandIdByOutputId.set(outputThermostatId, resolvedCommandId); },
|
|
209
210
|
onResolvedAlias: (resolvedCommandId) => this.deps.log.info(`Thermostat command ID resolved thermostat_${outputThermostatId} -> ${resolvedCommandId}`),
|
|
210
211
|
});
|
|
211
212
|
}
|
|
213
|
+
getManualThermostatCommandId(outputThermostatId) { const pair = this.deps.state.domusThermostatConfig.manualCommandPairs.find((item) => (0, device_id_1.stripDevicePrefix)(item.thermostatOutputId) === outputThermostatId); return pair ? (0, device_id_1.stripDevicePrefix)(pair.commandThermostatId) : undefined; }
|
|
212
214
|
async primeThermostatConfigCache(systemThermostatId) {
|
|
213
215
|
if (this.deps.state.thermostatCfgById.has(systemThermostatId))
|
|
214
216
|
return true;
|
|
@@ -260,10 +262,7 @@ class CommandService {
|
|
|
260
262
|
message.CRC_16 = (0, crc16_1.calculateCRC16)(JSON.stringify(message));
|
|
261
263
|
const jsonMessage = JSON.stringify(message);
|
|
262
264
|
const isPing = cmd === 'PING' || payloadType === 'HEARTBEAT';
|
|
263
|
-
if (!isPing && this.deps.logLevel >= log_levels_1.LogLevel.
|
|
264
|
-
this.deps.log.info(`Sending: ${(0, log_levels_1.maskSensitiveData)(jsonMessage)}`);
|
|
265
|
-
}
|
|
266
|
-
else if (this.deps.logLevel >= log_levels_1.LogLevel.DEBUG) {
|
|
265
|
+
if (!isPing && this.deps.logLevel >= log_levels_1.LogLevel.DEBUG) {
|
|
267
266
|
this.deps.log.debug(`Sending: ${(0, log_levels_1.maskSensitiveData)(jsonMessage)}`);
|
|
268
267
|
}
|
|
269
268
|
let pendingResponsePromise;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-service.js","sourceRoot":"","sources":["../../src/websocket-client/command-service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"command-service.js","sourceRoot":"","sources":["../../src/websocket-client/command-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/websocket-client/state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACtD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAEpD,wBAAgB,iCAAiC,CAC7C,qBAAqB,CAAC,EAAE,qBAAqB,GAC9C,oBAAoB,
|
|
1
|
+
{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/websocket-client/state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACtD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAEpD,wBAAgB,iCAAiC,CAC7C,qBAAqB,CAAC,EAAE,qBAAqB,GAC9C,oBAAoB,CA4BtB"}
|
|
@@ -5,6 +5,7 @@ function createInitialWebSocketClientState(domusThermostatConfig) {
|
|
|
5
5
|
const resolvedDomusConfig = {
|
|
6
6
|
enabled: domusThermostatConfig?.enabled ?? true,
|
|
7
7
|
manualPairs: domusThermostatConfig?.manualPairs ?? [],
|
|
8
|
+
manualCommandPairs: domusThermostatConfig?.manualCommandPairs ?? [],
|
|
8
9
|
sensorFreshnessMs: domusThermostatConfig?.sensorFreshnessMs ?? 300000,
|
|
9
10
|
};
|
|
10
11
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../src/websocket-client/state.ts"],"names":[],"mappings":";;AAGA,
|
|
1
|
+
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../src/websocket-client/state.ts"],"names":[],"mappings":";;AAGA,8EA8BC;AA9BD,SAAgB,iCAAiC,CAC7C,qBAA6C;IAE7C,MAAM,mBAAmB,GAAoC;QACzD,OAAO,EAAE,qBAAqB,EAAE,OAAO,IAAI,IAAI;QAC/C,WAAW,EAAE,qBAAqB,EAAE,WAAW,IAAI,EAAE;QACrD,kBAAkB,EAAE,qBAAqB,EAAE,kBAAkB,IAAI,EAAE;QACnE,iBAAiB,EAAE,qBAAqB,EAAE,iBAAiB,IAAI,MAAM;KACxE,CAAC;IAEF,OAAO;QACH,WAAW,EAAE,KAAK;QAClB,gBAAgB,EAAE,KAAK;QACvB,gBAAgB,EAAE,CAAC;QACnB,iBAAiB,EAAE,CAAC;QACpB,aAAa,EAAE,KAAK;QACpB,uBAAuB,EAAE,KAAK;QAC9B,qBAAqB,EAAE,IAAI,GAAG,EAAE;QAChC,qBAAqB,EAAE,IAAI,GAAG,EAAE;QAChC,mBAAmB,EAAE,IAAI,GAAG,EAAE;QAC9B,OAAO,EAAE,IAAI,GAAG,EAAE;QAClB,qBAAqB,EAAE,mBAAmB;QAC1C,iBAAiB,EAAE,IAAI,GAAG,EAAE;QAC5B,6BAA6B,EAAE,IAAI,GAAG,EAAE;QACxC,iBAAiB,EAAE,IAAI,GAAG,EAAE;QAC5B,YAAY,EAAE,IAAI,GAAG,EAAE;QACvB,iBAAiB,EAAE,IAAI,GAAG,EAAE;QAC5B,uBAAuB,EAAE,IAAI,GAAG,EAAE;QAClC,WAAW,EAAE,IAAI,GAAG,EAAE;KACzB,CAAC;AACN,CAAC"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
interface ResolveThermostatCommandIdInput {
|
|
2
2
|
outputThermostatId: string;
|
|
3
3
|
cachedCommandId?: string;
|
|
4
|
+
manualCommandId?: string;
|
|
4
5
|
mappedDomusSensorId?: string;
|
|
5
6
|
primeConfig: (candidateId: string) => Promise<boolean>;
|
|
6
7
|
rememberCommandId: (resolvedCommandId: string) => void;
|
|
7
8
|
onResolvedAlias?: (resolvedCommandId: string) => void;
|
|
8
9
|
}
|
|
9
|
-
export declare function resolveThermostatCommandId({ outputThermostatId, cachedCommandId, mappedDomusSensorId, primeConfig, rememberCommandId, onResolvedAlias, }: ResolveThermostatCommandIdInput): Promise<string>;
|
|
10
|
+
export declare function resolveThermostatCommandId({ outputThermostatId, cachedCommandId, manualCommandId, mappedDomusSensorId, primeConfig, rememberCommandId, onResolvedAlias, }: ResolveThermostatCommandIdInput): Promise<string>;
|
|
10
11
|
export {};
|
|
11
12
|
//# sourceMappingURL=thermostat-command-id-resolver.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thermostat-command-id-resolver.d.ts","sourceRoot":"","sources":["../../src/websocket-client/thermostat-command-id-resolver.ts"],"names":[],"mappings":"AAAA,UAAU,+BAA+B;IACrC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,WAAW,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACvD,iBAAiB,EAAE,CAAC,iBAAiB,EAAE,MAAM,KAAK,IAAI,CAAC;IACvD,eAAe,CAAC,EAAE,CAAC,iBAAiB,EAAE,MAAM,KAAK,IAAI,CAAC;CACzD;AAED,wBAAsB,0BAA0B,CAAC,EAC7C,kBAAkB,EAClB,eAAe,EACf,mBAAmB,EACnB,WAAW,EACX,iBAAiB,EACjB,eAAe,GAClB,EAAE,+BAA+B,GAAG,OAAO,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"thermostat-command-id-resolver.d.ts","sourceRoot":"","sources":["../../src/websocket-client/thermostat-command-id-resolver.ts"],"names":[],"mappings":"AAAA,UAAU,+BAA+B;IACrC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,WAAW,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACvD,iBAAiB,EAAE,CAAC,iBAAiB,EAAE,MAAM,KAAK,IAAI,CAAC;IACvD,eAAe,CAAC,EAAE,CAAC,iBAAiB,EAAE,MAAM,KAAK,IAAI,CAAC;CACzD;AAED,wBAAsB,0BAA0B,CAAC,EAC7C,kBAAkB,EAClB,eAAe,EACf,eAAe,EACf,mBAAmB,EACnB,WAAW,EACX,iBAAiB,EACjB,eAAe,GAClB,EAAE,+BAA+B,GAAG,OAAO,CAAC,MAAM,CAAC,CAuBnD"}
|
|
@@ -1,10 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.resolveThermostatCommandId = resolveThermostatCommandId;
|
|
4
|
-
async function resolveThermostatCommandId({ outputThermostatId, cachedCommandId, mappedDomusSensorId, primeConfig, rememberCommandId, onResolvedAlias, }) {
|
|
4
|
+
async function resolveThermostatCommandId({ outputThermostatId, cachedCommandId, manualCommandId, mappedDomusSensorId, primeConfig, rememberCommandId, onResolvedAlias, }) {
|
|
5
5
|
if (cachedCommandId) {
|
|
6
6
|
return cachedCommandId;
|
|
7
7
|
}
|
|
8
|
+
if (manualCommandId && await primeConfig(manualCommandId)) {
|
|
9
|
+
rememberCommandId(manualCommandId);
|
|
10
|
+
if (manualCommandId !== outputThermostatId)
|
|
11
|
+
onResolvedAlias?.(manualCommandId);
|
|
12
|
+
return manualCommandId;
|
|
13
|
+
}
|
|
8
14
|
const candidates = [outputThermostatId, mappedDomusSensorId].filter((id, index, arr) => Boolean(id) && arr.indexOf(id) === index);
|
|
9
15
|
for (const candidateId of candidates) {
|
|
10
16
|
if (!await primeConfig(candidateId)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thermostat-command-id-resolver.js","sourceRoot":"","sources":["../../src/websocket-client/thermostat-command-id-resolver.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"thermostat-command-id-resolver.js","sourceRoot":"","sources":["../../src/websocket-client/thermostat-command-id-resolver.ts"],"names":[],"mappings":";;AAUA,gEA+BC;AA/BM,KAAK,UAAU,0BAA0B,CAAC,EAC7C,kBAAkB,EAClB,eAAe,EACf,eAAe,EACf,mBAAmB,EACnB,WAAW,EACX,iBAAiB,EACjB,eAAe,GACe;IAC9B,IAAI,eAAe,EAAE,CAAC;QAClB,OAAO,eAAe,CAAC;IAC3B,CAAC;IACD,IAAI,eAAe,IAAI,MAAM,WAAW,CAAC,eAAe,CAAC,EAAE,CAAC;QACxD,iBAAiB,CAAC,eAAe,CAAC,CAAC;QACnC,IAAI,eAAe,KAAK,kBAAkB;YAAE,eAAe,EAAE,CAAC,eAAe,CAAC,CAAC;QAC/E,OAAO,eAAe,CAAC;IAC3B,CAAC;IACD,MAAM,UAAU,GAAG,CAAC,kBAAkB,EAAE,mBAAmB,CAAC,CAAC,MAAM,CAC/D,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,EAAgB,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,KAAK,CAC7E,CAAC;IACF,KAAK,MAAM,WAAW,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,CAAC,MAAM,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC;YAClC,SAAS;QACb,CAAC;QACD,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAC/B,IAAI,WAAW,KAAK,kBAAkB,EAAE,CAAC;YACrC,eAAe,EAAE,CAAC,WAAW,CAAC,CAAC;QACnC,CAAC;QACD,OAAO,WAAW,CAAC;IACvB,CAAC;IACD,OAAO,kBAAkB,CAAC;AAC9B,CAAC"}
|
package/package.json
CHANGED