webhook api

Author: d-a-v

libraries/ESP8266WebServer/src/ESP8266WebServer-impl.h

@@ -336,12 +336,14 @@ void ESP8266WebServerTemplate<ServerType>::handleClient() {
           _currentClient.setTimeout(HTTP_MAX_SEND_WAIT);
           _contentLength = CONTENT_LENGTH_NOT_SET;
           _handleRequest();
-
-          if (_currentClient.connected()) {
-            _currentStatus = HC_WAIT_CLOSE;
-            _statusChange = millis();
-            keepCurrentClient = true;
-          }
+        } else {
+          keepCurrentClient = false;
+          _currentClient.stop();
+        }
+        if (_currentClient.connected()) {
+          _currentStatus = HC_WAIT_CLOSE;
+          _statusChange = millis();
+          keepCurrentClient = true;
         }
       } else { // !_currentClient.available()
         if (millis() - _statusChange <= HTTP_MAX_DATA_WAIT) {

libraries/ESP8266WebServer/src/ESP8266WebServer.h

@@ -26,6 +26,7 @@
 
 #include <functional>
 #include <memory>
+#include <functional>
 #include <ESP8266WiFi.h>
 #include <FS.h>
 #include "detail/mimetable.h"
@@ -80,6 +81,7 @@ class ESP8266WebServerTemplate
   using ClientType = typename ServerType::ClientType;
   using RequestHandlerType = RequestHandler<ServerType>;
   using WebServerType = ESP8266WebServerTemplate<ServerType>;
+  using hook_f = std::function<bool(const String& method, const String& url, ClientType& client)>;
 
   void begin();
   void begin(uint16_t port);
@@ -192,6 +194,22 @@ class ESP8266WebServerTemplate
 
   static String responseCodeToString(const int code);
 
+  void addHook (hook_f hook)
+  {
+    if (_hook)
+    {
+      auto old = _hook;
+      _hook = [old, hook](const String& method, const String& url, ClientType& client)
+        {
+          if (first(method, url, client))
+            return true;
+          return hook(method, url, client);
+        };
+    }
+    else
+      _hook = hook;
+  }
+
 protected:
   void _addRequestHandler(RequestHandlerType* handler);
   void _handleRequest();
@@ -251,7 +269,7 @@ class ESP8266WebServerTemplate
   String           _sopaque;
   String           _srealm;  // Store the Auth realm between Calls
 
-  
+  hook_f           _hook;
 
 };
 

libraries/ESP8266WebServer/src/Parsing-impl.h

@@ -71,7 +71,7 @@ bool ESP8266WebServerTemplate<ServerType>::_parseRequest(ClientType& client) {
   client.readStringUntil('\n');
   //reset header value
   for (int i = 0; i < _headerKeysCount; ++i) {
-    _currentHeaders[i].value =String();
+    _currentHeaders[i].value.clear();
    }
 
   // First line of HTTP request looks like "GET /path HTTP/1.1"
@@ -98,6 +98,15 @@ bool ESP8266WebServerTemplate<ServerType>::_parseRequest(ClientType& client) {
   _currentUri = url;
   _chunked = false;
 
+  if (_hook && _hook(methodStr, url, client))
+  {
+    // _hook() must return true when method is recognized
+    // (even when request goes wrong)
+    // in any case, request header and content must be read
+    // returning false because request is now already handled
+    return false;
+  }
+
   HTTPMethod method = HTTP_GET;
   if (methodStr == F("HEAD")) {
     method = HTTP_HEAD;