Fascinated/node-fetch-cache
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Activity

have FileSystemCache TTLs survive the process exiting

Browse Source
This commit is contained in:
Randall Schmidt 2021-08-07 17:29:06 -04:00
parent 6607a71af6
commit 55b92ee40f
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/classes/caching/file_system_cache.js
View File

@ -1,6 +1,5 @@
import cacache from 'cacache'; import cacache from 'cacache';
import { Readable } from 'stream'; import { Readable } from 'stream';
import { KeyTimeout } from './key_timeout.js';
function getBodyAndMetaKeys(key) { function getBodyAndMetaKeys(key) {
return [`${key}body`, `${key}meta`]; return [`${key}body`, `${key}meta`];
@ -9,7 +8,6 @@ function getBodyAndMetaKeys(key) {
export class FileSystemCache { export class FileSystemCache {
constructor(options = {}) { constructor(options = {}) {
this.ttl = options.ttl; this.ttl = options.ttl;
this.keyTimeout = new KeyTimeout();
this.cacheDirectory = options.cacheDirectory || '.cache'; this.cacheDirectory = options.cacheDirectory || '.cache';
} }
@ -24,9 +22,15 @@ export class FileSystemCache {
const metaBuffer = await cacache.get.byDigest(this.cacheDirectory, metaInfo.integrity); const metaBuffer = await cacache.get.byDigest(this.cacheDirectory, metaInfo.integrity);
const metaData = JSON.parse(metaBuffer); const metaData = JSON.parse(metaBuffer);
const { bodyStreamIntegrity, empty } = metaData; const { bodyStreamIntegrity, empty, expiration } = metaData;
delete metaData.bodyStreamIntegrity; delete metaData.bodyStreamIntegrity;
delete metaData.empty; delete metaData.empty;
delete metaData.expiration;
if (expiration && expiration < Date.now()) {
return undefined;
}
const bodyStream = empty const bodyStream = empty
? Readable.from(Buffer.alloc(0)) ? Readable.from(Buffer.alloc(0))
@ -41,8 +45,6 @@ export class FileSystemCache {
remove(key) { remove(key) {
const [bodyKey, metaKey] = getBodyAndMetaKeys(key); const [bodyKey, metaKey] = getBodyAndMetaKeys(key);
this.keyTimeout.clearTimeout(key);
return Promise.all([ return Promise.all([
cacache.rm.entry(this.cacheDirectory, bodyKey), cacache.rm.entry(this.cacheDirectory, bodyKey),
cacache.rm.entry(this.cacheDirectory, metaKey), cacache.rm.entry(this.cacheDirectory, metaKey),
@ -53,7 +55,9 @@ export class FileSystemCache {
const [bodyKey, metaKey] = getBodyAndMetaKeys(key); const [bodyKey, metaKey] = getBodyAndMetaKeys(key);
const metaCopy = { ...metaData }; const metaCopy = { ...metaData };
this.keyTimeout.clearTimeout(key); if (typeof this.ttl === 'number') {
metaCopy.expiration = Date.now() + this.ttl;
}
try { try {
metaCopy.bodyStreamIntegrity = await new Promise((fulfill, reject) => { metaCopy.bodyStreamIntegrity = await new Promise((fulfill, reject) => {
@ -75,10 +79,6 @@ export class FileSystemCache {
await cacache.put(this.cacheDirectory, metaKey, metaBuffer); await cacache.put(this.cacheDirectory, metaKey, metaBuffer);
const cachedData = await this.get(key); const cachedData = await this.get(key);
if (typeof this.ttl === 'number') {
this.keyTimeout.updateTimeout(key, this.ttl, () => this.remove(key));
}
return cachedData; return cachedData;
} }
} }