fix(WebSocketSubject): Check to see if WebSocket exists in global scope (#3694)

bbonnet · benlesh · commit 2db0788eaeeb · 2018-05-20T19:26:51.000-07:00
before using it
diff --git a/spec/observables/dom/webSocket-spec.ts b/spec/observables/dom/webSocket-spec.ts
@@ -636,6 +636,48 @@ describe('webSocket', () => {
       ]);
     });
   });
+
+  describe('node constructor', () => {
+
+    it('should send and receive messages', () => {
+      let messageReceived = false;
+      const subject = webSocket<string>(<any>{
+        url: 'ws://mysocket',
+        WebSocketCtor: (url: string, protocol: string): MockWebSocket => {
+          return new MockWebSocket(url, protocol);
+        }
+      });
+
+      subject.next('ping');
+
+      subject.subscribe(x => {
+        expect(x).to.equal('pong');
+        messageReceived = true;
+      });
+
+      const socket = MockWebSocket.lastSocket;
+      expect(socket.url).to.equal('ws://mysocket');
+
+      socket.open();
+      expect(socket.lastMessageSent).to.equal(JSON.stringify('ping'));
+
+      socket.triggerMessage(JSON.stringify('pong'));
+      expect(messageReceived).to.be.true;
+
+      subject.unsubscribe();
+    });
+
+    it('should handle constructor errors if no WebSocketCtor', () => {
+
+      expect(() => {
+        const subject = webSocket<string>(<any>{
+          url: 'ws://mysocket'
+        });
+      }).to.throw('no WebSocket constructor can be found');
+
+    });
+  });
+
 });
 
 class MockWebSocket {
diff --git a/src/internal/observable/dom/WebSocketSubject.ts b/src/internal/observable/dom/WebSocketSubject.ts
@@ -80,7 +80,6 @@ export class WebSocketSubject<T> extends AnonymousSubject<T> {
       this.source = urlConfigOrSource as Observable<T>;
     } else {
       const config = this._config = { ...DEFAULT_WEBSOCKET_CONFIG };
-      config.WebSocketCtor = WebSocket;
       this._output = new Subject<T>();
       if (typeof urlConfigOrSource === 'string') {
         config.url = urlConfigOrSource;
@@ -91,7 +90,10 @@ export class WebSocketSubject<T> extends AnonymousSubject<T> {
           }
         }
       }
-      if (!config.WebSocketCtor) {
+
+      if (!config.WebSocketCtor && WebSocket) {
+        config.WebSocketCtor = WebSocket;
+      } else if (!config.WebSocketCtor) {
         throw new Error('no WebSocket constructor can be found');
       }
       this.destination = new ReplaySubject();

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,6 @@ export class WebSocketSubject<T> extends AnonymousSubject<T> {`
`80`	`80`	`this.source = urlConfigOrSource as Observable<T>;`
`81`	`81`	`} else {`
`82`	`82`	`const config = this._config = { ...DEFAULT_WEBSOCKET_CONFIG };`
`83`		`- config.WebSocketCtor = WebSocket;`
`84`	`83`	`this._output = new Subject<T>();`
`85`	`84`	`if (typeof urlConfigOrSource === 'string') {`
`86`	`85`	`config.url = urlConfigOrSource;`
`@@ -91,7 +90,10 @@ export class WebSocketSubject<T> extends AnonymousSubject<T> {`
`91`	`90`	`}`
`92`	`91`	`}`
`93`	`92`	`}`
`94`		`- if (!config.WebSocketCtor) {`
	`93`	`+`
	`94`	`+ if (!config.WebSocketCtor && WebSocket) {`
	`95`	`+ config.WebSocketCtor = WebSocket;`
	`96`	`+ } else if (!config.WebSocketCtor) {`
`95`	`97`	`throw new Error('no WebSocket constructor can be found');`
`96`	`98`	`}`
`97`	`99`	`this.destination = new ReplaySubject();`