byterazor/FHEM-NTFY
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: reconnect on websocket disconnect
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
FIXES: #53
This commit is contained in:
Dominik Meyer 2024-11-24 19:57:03 +01:00
parent 88823ef727
commit 1d98399d09
Signed by: byterazor
GPG Key ID: EABDA0FD5981BC97
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
FHEM/98_NTFY_TOPIC.pm
View File

@ -80,7 +80,6 @@ sub NTFY_TOPIC_Initialize
$hash->{WriteFn} = 'NTFY_TOPIC_Write'; $hash->{WriteFn} = 'NTFY_TOPIC_Write';
$hash->{AttrFn} = 'NTFY_TOPIC_Attr'; $hash->{AttrFn} = 'NTFY_TOPIC_Attr';
$hash->{AttrList} = $readingFnAttributes; $hash->{AttrList} = $readingFnAttributes;
$hash->{MatchList} = {"1:NTFY_CLIENT" => "^NTFY:.*"}; $hash->{MatchList} = {"1:NTFY_CLIENT" => "^NTFY:.*"};
} }
@ -122,6 +121,7 @@ sub NTFY_TOPIC_Define
$hash->{Clients} = "NTFY_CLIENT"; $hash->{Clients} = "NTFY_CLIENT";
$hash->{ClientsKeepOrder} = 1; $hash->{ClientsKeepOrder} = 1;
$hash->{STATE} = "unknown"; $hash->{STATE} = "unknown";
$hash->{nextOpenDelay} = 20;
$modules{NTFY_TOPIC}{defptr}{$hash->{SERVER} . "_" . $hash->{TOPIC}} = $hash; $modules{NTFY_TOPIC}{defptr}{$hash->{SERVER} . "_" . $hash->{TOPIC}} = $hash;
$attr{$hash->{NAME}}{room} = 'hidden'; $attr{$hash->{NAME}}{room} = 'hidden';
@ -207,9 +207,17 @@ sub NTFY_WS_CB
sub NTFY_TOPIC_Read sub NTFY_TOPIC_Read
{ {
my ( $hash ) = @_; my ( $hash ) = @_;
my $buf = DevIo_SimpleRead($hash); my $buf = DevIo_SimpleRead($hash);
if (!$buf)
{
NTFY_TOPIC_LOG(LOG_ERROR, "websocket disconnected");
InternalTimer(gettimeofday()+30, "NTFY_TOPIC_Reconnect", $hash);
return;
}
return unless length($buf) > 0; return unless length($buf) > 0;
my $msg = from_json($buf); my $msg = from_json($buf);
@ -226,4 +234,15 @@ sub NTFY_TOPIC_Read
Dispatch($hash,"NTFY:" . $hash->{SERVER}. "---" . $buf,{},1); Dispatch($hash,"NTFY:" . $hash->{SERVER}. "---" . $buf,{},1);
} }
sub NTFY_TOPIC_Reconnect
{
my $hash = shift;
if (!DevIo_IsOpen($hash))
{
NTFY_TOPIC_LOG(LOG_ERROR, "reconnecting websocket");
DevIo_OpenDev( $hash, 1, "NTFY_WS_Handshake", "NTFY_WS_CB" );
}
}
1; 1;