godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-15 13:51:40 +00:00
Code Releases Wiki Activity

[HTTPRequest] Cleanup, refactor deferred call.

Browse Source
This commit is contained in:
Fabio Alessandrelli
2022-07-31 21:56:13 +02:00
parent 98047e791a
commit 172a9e0b24
2 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
scene/main/http_request.cpp
View File

@@ -32,9 +32,6 @@
#include "core/io/compression.h" #include "core/io/compression.h"
#include "scene/main/timer.h" #include "scene/main/timer.h"
void HTTPRequest::_redirect_request(const String &p_new_url) {
}
Error HTTPRequest::_request() { Error HTTPRequest::_request() {
return client->connect_to_host(url, port, use_tls, validate_tls); return client->connect_to_host(url, port, use_tls, validate_tls);
} }
@@ -154,7 +151,7 @@ Error HTTPRequest::request_raw(const String &p_url, const Vector<String> &p_cust
client->set_blocking_mode(false); client->set_blocking_mode(false);
err = _request(); err = _request();
if (err != OK) { if (err != OK) {
call_deferred(SNAME("_request_done"), RESULT_CANT_CONNECT, 0, PackedStringArray(), PackedByteArray()); _defer_done(RESULT_CANT_CONNECT, 0, PackedStringArray(), PackedByteArray());
return ERR_CANT_CONNECT; return ERR_CANT_CONNECT;
} }
@@ -170,7 +167,7 @@ void HTTPRequest::_thread_func(void *p_userdata) {
Error err = hr->_request(); Error err = hr->_request();
if (err != OK) { if (err != OK) {
hr->call_deferred(SNAME("_request_done"), RESULT_CANT_CONNECT, 0, PackedStringArray(), PackedByteArray()); hr->_defer_done(RESULT_CANT_CONNECT, 0, PackedStringArray(), PackedByteArray());
} else { } else {
while (!hr->thread_request_quit.is_set()) { while (!hr->thread_request_quit.is_set()) {
bool exit = hr->_update_connection(); bool exit = hr->_update_connection();
@@ -210,7 +207,7 @@ void HTTPRequest::cancel_request() {
bool HTTPRequest::_handle_response(bool *ret_value) { bool HTTPRequest::_handle_response(bool *ret_value) {
if (!client->has_response()) { if (!client->has_response()) {
call_deferred(SNAME("_request_done"), RESULT_NO_RESPONSE, 0, PackedStringArray(), PackedByteArray()); _defer_done(RESULT_NO_RESPONSE, 0, PackedStringArray(), PackedByteArray());
*ret_value = true; *ret_value = true;
return true; return true;
} }
@@ -232,7 +229,7 @@ bool HTTPRequest::_handle_response(bool *ret_value) {
// Handle redirect. // Handle redirect.
if (max_redirects >= 0 && redirections >= max_redirects) { if (max_redirects >= 0 && redirections >= max_redirects) {
call_deferred(SNAME("_request_done"), RESULT_REDIRECT_LIMIT_REACHED, response_code, response_headers, PackedByteArray()); _defer_done(RESULT_REDIRECT_LIMIT_REACHED, response_code, response_headers, PackedByteArray());
*ret_value = true; *ret_value = true;
return true; return true;
} }
@@ -291,7 +288,7 @@ bool HTTPRequest::_handle_response(bool *ret_value) {
bool HTTPRequest::_update_connection() { bool HTTPRequest::_update_connection() {
switch (client->get_status()) { switch (client->get_status()) {
case HTTPClient::STATUS_DISCONNECTED: { case HTTPClient::STATUS_DISCONNECTED: {
call_deferred(SNAME("_request_done"), RESULT_CANT_CONNECT, 0, PackedStringArray(), PackedByteArray()); _defer_done(RESULT_CANT_CONNECT, 0, PackedStringArray(), PackedByteArray());
return true; // End it, since it's disconnected. return true; // End it, since it's disconnected.
} break; } break;
case HTTPClient::STATUS_RESOLVING: { case HTTPClient::STATUS_RESOLVING: {
@@ -300,7 +297,7 @@ bool HTTPRequest::_update_connection() {
return false; return false;
} break; } break;
case HTTPClient::STATUS_CANT_RESOLVE: { case HTTPClient::STATUS_CANT_RESOLVE: {
call_deferred(SNAME("_request_done"), RESULT_CANT_RESOLVE, 0, PackedStringArray(), PackedByteArray()); _defer_done(RESULT_CANT_RESOLVE, 0, PackedStringArray(), PackedByteArray());
return true; return true;
} break; } break;
@@ -310,7 +307,7 @@ bool HTTPRequest::_update_connection() {
return false; return false;
} break; // Connecting to IP. } break; // Connecting to IP.
case HTTPClient::STATUS_CANT_CONNECT: { case HTTPClient::STATUS_CANT_CONNECT: {
call_deferred(SNAME("_request_done"), RESULT_CANT_CONNECT, 0, PackedStringArray(), PackedByteArray()); _defer_done(RESULT_CANT_CONNECT, 0, PackedStringArray(), PackedByteArray());
return true; return true;
} break; } break;
@@ -325,16 +322,16 @@ bool HTTPRequest::_update_connection() {
return ret_value; return ret_value;
} }
call_deferred(SNAME("_request_done"), RESULT_SUCCESS, response_code, response_headers, PackedByteArray()); _defer_done(RESULT_SUCCESS, response_code, response_headers, PackedByteArray());
return true; return true;
} }
if (body_len < 0) { if (body_len < 0) {
// Chunked transfer is done. // Chunked transfer is done.
call_deferred(SNAME("_request_done"), RESULT_SUCCESS, response_code, response_headers, body); _defer_done(RESULT_SUCCESS, response_code, response_headers, body);
return true; return true;
} }
call_deferred(SNAME("_request_done"), RESULT_CHUNKED_BODY_SIZE_MISMATCH, response_code, response_headers, PackedByteArray()); _defer_done(RESULT_CHUNKED_BODY_SIZE_MISMATCH, response_code, response_headers, PackedByteArray());
return true; return true;
// Request might have been done. // Request might have been done.
} else { } else {
@@ -343,7 +340,7 @@ bool HTTPRequest::_update_connection() {
int size = request_data.size(); int size = request_data.size();
Error err = client->request(method, request_string, headers, size > 0 ? request_data.ptr() : nullptr, size); Error err = client->request(method, request_string, headers, size > 0 ? request_data.ptr() : nullptr, size);
if (err != OK) { if (err != OK) {
call_deferred(SNAME("_request_done"), RESULT_CONNECTION_ERROR, 0, PackedStringArray(), PackedByteArray()); _defer_done(RESULT_CONNECTION_ERROR, 0, PackedStringArray(), PackedByteArray());
return true; return true;
} }
@@ -366,7 +363,7 @@ bool HTTPRequest::_update_connection() {
} }
if (!client->is_response_chunked() && client->get_response_body_length() == 0) { if (!client->is_response_chunked() && client->get_response_body_length() == 0) {
call_deferred(SNAME("_request_done"), RESULT_SUCCESS, response_code, response_headers, PackedByteArray()); _defer_done(RESULT_SUCCESS, response_code, response_headers, PackedByteArray());
return true; return true;
} }
@@ -375,14 +372,14 @@ bool HTTPRequest::_update_connection() {
body_len = client->get_response_body_length(); body_len = client->get_response_body_length();
if (body_size_limit >= 0 && body_len > body_size_limit) { if (body_size_limit >= 0 && body_len > body_size_limit) {
call_deferred(SNAME("_request_done"), RESULT_BODY_SIZE_LIMIT_EXCEEDED, response_code, response_headers, PackedByteArray()); _defer_done(RESULT_BODY_SIZE_LIMIT_EXCEEDED, response_code, response_headers, PackedByteArray());
return true; return true;
} }
if (!download_to_file.is_empty()) { if (!download_to_file.is_empty()) {
file = FileAccess::open(download_to_file, FileAccess::WRITE); file = FileAccess::open(download_to_file, FileAccess::WRITE);
if (file.is_null()) { if (file.is_null()) {
call_deferred(SNAME("_request_done"), RESULT_DOWNLOAD_FILE_CANT_OPEN, response_code, response_headers, PackedByteArray()); _defer_done(RESULT_DOWNLOAD_FILE_CANT_OPEN, response_code, response_headers, PackedByteArray());
return true; return true;
} }
} }
@@ -404,14 +401,14 @@ bool HTTPRequest::_update_connection() {
err = decompressor->get_data(chunk.ptrw(), chunk.size()); err = decompressor->get_data(chunk.ptrw(), chunk.size());
} }
if (err != OK) { if (err != OK) {
call_deferred(SNAME("_request_done"), RESULT_BODY_DECOMPRESS_FAILED, response_code, response_headers, PackedByteArray()); _defer_done(RESULT_BODY_DECOMPRESS_FAILED, response_code, response_headers, PackedByteArray());
return true; return true;
} }
} }
final_body_size.add(chunk.size()); final_body_size.add(chunk.size());
if (body_size_limit >= 0 && final_body_size.get() > body_size_limit) { if (body_size_limit >= 0 && final_body_size.get() > body_size_limit) {
call_deferred(SNAME("_request_done"), RESULT_BODY_SIZE_LIMIT_EXCEEDED, response_code, response_headers, PackedByteArray()); _defer_done(RESULT_BODY_SIZE_LIMIT_EXCEEDED, response_code, response_headers, PackedByteArray());
return true; return true;
} }
@@ -420,7 +417,7 @@ bool HTTPRequest::_update_connection() {
const uint8_t *r = chunk.ptr(); const uint8_t *r = chunk.ptr();
file->store_buffer(r, chunk.size()); file->store_buffer(r, chunk.size());
if (file->get_error() != OK) { if (file->get_error() != OK) {
call_deferred(SNAME("_request_done"), RESULT_DOWNLOAD_FILE_WRITE_ERROR, response_code, response_headers, PackedByteArray()); _defer_done(RESULT_DOWNLOAD_FILE_WRITE_ERROR, response_code, response_headers, PackedByteArray());
return true; return true;
} }
} else { } else {
@@ -430,12 +427,12 @@ bool HTTPRequest::_update_connection() {
if (body_len >= 0) { if (body_len >= 0) {
if (downloaded.get() == body_len) { if (downloaded.get() == body_len) {
call_deferred(SNAME("_request_done"), RESULT_SUCCESS, response_code, response_headers, body); _defer_done(RESULT_SUCCESS, response_code, response_headers, body);
return true; return true;
} }
} else if (client->get_status() == HTTPClient::STATUS_DISCONNECTED) { } else if (client->get_status() == HTTPClient::STATUS_DISCONNECTED) {
// We read till EOF, with no errors. Request is done. // We read till EOF, with no errors. Request is done.
call_deferred(SNAME("_request_done"), RESULT_SUCCESS, response_code, response_headers, body); _defer_done(RESULT_SUCCESS, response_code, response_headers, body);
return true; return true;
} }
@@ -443,11 +440,11 @@ bool HTTPRequest::_update_connection() {
} break; // Request resulted in body: break which must be read. } break; // Request resulted in body: break which must be read.
case HTTPClient::STATUS_CONNECTION_ERROR: { case HTTPClient::STATUS_CONNECTION_ERROR: {
call_deferred(SNAME("_request_done"), RESULT_CONNECTION_ERROR, 0, PackedStringArray(), PackedByteArray()); _defer_done(RESULT_CONNECTION_ERROR, 0, PackedStringArray(), PackedByteArray());
return true; return true;
} break; } break;
case HTTPClient::STATUS_TLS_HANDSHAKE_ERROR: { case HTTPClient::STATUS_TLS_HANDSHAKE_ERROR: {
call_deferred(SNAME("_request_done"), RESULT_TLS_HANDSHAKE_ERROR, 0, PackedStringArray(), PackedByteArray()); _defer_done(RESULT_TLS_HANDSHAKE_ERROR, 0, PackedStringArray(), PackedByteArray());
return true; return true;
} break; } break;
} }
@@ -455,6 +452,10 @@ bool HTTPRequest::_update_connection() {
ERR_FAIL_V(false); ERR_FAIL_V(false);
} }
void HTTPRequest::_defer_done(int p_status, int p_code, const PackedStringArray &p_headers, const PackedByteArray &p_data) {
call_deferred(SNAME("_request_done"), p_status, p_code, p_headers, p_data);
}
void HTTPRequest::_request_done(int p_status, int p_code, const PackedStringArray &p_headers, const PackedByteArray &p_data) { void HTTPRequest::_request_done(int p_status, int p_code, const PackedStringArray &p_headers, const PackedByteArray &p_data) {
cancel_request(); cancel_request();
@@ -567,7 +568,7 @@ double HTTPRequest::get_timeout() {
void HTTPRequest::_timeout() { void HTTPRequest::_timeout() {
cancel_request(); cancel_request();
call_deferred(SNAME("_request_done"), RESULT_TIMEOUT, 0, PackedStringArray(), PackedByteArray()); _defer_done(RESULT_TIMEOUT, 0, PackedStringArray(), PackedByteArray());
} }
void HTTPRequest::_bind_methods() { void HTTPRequest::_bind_methods() {
@@ -595,7 +596,6 @@ void HTTPRequest::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_downloaded_bytes"), &HTTPRequest::get_downloaded_bytes); ClassDB::bind_method(D_METHOD("get_downloaded_bytes"), &HTTPRequest::get_downloaded_bytes);
ClassDB::bind_method(D_METHOD("get_body_size"), &HTTPRequest::get_body_size); ClassDB::bind_method(D_METHOD("get_body_size"), &HTTPRequest::get_body_size);
ClassDB::bind_method(D_METHOD("_redirect_request"), &HTTPRequest::_redirect_request);
ClassDB::bind_method(D_METHOD("_request_done"), &HTTPRequest::_request_done); ClassDB::bind_method(D_METHOD("_request_done"), &HTTPRequest::_request_done);
ClassDB::bind_method(D_METHOD("set_timeout", "timeout"), &HTTPRequest::set_timeout); ClassDB::bind_method(D_METHOD("set_timeout", "timeout"), &HTTPRequest::set_timeout);

1
scene/main/http_request.h
View File

@@ -116,6 +116,7 @@ private:
Thread thread; Thread thread;
void _defer_done(int p_status, int p_code, const PackedStringArray &p_headers, const PackedByteArray &p_data);
void _request_done(int p_status, int p_code, const PackedStringArray &p_headers, const PackedByteArray &p_data); void _request_done(int p_status, int p_code, const PackedStringArray &p_headers, const PackedByteArray &p_data);
static void _thread_func(void *p_userdata); static void _thread_func(void *p_userdata);