Printhive checks the collection and imports models added to it, into a collection of the same @@ -3191,7 +3192,8 @@ function watchHtml(w) {
${w.last_error ? `Nothing watched yet. Paste a MakerWorld collection link above.
'; // Keep the page current even between checks: one may start from the schedule, // another tab, or another browser. refreshWatches stops itself when you leave. + refreshDownloadBlock(); const checking = watches.some((w) => w.last_status === 'checking'); watchPoll = setTimeout(refreshWatches, checking ? 5000 : 20000); } diff --git a/server.js b/server.js index 1ee5d97..98839e0 100644 --- a/server.js +++ b/server.js @@ -36,6 +36,7 @@ const spoolSync = require('./lib/spoolSync'); const printerLive = require('./lib/printerLive'); const printerCamera = require('./lib/printerCamera'); +const downloadBlock = require('./lib/downloadBlock'); // What a printer has loaded → its card and the Filament page. async function syncTrays(printerId, trays) { @@ -1171,6 +1172,12 @@ async function downloadMakerworldFiles(html, skipNames = new Set()) { dl = await makerworld.resolveDownload(flareUrl, inst.id, token); } catch (err) { console.warn(`MakerWorld instance ${inst.id} resolve failed:`, err.message); + // A page where JSON was expected is usually the "prove you're human" check. + if (makerworld.isChallengeText(err.raw)) { + problems.push({ message: downloadBlock.DEFAULT, challenged: true }); + downloadBlock.block('makerworld'); + break; + } problems.push({ message: `Couldn’t ask MakerWorld for a download link: ${err.message}` }); continue; } @@ -1178,6 +1185,8 @@ async function downloadMakerworldFiles(html, skipNames = new Set()) { if (problem) { console.warn(`MakerWorld instance ${inst.id}: ${problem.message}`); problems.push(problem); + // Only you can clear this one, so stop rather than collect refusals. + if (problem.challenged) { downloadBlock.block('makerworld', problem.message); break; } continue; } const original = dl.name || `instance-${inst.id}.3mf`; @@ -1193,11 +1202,14 @@ async function downloadMakerworldFiles(html, skipNames = new Set()) { const filePath = path.join(UPLOAD_DIR, fileName); fs.writeFileSync(filePath, Buffer.from(await resp.arrayBuffer())); files.push(describeFile(filePath, fileName, original)); + downloadBlock.clear('makerworld'); // downloads are going through again } if (!files.length && problems.length) { const refused = problems.find((p) => p.tokenRejected); - throw Object.assign(new Error((refused || problems[0]).message), - { status: 502, reason: refused ? 'makerworld_token' : undefined }); + const challenged = problems.find((p) => p.challenged); + const worst = refused || challenged || problems[0]; + throw Object.assign(new Error(worst.message), + { status: 502, reason: refused ? 'makerworld_token' : challenged ? 'makerworld_challenge' : undefined }); } return files; } @@ -1533,6 +1545,18 @@ async function fetchMakerworldCollection(url) { return { ...collection, designs: [...byId.values()] }; } +// Whether a site is waiting for you to prove you're not a robot, and the +// button that says you have. Clearing it only lets Printhive try again. +app.get('/api/downloads/block', (req, res) => { + res.set('Cache-Control', 'no-store'); + res.json(downloadBlock.state('makerworld')); +}); + +app.post('/api/downloads/block/clear', (req, res) => { + downloadBlock.clear('makerworld'); + res.json({ message: 'Printhive will try MakerWorld downloads again.' }); +}); + app.get('/api/watches', async (req, res, next) => { try { res.json(await collectionWatch.list()); } catch (e) { next(e); } }); diff --git a/test/downloadBlock.test.js b/test/downloadBlock.test.js new file mode 100644 index 0000000..0aca9ba --- /dev/null +++ b/test/downloadBlock.test.js @@ -0,0 +1,34 @@ +const test = require('node:test'); +const assert = require('node:assert/strict'); +const block = require('../lib/downloadBlock'); +const makerworld = require('../lib/importers/makerworld'); + +test('a blocked site stays blocked until it’s cleared', () => { + assert.equal(block.isBlocked('makerworld'), false); + block.block('makerworld', 'Prove you’re not a robot.'); + assert.equal(block.isBlocked('makerworld'), true); + const state = block.state('makerworld'); + assert.equal(state.blocked, true); + assert.equal(state.message, 'Prove you’re not a robot.'); + assert.ok(state.since instanceof Date); + // Blocking again keeps the original message and time. + const again = block.block('makerworld', 'something else'); + assert.equal(again.message, 'Prove you’re not a robot.'); + block.clear('makerworld'); + assert.deepEqual(block.state('makerworld'), { blocked: false }); +}); + +test('MakerWorld’s anti-bot answers are recognised, ordinary refusals aren’t', () => { + for (const text of ['Please verify you are not a robot', 'Just a moment…', 'Select in this order', + 'Security check required', 'Verification required']) { + assert.equal(makerworld.isChallengeText(text), true, text); + } + for (const text of ['Please log in to download models.', 'Model not found', '']) { + assert.equal(makerworld.isChallengeText(text), false, text); + } + // An answer carrying a link is never a challenge. + assert.equal(makerworld.isChallenge({ url: 'https://cdn/x.3mf', message: 'captcha' }), false); + const problem = makerworld.downloadProblem({ error: 'Please verify you are not a robot' }); + assert.equal(problem.challenged, true); + assert.equal(makerworld.downloadProblem({ error: 'Please log in to download models.' }).tokenRejected, true); +});