Update Nuki Bridge and Device to version 2.1.0

The Nuki Bridge and Device modules have been updated to version 2.1.0.
Key changes include enhancements to the command handling within the
Bridge module, replacing the `given/when` construct with a more
flexible hash-based dispatcher for clarity and maintainability.

Additionally, minor refinements have been made in the Device module,
including improved reading updates and handling of last known
device states. The experimental feature switch has been commented
out, ensuring compatibility with standard Perl versions.

These updates improve the overall robustness and readability of the
code, making it easier to maintain and extend in future versions.
No breaking changes have been introduced.

FHEM/73_NUKIBridge.pm

@@ -267,7 +267,7 @@ sub Initialize {
   ],
   "release_status": "stable",
   "license": "GPL_2",
-  "version": "v2.0.2",
+  "version": "v2.1.0",
   "x_apiversion": "1.13.0",
   "author": [
     "Marko Oldenburg <leongaultier@gmail.com>"

FHEM/74_NUKIDevice.pm

@@ -271,7 +271,7 @@ sub Initialize {
   ],
   "release_status": "stable",
   "license": "GPL_2",
-  "version": "v2.0.2",
+  "version": "v2.1.0",
   "author": [
     "Marko Oldenburg <leongaultier@gmail.com>"
   ],

controls_NukiSmart.txt

@@ -1,4 +1,4 @@
-UPD 2021-12-17_12:18:33 10358 FHEM/73_NUKIBridge.pm
+UPD 2025-10-14_10:40:53 10358 FHEM/73_NUKIBridge.pm
-UPD 2021-12-17_12:44:59 11100 FHEM/74_NUKIDevice.pm
+UPD 2025-10-14_10:41:09 11100 FHEM/74_NUKIDevice.pm
-UPD 2022-09-26_11:59:12 42767 lib/FHEM/Devices/Nuki/Bridge.pm
+UPD 2025-10-14_10:42:11 42820 lib/FHEM/Devices/Nuki/Bridge.pm
-UPD 2021-12-17_12:18:33 16338 lib/FHEM/Devices/Nuki/Device.pm
+UPD 2025-10-14_10:42:04 16698 lib/FHEM/Devices/Nuki/Device.pm

lib/FHEM/Devices/Nuki/Bridge.pm

@@ -39,7 +39,8 @@ package FHEM::Devices::Nuki::Bridge;
 
 use strict;
 use warnings;
-use experimental qw( switch );
+
+#use experimental qw( switch );
 
 use FHEM::Meta;
 use HttpUtils;
@@ -422,59 +423,59 @@ sub Set {
     my $endpoint;
     my $param;
 
-    $cmd = lc($cmd);
+    $cmd = lc $cmd;
 
-    given ($cmd) {
+    my %handlers = (
-        when ('getdevicelist') {
+        getdevicelist => sub {
-            return 'usage: getDeviceList' if ($arg);
+            return 'usage: getDeviceList' if $arg;
             $endpoint = 'list';
-        }
+        },
-        when ('info') {
+        info => sub {
-            return 'usage: info' if ($arg);
+            return 'usage: info' if $arg;
             $endpoint = 'info';
-        }
+        },
-        when ('fwupdate') {
+        fwupdate => sub {
-            return 'usage: fwUpdate' if ($arg);
+            return 'usage: fwUpdate' if $arg;
             $endpoint = 'fwupdate';
-        }
+        },
-        when ('reboot') {
+        reboot => sub {
-            return 'usage: freboot' if ($arg);
+            return 'usage: reboot' if $arg;
             $endpoint = 'reboot';
-        }
+        },
-        when ('clearlog') {
+        clearlog => sub {
-            return 'usage: clearLog' if ($arg);
+            return 'usage: clearLog' if $arg;
             $endpoint = 'clearlog';
-        }
+        },
-        when ('factoryreset') {
+        factoryreset => sub {
-            return 'usage: factoryReset' if ($arg);
+            return 'usage: factoryReset' if $arg;
             $endpoint = 'factoryreset';
-        }
+        },
-
+        callbackremove => sub {
-        when ('callbackremove') {
             return 'usage: callbackRemove'
               if ( split( m{\s+}xms, $arg ) > 1 );
-            my $id = ( defined($arg) ? $arg : 0 );
+            my $id = defined $arg ? $arg : 0;
             $endpoint = 'callback/remove';
             $param    = '{"param":"' . $id . '"}';
-        }
+        },
-
+        configauth => sub {
-        when ('configauth') {
+            return 'usage: configAuth'
-            return 'usage: configAuth' if ( split( m{\s+}xms, $arg ) > 1 );
+              if ( split( m{\s+}xms, $arg ) > 1 );
-            $endpoint = 'clearlog';
             my $configAuth = 'enable=' . ( $arg eq 'enable' ? 1 : 0 );
             $endpoint = 'configAuth';
             $param    = '{"param":"' . $configAuth . '"}';
-        }
+        },
+    );
 
-        default {
+    if ( exists $handlers{$cmd} ) {
-            my $list = '';
+        my $result = $handlers{$cmd}->();
-            $list .= 'info:noArg getDeviceList:noArg ';
+        return $result if defined $result && length $result;
+    }
+    else {
+        my $list = 'info:noArg getDeviceList:noArg ';
         $list .=
 'clearLog:noArg fwUpdate:noArg reboot:noArg factoryReset:noArg configAuth:enable,disable'
-              if ( ::ReadingsVal( $name, 'bridgeType', 'Software' ) eq
+          if ( ::ReadingsVal( $name, 'bridgeType', 'Software' ) eq 'Hardware' );
-                'Hardware' );
+        return "Unknown argument $cmd, choose one of $list";
-            return ( 'Unknown argument ' . $cmd . ', choose one of ' . $list );
-        }
     }
 
     Write( $hash, $endpoint, $param )
@@ -486,30 +487,34 @@ sub Set {
 sub Get {
     my $hash = shift;
     my $name = shift;
-    my $cmd  = shift // return "set $name needs at least one argument !";
+    my $cmd  = shift // return "get $name needs at least one argument !";
     my $arg  = shift;
 
     my $endpoint;
 
-    $cmd = lc($cmd);
+    $cmd = lc $cmd;
-    given ($cmd) {
-        when ( $cmd eq 'logfile' ) {
-            return 'usage: logFile' if ( defined($arg) );
-            $endpoint = 'log';
-        }
-        when ( $cmd eq 'callbacklist' ) {
-            return 'usage: callbackList' if ( defined($arg) );
-            $endpoint = 'callback/list';
-        }
-        default {
-            my $list = '';
-            $list .= 'callbackList:noArg ';
-            $list .= 'logFile:noArg'
-              if ( ::ReadingsVal( $name, 'bridgeType', 'Software' ) eq
-                'Hardware' );
 
-            return 'Unknown argument ' . $cmd . ', choose one of ' . $list;
+    my %handlers = (
+        logfile => sub {
+            return 'usage: logFile' if defined $arg;
+            $endpoint = 'log';
+        },
+        callbacklist => sub {
+            return 'usage: callbackList' if defined $arg;
+            $endpoint = 'callback/list';
+        },
+    );
+
+    if ( exists $handlers{$cmd} ) {
+        my $result = $handlers{$cmd}->();
+        return $result if defined $result && length $result;
     }
+    else {
+        my $list = 'callbackList:noArg ';
+        $list .= 'logFile:noArg'
+          if ( ::ReadingsVal( $name, 'bridgeType', 'Software' ) eq 'Hardware' );
+
+        return "Unknown argument $cmd, choose one of $list";
     }
 
     return Write( $hash, $endpoint, undef );
@@ -765,7 +770,7 @@ sub DistributionErrHandle2 {
         ::asyncOutput( $param->{cl}, "Request Error: $err\r\n" )
           if ( $param->{cl} && $param->{cl}{canAsyncOutput} );
 
-        return ('received http code '
+        return ( 'received http code '
               . $param->{code}
               . ' without any data after requesting' );
     }

lib/FHEM/Devices/Nuki/Device.pm

@@ -28,7 +28,8 @@ package FHEM::Devices::Nuki::Device;
 
 use strict;
 use warnings;
-use experimental qw( switch );
+
+#use experimental qw( switch );
 
 use FHEM::Meta;
 
@@ -355,7 +356,7 @@ sub Set {
         GetUpdate($hash);
         return;
     }
-    elsif ($cmd eq 'lock'
+    elsif ( $cmd eq 'lock'
         || lc($cmd) eq 'deactivaterto'
         || $cmd eq 'unlock'
         || lc($cmd) eq 'activaterto'
@@ -534,20 +535,21 @@ sub WriteReadings {
 
     ::readingsBeginUpdate($hash);
 
-    my $t;
+    my ( $t, $v );
-    my $v;
 
-    if ( defined( $decode_json->{lastKnownState} )
+    # falls lastKnownState als Hash vorliegt, direkt integrieren
+    if ( defined $decode_json->{lastKnownState}
         && ref( $decode_json->{lastKnownState} ) eq 'HASH' )
     {
         while ( ( $t, $v ) = each %{ $decode_json->{lastKnownState} } ) {
             $decode_json->{$t} = $v;
         }
-
         delete $decode_json->{lastKnownState};
     }
 
     while ( ( $t, $v ) = each %{$decode_json} ) {
+
+        # generische readings (alles außer spezielle Felder)
         ::readingsBulkUpdate( $hash, $t, $v )
           if ( $t ne 'state'
             && $t ne 'mode'
@@ -560,42 +562,48 @@ sub WriteReadings {
             && $t ne 'doorsensorState'
             && $t ne 'doorsensorStateName' );
 
-        given ($t) {
+        # Dispatch-Tabelle für Spezialfälle
-            when ('state') {
+        my %handlers = (
-                ::readingsBulkUpdate(
+            state => sub {
-                    $hash, $t,
+                my $val =
-                    (
+                  ( $v =~ m{\A[0-9]\z}xms )
-                          $v =~ m{\A[0-9]\z}xms
                   ? $lockStates{$v}->{ $hash->{DEVICETYPEID} }
-                        : $v
+                  : $v;
-                    )
+                ::readingsBulkUpdate( $hash, 'state', $val );
-                );
+            },
-            }
+            mode => sub {
-            when ('mode') {
+                ::readingsBulkUpdate( $hash, 'mode',
-                ::readingsBulkUpdate( $hash, $t,
                     $modes{$v}{ $hash->{DEVICETYPEID} } );
-            }
+            },
-            when ('deviceType') {
+            devicetype => sub {
-                ::readingsBulkUpdate( $hash, $t, $deviceTypes{$v} );
+                ::readingsBulkUpdate( $hash, 'deviceType', $deviceTypes{$v} );
-            }
+            },
-            when ('doorsensorState') {
+            doorsensorstate => sub {
-                ::readingsBulkUpdate( $hash, $t, $doorsensorStates{$v} );
+                ::readingsBulkUpdate( $hash, 'doorsensorState',
-            }
+                    $doorsensorStates{$v} );
-            when ('paired') {
+            },
-                ::readingsBulkUpdate( $hash, $t,
+            paired => sub {
+                ::readingsBulkUpdate( $hash, 'paired',
                     ( $v == 1 ? 'true' : 'false' ) );
-            }
+            },
-            when ('batteryCharging') {
+            batterycharging => sub {
-                ::readingsBulkUpdate( $hash, $t,
+                ::readingsBulkUpdate( $hash, 'batteryCharging',
                     ( $v == 1 ? 'true' : 'false' ) );
-            }
+            },
-            when ('batteryCritical') {
+            batterycritical => sub {
                 ::readingsBulkUpdate( $hash, 'batteryState',
                     ( $v == 1 ? 'low' : 'ok' ) );
-            }
+            },
-            when ('batteryChargeState') {
+            batterychargestate => sub {
-                ::readingsBulkUpdate( $hash, 'batteryPercent', $v )
+                ::readingsBulkUpdate( $hash, 'batteryPercent', $v );
-            }
+            },
+        );
+
+        my $key =
+          lc $t;    # damit Vergleiche robust gegen Groß-/Kleinschreibung sind
+
+        if ( exists $handlers{$key} ) {
+            $handlers{$key}->();
         }
     }