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

change code for 2 step modul structure

Browse Source
This commit is contained in:
Marko Oldenburg
2020-01-08 16:30:42 +01:00
parent 5d24dba71a
commit a599602950
2 changed files with 57 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
73_NUKIBridge.pm
View File

@@ -46,7 +46,7 @@ use JSON;
use HttpUtils; use HttpUtils;
my $version = "0.7.3"; my $version = "0.7.9";
my $bridgeapi = "1.9"; my $bridgeapi = "1.9";
@@ -80,7 +80,7 @@ sub NUKIBridge_Set($@);
sub NUKIBridge_Get($@); sub NUKIBridge_Get($@);
sub NUKIBridge_GetCheckBridgeAlive($); sub NUKIBridge_GetCheckBridgeAlive($);
sub NUKIBridge_firstRun($); sub NUKIBridge_firstRun($);
sub NUKIBridge_Call($$$$$$); sub NUKIBridge_Write($@);
sub NUKIBridge_Distribution($$$); sub NUKIBridge_Distribution($$$);
sub NUKIBridge_ResponseProcessing($$$); sub NUKIBridge_ResponseProcessing($$$);
sub NUKIBridge_CGI(); sub NUKIBridge_CGI();
@@ -99,9 +99,9 @@ sub NUKIBridge_Initialize($) {
my ($hash) = @_; my ($hash) = @_;
# Provider # Provider
$hash->{WriteFn} = "NUKIBridge_Call"; $hash->{WriteFn} = "NUKIBridge_Write";
$hash->{Clients} = ':NUKIDevice:'; $hash->{Clients} = ':NUKIDevice:';
$hash->{MatchList} = { '1:NUKIDevice' => '^{"deviceType".*' }; $hash->{MatchList} = { '1:NUKIDevice' => '^{.*}$' };
my $webhookFWinstance = join( ",", devspec2array('TYPE=FHEMWEB:FILTER=TEMPORARY!=1') ); my $webhookFWinstance = join( ",", devspec2array('TYPE=FHEMWEB:FILTER=TEMPORARY!=1') );
@@ -123,13 +123,6 @@ sub NUKIBridge_Initialize($) {
} }
} }
sub NUKIBridge_Read($@) {
my ($hash,$chash,$name,$path,$lockAction,$nukiId,$deviceType)= @_;
NUKIBridge_Call($hash,$chash,$path,$lockAction,$nukiId,$deviceType );
}
sub NUKIBridge_Define($$) { sub NUKIBridge_Define($$) {
my ( $hash, $def ) = @_; my ( $hash, $def ) = @_;
@@ -260,7 +253,7 @@ sub NUKIBridge_Attr(@) {
my $url = "http://$webhookHttpHostname" . ":" . $hash->{WEBHOOK_PORT} . $hash->{WEBHOOK_URI}; my $url = "http://$webhookHttpHostname" . ":" . $hash->{WEBHOOK_PORT} . $hash->{WEBHOOK_URI};
Log3 $name, 3, "NUKIBridge ($name) - URL ist: $url"; Log3 $name, 3, "NUKIBridge ($name) - URL ist: $url";
NUKIBridge_Call($hash,$hash,"callback/add",$url,undef,undef ) if( $init_done ); NUKIBridge_Write($hash,"callback/add",$url,undef,undef ) if( $init_done );
$hash->{WEBHOOK_REGISTER} = "sent"; $hash->{WEBHOOK_REGISTER} = "sent";
} else { } else {
@@ -305,14 +298,14 @@ sub NUKIBridge_Set($@) {
if($cmd eq 'autocreate') { if($cmd eq 'autocreate') {
return "usage: autocreate" if( @args != 0 ); return "usage: autocreate" if( @args != 0 );
NUKIBridge_Call($hash,$hash,"list",undef,undef,undef) if( !IsDisabled($name) ); NUKIBridge_Write($hash,"list",undef,undef,undef) 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_Call($hash,$hash,"info",undef,undef,undef) if( !IsDisabled($name) ); NUKIBridge_Write($hash,"info",undef,undef,undef) if( !IsDisabled($name) );
return undef; return undef;
@@ -392,9 +385,9 @@ sub NUKIBridge_GetCheckBridgeAlive($) {
if( !IsDisabled($name) ) { if( !IsDisabled($name) ) {
NUKIBridge_Call($hash,$hash,'info',undef,undef,undef); NUKIBridge_Write($hash,'info',undef,undef,undef);
Log3 $name, 4, "NUKIBridge ($name) - run NUKIBridge_Call"; Log3 $name, 4, "NUKIBridge ($name) - run NUKIBridge_Write";
} }
InternalTimer( gettimeofday()+15+int(rand(15)), 'NUKIBridge_GetCheckBridgeAlive', $hash, 1 ); InternalTimer( gettimeofday()+15+int(rand(15)), 'NUKIBridge_GetCheckBridgeAlive', $hash, 1 );
@@ -409,16 +402,15 @@ sub NUKIBridge_firstRun($) {
RemoveInternalTimer($hash); RemoveInternalTimer($hash);
NUKIBridge_Call($hash,$hash,'list',undef,undef,undef) if( !IsDisabled($name) ); NUKIBridge_Write($hash,'list',undef,undef,undef) if( !IsDisabled($name) );
InternalTimer( gettimeofday()+15, 'NUKIBridge_GetCheckBridgeAlive', $hash, 1 ); InternalTimer( gettimeofday()+15, 'NUKIBridge_GetCheckBridgeAlive', $hash, 1 );
return undef; return undef;
} }
sub NUKIBridge_Call($$$$$$) { sub NUKIBridge_Write($@) {
my ($hash,$path,$lockAction,$nukiId,$deviceType) = @_;
my ($hash,$chash,$path,$lockAction,$nukiId,$deviceType) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $host = $hash->{HOST}; my $host = $hash->{HOST};
my $port = $hash->{PORT}; my $port = $hash->{PORT};
@@ -428,8 +420,8 @@ sub NUKIBridge_Call($$$$$$) {
my $uri = "http://" . $hash->{HOST} . ":" . $port; my $uri = "http://" . $hash->{HOST} . ":" . $port;
$uri .= "/" . $path if( defined $path); $uri .= "/" . $path if( defined $path);
$uri .= "?token=" . $token if( defined($token) ); $uri .= "?token=" . $token if( defined($token) );
$uri .= "&action=" . $lockActionsSmartLock{$lockAction} if( defined($lockAction) and $path ne "callback/add" and $chash->{DEVICETYPE} == 0 ); $uri .= "&action=" . $lockActionsSmartLock{$lockAction} if( defined($lockAction) and $path ne "callback/add" and $deviceType == 0 );
$uri .= "&action=" . $lockActionsOpener{$lockAction} if( defined($lockAction) and $path ne "callback/add" and $chash->{DEVICETYPE} == 2 ); $uri .= "&action=" . $lockActionsOpener{$lockAction} if( defined($lockAction) and $path ne "callback/add" and $deviceType == 2 );
$uri .= "&url=" . $lockAction if( defined($lockAction) and $path eq "callback/add" ); $uri .= "&url=" . $lockAction if( defined($lockAction) and $path eq "callback/add" );
$uri .= "&nukiId=" . $nukiId if( defined($nukiId) ); $uri .= "&nukiId=" . $nukiId if( defined($nukiId) );
$uri .= "&deviceType=" . $deviceType if( defined($deviceType) ); $uri .= "&deviceType=" . $deviceType if( defined($deviceType) );
@@ -437,14 +429,14 @@ sub NUKIBridge_Call($$$$$$) {
HttpUtils_NonblockingGet( HttpUtils_NonblockingGet(
{ {
url => $uri, url => $uri,
timeout => 30, timeout => 5,
hash => $hash, hash => $hash,
chash => $chash, nukiId => $nukiId,
endpoint => $path, endpoint => $path,
header => "Accept: application/json", header => "Accept: application/json",
method => "GET", method => "GET",
callback => \&NUKIBridge_Distribution, callback => \&NUKIBridge_Distribution,
} }
); );
@@ -459,6 +451,13 @@ sub NUKIBridge_Distribution($$$) {
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $host = $hash->{HOST}; my $host = $hash->{HOST};
my $dhash = $hash;
$dhash = $modules{NUKIDevice}{defptr}{ $param->{'nukiId'} }
unless ( not defined( $param->{'nukiId'} ) );
my $dname = $dhash->{NAME};
Log3 $name, 5, "NUKIBridge ($name) - Response JSON: $json"; Log3 $name, 5, "NUKIBridge ($name) - Response JSON: $json";
Log3 $name, 5, "NUKIBridge ($name) - Response ERROR: $err"; Log3 $name, 5, "NUKIBridge ($name) - Response ERROR: $err";
@@ -484,7 +483,7 @@ sub NUKIBridge_Distribution($$$) {
if( $json eq "" and exists( $param->{code} ) and $param->{code} ne 200 ) { if( $json eq "" and exists( $param->{code} ) and $param->{code} ne 200 ) {
if( $param->{code} eq 503 ) { if( $param->{code} eq 503 ) {
NUKIDevice_Parse($param->{chash},$param->{code}) if( $hash != $param->{chash} ); # NUKIDevice_Parse($dhash,$param->{code}) if( $hash != $dhash );
Log3 $name, 4, "NUKIBridge ($name) - smartlock is offline"; Log3 $name, 4, "NUKIBridge ($name) - smartlock is offline";
readingsEndUpdate( $hash, 1 ); readingsEndUpdate( $hash, 1 );
return "received http code ".$param->{code}.": smartlock is offline"; return "received http code ".$param->{code}.": smartlock is offline";
@@ -500,34 +499,37 @@ sub NUKIBridge_Distribution($$$) {
if( ( $json =~ /Error/i ) and exists( $param->{code} ) ) { if( ( $json =~ /Error/i ) and exists( $param->{code} ) ) {
readingsBulkUpdate( $hash, "lastError", "invalid API token" ) if( $param->{code} eq 401 ); readingsBulkUpdate( $hash, "lastError", "invalid API token" ) if( $param->{code} eq 401 );
readingsBulkUpdate( $hash, "lastError", "action is undefined" ) if( $param->{code} eq 400 and $hash == $param->{chash} ); readingsBulkUpdate( $hash, "lastError", "action is undefined" ) if( $param->{code} eq 400 and $hash == $dhash );
###### Fehler bei Antwort auf Anfrage eines logischen Devices ###### ###### Fehler bei Antwort auf Anfrage eines logischen Devices ######
# NUKIDevice_Parse($param->{chash},$param->{code}) if( $param->{code} eq 404 ); # NUKIDevice_Parse($dhash,$param->{code}) if( $param->{code} eq 404 );
# NUKIDevice_Parse($param->{chash},$param->{code}) if( $param->{code} eq 400 and $hash != $param->{chash} ); # NUKIDevice_Parse($dhash,$param->{code}) if( $param->{code} eq 400 and $hash != $dhash );
Log3 $name, 4, "NUKIBridge ($name) - invalid API token" if( $param->{code} eq 401 ); Log3 $name, 4, "NUKIBridge ($name) - invalid API token" if( $param->{code} eq 401 );
Log3 $name, 4, "NUKIBridge ($name) - nukiId is not known" if( $param->{code} eq 404 ); Log3 $name, 4, "NUKIBridge ($name) - nukiId is not known" if( $param->{code} eq 404 );
Log3 $name, 4, "NUKIBridge ($name) - action is undefined" if( $param->{code} eq 400 and $hash == $param->{chash} ); Log3 $name, 4, "NUKIBridge ($name) - action is undefined" if( $param->{code} eq 400 and $hash == $dhash );
readingsEndUpdate( $hash, 1 ); readingsEndUpdate( $hash, 1 );
return $param->{code}; return $param->{code};
} }
if( $hash == $param->{chash} ) { readingsEndUpdate( $hash, 1 );
if( $hash == $dhash ) {
NUKIBridge_ResponseProcessing($hash,$json,$param->{endpoint}); NUKIBridge_ResponseProcessing($hash,$json,$param->{endpoint});
} else { } else {
# NUKIDevice_Parse($param->{chash},$json); # NUKIDevice_Parse($dhash,$json);
Dispatch($hash,$json,undef);
} }
readingsEndUpdate( $hash, 1 );
return undef; return undef;
} }
@@ -556,10 +558,6 @@ sub NUKIBridge_ResponseProcessing($$$) {
} }
if( ref($decode_json) eq "ARRAY" and scalar(@{$decode_json}) > 0 and $path eq "list" ) { if( ref($decode_json) eq "ARRAY" and scalar(@{$decode_json}) > 0 and $path eq "list" ) {
# NUKIBridge_Autocreate($hash,$decode_json);
my @buffer = split( '\[', $json ); my @buffer = split( '\[', $json );
my ( $json, $tail ) = NUKIBridge_ParseJSON( $hash, $buffer[1] ); my ( $json, $tail ) = NUKIBridge_ParseJSON( $hash, $buffer[1] );
@@ -594,7 +592,7 @@ sub NUKIBridge_ResponseProcessing($$$) {
. $tail; . $tail;
} }
# NUKIBridge_Call($hash,$hash,"info",undef,undef,undef) # NUKIBridge_Write($hash,"info",undef,undef,undef)
# if( !IsDisabled($name) ); # if( !IsDisabled($name) );
} }

25
74_NUKIDevice.pm
View File

@@ -33,7 +33,7 @@ use warnings;
use JSON; use JSON;
my $version = "0.7.3"; my $version = "0.7.9";
@@ -65,7 +65,7 @@ sub NUKIDevice_Initialize($) {
my ($hash) = @_; my ($hash) = @_;
$hash->{Match} = '^{"deviceType".*'; $hash->{Match} = '^{.*}$';
$hash->{SetFn} = "NUKIDevice_Set"; $hash->{SetFn} = "NUKIDevice_Set";
$hash->{DefFn} = "NUKIDevice_Define"; $hash->{DefFn} = "NUKIDevice_Define";
@@ -225,7 +225,8 @@ sub NUKIDevice_Set($$@) {
} elsif( $cmd eq 'unpair' ) { } elsif( $cmd eq 'unpair' ) {
NUKIDevice_ReadFromNUKIBridge($hash,"$cmd",undef,$hash->{NUKIID},$hash->{DEVICETYPE} ) if( !IsDisabled($name) ); # NUKIDevice_ReadFromNUKIBridge($hash,"$cmd",undef,$hash->{NUKIID},$hash->{DEVICETYPE} ) if( !IsDisabled($name) );
IOWrite($hash,"$cmd",undef,$hash->{NUKIID},$hash->{DEVICETYPE}) if( !IsDisabled($name) );
return undef; return undef;
} else { } else {
@@ -241,7 +242,8 @@ sub NUKIDevice_Set($$@) {
} }
$hash->{helper}{lockAction} = $lockAction; $hash->{helper}{lockAction} = $lockAction;
NUKIDevice_ReadFromNUKIBridge($hash,"lockAction",$lockAction,$hash->{NUKIID},$hash->{DEVICETYPE} ) if( !IsDisabled($name) ); IOWrite($hash,"lockAction",$lockAction,$hash->{NUKIID},$hash->{DEVICETYPE});
# NUKIDevice_ReadFromNUKIBridge($hash,"lockAction",$lockAction,$hash->{NUKIID},$hash->{DEVICETYPE} ) if( !IsDisabled($name) );
return undef; return undef;
} }
@@ -253,8 +255,9 @@ sub NUKIDevice_GetUpdate($) {
RemoveInternalTimer($hash); RemoveInternalTimer($hash);
NUKIDevice_ReadFromNUKIBridge($hash, "lockState", undef, $hash->{NUKIID}, $hash->{DEVICETYPE} ) if( !IsDisabled($name) ); # NUKIDevice_ReadFromNUKIBridge($hash, "lockState", undef, $hash->{NUKIID}, $hash->{DEVICETYPE} ) if( !IsDisabled($name) );
Log3 $name, 5, "NUKIDevice ($name) - NUKIDevice_GetUpdate Call NUKIDevice_ReadFromNUKIBridge" if( !IsDisabled($name) ); IOWrite($hash, "lockState", undef, $hash->{NUKIID}, $hash->{DEVICETYPE} ) if( !IsDisabled($name) );
Log3 $name, 5, "NUKIDevice ($name) - NUKIDevice_GetUpdate Call IOWrite" if( !IsDisabled($name) );
return undef; return undef;
} }
@@ -357,7 +360,7 @@ sub NUKIDevice_Parse($$) {
if ( my $hash = $modules{NUKIDevice}{defptr}{$nukiId} ) { if ( my $hash = $modules{NUKIDevice}{defptr}{$nukiId} ) {
my $name = $hash->{NAME}; my $name = $hash->{NAME};
WriteReadings( $hash, $decode_json ); NUKIDevice_WriteReadings( $hash, $decode_json );
Log3 $name, 4, Log3 $name, 4,
"NUKIDevice ($name) - find logical device: $hash->{NAME}"; "NUKIDevice ($name) - find logical device: $hash->{NAME}";
@@ -379,7 +382,7 @@ sub NUKIDevice_Parse($$) {
Log3 $name, 5, "NUKIDevice ($name) - parse status message for $name"; Log3 $name, 5, "NUKIDevice ($name) - parse status message for $name";
# NUKIDevice_WriteReadings($hash,$decode_json); NUKIDevice_WriteReadings($hash,$decode_json);
} }
sub NUKIDevice_WriteReadings($$) { sub NUKIDevice_WriteReadings($$) {
@@ -413,12 +416,14 @@ sub NUKIDevice_WriteReadings($$) {
$state = $hash->{helper}{lockAction}; $state = $hash->{helper}{lockAction};
$lockState = $hash->{helper}{lockAction}; $lockState = $hash->{helper}{lockAction};
NUKIDevice_ReadFromNUKIBridge($hash, "lockState", undef, $hash->{NUKIID} ) if( ReadingsVal($hash->{IODev}->{NAME},'bridgeType','Software') eq 'Software' ); # NUKIDevice_ReadFromNUKIBridge($hash, "lockState", undef, $hash->{NUKIID} ) if( ReadingsVal($hash->{IODev}->{NAME},'bridgeType','Software') eq 'Software' );
IOWrite($hash, "lockState", undef, $hash->{NUKIID} ) if( ReadingsVal($hash->{IODev}->{NAME},'bridgeType','Software') eq 'Software' );
} elsif ( defined($decode_json->{success}) and ($decode_json->{success} eq "false" or $decode_json->{success} eq "0") ) { } elsif ( defined($decode_json->{success}) and ($decode_json->{success} eq "false" or $decode_json->{success} eq "0") ) {
$state = "error"; $state = "error";
NUKIDevice_ReadFromNUKIBridge($hash, "lockState", undef, $hash->{NUKIID} ); # NUKIDevice_ReadFromNUKIBridge($hash, "lockState", undef, $hash->{NUKIID} );
IOWrite($hash, "lockState", undef, $hash->{NUKIID}, $hash->{DEVICETYPE} );
} }
readingsBulkUpdate( $hash, "state", $state ); readingsBulkUpdate( $hash, "state", $state );