mirror of
https://github.com/ading2210/libcurl.js.git
synced 2025-05-14 06:50:00 -04:00
refactor request code
This commit is contained in:
ading2210
parent
0d7369c77a
commit
1748ca7dd9
12 changed files with 222 additions and 194 deletions
|
|
@ -5,8 +5,6 @@
|
|||
|
||||
#include "curl/curl.h"
|
||||
#include "curl/easy.h"
|
||||
#include "curl/header.h"
|
||||
#include "cjson/cJSON.h"
|
||||
#include "curl/multi.h"
|
||||
|
||||
#include "cacert.h"
|
||||
|
|
@ -16,22 +14,19 @@
|
|||
void finish_request(CURLMsg *curl_msg);
|
||||
void forward_headers(struct RequestInfo *request_info);
|
||||
|
||||
#define ERROR_REDIRECT_DISALLOWED -1
|
||||
|
||||
CURLM *multi_handle;
|
||||
int request_active = 0;
|
||||
struct curl_blob cacert_blob;
|
||||
|
||||
size_t write_function(void *data, size_t size, size_t nmemb, struct RequestInfo *request_info) {
|
||||
size_t write_function(char *data, size_t size, size_t nmemb, struct RequestInfo *request_info) {
|
||||
//this should be in the write callback rather than curl's header callback because
|
||||
//the write function will only be called after redirects
|
||||
if (!request_info->headers_received) {
|
||||
forward_headers(request_info);
|
||||
}
|
||||
|
||||
size_t real_size = size * nmemb;
|
||||
char* chunk = malloc(real_size);
|
||||
memcpy(chunk, data, real_size);
|
||||
(*request_info->data_callback)(chunk, real_size);
|
||||
free(chunk);
|
||||
(*request_info->data_callback)(data, real_size);
|
||||
return real_size;
|
||||
}
|
||||
|
||||
|
|
@ -53,164 +48,46 @@ void tick_request() {
|
|||
}
|
||||
}
|
||||
|
||||
CURL* start_request(const char* url, const char* json_params, DataCallback data_callback, EndCallback end_callback, HeadersCallback headers_callback, const char* body, int body_length) {
|
||||
CURL* create_handle(const char* url, DataCallback data_callback, EndCallback end_callback, HeadersCallback headers_callback) {
|
||||
CURL *http_handle = curl_easy_init();
|
||||
int abort_on_redirect = 0;
|
||||
int prevent_cleanup = 0;
|
||||
|
||||
curl_easy_setopt(http_handle, CURLOPT_URL, url);
|
||||
curl_easy_setopt(http_handle, CURLOPT_CAINFO_BLOB , cacert_blob);
|
||||
|
||||
//some default options
|
||||
curl_easy_setopt(http_handle, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(http_handle, CURLOPT_ACCEPT_ENCODING, "");
|
||||
curl_easy_setopt(http_handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_0);
|
||||
|
||||
//if url is a websocket, tell curl that we should handle the connection manually
|
||||
if (starts_with(url, "wss://") || starts_with(url, "ws://")) {
|
||||
curl_easy_setopt(http_handle, CURLOPT_CONNECT_ONLY, 2L);
|
||||
prevent_cleanup = 1;
|
||||
}
|
||||
|
||||
//parse json options
|
||||
cJSON* request_json = cJSON_Parse(json_params);
|
||||
cJSON* item = NULL;
|
||||
struct curl_slist* headers_list = NULL;
|
||||
|
||||
cJSON_ArrayForEach(item, request_json) {
|
||||
char* key = item->string;
|
||||
|
||||
if (strcmp(key, "_libcurl_verbose") == 0) {
|
||||
curl_easy_setopt(http_handle, CURLOPT_VERBOSE, 1L);
|
||||
}
|
||||
|
||||
if (strcmp(key, "_connect_only") == 0) {
|
||||
curl_easy_setopt(http_handle, CURLOPT_CONNECT_ONLY, 1L);
|
||||
curl_easy_setopt(http_handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
|
||||
curl_easy_setopt(http_handle, CURLOPT_SSL_ENABLE_ALPN, 0L);
|
||||
prevent_cleanup = 1;
|
||||
}
|
||||
|
||||
if (strcmp(key, "method") == 0 && cJSON_IsString(item)) {
|
||||
curl_easy_setopt(http_handle, CURLOPT_CUSTOMREQUEST, item->valuestring);
|
||||
}
|
||||
|
||||
if (strcmp(key, "headers") == 0 && cJSON_IsObject(item)) {
|
||||
cJSON* header = NULL;
|
||||
|
||||
cJSON_ArrayForEach(header, item) {
|
||||
if (!cJSON_IsString(header)) continue;
|
||||
int header_length = strlen(header->string) + strlen(header->valuestring) + 2;
|
||||
char* header_str = malloc(header_length+1);
|
||||
header_str[header_length] = 0;
|
||||
|
||||
sprintf(header_str, "%s: %s", header->string, header->valuestring);
|
||||
headers_list = curl_slist_append(headers_list, header_str);
|
||||
free(header_str);
|
||||
}
|
||||
|
||||
curl_easy_setopt(http_handle, CURLOPT_HTTPHEADER, headers_list);
|
||||
}
|
||||
|
||||
if (strcmp(key, "redirect") == 0 && cJSON_IsString(item)) {
|
||||
if (strcmp(item->valuestring, "error") == 0) {
|
||||
abort_on_redirect = 1;
|
||||
curl_easy_setopt(http_handle, CURLOPT_FOLLOWLOCATION, 0);
|
||||
}
|
||||
else if (strcmp(item->valuestring, "manual") == 0) {
|
||||
curl_easy_setopt(http_handle, CURLOPT_FOLLOWLOCATION, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
cJSON_Delete(request_json);
|
||||
|
||||
//add post data if specified
|
||||
if (body != NULL) {
|
||||
curl_easy_setopt(http_handle, CURLOPT_POSTFIELDS, body);
|
||||
curl_easy_setopt(http_handle, CURLOPT_POSTFIELDSIZE, body_length);
|
||||
}
|
||||
|
||||
//create request metadata struct
|
||||
struct RequestInfo *request_info = malloc(sizeof(struct RequestInfo));
|
||||
request_info->http_handle = http_handle;
|
||||
request_info->abort_on_redirect = abort_on_redirect;
|
||||
request_info->curl_msg = NULL;
|
||||
request_info->headers_list = headers_list;
|
||||
request_info->prevent_cleanup = prevent_cleanup;
|
||||
request_info->prevent_cleanup = 0;
|
||||
request_info->headers_received = 0;
|
||||
request_info->end_callback = end_callback;
|
||||
request_info->data_callback = data_callback;
|
||||
request_info->headers_callback = headers_callback;
|
||||
|
||||
curl_easy_setopt(http_handle, CURLOPT_PRIVATE, request_info);
|
||||
curl_easy_setopt(http_handle, CURLOPT_URL, url);
|
||||
curl_easy_setopt(http_handle, CURLOPT_CAINFO_BLOB , cacert_blob);
|
||||
|
||||
//callbacks to pass the response data back to js
|
||||
curl_easy_setopt(http_handle, CURLOPT_WRITEFUNCTION, &write_function);
|
||||
curl_easy_setopt(http_handle, CURLOPT_WRITEDATA, data_callback);
|
||||
|
||||
curl_easy_setopt(http_handle, CURLOPT_PRIVATE, request_info);
|
||||
curl_easy_setopt(http_handle, CURLOPT_WRITEDATA, request_info);
|
||||
|
||||
curl_multi_add_handle(multi_handle, http_handle);
|
||||
|
||||
return http_handle;
|
||||
}
|
||||
|
||||
void start_request(CURL* http_handle) {
|
||||
curl_multi_add_handle(multi_handle, http_handle);
|
||||
}
|
||||
|
||||
void forward_headers(struct RequestInfo *request_info) {
|
||||
request_info->headers_received = 1;
|
||||
CURL *http_handle = request_info->http_handle;
|
||||
|
||||
//create new json object with response info
|
||||
cJSON* response_json = cJSON_CreateObject();
|
||||
|
||||
long response_code;
|
||||
curl_easy_getinfo(http_handle, CURLINFO_RESPONSE_CODE, &response_code);
|
||||
cJSON* status_item = cJSON_CreateNumber(response_code);
|
||||
cJSON_AddItemToObject(response_json, "status", status_item);
|
||||
|
||||
char* response_url;
|
||||
curl_easy_getinfo(http_handle, CURLINFO_EFFECTIVE_URL, &response_url);
|
||||
cJSON* url_item = cJSON_CreateString(response_url);
|
||||
cJSON_AddItemToObject(response_json, "url", url_item);
|
||||
|
||||
cJSON* headers_item = cJSON_CreateArray();
|
||||
struct curl_header *prev_header = NULL;
|
||||
struct curl_header *header = NULL;
|
||||
while ((header = curl_easy_nextheader(http_handle, CURLH_HEADER, -1, prev_header))) {
|
||||
cJSON* header_key_entry = cJSON_CreateString(header->name);
|
||||
cJSON* header_value_entry = cJSON_CreateString(header->value);
|
||||
cJSON* header_pair_item = cJSON_CreateArray();
|
||||
cJSON_AddItemToArray(header_pair_item, header_key_entry);
|
||||
cJSON_AddItemToArray(header_pair_item, header_value_entry);
|
||||
cJSON_AddItemToArray(headers_item, header_pair_item);
|
||||
prev_header = header;
|
||||
}
|
||||
cJSON_AddItemToObject(response_json, "headers", headers_item);
|
||||
|
||||
long redirect_count;
|
||||
curl_easy_getinfo(http_handle, CURLINFO_REDIRECT_COUNT, &redirect_count);
|
||||
cJSON* redirects_item = cJSON_CreateBool(redirect_count > 0);
|
||||
cJSON_AddItemToObject(response_json, "redirected", redirects_item);
|
||||
|
||||
char* response_json_str = cJSON_Print(response_json);
|
||||
cJSON_Delete(response_json);
|
||||
|
||||
(*request_info->headers_callback)(response_json_str);
|
||||
(*request_info->headers_callback)();
|
||||
}
|
||||
|
||||
void finish_request(CURLMsg *curl_msg) {
|
||||
//get initial request info from the http handle
|
||||
struct RequestInfo *request_info;
|
||||
CURL *http_handle = curl_msg->easy_handle;
|
||||
curl_easy_getinfo(http_handle, CURLINFO_PRIVATE, &request_info);
|
||||
if (!request_info->headers_received) {
|
||||
forward_headers(request_info);
|
||||
}
|
||||
struct RequestInfo *request_info = get_handle_info(http_handle);
|
||||
|
||||
int error = (int) curl_msg->data.result;
|
||||
long response_code;
|
||||
curl_easy_getinfo(http_handle, CURLINFO_RESPONSE_CODE, &response_code);
|
||||
|
||||
if (request_info->abort_on_redirect && response_code / 100 == 3) {
|
||||
error = ERROR_REDIRECT_DISALLOWED;
|
||||
if (!request_info->headers_received && error == 0) {
|
||||
forward_headers(request_info);
|
||||
}
|
||||
|
||||
//clean up curl
|
||||
|
|
@ -224,6 +101,13 @@ void finish_request(CURLMsg *curl_msg) {
|
|||
free(request_info);
|
||||
}
|
||||
|
||||
void cleanup_handle(CURL* http_handle) {
|
||||
struct RequestInfo *request_info = get_handle_info(http_handle);
|
||||
curl_multi_remove_handle(multi_handle, http_handle);
|
||||
curl_easy_cleanup(http_handle);
|
||||
free(request_info);
|
||||
}
|
||||
|
||||
unsigned char* get_cacert() {
|
||||
return _cacert_pem;
|
||||
}
|
||||
|
|
@ -231,6 +115,9 @@ unsigned char* get_cacert() {
|
|||
void init_curl() {
|
||||
curl_global_init(CURL_GLOBAL_DEFAULT);
|
||||
multi_handle = curl_multi_init();
|
||||
|
||||
//emscripten has a fairly low file descriptor limit which means
|
||||
//we must limit the total number of active tcp connections
|
||||
curl_multi_setopt(multi_handle, CURLMOPT_MAX_TOTAL_CONNECTIONS, 50L);
|
||||
curl_multi_setopt(multi_handle, CURLMOPT_MAXCONNECTS, 40L);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue