pssh 0.2.3 → 0.3.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDVmMzVhYTE2ZjRhMGZiMmE0NWM1ZjdmM2Q3ZTUyZjljYTJiOTc1Nw==
+  data.tar.gz: !binary |-
+    ZDE1MDQ0MTBkOTA4NzhlY2UwMDBmZmJmZTU5NmQ5NmJjZmYyNzZhZA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NWQ4MTAxMTA1OGVjNzNmM2FkMWJjNDYzYjNiNGFhYzMzNzVmMTNlMDhiYjU0
+    MjkwN2I2ZmM5OTQ3MTNhMTZlZjVjNjkwZWUwNTEyMWMxM2RkMzNiODI5MDMz
+    ZTU2YTdkYjY2NzlhNmJlZmRhNmQ4OTI5YTM4ZjZkZDYwNTBmMTk=
+  data.tar.gz: !binary |-
+    OGRiZTE1OWQ4M2MyY2RkMWUxOGY2MGQ5ZjVmMzBlOTE3ODVlMzZjOGFmNjM0
+    ZDIzZjM2ODMzNGM4ODJiYmI5YjM4MzkyZTJjMWYyY2JkYjY1OTk0ZjdjOWU1
+    MDZmNjQzMmI1ZGM0Yzg4MzE2ZmE4NzQ0OWZhYWIxZjJlNDg3Njc=

data/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2013 Kelly Martin, except where otherwise noted
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -8,26 +8,32 @@ user, figuring out how the heck to get tmux to integrate everything, and then
 opening up port 22 on your firewall to let everyone know you're ready and willing
 for the all the brute force attacks your network can handle.
 
-What if it was as simple as opening up a new tab in tmux or screen, typing four
-letters, then sharing a URL with a friend?
+What if it was as simple as opening up a new shell, or a tab in tmux or screen,
+typing four letters, then sharing a URL with a friend?
 
 Pssh. Is that even possible?
 
 Yup.
 
 ```ruby
-gem install pssh
+> gem install pssh
+# to get started, just run it from the command line
+> pssh
 ```
 
 It defaults to running on port 8022, but throw in a `-p PORT` flag and you're
 up and running on whatever port.  If you're in a tmux or screen session, it'll
-share that.  If you're not, just pass in another flag to specify what you want.
+share that.  If you're not, no worries. **Pssh has its own session sharing built in.**
+And if you want to use tmux or screen, go right ahead and use the `-c tmux` flag.
 
-When it starts, you'll have a pseudo-terminal that lets you see who's connected,
-kick people off, and connect locally to the running session if you need access.
+If you're already in a tmux or screen session, you'll have a pseudo-terminal
+that lets you see who's connected, kick people off, and a few other handy things.
+
+If you started `pssh` in a plain shell, you'll be immediately transported into
+that shell. Just type `exit` to quit and kick everyone else off too.
 
 Check out all the options with the `-h` flag, or list the console commands by
-typing `help` when you start up Pssh.
+typing `help` when you start up Pssh inside tmux/screen.
 
 There's also support in there for HTTP basic authentication if you're running
 behind that layer. But that adds to the complexities.
@@ -36,3 +42,4 @@ You know what makes all this even easier? <a href="https://getportly.com">Portly
 Install Portly in seconds, add `localhost:8022` to your connections, and you can
 add authentication and share a classy URL right there on the spot.
 
+Thanks to those who are working on <a href="https://github.com/chjj/term.js/">term.js</a> and <a href="https://github.com/aluzzardi/wssh">WSSH</a> for making the job easier.

data/assets/pssh.js

