em-midori 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bded68c0e7831eb9e36ee2b49dec6c61c760a815
-  data.tar.gz: de5f760feffc996aa88443e3db67eab589d179d8
+  metadata.gz: 44777e7d5978bba6e8fd91c8cc640ef40270a7f3
+  data.tar.gz: dd69a2679cf440bc4ea7a29f52b6e0652d917b7c
 SHA512:
-  metadata.gz: 6ffe68ce957c773adf24da6a5e0c4c94deca32d0a617e29ee9ac10eacf4883e5e1d6cf0c94b0698fa30e9bde26599f4425bd081b38d945d0baa6b97a3d4a620e
-  data.tar.gz: 220b8c5f8ec1af61be67526d24975ccd1387384afd41c7014f7176a4bf2468c4fd061475eb147fd9bc8655e5f06b5b2677f382774bc3d8d1f954ff4b98a8b5b8
+  metadata.gz: f9716b1feb7f5f7609eae2c662bff23b1bc4900024f02124faf4b4200803a9e91dec19f851d2a68a5504c0ae4bb2a731aa0fd35c88401b0fa59adebb8597e73e
+  data.tar.gz: ddbb5d354658e519d9a8c4c29b134e24e28e1fa2e0ff2d2b35878f08fc9047b7510fade34e331699b827115359869e65acf6e5569d2010ee75a0a7d21ee840c7

data/lib/midori.rb

@@ -1,6 +1,6 @@
 require 'digest/sha1'
 require 'stringio'
-require 'eventmachine'
+require 'nio'
 require 'fiber'
 require 'logger'
 require 'http/parser'
@@ -9,6 +9,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/promise'
 require_relative 'midori/core_ext/promise_exception'
 require_relative 'midori/core_ext/define_class'
@@ -19,13 +20,14 @@ require_relative 'midori/version'
 require_relative 'midori/const'
 require_relative 'midori/exception'
 require_relative 'midori/clean_room'
+require_relative 'midori/server'
+require_relative 'midori/connection'
 require_relative 'midori/request'
 require_relative 'midori/response'
 require_relative 'midori/api'
 require_relative 'midori/api_engine'
 require_relative 'midori/route'
 require_relative 'midori/sandbox'
-require_relative 'midori/server'
 require_relative 'midori/websocket'
 require_relative 'midori/eventsource'
 require_relative 'midori/middleware'

data/lib/midori/connection.rb

@@ -0,0 +1,52 @@
+class Midori::Connection
+  include Midori::Server
+
+  attr_accessor :data
+
+  def initialize(socket)
+    @registered = false
+    @socket = socket
+    @monitor = nil
+    @close_flag = false
+    @data = ''
+    listen(socket)
+  end
+
+  def listen(socket)
+    EventLoop.register(socket, :rw) do |monitor|
+      @monitor = monitor
+      if monitor.readable?
+        receive_data(monitor)
+      end
+      if monitor.writable?
+        if !@data.empty?
+          monitor.io.write_nonblock(@data)
+          @data = ''
+        elsif @close_flag
+          close_connection
+        end
+      end
+    end
+  end
+
+  def send_data(data)
+    if @monitor.writable?
+      @socket.write_nonblock(data)
+    else
+      @data << data
+    end
+  end
+
+  def close_connection
+    begin
+      EventLoop.unregister @socket
+      @socket.close
+    rescue => e
+      puts e
+    end
+  end
+
+  def close_connection_after_writing
+    @close_flag = true
+  end
+end

data/lib/midori/core_ext/event_loop.rb

@@ -0,0 +1,38 @@
+module EventLoop
+  class << self
+    SELECTOR = NIO::Selector.new
+
+    def register(io, interest=(:rw), &callback)
+      monitor = SELECTOR.register(io, interest)
+      monitor.value = callback
+    end
+
+    def unregister(io)
+      SELECTOR.deregister(io)
+    end
+
+    def run_once
+      SELECTOR.select(1) do |monitor| # Timeout for 1 secs
+        monitor.value.call(monitor)
+      end
+    end
+
+    def start
+      return if running?
+      @stop = false
+      until @stop
+        run_once
+      end
+      @stop = nil
+    end
+
+    def stop
+      @stop = true
+    end
+
+    def running?
+      @stop = true if @stop.nil?
+      !@stop
+    end
+  end
+end

