Support for URLStreamBufferedESP32 and ICYStreamBufferedESP32

Author: pschatzmann

src/AudioTools/CoreAudio/AudioHttp/AbstractURLStream.h

@@ -2,6 +2,7 @@
 
 #include "AudioTools/CoreAudio/BaseStream.h"
 #include "AudioTools/CoreAudio/AudioMetaData/AbstractMetaData.h"
+#include "AudioTools/CoreAudio/AudioMetaData/MetaDataICY.h"
 #include "HttpTypes.h"
 #include "HttpRequest.h"
 #include "Client.h"
@@ -45,6 +46,10 @@ class AbstractURLStream : public AudioStream {
   /// of performance! - By default this is deactivated. ESP32 Only!
   virtual void setPowerSave(bool ps) = 0;
 
+  /// Define the Root PEM Certificate for SSL
+  void setCACert(const char* cert);
+
 };
 
+
 }  // namespace audio_tools

src/AudioTools/CoreAudio/AudioHttp/AudioHttp.h

@@ -6,10 +6,7 @@
 **/
 
 #include "URLStream.h"
-#include "URLStreamBuffered.h"
 #include "AudioServer.h"
-#include "ICYStream.h"
-#include "ICYStreamBuffered.h"
 #ifdef ESP32
 #  include "URLStreamESP32.h"
 #endif

src/AudioTools/CoreAudio/AudioHttp/ICYStreamBuffered.h

@@ -1,12 +1,9 @@
 #pragma once
-#ifdef USE_URL_ARDUINO
-
 #include "AudioConfig.h"
