1616#include " Firebase.h"
1717
1818using std::unique_ptr;
19+ using std::shared_ptr;
1920
2021namespace {
2122std::string makeFirebaseURL (const std::string& path, const std::string& auth) {
@@ -42,55 +43,56 @@ const std::string& Firebase::auth() const {
4243}
4344
4445FirebaseGet Firebase::get (const std::string& path) {
45- return FirebaseGet (host_, auth_, path, http_. get () );
46+ return FirebaseGet (host_, auth_, path, http_);
4647}
4748
48- unique_ptr<FirebaseGet> Firebase::getPtr (const std::string& path) {
49- return unique_ptr<FirebaseGet>(new FirebaseGet (host_, auth_, path, http_. get () ));
49+ unique_ptr<FirebaseGet> Firebase::getPtr (const std::string& path) {
50+ return unique_ptr<FirebaseGet>(new FirebaseGet (host_, auth_, path, http_));
5051}
5152
5253FirebaseSet Firebase::set (const std::string& path, const std::string& value) {
53- return FirebaseSet (host_, auth_, path, value, http_. get () );
54+ return FirebaseSet (host_, auth_, path, value, http_);
5455}
5556
56- unique_ptr<FirebaseSet> Firebase::setPtr (const std::string& path,
57- const std::string& value) {
58- return unique_ptr<FirebaseSet>(
59- new FirebaseSet (host_, auth_, path, value, http_. get ()));
57+ unique_ptr<FirebaseSet> Firebase::setPtr (const std::string& path,
58+ const std::string& value) {
59+ return unique_ptr<FirebaseSet>(
60+ new FirebaseSet (host_, auth_, path, value, http_));
6061}
6162
6263FirebasePush Firebase::push (const std::string& path, const std::string& value) {
63- return FirebasePush (host_, auth_, path, value, http_. get () );
64+ return FirebasePush (host_, auth_, path, value, http_);
6465}
65- unique_ptr<FirebasePush> Firebase::pushPtr (const std::string& path, const std::string& value) {
66- return unique_ptr<FirebasePush>(
67- new FirebasePush (host_, auth_, path, value, http_.get ()));
66+
67+ unique_ptr<FirebasePush> Firebase::pushPtr (const std::string& path, const std::string& value) {
68+ return unique_ptr<FirebasePush>(
69+ new FirebasePush (host_, auth_, path, value, http_));
6870}
6971
7072FirebaseRemove Firebase::remove (const std::string& path) {
71- return FirebaseRemove (host_, auth_, path, http_. get () );
73+ return FirebaseRemove (host_, auth_, path, http_);
7274}
7375
74- unique_ptr<FirebaseRemove> Firebase::removePtr (const std::string& path) {
75- return unique_ptr<FirebaseRemove>(
76- new FirebaseRemove (host_, auth_, path, http_. get ()));
76+ unique_ptr<FirebaseRemove> Firebase::removePtr (const std::string& path) {
77+ return unique_ptr<FirebaseRemove>(
78+ new FirebaseRemove (host_, auth_, path, http_));
7779}
7880
7981FirebaseStream Firebase::stream (const std::string& path) {
8082 // TODO: create new client dedicated to stream.
81- return FirebaseStream (host_, auth_, path, http_. get () );
83+ return FirebaseStream (host_, auth_, path, http_);
8284}
8385
84- unique_ptr<FirebaseStream> Firebase::streamPtr (const std::string& path) {
85- // TODO: create new client dedicated to stream.
86- return unique_ptr<FirebaseStream>(
87- new FirebaseStream (host_, auth_, path, http_. get ()));
86+ unique_ptr<FirebaseStream> Firebase::streamPtr (const std::string& path) {
87+ // TODO: create new client dedicated to stream.
88+ return unique_ptr<FirebaseStream>(
89+ new FirebaseStream (host_, auth_, path, http_));
8890}
8991
9092// FirebaseCall
9193FirebaseCall::FirebaseCall (const std::string& host, const std::string& auth,
9294 const char * method, const std::string& path,
93- const std::string& data, FirebaseHttpClient* http) : http_(http) {
95+ const std::string& data, const std::shared_ptr< FirebaseHttpClient> http) : http_(http) {
9496 std::string path_with_auth = makeFirebaseURL (path, auth);
9597 if ((method == " STREAM" getStreamingPath ())){
9698 // already streaming requested path.
@@ -153,22 +155,24 @@ FirebaseCall::~FirebaseCall() {
153155
154156const JsonObject& FirebaseCall::json () {
155157 // TODO(edcoyne): This is not efficient, we should do something smarter with
156- // the buffers.
157- buffer_ = DynamicJsonBuffer ();
158- return buffer_.parseObject (response ().c_str ());
158+ // the buffers. kotl: Is this still valid?
159+ if (buffer_.get () == NULL ) {
160+ buffer_.reset (new StaticJsonBuffer<FIREBASE_JSONBUFFER_SIZE>());
161+ }
162+ return buffer_.get ()->parseObject (response ().c_str ());
159163}
160164
161165// FirebaseGet
162166FirebaseGet::FirebaseGet (const std::string& host, const std::string& auth,
163167 const std::string& path,
164- FirebaseHttpClient* http)
168+ const std::shared_ptr< FirebaseHttpClient> http)
165169 : FirebaseCall(host, auth, " GET" " "
166170}
167171
168172// FirebaseSet
169173FirebaseSet::FirebaseSet (const std::string& host, const std::string& auth,
170174 const std::string& path, const std::string& value,
171- FirebaseHttpClient* http)
175+ const std::shared_ptr< FirebaseHttpClient> http)
172176 : FirebaseCall(host, auth, " PUT"
173177 if (!error ()) {
174178 // TODO: parse json
@@ -179,7 +183,7 @@ FirebaseSet::FirebaseSet(const std::string& host, const std::string& auth,
179183// FirebasePush
180184FirebasePush::FirebasePush (const std::string& host, const std::string& auth,
181185 const std::string& path, const std::string& value,
182- FirebaseHttpClient* http)
186+ const std::shared_ptr< FirebaseHttpClient> http)
183187 : FirebaseCall(host, auth, " POST"
184188 if (!error ()) {
185189 name_ = json ()[" name" as <const char *>();
@@ -189,26 +193,27 @@ FirebasePush::FirebasePush(const std::string& host, const std::string& auth,
189193// FirebaseRemove
190194FirebaseRemove::FirebaseRemove (const std::string& host, const std::string& auth,
191195 const std::string& path,
192- FirebaseHttpClient* http)
196+ const std::shared_ptr< FirebaseHttpClient> http)
193197 : FirebaseCall(host, auth, " DELETE" " "
194198}
195199
196200// FirebaseStream
197201FirebaseStream::FirebaseStream (const std::string& host, const std::string& auth,
198202 const std::string& path,
199- FirebaseHttpClient* http)
203+ const std::shared_ptr< FirebaseHttpClient> http)
200204 : FirebaseCall(host, auth, " STREAM" " "
201205}
202206
203207bool FirebaseStream::available () {
204- if (http_->getStreamPtr () == nullptr ) {
205- return false ;
206- }
207- return http_->getStreamPtr ()->available ();
208+ auto client = http_->getStreamPtr ();
209+ return (client == nullptr ) ? false : client->available ();
208210}
209211
210212FirebaseStream::Event FirebaseStream::read (std::string& event) {
211213 auto client = http_->getStreamPtr ();
214+ if (client == nullptr ) {
215+ return Event ();
216+ }
212217 Event type;
213218 std::string typeStr = client->readStringUntil (' \n ' substring (7 ).c_str ();
214219 if (typeStr == " put"
0 commit comments