Merge my fork up to head.

Firebase.cpp

@@ -15,109 +15,169 @@
 //
 #include "Firebase.h"
 
-const char* firebaseFingerprint = "7A 54 06 9B DC 7A 25 B3 86 8D 66 53 48 2C 0B 96 42 C7 B3 0A";
-const uint16_t firebasePort = 443;
+// Detect whether stable version of HTTP library is installed instead of
+// master branch and patch in missing status and methods.
+#ifndef HTTP_CODE_TEMPORARY_REDIRECT
+#define HTTP_CODE_TEMPORARY_REDIRECT 307
+#define USE_ESP_ARDUINO_CORE_2_0_0
+#endif
 
-Firebase::Firebase(const String& host) : _host(host) {
-  _http.setReuse(true);
+namespace {
+const char* kFirebaseFingerprint = "7A 54 06 9B DC 7A 25 B3 86 8D 66 53 48 2C 0B 96 42 C7 B3 0A";
+const uint16_t kFirebasePort = 443;
+
+String makeFirebaseURL(const String& path, const String& auth) {
+  String url;
+  if (path[0] != '/') {
+    url = "/";
+  }
+  url += path + ".json";
+  if (auth.length() > 0) {
+    url += "?auth=" + auth;
+  }
+  return url;
+}
+
+}  // namespace
+
+Firebase::Firebase(const String& host) : host_(host) {
+  http_.setReuse(true);
 }
 
 Firebase& Firebase::auth(const String& auth) {
-  _auth = auth;
+  auth_ = auth;
   return *this;
 }
 
-String Firebase::get(const String& path) {
-  sendRequest("GET", path);
-  return readBody();
+FirebaseGet Firebase::get(const String& path) {
+  return FirebaseGet(host_, auth_, path, &http_);
+}
+
+FirebaseSet Firebase::set(const String& path, const String& value) {
+  return FirebaseSet(host_, auth_, path, value, &http_);
 }
 
-String Firebase::push(const String& path, const String& value) {
-  sendRequest("POST", path, value);
-  return readBody();
+FirebasePush Firebase::push(const String& path, const String& value) {
+  return FirebasePush(host_, auth_, path, value, &http_);
 }
 
-void Firebase::remove(const String& path) {
-  sendRequest("DELETE", path);
+FirebaseRemove Firebase::remove(const String& path) {
+  return FirebaseRemove(host_, auth_, path, &http_);
 }
 
-Firebase& Firebase::stream(const String& path) {
-  _error.reset();
-  String url = makeURL(path); 
-  const char* headers[] = {"Location"};
-  _http.setReuse(true);  
-  _http.begin(_host.c_str(), firebasePort, url.c_str(), true, firebaseFingerprint);
-  _http.collectHeaders(headers, 1);
-  _http.addHeader("Accept", "text/event-stream");
-  int statusCode = _http.sendRequest("GET", (uint8_t*)NULL, 0);
-  String location;
-  // TODO(proppy): Add a max redirect check
-  while (statusCode == 307) {
-    location = _http.header("Location");
-    _http.setReuse(false);
-    _http.end();
-    _http.setReuse(true);    
-    _http.begin(location, firebaseFingerprint);
-    statusCode = _http.sendRequest("GET", (uint8_t*)NULL, 0);
+FirebaseStream Firebase::stream(const String& path) {
+  // TODO: create new client dedicated to stream.
+  return FirebaseStream(host_, auth_, path, &http_);
+}
+
+// FirebaseCall
+FirebaseCall::FirebaseCall(const String& host, const String& auth,
+                           const char* method, const String& path,
+                           const String& data, HTTPClient* http) : http_(http) {
+  String url = makeFirebaseURL(path, auth);
+  http_->setReuse(true);
+  http_->begin(host, kFirebasePort, url, true, kFirebaseFingerprint);
+
+  bool followRedirect = false;
+  if (method == "STREAM") {
+    method = "GET";
+    http_->addHeader("Accept", "text/event-stream");
+    followRedirect = true;
   }
-  if (statusCode != 200) {
-    _error.set(statusCode,
-	       "stream " + location + ": "
-	       + HTTPClient::errorToString(statusCode));
+
+  if (followRedirect) {
+    const char* headers[] = {"Location"};
+    http_->collectHeaders(headers, 1);
   }
-  return *this;
-}
 
-String Firebase::makeURL(const String& path) {
-  String url;
-  if (path[0] != '/') {
-    url = "/";
+  int status = http_->sendRequest(method, (uint8_t*)data.c_str(), data.length());
+
+  // TODO: Add a max redirect check
+  if (followRedirect) {
+    while (status == HTTP_CODE_TEMPORARY_REDIRECT) {
+      String location = http_->header("Location");
+      http_->setReuse(false);
+      http_->end();
+      http_->setReuse(true);
+      http_->begin(location, kFirebaseFingerprint);
+      status = http_->sendRequest("GET", (uint8_t*)NULL, 0);
+    }
   }
-  url += path + ".json";
-  if (_auth.length() > 0) {
-    url += "?auth=" + _auth;
+
+  if (status != 200) {
+#ifdef USE_ESP_ARDUINO_CORE_2_0_0
+    error_ = FirebaseError(status, String(method) + " " + url + ": " + status);
+#else
+    error_ = FirebaseError(status, String(method) + " " + url + ": " + HTTPClient::errorToString(status));
+#endif
+  }
+
+  // if not streaming.
+  if (!followRedirect) {
+    response_ = http_->getString();
   }
-  return url;
 }
 
-void Firebase::sendRequest(const char* method, const String& path, const String& value) {
-  String url = makeURL(path);
-  _http.begin(_host.c_str(), firebasePort, url.c_str(), true, firebaseFingerprint);
-  int statusCode =  _http.sendRequest(method, (uint8_t*)value.c_str(), value.length());
-  _error.reset();
-  if (statusCode < 0) {
-    _error.set(statusCode,
-               String(method) + " " + url + ": "
-               + HTTPClient::errorToString(statusCode));
-  }  
+// FirebaseGet
+FirebaseGet::FirebaseGet(const String& host, const String& auth,
+                         const String& path,
+                         HTTPClient* http)
+  : FirebaseCall(host, auth, "GET", path, "", http) {
+  if (!error()) {
+    // TODO: parse json
+    json_ = response();
+  }
 }
 
-String Firebase::readBody() {
-  if (_error.code() != 0) {
-    return "";
+// FirebaseSet
+FirebaseSet::FirebaseSet(const String& host, const String& auth,
+       const String& path, const String& value,
+       HTTPClient* http)
+  : FirebaseCall(host, auth, "PUT", path, value, http) {
+  if (!error()) {
+    // TODO: parse json
+    json_ = response();
   }
-  // no _http.end() because of connection reuse.
-  return _http.getString();
+}
+// FirebasePush
+FirebasePush::FirebasePush(const String& host, const String& auth,
+                           const String& path, const String& value,
+                           HTTPClient* http)
+  : FirebaseCall(host, auth, "POST", path, value, http) {
+  if (!error()) {
+    // TODO: parse name
+    name_ = response();
+  }
+}
+
+// FirebasePush
+FirebaseRemove::FirebaseRemove(const String& host, const String& auth,
+                               const String& path,
+                               HTTPClient* http)
+  : FirebaseCall(host, auth, "DELETE", path, "", http) {
 }
 
-bool Firebase::connected() {
-  return _http.connected();
+// FirebaseStream
+FirebaseStream::FirebaseStream(const String& host, const String& auth,
+                               const String& path,
+                               HTTPClient* http)
+  : FirebaseCall(host, auth, "STREAM", path, "", http) {
 }
 
-bool Firebase::available() {
-  return _http.getStreamPtr()->available();
+bool FirebaseStream::available() {
+  return http_->getStreamPtr()->available();
 }
 
-Firebase::Event Firebase::read(String& event) {
-  auto client = _http.getStreamPtr();
-  Event type;;
+FirebaseStream::Event FirebaseStream::read(String& event) {
+  auto client = http_->getStreamPtr();
+  Event type;
   String typeStr = client->readStringUntil('\n').substring(7);
   if (typeStr == "put") {
-    type = Firebase::Event::PUT;
+    type = Event::PUT;
   } else if (typeStr == "patch") {
-    type = Firebase::Event::PATCH;
+    type = Event::PATCH;
   } else {
-    type = Firebase::Event::UNKNOWN;
+    type = Event::UNKNOWN;
   }
   event = client->readStringUntil('\n').substring(6);
   client->readStringUntil('\n'); // consume separator