midori.rb 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccffda67e06a88ed46a9e81ac52823498d331a147869f54a3c520bc70946f469
-  data.tar.gz: 2abeba1e323655b28a547814eccc536773b35316075b3852897ec109b4272719
+  metadata.gz: f6d14d7e6c7a05f01d72029dc8d09ad83c37328d392d8c745b938025181d9812
+  data.tar.gz: dc2d8754f72ff25354f33fd0a15a0e23a1617eaa4a82ec94b21f9e47b2ed5eda
 SHA512:
-  metadata.gz: d68c112f68c228a79b46f2983e0bd4ba9b0ff25b8aa9025eca7893909719e7213a8236fca26d78ba2aad12926481d7f989d920148e00b866f9f86c8a6b3cff20
-  data.tar.gz: 6eae1c01af1fa93acf6bf817ce1c04121918a53d1f849815778eed0f974c36259bd1ee6df3901b86128d247b77dfca5c81e04e5e1477836aa2dd31c0c2a1061e
+  metadata.gz: 0f4bf5b25cb38d3f5b8cf2a8f685956086d920ccc9cee3c838cc1fc3a94c1e482576f193d4d6c03505104b32d403a959da924e7243105f87b5faebc5d2d17b3e
+  data.tar.gz: cc1e70247c020875415d73e2bba4190c9f33c3ad52dacff0574eb89b5a6f3e1ee2c68efbbd330e4af83e9b86270d64fb26ac27133a30a8ebe68ed0cbbfbffd07

data/ext/midori/websocket.c

@@ -1,32 +1,58 @@
 #include <ruby.h>
+#include <ruby/encoding.h>
 
 VALUE Midori = Qnil;
 VALUE MidoriWebSocket = Qnil;
 
 void Init_midori_ext();
 VALUE method_midori_websocket_mask(VALUE self, VALUE payload, VALUE mask);
+VALUE method_midori_websocket_mask_str(VALUE self, VALUE payload, VALUE mask);
 
