pytty 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d925871a8895ef6e93d35a265e5c44c3874d14241e08d2474b884acf4352c6b2
-  data.tar.gz: 9821b6759f9d57b89ed99c199b435c34f93196334be72c4fd5fe53973d348882
+  metadata.gz: 86943cf397ea5d69b0d735243100ad08ed00629b2b1ffc34157f44acb0ff2316
+  data.tar.gz: 5ee2c4f7c9bd1bbb9e550be3140d1c7c53f5b51f74ae3cad2f60994b1a026374
 SHA512:
-  metadata.gz: 6d2e382324e2882f6e394b7db0f9358600bc76057c2d611ac1c7c4d7e248429d984bcd624554cf684a6c1fa42a771127fa088b4ed57a6d88b62e31e9214145f7
-  data.tar.gz: be054067981dd164378fcd1ad83fbb948ebd9035fc1decb2a559b75332768e21a46426c8332bbe89e5dacad2db32b9aaf85b2e19235a30868f683b5f3789533e
+  metadata.gz: 04b69e3162611cda3e34a33dfae91a6cbad3226ae31e928d8a77dcf1e210c7b4fd766a173f182e8be7a089c2ca26cd3f6456fb13fab420695108c706649a56c3
+  data.tar.gz: 4a61b1ff318f39adb8918565e78a6ef7ed189c7063bcb97ce3ca9efc27593a2b73e8a9262e5542cd5c6e850eb77ddbe5c9555be8948f136f4422962d3d18c06b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pytty (0.1.0)
+    pytty (0.2.0)
       async-websocket
       clamp (~> 1.3)
       falcon

data/lib/pytty/client/cli.rb

@@ -2,4 +2,6 @@ require "clamp"
 
 require_relative "../common/cli/version_command"
 require_relative "cli/run_command"
+require_relative "cli/stream_command"
+
 require_relative "cli/root_command"

data/lib/pytty/client/cli/root_command.rb

@@ -13,6 +13,7 @@ module Pytty
 
         subcommand ["version"], "Show version information", Pytty::Common::Cli::VersionCommand
         subcommand ["run"], "run", RunCommand
+        subcommand ["stream"], "stream", StreamCommand
 
         def self.run
           super

data/lib/pytty/client/cli/run_command.rb

@@ -2,18 +2,23 @@
 require 'async'
 require 'async/http'
 require 'async/http/internet'
+require 'json'
 
 module Pytty
   module Client
     module Cli
       class RunCommand < Clamp::Command
+        parameter "CMD ...", "command"
         def execute
           Async.run do
             internet = Async::HTTP::Internet.new
             headers = [['accept', 'application/json']]
-            body = []
-            response = internet.post("http://localhost:1234/v1/run", headers, body)
-            response.read
+            body = {
+              cmd: cmd_list
+            }.to_json
+
+            response = internet.post("http://localhost:1234/v1/run", headers, [body])
+            puts response.read
           ensure
             internet.close
           end

data/lib/pytty/client/cli/stream_command.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+require 'async/reactor'
+require 'async/io/stream'
+require 'async/http/url_endpoint'
+require 'async/websocket/client'
+require 'io/console'
+
+module Pytty
+  module Client
+    module Cli
+      class StreamCommand < Clamp::Command
+        parameter "CMD ...", "command"
+        def execute
+          env = {
+            "LINES" => IO.console.winsize.first.to_s,
+            "COLUMNS" => IO.console.winsize.last.to_s
+          }
+
+          url = "ws://localhost:1234/v1/stream"
+          endpoint = Async::HTTP::URLEndpoint.parse url
+          Async::Reactor.run do |task|
+            endpoint.connect do |socket|
+              connection = Async::WebSocket::Client.new socket, url
+
+              connection.send_message({
+                cmd: cmd_list,
+                env: env
+              })
+
+              while message = connection.next_message
+                print message
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/pytty/daemon/api/chunk.rb

