jubilee 1.0.2 → 1.1.0.rc1

data/Rakefile

@@ -28,16 +28,17 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/isaiah/jubilee"
   gem.license = "MIT"
   gem.summary = %Q{More than a server for rack applications.}
-  gem.description = %Q{Jubilee is a experimental webserver built for speed, it's based on Vertx.}
+  gem.description = %Q{Jubilee is a jruby webserver built upon Vertx.}
   gem.email = "issaria@gmail.com"
   gem.authors = ["Isaiah Peng"]
+  gem.version = Jubilee::Version::STRING
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
+  test.libs << 'lib' << 'test' << 'spec'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
@@ -56,7 +57,7 @@ task :default => :test
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
-  version = Jubilee::VERSION
+  version = Jubilee::Version::STRING
 
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "jubilee #{version}"
@@ -80,7 +81,7 @@ desc "Compile the extension, need jdk7 because vertx relies on it"
 task :compile => "pkg/classes" do |t|
   ant.javac :srcdir => "java", :destdir => t.prerequisites.first,
     :source => "1.7", :target => "1.7", :debug => true,
-    :classpath => "${java.class.path}:${sun.boot.class.path}:jars/vertx-core-2.1.0-SNAPSHOT.jar:jars/netty-all-4.0.4.Final.jar:jars/jackson-core-2.2.2.jar:jars/jackson-databind-2.2.2.jar:jars/jackson-annotations-2.2.2.jar:jars/hazelcast-2.6.jar"
+    :classpath => "${java.class.path}:${sun.boot.class.path}:jars/vertx-core-2.1M3-SNAPSHOT.jar:jars/netty-all-4.0.13.Final.jar:jars/jackson-core-2.2.2.jar:jars/jackson-databind-2.2.2.jar:jars/jackson-annotations-2.2.2.jar:jars/hazelcast-2.6.3.jar"
 end
 
 desc "Build the jar"
@@ -88,7 +89,7 @@ task :jar => [:clean, :compile] do
   ant.jar :basedir => "pkg/classes", :destfile => "lib/jubilee/jubilee.jar", :includes => "**/*.class"
 end
  
-task :package => :jar
+task :build => :jar
 
 desc "Run the specs"
 task :spec => :jar do

data/examples/chatapp/Gemfile

@@ -1,4 +1,5 @@
+source "https://rubygems.org"
 gem 'sinatra'
 gem 'haml'
 
-gem 'jubilee', '1.0.0.beta1'
+gem 'jubilee', '~> 1.0.2'

data/examples/chatapp/Gemfile.lock

@@ -1,15 +1,17 @@
 GEM
+  remote: https://rubygems.org/
   specs:
-    ffi (1.9.0-java)
-    haml (4.0.3)
+    ffi (1.9.3)
+    ffi (1.9.3-java)
+    haml (4.0.4)
       tilt
-    jubilee (1.0.0.beta1)
+    jubilee (1.0.2)
       rack (>= 1.4.1)
       spoon (~> 0.0.4)
     rack (1.5.2)
-    rack-protection (1.5.0)
+    rack-protection (1.5.1)
       rack
-    sinatra (1.4.3)
+    sinatra (1.4.4)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
@@ -22,5 +24,5 @@ PLATFORMS
 
 DEPENDENCIES
   haml
-  jubilee (= 1.0.0.beta1)
+  jubilee (~> 1.0.2)
   sinatra

data/examples/chatapp/README.md

@@ -1,7 +1,10 @@
 Get started
 -----------
 
-Make sure you are using jruby 1.7+ and your JDK version is 7+
+There is a [online demo](http://192.241.201.68:8080/) for this
+application.
+
+Make sure you are using jruby 1.7+ (jubilee 1.1.0+ require jruby 1.7.5 or later) and your JDK version is 7+
 
 To run the application:
 
@@ -9,6 +12,6 @@ To run the application:
 bundle && jubilee --eventbus /eventbus
 ```
 
-Then go to http://localhost:3215 in your browser, if you have the page
+Then go to http://localhost:8080 in your browser, if you have the page
 opened in multiple tabs or windows you can see the message you sent are
 broadcasted to all the other tabs.

data/examples/chatapp/app.rb

@@ -1,5 +1,25 @@
 require 'bundler/setup'
 Bundler.require(:default)
+require 'vertx'
+
+def to_a(shared_set)
+  ret = []
+  shared_set.each{ |item| ret << item}
+  ret
+end
+
+Vertx::EventBus.register_handler('logout') do |message|
+  Vertx::SharedData.get_set(:users).delete(message.body)
+end
+
+# register the user and return the pervious users
+Vertx::EventBus.register_handler('login') do |message|
+  user = message.body
+  users = Vertx::SharedData.get_set(:users).add(user)
+  message.reply(users: to_a(users))
+  Vertx::EventBus.publish("new_user", user)
+end
+
 
 get "/" do
   haml :index
@@ -24,6 +44,10 @@ __END__
 @@index
 #updates
 
+%p
+  %label receiver
+  %select#receivers(name="receiver")
+    %option all
 %p
   %textarea#content(name="content" rows=8 cols=80)
 

data/examples/chatapp/public/assets/javascripts/application.js

@@ -1,14 +1,67 @@
+// To generate a random id 
+function s4() {
+  return Math.floor((1 + Math.random()) * 0x10000)
+    .toString(16)
+    .substring(1);
+};
+
 $(function() {
   var eb = new vertx.EventBus("/eventbus");
+  var updates = $("#updates");
+  var uid = "Guest_" + s4();
 
   eb.onopen = function() {
-                eb.registerHandler("chat", function(data) {
-                  $("#updates").append(data + "<br/>");
-                });
-              }
+    eb.send("login", uid, function(data){
+      for(var i = 0; i < data.users.length; i++) {
+        if (data.users[i] != uid) $("#receivers").append("<option>" + data.users[i] + "</option>");
+      }
+    });
+    updates.html("<h5>Welcome to the Jubilee chat room!</h5>");
+    eb.registerHandler("chat", function(data) {
+      if (data.sender != uid)
+        updates.append("<div class='public'><span class='sender'>" + data.sender + " said:</span>" + data.message + "</div>");
+      else
+        updates.append("<div class='public by_you'><span class='sender'>You said:</span>" + data.message + "</div>");
+    });
+
+    eb.registerHandler("new_user", function(data) {
+      if (data != uid) {
+        $("#receivers").append("<option>" + data + "</option");
+        updates.append("<div class='login'>" + data + " joined the room.</div>");
+      }
+    });
+
+    eb.registerHandler(uid, function(data) {
+      updates.append("<div class='private'><span class='sender'>" + data.sender + " said to you:</span>" + data.message + "</div>");
+    });
+
+    eb.registerHandler("logout", function(data) {
+      $('#receivers option:contains("' + data + '")').remove();
+      updates.append("<div class='logout'>" + data + " left the room.</div>");
+    });
 
-  $("#send").click(function() {
-    eb.publish("chat", $("#content").val());
+    window.onbeforeunload = function() {
+      eb.publish("logout", uid);
+    }
+  }
+
+  var sendMessage = function() {
+    var msg = $("#content").val();
+    if ((receiver = $("#receivers").val()) === "all") {
+      eb.publish("chat", {sender: uid, message: msg});
+    } else {
+      updates.append("<div class='public by_you'><span class='sender'>You said to " + uid + ":</span>" + msg + "</div>");
+      eb.send(receiver, {sender: uid, message: msg});
+    }
     $("#content").val("");
+  }
+
+  $("#send").click(sendMessage);
+
+  $(document.body).keyup(function(ev) {
+    if (ev.which === 13) {
+      sendMessage();
+    }
   });
+
 });

data/examples/chatapp/public/assets/stylesheets/application.css

@@ -2,3 +2,28 @@
   min-height: 400px;
   border: 1px solid #ccc;
 }
+
+.public, .private, .login, .logout {
+  border-bottom: 1px solid #CCCCCC;
+  line-height: 1.2em;
+}
+
+.private {
+  color: blue;
+}
+
+.login {
+  color: green;
+}
+.logout {
+  color: red;
+}
+.by_you {
+  color: gray;
+}
+.sender {
+  display: inline-block;
+  width: 168px;
+  font-size: 0.8em;
+  font-style: italic;
+}

data/examples/jubilee.conf.rb

@@ -1,9 +1,6 @@
 # Listen to port 3000
 listen 3000
 
-# the number of workers to serve client
-worker_threads 4
-
 # the ssl certification path
 ssl_keystore "jubilee/keystore.jks"
 

data/java/src/jubilee/JubileeService.java

@@ -1,20 +1,20 @@
 package jubilee;
 
 import org.jruby.Ruby;
-import org.jruby.jubilee.Server;
-import org.jruby.jubilee.impl.NullIO;
-import org.jruby.jubilee.impl.RubyIORackErrors;
+import org.jruby.jubilee.RubyHttpServerResponse;
+import org.jruby.jubilee.RubyServer;
 import org.jruby.jubilee.impl.RubyIORackInput;
+import org.jruby.jubilee.impl.RubyNullIO;
 import org.jruby.runtime.load.BasicLibraryService;
 
 import java.io.IOException;
 
 public class JubileeService implements BasicLibraryService {
     public boolean basicLoad(final Ruby ruby) throws IOException {
-        Server.createServerClass(ruby);
-        RubyIORackErrors.createRubyIORackErrorsClass(ruby);
-        RubyIORackInput.createRubyIORackInputClass(ruby);
-        NullIO.createNullIOClass(ruby);
+        RubyServer.createServerClass(ruby);
+        RubyHttpServerResponse.createHttpServerResponseClass(ruby);
+        RubyIORackInput.createIORackInputClass(ruby);
+        RubyNullIO.createNullIOClass(ruby);
         return true;
     }
 }

data/java/src/org/jruby/jubilee/Const.java

@@ -14,10 +14,11 @@ import java.util.Map;
  */
 public final class Const {
 
-    public static final String JUBILEE_VERSION = "Jubilee 0.5.0";
+    public static final String JUBILEE_VERSION = "Jubilee(1.1.0)";
     public static final String HTTP_11 = "HTTP/1.1";
     public static final String HTTP_10 = "HTTP/1.0";
 
+    public static final String SCRIPT_NAME = "SCRIPT_NAME";
     public static final String SERVER_SOFTWARE = "SERVER_SOFTWARE";
     public static final String SERVER_PROTOCOL = "SERVER_PROTOCOL";
     public static final String GATEWAY_INTERFACE = "GATEWAY_INTERFACE";
@@ -50,7 +51,7 @@ public final class Const {
     public static final String HTTP_CONTENT_LENGTH = "CONTENT_LENGTH";
 
     public static class Rack {
-        public static final String HTTP_DATE = "HTTP_DATE";
+        public static final String HTTP_AUTHORIZATION = "HTTP_AUTHORIZATION";
         public static final String HTTP_EXPECT = "HTTP_EXPECT";
         public static final String HTTP_IF_MATCH = "HTTP_IF_MATCH";
         public static final String HTTP_IF_MODIFIED_SINCE = "HTTP_IF_MODIFIED_SINCE";
@@ -78,13 +79,15 @@ public final class Const {
         public static final String ACCEPT = "accept";
         public static final String ACCEPT_LANGUAGE = "accept-language";
         public static final String ACCEPT_ENCODING = "accept-encoding";
+        public static final String AUTHORIZATION = "authorization";
         public static final String CONNECTION = "connection";
-        public static final String CONTENT_TYPE = "content-type";
-        public static final String CONTENT_LENGTH = "content-length";
+        public static final String CONTENT_TYPE = "Content-Type";
+        public static final String CONTENT_LENGTH = "Content-Length";
         public static final String CONTENT_MD5 = "content-md5";
         public static final String HOST = "host";
 
-        public static final String DATE = "date";
+        public static final String TRANSFER_ENCODING = "Transfer-Encoding";
+
         public static final String EXPECT = "expect";
         public static final String IF_MATCH = "if-match";
         public static final String IF_MODIFIED_SINCE = "if-modified-since";
@@ -104,35 +107,6 @@ public final class Const {
         public static final String X_FORWARDED_FOR = "x-forwarded-for"; // original ip
     }
 
-    public static Map<String, String> ADDITIONAL_HEADERS = new HashMap<String, String>();
-
-    static {
-        ADDITIONAL_HEADERS.put(Vertx.DATE, Rack.HTTP_DATE);
-        ADDITIONAL_HEADERS.put(Vertx.EXPECT, Rack.HTTP_EXPECT);
-        ADDITIONAL_HEADERS.put(Vertx.IF_MATCH, Rack.HTTP_IF_MATCH);
-        ADDITIONAL_HEADERS.put(Vertx.IF_MODIFIED_SINCE, Rack.HTTP_IF_MODIFIED_SINCE);
-        ADDITIONAL_HEADERS.put(Vertx.IF_NONE_MATCH, Rack.HTTP_IF_NONE_MATCH);
-        ADDITIONAL_HEADERS.put(Vertx.IF_RANGE, Rack.HTTP_IF_RANGE);
-        ADDITIONAL_HEADERS.put(Vertx.IF_UNMODIFIED_SINCE, Rack.HTTP_IF_UNMODIFIED_SINCE);
-        ADDITIONAL_HEADERS.put(Vertx.RANGE, Rack.HTTP_RANGE);
-        ADDITIONAL_HEADERS.put(Vertx.PRAGMA, Rack.HTTP_PRAGMA);
-        ADDITIONAL_HEADERS.put(Vertx.MAX_FORWARDS, Rack.HTTP_MAX_FORWARDS);
-        ADDITIONAL_HEADERS.put(Vertx.REFERER, Rack.HTTP_REFERER);
-        ADDITIONAL_HEADERS.put(Vertx.VIA, Rack.HTTP_VIA);
-        ADDITIONAL_HEADERS.put(Vertx.WARNING, Rack.HTTP_WARNING);
-        ADDITIONAL_HEADERS.put(Vertx.X_REQUESTED_WITH, Rack.HTTP_X_REQUESTED_WITH);
-        ADDITIONAL_HEADERS.put(Vertx.DNT, Rack.HTTP_DNT);
-        ADDITIONAL_HEADERS.put(Vertx.X_FORWARDED_FOR, Rack.HTTP_X_FORWARDED_FOR);
-        ADDITIONAL_HEADERS.put(Vertx.CONTENT_MD5, Rack.HTTP_CONTENT_MD5);
-    }
-
-    public static RubyArray RackVersion(Ruby runtime) {
-        RubyArray version = RubyArray.newArray(runtime, 2);
-        version.add("1");
-        version.add("4");
-        return version;
-    }
-
     public static final String HTTP = "http";
     public static final String HTTPS = "https";
     public static final String URL_SCHEME = "rack.url_scheme";
@@ -141,7 +115,8 @@ public final class Const {
     public static final String RACK_MULTITHREAD = "rack.multithread";
     public static final String RACK_MULTIPROCESS = "rack.multiprocess";
     public static final String RACK_RUNONCE = "rack.run_once";
-    public static final String SCRIPT_NAME = "SCRIPT_NAME";
+
+    public static final String RACK_HIJACK_P = "rack.hijack?";
 
     private Const() {
     }

data/java/src/org/jruby/jubilee/RackApplication.java

@@ -3,17 +3,23 @@ package org.jruby.jubilee;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.jruby.Ruby;
+import org.jruby.RubyArray;
+import org.jruby.RubyClass;
+import org.jruby.RubyFixnum;
 import org.jruby.javasupport.JavaEmbedUtils;
-import org.jruby.jubilee.impl.DefaultRackEnvironment;
+import org.jruby.jubilee.impl.RackEnvironment;
 import org.jruby.jubilee.impl.RubyIORackInput;
+import org.jruby.jubilee.impl.RubyNullIO;
+import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.vertx.java.core.Handler;
+import org.vertx.java.core.Vertx;
 import org.vertx.java.core.VoidHandler;
 import org.vertx.java.core.buffer.Buffer;
 import org.vertx.java.core.http.HttpServerRequest;
+import org.vertx.java.core.impl.DefaultVertx;
 
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
@@ -23,51 +29,76 @@ import java.util.concurrent.atomic.AtomicBoolean;
  * Time: 5:40 PM
  */
 public class RackApplication {
-  private IRubyObject app;
-  private boolean ssl;
+    private IRubyObject app;
+    private boolean ssl;
+    private Ruby runtime;
+    private DefaultVertx vertx;
+    private RubyClass rackIOInputClass;
+    private RubyClass httpServerResponseClass;
+    private RubyArray rackVersion;
+    private RubyNullIO nullio;
+    private RackEnvironment rackEnv;
 
-  private ExecutorService exec;
+    public RackApplication(Vertx vertx, ThreadContext context, IRubyObject app, boolean ssl) throws IOException {
+        this.app = app;
+        this.ssl = ssl;
+        this.vertx = (DefaultVertx) vertx;
+        this.runtime = context.runtime;
+        this.rackVersion = RubyArray.newArrayLight(runtime, RubyFixnum.one(runtime), RubyFixnum.four(runtime));
+        // Memorize the ruby classes
+        this.rackIOInputClass = (RubyClass) runtime.getClassFromPath("Jubilee::IORackInput");
+        this.httpServerResponseClass = (RubyClass) runtime.getClassFromPath("Jubilee::HttpServerResponse");
+        this.nullio = new RubyNullIO(runtime, (RubyClass) runtime.getClassFromPath("Jubilee::NullIO"));
 
-  public RackApplication(IRubyObject app, boolean ssl, int numberOfWorkers) {
-    this.app = app;
-    this.ssl = ssl;
-    exec = Executors.newFixedThreadPool(numberOfWorkers);
-  }
+        this.rackEnv = new RackEnvironment(runtime);
+    }
 
-  public void call(final HttpServerRequest request) {
-    final ByteBuf bodyBuf = Unpooled.unreleasableBuffer(Unpooled.buffer(0, Integer.MAX_VALUE));
-    final Ruby runtime = app.getRuntime();
-    final AtomicBoolean eof = new AtomicBoolean(false);
-    request.dataHandler(new Handler<Buffer>() {
-      @Override
-      public void handle(Buffer buffer) {
-        bodyBuf.writeBytes(buffer.getBytes());
-      }
-    });
-    // TODO optimize by use NullIO when there is no body here.
-    Runnable task = new Runnable() {
-      @Override
-      public void run() {
-        RackInput input = new RubyIORackInput(runtime, request, bodyBuf, eof);
-        RackEnvironment env = new DefaultRackEnvironment(runtime, request, input, ssl);
-        IRubyObject result = app.callMethod(runtime.getCurrentContext(), "call", env.getEnv());
-        RackResponse response = (RackResponse) JavaEmbedUtils.rubyToJava(runtime, result, RackResponse.class);
-        response.respond(request.response());
-      }
-    };
-    exec.execute(task);
-    request.endHandler(new VoidHandler() {
-      @Override
-      protected void handle() {
-        eof.set(true);
-      }
-    });
-  }
+    public void call(final HttpServerRequest request) {
+//        String te = request.headers().get(Const.Vertx.TRANSFER_ENCODING);
+//        String contentLength;
+        final RackInput input;
+        // This should be handled by Netty (expose a contentLength methods via HttpRequest,
+        // it set the empty content flag when passing the header
+//        if ((te != null && te.equals("chunked")) ||
+//                ((contentLength = request.headers().get(Const.Vertx.CONTENT_LENGTH)) != null && !contentLength.equals("0"))) {
+            final ByteBuf bodyBuf = Unpooled.buffer(0, Integer.MAX_VALUE);
+            final AtomicBoolean eof = new AtomicBoolean(false);
+            input = new RubyIORackInput(runtime, rackIOInputClass, request, bodyBuf, eof);
+
+            request.dataHandler(new Handler<Buffer>() {
+                @Override
+                public void handle(Buffer buffer) {
+                    bodyBuf.writeBytes(buffer.getByteBuf());
+                }
+            });
+
+            request.endHandler(new VoidHandler() {
+                @Override
+                protected void handle() {
+                    eof.set(true);
+                }
+            });
+//        } else {
+//            input = nullio;
+//        }
+        Runnable task = new Runnable() {
+            @Override
+            public void run() {
+                // This is a different context, do NOT replace runtime.getCurrentContext()
+//                IRubyObject result = app.callMethod(runtime.getCurrentContext(), "call", env.getEnv());
+                try {
+                    IRubyObject result = app.callMethod(runtime.getCurrentContext(), "call", rackEnv.getEnv(request, input, ssl));
+                    RackResponse response = (RackResponse) JavaEmbedUtils.rubyToJava(runtime, result, RackResponse.class);
+                    RubyHttpServerResponse resp = new RubyHttpServerResponse(runtime,
+                            httpServerResponseClass,
+                            request.response());
+                    response.respond(resp);
+                } catch (IOException e) {
+                    // noop
+                }
+            }
+        };
+        vertx.startInBackground(task, false);
+    }
 
-  public void shutdown(boolean force) {
-    if (force)
-      exec.shutdownNow();
-    else
-      exec.shutdown();
-  }
 }