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
6 changes: 4 additions & 2 deletions src/protocols/websocket.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,10 @@ class WSNode extends RTWrapper {
let err = error;

if (!(error instanceof Error)) {
err = error ?
new Error(error.message || error) : new Error('Unexpected error');
// browser-side, the payload sent to this event is a generic "Event"
// object bearing no information about the cause of the error
err = error && (typeof Event === 'undefined' || !(error instanceof Event)) ?
new Error(error.message || error) : new Error('Connection error');
}

this.clientNetworkError(err);
Expand Down
20 changes: 20 additions & 0 deletions test/protocol/websocket.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,26 @@ describe('WebSocket networking module', () => {
should(websocket.wasConnected).be.false();
});

it('should reject with a proper error if onerror is called with an event (browser)', () => {
const Event = sinon.stub();
Object.defineProperty(global, 'Event', {
value: Event,
enumerable: false,
writable: false,
configurable: true
});

const promise = websocket.connect();
websocket.client.onerror(new Event());

return should(promise).rejectedWith(Error, {message: 'Connection error'})
.then(() => delete global.Event)
.catch(e => {
delete global.Event;
throw e;
});
});

describe('#constructor', () => {
it('should throw if an invalid host is provided', () => {
const invalidHosts = [undefined, null, 123, false, true, [], {}, ''];
Expand Down