distributor 0.1.2 → 0.2.0

data/lib/distributor/client.rb

@@ -2,6 +2,7 @@ require "distributor"
 require "distributor/connector"
 require "distributor/multiplexer"
 require "json"
+require "thread"
 
 class Distributor::Client
 
@@ -10,7 +11,9 @@ class Distributor::Client
     @multiplexer = Distributor::Multiplexer.new(output)
     @handlers    = {}
     @processes   = []
-    @on_close    = Hash.new([])
+    @on_close    = Hash.new { |hash,key| hash[key] = Array.new }
+    @on_hello    = []
+    @hookup_lock = Mutex.new
 
     # reserve a command channel
     @multiplexer.reserve(0)
@@ -20,10 +23,9 @@ class Distributor::Client
       @multiplexer.input io
     end
 
-    # @connector.on_close(input) do |io|
-    #   p [:cl1, input]
-    #   @multiplexer.output 0, JSON.dump({ "command" => "close", "ch" => ch })
-    # end
+    @connector.on_close(input) do |io|
+      exit 0
+    end
 
     # handle the command channel of the multiplexer
     @connector.handle(@multiplexer.reader(0)) do |io|
@@ -31,6 +33,8 @@ class Distributor::Client
 
       dequeue_json do |data|
         case command = data["command"]
+        when "hello" then
+          @on_hello.each { |c| c.call }
         when "close" then
           ch = data["ch"]
           @on_close[ch].each { |c| c.call(ch) }
@@ -64,14 +68,17 @@ class Distributor::Client
   end
 
   def hookup(ch, input, output=input)
-    # handle data incoming on the multiplexer
-    @connector.handle(@multiplexer.reader(ch)) do |io|
-      begin
-        data = io.readpartial(4096)
-        # output.write "#{ch}: #{data}"
-        output.write data
-      rescue EOFError
-        @multiplexer.output 0, JSON.dump({ "command" => "close", "ch" => ch })
+    @hookup_lock.synchronize do
+      # handle data incoming on the multiplexer
+      @connector.handle(@multiplexer.reader(ch)) do |io|
+        begin
+          data = io.readpartial(4096)
+          # output.write "#{ch}: #{data}"
+          output.write data
+          output.flush
+        rescue EOFError
+          @multiplexer.output 0, JSON.dump({ "command" => "close", "ch" => ch })
+        end
       end
     end
 
@@ -81,7 +88,8 @@ class Distributor::Client
         data = io.readpartial(4096)
         @multiplexer.output ch, data
       rescue EOFError
-        @processes.each { |ch| @multiplexer.close(ch) }
+        @on_close[ch].each { |c| p c; c.call(ch) }
+        @connector.close(io)
       end
     end
   end
@@ -90,6 +98,10 @@ class Distributor::Client
     @on_close[ch] << blk
   end
 
+  def on_hello(&blk)
+    @on_hello << blk
+  end
+
   def start
     loop { @connector.listen }
   end

data/lib/distributor/connector.rb

@@ -6,10 +6,11 @@ class Distributor::Connector
 
   def initialize
     @connections = {}
-    @on_close = Hash.new([])
+    @on_close = Hash.new { |hash,key| hash[key] = Array.new }
   end
 
   def handle(from, &handler)
+    return unless from
     @connections[from] = handler
   end
 
@@ -18,17 +19,19 @@ class Distributor::Connector
   end
 
   def listen
-    rs, ws = IO.select(@connections.keys)
-    rs.each do |from|
-      @on_close.each { |c| c.call(from) } if from.eof?
-      self.connections[from].call(from)
+    rs, ws = IO.select(@connections.keys, [], [], 1)
+    (rs || []).each do |from|
+      begin
+        @on_close[from].each { |c| c.call(from) } if from.eof?
+        @connections[from].call(from)
+      rescue Errno::EIO
+      end
     end
   end
 
   def close(io)
     @connections.delete(io)
     @on_close[io].each { |c| c.call(io) }
-    exit 1
   end
 
 end

data/lib/distributor/multiplexer.rb

@@ -31,11 +31,11 @@ class Distributor::Multiplexer
     return if ch.nil?
     writer(ch).write data
   rescue IOError
-    @output.write Distributor::Packet.create(0, JSON.dump({ "command" => "close", "ch" => ch }))
+    output 0, JSON.dump({ "command" => "close", "ch" => ch })
   end
 
   def output(ch, data)
-    @output.write Distributor::Packet.create(ch, data)
+    Distributor::Packet.write(@output, ch, data)
   rescue Errno::EPIPE
   end
 

data/lib/distributor/packet.rb

@@ -1,15 +1,22 @@
 require "distributor"
+require "stringio"
+require "thread"
 
 class Distributor::Packet
 
   PROTOCOL_VERSION = 1
 
-  def self.create(channel, data)
-    packet = "DIST"
-    packet += pack(PROTOCOL_VERSION)
-    packet += pack(channel)
-    packet += pack(data.length)
-    packet += data
+  def self.write(io, channel, data)
+    @@output ||= Mutex.new
+    @@output.synchronize do
+      buffer = StringIO.new
+      buffer.write "DIST"
+      buffer.write pack(PROTOCOL_VERSION)
+      buffer.write pack(channel)
+      buffer.write pack(data.length)
+      buffer.write data
+      io.write buffer.string
+    end
   end
 
   def self.parse(io)

data/lib/distributor/server.rb

@@ -1,6 +1,7 @@
 require "distributor"
 require "distributor/connector"
 require "distributor/multiplexer"
+require "json"
 require "pty"
 require "socket"
 
@@ -18,7 +19,7 @@ class Distributor::Server
       @multiplexer.input io
     end
 
-    @connector.on_close(input) do |ch|
+    @connector.on_close(input) do |io|
       exit 0
     end
 
@@ -29,8 +30,9 @@ class Distributor::Server
       dequeue_json do |data|
         case command = data["command"]
         when "tunnel" then
-          ch = tunnel(data["port"])
-          @multiplexer.output 0, JSON.dump({ "id" => data["id"], "command" => "ack", "ch" => ch })
+          port = (data["port"] || ENV["PORT"] || 5000).to_i
+          ch = tunnel(port)
+          @multiplexer.output 0, JSON.dump({ "id" => data["id"], "command" => "ack", "ch" => ch, "port" => port })
         when "close" then
           @multiplexer.close data["ch"]
         when "run" then
@@ -91,6 +93,7 @@ class Distributor::Server
     ch
   end
   def start
+    @multiplexer.output 0, JSON.dump({ "command" => "hello" })
     loop { @connector.listen }
   end
 

data/lib/distributor/version.rb

@@ -1,5 +1,5 @@
 module Distributor
 
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: distributor
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000 Z
+date: 2012-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70255347061300 !ruby/object:Gem::Requirement
+  requirement: &70208946341240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.13.6
   type: :runtime
   prerelease: false
-  version_requirements: *70255347061300
+  version_requirements: *70208946341240
 description: TCP Multiplexer
 email: ddollar@gmail.com
 executables: []