mirror of
https://github.com/ajayyy/SponsorBlockServer.git
synced 2025-12-24 00:18:23 +03:00
Resolve conflicts
This commit is contained in:
@@ -6,6 +6,7 @@ import { RedisClientOptions } from "@redis/client/dist/lib/client";
|
|||||||
import { RedisReply } from "rate-limit-redis";
|
import { RedisReply } from "rate-limit-redis";
|
||||||
import { db } from "../databases/databases";
|
import { db } from "../databases/databases";
|
||||||
import { Postgres } from "../databases/Postgres";
|
import { Postgres } from "../databases/Postgres";
|
||||||
|
import { compress, uncompress } from "lz4-napi";
|
||||||
|
|
||||||
export interface RedisStats {
|
export interface RedisStats {
|
||||||
activeRequests: number;
|
activeRequests: number;
|
||||||
@@ -16,8 +17,11 @@ export interface RedisStats {
|
|||||||
|
|
||||||
interface RedisSB {
|
interface RedisSB {
|
||||||
get(key: RedisCommandArgument): Promise<string>;
|
get(key: RedisCommandArgument): Promise<string>;
|
||||||
|
getCompressed(key: RedisCommandArgument): Promise<string>;
|
||||||
set(key: RedisCommandArgument, value: RedisCommandArgument, options?: SetOptions): Promise<string>;
|
set(key: RedisCommandArgument, value: RedisCommandArgument, options?: SetOptions): Promise<string>;
|
||||||
|
setCompressed(key: RedisCommandArgument, value: RedisCommandArgument, options?: SetOptions): Promise<string>;
|
||||||
setEx(key: RedisCommandArgument, seconds: number, value: RedisCommandArgument): Promise<string>;
|
setEx(key: RedisCommandArgument, seconds: number, value: RedisCommandArgument): Promise<string>;
|
||||||
|
setExCompressed(key: RedisCommandArgument, seconds: number, value: RedisCommandArgument): Promise<string>;
|
||||||
del(...keys: [RedisCommandArgument]): Promise<number>;
|
del(...keys: [RedisCommandArgument]): Promise<number>;
|
||||||
increment?(key: RedisCommandArgument): Promise<RedisCommandRawReply[]>;
|
increment?(key: RedisCommandArgument): Promise<RedisCommandRawReply[]>;
|
||||||
sendCommand(args: RedisCommandArguments, options?: RedisClientOptions): Promise<RedisReply>;
|
sendCommand(args: RedisCommandArguments, options?: RedisClientOptions): Promise<RedisReply>;
|
||||||
@@ -27,8 +31,11 @@ interface RedisSB {
|
|||||||
|
|
||||||
let exportClient: RedisSB = {
|
let exportClient: RedisSB = {
|
||||||
get: () => Promise.resolve(null),
|
get: () => Promise.resolve(null),
|
||||||
|
getCompressed: () => Promise.resolve(null),
|
||||||
set: () => Promise.resolve(null),
|
set: () => Promise.resolve(null),
|
||||||
|
setCompressed: () => Promise.resolve(null),
|
||||||
setEx: () => Promise.resolve(null),
|
setEx: () => Promise.resolve(null),
|
||||||
|
setExCompressed: () => Promise.resolve(null),
|
||||||
del: () => Promise.resolve(null),
|
del: () => Promise.resolve(null),
|
||||||
increment: () => Promise.resolve(null),
|
increment: () => Promise.resolve(null),
|
||||||
sendCommand: () => Promise.resolve(null),
|
sendCommand: () => Promise.resolve(null),
|
||||||
@@ -36,7 +43,6 @@ let exportClient: RedisSB = {
|
|||||||
ttl: () => Promise.resolve(null),
|
ttl: () => Promise.resolve(null),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
let lastClientFail = 0;
|
let lastClientFail = 0;
|
||||||
let lastReadFail = 0;
|
let lastReadFail = 0;
|
||||||
let activeRequests = 0;
|
let activeRequests = 0;
|
||||||
@@ -47,7 +53,7 @@ const writeResponseTime: number[] = [];
|
|||||||
let lastResponseTimeLimit = 0;
|
let lastResponseTimeLimit = 0;
|
||||||
const maxStoredTimes = 200;
|
const maxStoredTimes = 200;
|
||||||
|
|
||||||
export class TooManyActiveConnectionsError extends Error {}
|
export class TooManyActiveConnectionsError extends Error { }
|
||||||
|
|
||||||
export let connectionPromise = Promise.resolve();
|
export let connectionPromise = Promise.resolve();
|
||||||
|
|
||||||
@@ -57,8 +63,24 @@ if (config.redis?.enabled) {
|
|||||||
const readClient = config.redisRead?.enabled ? createClient(config.redisRead) : null;
|
const readClient = config.redisRead?.enabled ? createClient(config.redisRead) : null;
|
||||||
connectionPromise = client.connect();
|
connectionPromise = client.connect();
|
||||||
void readClient?.connect(); // void as we don't care about the promise
|
void readClient?.connect(); // void as we don't care about the promise
|
||||||
exportClient = client as RedisSB;
|
exportClient = client as unknown as RedisSB;
|
||||||
|
|
||||||
|
exportClient.getCompressed = (key) => {
|
||||||
|
return exportClient.get(key).then((reply) => {
|
||||||
|
if (reply === null) return null;
|
||||||
|
return uncompress(Buffer.from(reply, "base64")).then((decompressed) => decompressed.toString("utf-8"));
|
||||||
|
});
|
||||||
|
};
|
||||||
|
exportClient.setCompressed = (key, value, options) => {
|
||||||
|
return compress(Buffer.from(value as string, "utf-8")).then((compressed) =>
|
||||||
|
exportClient.set(key, compressed.toString("base64"), options)
|
||||||
|
);
|
||||||
|
};
|
||||||
|
exportClient.setExCompressed = (key, seconds, value) => {
|
||||||
|
return compress(Buffer.from(value as string, "utf-8")).then((compressed) =>
|
||||||
|
exportClient.setEx(key, seconds, compressed.toString("base64"))
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
const get = client.get.bind(client);
|
const get = client.get.bind(client);
|
||||||
const getRead = readClient?.get?.bind(readClient);
|
const getRead = readClient?.get?.bind(readClient);
|
||||||
@@ -140,7 +162,7 @@ if (config.redis?.enabled) {
|
|||||||
.catch((err) => reject(err))
|
.catch((err) => reject(err))
|
||||||
);
|
);
|
||||||
/* istanbul ignore next */
|
/* istanbul ignore next */
|
||||||
client.on("error", function(error) {
|
client.on("error", function (error) {
|
||||||
lastClientFail = Date.now();
|
lastClientFail = Date.now();
|
||||||
Logger.error(`Redis Error: ${error}`);
|
Logger.error(`Redis Error: ${error}`);
|
||||||
});
|
});
|
||||||
@@ -149,7 +171,7 @@ if (config.redis?.enabled) {
|
|||||||
Logger.info("Redis: trying to reconnect");
|
Logger.info("Redis: trying to reconnect");
|
||||||
});
|
});
|
||||||
/* istanbul ignore next */
|
/* istanbul ignore next */
|
||||||
readClient?.on("error", function(error) {
|
readClient?.on("error", function (error) {
|
||||||
lastReadFail = Date.now();
|
lastReadFail = Date.now();
|
||||||
Logger.error(`Redis Read-Only Error: ${error}`);
|
Logger.error(`Redis Read-Only Error: ${error}`);
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user