midori.rb 0.5.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f47091da1ed0c2aa5186718051d4c0f67cf691eb0c0cf579bbfeff0fa007e1e
-  data.tar.gz: 172665350943d2de1faae70882bfad72a799756edc3d993185ea6a6d0cb1661e
+  metadata.gz: ccffda67e06a88ed46a9e81ac52823498d331a147869f54a3c520bc70946f469
+  data.tar.gz: 2abeba1e323655b28a547814eccc536773b35316075b3852897ec109b4272719
 SHA512:
-  metadata.gz: 1a6801c29d82920d82cd25760ca929f3be55a402169d5518d34941409949e99e799e4a1170b267ccfe7707b66c00ace0b5b0674fffb1ebc3dfd842607a05025e
-  data.tar.gz: 6ee0eb8e0b7e496ca8c2a8f71e7d5e03d28172bd10839ae92e2ef01981076b3f9aba50d9ae1e7c1e6374b9b93c27fe8b63e1260de40eef8c67595f9dce45c7d2
+  metadata.gz: d68c112f68c228a79b46f2983e0bd4ba9b0ff25b8aa9025eca7893909719e7213a8236fca26d78ba2aad12926481d7f989d920148e00b866f9f86c8a6b3cff20
+  data.tar.gz: 6eae1c01af1fa93acf6bf817ce1c04121918a53d1f849815778eed0f974c36259bd1ee6df3901b86128d247b77dfca5c81e04e5e1477836aa2dd31c0c2a1061e

data/lib/midori/configure.rb

@@ -4,7 +4,6 @@ class Midori::Configure
   extend Configurable
 
   set :logger, ::Logger.new(STDOUT)
-  set :protocol, :http
   set :bind, '127.0.0.1'
   set :port, 8080
   set :route_type, :sinatra
@@ -14,4 +13,7 @@ class Midori::Configure
   set :trusted_proxies, /\A127\.0\.0\.1\Z|\A(10|172\.(1[6-9]|2[0-9]|30|31)|192\.168)\.|
                          \A::1\Z|\Afd[0-9a-f]{2}:.+|\Alocalhost\Z|\Aunix\Z|\Aunix:/ix
   set :tcp_fast_open, true
+  set :keep_alive, true
+  set :keep_alive_timeout, 75
+  set :keep_alive_requests, 1000
 end

data/lib/midori/connection.rb

@@ -23,9 +23,7 @@ class Midori::Connection
   def listen(socket)
     EventLoop.register(socket, :rw) do |monitor|
       @monitor = monitor
-      if monitor.readable?
-        receive_data(monitor)
-      end
+      receive_data(monitor) if monitor.readable?
       if monitor.writable?
         if !@buffer.empty?
           send_buffer
@@ -45,6 +43,7 @@ class Midori::Connection
   end
 
   # Send buffer immediately
+  # @return [nil] nil
   private def send_buffer
     if @monitor.writable?
       written = @socket.write_nonblock(@buffer)
@@ -59,13 +58,18 @@ class Midori::Connection
   end
 
   # Close the connection
+  # @return [nil] nil
   def close_connection
+    EventLoop.remove_timer(@keep_alive_timer) unless @keep_alive_timer.nil? # Be sure to remove timer for memory safety
     EventLoop.deregister @socket
     @socket.close
+    nil
   end
 
   # Close the connection after writing
+  # @return [nil] nil
   def close_connection_after_writing
     @close_flag = true
+    nil
   end
 end

data/lib/midori/server.rb

@@ -17,40 +17,41 @@ module Midori::Server
   def server_initialize(api, logger)
     @api = api
     @logger = logger
+
     @request = Midori::Request.new
     @websocket = Midori::WebSocket.new(self)
     @eventsource = Midori::EventSource.new(self)
+
+    # Add keep-alive parameters
+    @keep_alive_timer = nil
+    @keep_alive_count = 1
   end
 
   # Logic of receiving data
-  # @param [String] monitor the socket able to read
+  # @param [NIO::Monitor] monitor the socket able to read
   def receive_data(monitor)
-    lambda do
-      async_fiber(Fiber.new do
-        begin
-          _sock_domain, remote_port, _remote_hostname, remote_ip = monitor.io.peeraddr
-          port, ip = remote_port, remote_ip
-          @request.ip = ip
-          @request.port = port
-          data = monitor.io.read_nonblock(16_384)
-          if @request.parsed? && @request.body_parsed?
-            websocket_request(StringIO.new(data))
-          else
-            @request.parse(data)
-            receive_new_request if @request.parsed && @request.body_parsed?
-          end
-        rescue EOFError, Errno::ENOTCONN => _e
-          close_connection
-          # Ignore client's disconnection
-        rescue => e
-          # :nocov:
-          # Leave for corner cases
-          close_connection
-          @logger.warn "#{@request.ip} - - #{e.class} #{e.backtrace.join("\n")}".yellow
-          # :nocov:
+    async_fiber(Fiber.new do
+      begin
+        _sock_domain, remote_port, _remote_hostname, remote_ip = monitor.io.peeraddr
+        @request.ip, @request.port = remote_port, remote_ip
+        data = monitor.io.read_nonblock(16_384)
+        if @request.parsed? && @request.body_parsed?
+          websocket_request(StringIO.new(data))
+        else
+          @request.parse(data)
+          receive_new_request if @request.parsed && @request.body_parsed?
         end
-      end)
-    end.call
+      rescue EOFError, Errno::ENOTCONN => _e
+        close_connection
+        # Ignore client's disconnection
+      rescue => e
+        # :nocov:
+        # Leave for corner cases
+        close_connection
+        @logger.warn "#{@request.ip} - - #{e.class} #{e.backtrace.join("\n")}".yellow
+        # :nocov:
+      end
+    end)
   end
 
   # Logic of receiving new request
@@ -68,9 +69,10 @@ module Midori::Server
       @logger.error e.inspect.red
       @logger.warn e.backtrace.join("\n").yellow
     end
+
     unless @request.websocket? || @request.eventsource?
       send_data @response
-      close_connection_after_writing
+      proceed_keep_alive
     end
   end
 
@@ -109,4 +111,21 @@ module Midori::Server
   def call_event(event, args = [])
     -> { @websocket.instance_exec(*args, &@websocket.events[event]) }.call unless @websocket.events[event].nil?
   end
+
+  private def proceed_keep_alive
+    # Detect if it should close connection
+    if !Midori::Configure.keep_alive || (@keep_alive_count >= Midori::Configure.keep_alive_requests)
+      close_connection_after_writing
+      return
+    end
+    # Add timeout for keep-alive
+    @keep_alive_count += 1
+    EventLoop.remove_timer(@keep_alive_timer) unless @keep_alive_timer.nil?
+    @keep_alive_timer = EventLoop::Timer.new(Midori::Configure.keep_alive_timeout) do
+      close_connection
+    end
+    EventLoop.add_timer(@keep_alive_timer)
+    # Reset request
+    @request = Midori::Request.new
+  end
 end

data/lib/midori/version.rb

@@ -1,5 +1,5 @@
 # Midori Module
 module Midori
   # Current Version Code
-  VERSION = '0.5.4'.freeze
+  VERSION = '0.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midori.rb
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors:
 - HeckPsi Lab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-28 00:00:00.000000000 Z
+date: 2018-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: murasaki
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: mustermann
   requirement: !ruby/object:Gem::Requirement