Skip to content

Fix P2P connection: initialize ICE servers and add fallback public ST… #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AMEST wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix P2P connection: initialize ICE servers and add fallback public ST… #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 59 additions & 12 deletions src/PeerMeeting.Host/ClientApp/src/services/PeerMeetingRtcMulticonnection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,17 @@ export default class PeerMeetingRtcMulticonnection {
participantsCardFixTimer = null
triedTurnOnly = false

// Public STUN servers
defaultStunServers = [
'stun:stun.l.google.com:19302',
'stun:stun1.l.google.com:19302',
'stun:stun2.l.google.com:19302',
'stun:stun3.l.google.com:19302',
'stun:stun4.l.google.com:19302',
'stun:stun.services.mozilla.com:3478',
'stun:stun.stunprotocol.org:3478',
]

constructor(store, router, participants) {
this.store = store
this.router = router
Expand Down Expand Up @@ -109,28 +120,64 @@ export default class PeerMeetingRtcMulticonnection {
}

configureIceServers() {
if (!this.store.state.application.turnSettings)
// Инициализируем iceServers если их нет
if (!this.connection.iceServers) {
this.connection.iceServers = []
}

// Если нет turnSettings, добавляем только публичные STUN серверы
if (!this.store.state.application.turnSettings) {
this.connection.iceServers = [
{
urls: this.defaultStunServers,
},
]
return
}

// Если TURN режим включен, очищаем iceServers и используем только TURN
if (this.store.state.application.turnOnly || this.triedTurnOnly) {
this.connection.iceServers = []
this.connection.candidates.host = false
this.connection.iceTransportPolicy = 'relay'
}
const turnUri = this.store.state.application.turnSettings.uris[0]
const stunUri = turnUri.replace(/^turn:/, 'stun:').replace(/\?transport=tcp$/, '').replace(/\?transport=udp$/, '')

// Добавляем публичные STUN серверы в начало списка
this.connection.iceServers.unshift({
urls: stunUri,
})
this.connection.iceServers.push({
urls: this.store.state.application.turnSettings.uris[0],
credential: this.store.state.application.turnSettings.password,
username: this.store.state.application.turnSettings.username,
urls: this.defaultStunServers,
})

// Извлекаем STUN из TURN URI
const turnUri = this.store.state.application.turnSettings.uris[0]
const stunUri = turnUri
.replace(/^turn:/, 'stun:')
.replace(/\?transport=tcp$/, '')
.replace(/\?transport=udp$/, '')

// Добавляем STUN сервер из конфига
this.connection.iceServers.push({
urls: this.store.state.application.turnSettings.uris[1],
credential: this.store.state.application.turnSettings.password,
username: this.store.state.application.turnSettings.username,
urls: stunUri,
})

// Добавляем первый TURN сервер
if (this.store.state.application.turnSettings.uris.length > 0) {
this.connection.iceServers.push({
urls: this.store.state.application.turnSettings.uris[0],
credential: this.store.state.application.turnSettings.password,
username: this.store.state.application.turnSettings.username,
})
}

// Добавляем второй TURN сервер (если доступен)
if (this.store.state.application.turnSettings.uris.length > 1) {
this.connection.iceServers.push({
urls: this.store.state.application.turnSettings.uris[1],
credential: this.store.state.application.turnSettings.password,
username: this.store.state.application.turnSettings.username,
})
}

console.log('ICE Servers configured:', this.connection.iceServers)
}

configureKicked() {
Expand Down
Loading