Changeset 15027

Timestamp:

01/10/07 17:10:03 (23 months ago)

Author:

andara

Message:

[runpugs]
-release of what was the 'devel' version, v0.3.0
-window/tab close now terminates session. Thanks diakopter.
-for those who didn't use the devel version: it's much faster now

Location:

misc/runpugs

Files:

• README (modified) (3 diffs)
• TODO (modified) (2 diffs)
• cgi-perl/test.pl (modified) (1 diff)
• htdocs/index.html (modified) (3 diffs)
• htdocs/runpugs/index.html (modified) (1 diff)
• htdocs/runpugs/runpugs.js (modified) (3 diffs)
• lib/Web/Terminal/Config.pm (deleted)
• lib/Web/Terminal/Dispatcher3.pm (modified) (1 diff)
• lib/Web/Terminal/Server/Session.pm (modified) (2 diffs)
• lib/Web/Terminal/Server3.pm (modified) (2 diffs)
• lib/Web/Terminal/Settings.pm (modified) (1 diff)
• lib/WebTerminal (deleted)
• perl/runpugs3.pl (modified) (2 diffs)

misc/runpugs/README

@@ -1 +1 @@
 ==============================================================================
-2006/12/12      Release of version 0.2.0 of runpugs/WebTerminal
+2007/01/10      Release of version 0.3.0 of runpugs/Web::Terminal
 ==============================================================================
 
 NAME
     runpugs: a web teminal for interactive pugs 
-    Web/Terminal: library for building a web terminal for interactive shells
+    Web::Terminal: library for building a web terminal for interactive shells
 
 INSTALLATION
@@ -11 +11 @@
     (e.g. ~/apache on feather, or /var/www elsewhere)
     Rename html folder if required (e.g. htdocs -> html or public_html)
-    * Start the terminal server script (bin/termserv2.pl) 
-    * To run, simply point your browser to /cgi-bin/runpugs (stable CGI
-     version) or just /runpugs/ (unstable version with asynchronous
-     JavaScript interface, running under mod_perl)
+    * Start the terminal server script (bin/termserv3.pl) 
+    * To run, simply point your browser to /runpugs/ 
 
 DESCRIPTION
     runpugs has two main components: 
