socket.io-client-simple 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2afed194d20af9d81e21b0048f1c056f12736ea1
-  data.tar.gz: 6113d9b1854c2a2a9e97fe37f682be60fa634e52
+  metadata.gz: 3e667cd97164a9d1c7086a9e6809a610b3f9be00
+  data.tar.gz: a4199df86ebc2d43a2f745b0ad2f648ba040ee1e
 SHA512:
-  metadata.gz: 0a7d3e056498915bb1ab326dc070962cc2d84127799af6f65670e3c7fa35b8684e574538d2aa420da0d4449493c6b1559e34af69df7fbdb74e34927710021551
-  data.tar.gz: b3f08e4f17e8cb4075b2e16d29a77a1c486e8508383c315a20ede5cd8caeeb616922c955e8e4370e1ebed34ed99b92dfb9851762c16a7cbfa94434116f3430e4
+  metadata.gz: 1d998aa592b286f6d627e13aea6ab35937f4041adff9c13ac6e3776a774301c425e9f8e1b492e989d5e2de8ea4ec795688b74606bb9400d0f539f46015ccfbde
+  data.tar.gz: 9085050e33a16bdc965ecbc06f608763ae99a0d57b8bacaf3232e239ae0c8dec5aaddee640687cb8a5a265ab761e01d5e0daabc3efe2a31f85a32e808325ad93

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    socket.io-client-simple (0.0.2)
+    socket.io-client-simple (0.0.3)
       event_emitter
       httparty
       json
-      websocket-client-simple
+      websocket-client-simple (>= 0.0.6)
 
 GEM
   remote: https://rubygems.org/
@@ -19,7 +19,7 @@ GEM
     multi_xml (0.5.5)
     rake (10.1.1)
     websocket (1.1.2)
-    websocket-client-simple (0.0.5)
+    websocket-client-simple (0.0.6)
       event_emitter
       websocket
 

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.0.3 2014-1-20
+
+* reconnect on socket.io disconnect
+* add Tests, use Travis-CI
+
 === 0.0.2 2014-1-18
 
 * bugfix "disconnect" event

data/README.md

@@ -4,6 +4,7 @@ A simple ruby client for node.js's socket.io. Supports only WebSocket.
 - https://github.com/shokai/ruby-socket.io-client-simple
 - https://rubygems.org/gems/socket.io-client-simple
 
