mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

98_JsonMod.pm: #110190: jsonp detection / update-on-start defaults to 0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21695 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
herrmannj
2020-04-15 20:53:03 +00:00
parent 801daa07f9
commit b10296b826
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
fhem/FHEM/98_JsonMod.pm
View File

@@ -46,6 +46,7 @@ sub JsonMod_Initialize {
@attrList = qw( @attrList = qw(
httpHeader:textField-long httpHeader:textField-long
httpTimeout httpTimeout
update-on-start:0,1
readingList:textField-long readingList:textField-long
disable:0,1 disable:0,1
interval interval
@@ -87,7 +88,8 @@ sub JsonMod_Define {
# reread / temporary remove # reread / temporary remove
sub JsonMod_Undef { sub JsonMod_Undef {
my ($hash, $name) = @_; my ($hash, $name) = @_;
RemoveInternalTimer($hash, \&JsonMod_DoTimer); #RemoveInternalTimer($hash, \&JsonMod_DoTimer);
JsonMod_StopTimer($hash);
return; return;
}; };
@@ -110,7 +112,7 @@ sub JsonMod_Run {
my $cron = AttrVal($name, 'interval', '0 * * * *'); my $cron = AttrVal($name, 'interval', '0 * * * *');
$hash->{'CONFIG'}->{'CRON'} = \$cron; $hash->{'CONFIG'}->{'CRON'} = \$cron;
JsonMod_StartTimer($hash); JsonMod_StartTimer($hash);
JsonMod_ApiRequest($hash); JsonMod_ApiRequest($hash) if AttrVal($name, 'update-on-start', 0);
return; return;
}; };
@@ -531,6 +533,7 @@ sub JsonMod_StopTimer {
my ($hash) = @_; my ($hash) = @_;
$hash->{'NEXT'} = 'NEVER'; $hash->{'NEXT'} = 'NEVER';
RemoveInternalTimer($hash, \&JsonMod_DoTimer); RemoveInternalTimer($hash, \&JsonMod_DoTimer);
RemoveInternalTimer($hash, \&JsonMod_ApiRequest);
return; return;
}; };
@@ -572,7 +575,8 @@ sub JsonMod_ApiRequest {
}; };
$header .= "\r\nAccept: application/json\r\nAccept-Charset: utf-8, iso-8859-1" unless ($header =~ m'Accept: application/json'); $header .= "\r\nAccept: application/json\r\nAccept-Charset: utf-8, iso-8859-1" unless ($header =~ m'Accept: application/json');
$param->{'header'} = $header; $param->{'header'} = $header;
$param->{'loglevel'} = AttrVal($name, 'verbose', 3); #$param->{'loglevel'} = AttrVal($name, 'verbose', 3);
$param->{'NAME'} = $name;
$param->{'timeout'} = AttrVal($name, 'httpTimeout', 30); $param->{'timeout'} = AttrVal($name, 'httpTimeout', 30);
HttpUtils_NonblockingGet($param); HttpUtils_NonblockingGet($param);
return; return;
@@ -631,11 +635,22 @@ sub JsonMod_ApiResponse {
# bool = utf8::is_utf8(string) # bool = utf8::is_utf8(string)
# if true: utf8::encode(string); # if true: utf8::encode(string);
my $enc = Encode::find_encoding($encoding); my $enc = Encode::find_encoding($encoding);
$enc = (defined($enc))?$enc->name():'utf-8-strict'; # precaution required in case of invalid respone $enc = (defined($enc))?$enc->name():'utf-8-strict'; # precaution required in case of invalid respone
Encode::from_to($data, $encoding, 'UTF-8') unless ($enc eq 'utf-8-strict'); Encode::from_to($data, $encoding, 'UTF-8') unless ($enc eq 'utf-8-strict');
JsonMod_Logger($hash, 4, 'api encoding is %s, designated encoder is %s', $encoding, $enc); JsonMod_Logger($hash, 4, 'api encoding is %s, designated encoder is %s', $encoding, $enc);
$data = "testtäüötü(bla);";
utf8::encode($data);
# JsonP handling
my ($jsonP, $remain, $jsFn) = extract_codeblock($data, '()', '(?s)^[^(]+');
if ($jsonP and $jsonP =~ m/^\((.*)\)$/ and $1) {
$data = $1;
};
return;
my $rs = JsonMod::JSON::StreamReader->new()->parse($data); my $rs = JsonMod::JSON::StreamReader->new()->parse($data);
if (not $rs or ((ref($rs) ne 'HASH') and ref($rs) ne 'ARRAY')) { if (not $rs or ((ref($rs) ne 'HASH') and ref($rs) ne 'ARRAY')) {
return doError('invalid server response'); return doError('invalid server response');
@@ -660,6 +675,7 @@ sub JsonMod_Logger {
}; };
# https://forum.fhem.de/index.php/topic,109413.msg1034685.html#msg1034685 # https://forum.fhem.de/index.php/topic,109413.msg1034685.html#msg1034685
no if $] >= 5.022, 'warnings', qw( redundant missing ); no if $] >= 5.022, 'warnings', qw( redundant missing );
no warnings "uninitialized";
Log3 ($name, $verbose, sprintf('[%s] '.$message, $name, @args)); Log3 ($name, $verbose, sprintf('[%s] '.$message, $name, @args));
return; return;
}; };