Skip to content

Commit

Permalink
fix: correctly detect WebSocket server
Browse files Browse the repository at this point in the history
  • Loading branch information
enisdenjo committed Aug 26, 2020
1 parent 2dcf72a commit eab29dc
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions src/server.ts
Expand Up @@ -198,10 +198,9 @@ export function createServer(
onSubscribe,
onComplete,
} = options;
const webSocketServer =
websocketOptionsOrServer instanceof WebSocket.Server
? websocketOptionsOrServer
: new WebSocket.Server(websocketOptionsOrServer);
const webSocketServer = isWebSocketServer(websocketOptionsOrServer)
? websocketOptionsOrServer
: new WebSocket.Server(websocketOptionsOrServer);

function handleConnection(socket: WebSocket, request: http.IncomingMessage) {
if (
Expand Down Expand Up @@ -511,3 +510,7 @@ function isErrorEvent(obj: unknown): obj is WebSocket.ErrorEvent {
hasOwnStringProperty(obj, 'type')
);
}

function isWebSocketServer(obj: unknown): obj is WebSocketServer {
return isObject(obj) && typeof obj.on === 'function';
}

0 comments on commit eab29dc

Please sign in to comment.