wildsonet-server 0.2.1-java → 0.2.2-java

data/Gemfile

@@ -1,3 +1,5 @@
 source :rubygems
 
-gem "rack"
+gem "rack"
+gem "activesupport"
+gem "wildsonet-netty"

data/README.rdoc

@@ -4,7 +4,7 @@ Server backend for WildSoNet.
 
 == Implementation
 
-Embeds jetty web server and implements Java's servlet with simple Rack interface.
+Implements simple Rack interdace on top of Netty library.
 
 == Status
 
@@ -29,6 +29,8 @@ This server should be used behind front-end server.
         }
 
         location / {
+            proxy_set_header X-For-Host     $http_host;
+            proxy_set_header X-For-Scheme   $scheme;
             proxy_pass http://<rails_address>:<address_port>;
         }
 
@@ -58,6 +60,12 @@ where App is your Rack application.
 * Configuration (threadpool)
 * Lots of other features
 
+== Changes
+
+=== 0.2.2
+
+* Rewritten from Jetty to Netty - no need for full web server
+
 == Contributing to wildsonet-server
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/lib/wildsonet-server-version.rb

@@ -1,5 +1,5 @@
 module WildSoNet
   module Server
-    VERSION = "0.2.1" unless defined?(::WildSoNet::Server::VERSION)
+    VERSION = "0.2.2" unless defined?(::WildSoNet::Server::VERSION)
   end
 end

data/lib/wildsonet-server.rb

@@ -1,8 +1,9 @@
 require "java"
 
-Dir.glob(File.join(File.dirname(__FILE__), "..", "jars", "*")) do |file|
-  require file
-end
+require "wildsonet-netty"
+require "active_support/core_ext/hash/reverse_merge"
+
+require  File.join(File.dirname(__FILE__), "..", "jars", "wildsonet_server.jar")
 
 require "wildsonet-server-version"
 
@@ -12,19 +13,21 @@ module WildSoNet
   # Rack extensions from WildSoNet
   module Server
 
-    java_import "org.eclipse.jetty.server.Server"
-    java_import "org.eclipse.jetty.server.nio.SelectChannelConnector"
-    java_import "org.eclipse.jetty.servlet.ServletContextHandler"
-    java_import "org.eclipse.jetty.servlet.ServletHolder"
+    java_import "cz.wildsonet.server.RackProxy"
+    java_import "cz.wildsonet.server.Server"
 
-    java_import "org.jruby.embed.PathType"
-    java_import "org.jruby.embed.ScriptingContainer"
-    java_import "javax.servlet.http.HttpServlet"
+    java_import "org.jboss.netty.buffer.ChannelBuffers"
+    java_import "org.jboss.netty.handler.codec.http.DefaultHttpResponse"
+    java_import "org.jboss.netty.handler.codec.http.HttpResponseStatus"
+    java_import "org.jboss.netty.handler.codec.http.HttpVersion"
+    java_import "org.jboss.netty.channel.ChannelFutureListener"
 
     # Rack handler utilizing Jetty web server. Works with nginx as frontend server to proxy the requests.
     # Jetty handles only dynamic requests. Static requests are handled by nginx proxy.
 
-    class Handler < HttpServlet
+    class Handler
+
+      include RackProxy
 
       # Starts the server.
       #
@@ -36,132 +39,62 @@ module WildSoNet
         options[:Host]      ||= "0.0.0.0"
 
         # Create new server
-        @@server            = Server.new
-
-        # Create new connector and configure it according to options
-        connector           = SelectChannelConnector.new
-        connector.port      = options[:Port]
-        connector.host      = options[:Host]
-
-        # Add connector to server
-        @@server.connectors = [connector]
-
-        # Create new server context and configure it ad root
-        context             = ServletContextHandler.new(ServletContextHandler::NO_SESSIONS)
-        context.contextPath = "/"
+        @@server            = Server.new(options[:Host], options[:Port], self.new(app, options))
 
-        # Add context to server
-        @@server.handler    = context
-
-        # Create new handler
-        servlet             = Handler.new
-        servlet.setup(app, options)
-
-        # Connect the handler with context
-        context.addServlet(ServletHolder.new(servlet), "/*")
-
-        # Start server
-        @@server.start
-        @@server.join
-
-      end
+        Thread.new do
+          while true
+            Kernel.sleep 10
+          end
+        end.join
 
-      # Stops the server
-      def self.shutdown
-        # Stop server
-        @@server.stop
-        @@server = nil
       end
 
       # Setup the server.
       #
       # @param app Rack application to start
       # @param options Options for server
-      def setup(app, options)
-        @app     = app
+      def initialize(app, options)
+        @app     = ::Rack::Lint.new(app)
         @options = options
-
-        # By default serve static files from directory "public" in current directory
-        @options[:Public] ||= File.expand_path("public") 
       end
 
-      # Handles the request. Servlet method.
-      #
-      # @param request Request to process
-      # @param response Response to the request
-      def service request, response
-        # "Compute" the path to request file
-        file = File.join(@options[:Public], request.getRequestURI())
-        # Check file existence
-        if File.exists?(file) and File.file?(file)
-          # Tell the proxy server(nginx) to serve this request from static files
-          response.setHeader("X-Accel-Redirect", "/static" + request.getRequestURI())
-        else
-          # Process the request
-          self.call(request, response)
-        end
-      end
+      def call env
 
