Merge sedsprintf_rs upstream main

Author: Rylan-Meilutis

sedsprintf_rs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sedsprintf_rs_2026"
-version = "1.1.1"
+version = "1.2.0"
 edition = "2024"
 build = "build.rs"
 authors = ["Rylan Meilutis <rylan@rylanswebsite.com>"]

sedsprintf_rs/header_templates/sedsprintf.h.txt

@@ -22,6 +22,9 @@ typedef uint64_t (* SedsNowMsFn)(void * user);
 
 typedef struct SedsRouter SedsRouter;
 
+typedef struct SedsRelay SedsRelay;
+
+
 typedef struct SedsPacketView
 {
     uint32_t ty;
@@ -259,6 +262,110 @@ SedsResult seds_owned_header_view(const SedsOwnedHeader * h, SedsPacketView * ou
 
 void seds_owned_header_free(SedsOwnedHeader * h);
 
+/* ==============================
+   Relay lifecycle
+   ============================== */
+
+/**
+ * @brief Create a new relay instance.
+ *
+ * @param now_ms_cb  Optional monotonic clock callback (may be NULL).
+ * @param user       Opaque user pointer passed back into @p now_ms_cb.
+ *
+ * @return Non-NULL relay handle on success; NULL on failure.
+ */
+SedsRelay * seds_relay_new(SedsNowMsFn now_ms_cb, void * user);
+
+/**
+ * @brief Destroy a relay previously returned by seds_relay_new().
+ */
+void seds_relay_free(SedsRelay * r);
+
+/**
+ * @brief Add a new side/network to the relay.
+ *
+ * The side is identified by a small integer ID (0,1,2,...) returned from
+ * this function. The same SedsTransmitFn type is used as for SedsRouter.
+ *
+ * @param r         Relay handle.
+ * @param name      Optional UTF-8 name (may be NULL).
+ * @param name_len  Length of @p name in bytes (0 if unused).
+ * @param tx        TX callback for this side (must not be NULL).
+ * @param tx_user   Opaque user pointer passed to @p tx.
+ *
+ * @return On success: non-negative side ID.
+ *         On error:   negative SedsResult error code.
+ */
+int32_t seds_relay_add_side(SedsRelay * r,
+                            const char * name,
+                            size_t name_len,
+                            SedsTransmitFn tx,
+                            void * tx_user);
+
+/**
+ * @brief Feed serialized bytes that arrived on a given side into the relay.
+ *
+ * This corresponds to “RX from network into relay”. The relay will fan-out
+ * the packet to all other sides when you later call the process_* functions.
+ *
+ * @param r        Relay handle.
+ * @param side_id  Side ID returned by seds_relay_add_side().
+ * @param bytes    Serialized packet bytes.
+ * @param len      Length of @p bytes.
+ *
+ * @return SEDS_OK on success or a negative SedsResult on error.
+ */
+SedsResult seds_relay_rx_serialized_from_side(SedsRelay * r,
+                                              uint32_t side_id,
+                                              const uint8_t * bytes,
+                                              size_t len);
+
+/* --- Relay queue processing (matching router style) --- */
+
+/**
+ * @brief Process all pending RX in the relay RX queue (expand into TX).
+ */
+SedsResult seds_relay_process_rx_queue(SedsRelay * r);
+
+/**
+ * @brief Process all pending TX in the relay TX queue (invoke side TX callbacks).
+ */
+SedsResult seds_relay_process_tx_queue(SedsRelay * r);
+
+/**
+ * @brief Process both RX and TX queues until they are empty.
+ */
+SedsResult seds_relay_process_all_queues(SedsRelay * r);
+
+/**
+ * @brief Clear both RX and TX queues without processing.
+ */
+SedsResult seds_relay_clear_queues(SedsRelay * r);
+
+/* --- Relay queue processing with time budget (ms) --- */
+
+/**
+ * @brief Process RX queue until timeout (ms) or completion.
+ *
+ * If @p timeout_ms is 0, drains the queue fully.
+ */
+SedsResult seds_relay_process_rx_queue_with_timeout(SedsRelay * r, uint32_t timeout_ms);
+
+/**
+ * @brief Process TX queue until timeout (ms) or completion.
+ *
+ * If @p timeout_ms is 0, drains the queue fully.
+ */
+SedsResult seds_relay_process_tx_queue_with_timeout(SedsRelay * r, uint32_t timeout_ms);
+
+/**
+ * @brief Process RX and TX queues until timeout (ms) or completion.
+ *
+ * If @p timeout_ms is 0, drains both queues fully.
+ */
+SedsResult seds_relay_process_all_queues_with_timeout(SedsRelay * r, uint32_t timeout_ms);
+
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif

sedsprintf_rs/header_templates/sedsprintf_rs.pyi.txt

@@ -42,6 +42,8 @@ PacketHandler = Callable[["Packet"], None]
 SerializedHandler = Callable[[bytes], None]
 """Endpoint handler invoked with raw serialized packet bytes."""
 
+SideId = int
+"""Logical relay side index (e.g. CAN, UART, RADIO)."""
 
 # ==============================
 # Packet object (immutable view of a telemetry packet)
@@ -181,6 +183,127 @@ class Router:
     def process_all_queues_with_timeout(self, timeout_ms: int) -> None: ...
 
 
+# ==============================
+# Relay (fan-out of serialized packets)
+# ==============================
+
+class Relay:
+    """
+    Serialized-packet relay.
+
+    The Relay:
+        - fans out serialized telemetry packets from one side to all others
+        - has RX and TX queues (same pattern as Router)
+        - supports time-budgeted queue processing
+        - uses the same monotonic clock callback style as Router
+    """
+
+    def __init__(self, now_ms: Optional[NowMsCallback] = ...) -> None:
+        """
+        Create a new Relay.
+
+        Parameters
+        ----------
+        now_ms:
+            Optional zero-arg callback returning an integer timestamp in ms.
+            If None, timeouts are based on a default clock that returns 0.
+        """
+        ...
+
+    def add_side(self, name: str, tx: TxCallback) -> SideId:
+        """
+        Add a new relay side (e.g. 'CAN', 'UART', 'RADIO').
+
+        Parameters
+        ----------
+        name:
+            Human-readable name for this side (used for debugging).
+        tx:
+            Transmit callback. Called as ``tx(bytes)`` when the relay
+            wants to send data on this side.
+
+        Returns
+        -------
+        SideId
+            Integer side id to use with ``rx_serialized_from_side``.
+        """
+        ...
+
+    def rx_serialized_from_side(
+        self,
+        side_id: SideId,
+        data: Buffer | bytes | bytearray | memoryview,
+    ) -> None:
+        """
+        Enqueue serialized bytes that arrived on a given side into the relay RX queue.
+
+        Parameters
+        ----------
+        side_id:
+            Side id previously returned by :meth:`add_side`.
+        data:
+            Serialized packet bytes.
+        """
+        ...
+
+    # Queue clearing
+
+    def clear_queues(self) -> None:
+        """Clear both RX and TX queues."""
+        ...
+
+    def clear_rx_queue(self) -> None:
+        """Clear only the RX queue."""
+        ...
+
+    def clear_tx_queue(self) -> None:
+        """Clear only the TX queue."""
+        ...
+
+    # Queue processing (no timeout)
+
+    def process_rx_queue(self) -> None:
+        """Drain the RX queue fully, expanding each item into TX items."""
+        ...
+
+    def process_tx_queue(self) -> None:
+        """Drain the TX queue fully, invoking per-side TX callbacks."""
+        ...
+
+    def process_all_queues(self) -> None:
+        """
+        Process RX then TX queues fully (one pass), until both queues are empty.
+        """
+        ...
+
+    # Time-budgeted queue processing
+
+    def process_rx_queue_with_timeout(self, timeout_ms: int) -> None:
+        """
+        Process the RX queue with a time budget in milliseconds.
+
+        Stops when the queue is empty or the timeout elapses.
+        """
+        ...
+
+    def process_tx_queue_with_timeout(self, timeout_ms: int) -> None:
+        """
+        Process the TX queue with a time budget in milliseconds.
+
+        Stops when the queue is empty or the timeout elapses.
+        """
+        ...
+
+    def process_all_queues_with_timeout(self, timeout_ms: int) -> None:
+        """
+        Process RX and TX queues interleaved with a time budget in ms.
+
+        If ``timeout_ms == 0``, drains fully (no time limit), matching the Rust
+        implementation semantics.
+        """
+        ...
+
+
 # ==============================
 # Top-level helpers
 # ==============================

sedsprintf_rs/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "sedsprintf_rs_2026"
-version = "1.1.1"
+version = "1.2.0"
 description = "Rust telemetry and serialization library"
 authors = [{ name = "Rylan Meilutis", email = "rylan.meilutis@gmail.com" }]
 readme = "README.md"