@@ -0,0 +1,129 @@
+/*
+PSSH Javascript Client
+Modeled after WSSH: https://github.com/aluzzardi/wssh
+
+Usage:
+
+var client = new PsshClient();
+
+client.connect({
+  // Connection and authentication parameters
+  username: 'root',
+  hostname: 'localhost',
+  authentication_method: 'password', // can either be password or private_key
+  password: 'secretpassword', // do not provide when using private_key
+  key_passphrase: 'secretpassphrase', // *may* be provided if the private_key is encrypted
+
+  // Callbacks
+  onError: function(error) {
+    // Called upon an error
+    console.error(error);
+  },
+  onConnect: function() {
+    // Called after a successful connection to the server
+    console.debug('Connected!');
+
+    client.send('ls\n'); // You can send data back to the server by using PsshClient.send()
+  },
+  onClose: function() {
+    // Called when the remote closes the connection
+    console.debug('Connection Reset By Peer');
+  },
+  onData: function(data) {
+    // Called when data is received from the server
+    console.debug('Received: ' + data);
+  }
+});
+
+*/
+
+function PsshClient(uuid) {
+  this.uuid=uuid;
+};
+
+PsshClient.prototype._generateEndpoint = function(options) {
+  if (window.location.protocol == 'https:') {
+    var protocol = 'wss://';
+  } else {
+    var protocol = 'ws://';
+  }
+  var endpoint = protocol + window.location.host +
+    '/socket?uuid=' + this.uuid + '&username=' + encodeURIComponent(options.username);
+  if (options.authentication_method == 'password') {
+    endpoint += '?password=' + encodeURIComponent(options.password);
+  } else if (options.authentication_method == 'private_key') {
+    endpoint += '?private_key=' + encodeURIComponent(options.private_key);
+    if (options.key_passphrase !== undefined) {
+      endpoint += '&key_passphrase=' + encodeURIComponent(options.key_passphrase);
+    }
+  }
+  return endpoint;
+};
+
+PsshClient.prototype.startSocket = function() {
+
+  var ping;
+  var _self = this;
+  var connected = true;
+
+  if (window.WebSocket) {
+    this._connection = new WebSocket(this.endpoint);
+  }
+  else if (window.MozWebSocket) {
+    this._connection = MozWebSocket(this.endpoint);
+  }
+  else {
+    this.options.onError('WebSocket Not Supported');
+    return ;
+  }
+
+  this._connection.onopen = function() {
+    ping = window.setInterval(function() {
+      _self._connection.send('p');
+    }, 10000);
+    _self.options.onConnect();
+  };
+
+  this._connection.onmessage = function (evt) {
+    var data = JSON.parse(evt.data.toString());
+    if (data.error !== undefined) {
+      _self.options.onError(data.error);
+    } else if (data.close !== undefined) {
+      connected = false;
+    } else {
+      _self.options.onData(data.data);
+    }
+  };
+
+  this._connection.onclose = function(evt) {
+    if (connected) {
+      window.clearInterval(ping);
+      _self.reconnect();
+    } else {
+      _self.options.onClose();
+    }
+  };
+
+};
+
+PsshClient.prototype.connect = function(options) {
+  this.endpoint = this._generateEndpoint(options);
+  this.options = options;
+  this.startSocket();
+};
+
+PsshClient.prototype.send = function(data) {
+  this._connection.send('d' + data);
+};
+
+PsshClient.prototype.start = function(width, height) {
+  this._connection.send('s' + height + ',' + width);
+};
+
+PsshClient.prototype.resize = function(width, height) {
+  this._connection.send('r' + height + ',' + width);
+};
+
+PsshClient.prototype.reconnect = function() {
+  this.startSocket();
+};

data/assets/style.css

@@ -11,7 +11,8 @@ body {
     font-family: "DejaVu Sans Mono", "Liberation Mono", monospace;
     font-size: 11px;
     padding: 0;
-  }
+}
+
 .terminal {
     font-family: "DejaVu Sans Mono", "Liberation Mono", monospace;
     font-size: 11px;

data/assets/term.js

@@ -1579,9 +1579,10 @@ Terminal.prototype.write = function(data) {
           // Send Device Attributes (Primary DA).
           // CSI > P s c
           // Send Device Attributes (Secondary DA)
-          case 'c':
-            this.sendDeviceAttributes(this.params);
-            break;
+          // We don't need this because we are controlling the device elsewhere.
+          // case 'c':
+          //   this.sendDeviceAttributes(this.params);
+          //   break;
 
           // CSI Pm d
           // Line Position Absolute  [row] (default = [1,column]) (VPA).

data/lib/pssh.rb

@@ -1,6 +1,7 @@
 require 'haml'
 require 'io/console'
 require 'json'
+require 'open-uri'
 require 'optparse'
 require 'pty'
 require 'readline'
@@ -11,15 +12,18 @@ require 'rack/websocket'
 require 'pssh/cli'
 require 'pssh/client'
 require 'pssh/console'
+require 'pssh/pty'
 require 'pssh/socket'
 require 'pssh/version'
-require 'pssh/web_console'
+require 'pssh/web'
 
 module Pssh
 
   DEFAULT_IO_MODE = 'rw'
-  DEFAULT_SOCKET_PREFIX = '/tmp/pssh'
+  DEFAULT_SOCKET_PREFIX = 'pssh'
   DEFAULT_PORT = 8022
+  DEFAULT_CACHE_LENGTH = 4096
+  PSSH_DOMAIN = 'pssh.herokuapp.com'
 
   class << self
 
@@ -29,6 +33,8 @@ module Pssh
     attr_writer :open_sessions
     attr_writer :port
     attr_writer :prompt
+    attr_accessor :socket_path
+    attr_accessor :cache_length
     attr_accessor :client
     attr_accessor :socket
     attr_accessor :pty
@@ -54,6 +60,23 @@ module Pssh
       @io_mode ||= DEFAULT_IO_MODE
     end
 
+    # Public: This method retrieves the current IP address and compresses
+    # it into a short url that can be shared to redirect to your site.
+    def share_url
+      return @share_url if @share_url
+      ip = open("http://#{PSSH_DOMAIN}/ip").read
+             .split('.')
+             .map { |x| x.to_i.to_s(36).rjust(2,'0') }
+             .join('')
+      @share_url = "http://#{PSSH_DOMAIN}/#{ip}#{port.to_i.to_s(36)}"
+    end
+
+    # Public: This sets the amount of data that will be stored to show
+    # new connections when they join.
+    def cache_length
+      @cache_length ||= DEFAULT_CACHE_LENGTH
+    end
+
     # Public: This is the prefix that will be used to set up the socket for tmux or screen.
     #
     # Returns a String.
@@ -66,7 +89,7 @@ module Pssh
     #
     # Returns a String.
     def default_socket_path
-      @socket ||= "#{socket_prefix}-#{SecureRandom.uuid}"
+      @socket_path ||= "#{socket_prefix}-#{SecureRandom.uuid}"
     end
 
     # Public: This is the tool which we are going to use for our multiplexing. If
@@ -79,9 +102,9 @@ module Pssh
       @command ||=
         (ENV['TMUX'] && :tmux) ||
         (ENV['STY'] && :screen) ||
-        (`which tmux` && :tmux) ||
-        (`which screen` && :screen) ||
         :shell
+        #(`which tmux` && :tmux) ||
+        #(`which screen` && :screen) ||
     end
 
     # Public: Allow configuring details of Pssh by making use of a block.

data/lib/pssh/cli.rb

@@ -33,8 +33,8 @@ module Pssh
           options[:command] = command
         end
 
-        opts.on('-s PATH', '--socket PATH', String, 'Set the socket that will be used for connecting (/path/to/socket)') do |socket|
-          options[:socket] = socket
+        opts.on('-s NAME', '--socket NAME', String, 'Set the socket that will be used for connecting (socket-name)') do |socket|
+          options[:socket_path] = socket
         end
 
         opts.on( '-h', '--help', 'Display this help.' ) do

data/lib/pssh/client.rb

@@ -2,23 +2,26 @@ module Pssh
   class Client
 
     def initialize
-      @pty = Pssh.pty = Pssh::Socket.new
-      @web = Pssh.web = Pssh::WebConsole.new
+      @pty = Pssh.pty = Pssh::Pty.new
+      @socket = Pssh.socket = Pssh::Socket.new
+      @web = Pssh.web = Pssh::Web.new
       @app = Rack::Builder.new do
         map "/assets/" do
           run Rack::File.new "#{Pssh.base_path}/assets/"
         end
         map "/socket" do
-          run Pssh.pty
+          run Pssh.socket
         end
         map "/" do
           run Pssh.web
         end
       end
-      Thread.new do
-        @console = Console.new(pty: @pty, web: @web)
-      end
       Thin::Logging.silent = true
+      if Pssh.pty.existing?
+        Thread.new do
+          @console = Console.new
+        end
+      end
       Rack::Handler::Thin.run @app, Port: Pssh.port
     end
 

data/lib/pssh/console.rb

@@ -17,17 +17,14 @@ module Pssh
 
     def initialize(opts = {})
 
-      @pty = opts[:pty]
-      @web = opts[:web]
-
       begin
         puts "[ pssh terminal ]"
         puts "Service started on port #{Pssh.port}."
+        puts "Share this url for access: #{Pssh.share_url}"
         puts "Type 'help' for more information."
 
         Readline.completion_append_character = " "
         Readline.completion_proc = completion_proc
-
         while command = Readline.readline(Pssh.prompt, true)
           command.strip!
           command.gsub!(/\s+/, ' ')
@@ -35,30 +32,30 @@ module Pssh
           when 'help'
             puts BANNER.gsub(/^ {6}/,'')
           when 'exit'
-            @pty.kill_all_sessions
+            Pssh.socket.kill_all_sessions
             Kernel.exit!
           when 'info'
             puts 'Current Configuration:'
-            if @pty.path
-              puts "Socket: #{@pty.path}"
-              puts "(Attach to this socket with `#{@pty.attach_cmd}`)"
+            if Pssh.pty.path
+              puts "Socket: #{Pssh.pty.path}"
+              puts "(Attach to this socket with `#{Pssh.pty.attach_cmd}`)"
             else
               puts 'Connections are made to a vanilla shell.'
             end
           when 'list sessions', 'list'
-            @pty.sessions.each do |k,v|
+            Pssh.socket.sessions.each do |k,v|
               puts v[:user_string]
             end
           when /^kill-sessions?\s?(.*)$/
             if $1 == '--all'
               puts 'disconnecting all clients'
-              @pty.kill_all_sessions
+              Pssh.socket.kill_all_sessions
             else
               puts "disconnecting #{$1}"
-              if @pty.sessions.keys.include?($1)
-                @pty.sessions[$1][:socket].close!
+              if Pssh.socket.sessions.keys.include?($1)
+                Pssh.socket.sessions[$1][:socket].close!
               else
-                @pty.sessions.each do |k, sess|
+                Pssh.socket.sessions.each do |k, sess|
                   if sess[:username] == $1
                     sess[:socket].close!
                   end

data/lib/pssh/pty.rb

@@ -0,0 +1,155 @@
+module Pssh
+  class Pty
+
+    attr_reader :read
+    #attr_reader :write
+    attr_reader :stream
+    attr_reader :pid
+
+    attr_reader :path
+    attr_reader :attach_cmd
+
+    def initialize
+      @stream = ''
+      set_command
+      clear_environment
+      Thread.new do
+        begin
+          @read, @write, @pid = PTY.spawn(@command)
+          @write.winsize = $stdout.winsize
+          if new?
+            system("clear")
+            pssh = <<-BANNER
+# [ pssh terminal ]
+# Type `exit` to terminate this terminal.
+BANNER
+            $stdout.puts pssh
+            Signal.trap(:WINCH) do
+              resize!
+            end
+            system("stty raw -echo")
+          end
+          @active = true
+          while @active do
+            begin
+              io = [@read]
+              io << $stdin if new?
+              rs, ws = IO.select(io)
+              r = rs[0]
+              while (data = r.read_nonblock(2048)) do
+                if new? && r == $stdin
+                  @write.write_nonblock data
+                else
+                  $stdout.write_nonblock data if new?
+                  data.encode!('UTF-16', 'UTF-8', :invalid => :replace, :replace => '')
+                  data.encode!('UTF-8', 'UTF-16')
+                  if data.valid_encoding?
+                    store data
+                    Pssh.socket.write data
+                  end
+                end
+              end
+            rescue Exception => e
+              if @active
+                if e.is_a?(Errno::EAGAIN)
+                  retry
+                else
+                  system("stty -raw echo") if new?
+                  puts 'Terminating Pssh.'
+                  Kernel.exit!
+                  @active = false
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+
+    def clear_environment
+      ENV['TMUX'] = nil
+      ENV['STY'] = nil
+    end
+
+    def new?
+      !existing?
+    end
+
+    def existing?
+      @existing_socket
+    end
+
+    def set_command
+      case Pssh.command.to_sym
+      when :tmux
+        if ENV['TMUX']
+          @path = ENV['TMUX'].split(',').first
+          @existing_socket = true
+          @command = "tmux -S #{@path} attach"
+        else
+          @path = "/tmp/#{Pssh.default_socket_path}"
+          @command = "tmux -S #{@path} new"
+        end
+        @attach_cmd = "tmux -S #{@path} attach"
+      when :screen
+        if ENV['STY']
+          @path = ENV['STY']
+          @existing_socket = true
+          @command = "screen -S #{@path} -X multiuser on && screen -x #{@path}"
+        else
+          @path = Pssh.default_socket_path
+          @command = "screen -S #{@path}"
+          puts @command
+        end
+        @attach_cmd = "screen -x #{@path}"
+      else
+        @path = nil
+        @command = ENV['SHELL'] || (`which zsh` && 'zsh') || (`which sh` && 'sh') || 'bash'
+      end
+    end
+
+    # Public: Writes to the open stream if they have access.
+    #
+    # Returns nothing.
+    def write(data)
+      @write.write_nonblock data if Pssh.io_mode['w']
+    end
+
+    # Public: Resizes the PTY session based on all the open
+    # windows.
+    #
+    # Returns nothing.
+    def resize!
+      winsizes = Pssh.socket.sessions.values.map { |sess| sess[:winsize] }
+      winsizes << $stdout.winsize if new?
+      y = winsizes.map { |w| w[0] }.min
+      x = winsizes.map { |w| w[1] }.min
+      @write.winsize = [ y, x ]
+    end
+
+    # Public: Sends a message to the tmux or screen display notifying of a
+    # new user that has connected.
+    #
+    # Returns nothing.
+    def send_display_message(user)
+      if @existing_socket
+        case Pssh.command.to_sym
+        when :tmux
+          `tmux -S #{@path} display-message "#{user} has connected"`
+        when :screen
+          `screen -S #{@path} -X wall "#{user} has connected"`
+        end
+      end
+    end
+
+    # Internal: Store data to the stream so that when a new connection
+    # is started we can send all that data and give them the visual.
+    #
+    # Returns nothing.
+    def store(data)
+      @stream << data
+      @stream = @stream[-Pssh.cache_length..-1] if @stream.length > Pssh.cache_length
+    end
+
+  end
+end

data/lib/pssh/socket.rb

@@ -13,36 +13,6 @@ module Pssh
       @killed_sessions = []
       @existing_socket = false
 
-      self.send Pssh.command.to_sym
-    end
-
-    def tmux
-      if ENV['TMUX']
-        @path = ENV['TMUX'].split(',').first
-        @existing_socket = true
-        @command = "tmux -S #{@path} attach"
-      else
-        @path = Pssh.default_socket_path
-        @command = "tmux -S #{@path} new"
-      end
-      @attach_cmd = "tmux -S #{@path} attach"
-    end
-
-    def screen
-      if ENV['STY']
-        @path = ENV['STY']
-        @existing_socket = true
-        @command = "screen -S #{@path} -X multiuser on && screen -x #{@path}"
-      else
-        @path = Pssh.default_socket_path
-        @command = "screen -m -S #{@path}"
-      end
-      @attach_cmd = "screen -x #{@path}"
-    end
-
-    def shell
-      @path = nil
-      @command = 'sh'
     end
 
     def params(env)
@@ -60,13 +30,14 @@ module Pssh
         @sessions[uuid][:active] = true
       elsif Pssh.open_sessions.keys.include?(uuid)
         user_string = Pssh.open_sessions[uuid] ? "#{Pssh.open_sessions[uuid]} (#{uuid})" : uuid
-        print "\n#{user_string} attached.\n#{Pssh.prompt}"
+        Pssh.pty.send_display_message user_string
         @sessions[uuid] = {
           data: [],
           username: Pssh.open_sessions[uuid],
           user_string: user_string,
           active: true,
-          started: false
+          started: false,
+          winsize: []
         }
         Pssh.open_sessions.delete uuid
       else
@@ -82,19 +53,23 @@ module Pssh
       Thread.new do
         sleep 10
         if @sessions[uuid][:active] == false
-          @sessions[uuid][:read].close
-          @sessions[uuid][:write].close
           @sessions.delete uuid
           print "\n#{user_string} detached.\n#{Pssh.prompt}"
         end
       end
     end
 
+    # Public: Writes the same data to all the open sessions.
+    #
+    # Returns nothing.
+    def write(data)
+      @sessions.each do |k,v|
+        v[:socket].send_data({ data: data }.to_json)
+      end
+    end
+
     def close_websocket
-      @sessions[@uuid][:socket].send_data({ close: true }.to_json) if @sessions[@uuid][:socket]
-      @sessions[@uuid][:read].close if @sessions[@uuid][:read]
-      @sessions[@uuid][:write].close if @sessions[@uuid][:write]
-      @sessions[@uuid][:thread].exit if @sessions[@uuid][:thread]
+      self.send_data({ close: true }.to_json)
       @sessions.delete @uuid
       super
     end
@@ -110,77 +85,22 @@ module Pssh
       @killed_sessions << @uuid
     end
 
-    # Internal: Sends a message to the tmux or screen display notifying of a
-    # new user that has connected.
-    #
-    # Returns nothing.
-    def send_display_message(uuid)
-      if @existing_socket
-        case Pssh.command.to_sym
-        when :tmux
-          `tmux -S #{@path} display-message "#{@sessions[uuid][:user_string]} has connected"`
-        when :screen
-          `screen -S #{@path} -X wall "#{@sessions[uuid][:user_string]} has connected"`
-        end
-      end
-    end
-
-    def clear_environment
-      ENV['TMUX'] = nil
-      ENV['STY'] = nil
-    end
-
     def on_message(env, message)
       uuid = params(env)['uuid']
       return unless @sessions[uuid]
       case message[0]
       when 's'
-        unless @sessions[uuid][:started]
-          @sessions[uuid][:started] = true
-          @sessions[uuid][:thread] = Thread.new do
-            begin
-              if @sessions[uuid]
-                size = message[1..-1].split ','
-                send_display_message(uuid)
-                clear_environment
-                @sessions[uuid][:read], @sessions[uuid][:write], @sessions[uuid][:pid] = PTY.spawn(@command)
-                @sessions[uuid][:write].winsize = [size[1].to_i, size[0].to_i]
-
-                while(@sessions[uuid] && @sessions[uuid][:active]) do
-                  IO.select([@sessions[uuid][:read]])
-                  begin
-                    while (data = @sessions[uuid][:read].readpartial(2048)) do
-                      data.encode!('UTF-16', 'UTF-8', :invalid => :replace, :replace => '')
-                      data.encode!('UTF-8', 'UTF-16')
-                      if data.valid_encoding?
-                        @sessions[uuid][:socket].send_data({ data: data }.to_json)
-                      end
-                    end
-                  rescue Exception => e
-                    if @sessions[uuid]
-                      if e.is_a?(Errno::EAGAIN)
-                        retry
-                      else
-                        @sessions[uuid][:active] = false
-                      end
-                    end
-                  end
-                end
-              end
-
-            rescue Exception => e
-              puts e.inspect
-              puts e.backtrace
-              puts '---'
-              retry
-            end
-          end
-        end
+        @sessions[uuid][:started] = true
+        size = message[1..-1].split ','
+        @sessions[uuid][:winsize] = [size[0].to_i, size[1].to_i]
+        send_data({ data: Pssh.pty.stream }.to_json)
+        Pssh.pty.resize!
       when 'd'
-        @sessions[uuid][:write].write_nonblock message[1..-1] if Pssh.io_mode['w']
+        Pssh.pty.write message[1..-1]
       when 'r'
         size = message[1..-1].split ','
-        @sessions[uuid][:write].winsize= [size[1].to_i, size[0].to_i]
+        @sessions[uuid][:winsize] = [size[0].to_i, size[1].to_i]
+        Pssh.pty.resize!
       end
     end
   end

data/lib/pssh/version.rb

@@ -1,4 +1,4 @@
 module Pssh
-  VERSION = "0.2.3"
+  VERSION = "0.3.3"
 end
 

data/lib/pssh/{web_console.rb → web.rb}

@@ -1,5 +1,5 @@
 module Pssh
-  class WebConsole
+  class Web
     def render(view, opts = {})
       [200, { 'Content-Type' => 'text/html' }, Tilt::HamlTemplate.new("#{Pssh.base_path}/views/#{view}.haml").render(self, opts)]
     end

data/views/index.haml

@@ -1,35 +1,39 @@
 %html
   %head
     %script{:src => "https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js", :type => "application/javascript"}
-    %script{:src => "assets/wssh.js", :type => "application/javascript"}
+    %script{:src => "assets/pssh.js", :type => "application/javascript"}
     %script{:src => "assets/term.js", :type => "application/javascript"}
     :javascript
-      function init() {
+      jQuery(function() {
+
+        // Calculate the width of a character
         var k = document.createElement('span.monospace');
         k.innerHTML = '_';
         k.style.position = 'absolute';
         document.body.appendChild(k);
-
-        var size =
-        [
-        k.offsetWidth,
-        13 // k.offsetHeight
+        var size = [
+          k.offsetWidth,
+          13
         ];
-
-
         document.body.removeChild(k);
-        console.log(size[0]+' '+size[1]);
+
+        // Determine the browser width
         width = parseInt($(window).width() / size[0]);
         height = parseInt($(window).height() / size[1]);
+
+        // Set up the socket and the terminal
         first_time = true;
-        var client = new WSSHClient('#{unique_id}');
+        var client = new PsshClient('#{unique_id}');
         var term = new Terminal(width, height, function(key) {
           client.send(key);
         });
         term.open();
         $('.terminal').detach().appendTo('#term');
-        //term.resize(200, 40);
-        term.write('Connecting...');
+
+        // Pretty sloppy usage that when connected sends over
+        // the browser size so we can request the right size window.
+        // It also handles reconnecting, which could more than likely
+        // be baked into the PsshClient.
         client.connect($.extend({}, {
             onError: function(error) {
                 term.write('Error: ' + error + "\\r\\n");
@@ -44,26 +48,24 @@
             onClose: function() {
               term.destroy();
               $('.terminal').remove();
-                //term.write('Connection Reset By Peer');
             },
             onTerminate: function() {
             },
             onData: function(data) {
-                console.log(data);
                 term.write(data);
             }
         }));
 
-        window.onresize = function() {
+        // When we resize the window, make sure the terminal changes too.
+        $(window).resize( function() {
           width = parseInt($(window).width() / size[0]);
           height = parseInt($(window).height() / size[1]);
           client.resize(width, height);
           term.resize(width, height);
-        };
+        });
 
-        function log(msg) { document.getElementById('log').innerHTML += msg + '<br>'; }
-      }
+      });
     %link{:href => "assets/bootstrap.css", :rel => "stylesheet"}/
     %link{:href => "assets/style.css", :rel => "stylesheet"}/
-  %body{:onload => "init();"}
+  %body
     #term

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: pssh
 version: !ruby/object:Gem::Version
-  version: 0.2.3
-  prerelease: 
+  version: 0.3.3
 platform: ruby
 authors:
 - Kelly Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -117,44 +104,45 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - assets/bootstrap.css
+- assets/pssh.js
 - assets/style.css
 - assets/term.js
-- assets/wssh.js
 - bin/pssh
 - lib/pssh.rb
 - lib/pssh/cli.rb
 - lib/pssh/client.rb
 - lib/pssh/console.rb
+- lib/pssh/pty.rb
 - lib/pssh/socket.rb
 - lib/pssh/version.rb
-- lib/pssh/web_console.rb
+- lib/pssh/web.rb
 - pssh.gemspec
 - views/index.haml
 homepage: http://pssh.me
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Pair Programming made user-friendly with your web browser (and Portly helps).
 test_files: []
 has_rdoc: 

data/assets/wssh.js

@@ -1,134 +0,0 @@
-/*
-WSSH Javascript Client
-
-Usage:
-
-var client = new WSSHClient();
-
-client.connect({
-    // Connection and authentication parameters
-    username: 'root',
-    hostname: 'localhost',
-    authentication_method: 'password', // can either be password or private_key
-    password: 'secretpassword', // do not provide when using private_key
-    key_passphrase: 'secretpassphrase', // *may* be provided if the private_key is encrypted
-
-    // Callbacks
-    onError: function(error) {
-        // Called upon an error
-        console.error(error);
-    },
-    onConnect: function() {
-        // Called after a successful connection to the server
-        console.debug('Connected!');
-
-        client.send('ls\n'); // You can send data back to the server by using WSSHClient.send()
-    },
-    onClose: function() {
-        // Called when the remote closes the connection
-        console.debug('Connection Reset By Peer');
-    },
-    onData: function(data) {
-        // Called when data is received from the server
-        console.debug('Received: ' + data);
-    }
-});
-
-*/
-
-function WSSHClient(uuid) {
-  this.uuid=uuid;
-};
-
-WSSHClient.prototype._generateEndpoint = function(options) {
-    if (window.location.protocol == 'https:') {
-        var protocol = 'wss://';
-    } else {
-        var protocol = 'ws://';
-    }
-    var endpoint = protocol + window.location.host +
-        '/socket?uuid=' + this.uuid; ///' + encodeURIComponent(options.hostname) + '/' +
-        //encodeURIComponent(options.username);
-    /*if (options.authentication_method == 'password') {
-        endpoint += '?password=' + encodeURIComponent(options.password);
-    } else if (options.authentication_method == 'private_key') {
-        endpoint += '?private_key=' + encodeURIComponent(options.private_key);
-        if (options.key_passphrase !== undefined)
-            endpoint += '&key_passphrase=' + encodeURIComponent(
-                options.key_passphrase);
-    }*/
-    return endpoint;
-};
-
-WSSHClient.prototype.startSocket = function() {
-
-    var ping;
-    var _self = this;
-    var connected = true;
-
-    if (window.WebSocket) {
-        this._connection = new WebSocket(this.endpoint);
-    }
-    else if (window.MozWebSocket) {
-        this._connection = MozWebSocket(this.endpoint);
-    }
-    else {
-        this.options.onError('WebSocket Not Supported');
-        return ;
-    }
-
-    this._connection.onopen = function() {
-        console.log("connected");
-        ping = window.setInterval(function() {
-          _self._connection.send('p');
-        }, 10000);
-        _self.options.onConnect();
-    };
-
-    this._connection.onmessage = function (evt) {
-        console.log(evt.data);
-        var data = JSON.parse(evt.data.toString());
-        if (data.error !== undefined) {
-            _self.options.onError(data.error);
-        } else if (data.close !== undefined) {
-          connected = false;
-        } else {
-            _self.options.onData(data.data);
-        }
-    };
-
-    this._connection.onclose = function(evt) {
-      if (connected) {
-        window.clearInterval(ping);
-        _self.reconnect();
-      } else {
-        _self.options.onClose();
-      }
-    };
-
-};
-
-WSSHClient.prototype.connect = function(options) {
-
-    this.endpoint = this._generateEndpoint(options);
-    this.options = options;
-
-    this.startSocket();
-
-};
-
-WSSHClient.prototype.send = function(data) {
-    this._connection.send('d' + data);
-};
-
-WSSHClient.prototype.start = function(width, height) {
-    this._connection.send('s' + width + ',' + height);
-};
-
-WSSHClient.prototype.resize = function(width, height) {
-    this._connection.send('r' + width + ',' + height);
-};
-
-WSSHClient.prototype.reconnect = function() {
-    this.startSocket();
-};