From bb37f68197e4bcdf6a6e67402dc22fb58bfec6cc Mon Sep 17 00:00:00 2001 From: NagyZoltanPeter <113987313+NagyZoltanPeter@users.noreply.github.com> Date: Wed, 4 Mar 2026 09:30:01 +0100 Subject: [PATCH 1/4] Temporary direct logos-devlivery link to connected PR --- flake.lock | 8 ++++---- vendor/logos-delivery | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index a9d26c8..bd38eb4 100644 --- a/flake.lock +++ b/flake.lock @@ -122,11 +122,11 @@ "zerokit": "zerokit" }, "locked": { - "lastModified": 1772578080, - "narHash": "sha256-JI+pECDsSe06aNTB0d5PVL9vdyXL01kaeXIkuuAJUNk=", + "lastModified": 1772610727, + "narHash": "sha256-VdCFKJb+xG/YxslYpiFOYISc6wo5CUgiF6UVxUNTb64=", "ref": "refs/heads/master", - "rev": "4a6ad732356c99d00c5f0143df8a470b84b6281d", - "revCount": 2233, + "rev": "91c48fa2a7efe997d81df4bd7ad72a3ff5dc4fff", + "revCount": 2234, "submodules": true, "type": "git", "url": "https://github.com/logos-messaging/logos-delivery" diff --git a/vendor/logos-delivery b/vendor/logos-delivery index 4a6ad73..91c48fa 160000 --- a/vendor/logos-delivery +++ b/vendor/logos-delivery @@ -1 +1 @@ -Subproject commit 4a6ad732356c99d00c5f0143df8a470b84b6281d +Subproject commit 91c48fa2a7efe997d81df4bd7ad72a3ff5dc4fff From d48a541e123a75263feddac4ce6bf12ef5bc0ba9 Mon Sep 17 00:00:00 2001 From: NagyZoltanPeter <113987313+NagyZoltanPeter@users.noreply.github.com> Date: Wed, 4 Mar 2026 09:39:42 +0100 Subject: [PATCH 2/4] Add event_callback translation forr message_received event --- delivery_module_plugin.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/delivery_module_plugin.cpp b/delivery_module_plugin.cpp index 1ec1e67..975db9d 100644 --- a/delivery_module_plugin.cpp +++ b/delivery_module_plugin.cpp @@ -101,6 +101,16 @@ void DeliveryModulePlugin::event_callback(int callerRet, const char* msg, size_t eventData << timestamp; plugin->emitEvent("messagePropagated", eventData); + } else if (eventType == "message_received") { + // MessageReceivedEvent: messageHash, message (WakuMessage) + QJsonObject msgObj = jsonObj["message"].toObject(); + QVariantList eventData; + eventData << jsonObj["messageHash"].toString(); + eventData << msgObj["contentTopic"].toString(); + eventData << msgObj["payload"].toString(); + eventData << QString::number(msgObj["timestamp"].toDouble(), 'f', 0); + plugin->emitEvent("messageReceived", eventData); + } else if (eventType == "connection_status_change") { QVariantList eventData; eventData << jsonObj["connectionStatus"].toString(); From 3aa5162ebc7c9ce936634507e9dd2960c654aa5e Mon Sep 17 00:00:00 2001 From: NagyZoltanPeter <113987313+NagyZoltanPeter@users.noreply.github.com> Date: Wed, 4 Mar 2026 09:53:22 +0100 Subject: [PATCH 3/4] Extend doc with message_received event desc --- README.md | 5 +++++ delivery_module_plugin.h | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/README.md b/README.md index 7757e3c..b5707ab 100644 --- a/README.md +++ b/README.md @@ -189,6 +189,11 @@ carries a `QVariantList data` with positional values: - `data[0]` (`QString`): request id - `data[1]` (`QString`): message hash - `data[2]` (`QString`): local timestamp (ISO-8601) +- **`messageReceived`** – a message arrived on a subscribed topic + - `data[0]` (`QString`): message hash + - `data[1]` (`QString`): content topic + - `data[2]` (`QString`): payload (base64-encoded) + - `data[3]` (`QString`): timestamp (nanoseconds since epoch) - **`connectionStateChanged`** – node connectivity change - `data[0]` (`QString`): connection status - `data[1]` (`QString`): local timestamp (ISO-8601) diff --git a/delivery_module_plugin.h b/delivery_module_plugin.h index a2bd6a3..dc6adfa 100644 --- a/delivery_module_plugin.h +++ b/delivery_module_plugin.h @@ -34,6 +34,11 @@ * - `data[0]` (`QString`): request id * - `data[1]` (`QString`): message hash * - `data[2]` (`QString`): local timestamp (ISO-8601) + * - `messageReceived` (emitted when a message arrives on a subscribed topic) + * - `data[0]` (`QString`): message hash + * - `data[1]` (`QString`): content topic + * - `data[2]` (`QString`): payload (base64-encoded) + * - `data[3]` (`QString`): timestamp (nanoseconds since epoch) * - `connectionStateChanged` * - `data[0]` (`QString`): connection status * - `data[1]` (`QString`): local timestamp (ISO-8601) @@ -42,6 +47,7 @@ * - `message_sent` -> `messageSent` * - `message_error` -> `messageError` * - `message_propagated` -> `messagePropagated` + * - `message_received` -> `messageReceived` * - `connection_status_change` -> `connectionStateChanged` * * As a general concept consider using proper content_topic format for your purpose. From 804f1732f5d6bc7d1cf9c2dc3f1d4c454810256e Mon Sep 17 00:00:00 2001 From: NagyZoltanPeter <113987313+NagyZoltanPeter@users.noreply.github.com> Date: Wed, 4 Mar 2026 09:57:10 +0100 Subject: [PATCH 4/4] Move logos-delivery ref to origin/master after dependent PR is merged --- flake.lock | 4 ++-- vendor/logos-delivery | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index bd38eb4..a0cd946 100644 --- a/flake.lock +++ b/flake.lock @@ -122,10 +122,10 @@ "zerokit": "zerokit" }, "locked": { - "lastModified": 1772610727, + "lastModified": 1772614128, "narHash": "sha256-VdCFKJb+xG/YxslYpiFOYISc6wo5CUgiF6UVxUNTb64=", "ref": "refs/heads/master", - "rev": "91c48fa2a7efe997d81df4bd7ad72a3ff5dc4fff", + "rev": "0ad55159b39ed74ba6b88b5a9d72db766b4b0f08", "revCount": 2234, "submodules": true, "type": "git", diff --git a/vendor/logos-delivery b/vendor/logos-delivery index 91c48fa..0ad5515 160000 --- a/vendor/logos-delivery +++ b/vendor/logos-delivery @@ -1 +1 @@ -Subproject commit 91c48fa2a7efe997d81df4bd7ad72a3ff5dc4fff +Subproject commit 0ad55159b39ed74ba6b88b5a9d72db766b4b0f08