X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=scripts%2FRFID-JSONP-server.pl;h=2575c5774a845679b20a8cd70cd54efa73cba2e8;hb=1e5c22d43e68966665fd2ca04a226b036e24c71b;hp=0b4bd3d7fe2b2b374d01f841cb906fc6ce84b2fd;hpb=a1f72617c09d002fa7e7a45b06c9bb5d05640e0d;p=Biblio-RFID.git

diff --git a/scripts/RFID-JSONP-server.pl b/scripts/RFID-JSONP-server.pl
index 0b4bd3d..2575c57 100755
--- a/scripts/RFID-JSONP-server.pl
+++ b/scripts/RFID-JSONP-server.pl
@@ -19,15 +19,21 @@ 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;
 
+GetOptions(
+	'debug!'    => \$debug,
+	'listen=s', => \$listen,
+	'reader=s', => \$reader,
+) || die $!;
 
 use lib 'lib';
-use RFID::Serial::Decode::RFID501;
-use RFID::Serial::3M810;
-my $rfid = RFID::Serial::3M810->new;
+use RFID::Biblio::RFID501;
+use RFID::Biblio::Reader;
+my $rfid = RFID::Biblio::Reader->new( shift @ARGV );
 
 my $index_html;
 {
@@ -35,17 +41,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()) {
@@ -69,12 +78,28 @@ 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->tags;
 				my $json = { time => time() };
-				foreach my $tag ( keys %$tags ) {
-					my $hash = RFID::Serial::Decode::RFID501->to_hash( $tags->{$tag} );
+				foreach my $tag ( @tags ) {
+					my $hash = RFID::Biblio::RFID501->to_hash( $rfid->blocks( $tag ) );
 					$hash->{sid}  = $tag;
+					$hash->{security} = uc unpack 'H*', $rfid->afi( $tag );
 					push @{ $json->{tags} }, $hash;
 				};
 				warn "#### ", encode_json($json);
@@ -87,13 +112,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";
@@ -111,7 +136,7 @@ sub http_server {
 					$status = 302;
 
 					warn "SECURE $tag $data\n";
-					secure_tag_with( $tag, $data );
+					$rfid->write_afi( $tag => hex($data) );
 				}
 
 				if ( $json ) {
@@ -163,6 +188,15 @@ label[for=pull-reader] {
 </style>
 <script type="text/javascript">
 
+// mock console
+if(!window.console) {
+	window.console = new function() {
+		this.info = function(str) {};
+		this.debug = function(str) {};
+	};
+}
+
+
 function got_visible_tags(data,textStatus) {
 	var html = 'No tags in range';
 	if ( data.tags ) {