Creepso/webstreamr-github
1
0
Fork 0
Code Issues 27 Pull requests 7 Projects Releases 240 Packages Wiki Activity Actions

fix(fetcher): consider request body for cache key

Browse source
This commit is contained in:
WebStreamr 2025-06-14 20:24:02 +00:00
parent 89af08b703
commit 6541782541
No known key found for this signature in database
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/utils/Fetcher.ts
View file

@ -144,10 +144,10 @@ export class Fetcher {
httpCacheItem.body = challengeResult.solution.response;
const ttl = this.determineTtl(httpCacheItem);
const ttl = this.determineCacheTtl(httpCacheItem);
/* istanbul ignore next */
if (ttl > 0) {
this.httpCache.set(url.href, httpCacheItem, { ttl });
this.httpCache.set(this.determineCacheKey(url, init), httpCacheItem, { ttl });
}
return httpCacheItem;
@ -169,7 +169,11 @@ export class Fetcher {
throw new HttpError(httpCacheItem.status, httpCacheItem.statusText, responseHeaders);
};
private determineTtl(httpCacheItem: HttpCacheItem): number {
private determineCacheKey(url: URL, init?: CustomRequestInit): string {
return `${url.href}_${init?.body?.toString()}`;
}
private determineCacheTtl(httpCacheItem: HttpCacheItem): number {
if (httpCacheItem.status === 200) {
return Math.max(httpCacheItem.policy.timeToLive(), 900000); // 15m at least
}
@ -192,7 +196,8 @@ export class Fetcher {
const request: CachePolicy.Request = { url: url.href, method: newInit.method ?? 'GET', headers: {} };
let httpCacheItem: HttpCacheItem | undefined = this.httpCache.get(url.href);
const cacheKey = this.determineCacheKey(url, init);
let httpCacheItem: HttpCacheItem | undefined = this.httpCache.get(cacheKey);
if (httpCacheItem) {
this.logger.info(`Cached fetch ${request.method} ${url}`, ctx);
return this.handleHttpCacheItem(ctx, httpCacheItem, url, init);
@ -205,9 +210,9 @@ export class Fetcher {
httpCacheItem = { policy, status: response.status, statusText: response.statusText, body };
const ttl = this.determineTtl(httpCacheItem);
const ttl = this.determineCacheTtl(httpCacheItem);
if (ttl > 0) {
this.httpCache.set(url.href, httpCacheItem, { ttl });
this.httpCache.set(cacheKey, httpCacheItem, { ttl });
}
return this.handleHttpCacheItem(ctx, httpCacheItem, url, init);