@@ -0,0 +1,28 @@
+require "falcon"
+require_relative "router"
+
+module Pytty
+  module Daemon
+    module Api
+      class Chunk
+
+        def call(env)
+          task = Async::Task.current
+          body = Async::HTTP::Body::Writable.new
+          task.async do |task|
+            10.times do
+              body.write "hello"
+              task.sleep 0.5
+            end
+          rescue Exception => ex
+            p ex
+          ensure
+            body.close
+          end
+
+          [200, {'content-type' => 'text/html; charset=utf-8'}, body]
+        end
+      end
+    end
+  end
+end

data/lib/pytty/daemon/api/router.rb

@@ -1,4 +1,6 @@
 require_relative "web_sockets"
+require_relative "chunk"
+
 require_relative "../components"
 
 module Pytty
@@ -8,11 +10,18 @@ module Pytty
         def call(env)
           req = Rack::Request.new(env)
           resp = case req.path_info
+          when "/stream"
+            if env["HTTP_UPGRADE"] == "websocket"
+              handler = Pytty::Daemon::Components::WebSocketHandler.new(env)
+              handler.handle
+            end
+
+            [404, {"Content-Type" => "text/html"}, ["websocket only"]]
           when "/run"
             handler = Pytty::Daemon::Components::WebHandler.new(env)
-            handler.handle
+            output = handler.handle
 
-            [200, {"Content-Type" => "text/html"}, ["ok"]]
+            [200, {"Content-Type" => "text/html"}, [output]]
           when "/ws"
             if env["HTTP_UPGRADE"] == "websocket"
               ws = WebSockets.new env

data/lib/pytty/daemon/api/server.rb

@@ -1,5 +1,6 @@
 require "falcon"
 require_relative "router"
+require_relative "chunk"
 
 module Pytty
   module Daemon
@@ -10,7 +11,11 @@ module Pytty
 
         def run
           rack_app = Rack::Builder.new do
-            use Rack::CommonLogger
+            #use Rack::CommonLogger
+
+            map "/chunk" do
+              run Chunk.new
+            end
             map "/v1" do
               run Router.new
             end

data/lib/pytty/daemon/api/web_sockets.rb

@@ -10,23 +10,51 @@ module Pytty
 
           @connection = Async::WebSocket::Server.open(env)
           @@connections << @connection
+
+          @messages = Async::Queue.new
+          @writes = Async::Queue.new
+        end
+
+        def close
+          @@connections.each do |connection|
+            connection.close
+          end
+          @@connections = []
+        end
+
+        def read
+          @messages.dequeue
+        end
+
+        def write(message)
+          @writes.enqueue message
         end
 
         def handle
-          while message = @connection.next_event
-            type = case message
-            when WebSocket::Driver::OpenEvent
-              puts "ws: open #{@env["REMOTE_ADDR"]}"
-            when WebSocket::Driver::CloseEvent
-              puts "ws: close #{@env["REMOTE_ADDR"]}"
-              @@connections.delete @connection
-            when WebSocket::Driver::MessageEvent
-              puts "ws: message #{@env["REMOTE_ADDR"]}"
+          Async::Task.current.async do
+            while message = @connection.next_event
+              type = case message
+              when WebSocket::Driver::OpenEvent
+                puts "ws: open #{@env["REMOTE_ADDR"]}"
+              when WebSocket::Driver::CloseEvent
+                puts "ws: close #{@env["REMOTE_ADDR"]}"
+                @@connections.delete @connection
+              when WebSocket::Driver::MessageEvent
+                puts "ws: message #{@env["REMOTE_ADDR"]}"
+                @messages.enqueue message.data
+              else
+                raise "ws: unknown #{message.inspect}"
+              end
+            end
+          end
+
+          Async::Task.current.async do |task|
+            while message = @writes.dequeue
               @@connections.each do |connection|
-                connection.send_message(message.data.reverse)
+                connection.send_message(message)
+              rescue Exception => ex
+                #TODO
               end
-            else
-              raise "ws: unknown #{message.inspect}"
             end
           end
         end

data/lib/pytty/daemon/components.rb

