Fix issue #77: Add a "force import from foundry" context button
All checks were successful
Test / test (push) Successful in 2s
All checks were successful
Test / test (push) Successful in 2s
This commit is contained in:
@@ -62,11 +62,14 @@ async function saveFoundryActor(campaign, source, fullSync = false) {
|
||||
: new Actor({ campaign: campaign._id });
|
||||
}
|
||||
actor.foundryActorId = foundryActorId;
|
||||
// `created` says whether this row is new: whoever imports a whole world counts
|
||||
// the rows it made apart from the ones it only wrote over.
|
||||
const created = actor.isNew;
|
||||
// A full snapshot runs when a GM reconnects. Preserve existing Dragonroll
|
||||
// edits then; live Foundry change events continue to overwrite normally.
|
||||
if (!fullSync || actor.isNew) Object.assign(actor, fields);
|
||||
await actor.save();
|
||||
return { foundryActorId, actorId: actor.id };
|
||||
return { foundryActorId, actorId: actor.id, created };
|
||||
}
|
||||
|
||||
// The campaign's item list mirrors the world's item directory and nothing else
|
||||
@@ -105,6 +108,9 @@ async function saveFoundryItem(campaign, source, fullSync = false, folders = nul
|
||||
}
|
||||
|
||||
item.foundryItemId = foundryItemId;
|
||||
// `created` says whether this row is new: whoever imports a whole world counts
|
||||
// the rows it made apart from the ones it only wrote over.
|
||||
const created = item.isNew;
|
||||
if (!fullSync || item.isNew) Object.assign(item, fields);
|
||||
// Foundry's own icon is kept on every save, not only when the edits above
|
||||
// land: the item window offers it back after the user picked their own.
|
||||
@@ -120,7 +126,7 @@ async function saveFoundryItem(campaign, source, fullSync = false, folders = nul
|
||||
const folder = resolveFoundryItemFolder(source, folders);
|
||||
if (folder !== undefined) item.folder = folder;
|
||||
await item.save();
|
||||
return { foundryItemId, itemId: item.id };
|
||||
return { foundryItemId, itemId: item.id, created };
|
||||
}
|
||||
|
||||
async function syncFoundryItems(campaign, sources, fullSync = false, folders = null) {
|
||||
@@ -447,3 +453,9 @@ router.post('/sync/map-item', async (req, res) => {
|
||||
});
|
||||
|
||||
module.exports = router;
|
||||
// The writers every Foundry document goes through: the sync pushes above, and the
|
||||
// force import a campaign asks for from its sidebar (routes/foundry.js). One set of
|
||||
// rules decides which campaign row a world document owns, so pulling a world over
|
||||
// twice updates its rows instead of doubling them.
|
||||
module.exports.saveFoundryActor = saveFoundryActor;
|
||||
module.exports.saveFoundryItem = saveFoundryItem;
|
||||
|
||||
@@ -4,12 +4,17 @@ const { requestFoundry } = require('../services/foundry');
|
||||
const { normalizeIconDirectory, readIconListingPage, shapeIconListing } = require('../services/foundry-icons');
|
||||
|
||||
const Campaign = require('../models/Campaign');
|
||||
// The writers a Foundry document is stored through, shared with the sync pushes the
|
||||
// linked module sends (routes/foundry-link.js) so both write a world's rows by the
|
||||
// same rules.
|
||||
const { saveFoundryActor, saveFoundryItem } = require('./foundry-link');
|
||||
|
||||
// The world address the icons are loaded from is kept on the campaign, so an icon
|
||||
// listing is always asked for one of the caller's own campaigns.
|
||||
// listing is always asked for one of the caller's own campaigns. The linked world's
|
||||
// id travels along: an import has to know whose data it is pulling over.
|
||||
async function findOwnedCampaign(campaignId, userId) {
|
||||
if (!campaignId) return null;
|
||||
return Campaign.findOne({ _id: campaignId, createdBy: userId }).select('settings').lean();
|
||||
return Campaign.findOne({ _id: campaignId, createdBy: userId }).select('settings foundryWorldId').lean();
|
||||
}
|
||||
|
||||
async function proxy(path, res) {
|
||||
@@ -34,6 +39,63 @@ router.get('/actors/:id/items', (req, res) => proxy(`api/actors/${encodeURICompo
|
||||
router.get('/actors/:id', (req, res) => proxy(`api/actors/${encodeURIComponent(req.params.id)}`, res));
|
||||
router.get('/items/:id', (req, res) => proxy(`api/items/${encodeURIComponent(req.params.id)}`, res));
|
||||
|
||||
// Force import (Syndria98/dragonroll#77): the sidebar's "force import from Foundry"
|
||||
// pulls the whole actor list or item directory of the world the bridge is showing
|
||||
// right now. The documents go through the writers the module's own snapshot push
|
||||
// uses, so a world document lands on the row it owns: what the campaign already has
|
||||
// is written over, not imported a second time. Nothing is pruned here — only a full
|
||||
// snapshot from the module sees the whole world, so dropping rows the world let go of
|
||||
// stays that snapshot's job.
|
||||
router.post('/import', async (req, res) => {
|
||||
try {
|
||||
const kind = ['actors', 'items'].includes(req.body?.kind) ? req.body.kind : null;
|
||||
if (!kind) return res.json({ status: 'error', msg: 'errors.missing-data' });
|
||||
|
||||
const campaign = await findOwnedCampaign(req.body.campaign, req.user.id);
|
||||
if (!campaign) return res.json({ status: 'error', msg: 'errors.notfound' });
|
||||
if (!campaign.foundryWorldId) {
|
||||
return res.json({ status: 'error', msg: 'foundry.errors.import-not-linked' });
|
||||
}
|
||||
|
||||
// The bridge answers `{status, data, world}`: `data` holds the world's actors
|
||||
// or its world-level items, in the shape the module published them in.
|
||||
let snapshot;
|
||||
try {
|
||||
snapshot = await requestFoundry(`api/${kind}`);
|
||||
} catch (err) {
|
||||
if (err.code !== 'FOUNDRY_NOT_CONFIGURED') console.error(err);
|
||||
return res.json({ status: 'error', msg: 'foundry.errors.import-unavailable' });
|
||||
}
|
||||
if (snapshot.status !== 200 || snapshot.data?.status !== 'ok' || !Array.isArray(snapshot.data.data)) {
|
||||
return res.json({ status: 'error', msg: 'foundry.errors.import-unavailable' });
|
||||
}
|
||||
// The bridge keeps one world's snapshot at a time, so a campaign linked to
|
||||
// another world must not be filled with it. A bridge that does not say whose
|
||||
// world it holds is taken at its word: only a known mismatch stops the import.
|
||||
if (snapshot.data.world?.id && snapshot.data.world.id !== campaign.foundryWorldId) {
|
||||
return res.json({ status: 'error', msg: 'foundry.errors.import-world-mismatch' });
|
||||
}
|
||||
|
||||
let imported = 0;
|
||||
let updated = 0;
|
||||
for (const source of snapshot.data.data) {
|
||||
// An actor without a name, or a world document that is not gear, maps to
|
||||
// nothing and is skipped exactly like a sync push skips it.
|
||||
const mapping = kind === 'actors'
|
||||
? await saveFoundryActor(campaign, source)
|
||||
: await saveFoundryItem(campaign, source);
|
||||
if (!mapping) continue;
|
||||
if (mapping.created) imported += 1;
|
||||
else updated += 1;
|
||||
}
|
||||
|
||||
res.json({ status: 'ok', kind, imported, updated });
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
res.json({ status: 'error', msg: 'errors.internal' });
|
||||
}
|
||||
});
|
||||
|
||||
// Foundry's core icon library: the `icons/` folder of the world's data directory.
|
||||
// One folder per request, and the icons inside it paged, because that library runs
|
||||
// into the thousands and the window only ever shows where the user is standing.
|
||||
|
||||
Reference in New Issue
Block a user