+ update package dependencies to latest version & support for rxjs 6.x.

package.json

@@ -23,8 +23,8 @@
   },
   "homepage": "https://github.com/voryx/Thruway.js#readme",
   "peerDependencies": {
-    "rxjs": "^5.4.0",
-    "ws": "^2.2.1"
+    "rxjs": "^6.3.3",
+    "ws": "^6.0.0"
   },
   "browser": {
     "ws": false
@@ -39,32 +39,33 @@
     "test_mocha": "mocha spec-js/spec/*",
     "test": "npm-run-all clean_spec build_spec test_mocha clean_spec"
   },
-  "devDependencies": {
-    "@types/es6-shim": "^0.31.32",
-    "@types/escape-string-regexp": "^0.0.30",
-    "@types/lodash": "^4.14.62",
-    "@types/mocha": "^2.2.32",
-    "@types/node": "6.0.38",
-    "@types/sinon": "^1.16.31",
-    "@types/sinon-chai": "^2.7.27",
-    "@types/ws": "0.0.30",
+  "dependencies": {
+    "@types/es6-shim": "^0.31.37",
+    "@types/escape-string-regexp": "^1.0.0",
+    "@types/lodash": "^4.14.116",
+    "@types/mocha": "^5.2.5",
+    "@types/node": "10.11.3",
+    "@types/sinon": "^5.0.2",
+    "@types/sinon-chai": "^3.2.0",
+    "@types/ws": "6.0.1",
     "browserfy": "^1.0.0",
-    "chai": "^3.5.0",
+    "chai": "^4.2.0",
     "es6-shim": "^0.35.1",
     "escape-string-regexp": "^1.0.5",
-    "lodash": "^4.14.62",
-    "mocha": "^3.0.2",
-    "npm-run-all": "^3.1.0",
-    "promise": "^7.1.1",
-    "protractor": "^3.1.1",
-    "rxjs": "^5.0.0",
-    "shx": "^0.1.4",
-    "sinon": "^2.0.0-pre",
-    "sinon-chai": "^2.8.0",
-    "ts-loader": "^0.8.2",
-    "ts-node": "^3.3.0",
-    "tslint": "^5.2.0",
-    "typescript": "<=2.4.0",
-    "webpack": "^2.0"
+    "lodash": "^4.17.11",
+    "mocha": "^5.2.0",
+    "npm-run-all": "^4.1.3",
+    "promise": "^8.0.2",
+    "protractor": "^5.4.1",
+    "rxjs": "^6.3.3",
+    "shx": "^0.3.2",
+    "sinon": "^6.3.4",
+    "sinon-chai": "^3.2.0",
+    "ts-loader": "^5.2.1",
+    "ts-node": "^7.0.1",
+    "tslint": "^5.11.0",
+    "typescript": "2.9.2",
+    "webpack": "^4.20.2",
+    "ws": "^6.0.0"
   }
 }

spec/client/client-spec.ts

@@ -1,4 +1,3 @@
-import {Subject} from 'rxjs/Subject';
 import {hot, expectObservable, expectSubscriptions, cold} from '../helpers/marble-testing';
 import {assertWampMessages, recordWampMessage, wampMessages} from '../helpers/wamp-testing';
 import {CallMessage} from '../../src/Messages/CallMessage';
@@ -7,7 +6,7 @@ import {WelcomeMessage} from '../../src/Messages/WelcomeMessage';
 import {ErrorMessage} from '../../src/Messages/ErrorMessage';
 import {WampErrorException} from '../../src/Common/WampErrorException';
 import {xit as it} from '../helpers/test-helpers';
-import {Subscriber} from 'rxjs/Subscriber';
+import {Subscriber,Subject} from 'rxjs';
 import {Client} from '../../src/Client';
 
 /** @test {client} */

spec/helpers/marble-testing.ts

@@ -1,9 +1,8 @@
-import {Observable} from 'rxjs/Observable';
-import {SubscriptionLog} from 'rxjs/testing/SubscriptionLog';
-import {ColdObservable} from 'rxjs/testing/ColdObservable';
-import {HotObservable} from 'rxjs/testing/HotObservable';
-import {observableToBeFn, subscriptionLogsToBeFn} from 'rxjs/testing/TestScheduler';
-import {expect} from 'chai';
+import {Observable} from 'rxjs';
+import {SubscriptionLog} from "rxjs/internal/testing/SubscriptionLog";
+import {observableToBeFn, subscriptionLogsToBeFn} from "rxjs/internal/testing/TestScheduler";
+import {HotObservable} from "rxjs/internal/testing/HotObservable";
+import {ColdObservable} from "rxjs/internal/testing/ColdObservable";
 
 declare const global: any;
 

spec/helpers/test-helpers.ts

@@ -1,6 +1,7 @@
-declare const global, require, it;
+import {TestScheduler} from "rxjs/testing";
+
+declare const global, it;
 
-import {TestScheduler} from 'rxjs/Rx';
 import {clearWampMessages} from './wamp-testing';
 import {expect} from 'chai';
 

spec/observables/call-spec.ts

@@ -1,4 +1,4 @@
-import {Subject} from 'rxjs/Subject';
+import {Subject} from 'rxjs';
 import {hot, expectObservable, expectSubscriptions, cold} from '../helpers/marble-testing';
 import {CallObservable} from '../../src/Observable/CallObservable';
 import {assertWampMessages, recordWampMessage, wampMessages} from '../helpers/wamp-testing';

spec/observables/register-spec.ts

@@ -1,5 +1,6 @@
+import {finalize} from "rxjs/operators";
+
 declare const global: any;
-import {Subject} from 'rxjs/Subject';
 import {hot, expectObservable, expectSubscriptions, cold} from '../helpers/marble-testing';
 import {assertWampMessages, recordWampMessage, wampMessages} from '../helpers/wamp-testing';
 import {WelcomeMessage} from '../../src/Messages/WelcomeMessage';
@@ -11,23 +12,23 @@ import {RegisteredMessage} from '../../src/Messages/RegisteredMessage';
 import {RegisterMessage} from '../../src/Messages/RegisterMessage';
 import {InvocationMessage} from '../../src/Messages/InvocationMessage';
 import {InterruptMessage} from '../../src/Messages/InterruptMessage';
-import {Observable} from 'rxjs/Observable';
+import {empty, from, never, Observable, of, Subject} from 'rxjs';
 import {expect} from 'chai';
 
 function callable(first = 0, second = 0) {
     return +first + +second;
 }
 
 function callableObs(first = 0, second = 0) {
-    return Observable.of(+first + +second);
+    return of(+first + +second);
 }
 
 function callableManyObs(first = 0, second = 0) {
-    return Observable.from([first, second]);
+    return from([first, second]);
 }
 
 function callableEmpty(first = 0, second = 0) {
-    return Observable.empty();
+    return empty();
 }
 
 function callableThrows(first = 0, second = 0) {
@@ -507,7 +508,7 @@ describe('RegisterObservable', () => {
         let disposedInner = false;
 
         const neverCallable = () => {
-            return Observable.never().finally(() => { disposedInner = true; });
+            return never().pipe(finalize(() => { disposedInner = true; }));
         };
 
         const register = new RegisterObservable('testing.uri', neverCallable, messages, webSocket, {}, null, global.rxTestScheduler);