mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-03-30 04:40:59 +00:00
feat: 防呆优化
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -9,6 +9,7 @@ logs
|
|||||||
web/dist
|
web/dist
|
||||||
.env
|
.env
|
||||||
one-api
|
one-api
|
||||||
|
new-api
|
||||||
.DS_Store
|
.DS_Store
|
||||||
tiktoken_cache
|
tiktoken_cache
|
||||||
.eslintcache
|
.eslintcache
|
||||||
|
|||||||
294
electron/main.js
294
electron/main.js
@@ -1,4 +1,4 @@
|
|||||||
const { app, BrowserWindow, dialog, Tray, Menu } = require('electron');
|
const { app, BrowserWindow, dialog, Tray, Menu, shell } = require('electron');
|
||||||
const { spawn } = require('child_process');
|
const { spawn } = require('child_process');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const http = require('http');
|
const http = require('http');
|
||||||
@@ -7,8 +7,145 @@ const fs = require('fs');
|
|||||||
let mainWindow;
|
let mainWindow;
|
||||||
let serverProcess;
|
let serverProcess;
|
||||||
let tray = null;
|
let tray = null;
|
||||||
|
let serverErrorLogs = [];
|
||||||
const PORT = 3000;
|
const PORT = 3000;
|
||||||
|
|
||||||
|
// 保存日志到文件并打开
|
||||||
|
function saveAndOpenErrorLog() {
|
||||||
|
try {
|
||||||
|
const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
|
||||||
|
const logFileName = `new-api-crash-${timestamp}.log`;
|
||||||
|
const logDir = app.getPath('logs');
|
||||||
|
const logFilePath = path.join(logDir, logFileName);
|
||||||
|
|
||||||
|
// 确保日志目录存在
|
||||||
|
if (!fs.existsSync(logDir)) {
|
||||||
|
fs.mkdirSync(logDir, { recursive: true });
|
||||||
|
}
|
||||||
|
|
||||||
|
// 写入日志
|
||||||
|
const logContent = `New API 崩溃日志
|
||||||
|
生成时间: ${new Date().toLocaleString('zh-CN')}
|
||||||
|
平台: ${process.platform}
|
||||||
|
架构: ${process.arch}
|
||||||
|
应用版本: ${app.getVersion()}
|
||||||
|
|
||||||
|
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
|
||||||
|
|
||||||
|
完整错误日志:
|
||||||
|
|
||||||
|
${serverErrorLogs.join('\n')}
|
||||||
|
|
||||||
|
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
|
||||||
|
|
||||||
|
日志文件位置: ${logFilePath}
|
||||||
|
`;
|
||||||
|
|
||||||
|
fs.writeFileSync(logFilePath, logContent, 'utf8');
|
||||||
|
|
||||||
|
// 打开日志文件
|
||||||
|
shell.openPath(logFilePath).then((error) => {
|
||||||
|
if (error) {
|
||||||
|
console.error('Failed to open log file:', error);
|
||||||
|
// 如果打开文件失败,至少显示文件位置
|
||||||
|
shell.showItemInFolder(logFilePath);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return logFilePath;
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Failed to save error log:', err);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 分析错误日志,识别常见错误并提供解决方案
|
||||||
|
function analyzeError(errorLogs) {
|
||||||
|
const allLogs = errorLogs.join('\n');
|
||||||
|
|
||||||
|
// 检测端口占用错误
|
||||||
|
if (allLogs.includes('failed to start HTTP server') ||
|
||||||
|
allLogs.includes('bind: address already in use') ||
|
||||||
|
allLogs.includes('listen tcp') && allLogs.includes('bind: address already in use')) {
|
||||||
|
return {
|
||||||
|
type: '端口被占用',
|
||||||
|
title: '端口 ' + PORT + ' 被占用',
|
||||||
|
message: '无法启动服务器,端口已被其他程序占用',
|
||||||
|
solution: `可能的解决方案:\n\n1. 关闭占用端口 ${PORT} 的其他程序\n2. 检查是否已经运行了另一个 New API 实例\n3. 使用以下命令查找占用端口的进程:\n Mac/Linux: lsof -i :${PORT}\n Windows: netstat -ano | findstr :${PORT}\n4. 重启电脑以释放端口`
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// 检测数据库错误
|
||||||
|
if (allLogs.includes('database is locked') ||
|
||||||
|
allLogs.includes('unable to open database')) {
|
||||||
|
return {
|
||||||
|
type: '数据库错误',
|
||||||
|
title: '数据库访问失败',
|
||||||
|
message: '无法访问或锁定数据库文件',
|
||||||
|
solution: '可能的解决方案:\n\n1. 确保没有其他 New API 实例正在运行\n2. 检查数据库文件权限\n3. 尝试删除数据库锁文件(.db-shm 和 .db-wal)\n4. 重启应用程序'
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// 检测权限错误
|
||||||
|
if (allLogs.includes('permission denied') ||
|
||||||
|
allLogs.includes('access denied')) {
|
||||||
|
return {
|
||||||
|
type: '权限错误',
|
||||||
|
title: '权限不足',
|
||||||
|
message: '程序没有足够的权限执行操作',
|
||||||
|
solution: '可能的解决方案:\n\n1. 以管理员/root权限运行程序\n2. 检查数据目录的读写权限\n3. 检查可执行文件的权限\n4. 在 Mac 上,检查安全性与隐私设置'
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// 检测网络错误
|
||||||
|
if (allLogs.includes('network is unreachable') ||
|
||||||
|
allLogs.includes('no such host') ||
|
||||||
|
allLogs.includes('connection refused')) {
|
||||||
|
return {
|
||||||
|
type: '网络错误',
|
||||||
|
title: '网络连接失败',
|
||||||
|
message: '无法建立网络连接',
|
||||||
|
solution: '可能的解决方案:\n\n1. 检查网络连接是否正常\n2. 检查防火墙设置\n3. 检查代理配置\n4. 确认目标服务器地址正确'
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// 检测配置文件错误
|
||||||
|
if (allLogs.includes('invalid configuration') ||
|
||||||
|
allLogs.includes('failed to parse config') ||
|
||||||
|
allLogs.includes('yaml') || allLogs.includes('json') && allLogs.includes('parse')) {
|
||||||
|
return {
|
||||||
|
type: '配置错误',
|
||||||
|
title: '配置文件错误',
|
||||||
|
message: '配置文件格式不正确或包含无效配置',
|
||||||
|
solution: '可能的解决方案:\n\n1. 检查配置文件格式是否正确\n2. 恢复默认配置\n3. 删除配置文件让程序重新生成\n4. 查看文档了解正确的配置格式'
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// 检测内存不足
|
||||||
|
if (allLogs.includes('out of memory') ||
|
||||||
|
allLogs.includes('cannot allocate memory')) {
|
||||||
|
return {
|
||||||
|
type: '内存不足',
|
||||||
|
title: '系统内存不足',
|
||||||
|
message: '程序运行时内存不足',
|
||||||
|
solution: '可能的解决方案:\n\n1. 关闭其他占用内存的程序\n2. 增加系统可用内存\n3. 重启电脑释放内存\n4. 检查是否存在内存泄漏'
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// 检测文件不存在错误
|
||||||
|
if (allLogs.includes('no such file or directory') ||
|
||||||
|
allLogs.includes('cannot find the file')) {
|
||||||
|
return {
|
||||||
|
type: '文件缺失',
|
||||||
|
title: '找不到必需的文件',
|
||||||
|
message: '缺少程序运行所需的文件',
|
||||||
|
solution: '可能的解决方案:\n\n1. 重新安装应用程序\n2. 检查安装目录是否完整\n3. 确保所有依赖文件都存在\n4. 检查文件路径是否正确'
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
function getBinaryPath() {
|
function getBinaryPath() {
|
||||||
const isDev = process.env.NODE_ENV === 'development';
|
const isDev = process.env.NODE_ENV === 'development';
|
||||||
const platform = process.platform;
|
const platform = process.platform;
|
||||||
@@ -73,7 +210,13 @@ function startServer() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
serverProcess.stderr.on('data', (data) => {
|
serverProcess.stderr.on('data', (data) => {
|
||||||
console.error(`Server Error: ${data}`);
|
const errorMsg = data.toString();
|
||||||
|
console.error(`Server Error: ${errorMsg}`);
|
||||||
|
serverErrorLogs.push(errorMsg);
|
||||||
|
// 只保留最近的100条错误日志
|
||||||
|
if (serverErrorLogs.length > 100) {
|
||||||
|
serverErrorLogs.shift();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
serverProcess.on('error', (err) => {
|
serverProcess.on('error', (err) => {
|
||||||
@@ -83,8 +226,76 @@ function startServer() {
|
|||||||
|
|
||||||
serverProcess.on('close', (code) => {
|
serverProcess.on('close', (code) => {
|
||||||
console.log(`Server process exited with code ${code}`);
|
console.log(`Server process exited with code ${code}`);
|
||||||
if (mainWindow && !mainWindow.isDestroyed()) {
|
|
||||||
mainWindow.close();
|
// 如果退出代码不是0,说明服务器异常退出
|
||||||
|
if (code !== 0 && code !== null) {
|
||||||
|
const errorDetails = serverErrorLogs.length > 0
|
||||||
|
? serverErrorLogs.slice(-20).join('\n')
|
||||||
|
: '没有捕获到错误日志';
|
||||||
|
|
||||||
|
// 分析错误类型
|
||||||
|
const knownError = analyzeError(serverErrorLogs);
|
||||||
|
|
||||||
|
let dialogOptions;
|
||||||
|
if (knownError) {
|
||||||
|
// 识别到已知错误,显示友好的错误信息和解决方案
|
||||||
|
dialogOptions = {
|
||||||
|
type: 'error',
|
||||||
|
title: knownError.title,
|
||||||
|
message: knownError.message,
|
||||||
|
detail: `${knownError.solution}\n\n━━━━━━━━━━━━━━━━━━━━━━\n\n退出代码: ${code}\n\n错误类型: ${knownError.type}\n\n最近的错误日志:\n${errorDetails}`,
|
||||||
|
buttons: ['退出应用', '查看完整日志'],
|
||||||
|
defaultId: 0,
|
||||||
|
cancelId: 0
|
||||||
|
};
|
||||||
|
} else {
|
||||||
|
// 未识别的错误,显示通用错误信息
|
||||||
|
dialogOptions = {
|
||||||
|
type: 'error',
|
||||||
|
title: '服务器崩溃',
|
||||||
|
message: '服务器进程异常退出',
|
||||||
|
detail: `退出代码: ${code}\n\n最近的错误信息:\n${errorDetails}`,
|
||||||
|
buttons: ['退出应用', '查看完整日志'],
|
||||||
|
defaultId: 0,
|
||||||
|
cancelId: 0
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
dialog.showMessageBox(dialogOptions).then((result) => {
|
||||||
|
if (result.response === 1) {
|
||||||
|
// 用户选择查看详情,保存并打开日志文件
|
||||||
|
const logPath = saveAndOpenErrorLog();
|
||||||
|
|
||||||
|
// 显示确认对话框
|
||||||
|
const confirmMessage = logPath
|
||||||
|
? `日志已保存到:\n${logPath}\n\n日志文件已在默认文本编辑器中打开。\n\n点击"退出"关闭应用程序。`
|
||||||
|
: '日志保存失败,但已在控制台输出。\n\n点击"退出"关闭应用程序。';
|
||||||
|
|
||||||
|
dialog.showMessageBox({
|
||||||
|
type: 'info',
|
||||||
|
title: '日志已保存',
|
||||||
|
message: confirmMessage,
|
||||||
|
buttons: ['退出'],
|
||||||
|
defaultId: 0
|
||||||
|
}).then(() => {
|
||||||
|
app.isQuitting = true;
|
||||||
|
app.quit();
|
||||||
|
});
|
||||||
|
|
||||||
|
// 同时在控制台输出
|
||||||
|
console.log('=== 完整错误日志 ===');
|
||||||
|
console.log(serverErrorLogs.join('\n'));
|
||||||
|
} else {
|
||||||
|
// 用户选择直接退出
|
||||||
|
app.isQuitting = true;
|
||||||
|
app.quit();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
// 正常退出(code为0或null),直接关闭窗口
|
||||||
|
if (mainWindow && !mainWindow.isDestroyed()) {
|
||||||
|
mainWindow.close();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -201,8 +412,79 @@ app.whenReady().then(async () => {
|
|||||||
createWindow();
|
createWindow();
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error('Failed to start application:', err);
|
console.error('Failed to start application:', err);
|
||||||
dialog.showErrorBox('Startup Error', `Failed to start server: ${err.message}`);
|
|
||||||
app.quit();
|
// 分析启动失败的错误
|
||||||
|
const knownError = analyzeError(serverErrorLogs);
|
||||||
|
|
||||||
|
if (knownError) {
|
||||||
|
dialog.showMessageBox({
|
||||||
|
type: 'error',
|
||||||
|
title: knownError.title,
|
||||||
|
message: `启动失败: ${knownError.message}`,
|
||||||
|
detail: `${knownError.solution}\n\n━━━━━━━━━━━━━━━━━━━━━━\n\n错误信息: ${err.message}\n\n错误类型: ${knownError.type}`,
|
||||||
|
buttons: ['退出', '查看完整日志'],
|
||||||
|
defaultId: 0,
|
||||||
|
cancelId: 0
|
||||||
|
}).then((result) => {
|
||||||
|
if (result.response === 1) {
|
||||||
|
// 用户选择查看日志
|
||||||
|
const logPath = saveAndOpenErrorLog();
|
||||||
|
|
||||||
|
const confirmMessage = logPath
|
||||||
|
? `日志已保存到:\n${logPath}\n\n日志文件已在默认文本编辑器中打开。\n\n点击"退出"关闭应用程序。`
|
||||||
|
: '日志保存失败,但已在控制台输出。\n\n点击"退出"关闭应用程序。';
|
||||||
|
|
||||||
|
dialog.showMessageBox({
|
||||||
|
type: 'info',
|
||||||
|
title: '日志已保存',
|
||||||
|
message: confirmMessage,
|
||||||
|
buttons: ['退出'],
|
||||||
|
defaultId: 0
|
||||||
|
}).then(() => {
|
||||||
|
app.quit();
|
||||||
|
});
|
||||||
|
|
||||||
|
console.log('=== 完整错误日志 ===');
|
||||||
|
console.log(serverErrorLogs.join('\n'));
|
||||||
|
} else {
|
||||||
|
app.quit();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
dialog.showMessageBox({
|
||||||
|
type: 'error',
|
||||||
|
title: '启动失败',
|
||||||
|
message: '无法启动服务器',
|
||||||
|
detail: `错误信息: ${err.message}\n\n请检查日志获取更多信息。`,
|
||||||
|
buttons: ['退出', '查看完整日志'],
|
||||||
|
defaultId: 0,
|
||||||
|
cancelId: 0
|
||||||
|
}).then((result) => {
|
||||||
|
if (result.response === 1) {
|
||||||
|
// 用户选择查看日志
|
||||||
|
const logPath = saveAndOpenErrorLog();
|
||||||
|
|
||||||
|
const confirmMessage = logPath
|
||||||
|
? `日志已保存到:\n${logPath}\n\n日志文件已在默认文本编辑器中打开。\n\n点击"退出"关闭应用程序。`
|
||||||
|
: '日志保存失败,但已在控制台输出。\n\n点击"退出"关闭应用程序。';
|
||||||
|
|
||||||
|
dialog.showMessageBox({
|
||||||
|
type: 'info',
|
||||||
|
title: '日志已保存',
|
||||||
|
message: confirmMessage,
|
||||||
|
buttons: ['退出'],
|
||||||
|
defaultId: 0
|
||||||
|
}).then(() => {
|
||||||
|
app.quit();
|
||||||
|
});
|
||||||
|
|
||||||
|
console.log('=== 完整错误日志 ===');
|
||||||
|
console.log(serverErrorLogs.join('\n'));
|
||||||
|
} else {
|
||||||
|
app.quit();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,8 @@
|
|||||||
"description": "New API - AI Model Gateway Desktop Application",
|
"description": "New API - AI Model Gateway Desktop Application",
|
||||||
"main": "main.js",
|
"main": "main.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "set NODE_ENV=development&& electron .",
|
"start": "electron .",
|
||||||
|
"dev": "cross-env NODE_ENV=development electron .",
|
||||||
"build": "electron-builder",
|
"build": "electron-builder",
|
||||||
"build:mac": "electron-builder --mac",
|
"build:mac": "electron-builder --mac",
|
||||||
"build:win": "electron-builder --win",
|
"build:win": "electron-builder --win",
|
||||||
@@ -17,14 +18,14 @@
|
|||||||
"openai",
|
"openai",
|
||||||
"claude"
|
"claude"
|
||||||
],
|
],
|
||||||
"author": "",
|
"author": "QuantumNous",
|
||||||
"license": "MIT",
|
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/Calcium-Ion/new-api"
|
"url": "https://github.com/QuantumNous/new-api"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"electron": "^28.0.0",
|
"cross-env": "^7.0.3",
|
||||||
|
"electron": "28.3.3",
|
||||||
"electron-builder": "^24.9.1"
|
"electron-builder": "^24.9.1"
|
||||||
},
|
},
|
||||||
"build": {
|
"build": {
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
const { contextBridge } = require('electron');
|
const { contextBridge } = require('electron');
|
||||||
|
|
||||||
contextBridge.exposeInMainWorld('electron', {
|
contextBridge.exposeInMainWorld('electron', {
|
||||||
|
isElectron: true,
|
||||||
version: process.versions.electron,
|
version: process.versions.electron,
|
||||||
platform: process.platform
|
platform: process.platform,
|
||||||
|
versions: process.versions
|
||||||
});
|
});
|
||||||
Reference in New Issue
Block a user