lib/mnit & implementations: move up `is_move` from Android to abstract

[nit.git] / lib / nitcorn / reactor.nit

diff --git a/lib/nitcorn/reactor.nit b/lib/nitcorn/reactor.nit
index 4d8cdfe..5bd285d 100644 (file)
--- a/lib/nitcorn/reactor.nit
+++ b/lib/nitcorn/reactor.nit
@@ -20,27 +20,22 @@
 module reactor
 
 import more_collections
-import http_request_parser
 
 import vararg_routes
 import http_request
+import http_request_buffer
 import http_response
 
 # A server handling a single connection
 class HttpServer
-       super Connection
+       super HTTPConnection
 
        # The associated `HttpFactory`
        var factory: HttpFactory
 
-       # Init the server using `HttpFactory`.
-       init(buf_ev: NativeBufferEvent, factory: HttpFactory) is old_style_init do
-               self.factory = factory
-       end
-
        private var parser = new HttpRequestParser is lazy
 
-       redef fun read_callback(str)
+       redef fun read_http_request(str)
        do
                var request_object = parser.parse_http_request(str.to_s)
                if request_object != null then delegate_answer request_object
@@ -79,7 +74,10 @@ class HttpServer
                                if root != null then
                                        turi = ("/" + request.uri.substring_from(root.length)).simplify_path
                                else turi = request.uri
-                               response = handler.answer(request, turi)
+
+                               # Delegate the responsibility to respond to the `Action`
+                               handler.prepare_respond_and_close(request, turi, self)
+                               return
                        else response = new HttpResponse(405)
                else response = new HttpResponse(405)
 
@@ -96,14 +94,27 @@ class HttpServer
 end
 
 redef abstract class Action
-       # Handle a request with the relative URI `truncated_uri`
+       # Prepare a `HttpResponse` destined to the client in response to the `request`
        #
-       # `request` is fully formed request object and has a reference to the session
-       # if one preexists.
+       # `request` is fully formed request object with a reference to the session
+       # if one already exists.
        #
        # `truncated_uri` is the ending of the full request URI, truncated from the route
        # leading to this `Action`.
        fun answer(request: HttpRequest, truncated_uri: String): HttpResponse is abstract
+
+       # Full  to a `request` with sending the response and closing of the `http_server`
+       #
+       # Must users only need to implement `answer`, this method is for advanced use only.
+       # It can be used to delay an answer until an event is raised or work is done on a different thread.
+       #
+       # By default this method calls `answer`, relays the response to `http_server.respond` and closes `http_server`.
+       protected fun prepare_respond_and_close(request: HttpRequest, truncated_uri: String, http_server: HttpServer)
+       do
+               var response = answer(request, truncated_uri)
+               http_server.respond response
+               http_server.close
+       end
 end
 
 # Factory to create `HttpServer` instances, and hold the libevent base handler
@@ -115,7 +126,7 @@ class HttpFactory
        # It should be populated after this object has instanciated
        var config = new ServerConfig.with_factory(self)
 
-       # Instanciate a server and libvent
+       # Instantiate a server and libvent
        #
        # You can use this to create the first `HttpFactory`, which is the most common.
        init and_libevent do init(new NativeEventBase)