pry-remote-em 0.6.3 → 0.7.0

data/README.md

@@ -38,7 +38,7 @@ program to connect itself to it:
 
 You can then connect to the pry session using ``pry-remote-em``:
 
-    $ pry-remote-em
+    $ pry-remote-em pryem://127.0.0.1:6462/
     [pry-remote-em] client connected to pryem://127.0.0.1:6462/
     [pry-remote-em] remote is PryRemoteEm 0.1.0
     [1] pry(#<Foo>)> stat
@@ -69,7 +69,7 @@ You can then connect to the pry session using ``pry-remote-em``:
     [7] pry(#<Foo>)> exit
     [pry-remote-em] session terminated
 
-    $ pry-remote-em
+    $ pry-remote-em pryem://127.0.0.1:6462/
     [pry-remote-em] client connected to pryem://127.0.0.1:6462/
     [pry-remote-em] remote is PryRemoteEm 0.1.0
     [1] pry(#<Foo>)> x
@@ -110,7 +110,8 @@ EM.run {
     [pry-remote-em] listening for connections on pryem://localhost:6466/
 
 ```shell
-$ pry-remote-em
+
+$ pry-remote-em pryem://127.0.0.1:6462/
 [pry-remote-em] client connected to pryem://127.0.0.1:6462/
 [pry-remote-em] remote is PryRemoteEm 0.4.0 pryem
 [1] pry("pretty_print")> 
@@ -136,6 +137,88 @@ $ pry-remote-em  pryem://127.0.0.1:6466/
 [1] pry(#<RubyVM::InstructionSequence>)> 
 ```
 
+## Server Broker
+
+When more than one server is running on a given host and each server is
+started with :auto it can be time consuming to manually figure out which
+port each server is running on. The Broker which listens on port 6461
+keeps track of which server is running on which port. 
+
+By default the pry-remote-em cli utility will connect to the broker and 
+retrieve a list of known servers. You can then select one to connect to
+by its id, name or url. You can also choose to proxy your connection
+through the broker to the selected server.
+
+```shell
+
+$ bin/pry-remote-em
+[pry-remote-em] client connected to pryem://127.0.0.1:6461/
+[pry-remote-em] remote is PryRemoteEm 0.7.0 pryem
+-----------------------------------------------------------------------------
+| id  |  name                              |  url                           |
+-----------------------------------------------------------------------------
+|  1  |  #<#<Class:0x007f924b9bbee8>>      |  pryem://127.0.0.1:6462/       |
+|  2  |  #<Foo>                            |  pryem://127.0.0.1:1337/       |
+|  3  |  #<#<Class:0x007f924b9bbee8>>      |  pryems://127.0.0.1:6463/      |
+|  4  |  #<#<Class:0x007f924b9bbee8>>      |  pryems://127.0.0.1:6464/      |
+|  5  |  #<#<Class:0x007f924b9bbee8>>      |  pryems://127.0.0.1:6465/      |
+|  6  |  #<#<Class:0x007f924b9bbee8>>      |  pryems://127.0.0.1:6466/      |
+|  7  |  #<#<Class:0x007f924b9bbee8>>      |  pryems://127.0.0.1:6467/      |
+|  8  |  #<#<Class:0x007f924b9bbee8>>      |  pryem://127.0.0.1:6468/       |
+|  9  |  #<#<Class:0x007f924b9bbee8>>      |  pryem://127.0.0.1:6469/       |
+-----------------------------------------------------------------------------
+(q) to quit; (r) to refresh (p) to proxy
+connect to: 3
+[pry-remote-em] client connected to pryem://127.0.0.1:6463/
+[pry-remote-em] remote is PryRemoteEm 0.7.0 pryems
+[pry-remote-em] negotiating TLS
+[pry-remote-em] TLS connection established
+[1] pry(#<#<Class:0x007f924b9bbee8>>)>
+```
+
+By default the Broker will listen on 127.0.0.1:6461. To change the ip
+address that the Broker binds to specify it in a PRYEMBROKER environment
+variable, or in :broker_host option passed to #remote_pry_em.
+
+```shell
+
+$ PRYEMBROKER=0.0.0.0 be ./test/service.rb  
+I, [2012-07-13T21:10:00.936993 #88528]  INFO -- : [pry-remote-em] listening for connections on pryem://0.0.0.0:6462/
+I, [2012-07-13T21:10:00.937132 #88528]  INFO -- : [pry-remote-em broker] listening on pryem://0.0.0.0:6461
+I, [2012-07-13T21:10:00.937264 #88528]  INFO -- : [pry-remote-em] listening for connections on pryem://0.0.0.0:1337/
+I, [2012-07-13T21:10:00.937533 #88528]  INFO -- : [pry-remote-em] listening for connections on pryems://0.0.0.0:6463/
+I, [2012-07-13T21:10:00.937804 #88528]  INFO -- : [pry-remote-em] listening for connections on pryems://0.0.0.0:6464/
+I, [2012-07-13T21:10:00.938126 #88528]  INFO -- : [pry-remote-em] listening for connections on pryems://0.0.0.0:6465/
+I, [2012-07-13T21:10:00.938471 #88528]  INFO -- : [pry-remote-em] listening for connections on pryems://0.0.0.0:6466/
+I, [2012-07-13T21:10:00.938835 #88528]  INFO -- : [pry-remote-em] listening for connections on pryems://0.0.0.0:6467/
+I, [2012-07-13T21:10:00.939230 #88528]  INFO -- : [pry-remote-em] listening for connections on pryem://0.0.0.0:6468/
+I, [2012-07-13T21:10:00.939640 #88528]  INFO -- : [pry-remote-em] listening for connections on pryem://0.0.0.0:6469/
+I, [2012-07-13T21:10:01.031576 #88528]  INFO -- : [pry-remote-em broker] received client connection from 127.0.0.1:62288
+I, [2012-07-13T21:10:01.031931 #88528]  INFO -- : [pry-remote-em] client connected to pryem://127.0.0.1:6461/
+I, [2012-07-13T21:10:01.032120 #88528]  INFO -- : [pry-remote-em] remote is PryRemoteEm 0.7.0 pryem
+I, [2012-07-13T21:10:01.032890 #88528]  INFO -- : [pry-remote-em broker] registered pryem://127.0.0.1:6462/ - "#<#<Class:0x007f924b9bbee8>>" 
+I, [2012-07-13T21:10:01.125123 #88528]  INFO -- : [pry-remote-em broker] registered pryem://127.0.0.1:6469/ - "#<#<Class:0x007f924b9bbee8>>" 
+I, [2012-07-13T21:10:01.125487 #88528]  INFO -- : [pry-remote-em broker] registered pryems://127.0.0.1:6467/ - "#<#<Class:0x007f924b9bbee8>>"
+I, [2012-07-13T21:10:01.490729 #88528]  INFO -- : [pry-remote-em broker] registered pryems://127.0.0.1:6464/ - "#<#<Class:0x007f924b9bbee8>>"
+I, [2012-07-13T21:10:01.583015 #88528]  INFO -- : [pry-remote-em broker] registered pryem://127.0.0.1:1337/ - "#<Foo>"                       
+I, [2012-07-13T21:10:01.674842 #88528]  INFO -- : [pry-remote-em broker] registered pryems://127.0.0.1:6466/ - "#<#<Class:0x007f924b9bbee8>>"
+I, [2012-07-13T21:10:01.766813 #88528]  INFO -- : [pry-remote-em broker] registered pryem://127.0.0.1:6468/ - "#<#<Class:0x007f924b9bbee8>>" 
+I, [2012-07-13T21:10:01.858423 #88528]  INFO -- : [pry-remote-em broker] registered pryems://127.0.0.1:6465/ - "#<#<Class:0x007f924b9bbee8>>"
+```
+
+It is possible to have a pry-remote-em server register with a Broker
+running on a different host. Just specify the Brokers address in the
+PRYEMBROKER environment variable or the :broker_host option passed to #remote_pry_em.
+
+To connect to a broker running on a seperate host with the cli client
+just specify it on the command line ``bin/pry-remote-em preym://10.0.0.2:6461/``.
+You can then proxy your client connections to remote servers through
+that Broker.
+
+The Broker will not run in TLS mode, but it can proxy connections to a
+TLS enabled server.
+
+
 ## TLS Encryption
   
 When creating a server pass the :tls => true option to enable TLS. 
@@ -369,9 +452,7 @@ E, [2012-02-11T19:23:40.770380 #36471] ERROR -- : refused to execute shell comma
 
 # Missing Features
 
-  - AutoDiscovery/Broker [ticket](https://github.com/simulacre/pry-remote-em/issues/11)
   - HTTP Transport [ticket](https://github.com/simulacre/pry-remote-em/issues/12)
-  - Vi mode editing - RbReadline doesn't support vi edit mode. I'm looking into contributing it. PryRemoteEm uses rb-readline because the STLIB version doesn't play nice with Fibers.
   - Ssh key based authentication
 
 

data/bin/pry-remote-em

@@ -4,10 +4,10 @@ require 'uri'
 require 'highline'
 require 'pry-remote-em/client'
 
-uri = ARGV[0] || "pryem://localhost:#{PryRemoteEm::DEFPORT}"
+uri = ARGV[0] || "pryem://localhost:#{PryRemoteEm::DEF_BROKERPORT}"
 uri = URI.parse(uri)
 unless %w(pryem pryems).include?(uri.scheme)
-  abort "only pryem URIs are currently supported\n usage: pryem(s)://127.0.0.1:#{PryRemoteEm::DEFPORT}" 
+  abort "only pryem URIs are currently supported\n usage: pryem(s)://127.0.0.1:#{PryRemoteEm::DEF_BROKERPORT}" 
 end
 
 tried = 0

data/lib/pry-remote-em.rb

@@ -4,16 +4,18 @@ rescue LoadError
   warn "OpenSSL support is not available"
 end
 require 'pry-remote-em/version'
-require 'pry-remote-em/json-proto'
+require 'pry-remote-em/proto'
 require 'eventmachine'
 require 'socket'
-require 'json'
-require "fiber"
+require 'fiber'
+require 'uri'
 
 module PryRemoteEm
-  DEFHOST   = 'localhost'
-  DEFPORT   = 6462
-  NEGOTIMER = 15
+  DEFHOST         = 'localhost'
+  DEFPORT         = 6462
+  DEF_BROKERPORT  = DEFPORT - 1
+  DEF_BROKERHOST  = 'localhost'
+  NEGOTIMER       = 15
 end
 
 

data/lib/pry-remote-em/broker.rb

@@ -0,0 +1,189 @@
+require 'pry-remote-em'
+require 'pry-remote-em/client/broker'
+require 'pry-remote-em/client/proxy'
+
+module PryRemoteEm
+  module Broker
+    class << self
+      attr_reader :listening, :host, :port
+      alias :listening? :listening
+
+      def run(host = ENV['PRYEMBROKER'] || DEF_BROKERHOST, port = ENV['PRYEMBROKERPORT'] || DEF_BROKERPORT, opts = {:tls => false})
+        raise "root permission required for port below 1024 (#{port})" if port < 1024 && Process.euid != 0
+        @host      = host
+        @port      = port
+        # Brokers cannot use SSL directly. If they do then when a proxy request to an SSL server is received
+        # the client and server will not be able to negotiate a SSL session. The proxied traffic can be SSL
+        # encrypted, but the SSL session will be between the client and the server.
+        opts       = opts.dup
+        opts[:tls] = false
+        @opts      = opts
+        begin
+          EM.start_server(host, port, PryRemoteEm::Broker, opts) do |broker|
+          end
+          log.info("[pry-remote-em broker] listening on #{opts[:tls] ? 'pryems' : 'pryem'}://#{host}:#{port}")
+          @listening = true
+        rescue => e
+          # EM 1.0.0.beta4's message tells us the port is in use; 0.12.10 just says, 'no acceptor'
+          if (e.message.include?('port is in use') || e.message.include?('no acceptor'))
+            # [pry-remote-em broker] a broker is already listening on #{host}:#{port}
+          else
+            raise e
+          end
+        end
+      end
+
+      def restart
+        log.info("[pry-remote-em broker] restarting on pryem://#{host}:#{port}")
+        run(@host, @port, @opts)
+        EM::Timer.new(rand(0.9)) do
+          PryRemoteEm.servers.each do |url, (sig, name)|
+            next unless EM.get_sockname(sig)
+            register(url, name)
+          end
+        end
+        @waiting   = nil
+        @client    = nil
+      end
+
+      def opts
+        @opts ||= {}
+      end
+
+      def log
+        return opts[:logger] if opts[:logger]
+        @log ||= Logger.new(STDERR)
+      end
+
+      def servers
+        @servers ||= {}
+      end
+
+      def register(url, name = 'unknown')
+        client { |c| c.send_register_server(url, name) }
+      end
+
+      def unregister(server)
+        client {|c| c.send_unregister_server(server) }
+      end
+
+      def watch_heartbeats(url)
+        return if timers[url]
+        timers[url] = EM::PeriodicTimer.new(20) do
+          if !hbeats[url] || (Time.new - hbeats[url]) > 20
+            servers.delete(url)
+            timers[url].cancel
+            timers.delete(url)
+          end
+        end
+      end
+
+      def timers
+        @timers ||= {}
+      end
+
+      def hbeats
+        @hbeats ||= {}
+      end
+
+      def connected?
+        @connected
+      end
+
+    private
+
+      def client(&blk)
+        raise ArgumentError.new("A block is required") unless block_given?
+        if @client
+          yield @client
+          return
+        end
+
+        if @waiting
+          @waiting << blk
+        else
+          @waiting = []
+          EM.connect(host, port, Client::Broker, @opts) do |client|
+            client.errback { |e| raise(e || "broker client error") }
+            client.callback do
+              @client    = client
+              while (w = @waiting.shift)
+                w.call(client)
+              end
+            end
+          end
+        end
+      end
+    end # class << self
+
+    include Proto
+
+    def receive_server_list
+      send_server_list(Broker.servers)
+    end
+
+    def receive_register_server(url, name)
+      url      = URI.parse(url)
+      url.host = peer_ip if ['0.0.0.0', 'localhost', '127.0.0.1'].include?(url.host)
+      log.info("[pry-remote-em broker] registered #{url} - #{name.inspect}") unless Broker.servers[url] == name
+      Broker.servers[url] = name
+      Broker.hbeats[url]  = Time.new
+      Broker.watch_heartbeats(url)
+      name
+    end
+
+    def receive_unregister_server(url)
+      url      = URI.parse(url)
+      url.host = peer_ip if ['0.0.0.0', 'localhost', '127.0.0.1'].include?(url.host)
+      log.warn("[pry-remote-em broker] unregister #{url}")
+      Broker.servers.delete(url)
+    end
+
+    def receive_proxy_connection(url)
+      log.info("[pry-remote-em broker] proxying to #{url}")
+      url = URI.parse(url)
+      EM.connect(url.host, url.port, Client::Proxy, self)
+    end
+
+    def initialize(opts = {:tls => false}, &blk)
+      @opts   = opts
+    end
+
+    def log
+      Broker.log
+    end
+
+    def post_init
+      port, ip = Socket.unpack_sockaddr_in(get_peername)
+      log.info("[pry-remote-em broker] received client connection from #{ip}:#{port}")
+      send_banner("PryRemoteEm #{VERSION} #{@opts[:tls] ? 'pryems' : 'pryem'}")
+      @opts[:tls] ? start_tls : send_server_list(Broker.servers)
+    end
+
+    def start_tls
+      log.debug("[pry-remote-em broker] starting TLS (#{peer_ip}:#{peer_port})")
+      send_start_tls
+      super(@opts[:tls].is_a?(Hash) ? @opts[:tls] : {})
+    end
+
+    def peer_ip
+      return @peer_ip if @peer_ip
+      return "" if get_peername.nil?
+      @peer_port, @peer_ip = Socket.unpack_sockaddr_in(get_peername)
+      @peer_ip
+    end
+
+    def peer_port
+      return @peer_port if @peer_port
+      return "" if get_peername.nil?
+      @peer_port, @peer_ip = Socket.unpack_sockaddr_in(get_peername)
+      @peer_port
+    end
+
+    def ssl_handshake_completed
+      log.info("[pry-remote-em broker] TLS connection established (#{peer_ip}:#{peer_port})")
+      send_server_list(Broker.servers)
+    end
+
+  end # module::Broker
+end # module::PryRemoteEm

data/lib/pry-remote-em/client.rb

@@ -1,17 +1,19 @@
 require 'uri'
 require 'pry-remote-em'
-require 'pry-remote-em/client/keyboard'
+begin
+  require 'pry-remote-em/client/keyboard'
+rescue LoadError => e
+  warn "[pry-remote-em] unable to load keyboard depenencies (termios); interactive shell commands disabled"
+end
+require "pry-remote-em/client/generic"
 require 'pry/helpers/base_helpers'
-#require "readline"   # doesn't work with Fiber.yield
-        #  - /Users/caleb/src/pry-remote-em/lib/pry-remote-em/client.rb:45:in `yield': fiber called across stack rewinding barrier (FiberError)
-require "rb-readline" # doesn't provide vi-mode support :(
-        # https://github.com/luislavena/rb-readline/issues/21
-        # https://github.com/simulacre/rb-readline/commit/0376eb4e9526b3dc1a6512716322efcef409628d
+require "readline"
+require 'highline'
 
 module PryRemoteEm
   module Client
     include EM::Deferrable
-    include JsonProto
+    include Client::Generic
     include Pry::Helpers::BaseHelpers
 
     class << self
@@ -19,7 +21,7 @@ module PryRemoteEm
         EM.connect(host || PryRemoteEm::DEFHOST, port || PryRemoteEm::DEFPORT, PryRemoteEm::Client, opts) do |c|
           c.callback { yield if block_given? }
           c.errback do |e|
-            puts "[pry-remote-em] connection failed\n#{e}"
+            Kernel.puts "[pry-remote-em] connection failed\n#{e}"
             yield(e) if block_given?
           end
         end
@@ -38,117 +40,182 @@ module PryRemoteEm
     end
 
     def post_init
-      if get_peername
-        port, ip = Socket.unpack_sockaddr_in(get_peername)
-        Kernel.puts "[pry-remote-em] client connected to pryem://#{ip}:#{port}/"
-      else
-        # TODO use the args used to create this connection
-        Kernel.puts "[pry-remote-em] client connected"
-      end
-      @nego_timer = EM::Timer.new(PryRemoteEm::NEGOTIMER) do
-        fail("[pry-remote-em] server didn't finish negotiation within #{PryRemoteEm::NEGOTIMER} seconds; terminating")
-      end
       Readline.completion_proc = method(:auto_complete)
     end
 
-    def auto_complete(word)
-      @waiting = Fiber.current
-      send_data({:c => word})
-      return Fiber.yield
+    def ssl_handshake_completed
+      log.info("[pry-remote-em] TLS connection established")
+      @opts[:tls] = true
     end
 
-    def receive_json(j)
-      if j['p'] # prompt
-        readline(j['p'])
-
-      elsif j['d'] # printable data
-        stagger_output j['d'], $stdout # Pry::Helpers::BaseHelpers
-
-      elsif j['m']
-        Kernel.puts "\033[1m! msg: " + j['m'] + "\033[0m"
+    def unbind
+      if (uri = @reconnect_to)
+        @reconnect_to = nil
+        tls       = uri.scheme == 'pryems'
+        log.info("\033[35m[pry-remote-em] connection will not be encrypted\033[0m")  if @opts[:tls] && !tls
+        @opts[:tls]   = tls
+        @tls_started  = false
+        reconnect(uri.host, uri.port)
+      else
+        @unbound = true
+        log.info("[pry-remote-em] session terminated")
+        # prior to 1.0.0.b4 error? returns true here even when it's not
+        return succeed if Gem.loaded_specs["eventmachine"].version < Gem::Version.new("1.0.0.beta4")
+        error? ? fail : succeed
+      end
+    end
 
-      elsif j['mb']
-        Kernel.puts "\033[1m!! msg: " + j['mb'] + "\033[0m"
+    def receive_banner(name, version, scheme)
+      # Client::Generic#receive_banner
+      if super(name, version, scheme)
+        start_tls if @opts[:tls]
+      end
+    end
 
-      elsif j['s'] # shell command output
-        Kernel.puts j['s']
+    def receive_server_list(list)
+      if list.empty?
+        log.info("\033[33m[pry-remote-em] no servers are registered with the broker\033[0m")
+        Process.exit
+      end
+      choice, proxy  = choose_server(list)
+      return unless choice
+      uri, name      = URI.parse(choice[0]), choice[1]
+      if proxy
+        @opts[:tls]  = uri.scheme == 'pryems'
+        @negotiated  = false
+        @tls_started = false
+        return send_proxy_connection(uri)
+      end
+      @reconnect_to = uri
+      close_connection
+    end
 
-      elsif j.include?('sc') # command completed
-        if @keyboard
-          @keyboard.bufferio(true)
-          @keyboard.close_connection
+    def choose_server(list)
+      highline    = HighLine.new
+      proxy       = false
+      choice      = nil
+      nm_col_len  = list.values.map(&:length).sort[-1] + 5
+      ur_col_len  = list.keys.map(&:length).sort[-1] + 5
+      header      = sprintf("| %-3s |  %-#{nm_col_len}s |  %-#{ur_col_len}s |", "id", "name", "url")
+      border      = ("-" * header.length)
+      table       = [border, header, border]
+      list        = list.to_a
+      list.each_with_index do |(url, name), idx|
+        table << sprintf("|  %-2d |  %-#{nm_col_len}s |  %-#{ur_col_len}s |", idx + 1, name, url)
+      end
+      table << border
+      table   = table.join("\n")
+      Kernel.puts table
+      while choice.nil?
+        if proxy
+          question = "(q) to quit; (r) to refresh (c) to connect\nproxy to: "
+        else
+          question = "(q) to quit; (r) to refresh (p) to proxy\nconnect to: "
         end
-
-      elsif j['g'] # server banner
-        Kernel.puts "[pry-remote-em] remote is #{j['g']}"
-        name, version, scheme = j['g'].split(" ", 3)
-        # TODO parse version and compare against a Gem style matcher
-        # https://github.com/simulacre/pry-remote-em/issues/21
-        return fail("[pry-remote-em] incompatible version #{version}") if version != PryRemoteEm::VERSION
-        if scheme.nil? || scheme != (reqscheme = @opts[:tls] ? 'pryems' : 'pryem')
-          if scheme == 'pryems' && defined?(::OpenSSL)
-            @opts[:tls] = true
-          else
-            return fail("[pry-remote-em] server doesn't support required scheme #{reqscheme.dump}")
-          end # scheme == 'pryems' && defined?(::OpenSSL)
+        choice = highline.ask(question)
+        return close_connection if ['q', 'quit', 'exit'].include?(choice.downcase)
+        if ['r', 'reload', 'refresh'].include?(choice.downcase)
+          send_server_list
+          return nil
         end
-        @nego_timer.cancel
-        @negotiated = true
-        start_tls if @opts[:tls]
+        if ['c', 'connect'].include?(choice.downcase)
+          proxy = false
+          choice = nil
+          next
+        end
+        if ['p', 'proxy'].include?(choice.downcase)
+          proxy = true
+          choice = nil
+          next
+        end
+        choice = choice.to_i.to_s == choice ?
+          list[choice.to_i - 1] :
+          list.find{|(url, name)| url == choice || name == choice }
+      end
+      [choice, proxy]
+    end
 
-      elsif j['c'] # tab completion response
-        @waiting, f = nil, @waiting
-        f.resume(j['c']) if f
+    def receive_auth(a)
+      return fail a if a.is_a?(String)
+      return authenticate if a == false
+      @authenticated = true if a == true
+    end
 
-      elsif j.include?('a') # authentication demand
-        return fail j['a'] if j['a'].is_a?(String)
-        return authenticate if j['a']   == false
-        @authenticated = true if j['a'] == true
+    def receive_msg(m)
+      Kernel.puts "\033[1m! msg: " + m + "\033[0m"
+    end
 
-      else
-        warn "[pry-remote-em] received unexpected data: #{j.inspect}"
+    def receive_msg_bcast(mb)
+      Kernel.puts "\033[1m!! msg: " + mb + "\033[0m"
+    end
+
+    def receive_shell_cmd(c)
+      Kernel.puts c
+    end
+
+    def receive_shell_result(c)
+      if @keyboard
+        @keyboard.bufferio(true)
+        @keyboard.close_connection
       end
     end
 
+    def receive_raw(r)
+      # Pry::Helpers::BaseHelpers
+      stagger_output(r, $stdout)
+    end
+
+    def receive_unknown(j)
+      warn "[pry-remote-em] received unexpected data: #{j.inspect}"
+    end
+
     def authenticate
       return fail("[pry-remote-em] authentication required") unless @auth
       return fail("[pry-remote-em] can't authenticate before negotiation complete") unless @negotiated
       user, pass = @auth.call
       return fail("[pry-remote-em] expected #{@auth} to return a user and password") unless user && pass
-      send_data({:a => [user, pass]})
+      send_auth([user, pass])
     end # authenticate
 
-    def ssl_handshake_completed
-      Kernel.puts "[pry-remote-em] TLS connection established"
+    def auto_complete(word)
+      @waiting = Thread.current
+      EM.next_tick { send_completion(word) }
+      sleep
+      c = Thread.current[:completion]
+      Thread.current[:completion] = nil
+      c
     end
 
-    def start_tls
-      Kernel.puts "[pry-remote-em] negotiating TLS"
-      super(@opts[:tls].is_a?(Hash) ? @opts[:tls] : {})
+    def receive_completion(c)
+      return unless @waiting
+      @waiting[:completion] = c
+      @waiting, t = nil, @waiting
+      t.run
     end
 
-    def unbind
-      @unbound = true
-      Kernel.puts "[pry-remote-em] session terminated"
-      # prior to 1.0.0.b4 error? returns true here even when it's not
-      return succeed if Gem.loaded_specs["eventmachine"].version < Gem::Version.new("1.0.0.beta4")
-      error? ? fail : succeed
+    def receive_prompt(p)
+      readline(p)
     end
 
     def readline(prompt)
       if @negotiated && !@unbound
-        Fiber.new {
-          l = Readline.readline(prompt, !prompt.nil?)
+        op       = proc { Readline.readline(prompt, !prompt.nil?) }
+        callback = proc do |l|
           if '!!' == l[0..1]
-            send_data({:b => l[2..-1]})
+            send_msg_bcast(l[2..-1])
           elsif '!' == l[0]
-            send_data({:m => l[1..-1]})
+            send_msg(l[1..-1])
           elsif '.' == l[0]
-            send_data({:s => l[1..-1]})
-            if Gem.loaded_specs["eventmachine"].version < Gem::Version.new("1.0.0.beta4")
-              Kernel.puts "\033[1minteractive shell commands are not well supported when running on EventMachine prior 1.0.0.beta4\033[0m"
+            if !Client.const_defined?(:Keyboard)
+              Kernel.puts "\033[31minteractive shell commands are not supported without termios\033[0m"
+              readline(prompt)
             else
-              @keyboard = EM.open_keyboard(Keyboard, self)
+              send_shell_cmd(l[1..-1])
+              if Gem.loaded_specs["eventmachine"].version < Gem::Version.new("1.0.0.beta4")
+                Kernel.puts "\033[1minteractive shell commands are not well supported when running on EventMachine prior to 1.0.0.beta4\033[0m"
+              else
+                @keyboard = EM.open_keyboard(Keyboard, self)
+              end
             end
           elsif 'reset' == l.strip
             # TODO work with 'bundle exec pry-remote-em ...'
@@ -156,9 +223,10 @@ module PryRemoteEm
             Kernel.puts "\033[1m#{$0} #{ARGV.join(' ')}\033[0m"
             exec("#{$0} #{ARGV.join(' ')}")
           else
-            send_data(l)
+            send_raw(l)
           end # "!!" == l[0..1]
-        }.resume
+        end
+        EM.defer(op, callback)
       end
     end # readline(prompt = @last_prompt)