data/lib/midori/core_ext/promise.rb

@@ -4,67 +4,40 @@
 class Promise
   # Init a Promise
   # @param [Proc] callback an async method
-  def initialize(callback)
+  def initialize(&callback)
     @callback = callback
   end
 
   # Define what to do after a method callbacks
   # @param [Proc] resolve what on callback
-  # @param [Proc] reject what on callback failed
   # @return [nil] nil
-  def then(resolve = ->() {}, reject = ->() {})
-    @callback.call(resolve, reject)
-  end
-end
-
-# A Syntactic Sugar for Promise
-class DeferPromise < Promise
-  # A Syntactic Sugar for Promise
-  # @param [Proc] deffered To do what asynchronous
-  def initialize(deffered)
-    super(->(resolve, _reject){
-      EventMachine.defer(proc {
-        begin
-          deffered.call
-        rescue StandardError => e
-          PromiseException.new(e)
-        end
-      }, proc { |result| resolve.call(result) })
-    })
+  def then(&resolve)
+    @callback.call(resolve)
   end
 end
 
 module Kernel
-  # Logic dealing of async method
-  # @param [Fiber] fiber a fiber to call
-  def async_internal(fiber)
-    chain = lambda do |result|
-      return unless result.is_a?Promise
-      result.then(lambda do |val|
+  def async_fiber(fiber)
+    chain = proc do |result|
+      next unless result.is_a? Promise
+      result.then do |val|
         chain.call(fiber.resume(val))
-      end)
+      end
     end
     chain.call(fiber.resume)
   end
 
   # Define an async method
-  # @param [Symbol] method_name method name
+  # @param [Symbol] method method name
   # @yield async method
   # @example
   #   async :hello do 
   #     puts 'Hello'
   #   end
-  def async(method_name)
-    define_singleton_method method_name, ->(*args) {
-      async_internal(Fiber.new { yield(*args) })
-    }
-  end
-
-  # Shortcut to init [DeferPromise]
-  # @yield To do what asynchronous
-  # @return [DerferPromise] instance
-  def defer(&block)
-    DeferPromise.new(block)
+  def async(method)
+    define_singleton_method method do |*args|
+      async_fiber(Fiber.new {yield(*args)})
+    end
   end
 
   # Block the I/O to wait for async method response

data/lib/midori/core_ext/promise_exception.rb

@@ -1,11 +1,11 @@
 ##
 # A special error as containers of errors inside [Promise]
-# @attr [StandardError] raw_exception raw execption raised
+# @attr [StandardError] raw_exception raw exception raised
 class PromiseException < StandardError
   attr_reader :raw_exception
 
   # Init PromiseException
-  # @param [StandardError] raw_exception raw execption raised
+  # @param [StandardError] raw_exception raw exception raised
   def initialize(raw_exception)
     super(nil)
     @raw_exception = raw_exception

data/lib/midori/core_ext/string.rb

@@ -16,7 +16,7 @@ class String
   def green
     colorize(32)
   end
-  
+
   # color the string with yellow color
   def yellow
     colorize(33)

data/lib/midori/runner.rb

@@ -12,7 +12,6 @@ class Midori::Runner
     @logger = configure.logger
     @bind = configure.bind
     @port = configure.port
-    @before = configure.before
     @api = ((api.is_a?Midori::APIEngine) ? api : Midori::APIEngine.new(api, configure.route_type))
   end
 
@@ -20,24 +19,21 @@ class Midori::Runner
   # @return [Boolean] [true] running
   # @return [Boolean] [false] not running
   def running?
-    !!@server_signature
+    !!@server
   end
 
   # Start the Midori server
   # @note This is an async method, but no callback
   def start
-    return if running?
-
-    EventMachine.set_simultaneous_accept_count(40) unless RUBY_PLATFORM == 'java'
-    EventMachine.run do
-      async :before do
-        @before.call
-      end
-      before
-      @logger.info "Midori #{Midori::VERSION} is now running on #{bind}:#{port}".blue
-      @server_signature = EventMachine.start_server bind, port, Midori::Server, @api, @logger
+    return false if running? || EventLoop.running?
+    @logger.info "Midori #{Midori::VERSION} is now running on #{bind}:#{port}".blue
+    @server = TCPServer.new(@bind, @port)
+    EventLoop.register(@server, :r) do |monitor|
+      socket = monitor.io.accept_nonblock
+      connection = Midori::Connection.new(socket)
+      connection.server_initialize(@api, @logger)
     end
