Northern_Lights/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2026-01-18 14:30:29 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Remove retry logic from tryUsePort function

Browse Source 
Simplified the tryUsePort function by removing the retryCurrentCount parameter and associated retry logic. Now, if a port is in use, the function increments the port number and retries up to MAX_PORT_TRY times without waiting between attempts.
This commit is contained in:
手瓜一十雪 2026-01-18 11:45:40 +08:00
parent e8855a59b0
commit 0c91f9c66b
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/napcat-webui-backend/index.ts
View File

@ -72,7 +72,7 @@ export function setPendingTokenToSend (token: string | null) {
export async function InitPort (parsedConfig: WebUiConfigType): Promise<[string, number, string]> {
try {
await tryUseHost(parsedConfig.host);
const port = await tryUsePort(parsedConfig.port, parsedConfig.host, 0, 5);
const port = await tryUsePort(parsedConfig.port, parsedConfig.host);
return [parsedConfig.host, port, parsedConfig.token];
} catch (error) {
console.log('host或port不可用', error);
@ -356,7 +356,7 @@ async function tryUseHost (host: string): Promise<string> {
});
}
async function tryUsePort (port: number, host: string, tryCount: number = 0, retryCurrentCount: number = 0): Promise<number> {
async function tryUsePort (port: number, host: string, tryCount: number = 0): Promise<number> {
return new Promise((resolve, reject) => {
try {
const server = net.createServer();
@ -367,17 +367,9 @@ async function tryUsePort (port: number, host: string, tryCount: number = 0, ret
server.on('error', (err: any) => {
if (err.code === 'EADDRINUSE') {
if (retryCurrentCount > 0) {
console.log(`[NapCat] [WebUi] 端口 ${port} 被占用，1秒后重试... (剩余重试次数: ${retryCurrentCount})`);
setTimeout(() => {
resolve(tryUsePort(port, host, tryCount, retryCurrentCount - 1));
}, 1000);
return;
}
if (tryCount < MAX_PORT_TRY) {
// 使用循环代替递归
resolve(tryUsePort(port + 1, host, tryCount + 1, 0));
resolve(tryUsePort(port + 1, host, tryCount + 1));
} else {
reject(new Error(`端口尝试失败，达到最大尝试次数: ${MAX_PORT_TRY}`));
}
@ -394,4 +386,3 @@ async function tryUsePort (port: number, host: string, tryCount: number = 0, ret
}
});
}