faye-websocket 0.10.5 → 0.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dfb25398e331800baf73b73988b88639753fac9
-  data.tar.gz: 86e8c6d23a38fa6e699be24dd0aa677a7ad29c0b
+  metadata.gz: 5b6bf17084f08c82f3d0d7ac138e98ddd2a0f059
+  data.tar.gz: 8b86e6161c6c6822f46675a8ac7644ad64257be8
 SHA512:
-  metadata.gz: 8900d2b969e66c6a9a338cf763c00f9c59728884ce52c7fe1034d852487c323b14bcab97b4a411761f6bd6d6af7f600f5a2de67c9275be912acbfe50598a0512
-  data.tar.gz: 6f8df7095506203c476b487383653ef28641bfba255b5febec138aa17af53f9b4e234f951e0f554107bbc461292ef4998cd91c94a0045dc470dc7236f6cfd5aa
+  metadata.gz: 41099891f06201e60913915da0bec5f3420b2ebaf955a80d5c17cf7d3cab53feac35e0a7376ad301880eb5245f9e7412304c4a448abdbb4a942c535d46c780a8
+  data.tar.gz: 66350cd838a0a77e20285130c28bcbe2a197d7179c729866ec5d38d78c8635c212c57670ca2496e0d292f1279825d21624b4a341a1e64df7a8fa83f1d6ab8f60

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 0.10.6 / 2017-01-22
+
+* Forcibly close the I/O stream after a timeout if the peer does not respond
+  after calling `close()`
+
 ### 0.10.5 / 2016-11-12
 
 * Set the SNI hostname when making secure requests

data/README.md

@@ -493,7 +493,7 @@ end
 
 (The MIT License)
 
-Copyright (c) 2010-2016 James Coglan
+Copyright (c) 2010-2017 James Coglan
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the 'Software'), to deal in

data/examples/autobahn_client.rb

@@ -18,13 +18,12 @@ EM.run {
   socket.onmessage = lambda do |event|
     puts "Total cases to run: #{event.data}"
     cases = event.data.to_i
-    progress = ProgressBar.new('Autobahn', cases)
+    progress = ProgressBar.create(:title => 'Autobahn', :total => cases)
   end
 
   run_case = lambda do |n|
     if n > cases
       socket = Faye::WebSocket::Client.new("#{host}/updateReports?agent=#{agent}")
-      progress.finish
       socket.onclose = lambda { |e| EM.stop }
       next
     end
@@ -37,7 +36,7 @@ EM.run {
     end
 
     socket.on :close do |event|
-      progress.inc
+      progress.increment
       run_case[n + 1]
     end
   end

data/lib/faye/websocket/api.rb

@@ -10,6 +10,8 @@ module Faye
       CLOSING    = 2
       CLOSED     = 3
 
+      CLOSE_TIMEOUT = 30
+
       include EventTarget
 
       extend Forwardable
@@ -36,7 +38,7 @@ module Faye
         @ping_id         = 0
         @buffered_amount = 0
 
-        @close_params = @ping_timer = @proxy = @stream = nil
+        @close_params = @close_timer = @ping_timer = @proxy = @stream = nil
         @onopen = @onmessage = @onclose = @onerror = nil
 
         @driver.on(:open)    { |e| open }
@@ -86,6 +88,8 @@ module Faye
 
         @ready_state = CLOSING unless @ready_state == CLOSED
         @driver.close(reason, code)
+
+        @close_timer = EventMachine.add_timer(CLOSE_TIMEOUT) { begin_close('', 1006) }
       end
 
       def protocol
@@ -133,6 +137,7 @@ module Faye
         return if @ready_state == CLOSED
         @ready_state = CLOSED
 
+        EventMachine.cancel_timer(@close_timer) if @close_timer
         EventMachine.cancel_timer(@ping_timer) if @ping_timer
 
         reason = @close_params ? @close_params[0] : ''

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faye-websocket
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.10.6
 platform: ruby
 authors:
 - James Coglan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-12 00:00:00.000000000 Z
+date: 2017-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Standards-compliant WebSocket server and client