Skip to content

Commit e4eb748

Browse files
author
cloudwebrtc
committed
Update.
1 parent 03939dc commit e4eb748

File tree

2 files changed

+32
-31
lines changed

2 files changed

+32
-31
lines changed

server/Server.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ export default class CallHandler {
7272
}
7373

7474
onClose = (client_self, data) => {
75+
console.log('close');
7576
var session_id = client_self.session_id;
7677
//remove old session_id
7778
if (session_id !== undefined) {
@@ -211,7 +212,7 @@ export default class CallHandler {
211212
data: {
212213
from: client_self.id,
213214
to: message.to,
214-
sdp: message.sdp,
215+
description: message.description,
215216
},
216217
};
217218

@@ -233,7 +234,7 @@ export default class CallHandler {
233234
data: {
234235
from: client_self.id,
235236
to: message.to,
236-
sdp: message.sdp,
237+
description: message.description,
237238
}
238239
};
239240

src/App.js

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class App extends Component {
7171
this.remoteView = null;
7272

7373
this.state = {
74-
pcPeers: {},
74+
peerConnections: {},
7575
session_id: '0-0',
7676
joined: false,
7777
peers: [],
@@ -119,10 +119,10 @@ class App extends Component {
119119

120120
switch (parsedMessage.type) {
121121
case 'invite':
122-
this.onSessionInvite(parsedMessage);
122+
this.onInvite(parsedMessage);
123123
break;
124124
case 'ringing':
125-
this.onPeerReady(parsedMessage);
125+
this.onRinging(parsedMessage);
126126
break;
127127
case 'offer':
128128
this.onOffer(parsedMessage);
@@ -206,7 +206,7 @@ class App extends Component {
206206
this.send(message);
207207
}
208208

209-
onPeerReady = (message) => {
209+
onRinging = (message) => {
210210
var data = message.data;
211211
var id = data.id;
212212
var media = data.media;
@@ -217,7 +217,7 @@ class App extends Component {
217217
});
218218
}
219219

220-
onSessionInvite = (message) => {
220+
onInvite = (message) => {
221221
var data = message.data;
222222
var from = data.from;
223223
console.log("data:" + data);
@@ -236,7 +236,7 @@ class App extends Component {
236236
let message = {
237237
type: 'offer',
238238
to: id,
239-
sdp: pc.localDescription,
239+
description: pc.localDescription,
240240
session_id: this.state.session_id,
241241
}
242242
this.send(message);
@@ -246,7 +246,7 @@ class App extends Component {
246246

247247
createPC = (id, isOffer) => {
248248
var pc = new RTCPeerConnection(configuration);
249-
this.state.pcPeers["" + id] = pc;
249+
this.state.peerConnections["" + id] = pc;
250250
pc.onicecandidate = (event) => {
251251
console.log('onicecandidate', event);
252252
if (event.candidate) {
@@ -331,21 +331,21 @@ class App extends Component {
331331
console.log("data.from:" + data.from);
332332

333333
var pc = null;
334-
if (from in this.state.pcPeers) {
335-
pc = this.state.pcPeers[from];
334+
if (from in this.state.peerConnections) {
335+
pc = this.state.peerConnections[from];
336336
}
337-
if (pc && data.sdp) {
337+
if (pc && data.description) {
338338
//console.log('on offer sdp', data);
339-
pc.setRemoteDescription(new RTCSessionDescription(data.sdp), () => {
339+
pc.setRemoteDescription(new RTCSessionDescription(data.description), () => {
340340
if (pc.remoteDescription.type == "offer")
341341
pc.createAnswer((desc) => {
342-
console.log('createAnswer: ', desc.sdp);
342+
console.log('createAnswer: ', desc.description);
343343
pc.setLocalDescription(desc, () => {
344344
console.log('setLocalDescription', pc.localDescription);
345345
let message = {
346346
type: 'answer',
347347
to: from,
348-
sdp: pc.localDescription,
348+
description: pc.localDescription,
349349
session_id: this.state.session_id,
350350
}
351351
this.send(message);
@@ -360,13 +360,13 @@ class App extends Component {
360360
var data = message.data;
361361
var from = data.from;
362362
var pc = null;
363-
if (from in this.state.pcPeers) {
364-
pc = this.state.pcPeers[from];
363+
if (from in this.state.peerConnections) {
364+
pc = this.state.peerConnections[from];
365365
}
366366

367-
if (pc && data.sdp) {
367+
if (pc && data.description) {
368368
//console.log('on answer sdp', data);
369-
pc.setRemoteDescription(new RTCSessionDescription(data.sdp), () => {
369+
pc.setRemoteDescription(new RTCSessionDescription(data.description), () => {
370370
}, this.logError);
371371
}
372372
}
@@ -375,8 +375,8 @@ class App extends Component {
375375
var data = message.data;
376376
var from = data.from;
377377
var pc = null;
378-
if (from in this.state.pcPeers) {
379-
pc = this.state.pcPeers[from];
378+
if (from in this.state.peerConnections) {
379+
pc = this.state.peerConnections[from];
380380
}
381381
if (pc && data.candidate) {
382382
//console.log('on candidate ', data);
@@ -387,14 +387,14 @@ class App extends Component {
387387
onLeave = (message) => {
388388
var id = message.data;
389389
console.log('leave', id);
390-
var pcPeers = this.state.pcPeers;
391-
var pc = pcPeers[id];
390+
var peerConnections = this.state.peerConnections;
391+
var pc = peerConnections[id];
392392
if (pc !== undefined) {
393393
pc.close();
394-
delete pcPeers[id];
394+
delete peerConnections[id];
395395
this.setState({
396396
joined: false,
397-
pcPeers,
397+
peerConnections,
398398
open: false,
399399
localStream: null,
400400
remoteStream: null
@@ -407,14 +407,14 @@ class App extends Component {
407407
var from = data.from;
408408
var to = data.to;
409409
console.log('bye: ', data.session_id);
410-
var pcPeers = this.state.pcPeers;
411-
var pc = pcPeers[to];
410+
var peerConnections = this.state.peerConnections;
411+
var pc = peerConnections[to];
412412
if (pc !== undefined) {
413413
pc.close();
414-
delete pcPeers[to];
414+
delete peerConnections[to];
415415
this.setState({
416416
joined: false,
417-
pcPeers,
417+
peerConnections,
418418
open: false,
419419
localStream: null,
420420
remoteStream: null
@@ -440,8 +440,8 @@ class App extends Component {
440440
//document.getElementById('textRoomInput').value = '';
441441
// var content = document.getElementById('textRoomContent');
442442
// content.innerHTML = content.innerHTML + '<p>' + 'Me' + ': ' + text + '</p>';
443-
for (var key in this.state.pcPeers) {
444-
var pc = this.state.pcPeers[key];
443+
for (var key in this.state.peerConnections) {
444+
var pc = this.state.peerConnections[key];
445445
pc.textDataChannel.send(text);
446446
}
447447
}

0 commit comments

Comments
 (0)