8000 webserver hook: allow to handle external http protocol by d-a-v · Pull Request #7459 · esp8266/Arduino · GitHub
[go: up one dir, main page]
Skip to content

webserver hook: allow to handle external http protocol #7459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Jul 28, 2020
Merged

webserver hook: allow to handle external http protocol #7459

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a9f3b6f
webhook api
d-a-v Jul 12, 2020
457272c
ditto
d-a-v Jul 15, 2020
dd8b5f7
Merge branch 'master' into webhook
d-a-v Jul 15, 2020
e27a8f4
simplify webserver debug printouts, move text to flash
d-a-v Jul 17, 2020
5365d6e
style
d-a-v Jul 17, 2020
b55feba
nothing against Hungarians
d-a-v Jul 17, 2020
bfc12fb
Hook examples in HelloServer example
d-a-v Jul 17, 2020
d24441f
remove debug comment
d-a-v Jul 17, 2020
724a74f
sorry hungarians (again)
d-a-v Jul 17, 2020
fbf4ca3
print executable code address in example
d-a-v Jul 17, 2020
93f2fbd
fix emulation on host
d-a-v Jul 17, 2020
9e45256
Merge branch 'master' into webhook
d-a-v Jul 17, 2020
0e4b110
simplify example per @mcspr suggestion
d-a-v Jul 17, 2020
a8f93c0
Merge branch 'master' into webhook
d-a-v Jul 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
nothing against Hungarians
  • Loading branch information
@d-a-v
d-a-v committed Jul 17, 2020
commit b55febab61b340a8a77fdd4933d4bd0fbb5fe63d
15 changes: 8 additions & 7 deletions libraries/ESP8266WebServer/src/ESP8266WebServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
#include "detail/mimetable.h"
#include "Uri.h"

//#define DEBUG_ESP_HTTP_SERVER
#define DEBUG_ESP_HTTP_SERVER

#ifdef DEBUG_ESP_HTTP_SERVER
#ifdef DEBUG_ESP_PORT
#define DBGWS(f,...) do { DEBUG_ESP_PORT.printf(PSTR(f), ##__VA_ARGS__); } while (0)
#else
#define DBGWS(f,...) do { Serial.printf(F(f), ##__VA_ARGS__); } while (0)
#define DBGWS(f,...) do { Serial.printf(PSTR(f), ##__VA_ARGS__); } while (0)
#endif
#else
#define DBGWS(x...) do { (void)0; } while (0)
Expand Down Expand Up @@ -93,9 +93,9 @@ class ESP8266WebServerTemplate
using ClientType = typename ServerType::ClientType;
using RequestHandlerType = RequestHandler<ServerType>;
using WebServerType = ESP8266WebServerTemplate<ServerType>;
using ContentType_f = std::function<String(const String&)>;
enum ClientFuture_e { CLIENT_REQUEST_CAN_CONTINUE, CLIENT_REQUEST_IS_HANDLED, CLIENT_MUST_STOP, CLIENT_IS_GIVEN };
using Hook_f = std::function<ClientFuture_e(const String& method, const String& url, WiFiClient* client, ContentType_f contentType)>;
typedef String (*ContentTypeFunction) (const String&);
using HookFunction = std::function<ClientFuture_e(const String& method, const String& url, WiFiClient* client, ContentTypeFunction contentType)>;

void begin();
void begin(uint16_t port);
Expand Down Expand Up @@ -208,10 +208,11 @@ class ESP8266WebServerTemplate

static String responseCodeToString(const int code);

void addHook (Hook_f hook) {
void addHook (HookFunction hook) {
DBGWS("addHook: @=%p\n", hook);
if (_hook) {
auto previousHook = _hook;
_hook = [previousHook, hook](const String& method, const String& url, WiFiClient* client, ContentType_f contentType) {
_hook = [previousHook, hook](const String& method, const String& url, WiFiClient* client, ContentTypeFunction contentType) {
auto whatNow = previousHook(method, url, client, contentType);
if (whatNow == CLIENT_REQUEST_CAN_CONTINUE)
return hook(method, url, client, contentType);
Expand Down Expand Up @@ -282,7 +283,7 @@ class ESP8266WebServerTemplate
String _sopaque;
String _srealm; // Store the Auth realm between Calls

Hook_f _hook;
HookFunction _hook;
};


Expand Down
0