From c2bef377ab1a6a85550964be0d42e4e472269a2e Mon Sep 17 00:00:00 2001 From: Shrikant Sharat Kandula Date: Tue, 25 Feb 2025 18:29:55 +0530 Subject: [PATCH] fix: Server split so that server is run on EE as well (#39435) --- app/client/packages/rts/src/ce/server.ts | 11 +---------- app/client/packages/rts/src/ee/server.ts | 4 +++- app/client/packages/rts/src/server.ts | 12 +++++++++++- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/app/client/packages/rts/src/ce/server.ts b/app/client/packages/rts/src/ce/server.ts index fadc4b548f3..33b14193acd 100644 --- a/app/client/packages/rts/src/ce/server.ts +++ b/app/client/packages/rts/src/ce/server.ts @@ -2,7 +2,6 @@ import http from "http"; import express from "express"; import type { LogLevelDesc } from "loglevel"; import log from "loglevel"; -import { VERSION as buildVersion } from "../version"; // release version of the api // routes import ast_routes from "../routes/ast_routes"; @@ -17,10 +16,8 @@ const logLevel: LogLevelDesc = (process.env.APPSMITH_LOG_LEVEL || log.setLevel(logLevel); -const APPSMITH_RTS_PORT = process.env.APPSMITH_RTS_PORT || 8091; - //Disable x-powered-by header to prevent information disclosure -const app = express(); +export const app = express(); app.disable("x-powered-by"); const server = new http.Server(app); @@ -34,11 +31,5 @@ app.use(`${RTS_BASE_API_PATH}`, health_check_routes); server.headersTimeout = 61000; server.keepAliveTimeout = 60000; -// Run the server -server.listen(APPSMITH_RTS_PORT, () => { - log.info( - `RTS version ${buildVersion} running at http://localhost:${APPSMITH_RTS_PORT}`, - ); -}); export default server; diff --git a/app/client/packages/rts/src/ee/server.ts b/app/client/packages/rts/src/ee/server.ts index 4ca75e90ae3..7d69beaf37f 100644 --- a/app/client/packages/rts/src/ee/server.ts +++ b/app/client/packages/rts/src/ee/server.ts @@ -1 +1,3 @@ -import "../ce/server.ts"; +import server from "../ce/server"; + +export default server; diff --git a/app/client/packages/rts/src/server.ts b/app/client/packages/rts/src/server.ts index f882c9736e4..5f782c144d9 100644 --- a/app/client/packages/rts/src/server.ts +++ b/app/client/packages/rts/src/server.ts @@ -1 +1,11 @@ -import "./ee/server.ts"; +import server from "./ee/server"; +import log from "loglevel"; +import { VERSION as buildVersion } from "./version"; // release version of the api + +const APPSMITH_RTS_PORT = process.env.APPSMITH_RTS_PORT || 8091; + +server.listen(APPSMITH_RTS_PORT, () => { + log.info( + `RTS version ${buildVersion} running at http://localhost:${APPSMITH_RTS_PORT}`, + ); +});