Use notoria's comment

This commit is contained in:
Adrián Arroyo Calle
2021-02-21 20:22:08 +01:00
parent b565eaaf5a
commit 265a5955d7

View File

@@ -10,7 +10,7 @@
Usage Usage
========== ==========
The main predicate of the library is http_listen/2, which needs a port number The main predicate of the library is http_listen/2, which needs a port number
(usually 80) and a list of handlers. A handler is created using the http_route/3 predicate (usually 80) and a list of handlers. A handler is a compund term with the functor
as one HTTP method (in lowercase) and followed by a Route Match and a predicate as one HTTP method (in lowercase) and followed by a Route Match and a predicate
which will handle the call. which will handle the call.
@@ -21,12 +21,9 @@
parameter_handler(User, Request, Response) :- parameter_handler(User, Request, Response) :-
http_body(Response, text(User)). http_body(Response, text(User)).
server :-
http_route(get(echo), text_handler, TextHandler),
http_route(post(user/User), parameter_handler(User), ParameterHandler),
http_listen(7890, [ http_listen(7890, [
TextHandler, % GET /echo get(echo, text_handler), % GET /echo
ParameterHandler % POST /user/<User> post(user/User, parameter_handler(User)) % POST /user/<User>
]). ]).
Every handler predicate will have at least 2-arity, with Request and Response. Every handler predicate will have at least 2-arity, with Request and Response.
@@ -52,7 +49,6 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
:- module(http_server, [ :- module(http_server, [
http_route/3,
http_listen/2, http_listen/2,
http_headers/2, http_headers/2,
http_status_code/2, http_status_code/2,
@@ -62,7 +58,7 @@
url_decode//1 url_decode//1
]). ]).
:- meta_predicate http_route(?, 2, ?). :- meta_predicate http_listen(?, 2).
:- use_module(library(sockets)). :- use_module(library(sockets)).
:- use_module(library(dcgs)). :- use_module(library(dcgs)).
@@ -74,12 +70,17 @@
:- use_module(library(time)). :- use_module(library(time)).
:- use_module(library(crypto)). :- use_module(library(crypto)).
http_route(Path, Handler, MetaHandler) :- % Module prefix workaround with meta_predicate
Path =.. [Method, Pattern], http_listen(Port, Module:Handlers0) :-
MetaHandler =.. [Method, Pattern, Handler]. maplist(module_qualification(Module), Handlers0, Handlers),
http_listen_(Port, Handlers).
module_qualification(M, H0, H) :-
H0 =.. [Method, Path, Goal],
H =.. [Method, Path, M:Goal].
% Server initialization % Server initialization
http_listen(Port, Handlers) :- http_listen_(Port, Handlers) :-
must_be(integer, Port), must_be(integer, Port),
must_be(list, Handlers), must_be(list, Handlers),
once(socket_server_open(Port, Socket)), once(socket_server_open(Port, Socket)),