feat: 修改脚本使其自动执行后处理功能,处理生成api的错误

This commit is contained in:
SikongJueluo 2025-07-17 19:04:23 +08:00
parent 2ff735e06a
commit 688fe05b1b
No known key found for this signature in database
1 changed files with 98 additions and 44 deletions

View File

@ -1,6 +1,7 @@
import { spawn, exec, ChildProcess } from 'child_process'; import { spawn, exec, ChildProcess } from 'child_process';
import { promisify } from 'util'; import { promisify } from 'util';
import fetch from 'node-fetch'; import fetch from 'node-fetch';
import * as fs from 'fs';
const execAsync = promisify(exec); const execAsync = promisify(exec);
@ -166,7 +167,7 @@ async function stopServer(): Promise<void> {
} }
}); });
// 设置超时,如果 5 秒内没有退出则强制终止 // 设置超时,如果 3 秒内没有退出则强制终止
const timeoutPromise = new Promise<void>((resolve) => { const timeoutPromise = new Promise<void>((resolve) => {
setTimeout(() => { setTimeout(() => {
if (serverProcess && !serverProcess.killed && serverProcess.exitCode === null) { if (serverProcess && !serverProcess.killed && serverProcess.exitCode === null) {
@ -174,7 +175,7 @@ async function stopServer(): Promise<void> {
serverProcess.kill('SIGKILL'); serverProcess.kill('SIGKILL');
} }
resolve(); resolve();
}, 5000); }, 3000); // 减少超时时间到3秒
}); });
await Promise.race([exitPromise, timeoutPromise]); await Promise.race([exitPromise, timeoutPromise]);
@ -184,22 +185,8 @@ async function stopServer(): Promise<void> {
} finally { } finally {
serverProcess = null; serverProcess = null;
// 额外清理:确保没有遗留的 dotnet 进程 // 只有在进程可能没有正常退出时才执行清理
try { // 移除自动清理逻辑,因为正常退出时不需要
if (process.platform === 'win32') {
// Windows: 使用 taskkill 清理进程
await execAsync('taskkill /F /IM dotnet.exe').catch(() => {
// 忽略错误,可能没有匹配的进程
});
} else {
// 只清理与我们项目相关的进程
await execAsync('pkill -f "dotnet.*run.*--property:Configuration=Release"').catch(() => {
// 忽略错误,可能没有匹配的进程
});
}
} catch (cleanupError) {
// 忽略清理错误
}
} }
} }
@ -238,7 +225,7 @@ async function stopWeb(): Promise<void> {
} }
}); });
// 设置超时,如果 5 秒内没有退出则强制终止 // 设置超时,如果 3 秒内没有退出则强制终止
const timeoutPromise = new Promise<void>((resolve) => { const timeoutPromise = new Promise<void>((resolve) => {
setTimeout(() => { setTimeout(() => {
if (webProcess && !webProcess.killed && webProcess.exitCode === null) { if (webProcess && !webProcess.killed && webProcess.exitCode === null) {
@ -246,7 +233,7 @@ async function stopWeb(): Promise<void> {
webProcess.kill('SIGKILL'); webProcess.kill('SIGKILL');
} }
resolve(); resolve();
}, 5000); }, 3000); // 减少超时时间到3秒
}); });
await Promise.race([exitPromise, timeoutPromise]); await Promise.race([exitPromise, timeoutPromise]);
@ -256,22 +243,36 @@ async function stopWeb(): Promise<void> {
} finally { } finally {
webProcess = null; webProcess = null;
// 额外清理:确保没有遗留的 npm/node 进程 // 只有在进程可能没有正常退出时才执行清理
try { // 移除自动清理逻辑,因为正常退出时不需要
if (process.platform === 'win32') { }
// Windows: 清理可能的 node 进程 }
await execAsync('taskkill /F /IM node.exe').catch(() => {
// 忽略错误,可能没有匹配的进程 async function postProcessApiClient(): Promise<void> {
}); console.log('Post-processing API client...');
} else { try {
// 清理可能的 vite 进程 const filePath = 'src/APIClient.ts';
await execAsync('pkill -f "vite"').catch(() => {
// 忽略错误,可能没有匹配的进程 // 检查文件是否存在
}); if (!fs.existsSync(filePath)) {
} throw new Error(`API client file not found: ${filePath}`);
} catch (cleanupError) {
// 忽略清理错误
} }
// 读取文件内容
let content = fs.readFileSync(filePath, 'utf8');
// 替换 ArgumentException 中的 message 属性声明
content = content.replace(
/(\s+)message!:\s*string;/g,
'$1declare message: string;'
);
// 写回文件
fs.writeFileSync(filePath, content, 'utf8');
console.log('✓ API client post-processing completed');
} catch (error) {
throw new Error(`Failed to post-process API client: ${error}`);
} }
} }
@ -281,6 +282,9 @@ async function generateApiClient(): Promise<void> {
const npxCommand = getCommand('npx'); const npxCommand = getCommand('npx');
await execAsync(`${npxCommand} nswag openapi2tsclient /input:http://localhost:5000/swagger/v1/swagger.json /output:src/APIClient.ts`); await execAsync(`${npxCommand} nswag openapi2tsclient /input:http://localhost:5000/swagger/v1/swagger.json /output:src/APIClient.ts`);
console.log('✓ API client generated successfully'); console.log('✓ API client generated successfully');
// 添加后处理步骤
await postProcessApiClient();
} catch (error) { } catch (error) {
throw new Error(`Failed to generate API client: ${error}`); throw new Error(`Failed to generate API client: ${error}`);
} }
@ -323,11 +327,28 @@ async function main(): Promise<void> {
} }
} }
// 改进的进程终止处理 // 改进的进程终止处理 - 添加防重复执行
let isCleaningUp = false;
const cleanup = async (signal: string) => { const cleanup = async (signal: string) => {
if (isCleaningUp) {
console.log('Cleanup already in progress, ignoring signal');
return;
}
isCleaningUp = true;
console.log(`\nReceived ${signal}, cleaning up...`); console.log(`\nReceived ${signal}, cleaning up...`);
await stopServer();
await stopWeb(); try {
await Promise.all([
stopServer(),
stopWeb()
]);
} catch (error) {
console.error('Error during cleanup:', error);
}
// 立即退出,不等待
process.exit(0); process.exit(0);
}; };
@ -336,22 +357,55 @@ process.on('SIGTERM', () => cleanup('SIGTERM'));
// 处理未捕获的异常 // 处理未捕获的异常
process.on('uncaughtException', async (error) => { process.on('uncaughtException', async (error) => {
if (isCleaningUp) return;
console.error('❌ Uncaught exception:', error); console.error('❌ Uncaught exception:', error);
await stopServer(); isCleaningUp = true;
await stopWeb();
try {
await Promise.all([
stopServer(),
stopWeb()
]);
} catch (cleanupError) {
console.error('Error during cleanup:', cleanupError);
}
process.exit(1); process.exit(1);
}); });
process.on('unhandledRejection', async (reason, promise) => { process.on('unhandledRejection', async (reason, promise) => {
if (isCleaningUp) return;
console.error('❌ Unhandled rejection at:', promise, 'reason:', reason); console.error('❌ Unhandled rejection at:', promise, 'reason:', reason);
await stopServer(); isCleaningUp = true;
await stopWeb();
try {
await Promise.all([
stopServer(),
stopWeb()
]);
} catch (cleanupError) {
console.error('Error during cleanup:', cleanupError);
}
process.exit(1); process.exit(1);
}); });
main().catch(async (error) => { main().catch(async (error) => {
if (isCleaningUp) return;
console.error('❌ Unhandled error:', error); console.error('❌ Unhandled error:', error);
await stopServer(); isCleaningUp = true;
await stopWeb();
try {
await Promise.all([
stopServer(),
stopWeb()
]);
} catch (cleanupError) {
console.error('Error during cleanup:', cleanupError);
}
process.exit(1); process.exit(1);
}); });