@@ -1,3 +1,6 @@
 
 require_relative "components/run"
-require_relative "components/web_handler"
+require_relative "components/stream"
+
+require_relative "components/web_handler"
+require_relative "components/web_socket_handler"

data/lib/pytty/daemon/components/run.rb

@@ -4,8 +4,13 @@ module Pytty
   module Daemon
     module Components
       class Run
+        def initialize(cmd:)
+          @cmd = cmd
+        end
+
         def run
-          `say hello`
+          cmd_string = @cmd.join(" ")
+          `#{cmd_string}`
         end
       end
     end

data/lib/pytty/daemon/components/stream.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+require 'pty'
+require 'io/console'
+
+module Pytty
+  module Daemon
+    module Components
+      class Stream
+        def initialize(cmd:, env:)
+          @cmd = cmd
+          @env = env
+        end
+
+        def run(stream:)
+          pipe = IO.pipe
+          stderr = Async::IO::Generic.new(pipe.first)
+          stderr_writer = Async::IO::Generic.new(pipe.last)
+
+
+          cmd, args = @cmd
+          process_stdout, process_stdin, pid = PTY.spawn(@env, cmd, *args, err: stderr_writer.fileno)
+          stderr_writer.close
+
+          stdout = Async::IO::Generic.new process_stdout
+          stdin = Async::IO::Generic.new process_stdin
+          Async::Task.current.async do |task|
+            while c = stdout.read(1)
+              stream.write c
+            end
+            stream.close
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/pytty/daemon/components/web_handler.rb

@@ -11,12 +11,21 @@ module Pytty
 
         def handle
           req = Rack::Request.new(@env)
-          case req.path_info
+          body = begin
+            JSON.parse(req.body.read)
+          rescue
+          end
+
+          obj = case req.path_info
           when "/run"
-            Run.new.run
+            Run.new cmd: body.dig("cmd")
+          when "/stream"
+            Stream.new cmd: body.dig("cmd")
           else
             raise "Unknown: #{req.path_info}"
           end
+
+          obj.run
         end
       end
     end

data/lib/pytty/daemon/components/web_socket_handler.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+require "rack/request"
+
+module Pytty
+  module Daemon
+    module Components
+      class WebSocketHandler
+        def initialize(env)
+          @env = env
+        end
+
+        def handle
+          req = Rack::Request.new(@env)
+          ws = Pytty::Daemon::Api::WebSockets.new(@env)
+          ws.handle
+
+          klass = case req.path_info
+          when "/stream"
+            Stream
+          else
+            raise "Unknown: #{req.path_info}"
+          end
+          params = ws.read
+          body = begin
+            JSON.parse(params)
+          rescue Exception => ex
+            p ex
+          end
+
+          obj = klass.new cmd: body.dig("cmd"), env: body.dig("env")
+          obj.run stream: ws
+        end
+      end
+    end
+  end
+end
+

data/lib/pytty/version.rb

@@ -1,3 +1,3 @@
 module Pytty
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pytty
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Matti Paksula
@@ -178,7 +178,9 @@ files:
 - lib/pytty/client/cli.rb
 - lib/pytty/client/cli/root_command.rb
 - lib/pytty/client/cli/run_command.rb
+- lib/pytty/client/cli/stream_command.rb
 - lib/pytty/common/cli/version_command.rb
+- lib/pytty/daemon/api/chunk.rb
 - lib/pytty/daemon/api/router.rb
 - lib/pytty/daemon/api/server.rb
 - lib/pytty/daemon/api/web_sockets.rb
@@ -187,7 +189,9 @@ files:
 - lib/pytty/daemon/cli/serve_command.rb
 - lib/pytty/daemon/components.rb
 - lib/pytty/daemon/components/run.rb
+- lib/pytty/daemon/components/stream.rb
 - lib/pytty/daemon/components/web_handler.rb
+- lib/pytty/daemon/components/web_socket_handler.rb
 - lib/pytty/version.rb
 - pytty.gemspec
 homepage: https://github.com/pyttyhq/pytty-ruby