fix(mosq): Add WebRTC implementation of peer_backend

Author: david-cermak

components/mosquitto/examples/serverless_mqtt/CMakeLists.txt

@@ -7,7 +7,7 @@ include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 # Setup ESP-PEER from GitHub repo (but it's supported only on certain targets)
 set(ESP_PEER_COMPATIBLE_TARGETS "esp32s2" "esp32s3" "esp32p4" "esp32")
 if(IDF_TARGET IN_LIST ESP_PEER_COMPATIBLE_TARGETS)
-execute_process(COMMAND ${CMAKE_BINARY_DIR}/../esp_peer_setup.sh
+execute_process(COMMAND ${CMAKE_BINARY_DIR}/../esp_peer_setup/install.sh
                 ${CMAKE_BINARY_DIR}
                 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
                 RESULT_VARIABLE script_result)

components/mosquitto/examples/serverless_mqtt/Add-default-event-to-http-client-handler.patch renamed to components/mosquitto/examples/serverless_mqtt/esp_peer_setup/Add-default-event-to-http-client-handler.patch

@@ -1,24 +1,28 @@
-From 06b15a30e860daef303b6c6541a2cae858c17e6c Mon Sep 17 00:00:00 2001
+From cdc43a56f5ea1ab1935f55f47f8644f5dd30825e Mon Sep 17 00:00:00 2001
 From: David Cermak <cermak@espressif.com>
 Date: Thu, 10 Jul 2025 11:09:57 +0200
 Subject: [PATCH] fix(media_lib): Remove deprecated freeRTOS header
 
 ---
- components/media_lib_sal/port/media_lib_os_freertos.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ components/media_lib_sal/port/media_lib_os_freertos.c | 4 ++++
+ 1 file changed, 4 insertions(+)
 
 diff --git a/components/media_lib_sal/port/media_lib_os_freertos.c b/components/media_lib_sal/port/media_lib_os_freertos.c
-index d248d59..7b588ca 100644
+index d248d59..aea0527 100644
 --- a/components/media_lib_sal/port/media_lib_os_freertos.c
 +++ b/components/media_lib_sal/port/media_lib_os_freertos.c
-@@ -40,7 +40,7 @@
+@@ -40,8 +40,12 @@
  #include "esp_idf_version.h"
 
  #if CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT
--#include "freertos/task_snapshot.h"
++#if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0))
 +#include "esp_private/freertos_debug.h"
++#else
+ #include "freertos/task_snapshot.h"
  #endif
++#endif
 
  #ifdef __XTENSA__
+ #include "esp_debug_helpers.h"
 --
 2.43.0

components/mosquitto/examples/serverless_mqtt/Remove-deprecated-freeRTOS-header.patch renamed to components/mosquitto/examples/serverless_mqtt/esp_peer_setup/Remove-deprecated-freeRTOS-header.patch

@@ -14,6 +14,7 @@ COMPONENTS_SRC="${EXTRACTED_DIR}/components"
 COMPONENTS_DST="${ESP_PEER_DIR}/components"
 PATCH_FILE_1="${THIS_DIR}/Add-default-event-to-http-client-handler.patch"
 PATCH_FILE_2="${THIS_DIR}/Remove-deprecated-freeRTOS-header.patch"
+PATCH_FILE_3="${THIS_DIR}/libpeer-Add-direct-dependency-to-libsrtp.patch"
 
 # Download if not exists
 if [ ! -d "$EXTRACTED_DIR" ]; then
@@ -22,6 +23,7 @@ if [ ! -d "$EXTRACTED_DIR" ]; then
     unzip -o "$ZIP_PATH" -d "$ESP_PEER_DIR"
     patch -p1 -d "$EXTRACTED_DIR" < "$PATCH_FILE_1"
     patch -p1 -d "$EXTRACTED_DIR" < "$PATCH_FILE_2"
+    patch -p1 -d "$EXTRACTED_DIR" < "$PATCH_FILE_3"
     mv ${EXTRACTED_DIR}/components ${ESP_PEER_DIR}
     mv ${ESP_PEER_DIR}/components/esp_webrtc/impl/peer_default ${ESP_PEER_DIR}/components
 fi

components/mosquitto/examples/serverless_mqtt/esp_peer_setup.sh renamed to components/mosquitto/examples/serverless_mqtt/esp_peer_setup/install.sh

@@ -0,0 +1,23 @@
+From 695e057000698f4897b6c5802851499842e2fe31 Mon Sep 17 00:00:00 2001
+From: David Cermak <cermak@espressif.com>
+Date: Fri, 11 Jul 2025 16:59:21 +0200
+Subject: [PATCH] fix(libpeer): Add direct dependency to libsrtp
+
+---
+ components/esp_webrtc/impl/peer_default/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/components/esp_webrtc/impl/peer_default/CMakeLists.txt b/components/esp_webrtc/impl/peer_default/CMakeLists.txt
+index 2af35cf..3fb4615 100644
+--- a/components/esp_webrtc/impl/peer_default/CMakeLists.txt
++++ b/components/esp_webrtc/impl/peer_default/CMakeLists.txt
+@@ -2,6 +2,6 @@ idf_component_register(INCLUDE_DIRS ./include)
+
+ get_filename_component(BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR} NAME)
+ add_prebuilt_library(${BASE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/libs/${IDF_TARGET}/libpeer_default.a"
+-                     PRIV_REQUIRES ${BASE_DIR} esp_timer)
++                     PRIV_REQUIRES ${BASE_DIR} esp_timer espressif__esp_libsrtp)
+ target_link_libraries(${COMPONENT_LIB}  INTERFACE "-L ${CMAKE_CURRENT_SOURCE_DIR}/libs/${IDF_TARGET}")
+ target_link_libraries(${COMPONENT_LIB}  INTERFACE peer_default)
+--
+2.43.0

