Update mqttExtension.js

Change data description used from "message" to MQTT standard "payload"
snap8
Simon Walters 2022-04-02 14:52:19 +01:00 zatwierdzone przez GitHub
rodzic 8aec222aef
commit a5ecb565d7
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 10 dodań i 6 usunięć

Wyświetl plik

@ -4,6 +4,7 @@
* Modified by Simon Walters
* and converted into an extension
* November 2021
* V1.1 - change back to using standard naming e.g payload not message
*/
@ -68,6 +69,8 @@ SnapExtensions.primitives.set(
wsbroker = wsbroker + ':8084'
} else if (wsbroker == 'ws://simplesi.cloud') {
wsbroker = wsbroker + ':8083'
} else if (wsbroker == 'ws://localhost') {
wsbroker = wsbroker + ':9001'
}
//log(wsbroker)
try {
@ -110,8 +113,8 @@ SnapExtensions.primitives.set(
SnapExtensions.primitives.set(
'mqt_pub(broker,topic,message,options)',
function (broker,topic,message,options) {
'mqt_pub(broker,topic,payload,options)',
function (broker,topic,payload,options) {
/* original code from github.com/pixavier/mqtt4snap */
/* adapted into extension by cymplecy 26Nov21 */
/* modified 5 Sep2021 by cymplecy to add parameters for qos and retain flag */
@ -122,7 +125,7 @@ SnapExtensions.primitives.set(
broker = broker ? broker.trim() : broker;
topic = topic ? topic.trim() : topic;
//payload not trimmed as might have real leading/trailing spaces
console.log(options)
//console.log(options)
options = JSON.parse(options);
const opts = {};
if (options['qos']) {
@ -150,10 +153,10 @@ SnapExtensions.primitives.set(
try{
let client = stage.mqtt[broker];
client.publish(topic, '' + message, opts);
console.log(opts)
client.publish(topic, '' + payload, opts);
//console.log(opts)
} catch(e) {
log('Failed to publish message ' + message);
log('Failed to publish payload ' + payload);
// console.log(e);
throw e;
}
@ -293,3 +296,4 @@ SnapExtensions.primitives.set(
}
}
)