Skip to content

WIP, refactor set local description #533

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

WIP, refactor set local description #533

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
36 changes: 31 additions & 5 deletions packages/common/src/webrtc/BaseCall.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,12 +621,18 @@ export default abstract class BaseCall implements IWebRTCCall {
}

private _onIceSdp(data: RTCSessionDescription) {
console.log('________________ _onIceSdp ___________')
if (this._iceTimeout) {
clearTimeout(this._iceTimeout)
}
this._iceTimeout = null
this._iceDone = true
const { sdp, type } = data


console.log('________ SDP: ', sdp)


if (sdp.indexOf('candidate') === -1) {
this._requestAnotherLocalDescription()
return
Expand Down Expand Up @@ -663,15 +669,19 @@ export default abstract class BaseCall implements IWebRTCCall {
this._iceDone = false
instance.onicecandidate = event => {
if (this._iceDone) {
console.log('______iceDone, returning...')
return
}
if (this._iceTimeout === null) {
this._iceTimeout = setTimeout(() => this._onIceSdp(instance.localDescription), 1000)
}
// if (this._iceTimeout === null) {
// console.log('______ set timeout for iceTimeout _____')
// this._iceTimeout = setTimeout(() => this._onIceSdp(instance.localDescription), 1000)
// }
if (event.candidate) {
logger.info('IceCandidate:', event.candidate)
logger.info('IceCandidate: address: ', event.candidate.address, ' - port: ', event.candidate.port, ' - type:', event.candidate.type)
} else {
this._onIceSdp(instance.localDescription)
console.log('_________onicecandidate - doing nothing_______')
// console.log('______calling onIceSdp with local description:', instance.localDescription?.sdp)
// this._onIceSdp(instance.localDescription)
}
}

Expand All @@ -687,6 +697,22 @@ export default abstract class BaseCall implements IWebRTCCall {
instance.addEventListener('addstream', (event: MediaStreamEvent) => {
this.options.remoteStream = event.stream
})

instance.addEventListener('icegatheringstatechange', (ev) => {
switch (instance.iceGatheringState) {
case 'new':
console.log('_______new_______')
break
case 'gathering':
console.log('_______gathering_______')
break
case 'complete':
console.log('_______complete_______ calling _onIceSdp with SDP: ', instance.localDescription?.sdp)
this._onIceSdp(instance.localDescription)
break
}
})

}

private _checkConferenceSerno = (serno: number) => {
Expand Down