Merge commit '32dd01b91bbae7f10b0b77ac200e69ea064ed44f'

bump version to 2.1.1
Merge pull request #355 from Links2004/ESP32_serial
2025-06-30 17:31:03 +02:00 · 2018-08-08 18:13:14 +02:00 · 2018-08-08 18:11:32 +02:00 · 2018-08-07 18:31:43 +02:00 · 2018-08-07 18:10:48 +02:00 · 2018-08-07 18:06:32 +02:00
13 changed files with 392 additions and 184 deletions
--- a/examples/esp32/WebSocketClient/WebSocketClient.ino
+++ b/examples/esp32/WebSocketClient/WebSocketClient.ino
@ -17,8 +17,6 @@
 WiFiMulti WiFiMulti;
 WebSocketsClient webSocket;

-HardwareSerial Serial1(2);
-
 #define USE_SERIAL Serial1

 void hexdump(const void *mem, uint32_t len, uint8_t cols = 16) {
@ -59,6 +57,12 @@ void webSocketEvent(WStype_t type, uint8_t * payload, size_t length) {
 			// send data to server
 			// webSocket.sendBIN(payload, length);
 			break;
+		case WStype_ERROR:			
+		case WStype_FRAGMENT_TEXT_START:
+		case WStype_FRAGMENT_BIN_START:
+		case WStype_FRAGMENT:
+		case WStype_FRAGMENT_FIN:
+			break;
 	}

 }
--- a/examples/esp32/WebSocketClientSSL/WebSocketClientSSL.ino
+++ b/examples/esp32/WebSocketClientSSL/WebSocketClientSSL.ino
@ -19,8 +19,6 @@
 WiFiMulti WiFiMulti;
 WebSocketsClient webSocket;

-HardwareSerial Serial1(2);
-
 #define USE_SERIAL Serial1

 void hexdump(const void *mem, uint32_t len, uint8_t cols = 16) {
@ -64,6 +62,12 @@ void webSocketEvent(WStype_t type, uint8_t * payload, size_t length) {
            // send data to server
            // webSocket.sendBIN(payload, length);
            break;
+		case WStype_ERROR:			
+		case WStype_FRAGMENT_TEXT_START:
+		case WStype_FRAGMENT_BIN_START:
+		case WStype_FRAGMENT:
+		case WStype_FRAGMENT_FIN:
+			break;
    }

 }
--- a/examples/esp32/WebSocketServer/WebSocketServer.ino
+++ b/examples/esp32/WebSocketServer/WebSocketServer.ino
@ -16,8 +16,6 @@
 WiFiMulti WiFiMulti;
 WebSocketsServer webSocket = WebSocketsServer(81);

-HardwareSerial Serial1(2);
-
 #define USE_SERIAL Serial1

 void hexdump(const void *mem, uint32_t len, uint8_t cols = 16) {
@ -64,6 +62,12 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t length
            // send message to client
            // webSocket.sendBIN(num, payload, length);
            break;
+		case WStype_ERROR:			
+		case WStype_FRAGMENT_TEXT_START:
+		case WStype_FRAGMENT_BIN_START:
+		case WStype_FRAGMENT:
+		case WStype_FRAGMENT_FIN:
+			break;
    }

 }
