Chore: one time sync of main -> develop to prepare for ff automation

.bdignore

@@ -0,0 +1,3 @@
+# BlackDuck scan exclusions
+# Vendored third-party source — attributed in NOTICE and LICENSE files
+src/vendor/

.github/skills/openspec-coverage/openspec_coverage.py

@@ -231,10 +231,15 @@ def extract_methods_from_code(file_path):
     method_pattern = re.compile(
         r"^\s*(?:[\w:<>,~]+\s+)+([\w:~]+)\s*\([^)]*\)\s*(const)?\s*[{;]"
     )
+    conversion_operator_pattern = re.compile(r"\boperator\s+[^\s(]+\s*\(")
     methods = set()
     try:
         with open(file_path, encoding="utf-8", errors="ignore") as f:
             for line in f:
+                # Skip conversion operators (e.g., 'explicit operator bool() const'),
+                # which do not have a standalone method identifier to report.
+                if conversion_operator_pattern.search(line):
+                    continue
                 m = method_pattern.match(line)
                 if m:
                     methods.add(m.group(1))

.version

@@ -0,0 +1 @@
+1.1.8

LICENSE

@@ -202,25 +202,3 @@
    limitations under the License.
 
 ===========================================================================
-
-MIT License
-
-Copyright (c) YEAR COPYRIGHT HOLDER
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.md