-
+    EventLoop.start
     nil
   end
 
@@ -47,10 +43,11 @@ class Midori::Runner
   # @return [Boolean] [false] nothing to stop
   def stop
     if running?
-      @logger.info 'Goodbye Midori'.blue
-      EventMachine.stop_server(@server_signature)
-      @server_signature = nil
-      EM.stop
+      @logger.info 'Stopping Midori'.blue
+      EventLoop.unregister @server
+      @server.close
+      @server = nil
+      EventLoop.stop
       true
     else
       @logger.error 'Midori Server has NOT been started'.red

data/lib/midori/server.rb

@@ -1,5 +1,5 @@
 ##
-# Logic to EventMachine TCP Server, running inside +EM::Connection+
+# Logic to EventMachine TCP Server, running inside +Midori::Connection+
 module Midori::Server
   # @!attribute request
   #   @return [Midori::Request] raw request
@@ -14,7 +14,7 @@ module Midori::Server
   # Define server behaviour
   # @param [Class] api inherited from Midori::API
   # @param [Logger] logger global logger
-  def initialize(api, logger)
+  def server_initialize(api, logger)
     @api = api
     @logger = logger
     @request = Midori::Request.new
@@ -23,22 +23,29 @@ module Midori::Server
   end
 
   # Logic of receiving data
-  # @param [String] data raw data
-  def receive_data(data)
+  # @param [String] monitor the socket able to read
+  def receive_data(monitor)
     lambda do
-      async_internal(Fiber.new do
-                       start_time = Time.now
-                       port, ip = Socket.unpack_sockaddr_in(get_peername)
-                       @request.ip = ip
-                       @request.port = port
-                       if @request.parsed?
-                         websocket_request(StringIO.new(data))
-                       else
-                         receive_new_request(data)
-                       end
-                       now_time = Time.now
-                       @logger.info "#{@request.ip} - - \"#{@request.method} #{@request.path} HTTP/#{@request.protocol.join('.')}\" #{@response.status} #{(now_time.to_f - start_time.to_f).round(6)}".green
-                     end)
+      async_fiber(Fiber.new do
+        begin
+          start_time = Time.now
+          _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?
+            websocket_request(StringIO.new(data))
+          else
+            receive_new_request(data)
+          end
+          now_time = Time.now
+          @logger.info "#{@request.ip} - - \"#{@request.method} #{@request.path} HTTP/#{@request.protocol.join('.')}\" #{@response.status} #{(now_time.to_f - start_time.to_f).round(6)}".green
+        rescue
+          close_connection
+          @logger.error "#{@request.ip} - - Reached an EOF Error".red
+        end
+      end)
     end.call
   end
 

data/lib/midori/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: em-midori
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - HeckPsi Lab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: eventmachine
+  name: nio4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mustermann
   requirement: !ruby/object:Gem::Requirement
@@ -60,16 +60,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
-- lib/em-midori
-- lib/em-midori.rb
 - lib/midori.rb
 - lib/midori/api.rb
 - lib/midori/api_engine.rb
 - lib/midori/clean_room.rb
 - lib/midori/configure.rb
+- lib/midori/connection.rb
 - lib/midori/const.rb
 - lib/midori/core_ext/configurable.rb
 - lib/midori/core_ext/define_class.rb
+- lib/midori/core_ext/event_loop.rb
 - lib/midori/core_ext/proc.rb
 - lib/midori/core_ext/promise.rb
 - lib/midori/core_ext/promise_exception.rb
@@ -77,11 +77,7 @@ files:
 - lib/midori/core_ext/string.rb
 - lib/midori/eventsource.rb
 - lib/midori/exception.rb
-- lib/midori/extension/file.rb
-- lib/midori/extension/ohm.rb
-- lib/midori/extension/postgres.rb
-- lib/midori/extension/redis.rb
-- lib/midori/extension/sequel.rb
+- lib/midori/extension/.gitkeep
 - lib/midori/middleware.rb
 - lib/midori/request.rb
 - lib/midori/response.rb
@@ -127,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/em-midori

@@ -1 +0,0 @@
-lib/midori

data/lib/em-midori.rb

