From 04d3816b69a847be365f41d5a625e224108b2c76 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 21 Apr 2017 16:41:27 +0100
Subject: net.http: Allow creation of http client objects, with custom options

---
 net/http.lua | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

(limited to 'net/http.lua')

diff --git a/net/http.lua b/net/http.lua
index 2fd46db9..986b6dc4 100644
--- a/net/http.lua
+++ b/net/http.lua
@@ -10,6 +10,7 @@ local b64 = require "util.encodings".base64.encode;
 local url = require "socket.url"
 local httpstream_new = require "net.http.parser".new;
 local util_http = require "util.http";
+local events = require "util.events";
 
 local ssl_available = pcall(require, "ssl");
 
@@ -122,7 +123,7 @@ local function log_if_failed(id, ret, ...)
 	return ...;
 end
 
-local function request(u, ex, callback)
+local function request(self, u, ex, callback)
 	local req = url.parse(u);
 
 	if not (req and req.host) then
@@ -207,9 +208,27 @@ local function request(u, ex, callback)
 	return req;
 end
 
-return {
-	request = request;
+local function new(options)
+	local http = {
+		options = options;
+		request = request;
+		new = options and function (new_options)
+			return new(setmetatable(new_options, { __index = options }));
+		end or new;
+		events = events.new();
+		request = request;
+	};
+	return http;
+end
 
+local default_http = new();
+
+return {
+	request = function (u, ex, callback)
+		return default_http:request(u, ex, callback);
+	end;
+	new = new;
+	events = default_http.events;
 	-- COMPAT
 	urlencode = util_http.urlencode;
 	urldecode = util_http.urldecode;
-- 
cgit v1.2.3


From 66a3d68d562fb51a8b5b8918bf2e4d6a76e0519b Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 21 Apr 2017 16:42:06 +0100
Subject: net.http: Fire new events: pre-request, request-connection-error,
 request, response

---
 net/http.lua | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'net/http.lua')

diff --git a/net/http.lua b/net/http.lua
index 986b6dc4..6d32b110 100644
--- a/net/http.lua
+++ b/net/http.lua
@@ -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
 
-- 
cgit v1.2.3


From 3371e3eae3f1dc9db621519c8ccf045b1738d030 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 21 Apr 2017 16:42:25 +0100
Subject: net.http: Add request.url, which is the original full URL as a string

---
 net/http.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'net/http.lua')

diff --git a/net/http.lua b/net/http.lua
index 6d32b110..d820e471 100644
--- a/net/http.lua
+++ b/net/http.lua
@@ -125,6 +125,7 @@ end
 
 local function request(self, u, ex, callback)
 	local req = url.parse(u);
+	req.url = u;
 
 	if not (req and req.host) then
 		callback("invalid-url", 0, req);
-- 
cgit v1.2.3