vpsadmin-client 3.0.0.master.20220107.pre.0.57b7b680 → 3.0.0.master.20220121.pre.0.b5a81113

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cf2f56783b09bcc5716d8b477be832756ac97dc3dec347fd9a6132cab47ee5c
-  data.tar.gz: 64807447baefa8d78eb3009f574380a646426546dbd1d014c557737a6d66e8df
+  metadata.gz: ce5635948bc213752357b413d4e92f8b7f2089306b9a3e02194b76f44f3617c3
+  data.tar.gz: 4304acd24bbecf0389a954d61ce680fece999e1128651f84e75306cf61889195
 SHA512:
-  metadata.gz: 8d2627afb4def067352bea111d2b9008253d1957578a87662923366785c37ad772ef432ddb08d8ae1cb20f1d6d1eef88fdef2ae144b3700eb1efdc9222513eac
-  data.tar.gz: 4ebb46b3667f022967aaf0851a0aea2ff43005729cd87df4cb2edd04d3538f1d84f0766e6874c6162ea248519ca02f974e3839c44c90fbb5a56fb477f959e29e
+  metadata.gz: b3c0c9029f6d14639adb9f901f4b1cc133d1518360be85d8e506e8aa285fa5a1b3e8be5cfa475ae87d8147fadf78dd55bd168593e945f59c1dc237412f714705
+  data.tar.gz: 35e2c3b730bf246d1a14c0a6a7cdf77c08910efa4d460aeb878a52a9d4a0210058a7450c556c7e30a08199b011464a45b17b155b13d965c2da057e14a3878309

data/lib/vpsadmin/cli/commands/vps_remote_console.rb

@@ -1,5 +1,4 @@
-require 'eventmachine'
-require 'em-http'
+require 'thread'
 require 'time'
 require 'json'
 require 'base64'
@@ -11,16 +10,35 @@ module VpsAdmin::CLI::Commands
     args 'VPS_ID'
     desc 'Open VPS remote console'
 
-    class InputHandler < EventMachine::Connection
-      attr_accessor :buffer
-
-      def initialize
+    class InputHandler
+      def initialize(http_client)
+        @http_client = http_client
         @private_buffer = ''
-        @buffer = ''
         @end_seq = ["\r", "\e", "."]
         @end_i = 0
+        @stop = false
+      end
+
+      def read_from(io)
+        begin
+          data = io.read_nonblock(4096)
+        rescue IO::WaitReadable
+          return
+        rescue Errno::EIO
+          stop
+          return
+        end
+
+        write(data)
       end
 
+      def stop?
+        @stop
+      end
+
+      protected
+      attr_reader :http_client
+
       # Data is checked on the presence of the end sequence. The first character
       # in the sequence (ENTER) can be read multiple times in a row and it is
       # to be forwarded.
@@ -29,38 +47,160 @@ module VpsAdmin::CLI::Commands
       # but stored in a private buffer. If the sequence is later broken, the private
       # buffer is forwarded and reset.
       #
-      # If the whole end sequence is read, EM event loop is stopped.
-      def receive_data(data)
+      # If the whole end sequence is read, we exit.
+      def write(data)
+        buffer = ''
+
         data.each_char do |char|
           if char == @end_seq[ @end_i ]
-            if @end_i == @end_seq.size-1
-              EM.stop
+            if @end_i == @end_seq.size - 1
+              @stop = true
               return
             end
 
             @end_i += 1
 
             if @end_i == 1
-              @buffer += char
-
+              buffer += char
             else
               @private_buffer += char
             end
 
           elsif char == @end_seq.first
-            @buffer += char
-
+            buffer += char
           else
             @end_i = 0
 
             unless @private_buffer.empty?
-              @buffer += @private_buffer
+              buffer += @private_buffer
               @private_buffer.clear
             end
 
-            @buffer += char
+            buffer += char
           end
         end
+
+        http_client.write(buffer) unless buffer.empty?
+      end
+    end
+
+    class HttpClient
+      def initialize(vps, token, rate)
+        @vps = vps
+        @token = token
+        @rate = rate
+        @mutex = Mutex.new
+        @write_buffer = ''
+        @stop = false
+        @error = false
+      end
+
+      def start
+        @thread = Thread.new { run }
+      end
+
+      def stop
+        @stop = true
+      end
+
+      def stop?
+        @stop
+      end
+
+      def error?
+        @error != false
+      end
+
+      def error
+        @error
+      end
+
+      def join
+        stop
+        thread.join
+      end
+
+      def write(data)
+        mutex.synchronize do
+          write_buffer << data
+        end
+      end
+
+      def resize(width, height)
+        @width = width
+        @height = height
+      end
+
+      protected
+      attr_reader :vps, :token, :rate, :width, :height, :write_buffer,
+        :mutex, :thread
+
+      def run
+        uri = URI("#{vps.node.location.remote_console_server}/console/feed/#{vps.id}")
+        start_args = [uri.host, uri.port, nil, nil, nil, nil, {
+          use_ssl: uri.scheme == 'https',
+        }]
+
+        Net::HTTP.start(*start_args) do |http|
+          loop do
+            break if stop? || error?
+
+            rate_limit { send_request(http, uri) }
+          end
+        end
+      end
+
+      def send_request(http, uri)
+        req = Net::HTTP::Post.new(uri)
+
+        keys =
+          mutex.synchronize do
+            s = write_buffer.dup
+            write_buffer.clear
+            s
+          end
+
+        req.set_form_data(
+          'session' => token,
+          'keys' => keys,
+          'width' => width,
+          'height' => height,
+        )
+
+        res = http.request(req)
+
+        unless res.is_a?(Net::HTTPSuccess)
+          set_error(
+            "Console server returned error: "+
+            "HTTP #{res.code} - #{res.message}\n\n#{res.body}"
+          )
+          stop
+          return
+        end
+
+        ret = JSON.parse(res.body, symbolize_names: true)
+
+        unless ret[:session]
+          $stdout.write(ret[:data])
+          set_error("Session closed.")
+          stop
+          return
+        end
+
+        $stdout.write(Base64.decode64(ret[:data]))
+      end
+
+      def rate_limit
+        t1 = Time.now
+        yield
+        t2 = Time.now
+
+        cooldown = rate - (t2 - t1)
+        sleep(cooldown) if cooldown > 0
+      end
+
+      def set_error(str)
+        @error = str
       end
     end
 
