Mirror/SponsorBlockServer
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlockServer.git synced 2025-12-12 14:37:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues with query caching for ratings

Browse Source
This commit is contained in:
Ajay Ramachandran
2021-12-02 23:42:39 -05:00
parent 48ac8d1136
commit 0cd25f0498
1 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/utils/queryCacher.ts
View File

@@ -27,7 +27,7 @@ async function get<T>(fetchFromDB: () => Promise<T>, key: string): Promise<T> {
/** /**
* Gets from redis for all specified values and splits the result before adding it to redis cache * Gets from redis for all specified values and splits the result before adding it to redis cache
*/ */
async function getAndSplit<T, U>(fetchFromDB: (values: U[]) => Promise<Array<T>>, keyGenerator: (value: U) => string, splitKey: string, values: U[]): Promise<Array<T>> { async function getAndSplit<T, U extends string>(fetchFromDB: (values: U[]) => Promise<Array<T>>, keyGenerator: (value: U) => string, splitKey: string, values: U[]): Promise<Array<T>> {
const cachedValues = await Promise.all(values.map(async (value) => { const cachedValues = await Promise.all(values.map(async (value) => {
const key = keyGenerator(value); const key = keyGenerator(value);
const { err, reply } = await redis.getAsync(key); const { err, reply } = await redis.getAsync(key);
@@ -49,24 +49,36 @@ async function getAndSplit<T, U>(fetchFromDB: (values: U[]) => Promise<Array<T>>
}; };
})); }));
const data = await fetchFromDB( const valuesToBeFetched = cachedValues.filter((cachedValue) => cachedValue.result === null)
cachedValues.filter((cachedValue) => cachedValue.result === null) .map((cachedValue) => cachedValue.value);
.map((cachedValue) => cachedValue.value));
let data: Array<T> = [];
if (valuesToBeFetched.length > 0) {
data = await fetchFromDB(valuesToBeFetched);
new Promise(() => { new Promise(() => {
const newResults: Record<string, T[]> = {}; const newResults: Record<string, T[]> = {};
for (const item of data) { for (const item of data) {
const key = (item as unknown as Record<string, string>)[splitKey]; const splitValue = (item as unknown as Record<string, string>)[splitKey];
const key = keyGenerator(splitValue as unknown as U);
newResults[key] ??= []; newResults[key] ??= [];
newResults[key].push(item); newResults[key].push(item);
} }
for (const value of valuesToBeFetched) {
// If it wasn't in the result, cache it as blank
newResults[keyGenerator(value)] ??= [];
}
console.log(newResults);
for (const key in newResults) { for (const key in newResults) {
redis.setAsync(keyGenerator(key as unknown as U), JSON.stringify(newResults[key])); redis.setAsync(key, JSON.stringify(newResults[key]));
} }
}); });
}
return data.concat(cachedValues.map((cachedValue) => cachedValue.result).filter((result) => result !== null)); return data.concat(...(cachedValues.map((cachedValue) => cachedValue.result).filter((result) => result !== null) || []));
} }
function clearSegmentCache(videoInfo: { videoID: VideoID; hashedVideoID: VideoIDHash; service: Service; userID?: UserID; }): void { function clearSegmentCache(videoInfo: { videoID: VideoID; hashedVideoID: VideoIDHash; service: Service; userID?: UserID; }): void {