scatch new application level API

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

diff --git a/scripts/RFID-JSONP-server.pl b/scripts/RFID-JSONP-server.pl
index 7877fca..f374bd4 100755 (executable)
--- a/scripts/RFID-JSONP-server.pl
+++ b/scripts/RFID-JSONP-server.pl
@@ -19,16 +19,22 @@ use JSON::XS;
 use IO::Socket::INET;
 
 my $debug = 1;
+my $listen = '127.0.0.1:9000';
+my $reader;
 
-my $listen_port = 9000;                  # pick something not in use
-my $server_url  = "http://localhost:$listen_port";
+use Getopt::Long;
 
-my $reader = shift @ARGV;
+GetOptions(
+       'debug!'    => \$debug,
+       'listen=s', => \$listen,
+       'reader=s', => \$reader,
+) || die $!;
 
 use lib 'lib';
 use RFID::Biblio::RFID501;
 use RFID::Biblio::Readers;
-my $rfid = (RFID::Biblio::Readers->available( $reader ))[0]; # FIXME
+my $rfid = RFID::Biblio::Readers->new( shift @ARGV );
+warn "using readers: ",dump( $rfid->_available );
 
 my $index_html;
 {
@@ -36,17 +42,20 @@ my $index_html;
        $index_html = <DATA>;
 }
 
+my $server_url;
+
 sub http_server {
 
        my $server = IO::Socket::INET->new(
                Proto     => 'tcp',
-               LocalPort => $listen_port,
+               LocalAddr => $listen,
                Listen    => SOMAXCONN,
                Reuse     => 1
        );
                                                                  
        die "can't setup server: $!" unless $server;
 
+       $server_url = 'http://' . $listen;
        print "Server $0 ready at $server_url\n";
 
        while (my $client = $server->accept()) {
@@ -70,13 +79,29 @@ sub http_server {
 
                        if ( $path eq '/' ) {
                                print $client "HTTP/1.0 200 OK\r\nContent-Type: text/html\r\n\r\n$index_html";
+                       } elsif ( $path =~ m{^/(examples/.+)} ) {
+                               $path = $1; # FIXME prefix with dir for installation
+                               my $size = -s $path;
+                               warn "static $path $size bytes\n";
+                               my $content_type = 'text/plain';
+                               $content_type = 'application/javascript' if $path =~ /\.js/;
+                               print $client "HTTP/1.0 200 OK\r\nContent-Type: $content_type\r\nContent-Length: $size\r\n\r\n";
+                               {
+                                       local $/ = undef;
+                                       open(my $fh, '<', $path) || die "can't open $path: $!";
+                                       while(<$fh>) {
+                                               print $client $_;
+                                       }
+                                       close($fh);
+                               }
                        } elsif ( $method =~ m{/scan} ) {
-                               my $tags = $rfid->scan;
+                               my $tags = $rfid->scan || {};
                                my $json = { time => time() };
                                foreach my $tag ( keys %$tags ) {
                                        my $hash = RFID::Biblio::RFID501->to_hash( $tags->{$tag} );
                                        $hash->{sid}  = $tag;
-                                       $hash->{security} = uc unpack 'H*', $rfid->read_afi( $tag );
+                                       $hash->{security} = uc unpack 'H*', $rfid->read_afi( $tag )
+                                               if $rfid->can('read_afi');
                                        push @{ $json->{tags} }, $hash;
                                };
                                warn "#### ", encode_json($json);
@@ -89,13 +114,13 @@ sub http_server {
                                foreach my $p ( keys %$param ) {
                                        next unless $p =~ m/^(E[0-9A-F]{15})$/;
                                        my $tag = $1;
-                                       my $content = "\x04\x11\x00\x01" . $param->{$p};
-                                       $content = "\x00" if $param->{$p} eq 'blank';
+                                       my $content = RFID::Biblio::RFID501->from_hash({ content => $param->{$p} });
+                                       $content    = RFID::Biblio::RFID501->blank if $param->{$p} eq 'blank';
                                        $status = 302;
 
                                        warn "PROGRAM $tag $content\n";
-                                       write_tag( $tag, $content );
-                                       secure_tag_with( $tag, $param->{$p} =~ /^130/ ? 'DA' : 'D7' );
+                                       $rfid->write_blocks( $tag => $content );
+                                       $rfid->write_afi(    $tag => chr( $param->{$p} =~ /^130/ ? 0xDA : 0xD7 ) );
                                }
 
                                print $client "HTTP/1.0 $status $method\r\nLocation: $server_url\r\n\r\n";
@@ -113,7 +138,7 @@ sub http_server {
                                        $status = 302;
 
                                        warn "SECURE $tag $data\n";
-                                       secure_tag_with( $tag, $data );
+                                       $rfid->write_afi( $tag => hex($data) );
                                }
 
                                if ( $json ) {