@@ -93,7 +233,7 @@ module VpsAdmin::CLI::Commands
       end
 
       puts "  VPS is on #{vps.node.domain_name}, located in #{vps.node.location.label}."
-      puts "Console router URL is #{vps.node.location.remote_console_server}"
+      puts "Console server URL is #{vps.node.location.remote_console_server}"
       write "Obtaining authentication token..."
 
       begin
@@ -105,31 +245,18 @@ module VpsAdmin::CLI::Commands
         exit(false)
       end
 
-      @token = t.token
-
       puts
-      puts "Connecting to remote console..."
+      puts "Connecting to the remote console..."
       puts "Press ENTER ESC . to exit"
       puts
 
       raw_mode do
-        EventMachine.run do
-          @input = EventMachine.open_keyboard(InputHandler)
-
-          @http = EventMachine::HttpRequest.new(
-              "#{vps.node.location.remote_console_server}/console/feed/#{vps_id}",
-              ssl: {verify_peer: true},
-          )
-          communicate
-        end
+        run_console(vps, t.token)
       end
     end
 
     protected
-    def write(s)
-      $stdout.write(s)
-      $stdout.flush
-    end
+    attr_reader :client
 
     def raw_mode
       state = `stty -g`
@@ -140,6 +267,7 @@ module VpsAdmin::CLI::Commands
 
         Signal.trap('WINCH') do
           @size = Terminal.size!
+          client.resize(@size[:width], @size[:height]) if client
         end
 
         yield
@@ -151,38 +279,35 @@ module VpsAdmin::CLI::Commands
       puts
     end
 
-    def communicate
-      post = @http.post(
-        body: {
-          session: @token,
-          keys: @input.buffer,
-          width: @size[:width],
-          height: @size[:height],
-        },
-        keepalive: true
-      )
+    def run_console(vps, token)
+      Thread.abort_on_exception = true
 
-      @input.buffer = ''
+      @client = HttpClient.new(vps, token, @opts[:rate])
+      client.resize(@size[:width], @size[:height])
 
-      post.errback do
-        puts "Error: connection to console router failed"
-        EventMachine.stop
-      end
+      input = InputHandler.new(client)
+      client.start
 
-      post.callback do
-        ret = JSON.parse(post.response, symbolize_names: true)
+      loop do
+        res = IO.select([$stdin], [], [], 1)
+        input.read_from($stdin) if res
 
-        unless ret[:session]
-          $stdout.write(ret[:data])
-          puts "\nSession closed."
-          EM.stop
-          next
-        end
+        if input.stop? || client.stop?
+          client.join
 
-        $stdout.write(Base64.decode64(ret[:data]))
+          if client.error?
+            write("\n")
+            write(client.error)
+          end
 
-        EM.add_timer(@opts[:rate]) { communicate }
+          return
+        end
       end
     end
+
+    def write(s)
+      $stdout.write(s)
+      $stdout.flush
+    end
   end
 end

data/lib/vpsadmin/client/version.rb

@@ -1,5 +1,5 @@
 module VpsAdmin
   module Client
-    VERSION = '3.0.0.master.20220107-0.57b7b680'
+    VERSION = '3.0.0.master.20220121-0.b5a81113'
   end
 end

data/vpsadmin-client.gemspec

@@ -22,8 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
 
   spec.add_runtime_dependency 'haveapi-client', '~> 0.15.1'
-  spec.add_runtime_dependency 'eventmachine', '~> 1.2.7'
-  spec.add_runtime_dependency 'em-http-request', '~> 1.1.6'
   spec.add_runtime_dependency 'json'
   spec.add_runtime_dependency 'curses'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vpsadmin-client
 version: !ruby/object:Gem::Version
-  version: 3.0.0.master.20220107.pre.0.57b7b680
+  version: 3.0.0.master.20220121.pre.0.b5a81113
 platform: ruby
 authors:
 - Jakub Skokan
@@ -52,34 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.1
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.7
-- !ruby/object:Gem::Dependency
-  name: em-http-request
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.6
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement