surro-gate 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a9c98fde8240310f3de62a3e4f53d933c726885
-  data.tar.gz: 11ce2faa9ce61b248954a61ad2c6a25175e2bdfd
+  metadata.gz: a27ce2403acd4f16e3d9d0e67209773563b24e9d
+  data.tar.gz: d8eb8edee4f24b9b66c03cea8e0df9cb2f6542da
 SHA512:
-  metadata.gz: e0245a150b59b21e4a852224386fb6cb00f4f811dc5f91ca4836778a1ca4f61ca089deb29ddf7ff74eb988314fb348f79945f781e5a7b51255ff9807e5aad5b1
-  data.tar.gz: 6905754a0c9d8a09f5187b0d420852183d3520a0704f81cf42594e9a37de507c3d0f32b2a81b72729aa22547108e2732680d31bd2ec864efb2b6d32d3a0fe20b
+  metadata.gz: '0801c6d8fa84ea67afab352c434fcbdcb56b0518ffe5886d372e371dc22ae35cc8de4571b23313ea18612d28c0d2f3e4889b4cee447573c1b8e64635a6ab8f0c'
+  data.tar.gz: 9b0324b3ca7638b9869285ea0993994fbabbf297f293eb0bd10b416fb37b4e2c77bc01ca75c7e9b92b7db8f042a906540ca5a94ecdbf237bcd0083ae1d55cd24

data/.travis.yml

@@ -2,7 +2,10 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.3.1
+  - 2.0.0
+  - 2.1.9
+  - 2.2.6
+  - 2.3.3
 before_install:
   - "echo 'gem: --no-ri --no-rdoc --no-document' > ~/.gemrc"
   - "gem install bundler -v 1.13.0"

data/lib/surro-gate/proxy.rb

@@ -13,7 +13,9 @@ module SurroGate
   class Proxy
     def initialize(logger)
       @mutex = Mutex.new
-      @selector = NIO::Selector.new
+      @reader = NIO::Selector.new
+      @writer = NIO::Selector.new
+      @selectors = [@reader, @writer]
       @log = logger || Logger.new(STDOUT)
     end
 
@@ -51,14 +53,13 @@ module SurroGate
     private
 
     def proxy(left, right, block = nil)
-      # Pass boths sockets to the Nio4r selector
-      monitors = [left, right].map { |socket| @selector.register(socket, :rw) }
-
-      # Set up handlers for both monitors
-      monitors.each do |src|
-        # Get the destination paired with the source
-        dst = monitors.reject { |m| m == src }.first
-        # Set up a proc for future transmissions
+      # Register the proxying in both directions
+      [[left, right], [right, left]].each do |rd, wr|
+        # Set up monitors for read/write separately
+        src = @reader.register(rd, :r)
+        dst = @writer.register(wr, :w)
+
+        # Set up handlers for the reader monitor
         src.value = proc do
           # Clean up the connection if one of the endpoints gets closed
           cleanup(src.io, dst.io, &block) if src.io.closed? || dst.io.closed?
@@ -67,8 +68,7 @@ module SurroGate
         end
       end
 
-      # Make sure that the internal thread is started
-      thread_start unless @selector.empty?
+      thread_start unless @reader.empty? || @writer.empty?
     end
 
     def transmit(src, dst, block)
@@ -81,7 +81,7 @@ module SurroGate
     def cleanup(*sockets)
       # Deregister and close the sockets
       sockets.each do |socket|
-        @selector.deregister(socket) if @selector.registered?(socket)
+        @selectors.each { |selector| selector.deregister(socket) if selector.registered?(socket) }
         socket.close unless socket.closed?
       end
 
@@ -90,7 +90,7 @@ module SurroGate
       yield if block_given?
 
       # Make sure that the internal thread is stopped if no sockets remain
-      thread_stop if @selector.empty?
+      thread_stop if @reader.empty? && @writer.empty?
     end
 
     def thread_start
@@ -111,16 +111,19 @@ module SurroGate
     end
 
     def reactor
-      # Atomically get an array of readable/writable monitors
-      monitors = @mutex.synchronize { @selector.select(0.1) || [] }
+      # Atomically get an array of readable monitors while also polling for writables
+      monitors = @mutex.synchronize do
+        @writer.select(0.1)
+        @reader.select(0.1) || []
+      end
       # Call each transmission proc and collect the results
-      callers = monitors.map { |m| m.value.call }
-      # Sleep for a short time if there was no transmission
-      sleep(0.1) if callers.none? && monitors.any?
+      monitors.map { |m| m.value.call }
     end
 
     def includes?(*sockets)
-      sockets.map { |socket| @selector.registered?(socket) }.any?
+      sockets.any? do |socket|
+        @selectors.any? { |selector| selector.registered?(socket) }
+      end
     end
   end
 end

data/lib/surro-gate/version.rb

@@ -1,3 +1,3 @@
 module SurroGate
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: surro-gate
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Dávid Halász
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nio4r