Angular6/RxJs6 upgrade (#106)

Author: guiohm

angular2-websocket.d.ts

@@ -1,5 +1,4 @@
-import { Observable } from 'rxjs/Observable';
-import { Subject } from 'rxjs/Subject';
+import { Observable, Subject } from 'rxjs';
 export declare class $WebSocket {
     private url;
     private protocols;

package.json

@@ -2,7 +2,7 @@
   "name": "angular2-websocket",
   "main": "angular2-websocket",
   "version": "0.9.6",
-  "license": "MIT",  
+  "license": "MIT",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "compile": "tsc",
@@ -18,30 +18,26 @@
     "bluebird": "^3.4.6"
   },
   "peerDependencies": {
-    "@angular/common": "^4.4.6",
-    "@angular/compiler": "^4.4.6",
-    "@angular/core": "^4.4.6",
     "core-js": "^2.4.1",
     "reflect-metadata": "^0.1.8",
-    "rxjs": "^5.4.0",
     "typescript": "^2.4.0",
     "zone.js": "^0.8.12"
   },
   "devDependencies": {
-    "@angular/common": "^4.4.6",
-    "@angular/compiler": "^4.4.6",
-    "@angular/core": "4.4.6",
-    "codelyzer": "~3.2.0",
+    "@angular/common": "^6.0.2",
+    "@angular/compiler": "^6.0.2",
+    "@angular/core": "6.0.2",
+    "@types/bluebird": "^3.0.35",
+    "codelyzer": "^4.3.0",
     "core-js": "^2.4.1",
     "grunt": "~0.4.1",
     "grunt-contrib-uglify": "~0.2.4",
     "grunt-typescript": "~0.2.4",
     "reflect-metadata": "^0.1.8",
-    "rxjs": "^5.4.0",
+    "rxjs": "^6.1.0",
     "tslint": "~5.7.0",
     "typescript": "^2.4.0",
     "typings": "^2.0.0",
-    "@types/bluebird": "^3.0.35",
     "zone.js": "^0.8.12"
   }
 }

src/angular2-websocket.ts

@@ -1,6 +1,5 @@
 import {Injectable} from '@angular/core';
-import {Observable} from 'rxjs/Observable';
-import {Subject} from 'rxjs/Subject';
+import {Observable, Subject} from 'rxjs';
 
 export class $WebSocket {
 
@@ -43,17 +42,17 @@ export class $WebSocket {
     private errorMessages: Subject<any>;
     private internalConnectionState: number;
 
-    constructor(private url: string, 
-        private protocols?: Array<string>, 
-        private config?: WebSocketConfig, 
-        private binaryType?: BinaryType) 
+    constructor(private url: string,
+        private protocols?: Array<string>,
+        private config?: WebSocketConfig,
+        private binaryType?: BinaryType)
     {
         let match = new RegExp('wss?:\/\/').test(url);
         if (!match) {
             throw new Error('Invalid url provided');
         }
         this.config = Object.assign({ initialTimeout: 500, maxTimeout: 300000, reconnectIfNotNormalClose: false }, config);
-        this.binaryType = binaryType || "blob";
+        this.binaryType = binaryType || 'blob';
         this.dataStream = new Subject();
         this.errorMessages = new Subject();
         this.connect(true);
@@ -64,7 +63,7 @@ export class $WebSocket {
         let self = this;
         if (force || !this.socket || this.socket.readyState !== this.readyStateConstants.OPEN) {
             self.socket = this.protocols ? new WebSocket(this.url, this.protocols) : new WebSocket(this.url);
-            self.socket.binaryType = self.binaryType.toString();
+            self.socket.binaryType = self.binaryType;
 
             self.socket.onopen = (ev: Event) => {
                 // console.log('onOpen: ', ev);
@@ -169,15 +168,15 @@ export class $WebSocket {
      * @returns {any}
      */
     send(data: any, mode?: WebSocketSendMode, binary?: boolean): any {
-        switch (typeof mode !== "undefined" ? mode : this.send4Mode) {
+        switch (typeof mode !== 'undefined' ? mode : this.send4Mode) {
             case WebSocketSendMode.Direct:
                 return this.send4Direct(data, binary);
             case WebSocketSendMode.Promise:
                 return this.send4Promise(data, binary);
             case WebSocketSendMode.Observable:
                 return this.send4Observable(data, binary);
             default:
-                throw Error("WebSocketSendMode Error.");
+                throw Error('WebSocketSendMode Error.');
         }
     }