}
- */
- static getLocationJournals() {
- const entries = game.journal?.contents || [];
- const locationFolder = this._findFolderByNameInsensitive('Archivist - Locations');
- return entries.filter(j => {
- const flagged = j.getFlag(CONFIG.MODULE_ID, 'archivistType') === 'location';
- const inFolder = locationFolder && j.folder?.id === locationFolder.id;
- return flagged || inFolder;
- });
- }
-
- /**
- * Find a folder by name (case-insensitive)
- * @param {string} name
- * @returns {Folder | undefined}
- */
- static _findFolderByNameInsensitive(name) {
- const folders = game.folders?.contents || [];
- return folders.find(
- f => f.type === 'JournalEntry' && f.name.toLowerCase() === String(name).toLowerCase()
- );
- }
-
- /**
- * Transform actor data for API synchronization
- * @param {Array} actors - Array of Foundry actor objects
- * @returns {Array} Array of transformed character data
- */
- static transformActorsForSync(actors) {
- return actors.map(actor => ({
- foundryId: actor.id,
- name: actor.name,
- type: actor.type,
- description: actor.system?.details?.biography?.value || '',
- level: actor.system?.details?.level || 1,
- race: actor.system?.details?.race || '',
- class: actor.system?.details?.class || '',
- }));
- }
-
- /**
- * Build Archivist Character payload from a Foundry Actor
- * @param {Actor} actor
- * @param {string} worldId
- */
- static toApiCharacterPayload(actor, worldId) {
- const isPC = actor.type === 'character';
- const pick = (...paths) => {
- for (const p of paths) {
- try {
- const v = foundry.utils.getProperty(actor, p);
- if (typeof v === 'string' && v.trim()) return v;
- } catch (_) { }
- }
- return '';
- };
- const bioHtml = pick('system.details.biography.value', 'system.details.biography.public', 'system.description.value');
- return {
- character_name: actor.name,
- player_name: actor?.system?.details?.player || '',
- description: this.toMarkdownIfHtml(bioHtml || ''),
- type: isPC ? 'PC' : 'NPC',
- campaign_id: worldId,
- };
- }
-
- /**
- * Build Archivist Faction payload from a JournalEntry
- * @param {JournalEntry} journal
- * @param {string} worldId
- */
- static toApiFactionPayload(journal, worldId) {
- const raw = String(journal?.img || '').trim();
- const image = raw.startsWith('https://') ? raw : undefined;
- const text = this._extractJournalText(journal);
- // Strip leading image since we set it as a separate property
- const cleanedText = this.stripLeadingImage(text);
- return {
- name: journal.name,
- // Journal pages store HTML — convert to Markdown for API
- description: this.toMarkdownIfHtml(cleanedText),
- ...(image ? { image } : {}),
- campaign_id: worldId,
- };
- }
-
- /**
- * Build Archivist Location payload from a JournalEntry
- * @param {JournalEntry} journal
- * @param {string} worldId
- */
- static toApiLocationPayload(journal, worldId) {
- const raw = String(journal?.img || '').trim();
- const image = raw.startsWith('https://') ? raw : undefined;
- const text = this._extractJournalText(journal);
- // Strip leading image since we set it as a separate property
- const cleanedText = this.stripLeadingImage(text);
- return {
- name: journal.name,
- description: this.toMarkdownIfHtml(cleanedText),
- ...(image ? { image } : {}),
- campaign_id: worldId,
- };
- }
-
- /**
- * Extract text content from a JournalEntry (first text page)
- * @param {JournalEntry} journal
- * @returns {string}
- */
- static _extractJournalText(journal) {
- const pages = journal.pages?.contents || journal.pages || [];
- const textPage = pages.find(p => p.type === 'text');
- // Foundry v10+ stores text in page.text.content
- return textPage?.text?.content || journal.content || '';
- }
-
- /**
- * Remove a single leading image from Markdown or HTML at the top of text.
- * Handles patterns like: \n\n, ![]()
, or wrapped in .
- * @param {string} text
- * @returns {string}
- */
- static stripLeadingImage(text) {
- const s = String(text || '');
- if (!s) return '';
- // Common patterns: Markdown image at start, possibly followed by blank line
- const mdImg = /^(?:\s*)!\[[^\]]*\]\([^\)]+\)\s*(?:\n+)?/;
- if (mdImg.test(s)) return s.replace(mdImg, '').trimStart();
- // HTML ![]()
possibly wrapped in
at the very start
- const htmlImgP = /^(?:\s*)]*>\s*]*>\s*<\/p>\s*/i;
- if (htmlImgP.test(s)) return s.replace(htmlImgP, '').trimStart();
- const htmlImg = /^(?:\s*)]*>\s*/i;
- if (htmlImg.test(s)) return s.replace(htmlImg, '').trimStart();
- return s;
- }
-
- /**
- * Ensure a journal has a single primary text page with provided content.
- * Works across Foundry versions (v10+ with pages collection).
- * @param {JournalEntry} journal
- * @param {string} content
- */
- static async ensureJournalTextPage(journal, content) {
- // v10+ API: JournalEntryPage documents under journal.pages
- const pagesCollection = journal.pages;
- const safeContent = String(content ?? '');
-
- console.log(`[Utils] ensureJournalTextPage:`, {
- journalId: journal?.id,
- journalName: journal?.name,
- contentLength: safeContent.length,
- contentPreview: safeContent.substring(0, 100),
- });
-
- if (pagesCollection) {
- const pages =
- pagesCollection.contents ?? (Array.isArray(pagesCollection) ? pagesCollection : []);
- const textPage = pages.find(p => p.type === 'text');
- if (textPage) {
- await textPage.update({ text: { content: safeContent, markdown: safeContent, format: 2 } });
- } else {
- await journal.createEmbeddedDocuments('JournalEntryPage', [
- {
- name: 'Description',
- type: 'text',
- text: { content: safeContent, markdown: safeContent, format: 2 },
- },
- ]);
- }
- return;
- }
- // Fallback (older Foundry versions) — use JournalEntry content
- await journal.update({ content: safeContent });
- }
-
- /**
- * Set a journal's thumbnail image (img property) to the provided URL.
- * Does not modify journal content or pages.
- * @param {JournalEntry} journal
- * @param {string} imageUrl
- */
- static async ensureJournalLeadImage(journal, imageUrl) {
- try {
- const url = String(imageUrl || '').trim();
- if (!url) return;
- console.debug('[Archivist Sync] ensureJournalLeadImage()', { journalId: journal?.id, url });
- // Set the journal thumbnail so it shows in lists
- try {
- await journal.update({ img: url });
- } catch (e) {
- console.debug('[Archivist Sync] journal img update failed', e);
- }
- } catch (e) {
- console.warn('[Archivist Sync] Failed to set journal lead image:', e);
- }
- }
-
- /**
- * Flags helpers for mapping Archivist IDs
- */
- static getActorArchivistId(actor) {
- return actor.getFlag(CONFIG.MODULE_ID, 'archivistId');
- }
-
- static async setActorArchivistId(actor, id, worldId) {
- await actor.setFlag(CONFIG.MODULE_ID, 'archivistId', id);
- if (worldId) await actor.setFlag(CONFIG.MODULE_ID, 'archivistWorldId', worldId);
- return true;
- }
-
- static getJournalArchivistMeta(journal) {
- return {
- id: journal.getFlag(CONFIG.MODULE_ID, 'archivistId') || null,
- type: journal.getFlag(CONFIG.MODULE_ID, 'archivistType') || null,
- worldId: journal.getFlag(CONFIG.MODULE_ID, 'archivistWorldId') || null,
- };
- }
-
- static async setJournalArchivistMeta(journal, id, type, worldId) {
- await journal.setFlag(CONFIG.MODULE_ID, 'archivistId', id);
- if (type) await journal.setFlag(CONFIG.MODULE_ID, 'archivistType', type);
- if (worldId) await journal.setFlag(CONFIG.MODULE_ID, 'archivistWorldId', worldId);
- }
-
- /**
- * Get Archivist metadata from a JournalEntryPage
- * @param {JournalEntryPage} page
- */
- static getPageArchivistMeta(page) {
- return {
- id: page?.getFlag?.(CONFIG.MODULE_ID, 'archivistId') || null,
- type: page?.getFlag?.(CONFIG.MODULE_ID, 'archivistType') || null,
- worldId: page?.getFlag?.(CONFIG.MODULE_ID, 'archivistWorldId') || null,
- };
- }
-
- /**
- * Set Archivist metadata on a JournalEntryPage
- * @param {JournalEntryPage} page
- * @param {string} id
- * @param {string} type
- * @param {string} worldId
- */
- static async setPageArchivistMeta(page, id, type, worldId) {
- if (!page) return;
- if (id) await page.setFlag(CONFIG.MODULE_ID, 'archivistId', id);
- if (type) await page.setFlag(CONFIG.MODULE_ID, 'archivistType', type);
- if (worldId) await page.setFlag(CONFIG.MODULE_ID, 'archivistWorldId', worldId);
- }
-
- /**
- * Ensure a single root-level JournalEntry exists as a container
- * @param {string} name
- * @returns {Promise}
- */
- static async ensureRootJournalContainer(name) {
- const journals = game.journal?.contents || [];
- let j = journals.find(x => x.name === name && !x.folder);
- if (j) return j;
- j = await JournalEntry.create({ name, folder: null, pages: [] }, { render: false });
- return j;
- }
-
- /**
- * Create or update a text page within a container journal
- * Returns the page document. If creating multiple, call with items pre-sorted, as creation order defines index.
- * @param {JournalEntry} container
- * @param {object} opts { name, html, imageUrl, flags }
- */
- static async upsertContainerTextPage(container, { name, html, imageUrl, flags } = {}) {
- const pages = container.pages?.contents || [];
- // Prefer matching by Archivist ID if provided via flags
- let page = null;
- if (flags?.archivistId) {
- page = pages.find(p => this.getPageArchivistMeta(p).id === flags.archivistId);
- }
- if (!page) page = pages.find(p => p.name === name && p.type === 'text');
- const baseMd = String(html || '');
- if (page) {
- await page.update({
- name,
- type: 'text',
- text: { content: baseMd, markdown: baseMd, format: 2 },
- });
- } else {
- const created = await container.createEmbeddedDocuments('JournalEntryPage', [
- { name, type: 'text', text: { content: baseMd, markdown: baseMd, format: 2 } },
- ]);
- page = created?.[0] || null;
- }
- if (page && flags) {
- await this.setPageArchivistMeta(
- page,
- flags.archivistId,
- flags.archivistType,
- flags.archivistWorldId
- );
- }
- return page;
- }
-
- /**
- * Sort pages within a container using comparator over page docs
- * Applies increasing sort values to match comparator order.
- * @param {JournalEntry} container
- * @param {(a: JournalEntryPage, b: JournalEntryPage) => number} comparator
- */
- static async sortContainerPages(container, comparator) {
- const pages = (container.pages?.contents || []).slice().sort(comparator);
- let sort = 0;
- const updates = pages.map(p => ({ _id: p.id, sort: (sort += 100) }));
- if (updates.length) await container.updateEmbeddedDocuments('JournalEntryPage', updates);
- }
-
- /**
- * Extract HTML text content from a JournalEntryPage
- * @param {JournalEntryPage} page
- */
- static extractPageHtml(page) {
- if (!page) return '';
- if (page.type === 'text') {
- const fmt = Number(page?.text?.format ?? 0);
- const md = page?.text?.markdown;
- if (fmt === 2 && typeof md === 'string') return String(md);
- return String(page?.text?.content || md || '');
- }
- return '';
- }
-
- /**
- * Validate API key format
- * @param {string} apiKey - The API key to validate
- * @returns {boolean} True if API key appears valid
- */
- static validateApiKey(apiKey) {
- return apiKey && typeof apiKey === 'string' && apiKey.trim().length > 0;
- }
-
- /**
- * Safely parse JSON response
- * @param {string} jsonString - JSON string to parse
- * @returns {object|null} Parsed object or null if parsing fails
- */
- static safeJsonParse(jsonString) {
- try {
- return JSON.parse(jsonString);
- } catch (error) {
- this.log(`Failed to parse JSON: ${error.message}`, 'warn');
- return null;
- }
- }
-
- /**
- * Debounce function to limit rapid successive calls
- * @param {Function} func - Function to debounce
- * @param {number} wait - Wait time in milliseconds
- * @param {boolean} immediate - Whether to trigger on leading edge
- * @returns {Function} Debounced function
- */
- static debounce(func, wait, immediate = false) {
- let timeout;
- return function executedFunction(...args) {
- const later = () => {
- timeout = null;
- if (!immediate) func.apply(this, args);
- };
- const callNow = immediate && !timeout;
- clearTimeout(timeout);
- timeout = setTimeout(later, wait);
- if (callNow) func.apply(this, args);
- };
- }
-
- /**
- * Check if user is a GM
- * @returns {boolean} True if current user is a GM
- */
- static isGM() {
- return game.user.isGM;
- }
-
- /**
- * Ensure a folder exists for JournalEntries by name; returns folder id or null
- * @param {string} name
- */
- static async ensureJournalFolder(name) {
- const existing = this._findFolderByNameInsensitive(name);
- if (existing) return existing.id;
- const created = await Folder.create({ name, type: 'JournalEntry' });
- return created?.id || null;
- }
-
- /** Ensure top-level organized folders exist for Archivist types */
- static async ensureArchivistFolders() {
- try {
- const folders = {
- pc: 'Archivist - PCs',
- npc: 'Archivist - NPCs',
- item: 'Archivist - Items',
- location: 'Archivist - Locations',
- faction: 'Archivist - Factions',
- };
-
- console.log('[Archivist Sync] Ensuring organized folders:', Object.values(folders));
- for (const name of Object.values(folders)) {
- await this.ensureJournalFolder(name);
- }
- } catch (e) {
- console.warn('[Archivist Sync] ensureArchivistFolders failed:', e);
- }
- }
-
- /** Get the organized folder for a given Archivist sheet type */
- static getArchivistFolder(type) {
- try {
- console.log('[Archivist Sync] getArchivistFolder called:', {
- type,
- });
-
- const map = {
- pc: 'Archivist - PCs',
- npc: 'Archivist - NPCs',
- item: 'Archivist - Items',
- location: 'Archivist - Locations',
- faction: 'Archivist - Factions',
- };
- const name = map[String(type || '').toLowerCase()];
-
- if (!name) {
- console.log('[Archivist Sync] No folder name mapped for type:', type);
- return null;
- }
-
- const folders = game.folders?.contents || [];
- const found = folders.find(f => f.type === 'JournalEntry' && f.name === name) || null;
-
- console.log('[Archivist Sync] Folder lookup result:', {
- searchingFor: name,
- found: found?.name || 'none',
- foundId: found?.id || 'none',
- });
-
- return found;
- } catch (e) {
- console.warn('[Archivist Sync] getArchivistFolder failed:', e);
- return null;
- }
- }
-
- /** Move a JournalEntry into its organized folder based on flags.archivist.sheetType */
- static async moveJournalToTypeFolder(journal) {
- try {
- const flags = journal.getFlag(CONFIG.MODULE_ID, 'archivist') || {};
- const type = String(flags.sheetType || '').toLowerCase();
- const folder = this.getArchivistFolder(type);
- if (!folder) return false;
- if (journal.folder?.id === folder.id) return false;
- await journal.update({ folder: folder.id });
- return true;
- } catch (_) {
- return false;
- }
- }
-
- /** Create a custom sheet JournalEntry for an imported Archivist entity */
- static async createCustomJournalForImport({ name, html = '', imageUrl, sheetType, archivistId, worldId, folderId, sort }) {
- try {
- console.log(`[Archivist Sync] createCustomJournalForImport called:`, {
- name,
- sheetType,
- archivistId,
- providedFolderId: folderId,
- sort,
- });
-
- await this.ensureArchivistFolders();
- const folder = this.getArchivistFolder(sheetType);
- const sheetClassMap = {
- pc: 'archivist-sync.PCPageSheetV2',
- npc: 'archivist-sync.NPCPageSheetV2',
- item: 'archivist-sync.ItemPageSheetV2',
- location: 'archivist-sync.LocationPageSheetV2',
- faction: 'archivist-sync.FactionPageSheetV2',
- recap: 'archivist-sync.RecapPageSheetV2',
- };
- const normalizedType = String(sheetType || '').toLowerCase();
- const sheetClass = sheetClassMap[normalizedType] || '';
-
- console.log(`[Archivist Sync] Folder lookup results:`, {
- sheetType,
- foundFolder: folder?.name || 'none',
- foundFolderId: folder?.id || 'none',
- providedFolderId: folderId || 'none',
- willUseFolderId: folderId || folder?.id || 'none (root)',
- });
-
- const targetFolderId = folderId || folder?.id || null;
- const createData = {
- name,
- folder: targetFolderId,
- ...(imageUrl ? { img: imageUrl } : {}),
- ...(typeof sort === 'number' ? { sort } : {}),
- flags: {
- core: { sheetClass, sheet: sheetClass },
- },
- };
-
- const journal = await JournalEntry.create(createData, { render: false });
-
- console.log(`[Archivist Sync] Journal created:`, {
- journalId: journal.id,
- journalName: journal.name,
- assignedFolderId: targetFolderId,
- actualFolderId: journal.folder?.id || 'none (root)',
- actualFolderName: journal.folder?.name || 'none (root)',
- });
-
- await this.ensureJournalTextPage(journal, html);
- // Hub image flag removed
- await journal.setFlag(CONFIG.MODULE_ID, 'archivist', {
- sheetType: normalizedType,
- archivistId: archivistId || null,
- archivistWorldId: worldId || null,
- image: imageUrl || null,
- archivistRefs: { characters: [], items: [], entries: [], factions: [], locationsAssociative: [] },
- foundryRefs: { actors: [], items: [], scenes: [], journals: [] },
- });
-
- console.log(`[Archivist Sync] Journal finalized with flags, final location:`, {
- journalId: journal.id,
- folderId: journal.folder?.id || 'root',
- folderName: journal.folder?.name || 'root',
- });
-
- return journal;
- } catch (e) {
- console.warn('[Archivist Sync] createCustomJournalForImport failed', e);
- return null;
- }
- }
-
- /** Create a new Archivist journal with flags and initial text page */
- static async createArchivistJournal({ name, sheetType, archivistId, worldId, folderName, text = '', sort }) {
- const folder = folderName ? await this.ensureJournalFolder(folderName) : null;
- // Map Archivist sheet types to our registered V2 sheet classes
- const sheetClassMap = {
- pc: 'archivist-sync.PCPageSheetV2',
- npc: 'archivist-sync.NPCPageSheetV2',
- item: 'archivist-sync.ItemPageSheetV2',
- location: 'archivist-sync.LocationPageSheetV2',
- faction: 'archivist-sync.FactionPageSheetV2',
- recap: 'archivist-sync.RecapPageSheetV2',
- };
- const normalizedType = String(sheetType || '').toLowerCase();
- const sheetClass = sheetClassMap[normalizedType] || '';
- // Provide our archivist flags at creation so createJournalEntry hook can POST immediately
- const initialArchivistFlags = {
- sheetType: normalizedType,
- archivistId: archivistId || null,
- archivistWorldId: worldId || null,
- archivistRefs: { characters: [], items: [], entries: [], factions: [], locationsAssociative: [] },
- foundryRefs: { actors: [], items: [], scenes: [], journals: [] },
- };
- const createData = {
- name,
- folder,
- ...(typeof sort === 'number' ? { sort } : {}),
- flags: {
- core: { sheetClass, sheet: sheetClass },
- [CONFIG.MODULE_ID]: { archivist: initialArchivistFlags },
- }
- };
- const journal = await JournalEntry.create(createData, { render: false });
- await this.ensureJournalTextPage(journal, text);
- // Flags were provided at creation; no need to set again here
- return journal;
- }
-
- static createPcJournal(opts) { return this.createArchivistJournal({ ...opts, sheetType: 'pc', folderName: 'Archivist - PCs' }); }
- static createNpcJournal(opts) { return this.createArchivistJournal({ ...opts, sheetType: 'npc', folderName: 'Archivist - NPCs' }); }
- static createItemJournal(opts) { return this.createArchivistJournal({ ...opts, sheetType: 'item', folderName: 'Archivist - Items' }); }
- static createLocationJournal(opts) { return this.createArchivistJournal({ ...opts, sheetType: 'location', folderName: 'Archivist - Locations' }); }
- static createFactionJournal(opts) { return this.createArchivistJournal({ ...opts, sheetType: 'faction', folderName: 'Archivist - Factions' }); }
- static createRecapJournal(opts) { return this.createArchivistJournal({ ...opts, sheetType: 'recap', folderName: 'Recaps' }); }
-
- /**
- * Deep clone an object
- * @param {object} obj - Object to clone
- * @returns {object} Cloned object
- */
- static deepClone(obj) {
- return foundry.utils.deepClone(obj);
- }
-
- /**
- * Merge objects using Foundry's utility
- * @param {object} original - Original object
- * @param {object} other - Object to merge
- * @returns {object} Merged object
- */
- static mergeObject(original, other) {
- return foundry.utils.mergeObject(original, other);
- }
-
- /**
- * Generate a random ID
- * @param {number} length - Length of the ID
- * @returns {string} Random ID string
- */
- static generateId(length = 8) {
- return foundry.utils.randomID(length);
- }
-
- /**
- * Format error message for display
- * @param {Error|string} error - Error object or message
- * @returns {string} Formatted error message
- */
- static formatError(error) {
- if (error instanceof Error) {
- return error.message;
- }
- return String(error);
- }
-
- /**
- * Check if a string is empty or whitespace only
- * @param {string} str - String to check
- * @returns {boolean} True if string is empty or whitespace
- */
- static isEmpty(str) {
- return !str || str.trim().length === 0;
- }
-
- /**
- * Capitalize first letter of a string
- * @param {string} str - String to capitalize
- * @returns {string} Capitalized string
- */
- static capitalize(str) {
- if (!str) return '';
- return str.charAt(0).toUpperCase() + str.slice(1);
- }
-}
diff --git a/scripts/services/archivist-api.js b/scripts/services/archivist-api.js
index 42bdfcb..52f8271 100644
--- a/scripts/services/archivist-api.js
+++ b/scripts/services/archivist-api.js
@@ -28,26 +28,6 @@ export class ArchivistApiService {
}
}
- /**
- * Remove a single leading image from Markdown or HTML at the top of description.
- * Handles patterns like: \n\n, ![]()
, or wrapped in .
- * @param {string} text
- * @returns {string}
- */
- _stripLeadingImage(text) {
- const s = String(text || '');
- if (!s) return '';
- // Common patterns: Markdown image at start, possibly followed by blank line
- const mdImg = /^(?:\s*)!\[[^\]]*\]\([^\)]+\)\s*(?:\n+)?/;
- if (mdImg.test(s)) return s.replace(mdImg, '').trimStart();
- // HTML ![]()
possibly wrapped in
at the very start
- const htmlImgP = /^(?:\s*)]*>\s*]*>\s*<\/p>\s*/i;
- if (htmlImgP.test(s)) return s.replace(htmlImgP, '').trimStart();
- const htmlImg = /^(?:\s*)]*>\s*/i;
- if (htmlImg.test(s)) return s.replace(htmlImg, '').trimStart();
- return s;
- }
-
/**
* Normalize payload text fields to Markdown and optionally strip leading image.
* - Converts known text fields that can contain rich text (description, summary)
@@ -61,7 +41,7 @@ export class ArchivistApiService {
if ('description' in p) {
p.description = this._sanitizeText(p.description);
if (opts.stripImageFromDescription) {
- p.description = this._stripLeadingImage(p.description);
+ p.description = Utils.stripLeadingImage(p.description);
}
}
if ('summary' in p) {
@@ -122,62 +102,75 @@ export class ArchivistApiService {
*/
_normalizeQuestPayload(payload) {
const p = payload ? { ...payload } : {};
-
- if (!('campaign_id' in p) && 'campaignId' in p) p.campaign_id = p.campaignId;
- if (!('campaign_id' in p) && 'worldId' in p) p.campaign_id = p.worldId;
- if (!('quest_name' in p) && 'questName' in p) p.quest_name = p.questName;
- if (!('quest_giver' in p) && 'questGiver' in p) p.quest_giver = p.questGiver;
- if (!('quest_giver_id' in p) && 'questGiverId' in p) p.quest_giver_id = p.questGiverId;
- if (!('quest_category' in p) && 'questCategory' in p) p.quest_category = p.questCategory;
- if (!('success_definition' in p) && 'successDefinition' in p) {
- p.success_definition = p.successDefinition;
- }
- if (!('failure_conditions' in p) && 'failureConditions' in p) {
- p.failure_conditions = p.failureConditions;
- }
- if (!('next_action' in p) && 'nextAction' in p) p.next_action = p.nextAction;
- if (!('progress_log' in p) && 'progressLog' in p) p.progress_log = p.progressLog;
- if (!('progress_log_entries' in p) && 'progressLogEntries' in p) {
- p.progress_log_entries = p.progressLogEntries;
- }
- if (!('related_characters' in p) && 'relatedCharacters' in p) {
- p.related_characters = p.relatedCharacters;
- }
- if (!('related_factions' in p) && 'relatedFactions' in p) {
- p.related_factions = p.relatedFactions;
+ const out = {};
+
+ // The API's QuestCreate/QuestUpdate schemas declare `extra="forbid"`, so
+ // any key they don't recognize rejects the whole request with a 422. Build
+ // a strict whitelist of writable fields only — read-only response fields
+ // (questGiverId, progressLogEntries, firstSession, lastSession, counts,
+ // orderIndex, timestamps) must never leak into a write payload.
+
+ // campaign/world id is accepted on create only (QuestUpdate has no such
+ // field); only forward it when a caller actually supplied one.
+ const campaignId = p.campaign_id ?? p.campaignId ?? p.worldId;
+ if (campaignId !== undefined) out.campaign_id = campaignId;
+
+ // Scalar text / enum fields.
+ const scalars = {
+ quest_name: p.quest_name ?? p.questName,
+ quest_giver: p.quest_giver ?? p.questGiver,
+ quest_category: p.quest_category ?? p.questCategory,
+ status: p.status,
+ success_definition: p.success_definition ?? p.successDefinition,
+ failure_conditions: p.failure_conditions ?? p.failureConditions,
+ next_action: p.next_action ?? p.nextAction,
+ resolution: p.resolution,
+ };
+ for (const [key, value] of Object.entries(scalars)) {
+ if (value !== undefined) out[key] = value;
}
- if (!('related_locations' in p) && 'relatedLocations' in p) {
- p.related_locations = p.relatedLocations;
+
+ // Objectives → [{ text, status }] (drop server-managed id/order). The
+ // API requires text with min_length=1 and rejects the whole request
+ // otherwise, so drop entries with empty text.
+ const objectives = p.objectives;
+ if (Array.isArray(objectives)) {
+ out.objectives = objectives
+ .map((o) =>
+ typeof o === 'string'
+ ? { text: o.trim(), status: 'pending' }
+ : {
+ text: String(o?.text ?? '').trim(),
+ status: o?.status ?? 'pending',
+ }
+ )
+ .filter((o) => o.text.length > 0);
}
- if (!('related_items' in p) && 'relatedItems' in p) {
- p.related_items = p.relatedItems;
+
+ // Progress log → [str].
+ const progressLog = p.progress_log ?? p.progressLog;
+ if (Array.isArray(progressLog)) {
+ out.progress_log = progressLog.map((e) =>
+ typeof e === 'string' ? e : e?.text ?? ''
+ );
}
- if (!('related_entity_refs' in p) && 'relatedEntityRefs' in p) {
- p.related_entity_refs = p.relatedEntityRefs;
+
+ // Related entity name lists → [str].
+ const relatedLists = {
+ related_characters: p.related_characters ?? p.relatedCharacters,
+ related_factions: p.related_factions ?? p.relatedFactions,
+ related_locations: p.related_locations ?? p.relatedLocations,
+ related_items: p.related_items ?? p.relatedItems,
+ };
+ for (const [key, value] of Object.entries(relatedLists)) {
+ if (Array.isArray(value)) out[key] = value;
}
- if (!('first_session' in p) && 'firstSession' in p) p.first_session = p.firstSession;
- if (!('last_session' in p) && 'lastSession' in p) p.last_session = p.lastSession;
-
- delete p.campaignId;
- delete p.worldId;
- delete p.questName;
- delete p.questGiver;
- delete p.questGiverId;
- delete p.questCategory;
- delete p.successDefinition;
- delete p.failureConditions;
- delete p.nextAction;
- delete p.progressLog;
- delete p.progressLogEntries;
- delete p.relatedCharacters;
- delete p.relatedFactions;
- delete p.relatedLocations;
- delete p.relatedItems;
- delete p.relatedEntityRefs;
- delete p.firstSession;
- delete p.lastSession;
- return p;
+ // Structured related refs pass through untouched.
+ const refs = p.related_entity_refs ?? p.relatedEntityRefs;
+ if (Array.isArray(refs)) out.related_entity_refs = refs;
+
+ return out;
}
/**
@@ -237,21 +230,24 @@ export class ArchivistApiService {
}
}
+ // keepalive lets in-flight writes survive page unload, but Chromium
+ // rejects keepalive requests whose body exceeds 64 KiB — skip it for
+ // large payloads (e.g. long journal content) so they still send.
+ const bodySize =
+ typeof options?.body === 'string'
+ ? new TextEncoder().encode(options.body).length
+ : 0;
+ const useKeepalive = isWrite && bodySize < 60000;
+
while (attempt <= maxRetries) {
try {
- const method = String(options?.method || 'GET').toUpperCase();
- const isWrite =
- method === 'POST' ||
- method === 'PUT' ||
- method === 'PATCH' ||
- method === 'DELETE';
const fetchOptions = {
...options,
headers,
mode: 'cors',
cache: 'no-store',
};
- if (isWrite) fetchOptions.keepalive = true;
+ if (useKeepalive) fetchOptions.keepalive = true;
const response = await fetch(url, fetchOptions);
// Handle successful responses (non-429)
@@ -568,7 +564,7 @@ export class ArchivistApiService {
: Array.isArray(data.data)
? data.data
: [];
- all.push(...items.map((quest) => this._normalizeQuestResponse(quest)));
+ all.push(...items);
const totalPages =
typeof data.pages === 'number'
? data.pages
@@ -1369,7 +1365,9 @@ export class ArchivistApiService {
: Array.isArray(data.data)
? data.data
: [];
- all.push(...items);
+ // Normalize to camelCase so quest reads are consistent with the shape
+ // returned by createQuest/updateQuest/getQuest.
+ all.push(...items.map((quest) => this._normalizeQuestResponse(quest)));
const totalPages =
typeof data.pages === 'number'
? data.pages
diff --git a/scripts/sidebar/ask-chat-sidebar-tab.js b/scripts/sidebar/ask-chat-sidebar-tab.js
deleted file mode 100644
index 405f8b6..0000000
--- a/scripts/sidebar/ask-chat-sidebar-tab.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import { AskChatWindow } from '../dialogs/ask-chat-window.js';
-
-export class AskChatSidebarTab extends foundry.applications.sidebar
- .AbstractSidebarTab {
- static DEFAULT_OPTIONS = foundry.utils.mergeObject(
- foundry.utils.deepClone(super.DEFAULT_OPTIONS),
- {
- id: 'archivist-chat',
- title:
- game.i18n?.localize?.('ARCHIVIST_SYNC.Menu.AskChat.Label') ??
- 'Archivist Chat',
- icon: 'fa-solid fa-sparkles',
- tooltip:
- game.i18n?.localize?.('ARCHIVIST_SYNC.Menu.AskChat.Label') ??
- 'Archivist Chat',
- group: 'primary',
- contentTemplate: 'modules/archivist-sync/templates/ask-chat-window.hbs',
- popOut: false,
- }
- );
-
- async getData(options) {
- try {
- console.log('[Archivist Sync][SidebarTab] getData()', { options });
- } catch (_) {}
- if (!this.chatApp) this.chatApp = new AskChatWindow({ popOut: false });
- return this.chatApp.getData();
- }
-
- async activateListeners(html) {
- try {
- console.log('[Archivist Sync][SidebarTab] activateListeners()', { html });
- } catch (_) {}
- super.activateListeners(html);
- if (!this.chatApp) this.chatApp = new AskChatWindow({ popOut: false });
- const el = this.element;
- if (el) {
- el.style.height = '100%';
- el.style.overflow = 'hidden auto';
- // Mount and render the chat UI into the sidebar panel
- this.chatApp._mountEl = el;
- await this.chatApp.render(false);
- const msgList = el.querySelector?.('.messages');
- if (msgList) msgList.scrollTop = msgList.scrollHeight;
- console.log('[Archivist Sync][SidebarTab] content mounted');
- }
- }
-}
-
-export default AskChatSidebarTab;
diff --git a/templates/world-setup-dialog.hbs b/templates/world-setup-dialog.hbs
index 6a93bbf..0585f80 100644
--- a/templates/world-setup-dialog.hbs
+++ b/templates/world-setup-dialog.hbs
@@ -481,11 +481,11 @@
-
{{syncStatus.processed}} / {{syncStatus.total}} — {{syncStatus.current}}
+
{{syncStatus.processed}} / {{syncStatus.total}} — {{syncStatus.current}}
{{/if}}
{{#if syncStatus.logs}}