wn/dispatcher_ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2018-01-03 21:31:14 +01:00
parent 1aadc7562e
commit ccf5bf8831
1 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/mqttHandler.js
View File

@ -27,28 +27,39 @@ function start() {
client.on('message', (topic, payload) => {
payload = payload.toString('UTF-8');
logger.info(`message received on topic ${topic}: ${payload}`);
//if (topic in topicCallbacks) {
// topicCallbacks[topic].forEach((cb) => { cb(topic, payload) });
//}
Object.keys(topicCallbacks).forEach((subscribedTopic) => {
// logger.warn(`Test: ${subscribedTopic}, ${topic}`);
// console.log(`Test: ${subscribedTopic}, ${topic}`);
if (subscribedTopic == topic) {
// logger.warn('1');
topicCallbacks[topic].forEach((cb) => { cb(topic, payload) });
} else if (subscribedTopic.endsWith('#') &&
(subscribedTopic.substring(0, subscribedTopic.length-1) ==
topic.substring(0, subscribedTopic.length-1))) {
// logger.warn('2');
// console.log('2');
topicCallbacks[subscribedTopic].forEach((cb) => { cb(topic, payload) });
}
});
processMessage(topic, payload);
});
}
function send(topic, payload) {
client.publish(topic, payload);
function processMessage(topic, payload) {
let found = false;
Object.keys(topicCallbacks).forEach((subscribedTopic) => {
// logger.warn(`Test: ${subscribedTopic}, ${topic}`);
// console.log(`Test: ${subscribedTopic}, ${topic}`);
if (subscribedTopic == topic) {
// logger.warn('1');
topicCallbacks[topic].forEach((cb) => { cb(topic, payload) });
found = true;
} else if (subscribedTopic.endsWith('#') &&
(subscribedTopic.substring(0, subscribedTopic.length-1) ==
topic.substring(0, subscribedTopic.length-1))) {
// logger.warn('2');
// console.log('2');
topicCallbacks[subscribedTopic].forEach((cb) => { cb(topic, payload) });
found = false;
}
});
return found;
}
function send(topic, payload, internalFirst = false) {
let sent = false;
if (internalFirst) {
sent = processMessage(topic, payload);
}
if (! sent) {
client.publish(topic, payload);
}
}
function register(topics, cb) {