This commit is contained in:
crusader 2018-09-05 15:29:06 +09:00
parent 160d40b455
commit 19dda63c8a
10 changed files with 25 additions and 11 deletions

View File

@ -12,5 +12,6 @@ export interface Host {
zone?: Zone; zone?: Zone;
portList?: Port[]; portList?: Port[];
discoveredBy?: string;
discoveredDate?: Date; discoveredDate?: Date;
} }

View File

@ -7,8 +7,9 @@ export interface Port {
portNumber?: number; portNumber?: number;
meta?: Map<string, string>; meta?: Map<string, string>;
discoveredDate?: Date;
host?: Host; host?: Host;
serviceList?: Service[]; serviceList?: Service[];
discoveredBy?: string;
discoveredDate?: Date;
} }

View File

@ -9,5 +9,6 @@ export interface Service {
port?: Port; port?: Port;
discoveredBy?: string;
discoveredDate?: Date; discoveredDate?: Date;
} }

View File

@ -9,5 +9,6 @@ export interface Zone {
mac?: string; mac?: string;
meta?: Map<string, string>; meta?: Map<string, string>;
discoveredBy?: string;
discoveredDate?: Date; discoveredDate?: Date;
} }

View File

@ -39,7 +39,7 @@
"@ngrx/schematics": "^6.1.0", "@ngrx/schematics": "^6.1.0",
"@ngrx/store": "^6.1.0", "@ngrx/store": "^6.1.0",
"@ngrx/store-devtools": "^6.1.0", "@ngrx/store-devtools": "^6.1.0",
"@overflow/rpc-js": "0.0.2", "@overflow/rpc-js": "0.0.4",
"@types/fs-extra": "^5.0.4", "@types/fs-extra": "^5.0.4",
"@types/jasmine": "~2.8.6", "@types/jasmine": "~2.8.6",
"@types/jasminewd2": "~2.0.3", "@types/jasminewd2": "~2.0.3",

View File

@ -6,7 +6,7 @@
</svg> </svg>
</div> </div>
<div class="home-description"> <div class="home-description">
<h1>overFlow Network Scanner </h1> <h1>overFlow Scanner </h1>
<br> <br>
<b>를 이용해 주셔서 감사합니다.</b> <b>를 이용해 주셔서 감사합니다.</b>
<br> 좌측의 버튼을 클릭 하시면 기본 설정으로 스캐닝이 시작 됩니다. 설정의 변경을 원하시면 상단의 설정 영역을 클릭하여 변경이 가능합니다. <br> 좌측의 버튼을 클릭 하시면 기본 설정으로 스캐닝이 시작 됩니다. 설정의 변경을 원하시면 상단의 설정 영역을 클릭하여 변경이 가능합니다.

View File

@ -3,7 +3,7 @@ import { Component, OnInit } from '@angular/core';
import { Observable, Subscription, of } from 'rxjs'; import { Observable, Subscription, of } from 'rxjs';
import { catchError, exhaustMap, map, tap, take } from 'rxjs/operators'; import { catchError, exhaustMap, map, tap, take } from 'rxjs/operators';
import { ProbeService } from '../../../commons/service/probe.service'; import { ProbeService, requesterID } from '../../../commons/service/probe.service';
import { Interface } from '@overflow/model/net/nic'; import { Interface } from '@overflow/model/net/nic';
import { Zone, DiscoverHost } from '@overflow/model/discovery'; import { Zone, DiscoverHost } from '@overflow/model/discovery';
@ -63,7 +63,7 @@ export class HomePageComponent implements OnInit {
} }
}; };
this.probeService.send('DiscoveryService.DiscoverHost', 'testRequesterID', zone, discoverHost); this.probeService.send('DiscoveryService.DiscoverHost', requesterID, zone, discoverHost);
// this.probeService.call<Interface>('MachineService.Interfaces').pipe( // this.probeService.call<Interface>('MachineService.Interfaces').pipe(
// map((ifaces: Interface[]) => { // map((ifaces: Interface[]) => {

View File

@ -15,7 +15,7 @@
</button> </button>
</p-header> </p-header>
<div id="nic-list-border"> <div id="nic-list-border">
<p-menu [model]="items"></p-menu> <p-menu [model]="addresses"></p-menu>
</div> </div>
<!-- <div>Body Content</div> <!-- <div>Body Content</div>

View File

@ -8,8 +8,10 @@ import {
} from '@overflow/rpc-js'; } from '@overflow/rpc-js';
import { Subscription } from 'rxjs'; import { Subscription } from 'rxjs';
export const requesterID = 'scannerUser';
const config: WebSocketClientRWCConfig = { const config: WebSocketClientRWCConfig = {
url: 'ws://localhost:60000/scanner' url: 'ws://localhost:60000/scanner?requesterID=' + requesterID
}; };
const rwc = new WebSocketClientRWC(config); const rwc = new WebSocketClientRWC(config);
const codec = new JSONClientCodec(); const codec = new JSONClientCodec();
@ -25,6 +27,14 @@ export class ProbeService extends Client {
this.notiSubscription = this.notification() this.notiSubscription = this.notification()
.subscribe((notiCodec: ClientNotificationCodec) => { .subscribe((notiCodec: ClientNotificationCodec) => {
console.log(notiCodec.method()); console.log(notiCodec.method());
const params = notiCodec.params();
if (undefined !== params) {
params.forEach(param => {
console.log(param);
}); });
} }
});
}
} }

View File

@ -224,9 +224,9 @@
tree-kill "^1.0.0" tree-kill "^1.0.0"
webpack-sources "^1.1.0" webpack-sources "^1.1.0"
"@overflow/rpc-js@0.0.2": "@overflow/rpc-js@0.0.4":
version "0.0.2" version "0.0.4"
resolved "https://nexus.loafle.net/repository/npm-all/@overflow/rpc-js/-/rpc-js-0.0.2.tgz#16a628f988cb2994d5b02d0c871340d9df6819e2" resolved "https://nexus.loafle.net/repository/npm-all/@overflow/rpc-js/-/rpc-js-0.0.4.tgz#0d0fe3919551ab60b784825f612290c6003148c7"
"@schematics/angular@0.7.3": "@schematics/angular@0.7.3":
version "0.7.3" version "0.7.3"