+[![Travis-CI Build Status](https://travis-ci.org/shokai/ruby-socket.io-client-simple.png)](https://travis-ci.org/shokai/ruby-socket.io-client-simple)
 
 ## Install
 
@@ -53,6 +54,13 @@ sample.rb works with [samples/chat_server.js](https://github.com/shokai/ruby-soc
 
     % ruby samples/sample.rb
 
+## Test
+
+    % gem install bundler
+    % bundle install
+    % npm install
+    % bundle exec rake test
+
 
 ## Contributing
 

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

@@ -10,11 +10,6 @@ require 'socket.io-client-simple/client'
 module SocketIO
   module Client
     module Simple
-
-      def self.connect(url, opts={})
-        Client.new(url, opts)
-      end
-
     end
   end
 end

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

@@ -2,19 +2,65 @@ module SocketIO
   module Client
     module Simple
 
+      def self.connect(url, opts={})
+        client = Client.new(url, opts)
+        client.connect
+        client
+      end
+
       class Client
         include EventEmitter
         alias_method :__emit, :emit
 
         attr_reader :websocket, :session_id, :heartbeat_timeout,
                     :connection_timeout, :transports
+        attr_accessor :last_heartbeat_at, :reconnecting
 
         def initialize(url, opts={})
           @url = url
           @opts = opts
-          configure
+          @reconnecting = false
+
+          Thread.new do
+            loop do
+              sleep 5
+              next if !@last_heartbeat_at or !@heartbeat_timeout
+              if Time.now - @last_heartbeat_at > @heartbeat_timeout
+                @websocket.close
+                __emit :disconnect
+                reconnect
+              end
+            end
+          end
+
+        end
 
-          @websocket = WebSocket::Client::Simple.connect "#{url}/socket.io/1/websocket/#{@session_id}"
+        def connect
+          res = nil
+          begin
+            res = HTTParty.get "#{@url}/socket.io/1/"
+          rescue => e
+            @reconnecting = false
+            reconnect
+            return
+          end
+          raise res.body unless res.code == 200
+
+          arr = res.body.split(':')
+          @session_id = arr.shift
+          @heartbeat_timeout = arr.shift.to_i
+          @connection_timeout = arr.shift.to_i
+          @transports = arr.shift.split(',')
+          unless @transports.include? 'websocket'
+            raise Error, "server #{@url} does not supports websocket!!"
+          end
+          begin
+            @websocket = WebSocket::Client::Simple.connect "#{@url}/socket.io/1/websocket/#{@session_id}"
+          rescue => e
+            @reconnecting = false
+            reconnect
+            return
+          end
 
           this = self
           @websocket.on :message do |msg|
@@ -22,11 +68,16 @@ module SocketIO
             code = code.to_i
             case code
             when 0
+              this.websocket.close if this.websocket.open?
               this.__emit :disconnect
-            when 1
+              this.reconnect
+            when 1  ##  socket.io connect
+              this.last_heartbeat_at = Time.now
+              this.reconnecting = false
               this.__emit :connect
             when 2
-              send "2::"  # heartbeat
+              this.last_heartbeat_at = Time.now
+              send "2::"  # socket.io heartbeat
             when 3
             when 4
             when 5
@@ -38,28 +89,23 @@ module SocketIO
             end
           end
 
-          @websocket.on :close do
-            this.__emit :disconnect
-          end
-
-          @websocket.send "1::#{opts[:path]}"
+          @websocket.send "1::#{@opts[:path]}"
+          return
         end
 
-        def configure
-          res = HTTParty.get "#{@url}/socket.io/1/"
-          raise res.body unless res.code == 200
+        def reconnect
+          return if @reconnecting
+          @reconnecting = true
+          sleep rand(20)+20
+          connect
+        end
 
-          arr = res.body.split(':')
-          @session_id = arr.shift
-          @heartbeat_timeout = arr.shift.to_i
-          @connection_timeout = arr.shift.to_i
-          @transports = arr.shift.split(',')
-          unless @transports.include? 'websocket'
-            raise Error, "server #{@url} does not supports websocket!!"
-          end
+        def open?
+          @websocket and @websocket.open?
         end
 
         def emit(event_name, *data)
+          return unless open?
           emit_data = {:name => event_name, :args => data}.to_json
           @websocket.send "5:::#{emit_data}"
         end

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

@@ -1,7 +1,7 @@
 module SocketIO
   module Client
     module Simple
-      VERSION = "0.0.2"
+      VERSION = "0.0.3"
     end
   end
 end

data/samples/sample.coffee

@@ -0,0 +1,19 @@
+#!/usr/bin/env coffee
+## npm insatll socket.io-client coffee-script
+
+socket = require('socket.io-client').connect('http://localhost:3000')
+
+socket.on 'connect', ->
+  console.log 'connect!!'
+
+socket.on 'disconnect', ->
+  console.log 'disconnected'
+
+socket.on 'chat', (data) ->
+  console.log "> " + data.msg
+
+process.stdin.setEncoding 'utf8'
+process.stdin.on 'data', (data) ->
+  msg = data.replace(/[\r\n]/g, '')
+  return if msg.length < 1
+  socket.emit 'chat', {msg: msg, at: Date.now()}

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"
+  spec.add_dependency "websocket-client-simple", '>= 0.0.6'
   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: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-18 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +129,7 @@ files:
 - lib/socket.io-client-simple/version.rb
 - package.json
 - samples/chat_server.js
+- samples/sample.coffee
 - samples/sample.rb
 - socket.io-client-simple.gemspec
 - test/server.rb