Skip to content

Commit 85dbb76

Browse files
committedMar 11, 2021
demo using turn credentials earlier in the pairing process
1 parent 0d09cfc commit 85dbb76

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed
 

‎src/connectClient/config.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ import * as packageJSON from '../../package.json';
22

33
const env = 'production';
44
const version = packageJSON.version;
5-
const V1endpoint = 'wss://connect.mewapi.io';
5+
const V1endpoint = 'https://connect.mewapi.io';
66
const V2endpoint = 'wss://connect2.mewapi.io/staging';
77

8-
// const stunServers = [
9-
// { urls: 'stun:global.stun.twilio.com:3478?transport=udp' }
10-
// ];
8+
const stunServers = [
9+
{ urls: 'stun:global.stun.twilio.com:3478?transport=udp' }
10+
];
1111

12-
const stunServers = [{"url":"stun:global.stun.twilio.com:3478?transport=udp","urls":"stun:global.stun.twilio.com:3478?transport=udp"},{"url":"turn:global.turn.twilio.com:3478?transport=udp","username":"aab76696eb0285530c6f8ee95c5f075d3515d1e307a22414b1d179a2a3d44ed7","urls":"turn:global.turn.twilio.com:3478?transport=udp","credential":"eyAeQDLjJ8kO3Ru8Tnan7vpCwlU1yDvDpN312KG12WE="},{"url":"turn:global.turn.twilio.com:3478?transport=tcp","username":"aab76696eb0285530c6f8ee95c5f075d3515d1e307a22414b1d179a2a3d44ed7","urls":"turn:global.turn.twilio.com:3478?transport=tcp","credential":"eyAeQDLjJ8kO3Ru8Tnan7vpCwlU1yDvDpN312KG12WE="},{"url":"turn:global.turn.twilio.com:443?transport=tcp","username":"aab76696eb0285530c6f8ee95c5f075d3515d1e307a22414b1d179a2a3d44ed7","urls":"turn:global.turn.twilio.com:443?transport=tcp","credential":"eyAeQDLjJ8kO3Ru8Tnan7vpCwlU1yDvDpN312KG12WE="}]
12+
// const stunServers = [{"url":"stun:global.stun.twilio.com:3478?transport=udp","urls":"stun:global.stun.twilio.com:3478?transport=udp"},{"url":"turn:global.turn.twilio.com:3478?transport=udp","username":"aab76696eb0285530c6f8ee95c5f075d3515d1e307a22414b1d179a2a3d44ed7","urls":"turn:global.turn.twilio.com:3478?transport=udp","credential":"eyAeQDLjJ8kO3Ru8Tnan7vpCwlU1yDvDpN312KG12WE="},{"url":"turn:global.turn.twilio.com:3478?transport=tcp","username":"aab76696eb0285530c6f8ee95c5f075d3515d1e307a22414b1d179a2a3d44ed7","urls":"turn:global.turn.twilio.com:3478?transport=tcp","credential":"eyAeQDLjJ8kO3Ru8Tnan7vpCwlU1yDvDpN312KG12WE="},{"url":"turn:global.turn.twilio.com:443?transport=tcp","username":"aab76696eb0285530c6f8ee95c5f075d3515d1e307a22414b1d179a2a3d44ed7","urls":"turn:global.turn.twilio.com:443?transport=tcp","credential":"eyAeQDLjJ8kO3Ru8Tnan7vpCwlU1yDvDpN312KG12WE="}]
1313

1414
export { env, version, stunServers, V1endpoint, V2endpoint };

‎src/connectClient/initiator/MewConnectInitiator.js

+1
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ Keys
378378

379379
if (this.V1.on) {
380380
this.V1.on('socketPaired', () => {
381+
console.log('socket 1 CONNECTED'); // todo remove dev item
381382
if (this.V2.socketDisconnect) this.V2.socketDisconnect();
382383
this.socketV1Connected = true;
383384
});

‎src/connectClient/initiator/MewConnectInitiatorV2.js

+8-7
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import wrtc from 'wrtc';
88
import MewConnectCommon from '../MewConnectCommon';
99
import MewConnectCrypto from '../MewConnectCrypto';
1010
import WebRtcCommunication from '../WebRtcCommunication';
11+
import { stunServers } from '../config';
1112

1213
const debug = debugLogger('MEWconnect:initiator-V2');
1314
const debugTurn = debugLogger('MEWconnect:turn-V2');
@@ -63,7 +64,7 @@ export default class MewConnectInitiatorV2 extends MewConnectCommon {
6364
// }, 120000);
6465

6566
// WebRTC options
66-
this.iceTransportPolicy = 'all'
67+
this.iceTransportPolicy = 'all';
6768
this.trickle = true;
6869
} catch (e) {
6970
debug('constructor error:', e);
@@ -236,10 +237,9 @@ export default class MewConnectInitiatorV2 extends MewConnectCommon {
236237
});
237238

238239
this.socketOn(this.signals.initiated, this.initiated.bind(this)); // response
239-
this.socketOn(
240-
this.signals.confirmation,
241-
this.beginRtcSequence.bind(this, '')
242-
); // response
240+
this.socketOn(this.signals.confirmation, data => {
241+
this.beginRtcSequence(stunServers);
242+
}); // response
243243
// this.signals.answer
244244
this.socketOn('answer', this.recieveAnswer.bind(this));
245245
this.socketOn(
@@ -323,13 +323,14 @@ export default class MewConnectInitiatorV2 extends MewConnectCommon {
323323
debug('initiator', this.signals.initiated, data);
324324
}
325325

326-
beginRtcSequence(data) {
326+
beginRtcSequence(stunServers) {
327327
this.emit('socketPaired');
328328
this.emit('beginRtcSequence', 'V2');
329329
try {
330330
debug('beginRtcSequence ');
331-
debug('sendOffer', data);
331+
debug('sendOffer', stunServers);
332332
this.iceServers = null;
333+
this.stunServers = stunServers;
333334
const options = {
334335
servers: this.stunServers,
335336
webRtcConfig: {

0 commit comments

Comments
 (0)
Please sign in to comment.