socket.io-client-simple 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6293cae06f3938964054ea93f5837c3ee3fe920a
-  data.tar.gz: 103d3bd06faea135bdcba6c59e96a47de8c8e0df
+  metadata.gz: bca9a1cac4a5f1360162905a37d5312ea2efead6
+  data.tar.gz: 671a1c8640db9d0c6b765e28b40a7d25e5c063a9
 SHA512:
-  metadata.gz: ff36295267269bb7f87e5748eecdce1d6e02ef5c279ddef9481e81792ffec5f940cc342accafb91fe51710210da2ce9da3dd671b757291854f59b4a768e86362
-  data.tar.gz: 3120faf19a55589c9a8eae733b58a4c069a3c5b5a67985da176f6bb189dcb0eab354658b516295e9c81c8a7ee58ee0f1c42b049c32c13aa0ea3a91e6bf33bc56
+  metadata.gz: ae32b7c6015a2f3db1698089c037136d4ce9a0b6c051abc277d60c0f1704c9bf14a9ee8a73a5db67478268c39d6657701928f2f34a65cf4300e08f39f6d08b63
+  data.tar.gz: 26e9f1dc32b32be4f2c7b583c7147d8c42e42998a5155193a8ae3f501353d5b12a2b2f60335761caaa0b0e30227cc41f09ea9d196017856d8cdcd8e3bab2194f

data/.travis.yml

@@ -1,8 +1,11 @@
 language: ruby
 node_js:
-  - "0.10"
+  - '0.10'
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - '2.0.0'
+  - '2.1.2'
 before_script:
   - npm install
+notifications:
+  slack:
+    secure: VDGagENM7+Hie8WSRvlvN+tjIxTf7AN2LSXb25Y8XVdY5UAL1ScQzLhObOHZ91W+MzLAOlVk19lPxdXUrH/n1a9R/mjPeikdZCfwQqMeI6db6BltMP3QhJyJyubuBQP0TrD1TfKyQuSHO+8+UcsHPzwaGy4VmOV3S6ctZ3dRyo8=

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    socket.io-client-simple (1.0.0)
+    socket.io-client-simple (1.1.2)
       event_emitter
       httparty
       json
-      websocket-client-simple (>= 0.0.9)
+      websocket-client-simple (>= 0.2.1)
 
 GEM
   remote: https://rubygems.org/
@@ -19,7 +19,7 @@ GEM
     multi_xml (0.5.5)
     rake (10.3.2)
     websocket (1.2.1)
-    websocket-client-simple (0.2.0)
+    websocket-client-simple (0.2.1)
       event_emitter
       websocket
 

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.1.1 2014-10-20
+
+* bugfix reconnection on websocket proxy  #9
+* fix samples
+* bundle update, use websocket-client-simple v0.2.1  #9
+* bugfix encoding handshake query parameter  #5
+
 === 1.1.0 2014-10-04
 
 * support Socket.IO v1.1x

data/lib/socket.io-client-simple.rb

@@ -1,3 +1,4 @@
+require 'uri'
 require 'json'
 require 'httparty'
 require 'websocket-client-simple'

data/lib/socket.io-client-simple/client.rb

@@ -13,7 +13,7 @@ module SocketIO
         alias_method :__emit, :emit
 
         attr_accessor :auto_reconnection, :websocket, :url, :reconnecting, :state,
-                      :session_id, :ping_interval, :ping_timeout, :last_pong_at
+                      :session_id, :ping_interval, :ping_timeout, :last_pong_at, :last_ping_at
 
         def initialize(url, opts={})
           @url = url
@@ -25,13 +25,21 @@ module SocketIO
 
           Thread.new do
             loop do
-              if @state == :connect
-                @websocket.send "2"  ## ping
-                @last_ping_at = Time.now
-                sleep @ping_interval/1000
-              else
-                sleep 1
+              if @websocket
+                if @state == :connect
+                  if Time.now.to_i - @last_ping_at > @ping_interval/1000
+                    @websocket.send "2"  ## ping
+                    @last_ping_at = Time.now.to_i
+                  end
+                end
+                if @websocket.open? and Time.now.to_i - @last_pong_at > @ping_timeout/1000
+                  @websocket.close
+                  @state = :disconnect
+                  __emit :disconnect
+                  reconnect
+                end
               end
+              sleep 1
             end
           end
 
@@ -39,7 +47,7 @@ module SocketIO
 
 
         def connect
-          query = @opts.map{|k,v| "#{k}=#{v}" }.join '&'
+          query = @opts.map{|k,v| URI.encode "#{k}=#{v}" }.join '&'
           begin
             @websocket = WebSocket::Client::Simple.connect "#{@url}/socket.io/?#{query}"
           rescue Errno::ECONNREFUSED => e
@@ -48,6 +56,7 @@ module SocketIO
             reconnect
             return
           end
+          @reconnecting = false
 
           this = self
 
@@ -67,15 +76,16 @@ module SocketIO
             code = code.to_i
             case code
             when 0  ##  socket.io connect
-              this.reconnecting = false
               body = JSON.parse body rescue next
-              this.session_id = body["sid"]
-              this.ping_interval = body["pingInterval"]
-              this.ping_timeout = body["pingTimeout"]
+              this.session_id = body["sid"] || "no_sid"
+              this.ping_interval = body["pingInterval"] || 25000
+              this.ping_timeout  = body["pingTimeout"]  || 60000
+              this.last_ping_at = Time.now.to_i
+              this.last_pong_at = Time.now.to_i
               this.state = :connect
               this.__emit :connect
             when 3  ## pong
-              this.last_pong_at = Time.now
+              this.last_pong_at = Time.now.to_i
             when 41  ## disconnect from server
               this.websocket.close if this.websocket.open?
               this.state = :disconnect
@@ -95,7 +105,7 @@ module SocketIO
           return unless @auto_reconnection
           return if @reconnecting
           @reconnecting = true
-          sleep rand(10)+5
+          sleep rand(5) + 5
           connect
         end
 

data/lib/socket.io-client-simple/version.rb

@@ -1,7 +1,7 @@
 module SocketIO
   module Client
     module Simple
-      VERSION = "1.1.0"
+      VERSION = "1.1.2"
     end
   end
 end

data/samples/sample.coffee

@@ -1,7 +1,8 @@
 #!/usr/bin/env coffee
 ## npm insatll socket.io-client coffee-script
 
-socket = require('socket.io-client').connect('http://localhost:3000')
+url    = process.argv[2] or 'http://localhost:3000'
+socket = require('socket.io-client').connect url, {transports: ['websocket']}
 
 socket.on 'connect', ->
   console.log 'connect!!'

data/samples/sample.rb

@@ -2,7 +2,8 @@ $:.unshift File.expand_path '../lib', File.dirname(__FILE__)
 require 'rubygems'
 require 'socket.io-client-simple'
 
-socket = SocketIO::Client::Simple.connect 'http://localhost:3000'
+url    = ARGV.shift or 'http://localhost:3000'
+socket = SocketIO::Client::Simple.connect url
 
 # socket.auto_reconnection = false
 

data/socket.io-client-simple.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest"
 
   spec.add_dependency "json"
-  spec.add_dependency "websocket-client-simple", '>= 0.0.9'
+  spec.add_dependency "websocket-client-simple", '>= 0.2.1'
   spec.add_dependency "httparty"
   spec.add_dependency "event_emitter"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socket.io-client-simple
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-04 00:00:00.000000000 Z
+date: 2014-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement