Merge https://github.com/hoeken/PsychicHttp

CHANGELOG.md

@@ -13,4 +13,5 @@
     * PsychicHttpServerRequest -> PsychicRequest
     * PsychicHttpServerResponse -> PsychicResponse
     * PsychicHttpWebsocket.h -> PsychicWebSocket.h
-    * Websocket => WebSocket
+    * Websocket => WebSocket
+* Quite a few bugfixes from the community.

README.md

@@ -589,15 +589,10 @@ ArduinoMongoose is a good alternative, although the latency issues when it gets
 
 # Roadmap
 
-## v1.1: Event Source + Handlers
+## v1.2: ESPAsyncWebserver Parity
 
-* Fix all outstanding issues on Github
 * Another pass over the docs
   * DefaultHeaders
-  
-
-## v1.2: ESPAsyncWebserver Parity
-
 * HTTP_ANY support (by abusing httpd_req_handle_err)
   * Issue: it would log a warning on every request (httpd_uri.c:298)
   * Issue: req->user_ctx is not passed in. (httpd_uri.c:309)

library.json

@@ -1,6 +1,6 @@
 {
   "name": "PsychicHttp",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Arduino style wrapper around ESP-IDF HTTP library. HTTP server with SSL + websockets. Works on esp32 and probably esp8266",
   "keywords": "network,http,https,tcp,ssl,tls,websocket,espasyncwebserver",
   "repository":
@@ -32,7 +32,7 @@
     {
       "owner": "bblanchon",
       "name": "ArduinoJson",
-      "version": "^6.21.4"
+      "version": "^7.0.4"
     },
     {
       "owner": "bblanchon",

library.properties

@@ -1,5 +1,5 @@
 name=PsychicHttp
-version=1.0.1
+version=1.1.0
 author=Zach Hoeken <[email protected]>
 maintainer=Zach Hoeken <[email protected]>
 sentence=PsychicHttp is a robust webserver that supports http/https + websockets.

src/PsychicHandler.cpp

@@ -7,7 +7,8 @@ PsychicHandler::PsychicHandler() :
   _password(""),
   _method(DIGEST_AUTH),
   _realm(""),
-  _authFailMsg("")
+  _authFailMsg(""),
+  _subprotocol("")
   {}
 
 PsychicHandler::~PsychicHandler() {
@@ -26,6 +27,13 @@ bool PsychicHandler::filter(PsychicRequest *request){
   return _filter == NULL || _filter(request);
 }
 
+void PsychicHandler::setSubprotocol(const String& subprotocol) {
+    this->_subprotocol = subprotocol;
+}
+const char* PsychicHandler::getSubprotocol() const {
+    return _subprotocol.c_str();
+}
+
 PsychicHandler* PsychicHandler::setAuthentication(const char *username, const char *password, HTTPAuthMethod method, const char *realm, const char *authFailMsg) {
   _username = String(username);
   _password = String(password);

src/PsychicHandler.h

@@ -24,6 +24,8 @@ class PsychicHandler {
     String _realm;
     String _authFailMsg;
 
+    String _subprotocol;
+
     std::list<PsychicClient*> _clients;
 
   public:
@@ -39,6 +41,9 @@ class PsychicHandler {
 
     virtual bool isWebSocket() { return false; };
 
+    void setSubprotocol(const String& subprotocol);
+    const char* getSubprotocol() const;
+
     PsychicClient * checkForNewClient(PsychicClient *client);
     void checkForClosedClient(PsychicClient *client);
 

src/PsychicHttpServer.cpp

@@ -141,7 +141,8 @@ PsychicEndpoint* PsychicHttpServer::on(const char* uri, http_method method, Psyc
     .method   = method,
     .handler  = PsychicEndpoint::requestCallback,
     .user_ctx = endpoint,
-    .is_websocket = handler->isWebSocket()
+    .is_websocket = handler->isWebSocket(),
+    .supported_subprotocol = handler->getSubprotocol()
   };
 
   // Register endpoint with ESP-IDF server