Skip to content

Commit 52ad69c

Browse files
committed
Merge pull request #453 from NativeScript/try-resolve-ws
Safely resolve `ws` module.
2 parents e69f540 + 9c08f40 commit 52ad69c

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

lib/transports/websocket.js

+8-3
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,16 @@ var BrowserWebSocket = global.WebSocket || global.MozWebSocket;
1212

1313
/**
1414
* Get either the `WebSocket` or `MozWebSocket` globals
15-
* in the browser or the WebSocket-compatible interface
16-
* exposed by `ws` for Node environment.
15+
* in the browser or try to resolve WebSocket-compatible
16+
* interface exposed by `ws` for Node-like environment.
1717
*/
1818

19-
var WebSocket = BrowserWebSocket || (typeof window !== 'undefined' ? null : require('ws'));
19+
var WebSocket = BrowserWebSocket;
20+
if (!WebSocket && typeof window === 'undefined') {
21+
try {
22+
WebSocket = require('ws');
23+
} catch (e) { }
24+
}
2025

2126
/**
2227
* Module exports.

0 commit comments

Comments
 (0)