fix _fingerprint is set checks for ESP32

see #633 and #632

.github/workflows/main.yml

@@ -33,20 +33,21 @@ jobs:
         run: |
           source $GITHUB_WORKSPACE/travis/common.sh
           cd $GITHUB_WORKSPACE
+          echo -en "::set-output name=matrix::"
+          echo -en "["
 
-          echo -en "matrix=" >> $GITHUB_OUTPUT
-          echo -en "[" >> $GITHUB_OUTPUT
+          get_sketches_json_matrix arduino $GITHUB_WORKSPACE/examples/esp8266 esp8266 1.6.13 esp8266com:esp8266:generic:xtal=80
+          echo -en ","
 
-          get_sketches_json_matrix arduino $GITHUB_WORKSPACE/examples/esp8266_pico esp8266 1.8.19 esp8266com:esp8266:generic:xtal=80,vt=flash,exception=disabled,stacksmash=disabled,ssl=all,mmu=3232,non32xfer=fast,ResetMethod=nodemcu,CrystalFreq=26,FlashFreq=80,FlashMode=qio,eesz=4M2M,led=2,sdk=nonosdk_190703,ip=lm2f,dbg=Serial1,lvl=SSL,wipe=none,baud=115200 >> $GITHUB_OUTPUT
-          echo -en "," >> $GITHUB_OUTPUT
+          get_sketches_json_matrix arduino $GITHUB_WORKSPACE/examples/esp8266 esp8266 1.6.13 esp8266com:esp8266:generic:xtal=80,dbg=Serial1
+          echo -en ","
 
-          get_sketches_json_matrix arduino $GITHUB_WORKSPACE/examples/esp8266_pico esp8266 1.8.19 esp8266com:esp8266:generic:xtal=80,vt=flash,exception=disabled,stacksmash=disabled,ssl=all,mmu=3232,non32xfer=fast,ResetMethod=nodemcu,CrystalFreq=26,FlashFreq=80,FlashMode=qio,eesz=4M2M,led=2,sdk=nonosdk_190703,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=115200 >> $GITHUB_OUTPUT
-          echo -en "," >> $GITHUB_OUTPUT
+          get_sketches_json_matrix arduino $GITHUB_WORKSPACE/examples/esp8266 esp8266 1.8.13 esp8266com:esp8266:generic:xtal=80,eesz=1M,FlashMode=qio,FlashFreq=80
+          echo -en ","
 
-          get_sketches_json_matrix arduino $GITHUB_WORKSPACE/examples/esp32 esp32 1.8.19 espressif:esp32:esp32:FlashFreq=80 >> $GITHUB_OUTPUT
+          get_sketches_json_matrix arduino $GITHUB_WORKSPACE/examples/esp32 esp32 1.8.13 espressif:esp32:esp32:FlashFreq=80
 
-          echo -en "]" >> $GITHUB_OUTPUT
-          echo >> $GITHUB_OUTPUT
+          echo -en "]"
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
 
@@ -55,7 +56,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        IDE_VERSION: [1.8.19]
+        IDE_VERSION: [1.8.13, 1.6.13]
     env:
       IDE_VERSION: ${{ matrix.IDE_VERSION }}
 
@@ -65,7 +66,7 @@ jobs:
       - name: Get Date
         id: get-date
         run: |
-          echo "date=$(/bin/date -u "+%Y%m%d")" >> $GITHUB_OUTPUT
+          echo "::set-output name=date::$(/bin/date -u "+%Y%m%d")"
         shell: bash
 
       - uses: actions/cache@v2
@@ -98,7 +99,7 @@ jobs:
           get_core esp8266
 
       - name: download esp32
-        if: steps.cache_all.outputs.cache-hit != 'true'
+        if: steps.cache_all.outputs.cache-hit != 'true' && matrix.IDE_VERSION != '1.6.13'
         run: |
           source $GITHUB_WORKSPACE/travis/common.sh
           get_core esp32
@@ -127,7 +128,7 @@ jobs:
       - name: Get Date
         id: get-date
         run: |
-          echo "date=$(/bin/date -u "+%Y%m%d")" >> $GITHUB_OUTPUT
+          echo "::set-output name=date::$(/bin/date -u "+%Y%m%d")"
         shell: bash
 
       - uses: actions/cache@v2
@@ -163,18 +164,15 @@ jobs:
 
       - name: config IDE
         run: |
-          set +x
           export DISPLAY=:1.0
           export PATH="$HOME/arduino_ide:$PATH"
           arduino --board $BOARD --save-prefs
-          arduino --pref update.check=false --pref build.verbose=false --pref cache.enable=true --pref compiler.cache_core=true --pref compiler.warning_level=default --save-prefs
           arduino --get-pref sketchbook.path
-          arduino --get-pref
+          arduino --pref update.check=false
 
       - name: build example
         timeout-minutes: 20
         run: |
-          set -ex
           export DISPLAY=:1.0
           export PATH="$HOME/arduino_ide:$PATH"
           source $GITHUB_WORKSPACE/travis/common.sh

README.md

