Response object is populated with important data.

Author: MA

README.md

@@ -1,5 +1,24 @@
 # Arduino Fetch
-High level HTTP Request Library that gives a javascript fetch like API.
+Arduino fetch is a high level HTTP Request Library that gives you a javascript fetch like API.
+
+```js
+ResponseOptions options;
+options.method = "POST";
+options.fingerprint = "DC 78 3C 09 3A 78 E3 A0 BA A9 C5 4F 7A A0 87 6F 89 01 71 4C";
+options.headers.contentType = "application/json";
+options.body = "{\"email\": \"[email protected]\", \"password\": \"test:80\"}";
+
+/** In JSON, this would look like:
+ * options = {
+ *      method: "POST",
+ *      fingerprint: "DC 78 3C 09 3A 78 E3 A0 BA A9 C5 4F 7A A0 87 6F 89 01 71 4C",
+ *      headers: { contentType: "application/json" },
+ *      body: "{\"email\": \"[email protected]\", \"password\": \"test:80\"}",
+ * }
+ */
+
+Response response = fetch("https://api.grandeur.tech/auth/login/?apiKey=grandeurkywxmoy914080rxf9dh05n7e", options);
+```
 
 # Include
 
@@ -20,48 +39,66 @@ RequestOptions options;
 /**
     {
         method: "GET" || "POST" || "HEAD" || "PUT" || "DELETE",
-        headers: { "Content-Type": "application/urlencoded", "Content-Length": Automatic, "Host: FromURL, "User-Agent": "arduino-fetch", "Cookie", "Accept": "* /*", "Connection": "close", "Transfer-Encoding": "chunked" },
-        body: {},
+        headers: { "Content-Type": "application/x-www-form-urlencoded", "Content-Length": Automatic, "Host: FromURL, "User-Agent": "arduino-fetch", "Cookie": "", "Accept": "* /*", "Connection": "close", "Transfer-Encoding": "chunked" },
+        body: "",
         redirect: "follow" || "manual", "error",
         follow: Integer,
 
     }
 */
 
-options["method"] = "POST";
-options["headers"]["Content-Type"] = "application/json";
-options["body"]["email"] = email;
-options["body"]["password"] = password;
+ResponseOptions options;
+options.method = "POST";
+options.body = "email=EMAIL&password=PASSWORD";
 ```
-## Request Body
 
+<!-- ```cpp
+ResponseOptions options;
+options["method"] = "POST";
+options["body"] = "email=EMAIL&password=PASSWORD";
+``` -->
+
+## Request Body
+<!-- 
 ```cpp
 MultipartFormBody body;
 URLEncodedBody body;
 JSONBody body;
 
 body["email"] = email;
 body["password"] = password;
+``` -->
+```cpp
+String body;
+// application/x-www-form-urlencoded
+body = "email=EMAIL&password=PASSWORD";
+// application/json
+body = "{\"email\":\"EMAIL\", \"password\"=\"PASSWORD\"}";
 ```
-
 ## Request Headers
 
-```cpp
+<!-- ```cpp
 Headers headers;
 
 headers["Content-Type"] = "application/json";
-```
+``` -->
+```cpp
+Headers headers;
 
+headers.contentType = "application/json";
+headers.connection = "keep-alive";
+headers.cookie = "abc=def,ghi=jkl";
+```
 # Response
 
 ```cpp
 Response response;
 
-JSONBody data = response.json();
-const char* data = response.text();
-const Blob = response.blob();
-const FormData = response.formData();
-unsigned int[] array = response.arrayBuffer();
+String data = response.text();
+JSONBody data = response.json(); // Not yet supported.
+const Blob = response.blob(); // Not yet supported.
+const FormData = response.formData(); // Not yet supported.
+unsigned int[] array = response.arrayBuffer(); // Not yet supported.
 
 bool ok = response.ok;
 int status = response.status;

examples/post/post.ino