--- a/examples/esp8266/WebSocketServerAllFunctionsDemo/WebSocketServerAllFunctionsDemo.ino
+++ b/examples/esp8266/WebSocketServerAllFunctionsDemo/WebSocketServerAllFunctionsDemo.ino
@ -0,0 +1,132 @@
+/*
+ * WebSocketServerAllFunctionsDemo.ino
+ *
+ *  Created on: 10.05.2018
+ *
+ */
+
+#include <Arduino.h>
+
+#include <ESP8266WiFi.h>
+#include <ESP8266WiFiMulti.h>
+#include <WebSocketsServer.h>
+#include <ESP8266WebServer.h>
+#include <ESP8266mDNS.h>
+#include <Hash.h>
+
+#define LED_RED     15
+#define LED_GREEN   12
+#define LED_BLUE    13
+
+#define USE_SERIAL Serial
+
+ESP8266WiFiMulti WiFiMulti;
+
+ESP8266WebServer server(80);
+WebSocketsServer webSocket = WebSocketsServer(81);
+
+void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t length) {
+
+    switch(type) {
+        case WStype_DISCONNECTED:
+            USE_SERIAL.printf("[%u] Disconnected!\n", num);
+            break;
+        case WStype_CONNECTED: {
+            IPAddress ip = webSocket.remoteIP(num);
+            USE_SERIAL.printf("[%u] Connected from %d.%d.%d.%d url: %s\n", num, ip[0], ip[1], ip[2], ip[3], payload);
+
+            // send message to client
+            webSocket.sendTXT(num, "Connected");
+        }
+            break;
+        case WStype_TEXT:
+            USE_SERIAL.printf("[%u] get Text: %s\n", num, payload);
+
+            if(payload[0] == '#') {
+                // we get RGB data
+
+                // decode rgb data
+                uint32_t rgb = (uint32_t) strtol((const char *) &payload[1], NULL, 16);
+
+                analogWrite(LED_RED, ((rgb >> 16) & 0xFF));
+                analogWrite(LED_GREEN, ((rgb >> 8) & 0xFF));
+                analogWrite(LED_BLUE, ((rgb >> 0) & 0xFF));
+            }
+
+            break;
+    }
+
+}
+
+void setup() {
+    //USE_SERIAL.begin(921600);
+    USE_SERIAL.begin(115200);
+
+    //USE_SERIAL.setDebugOutput(true);
+
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+
+    for(uint8_t t = 4; t > 0; t--) {
+        USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
+        USE_SERIAL.flush();
+        delay(1000);
+    }
+
+    pinMode(LED_RED, OUTPUT);
+    pinMode(LED_GREEN, OUTPUT);
+    pinMode(LED_BLUE, OUTPUT);
+
+    digitalWrite(LED_RED, 1);
+    digitalWrite(LED_GREEN, 1);
+    digitalWrite(LED_BLUE, 1);
+
+    WiFiMulti.addAP("SSID", "passpasspass");
+
+    while(WiFiMulti.run() != WL_CONNECTED) {
+        delay(100);
+    }
+
+    // start webSocket server
+    webSocket.begin();
+    webSocket.onEvent(webSocketEvent);
+
+    if(MDNS.begin("esp8266")) {
+        USE_SERIAL.println("MDNS responder started");
+    }
+
+    // handle index
+    server.on("/", []() {
+        // send index.html
+        server.send(200, "text/html", "<html><head><script>var connection = new WebSocket('ws://'+location.hostname+':81/', ['arduino']);connection.onopen = function () {  connection.send('Connect ' + new Date()); }; connection.onerror = function (error) {    console.log('WebSocket Error ', error);};connection.onmessage = function (e) {  console.log('Server: ', e.data);};function sendRGB() {  var r = parseInt(document.getElementById('r').value).toString(16);  var g = parseInt(document.getElementById('g').value).toString(16);  var b = parseInt(document.getElementById('b').value).toString(16);  if(r.length < 2) { r = '0' + r; }   if(g.length < 2) { g = '0' + g; }   if(b.length < 2) { b = '0' + b; }   var rgb = '#'+r+g+b;    console.log('RGB: ' + rgb); connection.send(rgb); }</script></head><body>LED Control:<br/><br/>R: <input id=\"r\" type=\"range\" min=\"0\" max=\"255\" step=\"1\" oninput=\"sendRGB();\" /><br/>G: <input id=\"g\" type=\"range\" min=\"0\" max=\"255\" step=\"1\" oninput=\"sendRGB();\" /><br/>B: <input id=\"b\" type=\"range\" min=\"0\" max=\"255\" step=\"1\" oninput=\"sendRGB();\" /><br/></body></html>");
+    });
+
+    server.begin();
+
+    // Add service to MDNS
+    MDNS.addService("http", "tcp", 80);
+    MDNS.addService("ws", "tcp", 81);
+
+    digitalWrite(LED_RED, 0);
+    digitalWrite(LED_GREEN, 0);
+    digitalWrite(LED_BLUE, 0);
+
+}
+
+unsigned long last_10sec = 0;
+unsigned int counter = 0;
+
+void loop() {
+    unsigned long t = millis();
+    webSocket.loop();
+    server.handleClient();
+
+    if((t - last_10sec) > 10 * 1000) {
+        counter++;
+        bool ping = (counter % 2);
+        int i = webSocket.connectedClients(ping);
+        USE_SERIAL.printf("%d Connected websocket clients ping: %d\n", i, ping);
+        last_10sec = millis();
+    }
+}
--- a/library.json
+++ b/library.json
@ -13,7 +13,7 @@
        "type": "git",
        "url": "https://github.com/Links2004/arduinoWebSockets.git"
    },
-    "version": "2.1.0",
+    "version": "2.1.1",
    "license": "LGPL-2.1",
    "export": {
        "exclude": [
@ -21,8 +21,5 @@
        ]
    },
    "frameworks": "arduino",
-    "platforms": "*",
-    "examples": [
-        "examples/*/*.ino"
-    ]
+    "platforms": "atmelavr, espressif8266, espressif32"
 }
--- a/library.properties
+++ b/library.properties
@ -1,5 +1,5 @@
 name=WebSockets
-version=2.1.0
+version=2.1.1
 author=Markus Sattler
 maintainer=Markus Sattler
 sentence=WebSockets for Arduino (Server + Client)
--- a/src/WebSockets.cpp
+++ b/src/WebSockets.cpp
@ -253,7 +253,7 @@ bool WebSockets::sendFrame(WSclient_t * client, WSopcode_t opcode, uint8_t * pay
        }
    }

