Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/clever-ends-wink.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"next-ws": patch
---

Await default property of route module
7 changes: 5 additions & 2 deletions src/server/helpers/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,10 @@ async function importModule<T>(modulePath: string): Promise<T> {
}
}

export function getSocketHandler(routeModule: RouteModule) {
export async function getSocketHandler(routeModule: RouteModule) {
if (routeModule.default instanceof Promise)
return getSocketHandler(await routeModule.default);

return (
routeModule?.default?.routeModule?.userland?.SOCKET ??
routeModule?.routeModule?.userland?.SOCKET ??
Expand All @@ -133,7 +136,7 @@ export function getSocketHandler(routeModule: RouteModule) {
}

export interface RouteModule {
default?: RouteModule;
default?: Promise<RouteModule> | RouteModule;
routeModule?: { userland?: RouteModule['handlers'] };
handlers?: { SOCKET?: SocketHandler };
}
2 changes: 1 addition & 1 deletion src/server/setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export function setupWebSocketServer(nextServer: NextNodeServer) {
return socket.destroy();
}

const socketHandler = getSocketHandler(routeModule);
const socketHandler = await getSocketHandler(routeModule);
if (!socketHandler || typeof socketHandler !== 'function') {
logger.error(`[next-ws] ${pathname} does not export a SOCKET handler`);
return socket.destroy();
Expand Down