Multiuser server / final bugs

Author: pschatzmann

examples/examples-webserver/player-sd-webserverex_mp3/player-sd-webserverex_mp3.ino

@@ -29,6 +29,7 @@ AudioPlayer player(source, out, *new CopyDecoder());
 void setup() {
   Serial.begin(115200);
   AudioLogger::instance().begin(Serial, AudioLogger::Warning);
+  HttpLogger.setLevel(tinyhttp::Warning);
 
   // setup SPI for SD card
   SPI.begin(PIN_AUDIO_KIT_SD_CARD_CLK, PIN_AUDIO_KIT_SD_CARD_MISO, PIN_AUDIO_KIT_SD_CARD_MOSI, PIN_AUDIO_KIT_SD_CARD_CS);

examples/examples-webserver/streams-generator-webserverex_wav/streams-generator-webserverex_wav.ino

@@ -12,8 +12,8 @@
 #include "AudioLibs/AudioServerEx.h"
 
 // WIFI
-const char *ssid = "ssid";
-const char *password = "password";
+const char *ssid = "Phil Schatzmann";
+const char *password = "sabrina01";
 AudioWAVServerEx server;
 // Sound Generation
 const int sample_rate = 10000;
@@ -25,6 +25,7 @@ GeneratedSoundStream<int16_t> in(sineWave);     // Stream generated from sine wa
 void setup() {
   Serial.begin(115200);
   AudioLogger::instance().begin(Serial,AudioLogger::Info);
+  HttpLogger.setLevel(tinyhttp::Info);
 
   // start server
   auto cfg = server.defaultConfig();
@@ -44,4 +45,4 @@ void setup() {
 // copy the data
 void loop() {
   server.copy();
-}
+}

src/AudioBasic/Debouncer.h

@@ -0,0 +1,44 @@
+#pragma once
+
+namespace audio_tools {
+
+    /**
+     * @brief Helper class to debounce user input from a push button
+     *
+     */
+    class Debouncer {
+
+    public:
+        Debouncer(uint16_t timeoutMs = 5000, void* ref = nullptr) {
+            setDebounceTimeout(timeoutMs);
+            p_ref = ref;
+        }
+
+        void setDebounceTimeout(uint16_t timeoutMs) {
+            ms = timeoutMs;
+        }
+
+        /// Prevents that the same method is executed multiple times within the indicated time limit
+        bool debounce(void(*cb)(void* ref) = nullptr) {
+            bool result = false;
+            if (millis() > debounce_ms) {
+                LOGI("accpted");
+                if (cb != nullptr) cb(p_ref);
+                // new time limit
+                debounce_ms = millis() + ms;
+                result = true;
+            }
+            else {
+                LOGI("rejected");
+            }
+            return result;
+        }
+
+    protected:
+        unsigned long debounce_ms = 0; // Debounce sensitive touch
+        uint16_t ms;
+        void* p_ref = nullptr;
+
+    };
+
+}

src/AudioBasic/StrExt.h

@@ -99,6 +99,13 @@ class StrExt : public Str {
             grow(newLen);
         }
 
+        // make sure that the max size is allocated
+        void allocate(int len=-1) {
+            int new_size = len<0?maxlen:len;
+            grow(new_size);
+            this->len = new_size;
+        }
+
     protected:
 
         bool grow(int newMaxLen){

src/AudioCodecs/CodecWAV.h

@@ -22,13 +22,13 @@ struct WAVAudioInfo : AudioBaseInfo {
         bits_per_sample=from.bits_per_sample; 
     }
 
-    int format;
-    int byte_rate;
-    int block_align;
-    bool is_streamed;
-    bool is_valid;
-    uint32_t data_length;
-    uint32_t file_size;
+    int format=WAV_FORMAT_PCM;
+    int byte_rate=0;
+    int block_align=0;
+    bool is_streamed=true;
+    bool is_valid=false;
+    uint32_t data_length=0;
+    uint32_t file_size=0;
 };
 
 const char* wav_mime = "audio/wav";

src/AudioLibs/AudioServerEx.h

@@ -62,13 +62,16 @@ class AudioServerEx : public AudioPrint {
 
     virtual bool begin() {
         end(); // we (re) start with  a clean state
+
         if (info.input==nullptr){
             p_stream = new ExtensionStream(info.path,tinyhttp::GET, info.mime );
         } else {
             p_stream = new ExtensionStream(info.path, info.mime, *info.input);
         }
         p_stream->setReplyHeader(*getReplyHeader()); 
-        p_server = new HttpServer(wifi);
+        p_server = new tinyhttp::HttpServer(wifi);
+        
+        // handling of WAV
         p_server->addExtension(*p_stream);
         return p_server->begin(info.port, info.ssid, info.password);
     }
@@ -153,21 +156,25 @@ class AudioWAVServerEx : public AudioServerEx {
     protected:
         // wav files start with a 44 bytes header
         virtual tinyhttp::Str* getReplyHeader() {
-            MemoryPrint mp{(uint8_t*)header.c_str(), header.length()};
+            header.allocate(44);
+            MemoryPrint mp{(uint8_t*)header.c_str(), 44};
             WAVEncoder enc;
             WAVAudioInfo wi;
+            wi.format = WAV_FORMAT_PCM;
             wi.sample_rate = info.sample_rate;
             wi.bits_per_sample = info.bits_per_sample;
             wi.channels = info.channels;
             enc.setAudioInfo(wi);
             // fill header with data
             enc.writeHeader(&mp);
+            // make sure that the length is 44
+            assert(header.length() == 44);
 
             return &header;
         }
 
-        // Allocate memory for 44 bytes header
-        tinyhttp::StrExt header{44};
+        // Dynamic memory
+            tinyhttp::StrExt header;
 
 };
 

src/AudioTools/AudioOutput.h

@@ -671,30 +671,38 @@ class MemoryPrint : public AudioPrint {
         MemoryPrint(uint8_t*start, int len){
             p_start = start;
             p_next = start;
-            size = len;
+            max_size = len;
+            if (p_next==nullptr){
+                LOGE("start must not be null");
+            }
         }
 
         size_t write(const uint8_t *buffer, size_t len) override {
-            if (pos+len<=size){
+            if (p_next==nullptr) return 0;
+            if (pos+len<=max_size){
                 memcpy(p_next, buffer,len);
                 pos+=len;
                 p_next+=len;
                 return len;
             } else {
-                LOGE("Buffer too small");
+                LOGE("Buffer too small: pos:%d, size: %lu ", pos, max_size);
                 return 0;
             }
         }
 
         int availableForWrite() override {
-            return size-pos;
+            return max_size-pos;
+        }
+
+        int size() {
+            return max_size;
         }
 
     protected:
-        int pos;
-        uint8_t* p_start;
-        uint8_t *p_next;
-        size_t size;
+        int pos=0;
+        uint8_t* p_start=nullptr;
+        uint8_t *p_next=nullptr;
+        size_t max_size;
 
 };
 

src/AudioTools/AudioPlayer.h

@@ -1,14 +1,15 @@
 #pragma once
 
 #include "AudioConfig.h"
+#include "AudioBasic/Str.h"
+#include "AudioBasic/Debouncer.h"
 #include "AudioTools/AudioTypes.h"
 #include "AudioTools/Buffers.h"
 #include "AudioTools/Converter.h"
 #include "AudioTools/AudioLogger.h"
 #include "AudioTools/AudioStreams.h"
 #include "AudioTools/AudioCopy.h"
 #include "AudioHttp/AudioHttp.h"
-#include "AudioBasic/Str.h"
 #include "AudioTools/AudioSource.h"
 // support for legacy USE_SDFAT
 #ifdef USE_SDFAT
@@ -18,46 +19,6 @@
 
 namespace audio_tools {
 
-
-    /**
-     * @brief Helper class to debounce user input from a push button
-     *
-     */
-    class Debouncer {
-
-    public:
-        Debouncer(uint16_t timeoutMs = 5000, void* ref = nullptr) {
-            setDebounceTimeout(timeoutMs);
-            p_ref = ref;
-        }
-
-        void setDebounceTimeout(uint16_t timeoutMs) {
-            ms = timeoutMs;
-        }
-
-        /// Prevents that the same method is executed multiple times within the indicated time limit
-        bool debounce(void(*cb)(void* ref) = nullptr) {
-            bool result = false;
-            if (millis() > debounce_ms) {
-                LOGI("accpted");
-                if (cb != nullptr) cb(p_ref);
-                // new time limit
-                debounce_ms = millis() + ms;
-                result = true;
-            }
-            else {
-                LOGI("rejected");
-            }
-            return result;
-        }
-
-    protected:
-        unsigned long debounce_ms = 0; // Debounce sensitive touch
-        uint16_t ms;
-        void* p_ref = nullptr;
-
-    };
-
     /**
      * @brief Implements a simple audio player which supports the following commands:
      * - begin
@@ -331,6 +292,11 @@ namespace audio_tools {
         virtual void copy() {
             if (active) {
                 LOGD(LOG_METHOD);
+                if (p_final_print!=nullptr && p_final_print->availableForWrite()==0){
+                    // not ready to do anything - so we wait a bit
+                    delay(100);
+                    return;
+                }
                 // handle sound
                 if (copier.copy() || timeout == 0) {
                     // reset timeout