em-midori 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5026a74972dc1290c62c3fcc076c881164527ead
-  data.tar.gz: b93b97c69b109b6e28b9d05d46be862ff13447a5
+  metadata.gz: 4ad463d2a5c54f9995812d347d0f428752414d77
+  data.tar.gz: 9a9ea6eb52f59bf540e7dc37d24a6581393a439d
 SHA512:
-  metadata.gz: 885500b149d1153fededb86c8610be89361c2a3992d0f1a2ace635226121137f9beb5c32c9a519998ffeaff210f25b2a14d47176a5b031e487e8d36d7019d17d
-  data.tar.gz: 6d1563e43233277c2d41ef1bdb732e1131714449f67b0505d64777a6228d15804564b7e158b2a709cd8c9455588c0316ddd2a10b026bca213831a976f43b1e0c
+  metadata.gz: bf12420ff582c13a143a872462284f3232472decff29a686286d931eb5fac60371182a313e0327c41281eea5a8a673913dd59eeebf560a8ecc99a4245aeaca9b
+  data.tar.gz: b40da8f51f4c39e5b9dd46a5944c17b0672425ffa5869a14a5880df85d0ce9bd92c19daa7433131624e4b93308ecf69d09f8c0e5afb3c0edcc3b4111957c3066

data/lib/midori.rb

@@ -10,6 +10,7 @@ require 'socket'
 require_relative 'midori/core_ext/configurable'
 require_relative 'midori/core_ext/string'
 require_relative 'midori/core_ext/event_loop'
+require_relative 'midori/core_ext/timer'
 require_relative 'midori/core_ext/promise'
 require_relative 'midori/core_ext/define_class'
 require_relative 'midori/core_ext/proc'

data/lib/midori/connection.rb

@@ -20,8 +20,11 @@ class Midori::Connection
       end
       if monitor.writable?
         if !@data.empty?
+          # :nocov:
+          # Leave for corner cases
           monitor.io.write_nonblock(@data)
           @data = ''
+          # :nocov:
         elsif @close_flag
           close_connection
         end
@@ -34,7 +37,7 @@ class Midori::Connection
   end
 
   def close_connection
-    EventLoop.unregister @socket
+    EventLoop.deregister @socket
     @socket.close
   end
 

data/lib/midori/core_ext/event_loop.rb

@@ -1,19 +1,42 @@
+require 'timeout'
+
 module EventLoop
   class << self
     SELECTOR = NIO::Selector.new
+    TIMERS = []
+
+    def add_timer(timer)
+      timer.start_time = Time.now.to_f + timer.time
+      TIMERS << timer
+    end
 
     def register(io, interest=(:rw), &callback)
       monitor = SELECTOR.register(io, interest)
-      monitor.value = callback
+      monitor.value = {
+          callback: callback,
+      }
+
     end
 
-    def unregister(io)
+    def deregister(io)
       SELECTOR.deregister(io)
     end
 
     def run_once
-      SELECTOR.select(1) do |monitor| # Timeout for 1 secs
-        monitor.value.call(monitor)
+      SELECTOR.select(0.2) do |monitor| # Timeout for 1 secs
+        monitor.value[:timer].stop unless monitor.value[:timer].nil?
+        monitor.value[:callback].call(monitor)
+      end
+      EventLoop.timer_once
+    end
+
+    def timer_once
+      now_time = Time.now.to_f
+      TIMERS.delete_if do |timer|
+        if timer.start_time < now_time
+          timer.callback.call
+          true
+        end
       end
     end
 

data/lib/midori/core_ext/timer.rb

@@ -0,0 +1,10 @@
+class EventLoop::Timer
+  attr_reader :time, :start_time, :callback
+  attr_accessor :start_time
+
+  def initialize(time, &callback)
+    @time = time
+    @callback = callback
+    @start_time = Float::INFINITY
+  end
+end

data/lib/midori/extension/file.rb

@@ -8,7 +8,7 @@ class Midori::File
       data = ''
       EventLoop.register(@file, :r) do
         if @file.eof?
-          EventLoop.unregister(@file)
+          EventLoop.deregister(@file)
           resolve.call(data)
         else
           data << @file.read_nonblock(16384)
@@ -23,7 +23,7 @@ class Midori::File
       EventLoop.register(@file, :w) do
         written += @file.write_nonblock(data[written..-1])
         if written == data.size
