Merge branch 'master' into master

Author: kotl

Diff for: src/Firebase.cpp

@@ -94,6 +94,15 @@ FirebaseCall::FirebaseCall(const std::string& host, const std::string& auth,
                            const char* method, const std::string& path,
                            const std::string& data, const std::shared_ptr<FirebaseHttpClient> http) : http_(http) {
   std::string path_with_auth = makeFirebaseURL(path, auth);
+  if ((method == "STREAM") && (path == http->getStreamingPath())){
+    // already streaming requested path.
+    return;
+  }
+  if (http_->isStreaming()) {
+    // closing streaming connection.
+    http_->setReuseConnection(false);
+    http_->end();
+  }
   http_->setReuseConnection(true);
   http_->begin(host, path_with_auth);
 
@@ -132,11 +141,14 @@ FirebaseCall::FirebaseCall(const std::string& host, const std::string& auth,
   // if not streaming.
   if (!followRedirect) {
     response_ = http_->getString();
+    http_->setStreaming("");
+  } else {
+    http_->setStreaming(path);
   }
 }
 
 FirebaseCall::~FirebaseCall() {
-  if (http_) {
+  if (http_ && !http_->isStreaming()) {
     http_->end();
   }
 }

Diff for: src/FirebaseArduino.h

@@ -189,9 +189,6 @@ class FirebaseArduino {
    * You should check success() after calling.
    * This changes the state of this object. Once this is called you may start
    * monitoring available() and calling readEvent() to get new events.
-   * WARNING: Currently you cannot make another call while the stream is
-   * running, otherwise you will crash due to memory issues. See:
-   * https://github.com/googlesamples/firebase-arduino/issues/48
    * \param path The path inside of your db to the node you wish to monitor.
    */
   void stream(const String& path);

Diff for: src/FirebaseHttpClient.h

@@ -33,7 +33,18 @@ class FirebaseHttpClient {
 
   virtual std::string errorToString(int error_code) = 0;
 
+  bool isStreaming() const {
+    return _streaming != "";
+  }
+  std::string getStreamingPath() const {
+    return _streaming;
+  }
+  void setStreaming(const std::string& path) {
+    _streaming = path;
+  }
  protected:
+  std::string _streaming = "";
+
   static const uint16_t kFirebasePort = 443;
 };
 

Diff for: src/FirebaseHttpClient_Esp8266.cpp

@@ -15,12 +15,32 @@
 #define USE_ESP_ARDUINO_CORE_2_0_0
 #endif
 
+// Firebase now returns `Connection: close` after REST streaming redirection.
+//
+// Override the built-in ESP8266HTTPClient to *not* close the
+// connection if forceReuse it set to `true`.
+class ForceReuseHTTPClient : public HTTPClient {
+public:
+  void end() {
+    if (_forceReuse) {
+      _canReuse = true;
+    }
+    HTTPClient::end();
+  }
+  void forceReuse(bool forceReuse) {
+    _forceReuse = forceReuse;
+  }
+protected:
+  bool _forceReuse = false;
+};
+
 class FirebaseHttpClientEsp8266 : public FirebaseHttpClient {
  public:
   FirebaseHttpClientEsp8266() {}
 
   void setReuseConnection(bool reuse) override {
     http_.setReuse(reuse);
+    http_.forceReuse(reuse);
   }
 
   void begin(const std::string& url) override {
@@ -64,7 +84,7 @@ class FirebaseHttpClientEsp8266 : public FirebaseHttpClient {
   }
 
  private:
-  HTTPClient http_;
+  ForceReuseHTTPClient http_;
 };
 
 FirebaseHttpClient* FirebaseHttpClient::create() {