Moved to PocketIO. Closes #GH-5

vti · Nov 15, 2011 · 5c56e0c · 5c56e0c
1 parent 201e2a6
commit 5c56e0c
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,8 @@
+*.sw[p-z]
+blib
+Makefile
+MANIFEST
+Makefile.old
+pm_to_blib
+*.bak
+*~
diff --git a/.gitmodules b/.gitmodules
diff --git a/INSTALL b/INSTALL
@@ -12,7 +12,7 @@ Showmetheshell installation steps:
       installing them as a local user read more about App::cpanminus)
 
         bin/cpanm --sudo IO::Pty Term::VT102 JSON Plack Twiggy \
-            Plack::Middleware::SocketIO Text::Caml
+            PocketIO Text::Caml
 
     * Start the server
 

diff --git a/contrib/socket.io b/contrib/socket.io
diff --git a/htdocs/WebSocketMain.swf b/htdocs/WebSocketMain.swf
diff --git a/htdocs/WebSocketMainInsecure.swf b/htdocs/WebSocketMainInsecure.swf
diff --git a/htdocs/socket.io.min.js b/htdocs/socket.io.min.js
diff --git a/htdocs/socket.io/WebSocketMain.swf b/htdocs/socket.io/WebSocketMain.swf
diff --git a/htdocs/socket.io/socket.io.js b/htdocs/socket.io/socket.io.js
diff --git a/lib/Handler.pm b/lib/Handler.pm
@@ -35,24 +35,24 @@ sub run {
 
                 my $message = JSON->new->encode(
                     {type => 'row', row => $row, text => $text});
-                $self->send_message($message);
+                $self->send($message);
             },
             on_cursor_move => sub {
                 my ($terminal, $x, $y) = @_;
 
                 my $message =
                   JSON->new->encode({type => 'cursor', x => $x, y => $y});
-                $self->send_message($message);
+                $self->send($message);
             },
             on_finished => sub {
                 my $terminal = shift;
 
-                $self->disconnect;
+                $self->close;
             }
         );
 
-        $self->on_message(
-            sub {
+        $self->on(
+            message => sub {
                 my ($self, $message) = @_;
 
                 my $json = JSON->new;
@@ -77,8 +77,8 @@ sub run {
             }
         );
 
-        $self->on_disconnect(
-            sub {
+        $self->on(
+            disconnect => sub {
             }
         );
 

diff --git a/showmetheshell.psgi b/showmetheshell.psgi
@@ -1,12 +1,26 @@
 use strict;
 use warnings;
 
+my $root;
+
+BEGIN {
+    use File::Basename ();
+    use File::Spec     ();
+
+    $root = File::Basename::dirname(__FILE__);
+    $root = File::Spec->rel2abs($root);
+
+    unshift @INC, "$root/../../lib";
+}
+
 use lib 'lib';
 
 use Plack::Builder;
+use Plack::App::File;
 
 use Handler;
 use Text::Caml;
+use PocketIO;
 
 my $caml = Text::Caml->new(templates_path => 'templates');
 
@@ -22,12 +36,24 @@ my $app = sub {
 };
 
 builder {
+    mount '/socket.io/static/flashsocket/WebSocketMain.swf' =>
+      Plack::App::File->new(file => "$root/htdocs/WebSocketMain.swf");
+
+    mount '/socket.io/static/flashsocket/WebSocketMainInsecure.swf' =>
+      Plack::App::File->new(file => "$root/htdocs/WebSocketMainInsecure.swf");
+
     enable "Static",
       path => qr/\.(?:js|css|jpe?g|gif|png|html?|swf|ico)$/,
       root => 'htdocs';
 
-    enable "SocketIO",
-        instance => Handler->new(cmd => '/bin/bash');
+    mount '/socket.io' =>
+      PocketIO->new(instance => Handler->new(cmd => '/bin/bash'));
+
+    mount '/' => builder {
+        enable "Static",
+          path => qr/\.(?:js|css|jpe?g|gif|png|html?|swf|ico)$/,
+          root => "$root/public";
 
-    $app;
+        $app;
+    };
 };
diff --git a/templates/index.caml b/templates/index.caml
@@ -6,10 +6,10 @@
         <script type="text/javascript" src="/jquery.json.js"></script>
         <script type="text/javascript" src="/shell.js"></script>
         <script>WEB_SOCKET_SWF_LOCATION = '/socket.io/WebSocketMain.swf';</script>
-        <script type="text/javascript" src="/socket.io/socket.io.js"></script>
+        <script type="text/javascript" src="/socket.io.min.js"></script>
         <script type="text/javascript">
             $(document).ready(function() {
-                var socket = new io.Socket(null, {port: 5000, rememberTransport: false});
+                var socket = io.connect();
                 var shell  = new Shell();
 
                 socket.on('message', function(data) {