Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

fix: Fix incorrect port getting passed to DLServerContext.getInstance #8989

Merged
tonyanziano merged 2 commits into from
Feb 11, 2022
Merged

fix: Fix incorrect port getting passed to DLServerContext.getInstance #8989

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a75a0db
fix: Fix incorrect port getting passed to DLServerContext.getInstance
tdurnford Feb 10, 2022
611a9c7
Merge branch 'main' into durnford/fix/port
cwhitten Feb 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions Composer/packages/server/src/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,13 @@ export async function start(electronContext?: ElectronContext): Promise<number |
const preferredPort = toNumber(process.env.PORT) || 5000;
let port = preferredPort;

if (process.env.NODE_ENV === 'production') {
// Dynamically search for an open PORT starting with PORT or 5000, so that
// the app doesn't crash if the port is already being used.
// (disabled in dev in order to avoid breaking the webpack dev server proxy)
port = await portfinder.getPortPromise({ port: preferredPort });
}

// Setup directline and conversation routes for v3 bots
const DLServerState = DLServerContext.getInstance(port);
const conversationRouter = mountConversationsRoutes(DLServerState);
Expand Down Expand Up @@ -171,12 +178,6 @@ export async function start(electronContext?: ElectronContext): Promise<number |
});
});

if (process.env.NODE_ENV === 'production') {
// Dynamically search for an open PORT starting with PORT or 5000, so that
// the app doesn't crash if the port is already being used.
// (disabled in dev in order to avoid breaking the webpack dev server proxy)
port = await portfinder.getPortPromise({ port: preferredPort });
}
let server;
await new Promise((resolve) => {
server = app.listen(port, () => {
Expand Down