mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-17 08:50:15 +01:00
* chore: remove unused redis file * chore: bump keyv dependencies, and update related imports * refactor: Implement IoRedis client for rate limiting across middleware, as node-redis via keyv not compatible * fix: Set max listeners to expected amount * WIP: memory improvements * refactor: Simplify getAbortData assignment in createAbortController * refactor: Update getAbortData to use WeakRef for content management * WIP: memory improvements in agent chat requests * refactor: Enhance memory management with finalization registry and cleanup functions * refactor: Simplify domainParser calls by removing unnecessary request parameter * refactor: Update parameter types for action tools and agent loading functions to use minimal configs * refactor: Simplify domainParser tests by removing unnecessary request parameter * refactor: Simplify domainParser call by removing unnecessary request parameter * refactor: Enhance client disposal by nullifying additional properties to improve memory management * refactor: Improve title generation by adding abort controller and timeout handling, consolidate request cleanup * refactor: Update checkIdleConnections to skip current user when checking for idle connections if passed * refactor: Update createMCPTool to derive userId from config and handle abort signals * refactor: Introduce createTokenCounter function and update tokenCounter usage; enhance disposeClient to reset Graph values * refactor: Update getMCPManager to accept userId parameter for improved idle connection handling * refactor: Extract logToolError function for improved error handling in AgentClient * refactor: Update disposeClient to clear handlerRegistry and graphRunnable references in client.run * refactor: Extract createHandleNewToken function to streamline token handling in initializeClient * chore: bump @librechat/agents * refactor: Improve timeout handling in addTitle function for better error management * refactor: Introduce createFetch instead of using class method * refactor: Enhance client disposal and request data handling in AskController and EditController * refactor: Update import statements for AnthropicClient and OpenAIClient to use specific paths * refactor: Use WeakRef for response handling in SplitStreamHandler to prevent memory leaks * refactor: Simplify client disposal and rename getReqData to processReqData in AskController and EditController * refactor: Improve logging structure and parameter handling in OpenAIClient * refactor: Remove unused GraphEvents and improve stream event handling in AnthropicClient and OpenAIClient * refactor: Simplify client initialization in AskController and EditController * refactor: Remove unused mock functions and implement in-memory store for KeyvMongo * chore: Update dependencies in package-lock.json to latest versions * refactor: Await token usage recording in OpenAIClient to ensure proper async handling * refactor: Remove handleAbort route from multiple endpoints and enhance client disposal logic * refactor: Enhance abort controller logic by managing abortKey more effectively * refactor: Add newConversation handling in useEventHandlers for improved conversation management * fix: dropparams * refactor: Use optional chaining for safer access to request properties in BaseClient * refactor: Move client disposal and request data processing logic to cleanup module for better organization * refactor: Remove aborted request check from addTitle function for cleaner logic * feat: Add Grok 3 model pricing and update tests for new models * chore: Remove trace warnings and inspect flags from backend start script used for debugging * refactor: Replace user identifier handling with userId for consistency across controllers, use UserId in clientRegistry * refactor: Enhance client disposal logic to prevent memory leaks by clearing additional references * chore: Update @librechat/agents to version 2.4.14 in package.json and package-lock.json
89 lines
2.9 KiB
JavaScript
89 lines
2.9 KiB
JavaScript
const rateLimit = require('express-rate-limit');
|
|
const { RedisStore } = require('rate-limit-redis');
|
|
const { ViolationTypes } = require('librechat-data-provider');
|
|
const ioredisClient = require('~/cache/ioredisClient');
|
|
const logViolation = require('~/cache/logViolation');
|
|
const { isEnabled } = require('~/server/utils');
|
|
const { logger } = require('~/config');
|
|
|
|
const getEnvironmentVariables = () => {
|
|
const IMPORT_IP_MAX = parseInt(process.env.IMPORT_IP_MAX) || 100;
|
|
const IMPORT_IP_WINDOW = parseInt(process.env.IMPORT_IP_WINDOW) || 15;
|
|
const IMPORT_USER_MAX = parseInt(process.env.IMPORT_USER_MAX) || 50;
|
|
const IMPORT_USER_WINDOW = parseInt(process.env.IMPORT_USER_WINDOW) || 15;
|
|
|
|
const importIpWindowMs = IMPORT_IP_WINDOW * 60 * 1000;
|
|
const importIpMax = IMPORT_IP_MAX;
|
|
const importIpWindowInMinutes = importIpWindowMs / 60000;
|
|
|
|
const importUserWindowMs = IMPORT_USER_WINDOW * 60 * 1000;
|
|
const importUserMax = IMPORT_USER_MAX;
|
|
const importUserWindowInMinutes = importUserWindowMs / 60000;
|
|
|
|
return {
|
|
importIpWindowMs,
|
|
importIpMax,
|
|
importIpWindowInMinutes,
|
|
importUserWindowMs,
|
|
importUserMax,
|
|
importUserWindowInMinutes,
|
|
};
|
|
};
|
|
|
|
const createImportHandler = (ip = true) => {
|
|
const { importIpMax, importIpWindowInMinutes, importUserMax, importUserWindowInMinutes } =
|
|
getEnvironmentVariables();
|
|
|
|
return async (req, res) => {
|
|
const type = ViolationTypes.FILE_UPLOAD_LIMIT;
|
|
const errorMessage = {
|
|
type,
|
|
max: ip ? importIpMax : importUserMax,
|
|
limiter: ip ? 'ip' : 'user',
|
|
windowInMinutes: ip ? importIpWindowInMinutes : importUserWindowInMinutes,
|
|
};
|
|
|
|
await logViolation(req, res, type, errorMessage);
|
|
res.status(429).json({ message: 'Too many conversation import requests. Try again later' });
|
|
};
|
|
};
|
|
|
|
const createImportLimiters = () => {
|
|
const { importIpWindowMs, importIpMax, importUserWindowMs, importUserMax } =
|
|
getEnvironmentVariables();
|
|
|
|
const ipLimiterOptions = {
|
|
windowMs: importIpWindowMs,
|
|
max: importIpMax,
|
|
handler: createImportHandler(),
|
|
};
|
|
const userLimiterOptions = {
|
|
windowMs: importUserWindowMs,
|
|
max: importUserMax,
|
|
handler: createImportHandler(false),
|
|
keyGenerator: function (req) {
|
|
return req.user?.id; // Use the user ID or NULL if not available
|
|
},
|
|
};
|
|
|
|
if (isEnabled(process.env.USE_REDIS) && ioredisClient) {
|
|
logger.debug('Using Redis for import rate limiters.');
|
|
const sendCommand = (...args) => ioredisClient.call(...args);
|
|
const ipStore = new RedisStore({
|
|
sendCommand,
|
|
prefix: 'import_ip_limiter:',
|
|
});
|
|
const userStore = new RedisStore({
|
|
sendCommand,
|
|
prefix: 'import_user_limiter:',
|
|
});
|
|
ipLimiterOptions.store = ipStore;
|
|
userLimiterOptions.store = userStore;
|
|
}
|
|
|
|
const importIpLimiter = rateLimit(ipLimiterOptions);
|
|
const importUserLimiter = rateLimit(userLimiterOptions);
|
|
return { importIpLimiter, importUserLimiter };
|
|
};
|
|
|
|
module.exports = { createImportLimiters };
|