diff --git a/arch/rp2xx0/rp2350.ini b/arch/rp2xx0/rp2350.ini
index c5849ff2a..ab16e24b4 100644
--- a/arch/rp2xx0/rp2350.ini
+++ b/arch/rp2xx0/rp2350.ini
@@ -7,12 +7,12 @@ platform_packages = framework-arduinopico@https://github.com/earlephilhower/ardu
board_build.core = earlephilhower
board_build.filesystem_size = 0.5m
build_flags =
- ${arduino_base.build_flags} -Wno-unused-variable
+ ${arduino_base.build_flags} -Wno-unused-variable -Wcast-align
-Isrc/platform/rp2xx0
- -D__PLAT_RP2040__
+ -D__PLAT_RP2350__
# -D _POSIX_THREADS
build_src_filter =
- ${arduino_base.build_src_filter} - - - - - - - - -
+ ${arduino_base.build_src_filter} - - - - - - - - - - -
lib_ignore =
BluetoothOTA
diff --git a/debian/ci_pack_sdeb.sh b/debian/ci_pack_sdeb.sh
index d45593c50..1f311af93 100755
--- a/debian/ci_pack_sdeb.sh
+++ b/debian/ci_pack_sdeb.sh
@@ -11,7 +11,7 @@ platformio pkg install -e native -t platformio/tool-scons@4.40502.0
tar -cf pio.tar pio/
rm -rf pio
# Download the latest meshtastic/web release build.tar to `web.tar`
-curl https://github.com/meshtastic/web/releases/download/latest/build.tar -o web.tar
+curl -L https://github.com/meshtastic/web/releases/download/latest/build.tar -o web.tar
package=$(dpkg-parsechangelog --show-field Source)
diff --git a/debian/control b/debian/control
index 097f85859..bb79d1958 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,8 @@ Section: misc
Priority: optional
Maintainer: Austin Lane
Build-Depends: debhelper-compat (= 13),
+ tar,
+ gzip,
platformio,
python3-protobuf,
python3-grpcio,
diff --git a/debian/rules b/debian/rules
index 31221dd80..a1a27c2f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,10 +14,10 @@ PIO_ENV:=\
override_dh_auto_build:
# Extract tarballs within source deb
tar -xf pio.tar
- tar -xf web.tar web
+ mkdir -p web && tar -xf web.tar -C web
gunzip web/ -r
# Build with platformio
$(PIO_ENV) platformio run -e native
# Move the binary and default config to the correct name
mv .pio/build/native/program .pio/build/native/meshtasticd
- cp bin/config-dist.yaml bin/config.yaml
\ No newline at end of file
+ cp bin/config-dist.yaml bin/config.yaml
diff --git a/src/mesh/MeshService.h b/src/mesh/MeshService.h
index 268c4308f..175d8a595 100644
--- a/src/mesh/MeshService.h
+++ b/src/mesh/MeshService.h
@@ -142,7 +142,7 @@ class MeshService
void sendToPhone(meshtastic_MeshPacket *p);
/// Send an MQTT message to the phone for client proxying
- void sendMqttMessageToClientProxy(meshtastic_MqttClientProxyMessage *m);
+ virtual void sendMqttMessageToClientProxy(meshtastic_MqttClientProxyMessage *m);
/// Send a ClientNotification to the phone
void sendClientNotification(meshtastic_ClientNotification *cn);
diff --git a/src/mesh/NodeDB.h b/src/mesh/NodeDB.h
index c8c0d3170..d244a94ba 100644
--- a/src/mesh/NodeDB.h
+++ b/src/mesh/NodeDB.h
@@ -145,7 +145,7 @@ class NodeDB
return &meshNodes->at(x);
}
- meshtastic_NodeInfoLite *getMeshNode(NodeNum n);
+ virtual meshtastic_NodeInfoLite *getMeshNode(NodeNum n);
size_t getNumMeshNodes() { return numMeshNodes; }
// returns true if the maximum number of nodes is reached or we are running low on memory
diff --git a/src/mesh/RadioLibInterface.cpp b/src/mesh/RadioLibInterface.cpp
index 997b1d6fe..09266b334 100644
--- a/src/mesh/RadioLibInterface.cpp
+++ b/src/mesh/RadioLibInterface.cpp
@@ -431,6 +431,7 @@ void RadioLibInterface::handleReceiveInterrupt()
// nodes.
meshtastic_MeshPacket *mp = packetPool.allocZeroed();
+ // Keep the assigned fields in sync with src/mqtt/MQTT.cpp:onReceiveProto
mp->from = radioBuffer.header.from;
mp->to = radioBuffer.header.to;
mp->id = radioBuffer.header.id;
diff --git a/src/mesh/Router.h b/src/mesh/Router.h
index da44d67df..0fe2bc551 100644
--- a/src/mesh/Router.h
+++ b/src/mesh/Router.h
@@ -71,7 +71,7 @@ class Router : protected concurrency::OSThread
* RadioInterface calls this to queue up packets that have been received from the radio. The router is now responsible for
* freeing the packet
*/
- void enqueueReceivedMessage(meshtastic_MeshPacket *p);
+ virtual void enqueueReceivedMessage(meshtastic_MeshPacket *p);
/**
* Send a packet on a suitable interface. This routine will
diff --git a/src/mesh/wifi/WiFiAPClient.cpp b/src/mesh/wifi/WiFiAPClient.cpp
index 2f8138921..dcfcdc047 100644
--- a/src/mesh/wifi/WiFiAPClient.cpp
+++ b/src/mesh/wifi/WiFiAPClient.cpp
@@ -143,6 +143,11 @@ static int32_t reconnectWiFi()
delay(5000);
if (!WiFi.isConnected()) {
+#ifdef CONFIG_IDF_TARGET_ESP32C3
+ WiFi.mode(WIFI_MODE_NULL);
+ WiFi.useStaticBuffers(true);
+ WiFi.mode(WIFI_STA);
+#endif
WiFi.begin(wifiName, wifiPsw);
}
isReconnecting = false;
diff --git a/src/modules/RoutingModule.h b/src/modules/RoutingModule.h
index 7c34c5bc9..c047f6e29 100644
--- a/src/modules/RoutingModule.h
+++ b/src/modules/RoutingModule.h
@@ -13,7 +13,8 @@ class RoutingModule : public ProtobufModule
*/
RoutingModule();
- void sendAckNak(meshtastic_Routing_Error err, NodeNum to, PacketId idFrom, ChannelIndex chIndex, uint8_t hopLimit = 0);
+ virtual void sendAckNak(meshtastic_Routing_Error err, NodeNum to, PacketId idFrom, ChannelIndex chIndex,
+ uint8_t hopLimit = 0);
// Given the hopStart and hopLimit upon reception of a request, return the hop limit to use for the response
uint8_t getHopLimitForResponse(uint8_t hopStart, uint8_t hopLimit);
diff --git a/src/mqtt/MQTT.cpp b/src/mqtt/MQTT.cpp
index 3db3c37bb..f642af231 100644
--- a/src/mqtt/MQTT.cpp
+++ b/src/mqtt/MQTT.cpp
@@ -76,12 +76,22 @@ inline void onReceiveProto(char *topic, byte *payload, size_t length)
return;
}
LOG_INFO("Received MQTT topic %s, len=%u", topic, length);
+ if (e.packet->hop_limit > HOP_MAX || e.packet->hop_start > HOP_MAX) {
+ LOG_INFO("Invalid hop_limit(%u) or hop_start(%u)", e.packet->hop_limit, e.packet->hop_start);
+ return;
+ }
- UniquePacketPoolPacket p = packetPool.allocUniqueCopy(*e.packet);
+ UniquePacketPoolPacket p = packetPool.allocUniqueZeroed();
+ p->from = e.packet->from;
+ p->to = e.packet->to;
+ p->id = e.packet->id;
+ p->channel = e.packet->channel;
+ p->hop_limit = e.packet->hop_limit;
+ p->hop_start = e.packet->hop_start;
+ p->want_ack = e.packet->want_ack;
p->via_mqtt = true; // Mark that the packet was received via MQTT
- // Unset received SNR/RSSI which might have been added by the MQTT gateway
- p->rx_snr = 0;
- p->rx_rssi = 0;
+ p->which_payload_variant = e.packet->which_payload_variant;
+ memcpy(&p->decoded, &e.packet->decoded, std::max(sizeof(p->decoded), sizeof(p->encrypted)));
if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
if (moduleConfig.mqtt.encryption_enabled) {
diff --git a/src/platform/rp2xx0/main-rp2xx0.cpp b/src/platform/rp2xx0/main-rp2xx0.cpp
index a46b0face..6c73e385a 100644
--- a/src/platform/rp2xx0/main-rp2xx0.cpp
+++ b/src/platform/rp2xx0/main-rp2xx0.cpp
@@ -2,14 +2,11 @@
#include "hardware/xosc.h"
#include
#include
-#include
#include
#include
-void setBluetoothEnable(bool enable)
-{
- // not needed
-}
+#ifdef __PLAT_RP2040__
+#include
static bool awake;
@@ -66,7 +63,20 @@ void cpuDeepSleep(uint32_t msecs)
rp2040.reboot();
/* Set RP2040 in dormant mode. Will not wake up. */
- // xosc_dormant();
+ // xosc_dormant();
+}
+
+#else
+void cpuDeepSleep(uint32_t msecs)
+{
+ /* Set RP2040 in dormant mode. Will not wake up. */
+ xosc_dormant();
+}
+#endif
+
+void setBluetoothEnable(bool enable)
+{
+ // not needed
}
void updateBatteryLevel(uint8_t level)
diff --git a/test/test_mqtt/MQTT.cpp b/test/test_mqtt/MQTT.cpp
new file mode 100644
index 000000000..55ba479e2
--- /dev/null
+++ b/test/test_mqtt/MQTT.cpp
@@ -0,0 +1,856 @@
+#include "DebugConfiguration.h"
+#include "TestUtil.h"
+#include
+
+#ifdef ARCH_PORTDUINO
+#include "mesh/CryptoEngine.h"
+#include "mesh/Default.h"
+#include "mesh/MeshService.h"
+#include "mesh/NodeDB.h"
+#include "mesh/Router.h"
+#include "modules/RoutingModule.h"
+#include "mqtt/MQTT.h"
+#include "mqtt/ServiceEnvelope.h"
+
+#include
+#include
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+namespace
+{
+// Minimal router needed to receive messages from MQTT.
+class MockRouter : public Router
+{
+ public:
+ ~MockRouter()
+ {
+ // cryptLock is created in the constructor for Router.
+ delete cryptLock;
+ cryptLock = NULL;
+ }
+ void enqueueReceivedMessage(meshtastic_MeshPacket *p) override
+ {
+ packets_.emplace_back(*p);
+ packetPool.release(p);
+ }
+ std::list packets_; // Packets received by the Router.
+};
+
+// Minimal MeshService needed to receive messages from MQTT for testing PKI channel.
+class MockMeshService : public MeshService
+{
+ public:
+ void sendMqttMessageToClientProxy(meshtastic_MqttClientProxyMessage *m) override
+ {
+ messages_.emplace_back(*m);
+ releaseMqttClientProxyMessageToPool(m);
+ }
+ std::list messages_; // Messages received from the MeshService.
+};
+
+// Minimal NodeDB needed to return values from getMeshNode.
+class MockNodeDB : public NodeDB
+{
+ public:
+ meshtastic_NodeInfoLite *getMeshNode(NodeNum n) override { return &emptyNode; }
+ meshtastic_NodeInfoLite emptyNode = {};
+};
+
+// Minimal RoutingModule needed to return values from sendAckNak.
+class MockRoutingModule : public RoutingModule
+{
+ public:
+ void sendAckNak(meshtastic_Routing_Error err, NodeNum to, PacketId idFrom, ChannelIndex chIndex,
+ uint8_t hopLimit = 0) override
+ {
+ ackNacks_.emplace_back(err, to, idFrom, chIndex, hopLimit);
+ }
+ std::list>
+ ackNacks_; // ackNacks received by the RoutingModule.
+};
+
+// A WiFi client used by the MQTT::PubSubClient. Implements a minimal pub/sub server.
+// There isn't an easy way to mock PubSubClient due to it not having virtual methods, so we mock using
+// the WiFiClinet that PubSubClient uses.
+class MockPubSubServer : public WiFiClient
+{
+ public:
+ static constexpr char kTextTopic[] = "TextTopic";
+ uint8_t connected() override { return connected_; }
+ void flush() override {}
+ IPAddress remoteIP() const override { return IPAddress(htonl(ipAddress_)); }
+ void stop() override { connected_ = false; }
+
+ int connect(IPAddress ip, uint16_t port) override
+ {
+ if (refuseConnection_)
+ return 0;
+ connected_ = true;
+ return 1;
+ }
+ int connect(const char *host, uint16_t port) override
+ {
+ if (refuseConnection_)
+ return 0;
+ connected_ = true;
+ return 1;
+ }
+
+ int available() override
+ {
+ if (buffer_.empty())
+ return 0;
+ return buffer_.front().size();
+ }
+
+ int read() override
+ {
+ assert(available());
+ std::string &front = buffer_.front();
+ char ch = front[0];
+ front = front.substr(1, front.size());
+ if (front.empty())
+ buffer_.pop_front();
+ return ch;
+ }
+
+ size_t write(uint8_t data) override { return write(&data, 1); }
+ size_t write(const uint8_t *buf, size_t size) override
+ {
+ command_ += std::string(reinterpret_cast(buf), size);
+ if (command_.size() < 2)
+ return size;
+ const int len = (uint8_t)command_[1] + 2;
+ if (command_.size() < len)
+ return size;
+ handleCommand(command_[0], command_.substr(2, len));
+ command_ = command_.substr(len, command_.size());
+ return size;
+ }
+
+ // The pub/sub "server".
+ // https://public.dhe.ibm.com/software/dw/webservices/ws-mqtt/MQTT_V3.1_Protocol_Specific.pdf
+ void handleCommand(uint8_t header, std::string_view message)
+ {
+ switch (header & 0xf0) {
+ case MQTTCONNECT:
+ LOG_DEBUG("MQTTCONNECT");
+ buffer_.push_back(std::string("\x20\x02\x00\x00", 4));
+ break;
+
+ case MQTTSUBSCRIBE: {
+ LOG_DEBUG("MQTTSUBSCRIBE");
+ assert(message.size() >= 5);
+ message.remove_prefix(2); // skip messageId
+
+ while (message.size() >= 3) {
+ const uint16_t topicSize = ((uint8_t)message[0]) << 8 | (uint8_t)message[1];
+ message.remove_prefix(2);
+
+ assert(message.size() >= topicSize + 1);
+ std::string topic(message.data(), topicSize);
+ message.remove_prefix(topicSize + 1);
+
+ LOG_DEBUG("Subscribed to topic: %s", topic.c_str());
+ subscriptions_.insert(std::move(topic));
+ }
+ break;
+ }
+
+ case MQTTPINGREQ:
+ LOG_DEBUG("MQTTPINGREQ");
+ buffer_.push_back(std::string("\xd0\x00", 2));
+ break;
+
+ case MQTTPUBLISH: {
+ LOG_DEBUG("MQTTPUBLISH");
+ assert(message.size() >= 3);
+ const uint16_t topicSize = ((uint8_t)message[0]) << 8 | (uint8_t)message[1];
+ message.remove_prefix(2);
+
+ assert(message.size() >= topicSize);
+ std::string topic(message.data(), topicSize);
+ message.remove_prefix(topicSize);
+
+ if (topic == kTextTopic) {
+ published_.emplace_back(std::move(topic), std::string(message.data(), message.size()));
+ } else {
+ published_.emplace_back(
+ std::move(topic), DecodedServiceEnvelope(reinterpret_cast(message.data()), message.size()));
+ }
+ break;
+ }
+ }
+ }
+
+ bool connected_ = false;
+ bool refuseConnection_ = false; // Simulate a failed connection.
+ uint32_t ipAddress_ = 0x01010101; // IP address of the MQTT server.
+ std::list buffer_; // Buffer of messages for the pubSub client to receive.
+ std::string command_; // Current command received from the pubSub client.
+ std::set subscriptions_; // Topics that the pubSub client has subscribed to.
+ std::list>>
+ published_; // Messages published from the pubSub client. Each list element is a pair containing the topic name and either
+ // a text message (if from the kTextTopic topic) or a DecodedServiceEnvelope.
+};
+
+// Instances of our mocks.
+class MQTTUnitTest;
+MQTTUnitTest *unitTest;
+MockPubSubServer *pubsub;
+MockRoutingModule *mockRoutingModule;
+MockMeshService *mockMeshService;
+MockRouter *mockRouter;
+
+// Keep running the loop until either conditionMet returns true or 4 seconds elapse.
+// Returns true if conditionMet returns true, returns false on timeout.
+bool loopUntil(std::function conditionMet)
+{
+ long start = millis();
+ while (start + 4000 > millis()) {
+ long delayMsec = concurrency::mainController.runOrDelay();
+ if (conditionMet())
+ return true;
+ concurrency::mainDelay.delay(std::min(delayMsec, 5L));
+ }
+ return false;
+}
+
+// Used to access protected/private members of MQTT for unit testing.
+class MQTTUnitTest : public MQTT
+{
+ public:
+ MQTTUnitTest() : MQTT(std::make_unique())
+ {
+ pubsub = reinterpret_cast(mqttClient.get());
+ }
+ ~MQTTUnitTest()
+ {
+ // Needed because WiFiClient does not have a virtual destructor.
+ mqttClient.release();
+ delete pubsub;
+ }
+ int queueSize() { return mqttQueue.numUsed(); }
+ void reportToMap(std::optional precision = std::nullopt)
+ {
+ if (precision.has_value())
+ map_position_precision = precision.value();
+ map_publish_interval_msecs = 0;
+ perhapsReportToMap();
+ }
+ void publish(const meshtastic_MeshPacket *p, std::string gateway = "!87654321", std::string channel = "test")
+ {
+ std::stringstream topic;
+ topic << "msh/2/e/" << channel << "/!" << gateway;
+ const meshtastic_ServiceEnvelope env = {.packet = const_cast(p),
+ .channel_id = const_cast(channel.c_str()),
+ .gateway_id = const_cast(gateway.c_str())};
+ uint8_t bytes[256];
+ size_t numBytes = pb_encode_to_bytes(bytes, sizeof(bytes), &meshtastic_ServiceEnvelope_msg, &env);
+ mqttCallback(const_cast(topic.str().c_str()), bytes, numBytes);
+ }
+ static void restart()
+ {
+ if (mqtt != NULL) {
+ delete mqtt;
+ mqtt = unitTest = NULL;
+ }
+ mqtt = unitTest = new MQTTUnitTest();
+ mqtt->start();
+
+ if (!moduleConfig.mqtt.enabled || moduleConfig.mqtt.proxy_to_client_enabled || *moduleConfig.mqtt.root) {
+ loopUntil([] { return true; }); // Loop once
+ return;
+ }
+ // Wait for MQTT to subscribe to all topics.
+ TEST_ASSERT_TRUE(loopUntil(
+ [] { return pubsub->subscriptions_.count("msh/2/e/test/+") && pubsub->subscriptions_.count("msh/2/e/PKI/+"); }));
+ }
+ PubSubClient &getPubSub() { return pubSub; }
+};
+
+// Packets used in unit tests.
+const meshtastic_MeshPacket decoded = {
+ .from = 1,
+ .to = 2,
+ .which_payload_variant = meshtastic_MeshPacket_decoded_tag,
+ .decoded = {.portnum = meshtastic_PortNum_TEXT_MESSAGE_APP, .has_bitfield = true, .bitfield = BITFIELD_OK_TO_MQTT_MASK},
+ .id = 4,
+};
+const meshtastic_MeshPacket encrypted = {
+ .from = 1,
+ .to = 2,
+ .which_payload_variant = meshtastic_MeshPacket_encrypted_tag,
+ .encrypted = {.size = 0},
+ .id = 3,
+};
+} // namespace
+
+// Initialize mocks and configuration before running each test.
+void setUp(void)
+{
+ moduleConfig.mqtt =
+ meshtastic_ModuleConfig_MQTTConfig{.enabled = true, .map_reporting_enabled = true, .has_map_report_settings = true};
+ channelFile.channels[0] = meshtastic_Channel{
+ .index = 0,
+ .has_settings = true,
+ .settings = {.name = "test", .uplink_enabled = true, .downlink_enabled = true},
+ .role = meshtastic_Channel_Role_PRIMARY,
+ };
+ channelFile.channels_count = 1;
+ owner = meshtastic_User{.id = "!12345678"};
+ myNodeInfo = meshtastic_MyNodeInfo{.my_node_num = 10};
+ localPosition =
+ meshtastic_Position{.has_latitude_i = true, .latitude_i = 7 * 1e7, .has_longitude_i = true, .longitude_i = 3 * 1e7};
+
+ router = mockRouter = new MockRouter();
+ service = mockMeshService = new MockMeshService();
+ routingModule = mockRoutingModule = new MockRoutingModule();
+ MQTTUnitTest::restart();
+}
+
+// Deinitialize all objects created in setUp.
+void tearDown(void)
+{
+ delete unitTest;
+ mqtt = unitTest = NULL;
+ delete mockRoutingModule;
+ routingModule = mockRoutingModule = NULL;
+ delete mockMeshService;
+ service = mockMeshService = NULL;
+ delete mockRouter;
+ router = mockRouter = NULL;
+}
+
+// Test that the decoded MeshPacket is published when encryption_enabled = false.
+void test_sendDirectlyConnectedDecoded(void)
+{
+ mqtt->onSend(encrypted, decoded, 0);
+
+ TEST_ASSERT_EQUAL(1, pubsub->published_.size());
+ const auto &[topic, payload] = pubsub->published_.front();
+ const DecodedServiceEnvelope &env = std::get(payload);
+ TEST_ASSERT_EQUAL_STRING("msh/2/e/test/!12345678", topic.c_str());
+ TEST_ASSERT_TRUE(env.validDecode);
+ TEST_ASSERT_EQUAL(decoded.id, env.packet->id);
+}
+
+// Test that the encrypted MeshPacket is published when encryption_enabled = true.
+void test_sendDirectlyConnectedEncrypted(void)
+{
+ moduleConfig.mqtt.encryption_enabled = true;
+
+ mqtt->onSend(encrypted, decoded, 0);
+
+ TEST_ASSERT_EQUAL(1, pubsub->published_.size());
+ const auto &[topic, payload] = pubsub->published_.front();
+ const DecodedServiceEnvelope &env = std::get(payload);
+ TEST_ASSERT_EQUAL_STRING("msh/2/e/test/!12345678", topic.c_str());
+ TEST_ASSERT_TRUE(env.validDecode);
+ TEST_ASSERT_EQUAL(encrypted.id, env.packet->id);
+}
+
+// Verify that the decoded MeshPacket is proxied through the MeshService when encryption_enabled = false.
+void test_proxyToMeshServiceDecoded(void)
+{
+ moduleConfig.mqtt.proxy_to_client_enabled = true;
+ MQTTUnitTest::restart();
+
+ mqtt->onSend(encrypted, decoded, 0);
+
+ TEST_ASSERT_EQUAL(1, mockMeshService->messages_.size());
+ const meshtastic_MqttClientProxyMessage &message = mockMeshService->messages_.front();
+ TEST_ASSERT_EQUAL_STRING("msh/2/e/test/!12345678", message.topic);
+ TEST_ASSERT_EQUAL(meshtastic_MqttClientProxyMessage_data_tag, message.which_payload_variant);
+ const DecodedServiceEnvelope env(message.payload_variant.data.bytes, message.payload_variant.data.size);
+ TEST_ASSERT_TRUE(env.validDecode);
+ TEST_ASSERT_EQUAL(decoded.id, env.packet->id);
+}
+
+// Verify that the encrypted MeshPacket is proxied through the MeshService when encryption_enabled = true.
+void test_proxyToMeshServiceEncrypted(void)
+{
+ moduleConfig.mqtt.proxy_to_client_enabled = true;
+ moduleConfig.mqtt.encryption_enabled = true;
+ MQTTUnitTest::restart();
+
+ mqtt->onSend(encrypted, decoded, 0);
+
+ TEST_ASSERT_EQUAL(1, mockMeshService->messages_.size());
+ const meshtastic_MqttClientProxyMessage &message = mockMeshService->messages_.front();
+ TEST_ASSERT_EQUAL_STRING("msh/2/e/test/!12345678", message.topic);
+ TEST_ASSERT_EQUAL(meshtastic_MqttClientProxyMessage_data_tag, message.which_payload_variant);
+ const DecodedServiceEnvelope env(message.payload_variant.data.bytes, message.payload_variant.data.size);
+ TEST_ASSERT_TRUE(env.validDecode);
+ TEST_ASSERT_EQUAL(encrypted.id, env.packet->id);
+}
+
+// A packet without the OK to MQTT bit set should not be published to a public server.
+void test_dontMqttMeOnPublicServer(void)
+{
+ meshtastic_MeshPacket p = decoded;
+ p.decoded.bitfield = 0;
+ p.decoded.has_bitfield = 0;
+
+ mqtt->onSend(encrypted, p, 0);
+
+ TEST_ASSERT_TRUE(pubsub->published_.empty());
+}
+
+// A packet without the OK to MQTT bit set should be published to a private server.
+void test_okToMqttOnPrivateServer(void)
+{
+ // Cause a disconnect.
+ pubsub->connected_ = false;
+ pubsub->refuseConnection_ = true;
+ TEST_ASSERT_TRUE(loopUntil([] { return !unitTest->getPubSub().connected(); }));
+
+ // Use 127.0.0.1 for the server's IP.
+ pubsub->ipAddress_ = 0x7f000001;
+
+ // Reconnect.
+ pubsub->refuseConnection_ = false;
+ TEST_ASSERT_TRUE(loopUntil([] { return unitTest->getPubSub().connected(); }));
+
+ // Send the same packet as test_dontMqttMeOnPublicServer.
+ meshtastic_MeshPacket p = decoded;
+ p.decoded.bitfield = 0;
+ p.decoded.has_bitfield = 0;
+
+ mqtt->onSend(encrypted, p, 0);
+
+ TEST_ASSERT_EQUAL(1, pubsub->published_.size());
+}
+
+// Range tests messages are not uplinked to the default server.
+void test_noRangeTestAppOnDefaultServer(void)
+{
+ meshtastic_MeshPacket p = decoded;
+ p.decoded.portnum = meshtastic_PortNum_RANGE_TEST_APP;
+
+ mqtt->onSend(encrypted, p, 0);
+
+ TEST_ASSERT_TRUE(pubsub->published_.empty());
+}
+
+// Detection sensor messages are not uplinked to the default server.
+void test_noDetectionSensorAppOnDefaultServer(void)
+{
+ meshtastic_MeshPacket p = decoded;
+ p.decoded.portnum = meshtastic_PortNum_DETECTION_SENSOR_APP;
+
+ mqtt->onSend(encrypted, p, 0);
+
+ TEST_ASSERT_TRUE(pubsub->published_.empty());
+}
+
+// Test that a MeshPacket is queued while the MQTT server is disconnected.
+void test_sendQueued(void)
+{
+ // Cause a disconnect.
+ pubsub->connected_ = false;
+ pubsub->refuseConnection_ = true;
+ TEST_ASSERT_TRUE(loopUntil([] { return !unitTest->getPubSub().connected(); }));
+
+ // Send while disconnected.
+ mqtt->onSend(encrypted, decoded, 0);
+ TEST_ASSERT_EQUAL(1, unitTest->queueSize());
+ TEST_ASSERT_TRUE(pubsub->published_.empty());
+ TEST_ASSERT_FALSE(unitTest->getPubSub().connected());
+
+ // Allow reconnect to happen. Expect to see the packet published now.
+ pubsub->refuseConnection_ = false;
+ TEST_ASSERT_TRUE(loopUntil([] { return !pubsub->published_.empty(); }));
+
+ TEST_ASSERT_EQUAL(0, unitTest->queueSize());
+ const auto &[topic, payload] = pubsub->published_.front();
+ const DecodedServiceEnvelope &env = std::get(payload);
+ TEST_ASSERT_EQUAL_STRING("msh/2/e/test/!12345678", topic.c_str());
+ TEST_ASSERT_TRUE(env.validDecode);
+ TEST_ASSERT_EQUAL(decoded.id, env.packet->id);
+}
+
+// Verify reconnecting with the proxy enabled does not reconnect to a MQTT server.
+void test_reconnectProxyDoesNotReconnectMqtt(void)
+{
+ moduleConfig.mqtt.proxy_to_client_enabled = true;
+ MQTTUnitTest::restart();
+
+ mqtt->reconnect();
+
+ TEST_ASSERT_FALSE(pubsub->connected_);
+}
+
+// Test receiving an empty MeshPacket on a subscribed topic.
+void test_receiveEmptyMeshPacket(void)
+{
+ unitTest->publish(NULL);
+
+ TEST_ASSERT_TRUE(mockRouter->packets_.empty());
+ TEST_ASSERT_TRUE(mockRoutingModule->ackNacks_.empty());
+}
+
+// Test receiving a decoded MeshPacket on a subscribed topic.
+void test_receiveDecodedProto(void)
+{
+ unitTest->publish(&decoded);
+
+ TEST_ASSERT_EQUAL(1, mockRouter->packets_.size());
+ const meshtastic_MeshPacket &p = mockRouter->packets_.front();
+ TEST_ASSERT_EQUAL(decoded.id, p.id);
+ TEST_ASSERT_TRUE(p.via_mqtt);
+}
+
+// Test receiving a decoded MeshPacket from the phone proxy.
+void test_receiveDecodedProtoFromProxy(void)
+{
+ const meshtastic_ServiceEnvelope env = {
+ .packet = const_cast(&decoded), .channel_id = "test", .gateway_id = "!87654321"};
+ meshtastic_MqttClientProxyMessage message = meshtastic_MqttClientProxyMessage_init_default;
+ strcat(message.topic, "msh/2/e/test/!87654321");
+ message.which_payload_variant = meshtastic_MqttClientProxyMessage_data_tag;
+ message.payload_variant.data.size = pb_encode_to_bytes(
+ message.payload_variant.data.bytes, sizeof(message.payload_variant.data.bytes), &meshtastic_ServiceEnvelope_msg, &env);
+
+ mqtt->onClientProxyReceive(message);
+
+ TEST_ASSERT_EQUAL(1, mockRouter->packets_.size());
+ const meshtastic_MeshPacket &p = mockRouter->packets_.front();
+ TEST_ASSERT_EQUAL(decoded.id, p.id);
+ TEST_ASSERT_TRUE(p.via_mqtt);
+}
+
+// Properly handles the case where the received message is empty.
+void test_receiveEmptyDataFromProxy(void)
+{
+ meshtastic_MqttClientProxyMessage message = meshtastic_MqttClientProxyMessage_init_default;
+ message.which_payload_variant = meshtastic_MqttClientProxyMessage_data_tag;
+
+ mqtt->onClientProxyReceive(message);
+
+ TEST_ASSERT_TRUE(mockRouter->packets_.empty());
+}
+
+// Packets should be ignored if downlink is not enabled.
+void test_receiveWithoutChannelDownlink(void)
+{
+ channelFile.channels[0].settings.downlink_enabled = false;
+
+ unitTest->publish(&decoded);
+
+ TEST_ASSERT_TRUE(mockRouter->packets_.empty());
+}
+
+// Test receiving an encrypted MeshPacket on the PKI topic.
+void test_receiveEncryptedPKITopicToUs(void)
+{
+ meshtastic_MeshPacket e = encrypted;
+ e.to = myNodeInfo.my_node_num;
+
+ unitTest->publish(&e, "!87654321", "PKI");
+
+ TEST_ASSERT_EQUAL(1, mockRouter->packets_.size());
+ const meshtastic_MeshPacket &p = mockRouter->packets_.front();
+ TEST_ASSERT_EQUAL(encrypted.id, p.id);
+ TEST_ASSERT_TRUE(p.via_mqtt);
+}
+
+// Should ignore messages published to MQTT by this gateway.
+void test_receiveIgnoresOwnPublishedMessages(void)
+{
+ unitTest->publish(&decoded, owner.id);
+
+ TEST_ASSERT_TRUE(mockRouter->packets_.empty());
+ TEST_ASSERT_TRUE(mockRoutingModule->ackNacks_.empty());
+}
+
+// Considers receiving one of our packets an acknowledgement of it being sent.
+void test_receiveAcksOwnSentMessages(void)
+{
+ meshtastic_MeshPacket p = decoded;
+ p.from = myNodeInfo.my_node_num;
+
+ unitTest->publish(&p, owner.id);
+
+ TEST_ASSERT_TRUE(mockRouter->packets_.empty());
+ TEST_ASSERT_EQUAL(1, mockRoutingModule->ackNacks_.size());
+ const auto &[err, to, idFrom, chIndex, hopLimit] = mockRoutingModule->ackNacks_.front();
+ TEST_ASSERT_EQUAL(meshtastic_Routing_Error_NONE, err);
+ TEST_ASSERT_EQUAL(myNodeInfo.my_node_num, to);
+ TEST_ASSERT_EQUAL(p.id, idFrom);
+}
+
+// Should ignore our own messages from MQTT that were heard by other nodes.
+void test_receiveIgnoresSentMessagesFromOthers(void)
+{
+ meshtastic_MeshPacket p = decoded;
+ p.from = myNodeInfo.my_node_num;
+
+ unitTest->publish(&p);
+
+ TEST_ASSERT_TRUE(mockRouter->packets_.empty());
+ TEST_ASSERT_TRUE(mockRoutingModule->ackNacks_.empty());
+}
+
+// Decoded MQTT messages should be ignored when encryption is enabled.
+void test_receiveIgnoresDecodedWhenEncryptionEnabled(void)
+{
+ moduleConfig.mqtt.encryption_enabled = true;
+
+ unitTest->publish(&decoded);
+
+ TEST_ASSERT_TRUE(mockRouter->packets_.empty());
+}
+
+// Non-encrypted messages for the Admin App should be ignored.
+void test_receiveIgnoresDecodedAdminApp(void)
+{
+ meshtastic_MeshPacket p = decoded;
+ p.decoded.portnum = meshtastic_PortNum_ADMIN_APP;
+
+ unitTest->publish(&p);
+
+ TEST_ASSERT_TRUE(mockRouter->packets_.empty());
+}
+
+// Only the same fields that are transmitted over LoRa should be set in MQTT messages.
+void test_receiveIgnoresUnexpectedFields(void)
+{
+ meshtastic_MeshPacket input = decoded;
+ input.rx_snr = 10;
+ input.rx_rssi = 20;
+
+ unitTest->publish(&input);
+
+ TEST_ASSERT_EQUAL(1, mockRouter->packets_.size());
+ const meshtastic_MeshPacket &p = mockRouter->packets_.front();
+ TEST_ASSERT_EQUAL(0, p.rx_snr);
+ TEST_ASSERT_EQUAL(0, p.rx_rssi);
+}
+
+// Messages with an invalid hop_limit are ignored.
+void test_receiveIgnoresInvalidHopLimit(void)
+{
+ meshtastic_MeshPacket p = decoded;
+ p.hop_limit = 10;
+
+ unitTest->publish(&p);
+
+ TEST_ASSERT_TRUE(mockRouter->packets_.empty());
+}
+
+// Publishing to a text channel.
+void test_publishTextMessageDirect(void)
+{
+ TEST_ASSERT_TRUE(mqtt->publish(MockPubSubServer::kTextTopic, "payload", 0));
+
+ TEST_ASSERT_EQUAL(1, pubsub->published_.size());
+ const auto &[topic, payload] = pubsub->published_.front();
+ TEST_ASSERT_EQUAL_STRING("payload", std::get(payload).c_str());
+}
+
+// Publishing to a text channel via the MQTT client proxy.
+void test_publishTextMessageWithProxy(void)
+{
+ moduleConfig.mqtt.proxy_to_client_enabled = true;
+
+ TEST_ASSERT_TRUE(mqtt->publish(MockPubSubServer::kTextTopic, "payload", 0));
+
+ TEST_ASSERT_EQUAL(1, mockMeshService->messages_.size());
+ const meshtastic_MqttClientProxyMessage &message = mockMeshService->messages_.front();
+ TEST_ASSERT_EQUAL_STRING(MockPubSubServer::kTextTopic, message.topic);
+ TEST_ASSERT_EQUAL(meshtastic_MqttClientProxyMessage_text_tag, message.which_payload_variant);
+ TEST_ASSERT_EQUAL_STRING("payload", message.payload_variant.text);
+}
+
+// Helper method to verify the expected latitude/longitude was received.
+void verifyLatLong(const DecodedServiceEnvelope &env, uint32_t latitude, uint32_t longitude)
+{
+ TEST_ASSERT_TRUE(env.validDecode);
+ const meshtastic_MeshPacket &p = *env.packet;
+ TEST_ASSERT_EQUAL(NODENUM_BROADCAST, p.to);
+ TEST_ASSERT_EQUAL(meshtastic_MeshPacket_decoded_tag, p.which_payload_variant);
+ TEST_ASSERT_EQUAL(meshtastic_PortNum_MAP_REPORT_APP, p.decoded.portnum);
+
+ meshtastic_MapReport mapReport;
+ TEST_ASSERT_TRUE(
+ pb_decode_from_bytes(p.decoded.payload.bytes, p.decoded.payload.size, &meshtastic_MapReport_msg, &mapReport));
+ TEST_ASSERT_EQUAL(latitude, mapReport.latitude_i);
+ TEST_ASSERT_EQUAL(longitude, mapReport.longitude_i);
+}
+
+// Map reporting defaults to an imprecise location.
+void test_reportToMapDefaultImprecise(void)
+{
+ unitTest->reportToMap();
+
+ TEST_ASSERT_EQUAL(1, pubsub->published_.size());
+ const auto &[topic, payload] = pubsub->published_.front();
+ TEST_ASSERT_EQUAL_STRING("msh/2/map/", topic.c_str());
+ verifyLatLong(std::get(payload), 70123520, 30015488);
+}
+
+// Precise location is reported when configured.
+void test_reportToMapPrecise(void)
+{
+ unitTest->reportToMap(/*precision=*/32);
+
+ TEST_ASSERT_EQUAL(1, pubsub->published_.size());
+ const auto &[topic, payload] = pubsub->published_.front();
+ TEST_ASSERT_EQUAL_STRING("msh/2/map/", topic.c_str());
+ verifyLatLong(std::get(payload), localPosition.latitude_i, localPosition.longitude_i);
+}
+
+// Location is sent over the phone proxy.
+void test_reportToMapPreciseProxied(void)
+{
+ moduleConfig.mqtt.proxy_to_client_enabled = true;
+ MQTTUnitTest::restart();
+
+ unitTest->reportToMap(/*precision=*/32);
+
+ TEST_ASSERT_EQUAL(1, mockMeshService->messages_.size());
+ const meshtastic_MqttClientProxyMessage &message = mockMeshService->messages_.front();
+ TEST_ASSERT_EQUAL_STRING("msh/2/map/", message.topic);
+ TEST_ASSERT_EQUAL(meshtastic_MqttClientProxyMessage_data_tag, message.which_payload_variant);
+ const DecodedServiceEnvelope env(message.payload_variant.data.bytes, message.payload_variant.data.size);
+ verifyLatLong(env, localPosition.latitude_i, localPosition.longitude_i);
+}
+
+// No location is reported when the precision is invalid.
+void test_reportToMapInvalidPrecision(void)
+{
+ unitTest->reportToMap(/*precision=*/0);
+
+ TEST_ASSERT_TRUE(pubsub->published_.empty());
+}
+
+// isUsingDefaultServer returns true when using the default server.
+void test_usingDefaultServer(void)
+{
+ TEST_ASSERT_TRUE(mqtt->isUsingDefaultServer());
+}
+
+// isUsingDefaultServer returns true when using the default server and a port.
+void test_usingDefaultServerWithPort(void)
+{
+ std::string server = default_mqtt_address;
+ server += ":1883";
+ strcpy(moduleConfig.mqtt.address, server.c_str());
+ MQTTUnitTest::restart();
+
+ TEST_ASSERT_TRUE(mqtt->isUsingDefaultServer());
+}
+
+// isUsingDefaultServer returns true when using the default server and invalid port.
+void test_usingDefaultServerWithInvalidPort(void)
+{
+ std::string server = default_mqtt_address;
+ server += ":invalid";
+ strcpy(moduleConfig.mqtt.address, server.c_str());
+ MQTTUnitTest::restart();
+
+ TEST_ASSERT_TRUE(mqtt->isUsingDefaultServer());
+}
+
+// isUsingDefaultServer returns false when not using the default server.
+void test_usingCustomServer(void)
+{
+ strcpy(moduleConfig.mqtt.address, "custom");
+ MQTTUnitTest::restart();
+
+ TEST_ASSERT_FALSE(mqtt->isUsingDefaultServer());
+}
+
+// Test that isEnabled returns true the MQTT module is enabled.
+void test_enabled(void)
+{
+ TEST_ASSERT_TRUE(mqtt->isEnabled());
+}
+
+// Test that isEnabled returns false the MQTT module not enabled.
+void test_disabled(void)
+{
+ moduleConfig.mqtt.enabled = false;
+ MQTTUnitTest::restart();
+
+ TEST_ASSERT_FALSE(mqtt->isEnabled());
+}
+
+// Subscriptions contain the moduleConfig.mqtt.root prefix.
+void test_customMqttRoot(void)
+{
+ strcpy(moduleConfig.mqtt.root, "custom");
+ MQTTUnitTest::restart();
+
+ TEST_ASSERT_TRUE(loopUntil(
+ [] { return pubsub->subscriptions_.count("custom/2/e/test/+") && pubsub->subscriptions_.count("custom/2/e/PKI/+"); }));
+}
+
+void setup()
+{
+ initializeTestEnvironment();
+ const std::unique_ptr mockNodeDB(new MockNodeDB());
+ nodeDB = mockNodeDB.get();
+
+ UNITY_BEGIN();
+ RUN_TEST(test_sendDirectlyConnectedDecoded);
+ RUN_TEST(test_sendDirectlyConnectedEncrypted);
+ RUN_TEST(test_proxyToMeshServiceDecoded);
+ RUN_TEST(test_proxyToMeshServiceEncrypted);
+ RUN_TEST(test_dontMqttMeOnPublicServer);
+ RUN_TEST(test_okToMqttOnPrivateServer);
+ RUN_TEST(test_noRangeTestAppOnDefaultServer);
+ RUN_TEST(test_noDetectionSensorAppOnDefaultServer);
+ RUN_TEST(test_sendQueued);
+ RUN_TEST(test_reconnectProxyDoesNotReconnectMqtt);
+ RUN_TEST(test_receiveEmptyMeshPacket);
+ RUN_TEST(test_receiveDecodedProto);
+ RUN_TEST(test_receiveDecodedProtoFromProxy);
+ RUN_TEST(test_receiveEmptyDataFromProxy);
+ RUN_TEST(test_receiveWithoutChannelDownlink);
+ RUN_TEST(test_receiveEncryptedPKITopicToUs);
+ RUN_TEST(test_receiveIgnoresOwnPublishedMessages);
+ RUN_TEST(test_receiveAcksOwnSentMessages);
+ RUN_TEST(test_receiveIgnoresSentMessagesFromOthers);
+ RUN_TEST(test_receiveIgnoresDecodedWhenEncryptionEnabled);
+ RUN_TEST(test_receiveIgnoresDecodedAdminApp);
+ RUN_TEST(test_receiveIgnoresUnexpectedFields);
+ RUN_TEST(test_receiveIgnoresInvalidHopLimit);
+ RUN_TEST(test_publishTextMessageDirect);
+ RUN_TEST(test_publishTextMessageWithProxy);
+ RUN_TEST(test_reportToMapDefaultImprecise);
+ RUN_TEST(test_reportToMapPrecise);
+ RUN_TEST(test_reportToMapPreciseProxied);
+ RUN_TEST(test_reportToMapInvalidPrecision);
+ RUN_TEST(test_usingDefaultServer);
+ RUN_TEST(test_usingDefaultServerWithPort);
+ RUN_TEST(test_usingDefaultServerWithInvalidPort);
+ RUN_TEST(test_usingCustomServer);
+ RUN_TEST(test_enabled);
+ RUN_TEST(test_disabled);
+ RUN_TEST(test_customMqttRoot);
+ exit(UNITY_END());
+}
+#else
+void setup()
+{
+ initializeTestEnvironment();
+ LOG_WARN("This test requires the ARCH_PORTDUINO variant of WiFiClient");
+ UNITY_BEGIN();
+ UNITY_END();
+}
+#endif
+void loop() {}
\ No newline at end of file