@marcel2215/homebridge-supla-plugin 2.1.26 → 2.1.28
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 -1
- package/dist/Accesories/ActionTriggerAccessory.js.map +1 -1
- package/dist/Accesories/AirQualityAccessory.js +1 -2
- package/dist/Accesories/AirQualityAccessory.js.map +1 -1
- package/dist/Accesories/DimmerAccessory.js.map +1 -1
- package/dist/Accesories/DimmerRgbLightAccessory.js.map +1 -1
- package/dist/Accesories/DoorAccessory.js.map +1 -1
- package/dist/Accesories/ElectricityMeterAccessory.js.map +1 -1
- package/dist/Accesories/FacadeBlindAccessory.js +1 -1
- package/dist/Accesories/FacadeBlindAccessory.js.map +1 -1
- package/dist/Accesories/FrontGateFsm.d.ts +12 -4
- package/dist/Accesories/FrontGateFsm.d.ts.map +1 -1
- package/dist/Accesories/FrontGateFsm.js +164 -71
- package/dist/Accesories/FrontGateFsm.js.map +1 -1
- package/dist/Accesories/GarageDoorOpenerAccesory.js.map +1 -1
- package/dist/Accesories/GateAccessory.d.ts +7 -0
- package/dist/Accesories/GateAccessory.d.ts.map +1 -1
- package/dist/Accesories/GateAccessory.js +55 -4
- package/dist/Accesories/GateAccessory.js.map +1 -1
- package/dist/Accesories/GateLockAccessory.js.map +1 -1
- package/dist/Accesories/LightBulbAccesory.js.map +1 -1
- package/dist/Accesories/PressureAccessory.js.map +1 -1
- package/dist/Accesories/RollerShutterAccessory.js +5 -5
- package/dist/Accesories/RollerShutterAccessory.js.map +1 -1
- package/dist/Accesories/SwitchAccessory.js.map +1 -1
- package/dist/Accesories/TemperatureAccessory.js.map +1 -1
- package/dist/Accesories/TemperatureHumidityAccessory.js.map +1 -1
- package/dist/Accesories/ThermostatAccessory.js +2 -2
- package/dist/Accesories/ThermostatAccessory.js.map +1 -1
- package/dist/Heplers/ColorConverters.js +4 -5
- package/dist/Heplers/ColorConverters.js.map +1 -1
- package/dist/Heplers/SuplaChannelContext.d.ts.map +1 -1
- package/dist/Heplers/SuplaMqttClient.d.ts +0 -1
- package/dist/Heplers/SuplaMqttClient.d.ts.map +1 -1
- package/dist/Heplers/SuplaMqttClient.js +33 -28
- package/dist/Heplers/SuplaMqttClient.js.map +1 -1
- package/dist/Heplers/SuplaMqttClientContext.d.ts +4 -4
- package/dist/Heplers/SuplaMqttClientContext.d.ts.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/platform.d.ts +0 -1
- package/dist/platform.d.ts.map +1 -1
- package/dist/platform.js +55 -56
- package/dist/platform.js.map +1 -1
- package/package.json +6 -6
- package/.codex/environments/environment.toml +0 -31
|
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
15
15
|
}) : function(o, v) {
|
|
16
16
|
o["default"] = v;
|
|
17
17
|
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
};
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
25
35
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
36
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
37
|
};
|
|
@@ -84,7 +94,6 @@ class SuplaMqttClient {
|
|
|
84
94
|
return this.discoverLegacyRollerShuttersAsync(registerHandler);
|
|
85
95
|
}
|
|
86
96
|
async discoverCloudChannelsAsync(registerHandler) {
|
|
87
|
-
var _a, _b, _c, _d;
|
|
88
97
|
const subscriptionTopic = `supla/${this.context.username}/devices/+/channels/#`;
|
|
89
98
|
const includeHidden = this.resolveIncludeHidden();
|
|
90
99
|
const usernamePattern = this.escapeRegex(this.context.username);
|
|
@@ -98,16 +107,15 @@ class SuplaMqttClient {
|
|
|
98
107
|
let quietTimer;
|
|
99
108
|
const maxWaitMs = 4000;
|
|
100
109
|
const quietWindowMs = 1000;
|
|
101
|
-
const maxTimer = setTimeout(() => resolveDone
|
|
110
|
+
const maxTimer = setTimeout(() => resolveDone?.(), maxWaitMs);
|
|
102
111
|
const messageHandler = (topic, message) => {
|
|
103
|
-
var _a;
|
|
104
112
|
const match = topic.match(new RegExp(`^supla/${usernamePattern}/devices/(\\d+)/channels/(\\d+)/(.*)$`));
|
|
105
113
|
if (!match) {
|
|
106
114
|
return;
|
|
107
115
|
}
|
|
108
116
|
const [, deviceId, channelId, suffix] = match;
|
|
109
117
|
const key = `${deviceId}:${channelId}`;
|
|
110
|
-
const entry =
|
|
118
|
+
const entry = channelMap.get(key) ?? { deviceId, channelId };
|
|
111
119
|
const value = message.toString();
|
|
112
120
|
switch (suffix) {
|
|
113
121
|
case 'type':
|
|
@@ -129,7 +137,7 @@ class SuplaMqttClient {
|
|
|
129
137
|
if (quietTimer) {
|
|
130
138
|
clearTimeout(quietTimer);
|
|
131
139
|
}
|
|
132
|
-
quietTimer = setTimeout(() => resolveDone
|
|
140
|
+
quietTimer = setTimeout(() => resolveDone?.(), quietWindowMs);
|
|
133
141
|
};
|
|
134
142
|
let cleanup;
|
|
135
143
|
if (registerHandler) {
|
|
@@ -141,7 +149,7 @@ class SuplaMqttClient {
|
|
|
141
149
|
this.client.subscribe(subscriptionTopic, (err) => {
|
|
142
150
|
if (err) {
|
|
143
151
|
this.log.error(`MQTT subscribe failed for ${subscriptionTopic}: ${err.message}`);
|
|
144
|
-
resolveDone
|
|
152
|
+
resolveDone?.();
|
|
145
153
|
}
|
|
146
154
|
});
|
|
147
155
|
this.client.on('message', messageHandler);
|
|
@@ -169,7 +177,7 @@ class SuplaMqttClient {
|
|
|
169
177
|
const result = [];
|
|
170
178
|
let skippedHidden = 0;
|
|
171
179
|
for (const entry of channelMap.values()) {
|
|
172
|
-
const hiddenValue =
|
|
180
|
+
const hiddenValue = entry.hidden ?? 'false';
|
|
173
181
|
const hidden = typeof hiddenValue === 'string'
|
|
174
182
|
? hiddenValue.toLowerCase() === 'true'
|
|
175
183
|
: Boolean(hiddenValue);
|
|
@@ -177,9 +185,9 @@ class SuplaMqttClient {
|
|
|
177
185
|
skippedHidden += 1;
|
|
178
186
|
continue;
|
|
179
187
|
}
|
|
180
|
-
const channelType =
|
|
181
|
-
const channelFunction =
|
|
182
|
-
const caption =
|
|
188
|
+
const channelType = entry.channelType ?? 'UNKNOWN';
|
|
189
|
+
const channelFunction = entry.channelFunction ?? 'UNKNOWN';
|
|
190
|
+
const caption = entry.channelCaption ?? `Device ${entry.deviceId} Channel ${entry.channelId}`;
|
|
183
191
|
const topic = `supla/${this.context.username}/devices/${entry.deviceId}/channels/${entry.channelId}`;
|
|
184
192
|
if (channelFunction === 'UNKNOWN' || channelType === 'UNKNOWN') {
|
|
185
193
|
this.log.warn(`Channel ${entry.deviceId}/${entry.channelId} missing metadata (function=${channelFunction}, type=${channelType})`);
|
|
@@ -208,7 +216,7 @@ class SuplaMqttClient {
|
|
|
208
216
|
let quietTimer;
|
|
209
217
|
const maxWaitMs = 4000;
|
|
210
218
|
const quietWindowMs = 1000;
|
|
211
|
-
const maxTimer = setTimeout(() => resolveDone
|
|
219
|
+
const maxTimer = setTimeout(() => resolveDone?.(), maxWaitMs);
|
|
212
220
|
const messageHandler = (topic, message) => {
|
|
213
221
|
const match = topic.match(/^supla\/channels\/status\/rollershutter\/(\d+)$/);
|
|
214
222
|
if (!match) {
|
|
@@ -230,13 +238,13 @@ class SuplaMqttClient {
|
|
|
230
238
|
}
|
|
231
239
|
}
|
|
232
240
|
}
|
|
233
|
-
catch
|
|
241
|
+
catch {
|
|
234
242
|
// ignore non-JSON payloads
|
|
235
243
|
}
|
|
236
244
|
if (quietTimer) {
|
|
237
245
|
clearTimeout(quietTimer);
|
|
238
246
|
}
|
|
239
|
-
quietTimer = setTimeout(() => resolveDone
|
|
247
|
+
quietTimer = setTimeout(() => resolveDone?.(), quietWindowMs);
|
|
240
248
|
};
|
|
241
249
|
let cleanup;
|
|
242
250
|
if (registerHandler) {
|
|
@@ -248,7 +256,7 @@ class SuplaMqttClient {
|
|
|
248
256
|
this.client.subscribe(subscriptionTopic, (err) => {
|
|
249
257
|
if (err) {
|
|
250
258
|
this.log.error(`MQTT subscribe failed for ${subscriptionTopic}: ${err.message}`);
|
|
251
|
-
resolveDone
|
|
259
|
+
resolveDone?.();
|
|
252
260
|
}
|
|
253
261
|
});
|
|
254
262
|
this.client.on('message', messageHandler);
|
|
@@ -287,8 +295,7 @@ class SuplaMqttClient {
|
|
|
287
295
|
return result;
|
|
288
296
|
}
|
|
289
297
|
resolveProtocol() {
|
|
290
|
-
|
|
291
|
-
const rawProtocol = ((_a = this.context.protocol) !== null && _a !== void 0 ? _a : '').toString().toLowerCase();
|
|
298
|
+
const rawProtocol = (this.context.protocol ?? '').toString().toLowerCase();
|
|
292
299
|
const tlsEnabled = this.resolveBoolean(this.context.tls, false);
|
|
293
300
|
if (!rawProtocol) {
|
|
294
301
|
return tlsEnabled ? 'mqtts' : 'mqtt';
|
|
@@ -311,9 +318,8 @@ class SuplaMqttClient {
|
|
|
311
318
|
return protocol === 'mqtts' || protocol === 'wss';
|
|
312
319
|
}
|
|
313
320
|
resolveTlsOptions() {
|
|
314
|
-
var _a, _b;
|
|
315
321
|
const options = {};
|
|
316
|
-
const caPath = (
|
|
322
|
+
const caPath = (this.context.tlsCaPath ?? '').toString().trim();
|
|
317
323
|
if (caPath) {
|
|
318
324
|
try {
|
|
319
325
|
options.ca = fs.readFileSync(caPath);
|
|
@@ -322,7 +328,7 @@ class SuplaMqttClient {
|
|
|
322
328
|
this.log.error(`Failed to read TLS CA at ${caPath}: ${error.message}`);
|
|
323
329
|
}
|
|
324
330
|
}
|
|
325
|
-
const servername = (
|
|
331
|
+
const servername = (this.context.tlsServername ?? '').toString().trim();
|
|
326
332
|
if (servername) {
|
|
327
333
|
options.servername = servername;
|
|
328
334
|
}
|
|
@@ -353,8 +359,7 @@ class SuplaMqttClient {
|
|
|
353
359
|
return fallback;
|
|
354
360
|
}
|
|
355
361
|
resolveTopicScheme() {
|
|
356
|
-
|
|
357
|
-
const raw = ((_a = this.context.mqttTopicScheme) !== null && _a !== void 0 ? _a : '').toString().toLowerCase();
|
|
362
|
+
const raw = (this.context.mqttTopicScheme ?? '').toString().toLowerCase();
|
|
358
363
|
if (raw === 'legacy') {
|
|
359
364
|
return 'legacy';
|
|
360
365
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SuplaMqttClient.js","sourceRoot":"","sources":["../../src/Heplers/SuplaMqttClient.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"SuplaMqttClient.js","sourceRoot":"","sources":["../../src/Heplers/SuplaMqttClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,12 +4,12 @@ export declare class SuplaMqttClientContext {
|
|
|
4
4
|
username: string;
|
|
5
5
|
password: string;
|
|
6
6
|
protocol?: string | undefined;
|
|
7
|
-
tls?:
|
|
7
|
+
tls?: boolean | string | undefined;
|
|
8
8
|
tlsCaPath?: string | undefined;
|
|
9
|
-
tlsRejectUnauthorized?:
|
|
9
|
+
tlsRejectUnauthorized?: boolean | string | undefined;
|
|
10
10
|
tlsServername?: string | undefined;
|
|
11
|
-
includeHidden?:
|
|
11
|
+
includeHidden?: boolean | string | undefined;
|
|
12
12
|
mqttTopicScheme?: string | undefined;
|
|
13
|
-
constructor(host: string, port: number, username: string, password: string, protocol?: string | undefined, tls?:
|
|
13
|
+
constructor(host: string, port: number, username: string, password: string, protocol?: string | undefined, tls?: boolean | string | undefined, tlsCaPath?: string | undefined, tlsRejectUnauthorized?: boolean | string | undefined, tlsServername?: string | undefined, includeHidden?: boolean | string | undefined, mqttTopicScheme?: string | undefined);
|
|
14
14
|
}
|
|
15
15
|
//# sourceMappingURL=SuplaMqttClientContext.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SuplaMqttClientContext.d.ts","sourceRoot":"","sources":["../../src/Heplers/SuplaMqttClientContext.ts"],"names":[],"mappings":"AAAA,qBAAa,sBAAsB;IAExB,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,MAAM;IAChB,QAAQ,EAAE,MAAM;IAChB,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"SuplaMqttClientContext.d.ts","sourceRoot":"","sources":["../../src/Heplers/SuplaMqttClientContext.ts"],"names":[],"mappings":"AAAA,qBAAa,sBAAsB;IAExB,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,MAAM;IAChB,QAAQ,EAAE,MAAM;IAChB,QAAQ,CAAC,EAAE,MAAM;IACjB,GAAG,CAAC,EAAE,OAAO,GAAG,MAAM;IACtB,SAAS,CAAC,EAAE,MAAM;IAClB,qBAAqB,CAAC,EAAE,OAAO,GAAG,MAAM;IACxC,aAAa,CAAC,EAAE,MAAM;IACtB,aAAa,CAAC,EAAE,OAAO,GAAG,MAAM;IAChC,eAAe,CAAC,EAAE,MAAM;gBAVxB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,YAAA,EACjB,GAAG,CAAC,EAAE,OAAO,GAAG,MAAM,YAAA,EACtB,SAAS,CAAC,EAAE,MAAM,YAAA,EAClB,qBAAqB,CAAC,EAAE,OAAO,GAAG,MAAM,YAAA,EACxC,aAAa,CAAC,EAAE,MAAM,YAAA,EACtB,aAAa,CAAC,EAAE,OAAO,GAAG,MAAM,YAAA,EAChC,eAAe,CAAC,EAAE,MAAM,YAAA;CAGlC"}
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAKjC;;GAEG;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAKjC;;GAEG;yBACO,KAAK,GAAG;AAAlB,kBAEE"}
|
package/dist/platform.d.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
1
|
import { API, DynamicPlatformPlugin, Logger, PlatformAccessory, PlatformConfig, Service, Characteristic } from 'homebridge';
|
|
3
2
|
import { SuplaMqttClient } from './Heplers/SuplaMqttClient';
|
|
4
3
|
import { SuplaChannelContext } from './Heplers/SuplaChannelContext';
|
package/dist/platform.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}
|
package/dist/platform.js
CHANGED
|
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
15
15
|
}) : function(o, v) {
|
|
16
16
|
o["default"] = v;
|
|
17
17
|
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
};
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
25
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
36
|
exports.SuplaPlatform = void 0;
|
|
27
37
|
const settings_1 = require("./settings");
|
|
@@ -55,7 +65,6 @@ const ActionTriggerAccessory_1 = require("./Accesories/ActionTriggerAccessory");
|
|
|
55
65
|
*/
|
|
56
66
|
class SuplaPlatform {
|
|
57
67
|
constructor(log, config, api) {
|
|
58
|
-
var _a, _b, _c, _d, _e, _f, _g;
|
|
59
68
|
this.log = log;
|
|
60
69
|
this.config = config;
|
|
61
70
|
this.api = api;
|
|
@@ -89,22 +98,22 @@ class SuplaPlatform {
|
|
|
89
98
|
this.gateLockExecuteAction = (configView.gateLockExecuteAction || 'open').toString();
|
|
90
99
|
this.gateLockSetTopicSuffix = this.normalizeTopicSuffix(configView.gateLockSetTopicSuffix || 'set/on');
|
|
91
100
|
this.gateLockPulseSeconds = Number(configView.gateLockPulseSeconds) || 0;
|
|
92
|
-
this.gateLockSetOnPayload = (
|
|
93
|
-
this.gateLockSetOffPayload = (
|
|
101
|
+
this.gateLockSetOnPayload = (configView.gateLockSetOnPayload ?? 'true').toString();
|
|
102
|
+
this.gateLockSetOffPayload = (configView.gateLockSetOffPayload ?? 'false').toString();
|
|
94
103
|
this.gatePartialHiMode = this.normalizeGatePartialHiMode(configView.gatePartialHiMode);
|
|
95
104
|
this.gateReverseFollowUpDelayMs = this.normalizeGateReverseFollowUpDelayMs(configView.gateReverseFollowUpDelayMs);
|
|
96
105
|
this.gateOpenAssumeDelayMs = this.normalizeGateOpenAssumeDelayMs(configView.gateOpenAssumeDelayMs);
|
|
97
106
|
this.gateCommandCooldownMs = this.normalizeGateCommandCooldownMs(configView.gateCommandCooldownMs);
|
|
98
107
|
this.gatePublishRetryDelayMs = this.normalizeGatePublishRetryDelayMs(configView.gatePublishRetryDelayMs);
|
|
99
|
-
this.gateStrictReverseDoublePulse = this.parseBoolean(
|
|
100
|
-
this.gateDebugTimeline = this.parseBoolean(
|
|
101
|
-
this.frontGateFullTravelMs = this.normalizeFrontGateFullTravelMs(
|
|
108
|
+
this.gateStrictReverseDoublePulse = this.parseBoolean(configView.gateStrictReverseDoublePulse ?? true);
|
|
109
|
+
this.gateDebugTimeline = this.parseBoolean(configView.gateDebugTimeline ?? false);
|
|
110
|
+
this.frontGateFullTravelMs = this.normalizeFrontGateFullTravelMs(configView.frontGateFullTravelMs ?? configView.gateOpenAssumeDelayMs);
|
|
102
111
|
this.frontGateReversePauseMs = this.normalizeFrontGateReversePauseMs(configView.frontGateReversePauseMs);
|
|
103
112
|
this.frontGateWrongDirectionRunMs = this.normalizeFrontGateWrongDirectionRunMs(configView.frontGateWrongDirectionRunMs);
|
|
104
|
-
this.frontGateMinimumPulseGapMs = this.normalizeFrontGateMinimumPulseGapMs(
|
|
113
|
+
this.frontGateMinimumPulseGapMs = this.normalizeFrontGateMinimumPulseGapMs(configView.frontGateMinimumPulseGapMs ?? configView.gateCommandCooldownMs);
|
|
105
114
|
this.frontGateCloseRetryLimit = this.normalizeFrontGateCloseRetryLimit(configView.frontGateCloseRetryLimit);
|
|
106
115
|
this.commandQos = this.normalizeCommandQos(configView.commandQos);
|
|
107
|
-
this.commandRetain = this.parseBoolean(
|
|
116
|
+
this.commandRetain = this.parseBoolean(configView.commandRetain ?? false);
|
|
108
117
|
this.api.on('shutdown', () => {
|
|
109
118
|
this.unregisterAllMqttHandlers();
|
|
110
119
|
if (this.MqttClient) {
|
|
@@ -167,8 +176,7 @@ class SuplaPlatform {
|
|
|
167
176
|
* must not be registered again to prevent "duplicate UUID" errors.
|
|
168
177
|
*/
|
|
169
178
|
discoverDevices(channelsOverride) {
|
|
170
|
-
|
|
171
|
-
const rawChannels = channelsOverride !== null && channelsOverride !== void 0 ? channelsOverride : this.loadChannelsFromConfig();
|
|
179
|
+
const rawChannels = channelsOverride ?? this.loadChannelsFromConfig();
|
|
172
180
|
const channels = rawChannels.map(channel => this.normalizeChannelContext(channel));
|
|
173
181
|
this.log.info('Channels discovered:', channels.length);
|
|
174
182
|
this.log.debug(`Discovery mode: ${channelsOverride ? 'live' : 'cached'} channels`);
|
|
@@ -192,9 +200,9 @@ class SuplaPlatform {
|
|
|
192
200
|
// loop over the discovered devices and register each one if it has not already been registered
|
|
193
201
|
for (const channel of channels) {
|
|
194
202
|
const existingByIds = findExistingByIds(channel);
|
|
195
|
-
const uuid =
|
|
203
|
+
const uuid = existingByIds?.UUID ?? this.getChannelUuid(channel);
|
|
196
204
|
channelUuids.add(uuid);
|
|
197
|
-
const existingAccessory = existingByIds
|
|
205
|
+
const existingAccessory = existingByIds ?? this.accessories.find(accessory => accessory.UUID === uuid);
|
|
198
206
|
if (existingAccessory) {
|
|
199
207
|
this.log.info('Restoring existing accessory from cache:', existingAccessory.displayName);
|
|
200
208
|
const signature = this.getChannelSignature(channel);
|
|
@@ -262,11 +270,10 @@ class SuplaPlatform {
|
|
|
262
270
|
return [];
|
|
263
271
|
}
|
|
264
272
|
persistChannels(channels) {
|
|
265
|
-
var _a;
|
|
266
273
|
try {
|
|
267
274
|
const configPath = this.api.user.configPath();
|
|
268
275
|
const config = JSON.parse(fs.readFileSync(configPath).toString());
|
|
269
|
-
const platformConfig =
|
|
276
|
+
const platformConfig = config.platforms?.find((platform) => platform.platform === settings_1.PLATFORM_NAME);
|
|
270
277
|
if (!platformConfig) {
|
|
271
278
|
this.log.warn(`Failed to save channels: ${settings_1.PLATFORM_NAME} not found in config.`);
|
|
272
279
|
return;
|
|
@@ -283,9 +290,8 @@ class SuplaPlatform {
|
|
|
283
290
|
}
|
|
284
291
|
}
|
|
285
292
|
normalizeChannelContext(channel) {
|
|
286
|
-
|
|
287
|
-
const
|
|
288
|
-
const baseFromTopic = this.normalizeTopicBase(rawTopic || ((_c = channel.topic) !== null && _c !== void 0 ? _c : '').toString());
|
|
293
|
+
const rawTopic = (channel.rawTopic ?? channel.topic ?? '').toString();
|
|
294
|
+
const baseFromTopic = this.normalizeTopicBase(rawTopic || (channel.topic ?? '').toString());
|
|
289
295
|
let deviceId = channel.deviceId;
|
|
290
296
|
let channelId = channel.channelId;
|
|
291
297
|
if (!deviceId || !channelId) {
|
|
@@ -321,13 +327,12 @@ class SuplaPlatform {
|
|
|
321
327
|
return this.api.hap.uuid.generate(key);
|
|
322
328
|
}
|
|
323
329
|
getChannelSignature(channel) {
|
|
324
|
-
var _a, _b, _c, _d, _e;
|
|
325
330
|
return [
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
+
channel.topic ?? '',
|
|
332
|
+
channel.channelFunction ?? '',
|
|
333
|
+
channel.channelType ?? '',
|
|
334
|
+
channel.deviceId ?? '',
|
|
335
|
+
channel.channelId ?? '',
|
|
331
336
|
].join('|');
|
|
332
337
|
}
|
|
333
338
|
resetAccessoryServices(accessory) {
|
|
@@ -450,8 +455,7 @@ class SuplaPlatform {
|
|
|
450
455
|
return false;
|
|
451
456
|
}
|
|
452
457
|
isLeakSensorChannel(channel) {
|
|
453
|
-
|
|
454
|
-
const caption = ((_a = channel.channelCaption) !== null && _a !== void 0 ? _a : '').toLowerCase();
|
|
458
|
+
const caption = (channel.channelCaption ?? '').toLowerCase();
|
|
455
459
|
return ['leak', 'flood', 'water', 'zalania'].some(term => caption.includes(term));
|
|
456
460
|
}
|
|
457
461
|
getCoveringControlMode() {
|
|
@@ -551,7 +555,7 @@ class SuplaPlatform {
|
|
|
551
555
|
return closeAction;
|
|
552
556
|
}
|
|
553
557
|
normalizeCoveringControlMode(value) {
|
|
554
|
-
const normalized = (value
|
|
558
|
+
const normalized = (value ?? 'set').toString().toLowerCase();
|
|
555
559
|
if (normalized === 'execute_action') {
|
|
556
560
|
return 'execute_action';
|
|
557
561
|
}
|
|
@@ -561,21 +565,21 @@ class SuplaPlatform {
|
|
|
561
565
|
return 'set';
|
|
562
566
|
}
|
|
563
567
|
normalizeGateControlMode(value) {
|
|
564
|
-
const normalized = (value
|
|
568
|
+
const normalized = (value ?? 'execute_action').toString().toLowerCase();
|
|
565
569
|
if (normalized === 'toggle') {
|
|
566
570
|
return 'toggle';
|
|
567
571
|
}
|
|
568
572
|
return 'execute_action';
|
|
569
573
|
}
|
|
570
574
|
normalizeGateLockControlMode(value) {
|
|
571
|
-
const normalized = (value
|
|
575
|
+
const normalized = (value ?? 'execute_action').toString().toLowerCase();
|
|
572
576
|
if (normalized === 'set_on_pulse') {
|
|
573
577
|
return 'set_on_pulse';
|
|
574
578
|
}
|
|
575
579
|
return 'execute_action';
|
|
576
580
|
}
|
|
577
581
|
normalizeGatePartialHiMode(value) {
|
|
578
|
-
const normalized = (value
|
|
582
|
+
const normalized = (value ?? 'moving').toString().toLowerCase();
|
|
579
583
|
if (normalized === 'open_endstop' || normalized === 'open') {
|
|
580
584
|
return 'open_endstop';
|
|
581
585
|
}
|
|
@@ -612,7 +616,7 @@ class SuplaPlatform {
|
|
|
612
616
|
return fallbackMs;
|
|
613
617
|
}
|
|
614
618
|
const rounded = Math.round(parsed);
|
|
615
|
-
return Math.min(
|
|
619
|
+
return Math.min(15000, Math.max(3000, rounded));
|
|
616
620
|
}
|
|
617
621
|
normalizeGatePublishRetryDelayMs(value) {
|
|
618
622
|
const fallbackMs = 300;
|
|
@@ -633,13 +637,13 @@ class SuplaPlatform {
|
|
|
633
637
|
return Math.min(120000, Math.max(5000, rounded));
|
|
634
638
|
}
|
|
635
639
|
normalizeFrontGateReversePauseMs(value) {
|
|
636
|
-
const fallbackMs =
|
|
640
|
+
const fallbackMs = 3000;
|
|
637
641
|
const parsed = Number(value);
|
|
638
642
|
if (!Number.isFinite(parsed)) {
|
|
639
643
|
return fallbackMs;
|
|
640
644
|
}
|
|
641
645
|
const rounded = Math.round(parsed);
|
|
642
|
-
return Math.min(
|
|
646
|
+
return Math.min(15000, Math.max(3000, rounded));
|
|
643
647
|
}
|
|
644
648
|
normalizeFrontGateWrongDirectionRunMs(value) {
|
|
645
649
|
const fallbackMs = 700;
|
|
@@ -651,7 +655,7 @@ class SuplaPlatform {
|
|
|
651
655
|
return Math.min(5000, Math.max(100, rounded));
|
|
652
656
|
}
|
|
653
657
|
normalizeFrontGateMinimumPulseGapMs(value) {
|
|
654
|
-
const fallbackMs =
|
|
658
|
+
const fallbackMs = 3000;
|
|
655
659
|
const parsed = Number(value);
|
|
656
660
|
if (!Number.isFinite(parsed)) {
|
|
657
661
|
return fallbackMs;
|
|
@@ -660,7 +664,7 @@ class SuplaPlatform {
|
|
|
660
664
|
return Math.min(10000, Math.max(0, rounded));
|
|
661
665
|
}
|
|
662
666
|
normalizeFrontGateCloseRetryLimit(value) {
|
|
663
|
-
const fallbackValue =
|
|
667
|
+
const fallbackValue = 0;
|
|
664
668
|
const parsed = Number(value);
|
|
665
669
|
if (!Number.isFinite(parsed)) {
|
|
666
670
|
return fallbackValue;
|
|
@@ -672,7 +676,7 @@ class SuplaPlatform {
|
|
|
672
676
|
return value.toString().replace(/^\/+/, '');
|
|
673
677
|
}
|
|
674
678
|
normalizeTopicBase(topic) {
|
|
675
|
-
let base = (topic
|
|
679
|
+
let base = (topic ?? '').toString().trim();
|
|
676
680
|
if (!base) {
|
|
677
681
|
return '';
|
|
678
682
|
}
|
|
@@ -683,17 +687,16 @@ class SuplaPlatform {
|
|
|
683
687
|
return base.replace(/\/+$/, '');
|
|
684
688
|
}
|
|
685
689
|
registerMqttHandler(topic, handler, ownerId) {
|
|
686
|
-
var _a, _b, _c;
|
|
687
690
|
if (!topic) {
|
|
688
691
|
return () => undefined;
|
|
689
692
|
}
|
|
690
693
|
this.startMqttRouter();
|
|
691
694
|
const handlerMap = this.isWildcardTopic(topic) ? this.mqttWildcardHandlers : this.mqttHandlers;
|
|
692
|
-
const handlers =
|
|
695
|
+
const handlers = handlerMap.get(topic) ?? new Set();
|
|
693
696
|
handlers.add(handler);
|
|
694
697
|
handlerMap.set(topic, handlers);
|
|
695
|
-
const ownerTopics =
|
|
696
|
-
const ownerHandlers =
|
|
698
|
+
const ownerTopics = this.mqttHandlerOwners.get(ownerId) ?? new Map();
|
|
699
|
+
const ownerHandlers = ownerTopics.get(topic) ?? new Set();
|
|
697
700
|
ownerHandlers.add(handler);
|
|
698
701
|
ownerTopics.set(topic, ownerHandlers);
|
|
699
702
|
this.mqttHandlerOwners.set(ownerId, ownerTopics);
|
|
@@ -702,11 +705,11 @@ class SuplaPlatform {
|
|
|
702
705
|
return () => {
|
|
703
706
|
this.removeHandler(topic, handler);
|
|
704
707
|
const ownerTopics = this.mqttHandlerOwners.get(ownerId);
|
|
705
|
-
const ownerHandlers = ownerTopics
|
|
708
|
+
const ownerHandlers = ownerTopics?.get(topic);
|
|
706
709
|
if (ownerHandlers) {
|
|
707
710
|
ownerHandlers.delete(handler);
|
|
708
711
|
if (ownerHandlers.size === 0) {
|
|
709
|
-
ownerTopics
|
|
712
|
+
ownerTopics?.delete(topic);
|
|
710
713
|
}
|
|
711
714
|
}
|
|
712
715
|
if (ownerTopics && ownerTopics.size === 0) {
|
|
@@ -715,8 +718,7 @@ class SuplaPlatform {
|
|
|
715
718
|
};
|
|
716
719
|
}
|
|
717
720
|
registerOwnerCleanup(ownerId, cleanup) {
|
|
718
|
-
|
|
719
|
-
const cleanups = (_a = this.ownerCleanups.get(ownerId)) !== null && _a !== void 0 ? _a : new Set();
|
|
721
|
+
const cleanups = this.ownerCleanups.get(ownerId) ?? new Set();
|
|
720
722
|
cleanups.add(cleanup);
|
|
721
723
|
this.ownerCleanups.set(ownerId, cleanups);
|
|
722
724
|
return () => {
|
|
@@ -763,8 +765,7 @@ class SuplaPlatform {
|
|
|
763
765
|
this.ownerCleanups.clear();
|
|
764
766
|
}
|
|
765
767
|
publishCommand(topic, payload, callback) {
|
|
766
|
-
|
|
767
|
-
const client = (_a = this.MqttClient) === null || _a === void 0 ? void 0 : _a.client;
|
|
768
|
+
const client = this.MqttClient?.client;
|
|
768
769
|
if (!client || !client.connected) {
|
|
769
770
|
const error = new Error('MQTT not connected');
|
|
770
771
|
this.log.error(`MQTT not connected; cannot publish ${topic}`);
|
|
@@ -838,7 +839,6 @@ class SuplaPlatform {
|
|
|
838
839
|
this.mqttRetryState.delete(topic);
|
|
839
840
|
}
|
|
840
841
|
scheduleSubscriptionRetry(topic, reason, hardDeny) {
|
|
841
|
-
var _a;
|
|
842
842
|
if (this.mqttRetryTimers.has(topic)) {
|
|
843
843
|
return;
|
|
844
844
|
}
|
|
@@ -848,7 +848,7 @@ class SuplaPlatform {
|
|
|
848
848
|
const baseDelayMs = 2500;
|
|
849
849
|
const maxDelayMs = 60000;
|
|
850
850
|
const now = Date.now();
|
|
851
|
-
const state =
|
|
851
|
+
const state = this.mqttRetryState.get(topic) ?? {
|
|
852
852
|
attempt: 0,
|
|
853
853
|
delayMs: baseDelayMs,
|
|
854
854
|
lastLogAt: 0,
|
|
@@ -895,9 +895,8 @@ class SuplaPlatform {
|
|
|
895
895
|
return entry.qos === 0 || entry.qos === 1 || entry.qos === 2;
|
|
896
896
|
}
|
|
897
897
|
logSubscriptionIssue(topic, message) {
|
|
898
|
-
var _a;
|
|
899
898
|
const now = Date.now();
|
|
900
|
-
const state =
|
|
899
|
+
const state = this.mqttRetryState.get(topic) ?? {
|
|
901
900
|
attempt: 0,
|
|
902
901
|
delayMs: 2500,
|
|
903
902
|
lastLogAt: 0,
|