websocket-eventmachine-base 1.0.0 → 1.0.1

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.0.1
+
+- prevent sending messages after connection was closed
+- prevent duplicated close frames
+
 ## 1.0.0
 
 - initial release

data/lib/websocket/eventmachine/base/version.rb

@@ -1,7 +1,7 @@
 module WebSocket
   module EventMachine
     class Base
-      VERSION = '1.0.0'
+      VERSION = '1.0.1'
     end
   end
 end

data/lib/websocket/eventmachine/base.rb

@@ -48,6 +48,7 @@ module WebSocket
       # @return [Boolean] true if data was send, otherwise call on_error if needed
       def send(data, args = {})
         type = args[:type] || :text
+        return if @state == :closed || (@state == :closing && type != :close)
         unless type == :plain
           frame = outgoing_frame.new(:version => @handshake.version, :data => data, :type => type.to_s, :code => args[:code])
           if !frame.supported?
@@ -156,29 +157,35 @@ module WebSocket
       def handle_open(data)
         @frame << data
         while frame = @frame.next
-          case frame.type
-          when :close
-            @state = :closing
-            close
-            trigger_onclose(frame.to_s)
-          when :ping
-            pong(frame.to_s)
-            trigger_onping(frame.to_s)
-          when :pong
-            trigger_onpong(frame.to_s)
-          when :text
-            trigger_onmessage(frame.to_s, :text)
-          when :binary
-            trigger_onmessage(frame.to_s, :binary)
+          if @state == :open
+            case frame.type
+            when :close
+              @state = :closing
+              close
+              trigger_onclose(frame.to_s)
+            when :ping
+              pong(frame.to_s)
+              trigger_onping(frame.to_s)
+            when :pong
+              trigger_onpong(frame.to_s)
+            when :text
+              trigger_onmessage(frame.to_s, :text)
+            when :binary
+              trigger_onmessage(frame.to_s, :binary)
+            end
+          else
+            break
           end
         end
         unbind if @frame.error?
       end
 
       def handle_closing(data)
-        @state = :closed
-        close
-        trigger_onclose
+        unless @state == :closed
+          @state = :closed
+          close
+          trigger_onclose('')
+        end
       end
 
       def debug(description, data)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: websocket-eventmachine-base
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors: