lib/em-midori/server.rb in em-midori-0.0.6 vs lib/em-midori/server.rb in em-midori-0.0.7

@@ -1,7 +1,5 @@
-require 'stringio'
-
 module Midori::Server
   attr_accessor :request, :api, :websocket
 
   def initialize(api)
     @api = api
@@ -18,61 +16,55 @@
     if @request.parsed?
       websocket_request(data)
     else
       receive_new_request(data)
     end
-    $stdout << "#{@request.ip} - - [#{Time.now.inspect}] \"#{@request.method} #{@request.path} #{@request.protocol}\" #{@response.status} #{(Time.now.to_f - start_time.to_f).round(5)}\n".green
+    puts "#{@request.ip} - - [#{Time.now.inspect}] \"#{@request.method} #{@request.path} #{@request.protocol}\" #{@response.status} #{(Time.now.to_f - start_time.to_f).round(5)}".green
   end
 
   def receive_new_request(data)
     begin
       @request.parse(data)
       @response = @api.receive(request, self)
+      call_event(:open) if @request.websocket?
     rescue Midori::Error::NotFound => _e
       @response = Midori::Response.new(404, {}, '404 Not Found')
     rescue => e
       @response = Midori::Response.new(500, {}, 'Internal Server Error')
-      puts e.inspect.yellow
+      puts e.inspect.red
+      puts e.backtrace.join("\n").yellow
     end
-    unless (@request.websocket? || @request.eventsource?)
+    unless @request.websocket? || @request.eventsource?
       send_data @response
       close_connection_after_writing
     end
-    if @request.websocket? && !@websocket.events[:open].nil?
-      call_event(:open)
-    end
   end
 
   def websocket_request(data)
-    begin
-      @websocket.decode(data)
-      case @websocket.opcode
-        when 0x1, 0x2
-          call_event(:message, @websocket.msg)
-        when 0x9
-          call_event(:ping)
-          @websocket.pong
-        when 0xA
-          call_event(:pong)
-        else
-          # Unknown Control Frame
-          raise Midori::Error::FrameEnd
-      end
-    rescue Midori::Error::FrameEnd => _e
-      unless @websocket.events[:close].nil?
-        call_event(:close)
-      end
-      send_data "\b" # Opcode 0x8
-      close_connection_after_writing
-    rescue => e
-      puts e.inspect.yellow
-      @response = Midori::Response.new(400, {}, 'Bad Request')
-      send_data @response
-      close_connection_after_writing
+    @websocket.decode(data)
+    case @websocket.opcode
+      when 0x1, 0x2
+        call_event(:message, [@websocket.msg])
+      when 0x9
+        @websocket.pong(@websocket.msg)
+        call_event(:ping)
+      when 0xA
+        call_event(:pong)
     end
+  rescue Midori::Error::FrameEnd => _e
+    call_event(:close)
+    send_data "\b" # Opcode 0x8
+    close_connection_after_writing
+  rescue Midori::Error::PingPongSizeTooLarge => e
+    puts e.inspect.yellow
+    call_event(:error) # Neglect Too large ping request
+  rescue => e
+    call_event(:error)
+    puts e.inspect.red
+    puts e.backtrace.join("\n").yellow
+    close_connection_after_writing
   end
 
-  def call_event(event, args=[])
-    lambda {@websocket.instance_exec(*args, &@websocket.events[event])}.call unless @websocket.events[event].nil?
+  def call_event(event, args = [])
+    (-> { @websocket.instance_exec(*args, &@websocket.events[event]) }.call) unless @websocket.events[event].nil?
   end
-
-end
\ No newline at end of file
+end