Config and payload variant

meshtastic/mesh.options

@@ -55,5 +55,6 @@
 
 *DeviceMetadata.firmware_version max_size:18
 
-*MqttClientProxyMessage.topic type:FT_POINTER
-*MqttClientProxyMessage.data max_size:500
+*MqttClientProxyMessage.topic max_size:60
+*MqttClientProxyMessage.data max_size:435
+*MqttClientProxyMessage.text max_size:435

meshtastic/mesh.proto

@@ -682,10 +682,26 @@ message Waypoint {
    * The MQTT topic this message will be sent /received on
    */
   string topic = 1;
+
   /*
    * The actual service envelope payload for mqtt delivery
    */
-  bytes data = 2;
+  oneof payload_variant {
+    /*
+     * Bytes
+     */
+    bytes data = 2;
+
+    /*
+     * Text
+     */
+    string text = 3;
+  }
+
+  /*
+   * Whether the message should be retained (or not)
+   */
+  bool retained = 4;
 }
 
 /*

meshtastic/module_config.proto

@@ -65,6 +65,11 @@ message ModuleConfig {
      * This is useful if you want to use a single MQTT server for multiple meshtastic networks and separate them via ACLs
      */
     string root = 8;
+
+    /*
+     * If true, we can use the connected phone / client to proxy messages to MQTT instead of a direct connection
+     */
+    bool proxy_to_client_enabled = 9;
   }
 
   /*