fix _fingerprint is set checks for ESP32

see #633 and #632

.github/dependabot.yml

@@ -1,11 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
-
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"

.github/workflows/arduino-lint.yaml

@@ -1,10 +0,0 @@
-name: Arduino library compliance (Lint)
-on: [push, pull_request]
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: arduino/arduino-lint-action@v1
-        with:
-          library-manager: update

.github/workflows/compile-arduino_wifinina-examples.yaml

@@ -1,69 +0,0 @@
-name: Compile Arduino WiFiNINA Examples
-
-# See: https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows
-on:
-  push:
-    paths:
-      - ".github/workflows/compile-arduino_wifinina-examples.yaml"
-      - "examples/arduino_wifinina/**"
-      - "src/**"
-  pull_request:
-    paths:
-      - ".github/workflows/compile-arduino_wifinina-examples.yaml"
-      - "examples/arduino_wifinina/**"
-      - "src/**"
-  schedule:
-    # Run every Tuesday at 8 AM UTC to catch breakage caused by changes to external resources (libraries, platforms).
-    - cron: "0 8 * * TUE"
-  workflow_dispatch:
-  repository_dispatch:
-
-jobs:
-  build:
-    name: ${{ matrix.board.fqbn }}
-    runs-on: ubuntu-latest
-
-    env:
-      SKETCHES_REPORTS_PATH: sketches-reports
-
-    strategy:
-      fail-fast: false
-
-      matrix:
-        board:
-          - fqbn: arduino:samd:mkrwifi1010
-            platforms: |
-              - name: arduino:samd
-            artifact-name-suffix: arduino-samd-mkrwifi1010
-            libraries: |
-              - name: WiFiNINA
-          - fqbn: arduino:samd:nano_33_iot
-            platforms: |
-              - name: arduino:samd
-            artifact-name-suffix: arduino-samd-nano_33_iot
-            libraries: |
-              - name: WiFiNINA
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Compile examples
-        uses: arduino/compile-sketches@v1
-        with:
-          fqbn: ${{ matrix.board.fqbn }}
-          platforms: ${{ matrix.board.platforms }}
-          libraries: |
-            # Install the library from the local path.
-            - source-path: ./
-            ${{ matrix.board.libraries }}
-          sketch-paths: |
-            - examples/arduino_wifinina/arduino_wifinina.ino
-          enable-deltas-report: true
-          sketches-report-path: ${{ env.SKETCHES_REPORTS_PATH }}
-
-      - name: Save sketches report as workflow artifact
-        uses: actions/upload-artifact@v4
-        with:
-          if-no-files-found: error
-          path: ${{ env.SKETCHES_REPORTS_PATH }}
-          name: sketches-report-${{ matrix.board.artifact-name-suffix }}

.github/workflows/compile-seeed-studio-examples.yaml

@@ -1,81 +0,0 @@
-name: Compile SeedStudio Examples
-
-# See: https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows
-on:
-  push:
-    paths:
-      - ".github/workflows/compile-seeed-studio-examples.yaml"
-      - "examples/seeed-studio/**"
-      - "src/**"
-  pull_request:
-    paths:
-      - ".github/workflows/compile-seeed-studio-examples.yaml"
-      - "examples/seeed-studio/**"
-      - "src/**"
-  schedule:
-    # Run every Tuesday at 8 AM UTC to catch breakage caused by changes to external resources (libraries, platforms).
-    - cron: "0 8 * * TUE"
-  workflow_dispatch:
-  repository_dispatch:
-
-jobs:
-  build:
-    name: ${{ matrix.board.fqbn }}
-    runs-on: ubuntu-latest
-
-    env:
-      SKETCHES_REPORTS_PATH: sketches-reports
-
-    strategy:
-      fail-fast: false
-
-      matrix:
-        board:
-          - fqbn: Seeeduino:samd:seeed_XIAO_m0:usbstack=arduino,debug=off
-            platforms: |
-              - name: Seeeduino:samd
-                source-url: https://files.seeedstudio.com/arduino/package_seeeduino_boards_index.json
-            libraries: |
-              - name: Seeed Arduino rpcWiFi
-              - name: Seeed Arduino rpcUnified
-              - name: Seeed_Arduino_mbedtls
-              - name: Seeed Arduino FS
-              - name: Seeed Arduino SFUD
-            artifact-name-suffix: seeeduino-xia0
-          - fqbn: Seeeduino:samd:seeed_wio_terminal
-            platforms: |
-              - name: Seeeduino:samd
-                source-url: https://files.seeedstudio.com/arduino/package_seeeduino_boards_index.json
-            libraries: |
-              - name: Seeed Arduino rpcWiFi
-              - name: Seeed Arduino rpcUnified
-              - name: Seeed_Arduino_mbedtls
-              - name: Seeed Arduino FS
-              - name: Seeed Arduino SFUD
-            artifact-name-suffix: seeeduino-wio_terminal
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Compile examples
-        uses: arduino/compile-sketches@v1
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          fqbn: ${{ matrix.board.fqbn }}
-          platforms: ${{ matrix.board.platforms }}
-          libraries: |
-            # Install the library from the local path.
-            - source-path: ./
-            ${{ matrix.board.libraries }}
-          sketch-paths: |
-            - examples/seeed-studio/xio-wio-terminal/WebSocketClient
-          enable-deltas-report: true
-          sketches-report-path: ${{ env.SKETCHES_REPORTS_PATH }}
-
-      - name: Save sketches report as workflow artifact
-        uses: actions/upload-artifact@v4
-        with:
-          if-no-files-found: error
-          path: ${{ env.SKETCHES_REPORTS_PATH }}
-          name: sketches-report-${{ matrix.board.artifact-name-suffix }}

.github/workflows/compile-unor4wifi-examples.yaml

@@ -1,60 +0,0 @@
-name: Compile Arduino UNO R4 WiFi Examples
-
-# See: https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows
-on:
-  push:
-    paths:
-      - ".github/workflows/compile-unor4wifi-examples.yaml"
-      - "examples/arduino_renesas/**"
-      - "src/**"
-  pull_request:
-    paths:
-      - ".github/workflows/compile-unor4wifi-examples.yaml"
-      - "examples/arduino_renesas/**"
-      - "src/**"
-  schedule:
-    # Run every Tuesday at 8 AM UTC to catch breakage caused by changes to external resources (libraries, platforms).
-    - cron: "0 8 * * TUE"
-  workflow_dispatch:
-  repository_dispatch:
-
-jobs:
-  build:
-    name: ${{ matrix.board.fqbn }}
-    runs-on: ubuntu-latest
-
-    env:
-      SKETCHES_REPORTS_PATH: sketches-reports
-
-    strategy:
-      fail-fast: false
-
-      matrix:
-        board:
-          - fqbn: arduino:renesas_uno:unor4wifi
-            platforms: |
-              - name: arduino:renesas_uno
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Compile examples
-        uses: arduino/compile-sketches@v1
-        with:
-          fqbn: ${{ matrix.board.fqbn }}
-          platforms: ${{ matrix.board.platforms }}
-          libraries: |
-            # Install the library from the local path.
-            - source-path: ./
-          sketch-paths: |
-            - examples/arduino_renesas/arduino_uno_r4_wifi
-          enable-deltas-report: true
-          sketches-report-path: ${{ env.SKETCHES_REPORTS_PATH }}
-
-      - name: Save sketches report as workflow artifact
-        uses: actions/upload-artifact@v4
-        with:
-          if-no-files-found: error
-          path: ${{ env.SKETCHES_REPORTS_PATH }}
-          name: sketches-report-${{ matrix.board.artifact-name-suffix }}

.github/workflows/main.yml

@@ -17,7 +17,7 @@ jobs:
   check_version_files:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
 
       - name: check version
         run: |
@@ -26,27 +26,28 @@ jobs:
   prepare_example_json:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
 
       - name: generate examples
         id: set-matrix
         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 0.35.3 esp8266: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 0.35.3 esp8266: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 0.35.3 esp32: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,35 +56,33 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        CLI_VERSION: [0.35.3]
+        IDE_VERSION: [1.8.13, 1.6.13]
     env:
