- make a template class for API Server

- Skip a lot of duplicate code
- add a hexDump output - might come in handy
- refactor directory names
- remove unused debugOut that was generating template errors

src/mesh/eth/ethClient.cpp

@@ -5,7 +5,7 @@
 #include <SPI.h>
 #include <RAK13800_W5100S.h>
 #include "target_specific.h"
-#include "mesh/eth/ethServerAPI.h"
+#include "mesh/api/ethServerAPI.h"
 #include "mqtt/MQTT.h"
 
 #ifndef DISABLE_NTP

src/mesh/eth/ethServerAPI.cpp

@@ -1,82 +0,0 @@
-#include "ethServerAPI.h"
-#include "configuration.h"
-#include <Arduino.h>
-
-static ethServerPort *apiPort;
-
-void initApiServer(int port)
-{
-    // Start API server on port 4403
-    if (!apiPort) {
-        apiPort = new ethServerPort(port);
-        LOG_INFO("API server listening on TCP port %d\n", port);
-        apiPort->init();
-    }
-}
-
-ethServerAPI::ethServerAPI(EthernetClient &_client) : StreamAPI(&client), concurrency::OSThread("ethServerAPI"), client(_client)
-{
-    LOG_INFO("Incoming ethernet connection\n");
-}
-
-ethServerAPI::~ethServerAPI()
-{
-    client.stop();
-
-    // FIXME - delete this if the client dropps the connection!
-}
-
-/// override close to also shutdown the TCP link
-void ethServerAPI::close()
-{
-    client.stop(); // drop tcp connection
-    StreamAPI::close();
-}
-
-/// Check the current underlying physical link to see if the client is currently connected
-bool ethServerAPI::checkIsConnected()
-{
-    return client.connected();
-}
-
-int32_t ethServerAPI::runOnce()
-{
-    if (client.connected()) {
-        return StreamAPI::runOncePart();
-    } else {
-        LOG_INFO("Client dropped connection, suspending API service\n");
-        enabled = false; // we no longer need to run
-        return 0;
-    }
-}
-
-/// If an api server is running, we try to spit out debug 'serial' characters there
-void ethServerPort::debugOut(char c)
-{
-    if (apiPort && apiPort->openAPI)
-        apiPort->openAPI->debugOut(c);
-}
-
-
-ethServerPort::ethServerPort(int port) : EthernetServer(port), concurrency::OSThread("ApiServer") {}
-
-void ethServerPort::init()
-{
-    begin();
-}
-
-int32_t ethServerPort::runOnce()
-{
-    auto client = available();
-    if (client) {
-        // Close any previous connection (see FIXME in header file)
-        if (openAPI) {
-            LOG_WARN("Force closing previous TCP connection\n");
-            delete openAPI;
-        }
-
-        openAPI = new ethServerAPI(client);
-    }
-
-    return 100; // only check occasionally for incoming connections
-}

src/mesh/eth/ethServerAPI.h

@@ -1,58 +0,0 @@
-#pragma once
-
-#include "StreamAPI.h"
-#include <RAK13800_W5100S.h>
-
-/**
- * Provides both debug printing and, if the client starts sending protobufs to us, switches to send/receive protobufs
- * (and starts dropping debug printing - FIXME, eventually those prints should be encapsulated in protobufs).
- */
-class ethServerAPI : public StreamAPI, private concurrency::OSThread
-{
-  private:
-    EthernetClient client;
-
-  public:
-    explicit ethServerAPI(EthernetClient &_client);
-
-    virtual ~ethServerAPI();
-
-    /// override close to also shutdown the TCP link
-    virtual void close();
-
-  protected:
-    /// We override this method to prevent publishing EVENT_SERIAL_CONNECTED/DISCONNECTED for wifi links (we want the board to
-    /// stay in the POWERED state to prevent disabling wifi)
-    virtual void onConnectionChanged(bool connected) override {}
-
-    virtual int32_t runOnce() override; // Check for dropped client connections
-
-    /// Check the current underlying physical link to see if the client is currently connected
-    virtual bool checkIsConnected() override;
-};
-
-/**
- * Listens for incoming connections and does accepts and creates instances of WiFiServerAPI as needed
- */
-class ethServerPort : public EthernetServer, private concurrency::OSThread
-{
-    /** The currently open port
-     *
-     * FIXME: We currently only allow one open TCP connection at a time, because we depend on the loop() call in this class to
-     * delegate to the worker.  Once coroutines are implemented we can relax this restriction.
-     */
-    ethServerAPI *openAPI = NULL;
-
-  public:
-    explicit ethServerPort(int port);
-
-    void init();
-
-    /// If an api server is running, we try to spit out debug 'serial' characters there
-    static void debugOut(char c);
-    
-  protected:
-    int32_t runOnce() override;
-};
-
-void initApiServer(int port=4403);