components/mosquitto/examples/serverless_mqtt/esp_peer_setup/libpeer-Add-direct-dependency-to-libsrtp.patch

@@ -1,8 +1,10 @@
 if(CONFIG_EXAMPLE_PEER_LIB_ESP_PEER)
-    set(PEER_BACKEND_SRC "webrtc.c")
+    set(PEER_BACKEND_SRC "peer_impl_webrtc.c")
+else()
+    set(PEER_BACKEND_SRC "peer_impl_juice.c")
 endif()
 
-idf_component_register(SRCS "serverless_mqtt.c" "peer_impl.c"
+idf_component_register(SRCS "serverless_mqtt.c"
                             "wifi_connect.c"
                             "${PEER_BACKEND_SRC}"
                     INCLUDE_DIRS "."

components/mosquitto/examples/serverless_mqtt/main/CMakeLists.txt

@@ -33,21 +33,55 @@ menu "Example Configuration"
                 WiFi station password for the example to use.
     endmenu
 
+    choice EXAMPLE_PEER_LIB
+        prompt "Choose peer library"
+        default EXAMPLE_PEER_LIB_LIBJUICE
+        help
+            Choose the peer library to use for WebRTC communication.
+            libjuice: Use libjuice library for ICE/STUN/TURN (Performs manual signalling)
+            esp_peer: Use ESP-IDF specific peer library
+
+        config EXAMPLE_PEER_LIB_ESP_PEER
+            bool "esp_peer"
+
+        config EXAMPLE_PEER_LIB_LIBJUICE
+            bool "libjuice"
+    endchoice
+
+    config EXAMPLE_WEBRTC_URL
+        string "WebRTC server URL"
+        depends on EXAMPLE_PEER_LIB_ESP_PEER
+        default "https://webrtc.espressif.com/join/"
+        help
+            URL of WebRTC remote endpoint.
+
+    config EXAMPLE_WEBRTC_ROOM_ID
+        string "WebRTC room ID"
+        depends on EXAMPLE_PEER_LIB_ESP_PEER
+        default "12345"
+        help
+            Room ID for WebRTC synchronisation.
+            Could be a random number, but the same for both peers.
+
+
     config EXAMPLE_MQTT_BROKER_URI
         string "MQTT Broker URL"
+        depends on EXAMPLE_PEER_LIB_LIBJUICE
         default "mqtt://mqtt.eclipseprojects.io"
         help
             URL of the mqtt broker use for synchronisation and exchanging
             ICE connect info (description and candidates).
 
     config EXAMPLE_MQTT_SYNC_TOPIC
         string "MQTT topic for synchronisation"
+        depends on EXAMPLE_PEER_LIB_LIBJUICE
         default "/topic/serverless_mqtt"
         help
             MQTT topic used fo synchronisation.
 
     config EXAMPLE_STUN_SERVER
         string "Hostname of STUN server"
+        depends on EXAMPLE_PEER_LIB_LIBJUICE
         default "stun.l.google.com"
         help
             STUN server hostname.
@@ -67,6 +101,7 @@ menu "Example Configuration"
 
     choice EXAMPLE_SERVERLESS_ROLE
         prompt "Choose your role"
+        depends on EXAMPLE_PEER_LIB_LIBJUICE
         default EXAMPLE_SERVERLESS_ROLE_PEER1
         help
             Choose either peer1 or peer2.
@@ -82,19 +117,4 @@ menu "Example Configuration"
             bool "peer2"
     endchoice
 
-    choice EXAMPLE_PEER_LIB
-        prompt "Choose peer library"
-        default EXAMPLE_PEER_LIB_LIBJUICE
-        help
-            Choose the peer library to use for WebRTC communication.
-            libjuice: Use libjuice library for ICE/STUN/TURN (Performs manual signalling)
-            esp_peer: Use ESP-IDF specific peer library
-
-        config EXAMPLE_PEER_LIB_ESP_PEER
-            bool "esp_peer"
-
-        config EXAMPLE_PEER_LIB_LIBJUICE
-            bool "libjuice"
-    endchoice
-
 endmenu

components/mosquitto/examples/serverless_mqtt/main/Kconfig.projbuild

@@ -3,3 +3,4 @@ dependencies:
   espressif/mosquitto:
     override_path: ../../..
   espressif/sock_utils: "*"
+  espressif/esp_libsrtp: "~1.0.0"

components/mosquitto/examples/serverless_mqtt/main/idf_component.yml

@@ -66,6 +66,7 @@ esp_err_t peer_init(on_peer_recv_t cb)
 {
     esp_err_t ret = ESP_FAIL;
     ESP_GOTO_ON_FALSE(cb, ESP_ERR_INVALID_ARG, err, TAG, "Invalid peer receive callback");
+    s_on_recv = cb;
     ESP_GOTO_ON_ERROR(create_candidates(), err, TAG, "Failed to create juice candidates");
     ESP_GOTO_ON_ERROR(sync_peers(), err, TAG, "Failed to sync with the other peer");
     EventBits_t bits = xEventGroupWaitBits(s_state, PEER_FAIL | PEER_CONNECTED, pdFALSE, pdFALSE, pdMS_TO_TICKS(90000));