-void Init_midori_ext() {
+void Init_midori_ext()
+{
   Midori = rb_define_module("Midori");
   MidoriWebSocket = rb_define_class_under(Midori, "WebSocket", rb_cObject);
   rb_define_protected_method(MidoriWebSocket, "mask", method_midori_websocket_mask, 2);
+  rb_define_protected_method(MidoriWebSocket, "mask_str", method_midori_websocket_mask_str, 2);
 }
 
-VALUE method_midori_websocket_mask(VALUE self, VALUE payload, VALUE mask) {
+VALUE method_midori_websocket_mask(VALUE self, VALUE payload, VALUE mask)
+{
   long n = RARRAY_LEN(payload), i, p, m;
   VALUE unmasked = rb_ary_new2(n);
 
   int mask_array[] = {
-    NUM2INT(rb_ary_entry(mask, 0)),
-    NUM2INT(rb_ary_entry(mask, 1)),
-    NUM2INT(rb_ary_entry(mask, 2)),
-    NUM2INT(rb_ary_entry(mask, 3))
-  };
+      NUM2INT(rb_ary_entry(mask, 0)),
+      NUM2INT(rb_ary_entry(mask, 1)),
+      NUM2INT(rb_ary_entry(mask, 2)),
+      NUM2INT(rb_ary_entry(mask, 3))};
 
-  for (i = 0; i < n; i++) {
+  for (i = 0; i < n; i++)
+  {
     p = NUM2INT(rb_ary_entry(payload, i));
     m = mask_array[i % 4];
     rb_ary_store(unmasked, i, INT2NUM(p ^ m));
   }
   return unmasked;
 }
+
+VALUE method_midori_websocket_mask_str(VALUE self, VALUE payload, VALUE mask)
+{
+  long n = RARRAY_LEN(payload), i, p, m;
+  char result[n];
+
+  int mask_array[] = {
+      NUM2INT(rb_ary_entry(mask, 0)),
+      NUM2INT(rb_ary_entry(mask, 1)),
+      NUM2INT(rb_ary_entry(mask, 2)),
+      NUM2INT(rb_ary_entry(mask, 3))};
+
+  for (i = 0; i < n; i++)
+  {
+    p = NUM2INT(rb_ary_entry(payload, i));
+    m = mask_array[i % 4];
+    result[i] = p ^ m;
+  }
+
+  return rb_enc_str_new(result, n, rb_utf8_encoding());
+}

data/lib/midori.rb

@@ -13,8 +13,8 @@ require_relative 'midori/core_ext/configurable'
 require_relative 'midori/core_ext/define_class'
 require_relative 'midori/core_ext/http_header'
 require_relative 'midori/core_ext/proc'
+require_relative 'midori/core_ext/socket'
 require_relative 'midori/core_ext/string'
-require_relative 'midori/core_ext/tcp_server'
 
 require_relative 'midori/version'
 

data/lib/midori/configure.rb

@@ -13,6 +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 :socket_reuse_port, false
   set :keep_alive, true
   set :keep_alive_timeout, 75
   set :keep_alive_requests, 1000

data/lib/midori/connection.rb

@@ -11,15 +11,16 @@ class Midori::Connection
   # @param [IO] socket raw socket
   def initialize(socket)
     @registered = false
-    @socket = socket
+    @socket = socket[0]
+    @peer_addr = socket[1].ip_unpack
     @monitor = nil
     @close_flag = false
     @buffer = ''
-    listen(socket)
+    listen(@socket)
   end
 
   # Register events of connection
-  # @param [IO] socket raw socket
+  # @param [Array] socket raw socket
   def listen(socket)
     EventLoop.register(socket, :rw) do |monitor|
       @monitor = monitor

data/lib/midori/core_ext/{tcp_server.rb → socket.rb}

@@ -1,9 +1,16 @@
-class TCPServer
+class Socket
   def tcp_fast_open
     # macOS devices option is DIFFERENT from Linux and FreeBSD
     opt = (/darwin/ =~ RUBY_PLATFORM) ? 1 : 5
     # Magic number 6 may refer to Socket::SOL_TCP or Socket::IPPROTO_TCP
-    self.setsockopt(6, Socket::TCP_FASTOPEN, opt)
+    setsockopt(6, Socket::TCP_FASTOPEN, opt)
+    true
+  rescue => _e
+    false
+  end
+
+  def reuse_port
+    setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1)
     true
   rescue => _e
     false

data/lib/midori/runner.rb

@@ -30,9 +30,7 @@ class Midori::Runner
   def start
     return false if running? || EventLoop.running?
     @logger.info "Midori #{Midori::VERSION} is now running on #{bind}:#{port}".blue
-    @server = TCPServer.new(@bind, @port)
-    tfo = @server.tcp_fast_open if Midori::Configure.tcp_fast_open
-    @logger.warn 'Failed to use TCP Fast Open feature on your OS'.yellow unless tfo
+    init_socket
     async_fiber(Fiber.new do
       @logger.info 'Midori is booting...'.blue
       @before.call
@@ -47,6 +45,17 @@ class Midori::Runner
     nil
   end
 
+  private def init_socket
+    @server = Socket.new Socket::AF_INET, Socket::SOCK_STREAM
+    @server.reuse_port if Midori::Configure.socket_reuse_port
+    @server.bind Addrinfo.tcp @bind, @port
+    @server.listen Socket::SOMAXCONN
+    if Midori::Configure.tcp_fast_open
+      tfo = @server.tcp_fast_open
+      @logger.warn 'Failed to use TCP Fast Open feature on your OS'.yellow unless tfo
+    end
+  end
+
   # Stop the Midori server
   # @note This is an async method, but no callback
   # @return [Boolean] [true] stop successfully

data/lib/midori/server.rb

@@ -32,8 +32,7 @@ module Midori::Server
   def receive_data(monitor)
     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
+        @request.ip, @request.port = @peer_addr
         data = monitor.io.read_nonblock(16_384)
         if @request.parsed? && @request.body_parsed?
           websocket_request(StringIO.new(data))

data/lib/midori/version.rb

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

data/lib/midori/websocket.rb

@@ -24,7 +24,7 @@ class Midori::WebSocket
     @opcode = byte_tmp & 0b00001111
     # NOT Support Multiple Fragments
     raise Midori::Exception::ContinuousFrame unless fin
-    raise Midori::Exception::OpCodeError unless [0x1, 0x2, 0x8, 0x9, 0xA].include? opcode
+    raise Midori::Exception::OpCodeError unless [0x1, 0x2, 0x8, 0x9, 0xA].include? @opcode
     close if @opcode == 0x8 # Close Frame
     # return if @opcode == 0x9 || @opcode == 0xA # Ping Pong
     decode_mask(data)
@@ -42,8 +42,11 @@ class Midori::WebSocket
     mask = Array.new(4) { data.getbyte }
     # Message
     masked_msg = Array.new(payload) { data.getbyte }
-    @msg = self.mask(masked_msg, mask)
-    @msg = @msg.pack('C*').force_encoding('utf-8') if [0x1, 0x9, 0xA].include? opcode
+    if [0x1, 0x9, 0xA].include? opcode
+      @msg = mask_str(masked_msg, mask)
+    else # [0x2]
+      @msg = mask(masked_msg, mask)
+    end
     # For debug
     #  data.rewind
     #  data.bytes {|byte| puts byte.to_s(16)}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midori.rb
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - HeckPsi Lab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-29 00:00:00.000000000 Z
+date: 2018-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: murasaki
@@ -91,8 +91,8 @@ files:
 - lib/midori/core_ext/define_class.rb
 - lib/midori/core_ext/http_header.rb
 - lib/midori/core_ext/proc.rb
+- lib/midori/core_ext/socket.rb
 - lib/midori/core_ext/string.rb
-- lib/midori/core_ext/tcp_server.rb
 - lib/midori/env.rb
 - lib/midori/eventsource.rb
 - lib/midori/exception.rb
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: High performance ruby web framework