mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-21 21:50:49 +02: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
198 lines
6.5 KiB
JavaScript
198 lines
6.5 KiB
JavaScript
const { Constants, EModelEndpoint, actionDomainSeparator } = require('librechat-data-provider');
|
|
const { domainParser } = require('./ActionService');
|
|
|
|
jest.mock('keyv');
|
|
jest.mock('~/server/services/Config', () => ({
|
|
getCustomConfig: jest.fn(),
|
|
}));
|
|
|
|
const globalCache = {};
|
|
jest.mock('~/cache/getLogStores', () => {
|
|
return jest.fn().mockImplementation(() => {
|
|
const EventEmitter = require('events');
|
|
const { CacheKeys } = require('librechat-data-provider');
|
|
|
|
class KeyvMongo extends EventEmitter {
|
|
constructor(url = 'mongodb://127.0.0.1:27017', options) {
|
|
super();
|
|
this.ttlSupport = false;
|
|
url = url ?? {};
|
|
if (typeof url === 'string') {
|
|
url = { url };
|
|
}
|
|
if (url.uri) {
|
|
url = { url: url.uri, ...url };
|
|
}
|
|
this.opts = {
|
|
url,
|
|
collection: 'keyv',
|
|
...url,
|
|
...options,
|
|
};
|
|
}
|
|
|
|
get = async (key) => {
|
|
return new Promise((resolve) => {
|
|
resolve(globalCache[key] || null);
|
|
});
|
|
};
|
|
|
|
set = async (key, value) => {
|
|
return new Promise((resolve) => {
|
|
globalCache[key] = value;
|
|
resolve(true);
|
|
});
|
|
};
|
|
}
|
|
|
|
return new KeyvMongo('', {
|
|
namespace: CacheKeys.ENCODED_DOMAINS,
|
|
ttl: 0,
|
|
});
|
|
});
|
|
});
|
|
|
|
describe('domainParser', () => {
|
|
const req = {
|
|
app: {
|
|
locals: {
|
|
[EModelEndpoint.azureOpenAI]: {
|
|
assistants: true,
|
|
},
|
|
},
|
|
},
|
|
};
|
|
|
|
const reqNoAzure = {
|
|
app: {
|
|
locals: {
|
|
[EModelEndpoint.azureOpenAI]: {
|
|
assistants: false,
|
|
},
|
|
},
|
|
},
|
|
};
|
|
|
|
const TLD = '.com';
|
|
|
|
// Non-azure request
|
|
it('does not return domain as is if not azure', async () => {
|
|
const domain = `example.com${actionDomainSeparator}test${actionDomainSeparator}`;
|
|
const result1 = await domainParser(domain, false);
|
|
const result2 = await domainParser(domain, true);
|
|
expect(result1).not.toEqual(domain);
|
|
expect(result2).not.toEqual(domain);
|
|
});
|
|
|
|
// Test for Empty or Null Inputs
|
|
it('returns undefined for null domain input', async () => {
|
|
const result = await domainParser(null, true);
|
|
expect(result).toBeUndefined();
|
|
});
|
|
|
|
it('returns undefined for empty domain input', async () => {
|
|
const result = await domainParser('', true);
|
|
expect(result).toBeUndefined();
|
|
});
|
|
|
|
// Verify Correct Caching Behavior
|
|
it('caches encoded domain correctly', async () => {
|
|
const domain = 'longdomainname.com';
|
|
const encodedDomain = Buffer.from(domain)
|
|
.toString('base64')
|
|
.substring(0, Constants.ENCODED_DOMAIN_LENGTH);
|
|
|
|
await domainParser(domain, true);
|
|
|
|
const cachedValue = await globalCache[encodedDomain];
|
|
expect(cachedValue).toEqual(Buffer.from(domain).toString('base64'));
|
|
});
|
|
|
|
// Test for Edge Cases Around Length Threshold
|
|
it('encodes domain exactly at threshold without modification', async () => {
|
|
const domain = 'a'.repeat(Constants.ENCODED_DOMAIN_LENGTH - TLD.length) + TLD;
|
|
const expected = domain.replace(/\./g, actionDomainSeparator);
|
|
const result = await domainParser(domain, true);
|
|
expect(result).toEqual(expected);
|
|
});
|
|
|
|
it('encodes domain just below threshold without modification', async () => {
|
|
const domain = 'a'.repeat(Constants.ENCODED_DOMAIN_LENGTH - 1 - TLD.length) + TLD;
|
|
const expected = domain.replace(/\./g, actionDomainSeparator);
|
|
const result = await domainParser(domain, true);
|
|
expect(result).toEqual(expected);
|
|
});
|
|
|
|
// Test for Unicode Domain Names
|
|
it('handles unicode characters in domain names correctly when encoding', async () => {
|
|
const unicodeDomain = 'täst.example.com';
|
|
const encodedDomain = Buffer.from(unicodeDomain)
|
|
.toString('base64')
|
|
.substring(0, Constants.ENCODED_DOMAIN_LENGTH);
|
|
const result = await domainParser(unicodeDomain, true);
|
|
expect(result).toEqual(encodedDomain);
|
|
});
|
|
|
|
it('decodes unicode domain names correctly', async () => {
|
|
const unicodeDomain = 'täst.example.com';
|
|
const encodedDomain = Buffer.from(unicodeDomain).toString('base64');
|
|
globalCache[encodedDomain.substring(0, Constants.ENCODED_DOMAIN_LENGTH)] = encodedDomain; // Simulate caching
|
|
|
|
const result = await domainParser(
|
|
encodedDomain.substring(0, Constants.ENCODED_DOMAIN_LENGTH),
|
|
false,
|
|
);
|
|
expect(result).toEqual(unicodeDomain);
|
|
});
|
|
|
|
// Core Functionality Tests
|
|
it('returns domain with replaced separators if no cached domain exists', async () => {
|
|
const domain = 'example.com';
|
|
const withSeparator = domain.replace(/\./g, actionDomainSeparator);
|
|
const result = await domainParser(withSeparator, false);
|
|
expect(result).toEqual(domain);
|
|
});
|
|
|
|
it('returns domain with replaced separators when inverse is false and under encoding length', async () => {
|
|
const domain = 'examp.com';
|
|
const withSeparator = domain.replace(/\./g, actionDomainSeparator);
|
|
const result = await domainParser(withSeparator, false);
|
|
expect(result).toEqual(domain);
|
|
});
|
|
|
|
it('replaces periods with actionDomainSeparator when inverse is true and under encoding length', async () => {
|
|
const domain = 'examp.com';
|
|
const expected = domain.replace(/\./g, actionDomainSeparator);
|
|
const result = await domainParser(domain, true);
|
|
expect(result).toEqual(expected);
|
|
});
|
|
|
|
it('encodes domain when length is above threshold and inverse is true', async () => {
|
|
const domain = 'a'.repeat(Constants.ENCODED_DOMAIN_LENGTH + 1).concat('.com');
|
|
const result = await domainParser(domain, true);
|
|
expect(result).not.toEqual(domain);
|
|
expect(result.length).toBeLessThanOrEqual(Constants.ENCODED_DOMAIN_LENGTH);
|
|
});
|
|
|
|
it('returns encoded value if no encoded value is cached, and inverse is false', async () => {
|
|
const originalDomain = 'example.com';
|
|
const encodedDomain = Buffer.from(
|
|
originalDomain.replace(/\./g, actionDomainSeparator),
|
|
).toString('base64');
|
|
const result = await domainParser(encodedDomain, false);
|
|
expect(result).toEqual(encodedDomain);
|
|
});
|
|
|
|
it('decodes encoded value if cached and encoded value is provided, and inverse is false', async () => {
|
|
const originalDomain = 'example.com';
|
|
const encodedDomain = await domainParser(originalDomain, true);
|
|
const result = await domainParser(encodedDomain, false);
|
|
expect(result).toEqual(originalDomain);
|
|
});
|
|
|
|
it('handles invalid base64 encoded values gracefully', async () => {
|
|
const invalidBase64Domain = 'not_base64_encoded';
|
|
const result = await domainParser(invalidBase64Domain, false);
|
|
expect(result).toEqual(invalidBase64Domain);
|
|
});
|
|
});
|