devttl/xiaozhi-esp32
1
0
Fork 0
forked from xiaozhi/xiaozhi-esp32
Code Pull Requests Activity

Support MQTT endpoint port

Browse Source
This commit is contained in:
Terrence
2025-04-21 06:54:50 +08:00
parent a6619dcdb9
commit c380617cca
6 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
main/protocols/mqtt_protocol.cc
View File

@@ -27,8 +27,8 @@ MqttProtocol::~MqttProtocol() {
vEventGroupDelete(event_group_handle_);
}
void MqttProtocol::Start() {
StartMqttClient(false);
bool MqttProtocol::Start() {
return StartMqttClient(false);
}
bool MqttProtocol::StartMqttClient(bool report_error) {
@@ -90,7 +90,16 @@ bool MqttProtocol::StartMqttClient(bool report_error) {
});
ESP_LOGI(TAG, "Connecting to endpoint %s", endpoint_.c_str());
if (!mqtt_->Connect(endpoint_, 8883, client_id_, username_, password_)) {
std::string broker_address;
int broker_port = 8883;
size_t pos = endpoint_.find(':');
if (pos != std::string::npos) {
broker_address = endpoint_.substr(0, pos);
broker_port = std::stoi(endpoint_.substr(pos + 1));
} else {
broker_address = endpoint_;
}
if (!mqtt_->Connect(broker_address, broker_port, client_id_, username_, password_)) {
ESP_LOGE(TAG, "Failed to connect to endpoint");
SetError(Lang::Strings::SERVER_NOT_CONNECTED);
return false;

2
main/protocols/mqtt_protocol.h
View File

@@ -25,7 +25,7 @@ public:
MqttProtocol();
~MqttProtocol();
void Start() override;
bool Start() override;
void SendAudio(const std::vector<uint8_t>& data) override;
bool OpenAudioChannel() override;
void CloseAudioChannel() override;

2
main/protocols/protocol.h
View File

@@ -44,7 +44,7 @@ public:
void OnAudioChannelClosed(std::function<void()> callback);
void OnNetworkError(std::function<void(const std::string& message)> callback);
virtual void Start() = 0;
virtual bool Start() = 0;
virtual bool OpenAudioChannel() = 0;
virtual void CloseAudioChannel() = 0;
virtual bool IsAudioChannelOpened() const = 0;

4
main/protocols/websocket_protocol.cc
View File

@@ -22,7 +22,9 @@ WebsocketProtocol::~WebsocketProtocol() {
vEventGroupDelete(event_group_handle_);
}
void WebsocketProtocol::Start() {
bool WebsocketProtocol::Start() {
// Only connect to server when audio channel is needed
return true;
}
void WebsocketProtocol::SendAudio(const std::vector<uint8_t>& data) {

2
main/protocols/websocket_protocol.h
View File

@@ -15,7 +15,7 @@ public:
WebsocketProtocol();
~WebsocketProtocol();
void Start() override;
bool Start() override;
void SendAudio(const std::vector<uint8_t>& data) override;
bool OpenAudioChannel() override;
void CloseAudioChannel() override;