-          EventLoop.unregister(@file)
+          EventLoop.deregister(@file)
           resolve.call(written)
         end
       end

data/lib/midori/extension/hiredis.rb

@@ -17,7 +17,7 @@ module Hiredis
           EventLoop.register(@sock, :w) do
             written += @sock.write_nonblock(data[written..-1])
             if written == string_size(data)
-              EventLoop.unregister(@sock)
+              EventLoop.deregister(@sock)
               resolve.call
             end
           end
@@ -31,7 +31,7 @@ module Hiredis
             @reader.feed @sock.read_nonblock(1024)
             reply = @reader.gets
             if reply
-              EventLoop.unregister(@sock)
+              EventLoop.deregister(@sock)
               resolve.call(reply)
             end
           end

data/lib/midori/extension/net.rb

@@ -0,0 +1,36 @@
+require 'net/protocol'
+
+class Net::BufferedIO
+  def wait_io(interest)
+    await(Promise.new do |resolve|
+      EventLoop.register(@io.to_io, interest) do
+        EventLoop.deregister(@io.to_io)
+        resolve.call(self)
+      end
+    end)
+  end
+
+  def rbuf_fill
+    loop do
+      case rv = @io.read_nonblock(BUFSIZE, exception: false)
+        when String
+          return @rbuf << rv
+        when :wait_readable
+          wait_io(:r)
+        # @io.to_io.wait_readable(@read_timeout) or raise Net::ReadTimeout
+        # continue looping
+        when :wait_writable
+          # OpenSSL::Buffering#read_nonblock may fail with IO::WaitWritable.
+          # http://www.openssl.org/support/faq.html#PROG10
+          # :nocov:
+          wait_io(:w)
+        # @io.to_io.wait_writable(@read_timeout) or raise Net::ReadTimeout
+        # continue looping
+        when nil
+          # callers do not care about backtrace, so avoid allocating for it
+          raise EOFError, 'end of file reached', []
+        # :nocov:
+      end
+    end
+  end
+end

data/lib/midori/extension/sequel/mysql2.rb

@@ -39,7 +39,7 @@ module Sequel
               socket = IO::open(conn.socket)
               await(Promise.new do |resolve|
                 EventLoop.register(socket, :w) do
-                  EventLoop.unregister(socket)
+                  EventLoop.deregister(socket)
                   conn.query(sql,
                              database_timezone: timezone,
                              application_timezone: Sequel.application_timezone,
@@ -50,7 +50,7 @@ module Sequel
               end)
               await(Promise.new do |resolve|
                 EventLoop.register(socket, :r) do
-                  EventLoop.unregister(socket)
+                  EventLoop.deregister(socket)
                   resolve.call(conn.async_result)
                 end
               end)

data/lib/midori/extension/sequel/postgres.rb

@@ -14,7 +14,7 @@ class Sequel::Postgres::Adapter
         await(Promise.new do |resolve|
           EventLoop.register(socket_object, :w) do
             unless is_busy
-              EventLoop.unregister(socket_object)
+              EventLoop.deregister(socket_object)
               send_query(sql)
               resolve.call
             end
@@ -24,7 +24,7 @@ class Sequel::Postgres::Adapter
         await(Promise.new do |resolve|
           consume_input
           EventLoop.register(socket_object, :r) do
-            EventLoop.unregister(socket_object)
+            EventLoop.deregister(socket_object)
             resolve.call(get_result)
           end
         end)

data/lib/midori/runner.rb

@@ -44,7 +44,7 @@ class Midori::Runner
   def stop
     if running?
       @logger.info 'Stopping Midori'.blue
-      EventLoop.unregister @server
+      EventLoop.deregister @server
       @server.close
       @server = nil
       EventLoop.stop

data/lib/midori/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-midori
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - HeckPsi Lab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nio4r
@@ -74,10 +74,12 @@ files:
 - lib/midori/core_ext/promise.rb
 - lib/midori/core_ext/safe_require.rb
 - lib/midori/core_ext/string.rb
+- lib/midori/core_ext/timer.rb
 - lib/midori/eventsource.rb
 - lib/midori/exception.rb
 - lib/midori/extension/file.rb
 - lib/midori/extension/hiredis.rb
+- lib/midori/extension/net.rb
 - lib/midori/extension/sequel/mysql2.rb
 - lib/midori/extension/sequel/postgres.rb
 - lib/midori/middleware.rb