-    DEBUG_WEBSOCKETS("[WS][%d][sendFrame] sending Frame Done (%uus).\n", client->num, (micros() - start));
+    DEBUG_WEBSOCKETS("[WS][%d][sendFrame] sending Frame Done (%luus).\n", client->num, (micros() - start));

 #ifdef WEBSOCKETS_USE_BIG_MEM
    if(useInternBuffer && payloadPtr) {
@ -271,7 +271,7 @@ bool WebSockets::sendFrame(WSclient_t * client, WSopcode_t opcode, uint8_t * pay
 void WebSockets::headerDone(WSclient_t * client) {
    client->status = WSC_CONNECTED;
    client->cWsRXsize = 0;
-    DEBUG_WEBSOCKETS("[WS][%d][headerDone] Header Handling Done (%uus).\n", client->num);
+    DEBUG_WEBSOCKETS("[WS][%d][headerDone] Header Handling Done.\n", client->num);
 #if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
    client->cHttpLine = "";
    handleWebsocket(client);
@ -440,11 +440,12 @@ void WebSockets::handleWebsocketPayloadCb(WSclient_t * client, bool ok, uint8_t
                DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] get pong (%s)\n", client->num, payload ? (const char*)payload : "");
                break;
            case WSop_close: {
-                uint16_t reasonCode = 1000;
-                if(header->payloadLen >= 2) {
-                    reasonCode = payload[0] << 8 | payload[1];
-                }
-
+                #ifndef NODEBUG_WEBSOCKETS
+                    uint16_t reasonCode = 1000;
+                    if(header->payloadLen >= 2) {
+                        reasonCode = payload[0] << 8 | payload[1];
+                    }
+                #endif
                DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] get ask for close. Code: %d", client->num, reasonCode);
                if(header->payloadLen > 2) {
                    DEBUG_WEBSOCKETS(" (%s)\n", (payload + 2));
@ -547,7 +548,7 @@ bool WebSockets::readCb(WSclient_t * client, uint8_t * out, size_t n, WSreadWait
 #else
    unsigned long t = millis();
    size_t len;
-    DEBUG_WEBSOCKETS("[readCb] n: %d t: %d\n", n, t);
+    DEBUG_WEBSOCKETS("[readCb] n: %zu t: %lu\n", n, t);
    while(n > 0) {
        if(client->tcp == NULL) {
            DEBUG_WEBSOCKETS("[readCb] tcp is null!\n");
@ -566,7 +567,7 @@ bool WebSockets::readCb(WSclient_t * client, uint8_t * out, size_t n, WSreadWait
        }

        if((millis() - t) > WEBSOCKETS_TCP_TIMEOUT) {
-            DEBUG_WEBSOCKETS("[readCb] receive TIMEOUT! %d\n", (millis() - t));
+            DEBUG_WEBSOCKETS("[readCb] receive TIMEOUT! %lu\n", (millis() - t));
            if(cb) {
                cb(client, false);
            }
@ -613,7 +614,7 @@ size_t WebSockets::write(WSclient_t * client, uint8_t *out, size_t n) {
 	unsigned long t = millis();
 	size_t len = 0;
 	size_t total = 0;
-	DEBUG_WEBSOCKETS("[write] n: %d t: %d\n", n, t);
+	DEBUG_WEBSOCKETS("[write] n: %zu t: %lu\n", n, t);
 	while(n > 0) {
 		if(client->tcp == NULL) {
 			DEBUG_WEBSOCKETS("[write] tcp is null!\n");
@ -626,7 +627,7 @@ size_t WebSockets::write(WSclient_t * client, uint8_t *out, size_t n) {
 		}

 		if((millis() - t) > WEBSOCKETS_TCP_TIMEOUT) {
-			DEBUG_WEBSOCKETS("[write] write TIMEOUT! %d\n", (millis() - t));
+			DEBUG_WEBSOCKETS("[write] write TIMEOUT! %lu\n", (millis() - t));
 			break;
 		}

--- a/src/WebSockets.h
+++ b/src/WebSockets.h
@ -30,9 +30,16 @@
 #define bit(b) (1UL << (b)) // Taken directly from Arduino.h
 #else
 #include <Arduino.h>
+#include <IPAddress.h>
 #endif

+#ifdef ARDUINO_ARCH_AVR
+#error Version 2.x.x currently does not support Arduino with AVR since there is no support for std namespace of c++.
+#error Use Version 1.x.x. (ATmega branch)
+#else
 #include <functional>
+#endif
+

 #ifndef NODEBUG_WEBSOCKETS
 #ifdef DEBUG_ESP_PORT
@ -272,10 +279,10 @@ class WebSockets {
        typedef std::function<void(WSclient_t * client, bool ok)> WSreadWaitCb;
 #endif

-        virtual void clientDisconnect(WSclient_t * client);
-        virtual bool clientIsConnected(WSclient_t * client);
+        virtual void clientDisconnect(WSclient_t * client) = 0;
+        virtual bool clientIsConnected(WSclient_t * client) = 0;

-        virtual void messageReceived(WSclient_t * client, WSopcode_t opcode, uint8_t * payload, size_t length, bool fin);
+        virtual void messageReceived(WSclient_t * client, WSopcode_t opcode, uint8_t * payload, size_t length, bool fin) = 0;

        void clientDisconnect(WSclient_t * client, uint16_t code, char * reason = NULL, size_t reasonLen = 0);
        bool sendFrame(WSclient_t * client, WSopcode_t opcode, uint8_t * payload = NULL, size_t length = 0, bool mask = false, bool fin = true, bool headerToPayload = false);
@ -298,4 +305,7 @@ class WebSockets {

 };

+#ifndef UNUSED
+#define UNUSED(var) (void)(var)
+#endif
 #endif /* WEBSOCKETS_H_ */
--- a/src/WebSocketsClient.cpp
+++ b/src/WebSocketsClient.cpp
@ -25,7 +25,6 @@
 #include "WebSockets.h"
 #include "WebSocketsClient.h"

-
 WebSocketsClient::WebSocketsClient() {
    _cbEvent = NULL;
    _client.num = 0;
@ -84,6 +83,10 @@ void WebSocketsClient::begin(String host, uint16_t port, String url, String prot
    begin(host.c_str(), port, url.c_str(), protocol.c_str());
 }

+void WebSocketsClient::begin(IPAddress host, uint16_t port, const char * url, const char * protocol) {
+    return begin(host.toString().c_str(), port, url, protocol);
+}
+
 #if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
 void WebSocketsClient::beginSSL(const char *host, uint16_t port, const char * url, const char * fingerprint, const char * protocol) {
    begin(host, port, url, protocol);
@ -124,10 +127,10 @@ void WebSocketsClient::beginSocketIOSSL(String host, uint16_t port, String url,
 */
 void WebSocketsClient::loop(void) {
    if(!clientIsConnected(&_client)) {
-    	// do not flood the server
-    	if((millis() - _lastConnectionFail) < _reconnectInterval) {
-    		return;
-    	}
+        // do not flood the server
+        if((millis() - _lastConnectionFail) < _reconnectInterval) {
+            return;
+        }

 #if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
        if(_client.isSSL) {
@ -248,7 +251,6 @@ bool WebSocketsClient::sendPing(String & payload) {
    return sendPing((uint8_t *) payload.c_str(), payload.length());
 }

-
 /**
 * disconnect one client
 * @param num uint8_t client id
@ -269,7 +271,7 @@ void WebSocketsClient::setAuthorization(const char * user, const char * password
        String auth = user;
        auth += ":";
        auth += password;
-        _client.base64Authorization = base64_encode((uint8_t *)auth.c_str(), auth.length());
+        _client.base64Authorization = base64_encode((uint8_t *) auth.c_str(), auth.length());
    }
 }

@ -293,14 +295,13 @@ void WebSocketsClient::setExtraHeaders(const char * extraHeaders) {
    _client.extraHeaders = extraHeaders;
 }

-
 /**
 * set the reconnect Interval
 * how long to wait after a connection initiate failed
 * @param time in ms
 */
 void WebSocketsClient::setReconnectInterval(unsigned long time) {
-	_reconnectInterval = time;
+    _reconnectInterval = time;
 }

 //#################################################################################
@ -317,6 +318,8 @@ void WebSocketsClient::setReconnectInterval(unsigned long time) {
 void WebSocketsClient::messageReceived(WSclient_t * client, WSopcode_t opcode, uint8_t * payload, size_t length, bool fin) {
    WStype_t type = WStype_ERROR;

+    UNUSED(client);
+
    switch(opcode) {
        case WSop_text:
            type = fin ? WStype_TEXT : WStype_FRAGMENT_TEXT_START;
@ -324,9 +327,14 @@ void WebSocketsClient::messageReceived(WSclient_t * client, WSopcode_t opcode, u
        case WSop_binary:
            type = fin ? WStype_BIN : WStype_FRAGMENT_BIN_START;
            break;
-		case WSop_continuation:
-			type = fin ? WStype_FRAGMENT_FIN : WStype_FRAGMENT;
-			break;
+        case WSop_continuation:
+            type = fin ? WStype_FRAGMENT_FIN : WStype_FRAGMENT;
+            break;
+        case WSop_close:
+        case WSop_ping:
+        case WSop_pong:
+        default:
+            break;
    }

    runCbEvent(type, payload, length);
@ -425,8 +433,7 @@ void WebSocketsClient::handleClientData(void) {
    int len = _client.tcp->available();
    if(len > 0) {
        switch(_client.status) {
-            case WSC_HEADER:
-            {
+            case WSC_HEADER: {
                String headerLine = _client.tcp->readStringUntil('\n');
                handleHeader(&_client, &headerLine);
            }
@ -445,14 +452,13 @@ void WebSocketsClient::handleClientData(void) {
 }
 #endif

-
 /**
 * send the WebSocket header to Server
 * @param client WSclient_t *  ptr to the client struct
 */
 void WebSocketsClient::sendHeader(WSclient_t * client) {

-	static const char * NEW_LINE = "\r\n";
+    static const char * NEW_LINE = "\r\n";

    DEBUG_WEBSOCKETS("[WS-Client][sendHeader] sending header...\n");

@ -473,67 +479,67 @@ void WebSocketsClient::sendHeader(WSclient_t * client) {
    String url = client->cUrl;

    if(client->isSocketIO) {
-    	if(client->cSessionId.length() == 0) {
-    		url += WEBSOCKETS_STRING("&transport=polling");
-    		ws_header = false;
-    	} else {
-    		url += WEBSOCKETS_STRING("&transport=websocket&sid=");
-    		url += client->cSessionId;
-    	}
+        if(client->cSessionId.length() == 0) {
+            url += WEBSOCKETS_STRING("&transport=polling");
+            ws_header = false;
+        } else {
+            url += WEBSOCKETS_STRING("&transport=websocket&sid=");
+            url += client->cSessionId;
+        }
    }

-	handshake = WEBSOCKETS_STRING("GET ");
-	handshake += url + WEBSOCKETS_STRING(" HTTP/1.1\r\n"
-			"Host: ");
-	handshake += _host + ":" + _port + NEW_LINE;
+    handshake = WEBSOCKETS_STRING("GET ");
+    handshake += url + WEBSOCKETS_STRING(" HTTP/1.1\r\n"
+            "Host: ");
+    handshake += _host + ":" + _port + NEW_LINE;

-	if(ws_header) {
-		handshake += WEBSOCKETS_STRING("Connection: Upgrade\r\n"
-				"Upgrade: websocket\r\n"
-				"Sec-WebSocket-Version: 13\r\n"
-				"Sec-WebSocket-Key: ");
-		handshake += client->cKey + NEW_LINE;
+    if(ws_header) {
+        handshake += WEBSOCKETS_STRING("Connection: Upgrade\r\n"
+                "Upgrade: websocket\r\n"
+                "Sec-WebSocket-Version: 13\r\n"
+                "Sec-WebSocket-Key: ");
+        handshake += client->cKey + NEW_LINE;

-		if(client->cProtocol.length() > 0) {
-			handshake += WEBSOCKETS_STRING("Sec-WebSocket-Protocol: ");
-			handshake +=client->cProtocol + NEW_LINE;
-		}
+        if(client->cProtocol.length() > 0) {
+            handshake += WEBSOCKETS_STRING("Sec-WebSocket-Protocol: ");
+            handshake += client->cProtocol + NEW_LINE;
+        }

-		if(client->cExtensions.length() > 0) {
-			handshake += WEBSOCKETS_STRING("Sec-WebSocket-Extensions: ");
-			handshake +=client->cExtensions + NEW_LINE;
-		}
-	} else {
-		handshake += WEBSOCKETS_STRING("Connection: keep-alive\r\n");
-	}
+        if(client->cExtensions.length() > 0) {
+            handshake += WEBSOCKETS_STRING("Sec-WebSocket-Extensions: ");
+            handshake += client->cExtensions + NEW_LINE;
+        }
+    } else {
+        handshake += WEBSOCKETS_STRING("Connection: keep-alive\r\n");
+    }

-	// add extra headers; by default this includes "Origin: file://"
-	if (client->extraHeaders) {
-		handshake += client->extraHeaders + NEW_LINE;
-	}	
+    // add extra headers; by default this includes "Origin: file://"
+    if(client->extraHeaders) {
+        handshake += client->extraHeaders + NEW_LINE;
+    }

-	handshake += WEBSOCKETS_STRING("User-Agent: arduino-WebSocket-Client\r\n");
+    handshake += WEBSOCKETS_STRING("User-Agent: arduino-WebSocket-Client\r\n");

-	if(client->base64Authorization.length() > 0) {
-		handshake += WEBSOCKETS_STRING("Authorization: Basic ");
-		handshake += client->base64Authorization + NEW_LINE;
-	}
+    if(client->base64Authorization.length() > 0) {
+        handshake += WEBSOCKETS_STRING("Authorization: Basic ");
+        handshake += client->base64Authorization + NEW_LINE;
+    }

-	if(client->plainAuthorization.length() > 0) {
-		handshake += WEBSOCKETS_STRING("Authorization: ");
-		handshake += client->plainAuthorization + NEW_LINE;
-	}
+    if(client->plainAuthorization.length() > 0) {
+        handshake += WEBSOCKETS_STRING("Authorization: ");
+        handshake += client->plainAuthorization + NEW_LINE;
+    }

-	handshake += NEW_LINE;
+    handshake += NEW_LINE;

-    DEBUG_WEBSOCKETS("[WS-Client][sendHeader] handshake %s", (uint8_t*)handshake.c_str());
-    write(client, (uint8_t*)handshake.c_str(), handshake.length());
+    DEBUG_WEBSOCKETS("[WS-Client][sendHeader] handshake %s", (uint8_t* )handshake.c_str());
+    write(client, (uint8_t*) handshake.c_str(), handshake.length());

 #if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
-        client->tcp->readStringUntil('\n', &(client->cHttpLine), std::bind(&WebSocketsClient::handleHeader, this, client, &(client->cHttpLine)));
+    client->tcp->readStringUntil('\n', &(client->cHttpLine), std::bind(&WebSocketsClient::handleHeader, this, client, &(client->cHttpLine)));
 #endif

-    DEBUG_WEBSOCKETS("[WS-Client][sendHeader] sending header... Done (%uus).\n", (micros() - start));
+    DEBUG_WEBSOCKETS("[WS-Client][sendHeader] sending header... Done (%luus).\n", (micros() - start));

 }

@ -553,7 +559,12 @@ void WebSocketsClient::handleHeader(WSclient_t * client, String * headerLine) {
            client->cCode = headerLine->substring(9, headerLine->indexOf(' ', 9)).toInt();
        } else if(headerLine->indexOf(':')) {
            String headerName = headerLine->substring(0, headerLine->indexOf(':'));
-            String headerValue = headerLine->substring(headerLine->indexOf(':') + 2);
+            String headerValue = headerLine->substring(headerLine->indexOf(':') + 1);
+
+            // remove space in the beginning  (RFC2616)
+            if(headerValue[0] == ' ') {
+                headerValue.remove(0, 1);
+            }

            if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Connection"))) {
                if(headerValue.equalsIgnoreCase(WEBSOCKETS_STRING("upgrade"))) {
@ -573,10 +584,10 @@ void WebSocketsClient::handleHeader(WSclient_t * client, String * headerLine) {
            } else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Sec-WebSocket-Version"))) {
                client->cVersion = headerValue.toInt();
            } else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Set-Cookie"))) {
-                if (headerValue.indexOf(WEBSOCKETS_STRING("HttpOnly")) > -1) {
+                if(headerValue.indexOf(WEBSOCKETS_STRING("HttpOnly")) > -1) {
                    client->cSessionId = headerValue.substring(headerValue.indexOf('=') + 1, headerValue.indexOf(";"));
-                } else { 
-                    client->cSessionId = headerValue.substring(headerValue.indexOf('=') + 1); 
+                } else {
+                    client->cSessionId = headerValue.substring(headerValue.indexOf('=') + 1);
                }
            }
        } else {
@ -648,17 +659,17 @@ void WebSocketsClient::handleHeader(WSclient_t * client, String * headerLine) {

            runCbEvent(WStype_CONNECTED, (uint8_t *) client->cUrl.c_str(), client->cUrl.length());

-		} else if(clientIsConnected(client) && client->isSocketIO && client->cSessionId.length() > 0) {
-			sendHeader(client);
-		} else {
-			DEBUG_WEBSOCKETS("[WS-Client][handleHeader] no Websocket connection close.\n");
-			_lastConnectionFail = millis();
-			if(clientIsConnected(client)) {
-				write(client, "This is a webSocket client!");
-			}
-			clientDisconnect(client);
-		}
-	}
+        } else if(clientIsConnected(client) && client->isSocketIO && client->cSessionId.length() > 0) {
+            sendHeader(client);
+        } else {
+            DEBUG_WEBSOCKETS("[WS-Client][handleHeader] no Websocket connection close.\n");
+            _lastConnectionFail = millis();
+            if(clientIsConnected(client)) {
+                write(client, "This is a webSocket client!");
+            }
+            clientDisconnect(client);
+        }
+    }
 }

 void WebSocketsClient::connectedCb() {
@ -667,15 +678,15 @@ void WebSocketsClient::connectedCb() {

 #if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
    _client.tcp->onDisconnect(std::bind([](WebSocketsClient * c, AsyncTCPbuffer * obj, WSclient_t * client) -> bool {
-        DEBUG_WEBSOCKETS("[WS-Server][%d] Disconnect client\n", client->num);
-        client->status = WSC_NOT_CONNECTED;
-        client->tcp = NULL;
+                        DEBUG_WEBSOCKETS("[WS-Server][%d] Disconnect client\n", client->num);
+                        client->status = WSC_NOT_CONNECTED;
+                        client->tcp = NULL;

-        // reconnect
-        c->asyncConnect();
+                        // reconnect
+                        c->asyncConnect();

-        return true;
-    }, this, std::placeholders::_1, &_client));
+                        return true;
+                    }, this, std::placeholders::_1, &_client));
 #endif

    _client.status = WSC_HEADER;
@ -702,7 +713,6 @@ void WebSocketsClient::connectedCb() {

 }

-
 void WebSocketsClient::connectFailedCb() {
    DEBUG_WEBSOCKETS("[WS-Client] connection to %s:%u Faild\n", _host.c_str(), _port);
 }
@ -721,26 +731,26 @@ void WebSocketsClient::asyncConnect() {
    }

    tcpclient->onDisconnect([](void *obj, AsyncClient* c) {
-        c->free();
-        delete c;
-    });
+                c->free();
+                delete c;
+            });

    tcpclient->onConnect(std::bind([](WebSocketsClient * ws , AsyncClient * tcp) {
-        ws->_client.tcp = new AsyncTCPbuffer(tcp);
-        if(!ws->_client.tcp) {
-            DEBUG_WEBSOCKETS("[WS-Client] creating Network class failed!\n");
-            ws->connectFailedCb();
-            return;
-        }
-        ws->connectedCb();
-    }, this, std::placeholders::_2));
+                        ws->_client.tcp = new AsyncTCPbuffer(tcp);
+                        if(!ws->_client.tcp) {
+                            DEBUG_WEBSOCKETS("[WS-Client] creating Network class failed!\n");
+                            ws->connectFailedCb();
+                            return;
+                        }
+                        ws->connectedCb();
+                    }, this, std::placeholders::_2));

    tcpclient->onError(std::bind([](WebSocketsClient * ws , AsyncClient * tcp) {
-        ws->connectFailedCb();
+                        ws->connectFailedCb();

-        // reconnect
-        ws->asyncConnect();
-    }, this, std::placeholders::_2));
+                        // reconnect
+                        ws->asyncConnect();
+                    }, this, std::placeholders::_2));

    if(!tcpclient->connect(_host.c_str(), _port)) {
        connectFailedCb();
--- a/src/WebSocketsClient.h
+++ b/src/WebSocketsClient.h
@ -41,6 +41,7 @@ class WebSocketsClient: private WebSockets {

        void begin(const char *host, uint16_t port, const char * url = "/", const char * protocol = "arduino");
        void begin(String host, uint16_t port, String url = "/", String protocol = "arduino");
+        void begin(IPAddress host, uint16_t port, const char * url = "/", const char * protocol = "arduino");

 #if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
        void beginSSL(const char *host, uint16_t port, const char * url = "/", const char * = "", const char * protocol = "arduino");
--- a/src/WebSocketsServer.cpp
+++ b/src/WebSocketsServer.cpp
@ -29,6 +29,7 @@ WebSocketsServer::WebSocketsServer(uint16_t port, String origin, String protocol
    _port = port;
    _origin = origin;
    _protocol = protocol;
+    _runnning = false;

    _server = new WEBSOCKETS_NETWORK_SERVER_CLASS(port);

@ -50,15 +51,7 @@ WebSocketsServer::WebSocketsServer(uint16_t port, String origin, String protocol

 WebSocketsServer::~WebSocketsServer() {
    // disconnect all clients
-    disconnect();
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
-    _server->close();
-#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
-    _server->end();
-#else
-    // TODO how to close server?
-#endif
+	close();

    if (_mandatoryHttpHeaders)
        delete[] _mandatoryHttpHeaders;
@ -110,18 +103,35 @@ void WebSocketsServer::begin(void) {
    randomSeed(millis());
 #endif

+    _runnning = true;
    _server->begin();

    DEBUG_WEBSOCKETS("[WS-Server] Server Started.\n");
 }

+void WebSocketsServer::close(void) {
+	_runnning = false;
+	 disconnect();
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+    _server->close();
+#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+    _server->end();
+#else
+    // TODO how to close server?
+#endif
+
+}
+
 #if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
 /**
 * called in arduino loop
 */
 void WebSocketsServer::loop(void) {
-    handleNewClients();
-    handleClientData();
+	if(_runnning) {
+		handleNewClients();
+		handleClientData();
+	}
 }
 #endif

@ -393,6 +403,24 @@ void WebSocketsServer::setAuthorization(const char * auth) {
    }
 }

+/**
+ * count the connected clients (optional ping them)
+ * @param ping bool ping the connected clients
+ */
+int WebSocketsServer::connectedClients(bool ping) {
+    WSclient_t * client;
+    int count = 0;
+	for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
+		client = &_clients[i];
+		if(client->status == WSC_CONNECTED) {
+			if(ping != true || sendPing(i)) {
+				count++;
+			}
+		}
+	}
+    return count;
+}
+
 #if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
 /**
 * get an IP for a client
@ -490,6 +518,11 @@ void WebSocketsServer::messageReceived(WSclient_t * client, WSopcode_t opcode, u
        case WSop_continuation:
            type = fin ? WStype_FRAGMENT_FIN : WStype_FRAGMENT;
            break;
+        case WSop_close:
+        case WSop_ping:
+        case WSop_pong:
+        default:
+            break;
    }

    runCbEvent(client->num, type, payload, length);
@ -684,55 +717,60 @@ void WebSocketsServer::handleHeader(WSclient_t * client, String * headerLine) {

 	static const char * NEW_LINE = "\r\n";

-    headerLine->trim(); // remove \r
+	headerLine->trim(); // remove \r

-    if(headerLine->length() > 0) {
-        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] RX: %s\n", client->num, headerLine->c_str());
+	if(headerLine->length() > 0) {
+		DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] RX: %s\n", client->num, headerLine->c_str());

-        // websocket requests always start with GET see rfc6455
-        if(headerLine->startsWith("GET ")) {
+		// websocket requests always start with GET see rfc6455
+		if(headerLine->startsWith("GET ")) {

-            // cut URL out
-            client->cUrl = headerLine->substring(4, headerLine->indexOf(' ', 4));
+			// cut URL out
+			client->cUrl = headerLine->substring(4, headerLine->indexOf(' ', 4));

-            //reset non-websocket http header validation state for this client
+			//reset non-websocket http header validation state for this client
 			client->cHttpHeadersValid = true;
 			client->cMandatoryHeadersCount = 0;

-        } else if(headerLine->indexOf(':')) {
-            String headerName = headerLine->substring(0, headerLine->indexOf(':'));
-            String headerValue = headerLine->substring(headerLine->indexOf(':') + 2);
+		} else if(headerLine->indexOf(':')) {
+			String headerName = headerLine->substring(0, headerLine->indexOf(':'));
+			String headerValue = headerLine->substring(headerLine->indexOf(':') + 1);

-            if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Connection"))) {
-                headerValue.toLowerCase();
-            	if(headerValue.indexOf(WEBSOCKETS_STRING("upgrade")) >= 0) {
-                    client->cIsUpgrade = true;
-                }
-            } else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Upgrade"))) {
-                if(headerValue.equalsIgnoreCase(WEBSOCKETS_STRING("websocket"))) {
-                    client->cIsWebsocket = true;
-                }
-            } else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Sec-WebSocket-Version"))) {
-                client->cVersion = headerValue.toInt();
-            } else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Sec-WebSocket-Key"))) {
-                client->cKey = headerValue;
-                client->cKey.trim(); // see rfc6455
-            } else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Sec-WebSocket-Protocol"))) {
-                client->cProtocol = headerValue;
-            } else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Sec-WebSocket-Extensions"))) {
-                client->cExtensions = headerValue;
-            } else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Authorization"))) {
-                client->base64Authorization = headerValue;
-            } else {
-            	client->cHttpHeadersValid &= execHttpHeaderValidation(headerName, headerValue);
-            	if (_mandatoryHttpHeaderCount > 0 && hasMandatoryHeader(headerName)) {
-            		client->cMandatoryHeadersCount++;
-            	}
-            }
+			// remove space in the beginning (RFC2616)
+			if(headerValue[0] == ' ') {
+				headerValue.remove(0, 1);
+			}

-        } else {
-            DEBUG_WEBSOCKETS("[WS-Client][handleHeader] Header error (%s)\n", headerLine->c_str());
-        }
+			if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Connection"))) {
+				headerValue.toLowerCase();
+				if(headerValue.indexOf(WEBSOCKETS_STRING("upgrade")) >= 0) {
+					client->cIsUpgrade = true;
+				}
+			} else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Upgrade"))) {
+				if(headerValue.equalsIgnoreCase(WEBSOCKETS_STRING("websocket"))) {
+					client->cIsWebsocket = true;
+				}
+			} else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Sec-WebSocket-Version"))) {
+				client->cVersion = headerValue.toInt();
+			} else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Sec-WebSocket-Key"))) {
+				client->cKey = headerValue;
+				client->cKey.trim(); // see rfc6455
+			} else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Sec-WebSocket-Protocol"))) {
+				client->cProtocol = headerValue;
+			} else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Sec-WebSocket-Extensions"))) {
+				client->cExtensions = headerValue;
+			} else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Authorization"))) {
+				client->base64Authorization = headerValue;
+			} else {
+				client->cHttpHeadersValid &= execHttpHeaderValidation(headerName, headerValue);
+				if(_mandatoryHttpHeaderCount > 0 && hasMandatoryHeader(headerName)) {
+					client->cMandatoryHeadersCount++;
+				}
+			}
+
+		} else {
+			DEBUG_WEBSOCKETS("[WS-Client][handleHeader] Header error (%s)\n", headerLine->c_str());
+		}

        (*headerLine) = "";
 #if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
@ -754,11 +792,11 @@ void WebSocketsServer::handleHeader(WSclient_t * client, String * headerLine) {

        bool ok = (client->cIsUpgrade && client->cIsWebsocket);

-        if(ok) {
-            if(client->cUrl.length() == 0) {
-                ok = false;
-            }
-            if(client->cKey.length() == 0) {
+		if(ok) {
+			if(client->cUrl.length() == 0) {
+				ok = false;
+			}
+			if(client->cKey.length() == 0) {
                ok = false;
            }
            if(client->cVersion != 13) {
--- a/src/WebSocketsServer.h
+++ b/src/WebSocketsServer.h
@ -27,7 +27,9 @@

 #include "WebSockets.h"

+#ifndef WEBSOCKETS_SERVER_CLIENT_MAX
 #define WEBSOCKETS_SERVER_CLIENT_MAX  (5)
+#endif



@ -47,6 +49,7 @@ public:
        virtual ~WebSocketsServer(void);

        void begin(void);
+        void close(void);

 #if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
        void loop(void);
@ -92,6 +95,8 @@ public:
        void setAuthorization(const char * user, const char * password);
        void setAuthorization(const char * auth);

+        int connectedClients(bool ping = false);
+
 #if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
        IPAddress remoteIP(uint8_t num);
 #endif
@ -111,6 +116,8 @@ protected:
        WebSocketServerEvent _cbEvent;
        WebSocketServerHttpHeaderValFunc _httpHeaderValidationFunc;

+        bool _runnning;
+
        bool newClient(WEBSOCKETS_NETWORK_CLASS * TCPclient);

        void messageReceived(WSclient_t * client, WSopcode_t opcode, uint8_t * payload, size_t length, bool fin);
--- a/tests/webSocketServer/index.js
+++ b/tests/webSocketServer/index.js
@ -7,7 +7,7 @@ var server = http.createServer(function(request, response) {
    response.writeHead(404);
    response.end();
 });
-server.listen(81, function() {
+server.listen(8011, function() {
    console.log((new Date()) + ' Server is listening on port 8011');
 });
 
@ -54,4 +54,4 @@ wsServer.on('request', function(request) {
    });
 	
 	connection.sendUTF("Hallo Client!");
-});
+});
Author	SHA1	Message	Date
Links	2626b26315	Merge commit '32dd01b91bbae7f10b0b77ac200e69ea064ed44f'	2018-08-08 18:13:14 +02:00
Links	32dd01b91b	bump version to 2.1.1	2018-08-08 18:11:32 +02:00
Markus	db8167f9c7	Merge pull request #355 from Links2004/ESP32_serial ESP32 fixes	2018-08-07 18:31:43 +02:00
Links	388683d4cd	fix compiler warnings for ESP32 - #319	2018-08-07 18:10:48 +02:00
Links	38c401b8af	adapt to ESP32 repo changes `4e5cbdaa7f`	2018-08-07 18:06:32 +02:00
Markus	f7a7ab6ab4	wrap reasonCode in define see #343	2018-07-04 16:29:28 +02:00
Markus	bdee8b9744	call end for ESP8266_ASYNC TCP Server	2018-06-21 09:30:11 +02:00
Links	7ddcdc2bd3	add info for AVR usage with version 2.x.x	2018-05-12 12:40:56 +02:00
Links	bde97179bf	fix unused parameter warnings fix switch warinings part of #319	2018-05-12 11:39:59 +02:00
Links	9ce044e550	code style	2018-05-12 11:34:12 +02:00
Links	a796079b0c	fix code style	2018-05-12 11:27:03 +02:00
Links	e8c0d775fb	fix #146 HTTP Header handler	2018-05-12 11:22:16 +02:00
Links	5636b02b46	add WebSocketServerAllFunctionsDemo (WIP)	2018-05-10 20:47:05 +02:00
Links	4b33575af1	add connectedClients see #242	2018-05-10 20:43:08 +02:00
Links	486a612693	allow usage of IPAddress #230	2018-05-10 20:12:48 +02:00
Links	ea8e81c6ce	add close #322	2018-05-10 18:56:31 +02:00
Markus	8a187b523b	Merge pull request #323 from chemicstry/printf_fix Fix format specifiers	2018-05-10 18:48:43 +02:00
chemicstry	ac8d806085	Fix format specifiers	2018-05-10 01:16:39 +03:00
Markus	02e0128802	Update index.js fix port	2018-04-17 19:42:47 +02:00
Markus	01e1fdfb50	Merge pull request #304 from CarlosRDomin/master Allow custom WEBSOCKETS_SERVER_CLIENT_MAX definition	2018-04-03 19:21:22 +02:00
Carlos Ruiz	d02932ef21	Allow custom WEBSOCKETS_SERVER_CLIENT_MAX definition	2018-04-02 22:17:34 -07:00
Markus	5bf8b2407e	Merge pull request #296 from getbyte/master fix undefined virtual methods	2018-03-18 07:34:57 +01:00
getbyte	50d9a8d6e5	fix undefined virtual methods	2018-03-18 01:25:49 +03:00
Markus	7443f9b1dc	Merge pull request #292 from ivankravets/patch-2 Update supported platforms, allow PIO to detect examples automatically	2018-03-07 18:49:05 +01:00
Ivan Kravets	4b04f6fa53	Update supported platforms, allow PIO to detect examples automatically	2018-03-07 10:33:33 +02:00