mirror of
https://github.com/eliasstepanik/strudel-docker.git
synced 2026-01-11 13:48:34 +00:00
mqtt bugfix - connection check (#1282)
This commit is contained in:
parent
cda79f3e5c
commit
cf8203a4db
@ -38,15 +38,10 @@ Pattern.prototype.mqtt = function (
|
|||||||
add_meta = true,
|
add_meta = true,
|
||||||
) {
|
) {
|
||||||
const key = host + '-' + client;
|
const key = host + '-' + client;
|
||||||
let connected = false;
|
|
||||||
let password_entered = false;
|
let password_entered = false;
|
||||||
|
|
||||||
if (!client) {
|
|
||||||
client = 'strudel-' + String(Math.floor(Math.random() * 1000000));
|
|
||||||
}
|
|
||||||
function onConnect() {
|
function onConnect() {
|
||||||
console.log('Connected to mqtt broker');
|
console.log('Connected to mqtt broker');
|
||||||
connected = true;
|
|
||||||
if (password_entered) {
|
if (password_entered) {
|
||||||
document.cookie = 'mqtt_pass=' + password;
|
document.cookie = 'mqtt_pass=' + password;
|
||||||
}
|
}
|
||||||
@ -56,6 +51,9 @@ Pattern.prototype.mqtt = function (
|
|||||||
if (connections[key]) {
|
if (connections[key]) {
|
||||||
cx = connections[key];
|
cx = connections[key];
|
||||||
} else {
|
} else {
|
||||||
|
if (!client) {
|
||||||
|
client = 'strudel-' + String(Math.floor(Math.random() * 1000000));
|
||||||
|
}
|
||||||
cx = new Paho.Client(host, client);
|
cx = new Paho.Client(host, client);
|
||||||
connections[key] = cx;
|
connections[key] = cx;
|
||||||
cx.onConnectionLost = onConnectionLost;
|
cx.onConnectionLost = onConnectionLost;
|
||||||
@ -86,7 +84,7 @@ Pattern.prototype.mqtt = function (
|
|||||||
return this.withHap((hap) => {
|
return this.withHap((hap) => {
|
||||||
const onTrigger = (t_deprecate, hap, currentTime, cps, targetTime) => {
|
const onTrigger = (t_deprecate, hap, currentTime, cps, targetTime) => {
|
||||||
let msg_topic = topic;
|
let msg_topic = topic;
|
||||||
if (!connected) {
|
if (!cx || !cx.isConnected()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let message = '';
|
let message = '';
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user