mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

net.http: Fire new events: pre-request, request-connection-error, request, response

Browse source
This commit is contained in:
Matthew Wild 2017-04-21 16:42:06 +01:00
parent 04d3816b69
commit 66a3d68d56
1 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

20
net/http.lua
View file

@ -137,6 +137,15 @@ local function request(self, u, ex, callback)
req.id = ex and ex.id or make_id(req);
do
local event = { http = self, url = u, request = req, options = ex, callback = callback };
local ret = self.events.fire_event("pre-request", event);
if ret then
return ret;
end
req, u, ex, callback = event.request, event.url, event.options, event.callback;
end
local method, headers, body;
local host, port = req.host, req.port;
@ -191,13 +200,20 @@ local function request(self, u, ex, callback)
local handler, conn = server.addclient(host, port_number, listener, "*a", sslctx)
if not handler then
self.events.fire_event("request-connection-error", { http = self, request = req, url = u, err = conn });
callback(conn, 0, req);
return nil, conn;
end
req.handler, req.conn = handler, conn
req.write = function (...) return req.handler:write(...); end
req.callback = function (content, code, request, response)
req.callback = function (content, code, response, request)
do
local event = { http = self, url = u, request = req, response = response, content = content, code = code, callback = callback };
self.events.fire_event("response", event);
content, code, response = event.content, event.code, event.response;
end
log("debug", "Request '%s': Calling callback, status %s", req.id, code or "---");
return log_if_failed(req.id, xpcall(function () return callback(content, code, request, response) end, handleerr));
end
@ -205,6 +221,8 @@ local function request(self, u, ex, callback)
req.state = "status";
requests[req.handler] = req;
self.events.fire_event("request", { http = self, request = req, url = u });
return req;
end