dfu: share upload framing across transports

* move firmware-upload command parsing and ACK framing into common DFU
code so WebUSB and WebSockets use the same upload protocol
* update WebSockets handlers to return fixed-size owned responses
* refactor bootloader WebUSB so HWA only owns USB buffers and endpoint
plumbing, while the instance layer owns RX queuing, upload parsing, and
DFU writer state

Author: paradajz

app/bootloader/CMakeLists.txt

@@ -9,6 +9,7 @@ add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../common/src/metadata ${CMAKE_CURREN
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../common/src/signaling ${CMAKE_CURRENT_BINARY_DIR}/signaling_common)
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../common/src/dfu/writer ${CMAKE_CURRENT_BINARY_DIR}/dfu_writer)
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../common/src/dfu/dfu_stream_parser ${CMAKE_CURRENT_BINARY_DIR}/dfu_stream_parser)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../common/src/dfu/upload ${CMAKE_CURRENT_BINARY_DIR}/dfu_upload)
 add_subdirectory(src/io/indicators)
 add_subdirectory(src/dfu/direct_update_writer)
 add_subdirectory(src/signaling)
@@ -19,6 +20,7 @@ target_link_libraries(app
     opendeck_common_metadata
     opendeck_common_signaling
     opendeck_common_dfu_dfu_stream_parser
+    opendeck_common_dfu_upload
     opendeck_bootloader_io_indicators
     opendeck_bootloader_dfu_direct_update_writer
     opendeck_bootloader_signaling

app/bootloader/src/dfu/direct_update_writer/CMakeLists.txt

@@ -6,7 +6,7 @@ target_sources(opendeck_bootloader_dfu_direct_update_writer PRIVATE
 )
 
 target_link_libraries(opendeck_bootloader_dfu_direct_update_writer
-    PRIVATE
+    PUBLIC
     opendeck_common_dfu_dfu_stream_parser
     opendeck_common_dfu_writer
     opendeck_common_metadata

app/bootloader/src/protocols/websockets/handler/firmware_upload/firmware_upload_handler.cpp

@@ -12,13 +12,17 @@ using namespace opendeck::bootloader::protocols::websockets::firmware_upload;
 namespace
 {
     LOG_MODULE_REGISTER(opendeck_bootloader_websockets_firmware_upload, CONFIG_OPENDECK_LOG_LEVEL);    // NOLINT
+
+    static_assert(sizeof(opendeck::common::dfu::upload::Ack) <=
+                  opendeck::common::protocols::websockets::Handler::RESPONSE_SIZE);
 }    // namespace
 
 FirmwareUploadHandler::FirmwareUploadHandler(bootloader::dfu::direct_update_writer::DirectUpdateWriter& direct_update_writer)
     : _firmware_upload(direct_update_writer)
 {}
 
-std::optional<std::span<const uint8_t>> FirmwareUploadHandler::handle_frame(std::span<const uint8_t> data, [[maybe_unused]] uint32_t session_id)
+std::optional<FirmwareUploadHandler::Response> FirmwareUploadHandler::handle_frame(std::span<const uint8_t>  data,
+                                                                                   [[maybe_unused]] uint32_t session_id)
 {
     const auto response = _firmware_upload.handle(data);
 
@@ -27,14 +31,19 @@ std::optional<std::span<const uint8_t>> FirmwareUploadHandler::handle_frame(std:
         return std::nullopt;
     }
 
-    _response = response->response;
-
     if (response->finished)
     {
         LOG_INF("Bootloader network DFU upload complete");
     }
 
-    return std::span<const uint8_t>(_response.data(), _response.size());
+    const auto ack_bytes = opendeck::common::dfu::upload::ack_to_bytes(response->response);
+
+    Response handler_response = {};
+    handler_response.size     = ack_bytes.size();
+
+    std::copy(ack_bytes.begin(), ack_bytes.end(), handler_response.data.begin());
+
+    return handler_response;
 }
 
 void FirmwareUploadHandler::on_close_session([[maybe_unused]] uint32_t session_id)

app/bootloader/src/protocols/websockets/handler/firmware_upload/firmware_upload_handler.h

@@ -8,12 +8,14 @@
 #include "bootloader/src/dfu/direct_update_writer/instance/impl/direct_update_writer.h"
 #include "common/src/protocols/websockets/handler/handler.h"
 #include "common/src/protocols/websockets/firmware_upload/firmware_upload.h"
-#include "common/src/protocols/websockets/shared/firmware_upload.h"
 
 namespace opendeck::bootloader::protocols::websockets::firmware_upload
 {
     /**
-     * @brief Handles direct firmware upload WebSockets frames in the bootloader.
+     * @brief Handles bootloader-side WebSockets DFU directly into the application slot.
+     *
+     * Unlike the firmware-side handler, the bootloader is already running in the update environment, so it
+     * installs the validated firmware image directly and does not need to request a reboot into another mode.
      */
     class FirmwareUploadHandler : public opendeck::common::protocols::websockets::Handler
     {
@@ -31,9 +33,9 @@ namespace opendeck::bootloader::protocols::websockets::firmware_upload
          * @param data       Frame payload bytes.
          * @param session_id Unused bootloader WebSockets session id.
          *
-         * @return ACK frame when the firmware-upload frame was handled, otherwise `std::nullopt`.
+         * @return Serialized DFU ACK when the firmware-upload frame was handled, otherwise `std::nullopt`.
          */
-        std::optional<std::span<const uint8_t>> handle_frame(std::span<const uint8_t> data, uint32_t session_id) override;
+        std::optional<Response> handle_frame(std::span<const uint8_t> data, uint32_t session_id) override;
 
         /**
          * @brief Aborts any active firmware upload.
@@ -43,7 +45,6 @@ namespace opendeck::bootloader::protocols::websockets::firmware_upload
         void on_close_session(uint32_t session_id) override;
 
         private:
-        opendeck::common::protocols::websockets::FirmwareUpload    _firmware_upload;
-        opendeck::common::protocols::websockets::FirmwareUploadAck _response = {};
+        opendeck::common::protocols::websockets::FirmwareUpload _firmware_upload;
     };
 }    // namespace opendeck::bootloader::protocols::websockets::firmware_upload

app/bootloader/src/protocols/websockets/instance/impl/websockets.h

@@ -5,9 +5,9 @@
 
 #pragma once
 
+#include "common/src/dfu/upload/shared/common.h"
 #include "common/src/protocols/websockets/instance/impl/websockets.h"
 #include "common/src/protocols/websockets/shared/buffers.h"
-#include "common/src/protocols/websockets/shared/firmware_upload.h"
 
 namespace opendeck::bootloader::protocols::websockets
 {
@@ -33,8 +33,8 @@ namespace opendeck::bootloader::protocols::websockets
 
         private:
         using WebSocketsBuffers = opendeck::common::protocols::websockets::Buffers<
-            opendeck::common::protocols::websockets::FIRMWARE_UPLOAD_FRAME_SIZE,
-            opendeck::common::protocols::websockets::FIRMWARE_UPLOAD_ACK_SIZE,
+            opendeck::common::dfu::upload::FRAME_SIZE,
+            sizeof(opendeck::common::dfu::upload::Ack),
             4>;
 
         opendeck::common::protocols::websockets::BuffersBase& buffers() override

app/bootloader/src/protocols/webusb/CMakeLists.txt

@@ -6,6 +6,11 @@ if(CONFIG_PROJECT_BOOTLOADER_SUPPORT_USB_DFU)
         instance/impl/webusb.cpp
     )
 
+    target_link_libraries(opendeck_bootloader_protocols_webusb
+        PUBLIC
+        opendeck_common_dfu_upload
+    )
+
     if(CONFIG_HW_BUILD)
         add_subdirectory(hwa/hw)
 

app/bootloader/src/protocols/webusb/builder/hw/builder_hw.h

@@ -23,8 +23,7 @@ namespace opendeck::bootloader::protocols::webusb
          * @param direct_update_writer Direct-update writer that receives incoming DFU bytes.
          */
         explicit Builder(bootloader::dfu::direct_update_writer::DirectUpdateWriter& direct_update_writer)
-            : _hwa(direct_update_writer)
-            , _instance(_hwa)
+            : _instance(_hwa, direct_update_writer)
         {}
 
         /**

app/bootloader/src/protocols/webusb/hwa/hw/CMakeLists.txt

@@ -7,7 +7,7 @@ target_sources(opendeck_bootloader_protocols_webusb_hwa_hw PRIVATE
 
 target_link_libraries(opendeck_bootloader_protocols_webusb_hwa_hw
     PRIVATE
-    opendeck_common_dfu_dfu_stream_parser
+    opendeck_common_dfu_upload
     opendeck_common_metadata
     zlibs_drivers_usb_hw
     zephyr_interface