From c9545d06e2db2a5953c25934767284f22f011c37 Mon Sep 17 00:00:00 2001 From: arc-alex Date: Fri, 29 Nov 2024 21:10:52 +0100 Subject: [PATCH] send portError to electron --- apps/server/src/app.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/server/src/app.ts b/apps/server/src/app.ts index 2ee18c32c..f44360da7 100644 --- a/apps/server/src/app.ts +++ b/apps/server/src/app.ts @@ -156,15 +156,16 @@ export const initAssets = async () => { */ export const startServer = async ( escalateErrorFn?: (error: string) => void, -): Promise<{ message: string; serverPort: number }> => { +): Promise<{ message: string; serverPort: number; portError: boolean }> => { checkStart(OntimeStartOrder.InitServer); const settings = getDataProvider().getSettings(); - const { serverPort } = settings; + const { serverPort: desiredPort } = settings; expressServer = http.createServer(app); // the express server must be started before the socket otherwise the on error eventlissner will not attach properly - const resultPort = await serverTryDesiredPort(expressServer, serverPort); + const resultPort = await serverTryDesiredPort(expressServer, desiredPort); + const portError = resultPort !== desiredPort; await getDataProvider().setSettings({ ...settings, serverPort: resultPort }); socket.init(expressServer); @@ -224,6 +225,7 @@ export const startServer = async ( return { message: returnMessage, serverPort: resultPort, + portError, }; };