Cleanup

Author: ErikMinekus

extension.h

@@ -68,8 +68,7 @@ struct CurlContext {
 };
 
 struct HTTPRequest {
-	HTTPRequest(const ke::AString &method, const ke::AString &url, json_t *data = NULL)
-		: method(method), url(url), data(data), body(NULL), pos(0), size(0)
+	HTTPRequest(json_t *data = NULL)
 	{
 		if (data != NULL)
 		{
@@ -78,25 +77,19 @@ struct HTTPRequest {
 		}
 	}
 
-	const ke::AString method;
-	const ke::AString url;
-	json_t *data;
-
-	char *body;
-	size_t pos;
-	size_t size;
+	char *body = NULL;
+	size_t pos = 0;
+	size_t size = 0;
 };
 
 struct HTTPResponse {
-	HTTPResponse() : status(0), data(NULL), hndlData(BAD_HANDLE), body(NULL), size(0) {}
-
-	long status;
-	json_t *data;
-	Handle_t hndlData;
+	long status = 0;
+	json_t *data = NULL;
+	Handle_t hndlData = BAD_HANDLE;
 	HTTPHeaderMap headers;
 
-	char *body;
-	size_t size;
+	char *body = NULL;
+	size_t size = 0;
 };
 
 struct JSONObjectKeys {

httprequestcontext.cpp

@@ -77,7 +77,8 @@ static size_t ReceiveResponseHeader(char *buffer, size_t size, size_t nmemb, voi
 HTTPRequestContext::HTTPRequestContext(const ke::AString &method, const ke::AString &url, json_t *data,
 	struct curl_slist *headers, IChangeableForward *forward, cell_t value,
 	long connectTimeout, long followLocation, long timeout)
-	: request(method, url, data), headers(headers), forward(forward), value(value), connectTimeout(connectTimeout), followLocation(followLocation), timeout(timeout)
+	: request(data), method(method), url(url), headers(headers), forward(forward), value(value),
+	connectTimeout(connectTimeout), followLocation(followLocation), timeout(timeout)
 {}
 
 HTTPRequestContext::~HTTPRequestContext()
@@ -99,22 +100,22 @@ void HTTPRequestContext::InitCurl()
 		return;
 	}
 
-	if (request.method.compare("POST") == 0)
+	if (method.compare("POST") == 0)
 	{
 		curl_easy_setopt(curl, CURLOPT_POST, 1L);
 	}
-	else if (request.method.compare("PUT") == 0)
+	else if (method.compare("PUT") == 0)
 	{
 		curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L);
 	}
-	else if (request.method.compare("PATCH") == 0)
+	else if (method.compare("PATCH") == 0)
 	{
-		curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, request.method.chars());
+		curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, method.chars());
 		curl_easy_setopt(curl, CURLOPT_POST, 1L);
 	}
-	else if (request.method.compare("DELETE") == 0)
+	else if (method.compare("DELETE") == 0)
 	{
-		curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, request.method.chars());
+		curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, method.chars());
 	}
 
 	curl_easy_setopt(curl, CURLOPT_ACCEPT_ENCODING, "");
@@ -131,7 +132,7 @@ void HTTPRequestContext::InitCurl()
 	curl_easy_setopt(curl, CURLOPT_READDATA, &request);
 	curl_easy_setopt(curl, CURLOPT_READFUNCTION, &ReadRequestBody);
 	curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout);
-	curl_easy_setopt(curl, CURLOPT_URL, request.url.chars());
+	curl_easy_setopt(curl, CURLOPT_URL, url.chars());
 	curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
 	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &WriteResponseBody);
 }

httprequestcontext.h

@@ -40,6 +40,8 @@ class HTTPRequestContext : public IHTTPContext
 	struct HTTPRequest request;
 	struct HTTPResponse response;
 
+	const ke::AString method;
+	const ke::AString url;
 	struct curl_slist *headers;
 	IChangeableForward *forward;
 	cell_t value;

pawn/scripting/include/ripext/http.inc

@@ -90,6 +90,8 @@ methodmap HTTPClient < Handle
 {
 	// Creates a HTTP client.
 	//
+	// The HTTPClient must be freed via delete or CloseHandle().
+	//
 	// @param baseURL    Base URL to the REST API.
 	public native HTTPClient(const char[] baseURL);
 

pawn/scripting/include/ripext/json.inc

@@ -1,13 +1,26 @@
 // Encoding flags
-#define JSON_MAX_INDENT         0x1F		/**< Maximum indentation */
-#define JSON_INDENT(%1)         ((%1) & JSON_MAX_INDENT)		/**< Pretty-print the result and indent with n spaces */
-#define JSON_COMPACT            0x20		/**< Compact representation */
-#define JSON_ENSURE_ASCII       0x40		/**< Escape all Unicode characters outside the ASCII range */
-#define JSON_SORT_KEYS          0x80		/**< Sort object keys */
-#define JSON_ENCODE_ANY         0x200		/**< Encode any value */
-#define JSON_ESCAPE_SLASH       0x400		/**< Escape / with \/ */
-#define JSON_REAL_PRECISION(%1) (((%1) & 0x1F) << 11)		/**< Output floats with at most n digits of precision */
-#define JSON_EMBED              0x10000		/**< Omit opening and closing braces of the top-level object */
+enum
+{
+	JSON_MAX_INDENT   = 0x1F,		/**< Maximum indentation */
+	JSON_COMPACT      = 0x20,		/**< Compact representation */
+	JSON_ENSURE_ASCII = 0x40,		/**< Escape all Unicode characters outside the ASCII range */
+	JSON_SORT_KEYS    = 0x80,		/**< Sort object keys */
+	JSON_ENCODE_ANY   = 0x200,		/**< Encode any value */
+	JSON_ESCAPE_SLASH = 0x400,		/**< Escape / with \/ */
+	JSON_EMBED        = 0x10000		/**< Omit opening and closing braces of the top-level object */
+};
+
+// Pretty-print the result and indent with n spaces
+stock int JSON_INDENT(int n)
+{
+	return n & JSON_MAX_INDENT;
+}
+
+// Output floats with at most n digits of precision
+stock int JSON_REAL_PRECISION(int n)
+{
+	return (n & 0x1F) << 11;
+}
 
 // Generic type for encoding JSON.
 methodmap JSON < Handle
@@ -17,7 +30,7 @@ methodmap JSON < Handle
 	// @param file       File to write to.
 	// @param flags      Encoding flags.
 	// @return           True on success, false on failure.
-	public native bool ToFile(const char[] file, int flags = JSON_INDENT(4));
+	public native bool ToFile(const char[] file, int flags = 0);
 
 	// Retrieves the JSON string representation of the object.
 	//
@@ -52,6 +65,8 @@ methodmap JSONObject < JSON
 
 	// Retrieves an array or object value from the object.
 	//
+	// The JSON must be freed via delete or CloseHandle().
+	//
 	// @param key        Key string.
 	// @return           Value read.
 	// @error            Invalid key.
@@ -197,6 +212,8 @@ methodmap JSONArray < JSON
 
 	// Retrieves an array or object value from the array.
 	//
+	// The JSON must be freed via delete or CloseHandle().
+	//
 	// @param index      Index in the array.
 	// @return           Value read.
 	// @error            Invalid index.