X-Git-Url: http://git.annexia.org/?p=xavierbot.git;a=blobdiff_plain;f=xavierbot.pl;h=824c198ea7577251a801c94f33e415b712864a6a;hp=230612b943b1091c3bb0a94688068165c7cd4ff7;hb=5648f9a1f439de689fa51ea8de3833449faf25a1;hpb=999637103a46eed68aa5051dd23f0ce0a3daf92e

diff --git a/xavierbot.pl b/xavierbot.pl
index 230612b..824c198 100755
--- a/xavierbot.pl
+++ b/xavierbot.pl
@@ -1,11 +1,12 @@
-#!/usr/bin/perl -wT
+#!/usr/bin/perl -w
 # xavierbot : an OCaml interpreter IRC bot.
 # By Richard W.M. Jones <rich@annexia.org>.
 # This code is in the Public Domain.
-# $Id: xavierbot.pl,v 1.5 2007/06/28 23:18:28 rjones Exp $
+# $Id: xavierbot.pl,v 1.11 2007/07/05 12:43:14 rjones Exp $
 
 use strict;
 use POE qw(Component::IRC Wheel::Run);
+use Getopt::Long;
 
 #----------------------------------------------------------------------
 # Start of configuration.
@@ -13,18 +14,36 @@ use POE qw(Component::IRC Wheel::Run);
 my $nick = "xavierbot";
 my $ircname = "Xavierbot";		# Printable name.
 my $server = "chat.freenode.net";
-#my $server = "devserv.devel.redhat.com";
 my $port = 6667;
 my $channel = "#ocaml";
 
 # End of configuration.
 #----------------------------------------------------------------------
 
+# Command line args can override configuration.
+GetOptions ("nick=s" => \$nick,
+	    "ircname=s" => \$ircname,
+	    "server=s" => \$server,
+	    "port=i" => \$port,
+	    "channel=s" => \$channel)
+    or die "$0: GetOptions: $!";
+
+# Simple flood protection.  This counts number of lines received from
+# the toplevel, and is reset when we send a line.  If this exceeds
+# some value, then we just eat lines.
+# XXX This ought to count characters, not lines.
+my $flood_lim = 0;
+
+# Are we awake or sleeping?
+my $sleeping = 0;
+
+#----------------------------------------------------------------------
+
 $ENV{PATH} = "/usr/bin:/bin";
 
 POE::Session->create (
   package_states => [
-    main => [ qw(_default _start irc_001 irc_public got_stdout) ],
+    main => [ qw(_default _start irc_001 irc_public got_stdout got_sigchld) ],
   ],
 );
 
@@ -43,12 +62,9 @@ sub _start
 	 port => $port,
 	 ) or die "POE::Component::IRC->spawn failed: $!";
 
-    my $ocaml = POE::Wheel::Run->new
-	(
-	 Program => "./ocamlbotwrapper",
-	 StdoutEvent => "got_stdout",
-	 StderrEvent => "got_stdout",
-	 ) or die "POE::Wheel::Run->new ./ocamlbotwrapper failed: $!";
+    my $ocaml = start_toplevel ();
+
+    $kernel->sig(CHLD => qw(got_sigchld));
 
     $heap->{irc} = $irc;
     $heap->{ocaml} = $ocaml;
@@ -78,12 +94,45 @@ sub irc_public
     my $nick = (split /!/, $who)[0];
     my $channel = $where->[0];
 
+    my @usage =
+	(
+	 "expr ;;  evaluate expr in toplevel and print result",
+	 "help     help message",
+	 "restart  restart the toplevel",
+	 "sleep    go to sleep",
+	 "wake     wake me up from sleep",
+	 );
+
     print "got: $what\n";
-    if (my ($stmt) = $what =~ /^\s*([^#].*;;)\s*$/) {
-	$heap->{ocaml}->put ("$stmt\n");
+    # XXX How to interpolate $nick into the patterns?
+    if ($what =~ /^\s*xavierbot\b.*\bhelp\b/) {
+	my $nick = (split /!/, $who)[0];
+	$kernel->post ($sender => privmsg => $channel =>
+	    "hello $nick, I am xavierbot 0.6, an OCaml toplevel");
+	$kernel->post ($sender => privmsg => $channel => $_)
+	    foreach (@usage);
     }
-    elsif ($what =~ /$nick.*restart/) {
-	print STDOUT "got instruction to restart ...\n"
+    elsif (!$sleeping) {
+	if (my ($stmt) = $what =~ m/^\s*([^\#].*;;)\s*$/) {
+	    $heap->{ocaml}->put ("$stmt\n");
+	    $flood_lim = 0;
+	}
+	elsif ($what =~ /^\s*xavierbot\b.*\b(sleep|shut|quiet)\b/) {
+	    $sleeping = 1;
+	    $kernel->post ($sender => privmsg => $channel =>
+			   "xavierbot goes to sleep (do 'xavierbot wake' to wake)");
+	}
+    } else { # sleeping
+	if ($what =~ /^\s*xavierbot\b.*\bwake\b/) {
+	    $sleeping = 0;
+	    $kernel->post ($sender => privmsg => $channel =>
+			   "xavierbot wakes up");
+	}
+	elsif ($what =~ /^\s*xavierbot\b.*\brestart\b/) {
+	    $sleeping = 0;
+	    print STDOUT "got instruction to restart ...\n";
+	    restart_toplevel ($heap->{ocaml});
+	}
     }
     undef;
 }
@@ -106,11 +155,49 @@ sub _default
 
 #----------------------------------------------------------------------
 
-# Bot wrote something.
+# Toplevel wrote something.
 
 sub got_stdout
 {
     my ($kernel,$heap, $input, $wheel_id) = @_[KERNEL,HEAP,ARG0,ARG1];
     print "Child said: $input\n";
-    $kernel->post ($heap->{irc} => privmsg => $channel => "$input");
+    if ($flood_lim < 10) {
+	$kernel->post ($heap->{irc} => privmsg => $channel => "$input");
+    }
+    $flood_lim++;
+}
+
+# Got a SIGCHLD, so start the bot up again.
+
+sub got_sigchld
+{
+    my ($kernel, $heap) = @_[KERNEL,HEAP];
+    my $ocaml = start_toplevel ();
+    $heap->{ocaml} = $ocaml;
+}
+
+# Start up the toplevel (assumes it's not running).
+
+sub start_toplevel
+{
+    return POE::Wheel::Run->new
+	(
+	 Program => "./ocamlbotwrapper",
+	 StdoutEvent => "got_stdout",
+	 StderrEvent => "got_stdout",
+	 ) or die "POE::Wheel::Run->new ./ocamlbotwrapper failed: $!";
+}
+
+# Restart the toplevel - kill the old one, and a new one
+# will be spawned after we get the SIGCHLD signal.
+#
+# XXX Can't send signal to setuid child, so instead just close
+# stdin.
+
+sub restart_toplevel
+{
+    my $ocaml = shift;
+
+    $ocaml->kill (9);
+    $ocaml->shutdown_stdin;
 }