2025-07-01 22:37:29 -04:00
|
|
|
import path from 'path';
|
|
|
|
|
import axios from 'axios';
|
🧵 refactor: Migrate Endpoint Initialization to TypeScript (#10794)
* refactor: move endpoint initialization methods to typescript
* refactor: move agent init to packages/api
- Introduced `initialize.ts` for agent initialization, including file processing and tool loading.
- Updated `resources.ts` to allow optional appConfig parameter.
- Enhanced endpoint configuration handling in various initialization files to support model parameters.
- Added new artifacts and prompts for React component generation.
- Refactored existing code to improve type safety and maintainability.
* refactor: streamline endpoint initialization and enhance type safety
- Updated initialization functions across various endpoints to use a consistent request structure, replacing `unknown` types with `ServerResponse`.
- Simplified request handling by directly extracting keys from the request body.
- Improved type safety by ensuring user IDs are safely accessed with optional chaining.
- Removed unnecessary parameters and streamlined model options handling for better clarity and maintainability.
* refactor: moved ModelService and extractBaseURL to packages/api
- Added comprehensive tests for the models fetching functionality, covering scenarios for OpenAI, Anthropic, Google, and Ollama models.
- Updated existing endpoint index to include the new models module.
- Enhanced utility functions for URL extraction and model data processing.
- Improved type safety and error handling across the models fetching logic.
* refactor: consolidate utility functions and remove unused files
- Merged `deriveBaseURL` and `extractBaseURL` into the `@librechat/api` module for better organization.
- Removed redundant utility files and their associated tests to streamline the codebase.
- Updated imports across various client files to utilize the new consolidated functions.
- Enhanced overall maintainability by reducing the number of utility modules.
* refactor: replace ModelService references with direct imports from @librechat/api and remove ModelService file
* refactor: move encrypt/decrypt methods and key db methods to data-schemas, use `getProviderConfig` from `@librechat/api`
* chore: remove unused 'res' from options in AgentClient
* refactor: file model imports and methods
- Updated imports in various controllers and services to use the unified file model from '~/models' instead of '~/models/File'.
- Consolidated file-related methods into a new file methods module in the data-schemas package.
- Added comprehensive tests for file methods including creation, retrieval, updating, and deletion.
- Enhanced the initializeAgent function to accept dependency injection for file-related methods.
- Improved error handling and logging in file methods.
* refactor: streamline database method references in agent initialization
* refactor: enhance file method tests and update type references to IMongoFile
* refactor: consolidate database method imports in agent client and initialization
* chore: remove redundant import of initializeAgent from @librechat/api
* refactor: move checkUserKeyExpiry utility to @librechat/api and update references across endpoints
* refactor: move updateUserPlugins logic to user.ts and simplify UserController
* refactor: update imports for user key management and remove UserService
* refactor: remove unused Anthropics and Bedrock endpoint files and clean up imports
* refactor: consolidate and update encryption imports across various files to use @librechat/data-schemas
* chore: update file model mock to use unified import from '~/models'
* chore: import order
* refactor: remove migrated to TS agent.js file and its associated logic from the endpoints
* chore: add reusable function to extract imports from source code in unused-packages workflow
* chore: enhance unused-packages workflow to include @librechat/api dependencies and improve dependency extraction
* chore: improve dependency extraction in unused-packages workflow with enhanced error handling and debugging output
* chore: add detailed debugging output to unused-packages workflow for better visibility into unused dependencies and exclusion lists
* chore: refine subpath handling in unused-packages workflow to correctly process scoped and non-scoped package imports
* chore: clean up unused debug output in unused-packages workflow and reorganize type imports in initialize.ts
2025-12-03 17:21:41 -05:00
|
|
|
import { ErrorTypes } from 'librechat-data-provider';
|
2025-07-01 22:37:29 -04:00
|
|
|
import { logger } from '@librechat/data-schemas';
|
2025-09-20 10:17:24 -04:00
|
|
|
import { readFileAsString } from './files';
|
2025-07-01 22:37:29 -04:00
|
|
|
|
|
|
|
|
export interface GoogleServiceKey {
|
|
|
|
|
type?: string;
|
|
|
|
|
project_id?: string;
|
|
|
|
|
private_key_id?: string;
|
|
|
|
|
private_key?: string;
|
|
|
|
|
client_email?: string;
|
|
|
|
|
client_id?: string;
|
|
|
|
|
auth_uri?: string;
|
|
|
|
|
token_uri?: string;
|
|
|
|
|
auth_provider_x509_cert_url?: string;
|
|
|
|
|
client_x509_cert_url?: string;
|
|
|
|
|
[key: string]: unknown;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
2025-07-08 21:07:33 -04:00
|
|
|
* Load Google service key from file path, URL, or stringified JSON
|
|
|
|
|
* @param keyPath - The path to the service key file, URL to fetch it from, or stringified JSON
|
2025-07-01 22:37:29 -04:00
|
|
|
* @returns The parsed service key object or null if failed
|
|
|
|
|
*/
|
|
|
|
|
export async function loadServiceKey(keyPath: string): Promise<GoogleServiceKey | null> {
|
|
|
|
|
if (!keyPath) {
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let serviceKey: unknown;
|
|
|
|
|
|
2025-07-10 20:33:01 -04:00
|
|
|
// Check if it's base64 encoded (common pattern for storing in env vars)
|
|
|
|
|
if (keyPath.trim().match(/^[A-Za-z0-9+/]+=*$/)) {
|
|
|
|
|
try {
|
|
|
|
|
const decoded = Buffer.from(keyPath.trim(), 'base64').toString('utf-8');
|
|
|
|
|
// Try to parse the decoded string as JSON
|
|
|
|
|
serviceKey = JSON.parse(decoded);
|
|
|
|
|
} catch {
|
|
|
|
|
// Not base64 or not valid JSON after decoding, continue with other methods
|
|
|
|
|
// Silent failure - not critical
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2025-07-08 21:07:33 -04:00
|
|
|
// Check if it's a stringified JSON (starts with '{')
|
2025-07-10 20:33:01 -04:00
|
|
|
if (!serviceKey && keyPath.trim().startsWith('{')) {
|
2025-07-08 21:07:33 -04:00
|
|
|
try {
|
|
|
|
|
serviceKey = JSON.parse(keyPath);
|
|
|
|
|
} catch (error) {
|
|
|
|
|
logger.error('Failed to parse service key from stringified JSON', error);
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
}
|
2025-07-01 22:37:29 -04:00
|
|
|
// Check if it's a URL
|
2025-07-10 20:33:01 -04:00
|
|
|
else if (!serviceKey && /^https?:\/\//.test(keyPath)) {
|
2025-07-01 22:37:29 -04:00
|
|
|
try {
|
|
|
|
|
const response = await axios.get(keyPath);
|
|
|
|
|
serviceKey = response.data;
|
|
|
|
|
} catch (error) {
|
|
|
|
|
logger.error(`Failed to fetch the service key from URL: ${keyPath}`, error);
|
|
|
|
|
return null;
|
|
|
|
|
}
|
2025-07-10 20:33:01 -04:00
|
|
|
} else if (!serviceKey) {
|
2025-07-01 22:37:29 -04:00
|
|
|
// It's a file path
|
|
|
|
|
try {
|
|
|
|
|
const absolutePath = path.isAbsolute(keyPath) ? keyPath : path.resolve(keyPath);
|
2025-09-20 10:17:24 -04:00
|
|
|
const { content: fileContent } = await readFileAsString(absolutePath);
|
2025-07-01 22:37:29 -04:00
|
|
|
serviceKey = JSON.parse(fileContent);
|
|
|
|
|
} catch (error) {
|
|
|
|
|
logger.error(`Failed to load service key from file: ${keyPath}`, error);
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// If the response is a string (e.g., from a URL that returns JSON as text), parse it
|
|
|
|
|
if (typeof serviceKey === 'string') {
|
|
|
|
|
try {
|
|
|
|
|
serviceKey = JSON.parse(serviceKey);
|
|
|
|
|
} catch (parseError) {
|
|
|
|
|
logger.error(`Failed to parse service key JSON from ${keyPath}`, parseError);
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Validate the service key has required fields
|
|
|
|
|
if (!serviceKey || typeof serviceKey !== 'object') {
|
|
|
|
|
logger.error(`Invalid service key format from ${keyPath}`);
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
|
2025-07-10 20:33:01 -04:00
|
|
|
// Fix private key formatting if needed
|
|
|
|
|
const key = serviceKey as GoogleServiceKey;
|
|
|
|
|
if (key.private_key && typeof key.private_key === 'string') {
|
|
|
|
|
// Replace escaped newlines with actual newlines
|
|
|
|
|
// When JSON.parse processes "\\n", it becomes "\n" (single backslash + n)
|
|
|
|
|
// When JSON.parse processes "\n", it becomes an actual newline character
|
|
|
|
|
key.private_key = key.private_key.replace(/\\n/g, '\n');
|
|
|
|
|
|
|
|
|
|
// Also handle the String.raw`\n` case mentioned in Stack Overflow
|
|
|
|
|
key.private_key = key.private_key.split(String.raw`\n`).join('\n');
|
|
|
|
|
|
|
|
|
|
// Ensure proper PEM format
|
|
|
|
|
if (!key.private_key.includes('\n')) {
|
|
|
|
|
// If no newlines are present, try to format it properly
|
|
|
|
|
const privateKeyMatch = key.private_key.match(
|
|
|
|
|
/^(-----BEGIN [A-Z ]+-----)(.*)(-----END [A-Z ]+-----)$/,
|
|
|
|
|
);
|
|
|
|
|
if (privateKeyMatch) {
|
|
|
|
|
const [, header, body, footer] = privateKeyMatch;
|
|
|
|
|
// Add newlines after header and before footer
|
|
|
|
|
key.private_key = `${header}\n${body}\n${footer}`;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return key;
|
2025-07-01 22:37:29 -04:00
|
|
|
}
|
🧵 refactor: Migrate Endpoint Initialization to TypeScript (#10794)
* refactor: move endpoint initialization methods to typescript
* refactor: move agent init to packages/api
- Introduced `initialize.ts` for agent initialization, including file processing and tool loading.
- Updated `resources.ts` to allow optional appConfig parameter.
- Enhanced endpoint configuration handling in various initialization files to support model parameters.
- Added new artifacts and prompts for React component generation.
- Refactored existing code to improve type safety and maintainability.
* refactor: streamline endpoint initialization and enhance type safety
- Updated initialization functions across various endpoints to use a consistent request structure, replacing `unknown` types with `ServerResponse`.
- Simplified request handling by directly extracting keys from the request body.
- Improved type safety by ensuring user IDs are safely accessed with optional chaining.
- Removed unnecessary parameters and streamlined model options handling for better clarity and maintainability.
* refactor: moved ModelService and extractBaseURL to packages/api
- Added comprehensive tests for the models fetching functionality, covering scenarios for OpenAI, Anthropic, Google, and Ollama models.
- Updated existing endpoint index to include the new models module.
- Enhanced utility functions for URL extraction and model data processing.
- Improved type safety and error handling across the models fetching logic.
* refactor: consolidate utility functions and remove unused files
- Merged `deriveBaseURL` and `extractBaseURL` into the `@librechat/api` module for better organization.
- Removed redundant utility files and their associated tests to streamline the codebase.
- Updated imports across various client files to utilize the new consolidated functions.
- Enhanced overall maintainability by reducing the number of utility modules.
* refactor: replace ModelService references with direct imports from @librechat/api and remove ModelService file
* refactor: move encrypt/decrypt methods and key db methods to data-schemas, use `getProviderConfig` from `@librechat/api`
* chore: remove unused 'res' from options in AgentClient
* refactor: file model imports and methods
- Updated imports in various controllers and services to use the unified file model from '~/models' instead of '~/models/File'.
- Consolidated file-related methods into a new file methods module in the data-schemas package.
- Added comprehensive tests for file methods including creation, retrieval, updating, and deletion.
- Enhanced the initializeAgent function to accept dependency injection for file-related methods.
- Improved error handling and logging in file methods.
* refactor: streamline database method references in agent initialization
* refactor: enhance file method tests and update type references to IMongoFile
* refactor: consolidate database method imports in agent client and initialization
* chore: remove redundant import of initializeAgent from @librechat/api
* refactor: move checkUserKeyExpiry utility to @librechat/api and update references across endpoints
* refactor: move updateUserPlugins logic to user.ts and simplify UserController
* refactor: update imports for user key management and remove UserService
* refactor: remove unused Anthropics and Bedrock endpoint files and clean up imports
* refactor: consolidate and update encryption imports across various files to use @librechat/data-schemas
* chore: update file model mock to use unified import from '~/models'
* chore: import order
* refactor: remove migrated to TS agent.js file and its associated logic from the endpoints
* chore: add reusable function to extract imports from source code in unused-packages workflow
* chore: enhance unused-packages workflow to include @librechat/api dependencies and improve dependency extraction
* chore: improve dependency extraction in unused-packages workflow with enhanced error handling and debugging output
* chore: add detailed debugging output to unused-packages workflow for better visibility into unused dependencies and exclusion lists
* chore: refine subpath handling in unused-packages workflow to correctly process scoped and non-scoped package imports
* chore: clean up unused debug output in unused-packages workflow and reorganize type imports in initialize.ts
2025-12-03 17:21:41 -05:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Checks if a user key has expired based on the provided expiration date and endpoint.
|
|
|
|
|
* If the key has expired, it throws an Error with details including the type of error,
|
|
|
|
|
* the expiration date, and the endpoint.
|
|
|
|
|
*
|
|
|
|
|
* @param expiresAt - The expiration date of the user key in a format that can be parsed by the Date constructor
|
|
|
|
|
* @param endpoint - The endpoint associated with the user key to be checked
|
|
|
|
|
* @throws Error if the user key has expired. The error message is a stringified JSON object
|
|
|
|
|
* containing the type of error (`ErrorTypes.EXPIRED_USER_KEY`), the expiration date in the local string format, and the endpoint.
|
|
|
|
|
*/
|
|
|
|
|
export function checkUserKeyExpiry(expiresAt: string, endpoint: string): void {
|
|
|
|
|
const expiresAtDate = new Date(expiresAt);
|
|
|
|
|
if (expiresAtDate < new Date()) {
|
|
|
|
|
const errorMessage = JSON.stringify({
|
|
|
|
|
type: ErrorTypes.EXPIRED_USER_KEY,
|
|
|
|
|
expiredAt: expiresAtDate.toLocaleString(),
|
|
|
|
|
endpoint,
|
|
|
|
|
});
|
|
|
|
|
throw new Error(errorMessage);
|
|
|
|
|
}
|
|
|
|
|
}
|