diff --git a/public/styles.css b/public/styles.css
index f5d44b5..29775eb 100644
--- a/public/styles.css
+++ b/public/styles.css
@@ -447,3 +447,8 @@ label { display: block; font-size: 13px; font-weight: 500; color: var(--text-mut
.suggestion-actions .btn-sm { align-self: auto; }
.suggestion-models { font-size: 13px; color: var(--text-muted); line-height: 1.7; }
.suggested-collections { font-size: 12px; color: var(--accent); }
+.token-reason { font-size: 14px; color: var(--text); line-height: 1.5; margin-bottom: 12px; }
+.token-steps { margin: 0 0 16px 18px; font-size: 13px; color: var(--text-muted); line-height: 1.7; }
+.token-steps code, .token-steps kbd { font-family: var(--mono); font-size: 12px; }
+.token-status { min-height: 1em; }
+.token-status.is-error { color: var(--danger); }
diff --git a/server.js b/server.js
index eb18843..1d35f18 100644
--- a/server.js
+++ b/server.js
@@ -444,6 +444,7 @@ app.post('/api/models/:id/download-files', async (req, res, next) => {
// original name is already present.
async function fetchSourceFiles(model, skipNames) {
if (model.source_site === 'makerworld') {
+ await requireMakerworldSettings(); // before the page fetch, which fails without FlareSolverr
const html = await fetchPageHtml(model.source_url);
return downloadMakerworldFiles(html, skipNames);
}
@@ -828,11 +829,15 @@ app.post('/api/import', async (req, res, next) => {
// Download the actual files where we can (MakerWorld via FlareSolverr+token,
// Printables via its public GraphQL API), and capture the license.
let files = [];
+ let filesError = null; // why no files could be downloaded, shown after the import
+ let filesErrorReason = null; // makerworld_token: the app offers to update the token
let license = meta.license || null;
let commercial = null;
if (detected.site === 'makerworld' && html) {
files = await downloadMakerworldFiles(html).catch((err) => {
console.warn('MakerWorld file download failed:', err.message);
+ filesError = err.message;
+ filesErrorReason = err.reason || null;
return [];
});
license = makerworld.parseLicense(html) || license;
@@ -840,6 +845,7 @@ app.post('/api/import', async (req, res, next) => {
} else if (detected.site === 'printables' && detected.id) {
const result = await downloadPrintablesFiles(detected.id).catch((err) => {
console.warn('Printables file download failed:', err.message);
+ filesError = err.message;
return { files: [] };
});
files = result.files;
@@ -869,7 +875,7 @@ app.post('/api/import', async (req, res, next) => {
files,
});
fingerprint.kick();
- res.status(201).json({ ...publicModel(model), metadataOnly: files.length === 0, metadataFetched });
+ res.status(201).json({ ...publicModel(model), metadataOnly: files.length === 0, metadataFetched, filesError, filesErrorReason });
} catch (e) { next(e); }
});
@@ -918,14 +924,33 @@ async function resolveCommercial(licenseName, fallback) {
// Download every printable instance of a MakerWorld model (needs token + FlareSolverr).
// skipNames: original filenames already present (so a re-download only adds new ones).
-async function downloadMakerworldFiles(html, skipNames = new Set()) {
+// MakerWorld downloads need both a FlareSolverr address and your auth token.
+// Errors carry a reason the app can act on: makerworld_token opens the token prompt.
+async function requireMakerworldSettings() {
const { value: token } = await resolveSetting('makerworld_token');
const { value: flareUrl } = await resolveSetting('flaresolverr_url');
- if (!token || !flareUrl) return [];
+ if (!flareUrl) {
+ throw Object.assign(new Error('Add your FlareSolverr URL in Settings to download MakerWorld files (MakerWorld is behind Cloudflare).'),
+ { status: 400, reason: 'makerworld_settings' });
+ }
+ if (!token) {
+ throw Object.assign(new Error('Add your MakerWorld auth token to download MakerWorld files.'), { status: 400, reason: 'makerworld_token' });
+ }
+ return { token, flareUrl };
+}
+
+// Downloads a MakerWorld model's files. When nothing could be downloaded it throws
+// with the reason (missing settings, an expired token, …) so the import can say why.
+async function downloadMakerworldFiles(html, skipNames = new Set()) {
+ const { token, flareUrl } = await requireMakerworldSettings();
const instances = makerworld.parseInstances(html);
+ if (!instances.length) {
+ throw Object.assign(new Error('Couldn’t find any printable files on the MakerWorld page.'), { status: 502 });
+ }
ensureUploadDir();
const files = [];
+ const problems = [];
for (let i = 0; i < instances.length; i++) {
if (i > 0) await sleep(1200); // give FlareSolverr's browser room between calls
const inst = instances[i];
@@ -934,18 +959,33 @@ 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);
+ problems.push({ message: `Couldn’t ask MakerWorld for a download link: ${err.message}` });
+ continue;
+ }
+ const problem = makerworld.downloadProblem(dl);
+ if (problem) {
+ console.warn(`MakerWorld instance ${inst.id}: ${problem.message}`);
+ problems.push(problem);
continue;
}
- if (!dl || !dl.url) continue;
const original = dl.name || `instance-${inst.id}.3mf`;
if (skipNames.has(original)) continue;
const resp = await fetch(dl.url);
- if (!resp.ok) { console.warn(`MakerWorld CDN download ${resp.status} for ${original}`); continue; }
+ if (!resp.ok) {
+ console.warn(`MakerWorld CDN download ${resp.status} for ${original}`);
+ problems.push({ message: `Downloading ${original} from MakerWorld failed (HTTP ${resp.status})` });
+ continue;
+ }
const fileName = uniqueName(original);
const filePath = path.join(UPLOAD_DIR, fileName);
fs.writeFileSync(filePath, Buffer.from(await resp.arrayBuffer()));
files.push(describeFile(filePath, fileName, original));
}
+ 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 });
+ }
return files;
}
@@ -1329,7 +1369,7 @@ app.post('/api/autotag/reapply', async (req, res, next) => {
// Central error handler.
app.use((err, req, res, next) => {
if (!err.status) console.error('Request error:', err.message);
- res.status(err.status || 500).json({ error: err.message });
+ res.status(err.status || 500).json({ error: err.message, ...(err.reason ? { reason: err.reason } : {}) });
});
db.init()
diff --git a/test/makerworld.test.js b/test/makerworld.test.js
new file mode 100644
index 0000000..74dc115
--- /dev/null
+++ b/test/makerworld.test.js
@@ -0,0 +1,30 @@
+// MakerWorld importer helpers (lib/importers/makerworld.js).
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const makerworld = require('../lib/importers/makerworld');
+
+const page = (design) =>
+ ``;
+
+test('printable instances and the license are read from the page data', () => {
+ const html = page({
+ license: 'Standard Digital File License',
+ instances: [{ id: 650088, title: 'AMS - 0.4 Nozzle - 0.08 Layer' }, { id: 650089 }],
+ });
+ assert.deepEqual(makerworld.parseInstances(html), [
+ { id: 650088, title: 'AMS - 0.4 Nozzle - 0.08 Layer' },
+ { id: 650089, title: '' },
+ ]);
+ assert.equal(makerworld.parseLicense(html), 'Standard Digital File License');
+ assert.deepEqual(makerworld.parseInstances('
Just a moment...'), []);
+});
+
+test('a download answer without a link says why, and flags a refused token', () => {
+ assert.equal(makerworld.downloadProblem({ name: 'bookmarks.3mf', url: 'https://cdn.example/bookmarks.3mf' }), null);
+ const refused = makerworld.downloadProblem({ code: 1, error: 'Please log in to download models.' });
+ assert.equal(refused.tokenRejected, true);
+ assert.match(refused.message, /token \(it has probably expired\)/);
+ assert.deepEqual(makerworld.downloadProblem({ code: 7, error: 'Model not found' }),
+ { message: 'MakerWorld didn’t give a download link: Model not found', tokenRejected: false });
+ assert.deepEqual(makerworld.downloadProblem(null), { message: 'MakerWorld didn’t give a download link', tokenRejected: false });
+});