iridium/neko
2
2
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2024-07-24 14:40:50 +12:00
Code Issues Packages Projects Releases Wiki Activity

webrtc fix logging.

Browse Source
This commit is contained in:
Miroslav Šedivý 2021-09-12 18:50:34 +02:00
parent a4d05c6bce
commit 93ee930601
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/component/internal/webrtc.ts
View File

@ -94,9 +94,14 @@ export class NekoWebRTC extends EventEmitter<NekoWebRTCEvents> {
this._log.debug(`sending remote ICE candidate`, { init }) this._log.debug(`sending remote ICE candidate`, { init })
} }
this._peer.onicecandidateerror = (event: RTCPeerConnectionIceErrorEvent) => {
const fields = { error: event.errorText, code: event.errorCode, port: event.port, url: event.url }
this._log.warn(`ICE candidate error`, fields)
}
this._peer.onconnectionstatechange = (event) => { this._peer.onconnectionstatechange = (event) => {
const state = this._peer!.connectionState const state = this._peer!.connectionState
this._log.debug(`peer connection state changed`, { state }) this._log.info(`peer connection state changed`, { state })
switch (state) { switch (state) {
// Chrome sends failed state change only for connectionState and not iceConnectionState, and firefox // Chrome sends failed state change only for connectionState and not iceConnectionState, and firefox
@ -110,7 +115,7 @@ export class NekoWebRTC extends EventEmitter<NekoWebRTCEvents> {
this._peer.oniceconnectionstatechange = (event) => { this._peer.oniceconnectionstatechange = (event) => {
this._state = this._peer!.iceConnectionState this._state = this._peer!.iceConnectionState
this._log.debug(`peer ice connection state changed`, { state: this._state }) this._log.info(`peer ice connection state changed`, { state: this._state })
switch (this._state) { switch (this._state) {
// We don't watch the disconnected signaling state here as it can indicate temporary issues and may // We don't watch the disconnected signaling state here as it can indicate temporary issues and may
@ -125,7 +130,7 @@ export class NekoWebRTC extends EventEmitter<NekoWebRTCEvents> {
this._peer.onsignalingstatechange = (event) => { this._peer.onsignalingstatechange = (event) => {
const state = this._peer!.iceConnectionState const state = this._peer!.iceConnectionState
this._log.debug(`peer signaling state changed`, { state }) this._log.info(`peer signaling state changed`, { state })
switch (state) { switch (state) {
// The closed signaling state has been deprecated in favor of the closed iceConnectionState. // The closed signaling state has been deprecated in favor of the closed iceConnectionState.
@ -137,6 +142,10 @@ export class NekoWebRTC extends EventEmitter<NekoWebRTCEvents> {
} }
} }
this._peer.onnegotiationneeded = (event) => {
this._log.warn(`negotiation is neded`)
}
this._peer.ontrack = this.onTrack.bind(this) this._peer.ontrack = this.onTrack.bind(this)
this._peer.ondatachannel = this.onDataChannel.bind(this) this._peer.ondatachannel = this.onDataChannel.bind(this)
this._peer.addTransceiver('audio', { direction: 'recvonly' }) this._peer.addTransceiver('audio', { direction: 'recvonly' })
@ -189,9 +198,11 @@ export class NekoWebRTC extends EventEmitter<NekoWebRTCEvents> {
if (typeof this._peer != 'undefined') { if (typeof this._peer != 'undefined') {
// unmount all events // unmount all events
this._peer.onicecandidate = () => {} this._peer.onicecandidate = () => {}
this._peer.onicecandidateerror = () => {}
this._peer.onconnectionstatechange = () => {} this._peer.onconnectionstatechange = () => {}
this._peer.oniceconnectionstatechange = () => {} this._peer.oniceconnectionstatechange = () => {}
this._peer.onsignalingstatechange = () => {} this._peer.onsignalingstatechange = () => {}
this._peer.onnegotiationneeded = () => {}
this._peer.ontrack = () => {} this._peer.ontrack = () => {}
this._peer.ondatachannel = () => {} this._peer.ondatachannel = () => {}
@ -211,7 +222,7 @@ export class NekoWebRTC extends EventEmitter<NekoWebRTCEvents> {
public send(event: 'mousedown' | 'mouseup' | 'keydown' | 'keyup', data: { key: number }): void public send(event: 'mousedown' | 'mouseup' | 'keydown' | 'keyup', data: { key: number }): void
public send(event: string, data: any): void { public send(event: string, data: any): void {
if (!this.connected) { if (!this.connected) {
this._log.warn(`attempting to send data while disconnected`) this._log.warn(`attempting to send data while disconnected`, { event })
return return
} }
@ -271,19 +282,11 @@ export class NekoWebRTC extends EventEmitter<NekoWebRTCEvents> {
} }
private onTrack(event: RTCTrackEvent) { private onTrack(event: RTCTrackEvent) {
this._log.debug(`received track from peer`, { this._log.debug(`received track from peer`, { label: event.track.label })
id: event.track.id,
label: event.track.label,
kind: event.track.label,
})
const stream = event.streams[0] const stream = event.streams[0]
if (!stream) { if (!stream) {
this._log.warn(`no stream provided for track`, { this._log.warn(`no stream provided for track`, { label: event.track.label })
id: event.track.id,
label: event.track.label,
kind: event.track.label,
})
return return
} }
@ -295,9 +298,7 @@ export class NekoWebRTC extends EventEmitter<NekoWebRTCEvents> {
} }
private onDataChannel(event: RTCDataChannelEvent) { private onDataChannel(event: RTCDataChannelEvent) {
this._log.debug(`received data channel from peer`, { this._log.debug(`received data channel from peer`, { label: event.channel.label })
label: event.channel.label,
})
this._channel = event.channel this._channel = event.channel
this._channel.binaryType = 'arraybuffer' this._channel.binaryType = 'arraybuffer'
@ -354,11 +355,11 @@ export class NekoWebRTC extends EventEmitter<NekoWebRTCEvents> {
this._statsStop = this.statsEmitter() this._statsStop = this.statsEmitter()
} }
private onDisconnected(reason?: Error) { private onDisconnected(error?: Error) {
this.disconnect() this.disconnect()
this._log.info(`disconnected`, { message: reason?.message }) this._log.info(`disconnected`, { error })
this.emit('disconnected', reason) this.emit('disconnected', error)
if (this._statsStop && typeof this._statsStop === 'function') { if (this._statsStop && typeof this._statsStop === 'function') {
this._statsStop() this._statsStop()