mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 06:00:56 +02:00

* WIP: app.locals refactoring
WIP: appConfig
fix: update memory configuration retrieval to use getAppConfig based on user role
fix: update comment for AppConfig interface to clarify purpose
🏷️ refactor: Update tests to use getAppConfig for endpoint configurations
ci: Update AppService tests to initialize app config instead of app.locals
ci: Integrate getAppConfig into remaining tests
refactor: Update multer storage destination to use promise-based getAppConfig and improve error handling in tests
refactor: Rename initializeAppConfig to setAppConfig and update related tests
ci: Mock getAppConfig in various tests to provide default configurations
refactor: Update convertMCPToolsToPlugins to use mcpManager for server configuration and adjust related tests
chore: rename `Config/getAppConfig` -> `Config/app`
fix: streamline OpenAI image tools configuration by removing direct appConfig dependency and using function parameters
chore: correct parameter documentation for imageOutputType in ToolService.js
refactor: remove `getCustomConfig` dependency in config route
refactor: update domain validation to use appConfig for allowed domains
refactor: use appConfig registration property
chore: remove app parameter from AppService invocation
refactor: update AppConfig interface to correct registration and turnstile configurations
refactor: remove getCustomConfig dependency and use getAppConfig in PluginController, multer, and MCP services
refactor: replace getCustomConfig with getAppConfig in STTService, TTSService, and related files
refactor: replace getCustomConfig with getAppConfig in Conversation and Message models, update tempChatRetention functions to use AppConfig type
refactor: update getAppConfig calls in Conversation and Message models to include user role for temporary chat expiration
ci: update related tests
refactor: update getAppConfig call in getCustomConfigSpeech to include user role
fix: update appConfig usage to access allowedDomains from actions instead of registration
refactor: enhance AppConfig to include fileStrategies and update related file strategy logic
refactor: update imports to use normalizeEndpointName from @librechat/api and remove redundant definitions
chore: remove deprecated unused RunManager
refactor: get balance config primarily from appConfig
refactor: remove customConfig dependency for appConfig and streamline loadConfigModels logic
refactor: remove getCustomConfig usage and use app config in file citations
refactor: consolidate endpoint loading logic into loadEndpoints function
refactor: update appConfig access to use endpoints structure across various services
refactor: implement custom endpoints configuration and streamline endpoint loading logic
refactor: update getAppConfig call to include user role parameter
refactor: streamline endpoint configuration and enhance appConfig usage across services
refactor: replace getMCPAuthMap with getUserMCPAuthMap and remove unused getCustomConfig file
refactor: add type annotation for loadedEndpoints in loadEndpoints function
refactor: move /services/Files/images/parse to TS API
chore: add missing FILE_CITATIONS permission to IRole interface
refactor: restructure toolkits to TS API
refactor: separate manifest logic into its own module
refactor: consolidate tool loading logic into a new tools module for startup logic
refactor: move interface config logic to TS API
refactor: migrate checkEmailConfig to TypeScript and update imports
refactor: add FunctionTool interface and availableTools to AppConfig
refactor: decouple caching and DB operations from AppService, make part of consolidated `getAppConfig`
WIP: fix tests
* fix: rebase conflicts
* refactor: remove app.locals references
* refactor: replace getBalanceConfig with getAppConfig in various strategies and middleware
* refactor: replace appConfig?.balance with getBalanceConfig in various controllers and clients
* test: add balance configuration to titleConvo method in AgentClient tests
* chore: remove unused `openai-chat-tokens` package
* chore: remove unused imports in initializeMCPs.js
* refactor: update balance configuration to use getAppConfig instead of getBalanceConfig
* refactor: integrate configMiddleware for centralized configuration handling
* refactor: optimize email domain validation by removing unnecessary async calls
* refactor: simplify multer storage configuration by removing async calls
* refactor: reorder imports for better readability in user.js
* refactor: replace getAppConfig calls with req.config for improved performance
* chore: replace getAppConfig calls with req.config in tests for centralized configuration handling
* chore: remove unused override config
* refactor: add configMiddleware to endpoint route and replace getAppConfig with req.config
* chore: remove customConfig parameter from TTSService constructor
* refactor: pass appConfig from request to processFileCitations for improved configuration handling
* refactor: remove configMiddleware from endpoint route and retrieve appConfig directly in getEndpointsConfig if not in `req.config`
* test: add mockAppConfig to processFileCitations tests for improved configuration handling
* fix: pass req.config to hasCustomUserVars and call without await after synchronous refactor
* fix: type safety in useExportConversation
* refactor: retrieve appConfig using getAppConfig in PluginController and remove configMiddleware from plugins route, to avoid always retrieving when plugins are cached
* chore: change `MongoUser` typedef to `IUser`
* fix: Add `user` and `config` fields to ServerRequest and update JSDoc type annotations from Express.Request to ServerRequest
* fix: remove unused setAppConfig mock from Server configuration tests
175 lines
6.2 KiB
JavaScript
175 lines
6.2 KiB
JavaScript
const { Constants, actionDomainSeparator } = require('librechat-data-provider');
|
|
const { domainParser } = require('./ActionService');
|
|
|
|
jest.mock('keyv');
|
|
|
|
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 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);
|
|
});
|
|
});
|