preservetube
/
backend
mirror of https://github.com/preservetube/backend.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix ratelimiting keys getting deleted

This commit is contained in:
localhost 2026-03-07 09:49:16 +01:00
parent ed35dd7c19
commit 7429a9603a
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/router/websocket.ts
View File

@ -15,6 +15,7 @@ const app = new Elysia()
const videoIds: Record<string, string> = {} const videoIds: Record<string, string> = {}
const MB_LIMIT = 500 const MB_LIMIT = 500
const saveKey = (videoId: string) => `save:${videoId}`
const checkMbLimit = async (hash: string, mb?: number): Promise<boolean> => { const checkMbLimit = async (hash: string, mb?: number): Promise<boolean> => {
const key = `save-mb:${hash}` const key = `save-mb:${hash}`
@ -36,7 +37,7 @@ const sendError = (ws: any, message: string, close: boolean = true) => {
const cleanup = async (ws: any, videoId: string) => { const cleanup = async (ws: any, videoId: string) => {
delete videoIds[ws.id]; delete videoIds[ws.id];
if (videoId) await redis.del(videoId); if (videoId) await redis.del(saveKey(videoId));
await redis.del(ws.id); await redis.del(ws.id);
}; };
@ -95,7 +96,7 @@ app.ws('/save', {
const videoId = validateVideo(ws.data.query.url) const videoId = validateVideo(ws.data.query.url)
if (!videoId) return sendError(ws, 'Invalid video URL.'); if (!videoId) return sendError(ws, 'Invalid video URL.');
if (await redis.get(videoId)) return sendError(ws, 'Someone is already downloading this video...'); if (await redis.get(saveKey(videoId))) return sendError(ws, 'Someone is already downloading this video...');
if (await redis.get(`blacklist:${videoId}`)) return sendError(ws, 'This video is blacklisted.'); if (await redis.get(`blacklist:${videoId}`)) return sendError(ws, 'This video is blacklisted.');
const already = await db.selectFrom('videos') const already = await db.selectFrom('videos')
@ -124,8 +125,8 @@ app.ws('/save', {
const videoId = videoIds[ws.id]; const videoId = videoIds[ws.id];
if (!videoId) return sendError(ws, 'No video ID associated with this session.'); if (!videoId) return sendError(ws, 'No video ID associated with this session.');
if (await redis.get(videoId) !== 'downloading') { if (await redis.get(saveKey(videoId)) !== 'downloading') {
await redis.set(videoId, 'downloading', 'EX', 300) await redis.set(saveKey(videoId), 'downloading', 'EX', 300)
const captchaCheck = await checkCaptcha(message, ws.data.headers['cf-connecting-ip'] || '0.0.0.0') const captchaCheck = await checkCaptcha(message, ws.data.headers['cf-connecting-ip'] || '0.0.0.0')
if (!captchaCheck.success) { if (!captchaCheck.success) {
@ -168,7 +169,7 @@ app.ws('/save', {
} }
const uploadSuccess = await handleUpload(ws, videoId); const uploadSuccess = await handleUpload(ws, videoId);
if (!uploadSuccess) await redis.del(videoId); if (!uploadSuccess) await redis.del(saveKey(videoId));
await cleanup(ws, videoId); await cleanup(ws, videoId);
ws.close(); ws.close();
@ -220,7 +221,7 @@ app.ws('/savechannel', {
const hash = Bun.hash(getRateLimitKey(ws.data.headers['cf-connecting-ip'] || '0.0.0.0')) const hash = Bun.hash(getRateLimitKey(ws.data.headers['cf-connecting-ip'] || '0.0.0.0'))
for (const video of videos.slice(0, 5)) { for (const video of videos.slice(0, 5)) {
if (!video || (await redis.get(video.video_id)) || (await redis.get(`blacklist:${video.video_id}`))) continue; if (!video || (await redis.get(saveKey(video.video_id))) || (await redis.get(`blacklist:${video.video_id}`))) continue;
const already = await db.selectFrom('videos') const already = await db.selectFrom('videos')
.select('id') .select('id')
@ -246,7 +247,7 @@ app.ws('/savechannel', {
} }
ws.send(`DATA - Processing video: ${video.title.text}`); ws.send(`DATA - Processing video: ${video.title.text}`);
await redis.set(video.video_id, 'downloading', 'EX', 300); await redis.set(saveKey(video.video_id), 'downloading', 'EX', 300);
const downloadResult = await downloadVideo(ws, video.video_id); const downloadResult = await downloadVideo(ws, video.video_id);
if (!downloadResult.fail) { if (!downloadResult.fail) {
@ -261,7 +262,7 @@ app.ws('/savechannel', {
await handleUpload(ws, video.video_id, true); await handleUpload(ws, video.video_id, true);
} }
await redis.del(video.video_id); await redis.del(saveKey(video.video_id));
ws.send(`DATA - Created video page for ${video.title.text}`) ws.send(`DATA - Created video page for ${video.title.text}`)
} }

4
src/utils/redis.ts
View File

@ -9,10 +9,6 @@ const redis = new Redis({
redis.on('ready', async function () { redis.on('ready', async function () {
console.log('connected to redis') console.log('connected to redis')
const keys = await redis.keys('*')
const filteredKeys = keys.filter(key => !key.startsWith('blacklist:'))
if (filteredKeys.length) await redis.del(filteredKeys)
setInterval(async () => { setInterval(async () => {
const files = fs.readdirSync('videos') const files = fs.readdirSync('videos')
const targetFiles = files.filter((file) => file.endsWith('.webm') || file.endsWith('.m4a')) const targetFiles = files.filter((file) => file.endsWith('.webm') || file.endsWith('.m4a'))