-      # Process the request
-      #
-      # @param request Request to be processed
-      # @param response Response to the request
-      def call request, response
-
-        # Prepare basic Rack environment
-        env = {
-            "REQUEST_METHOD"    => request.getMethod(),
-            "SCRIPT_NAME"       => "",
-            "PATH_INFO"         => request.getPathInfo() =~ /^\// ? request.getPathInfo() : "/" + request.getPathInfo(),
-            "QUERY_STRING"      => request.getQueryString(),
-            "SERVER_NAME"       => request.getServerName(),
-            "SERVER_PORT"       => request.getServerPort(),
-
-            "rack.version"      => [1, 1],
-            "rack.url_scheme"   => request.isSecure() ? "https" : "http",
-            "rack.input"        => request.getInputStream().to_io,
-            "rack.errors"       => $stderr,
-            "rack.multithread"  => true,
-            "rack.multiprocess" => false,
-            "rack.run_once"     => false,
-
-            # If this environment parameter is true after request processing, returned body will not be written to response
-            "wildsonet.written" => false
-        }
-
-        # Process HTTP headers from request; transforms header names into Rack format, if nil returned, the header is skipped
-        request.getHeaderNames().each do |name|
-          key = self.header_handler(name)
-          if key
-            env[key] = request.getHeader(name)
+        ruby = {}
+
+        env.keySet.each do |key|
+          case key
+            when "rack.input"
+              ruby[key] = env[key].to_io
+            when "rack.errors"
+              ruby[key] = env[key].to_io
+            else
+              ruby[key] = env[key]
           end
         end
 
-        # Process the request
-        status, headers, content = @app.call(env)
+        ruby["rack.version"] = ::Rack::VERSION
 
-        # Copy headers from Rack response to Servlet response
-        headers.each_pair do |key, value|
-          response.addHeader(key, value)
+        status, headers, body = @app.call(ruby)
+
+        response = DefaultHttpResponse.new(HttpVersion::HTTP_1_1, HttpResponseStatus.valueOf(status))
+
+        headers.each_pair do |header, value|
+          response.addHeader(header, value)
         end
 
-        # Set response status
-        response.setStatus(status)
+        buffer = ChannelBuffers.dynamicBuffer
+
+        body.each do |line|
+          buffer.writeBytes(line.to_s.to_java_bytes)
+        end
 
-        # Copy the content of request into Servlet output stream(writer)
-        # Skips this step if environment parameter was set to true 
-        content.each do |part|
-          response.writer.write(part)
-        end unless env["wildsonet.written"]
+        response.content = buffer
 
-      end
+        future = env["wsn.context"].channel.write(response)
 
-      # Processes header names to Rack format
-      #
-      # @param name Header name to transform
-      # @return Rack formatted header name or nil to skip the header
-      def header_handler name
-        "HTTP_" + name.to_s.sub("-", "_").upcase
+        future.addListener(ChannelFutureListener::CLOSE)
+        
       end
 
     end

data/wildsonet-server.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.name = "wildsonet-server"
   s.version = WildSoNet::Server::VERSION
   s.authors = ["Marek Jelen"]
-  s.summary = "Server backends for WildSoNet"
-  s.description = "Server backends for WildSoNet"
+  s.summary = "Server backend for WildSoNet"
+  s.description = "Server backend for WildSoNet on top of Netty library"
   s.email = "marek@jelen.biz"
   s.homepage = "http://github.com/marekjelen/wildsonet-server"
   s.licenses = ["MIT"]
@@ -26,14 +26,7 @@ Gem::Specification.new do |s|
     "Gemfile",
     "LICENSE.txt",
     "README.rdoc",
-    "jars/jetty-continuation-7.2.0.v20101020.jar",
-    "jars/jetty-http-7.2.0.v20101020.jar",
-    "jars/jetty-io-7.2.0.v20101020.jar",
-    "jars/jetty-security-7.2.0.v20101020.jar",
-    "jars/jetty-server-7.2.0.v20101020.jar",
-    "jars/jetty-servlet-7.2.0.v20101020.jar",
-    "jars/jetty-util-7.2.0.v20101020.jar",
-    "jars/servlet-api-2.5.jar",
+    "jars/wildsonet_server.jar",
     "lib/wildsonet-server.rb",
     "lib/wildsonet-server-version.rb",
     "wildsonet-server.gemspec"
@@ -45,6 +38,7 @@ Gem::Specification.new do |s|
   ]
 
   s.add_runtime_dependency("rack", ["> 1.0"])
-
+  s.add_runtime_dependency("wildsonet-netty", ["> 0.0"])
+  s.add_runtime_dependency("activesupport", ["> 3.0"])
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: java
 authors: 
 - Marek Jelen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-24 00:00:00 +01:00
+date: 2010-12-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,35 @@ dependencies:
         version: "1.0"
   type: :runtime
   version_requirements: *id001
-description: Server backends for WildSoNet
+- !ruby/object:Gem::Dependency 
+  name: wildsonet-netty
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        version: "0.0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :runtime
+  version_requirements: *id003
+description: Server backend for WildSoNet on top of Netty library
 email: marek@jelen.biz
 executables: []
 
@@ -44,14 +72,7 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.rdoc
-- jars/jetty-continuation-7.2.0.v20101020.jar
-- jars/jetty-http-7.2.0.v20101020.jar
-- jars/jetty-io-7.2.0.v20101020.jar
-- jars/jetty-security-7.2.0.v20101020.jar
-- jars/jetty-server-7.2.0.v20101020.jar
-- jars/jetty-servlet-7.2.0.v20101020.jar
-- jars/jetty-util-7.2.0.v20101020.jar
-- jars/servlet-api-2.5.jar
+- jars/wildsonet_server.jar
 - lib/wildsonet-server.rb
 - lib/wildsonet-server-version.rb
 - wildsonet-server.gemspec
@@ -88,6 +109,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Server backends for WildSoNet
+summary: Server backend for WildSoNet
 test_files: []