SmartX turn off warnings

[Biblio-RFID.git] / scripts / RFID-JSONP-server.pl

diff --git a/scripts/RFID-JSONP-server.pl b/scripts/RFID-JSONP-server.pl
index 3e1d4fd..ff47112 100755 (executable)
--- a/scripts/RFID-JSONP-server.pl
+++ b/scripts/RFID-JSONP-server.pl
@@ -17,6 +17,7 @@ use Data::Dump qw/dump/;
 
 use JSON::XS;
 use IO::Socket::INET;
+$ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0; # disable https cert validation
 use LWP::UserAgent;
 use URI;
 use URI::Escape;
@@ -24,8 +25,7 @@ use POSIX qw(strftime);
 use Encode;
 
 my $debug = 0;
-my $listen = '127.0.0.1:9000';
-$listen = ':9000';
+my $listen = $ENV{HTTP_LISTEN} || 'localhost:9000';
 my $reader;
 my $koha_url = $ENV{KOHA_URL};
 warn "$koha_url";
@@ -78,39 +78,68 @@ sub rfid_borrower {
 }
 
 
+sub sip2_socket {
+
+       return $sip2->{sock} if exists $sip2->{sock} && $sip2->{sock}->connected;
+
+       if ( my $server = $sip2->{server} ) {
+               my $sock = $sip2->{sock} = IO::Socket::INET->new( $server ) || die "can't connect to $server: $!";
+               warn "SIP2 server ", $sock->peerhost, ":", $sock->peerport, "\n";
+
+               # login
+               if ( sip2_message("9300CN$sip2->{user}|CO$sip2->{password}|")->{fixed} !~ m/^941/ ) {
+                       die "SIP2 login failed";
+               }
+
+       }
+       return $sip2->{sock};
+}
+
 sub sip2_message {
        my $send = shift;
 
-       my $sock = $sip2->{sock} || die "no sip2 socket";
+       my $retry = 0;
+
+send_again:
+       my $sock = sip2_socket || die "no sip2 socket";
 
        local $/ = "\r";
 
        $send .= "\r" unless $send =~ m/\r$/;
+       $send .= "\n" unless $send =~ m/\n$/;
+
        warn "SIP2 >>>> ",dump($send), "\n";
        print $sock $send;
        $sock->flush;
        
        my $expect = substr($send,0,2) | 0x01;
 
-       my $in = '';
-       my $repeat = 1;
-       while ( $in eq '' && $repeat < 10 ) {
-               $in = <$sock>;
-               $in =~ s/^\n//;
-               $in =~ s/\r$//;
-               warn "SIP2 <<<< ",dump($in), " repeat: $repeat\n";
-               $repeat++;
+       my $in = <$sock>;
+       warn "SIP2 <<<< ",dump($in), "\n";
+
+       $in =~ s/^\n//;
+       $in =~ s/\r$//;
+
+       if ( ! $in ) {
+               $retry++;
+               warn "empty read from SIP server, retry: $retry\n";
+               if ( $retry < 10 ) {
+                       close( $sip2->{sock} );
+                       goto send_again;
+               }
+               die "aborted";
        }
 
+
        die "expected $expect" unless substr($in,0,2) != $expect;
 
        my $hash;
-       if ( $in =~ s/^([0-9\s]+)// ) {
+       if ( $in =~ s/^([0-9\s\w]+)// ) {
                $hash->{fixed} = $1;
        }
        foreach ( split(/\|/, $in ) ) {
                my ( $f, $v ) = ( $1, $2 ) if m/([A-Z]{2})(.+)/;
-               $hash->{$f} = decode('utf-8',$v);
+               $hash->{$f} = decode('utf-8',$v) if $f;
        }
 
        warn "# sip2 hash response ",dump($hash);
@@ -118,16 +147,6 @@ sub sip2_message {
        return $hash;
 }
 
-if ( my $server = $sip2->{server} ) {
-       my $sock = $sip2->{sock} = IO::Socket::INET->new( $server ) || die "can't connect to $server: $!";
-       warn "SIP2 server ", $sock->peerhost, ":", $sock->peerport, "\n";
-
-       # login
-       if ( sip2_message("9300CN$sip2->{user}|CO$sip2->{password}|")->{fixed} !~ m/^941/ ) {
-               die "SIP2 login failed";
-       }
-
-}
 
 use lib 'lib';
 use Biblio::RFID::RFID501;
@@ -198,6 +217,7 @@ sub http_server {
                                        }
                                        close($fh);
                                }
+                               $rfid_sid_cache = undef if $path eq 'examples/selfcheck.html'; # invalidate on reload
                        } elsif ( $method =~ m{/scan(/only/(.+))?} ) {
                                my $only = $2;
                                my @tags = $rfid->tags( reader => sub {
@@ -217,6 +237,7 @@ sub http_server {
                                                my $borrower = rfid_borrower $hash;
                                                if ( exists $borrower->{error} ) {
                                                        warn "ERROR ", dump($borrower);
+                                                       $hash->{error} = $borrower->{error};
                                                } else {
                                                        $hash->{borrower} = $borrower->{borrower};
                                                        $hash->{content}  = $borrower->{borrower}->{cardnumber}; # compatibile with 3M tags
@@ -350,8 +371,11 @@ sub rfid_register {
 
        my $ua = LWP::UserAgent->new;
        my $url = URI->new( $rfid_url . '/register.pl');
-       $url->query_form(
-               local_ip => $ip->{eth0} || $ip->{ (keys %$ip)[0] },
+       $url->query_form( %$ip,
+               HTTP_LISTEN => $listen,
+               RFID_LISTEN => $ENV{RFID_LISTEN},
+               KOHA_URL => $koha_url,
+               RFID_URL => $rfid_url,
        );
        warn "GET ",$url->as_string;
        my $response = $ua->get($url);