@@ -16,8 +16,10 @@ void setup() {
     options.fingerprint = FINGERPRINT;
 
     Response response = fetch("https://api.grandeur.tech/auth/login/?apiKey=grandeurkywxmoy914080rxf9dh05n7e", options);
-
-    Serial.println(response.text());
+    
+    Serial.println(response);
+    Serial.printf("Connection Header: \"%s\"\n", response.headers.get("Content-Type").c_str());
+    Serial.printf("Connection Header: \"%s\"\n", response.headers.get("Connection").c_str());
 }
 
 void loop() {

src/ArduinoFetch.cpp

@@ -13,7 +13,7 @@ Response fetch(const char* url, RequestOptions options) {
 
     // Set fingerprint if https.
     if(parsedUrl.scheme == "https") {
-        if(options.fingerprint == "\0") Serial.println("[Error] Provide fingerprint for HTTPS.");
+        if(options.fingerprint == "") Serial.println("[Error] Provide fingerprint for HTTPS.");
         else client.setFingerprint(options.fingerprint.c_str());
     }
 
@@ -39,30 +39,45 @@ Response fetch(const char* url, RequestOptions options) {
     client.print(request);
 
     // Getting response headers.
-    String headers = "";
-    while(client.connected()) {
+    Response response;
+    for(int nLine = 1; client.connected(); nLine++) {
+        // Reading headers line by line.
         String line = client.readStringUntil('\n');
-        headers += line;
+        // Parse status and statusText from line 1.
+        if(nLine == 1) {
+            response.status = line.substring(line.indexOf(" ")).substring(0, line.indexOf(" ")).toInt();
+            response.statusText = line.substring(line.indexOf(String(response.status)) + 4);
+            response.statusText.trim();
+            continue;
+        }
+
+        response.headers.text += line + "\n";
+        // If headers end, move on.
         if(line == "\r") break;
     }
 
     // Serial.println("-----HEADERS START-----");
-    // Serial.println(headers);
+    // Serial.println(response.headers.text);
     // Serial.println("-----HEADERS END-----");
 
     // Getting response body.
-    String body = "";
     while(client.available()) {
-        body += client.readStringUntil('\n');
-        body += "\n";
+        response.body += client.readStringUntil('\n');
     }
 
-    return Response(body);
+    return response;
 }
 
 Headers::Headers(): contentType("application/x-www-form-urlencoded"),
-    contentLength(-1), userAgent("arduino-fetch"), cookie("\0"),
-    accept("*/*"), connection("close"), transferEncoding("\0") {}
+    contentLength(-1), userAgent("arduino-fetch"), cookie(""),
+    accept("*/*"), connection("close"), transferEncoding("") {}
+
+ResponseHeaders::ResponseHeaders(): text("") {}
+
+String ResponseHeaders::get(String headerName) {
+    String tillEnd = this->text.substring(this->text.lastIndexOf(headerName + ": "));
+    return tillEnd.substring(tillEnd.indexOf(" ") + 1, tillEnd.indexOf("\n") - 1);
+}
 
 Body::Body(): _text("") {}
 
@@ -85,11 +100,27 @@ String operator+(String str, Body body) {
 // ArduinoFetch::ArduinoFetch(const char* url, RequestOptions options) :
 //     _url(url), _options(options) {}
 
-Response::Response(String body): _text(body) {}
+Response::Response(): ok(false), status(200), statusText("OK"),
+    redirected(false), type(""), headers(ResponseHeaders()), body("") {}
 
 String Response::text() {
-    return this->_text;
+    return this->body;
+}
+
+size_t Response::printTo(Print& p) const {
+    size_t r = 0;
+
+    r += p.printf(
+        (String("{") +
+            "\n\t\"ok\": %d" +
+            "\n\t\"status\": %d" +
+            "\n\t\"statusText\": \"%s\"" +
+            "\n\t\"body\": \"%s\"" +
+        "\n}").c_str(),
+        ok, status, statusText.c_str(), body.c_str());
+
+    return r;
 }
 
-RequestOptions::RequestOptions(): method("GET"), headers(Headers()), body(Body()), fingerprint("\0") {}
+RequestOptions::RequestOptions(): method("GET"), headers(Headers()), body(Body()), fingerprint("") {}
 

src/ArduinoFetch.h

@@ -48,13 +48,30 @@ String operator+(String str, Body body);
 //         Request();
 // };
 
-class Response {
+class ResponseHeaders {
     private:
-    String _text;
     public:
-    Response();
-    Response(String body);
-    String text();
+        String text;
+
+        ResponseHeaders();
+        String get(String headerName);
+};
+
+class Response: public Printable {
+    private:
+    public:
+        bool ok;
+        int status;
+        String statusText;
+        bool redirected;
+        String type;
+        ResponseHeaders headers;
+        String body;
+
+        Response();
+        String text();
+
+        size_t printTo(Print& p) const;
 };
 
 class RequestOptions {