@@ -1 +0,0 @@
-require 'midori'

data/lib/midori/extension/file.rb

@@ -1,17 +0,0 @@
-##
-# Midori Extension of File reading and writing
-class Midori::File
-  class << self
-    # Same APIs as File.read
-    # @param [Array] args args of File.read
-    def read(*args)
-      await(defer{File.read(*args)})
-    end
-
-    # Same APIs as File.write
-    # @param [Array] args args of File.write
-    def write(*args)
-      await(defer{File.write(*args)})
-    end
-  end
-end

data/lib/midori/extension/ohm.rb

@@ -1,16 +0,0 @@
-safe_require 'ohm', 'gem install ohm'
-
-##
-# Midori Extension of ohm through meta programming Redic
-class Redic
-  # Call a redis request asynchronously
-  # @param [Array] args args of Redic.call
-  def call(*args)
-    await(defer{
-      @client.connect do
-        @client.write(args)
-        @client.read
-      end
-    })
-  end
-end

data/lib/midori/extension/postgres.rb

@@ -1,59 +0,0 @@
-safe_require 'postgres-pr/message', 'gem install postgres-pr'
-
-##
-# Midori Extension for Postgres Driver
-# @attr [Integer] connected Connection Status
-class Midori::Postgres
-  attr_reader :connected
-
-  # Init a Postgres Connection
-  # @param [Array] args args of EM.connect
-  def initialize(*args)
-    @connected = false
-    @db = EM.connect(*args, EM::P::Postgres3)
-  end
-
-  # Connect the Postgres server
-  # @param [String] db_name database name
-  # @param [String] username username
-  # @param [password] password password
-  # @return [nil] nil
-  def connect(db_name, username, password)
-    await(Promise.new(->(resolve, _reject) {
-      @db.connect(db_name, username, password).callback do |status|
-        @connected = status
-        resolve.call(status)
-      end
-    }))
-  end
-
-  # Make SQL query
-  # @param [String] sql sql query
-  # @return [Midori::Postgres::Result] query result
-  def query(sql)
-    await(Promise.new(->(resolve, _reject) {
-      begin
-        @db.query(sql).callback do |status, result, errors|
-          @connected = status
-          resolve.call(Midori::Postgres::Result.new(result, errors))
-        end
-      end
-    }))
-  end
-end
-
-##
-# Postgres Result for Midori Postgres Driver Extension
-# @attr [Array] result result if success
-# @attr [Array] errors exceptions met
-class Midori::Postgres::Result
-  attr_reader :result, :errors
-
-  # Init a Postgres Result
-  # @param [Array] result result if success
-  # @param [Array] errors exceptions met
-  def initialize(result, errors)
-    @result = result
-    @errors = errors
-  end
-end

data/lib/midori/extension/redis.rb

@@ -1,30 +0,0 @@
-safe_require 'em-hiredis', 'gem install em-hiredis'
-
-##
-# Midori Extension for Redis Driver
-class Midori::Redis
-
-  # Init a Redis Connection
-  # @param [Array] args args EM::Hiredis.connect
-  def initialize(*args)
-    @connection = EM::Hiredis.connect(*args)
-    @connection
-  end
-
-  # Call a redis request asynchronously
-  # @param [String] sys method name
-  # @param [Array] args args of the method calling
-  def method_missing(sys, *args)
-    await(Promise.new(->(resolve, _reject) {
-      @connection.send(sys, *args).callback do |*ret_args|
-        resolve.call(*ret_args)
-      end
-    }))
-  end
-
-  # Return raw pubsub mode
-  # @return [EM::Hiredis::Pubsub] raw pubsub
-  def pubsub
-    @connection.pubsub
-  end
-end

data/lib/midori/extension/sequel.rb

@@ -1,16 +0,0 @@
-safe_require 'sequel', 'gem install sequel'
-require 'sequel/adapters/postgres'
-
-##
-# Midori Extension of sequel postgres through meta programming
-class Sequel::Postgres::Adapter
-  # Call a sql request asynchronously
-  # @param [String] sql sql request
-  # @param [Array] args args to send
-  # @return [Array] sql query result
-  def execute_query(sql, args)
-    @db.log_connection_yield(sql, self, args) do
-      args ? await(defer{async_exec(sql, args)}) : await(defer{async_exec(sql)})
-    end
-  end
-end