FHEM/mod-GardenaSmart
1
0
Fork 0
Code Issues 2 Pull Requests Releases 3 Wiki Activity

Merge pull request 'patch-connect_problems' (#35) from patch-connect_problems into devel

Browse Source 
Reviewed-on: #35
Reviewed-by: Marko Oldenburg <marko@noreply@cooltux.net>
This commit is contained in:
Sebastian Schwaz 2021-06-28 18:39:21 +02:00
commit b49d7f643b
2 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
FHEM/73_GardenaSmartBridge.pm
View File

@ -366,6 +366,7 @@ sub Notify {
@{$events} @{$events}
) )
) )
&& $init_done
); );
getDevices($hash) getDevices($hash)
@ -385,7 +386,7 @@ sub Notify {
&& ( && (
grep /^state:.Connected$/, grep /^state:.Connected$/,
@{$events} or grep /^lastRequestState:.request_error$/, @{$events} or grep /^lastRequestState:.request_error$/,
@{$events} @{$events}
) )
) )
{ {
@ -483,6 +484,7 @@ sub Write {
{ {
url => $hash->{URL} . $uri, url => $hash->{URL} . $uri,
timeout => 15, timeout => 15,
incrementalTimeout => 1,
hash => $hash, hash => $hash,
device_id => $deviceId, device_id => $deviceId,
data => $payload, data => $payload,
@ -519,8 +521,8 @@ sub ErrorHandling {
my $dname = $dhash->{NAME}; my $dname = $dhash->{NAME};
Log3 $name, 4, "GardenaSmartBridge ($name) - Request: $data"; Log3 $name, 4, "GardenaSmartBridge ($name) - Request: $data";
my $decode_json = eval { decode_json($data) }; my $decode_json = eval { decode_json($data) } if ( length($data) > 0 );
if ($@) { if ($@) {
Log3 $name, 3, "GardenaSmartBridge ($name) - JSON error while request"; Log3 $name, 3, "GardenaSmartBridge ($name) - JSON error while request";
} }
@ -981,7 +983,6 @@ sub getDevices {
my $hash = shift; my $hash = shift;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
RemoveInternalTimer($hash); RemoveInternalTimer($hash);
if ( not IsDisabled($name) ) { if ( not IsDisabled($name) ) {
@ -992,12 +993,17 @@ sub getDevices {
for my $gardenaDev (@list){ for my $gardenaDev (@list){
push( @{ $hash->{helper}{deviceList} }, $gardenaDev ); push( @{ $hash->{helper}{deviceList} }, $gardenaDev );
} }
Write( $hash, undef, undef, undef ); if ( AttrVal( $name, 'gardenaAccountEmail', 'none' ) ne 'none'
Log3 $name, 4, && (
"GardenaSmartBridge ($name) - fetch device list and device states"; defined( ReadPassword( $hash, $name ) )
))
{
Write( $hash, undef, undef, undef );
Log3 $name, 4,
"GardenaSmartBridge ($name) - fetch device list and device states";
} # fi gardenaAccountEmail
} }
else { else {
readingsSingleUpdate( $hash, 'state', 'disabled', 1 ); readingsSingleUpdate( $hash, 'state', 'disabled', 1 );
Log3 $name, 3, "GardenaSmartBridge ($name) - device is disabled"; Log3 $name, 3, "GardenaSmartBridge ($name) - device is disabled";
} }
@ -1027,16 +1033,6 @@ sub getToken {
if ( defined( $hash->{helper}{locations_id} ) if ( defined( $hash->{helper}{locations_id} )
&& $hash->{helper}{locations_id} ); && $hash->{helper}{locations_id} );
# Write(
# $hash,
# '"sessions": {"email": "'
# . AttrVal( $name, 'gardenaAccountEmail', 'none' )
# . '","password": "'
# . ReadPassword( $hash, $name ) . '"}',
# undef,
# undef
# );
Write( Write(
$hash, $hash,
'"data": {"type":"token", "attributes":{"username": "' '"data": {"type":"token", "attributes":{"username": "'
@ -1047,8 +1043,9 @@ sub getToken {
undef undef
); );
Log3 $name, 4, '"data": {"type":"token", "attributes":{"username": "' . AttrVal( $name, 'gardenaAccountEmail', 'none' ) . '","password": "' Log3 $name, 4, '"data": {"type":"token", "attributes":{"username": "'
. ReadPassword( $hash, $name ) . '", "client_id":"smartgarden-jwt-client"}}'; .AttrVal( $name, 'gardenaAccountEmail', 'none' ) . '","password": "'
.ReadPassword( $hash, $name ) . '", "client_id":"smartgarden-jwt-client"}}';
Log3 $name, 3, Log3 $name, 3,
"GardenaSmartBridge ($name) - send credentials to fetch Token and locationId"; "GardenaSmartBridge ($name) - send credentials to fetch Token and locationId";
@ -1214,13 +1211,14 @@ sub createHttpValueStrings {
$payload = '{}' if ( !defined($payload) ); $payload = '{}' if ( !defined($payload) );
if ( $payload eq '{}' ) { if ( $payload eq '{}' ) {
$method = 'GET'; $method = 'GET' if (defined( $hash->{helper}{session_id} ) );
$payload = ''; $payload = '';
$uri .= '/locations?locatioId=null&user_id=' . $hash->{helper}{user_id} $uri .= '/locations?locatioId=null&user_id=' . $hash->{helper}{user_id}
if ( exists( $hash->{helper}{user_id} ) if ( exists( $hash->{helper}{user_id} )
&& !defined( $hash->{helper}{locations_id} ) ); && !defined( $hash->{helper}{locations_id} ) );
readingsSingleUpdate( $hash, 'state', 'fetch locationId', 1 ) readingsSingleUpdate( $hash, 'state', 'fetch locationId', 1 )
if ( !defined( $hash->{helper}{locations_id} ) ); if ( exists( $hash->{helper}{user_id} )
&& !defined( $hash->{helper}{locations_id} ) );
$uri .= '/devices' $uri .= '/devices'
if (!defined($abilities) if (!defined($abilities)
&& defined( $hash->{helper}{locations_id} ) ); && defined( $hash->{helper}{locations_id} ) );
@ -1228,6 +1226,7 @@ sub createHttpValueStrings {
$uri = '/devices/'.InternalVal($hash->{helper}{debug_device}, 'DEVICEID', 0 ) if ( exists ($hash->{helper}{debug_device})); $uri = '/devices/'.InternalVal($hash->{helper}{debug_device}, 'DEVICEID', 0 ) if ( exists ($hash->{helper}{debug_device}));
$uri = '/auth/token' if ( !defined( $hash->{helper}{session_id} ) ); $uri = '/auth/token' if ( !defined( $hash->{helper}{session_id} ) );
if ( defined( $hash->{helper}{locations_id} ) ) { if ( defined( $hash->{helper}{locations_id} ) ) {
if ( defined($abilities) && $abilities =~ /.*_settings/ ) { if ( defined($abilities) && $abilities =~ /.*_settings/ ) {
@ -1488,7 +1487,7 @@ sub DeletePassword {
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v2.4.2", "version": "v2.4.4",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],

4
controls_GardenaSmartDevice.txt
View File

@ -1,2 +1,2 @@
UPD 2021-06-05_18:47:30 46871 FHEM/73_GardenaSmartBridge.pm UPD 2021-06-28_10:47:43 47009 FHEM/73_GardenaSmartBridge.pm
UPD 2021-06-05_09:32:03 55505 FHEM/74_GardenaSmartDevice.pm UPD 2021-06-09_09:52:26 55505 FHEM/74_GardenaSmartDevice.pm