@@ -127,6 +127,7 @@ if (value) {
 
 - If the header is present, its value is returned.
 - If the header is not present, `std::nullopt` is returned.
+- Header-name lookup is case-sensitive; use the same capitalization as received from the server.
 
 #### Thread Safety
 Header operations are thread-safe. Access to response headers is protected by a mutex internally.

build.sh

@@ -18,6 +18,39 @@
 
 set -e
 
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+IMAGE="firebolt-cpp-transport-ci:local"
+
+# Pre-scan for --docker before arg parsing so forwarded args are preserved
+use_docker=false
+_forward_args=()
+for _arg in "$@"; do
+  [[ "$_arg" == "--docker" ]] && { use_docker=true; continue; }
+  _forward_args+=("$_arg")
+done
+
+if $use_docker; then
+  for _bdir in build build-dev; do
+    _cache="$SCRIPT_DIR/$_bdir/CMakeCache.txt"
+    if [[ -f "$_cache" ]]; then
+      _cached=$(grep '^CMAKE_HOME_DIRECTORY' "$_cache" 2>/dev/null | cut -d= -f2 || true)
+      # In Docker, the workspace is mounted at /workspace.  Only wipe if the
+      # cache was configured for a different environment (e.g. a native host build).
+      if [[ -n "$_cached" && "$_cached" != "/workspace" ]]; then
+        echo "Wiping stale $_bdir (configured at $_cached, expected /workspace)..."
+        rm -rf "$SCRIPT_DIR/$_bdir"
+      fi
+    fi
+  done
+  if ! docker image inspect "$IMAGE" &>/dev/null; then
+    echo "Building CI Docker image (one-time)..."
+    docker build -t "$IMAGE" -f "$SCRIPT_DIR/.github/Dockerfile" "$SCRIPT_DIR"
+  fi
+  exec docker run --rm --user "$(id -u):$(id -g)" \
+    -v "$SCRIPT_DIR:/workspace" -w /workspace \
+    "$IMAGE" ./build.sh "${_forward_args[@]}"
+fi
+
 bdir="build"
 do_install=false
 params=
@@ -50,12 +83,21 @@ while [[ ! -z $1 ]]; do
   esac; shift
 done
 
-[[ ! -z $SYSROOT_PATH ]] || { echo "SYSROOT_PATH not set" >/dev/stderr; exit 1; }
-[[ -e $SYSROOT_PATH ]] || { echo "SYSROOT_PATH not exist ($SYSROOT_PATH)" >/dev/stderr; exit 1; }
+SYSROOT_PATH="${SYSROOT_PATH:-/}"
+[[ -e $SYSROOT_PATH ]] || { echo "SYSROOT_PATH does not exist ($SYSROOT_PATH)" >/dev/stderr; exit 1; }
 
 $cleanFirst && rm -rf $bdir
 
-if [[ ! -e "$bdir" || -n "$@" ]]; then
+_cache="$SCRIPT_DIR/$bdir/CMakeCache.txt"
+if [[ -f "$_cache" ]]; then
+  _cached=$(grep '^CMAKE_HOME_DIRECTORY' "$_cache" 2>/dev/null | cut -d= -f2 || true)
+  if [[ -n "$_cached" && "$_cached" != "$SCRIPT_DIR" ]]; then
+    echo "Wiping stale $bdir (configured at $_cached, now at $SCRIPT_DIR)..."
+    rm -rf "$SCRIPT_DIR/$bdir"
+  fi
+fi
+
+if [[ ! -f "$bdir/CMakeCache.txt" || $# -gt 0 ]]; then
   params+=" -DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
   command -v ccache >/dev/null 2>&1 && params+=" -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
   cmake -B $bdir \

fmt.sh

@@ -15,9 +15,9 @@ fi
 RUN="docker run --rm --user $(id -u):$(id -g) -v $SCRIPT_DIR:/workspace $IMAGE bash -c"
 
 if [[ "${1:-}" == "--fix" ]]; then
-    $RUN "find /workspace/src /workspace/include /workspace/test -type f \( -name '*.cpp' -o -name '*.h' \) | xargs clang-format -i"
+    $RUN "find /workspace/src /workspace/include /workspace/test -type f \( -name '*.cpp' -o -name '*.h' \) -print0 | xargs -0 clang-format -i"
     echo "Done. Files reformatted."
 else
-    $RUN "find /workspace/src /workspace/include /workspace/test -type f \( -name '*.cpp' -o -name '*.h' \) | xargs clang-format --dry-run --Werror"
+    $RUN "find /workspace/src /workspace/include /workspace/test -type f \( -name '*.cpp' -o -name '*.h' \) -print0 | xargs -0 clang-format --dry-run --Werror"
     echo "Formatting OK."
 fi

include/firebolt/config.h.in

@@ -77,6 +77,45 @@ struct Config
 
     /** Watchdog polling cycle in milliseconds. Default: 500. */
     unsigned watchdogCycle_ms = 500;
+
+    /**
+     * @brief Retry policy for the initial gateway connection.
+     *
+     * On embedded devices the Firebolt client may start before the gateway
+     * daemon is ready (poor systemd ordering) or before the loopback interface
+     * has an IPv4 address assigned.  Setting reconnect_max_attempts > 0 causes
+     * connect() to retry up to that many times, waiting reconnect_delay_ms
+     * between each attempt, before returning an error to the caller.
+     *
+     * Each attempt is bounded by connect_attempt_timeout_ms: if the underlying
+     * transport (DNS + TCP + WebSocket handshake) does not complete within that
+     * window, the attempt is aborted and counted as a failure.  connect()
+     * therefore blocks for at most:
+     *   (reconnect_max_attempts + 1) * connect_attempt_timeout_ms
+     *   + reconnect_max_attempts * reconnect_delay_ms
+     *
+     * Capped internally at 100 retries regardless of this value.
+     *
+     * Default: 0 (single attempt, no retry; connect() returns the last
+     * transport error, e.g. Error::NotConnected, Error::Timedout, or
+     * Error::General, or Error::NotConnected on per-attempt timeout).
+     */
+    unsigned reconnect_max_attempts = 0;
+
+    /** Milliseconds to wait between reconnect attempts. Default: 1000. */
+    unsigned reconnect_delay_ms = 1000;
+
+    /**
+     * @brief Per-attempt timeout for the initial connection handshake (ms).
+     *
+     * If DNS resolution + TCP connect + WebSocket handshake do not complete
+     * within this window, the in-flight attempt is aborted and connect()
+     * either retries (if reconnect_max_attempts > 0) or returns
+     * Error::NotConnected to the caller.
+     *
+     * Default: 10000 (10 seconds).
+     */
+    unsigned connect_attempt_timeout_ms = 10000;
 };
 
 } // namespace Firebolt

include/firebolt/gateway.h

@@ -24,6 +24,7 @@
 #include <functional>
 #include <future>
 #include <nlohmann/json.hpp>
+#include <optional>
 #include <string>
 
 namespace Firebolt::Transport
@@ -36,6 +37,9 @@ class IGateway
 public:
     virtual ~IGateway();
 
+    // NOTE: onConnectionChange is invoked once with the final result on the
+    // connect() calling thread.  All subsequent callbacks (disconnect, watchdog
+    // reconnect) fire on the websocketpp IO thread.  Callers must be thread-safe.
     virtual Firebolt::Error connect(const Firebolt::Config& config, ConnectionChangeCallback onConnectionChange) = 0;
     virtual Firebolt::Error disconnect() = 0;
 

presentations/openspec-with-copliot-experience/package.json → presentations/openspec-with-copilot-experience/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "openspec-with-copliot-experience",
+  "name": "openspec-with-copilot-experience",
   "private": true,
   "scripts": {
     "dev": "slidev --open",

presentations/openspec-with-copliot-experience/slides.md → presentations/openspec-with-copilot-experience/slides.md

@@ -278,10 +278,10 @@ https://github.com/rdkcentral/firebolt-cpp-transport/tree/feature/openspec
   - Current slides are Auto Generated from OpenSpec and Copilot chat conversations.
   - Multiple Reusable Skills generated for creating slides based on the effort
    ```sh
-    $ /init-slidev-presentation "openspec-with-copliot-experience" --content "slides.md"
-    $ /add-slide "openspec-with-copliot-experience" --content "slides.md" --slideTitle "Slide Title"
-    $ /add-diagram "openspec-with-copliot-experience" --content "slides.md" --diagramCode "mermaid code here"
-    $ /export-slidev-presentation "openspec-with-copliot-experience" --format pdf
+    $ /init-slidev-presentation "openspec-with-copilot-experience" --content "slides.md"
+    $ /add-slide "openspec-with-copilot-experience" --content "slides.md" --slideTitle "Slide Title"
+    $ /add-diagram "openspec-with-copilot-experience" --content "slides.md" --diagramCode "mermaid code here"
+    $ /export-slidev-presentation "openspec-with-copilot-experience" --format pdf
   ```
 
 ---

presentations/transport-slides/slides.md

@@ -132,76 +132,3 @@ layout: center
 # Thank You!
 
 [GitHub](https://github.com/rdkcentral/firebolt-cpp-transport)
-
----
-
-# Connection Protocol
-
-The Firebolt Transport Layer uses WebSocket as its underlying transport, with JSON-RPC layered on top for structured messaging and event notifications.
-
-**Message Flow:**
-
-```
-┌─────────────┐      WebSocket      ┌─────────────┐
-│   Client    │<------------------->│   Gateway   │
-└─────────────┘     JSON-RPC        └─────────────┘
-```
-
-- Client connects to a configurable WebSocket URL (default: ws://127.0.0.1:9998)
-- Connection state managed via callbacks (e.g., ConnectionChangeCallback)
-- Supports reconnect, disconnect, and error handling
-- All requests, responses, and events are JSON-RPC messages
-- Legacy support via `legacyRPCv1` flag
-
----
-
-# Integration Points
-
-- Standalone library for JSON-RPC over WebSocket
-- Agnostic to client usage and WebSocket implementation
-- API schemas and business logic reside in separate repos (e.g., firebolt-cpp-client)
-- IGateway and IHelper interfaces are designed for external use
-- Initialization/configuration flows for Gateway are an open requirement
-
-**Conclusion:**
-The transport library is decoupled from client and schema logic, providing a generic, extensible foundation for JSON-RPC over WebSocket. Integration patterns and initialization flows should be defined to support external consumers and SDKs.
----
-
-# Firebolt C++ Transport
-
-A modern, efficient transport layer for Firebolt.
-
----
-
-# Project Overview
-
-- C++ implementation
-- Modular design
-- JSON-RPC support
-- Logging and diagnostics
-
----
-
-# Architecture
-
-- Gateway
-- Helpers
-- Transport core
-- Utilities
-
----
-
-# Key Features
-
-- High performance
-- Extensible
-- Easy integration
-- Comprehensive unit tests
-
----
-layout: center
----
-
-# Thank You!
-
-[GitHub](https://github.com/rdkcentral/firebolt-cpp-transport)

src/CMakeLists.txt

@@ -82,6 +82,9 @@ target_link_libraries(${TARGET}
 
 target_include_directories(${TARGET}
     PRIVATE
+        # vendor/ must come before the system websocketpp headers so that
+        # our patched endpoint.hpp (numeric-IP resolver fix) takes priority.
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/vendor>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
     PUBLIC