overflow_cloud/member_webapp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ing

Browse Source
This commit is contained in:
crusader 2018-05-31 21:44:11 +09:00
parent e46aa26170
commit 87f68ca3f3
4 changed files with 28 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
@overflow/discovery/component/discovery.component.ts
View File

@ -6,9 +6,10 @@ import { Anim } from './animation';
import { Store, select } from '@ngrx/store'; import { Store, select } from '@ngrx/store';
import { Observable, of, Subscription } from 'rxjs'; import { Observable, of, Subscription } from 'rxjs';
import { DiscoveryService } from '../service/discovery.service'; import { DiscoveryService } from '../service/discovery.service';
import { DiscoveryNotify } from '../core/discovery-subject'; import { DiscoveryNotify } from '../subscriber/discovery.subscriber.subject';
import { catchError, exhaustMap, map, tap } from 'rxjs/operators'; import { catchError, exhaustMap, map, tap } from 'rxjs/operators';
import { DiscoverZone, Zone, Host, Port, Service } from '@overflow/commons-typescript/model/discovery'; import { DiscoverZone, Zone, Host, Port, Service } from '@overflow/commons-typescript/model/discovery';
import { DiscoverySubscriber } from '../subscriber/discovery.subscriber';
@Component({ @Component({
selector: 'of-discovery', selector: 'of-discovery',
@ -28,6 +29,7 @@ export class DiscoveryComponent {
constructor( constructor(
private discoveryService: DiscoveryService, private discoveryService: DiscoveryService,
private discoverySubscriber: DiscoverySubscriber,
private store: Store<any> private store: Store<any>
) { ) {
} }
@ -37,7 +39,12 @@ export class DiscoveryComponent {
this.requested = true; this.requested = true;
this.discoverySubscription = this.discoveryService.discoverZone(this.selectedProbe.probe.probeKey, dz).pipe( const discovery$ = this.discoverySubscriber.subscribe();
discovery$.pipe(
tap(() => {
this.discoveryService.discoverZone(this.selectedProbe.probe.probeKey, dz);
}),
map((discoveryNotify: DiscoveryNotify) => { map((discoveryNotify: DiscoveryNotify) => {
switch (discoveryNotify.method) { switch (discoveryNotify.method) {
case 'DiscoveryService.discoveryStart': { case 'DiscoveryService.discoveryStart': {

35
@overflow/discovery/service/discovery.service.ts
View File

@ -1,7 +1,7 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable'; import { Observable } from 'rxjs/Observable';
import { RPCService, RPCSubscribeService } from '@loafer/ng-rpc'; import { RPCService } from '@loafer/ng-rpc';
import { import {
DiscoverZone as MDDiscoverZone, DiscoverZone as MDDiscoverZone,
DiscoverHost as MDDiscoverHost, DiscoverHost as MDDiscoverHost,
@ -13,50 +13,25 @@ import {
Service, Service,
} from '@overflow/commons-typescript/model/discovery'; } from '@overflow/commons-typescript/model/discovery';
import { DiscoverySubject, DiscoveryNotify } from '../core/discovery-subject';
import * as DiscoverStore from '../store/discover';
import { DiscoverySubscriber } from '../subscriber/discovery.subscriber';
@Injectable() @Injectable()
export class DiscoveryService { export class DiscoveryService {
public constructor( public constructor(
private discoverySubscriber: DiscoverySubscriber,
private rpcService: RPCService, private rpcService: RPCService,
) { ) {
} }
public discoverZone(probeID: string, discoverZone: MDDiscoverZone): Observable<DiscoveryNotify> { public discoverZone(probeID: string, discoverZone: MDDiscoverZone): void {
const discoverySubject: DiscoverySubject = new DiscoverySubject();
this.discoverySubscriber.setDiscoverySubject(discoverySubject);
this.rpcService.send('DiscoveryService.discoverZone', probeID, discoverZone); this.rpcService.send('DiscoveryService.discoverZone', probeID, discoverZone);
return discoverySubject;
} }
public discoverHost(probeID: string, zone: Zone, discoverHost: MDDiscoverHost): Observable<DiscoveryNotify> { public discoverHost(probeID: string, zone: Zone, discoverHost: MDDiscoverHost): void {
const discoverySubject: DiscoverySubject = new DiscoverySubject();
this.discoverySubscriber.setDiscoverySubject(discoverySubject);
this.rpcService.send('DiscoveryService.discoverHost', probeID, zone, discoverHost); this.rpcService.send('DiscoveryService.discoverHost', probeID, zone, discoverHost);
return discoverySubject;
} }
public discoverPort(probeID: string, host: Host, discoverPort: MDDiscoverPort): Observable<DiscoveryNotify> { public discoverPort(probeID: string, host: Host, discoverPort: MDDiscoverPort): void {
const discoverySubject: DiscoverySubject = new DiscoverySubject();
this.discoverySubscriber.setDiscoverySubject(discoverySubject);
this.rpcService.send('DiscoveryService.discoverPort', probeID, host, discoverPort); this.rpcService.send('DiscoveryService.discoverPort', probeID, host, discoverPort);
return discoverySubject;
} }
public discoverService(probeID: string, port: Port, discoverService: MDDiscoverService): Observable<DiscoveryNotify> { public discoverService(probeID: string, port: Port, discoverService: MDDiscoverService): void {
const discoverySubject: DiscoverySubject = new DiscoverySubject();
this.discoverySubscriber.setDiscoverySubject(discoverySubject);
this.rpcService.send('DiscoveryService.discoverService', probeID, port, discoverService); this.rpcService.send('DiscoveryService.discoverService', probeID, port, discoverService);
return discoverySubject;
} }
} }

2
@overflow/discovery/core/discovery-subject.ts → @overflow/discovery/subscriber/discovery.subscriber.subject.ts
View File

@ -12,6 +12,6 @@ export interface DiscoveryNotify {
params: Date | Zone | Host | Port | Service; params: Date | Zone | Host | Port | Service;
} }
export class DiscoverySubject extends Subject<DiscoveryNotify> { export class DiscoverySubscriberSubject extends Subject<DiscoveryNotify> {
} }

27
@overflow/discovery/subscriber/discovery.subscriber.ts
View File

@ -1,4 +1,5 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Observable, Subject } from 'rxjs';
import { catchError, exhaustMap, map, tap } from 'rxjs/operators'; import { catchError, exhaustMap, map, tap } from 'rxjs/operators';
import { RPCSubscriber } from '@loafer/ng-rpc'; import { RPCSubscriber } from '@loafer/ng-rpc';
@ -13,63 +14,61 @@ import {
Port, Port,
Service, Service,
} from '@overflow/commons-typescript/model/discovery'; } from '@overflow/commons-typescript/model/discovery';
import { DiscoverySubject } from '../core/discovery-subject'; import { DiscoverySubscriberSubject, DiscoveryNotify } from './discovery.subscriber.subject';
@Injectable() @Injectable()
export class DiscoverySubscriber { export class DiscoverySubscriber {
discoverySubject: DiscoverySubject | null; discoverySubscriberSubject: DiscoverySubscriberSubject;
public constructor( public constructor(
private loggerService: LoggerService, private loggerService: LoggerService,
) { ) {
this.discoverySubscriberSubject = new DiscoverySubscriberSubject();
} }
/** /**
* name * name
*/ */
public setDiscoverySubject(discoverySubject: DiscoverySubject) { public subscribe(): Observable<DiscoveryNotify> {
this.discoverySubject = discoverySubject; return this.discoverySubscriberSubject.asObservable();
} }
private publish(method: string, params: any): void { private publish(method: string, params: any): void {
if (null !== this.discoverySubject) { this.discoverySubscriberSubject.next({ method: method, params: params });
this.discoverySubject.next({method: method, params: params});
}
} }
@RPCSubscriber({method: 'DiscoveryService.discoveryStart'}) @RPCSubscriber({ method: 'DiscoveryService.discoveryStart' })
public discoveryStart(startDate: Date): void { public discoveryStart(startDate: Date): void {
this.loggerService.debug('DiscoverySubscriber.discoveryStart startDate:', startDate); this.loggerService.debug('DiscoverySubscriber.discoveryStart startDate:', startDate);
this.publish('DiscoveryService.discoveryStart', startDate); this.publish('DiscoveryService.discoveryStart', startDate);
} }
@RPCSubscriber({method: 'DiscoveryService.discoveryStop'}) @RPCSubscriber({ method: 'DiscoveryService.discoveryStop' })
public discoveryStop(stopDate: Date): void { public discoveryStop(stopDate: Date): void {
this.loggerService.debug('DiscoverySubscriber.discoveryStop stopDate:', stopDate); this.loggerService.debug('DiscoverySubscriber.discoveryStop stopDate:', stopDate);
this.publish('DiscoveryService.discoveryStop', stopDate); this.publish('DiscoveryService.discoveryStop', stopDate);
this.setDiscoverySubject(null);
} }
@RPCSubscriber({method: 'DiscoveryService.discoveredZone'}) @RPCSubscriber({ method: 'DiscoveryService.discoveredZone' })
public discoveredZone(zone: Zone): void { public discoveredZone(zone: Zone): void {
this.loggerService.debug('DiscoverySubscriber.discoveredZone zone:', zone); this.loggerService.debug('DiscoverySubscriber.discoveredZone zone:', zone);
this.publish('DiscoveryService.discoveredZone', zone); this.publish('DiscoveryService.discoveredZone', zone);
} }
@RPCSubscriber({method: 'DiscoveryService.discoveredHost'}) @RPCSubscriber({ method: 'DiscoveryService.discoveredHost' })
public discoveredHost(host: Host): void { public discoveredHost(host: Host): void {
this.loggerService.debug('DiscoverySubscriber.discoveredHost host:', host); this.loggerService.debug('DiscoverySubscriber.discoveredHost host:', host);
this.publish('DiscoveryService.discoveredHost', host); this.publish('DiscoveryService.discoveredHost', host);
} }
@RPCSubscriber({method: 'DiscoveryService.discoveredPort'}) @RPCSubscriber({ method: 'DiscoveryService.discoveredPort' })
public discoveredPort(port: Port): void { public discoveredPort(port: Port): void {
this.publish('DiscoveryService.discoveredPort', port); this.publish('DiscoveryService.discoveredPort', port);
} }
@RPCSubscriber({method: 'DiscoveryService.discoveredService'}) @RPCSubscriber({ method: 'DiscoveryService.discoveredService' })
public discoveredService(service: Service): void { public discoveredService(service: Service): void {
this.loggerService.debug('DiscoverySubscriber.discoveredService service:', service); this.loggerService.debug('DiscoverySubscriber.discoveredService service:', service);
this.publish('DiscoveryService.discoveredService', service); this.publish('DiscoveryService.discoveredService', service);