homebridge-plugin-klares4 2.0.0-beta.1 → 2.0.0-beta.3
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/CHANGELOG.md +7 -0
- package/README.md +2 -0
- package/config.schema.json +87 -0
- package/dist/platform/index.d.ts.map +1 -1
- package/dist/platform/index.js +1 -0
- package/dist/platform/index.js.map +1 -1
- package/dist/platform/types.d.ts +2 -1
- package/dist/platform/types.d.ts.map +1 -1
- package/dist/types/websocket.types.d.ts +10 -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 +56 -32
- package/dist/websocket-client/command-service.js.map +1 -1
- package/dist/websocket-client/connection-service.d.ts.map +1 -1
- package/dist/websocket-client/connection-service.js +3 -1
- package/dist/websocket-client/connection-service.js.map +1 -1
- package/dist/websocket-client/domus-thermostat-mapper.d.ts +22 -0
- package/dist/websocket-client/domus-thermostat-mapper.d.ts.map +1 -0
- package/dist/websocket-client/domus-thermostat-mapper.js +114 -0
- package/dist/websocket-client/domus-thermostat-mapper.js.map +1 -0
- package/dist/websocket-client/index.d.ts.map +1 -1
- package/dist/websocket-client/index.js +1 -1
- package/dist/websocket-client/index.js.map +1 -1
- package/dist/websocket-client/message-service.d.ts +1 -0
- package/dist/websocket-client/message-service.d.ts.map +1 -1
- package/dist/websocket-client/message-service.js +46 -0
- package/dist/websocket-client/message-service.js.map +1 -1
- package/dist/websocket-client/state.d.ts +2 -1
- package/dist/websocket-client/state.d.ts.map +1 -1
- package/dist/websocket-client/state.js +12 -1
- package/dist/websocket-client/state.js.map +1 -1
- package/dist/websocket-client/status-updater.d.ts.map +1 -1
- package/dist/websocket-client/status-updater.js +34 -9
- package/dist/websocket-client/status-updater.js.map +1 -1
- package/dist/websocket-client/system-temperature-updater.d.ts.map +1 -1
- package/dist/websocket-client/system-temperature-updater.js +18 -0
- package/dist/websocket-client/system-temperature-updater.js.map +1 -1
- package/dist/websocket-client/thermostat-write-payload.d.ts +5 -0
- package/dist/websocket-client/thermostat-write-payload.d.ts.map +1 -0
- package/dist/websocket-client/thermostat-write-payload.js +42 -0
- package/dist/websocket-client/thermostat-write-payload.js.map +1 -0
- package/dist/websocket-client/types.d.ts +13 -1
- package/dist/websocket-client/types.d.ts.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|
|
7
7
|
|
|
8
8
|
## [Unreleased]
|
|
9
9
|
|
|
10
|
+
## [2.0.0-beta.2] - 2026-03-07
|
|
11
|
+
|
|
12
|
+
### Fixed
|
|
13
|
+
|
|
14
|
+
- Output/scenario commands no longer wait for strict `CMD_USR_RES` ACK, preventing 8s command timeouts on centrales that apply command and emit only realtime state updates.
|
|
15
|
+
- Reconnect scheduler now avoids duplicate timer registration, removing duplicated "Scheduling reconnection..." log lines after connection failures.
|
|
16
|
+
|
|
10
17
|
## [2.0.0-beta.1] - 2026-03-07
|
|
11
18
|
|
|
12
19
|
### Changed
|
package/README.md
CHANGED
|
@@ -107,6 +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
111
|
| `debug` | boolean | false | Detailed logging |
|
|
111
112
|
| `excludeZones` | string[] | [] | Zones to exclude |
|
|
112
113
|
| `excludeOutputs` | string[] | [] | Outputs to exclude |
|
|
@@ -397,6 +398,7 @@ Il plugin puo essere configurato completamente tramite l'interfaccia grafica di
|
|
|
397
398
|
| `maxSeconds` | number | 30 | Tempo max tapparelle (secondi) |
|
|
398
399
|
| `reconnectInterval` | number | 5000 | Intervallo riconnessione (ms) |
|
|
399
400
|
| `heartbeatInterval` | number | 30000 | Intervallo heartbeat (ms) |
|
|
401
|
+
| `domusThermostat` | object | default attivi | Mapping termostati DOMUS, override manuali e fallback freshness |
|
|
400
402
|
| `debug` | boolean | false | Logging dettagliato |
|
|
401
403
|
| `excludeZones` | string[] | [] | Zone da escludere |
|
|
402
404
|
| `excludeOutputs` | string[] | [] | Output da escludere |
|
package/config.schema.json
CHANGED
|
@@ -251,6 +251,55 @@
|
|
|
251
251
|
}
|
|
252
252
|
}
|
|
253
253
|
},
|
|
254
|
+
"domusThermostat": {
|
|
255
|
+
"type": "object",
|
|
256
|
+
"default": {
|
|
257
|
+
"enabled": true,
|
|
258
|
+
"sensorFreshnessMs": 300000,
|
|
259
|
+
"manualPairs": []
|
|
260
|
+
},
|
|
261
|
+
"properties": {
|
|
262
|
+
"enabled": {
|
|
263
|
+
"title": "Abilita Mapping DOMUS Termostati",
|
|
264
|
+
"type": "boolean",
|
|
265
|
+
"default": true,
|
|
266
|
+
"description": "Usa i sensori DOMUS per la temperatura corrente dei termostati"
|
|
267
|
+
},
|
|
268
|
+
"sensorFreshnessMs": {
|
|
269
|
+
"title": "Freshness Sensore DOMUS (ms)",
|
|
270
|
+
"type": "integer",
|
|
271
|
+
"default": 300000,
|
|
272
|
+
"minimum": 30000,
|
|
273
|
+
"maximum": 3600000,
|
|
274
|
+
"description": "Dopo questo tempo senza update DOMUS, fallback su STATUS_SYSTEM.TEMP.IN"
|
|
275
|
+
},
|
|
276
|
+
"manualPairs": {
|
|
277
|
+
"title": "Override Manuale Mapping",
|
|
278
|
+
"type": "array",
|
|
279
|
+
"items": {
|
|
280
|
+
"type": "object",
|
|
281
|
+
"properties": {
|
|
282
|
+
"thermostatOutputId": {
|
|
283
|
+
"title": "Thermostat Output ID",
|
|
284
|
+
"type": "string",
|
|
285
|
+
"pattern": "^(thermostat_)?[0-9]+$",
|
|
286
|
+
"placeholder": "18 o thermostat_18"
|
|
287
|
+
},
|
|
288
|
+
"domusSensorId": {
|
|
289
|
+
"title": "DOMUS Sensor ID",
|
|
290
|
+
"type": "string",
|
|
291
|
+
"pattern": "^((sensor_(temp|hum|light)_)?[0-9]+)$",
|
|
292
|
+
"placeholder": "1 o sensor_temp_1"
|
|
293
|
+
}
|
|
294
|
+
},
|
|
295
|
+
"required": [
|
|
296
|
+
"thermostatOutputId",
|
|
297
|
+
"domusSensorId"
|
|
298
|
+
]
|
|
299
|
+
}
|
|
300
|
+
}
|
|
301
|
+
}
|
|
302
|
+
},
|
|
254
303
|
"mqtt": {
|
|
255
304
|
"type": "object",
|
|
256
305
|
"properties": {
|
|
@@ -502,6 +551,44 @@
|
|
|
502
551
|
"flex": "1 1 100px"
|
|
503
552
|
}
|
|
504
553
|
]
|
|
554
|
+
},
|
|
555
|
+
{
|
|
556
|
+
"key": "domusThermostat.enabled",
|
|
557
|
+
"title": "Mapping DOMUS Attivo"
|
|
558
|
+
},
|
|
559
|
+
{
|
|
560
|
+
"key": "domusThermostat.sensorFreshnessMs",
|
|
561
|
+
"title": "Freshness DOMUS (ms)",
|
|
562
|
+
"condition": {
|
|
563
|
+
"functionBody": "return !model.domusThermostat || model.domusThermostat.enabled !== false;"
|
|
564
|
+
}
|
|
565
|
+
},
|
|
566
|
+
{
|
|
567
|
+
"key": "domusThermostat.manualPairs",
|
|
568
|
+
"type": "array",
|
|
569
|
+
"title": "Override Manuale",
|
|
570
|
+
"orderable": true,
|
|
571
|
+
"buttonText": "+ Aggiungi Pair",
|
|
572
|
+
"condition": {
|
|
573
|
+
"functionBody": "return !model.domusThermostat || model.domusThermostat.enabled !== false;"
|
|
574
|
+
},
|
|
575
|
+
"items": [
|
|
576
|
+
{
|
|
577
|
+
"type": "fieldset",
|
|
578
|
+
"items": [
|
|
579
|
+
{
|
|
580
|
+
"key": "domusThermostat.manualPairs[].thermostatOutputId",
|
|
581
|
+
"title": "Thermostat Output ID",
|
|
582
|
+
"placeholder": "18 o thermostat_18"
|
|
583
|
+
},
|
|
584
|
+
{
|
|
585
|
+
"key": "domusThermostat.manualPairs[].domusSensorId",
|
|
586
|
+
"title": "DOMUS Sensor ID",
|
|
587
|
+
"placeholder": "1 o sensor_temp_1"
|
|
588
|
+
}
|
|
589
|
+
]
|
|
590
|
+
}
|
|
591
|
+
]
|
|
505
592
|
}
|
|
506
593
|
]
|
|
507
594
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/platform/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,GAAG,EACH,cAAc,EACd,qBAAqB,EACrB,MAAM,EACN,iBAAiB,EACjB,OAAO,EACV,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAQ5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE9D,YAAY,EAAE,gBAAgB,EAAE,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3F,qBAAa,cAAe,YAAW,qBAAqB;aAmBpC,GAAG,EAAE,MAAM;aACX,MAAM,EAAE,YAAY;aACpB,GAAG,EAAE,GAAG;IApB5B,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAC;IACxC,SAAgB,cAAc,EAAE,OAAO,cAAc,CAAC;IACtD,SAAgB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAa;IACxE,SAAgB,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAa;IAEtE,QAAQ,CAAC,EAAE,qBAAqB,CAAC;IACjC,UAAU,CAAC,EAAE,UAAU,CAAC;IAE/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAwC;IAC1E,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAA0B;IAChE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IACtD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmB;IACpD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA2B;IAC5D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IACtD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA0B;IACzD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA4B;gBAG1C,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,YAAY,EACpB,GAAG,EAAE,GAAG;YA0Dd,gBAAgB;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/platform/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,GAAG,EACH,cAAc,EACd,qBAAqB,EACrB,MAAM,EACN,iBAAiB,EACjB,OAAO,EACV,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAQ5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE9D,YAAY,EAAE,gBAAgB,EAAE,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3F,qBAAa,cAAe,YAAW,qBAAqB;aAmBpC,GAAG,EAAE,MAAM;aACX,MAAM,EAAE,YAAY;aACpB,GAAG,EAAE,GAAG;IApB5B,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAC;IACxC,SAAgB,cAAc,EAAE,OAAO,cAAc,CAAC;IACtD,SAAgB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAa;IACxE,SAAgB,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAa;IAEtE,QAAQ,CAAC,EAAE,qBAAqB,CAAC;IACjC,UAAU,CAAC,EAAE,UAAU,CAAC;IAE/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAwC;IAC1E,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAA0B;IAChE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IACtD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmB;IACpD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA2B;IAC5D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IACtD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA0B;IACzD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA4B;gBAG1C,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,YAAY,EACpB,GAAG,EAAE,GAAG;YA0Dd,gBAAgB;IAoE9B,OAAO,CAAC,yBAAyB;IAKjC,OAAO,CAAC,kBAAkB;IAO1B,OAAO,CAAC,sBAAsB;IAc9B,OAAO,CAAC,wBAAwB;IAMzB,kBAAkB,CAAC,SAAS,EAAE,iBAAiB,GAAG,IAAI;IAItD,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAIxC,eAAe,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAI3C,eAAe,CAAC,SAAS,EAAE,iBAAiB,GAAG,IAAI;CAG7D"}
|
package/dist/platform/index.js
CHANGED
|
@@ -85,6 +85,7 @@ class Lares4Platform {
|
|
|
85
85
|
heartbeatInterval: this.config.heartbeatInterval ?? 30000,
|
|
86
86
|
commandTimeoutMs: this.config.commandTimeoutMs ?? 8000,
|
|
87
87
|
allowInsecureTls: this.config.allowInsecureTls ?? false,
|
|
88
|
+
domusThermostat: this.config.domusThermostat,
|
|
88
89
|
});
|
|
89
90
|
if (this.config.allowInsecureTls) {
|
|
90
91
|
this.log.warn('TLS certificate verification is disabled (allowInsecureTls=true). Use only on trusted local networks.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/platform/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/platform/index.ts"],"names":[],"mappings":"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"}
|
package/dist/platform/types.d.ts
CHANGED
|
@@ -6,7 +6,7 @@ import type { ScenarioAccessory } from '../accessories/scenario-accessory';
|
|
|
6
6
|
import type { SensorAccessory } from '../accessories/sensor-accessory';
|
|
7
7
|
import type { ThermostatAccessory } from '../accessories/thermostat-accessory';
|
|
8
8
|
import type { ZoneAccessory } from '../accessories/zone-accessory';
|
|
9
|
-
import type { MqttConfig, RoomMappingConfig } from '../types';
|
|
9
|
+
import type { DomusThermostatConfig, MqttConfig, RoomMappingConfig } from '../types';
|
|
10
10
|
export type AccessoryHandler = LightAccessory | CoverAccessory | GateAccessory | SensorAccessory | ZoneAccessory | ThermostatAccessory | ScenarioAccessory;
|
|
11
11
|
export interface Lares4Config extends PlatformConfig {
|
|
12
12
|
ip?: string;
|
|
@@ -42,6 +42,7 @@ export interface Lares4Config extends PlatformConfig {
|
|
|
42
42
|
devicesSummaryDelay?: number;
|
|
43
43
|
mqtt?: MqttConfig;
|
|
44
44
|
roomMapping?: RoomMappingConfig;
|
|
45
|
+
domusThermostat?: DomusThermostatConfig;
|
|
45
46
|
generateDebugFile?: boolean;
|
|
46
47
|
}
|
|
47
48
|
export interface DeviceListItem {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/platform/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC/E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/platform/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,6 +71,15 @@ export interface KseniaOutputCommand {
|
|
|
71
71
|
ID: string;
|
|
72
72
|
STA: string;
|
|
73
73
|
}
|
|
74
|
+
export interface DomusThermostatManualPair {
|
|
75
|
+
thermostatOutputId: string;
|
|
76
|
+
domusSensorId: string;
|
|
77
|
+
}
|
|
78
|
+
export interface DomusThermostatConfig {
|
|
79
|
+
enabled?: boolean;
|
|
80
|
+
manualPairs?: DomusThermostatManualPair[];
|
|
81
|
+
sensorFreshnessMs?: number;
|
|
82
|
+
}
|
|
74
83
|
export interface KseniaMessagePayload {
|
|
75
84
|
PIN?: string;
|
|
76
85
|
ID_LOGIN?: string;
|
|
@@ -107,5 +116,6 @@ export interface KseniaWebSocketOptions {
|
|
|
107
116
|
commandTimeoutMs?: number;
|
|
108
117
|
allowInsecureTls?: boolean;
|
|
109
118
|
loginTimeoutMs?: number;
|
|
119
|
+
domusThermostat?: DomusThermostatConfig;
|
|
110
120
|
}
|
|
111
121
|
//# sourceMappingURL=websocket.types.d.ts.map
|
|
@@ -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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"}
|
|
@@ -19,6 +19,7 @@ interface CommandServiceDeps {
|
|
|
19
19
|
export declare class CommandService {
|
|
20
20
|
private readonly deps;
|
|
21
21
|
constructor(deps: CommandServiceDeps);
|
|
22
|
+
private readonly thermostatWriteSeasonById;
|
|
22
23
|
sendLoginCommand(): Promise<void>;
|
|
23
24
|
requestSystemData(): Promise<void>;
|
|
24
25
|
switchLight(lightId: string, on: boolean): Promise<void>;
|
|
@@ -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;
|
|
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;AAMxD,OAAO,KAAK,EAGR,sBAAsB,EACzB,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAER,mBAAmB,EAEnB,oBAAoB,EACvB,MAAM,SAAS,CAAC;AAEjB,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;AACD,qBAAa,cAAc;IACX,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,kBAAkB;IAErD,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAyC;IACtE,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBjC,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAiClC,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;IA+B5E,wBAAwB,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoClF,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAcjD,iBAAiB;IA+C/B,OAAO,CAAC,YAAY;YAON,WAAW;YAKX,cAAc;CAI/B"}
|
|
@@ -9,10 +9,12 @@ const log_levels_1 = require("../log-levels");
|
|
|
9
9
|
const device_id_1 = require("../device-id");
|
|
10
10
|
const thermostat_mode_1 = require("../thermostat-mode");
|
|
11
11
|
const device_state_projector_1 = require("../websocket/device-state-projector");
|
|
12
|
+
const thermostat_write_payload_1 = require("./thermostat-write-payload");
|
|
12
13
|
const crc16_1 = require("./crc16");
|
|
13
14
|
class CommandService {
|
|
14
15
|
constructor(deps) {
|
|
15
16
|
this.deps = deps;
|
|
17
|
+
this.thermostatWriteSeasonById = new Map();
|
|
16
18
|
}
|
|
17
19
|
async sendLoginCommand() {
|
|
18
20
|
const loginMessage = {
|
|
@@ -76,9 +78,6 @@ class CommandService {
|
|
|
76
78
|
ID: systemOutputId,
|
|
77
79
|
STA: on ? 'ON' : 'OFF',
|
|
78
80
|
},
|
|
79
|
-
}, {
|
|
80
|
-
awaitResponse: true,
|
|
81
|
-
responseCmds: ['CMD_USR_RES'],
|
|
82
81
|
});
|
|
83
82
|
});
|
|
84
83
|
this.deps.log.info(`Light command sent: Output ${systemOutputId} -> ${on ? 'ON' : 'OFF'}`);
|
|
@@ -96,9 +95,6 @@ class CommandService {
|
|
|
96
95
|
ID: systemOutputId,
|
|
97
96
|
STA: safeBrightness.toString(),
|
|
98
97
|
},
|
|
99
|
-
}, {
|
|
100
|
-
awaitResponse: true,
|
|
101
|
-
responseCmds: ['CMD_USR_RES'],
|
|
102
98
|
});
|
|
103
99
|
});
|
|
104
100
|
this.deps.log.info(`Dimmer command sent: Output ${systemOutputId} -> ${safeBrightness}%`);
|
|
@@ -117,9 +113,6 @@ class CommandService {
|
|
|
117
113
|
ID: systemOutputId,
|
|
118
114
|
STA: command,
|
|
119
115
|
},
|
|
120
|
-
}, {
|
|
121
|
-
awaitResponse: true,
|
|
122
|
-
responseCmds: ['CMD_USR_RES'],
|
|
123
116
|
});
|
|
124
117
|
});
|
|
125
118
|
this.deps.log.info(`Cover command sent: Output ${systemOutputId} -> ${command}`);
|
|
@@ -136,9 +129,6 @@ class CommandService {
|
|
|
136
129
|
ID: systemOutputId,
|
|
137
130
|
STA: 'ON',
|
|
138
131
|
},
|
|
139
|
-
}, {
|
|
140
|
-
awaitResponse: true,
|
|
141
|
-
responseCmds: ['CMD_USR_RES'],
|
|
142
132
|
});
|
|
143
133
|
});
|
|
144
134
|
this.deps.log.info(`Gate command sent: Output ${systemOutputId} -> ON (momentary)`);
|
|
@@ -146,31 +136,68 @@ class CommandService {
|
|
|
146
136
|
async setThermostatMode(thermostatId, mode) {
|
|
147
137
|
if (!this.deps.state.idLogin)
|
|
148
138
|
throw new Error('Not connected');
|
|
149
|
-
const
|
|
139
|
+
const systemThermostatId = (0, device_id_1.stripDevicePrefix)(thermostatId);
|
|
140
|
+
(0, thermostat_write_payload_1.updateThermostatSeasonHint)(this.thermostatWriteSeasonById, systemThermostatId, mode);
|
|
150
141
|
await this.deps.commandDispatcher.enqueueDeviceCommand(thermostatId, async () => {
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
142
|
+
try {
|
|
143
|
+
await this.sendKseniaCommand('WRITE_CFG', 'CFG_ALL', {
|
|
144
|
+
ID_LOGIN: 'true',
|
|
145
|
+
CFG_THERMOSTATS: [
|
|
146
|
+
{
|
|
147
|
+
ID: systemThermostatId,
|
|
148
|
+
...(0, thermostat_write_payload_1.buildThermostatModeCfgPayload)(mode),
|
|
149
|
+
},
|
|
150
|
+
],
|
|
151
|
+
}, {
|
|
152
|
+
awaitResponse: true,
|
|
153
|
+
responseCmds: ['WRITE_CFG_RES'],
|
|
154
|
+
});
|
|
155
|
+
}
|
|
156
|
+
catch (error) {
|
|
157
|
+
await this.sendKseniaCommand('WRITE', 'THERMOSTAT', {
|
|
158
|
+
ID_LOGIN: this.deps.state.idLogin,
|
|
159
|
+
ID_THERMOSTAT: systemThermostatId,
|
|
160
|
+
MODE: (0, thermostat_mode_1.domainModeToKsenia)(mode),
|
|
161
|
+
}, {
|
|
162
|
+
awaitResponse: true,
|
|
163
|
+
responseCmds: ['WRITE_RES'],
|
|
164
|
+
});
|
|
165
|
+
this.deps.log.warn(`Thermostat mode fallback to legacy WRITE/THERMOSTAT for ${systemThermostatId}: ${error instanceof Error ? error.message : String(error)}`);
|
|
166
|
+
}
|
|
159
167
|
});
|
|
160
168
|
}
|
|
161
169
|
async setThermostatTemperature(thermostatId, temperature) {
|
|
162
170
|
if (!this.deps.state.idLogin)
|
|
163
171
|
throw new Error('Not connected');
|
|
164
172
|
const safeTemperature = (0, device_state_projector_1.clampValue)(temperature, 5, 40);
|
|
173
|
+
const systemThermostatId = (0, device_id_1.stripDevicePrefix)(thermostatId);
|
|
165
174
|
await this.deps.commandDispatcher.enqueueDeviceCommand(thermostatId, async () => {
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
175
|
+
try {
|
|
176
|
+
await this.sendKseniaCommand('WRITE_CFG', 'CFG_ALL', {
|
|
177
|
+
ID_LOGIN: 'true',
|
|
178
|
+
CFG_THERMOSTATS: [
|
|
179
|
+
{
|
|
180
|
+
ID: systemThermostatId,
|
|
181
|
+
ACT_MODE: 'MAN',
|
|
182
|
+
...(0, thermostat_write_payload_1.buildThermostatSetpointCfgPayload)(this.thermostatWriteSeasonById, systemThermostatId, safeTemperature),
|
|
183
|
+
},
|
|
184
|
+
],
|
|
185
|
+
}, {
|
|
186
|
+
awaitResponse: true,
|
|
187
|
+
responseCmds: ['WRITE_CFG_RES'],
|
|
188
|
+
});
|
|
189
|
+
}
|
|
190
|
+
catch (error) {
|
|
191
|
+
await this.sendKseniaCommand('WRITE', 'THERMOSTAT', {
|
|
192
|
+
ID_LOGIN: this.deps.state.idLogin,
|
|
193
|
+
ID_THERMOSTAT: systemThermostatId,
|
|
194
|
+
TARGET_TEMP: safeTemperature.toString(),
|
|
195
|
+
}, {
|
|
196
|
+
awaitResponse: true,
|
|
197
|
+
responseCmds: ['WRITE_RES'],
|
|
198
|
+
});
|
|
199
|
+
this.deps.log.warn(`Thermostat temperature fallback to legacy WRITE/THERMOSTAT for ${systemThermostatId}: ${error instanceof Error ? error.message : String(error)}`);
|
|
200
|
+
}
|
|
174
201
|
});
|
|
175
202
|
}
|
|
176
203
|
async triggerScenario(scenarioId) {
|
|
@@ -184,9 +211,6 @@ class CommandService {
|
|
|
184
211
|
SCENARIO: {
|
|
185
212
|
ID: systemScenarioId,
|
|
186
213
|
},
|
|
187
|
-
}, {
|
|
188
|
-
awaitResponse: true,
|
|
189
|
-
responseCmds: ['CMD_USR_RES'],
|
|
190
214
|
});
|
|
191
215
|
});
|
|
192
216
|
this.deps.log.info(`Scenario ${systemScenarioId} executed`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-service.js","sourceRoot":"","sources":["../../src/websocket-client/command-service.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA2B;AAE3B,8CAA4D;AAC5D,4CAAiD;AACjD,wDAA6E;AAE7E,gFAAiE;
|
|
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":"connection-service.d.ts","sourceRoot":"","sources":["../../src/websocket-client/connection-service.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,KAAK,EAAE,oBAAoB,EAA8B,MAAM,SAAS,CAAC;AAEhF,UAAU,qBAAqB;IAC3B,KAAK,EAAE,oBAAoB,CAAC;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,sBAAsB,CAAC;IAChC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,WAAW,EAAE,WAAW,CAAC;IACzB,YAAY,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACrC;AAED,qBAAa,iBAAiB;IAGd,OAAO,CAAC,QAAQ,CAAC,IAAI;IAFjC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;gBAEd,IAAI,EAAE,qBAAqB;IAE3C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA4H9B,cAAc,IAAI,IAAI;IAgCtB,UAAU,IAAI,IAAI;
|
|
1
|
+
{"version":3,"file":"connection-service.d.ts","sourceRoot":"","sources":["../../src/websocket-client/connection-service.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,KAAK,EAAE,oBAAoB,EAA8B,MAAM,SAAS,CAAC;AAEhF,UAAU,qBAAqB;IAC3B,KAAK,EAAE,oBAAoB,CAAC;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,sBAAsB,CAAC;IAChC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,WAAW,EAAE,WAAW,CAAC;IACzB,YAAY,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACrC;AAED,qBAAa,iBAAiB;IAGd,OAAO,CAAC,QAAQ,CAAC,IAAI;IAFjC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;gBAEd,IAAI,EAAE,qBAAqB;IAE3C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA4H9B,cAAc,IAAI,IAAI;IAgCtB,UAAU,IAAI,IAAI;IAsBzB,OAAO,CAAC,cAAc;IAuBtB,OAAO,CAAC,iBAAiB;CAmC5B"}
|
|
@@ -182,6 +182,7 @@ class ConnectionService {
|
|
|
182
182
|
}
|
|
183
183
|
if (this.deps.state.reconnectTimer) {
|
|
184
184
|
clearTimeout(this.deps.state.reconnectTimer);
|
|
185
|
+
this.deps.state.reconnectTimer = undefined;
|
|
185
186
|
}
|
|
186
187
|
if (this.deps.state.ws) {
|
|
187
188
|
this.deps.state.isManualClose = true;
|
|
@@ -215,7 +216,7 @@ class ConnectionService {
|
|
|
215
216
|
}
|
|
216
217
|
scheduleReconnect() {
|
|
217
218
|
if (this.deps.state.reconnectTimer) {
|
|
218
|
-
|
|
219
|
+
return;
|
|
219
220
|
}
|
|
220
221
|
const baseDelay = this.deps.options.reconnectInterval ?? 5000;
|
|
221
222
|
const exponentialDelay = Math.min(baseDelay * Math.pow(2, this.deps.state.reconnectAttempts), this.maxReconnectDelay);
|
|
@@ -223,6 +224,7 @@ class ConnectionService {
|
|
|
223
224
|
const finalDelay = Math.round(exponentialDelay + jitter);
|
|
224
225
|
this.deps.log.info(`Scheduling reconnection attempt ${this.deps.state.reconnectAttempts + 1} in ${Math.round(finalDelay / 1000)}s...`);
|
|
225
226
|
this.deps.state.reconnectTimer = setTimeout(() => {
|
|
227
|
+
this.deps.state.reconnectTimer = undefined;
|
|
226
228
|
this.deps.state.reconnectAttempts++;
|
|
227
229
|
this.deps.log.info(`Attempting reconnection (attempt ${this.deps.state.reconnectAttempts})...`);
|
|
228
230
|
this.connect()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection-service.js","sourceRoot":"","sources":["../../src/websocket-client/connection-service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"connection-service.js","sourceRoot":"","sources":["../../src/websocket-client/connection-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import type { DomusThermostatManualPair } from '../types';
|
|
2
|
+
export type DomusMappingSource = 'manual' | 'auto' | 'fallback';
|
|
3
|
+
export interface BuildDomusMappingInput {
|
|
4
|
+
thermostatOutputs: Map<string, {
|
|
5
|
+
id: string;
|
|
6
|
+
name: string;
|
|
7
|
+
}>;
|
|
8
|
+
domusSensors: Map<string, {
|
|
9
|
+
id: string;
|
|
10
|
+
name: string;
|
|
11
|
+
}>;
|
|
12
|
+
manualPairs: DomusThermostatManualPair[];
|
|
13
|
+
scoreThreshold?: number;
|
|
14
|
+
}
|
|
15
|
+
export interface BuildDomusMappingResult {
|
|
16
|
+
mapping: Map<string, string>;
|
|
17
|
+
sources: Map<string, DomusMappingSource>;
|
|
18
|
+
unmatched: string[];
|
|
19
|
+
}
|
|
20
|
+
export declare function buildDomusThermostatMapping(input: BuildDomusMappingInput): BuildDomusMappingResult;
|
|
21
|
+
export declare function normalizeDomusIdsForConfig(pairs: DomusThermostatManualPair[]): DomusThermostatManualPair[];
|
|
22
|
+
//# sourceMappingURL=domus-thermostat-mapper.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"domus-thermostat-mapper.d.ts","sourceRoot":"","sources":["../../src/websocket-client/domus-thermostat-mapper.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAE1D,MAAM,MAAM,kBAAkB,GAAG,QAAQ,GAAG,MAAM,GAAG,UAAU,CAAC;AAEhE,MAAM,WAAW,sBAAsB;IACnC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC7D,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACxD,WAAW,EAAE,yBAAyB,EAAE,CAAC;IACzC,cAAc,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,uBAAuB;IACpC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IACzC,SAAS,EAAE,MAAM,EAAE,CAAC;CACvB;AA0DD,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,sBAAsB,GAAG,uBAAuB,CA6DlG;AAED,wBAAgB,0BAA0B,CACtC,KAAK,EAAE,yBAAyB,EAAE,GACnC,yBAAyB,EAAE,CAK7B"}
|