This commit is contained in:
@@ -30,6 +30,8 @@ const queuedActorChanges = new Map();
|
||||
let itemSyncTimeout;
|
||||
let itemSyncRunning = false;
|
||||
let itemSyncErrorLogged = false;
|
||||
let folderSyncTimeout;
|
||||
let folderSyncRunning = false;
|
||||
const syncingItemIds = new Set();
|
||||
const queuedItemChanges = new Map();
|
||||
|
||||
@@ -436,6 +438,7 @@ function handleAutoSyncChange(value) {
|
||||
if (value === false) {
|
||||
clearTimeout(actorSyncTimeout);
|
||||
clearTimeout(itemSyncTimeout);
|
||||
clearTimeout(folderSyncTimeout);
|
||||
return;
|
||||
}
|
||||
if (!game.user?.isGM || !getSyncToken()) return;
|
||||
@@ -444,6 +447,7 @@ function handleAutoSyncChange(value) {
|
||||
// while autosync was off are pushed so this world's state wins over them.
|
||||
initializeCharacterSync();
|
||||
reconcileDragonrollItems();
|
||||
queueFoundryItemFolders(400);
|
||||
if (queuedActorChanges.size) {
|
||||
clearTimeout(actorSyncTimeout);
|
||||
actorSyncTimeout = setTimeout(flushActorChanges, 400);
|
||||
@@ -527,6 +531,8 @@ async function pushFoundryActors(actors, fullSync = false) {
|
||||
// Dragonroll deduplicates by name, so sending the world directory next to
|
||||
// the actor copies keeps a single Item per piece of gear.
|
||||
items: getWorldItemSnapshots(),
|
||||
// The folder tree those world items stand in (see worldItemFolderSnapshots).
|
||||
folders: worldItemFolderSnapshots(),
|
||||
fullSync,
|
||||
}, token);
|
||||
|
||||
@@ -644,8 +650,60 @@ function serializeFoundryItem(item) {
|
||||
return data;
|
||||
}
|
||||
|
||||
// --- Item folders ------------------------------------------------------------
|
||||
// Dragonroll mirrors the folders the world's item directory is grouped into, so its
|
||||
// item list reads like Foundry's. `game.folders` also holds the folders an actor
|
||||
// keeps for its own inventory: those hang off the actor instead of the world, and
|
||||
// the campaign has no use for them, so only folders rooted in the world go over.
|
||||
|
||||
// The folder a folder is nested in, or null when it is not nested in a folder.
|
||||
function itemFolderParent(folder) {
|
||||
const parent = typeof folder.parent === "string" ? game.folders?.get(folder.parent) : folder.parent;
|
||||
return parent?.documentName === "Folder" ? parent : null;
|
||||
}
|
||||
|
||||
// Whether a folder belongs to the world's item directory: its whole ancestry has
|
||||
// to be folders, ending in one that nothing is above.
|
||||
function isWorldItemFolder(folder, seen = new Set()) {
|
||||
if (folder.type !== "Item" || seen.has(folder.id)) return false;
|
||||
seen.add(folder.id);
|
||||
const rawParent = folder.parent;
|
||||
const rawParentId = typeof rawParent === "string" ? rawParent : rawParent?.id;
|
||||
if (!rawParentId) return true;
|
||||
const parent = typeof rawParent === "string" ? game.folders?.get(rawParentId) : rawParent;
|
||||
if (parent?.documentName !== "Folder") return false;
|
||||
return isWorldItemFolder(parent, seen);
|
||||
}
|
||||
|
||||
function worldItemFolderSnapshots() {
|
||||
return (game.folders?.contents || [])
|
||||
.filter((folder) => isWorldItemFolder(folder))
|
||||
.map((folder) => ({ id: folder.id, name: folder.name, parent: itemFolderParent(folder)?.id || null }));
|
||||
}
|
||||
|
||||
// A world item travels with the folder it stands in, so Dragonroll can file it the
|
||||
// same way; `""` says the world keeps it at the root of the item directory. Items
|
||||
// embedded in an actor use serializeFoundryItem instead: their folders are the
|
||||
// actor's own, and the campaign's item list is deduplicated by name anyway.
|
||||
function serializeFoundryWorldItem(item) {
|
||||
const data = serializeFoundryItem(item);
|
||||
if (!data) return null;
|
||||
|
||||
data.dragonroll = { ...data.dragonroll, folder: worldItemFolderId(item) };
|
||||
return data;
|
||||
}
|
||||
|
||||
// The folder id an item data carries is either the id or the Folder document
|
||||
// itself, depending on the Foundry version.
|
||||
function worldItemFolderId(item) {
|
||||
const folder = item?.folder;
|
||||
if (!folder) return "";
|
||||
if (typeof folder === "string") return game.folders?.get(folder)?.documentName === "Folder" ? folder : "";
|
||||
return folder.documentName === "Folder" ? String(folder.id || "") : "";
|
||||
}
|
||||
|
||||
function getWorldItemSnapshots() {
|
||||
return (game.items?.contents || []).map(serializeFoundryItem).filter(Boolean);
|
||||
return (game.items?.contents || []).map(serializeFoundryWorldItem).filter(Boolean);
|
||||
}
|
||||
|
||||
function dragonrollItemIdOf(item) {
|
||||
@@ -693,7 +751,10 @@ async function pushFoundryItems(items) {
|
||||
|
||||
const result = await postDragonroll("foundry/sync/item-snapshot", {
|
||||
worldId: game.world.id,
|
||||
items: items.map(serializeFoundryItem).filter(Boolean),
|
||||
items: items.map(serializeFoundryWorldItem).filter(Boolean),
|
||||
// The folder tree goes along, so an item that moved into or out of a folder
|
||||
// arrives with the folder it names.
|
||||
folders: worldItemFolderSnapshots(),
|
||||
}, token);
|
||||
await rememberItemMappings(result.items);
|
||||
itemSyncErrorLogged = false;
|
||||
@@ -717,6 +778,34 @@ function queueFoundryItemChange(kind, item) {
|
||||
itemSyncTimeout = setTimeout(flushItemChanges, 400);
|
||||
}
|
||||
|
||||
// A folder the GM made, renamed or nested has to reach the campaign even though no
|
||||
// item changed, so the tree goes over on its own without pushing the items in it.
|
||||
function queueFoundryItemFolders(delay = 400) {
|
||||
clearTimeout(folderSyncTimeout);
|
||||
folderSyncTimeout = setTimeout(pushFoundryItemFolders, delay);
|
||||
}
|
||||
|
||||
async function pushFoundryItemFolders() {
|
||||
// Autosync off: folder changes wait, like the item edits do.
|
||||
if (!isAutoSyncEnabled()) return;
|
||||
const token = getSyncToken();
|
||||
if (!token || !game.user?.isGM || !game.world || folderSyncRunning) return;
|
||||
folderSyncRunning = true;
|
||||
try {
|
||||
await postDragonroll("foundry/sync/item-snapshot", {
|
||||
worldId: game.world.id,
|
||||
items: [],
|
||||
folders: worldItemFolderSnapshots(),
|
||||
}, token);
|
||||
itemSyncErrorLogged = false;
|
||||
} catch (error) {
|
||||
reportItemSyncError(error);
|
||||
queueFoundryItemFolders(5000);
|
||||
} finally {
|
||||
folderSyncRunning = false;
|
||||
}
|
||||
}
|
||||
|
||||
async function flushItemChanges() {
|
||||
// Autosync off: the queued edits wait here, like the actor changes do.
|
||||
if (!isAutoSyncEnabled()) return;
|
||||
@@ -1206,6 +1295,7 @@ Hooks.once("ready", () => {
|
||||
for (const event of [
|
||||
"createActor", "updateActor", "deleteActor",
|
||||
"createItem", "updateItem", "deleteItem",
|
||||
"createFolder", "updateFolder", "deleteFolder",
|
||||
]) {
|
||||
Hooks.on(event, (document) => {
|
||||
scheduleSnapshotSync();
|
||||
@@ -1215,6 +1305,12 @@ Hooks.once("ready", () => {
|
||||
queueFoundryActorChange(isDelete ? "delete" : "upsert", document);
|
||||
return;
|
||||
}
|
||||
// An item folder the GM made, renamed or nested changes the tree the campaign
|
||||
// mirrors; nothing about the items themselves changed, so only the tree goes.
|
||||
if (document.documentName === "Folder") {
|
||||
if (document.type === "Item" && isWorldItemFolder(document)) queueFoundryItemFolders();
|
||||
return;
|
||||
}
|
||||
if (document.documentName !== "Item") return;
|
||||
|
||||
// Items embedded in an actor travel with that actor's snapshot: adding or
|
||||
|
||||
Reference in New Issue
Block a user