@@ -26,7 +26,6 @@ a WebSocket Server and Client for Arduino based on RFC6455.
  - ESP8266 [Arduino for ESP8266](https://github.com/esp8266/Arduino/)
  - ESP32 [Arduino for ESP32](https://github.com/espressif/arduino-esp32)
  - ESP31B
- - Raspberry Pi Pico W [Arduino for Pico](https://github.com/earlephilhower/arduino-pico)
  - Particle with STM32 ARM Cortex M3
  - ATmega328 with Ethernet Shield (ATmega branch)
  - ATmega328 with enc28j60 (ATmega branch)

examples/esp32/WebSocketClientSocketIOack/WebSocketClientSocketIOack.ino

@@ -1,155 +0,0 @@
-/*
- * WebSocketClientSocketIOack.ino
- *
- *  Created on: 20.07.2019
- *
- */
-
-#include <Arduino.h>
-
-#include <WiFi.h>
-#include <WiFiMulti.h>
-#include <WiFiClientSecure.h>
-
-#include <ArduinoJson.h>
-
-#include <WebSocketsClient.h>
-#include <SocketIOclient.h>
-
-WiFiMulti WiFiMulti;
-SocketIOclient socketIO;
-
-#define USE_SERIAL Serial
-
-
-void socketIOEvent(socketIOmessageType_t type, uint8_t * payload, size_t length) {
-    switch(type) {
-        case sIOtype_DISCONNECT:
-            USE_SERIAL.printf("[IOc] Disconnected!\n");
-            break;
-        case sIOtype_CONNECT:
-            USE_SERIAL.printf("[IOc] Connected to url: %s\n", payload);
-
-            // join default namespace (no auto join in Socket.IO V3)
-            socketIO.send(sIOtype_CONNECT, "/");
-            break;
-        case sIOtype_EVENT:
-        {
-            char * sptr = NULL;
-            int id = strtol((char *)payload, &sptr, 10);
-            USE_SERIAL.printf("[IOc] get event: %s id: %d\n", payload, id);
-            if(id) {
-                payload = (uint8_t *)sptr;
-            }
-            DynamicJsonDocument doc(1024);
-            DeserializationError error = deserializeJson(doc, payload, length);
-            if(error) {
-                USE_SERIAL.print(F("deserializeJson() failed: "));
-                USE_SERIAL.println(error.c_str());
-                return;
-            }
-
-            String eventName = doc[0];
-            USE_SERIAL.printf("[IOc] event name: %s\n", eventName.c_str());
-
-            // Message Includes a ID for a ACK (callback)
-            if(id) {
-                // creat JSON message for Socket.IO (ack)
-                DynamicJsonDocument docOut(1024);
-                JsonArray array = docOut.to<JsonArray>();
-
-                // add payload (parameters) for the ack (callback function)
-                JsonObject param1 = array.createNestedObject();
-                param1["now"] = millis();
-
-                // JSON to String (serializion)
-                String output;
-                output += id;
-                serializeJson(docOut, output);
-
-                // Send event
-                socketIO.send(sIOtype_ACK, output);
-            }
-        }
-            break;
-        case sIOtype_ACK:
-            USE_SERIAL.printf("[IOc] get ack: %u\n", length);
-            break;
-        case sIOtype_ERROR:
-            USE_SERIAL.printf("[IOc] get error: %u\n", length);
-            break;
-        case sIOtype_BINARY_EVENT:
-            USE_SERIAL.printf("[IOc] get binary: %u\n", length);
-            break;
-        case sIOtype_BINARY_ACK:
-            USE_SERIAL.printf("[IOc] get binary ack: %u\n", length);
-            break;
-    }
-}
-
-void setup() {
-    //USE_SERIAL.begin(921600);
-    USE_SERIAL.begin(115200);
-
-    //Serial.setDebugOutput(true);
-    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);
-      }
-
-    WiFiMulti.addAP("SSID", "passpasspass");
-
-    //WiFi.disconnect();
-    while(WiFiMulti.run() != WL_CONNECTED) {
-        delay(100);
-    }
-
-    String ip = WiFi.localIP().toString();
-    USE_SERIAL.printf("[SETUP] WiFi Connected %s\n", ip.c_str());
-
-    // server address, port and URL
-    socketIO.begin("10.11.100.100", 8880, "/socket.io/?EIO=4");
-
-    // event handler
-    socketIO.onEvent(socketIOEvent);
-}
-
-unsigned long messageTimestamp = 0;
-void loop() {
-    socketIO.loop();
-
-    uint64_t now = millis();
-
-    if(now - messageTimestamp > 2000) {
-        messageTimestamp = now;
-
-        // creat JSON message for Socket.IO (event)
-        DynamicJsonDocument doc(1024);
-        JsonArray array = doc.to<JsonArray>();
-
-        // add evnet name
-        // Hint: socket.on('event_name', ....
-        array.add("event_name");
-
-        // add payload (parameters) for the event
-        JsonObject param1 = array.createNestedObject();
-        param1["now"] = (uint32_t) now;
-
-        // JSON to String (serializion)
-        String output;
-        serializeJson(doc, output);
-
-        // Send event
-        socketIO.sendEVENT(output);
-
-        // Print JSON for debugging
-        USE_SERIAL.println(output);
-    }
-}

examples/esp8266/WebSocketClientSocketIO/WebSocketClientSocketIO.ino

@@ -88,7 +88,7 @@ void setup() {
     USE_SERIAL.printf("[SETUP] WiFi Connected %s\n", ip.c_str());
 
     // server address, port and URL
-    socketIO.begin("10.11.100.100", 8880, "/socket.io/?EIO=4");
+    socketIO.begin("10.11.100.100", 8880);
 
     // event handler
     socketIO.onEvent(socketIOEvent);
@@ -106,7 +106,7 @@ void loop() {
         // creat JSON message for Socket.IO (event)
         DynamicJsonDocument doc(1024);
         JsonArray array = doc.to<JsonArray>();
-
+        
         // add evnet name
         // Hint: socket.on('event_name', ....
         array.add("event_name");
@@ -119,7 +119,7 @@ void loop() {
         String output;
         serializeJson(doc, output);
 
-        // Send event
+        // Send event        
         socketIO.sendEVENT(output);
 
         // Print JSON for debugging

examples/esp8266/WebSocketClientSocketIOack/WebSocketClientSocketIOack.ino

@@ -49,7 +49,7 @@ void socketIOEvent(socketIOmessageType_t type, uint8_t * payload, size_t length)
                 USE_SERIAL.println(error.c_str());
                 return;
             }
-
+            
             String eventName = doc[0];
             USE_SERIAL.printf("[IOc] event name: %s\n", eventName.c_str());
 
@@ -58,7 +58,7 @@ void socketIOEvent(socketIOmessageType_t type, uint8_t * payload, size_t length)
                 // creat JSON message for Socket.IO (ack)
                 DynamicJsonDocument docOut(1024);
                 JsonArray array = docOut.to<JsonArray>();
-
+                
                 // add payload (parameters) for the ack (callback function)
                 JsonObject param1 = array.createNestedObject();
                 param1["now"] = millis();
@@ -68,7 +68,7 @@ void socketIOEvent(socketIOmessageType_t type, uint8_t * payload, size_t length)
                 output += id;
                 serializeJson(docOut, output);
 
-                // Send event
+                // Send event        
                 socketIO.send(sIOtype_ACK, output);
             }
         }
@@ -125,7 +125,7 @@ void setup() {
     USE_SERIAL.printf("[SETUP] WiFi Connected %s\n", ip.c_str());
 
     // server address, port and URL
-    socketIO.begin("10.11.100.100", 8880, "/socket.io/?EIO=4");
+    socketIO.begin("10.11.100.100", 8880);
 
     // event handler
     socketIO.onEvent(socketIOEvent);
@@ -143,7 +143,7 @@ void loop() {
         // creat JSON message for Socket.IO (event)
         DynamicJsonDocument doc(1024);
         JsonArray array = doc.to<JsonArray>();
-
+        
         // add evnet name
         // Hint: socket.on('event_name', ....
         array.add("event_name");
@@ -156,7 +156,7 @@ void loop() {
         String output;
         serializeJson(doc, output);
 
-        // Send event
+        // Send event        
         socketIO.sendEVENT(output);
 
         // Print JSON for debugging

examples/esp8266_pico/WebSocketClientOTA/README.md

@@ -1,27 +0,0 @@
-## Minimal example of WebsocketClientOTA and Python server
-
-Take this as small example, how achieve OTA update on ESP8266 and ESP32.
-
-Python server was wrote from train so take it only as bare example.
-It's working, but it's not mean to run in production.
-
-
-### Usage:
-
-Start server:
-```bash
-cd python_ota_server
-python3 -m venv .venv
-source .venv/bin/activate
-pip3 install -r requirements.txt
-python3 main.py
-```
-
-Flash ESP with example sketch and start it.
-
-Change version inside example sketch to higher and compile it and save it to bin file.
-
-Rename it to `mydevice-1.0.1-esp8266.bin` and place it inside new folder firmware (server create it).
-
-When the ESP connect to server, it check if version flashed is equal to fw in firmware folder. If higher FW version is present,
-start the flash process.

examples/esp8266_pico/WebSocketClientOTA/WebSocketClientOTA.ino

@@ -1,264 +0,0 @@
-/*
- * WebSocketClientOTA.ino
- *
- *  Created on: 25.10.2021
- *
- */
-
-#include <Arduino.h>
-#include <ArduinoJson.h>
-
-#if defined(ESP8266)
-    #include <ESP8266WiFi.h>
-    #include <ESP8266WiFiMulti.h>
-    #include <ESP8266mDNS.h>
-    #include <Updater.h>
-    #include <Hash.h>
-
-    ESP8266WiFiMulti WiFiMulti;
-#elif defined(ESP32)
-    #include <WiFi.h>
-    #include <WiFiMulti.h>
-    #include "ESPmDNS.h"
-    #include <Update.h>
-
-    WiFiMulti WiFiMulti;
-#else
-    #error Unsupported device
-#endif
-
-#include <WiFiUdp.h>
-#include <WebSocketsClient.h>
-
-
-WebSocketsClient webSocket;
-
-#define USE_SERIAL Serial
-
-// Variables:
-// Settable:
-const char *version = "1.0.0";
-const char *name = "mydevice";
-
-// Others:
-#ifdef ESP8266
-	const char *chip = "esp8266";
-#endif
-#ifdef ESP32
-	const char *chip = "esp32";
-#endif
-
-uint32_t maxSketchSpace = 0;
-int SketchSize = 0;
-bool ws_conn = false;
-
-
-void greetings_(){
-	StaticJsonDocument<200> doc;
-	doc["type"] = "greetings";
-	doc["mac"] = WiFi.macAddress().c_str();
-	doc["ip"] = WiFi.localIP().toString().c_str();
-	doc["version"] = version;
-	doc["name"] = name;
-	doc["chip"] = chip;
-
-	char data[200];
-	serializeJson(doc, data);
-	webSocket.sendTXT(data);
-}
-
-void register_(){
-	StaticJsonDocument<200> doc;
-	doc["type"] = "register";
-    doc["mac"] = WiFi.macAddress().c_str();
-
-	char data[200];
-	serializeJson(doc, data);
-	webSocket.sendTXT(data);
-    ws_conn = true;
-}
-
-typedef void (*CALLBACK_FUNCTION)(JsonDocument &msg);
-
-typedef struct {
-   char  type[50];
-   CALLBACK_FUNCTION  func;
-} RESPONSES_STRUCT;
-
-void OTA_RESPONSES(JsonDocument &msg){
-    USE_SERIAL.print(F("[WSc] OTA mode: "));
-    String val = msg["value"];
-    if(val == "go") {
-        USE_SERIAL.print(F("go\n"));
-        SketchSize = int(msg["size"]);
-        maxSketchSpace = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
-        USE_SERIAL.printf("[WSc] Max sketch size: %u\n", maxSketchSpace);
-        USE_SERIAL.printf("[WSc] Sketch size: %d\n", SketchSize);
-        USE_SERIAL.setDebugOutput(true);
-        if (!Update.begin(maxSketchSpace)) { //start with max available size
-            Update.printError(Serial);
-            ESP.restart();
-        }
-    } else if (val == "ok") {
-        USE_SERIAL.print(F("OK\n"));
-        register_();
-    } else {
-        USE_SERIAL.print(F("unknown value : "));
-        USE_SERIAL.print(val);
-        USE_SERIAL.print(F("\n"));
-    }
-}
-
-void STA_RESPONSES(JsonDocument &msg){
-    // Do something with message
-}
-
-// Count of responses handled by RESPONSES_STRUCT
-// increase increase if another response handler is added
-const int nrOfResponses = 2;
-
-RESPONSES_STRUCT responses[nrOfResponses] = {
-  {"ota",        OTA_RESPONSES},
-  {"state",      STA_RESPONSES},
-};
-
-void text(uint8_t * payload, size_t length){
-    // Convert message to something usable
-    char msgch[length];
-    for (unsigned int i = 0; i < length; i++)
-    {
-        USE_SERIAL.print((char)payload[i]);
-        msgch[i] = ((char)payload[i]);
-    }
-    msgch[length] = '\0';
-
-    // Parse Json
-    StaticJsonDocument<200> doc_in;
-    DeserializationError error = deserializeJson(doc_in, msgch);
-
-    if (error) {
-        USE_SERIAL.print(F("deserializeJson() failed: "));
-        USE_SERIAL.println(error.c_str());
-        return;
-    }
-
-    // Handle each TYPE of message
-    int b = 0;
-
-    String t = doc_in["type"];
-    for( b=0 ; b<nrOfResponses ; b++ )
-    {
-        if(t == responses[b].type) {
-            responses[b].func(doc_in);
-        }
-    }
-}
-
-void webSocketEvent(WStype_t type, uint8_t * payload, size_t length) {
-
-	switch(type) {
-		case WStype_DISCONNECTED:
-			USE_SERIAL.printf("[WSc] Disconnected!\n");
-			break;
-		case WStype_CONNECTED: {
-			USE_SERIAL.printf("[WSc] Connected to url: %s\n", payload);
-
-			// send message to server when Connected
-			// webSocket.sendTXT("Connected");
-			greetings_();
-		}
-			break;
-		case WStype_TEXT:
-			USE_SERIAL.printf("[WSc] get text: %s\n", payload);
-
-			// send message to server
-			// webSocket.sendTXT("message here");
-			text(payload, length);
-			break;
-		case WStype_BIN:
-			USE_SERIAL.printf("[WSc] get binary length: %u\n", length);
-			// hexdump(payload, length);
-	        if (Update.write(payload, length) != length) {
-                Update.printError(Serial);
-                ESP.restart();
-            }
-            yield();
-            SketchSize -= length;
-            USE_SERIAL.printf("[WSc] Sketch size left: %u\n", SketchSize);
-            if (SketchSize < 1){
-                if (Update.end(true)) { //true to set the size to the current progress
-                    USE_SERIAL.printf("Update Success: \nRebooting...\n");
-                    delay(5);
-                    yield();
-                    ESP.restart();
-                } else {
-                    Update.printError(USE_SERIAL);
-                    ESP.restart();
-                }
-                USE_SERIAL.setDebugOutput(false);
-            }
-
-			// send data to server
-			// webSocket.sendBIN(payload, length);
-			break;
-        case WStype_PING:
-            // pong will be send automatically
-            USE_SERIAL.printf("[WSc] get ping\n");
-            break;
-        case WStype_PONG:
-            // answer to a ping we send
-            USE_SERIAL.printf("[WSc] get pong\n");
-            break;
-    }
-
-}
-
-void setup() {
-	// USE_SERIAL.begin(921600);
-	USE_SERIAL.begin(115200);
-
-	//Serial.setDebugOutput(true);
-	USE_SERIAL.setDebugOutput(true);
-
-	USE_SERIAL.print(F("\nMAC: "));
-	USE_SERIAL.println(WiFi.macAddress());
-	USE_SERIAL.print(F("\nDevice: "));
-	USE_SERIAL.println(name);
-	USE_SERIAL.printf("\nVersion: %s\n", version);
-
-	for(uint8_t t = 4; t > 0; t--) {
-		USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
-		USE_SERIAL.flush();
-		delay(1000);
-	}
-
-	WiFiMulti.addAP("SSID", "PASS");
-
-	//WiFi.disconnect();
-	while(WiFiMulti.run() != WL_CONNECTED) {
-		delay(100);
-	}
-
-	// server address, port and URL
-	webSocket.begin("10.0.1.5", 8081, "/");
-
-	// event handler
-	webSocket.onEvent(webSocketEvent);
-
-	// use HTTP Basic Authorization this is optional remove if not needed
-	// webSocket.setAuthorization("USER", "PASS");
-
-	// try ever 5000 again if connection has failed
-	webSocket.setReconnectInterval(5000);
-
-  // start heartbeat (optional)
-  // ping server every 15000 ms
-  // expect pong from server within 3000 ms
-  // consider connection disconnected if pong is not received 2 times
-  webSocket.enableHeartbeat(15000, 3000, 2);
-
-}
-
-void loop() {
-	webSocket.loop();
-}

examples/esp8266_pico/WebSocketClientOTA/python_ota_server/main.py

@@ -1,235 +0,0 @@
-"""Minimal example of Python websocket server
-handling OTA updates for ESP32 amd ESP8266
-
-Check and upload of firmware works.
-Register and state function are jus for example.
-"""
-# pylint: disable=W0703,E1101
-import asyncio
-import copy
-import json
-import logging
-import subprocess
-import threading
-import time
-from os import listdir
-from os.path import join as join_pth
-from pathlib import Path
-
-import websockets
-from packaging import version
-
-# Logger settings
-logging.basicConfig(filename="ws_server.log")
-Logger = logging.getLogger('WS-OTA')
-Logger.addHandler(logging.StreamHandler())
-Logger.setLevel(logging.INFO)
-
-# Path to directory with FW
-fw_path = join_pth(Path().absolute(), "firmware")
-
-
-def create_path(path: str) -> None:
-    """Check if path exist or create it"""
-    Path(path).mkdir(parents=True, exist_ok=True)
-
-
-def shell(command):
-    """Handle execution of shell commands"""
-    with subprocess.Popen(command, shell=True,
-                          stdout=subprocess.PIPE,
-                          universal_newlines=True
-                          ) as process:
-        for stdout_line in iter(process.stdout.readline, ""):
-            Logger.debug(stdout_line)
-        process.stdout.close()
-        return_code = process.wait()
-        Logger.debug("Shell returned: %s", return_code)
-
-        return process.returncode
-    return None
-
-
-async def binary_send(websocket, fw_file):
-    """Read firmware file, divide it to chunks and send them"""
-    with open(fw_file, "rb") as binaryfile:
-
-        while True:
-            chunk = binaryfile.read(4096)
-            if not chunk:
-                break
-            try:
-                await websocket.send(chunk)
-            except Exception as exception:
-                Logger.exception(exception)
-                return False
-            asyncio.sleep(0.2)
-
-
-def version_checker(name, vdev, vapp):
-    """Parse and compare FW version"""
-
-    if version.parse(vdev) < version.parse(vapp):
-        Logger.info("Client(%s) version %s is smaller than %s: Go for update", name, vdev, vapp)
-        return True
-    Logger.info("Client(%s) version %s is greater or equal to %s: Not updating", name, vdev, vapp)
-    return False
-
-
-class WsOtaHandler (threading.Thread):
-    """Thread handling ota update
-
-    Running ota directly from message would kill WS
-    as message bus would timeout.
-    """
-    def __init__(self, name, message, websocket):
-        threading.Thread.__init__(self, daemon=True)
-        self.name = name
-        self.msg = message
-        self.websocket = websocket
-
-    def run(self, ):
-        try:
-            asyncio.run(self.start_())
-        except Exception as exception:
-            Logger.exception(exception)
-        finally:
-            pass
-
-    async def start_(self):
-        """Start _ota se asyncio future"""
-        msg_task = asyncio.ensure_future(
-            self._ota())
-
-        done, pending = await asyncio.wait(
-            [msg_task],
-            return_when=asyncio.FIRST_COMPLETED,
-        )
-        Logger.info("WS Ota Handler done: %s", done)
-        for task in pending:
-            task.cancel()
-
-    async def _ota(self):
-        """Check for new fw and update or pass"""
-        device_name = self.msg['name']
-        device_chip = self.msg['chip']
-        device_version = self.msg['version']
-        fw_version = ''
-        fw_name = ''
-        fw_device = ''
-
-        for filename in listdir(fw_path):
-            fw_info = filename.split("-")
-            fw_device = fw_info[0]
-            if fw_device == device_name:
-                fw_version = fw_info[1]
-                fw_name = filename
-                break
-
-        if not fw_version:
-            Logger.info("Client(%s): No fw found!", device_name)
-            msg = '{"type": "ota", "value":"ok"}'
-            await self.websocket.send(msg)
-            return
-
-        if not version_checker(device_name, device_version, fw_version):
-            return
-
-        fw_file = join_pth(fw_path, fw_name)
-        if device_chip == 'esp8266' and not fw_file.endswith('.gz'):
-            # We can compress fw to make it smaller for upload
-            fw_cpress = fw_file
-            fw_file = fw_cpress + ".gz"
-            cpress = f"gzip -9 {fw_cpress}"
-            cstate = shell(cpress)
-            if cstate:
-                Logger.error("Cannot compress firmware: %s", fw_name)
-                return
-
-        # Get size of fw
-        size = Path(fw_file).stat().st_size
-
-        # Request ota mode
-        msg = '{"type": "ota", "value":"go", "size":' + str(size) + '}'
-        await self.websocket.send(msg)
-
-        # send file by chunks trough websocket
-        await binary_send(self.websocket, fw_file)
-
-
-async def _register(websocket, message):
-    mac = message.get('mac')
-    name = message.get('name')
-    Logger.info("Client(%s) mac: %s", name, mac)
-    # Some code
-
-    response = {'type': 'registry', 'state': 'ok'}
-    await websocket.send(json.dumps(response))
-
-
-async def _state(websocket, message):
-    mac = message.get('mac')
-    name = message.get('name')
-    Logger.info("Client(%s) mac: %s", name, mac)
-    # Some code
-
-    response = {'type': 'state', 'state': 'ok'}
-    await websocket.send(json.dumps(response))
-
-
-async def _unhandled(websocket, msg):
-    Logger.info("Unhandled message from device: %s", str(msg))
-    response = {'type': 'response', 'state': 'nok'}
-    await websocket.send(json.dumps(response))
-
-
-async def _greetings(websocket, message):
-    WsOtaHandler('thread_ota', copy.deepcopy(message), websocket).start()
-
-
-async def message_received(websocket, message) -> None:
-    """Handle incoming messages
-
-    Check if message contain json and run waned function
-    """
-    switcher = {"greetings": _greetings,
-                "register":  _register,
-                "state":     _state
-                }
-
-    if message[0:1] == "{":
-        try:
-            msg_json = json.loads(message)
-        except Exception as exception:
-            Logger.error(exception)
-            return
-
-        type_ = msg_json.get('type')
-        name = msg_json.get('name')
-        func = switcher.get(type_, _unhandled)
-        Logger.debug("Client(%s)said: %s", name, type_)
-
-        try:
-            await func(websocket, msg_json)
-        except Exception as exception:
-            Logger.error(exception)
-
-
-# pylint: disable=W0613
-async def ws_server(websocket, path) -> None:
-    """Run in cycle and wait for new messages"""
-    async for message in websocket:
-        await message_received(websocket, message)
-
-
-async def main():
-    """Server starter
-
-    Normal user can bind only port numbers greater than 1024
-    """
-    async with websockets.serve(ws_server, "10.0.1.5", 8081):
-        await asyncio.Future()  # run forever
-
-
-create_path(fw_path)
-asyncio.run(main())

examples/esp8266_pico/WebSocketClientOTA/python_ota_server/requirements.txt

@@ -1,2 +0,0 @@
-packaging
-websockets

library.json

@@ -16,10 +16,10 @@
     "keywords": "wifi, http, web, server, client, websocket",
     "license": "LGPL-2.1",
     "name": "WebSockets",
-    "platforms": "atmelavr, espressif8266, espressif32, raspberrypi",
+    "platforms": "atmelavr, espressif8266, espressif32",
     "repository": {
         "type": "git",
         "url": "https://github.com/Links2004/arduinoWebSockets.git"
     },
-    "version": "2.4.0"
+    "version": "2.3.5"
 }

library.properties

@@ -1,5 +1,5 @@
 name=WebSockets
-version=2.4.0
+version=2.3.5
 author=Markus Sattler
 maintainer=Markus Sattler
 sentence=WebSockets for Arduino (Server + Client)

src/SocketIOclient.cpp

@@ -85,14 +85,6 @@ bool SocketIOclient::isConnected(void) {
     return WebSocketsClient::isConnected();
 }
 
-void SocketIOclient::setExtraHeaders(const char * extraHeaders) {
-    return WebSocketsClient::setExtraHeaders(extraHeaders);
-}
-
-void SocketIOclient::setReconnectInterval(unsigned long time) {
-    return WebSocketsClient::setReconnectInterval(time);
-}
-
 /**
  * send text data to client
  * @param num uint8_t client id

src/SocketIOclient.h

@@ -9,7 +9,6 @@
 #define SOCKETIOCLIENT_H_
 
 #include "WebSockets.h"
-#include "WebSocketsClient.h"
 
 #define EIO_HEARTBEAT_INTERVAL 20000
 
@@ -76,9 +75,6 @@ class SocketIOclient : protected WebSocketsClient {
     bool send(socketIOmessageType_t type, const char * payload, size_t length = 0);
     bool send(socketIOmessageType_t type, String & payload);
 
-    void setExtraHeaders(const char * extraHeaders = NULL);
-    void setReconnectInterval(unsigned long time);
-
     void loop(void);
 
     void configureEIOping(bool disableHeartbeat = false);

src/WebSockets.cpp

@@ -42,11 +42,7 @@ extern "C" {
 #include <esp_system.h>
 
 #if ESP_IDF_VERSION_MAJOR >= 4
-#if(ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(1, 0, 6))
-#include "sha/sha_parallel_engine.h"
-#else
 #include <esp32/sha.h>
-#endif
 #else
 #include <hwcrypto/sha.h>
 #endif
@@ -472,7 +468,7 @@ void WebSockets::handleWebsocketPayloadCb(WSclient_t * client, bool ok, uint8_t
             payload[header->payloadLen] = 0x00;
 
             if(header->mask) {
-                // decode XOR
+                //decode XOR
                 for(size_t i = 0; i < header->payloadLen; i++) {
                     payload[i] = (payload[i] ^ header->maskKey[i % 4]);
                 }
@@ -482,7 +478,7 @@ void WebSockets::handleWebsocketPayloadCb(WSclient_t * client, bool ok, uint8_t
         switch(header->opCode) {
             case WSop_text:
                 DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] text: %s\n", client->num, payload);
-                // fallthrough
+                // no break here!
             case WSop_binary:
             case WSop_continuation:
                 messageReceived(client, header->opCode, payload, header->payloadLen, header->fin);
@@ -526,7 +522,7 @@ void WebSockets::handleWebsocketPayloadCb(WSclient_t * client, bool ok, uint8_t
         // reset input
         client->cWsRXsize = 0;
 #if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
-        // register callback for next message
+        //register callback for next message
         handleWebsocketWaitFor(client, 2);
 #endif
 
@@ -644,9 +640,9 @@ bool WebSockets::readCb(WSclient_t * client, uint8_t * out, size_t n, WSreadWait
             t = millis();
             out += len;
             n -= len;
-            // DEBUG_WEBSOCKETS("Receive %d left %d!\n", len, n);
+            //DEBUG_WEBSOCKETS("Receive %d left %d!\n", len, n);
         } else {
-            // DEBUG_WEBSOCKETS("Receive %d left %d!\n", len, n);
+            //DEBUG_WEBSOCKETS("Receive %d left %d!\n", len, n);
         }
         if(n > 0) {
             WEBSOCKETS_YIELD();
@@ -698,7 +694,7 @@ size_t WebSockets::write(WSclient_t * client, uint8_t * out, size_t n) {
             out += len;
             n -= len;
             total += len;
-            // DEBUG_WEBSOCKETS("write %d left %d!\n", len, n);
+            //DEBUG_WEBSOCKETS("write %d left %d!\n", len, n);
         } else {
             DEBUG_WEBSOCKETS("WS write %d failed left %d!\n", len, n);
         }

src/WebSockets.h

@@ -50,7 +50,7 @@
         DEBUG_ESP_PORT.flush();             \
     }
 #else
-// #define DEBUG_WEBSOCKETS(...) os_printf( __VA_ARGS__ )
+//#define DEBUG_WEBSOCKETS(...) os_printf( __VA_ARGS__ )
 #endif
 #endif
 
@@ -67,7 +67,7 @@
 #define WEBSOCKETS_USE_BIG_MEM
 #define GET_FREE_HEAP ESP.getFreeHeap()
 // moves all Header strings to Flash (~300 Byte)
-// #define WEBSOCKETS_SAVE_RAM
+//#define WEBSOCKETS_SAVE_RAM
 
 #if defined(ESP8266)
 #define WEBSOCKETS_YIELD() delay(0)
@@ -84,18 +84,9 @@
 #define GET_FREE_HEAP System.freeMemory()
 #define WEBSOCKETS_YIELD()
 #define WEBSOCKETS_YIELD_MORE()
-
-#elif defined(ARDUINO_ARCH_RP2040)
-
-#define WEBSOCKETS_MAX_DATA_SIZE (15 * 1024)
-#define WEBSOCKETS_USE_BIG_MEM
-#define GET_FREE_HEAP rp2040.getFreeHeap()
-#define WEBSOCKETS_YIELD() yield()
-#define WEBSOCKETS_YIELD_MORE() delay(1)
-
 #else
 
-// atmega328p has only 2KB ram!
+//atmega328p has only 2KB ram!
 #define WEBSOCKETS_MAX_DATA_SIZE (1024)
 // moves all Header strings to Flash
 #define WEBSOCKETS_SAVE_RAM
@@ -103,9 +94,7 @@
 #define WEBSOCKETS_YIELD_MORE()
 #endif
 
-#ifndef WEBSOCKETS_TCP_TIMEOUT
 #define WEBSOCKETS_TCP_TIMEOUT (5000)
-#endif
 
 #define NETWORK_ESP8266_ASYNC (0)
 #define NETWORK_ESP8266 (1)
@@ -113,7 +102,6 @@
 #define NETWORK_ENC28J60 (3)
 #define NETWORK_ESP32 (4)
 #define NETWORK_ESP32_ETH (5)
-#define NETWORK_RP2040 (6)
 
 // max size of the WS Message Header
 #define WEBSOCKETS_MAX_HEADER_SIZE (14)
@@ -122,16 +110,12 @@
 // select Network type based
 #if defined(ESP8266) || defined(ESP31B)
 #define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP8266
-// #define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP8266_ASYNC
-// #define WEBSOCKETS_NETWORK_TYPE NETWORK_W5100
+//#define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP8266_ASYNC
+//#define WEBSOCKETS_NETWORK_TYPE NETWORK_W5100
 
 #elif defined(ESP32)
 #define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP32
-// #define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP32_ETH
-
-#elif defined(ARDUINO_ARCH_RP2040)
-#define WEBSOCKETS_NETWORK_TYPE NETWORK_RP2040
-
+//#define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP32_ETH
 #else
 #define WEBSOCKETS_NETWORK_TYPE NETWORK_W5100
 
@@ -215,15 +199,6 @@
 #define WEBSOCKETS_NETWORK_CLASS WiFiClient
 #define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer
 
-#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040)
-
-#include <WiFi.h>
-#include <WiFiClientSecure.h>
-#define SSL_BARESSL
-#define WEBSOCKETS_NETWORK_CLASS WiFiClient
-#define WEBSOCKETS_NETWORK_SSL_CLASS WiFiClientSecure
-#define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer
-
 #else
 #error "no network type selected!"
 #endif

src/WebSockets4WebServer.h

@@ -28,29 +28,23 @@
 #include <WebSocketsServer.h>
 #include <ESP8266WebServer.h>
 
-#if((WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040)) && WEBSERVER_HAS_HOOK
+#if WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266 && WEBSERVER_HAS_HOOK
 
 class WebSockets4WebServer : public WebSocketsServerCore {
-#if defined(ESP8266)
-    using WebServerClass = ESP8266WebServer;
-#else
-    using WebServerClass = WebServer;
-#endif
-
   public:
     WebSockets4WebServer(const String & origin = "", const String & protocol = "arduino")
         : WebSocketsServerCore(origin, protocol) {
         begin();
     }
 
-    WebServerClass::HookFunction hookForWebserver(const String & wsRootDir, WebSocketServerEvent event) {
+    ESP8266WebServer::HookFunction hookForWebserver(const String & wsRootDir, WebSocketServerEvent event) {
         onEvent(event);
 
-        return [&, wsRootDir](const String & method, const String & url, WiFiClient * tcpClient, WebServerClass::ContentTypeFunction contentType) {
+        return [&, wsRootDir](const String & method, const String & url, WiFiClient * tcpClient, ESP8266WebServer::ContentTypeFunction contentType) {
             (void)contentType;
 
             if(!(method == "GET" && url.indexOf(wsRootDir) == 0)) {
-                return WebServerClass::CLIENT_REQUEST_CAN_CONTINUE;
+                return ESP8266WebServer::CLIENT_REQUEST_CAN_CONTINUE;
             }
 
             // allocate a WiFiClient copy (like in WebSocketsServer::handleNewClients())
@@ -69,7 +63,7 @@ class WebSockets4WebServer : public WebSocketsServerCore {
             }
 
             // tell webserver to not close but forget about this client
-            return WebServerClass::CLIENT_IS_GIVEN;
+            return ESP8266WebServer::CLIENT_IS_GIVEN;
         };
     }
 };

src/WebSocketsClient.cpp

@@ -76,8 +76,6 @@ void WebSocketsClient::begin(const char * host, uint16_t port, const char * url,
 
 #ifdef ESP8266
     randomSeed(RANDOM_REG32);
-#elif defined(ARDUINO_ARCH_RP2040)
-    randomSeed(rp2040.hwrand32());
 #else
     // todo find better seed
     randomSeed(millis());
@@ -226,7 +224,7 @@ void WebSocketsClient::loop(void) {
                 _client.ssl->setCACert(_CA_cert);
 #elif defined(ESP8266) && defined(SSL_AXTLS)
                 _client.ssl->setCACert((const uint8_t *)_CA_cert, strlen(_CA_cert) + 1);
-#elif(defined(ESP8266) || defined(ARDUINO_ARCH_RP2040)) && defined(SSL_BARESSL)
+#elif defined(ESP8266) && defined(SSL_BARESSL)
                 _client.ssl->setTrustAnchors(_CA_cert);
 #else
 #error setCACert not implemented
@@ -428,9 +426,9 @@ bool WebSocketsClient::isConnected(void) {
     return (_client.status == WSC_CONNECTED);
 }
 
-// #################################################################################
-// #################################################################################
-// #################################################################################
+//#################################################################################
+//#################################################################################
+//#################################################################################
 
 /**
  *
@@ -475,7 +473,7 @@ void WebSocketsClient::messageReceived(WSclient_t * client, WSopcode_t opcode, u
 void WebSocketsClient::clientDisconnect(WSclient_t * client) {
     bool event = false;
 
-#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040)
+#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
     if(client->isSSL && client->ssl) {
         if(client->ssl->connected()) {
             client->ssl->flush();
@@ -735,7 +733,7 @@ void WebSocketsClient::handleHeader(WSclient_t * client, String * headerLine) {
                 client->cExtensions = headerValue;
             } else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Sec-WebSocket-Version"))) {
                 client->cVersion = headerValue.toInt();
-            } else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Set-Cookie")) && headerValue.indexOf(" io=") > -1) {
+            } else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Set-Cookie"))) {
                 if(headerValue.indexOf(';') > -1) {
                     client->cSessionId = headerValue.substring(headerValue.indexOf('=') + 1, headerValue.indexOf(";"));
                 } else {
@@ -786,11 +784,9 @@ void WebSocketsClient::handleHeader(WSclient_t * client, String * headerLine) {
                     if(client->isSocketIO) {
                         break;
                     }
-                    // falls through
                 case 403:    ///< Forbidden
-                             // todo handle login
-                             // falls through
-                default:     ///< Server dont unterstand requrst
+                    // todo handle login
+                default:    ///< Server dont unterstand requrst
                     ok = false;
                     DEBUG_WEBSOCKETS("[WS-Client][handleHeader] serverCode is not 101 (%d)\n", client->cCode);
                     clientDisconnect(client);
@@ -866,7 +862,7 @@ void WebSocketsClient::connectedCb() {
     _client.tcp->setTimeout(WEBSOCKETS_TCP_TIMEOUT);
 #endif
 
-#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040)
+#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
     _client.tcp->setNoDelay(true);
 #endif
 

src/WebSocketsClient.h

@@ -154,11 +154,11 @@ class WebSocketsClient : protected WebSockets {
 #endif
 
     /**
-     * called for sending a Event to the app
-     * @param type WStype_t
-     * @param payload uint8_t *
-     * @param length size_t
-     */
+         * called for sending a Event to the app
+         * @param type WStype_t
+         * @param payload uint8_t *
+         * @param length size_t
+         */
     virtual void runCbEvent(WStype_t type, uint8_t * payload, size_t length) {
         if(_cbEvent) {
             _cbEvent(type, payload, length);

src/WebSocketsServer.cpp

@@ -85,8 +85,6 @@ void WebSocketsServerCore::begin(void) {
 #elif defined(ESP32)
 #define DR_REG_RNG_BASE 0x3ff75144
     randomSeed(READ_PERI_REG(DR_REG_RNG_BASE));
-#elif defined(ARDUINO_ARCH_RP2040)
-    randomSeed(rp2040.hwrand32());
 #else
     // TODO find better seed
     randomSeed(millis());
@@ -396,7 +394,7 @@ bool WebSocketsServerCore::clientIsConnected(uint8_t num) {
     return clientIsConnected(client);
 }
 
-#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040)
+#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
 /**
  * get an IP for a client
  * @param num uint8_t client id
@@ -414,9 +412,9 @@ IPAddress WebSocketsServerCore::remoteIP(uint8_t num) {
 }
 #endif
 
-// #################################################################################
-// #################################################################################
-// #################################################################################
+//#################################################################################
+//#################################################################################
+//#################################################################################
 
 /**
  * handle new client connection
@@ -441,7 +439,7 @@ WSclient_t * WebSocketsServerCore::newClient(WEBSOCKETS_NETWORK_CLASS * TCPclien
             client->tcp->setTimeout(WEBSOCKETS_TCP_TIMEOUT);
 #endif
             client->status = WSC_HEADER;
-#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040)
+#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
 #ifndef NODEBUG_WEBSOCKETS
             IPAddress ip = client->tcp->remoteIP();
 #endif
@@ -518,12 +516,9 @@ void WebSocketsServerCore::messageReceived(WSclient_t * client, WSopcode_t opcod
  * @param client WSclient_t *  ptr to the client struct contaning the native client "->tcp"
  */
 void WebSocketsServerCore::dropNativeClient(WSclient_t * client) {
-    if(!client) {
-        return;
-    }
     if(client->tcp) {
         if(client->tcp->connected()) {
-#if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) && (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP32) && (WEBSOCKETS_NETWORK_TYPE != NETWORK_RP2040)
+#if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) && (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP32)
             client->tcp->flush();
 #endif
             client->tcp->stop();
@@ -542,7 +537,7 @@ void WebSocketsServerCore::dropNativeClient(WSclient_t * client) {
  * @param client WSclient_t *  ptr to the client struct
  */
 void WebSocketsServerCore::clientDisconnect(WSclient_t * client) {
-#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040)
+#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
     if(client->isSSL && client->ssl) {
         if(client->ssl->connected()) {
             client->ssl->flush();
@@ -616,7 +611,7 @@ WSclient_t * WebSocketsServerCore::handleNewClient(WEBSOCKETS_NETWORK_CLASS * tc
 
     if(!client) {
         // no free space to handle client
-#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040)
+#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
 #ifndef NODEBUG_WEBSOCKETS
         IPAddress ip = tcpClient->remoteIP();
 #endif
@@ -624,12 +619,7 @@ WSclient_t * WebSocketsServerCore::handleNewClient(WEBSOCKETS_NETWORK_CLASS * tc
 #else
         DEBUG_WEBSOCKETS("[WS-Server] no free space new client\n");
 #endif
-        // no client! => create dummy!
-        WSclient_t dummy = WSclient_t();
-        client           = &dummy;
-        client->tcp      = tcpClient;
         dropNativeClient(client);
-        return nullptr;
     }
 
     WEBSOCKETS_YIELD();
@@ -641,7 +631,7 @@ WSclient_t * WebSocketsServerCore::handleNewClient(WEBSOCKETS_NETWORK_CLASS * tc
  * Handle incoming Connection Request
  */
 void WebSocketsServer::handleNewClients(void) {
-#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040)
+#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
     while(_server->hasClient()) {
 #endif
 
@@ -654,7 +644,7 @@ void WebSocketsServer::handleNewClients(void) {
 
         handleNewClient(tcpClient);
 
-#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040)
+#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
     }
 #endif
 }
@@ -669,7 +659,7 @@ void WebSocketsServerCore::handleClientData(void) {
         if(clientIsConnected(client)) {
             int len = client->tcp->available();
             if(len > 0) {
-                // DEBUG_WEBSOCKETS("[WS-Server][%d][handleClientData] len: %d\n", client->num, len);
+                //DEBUG_WEBSOCKETS("[WS-Server][%d][handleClientData] len: %d\n", client->num, len);
                 switch(client->status) {
                     case WSC_HEADER: {
                         String headerLine = client->tcp->readStringUntil('\n');
@@ -723,7 +713,7 @@ void WebSocketsServerCore::handleHeader(WSclient_t * client, String * headerLine
             // 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;
 
@@ -925,7 +915,7 @@ void WebSocketsServer::begin(void) {
 
 void WebSocketsServer::close(void) {
     WebSocketsServerCore::close();
-#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040)
+#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
     _server->close();
 #elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
     _server->end();

src/WebSocketsServer.h

@@ -90,7 +90,7 @@ class WebSocketsServerCore : protected WebSockets {
     void enableHeartbeat(uint32_t pingInterval, uint32_t pongTimeout, uint8_t disconnectTimeoutCount);
     void disableHeartbeat();
 
-#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040)
+#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
     IPAddress remoteIP(uint8_t num);
 #endif
 
@@ -132,10 +132,10 @@ class WebSocketsServerCore : protected WebSockets {
     void handleHBPing(WSclient_t * client);    // send ping in specified intervals
 
     /**
-     * called if a non Websocket connection is coming in.
-     * Note: can be override
-     * @param client WSclient_t *  ptr to the client struct
-     */
+         * called if a non Websocket connection is coming in.
+         * Note: can be override
+         * @param client WSclient_t *  ptr to the client struct
+         */
     virtual void handleNonWebsocketConnection(WSclient_t * client) {
         DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] no Websocket connection close.\n", client->num);
         client->tcp->write(
@@ -151,10 +151,10 @@ class WebSocketsServerCore : protected WebSockets {
     }
 
     /**
-     * called if a non Authorization connection is coming in.
-     * Note: can be override
-     * @param client WSclient_t *  ptr to the client struct
-     */
+         * called if a non Authorization connection is coming in.
+         * Note: can be override
+         * @param client WSclient_t *  ptr to the client struct
+         */
     virtual void handleAuthorizationFailed(WSclient_t * client) {
         client->tcp->write(
             "HTTP/1.1 401 Unauthorized\r\n"
@@ -170,12 +170,12 @@ class WebSocketsServerCore : protected WebSockets {
     }
 
     /**
-     * called for sending a Event to the app
-     * @param num uint8_t
-     * @param type WStype_t
-     * @param payload uint8_t *
-     * @param length size_t
-     */
+         * called for sending a Event to the app
+         * @param num uint8_t
+         * @param type WStype_t
+         * @param payload uint8_t *
+         * @param length size_t
+         */
     virtual void runCbEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t length) {
         if(_cbEvent) {
             _cbEvent(num, type, payload, length);
@@ -183,19 +183,19 @@ class WebSocketsServerCore : protected WebSockets {
     }
 
     /*
-     * Called at client socket connect handshake negotiation time for each http header that is not
-     * a websocket specific http header (not Connection, Upgrade, Sec-WebSocket-*)
-     * If the custom httpHeaderValidationFunc returns false for any headerName / headerValue passed, the
-     * socket negotiation is considered invalid and the upgrade to websockets request is denied / rejected
-     * This mechanism can be used to enable custom authentication schemes e.g. test the value
-     * of a session cookie to determine if a user is logged on / authenticated
-     */
+         * Called at client socket connect handshake negotiation time for each http header that is not
+         * a websocket specific http header (not Connection, Upgrade, Sec-WebSocket-*)
+         * If the custom httpHeaderValidationFunc returns false for any headerName / headerValue passed, the
+         * socket negotiation is considered invalid and the upgrade to websockets request is denied / rejected
+         * This mechanism can be used to enable custom authentication schemes e.g. test the value
+         * of a session cookie to determine if a user is logged on / authenticated
+         */
     virtual bool execHttpHeaderValidation(String headerName, String headerValue) {
         if(_httpHeaderValidationFunc) {
-            // return the value of the custom http header validation function
+            //return the value of the custom http header validation function
             return _httpHeaderValidationFunc(headerName, headerValue);
         }
-        // no custom http header validation so just assume all is good
+        //no custom http header validation so just assume all is good
         return true;
     }
 
@@ -205,14 +205,14 @@ class WebSocketsServerCore : protected WebSockets {
 
     /**
      * drop native tcp connection (client->tcp)
-     */
+    */
     void dropNativeClient(WSclient_t * client);
 
   private:
     /*
-     * returns an indicator whether the given named header exists in the configured _mandatoryHttpHeaders collection
-     * @param headerName String ///< the name of the header being checked
-     */
+         * returns an indicator whether the given named header exists in the configured _mandatoryHttpHeaders collection
+         * @param headerName String ///< the name of the header being checked
+         */
     bool hasMandatoryHeader(String headerName);
 };
 

src/WebSocketsVersion.h

@@ -1,6 +1,6 @@
 /**
  * @file WebSocketsVersion.h
- * @date 01.05.2023
+ * @date 09.02.2021
  * @author Markus Sattler
  *
  * Copyright (c) 2015 Markus Sattler. All rights reserved.
@@ -25,12 +25,12 @@
 #ifndef WEBSOCKETSVERSION_H_
 #define WEBSOCKETSVERSION_H_
 
-#define WEBSOCKETS_VERSION "2.4.0"
+#define WEBSOCKETS_VERSION "2.3.5"
 
 #define WEBSOCKETS_VERSION_MAJOR 2
-#define WEBSOCKETS_VERSION_MINOR 4
-#define WEBSOCKETS_VERSION_PATCH 0
+#define WEBSOCKETS_VERSION_MINOR 3
+#define WEBSOCKETS_VERSION_PATCH 5
 
-#define WEBSOCKETS_VERSION_INT 2004000
+#define WEBSOCKETS_VERSION_INT 2003005
 
 #endif /* WEBSOCKETSVERSION_H_ */

src/libb64/cdecode.c

@@ -9,7 +9,7 @@ For details, see http://sourceforge.net/projects/libb64
 #include <core_esp8266_features.h>
 #endif
 
-#if defined(ESP32) || defined(ARDUINO_ARCH_RP2040)
+#if defined(ESP32)
 #define CORE_HAS_LIBB64
 #endif
 

src/libb64/cencode.c

@@ -9,7 +9,7 @@ For details, see http://sourceforge.net/projects/libb64
 #include <core_esp8266_features.h>
 #endif
 
-#if defined(ESP32) || defined(ARDUINO_ARCH_RP2040)
+#if defined(ESP32)
 #define CORE_HAS_LIBB64
 #endif
 

travis/common.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -x
-
 function build_sketches()
 {
     local arduino=$1
@@ -30,10 +28,10 @@ function build_sketches()
 }
 
 function build_sketch()
-{
+{    
     local arduino=$1
     local sketch=$2
-    $arduino --verify --verbose $sketch;
+    $arduino --verify $sketch;
     local result=$?
     if [ $result -ne 0 ]; then
         echo "Build failed ($sketch) build verbose..."
@@ -62,7 +60,7 @@ function get_sketches_json()
         if [[ $sketch != ${sketches[-1]} ]] ; then
             echo -en ","
         fi
-
+        
     done
     echo -en "]"
 }
@@ -99,7 +97,6 @@ function get_core()
         cd esp8266com
         git clone --depth 1 https://github.com/esp8266/Arduino.git esp8266
         cd esp8266/
-        git submodule update --init
         rm -rf .git
         cd tools
         python get.py
@@ -130,5 +127,5 @@ function clone_library() {
 
 function hash_library_names() {
     cd $HOME/Arduino/libraries
-    ls | sha1sum -z | cut -c1-5
+    ls | sha1sum -z | cut -c1-5 
 }