diff --git a/src/framework/napcat.ts b/src/framework/napcat.ts index b1451dc2..d96e1ff3 100644 --- a/src/framework/napcat.ts +++ b/src/framework/napcat.ts @@ -7,13 +7,13 @@ import { SelfInfo } from '@/core/types'; import { NodeIKernelLoginListener } from '@/core/listeners'; import { NodeIKernelLoginService } from '@/core/services'; import { NodeIQQNTWrapperSession, WrapperNodeApi } from '@/core/wrapper'; -import { InitWebUi, WebUiConfig } from '@/webui'; +import { InitWebUi, WebUiConfig, webUiRuntimePort } from '@/webui'; import { NapCatOneBot11Adapter } from '@/onebot'; //Framework ES入口文件 export async function getWebUiUrl() { const WebUiConfigData = (await WebUiConfig.GetWebUIConfig()); - return 'http://127.0.0.1:' + WebUiConfigData.port + '/webui/?token=' + WebUiConfigData.token; + return 'http://127.0.0.1:' + webUiRuntimePort + '/webui/?token=' + WebUiConfigData.token; } export async function NCoreInitFramework( diff --git a/src/webui/index.ts b/src/webui/index.ts index a4eae968..716e84fc 100644 --- a/src/webui/index.ts +++ b/src/webui/index.ts @@ -29,7 +29,7 @@ export let webUiPathWrapper: NapCatPathWrapper; const MAX_PORT_TRY = 100; import * as net from 'node:net'; import { WebUiDataRuntime } from './src/helper/Data'; - +export let webUiRuntimePort = 6099; export async function InitPort(parsedConfig: WebUiConfigType): Promise<[string, number, string]> { try { await tryUseHost(parsedConfig.host); @@ -45,6 +45,7 @@ export async function InitWebUi(logger: LogWrapper, pathWrapper: NapCatPathWrapp webUiPathWrapper = pathWrapper; WebUiConfig = new WebUiConfigWrapper(); const [host, port, token] = await InitPort(await WebUiConfig.GetWebUIConfig()); + webUiRuntimePort = port; if (port == 0) { logger.log('[NapCat] [WebUi] Current WebUi is not run.'); return;