-      CLI_VERSION: ${{ matrix.CLI_VERSION }}
-      ARDUINO_DIRECTORIES_DATA: /home/runner/arduino_ide
+      IDE_VERSION: ${{ matrix.IDE_VERSION }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
 
-      - name: Get hash
-        id: get-hash
+      - name: Get Date
+        id: get-date
         run: |
-          echo "hash=$(/bin/date -u "+%Y%m%d")-$(md5sum ".github/workflows/main.yml" | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT
+          echo "::set-output name=date::$(/bin/date -u "+%Y%m%d")"
         shell: bash
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v2
         id: cache_all
         with:
           path: |
             /home/runner/arduino_ide
             /home/runner/Arduino
-          key: ${{ runner.os }}-${{ steps.get-hash.outputs.hash }}-${{ matrix.CLI_VERSION }}-cli
+          key: ${{ runner.os }}-${{ steps.get-date.outputs.date }}-${{ matrix.IDE_VERSION }}
 
       - name: download IDE
         if: steps.cache_all.outputs.cache-hit != 'true'
         run: |
-          wget https://github.com/arduino/arduino-cli/releases/download/v${CLI_VERSION}/arduino-cli_${CLI_VERSION}_Linux_64bit.tar.gz -q
-          tar xf arduino-cli_${CLI_VERSION}_Linux_64bit.tar.gz
-          mkdir -p $ARDUINO_DIRECTORIES_DATA
-          mv arduino-cli $ARDUINO_DIRECTORIES_DATA/
+          wget http://downloads.arduino.cc/arduino-$IDE_VERSION-linux64.tar.xz -q
+          tar xf arduino-$IDE_VERSION-linux64.tar.xz
+          mv arduino-$IDE_VERSION $HOME/arduino_ide
 
       - name: download ArduinoJson
         if: steps.cache_all.outputs.cache-hit != 'true'
@@ -93,12 +92,17 @@ jobs:
           unzip 6.x.zip
           mv ArduinoJson-6.x $HOME/Arduino/libraries/ArduinoJson
 
-      - name: download cores
+      - name: download esp8266
         if: steps.cache_all.outputs.cache-hit != 'true'
         run: |
-          export PATH="$ARDUINO_DIRECTORIES_DATA:$PATH"
           source $GITHUB_WORKSPACE/travis/common.sh
-          get_core_cli
+          get_core esp8266
+
+      - name: download esp32
+        if: steps.cache_all.outputs.cache-hit != 'true' && matrix.IDE_VERSION != '1.6.13'
+        run: |
+          source $GITHUB_WORKSPACE/travis/common.sh
+          get_core esp32
 
   build:
     needs: [prepare_ide, prepare_example_json]
@@ -110,31 +114,30 @@ jobs:
     env:
       CPU: ${{ matrix.cpu }}
       BOARD: ${{ matrix.board }}
-      CLI_VERSION: ${{ matrix.cliversion }}
+      IDE_VERSION: ${{ matrix.ideversion }}
       SKETCH: ${{ matrix.sketch }}
-      ARDUINO_DIRECTORIES_DATA: /home/runner/arduino_ide
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
 
       - name: install libgtk2.0-0
         run: |
           sudo apt-get install -y libgtk2.0-0
 
-      - name: Get hash
-        id: get-hash
+      - name: Get Date
+        id: get-date
         run: |
-          echo "hash=$(/bin/date -u "+%Y%m%d")-$(md5sum ".github/workflows/main.yml" | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT
+          echo "::set-output name=date::$(/bin/date -u "+%Y%m%d")"
         shell: bash
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v2
         id: cache_all
         with:
           path: |
             /home/runner/arduino_ide
             /home/runner/Arduino
-          key: ${{ runner.os }}-${{ steps.get-hash.outputs.hash }}-${{ matrix.cliversion }}-cli
+          key: ${{ runner.os }}-${{ steps.get-date.outputs.date }}-${{ matrix.ideversion }}
 
       - name: install python serial
         if: matrix.cpu == 'esp32'
@@ -143,24 +146,38 @@ jobs:
           sudo pip install pyserial
 #          sudo apt install python-is-python3
 
+      - name: start DISPLAY
+        run: |
+          /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16
+          export DISPLAY=:1.0
+          sleep 3
+
       - name: test IDE
         run: |
-          export PATH="$ARDUINO_DIRECTORIES_DATA:$PATH"
-          which arduino-cli
+          export PATH="$HOME/arduino_ide:$PATH"
+          which arduino
 
       - name: copy code
         run: |
           mkdir -p $HOME/Arduino/libraries/
           cp -r $GITHUB_WORKSPACE $HOME/Arduino/libraries/arduinoWebSockets
 
+      - name: config IDE
+        run: |
+          export DISPLAY=:1.0
+          export PATH="$HOME/arduino_ide:$PATH"
+          arduino --board $BOARD --save-prefs
+          arduino --get-pref sketchbook.path
+          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
           cd $GITHUB_WORKSPACE
-          build_sketch_cli "$SKETCH" "$BOARD"
+          build_sketch arduino $SKETCH
 
   done:
     needs: [prepare_ide, prepare_example_json, build, check_version_files]

README.md

@@ -1,4 +1,4 @@
-WebSocket Server and Client for Arduino [![Build Status](https://github.com/Links2004/arduinoWebSockets/actions/workflows/main.yml/badge.svg?branch=master)](https://github.com/Links2004/arduinoWebSockets/actions?query=branch%3Amaster)
+WebSocket Server and Client for Arduino [![Build Status](https://github.com/Links2004/arduinoWebSockets/workflows/CI/badge.svg?branch=master)](https://github.com/Links2004/arduinoWebSockets/actions?query=workflow%3ACI+branch%3Amaster)
 ===========================================
 
 a WebSocket Server and Client for Arduino based on RFC6455.
@@ -26,15 +26,11 @@ 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)
  - ATmega2560 with Ethernet Shield (ATmega branch)
  - ATmega2560 with enc28j60 (ATmega branch)
- - Arduino UNO [R4 WiFi](https://github.com/arduino/ArduinoCore-renesas)
- - Arduino Nano 33 IoT, MKR WIFI 1010 (requires [WiFiNINA](https://github.com/arduino-libraries/WiFiNINA/) library)
- - Seeeduino XIAO, Seeeduino Wio Terminal (requires [rpcWiFi](https://github.com/Seeed-Studio/Seeed_Arduino_rpcWiFi) library)
 
 ###### Note: ######
 
@@ -51,16 +47,6 @@ a WebSocket Server and Client for Arduino based on RFC6455.
    by running the device behind an SSL proxy. See [Nginx](examples/Nginx/esp8266.ssl.reverse.proxy.conf) for a
    sample Nginx server configuration file to enable this.
 
-### Root CA Cert Bundles for SSL/TLS connections ###
-
-Secure connections require the certificate of the server to be verified. One option is to provide a single certificate in the chain of trust. However, for flexibility and robustness, a certificate bundle is recommended. If a server changes the root CA from which it derives its certificates, this will not be a problem. With a single CA cert it will not connect.
-
- - For [technical details](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/protocols/esp_crt_bundle.html)
- - For a [PlatformIO setup](https://github.com/Duckle29/esp32-certBundle/)
- - For an [example](examples/esp32/WebSocketClientSSLBundle/)
-
-Including a bundle with all CA certs will use 77.2 kB but this list can be reduced to 16.5 kB for the 41 most common. This results in 90% absolute usage coverage and 99% market share coverage according to [W3Techs](https://w3techs.com/technologies/overview/ssl_certificate). The bundle is inserted into the compiled firmware. The bundle is not loaded into RAM, only its index.
-
 ### ESP Async TCP ###
 
 This libary can run in Async TCP mode on the ESP.
@@ -76,19 +62,19 @@ The mode can be activated in the ```WebSockets.h``` (see WEBSOCKETS_NETWORK_TYPE
 ```c++
 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");
-```
+ ```
  - `onEvent`: Callback to handle for websocket events
 
-```c++
+ ```c++
  void onEvent(WebSocketClientEvent cbEvent);
-```
+ ```
 
  - `WebSocketClientEvent`: Handler for websocket events
-```c++
+ ```c++
  void (*WebSocketClientEvent)(WStype_t type, uint8_t * payload, size_t length)
-```
+ ```
 Where `WStype_t type` is defined as:
-```c++
+  ```c++
   typedef enum {
       WStype_ERROR,
       WStype_DISCONNECTED,
@@ -102,11 +88,13 @@ Where `WStype_t type` is defined as:
       WStype_PING,
       WStype_PONG,
   } WStype_t;
-```
+  ```
 
 ### Issues ###
 Submit issues to: https://github.com/Links2004/arduinoWebSockets/issues
 
+[![Join the chat at https://gitter.im/Links2004/arduinoWebSockets](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Links2004/arduinoWebSockets?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 ### License and credits ###
 
 The library is licensed under [LGPLv2.1](https://github.com/Links2004/arduinoWebSockets/blob/master/LICENSE)

examples/arduino_renesas/arduino_uno_r4_wifi/arduino_uno_r4_wifi.ino

@@ -1,109 +0,0 @@
-#include <Arduino.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "WiFiS3.h"
-#include <WebSocketsClient.h>
-
-#define WIFI_SSID ""
-#define WIFI_PASS ""
-
-WebSocketsClient webSocket;
- 
-void webSocketEvent(WStype_t type, uint8_t *payload, size_t length) {
-
-  switch (type) {
-    case WStype_DISCONNECTED:
-      Serial.println("[WSc] Disconnected!");
-      break;
-    case WStype_CONNECTED:
-      Serial.println("[WSc] Connected!");
-
-      // send message to server when Connected
-      webSocket.sendTXT("Connected");
-      break;
-    case WStype_TEXT:
-      Serial.print("[WSc] get text:");
-      Serial.println((char *)payload);
-
-      // send message to server
-      // webSocket.sendTXT("message here");
-      break;
-    case WStype_BIN:
-      // 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;
-  }
-}
-
-void setup() {
-  Serial.begin(115200);
-
-  while (!Serial) {
-    ;  // wait for serial port to connect. Needed for native USB port only
-  }
-
-  Serial.println();
-  Serial.println();
-  Serial.println();
-
-  for (uint8_t t = 4; t > 0; t--) {
-    Serial.println("[SETUP] BOOT WAIT ...");
-    Serial.flush();
-    delay(1000);
-  }
-
-  // check for the WiFi module:
-  if (WiFi.status() == WL_NO_MODULE) {
-    Serial.println("Communication with WiFi module failed!");
-    // don't continue
-    while (true)
-      ;
-  }
-
-  String fv = WiFi.firmwareVersion();
-  if (fv < WIFI_FIRMWARE_LATEST_VERSION) {
-    Serial.println("Please upgrade the firmware");
-  }
-
-  Serial.println("[Wifi]: Connecting");
-
-  int status = WL_IDLE_STATUS;
-
-  // attempt to connect to WiFi network:
-  while (status != WL_CONNECTED) {
-    Serial.print("[Wifi]: Attempting to connect to SSID: ");
-    Serial.println(WIFI_SSID);
-
-    // Connect to WPA/WPA2 network. Change this line if using open or WEP network:
-    status = WiFi.begin(WIFI_SSID, WIFI_PASS);
-
-    delay(1000);
-  }
-
-  Serial.println("Connected!");
-
-  // print your board's IP address:
-  IPAddress ip = WiFi.localIP();
-  Serial.print("IP Address: ");
-  Serial.println(ip);
-
-  // server address, port and URL
-  webSocket.begin("192.168.0.123", 8011);
-
-  // event handler
-  webSocket.onEvent(webSocketEvent);
-
-  // try ever 5000 again if connection has failed
-  webSocket.setReconnectInterval(5000);
-}
-
-void loop() {
-  webSocket.loop();
-}

examples/arduino_wifinina/arduino_wifinina.ino

@@ -1,100 +0,0 @@
-#include <Arduino.h>
-#include <SPI.h>
-#include <WiFiNINA.h>
-#include <WebSocketsClient.h>
-
-#define WIFI_SSID ""
-#define WIFI_PASS ""
-
-int status = WL_IDLE_STATUS;
-WiFiClient client;
-WebSocketsClient webSocket;
-
-void webSocketEvent(WStype_t type, uint8_t *payload, size_t length) {
-
-  switch (type) {
-    case WStype_DISCONNECTED:
-      Serial.println("[WSc] Disconnected!");
-      break;
-    case WStype_CONNECTED:
-      Serial.println("[WSc] Connected!");
-
-      // send message to server when Connected
-      webSocket.sendTXT("Connected");
-      break;
-    case WStype_TEXT:
-      Serial.print("[WSc] get text:");
-      Serial.println((char *)payload);
-
-      // send message to server
-      // webSocket.sendTXT("message here");
-      break;
-    case WStype_BIN:
-      // 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_PING:
-    case WStype_PONG:
-    case WStype_FRAGMENT_FIN:
-      break;
-  }
-}
-
-void setup() {
-  Serial.begin(115200);
-
-  while (!Serial) {
-    ;  // wait for serial port to connect. Needed for native USB port only
-  }
-
-  Serial.println();
-  Serial.println();
-  Serial.println();
-
-  // check for the WiFi module:
-  if (WiFi.status() == WL_NO_MODULE) {
-    Serial.println("Communication with WiFi module failed!");
-    // don't continue
-    while (true);
-  }
-
-  String fv = WiFi.firmwareVersion();
-  if (fv < WIFI_FIRMWARE_LATEST_VERSION) {
-    Serial.println("Please upgrade the firmware");
-  }
-
-  // attempt to connect to WiFi network:
-  while (status != WL_CONNECTED) {
-    Serial.print("Attempting to connect to SSID: ");
-    Serial.println(WIFI_SSID);
-    // Connect to WPA/WPA2 network. Change this line if using open or WEP network:
-    status = WiFi.begin(WIFI_SSID, WIFI_PASS);
-
-    // wait 10 seconds for connection:
-    delay(10000);
-  }
-
-  Serial.println("Connected to WiFi");
-
-  // print your board's IP address:
-  IPAddress ip = WiFi.localIP();
-  Serial.print("IP Address: ");
-  Serial.println(ip);
-
-  // server address, port and URL
-  webSocket.begin("192.168.0.123", 8011);
-
-  // event handler
-  webSocket.onEvent(webSocketEvent);
-
-  // try ever 5000 again if connection has failed
-  webSocket.setReconnectInterval(5000);
-}
-
-void loop() {
-  webSocket.loop();
-}

examples/esp32/WebSocketClientSSLBundle/WebSocketClientSSLBundle.ino

@@ -1,135 +0,0 @@
-/*
- * main.cpp
- *
- *  Created on: 15.06.2024
- *
- */
-
-#include <Arduino.h>
-#include <WiFi.h>
-#include <WiFiMulti.h>
-
-#include <WebSocketsClient.h>
-
-// Use the incbin library to embedd the cert binary
-// extern const uint8_t rootca_crt_bundle_start[] asm(
-//     "_binary_data_cert_x509_crt_bundle_bin_start");
-
-WiFiMulti wifiMulti;
-WebSocketsClient webSocket;
-
-#define USE_SERIAL Serial
-
-void setClock() {
-    configTime(0, 0, "pool.ntp.org", "time.nist.gov");
-
-    USE_SERIAL.print(F("Waiting for NTP time sync: "));
-    time_t nowSecs = time(nullptr);
-    while(nowSecs < 8 * 3600 * 2) {
-        delay(500);
-        USE_SERIAL.print(F("."));
-        yield();
-        nowSecs = time(nullptr);
-    }
-
-    USE_SERIAL.println();
-    struct tm timeinfo;
-    gmtime_r(&nowSecs, &timeinfo);
-    USE_SERIAL.print(F("Current time: "));
-    USE_SERIAL.print(asctime(&timeinfo));
-}
-
-void hexdump(const void * mem, uint32_t len, uint8_t cols = 16) {
-    const uint8_t * src = (const uint8_t *)mem;
-    USE_SERIAL.printf("\n[HEXDUMP] Address: 0x%08X len: 0x%X (%d)", (ptrdiff_t)src, len, len);
-    for(uint32_t i = 0; i < len; i++) {
-        if(i % cols == 0) {
-            USE_SERIAL.printf("\n[0x%08X] 0x%08X: ", (ptrdiff_t)src, i);
-        }
-        USE_SERIAL.printf("%02X ", *src);
-        src++;
-    }
-    USE_SERIAL.printf("\n");
-}
-
-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");
-            break;
-        case WStype_TEXT:
-            USE_SERIAL.printf("[WSc] get text: %s\n", payload);
-
-            // send message to server
-            // webSocket.sendTXT("message here");
-            break;
-        case WStype_BIN:
-            USE_SERIAL.printf("[WSc] get binary length: %u\n", length);
-            hexdump(payload, 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;
-    }
-}
-
-void setup() {
-    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);
-    }
-
-    wifiMulti.addAP("SSID", "WIFI_PASSPHRASE");
-
-    // WiFi.disconnect();
-    while(wifiMulti.run() != WL_CONNECTED) {
-        delay(100);
-    }
-
-    setClock();
-
-    // server address, port and URL. This server can be flakey.
-    // Expected response: Request served by 0123456789abcdef
-    // webSocket.beginSslWithBundle("echo.websocket.org", 443, "/", rootca_crt_bundle_start, "");
-    // ESP32 3.0.4 or higher needs the size of the bundle
-    // webSocket.beginSslWithBundle("echo.websocket.org", 443, "/", rootca_crt_bundle_start, sizeof(rootca_crt_bundle_start), "");
-#if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 4)
-    webSocket.beginSslWithBundle("echo.websocket.org", 443, "/", NULL, 0, "");
-#else
-    webSocket.beginSslWithBundle("echo.websocket.org", 443, "/", NULL, "");
-#endif
-
-    // event handler
-    webSocket.onEvent(webSocketEvent);
-
-    // use HTTP Basic Authorization this is optional enable if needed
-    // webSocket.setAuthorization("user", "Password");
-
-    // try ever 5000 again if connection has failed
-    webSocket.setReconnectInterval(5000);
-}
-
-void loop() {
-    webSocket.loop();
-}

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/esp32_pio/WebSocketClientSSLBundle/.gitignore

@@ -1,8 +0,0 @@
-.pio
-.vscode/.browse.c_cpp.db*
-.vscode/c_cpp_properties.json
-.vscode/launch.json
-.vscode/ipch
-*secret*
-!*secrets.hpp.template
-*x509_crt_bundle.bin

examples/esp32_pio/WebSocketClientSSLBundle/cmn_crt_authorities.csv

@@ -1,39 +0,0 @@
-Owner,Common Name or Certificate Name
-Amazon Trust Services,Amazon Root CA 1
-Amazon Trust Services,Amazon Root CA 2
-Amazon Trust Services,Amazon Root CA 3
-Amazon Trust Services,Amazon Root CA 4
-Amazon Trust Services,Starfield Services Root Certificate Authority - G2
-DigiCert,Baltimore CyberTrust Root
-DigiCert,Cybertrust Global Root
-DigiCert,DigiCert Assured ID Root CA
-DigiCert,DigiCert Assured ID Root G2
-DigiCert,DigiCert Assured ID Root G3
-DigiCert,DigiCert Global Root CA
-DigiCert,DigiCert Global Root G2
-DigiCert,DigiCert Global Root G3
-DigiCert,DigiCert High Assurance EV Root CA
-DigiCert,DigiCert Trusted Root G4
-GlobalSign,GlobalSign ECC Root CA - R5
-GlobalSign,GlobalSign Root CA - R3
-GlobalSign,GlobalSign Root CA - R6
-GlobalSign,GlobalSign Root CA
-GoDaddy,Go Daddy Class 2 CA
-GoDaddy,Go Daddy Root Certificate Authority - G2
-GoDaddy,Starfield Class 2 CA
-GoDaddy,Starfield Root Certificate Authority - G2
-Google Trust Services LLC (GTS),GlobalSign ECC Root CA - R4
-Google Trust Services LLC (GTS),GlobalSign Root CA - R2
-Google Trust Services LLC (GTS),GTS Root R1
-Google Trust Services LLC (GTS),GTS Root R2
-Google Trust Services LLC (GTS),GTS Root R3
-Google Trust Services LLC (GTS),GTS Root R4
-"IdenTrust Services, LLC",DST Root CA X3
-"IdenTrust Services, LLC",IdenTrust Commercial Root CA 1
-"IdenTrust Services, LLC",IdenTrust Public Sector Root CA 1
-Sectigo,Comodo AAA Services root
-Sectigo,COMODO Certification Authority
-Sectigo,COMODO ECC Certification Authority
-Sectigo,COMODO RSA Certification Authority
-Sectigo,USERTrust ECC Certification Authority
-Sectigo,USERTrust RSA Certification Authority

examples/esp32_pio/WebSocketClientSSLBundle/gen_crt_bundle.py

@@ -1,227 +0,0 @@
-#!/usr/bin/env python
-#
-# ESP32 x509 certificate bundle generation utility
-#
-# Converts PEM and DER certificates to a custom bundle format which stores just the
-# subject name and public key to reduce space
-#
-# The bundle will have the format: number of certificates; crt 1 subject name length; crt 1 public key length;
-# crt 1 subject name; crt 1 public key; crt 2...
-#
-# Copyright 2018-2019 Espressif Systems (Shanghai) PTE LTD
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http:#www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from __future__ import with_statement
-
-import argparse
-import csv
-import os
-import re
-import struct
-import sys
-from io import open
-
-try:
-    from cryptography import x509
-    from cryptography.hazmat.backends import default_backend
-    from cryptography.hazmat.primitives import serialization
-except ImportError:
-    print('The cryptography package is not installed.'
-          'Please refer to the Get Started section of the ESP-IDF Programming Guide for '
-          'setting up the required packages.')
-    raise
-
-ca_bundle_bin_file = 'x509_crt_bundle'
-
-quiet = False
-
-
-def status(msg):
-    """ Print status message to stderr """
-    if not quiet:
-        critical(msg)
-
-
-def critical(msg):
-    """ Print critical message to stderr """
-    sys.stderr.write('gen_crt_bundle.py: ')
-    sys.stderr.write(msg)
-    sys.stderr.write('\n')
-
-
-class CertificateBundle:
-    def __init__(self):
-        self.certificates = []
-        self.compressed_crts = []
-
-        if os.path.isfile(ca_bundle_bin_file):
-            os.remove(ca_bundle_bin_file)
-
-    def add_from_path(self, crts_path):
-
-        found = False
-        for file_path in os.listdir(crts_path):
-            found |= self.add_from_file(os.path.join(crts_path, file_path))
-
-        if found is False:
-            raise InputError('No valid x509 certificates found in %s' % crts_path)
-
-    def add_from_file(self, file_path):
-        try:
-            if file_path.endswith('.pem'):
-                status('Parsing certificates from %s' % file_path)
-                with open(file_path, 'r', encoding='utf-8') as f:
-                    crt_str = f.read()
-                    self.add_from_pem(crt_str)
-                    return True
-
-            elif file_path.endswith('.der'):
-                status('Parsing certificates from %s' % file_path)
-                with open(file_path, 'rb') as f:
-                    crt_str = f.read()
-                    self.add_from_der(crt_str)
-                    return True
-
-        except ValueError:
-            critical('Invalid certificate in %s' % file_path)
-            raise InputError('Invalid certificate')
-
-        return False
-
-    def add_from_pem(self, crt_str):
-        """ A single PEM file may have multiple certificates """
-
-        crt = ''
-        count = 0
-        start = False
-
-        for strg in crt_str.splitlines(True):
-            if strg == '-----BEGIN CERTIFICATE-----\n' and start is False:
-                crt = ''
-                start = True
-            elif strg == '-----END CERTIFICATE-----\n' and start is True:
-                crt += strg + '\n'
-                start = False
-                self.certificates.append(x509.load_pem_x509_certificate(crt.encode(), default_backend()))
-                count += 1
-            if start is True:
-                crt += strg
-
-        if(count == 0):
-            raise InputError('No certificate found')
-
-        status('Successfully added %d certificates' % count)
-
-    def add_from_der(self, crt_str):
-        self.certificates.append(x509.load_der_x509_certificate(crt_str, default_backend()))
-        status('Successfully added 1 certificate')
-
-    def create_bundle(self):
-        # Sort certificates in order to do binary search when looking up certificates
-        self.certificates = sorted(self.certificates, key=lambda cert: cert.subject.public_bytes(default_backend()))
-
-        bundle = struct.pack('>H', len(self.certificates))
-
-        for crt in self.certificates:
-            """ Read the public key as DER format """
-            pub_key = crt.public_key()
-            pub_key_der = pub_key.public_bytes(serialization.Encoding.DER, serialization.PublicFormat.SubjectPublicKeyInfo)
-
-            """ Read the subject name as DER format """
-            sub_name_der = crt.subject.public_bytes(default_backend())
-
-            name_len = len(sub_name_der)
-            key_len = len(pub_key_der)
-            len_data = struct.pack('>HH', name_len, key_len)
-
-            bundle += len_data
-            bundle += sub_name_der
-            bundle += pub_key_der
-
-        return bundle
-
-    def add_with_filter(self, crts_path, filter_path):
-
-        filter_set = set()
-        with open(filter_path, 'r', encoding='utf-8') as f:
-            csv_reader = csv.reader(f, delimiter=',')
-
-            # Skip header
-            next(csv_reader)
-            for row in csv_reader:
-                filter_set.add(row[1])
-
-        status('Parsing certificates from %s' % crts_path)
-        crt_str = []
-        with open(crts_path, 'r', encoding='utf-8') as f:
-            crt_str = f.read()
-
-            # Split all certs into a list of (name, certificate string) tuples
-            pem_crts = re.findall(r'(^.+?)\n(=+\n[\s\S]+?END CERTIFICATE-----\n)', crt_str, re.MULTILINE)
-
-            filtered_crts = ''
-            for name, crt in pem_crts:
-                if name in filter_set:
-                    filtered_crts += crt
-
-        self.add_from_pem(filtered_crts)
-
-
-class InputError(RuntimeError):
-    def __init__(self, e):
-        super(InputError, self).__init__(e)
-
-
-def main():
-    global quiet
-
-    parser = argparse.ArgumentParser(description='ESP-IDF x509 certificate bundle utility')
-
-    parser.add_argument('--quiet', '-q', help="Don't print non-critical status messages to stderr", action='store_true')
-    parser.add_argument('--input', '-i', nargs='+', required=True,
-                        help='Paths to the custom certificate folders or files to parse, parses all .pem or .der files')
-    parser.add_argument('--filter', '-f', help='Path to CSV-file where the second columns contains the name of the certificates \
-                        that should be included from cacrt_all.pem')
-
-    args = parser.parse_args()
-
-    quiet = args.quiet
-
-    bundle = CertificateBundle()
-
-    for path in args.input:
-        if os.path.isfile(path):
-            if os.path.basename(path) == 'cacrt_all.pem' and args.filter:
-                bundle.add_with_filter(path, args.filter)
-            else:
-                bundle.add_from_file(path)
-        elif os.path.isdir(path):
-            bundle.add_from_path(path)
-        else:
-            raise InputError('Invalid --input=%s, is neither file nor folder' % args.input)
-
-    status('Successfully added %d certificates in total' % len(bundle.certificates))
-
-    crt_bundle = bundle.create_bundle()
-
-    with open(ca_bundle_bin_file, 'wb') as f:
-        f.write(crt_bundle)
-
-
-if __name__ == '__main__':
-    try:
-        main()
-    except InputError as e:
-        print(e)
-        sys.exit(2)

examples/esp32_pio/WebSocketClientSSLBundle/lib/README

@@ -1,46 +0,0 @@
-
-This directory is intended for project specific (private) libraries.
-PlatformIO will compile them to static libraries and link into executable file.
-
-The source code of each library should be placed in a an own separate directory
-("lib/your_library_name/[here are source files]").
-
-For example, see a structure of the following two libraries `Foo` and `Bar`:
-
-|--lib
-|  |
-|  |--Bar
-|  |  |--docs
-|  |  |--examples
-|  |  |--src
-|  |     |- Bar.c
-|  |     |- Bar.h
-|  |  |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html
-|  |
-|  |--Foo
-|  |  |- Foo.c
-|  |  |- Foo.h
-|  |
-|  |- README --> THIS FILE
-|
-|- platformio.ini
-|--src
-   |- main.c
-
-and a contents of `src/main.c`:
-```
-#include <Foo.h>
-#include <Bar.h>
-
-int main (void)
-{
-  ...
-}
-
-```
-
-PlatformIO Library Dependency Finder will find automatically dependent
-libraries scanning project source files.
-
-More information about PlatformIO Library Dependency Finder
-- https://docs.platformio.org/page/librarymanager/ldf.html

examples/esp32_pio/WebSocketClientSSLBundle/platformio.ini

@@ -1,25 +0,0 @@
-; PlatformIO Project Configuration File
-;
-;   Build options: build flags, source filter
-;   Upload options: custom upload port, speed and extra flags
-;   Library options: dependencies, extra library storages
-;   Advanced options: extra scripting
-;
-; Please visit documentation for the other options and examples
-; https://docs.platformio.org/page/projectconf.html
-
-[env:esp32dev]
-platform = espressif32
-board = esp32dev
-framework = arduino
-monitor_speed = 115200
-upload_speed = 921600
-build_flags = 
-    -DCORE_DEBUG_LEVEL=5
-lib_deps = ../../../src
-
-extra_scripts = 
-    pre:run_gen_script.py
-
-board_build.embed_txtfiles = 
-    data/cert/x509_crt_bundle.bin

examples/esp32_pio/WebSocketClientSSLBundle/readme.md

@@ -1,12 +0,0 @@
-This is a PlatformIO project that uses a modified WiFiClientSecure library (in `lib`) to 
-implement proper SSL support using root certificates as discussed 
-[here](https://github.com/espressif/arduino-esp32/issues/3646#issuecomment-648292677)
-
-It is based on the work by [meltdonw03](https://github.com/meltdown03) in that thread, and the
-[BasicHttpsClient example](https://github.com/espressif/arduino-esp32/blob/1.0.4/libraries/HTTPClient/examples/BasicHttpsClient/BasicHttpsClient.ino) from the arduino-esp32 project.
-
-Just copy `include/secrets.hpp.template` to `include/secrets.hpp` and fill in your WiFi details.
-Then it should be pretty much ready to go. The local WiFiClientSecure library should take priority.
-Debug is set to verbose, so you'll see a lot of noise, but there should also be this readme on success :)
-
-To get a current CA cert bundle download it from [curl's website](https://curl.se/docs/caextract.html).

examples/esp32_pio/WebSocketClientSSLBundle/run_gen_script.py

@@ -1,6 +0,0 @@
-Import("env")
-
-env.Execute("$PYTHONEXE -m pip install cryptography")
-env.Execute("$PYTHONEXE gen_crt_bundle.py --input cacrt_all.pem")
-env.Execute("mkdir -p data/cert")
-env.Execute("mv -f x509_crt_bundle data/cert/x509_crt_bundle.bin")

examples/esp32_pio/WebSocketClientSSLBundle/src/main.cpp

@@ -1,127 +0,0 @@
-/*
- * main.cpp
- *
- *  Created on: 15.06.2024
- *
- */
-
-#include <Arduino.h>
-#include <WiFi.h>
-#include <WiFiMulti.h>
-
-#include <WebSocketsClient.h>
-
-extern const uint8_t rootca_crt_bundle_start[] asm(
-    "_binary_data_cert_x509_crt_bundle_bin_start");
-
-WiFiMulti wifiMulti;
-WebSocketsClient webSocket;
-
-#define USE_SERIAL Serial
-
-void setClock() {
-    configTime(0, 0, "pool.ntp.org", "time.nist.gov");
-
-    USE_SERIAL.print(F("Waiting for NTP time sync: "));
-    time_t nowSecs = time(nullptr);
-    while(nowSecs < 8 * 3600 * 2) {
-        delay(500);
-        USE_SERIAL.print(F("."));
-        yield();
-        nowSecs = time(nullptr);
-    }
-
-    USE_SERIAL.println();
-    struct tm timeinfo;
-    gmtime_r(&nowSecs, &timeinfo);
-    USE_SERIAL.print(F("Current time: "));
-    USE_SERIAL.print(asctime(&timeinfo));
-}
-
-void hexdump(const void * mem, uint32_t len, uint8_t cols = 16) {
-    const uint8_t * src = (const uint8_t *)mem;
-    USE_SERIAL.printf("\n[HEXDUMP] Address: 0x%08X len: 0x%X (%d)", (ptrdiff_t)src, len, len);
-    for(uint32_t i = 0; i < len; i++) {
-        if(i % cols == 0) {
-            USE_SERIAL.printf("\n[0x%08X] 0x%08X: ", (ptrdiff_t)src, i);
-        }
-        USE_SERIAL.printf("%02X ", *src);
-        src++;
-    }
-    USE_SERIAL.printf("\n");
-}
-
-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");
-            break;
-        case WStype_TEXT:
-            USE_SERIAL.printf("[WSc] get text: %s\n", payload);
-
-            // send message to server
-            // webSocket.sendTXT("message here");
-            break;
-        case WStype_BIN:
-            USE_SERIAL.printf("[WSc] get binary length: %u\n", length);
-            hexdump(payload, 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;
-    }
-}
-
-void setup() {
-    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);
-    }
-
-    wifiMulti.addAP("SSID", "WIFI_PASSPHRASE");
-
-    // WiFi.disconnect();
-    while(wifiMulti.run() != WL_CONNECTED) {
-        delay(100);
-    }
-
-    setClock();
-
-    // server address, port and URL. This server can be flakey.
-    // Expected response: Request served by 0123456789abcdef
-    webSocket.beginSslWithBundle("echo.websocket.org", 443, "/", rootca_crt_bundle_start, "");
-
-    // event handler
-    webSocket.onEvent(webSocketEvent);
-
-    // use HTTP Basic Authorization this is optional enable if needed
-    // webSocket.setAuthorization("user", "Password");
-
-    // try ever 5000 again if connection has failed
-    webSocket.setReconnectInterval(5000);
-}
-
-void loop() {
-    webSocket.loop();
-}

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

examples/seeed-studio/xio-wio-terminal/WebSocketClient/WebSocketClient.ino

@@ -1,105 +0,0 @@
-/*
- * WebSocketClient.ino
- *
- *  Created on: 10.08.2024
- *
- */
-
-#include <Arduino.h>
-#include <rpcWiFi.h>
-#include <WiFiMulti.h>
-#include <WebSocketsClient.h>
-
-WebSocketsClient webSocket;
-WiFiMulti wifiMulti;
-
-#define USE_SERIAL Serial
-
-void hexdump(const void *mem, uint32_t len, uint8_t cols = 16) {
-	const uint8_t* src = (const uint8_t*) mem;
-	USE_SERIAL.printf("\n[HEXDUMP] Address: 0x%08X len: 0x%X (%d)", (ptrdiff_t)src, len, len);
-	for(uint32_t i = 0; i < len; i++) {
-		if(i % cols == 0) {
-			USE_SERIAL.printf("\n[0x%08X] 0x%08X: ", (ptrdiff_t)src, i);
-		}
-		USE_SERIAL.printf("%02X ", *src);
-		src++;
-	}
-	USE_SERIAL.printf("\n");
-}
-
-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");
-			break;
-		case WStype_TEXT:
-			USE_SERIAL.printf("[WSc] get text: %s\n", payload);
-
-			// send message to server
-			// webSocket.sendTXT("message here");
-			break;
-		case WStype_BIN:
-			USE_SERIAL.printf("[WSc] get binary length: %u\n", length);
-			hexdump(payload, 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_PONG:
-    case WStype_PING:
-		case WStype_FRAGMENT_FIN:
-			break;
-	}
-
-}
-
-void setup() {
-	// USE_SERIAL.begin(921600);
-	USE_SERIAL.begin(115200);
-	
-	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);
-	}
-
-	// server address, port and URL
-	webSocket.begin("192.168.0.123", 81, "/");
-
-	// event handler
-	webSocket.onEvent(webSocketEvent);
-
-	// use HTTP Basic Authorization this is optional remove if not needed
-	webSocket.setAuthorization("user", "Password");
-
-	// try ever 5000 again if connection has failed
-	webSocket.setReconnectInterval(5000);
-
-}
-
-void loop() {
-	webSocket.loop();
-}

library.json

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

library.properties

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

src/SocketIOclient.cpp

@@ -15,39 +15,39 @@ SocketIOclient::SocketIOclient() {
 SocketIOclient::~SocketIOclient() {
 }
 
-void SocketIOclient::begin(const char * host, uint16_t port, const char * url, const char * protocol, uint32_t pingInterval, uint32_t pongTimeout, uint8_t disconnectTimeoutCount) {
+void SocketIOclient::begin(const char * host, uint16_t port, const char * url, const char * protocol) {
     WebSocketsClient::beginSocketIO(host, port, url, protocol);
-    WebSocketsClient::enableHeartbeat(pingInterval, pongTimeout, disconnectTimeoutCount);
+    WebSocketsClient::enableHeartbeat(60 * 1000, 90 * 1000, 5);
     initClient();
 }
 
-void SocketIOclient::begin(String host, uint16_t port, String url, String protocol, uint32_t pingInterval, uint32_t pongTimeout, uint8_t disconnectTimeoutCount) {
+void SocketIOclient::begin(String host, uint16_t port, String url, String protocol) {
     WebSocketsClient::beginSocketIO(host, port, url, protocol);
-    WebSocketsClient::enableHeartbeat(pingInterval, pongTimeout, disconnectTimeoutCount);
+    WebSocketsClient::enableHeartbeat(60 * 1000, 90 * 1000, 5);
     initClient();
 }
 #if defined(HAS_SSL)
-void SocketIOclient::beginSSL(const char * host, uint16_t port, const char * url, const char * protocol, uint32_t pingInterval, uint32_t pongTimeout, uint8_t disconnectTimeoutCount) {
+void SocketIOclient::beginSSL(const char * host, uint16_t port, const char * url, const char * protocol) {
     WebSocketsClient::beginSocketIOSSL(host, port, url, protocol);
-    WebSocketsClient::enableHeartbeat(pingInterval, pongTimeout, disconnectTimeoutCount);
+    WebSocketsClient::enableHeartbeat(60 * 1000, 90 * 1000, 5);
     initClient();
 }
 
-void SocketIOclient::beginSSL(String host, uint16_t port, String url, String protocol, uint32_t pingInterval, uint32_t pongTimeout, uint8_t disconnectTimeoutCount) {
+void SocketIOclient::beginSSL(String host, uint16_t port, String url, String protocol) {
     WebSocketsClient::beginSocketIOSSL(host, port, url, protocol);
-    WebSocketsClient::enableHeartbeat(pingInterval, pongTimeout, disconnectTimeoutCount);
+    WebSocketsClient::enableHeartbeat(60 * 1000, 90 * 1000, 5);
     initClient();
 }
 #if defined(SSL_BARESSL)
-void SocketIOclient::beginSSLWithCA(const char * host, uint16_t port, const char * url, const char * CA_cert, const char * protocol, uint32_t pingInterval, uint32_t pongTimeout, uint8_t disconnectTimeoutCount) {
+void SocketIOclient::beginSSLWithCA(const char * host, uint16_t port, const char * url, const char * CA_cert, const char * protocol) {
     WebSocketsClient::beginSocketIOSSLWithCA(host, port, url, CA_cert, protocol);
-    WebSocketsClient::enableHeartbeat(pingInterval, pongTimeout, disconnectTimeoutCount);
+    WebSocketsClient::enableHeartbeat(60 * 1000, 90 * 1000, 5);
     initClient();
 }
 
-void SocketIOclient::beginSSLWithCA(const char * host, uint16_t port, const char * url, BearSSL::X509List * CA_cert, const char * protocol, uint32_t pingInterval, uint32_t pongTimeout, uint8_t disconnectTimeoutCount) {
+void SocketIOclient::beginSSLWithCA(const char * host, uint16_t port, const char * url, BearSSL::X509List * CA_cert, const char * protocol) {
     WebSocketsClient::beginSocketIOSSLWithCA(host, port, url, CA_cert, protocol);
-    WebSocketsClient::enableHeartbeat(pingInterval, pongTimeout, disconnectTimeoutCount);
+    WebSocketsClient::enableHeartbeat(60 * 1000, 90 * 1000, 5);
     initClient();
 }
 
@@ -85,18 +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);
-}
-
-void SocketIOclient::disconnect(void) {
-    WebSocketsClient::disconnect();
-}
-
 /**
  * send text data to client
  * @param num uint8_t client id
@@ -261,4 +249,4 @@ void SocketIOclient::handleCbEvent(WStype_t type, uint8_t * payload, size_t leng
         case WStype_PONG:
             break;
     }
-}
+}

src/SocketIOclient.h

@@ -9,7 +9,6 @@
 #define SOCKETIOCLIENT_H_
 
 #include "WebSockets.h"
-#include "WebSocketsClient.h"
 
 #define EIO_HEARTBEAT_INTERVAL 20000
 
@@ -47,25 +46,22 @@ class SocketIOclient : protected WebSocketsClient {
     SocketIOclient(void);
     virtual ~SocketIOclient(void);
 
-    void begin(const char * host, uint16_t port, const char * url = "/socket.io/?EIO=3", const char * protocol = "arduino", uint32_t pingInterval = 60 * 1000, uint32_t pongTimeout = 90 * 1000, uint8_t disconnectTimeoutCount = 5);
-    void begin(String host, uint16_t port, String url = "/socket.io/?EIO=3", String protocol = "arduino", uint32_t pingInterval = 60 * 1000, uint32_t pongTimeout = 90 * 1000, uint8_t disconnectTimeoutCount = 5);
+    void begin(const char * host, uint16_t port, const char * url = "/socket.io/?EIO=3", const char * protocol = "arduino");
+    void begin(String host, uint16_t port, String url = "/socket.io/?EIO=3", String protocol = "arduino");
 
 #ifdef HAS_SSL
-    void beginSSL(const char * host, uint16_t port, const char * url = "/socket.io/?EIO=3", const char * protocol = "arduino", uint32_t pingInterval = 60 * 1000, uint32_t pongTimeout = 90 * 1000, uint8_t disconnectTimeoutCount = 5);
-    void beginSSL(String host, uint16_t port, String url = "/socket.io/?EIO=3", String protocol = "arduino", uint32_t pingInterval = 60 * 1000, uint32_t pongTimeout = 90 * 1000, uint8_t disconnectTimeoutCount = 5);
+    void beginSSL(const char * host, uint16_t port, const char * url = "/socket.io/?EIO=3", const char * protocol = "arduino");
+    void beginSSL(String host, uint16_t port, String url = "/socket.io/?EIO=3", String protocol = "arduino");
 #ifndef SSL_AXTLS
-    void beginSSLWithCA(const char * host, uint16_t port, const char * url = "/socket.io/?EIO=3", const char * CA_cert = NULL, const char * protocol = "arduino", uint32_t pingInterval = 60 * 1000, uint32_t pongTimeout = 90 * 1000, uint8_t disconnectTimeoutCount = 5);
+    void beginSSLWithCA(const char * host, uint16_t port, const char * url = "/socket.io/?EIO=3", const char * CA_cert = NULL, const char * protocol = "arduino");
+    void beginSSLWithCA(const char * host, uint16_t port, const char * url = "/socket.io/?EIO=3", BearSSL::X509List * CA_cert = NULL, const char * protocol = "arduino");
     void setSSLClientCertKey(const char * clientCert = NULL, const char * clientPrivateKey = NULL);
-    #if defined(SSL_BARESSL)
-    void beginSSLWithCA(const char * host, uint16_t port, const char * url = "/socket.io/?EIO=3", BearSSL::X509List * CA_cert = NULL, const char * protocol = "arduino", uint32_t pingInterval = 60 * 1000, uint32_t pongTimeout = 90 * 1000, uint8_t disconnectTimeoutCount = 5);
     void setSSLClientCertKey(BearSSL::X509List * clientCert = NULL, BearSSL::PrivateKey * clientPrivateKey = NULL);
-    #endif
 #endif
 #endif
     bool isConnected(void);
 
     void onEvent(SocketIOclientEvent cbEvent);
-    void disconnect(void);
 
     bool sendEVENT(uint8_t * payload, size_t length = 0, bool headerToPayload = false);
     bool sendEVENT(const uint8_t * payload, size_t length = 0);
@@ -79,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
 
@@ -571,7 +567,6 @@ String WebSockets::acceptKey(String & clientKey) {
  */
 String WebSockets::base64_encode(uint8_t * data, size_t length) {
     size_t size   = ((length * 1.6f) + 1);
-    size          = std::max(size, (size_t)5);    // minimum buffer size
     char * buffer = (char *)malloc(size);
     if(buffer) {
         base64_encodestate _state;
@@ -645,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();
@@ -699,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);
         }
@@ -750,7 +745,7 @@ void WebSockets::handleHBTimeout(WSclient_t * client) {
                 client->pongTimeoutCount++;
                 client->lastPing = millis() - client->pingInterval - 500;    // force ping on the next run
 
-                DEBUG_WEBSOCKETS("[HBtimeout] pong TIMEOUT! lp=%d millis=%lu pi=%d count=%d\n", client->lastPing, millis(), pi, client->pongTimeoutCount);
+                DEBUG_WEBSOCKETS("[HBtimeout] pong TIMEOUT! lp=%d millis=%d pi=%d count=%d\n", client->lastPing, millis(), pi, client->pongTimeoutCount);
 
                 if(client->disconnectTimeoutCount && client->pongTimeoutCount >= client->disconnectTimeoutCount) {
                     DEBUG_WEBSOCKETS("[HBtimeout] count=%d, DISCONNECTING\n", client->pongTimeoutCount);

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,36 +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)
-
-#elif defined(ARDUINO_UNOWIFIR4)
-
-#define WEBSOCKETS_MAX_DATA_SIZE (15 * 1024)
-#define WEBSOCKETS_YIELD() yield()
-#define WEBSOCKETS_YIELD_MORE() delay(1)
-
-#elif defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_SAMD_NANO_33_IOT)
-
-#define WEBSOCKETS_MAX_DATA_SIZE (15 * 1024)
-#define WEBSOCKETS_YIELD() yield()
-#define WEBSOCKETS_YIELD_MORE() delay(1)
-
-#elif defined(WIO_TERMINAL) || defined(SEEED_XIAO_M0)
-
-#define WEBSOCKETS_MAX_DATA_SIZE (15 * 1024)
-#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
@@ -121,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)
@@ -131,10 +102,6 @@
 #define NETWORK_ENC28J60 (3)
 #define NETWORK_ESP32 (4)
 #define NETWORK_ESP32_ETH (5)
-#define NETWORK_RP2040 (6)
-#define NETWORK_UNOWIFIR4 (7)
-#define NETWORK_WIFI_NINA (8)
-#define NETWORK_SAMD_SEED (9)
 
 // max size of the WS Message Header
 #define WEBSOCKETS_MAX_HEADER_SIZE (14)
@@ -143,25 +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
-
-#elif defined(ARDUINO_UNOWIFIR4)
-#define WEBSOCKETS_NETWORK_TYPE NETWORK_UNOWIFIR4
-
-#elif defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_SAMD_NANO_33_IOT)
-#define WEBSOCKETS_NETWORK_TYPE NETWORK_WIFI_NINA
-
-#elif defined(WIO_TERMINAL) || defined(SEEED_XIAO_M0)
-#define WEBSOCKETS_NETWORK_TYPE NETWORK_SAMD_SEED
-
+//#define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP32_ETH
 #else
 #define WEBSOCKETS_NETWORK_TYPE NETWORK_W5100
 
@@ -245,47 +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
-
-#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_UNOWIFIR4)
-
-#include <WiFiS3.h>
-#define WEBSOCKETS_NETWORK_CLASS WiFiClient
-#define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer
-
-#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA)
-#if __has_include(<WiFiNINA.h>)
-    #include <WiFiNINA.h>
-#else
-    #error "Please install WiFiNINA library!"
-#endif
-
-#define WEBSOCKETS_NETWORK_CLASS WiFiClient
-#define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer
-#define WEBSOCKETS_NETWORK_SSL_CLASS WiFiSSLClient
-
-#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED)
-#if __has_include(<rpcWiFi.h>) && __has_include(<rpcWiFiClientSecure.h>)
-    #include <rpcWiFi.h>
-    #include <rpcWiFiClientSecure.h>
-#else
-    #error "Please install rpcWiFi library!"
-#endif
-
-#define WEBSOCKETS_NETWORK_CLASS WiFiClient
-#define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer
-#define WEBSOCKETS_NETWORK_SSL_CLASS WiFiClientSecure
-
-#define WEBSOCKETS_NETWORK_CLASS WiFiClient
-#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

@@ -48,12 +48,6 @@ void WebSocketsClient::begin(const char * host, uint16_t port, const char * url,
 #if defined(HAS_SSL)
     _fingerprint = SSL_FINGERPRINT_NULL;
     _CA_cert     = NULL;
-#ifdef ESP32
-    _CA_bundle = NULL;
-#if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 4)
-    _CA_bundle_size = 0;
-#endif
-#endif
 #endif
 
     _client.num    = 0;
@@ -82,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());
@@ -113,7 +105,6 @@ void WebSocketsClient::beginSSL(const char * host, uint16_t port, const char * u
     _client.isSSL = true;
     _fingerprint  = fingerprint;
     _CA_cert      = NULL;
-    _CA_bundle    = NULL;
 }
 
 void WebSocketsClient::beginSSL(String host, uint16_t port, String url, String fingerprint, String protocol) {
@@ -125,28 +116,7 @@ void WebSocketsClient::beginSslWithCA(const char * host, uint16_t port, const ch
     _client.isSSL = true;
     _fingerprint  = SSL_FINGERPRINT_NULL;
     _CA_cert      = CA_cert;
-    _CA_bundle    = NULL;
 }
-
-#if defined(ESP32) && ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 4)
-void WebSocketsClient::beginSslWithBundle(const char * host, uint16_t port, const char * url, const uint8_t * CA_bundle, size_t CA_bundle_size, const char * protocol) {
-    begin(host, port, url, protocol);
-    _client.isSSL   = true;
-    _fingerprint    = SSL_FINGERPRINT_NULL;
-    _CA_cert        = NULL;
-    _CA_bundle      = CA_bundle;
-    _CA_bundle_size = CA_bundle_size;
-}
-#else
-void WebSocketsClient::beginSslWithBundle(const char * host, uint16_t port, const char * url, const uint8_t * CA_bundle, const char * protocol) {
-    begin(host, port, url, protocol);
-    _client.isSSL = true;
-    _fingerprint  = SSL_FINGERPRINT_NULL;
-    _CA_cert      = NULL;
-    _CA_bundle    = CA_bundle;
-}
-#endif
-
 #else
 void WebSocketsClient::beginSSL(const char * host, uint16_t port, const char * url, const uint8_t * fingerprint, const char * protocol) {
     begin(host, port, url, protocol);
@@ -155,7 +125,6 @@ void WebSocketsClient::beginSSL(const char * host, uint16_t port, const char * u
     _CA_cert      = NULL;
 }
 
-#if defined(SSL_BARESSL)
 void WebSocketsClient::beginSslWithCA(const char * host, uint16_t port, const char * url, BearSSL::X509List * CA_cert, const char * protocol) {
     begin(host, port, url, protocol);
     _client.isSSL = true;
@@ -167,16 +136,14 @@ void WebSocketsClient::beginSslWithCA(const char * host, uint16_t port, const ch
     beginSslWithCA(host, port, url, new BearSSL::X509List(CA_cert), protocol);
 }
 
-void WebSocketsClient::setSSLClientCertKey(const char * clientCert, const char * clientPrivateKey) {
-    setSSLClientCertKey(new BearSSL::X509List(clientCert), new BearSSL::PrivateKey(clientPrivateKey));
-}
-
 void WebSocketsClient::setSSLClientCertKey(BearSSL::X509List * clientCert, BearSSL::PrivateKey * clientPrivateKey) {
     _client_cert = clientCert;
     _client_key  = clientPrivateKey;
 }
-#endif    // SSL_BARESSL
 
+void WebSocketsClient::setSSLClientCertKey(const char * clientCert, const char * clientPrivateKey) {
+    setSSLClientCertKey(new BearSSL::X509List(clientCert), new BearSSL::PrivateKey(clientPrivateKey));
+}
 
 #endif    // SSL_AXTLS
 #endif    // HAS_SSL
@@ -245,12 +212,7 @@ void WebSocketsClient::loop(void) {
         if(_client.isSSL) {
             DEBUG_WEBSOCKETS("[WS-Client] connect wss...\n");
             if(_client.ssl) {
-                #if(WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) || (WEBSOCKETS_NETWORK_TYPE ==NETWORK_UNOWIFIR4)
-                    // does not support delete (no destructor)
-                #else
-                    delete _client.ssl;
-                #endif
-                
+                delete _client.ssl;
                 _client.ssl = NULL;
                 _client.tcp = NULL;
             }
@@ -262,23 +224,12 @@ 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);
-#elif defined(WIO_TERMINAL) || defined(SEEED_XIAO_M0)
-                _client.ssl->setCACert(_CA_cert);
-#elif defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_SAMD_NANO_33_IOT)
-                // no setCACert
 #else
 #error setCACert not implemented
 #endif
 #if defined(ESP32)
-            } else if(_CA_bundle) {
-                DEBUG_WEBSOCKETS("[WS-Client] setting CA bundle");
-#if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 4)
-                _client.ssl->setCACertBundle(_CA_bundle, _CA_bundle_size);
-#else
-                _client.ssl->setCACertBundle(_CA_bundle);
-#endif
             } else if(!SSL_FINGERPRINT_IS_SET) {
                 _client.ssl->setInsecure();
 #elif defined(SSL_BARESSL)
@@ -295,11 +246,7 @@ void WebSocketsClient::loop(void) {
         } else {
             DEBUG_WEBSOCKETS("[WS-Client] connect ws...\n");
             if(_client.tcp) {
-                #if(WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) || (WEBSOCKETS_NETWORK_TYPE ==NETWORK_UNOWIFIR4)
-                    // does not support delete (no destructor)
-                #else
                 delete _client.tcp;
-                #endif
                 _client.tcp = NULL;
             }
             _client.tcp = new WEBSOCKETS_NETWORK_CLASS();
@@ -479,9 +426,9 @@ bool WebSocketsClient::isConnected(void) {
     return (_client.status == WSC_CONNECTED);
 }
 
-// #################################################################################
-// #################################################################################
-// #################################################################################
+//#################################################################################
+//#################################################################################
+//#################################################################################
 
 /**
  *
@@ -526,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();
@@ -550,11 +497,7 @@ void WebSocketsClient::clientDisconnect(WSclient_t * client) {
 #if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
         client->status = WSC_NOT_CONNECTED;
 #else
-        #if(WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) || (WEBSOCKETS_NETWORK_TYPE ==NETWORK_UNOWIFIR4)
-            // does not support delete (no destructor)
-        #else
-            delete client->tcp;
-        #endif
+        delete client->tcp;
 #endif
         client->tcp = NULL;
     }
@@ -790,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 {
@@ -841,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);
@@ -921,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

@@ -48,20 +48,11 @@ class WebSocketsClient : protected WebSockets {
     void beginSSL(String host, uint16_t port, String url = "/", String fingerprint = "", String protocol = "arduino");
 #else
     void beginSSL(const char * host, uint16_t port, const char * url = "/", const uint8_t * fingerprint = NULL, const char * protocol = "arduino");
-    #if defined(SSL_BARESSL)
     void beginSslWithCA(const char * host, uint16_t port, const char * url = "/", BearSSL::X509List * CA_cert = NULL, const char * protocol = "arduino");
     void setSSLClientCertKey(BearSSL::X509List * clientCert = NULL, BearSSL::PrivateKey * clientPrivateKey = NULL);
-    #endif
     void setSSLClientCertKey(const char * clientCert = NULL, const char * clientPrivateKey = NULL);
 #endif
     void beginSslWithCA(const char * host, uint16_t port, const char * url = "/", const char * CA_cert = NULL, const char * protocol = "arduino");
-#ifdef ESP32
-#if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 4)
-    void beginSslWithBundle(const char * host, uint16_t port, const char * url = "/", const uint8_t * CA_bundle = NULL, size_t CA_bundle_size = 0, const char * protocol = "arduino");
-#else
-    void beginSslWithBundle(const char * host, uint16_t port, const char * url = "/", const uint8_t * CA_bundle = NULL, const char * protocol = "arduino");
-#endif
-#endif
 #endif
 
     void beginSocketIO(const char * host, uint16_t port, const char * url = "/socket.io/?EIO=3", const char * protocol = "arduino");
@@ -121,30 +112,17 @@ class WebSocketsClient : protected WebSockets {
 #ifdef SSL_AXTLS
     String _fingerprint;
     const char * _CA_cert;
-    const uint8_t * _CA_bundle;
-#if defined(ESP32)
-#if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 4)
-    size_t _CA_bundle_size;
-#endif
-#endif
 #define SSL_FINGERPRINT_IS_SET (_fingerprint.length())
 #define SSL_FINGERPRINT_NULL ""
 #else
     const uint8_t * _fingerprint;
-    #if defined(SSL_BARESSL)
     BearSSL::X509List * _CA_cert;
     BearSSL::X509List * _client_cert;
     BearSSL::PrivateKey * _client_key;
-    #endif
 #define SSL_FINGERPRINT_IS_SET (_fingerprint != NULL)
 #define SSL_FINGERPRINT_NULL NULL
 #endif
 
-#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA)
-    const char * _CA_cert;
-    const uint8_t * _CA_bundle;
-#endif
-
 #endif
     WSclient_t _client;
 
@@ -176,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

@@ -65,11 +65,6 @@ WebSocketsServerCore::~WebSocketsServerCore() {
 }
 
 WebSocketsServer::~WebSocketsServer() {
-    #if(WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED)
-        // does not support delete (no destructor)
-    #else
-        delete _server;
-    #endif    
 }
 
 /**
@@ -90,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());
@@ -401,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
@@ -419,9 +412,9 @@ IPAddress WebSocketsServerCore::remoteIP(uint8_t num) {
 }
 #endif
 
-// #################################################################################
-// #################################################################################
-// #################################################################################
+//#################################################################################
+//#################################################################################
+//#################################################################################
 
 /**
  * handle new client connection
@@ -433,16 +426,8 @@ WSclient_t * WebSocketsServerCore::newClient(WEBSOCKETS_NETWORK_CLASS * TCPclien
     for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
         client = &_clients[i];
 
-        // look for match to existing socket before creating a new one
-        if(clientIsConnected(client)) {
-#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_W5100)
-            // Check to see if it is the same socket - if so, return it
-            if(client->tcp->getSocketNumber() == TCPclient->getSocketNumber()) {
-                return client;
-            }
-#endif
-        } else {
-            // state is not connected or tcp connection is lost
+        // state is not connected or tcp connection is lost
+        if(!clientIsConnected(client)) {
             client->tcp = TCPclient;
 
 #if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
@@ -454,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
@@ -531,20 +516,15 @@ 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();
         }
 #if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
         client->status = WSC_NOT_CONNECTED;
-#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED)
-        // does not support delete (no destructor)
 #else
         delete client->tcp;
 #endif
@@ -557,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();
@@ -631,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
@@ -639,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();
@@ -656,17 +631,12 @@ 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
 
         // store new connection
-        #if(WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA)
-            WEBSOCKETS_NETWORK_CLASS * tcpClient = new WEBSOCKETS_NETWORK_CLASS(_server->available());
-        #else
-            WEBSOCKETS_NETWORK_CLASS * tcpClient = new WEBSOCKETS_NETWORK_CLASS(_server->accept());
-        #endif
-
+        WEBSOCKETS_NETWORK_CLASS * tcpClient = new WEBSOCKETS_NETWORK_CLASS(_server->available());
         if(!tcpClient) {
             DEBUG_WEBSOCKETS("[WS-Client] creating Network class failed!");
             return;
@@ -674,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
 }
@@ -689,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');
@@ -743,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;
 
@@ -945,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 25.08.2024
+ * @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.6.0"
+#define WEBSOCKETS_VERSION "2.3.5"
 
 #define WEBSOCKETS_VERSION_MAJOR 2
-#define WEBSOCKETS_VERSION_MINOR 6
-#define WEBSOCKETS_VERSION_PATCH 0
+#define WEBSOCKETS_VERSION_MINOR 3
+#define WEBSOCKETS_VERSION_PATCH 5
 
-#define WEBSOCKETS_VERSION_INT 2006000
+#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) || defined(WIO_TERMINAL) || defined(SEEED_XIAO_M0)
+#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) || defined(WIO_TERMINAL) || defined(SEEED_XIAO_M0)
+#if defined(ESP32)
 #define CORE_HAS_LIBB64
 #endif
 

travis/common.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-set -e
 
 function build_sketches()
 {
@@ -28,28 +27,11 @@ function build_sketches()
     done
 }
 
-function build_sketch_cli()
-{
-    local sketch=$1
-    local board=$2
-    arduino-cli --log --log-level info compile -b "$board" "$sketch"
-    result=$?
-    if [ $result -ne 0 ]; then
-        echo "Build failed ($sketch) build verbose..."
-        arduino-cli --log --log-level debug compile -b "$board" "$sketch"
-        result=$?
-    fi
-    if [ $result -ne 0 ]; then
-        echo "Build failed ($1) $sketch"
-        return $result
-    fi
-}
-
 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..."
@@ -78,7 +60,7 @@ function get_sketches_json()
         if [[ $sketch != ${sketches[-1]} ]] ; then
             echo -en ","
         fi
-
+        
     done
     echo -en "]"
 }
@@ -88,7 +70,7 @@ function get_sketches_json_matrix()
     local arduino=$1
     local srcpath=$2
     local platform=$3
-    local cliversion=$4
+    local ideversion=$4
     local board=$5
     local sketches=($(find $srcpath -name *.ino))
     for sketch in "${sketches[@]}" ; do
@@ -97,34 +79,24 @@ function get_sketches_json_matrix()
         if [[ -f "$sketchdir/.$platform.skip" ]]; then
             continue
         fi
-        echo -en "{\"name\":\"$sketchname\",\"board\":\"$board\",\"cliversion\":\"$cliversion\",\"cpu\":\"$platform\",\"sketch\":\"$sketch\"}"
+        echo -en "{\"name\":\"$sketchname\",\"board\":\"$board\",\"ideversion\":\"$ideversion\",\"cpu\":\"$platform\",\"sketch\":\"$sketch\"}"
         if [[ $sketch != ${sketches[-1]} ]] ; then
             echo -en ","
         fi
     done
 }
 
-function get_core_cli() {
-    export ARDUINO_BOARD_MANAGER_ADDITIONAL_URLS="https://arduino.esp8266.com/stable/package_esp8266com_index.json https://espressif.github.io/arduino-esp32/package_esp32_index.json https://github.com/earlephilhower/arduino-pico/releases/download/3.9.2/package_rp2040_index.json"
-    arduino-cli core update-index
-    arduino-cli core install esp8266:esp8266
-    arduino-cli core install esp32:esp32
-    arduino-cli core install rp2040:rp2040
-}
-
 function get_core()
 {
     echo Setup core for $1
 
-    mkdir -p $HOME/arduino_ide/packages/hardware
-    cd $HOME/arduino_ide/packages/hardware
+    cd $HOME/arduino_ide/hardware
 
     if [ "$1" = "esp8266" ] ; then
         mkdir esp8266com
         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
@@ -155,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 
 }