distributor 0.0.1 → 0.1.0

data/lib/distributor/client.rb

@@ -20,26 +20,29 @@ class Distributor::Client
       @multiplexer.input io
     end
 
-    @connector.on_close(input) do |io|
-      @multiplexer.output 0, JSON.dump({ "command" => "close", "ch" => ch })
-    end
+    # @connector.on_close(input) do |io|
+    #   p [:cl1, input]
+    #   @multiplexer.output 0, JSON.dump({ "command" => "close", "ch" => ch })
+    # end
 
     # handle the command channel of the multiplexer
     @connector.handle(@multiplexer.reader(0)) do |io|
-      data = JSON.parse(io.readpartial(4096))
-
-      case command = data["command"]
-      when "close" then
-        ch = data["ch"]
-        @on_close[ch].each { |c| c.call(ch) }
-      when "launch" then
-        ch = data["ch"]
-        @multiplexer.reserve ch
-        @handlers[data["id"]].call(ch)
-        @handlers.delete(data["id"])
-        @processes << ch
-      else
-        raise "no such command: #{command}"
+      append_json(io.readpartial(4096))
+
+      dequeue_json do |data|
+        case command = data["command"]
+        when "close" then
+          ch = data["ch"]
+          @on_close[ch].each { |c| c.call(ch) }
+        when "ack" then
+          ch = data["ch"]
+          @multiplexer.reserve ch
+          @handlers[data["id"]].call(ch)
+          @handlers.delete(data["id"])
+          @processes << ch
+        else
+          raise "no such command: #{command}"
+        end
       end
     end
   end
@@ -49,12 +52,18 @@ class Distributor::Client
   end
 
   def run(command, &handler)
-    id = "#{Time.now.to_f}-#{rand(10000)}"
+    id = generate_id
     @multiplexer.output 0, JSON.dump({ "id" => id, "command" => "run", "args" => command })
     @handlers[id] = handler
   end
 
-  def hookup(ch, input, output)
+  def tunnel(port, &handler)
+    id = generate_id
+    @multiplexer.output 0, JSON.dump({ "id" => id, "command" => "tunnel", "port" => port })
+    @handlers[id] = handler
+  end
+
+  def hookup(ch, input, output=input)
     # handle data incoming on the multiplexer
     @connector.handle(@multiplexer.reader(ch)) do |io|
       begin
@@ -85,4 +94,22 @@ class Distributor::Client
     loop { @connector.listen }
   end
 
+private
+
+  def generate_id
+    id = "#{Time.now.to_f}-#{rand(10000)}"
+  end
+
+  def append_json(data)
+    @json ||= ""
+    @json += data
+  end
+
+  def dequeue_json
+    while idx = @json.index("}")
+      yield JSON.parse(@json[0..idx])
+      @json = @json[idx+1..-1]
+    end
+  end
+
 end

data/lib/distributor/connector.rb

@@ -20,9 +20,15 @@ class Distributor::Connector
   def listen
     rs, ws = IO.select(@connections.keys)
     rs.each do |from|
-      @on_close.each { |c| c.call } if from.eof?
+      @on_close.each { |c| c.call(from) } if from.eof?
       self.connections[from].call(from)
     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

@@ -40,7 +40,7 @@ class Distributor::Multiplexer
   end
 
   def close(ch)
-    writer(ch).close
+    output 0, JSON.dump({ "command" => "close", "ch" => ch })
   rescue IOError
   end
 

data/lib/distributor/server.rb

@@ -2,6 +2,7 @@ require "distributor"
 require "distributor/connector"
 require "distributor/multiplexer"
 require "pty"
+require "socket"
 
 class Distributor::Server
 
@@ -17,18 +18,27 @@ class Distributor::Server
       @multiplexer.input io
     end
 
+    @connector.on_close(input) do |ch|
+      exit 0
+    end
+
     # handle the command channel of the multiplexer
     @connector.handle(@multiplexer.reader(0)) do |io|
-      data = JSON.parse(io.readpartial(4096))
-
-      case command = data["command"]
-      when "close" then
-        @multiplexer.close data["ch"]
-      when "run" then
-        ch = run(data["args"])
-        @multiplexer.output 0, JSON.dump({ "id" => data["id"], "command" => "launch", "ch" => ch })
-      else
-        raise "no such command: #{command}"
+      append_json(io.readpartial(4096))
+
+      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 })
+        when "close" then
+          @multiplexer.close data["ch"]
+        when "run" then
+          ch = run(data["args"])
+          @multiplexer.output 0, JSON.dump({ "id" => data["id"], "command" => "ack", "ch" => ch })
+        else
+          raise "no such command: #{command}"
+        end
       end
     end
   end
@@ -43,7 +53,8 @@ class Distributor::Server
       begin
         @multiplexer.output(ch, io.readpartial(4096))
       rescue EOFError
-        @multiplexer.output 0, JSON.dump({ "command" => "close", "ch" => ch })
+        @multiplexer.close(ch)
+        @connector.close(io)
       end
     end
 
@@ -56,11 +67,45 @@ class Distributor::Server
     ch
   end
 
-  def close(ch)
-  end
+  def tunnel(port)
+    ch = @multiplexer.reserve
+
+    tcp = TCPSocket.new("localhost", port)
+
+    # handle data incoming from process
+    @connector.handle(tcp) do |io|
+      begin
+        @multiplexer.output(ch, io.readpartial(4096))
+      rescue EOFError
+        @multiplexer.close(ch)
+        @connector.close(io)
+      end
+    end
 
+    # handle data incoming on the multiplexer
+    @connector.handle(@multiplexer.reader(ch)) do |input_io|
+      data = input_io.readpartial(4096)
+      tcp.write data
+    end
+
+    ch
+  end
   def start
     loop { @connector.listen }
   end
 
+private
+
+  def append_json(data)
+    @json ||= ""
+    @json += data
+  end
+
+  def dequeue_json
+    while idx = @json.index("}")
+      yield JSON.parse(@json[0..idx])
+      @json = @json[idx+1..-1]
+    end
+  end
+
 end

data/lib/distributor/version.rb

@@ -1,5 +1,5 @@
 module Distributor
 
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: distributor
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70336779621500 !ruby/object:Gem::Requirement
+  requirement: &70208191262780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.13.6
   type: :runtime
   prerelease: false
-  version_requirements: *70336779621500
+  version_requirements: *70208191262780
 description: TCP Multiplexer
 email: ddollar@gmail.com
 executables: []