sinatra-websocketio 0.0.3 → 0.0.4

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.4 2013-03-10
+
+* close websocket if session_id duplicate
+
 === 0.0.3 2013-03-09
 
 * add EM::WebSocketIO::Client

data/lib/sinatra-websocketio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module WebSocketIO
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/sinatra-websocketio/websocketio.rb

@@ -10,22 +10,30 @@ class WebSocketIO
         ws.onopen do |handshake|
           params = parse_handshake_params handshake.path
           session_id = params[:session] || (create_session Socket.unpack_sockaddr_in ws.get_peername)
-          self.sessions[session_id] = {
-            :websocket => ws
-          }
-          ws.onclose do
-            self.emit :disconnect, session_id
-          end
-          ws.onmessage do |msg|
-            begin
-              data = JSON.parse msg
-            rescue => e
-              self.emit :error, e
+
+          if self.sessions.include? session_id
+            ws.send({:type => :error, :data => "invalid session_id (#{session_id})"}.to_json)
+            ws.close
+          else
+            self.sessions[session_id] = {
+              :websocket => ws
+            }
+            ws.onclose do
+              self.sessions.delete session_id
+              self.emit :disconnect, session_id
             end
-            self.emit data['type'], data['data'], session_id if data
+            ws.onmessage do |msg|
+              begin
+                data = JSON.parse msg
+              rescue => e
+                self.emit :error, e
+              end
+              self.emit data['type'], data['data'], session_id if data
+            end
+            ws.send({:type => :__session_id, :data => session_id}.to_json)
+            self.emit :connect, session_id
           end
-          ws.send({:type => :__session_id, :data => session_id}.to_json)
-          self.emit :connect, session_id
+
         end
       end
     end

data/sample/main.rb

@@ -1,6 +1,6 @@
 WebSocketIO.on :connect do |session|
   puts "new client <#{session}>"
-  WebSocketIO.push :chat, {:name => "system", :message => "new client <#{session}>"}
+  WebSocketIO.push :chat, {:name => "system", :message => "new client <#{session}> / #{WebSocketIO.sessions.size} clients connecting"}
   WebSocketIO.push :chat, {:name => "system", :message => "welcome <#{session}>"}, {:to => session}
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-websocketio
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors: