lets batch the requests for users with gazillion characters
This commit is contained in:
@@ -48,7 +48,7 @@ declare module "@mui/material/styles" {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const MainGrid = () => {
|
export const MainGrid = () => {
|
||||||
const { characters, updateCharacter } = useContext(CharacterContext);
|
const { characters } = useContext(CharacterContext);
|
||||||
const { compactMode, toggleCompactMode, alertMode, toggleAlertMode, planMode, togglePlanMode, extractionTimeMode, toggleExtractionTimeMode } = useContext(SessionContext);
|
const { compactMode, toggleCompactMode, alertMode, toggleAlertMode, planMode, togglePlanMode, extractionTimeMode, toggleExtractionTimeMode } = useContext(SessionContext);
|
||||||
const [accountOrder, setAccountOrder] = useState<string[]>([]);
|
const [accountOrder, setAccountOrder] = useState<string[]>([]);
|
||||||
const [allCollapsed, setAllCollapsed] = useState(false);
|
const [allCollapsed, setAllCollapsed] = useState(false);
|
||||||
|
@@ -19,6 +19,21 @@ import { EvePraisalResult, fetchAllPrices } from "@/eve-praisal";
|
|||||||
import { getPlanet, getPlanetUniverse, getPlanets } from "@/planets";
|
import { getPlanet, getPlanetUniverse, getPlanets } from "@/planets";
|
||||||
import { PlanetConfig } from "@/types";
|
import { PlanetConfig } from "@/types";
|
||||||
|
|
||||||
|
// Add batch processing utility
|
||||||
|
const processInBatches = async <T, R>(
|
||||||
|
items: T[],
|
||||||
|
batchSize: number,
|
||||||
|
processFn: (item: T) => Promise<R>
|
||||||
|
): Promise<R[]> => {
|
||||||
|
const results: R[] = [];
|
||||||
|
for (let i = 0; i < items.length; i += batchSize) {
|
||||||
|
const batch = items.slice(i, i + batchSize);
|
||||||
|
const batchResults = await Promise.all(batch.map(processFn));
|
||||||
|
results.push(...batchResults);
|
||||||
|
}
|
||||||
|
return results;
|
||||||
|
};
|
||||||
|
|
||||||
const Home = () => {
|
const Home = () => {
|
||||||
const searchParams = useSearchParams();
|
const searchParams = useSearchParams();
|
||||||
const [characters, setCharacters] = useState<AccessToken[]>([]);
|
const [characters, setCharacters] = useState<AccessToken[]>([]);
|
||||||
@@ -63,15 +78,13 @@ const Home = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const refreshSession = async (characters: AccessToken[]) => {
|
const refreshSession = async (characters: AccessToken[]) => {
|
||||||
return Promise.all(
|
return processInBatches(characters, 5, async (c) => {
|
||||||
characters.map((c) => {
|
try {
|
||||||
try {
|
return await refreshToken(c);
|
||||||
return refreshToken(c);
|
} catch {
|
||||||
} catch {
|
return { ...c, needsLogin: true };
|
||||||
return { ...c, needsLogin: true };
|
}
|
||||||
}
|
});
|
||||||
}),
|
|
||||||
);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleCallback = async (
|
const handleCallback = async (
|
||||||
@@ -107,24 +120,24 @@ const Home = () => {
|
|||||||
const initializeCharacterPlanets = (
|
const initializeCharacterPlanets = (
|
||||||
characters: AccessToken[],
|
characters: AccessToken[],
|
||||||
): Promise<AccessToken[]> =>
|
): Promise<AccessToken[]> =>
|
||||||
Promise.all(
|
processInBatches(characters, 3, async (c) => {
|
||||||
characters.map(async (c) => {
|
if (c.needsLogin || c.character === undefined)
|
||||||
if (c.needsLogin || c.character === undefined)
|
return { ...c, planets: [] };
|
||||||
return { ...c, planets: [] };
|
const planets = await getPlanets(c);
|
||||||
const planets = await getPlanets(c);
|
const planetsWithInfo: PlanetWithInfo[] = await processInBatches(
|
||||||
const planetsWithInfo: PlanetWithInfo[] = await Promise.all(
|
planets,
|
||||||
planets.map(async (p) => ({
|
3,
|
||||||
...p,
|
async (p) => ({
|
||||||
info: await getPlanet(c, p),
|
...p,
|
||||||
infoUniverse: await getPlanetUniverse(p),
|
info: await getPlanet(c, p),
|
||||||
})),
|
infoUniverse: await getPlanetUniverse(p),
|
||||||
);
|
})
|
||||||
return {
|
);
|
||||||
...c,
|
return {
|
||||||
planets: planetsWithInfo,
|
...c,
|
||||||
};
|
planets: planetsWithInfo,
|
||||||
}),
|
};
|
||||||
);
|
});
|
||||||
|
|
||||||
const saveCharacters = (characters: AccessToken[]): AccessToken[] => {
|
const saveCharacters = (characters: AccessToken[]): AccessToken[] => {
|
||||||
localStorage.setItem("characters", JSON.stringify(characters));
|
localStorage.setItem("characters", JSON.stringify(characters));
|
||||||
|
Reference in New Issue
Block a user