dlawler489/printhive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: dlawler489:27e1caf1a6b687fd5742c03286c7a72321d41252
Branches Tags
dlawler489:main
dlawler489:phase-3-slicer-handoff
dlawler489:phase-2-formats-viewer
dlawler489:phase-1-library-core
...
compare: dlawler489:b2078690bde33471955df0a03895a1c3e5f6013f
Branches Tags
dlawler489:main
dlawler489:phase-3-slicer-handoff
dlawler489:phase-2-formats-viewer
dlawler489:phase-1-library-core

2 commits
27e1caf1a6 ... b2078690bd

Author SHA1 Message Date
dlawler489
b2078690bd Merge deadlines for downloads
All checks were successful
build-and-push / docker (push) Successful in 39s
Details 
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
 2026-09-16 17:52:12 +10:00
dlawler489
341731a946 Give downloads a deadline instead of hanging for ever 
Neither the FlareSolverr call nor the CDN fetch set a timeout, so a stalled
connection hung the request indefinitely: the button sat on "Downloading…"
with nothing to reset it and no error to show. FlareSolverr calls now give up
15s after the deadline FlareSolverr itself was given (and a timeout counts as
retryable, like other transport failures), and a CDN download gives up after
three minutes.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
 2026-09-16 17:50:48 +10:00
2 changed files with 8 additions and 3 deletions
Show stats Expand all files Collapse all files

5
lib/flaresolverr.js
View file

@ -21,6 +21,9 @@ async function solve(flaresolverrUrl, targetUrl, opts = {}) {
method: 'POST', method: 'POST',
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(body), body: JSON.stringify(body),
// FlareSolverr is told to give up at maxTimeout; if it doesn't answer
// even then, stop waiting rather than hanging the request for ever.
signal: AbortSignal.timeout((opts.maxTimeout || 60000) + 15000),
}); });
if (res.status >= 500) { lastErr = new Error(`FlareSolverr HTTP ${res.status}`); continue; } if (res.status >= 500) { lastErr = new Error(`FlareSolverr HTTP ${res.status}`); continue; }
if (!res.ok) throw new Error(`FlareSolverr HTTP ${res.status}`); if (!res.ok) throw new Error(`FlareSolverr HTTP ${res.status}`);
@ -29,7 +32,7 @@ async function solve(flaresolverrUrl, targetUrl, opts = {}) {
return data.solution.response; return data.solution.response;
} catch (err) { } catch (err) {
lastErr = err; lastErr = err;
if (!/HTTP 5\d\d|fetch failed|ECONNRESET|network/i.test(err.message)) throw err; if (!/HTTP 5\d\d|fetch failed|ECONNRESET|network|timeout|aborted/i.test(err.message)) throw err;
} }
} }
throw lastErr; throw lastErr;

6
server.js
View file

@ -993,7 +993,8 @@ async function downloadMakerworldFiles(html, skipNames = new Set()) {
} }
const original = dl.name || `instance-${inst.id}.3mf`; const original = dl.name || `instance-${inst.id}.3mf`;
if (skipNames.has(original)) continue; if (skipNames.has(original)) continue;
const resp = await fetch(dl.url); // A stalled CDN connection would otherwise hang the download for ever.
const resp = await fetch(dl.url, { signal: AbortSignal.timeout(180000) });
if (!resp.ok) { if (!resp.ok) {
console.warn(`MakerWorld CDN download ${resp.status} for ${original}`); console.warn(`MakerWorld CDN download ${resp.status} for ${original}`);
problems.push({ message: `Downloading ${original} from MakerWorld failed (HTTP ${resp.status})` }); problems.push({ message: `Downloading ${original} from MakerWorld failed (HTTP ${resp.status})` });
@ -1064,7 +1065,8 @@ async function downloadThingiverseFiles(meta, skipNames = new Set()) {
for (const dl of meta.downloads) { for (const dl of meta.downloads) {
if (!fileProcessor.isAllowed(dl.name)) continue; // skip readmes/images if (!fileProcessor.isAllowed(dl.name)) continue; // skip readmes/images
if (skipNames.has(dl.name)) continue; if (skipNames.has(dl.name)) continue;
const resp = await fetch(dl.url); // A stalled CDN connection would otherwise hang the download for ever.
const resp = await fetch(dl.url, { signal: AbortSignal.timeout(180000) });
if (!resp.ok) { console.error(`Download failed (${resp.status}): ${dl.name}`); continue; } if (!resp.ok) { console.error(`Download failed (${resp.status}): ${dl.name}`); continue; }
const buffer = Buffer.from(await resp.arrayBuffer()); const buffer = Buffer.from(await resp.arrayBuffer());
const fileName = uniqueName(dl.name); const fileName = uniqueName(dl.name);