-    -a cgi script (cgi-bin/runpugs) which uses an html template
-    (data/runpugs.html). The latter calls the runpugs.css stylesheet from
-    htdocs/runpugs.css
-    -a server (bin/termserv2.pl) which handles the interactive pugs sessions and communicates with
-    the cgi script. The pugs sessions stay alive for some time (currently 10') if
+    -a mod_perl script (/perl/runpugs3) which uses an html template
+    (/data/runpugs_async3.html). The latter calls the runpugs.css stylesheet from
+    /htdocs/runpugs.css. The script is called from /htdocs/runpugs/index.html
+    -a server (/bin/termserv3.pl) which handles the interactive pugs sessions and communicates with
+    the mod_perl script. The pugs sessions stay alive for some time (currently 10') if
     left inactive.
 
-    The unstable version has some AJAX-like goodness and runs under mod_perl.
-    The entrypoint is /htdocs/runpugs/index.html, which calls /perl/runpugs.pl
+    This version has some AJAX goodness and runs under mod_perl.
+    The entrypoint is /htdocs/runpugs/index.html, which calls /perl/runpugs3.pl
 
    The underlying library, Web/Terminal, can in principle be used for any
@@ -44 +42 @@
 ==============================================================================
 
+CHANGES IN VERSION 0.3.0
+    -Uses AJAX for persistent interface and mod_perl for speed
+    -Sessions are preloaded for fast startup
+    -The user interface behaves much more like a terminal.
+
 CHANGES IN VERSION 0.2.0
     -Web/Terminal replaces the original WebTerminal modules. This

misc/runpugs/TODO

@@ -1 @@
-runpugs version 0.2.0 TODO:
+runpugs version 0.3.0 TODO:
 
-2006/12/06
+2007/01/10
 * Unicode: hack Net::Telnet so it handles Unicode
 * Improve POD
-* Add proper copyright & licensing info, in particular to Msg.pm
 * Put more functionality in JS (clear, timeout, history)
-* Use true AJAX for front-end (prototype.js)
-* Convert to Perl: this is a nice long-term goal. 
+* Use true AJAX for front-end (e.g. prototype.js)
+* Convert to Perl6: this is a nice long-term goal. 
     Perl 5 Modules to be ported:
     - IO::Pty (xs based)
@@ -15 +14 @@
     - The Perl 6 equivalents of POSIX, Errno, IO::Select, Carp
    Of course we can use the Perl 5 implementations for the time being.
-* Test mod_perl; tailor code for mod_perl?   

misc/runpugs/cgi-perl/test.pl

@@ -1 +1 @@
 print "Content-type: text/html\n\n";
 print "Hi There!";
+system('echo "1" > tmplog');

misc/runpugs/htdocs/index.html

@@ -16 +16 @@
 <p><tt>runpugs</tt> lives at <a
 href="http://run.pugscode.org">run.pugscode.org</a>.</p>
-<p>By default, the Pugs session will use the <a
+<p>By default, the pugs session will use the  latest development snapshot. You can choose the <a
 href="http://search.cpan.org/search?query=perl6%3A%3Apugs">latest
-release</a>. You can try the latest development snapshot of Pugs by selecting the 'Development' radio button.</p>
+release</a> by selecting
+the 'Release' radio button.</p>
+<!--
 <p>Don't hesitate to test the <em>development version</em> of
 <tt>runpugs</tt>:</p><ul><li>try the <a
 href="http://feather.perl6.nl:8080/runpugs/">interactive session</a>
 with command history, fast startup and response and a persistent interface; </li> 
-<li>or <a
+<li>or-->
+<p>You can also <a
 href="http://feather.perl6.nl:8080/cgi-bin/runp6script">run a full Perl 6
-script</a> in <em>non-interactive</em> mode.</li>
-
-</ul>
-
+script</a> in non-interactive mode.
+</p>
+<p>If your browser does not support JavaScript, you can use the <a
+href="http://feather.perl6.nl:8080/cgi-bin/runpugs">non-AJAX version</a>.</p>
 <h2>Instructions</h2>
 <p><tt>runpugs</tt> presents the pugs interactive shell. Only
@@ -41 +44 @@
 <code>:q</code>)</dd><br>
 </dl>
-<p>Please be considerate and do <em>quit</em> your
+<!--<p>Please be considerate and do <em>quit</em> your
 pugs session  before you close the browser window.
-</p>
+</p>-->
 <h2>Restrictions</h2>
 <p>Because this is a web terminal, a number of restrictions apply:</p>
@@ -69 +72 @@
 restrictive.</p>
 <h2>Known issues</h2>
-<p><tt>runpugs</tt> is a very young project, and there will certainly be some bugs. Some known issues are:</p>
+<p><tt>runpugs</tt> is a very young project, and there will certainly be some
+bugs. Known issues are:</p>
 <ul>
 <li>Unicode is not supported.</li>
-<li>There is no command history.</li>
 </ul>
 <h2>Source</h2>

misc/runpugs/htdocs/runpugs/index.html

@@ -5 +5 @@
 <script language="JavaScript" src="runpugs.js"></script>
 </head>
-<body>
-
+<body onunload="HandleOnUnload(event)">
 <iframe src="/perl/runpugs3.pl" id="scratch" name="scratch"
 style="visibility:hidden" width="700px" height="1px"  onLoad="getreply()"></iframe>

misc/runpugs/htdocs/runpugs/runpugs.js

@@ -3 +3 @@
 var histentry=0;
 var reply="";
-
+var sessionid=0;
+var reldev=1;
 function getnchars() {
     return document.terminal.cmd.value.length
@@ -100 +101 @@
     histlist=scratchpad.terminal.history.options;
     histentry=histlist.length;
+    sessionid=scratchpad.terminal.sessionid.value;
+    //reldev=scratchpad.terminal.reldev.value;
     //histlist.reverse;
     document.terminal.cmd.value=reply;
@@ -141 +144 @@
 </textarea>
 */
+
+/* Courtesy of diakopter */
+//WV01012007: But it does not send a ':q' on close. 
+//in fact, it looks like the handler is completely ignored.
+function HandleOnUnload(evt)
+{
+        if ( (navigator.userAgent.toUpperCase().indexOf( "SAFARI" ) == -1) &&  // Exclude Safari.
+        ( (document.all && window.screenLeft >= 10004)   // IE moves the window 10000 pixels to the right while closing it
+                || (!document.all && evt.target==null) ) )  // Firefox sets the target of the passed event to null.
+        { // The window has been closed.  Submit a logout request to the server.
+    var expireSessionUrl='/perl/runpugs3.pl?sessionid='+sessionid+'&reldev=1&ia=1&cmd=%3Aq';
+                var objXMLCloser = null;
+                if ( !document.all && !XMLHttpRequest ) return;
+                if ( document.all ) { objXMLCloser = new ActiveXObject( "Microsoft.XMLHTTP" ) }
+                else if ( XMLHttpRequest ) { objXMLCloser = new XMLHttpRequest(); }
+                if (objXMLCloser) { objXMLCloser.open( 'GET', expireSessionUrl, false ); objXMLCloser.send( null ); }
+        }
+}
+
+/* usage: 
+
+This will work in any server-language environment that maintains session state on the server with timeouts.  This will help prevent large accumulation of sessions in memory on the servers.
+
+You need to include the javascript file above.
+
+Usage: on the page where you want to trap the window close event, add the following to the body tag as follows: 
+<body onunload="HandleOnUnload(event)">
+
+*/

misc/runpugs/lib/Web/Terminal/Dispatcher3.pm

@@ -2 +2 @@
 
 use vars qw( $VERSION );
-$VERSION = '0.2.0';
+$VERSION = '0.3.0';
 use strict;
 use utf8;

misc/runpugs/lib/Web/Terminal/Server/Session.pm

@@ -2 +2 @@
 
 use vars qw( $VERSION );
-$VERSION='0.2.0';
+$VERSION='0.3.0';
 use strict;
 use utf8;
@@ -155 +155 @@
        $obj->{pugs}->close();
         kill 9, $obj->{'pid'};
-        $lline.="Generated output is limited to $Web::Terminal::Settings::nlines lines. Aborted.\npugs";
+        $lline.="Generated output is limited to $Web::Terminal::Settings::nlines lines. Aborted.\n";
         $obj->{'error'}=1;
     }

misc/runpugs/lib/Web/Terminal/Server3.pm

@@ -251 +251 @@
                                 return $Web::Terminal::Settings::prompt;
                         }
