ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-testapp: test-scenarios final response updated (numberOfElements, content)

pull/88/merge
pabloFuente 2018-07-04 19:11:00 +02:00
parent 150c58429c
commit 4548b97a56
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
openvidu-testapp/src/app/components/test-scenarios/test-scenarios.component.ts
View File

@ -124,7 +124,7 @@ export class TestScenariosComponent implements OnInit, OnDestroy {
} }
this.users = []; this.users = [];
this.report = { 'streamsOut': { 'count': 0, 'items': [] }, 'streamsIn': { 'count': 0, 'items': [] } }; this.report = { 'streamsOut': { 'numberOfElements': 0, 'content': [] }, 'streamsIn': { 'numberOfElements': 0, 'content': [] } };
this.loadSubsPubs(subsPubs); this.loadSubsPubs(subsPubs);
this.loadPubs(pubs); this.loadPubs(pubs);
this.loadSubs(subs); this.loadSubs(subs);
@ -331,8 +331,8 @@ export class TestScenariosComponent implements OnInit, OnDestroy {
event.streamManager.stream.getRemoteIceCandidateList().map((c: RTCIceCandidate) => c.candidate), event.streamManager.stream.getRemoteIceCandidateList().map((c: RTCIceCandidate) => c.candidate),
}; };
this.report.streamsIn.count++; this.report.streamsIn.numberOfElements++;
this.report.streamsIn.items.push(newReport); this.report.streamsIn.content.push(newReport);
} else { } else {
newReport = { newReport = {
connectionId: event.connectionId, connectionId: event.connectionId,
@ -353,8 +353,8 @@ export class TestScenariosComponent implements OnInit, OnDestroy {
event.streamManager.stream.getRemoteIceCandidateList().map((c: RTCIceCandidate) => c.candidate) event.streamManager.stream.getRemoteIceCandidateList().map((c: RTCIceCandidate) => c.candidate)
}; };
this.report.streamsOut.count++; this.report.streamsOut.numberOfElements++;
this.report.streamsOut.items.push(newReport); this.report.streamsOut.content.push(newReport);
} }
if (++this.numberOfReports === this.totalNumberOfStreams) { if (++this.numberOfReports === this.totalNumberOfStreams) {
@ -371,8 +371,8 @@ export class TestScenariosComponent implements OnInit, OnDestroy {
this.http.get(this.openviduUrl + 'api/sessions/' + this.fixedSessionId + '?webRtcStats=true', { headers }).subscribe( this.http.get(this.openviduUrl + 'api/sessions/' + this.fixedSessionId + '?webRtcStats=true', { headers }).subscribe(
sessionInfo => { sessionInfo => {
this.report.streamsOut.items.forEach(report => { this.report.streamsOut.content.forEach(report => {
const streamOutRemoteInfo = sessionInfo['connections'] const streamOutRemoteInfo = sessionInfo['connections'].content
.find(c => c.connectionId === report.connectionId).publishers .find(c => c.connectionId === report.connectionId).publishers
.find(p => { .find(p => {
report.webrtcTagName = p.webrtcTagName; report.webrtcTagName = p.webrtcTagName;
@ -390,8 +390,8 @@ export class TestScenariosComponent implements OnInit, OnDestroy {
} }
}); });
this.report.streamsIn.items.forEach(report => { this.report.streamsIn.content.forEach(report => {
const streamInRemoteInfo = sessionInfo['connections'] const streamInRemoteInfo = sessionInfo['connections'].content
.find(c => c.connectionId === report.connectionId).subscribers .find(c => c.connectionId === report.connectionId).subscribers
.find(p => { .find(p => {
report.webrtcTagName = p.webrtcTagName; report.webrtcTagName = p.webrtcTagName;
@ -435,7 +435,7 @@ export class TestScenariosComponent implements OnInit, OnDestroy {
focusOnReportForStream(event) { focusOnReportForStream(event) {
this.isFocusedOnReport = true; this.isFocusedOnReport = true;
let jsonObject = !!event.in ? this.report.streamsIn : this.report.streamsOut; let jsonObject = !!event.in ? this.report.streamsIn : this.report.streamsOut;
jsonObject = jsonObject.items.find(stream => { jsonObject = jsonObject.content.find(stream => {
const webrtcTagName = !!event.in ? event.connectionId + '_' + event.streamId : event.streamId; const webrtcTagName = !!event.in ? event.connectionId + '_' + event.streamId : event.streamId;
return (stream.connectionId === event.connectionId && stream.webrtcTagName === webrtcTagName); return (stream.connectionId === event.connectionId && stream.webrtcTagName === webrtcTagName);
}); });
@ -452,7 +452,7 @@ export class TestScenariosComponent implements OnInit, OnDestroy {
.then(localCandidatePair => { .then(localCandidatePair => {
let newReport; let newReport;
if (event.streamManager.remote) { if (event.streamManager.remote) {
const streamInRemoteInfo = sessionInfo['connections'] const streamInRemoteInfo = sessionInfo['connections'].content
.find(c => c.connectionId === event.connectionId).subscribers .find(c => c.connectionId === event.connectionId).subscribers
.find(p => p.webrtcTagName === event.connectionId + '_' + event.streamManager.stream.streamId); .find(p => p.webrtcTagName === event.connectionId + '_' + event.streamManager.stream.streamId);
@ -470,11 +470,11 @@ export class TestScenariosComponent implements OnInit, OnDestroy {
} }
}; };
this.report.streamsIn.count++; this.report.streamsIn.numberOfElements++;
this.report.streamsIn.items.push(newReport); this.report.streamsIn.content.push(newReport);
this.stringifyReport = JSON.stringify(this.report, null, '\t'); this.stringifyReport = JSON.stringify(this.report, null, '\t');
} else { } else {
const streamOutRemoteInfo = sessionInfo['connections'] const streamOutRemoteInfo = sessionInfo['connections'].content
.find(c => c.connectionId === event.connectionId).publishers .find(c => c.connectionId === event.connectionId).publishers
.find(p => p.webrtcTagName === event.streamManager.stream.streamId); .find(p => p.webrtcTagName === event.streamManager.stream.streamId);
@ -492,8 +492,8 @@ export class TestScenariosComponent implements OnInit, OnDestroy {
} }
}; };
this.report.streamsOut.count++; this.report.streamsOut.numberOfElements++;
this.report.streamsOut.items.push(newReport); this.report.streamsOut.content.push(newReport);
this.stringifyReport = JSON.stringify(this.report, null, '\t'); this.stringifyReport = JSON.stringify(this.report, null, '\t');
} }
}) })