mercuryworkshop-mirror/libcurl.js
1
0
Fork 0
mirror of https://github.com/ading2210/libcurl.js.git synced 2025-05-13 14:30:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix handling of request bodies

Browse source
This commit is contained in:
ading2210 2024-03-20 18:38:13 -04:00
parent 3a50060e07
commit 5e9f26f818
6 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
client/javascript/http.js
View file

@ -41,6 +41,7 @@ class HTTPSession extends CurlSession {
request_async(url, params, body) {
return new Promise((resolve, reject) => {
let http_handle;
let body_ptr = null;
let headers_callback = (stream) => {
let response_json = c_func_str(_http_get_info, [http_handle]);
@ -53,6 +54,7 @@ class HTTPSession extends CurlSession {
resolve(response);
}
let finish_callback = (error) => {
_free(body_ptr);
if (error > 0) {
error_msg(`Request "${url}" failed with error code ${error}: ${get_error_str(error)}`);
reject(`Request failed with error code ${error}: ${get_error_str(error)}`);
@ -65,12 +67,13 @@ class HTTPSession extends CurlSession {
}
this.remove_request(http_handle);
}
body_ptr = body ? allocate_array(body) : null;
let body_length = body ? body.length : 0;
let params_json = JSON.stringify(params);
http_handle = this.stream_response(url, headers_callback, finish_callback, params.signal);
c_func(_http_set_options, [http_handle, params_json, body, body_length]);
c_func(_http_set_options, [http_handle, params_json, body_ptr, body_length]);
if (this.cookie_filename && params.credentials !== "omit") {
c_func(_http_set_cookie_jar, [http_handle, this.cookie_filename]);
}
@ -139,8 +142,8 @@ class HTTPSession extends CurlSession {
if (!params.headers["User-Agent"]) {
params.headers["User-Agent"] = navigator.userAgent;
}
if (body) {
params.headers["Content-Type"] = request_obj.headers.get("Content-Type");
if (body && !params.headers["Content-Type"]) {
params.headers["Content-Type"] = request_obj.headers.get("Content-Type") || "";
}
return body;

11
client/javascript/util.js
View file

@ -77,10 +77,15 @@ function data_to_array(data) {
function c_func(target, args=[]) {
let str_pointers = [];
for (let i = 0; i < args.length; i++) {
if (typeof args[i] !== "string") {
continue;
let ptr = null;
if (typeof args[i] === "string") {
ptr = allocate_str(args[i]);
}
let ptr = allocate_str(args[i]);
if (args[i] instanceof Uint8Array) {
ptr = allocate_array(args[i]);
}
if (!ptr) continue;
args[i] = ptr;
str_pointers.push(ptr);
}