some js files

This commit is contained in:
Wolfgang Hottgenroth
2018-04-02 20:29:45 +02:00
parent dfc4a04df0
commit f444cb13e3
3 changed files with 5 additions and 6 deletions

3
dist/AItem.js vendored
View File

@ -1,6 +1,5 @@
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
const logger = require("./log");
const MqttDispatcher_1 = require("./MqttDispatcher"); const MqttDispatcher_1 = require("./MqttDispatcher");
class AItem { class AItem {
constructor(floor, room, item, label = '') { constructor(floor, room, item, label = '') {
@ -21,7 +20,7 @@ class AItem {
} }
start() { start() {
MqttDispatcher_1.mqttHandler.register(this.subscribeTopics, (topic, payload) => { MqttDispatcher_1.mqttHandler.register(this.subscribeTopics, (topic, payload) => {
logger.info(`item ${this.itemId}: ${topic}, ${payload}`); // logger.info(`item ${this.itemId}: ${topic}, ${payload}`)
this.processMessage(topic, payload); this.processMessage(topic, payload);
}); });
} }

View File

@ -43,7 +43,7 @@ class MqttHandler {
this.mqttClient.on('message', (topic, payload, packet) => { this.mqttClient.on('message', (topic, payload, packet) => {
if (!packet.retain) { if (!packet.retain) {
let payloadStr = payload.toString('UTF-8'); let payloadStr = payload.toString('UTF-8');
logger.info(`Message received on topic ${topic}: ${payload}`); // logger.info(`Message received on topic ${topic}: ${payload}`)
this.processMessage(topic, payloadStr); this.processMessage(topic, payloadStr);
} }
}); });

6
dist/RelayBox.js vendored
View File

@ -21,7 +21,7 @@ class RelayBoxThing extends AItem_1.AItem {
processMessage(topic, payload) { processMessage(topic, payload) {
// logger.info(`RT: ${topic}, ${payload}`) // logger.info(`RT: ${topic}, ${payload}`)
if (topic == this.deviceStatusTopic) { if (topic == this.deviceStatusTopic) {
logger.info(`RT: status received`); // logger.info(`RT: status received`)
this.status = JSON.parse(payload); this.status = JSON.parse(payload);
let statusParsed = JSON.stringify(this.status); let statusParsed = JSON.stringify(this.status);
this.switchStates = JSON.stringify(this.status.data.switchStates); this.switchStates = JSON.stringify(this.status.data.switchStates);
@ -32,10 +32,10 @@ class RelayBoxThing extends AItem_1.AItem {
logger.info(`RT: uptime: ${this.status.data.uptime}`); logger.info(`RT: uptime: ${this.status.data.uptime}`);
for (let i = 0; i < this.itemNames.length; i++) { for (let i = 0; i < this.itemNames.length; i++) {
if (this.status.data.switchStates[i].feedbackState == '0') { if (this.status.data.switchStates[i].feedbackState == '0') {
MqttDispatcher_1.mqttHandler.send(`${this.feedbackTopicPre}/${i}`, 'ON'); MqttDispatcher_1.mqttHandler.send(`${this.feedbackTopicPre}/${i}`, 'OFF');
} }
else { else {
MqttDispatcher_1.mqttHandler.send(`${this.feedbackTopicPre}/${i}`, 'OFF'); MqttDispatcher_1.mqttHandler.send(`${this.feedbackTopicPre}/${i}`, 'ON');
} }
if (this.status.data.switchStates[i].stateConflict == '0') { if (this.status.data.switchStates[i].stateConflict == '0') {
MqttDispatcher_1.mqttHandler.send(`${this.conflictTopicPre}/${i}`, 'CLEAR'); MqttDispatcher_1.mqttHandler.send(`${this.conflictTopicPre}/${i}`, 'CLEAR');