added logic to *type* output lines/strings in the system. Allows output *writers* to determine what actions to take with the data - deal with headers, deal with mime types ...etc

Author: gigapod

src/Flux/flxCoreInterface.h

@@ -44,6 +44,13 @@ class flxDataEditor
 };
 
 // Define an interface for output of log information.
+typedef enum
+{
+    flxLineTypeNone       = 0,
+    flxLineTypeData       = 1,
+    flxLineTypeHeader     = 2,
+    flxLineTypeMime       = 4
+} flxLineType_t;
 
 class flxWriter
 {
@@ -55,14 +62,18 @@ class flxWriter
     };
     virtual void write(int) = 0;
     virtual void write(float) = 0;
-    virtual void write(const char* value, bool newline)=0;
+    virtual void write(const char* value, bool newline, flxLineType_t type) = 0;
+    virtual void write(const char* value, bool newline)
+    {
+        write(value, newline, flxLineTypeData);
+    };
     virtual void write(std::string &value, bool newline)
     {
-      write(value.c_str(), newline);
+        write(value.c_str(), newline);
     }
     virtual void write(const char * value)
     {
-      write(value, true);
+        write(value, true);
     }
     virtual void write(std::string &value)
     {

src/Flux/flxIoTAWS.h

@@ -40,15 +40,16 @@ class flxIoTAWS : public flxMQTTESP32SecureCore<flxIoTAWS>, public flxWriter
     {
         // noop
     }
-    virtual void write(const char * value, bool newline)
+    virtual void write(const char * value, bool newline, flxLineType_t type)
     {
-    	if (!value)
+        // no data? Or is this a header line (not sure why it would be - we just want JSON)
+    	if (!value || type != flxLineTypeData)
     		return;
 
     	// Wrap the value with the structure required to update the device shadow
         char szBuffer[strlen(value) + sizeof(kAWSUpdateShadowTemplate)];
         snprintf(szBuffer, sizeof(szBuffer),  kAWSUpdateShadowTemplate, value);
-        flxMQTTESP32SecureCore::write(szBuffer, false);
+        flxMQTTESP32SecureCore::write(szBuffer, false, type);
     }
 
     bool initialize(void)

src/Flux/flxIoTAzure.h

@@ -83,12 +83,13 @@ class flxIoTAzure : public flxMQTTESP32SecureCore<flxIoTAzure>, public flxWriter
         // noop
     }
     //---------------------------------------------------------------------    
-    virtual void write(const char *value, bool newline)
+    virtual void write(const char *value, bool newline, flxLineType_t type)
     {
-        if (!value || !_connected)
+        // value? Connected? Data line?
+        if (!value || !_connected || type != flxLineTypeData)
             return;
 
-        flxMQTTESP32SecureCore::write(value, false);
+        flxMQTTESP32SecureCore::write(value, false, type);
     }
 
     //---------------------------------------------------------------------

src/Flux/flxIoTHTTP.h

@@ -244,10 +244,10 @@ template <class Object> class flxIoTHTTPBase : public flxActionType<Object>
 
     //----------------------------------------------------------------------------
     // flxWriter interface method
-    virtual void write(const char *value, bool newline)
+    virtual void write(const char *value, bool newline, flxLineType_t type)
     {
-        // if we are not connected, ignore
-        if (!_isEnabled || !_canConnect || !value || _url.length() < 10)
+        // if we are not connected, ignore, bad url skip, we want json, so no headers
+        if (!_isEnabled || !_canConnect || !value || _url.length() < 10 || type != flxLineTypeData)
             return;
 
         if (!_wifiClient)
@@ -341,10 +341,10 @@ class flxIoTHTTP : public flxIoTHTTPBase<flxIoTHTTP>, public flxWriter
         // noop
     }
     //---------------------------------------------------------------------    
-    virtual void write(const char *value, bool newline)
+    virtual void write(const char *value, bool newline, flxLineType_t type)
     {
 
-        flxIoTHTTPBase<flxIoTHTTP>::write(value, false);
+        flxIoTHTTPBase<flxIoTHTTP>::write(value, false, type);
     }
 };
 #endif

src/Flux/flxIoTMachineChat.h

@@ -80,7 +80,7 @@ class flxIoTMachineChat : public flxIoTHTTPBase<flxIoTMachineChat>, public flxIW
             serializeJson(jsonOutput, strOutput);
 
             // post to machine chat.
-            flxIoTHTTPBase<flxIoTMachineChat>::write(strOutput.c_str(), false);
+            flxIoTHTTPBase<flxIoTMachineChat>::write(strOutput.c_str(), false, flxLineTypeData);
         }
     }
 };

src/Flux/flxIoTThingSpeak.h

@@ -130,7 +130,7 @@ class flxIoTThingSpeak : public flxMQTTESP32SecureCore<flxIoTThingSpeak>, public
             // Topic is based on the channel...
 
             // send this payload to thingspeak
-            flxMQTTESP32SecureCore::write(buffer.c_str(), false);
+            flxMQTTESP32SecureCore::write(buffer.c_str(), false, flxLineTypeData);
         }
     }
 

src/Flux/flxMQTTESP32.h

@@ -195,12 +195,12 @@ template <class Object, typename CLIENT> class flxMQTTESP32Base : public flxActi
 
     //----------------------------------------------------------------------------
     // flxWriter interface method
-    virtual void write(const char *value, bool newline)
+    virtual void write(const char *value, bool newline, flxLineType_t type)
     {
 
         // Should we continue?
-        // enabled? Have a value to send?
-        if (!_isEnabled || !value)
+        // enabled? Have a value to send? We only deal with JSON - just the data 
+        if (!_isEnabled || !value || type != flxLineTypeData)
             return;
 
         // If we lost the connection to the broker, try to reconnect...
@@ -287,9 +287,9 @@ class flxMQTTESP32 : public flxMQTTESP32Base<flxMQTTESP32, WiFiClient>, public f
     {
         // noop
     }
-    void write(const char *value, bool newline)
+    void write(const char *value, bool newline, flxLineType_t type)
     {
-        flxMQTTESP32Base::write(value, newline);
+        flxMQTTESP32Base::write(value, newline, type);
     }
 };
 
@@ -591,9 +591,9 @@ class flxMQTTESP32Secure : public flxMQTTESP32SecureCore<flxMQTTESP32Secure>, pu
     {
         // noop
     }
-    void write(const char *value, bool newline)
+    void write(const char *value, bool newline, flxLineType_t type)
     {
-        flxMQTTESP32Base::write(value, newline);
+        flxMQTTESP32Base::write(value, newline, type);
     }
 };
 #endif

src/Flux/flxOutput.h

@@ -91,11 +91,11 @@ class flxOutputFormat
             _Writers.erase(iter);
     }
 
-    void outputObservation(const char *szBuffer)
+    void outputObservation(const char *szBuffer, flxLineType_t type = flxLineTypeData)
     {
 
         for (auto writer : _Writers)
-            writer->write(szBuffer);
+            writer->write(szBuffer, true, type);
     }
 
   private: