socket.io-client-simple 0.0.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53637062fd1f888bca99a916ad53579a82184658
-  data.tar.gz: a1938eb0b5cc6c5df5ff6d1e5e73c3fa2b6b6fa7
+  metadata.gz: 50a078ab4570719f46273add06d388b0ce58db48
+  data.tar.gz: 332855f1fe15af38a2594b020897ea6880025633
 SHA512:
-  metadata.gz: 3f96621384ba80c5ee9528474b594a93056d331071443df72df1b4e313236e407eb32ac1a6d3824d2c6bf148b43715fad6ad17bda3e883c5667a25a86aa4239b
-  data.tar.gz: 8af155de0ee260969380caaf35adf9a6706df5adfb531f92bacbf7068582344cb8d9507c92032da5ff1bf41669a159cb9749ac17682e0441605092f889c83138
+  metadata.gz: bf78878c9ca070fe802161173f70ee694ac809474247536236eea26e22e42e8d58bafcc9e210d7edeb8bd4542c1e0cf6b1074b6bf042677aad32e791670ab499
+  data.tar.gz: 5f3889fbbd2c2f5f2a5f5f2289d4c20675779f1ff9214372f5b2b010f3f5630881a8f83afefd82aef11f7ba810f302c9410a1f20fa530910e9aa37972d65111e

data/.gitignore

@@ -18,3 +18,4 @@ test/tmp
 test/version_tmp
 tmp
 node_modules
+*.log

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    socket.io-client-simple (0.0.6)
+    socket.io-client-simple (1.0.0)
       event_emitter
       httparty
       json

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.0.0 2014-07-03
+
+* support Socket.IO v1.0.x  #4
+  * add parameter Client#auto_reconnection to disable auto-reconneciton
+
 === 0.0.6 2014-06-08
 
 * use 2nd argment of method "SocketIO::Client::Simple.connect" as handshake query parameter  #5

data/README.md

@@ -1,5 +1,5 @@
 # SocketIO::Client::Simple
-A simple ruby client for node.js's socket.io. Supports only WebSocket.
+A simple ruby client for Node.js's Socket.IO v1.0.x, Supports only WebSocket.
 
 - https://github.com/shokai/ruby-socket.io-client-simple
 - https://rubygems.org/gems/socket.io-client-simple
@@ -8,7 +8,15 @@ A simple ruby client for node.js's socket.io. Supports only WebSocket.
 
 ## Install
 
-    % gem install socket.io-client-simple
+gem intsall
+
+    % gem install socket.io-client-simple  # latest version, supports Socket.IO v1.0.x
+
+
+or use `Gemfile` with Bundler
+
+    gem 'socket.io-client-simple', '< 1.0'  # for Socket.IO v0.9.x
+    gem 'socket.io-client-simple'           # for Socket.IO v1.0.x
 
 
 ## Usage
