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

fix url handling and websockets

Browse source
This commit is contained in:
ading2210 2024-10-03 09:48:12 -04:00
parent 0cab209e9d
commit 2e6fba2c3b
8 changed files with 67 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
client/javascript/session.js
View file

@ -51,7 +51,7 @@ class CurlSession {
this.request_callbacks[request_id].headers(chunk);
}
create_request(url, js_data_callback, js_end_callback, js_headers_callback) {
create_request(url, js_data_callback, js_end_callback, js_headers_callback, tls=false) {
this.assert_ready();
let request_id = this.last_request_id++;
this.request_callbacks[request_id] = {
@ -59,6 +59,18 @@ class CurlSession {
data: js_data_callback,
headers: js_headers_callback
}
//if tls is enabled, add a flag to the url
if (tls) {
let url_obj = new URL(url);
url_obj.hostname += "---tls-enabled---";
if (url_obj.protocol == "https:") url_obj.protocol = "http:";
if (url_obj.protocol == "wss:") url_obj.protocol = "ws:";
if (!url_obj.port) {
url_obj.href = url_obj.href.replace(url_obj.origin, url_obj.origin + ":443");
}
url = url_obj.href;
}
let request_ptr = c_func(_create_request, [
url, request_id, this.data_callback_ptr, this.end_callback_ptr, this.headers_callback_ptr
@ -133,7 +145,7 @@ class CurlSession {
}
//wrap request callbacks using a readable stream and return the new callbacks
stream_response(url, headers_callback, end_callback, abort_signal) {
stream_response(url, headers_callback, end_callback, abort_signal, tls) {
let stream_controller;
let aborted = false;
let headers_received = false;
@ -190,6 +202,6 @@ class CurlSession {
end_callback(error);
}
return this.create_request(url, real_data_callback, real_end_callback, () => {});
return this.create_request(url, real_data_callback, real_end_callback, () => {}, tls);
}
}