tipi 0.36 → 0.39

data/examples/https_wss_server.rb

@@ -2,6 +2,7 @@
 
 require 'bundler/setup'
 require 'tipi'
+require 'tipi/websocket'
 require 'localhost/authority'
 
 def ws_handler(conn)
@@ -26,7 +27,7 @@ opts = {
   dont_linger:    true,
   secure_context: authority.server_context,
   upgrade:        {
-    websocket: Polyphony::Websocket.handler(&method(:ws_handler))
+    websocket: Tipi::Websocket.handler(&method(:ws_handler))
   }
 }
 

data/examples/rack_server.rb

@@ -4,6 +4,11 @@ require 'bundler/setup'
 require 'tipi'
 
 app_path = ARGV.first || File.expand_path('./config.ru', __dir__)
+unless File.file?(app_path)
+  STDERR.puts "Please provide rack config file (there are some in the examples directory.)"
+  exit!
+end
+
 app = Tipi::RackAdapter.load(app_path)
 opts = { reuse_addr: true, dont_linger: true }
 

data/examples/rack_server_https.rb

@@ -5,7 +5,7 @@ require 'tipi'
 require 'localhost/authority'
 
 app_path = ARGV.first || File.expand_path('./config.ru', __dir__)
-app = Polyphony::HTTP::Server::RackAdapter.load(app_path)
+app = Tipi::RackAdapter.load(app_path)
 
 authority = Localhost::Authority.fetch
 opts = {

data/examples/rack_server_https_forked.rb

@@ -5,15 +5,16 @@ require 'tipi'
 require 'localhost/authority'
 
 app_path = ARGV.first || File.expand_path('./config.ru', __dir__)
-app = Polyphony::HTTP::Server::RackAdapter.load(app_path)
+app = Tipi::RackAdapter.load(app_path)
 
 authority = Localhost::Authority.fetch
 opts = {
   reuse_addr:     true,
+  reuse_port:     true,
   dont_linger:    true,
   secure_context: authority.server_context
 }
-server = Polyphony::HTTP::Server.listen('0.0.0.0', 1234, opts)
+server = Tipi.listen('0.0.0.0', 1234, opts)
 puts 'Listening on port 1234'
 
 child_pids = []
@@ -24,4 +25,4 @@ child_pids = []
   end
 end
 
-child_pids.each { |pid| EV::Child.new(pid).await }
+child_pids.each { |pid| Thread.current.backend.waitpid(pid) }

data/examples/routing_server.rb

@@ -12,17 +12,18 @@ puts "pid: #{Process.pid}"
 puts 'Listening on port 4411...'
 
 app = Tipi.route do |r|
-  r.root do
+
+  r.on_root do
     r.redirect '/hello'
   end
   r.on 'hello' do
-    r.get 'world' do
+    r.on_get 'world' do
       r.respond 'Hello world'
     end
-    r.get do
+    r.on_get do
       r.respond 'Hello'
     end
-    r.post do
+    r.on_post do
       puts 'Someone said Hello'
       r.redirect '/'
     end

data/lib/tipi/digital_fabric/agent.rb

@@ -119,7 +119,7 @@ module DigitalFabric
 
     def recv_df_message(msg)
       @last_recv = Time.now
-      case msg['kind']
+      case msg[Protocol::Attribute::KIND]
       when Protocol::SHUTDOWN
         recv_shutdown
       when Protocol::HTTP_REQUEST
@@ -130,7 +130,7 @@ module DigitalFabric
         recv_ws_request(msg)
       when Protocol::CONN_DATA, Protocol::CONN_CLOSE,
            Protocol::WS_DATA, Protocol::WS_CLOSE
-        fiber = @requests[msg['id']]
+        fiber = @requests[msg[Protocol::Attribute::ID]]
         fiber << msg if fiber
       end
     end
@@ -140,7 +140,7 @@ module DigitalFabric
       # messages. This is so we can correctly stop long-running requests
       # upon graceful shutdown
       if is_long_running_request_response?(msg)
-        id = msg[:id]
+        id = msg[Protocol::Attribute::ID]
         @long_running_requests[id] = @requests[id]
       end
       @last_send = Time.now
@@ -148,11 +148,11 @@ module DigitalFabric
     end
 
     def is_long_running_request_response?(msg)
-      case msg[:kind]
+      case msg[Protocol::Attribute::KIND]
       when Protocol::HTTP_UPGRADE
         true
       when Protocol::HTTP_RESPONSE
-        msg[:body] && !msg[:complete]
+        !msg[Protocol::Attribute::HttpResponse::COMPLETE]
       end
     end
 
@@ -165,7 +165,7 @@ module DigitalFabric
 
     def recv_http_request(msg)
       req = prepare_http_request(msg)
-      id = msg['id']
+      id = msg[Protocol::Attribute::ID]
       @requests[id] = spin do
         http_request(req)
       rescue IOError, Errno::ECONNREFUSED, Errno::EPIPE
@@ -180,17 +180,20 @@ module DigitalFabric
     end
 
     def prepare_http_request(msg)
-      req = Qeweney::Request.new(msg['headers'], RequestAdapter.new(self, msg))
-      req.buffer_body_chunk(msg['body']) if msg['body']
-      req.complete! if msg['complete']
+      headers = msg[Protocol::Attribute::HttpRequest::HEADERS]
+      body_chunk = msg[Protocol::Attribute::HttpRequest::BODY_CHUNK]
+      complete = msg[Protocol::Attribute::HttpRequest::COMPLETE]
+      req = Qeweney::Request.new(headers, RequestAdapter.new(self, msg))
+      req.buffer_body_chunk(body_chunk) if body_chunk
+      req.complete! if complete
       req
     end
 
     def recv_http_request_body(msg)
-      fiber = @requests[msg['id']]
+      fiber = @requests[msg[Protocol::Attribute::ID]]
       return unless fiber
 
-      fiber << msg['body']
+      fiber << msg[Protocol::Attribute::HttpRequestBody::BODY]
     end
 
     def get_http_request_body(id, limit)
@@ -199,8 +202,8 @@ module DigitalFabric
     end
 
     def recv_ws_request(msg)
-      req = Qeweney::Request.new(msg['headers'], RequestAdapter.new(self, msg))
-      id = msg['id']
+      req = Qeweney::Request.new(msg[Protocol::Attribute::WS::HEADERS], RequestAdapter.new(self, msg))
+      id = msg[Protocol::Attribute::ID]
       @requests[id] = @long_running_requests[id] = spin do
         ws_request(req)
       rescue IOError, Errno::ECONNREFUSED, Errno::EPIPE

data/lib/tipi/digital_fabric/agent_proxy.rb

@@ -31,6 +31,7 @@ module DigitalFabric
     def run
       @fiber = Fiber.current
       @service.mount(route, self)
+      @mounted = true
       keep_alive_timer = spin_loop(interval: 5) { keep_alive }
       process_incoming_messages(false)
     rescue GracefulShutdown
@@ -38,7 +39,7 @@ module DigitalFabric
       process_incoming_messages(true)
     ensure
       keep_alive_timer&.stop
-      @service.unmount(self)
+      unmount
     end
 
     def process_incoming_messages(shutdown = false)
@@ -48,7 +49,15 @@ module DigitalFabric
         recv_df_message(msg)
         return if shutdown && @requests.empty?
       end
-    rescue TimeoutError, IOError
+    rescue TimeoutError, IOError, SystemCallError
+      # ignore and just return in order to terminate the proxy
+    end
+
+    def unmount
+      return unless @mounted
+
+      @service.unmount(self) 
+      @mounted = nil
     end
 
     def shutdown
@@ -82,9 +91,16 @@ module DigitalFabric
 
     def recv_df_message(message)
       @last_recv = Time.now
-      return if message['kind'] == Protocol::PING
+      # puts "<<< #{message.inspect}"
 
-      handler = @requests[message['id']]
+      case message[Protocol::Attribute::KIND]
+      when Protocol::PING
+        return
+      when Protocol::UNMOUNT
+        return unmount
+      end
+
+      handler = @requests[message[Protocol::Attribute::ID]]
       if !handler
         # puts "Unknown request id in #{message}"
         return
@@ -94,6 +110,8 @@ module DigitalFabric
     end
 
     def send_df_message(message)
+      # puts ">>> #{message.inspect}" unless message[Protocol::Attribute::KIND] == Protocol::PING
+
       @last_send = Time.now
       @conn << message.to_msgpack
     end
@@ -130,41 +148,51 @@ module DigitalFabric
             t1 = Time.now
             @service.record_latency_measurement(t1 - t0)
           end
-          return if http_request_message(id, req, message)
+          kind = message[Protocol::Attribute::KIND]
+          attributes = message[Protocol::Attribute::HttpRequest::HEADERS..-1]
+          return if http_request_message(id, req, kind, attributes)
         end
       end
     rescue => e
-      req.respond("Error: #{e.inspect}", ':status' => Qeweney::Status::INTERNAL_SERVER_ERROR)
+      p "Internal server error: #{e.inspect}"
+      puts e.backtrace.join("\n")
+      http_request_send_error_response(e)
+    end
+
+    def http_request_send_error_response(error)
+      response = format("Error: %s\n%s", error.inspect, error.backtrace.join("\n"))
+      req.respond(response, ':status' => Qeweney::Status::INTERNAL_SERVER_ERROR)
+    rescue IOError, SystemCallError
+      # ignore
     end
 
     # @return [Boolean] true if response is complete
-    def http_request_message(id, req, message)
-      case message['kind']
+    def http_request_message(id, req, kind, message)
+      case kind
       when Protocol::HTTP_UPGRADE
-        http_custom_upgrade(id, req, message)
+        http_custom_upgrade(id, req, *message)
         true
       when Protocol::HTTP_GET_REQUEST_BODY
-        http_get_request_body(id, req, message)
+        http_get_request_body(id, req, *message)
         false
       when Protocol::HTTP_RESPONSE
-        headers = message['headers']
-        body = message['body']
-        done = message['complete']
-        req.send_headers(headers) if headers && !req.headers_sent?
-        req.send_chunk(body, done: done) if body or done
-        done
+        http_response(id, req, *message)
       else
         # invalid message
         true
       end
     end
 
+    def send_transfer_count(key, rx, tx)
+      send_df_message(Protocol.transfer_count(key, rx, tx))
+    end
+
     HTTP_RESPONSE_UPGRADE_HEADERS = { ':status' => Qeweney::Status::SWITCHING_PROTOCOLS }
 
-    def http_custom_upgrade(id, req, message)
+    def http_custom_upgrade(id, req, headers)
       # send upgrade response
-      upgrade_headers = message['headers'] ?
-        message['headers'].merge(HTTP_RESPONSE_UPGRADE_HEADERS) :
+      upgrade_headers = headers ?
+       headers.merge(HTTP_RESPONSE_UPGRADE_HEADERS) :
         HTTP_RESPONSE_UPGRADE_HEADERS
       req.send_headers(upgrade_headers, true)
 
@@ -182,9 +210,9 @@ module DigitalFabric
     end
 
     def http_custom_upgrade_message(conn, message)
-      case message['kind']
+      case message[Protocol::Attribute::KIND]
       when Protocol::CONN_DATA
-        conn << message['data']
+        conn << message[:Protocol::Attribute::ConnData::DATA]
         false
       when Protocol::CONN_CLOSE
         true
@@ -194,8 +222,30 @@ module DigitalFabric
       end
     end
 
-    def http_get_request_body(id, req, message)
-      case (limit = message['limit'])
+    def http_response(id, req, body, headers, complete, transfer_count_key)
+      if !req.headers_sent? && complete
+        req.respond(body, headers|| {})
+        if transfer_count_key
+          rx, tx = req.transfer_counts
+          send_transfer_count(transfer_count_key, rx, tx)
+        end
+        true
+      else
+        req.send_headers(headers) if headers && !req.headers_sent?
+        req.send_chunk(body, done: complete) if body or complete
+        
+        if complete && transfer_count_key
+          rx, tx = req.transfer_counts
+          send_transfer_count(transfer_count_key, rx, tx)
+        end
+        complete
+      end
+    rescue IOError, SystemCallError
+      # ignore error
+    end
+
+    def http_get_request_body(id, req, limit)
+      case limit
       when nil
         body = req.read
       else
@@ -225,9 +275,9 @@ module DigitalFabric
       with_request do |id|
         send_df_message(Protocol.ws_request(id, req.headers))
         response = receive
-        case response['kind']
+        case response[0]
         when Protocol::WS_RESPONSE
-          headers = response['headers'] || {} 
+          headers = response[2] || {} 
           status = headers[':status'] || Qeweney::Status::SWITCHING_PROTOCOLS
           if status != Qeweney::Status::SWITCHING_PROTOCOLS
             req.respond(nil, headers)
@@ -239,6 +289,8 @@ module DigitalFabric
           req.respond(nil, ':status' => Qeweney::Status::SERVICE_UNAVAILABLE)
         end
       end
+    rescue IOError, SystemCallError
+      # ignore
     end
 
     def run_websocket_connection(id, websocket)
@@ -248,9 +300,9 @@ module DigitalFabric
         end
       end
       while (message = receive)
-        case message['kind']
+        case message[Protocol::Attribute::KIND]
         when Protocol::WS_DATA
-          websocket << message['data']
+          websocket << message[Protocol::Attribute::WS::DATA]
         when Protocol::WS_CLOSE
           return
         else

data/lib/tipi/digital_fabric/protocol.rb

@@ -4,6 +4,7 @@ module DigitalFabric
   module Protocol
     PING = 'ping'
     SHUTDOWN = 'shutdown'
+    UNMOUNT = 'unmount'
 
     HTTP_REQUEST = 'http_request'
     HTTP_RESPONSE = 'http_response'
@@ -19,16 +20,68 @@ module DigitalFabric
     WS_DATA = 'ws_data'
     WS_CLOSE = 'ws_close'
 
+    TRANSFER_COUNT = 'transfer_count'
+
     SEND_TIMEOUT = 15
     RECV_TIMEOUT = SEND_TIMEOUT + 5
 
+    module Attribute
+      KIND = 0
+      ID = 1
+
+      module HttpRequest
+        HEADERS = 2
+        BODY_CHUNK = 3
+        COMPLETE = 4
+      end
+
+      module HttpResponse
+        BODY = 2
+        HEADERS = 3
+        COMPLETE = 4
+        TRANSFER_COUNT_KEY = 5
+      end
+
+      module HttpUpgrade
+        HEADERS = 2
+      end
+
+      module HttpGetRequestBody
+        LIMIT = 2
+      end
+
+      module HttpRequestBody
+        BODY = 2
+        COMPLETE = 3
+      end
+
+      module ConnectionData
+        DATA = 2
+      end
+
+      module WS
+        HEADERS = 2
+        DATA = 2
+      end
+
+      module TransferCount
+        KEY = 1
+        RX = 2
+        TX = 3
+      end
+    end
+
     class << self
       def ping
-        { kind: PING }
+        [ PING ]
       end
 
       def shutdown
-        { kind: SHUTDOWN }
+        [ SHUTDOWN ]
+      end
+
+      def unmount
+        [ UNMOUNT ]
       end
 
       DF_UPGRADE_RESPONSE = <<~HTTP.gsub("\n", "\r\n")
@@ -43,47 +96,51 @@ module DigitalFabric
       end
 
       def http_request(id, req)
-        { kind: HTTP_REQUEST, id: id, headers: req.headers, body: req.next_chunk, complete: req.complete? }
+        [ HTTP_REQUEST, id, req.headers, req.next_chunk, req.complete? ]
       end
 
-      def http_response(id, body, headers, complete)
-        { kind: HTTP_RESPONSE, id: id, body: body, headers: headers, complete: complete }
+      def http_response(id, body, headers, complete, transfer_count_key = nil)
+        [ HTTP_RESPONSE, id, body, headers, complete, transfer_count_key ]
       end
 
       def http_upgrade(id, headers)
-        { kind: HTTP_UPGRADE, id: id }
+        [ HTTP_UPGRADE, id, headers ]
       end
 
       def http_get_request_body(id, limit = nil)
-        { kind: HTTP_GET_REQUEST_BODY, id: id, limit: limit }
+        [ HTTP_GET_REQUEST_BODY, id, limit ]
       end
 
       def http_request_body(id, body, complete)
-        { kind: HTTP_REQUEST_BODY, id: id, body: body, complete: complete }
+        [ HTTP_REQUEST_BODY, id, body, complete ]
       end
 
       def connection_data(id, data)
-        { kind: CONN_DATA, id: id, data: data }
+        [ CONN_DATA, id, data ]
       end
 
       def connection_close(id)
-        { kind: CONN_CLOSE, id: id }
+        [ CONN_CLOSE, id ]
       end
 
       def ws_request(id, headers)
-        { kind: WS_REQUEST, id: id, headers: headers }
+        [ WS_REQUEST, id, headers ]
       end
 
       def ws_response(id, headers)
-        { kind: WS_RESPONSE, id: id, headers: headers }
+        [ WS_RESPONSE, id, headers ]
       end
 
       def ws_data(id, data)
-        { id: id, kind: WS_DATA, data: data }
+        [ WS_DATA, id, data ]
       end
         
       def ws_close(id)
-        { id: id, kind: WS_CLOSE }
+        [WS_CLOSE, id ]
+      end
+
+      def transfer_count(key, rx, tx)
+        [ TRANSFER_COUNT, key, rx, tx ]
       end
     end
   end