reidlab/amdl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make the cache act right

Browse source
This commit is contained in:
Reid 2025-10-13 00:46:46 -07:00
parent 3a179e0c69
commit 8872d127a9
Signed by: reidlab
GPG key ID: DAF5EAF6665839FD
1 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/cache.ts
View file

@ -26,16 +26,21 @@ try {
let entriesClearedBytes = 0; let entriesClearedBytes = 0;
log.debug("cache cleanup and expiry timers starting"); log.debug("cache cleanup and expiry timers starting");
await Promise.all((await db.select().from(fileCacheTable)).map(async ({ name, expiry }) => { const results = await Promise.all((await db.select().from(fileCacheTable)).map(async ({ name, expiry }) => {
if (expiry < Date.now()) { if (expiry < Date.now()) {
entriesCleared++; return await dropFile(name);
entriesClearedBytes += (await fsPromises.stat(path.join(config.downloader.cache.directory, name))).size;
await dropFile(name);
} else { } else {
await scheduleDeletion(name, expiry); await scheduleDeletion(name, expiry);
} }
})); }));
for (const result of results) {
if (result !== undefined) {
entriesCleared += 1;
entriesClearedBytes += result;
}
}
log.debug("cache cleanup complete!"); log.debug("cache cleanup complete!");
log.debug(`cleared ${entriesCleared} entr${entriesCleared === 1 ? "y" : "ies"}, freeing up ${prettyBytes(entriesClearedBytes)}!`); log.debug(`cleared ${entriesCleared} entr${entriesCleared === 1 ? "y" : "ies"}, freeing up ${prettyBytes(entriesClearedBytes)}!`);
} catch (err) { } catch (err) {
@ -56,19 +61,26 @@ async function scheduleDeletion(name: string, expiry: number): Promise<void> {
timers.set(name, timeout); timers.set(name, timeout);
} }
async function dropFile(name: string): Promise<void> { // TODO: add behavior toggle: should we keep it in the database on failure or not ??
const size = (await fsPromises.stat(path.join(config.downloader.cache.directory, name))).size; // current behavior: delete from db first, then try deleting files
await fsPromises.unlink(path.join(config.downloader.cache.directory, name)).catch((err) => { // this is good if manual cleanup was already done (we can then ignore ENOENT)
if (err.code !== "ENOENT") { // bad if they change the permissions instead of manual removal
log.error(`failed to delete cached file ${name} for whatever reason!`); async function dropFile(name: string): Promise<number | undefined> {
log.error("manual removal may be necessary!"); try {
log.error(err); await db.delete(fileCacheTable).where(eq(fileCacheTable.name, name));
} const size = (await fsPromises.stat(path.join(config.downloader.cache.directory, name))).size;
}); await fsPromises.unlink(path.join(config.downloader.cache.directory, name));
log.debug(`deleted file ${name} from cache, freeing up ${prettyBytes(size)}`); log.debug(`deleted file ${name} from cache, freeing up ${prettyBytes(size)}`);
await db.delete(fileCacheTable).where(eq(fileCacheTable.name, name)); return size;
} catch (err) {
if (err instanceof Error && err.message.includes("ENOENT")) { return; }
log.error(`failed to delete cached file ${name} for whatever reason!`);
log.error("manual removal may be necessary!");
log.error(err);
}
} }
export async function addFileToCache(fileName: string): Promise<void> { export async function addFileToCache(fileName: string): Promise<void> {