Added support for atomic operations

Author: gilmaimon

keywords.txt

@@ -14,4 +14,10 @@ tryConnect	KEYWORD2
 setCredentials	KEYWORD2
 put	KEYWORD2
 get	KEYWORD2
-add	KEYWORD2
+add	KEYWORD2
+pop	KEYWORD2
+inc	KEYWORD2
+dec	KEYWORD2
+put_min	KEYWORD2
+put_max	KEYWORD2
+datetime	KEYWORD2

src/CloudStorage.h

@@ -127,6 +127,33 @@ class BaseCloudStorage {
       !root["result"]["empty"]
     );
   }
+
+  //Increment
+  cloud_storage_utils::ResultWrapper<int> inc(String key, int value = 1) {
+    return atomic<int>(key, "inc", value);
+  }
+
+  //Decrement
+  cloud_storage_utils::ResultWrapper<int> dec(String key, int value = 1) {
+    return atomic<int>(key, "dec", value);
+  }
+
+  //Replace an item if it is a new minimum
+  template <class Ty>
+  cloud_storage_utils::ResultWrapper<Ty> put_min(String key, Ty value) {
+    return atomic<Ty>(key, "min", value);
+  }
+  
+  //Replace an item if it is a new maximum
+  template <class Ty>
+  cloud_storage_utils::ResultWrapper<Ty> put_max(String key, Ty value) {
+    return atomic<Ty>(key, "max", value);
+  }
+
+  //Replace an item if it is a new maximum
+  cloud_storage_utils::ResultWrapper<String> datetime(String key) {
+    return atomic<String>(key, "date", "");
+  }
 
 private:
   String _username, _password;
@@ -197,6 +224,24 @@ class BaseCloudStorage {
     return jsonString;
   }
 
+  // Utility method for constructing generic *Atomic* request json string
+  template <class Ty>
+  String buildAtomicRequestJson(String key, String action, Ty value) {
+    // Compose request json object
+    StaticJsonBuffer<200> jsonBuffer;
+    JsonObject& root = jsonBuffer.createObject();
+    root["username"] = _username;
+    root["password"] = _password;
+    root["key"] = key;
+    root["action"] = action;
+    root["value"] = value;
+
+    // Return string form of the object
+    String jsonString;
+    root.printTo(jsonString);
+    return jsonString;
+  }
+
   // Method for accessing nested json objects with '.' seperated keys.
   // for examples "name.first.english" for accessing name:{.., first:{ english: "MyName", .... }}
   template <class Type>
@@ -211,7 +256,34 @@ class BaseCloudStorage {
 
     // traverse the parentKey object
     return getValueByKey<Type>(root[parentKey], remainder);
-  } 
+  }
+
+  //Generic Atomic Request
+  template <class Ty>
+  cloud_storage_utils::ResultWrapper<Ty> atomic(String key, String action, Ty value) {
+    // Build request json 
+    String jsonString = buildAtomicRequestJson<Ty>(key, action, value);
+    
+    // Construct http request
+    RequestType request(
+      _baseServerUrl + "/data/object/atomic", 
+      http::Method::GET, 
+      jsonString
+    );
+    request.addHeader("Content-Type", "application/json; charset=utf-8");
+    
+    //Execute request
+    http::Response response = request.execute();
+    if(response.statusCode != 200) return false;
+
+    // Parse response body and extract the wanted value
+    StaticJsonBuffer<300> jsonBuffer;
+    JsonObject& root = jsonBuffer.parseObject(response.body);
+    return cloud_storage_utils::ResultWrapper<Ty>(
+      !root["error"],
+      getValueByKey<Ty>(root["result"], key)
+    );
+  }
 };
 
 typedef BaseCloudStorage<http::GenericEspRequest> CloudStorage;

src/Http/EspClient.h

@@ -1,8 +1,19 @@
 #pragma once
 
 #include "Client.h"
-#include "GenericEspRequestImpl.h"
 
+#ifdef ARDUINO_ARCH_ESP32
+
+#include "GenericEspRequestImpl.h"
 namespace http {
     typedef Request<GenericEspRequestImpl> GenericEspRequest;
-};
+};
+
+#else
+
+#include "Esp8266RequestImpl.h"
+namespace http {
+    typedef Request<Esp8266RequestImpl> GenericEspRequest;
+};
+
+#endif

src/WifiConnection.h

@@ -1,7 +1,8 @@
 #pragma once
 
-#include <WiFi.h>
+#ifdef ARDUINO_ARCH_ESP32
 
+#include <WiFi.h>
 namespace WifiConnection {    
   // Sets wifi mode to STA and tries to connect to a network
   void tryConnect(String ssid, String pass) {
@@ -14,3 +15,25 @@ namespace WifiConnection {
     return WiFi.status() == WL_CONNECTED;
   }
 };
+
+#else
+
+#include <ESP8266WiFi.h>
+#include <ESP8266WiFiMulti.h>
+
+namespace WifiConnection {  
+  ESP8266WiFiMulti WiFiMulti;
+  
+  // Sets wifi mode to STA and tries to connect to a network
+  void tryConnect(String ssid, String pass) {
+    WiFi.mode(WIFI_STA);
+    WiFiMulti.addAP(ssid.c_str(), pass.c_str());
+  }
+  
+  // Method for checking if currently connected to wifi
+  boolean isConnected() {
+    return WiFiMulti.run() == WL_CONNECTED;
+  }
+};
+
+#endif