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

switch to reused promiseOrTimeout

Browse Source
This commit is contained in:
Michael C
2022-09-08 16:34:39 -04:00
parent 9be9d05dbe
commit 00dae6d6a1
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/routes/getStatus.ts
View File

@@ -3,30 +3,30 @@ import { Logger } from "../utils/logger";
import { Request, Response } from "express"; import { Request, Response } from "express";
import os from "os"; import os from "os";
import redis from "../utils/redis"; import redis from "../utils/redis";
import { setTimeout } from "timers/promises"; import { promiseOrTimeout } from "../utils/promise";
export async function getStatus(req: Request, res: Response): Promise<Response> { export async function getStatus(req: Request, res: Response): Promise<Response> {
const startTime = Date.now(); const startTime = Date.now();
let value = req.params.value as string[] | string; let value = req.params.value as string[] | string;
value = Array.isArray(value) ? value[0] : value; value = Array.isArray(value) ? value[0] : value;
let processTime, redisProcessTime = -1; let processTime, redisProcessTime = -1;
const timeoutPromise = async (): Promise<string> => {
await setTimeout(5000);
return "timeout";
};
try { try {
const dbVersion = await Promise.race([db.prepare("get", "SELECT key, value FROM config where key = ?", ["version"]), timeoutPromise()]) const dbVersion = await promiseOrTimeout(db.prepare("get", "SELECT key, value FROM config where key = ?", ["version"]), 5000)
.then(e => { .then(e => {
if (e === "timeout") return e;
processTime = Date.now() - startTime; processTime = Date.now() - startTime;
return e.value; return e.value;
})
.catch(e => {
Logger.error(`status: SQL query timed out: ${e}`);
}); });
let statusRequests: unknown = 0; let statusRequests: unknown = 0;
const numberRequests = await Promise.race([redis.increment("statusRequest"), timeoutPromise()]) const numberRequests = await promiseOrTimeout(redis.increment("statusRequest"), 5000)
.then(e => { .then(e => {
if (e === "timeout") return [-1];
redisProcessTime = Date.now() - startTime; redisProcessTime = Date.now() - startTime;
return e; return e;
}).catch(e => {
Logger.error(`status: redis increment timed out ${e}`);
return [-1];
}); });
statusRequests = numberRequests?.[0]; statusRequests = numberRequests?.[0];