[FCT] Add flexible connection address

Author: jferdelyi

demo/._project.godot

@@ -15,8 +15,10 @@ signal error_received(message, reason_code)
 
 @export var client_id: String = "MQTTClient" 
 @export var clean_session: bool = true 
+@export var protocol: String = "tcp"
 @export var broker_address: String = "localhost"
 @export var broker_port: int = 1883
+@export var broker_address_end: String = ""
 @export var broker_keep_alive: int = 60
 @export var username: String = ""
 @export var password: String = ""
@@ -35,7 +37,7 @@ func initialise() -> void:
 	_mqtt_client.connect("log", Callable(self, "_on_MQTTClient_log"))
 	_mqtt_client.connect("error", Callable(self, "_on_MQTTClient_error"))
 
-	var rc_initialise: int = _mqtt_client.initialise(client_id, broker_address, str(broker_port))
+	var rc_initialise: int = _mqtt_client.initialise_full_address(client_id, protocol + "://" + broker_address + ":" + str(broker_port) + "/" + broker_address_end)
 	var rc = rc_initialise
 	if not rc_initialise:
 		if username != "" and password != "":

demo/addons/GDPaho/PahoClient.gd

@@ -12,7 +12,7 @@ config_version=5
 
 config/name="GDPaho Demo"
 run/main_scene="res://scenes/Main.tscn"
-config/features=PackedStringArray("4.1")
+config/features=PackedStringArray("4.2")
 config/icon="res://GDPaho.png"
 
 [autoload]

demo/project.godot

@@ -29,6 +29,7 @@ GDPaho::~GDPaho() {
 void GDPaho::_bind_methods() {
 	// Methods
 	ClassDB::bind_method(D_METHOD("loop"), &GDPaho::loop);
+	ClassDB::bind_method(D_METHOD("initialise_full_address"), &GDPaho::initialise_full_address);
 	ClassDB::bind_method(D_METHOD("initialise"), &GDPaho::initialise);
 	ClassDB::bind_method(D_METHOD("username_pw_set"), &GDPaho::username_pw_set);
 	ClassDB::bind_method(D_METHOD("is_connected_to_broker"), &GDPaho::is_connected_to_broker);
@@ -112,16 +113,20 @@ void GDPaho::loop() {
 //	Wrapped methods
 //###############################################################
 
-int GDPaho::initialise(const String p_id, const String p_host, const String p_port) {
+int GDPaho::initialise_full_address(const String p_id, const String p_full_address) {
 	try {
-		String m_connection_address = "tcp://" + p_host + ":" + p_port;
+		String m_connection_address = p_full_address;
 		m_wrapper = new PahoWrapper(*this, p_id.utf8().get_data(), m_connection_address.utf8().get_data());
 		return mqtt::ReasonCode::SUCCESS;
 	} catch (std::exception& p_exception) {
 		return atoi(p_exception.what());
 	}
 }
 
+int GDPaho::initialise(const String p_id, const String p_host, const String p_port) {
+	return initialise_full_address(p_id, "tcp://" + p_host + ":" + p_port);
+}
+
 int GDPaho::username_pw_set(const String p_username, const String p_password) {
 	if (!m_wrapper) {
 		return PAHO_ERR_NOT_INIT;

src/GDPaho.cpp

@@ -107,6 +107,14 @@ namespace godot {
 			//	Wrapped methods
 			//###############################################################
 
+			/**
+			 * Create a new paho client instance
+			 * @param p_id string to use as the client id. If NULL, a random client id will be generated. If id is NULL, clean_session must be true
+			 * @param p_full_address the full connection address
+			 * @return the reason code, if something wrong happen. 0 = OK (see https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901031)
+		 	 */
+			int initialise_full_address(const String p_id, const String p_full_address);
+
 			/**
 			 * Create a new paho client instance
 			 * @param p_id string to use as the client id. If NULL, a random client id will be generated. If id is NULL, clean_session must be true