Fixes for ESP32

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "cspot/bell"]
 	path = cspot/bell
-	url = https://github.com/feelfreelinux/bell
-	branch = develop
+	url = https://github.com/tobiasguyer/bell
+	branch = master

.vscode/settings.json

@@ -8,5 +8,94 @@
         "--background-index",
         "--compile-commands-dir=${workspaceFolder}/targets/cli/build"
     ],
-    "editor.tabSize": 2
+    "editor.tabSize": 2,
+    "files.associations": {
+        "vector": "cpp",
+        "memory": "cpp",
+        "chrono": "cpp",
+        "variant": "cpp",
+        "mutex": "cpp",
+        "deque": "cpp",
+        "array": "cpp",
+        "ranges": "cpp",
+        "span": "cpp",
+        "xstring": "cpp",
+        "xutility": "cpp",
+        "algorithm": "cpp",
+        "any": "cpp",
+        "atomic": "cpp",
+        "bit": "cpp",
+        "cctype": "cpp",
+        "charconv": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "codecvt": "cpp",
+        "compare": "cpp",
+        "complex": "cpp",
+        "concepts": "cpp",
+        "condition_variable": "cpp",
+        "csignal": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "exception": "cpp",
+        "filesystem": "cpp",
+        "format": "cpp",
+        "forward_list": "cpp",
+        "fstream": "cpp",
+        "functional": "cpp",
+        "initializer_list": "cpp",
+        "iomanip": "cpp",
+        "ios": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "iterator": "cpp",
+        "limits": "cpp",
+        "list": "cpp",
+        "locale": "cpp",
+        "map": "cpp",
+        "new": "cpp",
+        "numeric": "cpp",
+        "optional": "cpp",
+        "ostream": "cpp",
+        "queue": "cpp",
+        "random": "cpp",
+        "ratio": "cpp",
+        "regex": "cpp",
+        "set": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "stop_token": "cpp",
+        "streambuf": "cpp",
+        "string": "cpp",
+        "system_error": "cpp",
+        "thread": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "typeindex": "cpp",
+        "typeinfo": "cpp",
+        "unordered_map": "cpp",
+        "unordered_set": "cpp",
+        "utility": "cpp",
+        "valarray": "cpp",
+        "xfacet": "cpp",
+        "xhash": "cpp",
+        "xiosbase": "cpp",
+        "xlocale": "cpp",
+        "xlocbuf": "cpp",
+        "xlocinfo": "cpp",
+        "xlocmes": "cpp",
+        "xlocmon": "cpp",
+        "xlocnum": "cpp",
+        "xloctime": "cpp",
+        "xmemory": "cpp",
+        "xtr1common": "cpp",
+        "xtree": "cpp"
+    }
 }

cspot/include/CDNAudioFile.h

@@ -21,11 +21,21 @@ class CDNAudioFile {
  public:
   CDNAudioFile(const std::string& cdnUrl, const std::vector<uint8_t>& audioKey);
 
+#ifndef CONFIG_BELL_NOCODEC
   /**
   * @brief Opens connection to the provided cdn url, and fetches track metadata.
   */
   void openStream();
-
+#else
+  /**
+  * @brief Opens connection to the provided cdn url, and fetches track header.
+  * 
+  * @param header_size
+  * 
+  * @returns char* where to read data from
+  */
+  uint8_t* openStream(size_t&);
+#endif
   /**
   * @brief Read and decrypt part of the cdn stream
   *
@@ -34,7 +44,7 @@ class CDNAudioFile {
   *
   * @returns amount of bytes read
   */
-  size_t readBytes(uint8_t* dst, size_t bytes);
+  long readBytes(uint8_t* dst, size_t bytes);
 
   /**
   * @brief Returns current position in CDN stream
@@ -52,6 +62,8 @@ class CDNAudioFile {
   */
   void seek(size_t position);
 
+  long getHeader();
+
  private:
   const int OPUS_HEADER_SIZE = 8 * 1024;
   const int OPUS_FOOTER_PREFFERED = 1024 * 12;  // 12K should be safe
@@ -60,10 +72,11 @@ class CDNAudioFile {
   const int HTTP_BUFFER_SIZE = 1024 * 14;
   const int SPOTIFY_OPUS_HEADER = 167;
 
+#ifndef CONFIG_BELL_NOCODEC
   // Used to store opus metadata, speeds up read
   std::vector<uint8_t> header = std::vector<uint8_t>(OPUS_HEADER_SIZE);
   std::vector<uint8_t> footer;
-
+#endif
   // General purpose buffer to read data
   std::vector<uint8_t> httpBuffer = std::vector<uint8_t>(HTTP_BUFFER_SIZE);
 

cspot/include/CSpotContext.h

@@ -2,8 +2,10 @@
 
 #include <stdint.h>
 #include <memory>
+#include <random>  //for random_device and default_random_engine
 
 #include "Crypto.h"
+#include "EventManager.h"
 #include "LoginBlob.h"
 #include "MercurySession.h"
 #include "TimeProvider.h"
@@ -17,6 +19,14 @@
 #include "nlohmann/json_fwd.hpp"  // for json
 #endif
 
+#ifdef ESP_PLATFORM
+#include "freertos/FreeRTOS.h"
+#include "freertos/event_groups.h"
+#define WIFI_CONNECTED_BIT BIT0
+#define WIFI_FAIL_BIT BIT1
+#define CSPOT_CONNECTED_BIT BIT2
+#endif
+
 namespace cspot {
 struct Context {
   struct ConfigState {
@@ -27,6 +37,10 @@ struct Context {
     std::vector<uint8_t> authData;
     int volume;
 
+#ifdef ESP_PLATFORM
+    EventGroupHandle_t s_cspot_event_group;
+#endif
+
     std::string username;
     std::string countryCode;
   };
@@ -35,6 +49,9 @@ struct Context {
 
   std::shared_ptr<TimeProvider> timeProvider;
   std::shared_ptr<cspot::MercurySession> session;
+  std::shared_ptr<PlaybackMetrics> playbackMetrics;
+  std::random_device rd;
+  std::default_random_engine rng;
   std::string getCredentialsJson() {
 #ifdef BELL_ONLY_CJSON
     cJSON* json_obj = cJSON_CreateObject();
@@ -62,12 +79,20 @@ struct Context {
 #endif
   }
 
+  void lost_connection(void*) {
+    //if(!connection)
+  }
+
   static std::shared_ptr<Context> createFromBlob(
       std::shared_ptr<LoginBlob> blob) {
     auto ctx = std::make_shared<Context>();
     ctx->timeProvider = std::make_shared<TimeProvider>();
-
+    ctx->rng = std::default_random_engine{ctx->rd()};
+#ifdef ESP_PLATFORM
+    //s_cspot_event_group = xEventGroupCreate();
+#endif
     ctx->session = std::make_shared<MercurySession>(ctx->timeProvider);
+    ctx->playbackMetrics = std::make_shared<PlaybackMetrics>(ctx);
     ctx->config.deviceId = blob->getDeviceId();
     ctx->config.deviceName = blob->getDeviceName();
     ctx->config.authData = blob->authData;

cspot/include/ConstantParameters.h

@@ -12,6 +12,6 @@ const char* const brandName = "cspot";
 const char* const versionString = "cspot-1.1";
 const char* const protocolVersion = "2.7.1";
 const char* const defaultDeviceName = "CSpot";
-const char* const swVersion = "1.0.0";
+const char* const swVersion = "1.1.0";
 
 }  // namespace cspot

cspot/include/DeviceStateHandler.h

@@ -0,0 +1,113 @@
+/**
+ * TO DO
+ * 
+ * autoplay doesn't work for episodes
+ * 
+ */
+#pragma once
+
+#include <stdint.h>    // for uint8_t, uint32_t
+#include <deque>       //for deque..
+#include <functional>  //for function
+#include <memory>      // for shared_ptr
+#include <string>      // for string
+#include <utility>     // for pair
+#include <variant>     // for variant
+#include <vector>      // for vector
+
+#include "PlayerContext.h"  // for PlayerContext::resolveTracklist, jsonToTracklist...
+#include "TrackPlayer.h"  // for TrackPlayer
+#include "TrackQueue.h"
+#include "TrackReference.h"
+#include "protobuf/connect.pb.h"  // for PutStateRequest, DeviceState, PlayerState...
+
+namespace cspot {
+struct Context;
+struct PlayerContext;
+
+class DeviceStateHandler {
+ public:
+  //Command Callback Structure
+  enum CommandType {
+    STOP,
+    PLAY,
+    PAUSE,
+    DISC,
+    DEPLETED,
+    FLUSH,
+    PLAYBACK_START,
+    PLAYBACK,
+    SKIP_NEXT,
+    SKIP_PREV,
+    SEEK,
+    SET_SHUFFLE,
+    SET_REPEAT,
+    VOLUME,
+    TRACK_INFO,
+  };
+
+  typedef std::variant<std::shared_ptr<cspot::QueuedTrack>, int32_t, bool>
+      CommandData;
+
+  struct Command {
+    CommandType commandType;
+    CommandData data;
+  };
+
+  typedef std::function<void(Command)> StateCallback;
+
+  DeviceStateHandler(std::shared_ptr<cspot::Context>);
+  ~DeviceStateHandler();
+
+  void disconnect();
+
+  void putDeviceState(PutStateReason member_type =
+                          PutStateReason::PutStateReason_PLAYER_STATE_CHANGED);
+
+  void setDeviceState(PutStateReason put_state_reason);
+  void putPlayerState(PutStateReason member_type =
+                          PutStateReason::PutStateReason_PLAYER_STATE_CHANGED);
+  void handleConnectState();
+  void sendCommand(CommandType, CommandData data = {});
+
+  Device device = Device_init_zero;
+
+  std::vector<ProvidedTrack> currentTracks = {};
+  StateCallback stateCallback;
+
+  uint64_t started_playing_at = 0;
+  uint32_t last_message_id = -1;
+  uint8_t offset = 0;
+  int64_t offsetFromStartInMillis = 0;
+
+  bool is_active = false;
+  bool reloadPreloadedTracks = true;
+  bool needsToBeSkipped = true;
+  bool playerStateChanged = false;
+
+  std::shared_ptr<cspot::TrackPlayer> trackPlayer;
+  std::shared_ptr<cspot::TrackQueue> trackQueue;
+  std::shared_ptr<cspot::Context> ctx;
+
+ private:
+  std::shared_ptr<PlayerContext> playerContext;
+
+  std::pair<uint8_t*, std::vector<ProvidedTrack>*> queuePacket = {
+      &offset, &currentTracks};
+  std::vector<std::pair<std::string, std::string>> metadata_map = {};
+  std::vector<std::pair<std::string, std::string>> context_metadata_map = {};
+  std::mutex playerStateMutex;
+  std::string context_uri, context_url;
+  void parseCommand(std::vector<uint8_t>& data);
+  void skip(CommandType dir, bool notify);
+
+  void unreference(char* string) {
+    if (string != NULL)
+      free(string);
+    string = NULL;
+  }
+
+  static void reloadTrackList(void*);
+  std::atomic<bool> resolvingContext = false;
+};
+}  // namespace cspot