Add PF2e attack effects, ability frequency, and perception details
Show inline on-hit effects on attack lines (e.g., "plus Grab"), frequency limits on abilities (e.g., "(1/day)"), and perception details text alongside senses. Strip redundant frequency lines from Foundry descriptions. Also add resilient PF2e source fetching: batched requests with retry, graceful handling of ad-blocker-blocked creature files (partial success with toast warning and re-fetch prompt for missing creatures). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -28,7 +28,10 @@ interface BestiaryHook {
|
||||
getCreature: (id: CreatureId) => AnyCreature | undefined;
|
||||
isLoaded: boolean;
|
||||
isSourceCached: (sourceCode: string) => Promise<boolean>;
|
||||
fetchAndCacheSource: (sourceCode: string, url: string) => Promise<void>;
|
||||
fetchAndCacheSource: (
|
||||
sourceCode: string,
|
||||
url: string,
|
||||
) => Promise<{ skippedNames: string[] }>;
|
||||
uploadAndCacheSource: (
|
||||
sourceCode: string,
|
||||
jsonData: unknown,
|
||||
@@ -36,6 +39,108 @@ interface BestiaryHook {
|
||||
refreshCache: () => Promise<void>;
|
||||
}
|
||||
|
||||
interface BatchResult {
|
||||
readonly responses: unknown[];
|
||||
readonly failed: string[];
|
||||
}
|
||||
|
||||
async function fetchJson(url: string, path: string): Promise<unknown> {
|
||||
const response = await fetch(url);
|
||||
if (!response.ok) {
|
||||
throw new Error(
|
||||
`Failed to fetch ${path}: ${response.status} ${response.statusText}`,
|
||||
);
|
||||
}
|
||||
return response.json();
|
||||
}
|
||||
|
||||
async function fetchWithRetry(
|
||||
url: string,
|
||||
path: string,
|
||||
retries = 2,
|
||||
): Promise<unknown> {
|
||||
try {
|
||||
return await fetchJson(url, path);
|
||||
} catch (error) {
|
||||
if (retries <= 0) throw error;
|
||||
await new Promise<void>((r) => setTimeout(r, 500));
|
||||
return fetchWithRetry(url, path, retries - 1);
|
||||
}
|
||||
}
|
||||
|
||||
async function fetchBatch(
|
||||
baseUrl: string,
|
||||
paths: string[],
|
||||
): Promise<BatchResult> {
|
||||
const settled = await Promise.allSettled(
|
||||
paths.map((path) => fetchWithRetry(`${baseUrl}${path}`, path)),
|
||||
);
|
||||
const responses: unknown[] = [];
|
||||
const failed: string[] = [];
|
||||
for (let i = 0; i < settled.length; i++) {
|
||||
const result = settled[i];
|
||||
if (result.status === "fulfilled") {
|
||||
responses.push(result.value);
|
||||
} else {
|
||||
failed.push(paths[i]);
|
||||
}
|
||||
}
|
||||
return { responses, failed };
|
||||
}
|
||||
|
||||
async function fetchInBatches(
|
||||
paths: string[],
|
||||
baseUrl: string,
|
||||
concurrency: number,
|
||||
): Promise<BatchResult> {
|
||||
const batches: string[][] = [];
|
||||
for (let i = 0; i < paths.length; i += concurrency) {
|
||||
batches.push(paths.slice(i, i + concurrency));
|
||||
}
|
||||
const accumulated = await batches.reduce<Promise<BatchResult>>(
|
||||
async (prev, batch) => {
|
||||
const acc = await prev;
|
||||
const result = await fetchBatch(baseUrl, batch);
|
||||
return {
|
||||
responses: [...acc.responses, ...result.responses],
|
||||
failed: [...acc.failed, ...result.failed],
|
||||
};
|
||||
},
|
||||
Promise.resolve({ responses: [], failed: [] }),
|
||||
);
|
||||
return accumulated;
|
||||
}
|
||||
|
||||
interface Pf2eFetchResult {
|
||||
creatures: AnyCreature[];
|
||||
skippedNames: string[];
|
||||
}
|
||||
|
||||
async function fetchPf2eSource(
|
||||
paths: string[],
|
||||
url: string,
|
||||
sourceCode: string,
|
||||
displayName: string,
|
||||
resolveNames: (failedPaths: string[]) => Map<string, string>,
|
||||
): Promise<Pf2eFetchResult> {
|
||||
const baseUrl = url.endsWith("/") ? url : `${url}/`;
|
||||
const { responses, failed } = await fetchInBatches(paths, baseUrl, 6);
|
||||
if (responses.length === 0) {
|
||||
throw new Error(
|
||||
`Failed to fetch any creatures (${failed.length} failed). This may be caused by an ad blocker — try disabling it for this site or use file upload instead.`,
|
||||
);
|
||||
}
|
||||
const nameMap = failed.length > 0 ? resolveNames(failed) : new Map();
|
||||
const skippedNames = failed.map((p) => nameMap.get(p) ?? p);
|
||||
if (skippedNames.length > 0) {
|
||||
console.warn("Skipped creatures (ad blocker?):", skippedNames);
|
||||
}
|
||||
return {
|
||||
creatures: normalizeFoundryCreatures(responses, sourceCode, displayName),
|
||||
skippedNames,
|
||||
};
|
||||
}
|
||||
|
||||
export function useBestiary(): BestiaryHook {
|
||||
const { bestiaryCache, bestiaryIndex, pf2eBestiaryIndex } = useAdapters();
|
||||
const { edition } = useRulesEditionContext();
|
||||
@@ -108,30 +213,25 @@ export function useBestiary(): BestiaryHook {
|
||||
);
|
||||
|
||||
const fetchAndCacheSource = useCallback(
|
||||
async (sourceCode: string, url: string): Promise<void> => {
|
||||
async (
|
||||
sourceCode: string,
|
||||
url: string,
|
||||
): Promise<{ skippedNames: string[] }> => {
|
||||
let creatures: AnyCreature[];
|
||||
let skippedNames: string[] = [];
|
||||
|
||||
if (edition === "pf2e") {
|
||||
// PF2e: url is a base URL; fetch each creature file in parallel
|
||||
const paths = pf2eBestiaryIndex.getCreaturePathsForSource(sourceCode);
|
||||
const baseUrl = url.endsWith("/") ? url : `${url}/`;
|
||||
const responses = await Promise.all(
|
||||
paths.map(async (path) => {
|
||||
const response = await fetch(`${baseUrl}${path}`);
|
||||
if (!response.ok) {
|
||||
throw new Error(
|
||||
`Failed to fetch ${path}: ${response.status} ${response.statusText}`,
|
||||
);
|
||||
}
|
||||
return response.json();
|
||||
}),
|
||||
);
|
||||
const displayName = pf2eBestiaryIndex.getSourceDisplayName(sourceCode);
|
||||
creatures = normalizeFoundryCreatures(
|
||||
responses,
|
||||
const result = await fetchPf2eSource(
|
||||
paths,
|
||||
url,
|
||||
sourceCode,
|
||||
displayName,
|
||||
pf2eBestiaryIndex.getCreatureNamesByPaths,
|
||||
);
|
||||
creatures = result.creatures;
|
||||
skippedNames = result.skippedNames;
|
||||
} else {
|
||||
const response = await fetch(url);
|
||||
if (!response.ok) {
|
||||
@@ -160,6 +260,7 @@ export function useBestiary(): BestiaryHook {
|
||||
}
|
||||
return next;
|
||||
});
|
||||
return { skippedNames };
|
||||
},
|
||||
[bestiaryCache, bestiaryIndex, pf2eBestiaryIndex, edition, system],
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user