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

fix bridge endpoint setter

Browse Source
This commit is contained in:
Marko Oldenburg 2020-01-12 14:55:22 +01:00
parent ca196b686c
commit 436049aa8a
1 changed files with 48 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
73_NUKIBridge.pm
View File

@ -140,7 +140,6 @@ my %lockActionsOpener = (
sub NUKIBridge_Initialize ($); sub NUKIBridge_Initialize ($);
sub NUKIBridge_Define ($$); sub NUKIBridge_Define ($$);
sub NUKIBridge_Undef ($$); sub NUKIBridge_Undef ($$);
sub NUKIBridge_Read($@);
sub NUKIBridge_Attr(@); sub NUKIBridge_Attr(@);
sub NUKIBridge_addExtension($$$); sub NUKIBridge_addExtension($$$);
sub NUKIBridge_removeExtension($); sub NUKIBridge_removeExtension($);
@ -153,7 +152,6 @@ sub NUKIBridge_Call($);
sub NUKIBridge_Distribution($$$); sub NUKIBridge_Distribution($$$);
sub NUKIBridge_ResponseProcessing($$$); sub NUKIBridge_ResponseProcessing($$$);
sub NUKIBridge_CGI(); sub NUKIBridge_CGI();
sub NUKIBridge_Autocreate($$;$);
sub NUKIBridge_InfoProcessing($$); sub NUKIBridge_InfoProcessing($$);
sub NUKIBridge_getLogfile($$); sub NUKIBridge_getLogfile($$);
sub NUKIBridge_getCallbackList($$); sub NUKIBridge_getCallbackList($$);
@ -404,63 +402,68 @@ sub NUKIBridge_Set($@) {
if ( lc($cmd) eq 'getdevicelist' ) { if ( lc($cmd) eq 'getdevicelist' ) {
return 'usage: getDeviceList' if ( @args != 0 ); return 'usage: getDeviceList' if ( @args != 0 );
NUKIBridge_Write( $hash, "list", undef, undef, undef ) NUKIBridge_Write( $hash, 'list', undef, undef, undef )
if ( !IsDisabled($name) ); if ( !IsDisabled($name) );
return undef; return undef;
} }
elsif ( $cmd eq 'info' ) { elsif ( $cmd eq 'info' ) {
return 'usage: statusRequest' if ( @args != 0 ); return 'usage: statusRequest' if ( @args != 0 );
NUKIBridge_Write( $hash, "info", undef, undef, undef ) NUKIBridge_Write( $hash, 'info', undef, undef, undef )
if ( !IsDisabled($name) ); if ( !IsDisabled($name) );
return undef; return undef;
} }
elsif ( lc($cmd) eq 'fwupdate' ) { elsif ( lc($cmd) eq 'fwupdate' ) {
return 'usage: fwUpdate' if ( @args != 0 ); return 'usage: fwUpdate' if ( @args != 0 );
NUKIBridge_CallBlocking( $hash, "fwupdate", undef ) NUKIBridge_Write( $hash, 'fwupdate', undef, undef, undef )
if ( !IsDisabled($name) ); if ( !IsDisabled($name) );
return undef; return undef;
} }
elsif ( $cmd eq 'reboot' ) { elsif ( $cmd eq 'reboot' ) {
return 'usage: reboot' if ( @args != 0 ); return 'usage: reboot' if ( @args != 0 );
NUKIBridge_CallBlocking( $hash, "reboot", undef ) NUKIBridge_Write( $hash, 'reboot', undef, undef, undef )
if ( !IsDisabled($name) ); if ( !IsDisabled($name) );
return undef; return undef;
} }
elsif ( lc($cmd) eq 'clearlog' ) { elsif ( lc($cmd) eq 'clearlog' ) {
return 'usage: clearLog' if ( @args != 0 ); return 'usage: clearLog' if ( @args != 0 );
NUKIBridge_CallBlocking( $hash, "clearlog", undef ) NUKIBridge_Write( $hash, 'clearlog', undef, undef, undef )
if ( !IsDisabled($name) ); if ( !IsDisabled($name) );
} }
elsif ( lc($cmd) eq 'factoryreset' ) { elsif ( lc($cmd) eq 'factoryreset' ) {
return 'usage: clearLog' if ( @args != 0 ); return 'usage: clearLog' if ( @args != 0 );
NUKIBridge_CallBlocking( $hash, "factoryReset", undef ) NUKIBridge_Write( $hash, 'factoryReset', undef, undef, undef )
if ( !IsDisabled($name) ); if ( !IsDisabled($name) );
} }
elsif ( lc($cmd) eq 'callbackremove' ) { elsif ( lc($cmd) eq 'callbackremove' ) {
return 'usage: callbackRemove' if ( @args > 1 ); return 'usage: callbackRemove' if ( @args > 1 );
my $id = "id=" . ( @args > 0 ? join( ' ', @args ) : 0 ); my $id = ( @args > 0 ? join( ' ', @args ) : 0 );
my $resp = NUKIBridge_CallBlocking( $hash, 'callback/remove', $id )
NUKIBridge_Write( $hash, 'callback/remove', $id, undef, undef )
if ( !IsDisabled($name) ); if ( !IsDisabled($name) );
if (
( # my $resp = NUKIBridge_CallBlocking( $hash, 'callback/remove', $id )
$resp->{success} eq 'true' # if ( !IsDisabled($name) );
or $resp->{success} == 1 #
) # if (
and !IsDisabled($name) # (
) # $resp->{success} eq 'true'
{ # or $resp->{success} == 1
return ( 'Success Callback ' . $id . ' removed' ); # )
} # and !IsDisabled($name)
else { # )
return ('remove Callback failed'); # {
} # return ( 'Success Callback ' . $id . ' removed' );
# }
# else {
# return ('remove Callback failed');
# }
} }
else { else {
my $list = ''; my $list = '';
@ -558,6 +561,7 @@ sub NUKIBridge_Write($@) {
sub NUKIBridge_CreateUri($$) { sub NUKIBridge_CreateUri($$) {
my ( $hash, $obj ) = @_; my ( $hash, $obj ) = @_;
my $name = $hash->{NAME};
my $host = $hash->{HOST}; my $host = $hash->{HOST};
my $port = $hash->{PORT}; my $port = $hash->{PORT};
my $token = $hash->{TOKEN}; my $token = $hash->{TOKEN};
@ -569,25 +573,33 @@ sub NUKIBridge_CreateUri($$) {
my $uri = 'http://' . $host . ':' . $port; my $uri = 'http://' . $host . ':' . $port;
$uri .= '/' . $endpoint if ( defined $endpoint ); $uri .= '/' . $endpoint if ( defined $endpoint );
$uri .= '?token=' . $token if ( defined($token) ); $uri .= '?token=' . $token if ( defined($token) );
$uri .= '&action=' . $lockActionsSmartLock{$param}
if ( defined($param)
and $param ne 'callback/add'
and $deviceType == 0 );
$uri .= '&action=' . $lockActionsOpener{$param} if ( defined($param)
if ( defined($param) and defined($deviceType) )
and $param ne 'callback/add' {
and $deviceType == 2 ); $uri .= '&action=' . $lockActionsSmartLock{$param}
if ( $endpoint ne 'callback/add'
and $deviceType == 0 );
$uri .= '&action=' . $lockActionsOpener{$param}
if ( $endpoint ne 'callback/add'
and $deviceType == 2 );
}
$uri .= '&id=' . $param
if ( defined($param)
and $endpoint eq 'callback/remove' );
$uri .= '&url=' . $param $uri .= '&url=' . $param
if ( defined($param) if ( defined($param)
and $param eq 'callback/add' ); and $endpoint eq 'callback/add' );
$uri .= '&nukiId=' . $nukiId $uri .= '&nukiId=' . $nukiId
if ( defined($nukiId) ); if ( defined($nukiId) );
$uri .= '&deviceType=' . $deviceType $uri .= '&deviceType=' . $deviceType
if ( defined($deviceType) ); if ( defined($deviceType) );
Log3( $name, 4, "NUKIBridge ($name) - created uri: $uri" );
return $uri; return $uri;
} }
@ -647,9 +659,9 @@ sub NUKIBridge_Distribution($$$) {
my $dname = $dhash->{NAME}; my $dname = $dhash->{NAME};
Log3( $name, 5, "NUKIBridge ($name) - Response JSON: $json" ); Log3( $name, 4, "NUKIBridge ($name) - Response JSON: $json" );
Log3( $name, 5, "NUKIBridge ($name) - Response ERROR: $err" ); Log3( $name, 4, "NUKIBridge ($name) - Response ERROR: $err" );
Log3( $name, 5, "NUKIBridge ($name) - Response CODE: $param->{code}" ) Log3( $name, 4, "NUKIBridge ($name) - Response CODE: $param->{code}" )
if ( defined( $param->{code} ) and ( $param->{code} ) ); if ( defined( $param->{code} ) and ( $param->{code} ) );
$hash->{helper}->{iowrite} = 0 $hash->{helper}->{iowrite} = 0
@ -1290,7 +1302,7 @@ sub NUKIBridge_ParseJSON($$) {
], ],
"release_status": "under develop", "release_status": "under develop",
"license": "GPL_2", "license": "GPL_2",
"version": "v1.9.3", "version": "v1.9.4",
"x_apiversion": "1.9", "x_apiversion": "1.9",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"