em-rtmp 0.0.4 → 0.0.5

data/lib/em-rtmp/connection.rb

@@ -148,21 +148,16 @@ module EventMachine
         loop do
           break if bytes_waiting < 1
 
-          begin
-            case state
-            when :handshake
-              if @handshake.buffer_changed == :handshake_complete
-                @handshake = nil
-                change_state :handshake_complete
-              end
-              break
-            when :handshake_complete, :ready
-              @response_router.buffer_changed
-              next
+          case state
+          when :handshake
+            if @handshake.buffer_changed == :handshake_complete
+              @handshake = nil
+              change_state :handshake_complete
             end
-          rescue NoMethodError, TypeError, RuntimeError => e
-            Logger.error "failure: #{e}"
-            retry
+            break
+          when :handshake_complete, :ready
+            @response_router.buffer_changed
+            next
           end
         end
 

data/lib/em-rtmp/io_helpers.rb

@@ -6,7 +6,7 @@ module EventMachine
       #
       # Returns the result of the read
       def read_uint8
-        read(1).unpack('C')[0]
+        read_safe(1).unpack('C')[0]
       end
 
       # Write an unsigned 8-bit integer
@@ -22,7 +22,7 @@ module EventMachine
       #
       # Returns the result of the read
       def read_uint16_be
-        read(2).unpack('n')[0]
+        read_safe(2).unpack('n')[0]
       end
 
       # Write an unsigned 16-bit integer
@@ -38,7 +38,7 @@ module EventMachine
       #
       # Returns the result of the read
       def read_uint24_be
-        ("\x00" + read(3)).unpack('N')[0]
+        ("\x00" + read_safe(3)).unpack('N')[0]
       end
 
       # Write an unsigned 24-bit integer
@@ -54,14 +54,14 @@ module EventMachine
       #
       # Returns the result of the read
       def read_uint32_be
-        read(4).unpack('N')[0]
+        read_safe(4).unpack('N')[0]
       end
 
       # Read a unsigned 32-bit integer (little endian)
       #
       # Returns the result of the read
       def read_uint32_le
-        read(4).unpack('V')[0]
+        read_safe(4).unpack('V')[0]
       end
 
       # Write an unsigned 32-bit integer (big endian)
@@ -86,7 +86,7 @@ module EventMachine
       #
       # Returns the result of the read
       def read_double_be
-        read(8).unpack('G')[0]
+        read_safe(8).unpack('G')[0]
       end
 
       # Write a double (big endian)
@@ -172,6 +172,18 @@ module EventMachine
         }
       end
 
+      def read_safe(length)
+        raise ArgumentError, "cannot read nothing: #{length}" unless length && length >= 1
+
+        loop do
+          if value = read(length)
+            return value
+          else
+            Logger.error "unable to read from socket"
+          end
+        end
+      end
+
       private
 
       # Obtain the shift and bitmasks for a set of widths

data/lib/em-rtmp/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   module RTMP
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-rtmp
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors: