midori.rb 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2adfa1f5075c05406725691e2e254c7ac1e0f3ff9aba2e8787d9567323681654
-  data.tar.gz: f6f22a1df53862dbc956f53b188a7e4b023c6ef85e58f879c4fcdaefb0539e38
+  metadata.gz: edd8000aa37d5c07d175259326fe4b04cb6abe08f544d9ba3d9abd97d95ee07e
+  data.tar.gz: b99490a6e749c18d6cbb780141f970f23fc5bddf33b55575b7f79938135a9f88
 SHA512:
-  metadata.gz: ab4f42932ef1851b8529c6eaa3d3a10d8a21cdd97e3702e94717a0bb8076ab981cd352d275e700f93203f4c790b75993b066e7c59f6b2c4fa6aa39f5479bd210
-  data.tar.gz: cab7f16b86eaa3e532ab5d40265e057c7b998d4122d002db14690e78e243191c2888795a77364a45bcd3112f6524ef194e71eb239b44026831a4ce789dd5381b
+  metadata.gz: d186e5e12777db3855033f394eead2c927a127b5bfd9f06f784d72eec4bc560047517ae6e1e98303330cfa763b9196e0068611b7d18ec9897ea151e215267597
+  data.tar.gz: 2fcef7288f3f5358643ccd677ca628a40c3c06e4d8bceb0f4f0de411524da556f0fb449e881ac9b55d4350a7a1357704690baa54517e126ebce33e596aa6095a

data/example.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+$LOAD_PATH.unshift File.expand_path("./lib", __dir__)
+
+require 'evt'
+require 'midori'
+
+Fiber.set_scheduler Evt::Scheduler.new
+
+class HelloWorldAPI < Midori::API
+  get '/' do
+    'Ohayou Midori'
+  end
+end
+
+Fiber.schedule do
+  Midori::Runner.new(HelloWorldAPI).start
+end

data/lib/midori.rb

@@ -1,11 +1,11 @@
 require 'cgi'
+require 'evt'
 require 'digest/sha1'
 require 'stringio'
 require 'fiber'
 require 'logger'
 require 'mizu'
 require 'mustermann'
-require 'murasaki'
 require 'socket'
 
 require_relative 'midori/core_ext/configurable'

data/lib/midori/connection.rb

@@ -13,19 +13,16 @@ class Midori::Connection
     @registered = false
     @socket = socket[0]
     @peer_addr = socket[1].ip_unpack
-    @monitor = nil
     @close_flag = false
     @buffer = ''
-    listen(@socket)
   end
 
   # Register events of connection
   # @param [Array] socket raw socket
-  def listen(socket)
-    EventLoop.register(socket, :rw) do |monitor|
-      @monitor = monitor
-      receive_data(monitor) if monitor.readable?
-      if monitor.writable?
+  def listen
+    Fiber.schedule do
+      until @socket.closed?
+        receive_data(@socket)
         if !@buffer.empty?
           send_buffer
         elsif @close_flag
@@ -46,23 +43,13 @@ class Midori::Connection
   # Send buffer immediately
   # @return [nil] nil
   private def send_buffer
-    if @monitor.writable?
-      written = @socket.write_nonblock(@buffer)
-      @buffer = @buffer.byteslice(written..-1)
-    end
-    nil
-  rescue IO::EAGAINWaitWritable => _e
-    # :nocov:
-    # Unknown Reason Resource Conflict
+    @socket.write(@buffer) unless @socket.closed?
     nil
-    # :nocov:
   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

data/lib/midori/request.rb

@@ -26,6 +26,8 @@ class Midori::Request
     @body_parsed = false
     @is_websocket = false
     @is_eventsource = false
+    @ip = ''
+    @port = 0
     @parser = Mizu::Parser.new
     @params = {}
     @query_params = Hash.new(Array.new)
@@ -74,6 +76,7 @@ class Midori::Request
     if @parsed
       @body += data
     else
+      return nil if data.nil?
       @parser << data
       @body += data[@parser.offset..-1] if @parsed
     end

data/lib/midori/runner.rb

@@ -28,20 +28,22 @@ class Midori::Runner
   # Start the Midori server
   # @note This is an async method, but no callback
   def start
-    return false if running? || EventLoop.running?
+    return false if running?
     @logger.info "Midori #{Midori::VERSION} is now running on #{bind}:#{port}".blue
     init_socket
-    async_fiber(Fiber.new do
+    Fiber.schedule do
       @logger.info 'Midori is booting...'.blue
       @before.call
       @logger.info 'Midori is serving...'.blue
-      EventLoop.register(@server, :r) do |monitor|
-        socket = monitor.io.accept_nonblock
-        connection = Midori::Connection.new(socket)
-        connection.server_initialize(@api, @logger)
+      Fiber.schedule do
+        loop do
+          socket = @server.accept
+          connection = Midori::Connection.new(socket)
+          connection.server_initialize(@api, @logger)
+          connection.listen
+        end
       end
-    end)
-    EventLoop.start
+    end
     nil
   end
 
@@ -63,10 +65,8 @@ class Midori::Runner
   def stop
     if running?
       @logger.info 'Stopping Midori'.blue
-      EventLoop.deregister @server
       @server.close
       @server = nil
-      EventLoop.stop
       true
     else
       @logger.error 'Midori Server has NOT been started'.red

data/lib/midori/server.rb

@@ -28,29 +28,32 @@ module Midori::Server
   end
 
   # Logic of receiving data
-  # @param [NIO::Monitor] monitor the socket able to read
-  def receive_data(monitor)
-    async_fiber(Fiber.new do
-      begin
-        @request.ip, @request.port = @peer_addr
-        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:
+  # @param [Scoket] the socket able to read
+  def receive_data(socket)
+    begin
+      @request.ip, @request.port = @peer_addr
+      if @request.parsed? && !(@request.body_parsed?)
+        data = socket.read @request.body.bytesize - @request.header['Content-Length']
+      else
+        data = socket.readline
+      end
+
+      if @request.websocket?
+        websocket_request(StringIO.new(data))
+      else
+        @request.parse(data)
+        receive_new_request if @request.parsed? && @request.body_parsed?
       end
-    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:
+    end
   end
 
   # Logic of receiving new request
@@ -119,11 +122,10 @@ module Midori::Server
     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
+    Fiber.schedule do
+      sleep Midori::Configure.keep_alive_timeout
       close_connection
     end
-    EventLoop.add_timer(@keep_alive_timer)
     # Reset request
     @request.reset!
   end

data/lib/midori/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: midori.rb
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - HeckPsi Lab
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-30 00:00:00.000000000 Z
+date: 2020-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: murasaki
+  name: evt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: mustermann
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +78,7 @@ files:
 - ".editorconfig"
 - ".github/ISSUE_TEMPLATE.md"
 - LICENSE
+- example.rb
 - ext/midori/extconf.rb
 - ext/midori/websocket.c
 - lib/midori.rb
@@ -125,15 +126,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.6
+      version: 3.0.0.rc1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.2.2
+signing_key:
 specification_version: 4
 summary: High performance ruby web framework
 test_files: []