Jerry/crystelf-plugin
1
0
Fork 0
mirror of https://github.com/Jerryplusy/crystelf-plugin.git synced 2025-12-05 23:51:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

🎨 refactor(aiCaller): improve logging for user OpenAI instance retrieval

Browse Source 
🔧 fix(userConfigManager): update user config path and improve error handling during load/save operations
This commit is contained in:
Jerry 2025-12-06 01:30:11 +08:00
parent 71f956d418
commit fcbb10d2f5
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ai/aiCaller.js
View File

@ -263,12 +263,14 @@ class AiCaller {
* @param {Object} config - 用户配置
* @returns {OpenaiChat} OpenAI实例
*/
async getUserOpenaiInstance(userId, config) {
async getUserOpenaiInstance(userId, config) {
if (config.apiKey === this.config.apiKey && config.baseApi === this.config.baseApi) {
logger.info(`[crystelf-ai] 用户 ${userId} 使用全局OpenAI实例`);
return this.openaiChat;
}
const cacheKey = `${userId}_${config.apiKey}_${config.baseApi}`;
if (this.userOpenaiInstances.has(cacheKey)) {
logger.info(`[crystelf-ai] 用户 ${userId} 使用缓存的OpenAI实例`);
return this.userOpenaiInstances.get(cacheKey);
}
const userOpenaiChat = new OpenaiChat();

21
lib/ai/userConfigManager.js
View File

@ -8,7 +8,7 @@ import ConfigControl from '../config/configControl.js';
*/
class UserConfigManager {
constructor() {
this.basePath = path.join(process.cwd(), 'data', 'crystelf', 'ai');
this.basePath = path.join(process.cwd(), 'data', 'crystelf');
this.userConfigs = new Map();
this.globalConfig = null;
}
@ -30,20 +30,25 @@ class UserConfigManager {
async getUserConfig(userId) {
try {
if (this.userConfigs.has(userId)) {
return this.userConfigs.get(userId);
const cachedConfig = this.userConfigs.get(userId);
logger.info(`[crystelf-ai] 使用缓存的用户配置 ${userId}: apiKey=${!!cachedConfig.apiKey}, model=${cachedConfig.modelType}`);
return cachedConfig;
}
const userConfigPath = path.join(this.basePath, `${userId}.json`);
const userConfigPath = path.join(this.basePath, 'ai', userId, 'ai.json');
logger.info(`[crystelf-ai] 尝试加载用户配置: ${userConfigPath}`);
let userConfig = {};
try {
const configData = await fs.readFile(userConfigPath, 'utf-8');
userConfig = JSON.parse(configData);
} catch (error) {
if (error.code !== 'ENOENT') {
if (error.code === 'ENOENT') {
} else {
logger.warn(`[crystelf-ai] 用户 ${userId} 的配置文件解析失败，使用默认配置: ${error.message}`);
}
}
const mergedConfig = this.mergeConfigs(this.globalConfig, userConfig);
this.userConfigs.set(userId, mergedConfig);
@ -61,12 +66,16 @@ class UserConfigManager {
*/
async saveUserConfig(userId, config) {
try {
const userConfigPath = path.join(this.basePath, `${userId}.json`);
const userConfigDir = path.join(this.basePath, 'ai', userId);
const userConfigPath = path.join(userConfigDir, 'ai.json');
const filteredConfig = this.filterUserConfig(config);
await fs.mkdir(userConfigDir, { recursive: true });
await fs.writeFile(userConfigPath, JSON.stringify(filteredConfig, null, 2));
const mergedConfig = this.mergeConfigs(this.globalConfig, filteredConfig);
this.userConfigs.set(userId, mergedConfig);
} catch (error) {
logger.error(`[crystelf-ai] 保存用户 ${userId} 配置失败: ${error.message}`);
throw error;
@ -158,7 +167,7 @@ class UserConfigManager {
*/
async hasUserConfig(userId) {
try {
const userConfigPath = path.join(this.basePath, `${userId}.json`);
const userConfigPath = path.join(this.basePath, 'ai', userId, 'ai.json');
await fs.access(userConfigPath);
return true;
} catch {