Skip to content

Commit

Permalink
Optimizations and skipping long messages
Browse files Browse the repository at this point in the history
  • Loading branch information
@gemini1389
gemini1389 committed Jan 5, 2022
1 parent ee144d1 commit 53892d7
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 19 deletions.
97 changes: 79 additions & 18 deletions src/UniversalTelegramBot.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ String UniversalTelegramBot::buildCommand(const String& cmd) {
}

String UniversalTelegramBot::sendGetToTelegram(const String& command) {
String body, headers;
String body;

// Connect with api.telegram.org if not already connected
if (!client->connected()) {
Expand All @@ -91,34 +91,51 @@ String UniversalTelegramBot::sendGetToTelegram(const String& command) {
client->println(F("Cache-Control: no-cache"));
client->println();

readHTTPAnswer(body, headers);
readHTTPAnswer(body);
}

return body;
}

bool UniversalTelegramBot::readHTTPAnswer(String &body, String &headers) {
bool UniversalTelegramBot::readHTTPAnswer(String &body) {
int ch_count = 0;
unsigned long now = millis();
bool finishedHeaders = false;
bool currentLineIsBlank = true;
bool responseReceived = false;
int toRead = 0;
String headers;

while (millis() - now < longPoll * 1000 + waitForResponse) {
while (client->available()) {
char c = client->read();
responseReceived = true;

if (!finishedHeaders) {
if (currentLineIsBlank && c == '\n') {
finishedHeaders = true;

String headerLC = String(headers);
headerLC.toLowerCase();
int ind1 = headerLC.indexOf("content-length");
if (ind1 != -1) {
int ind2 = headerLC.indexOf("\r", ind1 + 15);
if (ind2 != -1) {
toRead = headerLC.substring(ind1 + 15, ind2).toInt();
headers = "";
#ifdef TELEGRAM_DEBUG
Serial.print(F("Content-Length: "));
Serial.println(toRead);
#endif
}
}
} else {
headers += c;
}
} else {
if (ch_count < maxMessageLength) {
body += c;
ch_count++;
responseReceived = toRead > 0 ? ch_count == toRead : true;
}
}

Expand All @@ -127,21 +144,23 @@ bool UniversalTelegramBot::readHTTPAnswer(String &body, String &headers) {
}

if (responseReceived) {
#ifdef TELEGRAM_DEBUG
Serial.println();
Serial.println(body);
Serial.println();
#endif
break;
}
}

#ifdef TELEGRAM_DEBUG
Serial.println(F("Body:"));
Serial.println(body);
Serial.print(F("ch_count: "));
Serial.println(ch_count);
#endif

return responseReceived;
}

String UniversalTelegramBot::sendPostToTelegram(const String& command, JsonObject payload) {

String body;
String headers;

// Connect with api.telegram.org if not already connected
if (!client->connected()) {
Expand Down Expand Up @@ -176,10 +195,11 @@ String UniversalTelegramBot::sendPostToTelegram(const String& command, JsonObjec

client->println(out);
#ifdef TELEGRAM_DEBUG
Serial.println(String("Posting:") + out);
Serial.print(F("Posting: "));
Serial.println(out);
#endif

readHTTPAnswer(body, headers);
readHTTPAnswer(body);
}

return body;
Expand All @@ -194,7 +214,6 @@ String UniversalTelegramBot::sendMultipartFormDataToTelegram(
GetNextBufferLen getNextBufferLenCallback) {

String body;
String headers;

const String boundary = F("------------------------b8f610217e83e29b");

Expand Down Expand Up @@ -252,7 +271,8 @@ String UniversalTelegramBot::sendMultipartFormDataToTelegram(
client->print(start_request);

#ifdef TELEGRAM_DEBUG
Serial.print("Start request: " + start_request);
Serial.print(F("Start request: "));
Serial.println(start_request);
#endif

if (getNextByteCallback == nullptr) {
Expand Down Expand Up @@ -291,9 +311,10 @@ String UniversalTelegramBot::sendMultipartFormDataToTelegram(

client->print(end_request);
#ifdef TELEGRAM_DEBUG
Serial.print("End request: " + end_request);
Serial.print(F("End request: "));
Serial.println(end_request);
#endif
readHTTPAnswer(body, headers);
readHTTPAnswer(body);
}

closeClient();
Expand Down Expand Up @@ -337,7 +358,8 @@ bool UniversalTelegramBot::setMyCommands(const String& commandArray) {
while (millis() - sttime < 8000ul) { // loop for a while to send the message
response = sendPostToTelegram(BOT_CMD("setMyCommands"), payload.as<JsonObject>());
#ifdef TELEGRAM_DEBUG
Serial.println("setMyCommands response" + response);
Serial.println(F("setMyCommands response:"));
Serial.println(response);
#endif
sent = checkForOkResponse(response);
if (sent) break;
Expand Down Expand Up @@ -368,6 +390,7 @@ int UniversalTelegramBot::getUpdates(long offset) {
command += String(longPoll);
}
String response = sendGetToTelegram(command); // receive reply from telegram.org
long updateId = getUpdateIdFromResponse(response);

if (response == "") {
#ifdef TELEGRAM_DEBUG
Expand Down Expand Up @@ -416,6 +439,9 @@ int UniversalTelegramBot::getUpdates(long offset) {
#endif
}
} else { // Parsing failed
Serial.print(F("Update ID with error: "));
Serial.println(updateId);

if (response.length() < 2) { // Too short a message. Maybe a connection issue
#ifdef TELEGRAM_DEBUG
Serial.println(F("Parsing error: Message too short"));
Expand All @@ -432,6 +458,15 @@ int UniversalTelegramBot::getUpdates(long offset) {
}
// Close the client as no response is to be given
closeClient();

if (error && response.length() == (unsigned) maxMessageLength) {
Serial.print(F("The message with update ID "));
Serial.print(updateId);
Serial.println(F(" is too long and was skipped. The next update ID has been sent for processing."));

return getUpdates(updateId + 1);
}

return 0;
}
}
Expand Down Expand Up @@ -651,7 +686,7 @@ bool UniversalTelegramBot::sendMessageWithInlineKeyboard(const String& chat_id,
const String& text,
const String& parse_mode,
const String& keyboard,
int message_id) { // added message_id
int message_id) {

DynamicJsonDocument payload(maxMessageLength);
payload["chat_id"] = chat_id;
Expand Down Expand Up @@ -860,3 +895,29 @@ bool UniversalTelegramBot::answerCallbackQuery(const String &query_id, const Str
closeClient();
return answer;
}

long UniversalTelegramBot::getUpdateIdFromResponse(String response) {
response.remove(response.indexOf("\n"));

char updateId[20];
const char *str = response.c_str();

while(*str != '\0')
{
if (*str == '\r') {
break;
}

str++;

int i = 0;
while('0' <= *str && *str <= '9')
{
updateId[i] = *str;
i++;
str++;
}
}

return atol(updateId);
}
3 changes: 2 additions & 1 deletion src/UniversalTelegramBot.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class UniversalTelegramBot {
GetNextBuffer getNextBufferCallback,
GetNextBufferLen getNextBufferLenCallback);

bool readHTTPAnswer(String &body, String &headers);
bool readHTTPAnswer(String &body);
bool getMe();

bool sendSimpleMessage(const String& chat_id, const String& text, const String& parse_mode);
Expand Down Expand Up @@ -135,6 +135,7 @@ class UniversalTelegramBot {
void closeClient();
bool getFile(String& file_path, long& file_size, const String& file_id);
bool processResult(JsonObject result, int messageIndex);
long getUpdateIdFromResponse(String response);
};

#endif

0 comments on commit 53892d7

Please sign in to comment.