mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-08-17 09:02:15 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

up2k.js: set timeouts for uploads

Browse source 
in the event that an upload chunk gets stuck, the js would
never stop waiting for a response, requiring a page reload

improves reliability when running behind a reverse-proxy
which is configured to never timeout requests (can make
sense when combined with other services on the same box)
This commit is contained in:
ed 2024-07-29 19:17:03 +00:00
parent a19a0fa9f3
commit 85e54980cc
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
copyparty/web/up2k.js
View file

@ -2186,7 +2186,7 @@ function up2k_init(subtle) {
st.busy.head.push(t); st.busy.head.push(t);
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.onerror = function () { xhr.onerror = xhr.ontimeout = function () {
console.log('head onerror, retrying', t.name, t); console.log('head onerror, retrying', t.name, t);
if (!toast.visible) if (!toast.visible)
toast.warn(9.98, L.u_enethd + "\n\nfile: " + t.name, t); toast.warn(9.98, L.u_enethd + "\n\nfile: " + t.name, t);
@ -2230,6 +2230,7 @@ function up2k_init(subtle) {
try { orz(e); } catch (ex) { vis_exh(ex + '', 'up2k.js', '', '', ex); } try { orz(e); } catch (ex) { vis_exh(ex + '', 'up2k.js', '', '', ex); }
}; };
xhr.timeout = 34000;
xhr.open('HEAD', t.purl + uricom_enc(t.name), true); xhr.open('HEAD', t.purl + uricom_enc(t.name), true);
xhr.send(); xhr.send();
} }
@ -2255,7 +2256,7 @@ function up2k_init(subtle) {
console.log("sending keepalive handshake", t.name, t); console.log("sending keepalive handshake", t.name, t);
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.onerror = function () { xhr.onerror = xhr.ontimeout = function () {
if (t.t_busied != me) // t.done ok if (t.t_busied != me) // t.done ok
return console.log('zombie handshake onerror', t.name, t); return console.log('zombie handshake onerror', t.name, t);
@ -2512,6 +2513,7 @@ function up2k_init(subtle) {
xhr.open('POST', t.purl, true); xhr.open('POST', t.purl, true);
xhr.responseType = 'text'; xhr.responseType = 'text';
xhr.timeout = 42000;
xhr.send(JSON.stringify(req)); xhr.send(JSON.stringify(req));
} }
@ -2631,15 +2633,21 @@ function up2k_init(subtle) {
btot = Math.floor(st.bytes.total / 1024 / 1024); btot = Math.floor(st.bytes.total / 1024 / 1024);
xhr.upload.onprogress = function (xev) { xhr.upload.onprogress = function (xev) {
var nb = xev.loaded; var nb = xev.loaded,
st.bytes.inflight += nb - xhr.bsent; db = nb - xhr.bsent;
if (!db)
return;
st.bytes.inflight += db;
xhr.bsent = nb; xhr.bsent = nb;
xhr.timeout = 64000 + Date.now() - xhr.t0;
pvis.prog(t, pcar, nb); pvis.prog(t, pcar, nb);
}; };
xhr.onload = function (xev) { xhr.onload = function (xev) {
try { orz(xhr); } catch (ex) { vis_exh(ex + '', 'up2k.js', '', '', ex); } try { orz(xhr); } catch (ex) { vis_exh(ex + '', 'up2k.js', '', '', ex); }
}; };
xhr.onerror = function (xev) { xhr.onerror = xhr.ontimeout = function (xev) {
if (crashed) if (crashed)
return; return;
@ -2666,6 +2674,8 @@ function up2k_init(subtle) {
xhr.overrideMimeType('Content-Type', 'application/octet-stream'); xhr.overrideMimeType('Content-Type', 'application/octet-stream');
xhr.bsent = 0; xhr.bsent = 0;
xhr.t0 = Date.now();
xhr.timeout = 42000;
xhr.responseType = 'text'; xhr.responseType = 'text';
xhr.send(t.fobj.slice(car, cdr)); xhr.send(t.fobj.slice(car, cdr));
} }