-                } else {
+                #} else {
+            # WARNING: HERE WE MUST CHECK IF cmd eq ':q'
+            # IF SO, ignore! 
+             } elsif ($cmd ne ':q') {
                         if ( $nsessions_per_ip{$ip} >
                                 $Web::Terminal::Settings::nsessions_ip )
@@ -289 +292 @@
                                         }
                                 }
-                        }
-                }
+                    }
+        } else { # a quit on a non-exisiting session 
+             return "Session was already closed.\n";
+            }
         }
     } else { # non-interactive

misc/runpugs/lib/Web/Terminal/Settings.pm

@@ -4 +4 @@
 
 use vars qw( $VERSION );
-$VERSION = '0.2.0';
+$VERSION = '0.3.0';
 use utf8;
 use strict;

misc/runpugs/perl/runpugs3.pl

@@ -68 +68 @@
                 last;
         };
-        $cmdline=~/$Web::Terminal::Settings::quit_message/ 
+        $cmdline=~/$Web::Terminal::Settings::quit_message|Aborted/ 
         && do {
         $cmd='clear';
@@ -135 +135 @@
             $reply = "Sorry, Unicode is not yet supported.\n".$Web::Terminal::Settings::prompt;
         } else {
-            if ($cmd=~/>\s+(\:*help)\b/) {
+            if ($cmd=~/\s*(\:*help)\b/) {
                 $cmd=~s/$1/:h/;
-            } elsif ($cmd=~/>\s+(\:*(quit|bye))\b/) {
+            } elsif ($cmd=~/\s*(\:*(quit|bye))\b/) {
                 $cmd=~s/$1/:q/;
             }