-#include "URLStreamBuffered.h"
-#include "AudioTools/CoreAudio/AudioMetaData/MetaDataICY.h"
+#if defined(USE_CONCURRENCY) && defined(USE_URL_ARDUINO)
+#include "URLStream.h"
 
 namespace audio_tools {
-
 /**
  * @brief Icecast/Shoutcast Audio Stream which splits the data into metadata and
  * audio data. The Audio data is provided via the regular stream functions. The
@@ -24,25 +21,24 @@ namespace audio_tools {
  * @copyright GPLv3
  */
 
-class ICYStream : public AbstractURLStream {
+ template<class T>
+ class ICYStreamT : public AbstractURLStream {
  public:
-  ICYStream(int readBufferSize = DEFAULT_BUFFER_SIZE) {
+ ICYStreamT(int readBufferSize = DEFAULT_BUFFER_SIZE) {
     TRACEI();
     setReadBufferSize(readBufferSize);
   }
 
-  ICYStream(Client& clientPar, int readBufferSize = DEFAULT_BUFFER_SIZE) {
+  ICYStreamT(Client& clientPar, int readBufferSize = DEFAULT_BUFFER_SIZE) : ICYStreamT(readBufferSize) {
     TRACEI();
-    setReadBufferSize(readBufferSize);
     setClient(clientPar);
   }
 
   /// Default constructor
-  ICYStream(const char* network, const char* password,
-            int readBufferSize = DEFAULT_BUFFER_SIZE) {
+  ICYStreamT(const char* ssid, const char* password,
+            int readBufferSize = DEFAULT_BUFFER_SIZE) : ICYStreamT(readBufferSize) {
     TRACEI();
-    setReadBufferSize(readBufferSize);
-    setSSID(network);
+    setSSID(ssid);
     setPassword(password);
   }
 
@@ -152,11 +148,17 @@ class ICYStream : public AbstractURLStream {
   /// of performance! - By default this is deactivated. ESP32 Only!
   void setPowerSave(bool active) { url.setPowerSave(active);}
 
+  /// Define the Root PEM Certificate for SSL:
+  void setCACert(const char* cert){
+    url.setCACert(cert);
+  }
+
  protected:
-  URLStream url;
+  T url;
   MetaDataICY icy;  // icy state machine
   void (*callback)(MetaDataType info, const char* str, int len) = nullptr;
 };
 
-}  // namespace audio_tools
-#endif
+}
+
+#endif

src/AudioTools/CoreAudio/AudioHttp/ICYStream.h renamed to src/AudioTools/CoreAudio/AudioHttp/ICYURLStreamT.h

@@ -10,9 +10,12 @@
 # include <esp_wifi.h>
 #endif
 
+#include "AudioTools/CoreAudio/AudioBasic/Str.h"
 #include "AbstractURLStream.h"
 #include "HttpRequest.h"
-#include "AudioTools/CoreAudio/AudioBasic/Str.h"
+#include "ICYURLStreamT.h"
+#include "URLStreamBufferedT.h"
+
 
 namespace audio_tools {
 
@@ -259,6 +262,13 @@ class URLStream : public AbstractURLStream {
 #endif
   const char* urlStr() { return url_str.c_str(); }
 
+/// Define the Root PEM Certificate for SSL
+  void setCACert(const char* cert){
+  #ifdef USE_WIFI_CLIENT_SECURE
+    if (clientSecure!=nullptr) clientSecure->setCACert(cert);
+  #endif
+  }
+
  protected:
   HttpRequest request;
 #if USE_AUDIO_LOGGING
@@ -427,6 +437,10 @@ class URLStream : public AbstractURLStream {
   }
 };
 
+using URLStreamBuffered = URLStreamBufferedT<URLStream>;
+using ICYStream = ICYStreamT<URLStream>;
+using ICYStreamBuffered = URLStreamBufferedT<ICYStream>;
+
 }  // namespace audio_tools
 
 #endif

src/AudioTools/CoreAudio/AudioHttp/URLStream.h

@@ -1,27 +1,26 @@
 #pragma once
 #include "AudioConfig.h"
 #if defined(USE_CONCURRENCY) && defined(USE_URL_ARDUINO)
-#include "URLStream.h"
 #include "AudioTools/AudioLibs/Concurrency.h"
-#include "AudioTools/CoreAudio/AudioStreams.h"
+#include "AudioTools/CoreAudio/BaseStream.h"
+#include "URLStream.h"
 
 #ifndef URL_STREAM_CORE
-#  define URL_STREAM_CORE 0
+#define URL_STREAM_CORE 0
 #endif
 
 #ifndef URL_STREAM_PRIORITY
-#  define URL_STREAM_PRIORITY 2
+#define URL_STREAM_PRIORITY 2
 #endif
 
 #ifndef URL_STREAM_BUFFER_COUNT
-#  define URL_STREAM_BUFFER_COUNT 10
+#define URL_STREAM_BUFFER_COUNT 10
 #endif
 
 #ifndef STACK_SIZE
-#  define STACK_SIZE 30000
+#define STACK_SIZE 30000
 #endif
 
-
 namespace audio_tools {
 
 /**
@@ -46,7 +45,7 @@ class BufferedTaskStream : public AudioStream {
   }
 
   /// Define an explicit the buffer size in bytes
-  void setBufferSize(int bufferSize, int bufferCount){
+  void setBufferSize(int bufferSize, int bufferCount) {
     buffers.resize(bufferSize, bufferCount);
   }
 
@@ -112,14 +111,12 @@ class BufferedTaskStream : public AudioStream {
     return result;
   }
 
-
  protected:
   AudioStream *p_stream = nullptr;
   bool active = false;
   Task task{"BufferedTaskStream", STACK_SIZE, URL_STREAM_PRIORITY,
             URL_STREAM_CORE};
-  SynchronizedNBuffer buffers{DEFAULT_BUFFER_SIZE,
-                                       URL_STREAM_BUFFER_COUNT};
+  SynchronizedNBuffer buffers{DEFAULT_BUFFER_SIZE, URL_STREAM_BUFFER_COUNT};
   bool ready = false;
 
   void processTask() {
@@ -147,29 +144,30 @@ class BufferedTaskStream : public AudioStream {
 
 /**
  * @brief URLStream implementation for the ESP32 based on a separate FreeRTOS
- * task
+ * task: the 
  * @ingroup http
  * @author Phil Schatzmann
  * @copyright GPLv3
  */
 
-class URLStreamBuffered : public AbstractURLStream {
+ template<class T>
+class URLStreamBufferedT : public AbstractURLStream {
  public:
-  URLStreamBuffered(int readBufferSize = DEFAULT_BUFFER_SIZE) {
+ URLStreamBufferedT(int readBufferSize = DEFAULT_BUFFER_SIZE) {
     TRACED();
     urlStream.setReadBufferSize(readBufferSize);
     taskStream.setInput(urlStream);
   }
 
-  URLStreamBuffered(Client &clientPar,
+  URLStreamBufferedT(Client &clientPar,
                     int readBufferSize = DEFAULT_BUFFER_SIZE) {
     TRACED();
     urlStream.setReadBufferSize(readBufferSize);
     setClient(clientPar);
     taskStream.setInput(urlStream);
   }
 
-  URLStreamBuffered(const char *network, const char *password,
+  URLStreamBufferedT(const char *network, const char *password,
                     int readBufferSize = DEFAULT_BUFFER_SIZE) {
     TRACED();
     urlStream.setReadBufferSize(readBufferSize);
@@ -179,7 +177,7 @@ class URLStreamBuffered : public AbstractURLStream {
   }
 
   /// Defines the buffer that holds the with encoded data
-  void setBufferSize(int bufferSize, int bufferCount){
+  void setBufferSize(int bufferSize, int bufferCount) {
     taskStream.setBufferSize(bufferSize, bufferCount);
   }
 
@@ -228,13 +226,15 @@ class URLStreamBuffered : public AbstractURLStream {
     urlStream.setPassword(password);
   }
 
-  /// ESP32 only: PowerSave off (= default setting) is much faster 
+  /// ESP32 only: PowerSave off (= default setting) is much faster
   void setPowerSave(bool ps) override { urlStream.setPowerSave(ps); }
 
+/// Define the Root PEM Certificate for SSL
+void setCACert(const char *cert) { urlStream.setCACert(cert); }
 
  protected:
   BufferedTaskStream taskStream;
-  URLStream urlStream;
+  T urlStream;
 };
 
 }  // namespace audio_tools