mirror of
https://github.com/ajayyy/SponsorBlockServer.git
synced 2025-12-26 17:38:28 +03:00
Add locks to different write operations
This commit is contained in:
@@ -12,6 +12,7 @@ import { isUserVIP } from "../utils/isUserVIP";
|
||||
import { Logger } from "../utils/logger";
|
||||
import crypto from "crypto";
|
||||
import { QueryCacher } from "../utils/queryCacher";
|
||||
import { acquireLock } from "../utils/redisLock";
|
||||
|
||||
enum BrandingType {
|
||||
Title,
|
||||
@@ -42,6 +43,14 @@ export async function postBranding(req: Request, res: Response) {
|
||||
const hashedVideoID = await getHashCache(videoID, 1);
|
||||
const hashedIP = await getHashCache(getIP(req) + config.globalSalt as IPAddress);
|
||||
|
||||
const lock = await acquireLock(`postBranding:${videoID}.${hashedUserID}`);
|
||||
if (!lock.status) {
|
||||
res.status(429).send("Vote already in progress");
|
||||
return;
|
||||
}
|
||||
|
||||
await new Promise((resolve) => setTimeout(resolve, 3000));
|
||||
|
||||
const now = Date.now();
|
||||
const voteType = 1;
|
||||
|
||||
@@ -104,6 +113,7 @@ export async function postBranding(req: Request, res: Response) {
|
||||
|
||||
QueryCacher.clearBrandingCache({ videoID, hashedVideoID, service });
|
||||
res.status(200).send("OK");
|
||||
lock.unlock();
|
||||
} catch (e) {
|
||||
Logger.error(e as string);
|
||||
res.status(500).send("Internal Server Error");
|
||||
|
||||
@@ -24,6 +24,7 @@ import { canSubmit } from "../utils/permissions";
|
||||
import { getVideoDetails, videoDetails } from "../utils/getVideoDetails";
|
||||
import * as youtubeID from "../utils/youtubeID";
|
||||
import { banUser } from "./shadowBanUser";
|
||||
import { acquireLock } from "../utils/redisLock";
|
||||
|
||||
type CheckResult = {
|
||||
pass: boolean,
|
||||
@@ -508,6 +509,12 @@ export async function postSkipSegments(req: Request, res: Response): Promise<Res
|
||||
return res.status(userWarningCheckResult.errorCode).send(userWarningCheckResult.errorMessage);
|
||||
}
|
||||
|
||||
const lock = await acquireLock(`postSkipSegment:${videoID}.${userID}`);
|
||||
if (!lock.status) {
|
||||
res.status(429).send("Submission already in progress");
|
||||
return;
|
||||
}
|
||||
|
||||
const isVIP = (await isUserVIP(userID));
|
||||
const isTempVIP = (await isUserTempVIP(userID, videoID));
|
||||
const rawIP = getIP(req);
|
||||
@@ -618,6 +625,8 @@ export async function postSkipSegments(req: Request, res: Response): Promise<Res
|
||||
for (let i = 0; i < segments.length; i++) {
|
||||
sendWebhooks(apiVideoDetails, userID, videoID, UUIDs[i], segments[i], service).catch((e) => Logger.error(`call send webhooks ${e}`));
|
||||
}
|
||||
|
||||
lock.unlock();
|
||||
return res.json(newSegments);
|
||||
}
|
||||
|
||||
|
||||
@@ -15,6 +15,7 @@ import { QueryCacher } from "../utils/queryCacher";
|
||||
import axios from "axios";
|
||||
import { getVideoDetails, videoDetails } from "../utils/getVideoDetails";
|
||||
import { deleteLockCategories } from "./deleteLockCategories";
|
||||
import { acquireLock } from "../utils/redisLock";
|
||||
|
||||
const voteTypes = {
|
||||
normal: 0,
|
||||
@@ -335,6 +336,11 @@ export async function vote(ip: IPAddress, UUID: SegmentUUID, paramUserID: UserID
|
||||
const nonAnonUserID = await getHashCache(paramUserID);
|
||||
const userID = await getHashCache(paramUserID + UUID);
|
||||
|
||||
const lock = await acquireLock(`voteOnSponsorTime:${UUID}.${paramUserID}`);
|
||||
if (!lock.status) {
|
||||
return { status: 429, message: "Vote already in progress" };
|
||||
}
|
||||
|
||||
// To force a non 200, change this early
|
||||
const finalResponse: FinalResponse = {
|
||||
blockVote: false,
|
||||
@@ -526,6 +532,9 @@ export async function vote(ip: IPAddress, UUID: SegmentUUID, paramUserID: UserID
|
||||
finalResponse
|
||||
}).catch((e) => Logger.error(`Sending vote webhook: ${e}`));
|
||||
}
|
||||
|
||||
lock.unlock();
|
||||
|
||||
return { status: finalResponse.finalStatus, message: finalResponse.finalMessage ?? undefined };
|
||||
} catch (err) {
|
||||
Logger.error(err as string);
|
||||
|
||||
Reference in New Issue
Block a user