New Firebase Fingerprint

.travis.yml

@@ -8,26 +8,27 @@ addons:
     packages:
     - g++-4.8
 env:
-- ARDUINO_VERSION=1.6.9 ARDUINO_ESP8266_VERSION=2.3.0 LIB_NEOPIXEL_VERSION=v1.0.5 LIB_GFX_VERSION=v1.1.5 LIB_SSD1306_VERSION=1.1.0 ARDUINO_ROOT=${HOME}/arduino-${ARDUINO_VERSION} ARDUINO_ESP8266_ROOT=${ARDUINO_ROOT}/hardware/esp8266com/esp8266 ARDUINO_HOME=${HOME}/Arduino
-- ARDUINO_VERSION=nightly ARDUINO_ESP8266_VERSION=master LIB_NEOPIXEL_VERSION=master LIB_GFX_VERSION=master LIB_SSD1306_VERSION=master ARDUINO_ROOT=${HOME}/arduino-${ARDUINO_VERSION} ARDUINO_ESP8266_ROOT=${ARDUINO_ROOT}/hardware/esp8266com/esp8266 ARDUINO_HOME=${HOME}/Arduino
+- ARDUINO_VERSION=1.6.9 ARDUINO_ESP8266_VERSION=2.3.0 LIB_NEOPIXEL_VERSION=v1.0.5 LIB_GFX_VERSION=v1.1.5 LIB_SSD1306_VERSION=1.1.0 LIB_JSON_VERSION=v5.11.2 ARDUINO_ROOT=${HOME}/arduino-${ARDUINO_VERSION} ARDUINO_ESP8266_ROOT=${ARDUINO_ROOT}/hardware/esp8266com/esp8266 ARDUINO_HOME=${HOME}/Arduino
+- ARDUINO_VERSION=nightly ARDUINO_ESP8266_VERSION=master LIB_NEOPIXEL_VERSION=master LIB_GFX_VERSION=master LIB_SSD1306_VERSION=master LIB_JSON_VERSION=master ARDUINO_ROOT=${HOME}/arduino-${ARDUINO_VERSION} ARDUINO_ESP8266_ROOT=${ARDUINO_ROOT}/hardware/esp8266com/esp8266 ARDUINO_HOME=${HOME}/Arduino
 install:
 - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
 - ( cd ${HOME} && wget https://downloads.arduino.cc/arduino-${ARDUINO_VERSION}-linux64.tar.xz && tar xf arduino-${ARDUINO_VERSION}-linux64.tar.xz )
 - ( LIB=SoftwareSerial VERSION=097712eb07f5b3a70ef419b6e7a7ed2ada5aab85 && cd ${HOME} && wget https://github.com/plerup/espsoftwareserial/archive/${VERSION}.zip -q -O ${LIB}.zip && unzip -q ${LIB}.zip && rm ${LIB}.zip && mv espsoftwareserial-* ${LIB} )
 - ( LIB=Adafruit_NeoPixel VERSION=${LIB_NEOPIXEL_VERSION} && cd ${HOME} && wget https://github.com/adafruit/${LIB}/archive/${VERSION}.zip -q -O ${LIB}.zip && unzip -q ${LIB}.zip && rm ${LIB}.zip && mv ${LIB}-* ${LIB} )
 - ( LIB=Adafruit-GFX-Library VERSION=${LIB_GFX_VERSION} && cd ${HOME} && wget https://github.com/adafruit/${LIB}/archive/${VERSION}.zip -q -O ${LIB}.zip && unzip -q ${LIB}.zip && rm ${LIB}.zip && mv ${LIB}-* ${LIB} )
 - ( LIB=Adafruit_SSD1306 VERSION=${LIB_SSD1306_VERSION} && cd ${HOME} && wget https://github.com/adafruit/${LIB}/archive/${VERSION}.zip -q -O ${LIB}.zip && unzip -q ${LIB}.zip && rm ${LIB}.zip && mv ${LIB}-* ${LIB} )
+- ( LIB=ArduinoJson VERSION=${LIB_JSON_VERSION} && cd ${HOME} && wget https://github.com/bblanchon/${LIB}/archive/${VERSION}.zip -q -O ${LIB}.zip && unzip -q ${LIB}.zip && rm ${LIB}.zip && mv ${LIB}-* ${LIB} )
 - git clone --branch ${ARDUINO_ESP8266_VERSION} https://github.com/esp8266/Arduino.git ${ARDUINO_ESP8266_ROOT}
 - git submodule init && git submodule update
 - ( cd ${ARDUINO_ESP8266_ROOT}/tools && python get.py )
 before_script:
 - mkdir -p ${ARDUINO_HOME}/libraries
-- ( cd ${ARDUINO_HOME}/libraries && ln -s ${TRAVIS_BUILD_DIR} firebase-arduino && ln -s ${TRAVIS_BUILD_DIR}/src/third-party/arduino-json-5.6.7 ArduinoJson && ln -s ${HOME}/SoftwareSerial ./ && ln -s ${HOME}/Adafruit_NeoPixel ./ && ln -s ${HOME}/Adafruit-GFX-Library ./ && ln -s ${HOME}/Adafruit_SSD1306 ./)
+- ( cd ${ARDUINO_HOME}/libraries && ln -s ${TRAVIS_BUILD_DIR} firebase-arduino && ln -s ${HOME}/SoftwareSerial ./ && ln -s ${HOME}/Adafruit_NeoPixel ./ && ln -s ${HOME}/Adafruit-GFX-Library ./ && ln -s ${HOME}/Adafruit_SSD1306 ./ && ln -s ${HOME}/ArduinoJson ./)
 script:
-- ${ARDUINO_ROOT}/arduino-builder -verbose  -hardware ${ARDUINO_ROOT}/hardware/ -tools ${ARDUINO_ESP8266_ROOT}/tools/ -tools ${ARDUINO_ROOT}/tools-builder/ -fqbn esp8266com:esp8266:nodemcuv2 -libraries ${ARDUINO_HOME}/libraries/ -prefs build.flash_ld=${ARDUINO_ESP8266_ROOT}/tools/sdk/ld/eagle.flash.4m.ld -prefs build.flash_freq=40 -prefs build.flash_size=4M examples/FirebaseDemo_ESP8266/FirebaseDemo_ESP8266.ino
-- ${ARDUINO_ROOT}/arduino-builder -verbose  -hardware ${ARDUINO_ROOT}/hardware/ -tools ${ARDUINO_ESP8266_ROOT}/tools/ -tools ${ARDUINO_ROOT}/tools-builder/ -fqbn esp8266com:esp8266:nodemcuv2 -libraries ${ARDUINO_HOME}/libraries/ -prefs build.flash_ld=${ARDUINO_ESP8266_ROOT}/tools/sdk/ld/eagle.flash.4m.ld -prefs build.flash_freq=40 -prefs build.flash_size=4M examples/FirebaseNeoPixel_ESP8266/FirebaseNeoPixel_ESP8266.ino
-- ${ARDUINO_ROOT}/arduino-builder -verbose  -hardware ${ARDUINO_ROOT}/hardware/ -tools ${ARDUINO_ESP8266_ROOT}/tools/ -tools ${ARDUINO_ROOT}/tools-builder/ -fqbn esp8266com:esp8266:nodemcuv2 -libraries ${ARDUINO_HOME}/libraries/ -prefs build.flash_ld=${ARDUINO_ESP8266_ROOT}/tools/sdk/ld/eagle.flash.4m.ld -prefs build.flash_freq=40 -prefs build.flash_size=4M examples/FirebaseStream_ESP8266/FirebaseStream_ESP8266.ino
-- ${ARDUINO_ROOT}/arduino-builder -verbose  -hardware ${ARDUINO_ROOT}/hardware/ -tools ${ARDUINO_ESP8266_ROOT}/tools/ -tools ${ARDUINO_ROOT}/tools-builder/ -fqbn esp8266com:esp8266:nodemcuv2 -libraries ${ARDUINO_HOME}/libraries/ -prefs build.flash_ld=${ARDUINO_ESP8266_ROOT}/tools/sdk/ld/eagle.flash.4m.ld -prefs build.flash_freq=40 -prefs build.flash_size=4M examples/FirebaseRoom_ESP8266/FirebaseRoom_ESP8266.ino
+- ${ARDUINO_ROOT}/arduino-builder -verbose  -hardware ${ARDUINO_ROOT}/hardware/ -tools ${ARDUINO_ESP8266_ROOT}/tools/ -tools ${ARDUINO_ROOT}/tools-builder/ -fqbn esp8266com:esp8266:nodemcuv2 -libraries ${ARDUINO_HOME}/libraries/ -prefs build.flash_ld=${ARDUINO_ESP8266_ROOT}/tools/sdk/ld/eagle.flash.4m.ld -prefs build.flash_freq=40 -prefs build.flash_size=4M -prefs build.f_cpu=80000000 examples/FirebaseDemo_ESP8266/FirebaseDemo_ESP8266.ino
+- ${ARDUINO_ROOT}/arduino-builder -verbose  -hardware ${ARDUINO_ROOT}/hardware/ -tools ${ARDUINO_ESP8266_ROOT}/tools/ -tools ${ARDUINO_ROOT}/tools-builder/ -fqbn esp8266com:esp8266:nodemcuv2 -libraries ${ARDUINO_HOME}/libraries/ -prefs build.flash_ld=${ARDUINO_ESP8266_ROOT}/tools/sdk/ld/eagle.flash.4m.ld -prefs build.flash_freq=40 -prefs build.flash_size=4M -prefs build.f_cpu=80000000 examples/FirebaseNeoPixel_ESP8266/FirebaseNeoPixel_ESP8266.ino
+- ${ARDUINO_ROOT}/arduino-builder -verbose  -hardware ${ARDUINO_ROOT}/hardware/ -tools ${ARDUINO_ESP8266_ROOT}/tools/ -tools ${ARDUINO_ROOT}/tools-builder/ -fqbn esp8266com:esp8266:nodemcuv2 -libraries ${ARDUINO_HOME}/libraries/ -prefs build.flash_ld=${ARDUINO_ESP8266_ROOT}/tools/sdk/ld/eagle.flash.4m.ld -prefs build.flash_freq=40 -prefs build.flash_size=4M -prefs build.f_cpu=80000000 examples/FirebaseStream_ESP8266/FirebaseStream_ESP8266.ino
+- ${ARDUINO_ROOT}/arduino-builder -verbose  -hardware ${ARDUINO_ROOT}/hardware/ -tools ${ARDUINO_ESP8266_ROOT}/tools/ -tools ${ARDUINO_ROOT}/tools-builder/ -fqbn esp8266com:esp8266:nodemcuv2 -libraries ${ARDUINO_HOME}/libraries/ -prefs build.flash_ld=${ARDUINO_ESP8266_ROOT}/tools/sdk/ld/eagle.flash.4m.ld -prefs build.flash_freq=40 -prefs build.flash_size=4M -prefs build.f_cpu=80000000 examples/FirebaseRoom_ESP8266/FirebaseRoom_ESP8266.ino
 - ( cd contrib/test && make check )
 - ( cd contrib/test/modem/ && make test )
 - contrib/test/travis/check_all_examples_use_standard_init.sh

README.md

@@ -6,7 +6,15 @@
 
 This repo contains a collection of samples and an Arduino library that show how to call the [Firebase](https://www.firebase.com/) API from the [ESP8266 Arduino core](https://github.com/esp8266/Arduino).
 
-The Arduino library is [under heavy development](https://github.com/googlesamples/firebase-arduino/issues), **experimental**, **unversioned** and its API is **not stable**.
+
+## Status
+
+![Status: Frozen](https://img.shields.io/badge/Status-Frozen-yellow)
+
+This repository is no longer under active development. No new features will be added and issues are not actively triaged. Pull Requests which fix bugs are welcome and will be reviewed on a best-effort basis.
+
+If you maintain a fork of this repository that you believe is healthier than the official version, we may consider recommending your fork. Please open a Pull Request if you believe that is the case.
+
 
 ## Samples
 
@@ -19,6 +27,11 @@ The Arduino library is [under heavy development](https://github.com/googlesample
 
 - [FirebaseArduino API Reference](http://firebase-arduino.readthedocs.io/)
 
+## Dependencies
+- FirebaseArduino now depends on [ArduinoJson library](https://github.com/bblanchon/ArduinoJson) instead of containing it's own version of it. Please either use Library Manager or download specific version of the library from github. We recommend that ArduinoJson is at least version [5.13.1](https://github.com/bblanchon/ArduinoJson/tree/v5.13.1)
+
+- ESP8266 Core SDK. We recommend using officially tagged releases and it should be at least [2.4.1](https://github.com/esp8266/Arduino/tree/2.4.1)
+
 ## Disclaimer
 
 *This is not an official Google product*.

README.rst

@@ -2,7 +2,10 @@ FirebaseArduino is a library to simplify connecting to the Firebase database fro
 arduino clients.
 
 It is a full abstraction of Firebase's REST API exposed through C++ calls in a wiring
-friendly way. All Json parsing is handled by the library and you may deal in pure C/Arduino
-types.
+friendly way.
+
+ArduinoJson is no longer part of this library and you will have to install latest version
+in Arduino environment yourself. (through Board manager or download+unpack from master:
+https://github.com/bblanchon/ArduinoJson)
 
 ----------------------------------

contrib/src/modem/command.h

@@ -1,7 +1,7 @@
 #ifndef MODEM_COMMAND_H
 #define MODEM_COMMAND_H
 
-#include "Firebase.h"
+#include "FirebaseArduino.h"
 #include "modem/output-stream.h"
 #include "modem/input-stream.h"
 
@@ -10,19 +10,19 @@ namespace modem {
 
 class Command {
  public:
-  Command(Firebase* fbase) : fbase_(fbase) {}
+  Command(FirebaseArduino* fbase) : fbase_(fbase) {}
 
   // Execute command, reading any additional data needed from stream.
   // Return false if execution failed.
   virtual bool execute(const String& command,
                        InputStream* in, OutputStream* out) = 0;
  protected:
-  Firebase& fbase() {
+  FirebaseArduino& fbase() {
     return *fbase_;
   }
 
  private:
-  Firebase* fbase_;
+  FirebaseArduino* fbase_;
 };
 
 }  // modem

contrib/src/modem/db/DatabaseProtocol.cpp

@@ -42,7 +42,7 @@ void DatabaseProtocol::Execute(const String& command_name, InputStream* in,
 }
 
 std::unique_ptr<Command> DatabaseProtocol::CreateCommand(const String& text,
-                                                         Firebase* fbase) {
+                                                         FirebaseArduino* fbase) {
   std::unique_ptr<Command> command;
   if (text == "GET") {
     command.reset(new GetCommand(fbase));

contrib/src/modem/db/DatabaseProtocol.h

@@ -13,9 +13,9 @@ class DatabaseProtocol : public SerialProtocol {
   const std::vector<String>& commands() const override;
   void Execute(const String& command, InputStream* in, OutputStream* out) override;
  private:
-  std::unique_ptr<Command> CreateCommand(const String& text, Firebase* fbase);
+  std::unique_ptr<Command> CreateCommand(const String& text, FirebaseArduino* fbase);
 
-  std::unique_ptr<Firebase> fbase_;
+  std::unique_ptr<FirebaseArduino> fbase_;
 };
 
 

contrib/src/modem/db/begin-command.cpp

@@ -33,13 +33,14 @@ bool BeginCommand::execute(const String& command,
     return false;
   }
 
-  new_firebase_.reset(new Firebase(host.c_str(), auth.c_str()));
+  new_firebase_.reset(new FirebaseArduino());
+  new_firebase_.get()->begin(host.c_str(), auth.c_str());
 
   out->println("+OK");
   return true;
 }
 
-std::unique_ptr<Firebase> BeginCommand::firebase() {
+std::unique_ptr<FirebaseArduino> BeginCommand::firebase() {
   return std::move(new_firebase_);
 }
 

contrib/src/modem/db/commands.h

@@ -1,7 +1,7 @@
 #ifndef MODEM_DB_COMMANDS_H
 #define MODEM_DB_COMMANDS_H
 
-#include "Firebase.h"
+#include "FirebaseArduino.h"
 #include "modem/command.h"
 #include "modem/output-stream.h"
 #include "modem/input-stream.h"
@@ -11,28 +11,28 @@ namespace modem {
 
 class GetCommand : public Command {
  public:
-  GetCommand(Firebase* fbase) : Command(fbase) {}
+  GetCommand(FirebaseArduino* fbase) : Command(fbase) {}
 
   bool execute(const String& command, InputStream* in, OutputStream* out);
 };
 
 class SetCommand : public Command {
  public:
-  SetCommand(Firebase* fbase) : Command(fbase) {}
+  SetCommand(FirebaseArduino* fbase) : Command(fbase) {}
 
   bool execute(const String& command, InputStream* in, OutputStream* out);
 };
 
 class RemoveCommand : public Command {
  public:
-  RemoveCommand(Firebase* fbase) : Command(fbase) {}
+  RemoveCommand(FirebaseArduino* fbase) : Command(fbase) {}
 
   bool execute(const String& command, InputStream* in, OutputStream* out);
 };
 
 class PushCommand : public Command {
  public:
-  PushCommand(Firebase* fbase) : Command(fbase) {}
+  PushCommand(FirebaseArduino* fbase) : Command(fbase) {}
 
   bool execute(const String& command, InputStream* in, OutputStream* out);
 };
@@ -44,15 +44,15 @@ class BeginCommand : public Command {
   bool execute(const String& command, InputStream* in, OutputStream* out);
 
   // This can only be called once.
-  std::unique_ptr<Firebase> firebase();
+  std::unique_ptr<FirebaseArduino> firebase();
 
  private:
-  std::unique_ptr<Firebase> new_firebase_;
+  std::unique_ptr<FirebaseArduino> new_firebase_;
 };
 
 class StreamCommand : public Command {
  public:
-  StreamCommand(Firebase* fbase) : Command(fbase) {}
+  StreamCommand(FirebaseArduino* fbase) : Command(fbase) {}
 
   bool execute(const String& command, InputStream* in, OutputStream* out);
 };

contrib/src/modem/db/get-command.cpp

@@ -13,16 +13,14 @@ bool GetCommand::execute(const String& command,
     return false;
   }
 
-  std::string path = in->readLine().c_str();
-  std::unique_ptr<FirebaseGet> get(fbase().getPtr(path));
-
-  if (get->error()) {
+  String path = in->readLine();
+  String value = fbase().getString(path);
+  if (fbase().error().length() != 0) {
     out->print("-FAIL ");
-    out->println(get->error().message().c_str());
+    out->println(fbase().error().c_str());
     return false;
   }
 
-  String value(get->response().c_str());
   // TODO implement json parsing to pull and process value.
   out->print("+");
   out->println(value);

contrib/src/modem/db/push-command.cpp

@@ -14,15 +14,14 @@ bool PushCommand::execute(const String& command,
     return false;
   }
 
-  std::string path(in->readStringUntil(' ').c_str());
-  std::string data(in->readLine().c_str());
+  String path =  in->readStringUntil(' ');
+  String data = in->readLine();
 
-  std::unique_ptr<FirebasePush> push(
-      fbase().pushPtr(path, EncodeForJson(data)));
+  fbase().pushString(path, data);
 
-  if (push->error()) {
+  if (fbase().error().length() != 0) {
     out->print("-FAIL ");
-    out->println(push->error().message().c_str());
+    out->println(fbase().error().c_str());
     return false;
   } else {
     out->println("+OK");

contrib/src/modem/db/remove-command.cpp

@@ -14,11 +14,11 @@ bool RemoveCommand::execute(const String& command,
   }
 
   String path = in->readLine();
-  std::unique_ptr<FirebaseRemove> get(fbase().removePtr(path.c_str()));
+  fbase().remove(path);
 
-  if (get->error()) {
+  if (fbase().error().length() != 0) {
     out->print("-FAIL ");
-    out->println(get->error().message().c_str());
+    out->println(fbase().error().c_str());
     return false;
   }
 

contrib/src/modem/db/set-command.cpp

@@ -14,15 +14,14 @@ bool SetCommand::execute(const String& command,
     return false;
   }
 
-  std::string path(in->readStringUntil(' ').c_str());
-  std::string data(in->readLine().c_str());
+  String path = in->readStringUntil(' ');
+  String data = in->readLine();
 
-  std::unique_ptr<FirebaseSet> set(fbase().setPtr(path,
-                                                  EncodeForJson(data)));
+  fbase().setString(path, data);
 
-  if (set->error()) {
+  if (fbase().error().length() != 0) {
     out->print("-FAIL ");
-    out->println(set->error().message().c_str());
+    out->println(fbase().error().c_str());
     return false;
   } else {
     out->println("+OK");

contrib/src/modem/db/stream-command.cpp

@@ -13,27 +13,24 @@ bool StreamCommand::execute(const String& command,
     return false;
   }
 
-  std::string path = in->readLine().c_str();
-  std::unique_ptr<FirebaseStream> stream(fbase().streamPtr(path));
+  String path = in->readLine().c_str();
+  fbase().stream(path);  
 
-  if (stream->error()) {
+  if (fbase().error().length() != 0) {
     out->print("-FAIL ");
-    out->println(stream->error().message().c_str());
+    out->println(fbase().error().c_str());
     return false;
   }
-
   bool running = true;
   DynamicJsonBuffer buffer;
   while(running) {
-    if (stream->available()) {
-      std::string json;
-      FirebaseStream::Event event = stream->read(json);
+    if (fbase().available()) {
+      FirebaseObject event = fbase().readEvent();
       out->print("+");
-      out->print(FirebaseStream::EventToName(event).c_str());
+      out->print(event.getString("type").c_str());
       out->print(" ");
-      const auto& object = buffer.parseObject(json.c_str());
-      String data = object["data"];
-      out->println(object["path"].asString());
+      String data = event.getString("data");
+      out->println(event.getString("path"));
       out->println(data.length());
       out->println(data);
     } else if (in->available()) {

contrib/src/thing/Config.cpp

@@ -1,6 +1,6 @@
 #include "Arduino.h"
 #include "thing/Config.h"
-#include "third-party/arduino-json-5.6.7/include/ArduinoJson.h"
+#include <ArduinoJson.h>
 
 namespace thing {
 

contrib/src/thing/Config.h

@@ -4,7 +4,7 @@
 #include "Arduino.h"
 #include <string>
 #include <functional>
-#include "third-party/arduino-json-5.6.7/include/ArduinoJson.h"
+#include <ArduinoJson.h>
 
 namespace thing {
 

contrib/src/thing/Portal.cpp

@@ -1,5 +1,5 @@
 #include "thing/Portal.h"
-#include "third-party/arduino-json-5.6.7/include/ArduinoJson.h"
+#include <ArduinoJson.h>
 
 namespace thing {