@@ -47,12 +55,12 @@ loop do
 end
 ```
 
-sample.rb works with [samples/chat_server.js](https://github.com/shokai/ruby-socket.io-client-simple/blob/master/samples/chat_server.js).
+sample.rb works with [samples/chat_server.coffee](https://github.com/shokai/ruby-socket.io-client-simple/blob/master/samples/chat_server.coffee).
 
 ### start chat server
 
     % npm install
-    % node samples/chat_server.js
+    % coffee samples/chat_server.coffee
 
 => chat server start at localhost:3000
 

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

@@ -5,58 +5,45 @@ module SocketIO
       def self.connect(url, opts={})
         client = Client.new(url, opts)
         client.connect
-        client
+        return client
       end
 
       class Client
         include EventEmitter
         alias_method :__emit, :emit
 
-        attr_reader :websocket, :session_id, :heartbeat_timeout,
-                    :connection_timeout, :transports, :url
-        attr_accessor :last_heartbeat_at, :reconnecting
+        attr_accessor :auto_reconnection, :websocket, :url, :reconnecting, :state,
+                      :session_id, :ping_interval, :ping_timeout, :last_pong_at
 
         def initialize(url, opts={})
           @url = url
           @opts = opts
+          @opts[:transport] = :websocket
           @reconnecting = false
+          @state = :disconnect
+          @auto_reconnection = true
 
           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
+              if @state == :connect
+                @websocket.send "2"  ## ping
+                @last_ping_at = Time.now
+                sleep @ping_interval/1000
+              else
+                sleep 1
               end
             end
           end
 
         end
 
+
         def connect
-          res = nil
-          begin
-            res = HTTParty.get "#{@url}/socket.io/1", :query => @opts
-          rescue Errno::ECONNREFUSED => 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
+          query = @opts.map{|k,v| "#{k}=#{v}" }.join '&'
           begin
-            @websocket = WebSocket::Client::Simple.connect "#{@url}/socket.io/1/websocket/#{@session_id}"
+            @websocket = WebSocket::Client::Simple.connect "#{@url}/socket.io/?#{query}"
           rescue Errno::ECONNREFUSED => e
+            @state = :disconnect
             @reconnecting = false
             reconnect
             return
@@ -65,43 +52,50 @@ module SocketIO
           this = self
 
           @websocket.on :error do |err|
+            if err.kind_of? Errno::ECONNRESET and this.state == :connect
+              this.state = :disconnect
+              this.__emit :disconnect
+              this.reconnect
+              next
+            end
             this.__emit :error, err
           end
 
           @websocket.on :message do |msg|
-            code, body = msg.data.scan(/^(\d+):{2,3}(.*)$/)[0]
+            next unless msg.data =~ /^\d+/
+            code, body = msg.data.unpack('U*').pack('C*').force_encoding('utf-8').scan(/^(\d+)(.*)$/)[0]
             code = code.to_i
             case code
-            when 0
-              this.websocket.close if this.websocket.open?
-              this.__emit :disconnect
-              this.reconnect
-            when 1  ##  socket.io connect
-              this.last_heartbeat_at = Time.now
+            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.state = :connect
               this.__emit :connect
-            when 2
-              this.last_heartbeat_at = Time.now
-              send "2::"  # socket.io heartbeat
-            when 3
-            when 4
-            when 5
-              data = JSON.parse body
-              this.__emit data['name'], *data['args']
-            when 6
-            when 7
-              this.__emit :error
+            when 3  ## pong
+              this.last_pong_at = Time.now
+            when 41  ## disconnect from server
+              this.websocket.close if this.websocket.open?
+              this.state = :disconnect
+              this.__emit :disconnect
+              reconnect
+            when 42  ## data
+              data = JSON.parse body rescue next
+              event_name = data.shift
+              this.__emit event_name, *data
             end
           end
 
-          @websocket.send "1::#{@opts[:path]}"
-          return
+          return self
         end
 
         def reconnect
+          return unless @auto_reconnection
           return if @reconnecting
           @reconnecting = true
-          sleep rand(20)+20
+          sleep rand(10)+5
           connect
         end
 
@@ -111,8 +105,9 @@ module SocketIO
 
         def emit(event_name, *data)
           return unless open?
-          emit_data = {:name => event_name, :args => data}.to_json
-          @websocket.send "5:::#{emit_data}"
+          return unless @state == :connect
+          data.unshift event_name
+          @websocket.send "42#{data.to_json}".unpack('C*').pack('U*')
         end
 
       end

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

@@ -1,7 +1,7 @@
 module SocketIO
   module Client
     module Simple
-      VERSION = "0.0.6"
+      VERSION = "1.0.0"
     end
   end
 end

data/package.json

@@ -6,11 +6,13 @@
   "license": "MIT",
   "homepage": "https://github.com/shokai/ruby-socket.io-client-simple",
   "dependencies": {
-    "socket.io": "~0.9.16"
+    "socket.io": "~1.0",
+    "socket.io-client": "~1.0",
+    "coffee-script": "*"
   },
   "devDependencies": {},
   "scripts": {
-    "start": "node samples/chat_server.js"
+    "start": "coffee samples/chat_server.coffee"
   },
   "repository": {
     "type": "git",

data/samples/chat_server.coffee

@@ -0,0 +1,19 @@
+## socket.io chat server
+
+process.env.PORT ||= 3000;
+
+io = require('socket.io').listen process.env.PORT
+console.log "socket.io server start - port: #{process.env.PORT}"
+
+io.sockets.on 'connection', (socket) ->
+  user = socket.handshake.query.user
+  socket.emit 'chat', {msg: 'hello world (from server)'}
+  socket.on 'chat', (data) ->
+    console.log data
+    data.user = user
+    io.sockets.emit 'chat', data; # broadcast echo
+
+if process.env.EXIT_AT
+  setTimeout ->
+    process.exit();
+  , process.env.EXIT_AT-0

data/samples/sample.rb

@@ -4,6 +4,8 @@ require 'socket.io-client-simple'
 
 socket = SocketIO::Client::Simple.connect 'http://localhost:3000'
 
+# socket.auto_reconnection = false
+
 #socket.websocket.on :message do |msg|  ## inspect websocket data
 #  p msg.data
 #end

data/socket.io-client-simple.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = SocketIO::Client::Simple::VERSION
   spec.authors       = ["Sho Hashimoto"]
   spec.email         = ["hashimoto@shokai.org"]
-  spec.description   = "A simple ruby client for node.js's socket.io. Supports only WebSocket."
+  spec.description   = "A simple ruby client for Node.js's Socket.IO v1.0.x, Supports only WebSocket."
   spec.summary       = spec.description
   spec.homepage      = "https://github.com/shokai/ruby-socket.io-client-simple"
   spec.license       = "MIT"

data/test/test_socket.io.rb

@@ -2,9 +2,7 @@ require File.expand_path 'test_helper', File.dirname(__FILE__)
 
 class TestSocketIOClientSimple < MiniTest::Test
 
-  def setup
-    TestServer.start
-  end
+  TestServer.start
 
   def test_connect
     socket = SocketIO::Client::Simple.connect TestServer.url

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socket.io-client-simple
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 1.0.0
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,7 +108,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A simple ruby client for node.js's socket.io. Supports only WebSocket.
+description: A simple ruby client for Node.js's Socket.IO v1.0.x, Supports only WebSocket.
 email:
 - hashimoto@shokai.org
 executables: []
@@ -128,7 +128,7 @@ files:
 - lib/socket.io-client-simple/error.rb
 - lib/socket.io-client-simple/version.rb
 - package.json
-- samples/chat_server.js
+- samples/chat_server.coffee
 - samples/sample.coffee
 - samples/sample.rb
 - socket.io-client-simple.gemspec
@@ -158,7 +158,7 @@ rubyforge_project:
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: A simple ruby client for node.js's socket.io. Supports only WebSocket.
+summary: A simple ruby client for Node.js's Socket.IO v1.0.x, Supports only WebSocket.
 test_files:
 - test/server.rb
 - test/test_helper.rb

data/samples/chat_server.js

@@ -1,22 +0,0 @@
-// socket.io chat server
-var port = (process.env.PORT || 3000) - 0;
-
-var io = require('socket.io').listen(port);
-console.log("socket.io server start - port:"+port);
-
-io.sockets.on('connection', function(socket){
-  var user = socket.manager.handshaken[socket.id].query.user;
-  socket.emit('chat', {msg: 'hello world (from server)'});
-  socket.on('chat', function(data){
-    console.log(data);
-    data.user = user;
-    socket.emit('chat', data); // echo
-  });
-});
-
-
-if(!!process.env.EXIT_AT){
-  setTimeout(function(){
-    process.exit();
-  }, process.env.EXIT_AT-0);
-}