ing

package.json

@@ -25,7 +25,6 @@
     "@ngrx/store": "^5.2.0",
     "core-js": "^2.5.4",
     "rxjs": "^6.0.0",
-    "rxjs-compat": "^6.0.0",
     "zone.js": "^0.8.26"
   },
   "devDependencies": {

projects/loafer/ng-rpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loafer/ng-rpc",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "repository": {
     "type": "git",
     "url": "https://git.loafle.net/loafer/ng.git"

projects/loafer/ng-rpc/src/lib/client/RPCClient.ts

@@ -1,5 +1,4 @@
-import { Observable } from 'rxjs/Observable';
+import { Observable, Subject } from 'rxjs';
-import { Subject } from 'rxjs/Subject';
 
 import { RPCClientError } from '../protocol/RPCError';
 import { RPCClientRWC } from './RPCClientRWC';

projects/loafer/ng-rpc/src/lib/client/RPCClientRWC.ts

@@ -1,6 +1,4 @@
-import { InjectionToken } from '@angular/core';
+import { Observable } from 'rxjs';
-
-import { Observable } from 'rxjs/Observable';
 
 export interface RPCClientRWC<T> {
   connect(queryString?: string): void;

projects/loafer/ng-rpc/src/lib/client/rwc/websocket/RPCClientWebsocketRWC.ts

@@ -1,6 +1,4 @@
-import { Observable } from 'rxjs/Observable';
+import { Observable, Subject } from 'rxjs';
-import { Subject } from 'rxjs/Subject';
-import { map } from 'rxjs/operator/map';
 
 import {
   RxWebsocketSubject,

projects/loafer/ng-rpc/src/lib/client/rwc/websocket/RxWebsocketSubject.ts

@@ -1,15 +1,6 @@
-import { Observable } from 'rxjs/Observable';
+import { Observable, Observer, Subject, interval } from 'rxjs';
-import { Observer } from 'rxjs/Observer';
+import { share, distinctUntilChanged, takeWhile } from 'rxjs/operators';
-import { Subject } from 'rxjs/Subject';
+import { WebSocketSubject, WebSocketSubjectConfig } from 'rxjs/webSocket';
-import {
-  WebSocketSubject,
-  WebSocketSubjectConfig
-} from 'rxjs/observable/dom/WebSocketSubject';
-
-import 'rxjs/add/operator/distinctUntilChanged';
-import 'rxjs/add/operator/share';
-import 'rxjs/add/operator/takeWhile';
-import 'rxjs/add/observable/interval';
 
 export interface RxWebsocketSubjectConfig {
   url: string;
@@ -31,7 +22,10 @@ export class RxWebsocketSubject<T> extends Subject<T> {
 
     this._connectionStatus = new Observable<boolean>((observer) => {
       this._connectionObserver = observer;
-    }).share().distinctUntilChanged();
+    }).pipe(
+      share(),
+      distinctUntilChanged(),
+    );
 
     this._wsSubjectConfig = {
       url: _config.url,
@@ -93,10 +87,11 @@ export class RxWebsocketSubject<T> extends Subject<T> {
   }
 
   private reconnect(): void {
-    this._reconnectionObservable = Observable.interval(this._config.reconnectInterval)
+    this._reconnectionObservable = interval(this._config.reconnectInterval).pipe(
-      .takeWhile((v, index) => {
+      takeWhile((v, index) => {
         return index < this._config.reconnectRetry && !this._socket;
-    });
+    }));
+
     this._reconnectionObservable.subscribe(
       () => {
         this.connect();

projects/loafer/ng-rpc/src/lib/ng-rpc.module.ts

@@ -3,25 +3,13 @@ import {
   ModuleWithProviders,
   Type,
   Inject,
-  InjectionToken,
 } from '@angular/core';
 
 import {
-  RPC_CODEC,
-  RPC_RWC,
-
   _ROOT_SUBSCRIBERS,
   _FEATURE_SUBSCRIBERS,
 } from './core/token';
 
-import {
-  RPCClientRWC,
-} from './client/RPCClientRWC';
-
-import {
-  RPCClientCodec,
-} from './protocol/RPCClientCodec';
-
 import {
   RPCService,
 } from './service/rpc.service';

projects/loafer/ng-rpc/src/lib/service/rpc.service.ts

@@ -1,8 +1,4 @@
 import { Injectable, Inject } from '@angular/core';
-import { Store, select } from '@ngrx/store';
-
-import { Observable } from 'rxjs/Observable';
-import { Subject } from 'rxjs/Subject';
 
 import {
   RPC_CODEC,

projects/loafer/ng-rpc/src/lib/subscribe/subscribe.service.ts

@@ -1,5 +1,4 @@
-import { Injectable, Inject } from '@angular/core';
+import { Injectable } from '@angular/core';
-import { Store, select } from '@ngrx/store';
 
 import {
   Type,
@@ -11,7 +10,6 @@ import { TypeUtil } from '@loafer/core/util/TypeUtil';
 import {
   Class,
   Method,
-  Metadata,
 } from '@loafer/core/reflect';
 
 import { RPCSubscriberAnnotation } from '../decorator/rpc-subscriber.decorator';