Add new generic target and class handler

src/pushtarget.cpp

@@ -0,0 +1,132 @@
+/* Copyright (C) 2019-2020 Lee C. Bussy (@LBussy)
+
+This file is part of Lee Bussy's Brew Bubbbles (brew-bubbles).
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE. */
+
+#include "pushtarget.h"
+
+IPAddress resolveHost(PushTarget *target) {
+    LCBUrl lcburl;
+    lcburl.setUrl(String(target->url));
+    // Resolve hostname. This is necessary due to flakey name resolution
+    // and because WiFiClient::connect() does not use mDNS
+    IPAddress resolvedIP = INADDR_NONE;
+    if (!WiFi.hostByName(lcburl.getHost().c_str(), resolvedIP)) {
+        // Failed so set to the previous IP
+        resolvedIP = target->ip;
+    }
+    return resolvedIP;
+}
+
+bool pushTarget(PushTarget *target) {
+    LCBUrl lcburl;
+    lcburl.setUrl(String(target->url));
+
+    if (target->ip == INADDR_NONE) {
+        Log.error(F("Name resolution failed for %s." CR), lcburl.getHost().c_str());
+        return false;
+    }
+
+    Bubbles *bubble = Bubbles::getInstance();
+    JsonConfig *config = JsonConfig::getInstance();
+    const size_t capacity = JSON_OBJECT_SIZE(8) + 210;
+    StaticJsonDocument<capacity> doc;
+
+    if (target->apiName.enabled) doc[target->apiName.name] = F(API_KEY);
+    if (target->bubName.enabled) doc[target->bubName.name] = config->bubname;
+    if (target->bpm.enabled) doc[target->bpm.name] = bubble->getAvgBpm();
+    if (target->ambientTemp.enabled) doc[target->ambientTemp.name] = bubble->getAvgAmbient();
+    if (target->vesselTemp.enabled) doc[target->vesselTemp.name] = bubble->getAvgVessel();
+    if (target->tempFormat.enabled) {
+        if (config->tempinf == true) doc[target->tempFormat.name] = F("F");
+        else doc[target->tempFormat.name] = F("C");
+    }
+    String json;
+    serializeJson(doc, json);
+
+    // Post JSON to Server
+    //
+    // Use the IP address we resolved if we are connecting with mDNS
+    Log.verbose(F("Connecting to: %s, %l" CR), lcburl.getHost().c_str(), lcburl.getHost().c_str());
+    WiFiClient client;
+    client.setTimeout(10000);
+    int retval = client.connect(target->ip, lcburl.getPort());
+    //  1 = SUCCESS
+    //  0 = FAILED
+    // -1 = TIMED_OUT
+    // -2 = INVALID_SERVER
+    // -3 = TRUNCATED
+    // -4 = INVALID_RESPONSE 
+    if (!retval == 1) {
+        Log.warning(F("Connection failed, Host: %s, Port: %l (Err: %d)" CR),
+            lcburl.getHost().c_str(), lcburl.getHost().c_str(), retval
+        );
+        return false;
+    } else {
+        Log.notice(F("Connected to: %s at %s, %l" CR),
+            target->target.name, lcburl.getHost().c_str(), lcburl.getPort()
+        );
+
+        // Open POST connection
+        Log.verbose(F("POST /%s HTTP/1.1" CR), lcburl.getPath().c_str());
+        client.print(F("POST /"));
+        client.print(lcburl.getPath().c_str());
+        client.println(F(" HTTP/1.1"));
+
+        // Begin headers
+        //
+        // Host
+        Log.verbose(F("Host: %s" CR), lcburl.getHost().c_str());
+        client.print(F("Host: "));
+        client.println(lcburl.getHost().c_str());
+        //
+        Log.verbose(F("Connection: close" CR));
+        client.println(F("Connection: close"));
+        // Content
+        Log.verbose(F("Content-Length: %l" CR),json.length());
+        client.print(F("Content-Length: "));
+        client.println(json.length());
+        // Content Type
+        Log.verbose(F("Content-Type: application/json" CR)); 
+        client.println(F("Content-Type: application/json"));
+        // Terminate headers with a blank line
+        Log.verbose(F("End headers." CR));
+        client.println();
+        //
+        // End Headers
+
+        // Post Data
+        Log.verbose(F("Posting JSON to target." CR));
+        client.println(json);
+        // Check the HTTP status (should be "HTTP/1.1 200 OK")
+        char status[32] = {0};
+        // TODO: Need to check response body
+        client.readBytesUntil('\r', status, sizeof(status));
+        client.stop(); 
+        Log.verbose(F("Status: %s" CR), status);
+        if ((String(status).endsWith("200 OK"))) {
+            Log.verbose(F("JSON posted." CR));
+            return true;
+        } else {
+            Log.error(F("Unexpected status: %s" CR), status);
+            return false;
+        }
+    }
+}

src/pushtarget.h

@@ -0,0 +1,60 @@
+/* Copyright (C) 2019-2020 Lee C. Bussy (@LBussy)
+
+This file is part of Lee Bussy's Brew Bubbbles (brew-bubbles).
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE. */
+
+#ifndef _PUSHTARGET_H
+#define _PUSHTARGET_H
+
+#include "bubbles.h"
+#include "jsonconfig.h"
+#include <LCBUrl.h>
+// #include <ArduinoLog.h>
+#include <ArduinoJson.h>
+#include <ESP8266WiFi.h>
+// #include <Arduino.h>
+
+struct pushPoint {
+    bool enabled;   // Whether to send or not
+    char name[129]; // What to call the data point
+};
+
+class PushTarget {
+    private:
+
+    public:
+        PushTarget() {};
+        pushPoint target;       // Target enabled and name
+        pushPoint checkBody;    // Check return body for success
+        char url[129];               // URL of target
+        IPAddress ip;           // Resolved address of target
+        pushPoint apiName;      // i.e. "Brew Bubbles"
+        pushPoint bubName;      // mDNS name i.e. "brewbubbles"
+        pushPoint lastTime;     // Time of last send
+        pushPoint tempFormat;   // F or C
+        pushPoint ambientTemp;  // Room or chamber temp
+        pushPoint vesselTemp;   // Brew temp
+        pushPoint bpm;          // Bubbles per minute
+};
+
+IPAddress resolveHost(PushTarget*);
+bool pushTarget(PushTarget*);
+
+#endif // _PUSHTARGET_H