From 03b2130625ba46f67d1d2782e4cc029ca5d9b157 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 21 May 2024 10:29:07 +0200 Subject: [PATCH 1/6] fix: api call,rate limit --- FHEM/73_GardenaSmartBridge.pm | 33 ++++++++++++++++++++++++++------- controls_GardenaSmartDevice.txt | 4 ++-- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/FHEM/73_GardenaSmartBridge.pm b/FHEM/73_GardenaSmartBridge.pm index 524578e..ba44fe7 100644 --- a/FHEM/73_GardenaSmartBridge.pm +++ b/FHEM/73_GardenaSmartBridge.pm @@ -264,6 +264,8 @@ sub Attr { if ( $cmd eq 'set' && $attrVal eq '1' ) { RemoveInternalTimer( $hash, "FHEM::GardenaSmartBridge::getDevices" ); + RemoveInternalTimer( $hash, + "FHEM::GardenaSmartBridge::getToken" ); readingsSingleUpdate( $hash, 'state', 'inactive', 1 ); Log3 $name, 3, "GardenaSmartBridge ($name) - disabled"; } @@ -691,6 +693,20 @@ sub ErrorHandling { "GardenaSmartBridge ($dname) - RequestERROR: check the ???"; } + elsif ( $decode_json->{errors}[0]{code} eq "ratelimit.exceeded" ) { + Log3 $dname, 5, + "GardenaSmartBridge ($dname) - RequestERROR: error ratelimit.exceeded"; + readingsBulkUpdate( $dhash, "lastRequestState", "too many requests", 1 ); + readingsBulkUpdate( $dhash, "state", "inactive", 1 ); + # remove all timer and disable bridge + readingsBulkUpdate( $dhash, "disable", "1", 1 ); +# AttrVal( $name, 'disable', '1'); + RemoveInternalTimer( $dhash, "FHEM::GardenaSmartBridge::getDevices" ); + RemoveInternalTimer( $dhash, "FHEM::GardenaSmartBridge::getToken" ); + + + return; # post request max. + } else { Log3 $dname, 5, @@ -1176,21 +1192,21 @@ sub getToken { Write( $hash, - '"data": {"type":"token", "attributes":{"username": "' + '"data":{"type":"token","attributes":{"username":"' . AttrVal( $name, 'gardenaAccountEmail', 'none' ) - . '","password": "' + . '","password":"' . ReadPassword( $hash, $name ) - . '", "client_id":"smartgarden-jwt-client"}}', + . '","client_id":"smartgarden-jwt-client"}}', undef, undef ); Log3 $name, 4, - '"data": {"type":"token", "attributes":{"username": "' + '"data": {"type":"token", "attributes":{"username":"' . AttrVal( $name, 'gardenaAccountEmail', 'none' ) - . '","password": "' + . '","password":"' . ReadPassword( $hash, $name ) - . '", "client_id":"smartgarden-jwt-client"}}'; + . '","client_id":"smartgarden-jwt-client"}}'; Log3 $name, 3, "GardenaSmartBridge ($name) - send credentials to fetch Token and locationId"; @@ -1289,7 +1305,10 @@ sub createHttpValueStrings { my ( $hash, $payload, $deviceId, $abilities, $service_id ) = @_; my $session_id = $hash->{helper}{session_id}; - my $header = "Content-Type: application/json"; + my $header = 'Content-Type: application/json'; + $header .= "\r\norigin: https://smart.gardena.com"; + + #my $header = "Content-Type: application/json; origin: https://smart.gardena.com"; my $uri = ''; my $method = 'POST'; $header .= "\r\nAuthorization: Bearer $session_id" diff --git a/controls_GardenaSmartDevice.txt b/controls_GardenaSmartDevice.txt index b3411e5..340df72 100644 --- a/controls_GardenaSmartDevice.txt +++ b/controls_GardenaSmartDevice.txt @@ -1,2 +1,2 @@ -UPD 2024-04-15_15:52:28 49971 FHEM/73_GardenaSmartBridge.pm -UPD 2024-04-15_15:52:28 127762 FHEM/74_GardenaSmartDevice.pm +UPD 2024-05-21_10:28:45 50909 FHEM/73_GardenaSmartBridge.pm +UPD 2024-05-21_09:01:54 127762 FHEM/74_GardenaSmartDevice.pm -- 2.47.2 From 517f033ccc3ecd07e9fb821c1387bcabeaae41d2 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 21 May 2024 10:31:30 +0200 Subject: [PATCH 2/6] fix: api call, login limit, disable --- CHANGELOG.md | 69 ++++++++++++++++++++++++++------- FHEM/73_GardenaSmartBridge.pm | 2 +- controls_GardenaSmartDevice.txt | 2 +- 3 files changed, 57 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af3a1c3..6ef9914 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,35 @@ -### fix: patch code scheduling by hhhdg (HEAD -> patch_valve_hhhdg) +### fix: api call,rate limit (HEAD -> patch_login_autodisable_api) +>Tue, 21 May 2024 10:29:07 +0200 + +>Author: Sebastian (em@ail.tld) + +>Commiter: Sebastian (em@ail.tld) + + + + +### docs: change copyright year +>Mon, 15 Apr 2024 15:45:33 +0200 + +>Author: Marko Oldenburg (fhemdevelopment@cooltux.net) + +>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net) + +Ticket: no + + + +### fix: version push (origin/patch_valve_hhhdg, patch_valve_hhhdg) +>Mon, 15 Apr 2024 09:38:16 +0200 + +>Author: Sebastian (em@ail.tld) + +>Commiter: Sebastian (em@ail.tld) + + + + +### fix: patch code scheduling by hhhdg >Mon, 15 Apr 2024 09:32:51 +0200 >Author: Sebastian (em@ail.tld) @@ -8,6 +39,16 @@ +### docs: new CHANGELOG +>Thu, 28 Mar 2024 12:41:42 +0100 + +>Author: Marko Oldenburg (fhemdevelopment@cooltux.net) + +>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net) + + + + ### controls_GardenaSmartDevice.txt aktualisiert >Thu, 28 Mar 2024 06:05:59 +0100 @@ -188,7 +229,7 @@ -### feat: changelog +### feat: changelog (origin/patch_setExtention, patch_setExtention) >Thu, 2 Mar 2023 11:58:58 +0100 >Author: Sebastian (em@ail.tld) @@ -218,7 +259,7 @@ -### docs: add changelog file (tag: v2.6.0, origin/patch-changeVersion, patch-changeVersion) +### docs: add changelog file (tag: v2.6.0, origin/patch-changeVersion) >Tue, 10 Jan 2023 09:51:23 +0100 >Author: Marko Oldenburg (fhemdevelopment@cooltux.net) @@ -250,7 +291,7 @@ hooks for commit test and create changelog -### [translaten] - add commandref translation +### [translaten] - add commandref translation (origin/patch-fix_commandref_spell, patch-fix_commandref_spell) >Sun, 18 Sep 2022 08:52:43 +0200 >Author: Sebastian (em@ail.tld) @@ -270,7 +311,7 @@ hooks for commit test and create changelog -### [enhancement] - commandref +### [enhancement] - commandref (origin/patch-wc_rest_valve_and_additinal_commandref, patch-wc_rest_valve_and_additinal_commandref) >Tue, 6 Sep 2022 12:32:40 +0200 >Author: Sebastian (em@ail.tld) @@ -320,7 +361,7 @@ hooks for commit test and create changelog -### [fix] - upper/lower case +### [fix] - upper/lower case (origin/patch-offline_status_startup_undefined, patch-offline_status_startup_undefined) >Thu, 11 Aug 2022 14:25:19 +0200 >Author: Sebastian (em@ail.tld) @@ -610,7 +651,7 @@ hooks for commit test and create changelog -### readd lost setter webinterface +### readd lost setter webinterface (origin/patch-dev_merge_failed_electronic_pressure_pump, patch-dev_merge_failed_electronic_pressure_pump) >Wed, 13 Jul 2022 20:56:47 +0200 >Author: Sebastian (em@ail.tld) @@ -631,7 +672,7 @@ hooks for commit test and create changelog -### „FHEM/74_GardenaSmartDevice.pm“ ändern +### „FHEM/74_GardenaSmartDevice.pm“ ändern (origin/patch_electronic_pressure_pump_water_pump_name_mistake) >Tue, 12 Jul 2022 20:09:33 +0200 >Author: Sebastian Schwaz (sebastianschwarz@noreply@cooltux.net) @@ -851,7 +892,7 @@ hooks for commit test and create changelog -### [fix] - setter procedure +### [fix] - setter procedure (origin/patch_pressure_pump_setlist, patch_pressure_pump_setlist) >Wed, 29 Jun 2022 20:32:00 +0200 >Author: Sebastian (em@ail.tld) @@ -1001,7 +1042,7 @@ hooks for commit test and create changelog -### patch lono. eventuell recrusive readings einbauen. waterpump rechtschreibfehler mit fixed +### patch lono. eventuell recrusive readings einbauen. waterpump rechtschreibfehler mit fixed (origin/patch_lona, patch_lona) >Sat, 25 Jun 2022 12:58:59 +0200 >Author: Sebastian (em@ail.tld) @@ -1381,7 +1422,7 @@ hooks for commit test and create changelog -### lona +### lona (origin/patch_waterpump, patch_waterpump) >Tue, 17 May 2022 20:53:37 +0200 >Author: Sebastian (em@ail.tld) @@ -1771,7 +1812,7 @@ hooks for commit test and create changelog -### round minutes in irregation +### round minutes in irregation (origin/patch_water_control) >Tue, 12 Apr 2022 08:40:40 +0200 >Author: Sebastian (em@ail.tld) @@ -1911,7 +1952,7 @@ hooks for commit test and create changelog -### fix state +### fix state (origin/patch_add_sensor2) >Tue, 5 Apr 2022 09:23:34 +0200 >Author: Sebastian (em@ail.tld) @@ -1941,7 +1982,7 @@ hooks for commit test and create changelog -### fix ic24 +### fix ic24 (origin/patch_ic24_schedule) >Tue, 29 Mar 2022 16:35:58 +0200 >Author: Sebastian (em@ail.tld) diff --git a/FHEM/73_GardenaSmartBridge.pm b/FHEM/73_GardenaSmartBridge.pm index ba44fe7..48aa2b8 100644 --- a/FHEM/73_GardenaSmartBridge.pm +++ b/FHEM/73_GardenaSmartBridge.pm @@ -1600,7 +1600,7 @@ sub DeletePassword { ], "release_status": "stable", "license": "GPL_2", - "version": "v2.6.2", + "version": "v2.6.3", "author": [ "Marko Oldenburg " ], diff --git a/controls_GardenaSmartDevice.txt b/controls_GardenaSmartDevice.txt index 340df72..e088120 100644 --- a/controls_GardenaSmartDevice.txt +++ b/controls_GardenaSmartDevice.txt @@ -1,2 +1,2 @@ -UPD 2024-05-21_10:28:45 50909 FHEM/73_GardenaSmartBridge.pm +UPD 2024-05-21_10:31:15 50909 FHEM/73_GardenaSmartBridge.pm UPD 2024-05-21_09:01:54 127762 FHEM/74_GardenaSmartDevice.pm -- 2.47.2 From f38236f721b8e3f6b7dec6cb9ff7ee6913bef07d Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 21 May 2024 22:45:49 +0200 Subject: [PATCH 3/6] fix: intervall 180 sek add useragent --- FHEM/73_GardenaSmartBridge.pm | 12 ++++++------ controls_GardenaSmartDevice.txt | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/FHEM/73_GardenaSmartBridge.pm b/FHEM/73_GardenaSmartBridge.pm index 48aa2b8..0e0ec38 100644 --- a/FHEM/73_GardenaSmartBridge.pm +++ b/FHEM/73_GardenaSmartBridge.pm @@ -221,7 +221,7 @@ sub Define { $hash->{URL} = AttrVal( $name, 'gardenaBaseURL', 'https://smart.gardena.com' ) . '/v1'; $hash->{VERSION} = version->parse($VERSION)->normal; - $hash->{INTERVAL} = 60; + $hash->{INTERVAL} = 180; $hash->{NOTIFYDEV} = "global,$name"; CommandAttr( undef, $name . ' room GardenaSmart' ) @@ -292,14 +292,14 @@ sub Attr { if ( $attrVal == 0 ); RemoveInternalTimer( $hash, "FHEM::GardenaSmartBridge::getDevices" ); - $hash->{INTERVAL} = $attrVal; + $hash->{INTERVAL} = $attrVal if $attrVal >= 180; Log3 $name, 3, "GardenaSmartBridge ($name) - set interval: $attrVal"; } elsif ( $cmd eq 'del' ) { RemoveInternalTimer( $hash, "FHEM::GardenaSmartBridge::getDevices" ); - $hash->{INTERVAL} = 60; + $hash->{INTERVAL} = 180; Log3 $name, 3, "GardenaSmartBridge ($name) - delete User interval and set default: 60"; } @@ -1307,7 +1307,7 @@ sub createHttpValueStrings { my $session_id = $hash->{helper}{session_id}; my $header = 'Content-Type: application/json'; $header .= "\r\norigin: https://smart.gardena.com"; - + $header .= "\r\nuser-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36"; #my $header = "Content-Type: application/json; origin: https://smart.gardena.com"; my $uri = ''; my $method = 'POST'; @@ -1515,7 +1515,7 @@ sub DeletePassword {
  • debugJSON -
  • disable - Disables the Bridge
    • -
  • interval - Interval in seconds (Default=60)
    • +
  • interval - Interval in seconds (Default=180)
  • gardenaAccountEmail - Email Adresse which was used in the GardenaAPP
@@ -1576,7 +1576,7 @@ sub DeletePassword {
  • debugJSON - JSON Fehlermeldungen
  • disable - Schaltet die Datenübertragung der Bridge ab
    • -
  • interval - Abfrageinterval in Sekunden (default: 60)
    • +
  • interval - Abfrageinterval in Sekunden (default: 180)
  • gardenaAccountEmail - Email Adresse, die auch in der GardenaApp verwendet wurde
diff --git a/controls_GardenaSmartDevice.txt b/controls_GardenaSmartDevice.txt index e088120..800dd56 100644 --- a/controls_GardenaSmartDevice.txt +++ b/controls_GardenaSmartDevice.txt @@ -1,2 +1,2 @@ -UPD 2024-05-21_10:31:15 50909 FHEM/73_GardenaSmartBridge.pm +UPD 2024-05-21_22:04:23 51083 FHEM/73_GardenaSmartBridge.pm UPD 2024-05-21_09:01:54 127762 FHEM/74_GardenaSmartDevice.pm -- 2.47.2 From 640a7544d70f9131841ece15052f8a1e25031b3e Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 22 May 2024 18:15:35 +0200 Subject: [PATCH 4/6] fix: api und disablle --- FHEM/73_GardenaSmartBridge.pm | 14 +++++--------- controls_GardenaSmartDevice.txt | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/FHEM/73_GardenaSmartBridge.pm b/FHEM/73_GardenaSmartBridge.pm index 0e0ec38..5a8a228 100644 --- a/FHEM/73_GardenaSmartBridge.pm +++ b/FHEM/73_GardenaSmartBridge.pm @@ -694,17 +694,13 @@ sub ErrorHandling { } elsif ( $decode_json->{errors}[0]{code} eq "ratelimit.exceeded" ) { - Log3 $dname, 5, - "GardenaSmartBridge ($dname) - RequestERROR: error ratelimit.exceeded"; - readingsBulkUpdate( $dhash, "lastRequestState", "too many requests", 1 ); - readingsBulkUpdate( $dhash, "state", "inactive", 1 ); + Log3 $name, 5, + "GardenaSmartBridge ($name) - RequestERROR: error ratelimit.exceeded"; + readingsBulkUpdate( $hash, "lastRequestState", "too many requests", 1 ); + readingsBulkUpdate( $hash, "state", "inactive", 1 ); # remove all timer and disable bridge - readingsBulkUpdate( $dhash, "disable", "1", 1 ); -# AttrVal( $name, 'disable', '1'); - RemoveInternalTimer( $dhash, "FHEM::GardenaSmartBridge::getDevices" ); - RemoveInternalTimer( $dhash, "FHEM::GardenaSmartBridge::getToken" ); + RemoveInternalTimer( $hash ); - return; # post request max. } else { diff --git a/controls_GardenaSmartDevice.txt b/controls_GardenaSmartDevice.txt index 800dd56..36b4d2c 100644 --- a/controls_GardenaSmartDevice.txt +++ b/controls_GardenaSmartDevice.txt @@ -1,2 +1,2 @@ -UPD 2024-05-21_22:04:23 51083 FHEM/73_GardenaSmartBridge.pm +UPD 2024-05-22_18:13:20 50855 FHEM/73_GardenaSmartBridge.pm UPD 2024-05-21_09:01:54 127762 FHEM/74_GardenaSmartDevice.pm -- 2.47.2 From ae437a09f2b203b5d1e1673ab9ddf862e58ab22b Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 22 May 2024 18:40:04 +0200 Subject: [PATCH 5/6] fix: push --- FHEM/73_GardenaSmartBridge.pm | 12 ++++++++++-- controls_GardenaSmartDevice.txt | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/FHEM/73_GardenaSmartBridge.pm b/FHEM/73_GardenaSmartBridge.pm index 5a8a228..2d2f806 100644 --- a/FHEM/73_GardenaSmartBridge.pm +++ b/FHEM/73_GardenaSmartBridge.pm @@ -205,6 +205,7 @@ sub Define { my $hash = shift // return; my $aArg = shift // return; + return $@ unless ( FHEM::Meta::SetInternals($hash) ); use version 0.60; our $VERSION = FHEM::Meta::Get( $hash, 'version' ); @@ -223,6 +224,7 @@ sub Define { $hash->{VERSION} = version->parse($VERSION)->normal; $hash->{INTERVAL} = 180; $hash->{NOTIFYDEV} = "global,$name"; + $hash->{helper}{gettoken_count} = 0; CommandAttr( undef, $name . ' room GardenaSmart' ) if ( AttrVal( $name, 'room', 'none' ) eq 'none' ); @@ -700,7 +702,7 @@ sub ErrorHandling { readingsBulkUpdate( $hash, "state", "inactive", 1 ); # remove all timer and disable bridge RemoveInternalTimer( $hash ); - + return; # post request max. } else { @@ -712,8 +714,14 @@ sub ErrorHandling { if ( !defined( $hash->{helper}{session_id} ) ) { readingsSingleUpdate( $hash, 'token', 'none', 1 ); + Log3 $name, 3, + "GardenaSmartBridge ($name) - getToken limit: " + . $hash->{helper}{gettoken_count} ; + + $hash->{helper}{gettoken_count}++; InternalTimer( gettimeofday() + 5, - "FHEM::GardenaSmartBridge::getToken", $hash ); + "FHEM::GardenaSmartBridge::getToken", $hash ) + if ($hash->{helper}{gettoken_count} < 6); } readingsEndUpdate( $dhash, 1 ); diff --git a/controls_GardenaSmartDevice.txt b/controls_GardenaSmartDevice.txt index 36b4d2c..799df6e 100644 --- a/controls_GardenaSmartDevice.txt +++ b/controls_GardenaSmartDevice.txt @@ -1,2 +1,2 @@ -UPD 2024-05-22_18:13:20 50855 FHEM/73_GardenaSmartBridge.pm +UPD 2024-05-22_18:35:07 51132 FHEM/73_GardenaSmartBridge.pm UPD 2024-05-21_09:01:54 127762 FHEM/74_GardenaSmartDevice.pm -- 2.47.2 From 9412aac1768cdd5c2f1a37f89a65cdee28d937e4 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 22 May 2024 18:46:38 +0200 Subject: [PATCH 6/6] fix: disable after 5 attemps --- FHEM/73_GardenaSmartBridge.pm | 10 +++++++--- controls_GardenaSmartDevice.txt | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/FHEM/73_GardenaSmartBridge.pm b/FHEM/73_GardenaSmartBridge.pm index 2d2f806..1277423 100644 --- a/FHEM/73_GardenaSmartBridge.pm +++ b/FHEM/73_GardenaSmartBridge.pm @@ -718,10 +718,14 @@ sub ErrorHandling { "GardenaSmartBridge ($name) - getToken limit: " . $hash->{helper}{gettoken_count} ; - $hash->{helper}{gettoken_count}++; - InternalTimer( gettimeofday() + 5, + if ($hash->{helper}{gettoken_count} < 6) { + $hash->{helper}{gettoken_count}++; + InternalTimer( gettimeofday() + 5, "FHEM::GardenaSmartBridge::getToken", $hash ) - if ($hash->{helper}{gettoken_count} < 6); + } else { + RemoveInternalTimer ($hash); + $hash->{helper}{gettoken_count} = 0; + } } readingsEndUpdate( $dhash, 1 ); diff --git a/controls_GardenaSmartDevice.txt b/controls_GardenaSmartDevice.txt index 799df6e..02be3a4 100644 --- a/controls_GardenaSmartDevice.txt +++ b/controls_GardenaSmartDevice.txt @@ -1,2 +1,2 @@ -UPD 2024-05-22_18:35:07 51132 FHEM/73_GardenaSmartBridge.pm +UPD 2024-05-22_18:46:22 51262 FHEM/73_GardenaSmartBridge.pm UPD 2024-05-21_09:01:54 127762 FHEM/74_GardenaSmartDevice.pm -- 2.47.2