Convert ESP8266WebServer* into templatized model

Supercedes #4912

Refactor the three versions of ESP8266WebServer and *WebServerSecure to a
single templated class. Use "using" to enable old, non-templated names to b
used (so no user changes required to compile or run).

Fixes #4908 and clean up the code base a lot.

Basic tests run (the ones in the example code).

No code changes are required in userland except for setting the SSL
certificates which now use a cleaner "getServer()" accessor and lets the
app use the native BearSSL calls on the WiFiClientSecure object.

@devyte should be proud, it removes virtuals and even has template specialization...

Author: earlephilhower

libraries/ESP8266HTTPUpdateServer/examples/SecureBearSSLUpdater/SecureBearSSLUpdater.ino

@@ -32,7 +32,7 @@ const char* ssid = STASSID;
 const char* password = STAPSK;
 
 BearSSL::ESP8266WebServerSecure httpServer(443);
-ESP8266HTTPUpdateServer httpUpdater;
+ESP8266HTTPUpdateServerTemplate<BearSSL::WiFiServerSecure, BearSSL::WiFiClientSecure> httpUpdater;
 
 static const char serverCert[] PROGMEM = R"EOF(
 -----BEGIN CERTIFICATE-----

libraries/ESP8266HTTPUpdateServer/examples/SecureHTTPSUpdater/SecureHTTPSUpdater.ino

@@ -61,7 +61,7 @@ const char* ssid = STASSID;
 const char* password = STAPSK;
 
 ESP8266WebServerSecure httpServer(443);
-ESP8266HTTPUpdateServer httpUpdater;
+ESP8266HTTPUpdateServerTemplate<axTLS::WiFiServerSecure, axTLS::WiFiClientSecure> httpUpdater;
 
 // The certificate is stored in PMEM
 static const uint8_t x509[] PROGMEM = {

libraries/ESP8266HTTPUpdateServer/src/ESP8266HTTPUpdateServer.cpp renamed to libraries/ESP8266HTTPUpdateServer/src/ESP8266HTTPUpdateServer-impl.h

@@ -16,7 +16,8 @@ static const char serverIndex[] PROGMEM =
 static const char successResponse[] PROGMEM = 
   "<META http-equiv=\"refresh\" content=\"15;URL=/\">Update Success! Rebooting...\n";
 
-ESP8266HTTPUpdateServer::ESP8266HTTPUpdateServer(bool serial_debug)
+template <typename ServerType, typename ClientType>
+ESP8266HTTPUpdateServerTemplate<ServerType, ClientType>::ESP8266HTTPUpdateServer(bool serial_debug)
 {
   _serial_output = serial_debug;
   _server = NULL;
@@ -25,7 +26,8 @@ ESP8266HTTPUpdateServer::ESP8266HTTPUpdateServer(bool serial_debug)
   _authenticated = false;
 }
 
-void ESP8266HTTPUpdateServer::setup(ESP8266WebServer *server, const String& path, const String& username, const String& password)
+template <typename ServerType, typename ClientType>
+void ESP8266HTTPUpdateServerTemplate<ServerType, ClientType>::setup(ESP8266WebServerTemplate<ServerType, ClientType> *server, const String& path, const String& username, const String& password)
 {
     _server = server;
     _username = username;
@@ -95,7 +97,8 @@ void ESP8266HTTPUpdateServer::setup(ESP8266WebServer *server, const String& path
     });
 }
 
-void ESP8266HTTPUpdateServer::_setUpdaterError()
+template <typename ServerType, typename ClientType>
+void ESP8266HTTPUpdateServerTemplate<ServerType, ClientType>::_setUpdaterError()
 {
   if (_serial_output) Update.printError(Serial);
   StreamString str;

libraries/ESP8266HTTPUpdateServer/src/ESP8266HTTPUpdateServer.h

@@ -1,29 +1,30 @@
 #ifndef __HTTP_UPDATE_SERVER_H
 #define __HTTP_UPDATE_SERVER_H
 
-class ESP8266WebServer;
+#include <ESP8266WebServer.h>
 
-class ESP8266HTTPUpdateServer
+temnplate <typename ServerType, typename ClientType>
+class ESP8266HTTPUpdateServerTemplate
 {
   public:
-    ESP8266HTTPUpdateServer(bool serial_debug=false);
+    ESP8266HTTPUpdateServerTemplate(bool serial_debug=false);
 
-    void setup(ESP8266WebServer *server)
+    void setup(ESP8266WebServerTemplate<ServerType, ClientType> *server)
     {
       setup(server, emptyString, emptyString);
     }
 
-    void setup(ESP8266WebServer *server, const String& path)
+    void setup(ESP8266WebServerTemplate<ServerType, ClientType> *server, const String& path)
     {
       setup(server, path, emptyString, emptyString);
     }
 
-    void setup(ESP8266WebServer *server, const String& username, const String& password)
+    void setup(ESP8266WebServerTemplate<ServerType, ClientType> *server, const String& username, const String& password)
     {
       setup(server, "/update", username, password);
     }
 
-    void setup(ESP8266WebServer *server, const String& path, const String& username, const String& password);
+    void setup(ESP8266WebServerTemplate<ServerType, ClientType> *server, const String& path, const String& username, const String& password);
 
     void updateCredentials(const String& username, const String& password)
     {
@@ -36,12 +37,16 @@ class ESP8266HTTPUpdateServer
 
   private:
     bool _serial_output;
-    ESP8266WebServer *_server;
+    ESP8266WebServerTemplate<ServerType, ClientType> *_server;
     String _username;
     String _password;
     bool _authenticated;
     String _updaterError;
 };
 
+#include "ESP8266HTTPUpdateServer-impl.h"
+
+
+using ESP8266HTTPUpdateServer = ESP8266HTTPUpdateServerTemplate<WiFiServer, WiFiClient>;
 
 #endif

libraries/ESP8266WebServer/examples/HelloServerBearSSL/HelloServerBearSSL.ino

@@ -128,7 +128,7 @@ void setup(void){
     Serial.println("MDNS responder started");
   }
 
-  server.setRSACert(new BearSSL::X509List(serverCert), new BearSSL::PrivateKey(serverKey));
+  server.getServer().setRSACert(new BearSSL::X509List(serverCert), new BearSSL::PrivateKey(serverKey));
 
   server.on("/", handleRoot);
 

libraries/ESP8266WebServer/examples/HelloServerSecure/HelloServerSecure.ino

@@ -165,7 +165,7 @@ void setup(void) {
     Serial.println("MDNS responder started");
   }
 
-  server.setServerKeyAndCert_P(rsakey, sizeof(rsakey), x509, sizeof(x509));
+  server.getServer().setServerKeyAndCert_P(rsakey, sizeof(rsakey), x509, sizeof(x509));
 
   server.on("/", handleRoot);