prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make reading position parsing safer

Browse source
This commit is contained in:
Jackson Harper 2024-01-31 13:32:14 +08:00
parent 9dc070243a
commit a060aaf496
2 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
packages/api/src/datasources/reading_progress_data_source.ts
View file

@ -37,18 +37,8 @@ export class ReadingProgressDataSource {
...progress,
}
const cacheKey = keyForCachedReadingPosition(uid, libraryItemID)
pushCachedReadingPosition(uid, libraryItemID, cacheItem)
this.cacheItems[cacheKey] = cacheItem
if (
await redisDataSource.redisClient?.lpush(
cacheKey,
JSON.stringify(cacheItem)
)
) {
console.log('cached reading progress', cacheKey)
} else {
console.log('failed to cache reading progress')
if (await pushCachedReadingPosition(uid, libraryItemID, cacheItem)) {
this.cacheItems[cacheKey] = cacheItem
}
}
}

33
packages/api/src/services/cached_reading_position.ts
View file

@ -1,6 +1,8 @@
import { redisDataSource } from '../redis_data_source'
import { logger } from '../utils/logger'
export const CACHED_READING_POSITION_PREFIX = `omnivore:reading-progress`
export type ReadingProgressCacheItem = {
uid: string
libraryItemID: string
@ -10,7 +12,23 @@ export type ReadingProgressCacheItem = {
updatedAt: string | undefined
}
export const CACHED_READING_POSITION_PREFIX = `omnivore:reading-progress`
export const isReadingProgressCacheItem = (
item: any
): item is ReadingProgressCacheItem => {
return (
'uid' in item && 'libraryItemID' in item && 'readingProgressPercent' in item
)
}
export const parseReadingProgressCacheItem = (
item: any
): ReadingProgressCacheItem | undefined => {
const result = JSON.parse(item) as unknown
if (isReadingProgressCacheItem(result)) {
return result
}
return undefined
}
export const keyForCachedReadingPosition = (
uid: string,
@ -77,7 +95,6 @@ export const fetchCachedReadingPosition = async (
uid: string,
libraryItemID: string
): Promise<ReadingProgressCacheItem | undefined> => {
console.log('checking uid', uid, 'libraryItemId', libraryItemID)
const cacheKey = keyForCachedReadingPosition(uid, libraryItemID)
try {
const cacheItemList = await redisDataSource.redisClient?.lrange(
@ -85,9 +102,9 @@ export const fetchCachedReadingPosition = async (
0,
-1
)
console.log('cacheItemList: ', cacheKey, cacheItemList)
const items = cacheItemList?.map((item) => JSON.parse(item))
console.log(' items[]: ', items)
const items = cacheItemList
?.map((item) => parseReadingProgressCacheItem(item))
.filter(isReadingProgressCacheItem)
if (!items || items.length < 1) {
return undefined
}
@ -99,12 +116,14 @@ export const fetchCachedReadingPosition = async (
)
const top = Math.max(
...items.map((o) =>
'readingProgressTopPercent' in o ? o.readingProgressTopPercent : 0
'readingProgressTopPercent' in o ? o.readingProgressTopPercent ?? 0 : 0
)
)
const anchor = Math.max(
...items.map((o) =>
'readingProgressAnchorIndex' in o ? o.readingProgressAnchorIndex : 0
'readingProgressAnchorIndex' in o
? o.readingProgressAnchorIndex ?? 0
: 0
)
)