@fastybird/smart-panel-backend 0.1.0-alpha.6 → 0.2.0-alpha.0
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/dist/migrations/1000000000000-InitialSetup.js +22 -12
- package/dist/migrations/1000000000000-InitialSetup.js.map +1 -1
- package/dist/modules/system/commands/update-panel.command.js +7 -12
- package/dist/modules/system/commands/update-panel.command.js.map +1 -1
- package/dist/modules/system/services/update.service.js +1 -1
- package/dist/modules/system/services/update.service.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/delegates/delegates-manager.service.d.ts +11 -1
- package/dist/plugins/devices-shelly-ng/delegates/delegates-manager.service.js +212 -47
- package/dist/plugins/devices-shelly-ng/delegates/delegates-manager.service.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/devices-shelly-ng.constants.d.ts +5 -0
- package/dist/plugins/devices-shelly-ng/devices-shelly-ng.constants.js +10 -1
- package/dist/plugins/devices-shelly-ng/devices-shelly-ng.constants.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/devices-shelly-ng.plugin.js +9 -1
- package/dist/plugins/devices-shelly-ng/devices-shelly-ng.plugin.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/dto/create-device.dto.d.ts +0 -1
- package/dist/plugins/devices-shelly-ng/dto/create-device.dto.js +0 -14
- package/dist/plugins/devices-shelly-ng/dto/create-device.dto.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/dto/update-device.dto.d.ts +2 -1
- package/dist/plugins/devices-shelly-ng/dto/update-device.dto.js +19 -4
- package/dist/plugins/devices-shelly-ng/dto/update-device.dto.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/entities/devices-shelly-ng.entity.d.ts +6 -1
- package/dist/plugins/devices-shelly-ng/entities/devices-shelly-ng.entity.js +38 -6
- package/dist/plugins/devices-shelly-ng/entities/devices-shelly-ng.entity.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/entities/shelly-ng-device-address.entity.d.ts +10 -0
- package/dist/plugins/devices-shelly-ng/entities/shelly-ng-device-address.entity.js +69 -0
- package/dist/plugins/devices-shelly-ng/entities/shelly-ng-device-address.entity.js.map +1 -0
- package/dist/plugins/devices-shelly-ng/services/database-discoverer.service.d.ts +3 -1
- package/dist/plugins/devices-shelly-ng/services/database-discoverer.service.js +19 -7
- package/dist/plugins/devices-shelly-ng/services/database-discoverer.service.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/services/device-address.service.d.ts +22 -0
- package/dist/plugins/devices-shelly-ng/services/device-address.service.js +149 -0
- package/dist/plugins/devices-shelly-ng/services/device-address.service.js.map +1 -0
- package/dist/plugins/devices-shelly-ng/services/device-manager.service.d.ts +3 -1
- package/dist/plugins/devices-shelly-ng/services/device-manager.service.js +20 -7
- package/dist/plugins/devices-shelly-ng/services/device-manager.service.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/subscribers/device-entity.subscriber.d.ts +6 -2
- package/dist/plugins/devices-shelly-ng/subscribers/device-entity.subscriber.js +75 -6
- package/dist/plugins/devices-shelly-ng/subscribers/device-entity.subscriber.js.map +1 -1
- package/dist/plugins/devices-zigbee2mqtt/devices-zigbee2mqtt.constants.d.ts +4 -0
- package/dist/plugins/devices-zigbee2mqtt/devices-zigbee2mqtt.constants.js +5 -1
- package/dist/plugins/devices-zigbee2mqtt/devices-zigbee2mqtt.constants.js.map +1 -1
- package/dist/plugins/devices-zigbee2mqtt/devices-zigbee2mqtt.openapi.d.ts +2 -2
- package/dist/plugins/devices-zigbee2mqtt/devices-zigbee2mqtt.openapi.js +2 -0
- package/dist/plugins/devices-zigbee2mqtt/devices-zigbee2mqtt.openapi.js.map +1 -1
- package/dist/plugins/devices-zigbee2mqtt/devices-zigbee2mqtt.plugin.js +11 -6
- package/dist/plugins/devices-zigbee2mqtt/devices-zigbee2mqtt.plugin.js.map +1 -1
- package/dist/plugins/devices-zigbee2mqtt/dto/update-config.dto.d.ts +10 -0
- package/dist/plugins/devices-zigbee2mqtt/dto/update-config.dto.js +117 -3
- package/dist/plugins/devices-zigbee2mqtt/dto/update-config.dto.js.map +1 -1
- package/dist/plugins/devices-zigbee2mqtt/interfaces/zigbee2mqtt.interface.d.ts +8 -0
- package/dist/plugins/devices-zigbee2mqtt/mappings/definitions/covers.yaml +5 -4
- package/dist/plugins/devices-zigbee2mqtt/models/config.model.d.ts +10 -0
- package/dist/plugins/devices-zigbee2mqtt/models/config.model.js +108 -3
- package/dist/plugins/devices-zigbee2mqtt/models/config.model.js.map +1 -1
- package/dist/plugins/devices-zigbee2mqtt/platforms/zigbee2mqtt.device.platform.d.ts +3 -4
- package/dist/plugins/devices-zigbee2mqtt/platforms/zigbee2mqtt.device.platform.js +11 -22
- package/dist/plugins/devices-zigbee2mqtt/platforms/zigbee2mqtt.device.platform.js.map +1 -1
- package/dist/plugins/devices-zigbee2mqtt/services/base-client-adapter.d.ts +35 -0
- package/dist/plugins/devices-zigbee2mqtt/services/base-client-adapter.js +265 -0
- package/dist/plugins/devices-zigbee2mqtt/services/base-client-adapter.js.map +1 -0
- package/dist/plugins/devices-zigbee2mqtt/services/device-mapper.service.js +6 -5
- package/dist/plugins/devices-zigbee2mqtt/services/device-mapper.service.js.map +1 -1
- package/dist/plugins/devices-zigbee2mqtt/services/mqtt-client-adapter.service.d.ts +4 -26
- package/dist/plugins/devices-zigbee2mqtt/services/mqtt-client-adapter.service.js +16 -265
- package/dist/plugins/devices-zigbee2mqtt/services/mqtt-client-adapter.service.js.map +1 -1
- package/dist/plugins/devices-zigbee2mqtt/services/virtual-property.types.js +0 -16
- package/dist/plugins/devices-zigbee2mqtt/services/virtual-property.types.js.map +1 -1
- package/dist/plugins/devices-zigbee2mqtt/services/ws-client-adapter.service.d.ts +14 -0
- package/dist/plugins/devices-zigbee2mqtt/services/ws-client-adapter.service.js +199 -0
- package/dist/plugins/devices-zigbee2mqtt/services/ws-client-adapter.service.js.map +1 -0
- package/dist/plugins/devices-zigbee2mqtt/services/zigbee2mqtt-config-validator.service.d.ts +2 -0
- package/dist/plugins/devices-zigbee2mqtt/services/zigbee2mqtt-config-validator.service.js +69 -0
- package/dist/plugins/devices-zigbee2mqtt/services/zigbee2mqtt-config-validator.service.js.map +1 -1
- package/dist/plugins/devices-zigbee2mqtt/services/zigbee2mqtt.service.d.ts +8 -1
- package/dist/plugins/devices-zigbee2mqtt/services/zigbee2mqtt.service.js +86 -32
- package/dist/plugins/devices-zigbee2mqtt/services/zigbee2mqtt.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +2 -2
|
@@ -38,57 +38,25 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
38
38
|
return result;
|
|
39
39
|
};
|
|
40
40
|
})();
|
|
41
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
42
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
43
|
+
};
|
|
41
44
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
42
45
|
exports.Z2mMqttClientAdapterService = void 0;
|
|
43
46
|
const mqtt = __importStar(require("mqtt"));
|
|
44
47
|
const common_1 = require("@nestjs/common");
|
|
45
|
-
const
|
|
46
|
-
|
|
47
|
-
let Z2mMqttClientAdapterService = class Z2mMqttClientAdapterService {
|
|
48
|
+
const base_client_adapter_1 = require("./base-client-adapter");
|
|
49
|
+
let Z2mMqttClientAdapterService = class Z2mMqttClientAdapterService extends base_client_adapter_1.Z2mBaseClientAdapter {
|
|
48
50
|
constructor() {
|
|
49
|
-
|
|
51
|
+
super('MqttClientAdapter');
|
|
50
52
|
this.client = null;
|
|
51
53
|
this.config = null;
|
|
52
|
-
this.connected = false;
|
|
53
|
-
this.bridgeOnline = false;
|
|
54
|
-
this.reconnectTimer = null;
|
|
55
|
-
this.deviceRegistry = new Map();
|
|
56
|
-
this.stateCache = new Map();
|
|
57
|
-
this.callbacks = {};
|
|
58
|
-
}
|
|
59
|
-
setCallbacks(callbacks) {
|
|
60
|
-
this.callbacks = callbacks;
|
|
61
|
-
}
|
|
62
|
-
get baseTopic() {
|
|
63
|
-
return this.config?.baseTopic ?? devices_zigbee2mqtt_constants_1.DEFAULT_MQTT_BASE_TOPIC;
|
|
64
|
-
}
|
|
65
|
-
isConnected() {
|
|
66
|
-
return this.connected;
|
|
67
|
-
}
|
|
68
|
-
isBridgeOnline() {
|
|
69
|
-
return this.bridgeOnline;
|
|
70
|
-
}
|
|
71
|
-
getRegisteredDevices() {
|
|
72
|
-
return Array.from(this.deviceRegistry.values());
|
|
73
|
-
}
|
|
74
|
-
getDevice(friendlyName) {
|
|
75
|
-
return this.deviceRegistry.get(friendlyName);
|
|
76
|
-
}
|
|
77
|
-
getDeviceByIeeeAddress(ieeeAddress) {
|
|
78
|
-
for (const device of this.deviceRegistry.values()) {
|
|
79
|
-
if (device.ieeeAddress === ieeeAddress) {
|
|
80
|
-
return device;
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
return undefined;
|
|
84
|
-
}
|
|
85
|
-
getCachedState(friendlyName) {
|
|
86
|
-
return this.stateCache.get(friendlyName) ?? {};
|
|
87
54
|
}
|
|
88
55
|
async connect(config) {
|
|
89
|
-
this.
|
|
56
|
+
this.configBaseTopic = config.baseTopic;
|
|
90
57
|
this.clearReconnectTimer();
|
|
91
58
|
await this.disconnect();
|
|
59
|
+
this.config = config;
|
|
92
60
|
const brokerUrl = this.buildBrokerUrl(config);
|
|
93
61
|
this.logger.log(`Connecting to MQTT broker: ${brokerUrl}`);
|
|
94
62
|
return new Promise((resolve, reject) => {
|
|
@@ -142,7 +110,7 @@ let Z2mMqttClientAdapterService = class Z2mMqttClientAdapterService {
|
|
|
142
110
|
this.logger.warn('MQTT client is offline');
|
|
143
111
|
});
|
|
144
112
|
this.client.on('message', (topic, payload) => {
|
|
145
|
-
this.handleMessage(topic, payload);
|
|
113
|
+
this.handleMessage(topic, payload.toString());
|
|
146
114
|
});
|
|
147
115
|
}
|
|
148
116
|
catch (error) {
|
|
@@ -155,20 +123,19 @@ let Z2mMqttClientAdapterService = class Z2mMqttClientAdapterService {
|
|
|
155
123
|
}
|
|
156
124
|
async disconnect() {
|
|
157
125
|
this.clearReconnectTimer();
|
|
126
|
+
this.connected = false;
|
|
127
|
+
this.bridgeOnline = false;
|
|
128
|
+
this.config = null;
|
|
158
129
|
if (this.client) {
|
|
159
130
|
this.logger.log('Disconnecting from MQTT broker');
|
|
160
|
-
|
|
161
|
-
this.bridgeOnline = false;
|
|
162
|
-
this.config = null;
|
|
163
|
-
return new Promise((resolve) => {
|
|
131
|
+
await new Promise((resolve) => {
|
|
164
132
|
this.client?.end(true, {}, () => {
|
|
165
133
|
this.client = null;
|
|
166
|
-
this.deviceRegistry.clear();
|
|
167
|
-
this.stateCache.clear();
|
|
168
134
|
resolve();
|
|
169
135
|
});
|
|
170
136
|
});
|
|
171
137
|
}
|
|
138
|
+
this.resetState();
|
|
172
139
|
}
|
|
173
140
|
async publishCommand(friendlyName, payload) {
|
|
174
141
|
if (!this.client || !this.connected) {
|
|
@@ -233,217 +200,6 @@ let Z2mMqttClientAdapterService = class Z2mMqttClientAdapterService {
|
|
|
233
200
|
});
|
|
234
201
|
}
|
|
235
202
|
}
|
|
236
|
-
handleMessage(topic, payload) {
|
|
237
|
-
const message = payload.toString();
|
|
238
|
-
try {
|
|
239
|
-
const relativePath = topic.replace(`${this.baseTopic}/`, '');
|
|
240
|
-
const topicParts = relativePath.split('/');
|
|
241
|
-
if (topicParts.length === 0) {
|
|
242
|
-
return;
|
|
243
|
-
}
|
|
244
|
-
if (this.deviceRegistry.has(relativePath)) {
|
|
245
|
-
this.handleDeviceStateMessage(relativePath, message);
|
|
246
|
-
return;
|
|
247
|
-
}
|
|
248
|
-
if (topicParts[0] === 'bridge') {
|
|
249
|
-
this.handleBridgeMessage(topicParts[1], message);
|
|
250
|
-
return;
|
|
251
|
-
}
|
|
252
|
-
const lastPart = topicParts[topicParts.length - 1];
|
|
253
|
-
const pathWithoutSuffix = topicParts.slice(0, -1).join('/');
|
|
254
|
-
if (lastPart === 'availability' && pathWithoutSuffix) {
|
|
255
|
-
if (this.deviceRegistry.has(pathWithoutSuffix)) {
|
|
256
|
-
this.handleDeviceAvailabilityMessage(pathWithoutSuffix, message);
|
|
257
|
-
}
|
|
258
|
-
else {
|
|
259
|
-
this.handleDeviceAvailabilityMessage(pathWithoutSuffix, message);
|
|
260
|
-
}
|
|
261
|
-
return;
|
|
262
|
-
}
|
|
263
|
-
if (lastPart === 'set' || lastPart === 'get') {
|
|
264
|
-
return;
|
|
265
|
-
}
|
|
266
|
-
this.handleDeviceStateMessage(relativePath, message);
|
|
267
|
-
}
|
|
268
|
-
catch (error) {
|
|
269
|
-
this.logger.warn(`Failed to handle message on topic ${topic}`, {
|
|
270
|
-
message: error instanceof Error ? error.message : String(error),
|
|
271
|
-
});
|
|
272
|
-
}
|
|
273
|
-
}
|
|
274
|
-
handleBridgeMessage(subtopic, message) {
|
|
275
|
-
switch (subtopic) {
|
|
276
|
-
case 'state':
|
|
277
|
-
this.handleBridgeStateMessage(message);
|
|
278
|
-
break;
|
|
279
|
-
case 'devices':
|
|
280
|
-
this.handleBridgeDevicesMessage(message);
|
|
281
|
-
break;
|
|
282
|
-
case 'event':
|
|
283
|
-
this.handleBridgeEventMessage(message);
|
|
284
|
-
break;
|
|
285
|
-
case 'groups':
|
|
286
|
-
this.logger.debug('Received bridge/groups message (not implemented)');
|
|
287
|
-
break;
|
|
288
|
-
}
|
|
289
|
-
}
|
|
290
|
-
handleBridgeStateMessage(message) {
|
|
291
|
-
try {
|
|
292
|
-
const state = JSON.parse(message);
|
|
293
|
-
const wasOnline = this.bridgeOnline;
|
|
294
|
-
this.bridgeOnline = state.state === 'online';
|
|
295
|
-
if (this.bridgeOnline && !wasOnline) {
|
|
296
|
-
this.logger.log('Zigbee2MQTT bridge is online');
|
|
297
|
-
void this.callbacks.onBridgeOnline?.();
|
|
298
|
-
}
|
|
299
|
-
else if (!this.bridgeOnline && wasOnline) {
|
|
300
|
-
this.logger.warn('Zigbee2MQTT bridge is offline');
|
|
301
|
-
void this.callbacks.onBridgeOffline?.();
|
|
302
|
-
}
|
|
303
|
-
}
|
|
304
|
-
catch (error) {
|
|
305
|
-
this.logger.warn('Failed to parse bridge/state message', {
|
|
306
|
-
message: error instanceof Error ? error.message : String(error),
|
|
307
|
-
});
|
|
308
|
-
}
|
|
309
|
-
}
|
|
310
|
-
handleBridgeDevicesMessage(message) {
|
|
311
|
-
try {
|
|
312
|
-
const devices = JSON.parse(message);
|
|
313
|
-
this.logger.log(`Received device registry with ${devices.length} devices`);
|
|
314
|
-
for (const device of devices) {
|
|
315
|
-
if (device.definition) {
|
|
316
|
-
this.logger.debug(`Device ${device.friendly_name}: ${device.definition.exposes?.length ?? 0} exposes, ` +
|
|
317
|
-
`types: ${device.definition.exposes?.map((e) => e.type).join(', ') ?? 'none'}`);
|
|
318
|
-
}
|
|
319
|
-
}
|
|
320
|
-
for (const device of devices) {
|
|
321
|
-
if (devices_zigbee2mqtt_constants_1.Z2M_IGNORED_DEVICE_TYPES.includes(device.type) ||
|
|
322
|
-
!device.supported ||
|
|
323
|
-
device.disabled) {
|
|
324
|
-
continue;
|
|
325
|
-
}
|
|
326
|
-
const existing = this.deviceRegistry.get(device.friendly_name);
|
|
327
|
-
const cachedState = this.stateCache.get(device.friendly_name) ?? {};
|
|
328
|
-
const registeredDevice = {
|
|
329
|
-
ieeeAddress: device.ieee_address,
|
|
330
|
-
friendlyName: device.friendly_name,
|
|
331
|
-
description: device.description,
|
|
332
|
-
type: device.type,
|
|
333
|
-
supported: device.supported,
|
|
334
|
-
disabled: device.disabled,
|
|
335
|
-
definition: device.definition,
|
|
336
|
-
powerSource: device.power_source,
|
|
337
|
-
modelId: device.model_id,
|
|
338
|
-
available: existing?.available ?? true,
|
|
339
|
-
lastSeen: existing?.lastSeen,
|
|
340
|
-
currentState: { ...(existing?.currentState ?? {}), ...cachedState },
|
|
341
|
-
};
|
|
342
|
-
this.deviceRegistry.set(device.friendly_name, registeredDevice);
|
|
343
|
-
if (Object.keys(cachedState).length > 0) {
|
|
344
|
-
this.logger.debug(`Applied cached state to "${device.friendly_name}": ${Object.keys(cachedState).join(', ')}`);
|
|
345
|
-
}
|
|
346
|
-
}
|
|
347
|
-
const currentFriendlyNames = new Set(devices.map((d) => d.friendly_name));
|
|
348
|
-
for (const friendlyName of this.deviceRegistry.keys()) {
|
|
349
|
-
if (!currentFriendlyNames.has(friendlyName)) {
|
|
350
|
-
this.deviceRegistry.delete(friendlyName);
|
|
351
|
-
}
|
|
352
|
-
}
|
|
353
|
-
this.requestMissingStates();
|
|
354
|
-
const filteredDevices = devices.filter((d) => !devices_zigbee2mqtt_constants_1.Z2M_IGNORED_DEVICE_TYPES.includes(d.type) &&
|
|
355
|
-
d.supported &&
|
|
356
|
-
!d.disabled);
|
|
357
|
-
void this.callbacks.onDevicesReceived?.(filteredDevices);
|
|
358
|
-
}
|
|
359
|
-
catch (error) {
|
|
360
|
-
this.logger.error('Failed to parse bridge/devices message', {
|
|
361
|
-
message: error instanceof Error ? error.message : String(error),
|
|
362
|
-
});
|
|
363
|
-
}
|
|
364
|
-
}
|
|
365
|
-
requestMissingStates() {
|
|
366
|
-
for (const [friendlyName, device] of this.deviceRegistry.entries()) {
|
|
367
|
-
if (Object.keys(device.currentState).length === 0) {
|
|
368
|
-
this.logger.debug(`Requesting state for device without current state: ${friendlyName}`);
|
|
369
|
-
this.requestState(friendlyName).catch(() => {
|
|
370
|
-
});
|
|
371
|
-
}
|
|
372
|
-
}
|
|
373
|
-
}
|
|
374
|
-
handleBridgeEventMessage(message) {
|
|
375
|
-
try {
|
|
376
|
-
const event = JSON.parse(message);
|
|
377
|
-
switch (event.type) {
|
|
378
|
-
case 'device_joined':
|
|
379
|
-
case 'device_announce':
|
|
380
|
-
this.logger.log(`Device joined: ${event.data.friendly_name}`);
|
|
381
|
-
void this.callbacks.onDeviceJoined?.(event.data.ieee_address ?? '', event.data.friendly_name ?? '');
|
|
382
|
-
break;
|
|
383
|
-
case 'device_leave':
|
|
384
|
-
this.logger.log(`Device left: ${event.data.friendly_name}`);
|
|
385
|
-
if (event.data.friendly_name) {
|
|
386
|
-
this.deviceRegistry.delete(event.data.friendly_name);
|
|
387
|
-
}
|
|
388
|
-
void this.callbacks.onDeviceLeft?.(event.data.ieee_address ?? '', event.data.friendly_name ?? '');
|
|
389
|
-
break;
|
|
390
|
-
case 'device_interview':
|
|
391
|
-
this.logger.debug(`Device interview: ${event.data.friendly_name} - ${event.data.status}`);
|
|
392
|
-
break;
|
|
393
|
-
}
|
|
394
|
-
}
|
|
395
|
-
catch (error) {
|
|
396
|
-
this.logger.warn('Failed to parse bridge/event message', {
|
|
397
|
-
message: error instanceof Error ? error.message : String(error),
|
|
398
|
-
});
|
|
399
|
-
}
|
|
400
|
-
}
|
|
401
|
-
handleDeviceStateMessage(friendlyName, message) {
|
|
402
|
-
try {
|
|
403
|
-
const state = JSON.parse(message);
|
|
404
|
-
this.logger.debug(`Received state for "${friendlyName}": ${Object.keys(state).join(', ')}`);
|
|
405
|
-
const existingCachedState = this.stateCache.get(friendlyName) ?? {};
|
|
406
|
-
this.stateCache.set(friendlyName, { ...existingCachedState, ...state });
|
|
407
|
-
const device = this.deviceRegistry.get(friendlyName);
|
|
408
|
-
if (device) {
|
|
409
|
-
device.currentState = { ...device.currentState, ...state };
|
|
410
|
-
device.lastSeen = new Date();
|
|
411
|
-
this.logger.debug(`Updated registry and cache for "${friendlyName}"`);
|
|
412
|
-
}
|
|
413
|
-
else {
|
|
414
|
-
this.logger.debug(`Updated cache for "${friendlyName}" (not yet in registry)`);
|
|
415
|
-
}
|
|
416
|
-
void this.callbacks.onDeviceStateChanged?.(friendlyName, state);
|
|
417
|
-
}
|
|
418
|
-
catch (error) {
|
|
419
|
-
this.logger.warn(`Failed to parse state for device ${friendlyName}`, {
|
|
420
|
-
message: error instanceof Error ? error.message : String(error),
|
|
421
|
-
});
|
|
422
|
-
}
|
|
423
|
-
}
|
|
424
|
-
handleDeviceAvailabilityMessage(friendlyName, message) {
|
|
425
|
-
this.logger.debug(`Received availability for "${friendlyName}": ${message}`);
|
|
426
|
-
try {
|
|
427
|
-
let available;
|
|
428
|
-
try {
|
|
429
|
-
const availability = JSON.parse(message);
|
|
430
|
-
available = availability.state === 'online';
|
|
431
|
-
}
|
|
432
|
-
catch {
|
|
433
|
-
available = message === 'online';
|
|
434
|
-
}
|
|
435
|
-
const device = this.deviceRegistry.get(friendlyName);
|
|
436
|
-
if (device) {
|
|
437
|
-
device.available = available;
|
|
438
|
-
}
|
|
439
|
-
void this.callbacks.onDeviceAvailabilityChanged?.(friendlyName, available);
|
|
440
|
-
}
|
|
441
|
-
catch (error) {
|
|
442
|
-
this.logger.warn(`Failed to parse availability for device ${friendlyName}`, {
|
|
443
|
-
message: error instanceof Error ? error.message : String(error),
|
|
444
|
-
});
|
|
445
|
-
}
|
|
446
|
-
}
|
|
447
203
|
scheduleReconnect() {
|
|
448
204
|
if (this.reconnectTimer || !this.config) {
|
|
449
205
|
return;
|
|
@@ -463,15 +219,10 @@ let Z2mMqttClientAdapterService = class Z2mMqttClientAdapterService {
|
|
|
463
219
|
}
|
|
464
220
|
}, interval);
|
|
465
221
|
}
|
|
466
|
-
clearReconnectTimer() {
|
|
467
|
-
if (this.reconnectTimer) {
|
|
468
|
-
clearTimeout(this.reconnectTimer);
|
|
469
|
-
this.reconnectTimer = null;
|
|
470
|
-
}
|
|
471
|
-
}
|
|
472
222
|
};
|
|
473
223
|
exports.Z2mMqttClientAdapterService = Z2mMqttClientAdapterService;
|
|
474
224
|
exports.Z2mMqttClientAdapterService = Z2mMqttClientAdapterService = __decorate([
|
|
475
|
-
(0, common_1.Injectable)()
|
|
225
|
+
(0, common_1.Injectable)(),
|
|
226
|
+
__metadata("design:paramtypes", [])
|
|
476
227
|
], Z2mMqttClientAdapterService);
|
|
477
228
|
//# sourceMappingURL=mqtt-client-adapter.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mqtt-client-adapter.service.js","sourceRoot":"","sources":["../../../../src/plugins/devices-zigbee2mqtt/services/mqtt-client-adapter.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"mqtt-client-adapter.service.js","sourceRoot":"","sources":["../../../../src/plugins/devices-zigbee2mqtt/services/mqtt-client-adapter.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,22 +84,6 @@ exports.CHANNEL_VIRTUAL_PROPERTIES = [
|
|
|
84
84
|
stop: 'STOP',
|
|
85
85
|
},
|
|
86
86
|
},
|
|
87
|
-
{
|
|
88
|
-
property_category: devices_constants_1.PropertyCategory.MODE,
|
|
89
|
-
virtual_type: VirtualPropertyType.STATIC,
|
|
90
|
-
data_type: devices_constants_1.DataTypeType.ENUM,
|
|
91
|
-
permissions: [devices_constants_1.PermissionType.READ_ONLY],
|
|
92
|
-
format: ['position', 'lift_percentage', 'goto_lift_percentage'],
|
|
93
|
-
static_value: 'position',
|
|
94
|
-
},
|
|
95
|
-
{
|
|
96
|
-
property_category: devices_constants_1.PropertyCategory.TILT,
|
|
97
|
-
virtual_type: VirtualPropertyType.STATIC,
|
|
98
|
-
data_type: devices_constants_1.DataTypeType.ENUM,
|
|
99
|
-
permissions: [devices_constants_1.PermissionType.READ_ONLY],
|
|
100
|
-
format: ['tilt', 'tilt_percentage'],
|
|
101
|
-
static_value: 'tilt',
|
|
102
|
-
},
|
|
103
87
|
],
|
|
104
88
|
},
|
|
105
89
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"virtual-property.types.js","sourceRoot":"","sources":["../../../../src/plugins/devices-zigbee2mqtt/services/virtual-property.types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"virtual-property.types.js","sourceRoot":"","sources":["../../../../src/plugins/devices-zigbee2mqtt/services/virtual-property.types.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { Z2mSetPayload, Z2mWsConfig } from '../interfaces/zigbee2mqtt.interface';
|
|
2
|
+
import { Z2mBaseClientAdapter } from './base-client-adapter';
|
|
3
|
+
export declare class Z2mWsClientAdapterService extends Z2mBaseClientAdapter {
|
|
4
|
+
private ws;
|
|
5
|
+
private config;
|
|
6
|
+
constructor();
|
|
7
|
+
connect(config: Z2mWsConfig): Promise<void>;
|
|
8
|
+
disconnect(): Promise<void>;
|
|
9
|
+
publishCommand(friendlyName: string, payload: Z2mSetPayload): Promise<boolean>;
|
|
10
|
+
requestState(friendlyName: string, properties?: string[]): Promise<boolean>;
|
|
11
|
+
private buildWsUrl;
|
|
12
|
+
private handleWsMessage;
|
|
13
|
+
private scheduleReconnect;
|
|
14
|
+
}
|
|
@@ -0,0 +1,199 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.Z2mWsClientAdapterService = void 0;
|
|
16
|
+
const ws_1 = __importDefault(require("ws"));
|
|
17
|
+
const common_1 = require("@nestjs/common");
|
|
18
|
+
const base_client_adapter_1 = require("./base-client-adapter");
|
|
19
|
+
let Z2mWsClientAdapterService = class Z2mWsClientAdapterService extends base_client_adapter_1.Z2mBaseClientAdapter {
|
|
20
|
+
constructor() {
|
|
21
|
+
super('WsClientAdapter');
|
|
22
|
+
this.ws = null;
|
|
23
|
+
this.config = null;
|
|
24
|
+
}
|
|
25
|
+
async connect(config) {
|
|
26
|
+
this.configBaseTopic = config.baseTopic;
|
|
27
|
+
this.clearReconnectTimer();
|
|
28
|
+
await this.disconnect();
|
|
29
|
+
this.config = config;
|
|
30
|
+
const wsUrl = this.buildWsUrl(config);
|
|
31
|
+
this.logger.log(`Connecting to Zigbee2MQTT WebSocket: ${wsUrl}`);
|
|
32
|
+
return new Promise((resolve, reject) => {
|
|
33
|
+
let settled = false;
|
|
34
|
+
try {
|
|
35
|
+
const timeoutId = setTimeout(() => {
|
|
36
|
+
if (!settled && !this.connected) {
|
|
37
|
+
settled = true;
|
|
38
|
+
this.logger.error('WebSocket connection timed out');
|
|
39
|
+
this.ws?.terminate();
|
|
40
|
+
this.ws = null;
|
|
41
|
+
reject(new Error('WebSocket connection timed out'));
|
|
42
|
+
}
|
|
43
|
+
}, config.connectTimeout);
|
|
44
|
+
this.ws = new ws_1.default(wsUrl);
|
|
45
|
+
this.ws.on('open', () => {
|
|
46
|
+
clearTimeout(timeoutId);
|
|
47
|
+
settled = true;
|
|
48
|
+
this.logger.log('Connected to Zigbee2MQTT WebSocket');
|
|
49
|
+
this.connected = true;
|
|
50
|
+
resolve();
|
|
51
|
+
});
|
|
52
|
+
this.ws.on('error', (error) => {
|
|
53
|
+
clearTimeout(timeoutId);
|
|
54
|
+
this.logger.error('WebSocket client error', {
|
|
55
|
+
message: error.message,
|
|
56
|
+
});
|
|
57
|
+
if (!settled && !this.connected) {
|
|
58
|
+
settled = true;
|
|
59
|
+
reject(error);
|
|
60
|
+
}
|
|
61
|
+
});
|
|
62
|
+
this.ws.on('close', () => {
|
|
63
|
+
clearTimeout(timeoutId);
|
|
64
|
+
const wasConnected = this.connected;
|
|
65
|
+
this.connected = false;
|
|
66
|
+
this.bridgeOnline = false;
|
|
67
|
+
this.ws = null;
|
|
68
|
+
this.logger.log('Disconnected from Zigbee2MQTT WebSocket');
|
|
69
|
+
if (wasConnected) {
|
|
70
|
+
this.scheduleReconnect();
|
|
71
|
+
}
|
|
72
|
+
});
|
|
73
|
+
this.ws.on('message', (data) => {
|
|
74
|
+
this.handleWsMessage(data);
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
catch (error) {
|
|
78
|
+
this.logger.error('Failed to create WebSocket client', {
|
|
79
|
+
message: error instanceof Error ? error.message : String(error),
|
|
80
|
+
});
|
|
81
|
+
reject(error instanceof Error ? error : new Error(String(error)));
|
|
82
|
+
}
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
async disconnect() {
|
|
86
|
+
this.clearReconnectTimer();
|
|
87
|
+
this.connected = false;
|
|
88
|
+
this.bridgeOnline = false;
|
|
89
|
+
this.config = null;
|
|
90
|
+
if (this.ws) {
|
|
91
|
+
this.logger.log('Disconnecting from Zigbee2MQTT WebSocket');
|
|
92
|
+
await new Promise((resolve) => {
|
|
93
|
+
if (!this.ws) {
|
|
94
|
+
resolve();
|
|
95
|
+
return;
|
|
96
|
+
}
|
|
97
|
+
const closingWs = this.ws;
|
|
98
|
+
closingWs.removeAllListeners();
|
|
99
|
+
const forceCloseTimer = setTimeout(() => {
|
|
100
|
+
closingWs.terminate();
|
|
101
|
+
if (this.ws === closingWs) {
|
|
102
|
+
this.ws = null;
|
|
103
|
+
}
|
|
104
|
+
resolve();
|
|
105
|
+
}, 2000);
|
|
106
|
+
closingWs.on('close', () => {
|
|
107
|
+
clearTimeout(forceCloseTimer);
|
|
108
|
+
if (this.ws === closingWs) {
|
|
109
|
+
this.ws = null;
|
|
110
|
+
}
|
|
111
|
+
resolve();
|
|
112
|
+
});
|
|
113
|
+
closingWs.close();
|
|
114
|
+
});
|
|
115
|
+
}
|
|
116
|
+
this.resetState();
|
|
117
|
+
}
|
|
118
|
+
async publishCommand(friendlyName, payload) {
|
|
119
|
+
if (!this.ws || !this.connected) {
|
|
120
|
+
this.logger.warn('Cannot publish: not connected to Zigbee2MQTT WebSocket');
|
|
121
|
+
return false;
|
|
122
|
+
}
|
|
123
|
+
const topic = `${friendlyName}/set`;
|
|
124
|
+
const message = { topic, payload };
|
|
125
|
+
this.logger.debug(`Sending WS command to ${topic}: ${JSON.stringify(payload)}`);
|
|
126
|
+
return new Promise((resolve) => {
|
|
127
|
+
this.ws?.send(JSON.stringify(message), (error) => {
|
|
128
|
+
if (error) {
|
|
129
|
+
this.logger.error(`Failed to send WS command to ${topic}`, {
|
|
130
|
+
message: error.message,
|
|
131
|
+
});
|
|
132
|
+
resolve(false);
|
|
133
|
+
}
|
|
134
|
+
else {
|
|
135
|
+
resolve(true);
|
|
136
|
+
}
|
|
137
|
+
});
|
|
138
|
+
});
|
|
139
|
+
}
|
|
140
|
+
async requestState(friendlyName, properties = []) {
|
|
141
|
+
if (!this.ws || !this.connected) {
|
|
142
|
+
return false;
|
|
143
|
+
}
|
|
144
|
+
const topic = `${friendlyName}/get`;
|
|
145
|
+
const payload = properties.length > 0 ? Object.fromEntries(properties.map((p) => [p, ''])) : { state: '' };
|
|
146
|
+
const message = { topic, payload };
|
|
147
|
+
return new Promise((resolve) => {
|
|
148
|
+
this.ws?.send(JSON.stringify(message), (error) => {
|
|
149
|
+
resolve(!error);
|
|
150
|
+
});
|
|
151
|
+
});
|
|
152
|
+
}
|
|
153
|
+
buildWsUrl(config) {
|
|
154
|
+
const protocol = config.secure ? 'wss' : 'ws';
|
|
155
|
+
return `${protocol}://${config.host}:${config.port}/api`;
|
|
156
|
+
}
|
|
157
|
+
handleWsMessage(data) {
|
|
158
|
+
try {
|
|
159
|
+
const raw = typeof data === 'string' ? data : Buffer.from(data).toString('utf-8');
|
|
160
|
+
const wsMessage = JSON.parse(raw);
|
|
161
|
+
if (!wsMessage.topic) {
|
|
162
|
+
this.logger.debug('Received WS message without topic, ignoring');
|
|
163
|
+
return;
|
|
164
|
+
}
|
|
165
|
+
const payloadStr = typeof wsMessage.payload === 'string' ? wsMessage.payload : JSON.stringify(wsMessage.payload);
|
|
166
|
+
this.handleMessage(wsMessage.topic, payloadStr, true);
|
|
167
|
+
}
|
|
168
|
+
catch (error) {
|
|
169
|
+
this.logger.warn('Failed to parse WebSocket message', {
|
|
170
|
+
message: error instanceof Error ? error.message : String(error),
|
|
171
|
+
});
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
scheduleReconnect() {
|
|
175
|
+
if (this.reconnectTimer || !this.config) {
|
|
176
|
+
return;
|
|
177
|
+
}
|
|
178
|
+
const interval = this.config.reconnectInterval;
|
|
179
|
+
this.logger.log(`Scheduling WebSocket reconnection in ${interval}ms`);
|
|
180
|
+
this.reconnectTimer = setTimeout(() => {
|
|
181
|
+
this.reconnectTimer = null;
|
|
182
|
+
if (!this.connected && this.config) {
|
|
183
|
+
this.connect(this.config).catch((error) => {
|
|
184
|
+
const errorMessage = error instanceof Error ? error.message : JSON.stringify(error);
|
|
185
|
+
this.logger.error('WebSocket reconnection failed', {
|
|
186
|
+
message: errorMessage,
|
|
187
|
+
});
|
|
188
|
+
this.scheduleReconnect();
|
|
189
|
+
});
|
|
190
|
+
}
|
|
191
|
+
}, interval);
|
|
192
|
+
}
|
|
193
|
+
};
|
|
194
|
+
exports.Z2mWsClientAdapterService = Z2mWsClientAdapterService;
|
|
195
|
+
exports.Z2mWsClientAdapterService = Z2mWsClientAdapterService = __decorate([
|
|
196
|
+
(0, common_1.Injectable)(),
|
|
197
|
+
__metadata("design:paramtypes", [])
|
|
198
|
+
], Z2mWsClientAdapterService);
|
|
199
|
+
//# sourceMappingURL=ws-client-adapter.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ws-client-adapter.service.js","sourceRoot":"","sources":["../../../../src/plugins/devices-zigbee2mqtt/services/ws-client-adapter.service.ts"],"names":[],"mappings":"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"}
|