mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-01-08 11:38:51 +01:00
feat(api): initial Redis support; fix(SearchBar): proper debounce (#1039)
* refactor: use keyv for search caching with 1 min expirations * feat: keyvRedis; chore: bump keyv, bun.lockb, add jsconfig for vscode file resolution * feat: api/search redis support * refactor(redis) use ioredis cluster for keyv fix(OpenID): when redis is configured, use redis memory store for express-session * fix: revert using uri for keyvredis * fix(SearchBar): properly debounce search queries, fix weird render behaviors * refactor: add authentication to search endpoint and show error messages in results * feat: redis support for violation logs * fix(logViolation): ensure a number is always being stored in cache * feat(concurrentLimiter): uses clearPendingReq, clears pendingReq on abort, redis support * fix(api/search/enable): query only when authenticated * feat(ModelService): redis support * feat(checkBan): redis support * refactor(api/search): consolidate keyv logic * fix(ci): add default empty value for REDIS_URI * refactor(keyvRedis): use condition to initialize keyvRedis assignment * refactor(connectDb): handle disconnected state (should create a new conn) * fix(ci/e2e): handle case where cleanUp did not successfully run * fix(getDefaultEndpoint): return endpoint from localStorage if defined and endpointsConfig is default * ci(e2e): remove afterAll messages as startup/cleanUp will clear messages * ci(e2e): remove teardown for CI until further notice * chore: bump playwright/test * ci(e2e): reinstate teardown as CI issue is specific to github env * fix(ci): click settings menu trigger by testid
This commit is contained in:
parent
4ac0c04e83
commit
5145121eb7
29 changed files with 461 additions and 171 deletions
45
api/cache/clearPendingReq.js
vendored
45
api/cache/clearPendingReq.js
vendored
|
|
@ -1,29 +1,48 @@
|
|||
const Keyv = require('keyv');
|
||||
const { pendingReqFile } = require('./keyvFiles');
|
||||
const { LIMIT_CONCURRENT_MESSAGES } = process.env ?? {};
|
||||
|
||||
const keyv = new Keyv({ store: pendingReqFile, namespace: 'pendingRequests' });
|
||||
const getLogStores = require('./getLogStores');
|
||||
const { isEnabled } = require('../server/utils');
|
||||
const { USE_REDIS, LIMIT_CONCURRENT_MESSAGES } = process.env ?? {};
|
||||
const ttl = 1000 * 60 * 1;
|
||||
|
||||
/**
|
||||
* Clear pending requests from the cache.
|
||||
* Clear or decrement pending requests from the cache.
|
||||
* Checks the environmental variable LIMIT_CONCURRENT_MESSAGES;
|
||||
* if the rule is enabled ('true'), pending requests in the cache are cleared.
|
||||
* if the rule is enabled ('true'), it either decrements the count of pending requests
|
||||
* or deletes the key if the count is less than or equal to 1.
|
||||
*
|
||||
* @module clearPendingReq
|
||||
* @requires keyv
|
||||
* @requires keyvFiles
|
||||
* @requires ./getLogStores
|
||||
* @requires ../server/utils
|
||||
* @requires process
|
||||
*
|
||||
* @async
|
||||
* @function
|
||||
* @returns {Promise<void>} A promise that either clears 'pendingRequests' from store or resolves with no value.
|
||||
* @param {Object} params - The parameters object.
|
||||
* @param {string} params.userId - The user ID for which the pending requests are to be cleared or decremented.
|
||||
* @param {Object} [params.cache] - An optional cache object to use. If not provided, a default cache will be fetched using getLogStores.
|
||||
* @returns {Promise<void>} A promise that either decrements the 'pendingRequests' count, deletes the key from the store, or resolves with no value.
|
||||
*/
|
||||
const clearPendingReq = async () => {
|
||||
if (LIMIT_CONCURRENT_MESSAGES?.toLowerCase() !== 'true') {
|
||||
const clearPendingReq = async ({ userId, cache: _cache }) => {
|
||||
if (!userId) {
|
||||
return;
|
||||
} else if (!isEnabled(LIMIT_CONCURRENT_MESSAGES)) {
|
||||
return;
|
||||
}
|
||||
|
||||
await keyv.clear();
|
||||
const namespace = 'pending_req';
|
||||
const cache = _cache ?? getLogStores(namespace);
|
||||
|
||||
if (!cache) {
|
||||
return;
|
||||
}
|
||||
|
||||
const key = `${USE_REDIS ? namespace : ''}:${userId ?? ''}`;
|
||||
const currentReq = +((await cache.get(key)) ?? 0);
|
||||
|
||||
if (currentReq && currentReq >= 1) {
|
||||
await cache.set(key, currentReq - 1, ttl);
|
||||
} else {
|
||||
await cache.delete(key);
|
||||
}
|
||||
};
|
||||
|
||||
module.exports = clearPendingReq;
|
||||
|
|
|
|||
40
api/cache/getLogStores.js
vendored
40
api/cache/getLogStores.js
vendored
|
|
@ -1,26 +1,37 @@
|
|||
const Keyv = require('keyv');
|
||||
const keyvMongo = require('./keyvMongo');
|
||||
const { math } = require('../server/utils');
|
||||
const keyvRedis = require('./keyvRedis');
|
||||
const { math, isEnabled } = require('../server/utils');
|
||||
const { logFile, violationFile } = require('./keyvFiles');
|
||||
const { BAN_DURATION } = process.env ?? {};
|
||||
const { BAN_DURATION, USE_REDIS } = process.env ?? {};
|
||||
|
||||
const duration = math(BAN_DURATION, 7200000);
|
||||
|
||||
const createViolationInstance = (namespace) => {
|
||||
const config = isEnabled(USE_REDIS) ? { store: keyvRedis } : { store: violationFile, namespace };
|
||||
return new Keyv(config);
|
||||
};
|
||||
|
||||
// Serve cache from memory so no need to clear it on startup/exit
|
||||
const pending_req = isEnabled(USE_REDIS)
|
||||
? new Keyv({ store: keyvRedis })
|
||||
: new Keyv({ namespace: 'pending_req' });
|
||||
|
||||
const namespaces = {
|
||||
ban: new Keyv({ store: keyvMongo, ttl: duration, namespace: 'bans' }),
|
||||
pending_req,
|
||||
ban: new Keyv({ store: keyvMongo, namespace: 'bans', duration }),
|
||||
general: new Keyv({ store: logFile, namespace: 'violations' }),
|
||||
concurrent: new Keyv({ store: violationFile, namespace: 'concurrent' }),
|
||||
non_browser: new Keyv({ store: violationFile, namespace: 'non_browser' }),
|
||||
message_limit: new Keyv({ store: violationFile, namespace: 'message_limit' }),
|
||||
token_balance: new Keyv({ store: violationFile, namespace: 'token_balance' }),
|
||||
registrations: new Keyv({ store: violationFile, namespace: 'registrations' }),
|
||||
logins: new Keyv({ store: violationFile, namespace: 'logins' }),
|
||||
concurrent: createViolationInstance('concurrent'),
|
||||
non_browser: createViolationInstance('non_browser'),
|
||||
message_limit: createViolationInstance('message_limit'),
|
||||
token_balance: createViolationInstance('token_balance'),
|
||||
registrations: createViolationInstance('registrations'),
|
||||
logins: createViolationInstance('logins'),
|
||||
};
|
||||
|
||||
/**
|
||||
* Returns either the logs of violations specified by type if a type is provided
|
||||
* or it returns the general log if no type is specified. If an invalid type is passed,
|
||||
* an error will be thrown.
|
||||
* Returns the keyv cache specified by type.
|
||||
* If an invalid type is passed, an error will be thrown.
|
||||
*
|
||||
* @module getLogStores
|
||||
* @requires keyv - a simple key-value storage that allows you to easily switch out storage adapters.
|
||||
|
|
@ -31,11 +42,10 @@ const namespaces = {
|
|||
* @throws Will throw an error if an invalid violation type is passed.
|
||||
*/
|
||||
const getLogStores = (type) => {
|
||||
if (!type) {
|
||||
if (!type || !namespaces[type]) {
|
||||
throw new Error(`Invalid store type: ${type}`);
|
||||
}
|
||||
const logs = namespaces[type];
|
||||
return logs;
|
||||
return namespaces[type];
|
||||
};
|
||||
|
||||
module.exports = getLogStores;
|
||||
|
|
|
|||
3
api/cache/index.js
vendored
3
api/cache/index.js
vendored
|
|
@ -1,6 +1,5 @@
|
|||
const keyvFiles = require('./keyvFiles');
|
||||
const getLogStores = require('./getLogStores');
|
||||
const logViolation = require('./logViolation');
|
||||
const clearPendingReq = require('./clearPendingReq');
|
||||
|
||||
module.exports = { ...keyvFiles, getLogStores, logViolation, clearPendingReq };
|
||||
module.exports = { ...keyvFiles, getLogStores, logViolation };
|
||||
|
|
|
|||
14
api/cache/keyvRedis.js
vendored
Normal file
14
api/cache/keyvRedis.js
vendored
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
const KeyvRedis = require('@keyv/redis');
|
||||
|
||||
const { REDIS_URI } = process.env;
|
||||
|
||||
let keyvRedis;
|
||||
|
||||
if (REDIS_URI) {
|
||||
keyvRedis = new KeyvRedis(REDIS_URI, { useRedisSets: false });
|
||||
keyvRedis.on('error', (err) => console.error('KeyvRedis connection error:', err));
|
||||
} else {
|
||||
// console.log('REDIS_URI not provided. Redis module will not be initialized.');
|
||||
}
|
||||
|
||||
module.exports = keyvRedis;
|
||||
12
api/cache/logViolation.js
vendored
12
api/cache/logViolation.js
vendored
|
|
@ -1,5 +1,6 @@
|
|||
const getLogStores = require('./getLogStores');
|
||||
const banViolation = require('./banViolation');
|
||||
const { isEnabled } = require('../server/utils');
|
||||
|
||||
/**
|
||||
* Logs the violation.
|
||||
|
|
@ -17,10 +18,11 @@ const logViolation = async (req, res, type, errorMessage, score = 1) => {
|
|||
}
|
||||
const logs = getLogStores('general');
|
||||
const violationLogs = getLogStores(type);
|
||||
const key = isEnabled(process.env.USE_REDIS) ? `${type}:${userId}` : userId;
|
||||
|
||||
const userViolations = (await violationLogs.get(userId)) ?? 0;
|
||||
const violationCount = userViolations + score;
|
||||
await violationLogs.set(userId, violationCount);
|
||||
const userViolations = (await violationLogs.get(key)) ?? 0;
|
||||
const violationCount = +userViolations + +score;
|
||||
await violationLogs.set(key, violationCount);
|
||||
|
||||
errorMessage.user_id = userId;
|
||||
errorMessage.prev_count = userViolations;
|
||||
|
|
@ -28,10 +30,10 @@ const logViolation = async (req, res, type, errorMessage, score = 1) => {
|
|||
errorMessage.date = new Date().toISOString();
|
||||
|
||||
await banViolation(req, res, errorMessage);
|
||||
const userLogs = (await logs.get(userId)) ?? [];
|
||||
const userLogs = (await logs.get(key)) ?? [];
|
||||
userLogs.push(errorMessage);
|
||||
delete errorMessage.user_id;
|
||||
await logs.set(userId, userLogs);
|
||||
await logs.set(key, userLogs);
|
||||
};
|
||||
|
||||
module.exports = logViolation;
|
||||
|
|
|
|||
4
api/cache/redis.js
vendored
Normal file
4
api/cache/redis.js
vendored
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
const Redis = require('ioredis');
|
||||
const { REDIS_URI } = process.env ?? {};
|
||||
const redis = new Redis.Cluster(REDIS_URI);
|
||||
module.exports = redis;
|
||||
Loading…
Add table
Add a link
Reference in a new issue