web_socket_rb 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb1f89b03d703f0ccb4d4993b3b291ea198c9ab1
-  data.tar.gz: 55820c722b44c2a238fdea8c859df4804cf9859d
+  metadata.gz: a5a31bd0b3175723b6dfd21d67647b4f1078b98a
+  data.tar.gz: 311d9c3394d5f516847f3dbb72e555ee2770fa41
 SHA512:
-  metadata.gz: 8703dd1ab0f52f1c2b58b5360f3a6a32675e761106fd3d99e5a04793a9da18482a751ecc34cf17e1b6ca433ae6886f4c115594b8de28531362208761b11e1a27
-  data.tar.gz: 5ac78d00af0af664721ba5a11c5111aaa34176b386e1b4e41f3f0e8b38436f531ac7eb88eebcc534816af435ed6c22852692bcab37875ee44c032e004cfc9158
+  metadata.gz: 357c47fbe3a6cbc61e9aa427110c7ab586fabfde8cd4f7e98e4825c6a1089bfa7ed721530aba4c3e24e5016dae4e4a724038f96f9955ef55eda1dbf0ea7b24f7
+  data.tar.gz: 61ffed8eb50ad360b0ab5c1feafe006bd9b7eb8c6044d8c7f34044df1616671b364ea5e1fbcbcdf80c0dd93545ee7949fb0ef319636ee8c089d3129119d7c5e7

data/lib/web_socket_rb/protocol/frames_handler.rb

@@ -10,12 +10,14 @@ module WebSocketRb
   module Protocol
     class FramesHandler
       def initialize(connections, connection, routes, frames_sender, sandbox)
-        @connections = connections
-        @conn          = connection
-        @routes        = routes
-        @frames_sender = frames_sender
-        @sandbox       = sandbox
-        @threads       = []
+        @connections      = connections
+        @conn             = connection
+        @routes           = routes
+        @frames_sender    = frames_sender
+        @sandbox          = sandbox
+        @threads          = []
+        @pending_pings    = []
+        @mutex            = Mutex.new
       end
 
       # Run reading and sending frames
@@ -32,7 +34,9 @@ module WebSocketRb
         loop do
           frame = Service::BuildPingFrameService.new.run
           @frames_sender.frame_to_send(frame)
+          @mutex.synchronize { @pending_pings << frame }
           sleep(10)
+          @mutex.synchronize { @threads.reverse.each(&:kill) if @pending_pings.include?(frame) }
         end
       end
 
@@ -62,7 +66,16 @@ module WebSocketRb
           @threads.each(&:exit)
 
         elsif frame.pong?
-          # Do nothing
+
+          # Verify pending PINGs and find one with the same payload data
+          App.logger.info('Frames handler') {'Verifying PINGS'}
+          @mutex.synchronize do
+            pending_ping = @pending_pings.reject! do |ping_frame|
+              frame.payload_data == ping_frame.payload_data
+            end
+            @threads.each(&:exit) if pending_ping.nil?
+          end
+
         elsif frame.text? || frame.binary?
 
           # Call subscribe block

data/lib/web_socket_rb/protocol/handshake.rb

@@ -44,7 +44,6 @@ module WebSocketRb
         @conn.puts('Upgrade: websocket')
         @conn.puts('Connection: Upgrade')
         @conn.puts("Sec-WebSocket-Accept: #{calculate_key(request.key)}")
-        # @conn.puts("Sec-WebSocket-Protocol: #{Wrapper::HandshakeRequest::PROTOCOL}")
         @conn.puts('')
         App.logger.info('Handshake') { 'Finished sending accept response' }
       end

data/lib/web_socket_rb/version.rb

@@ -1,3 +1,3 @@
 module WebSocketRb
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web_socket_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Karol Bajko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2016-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler