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

move connection type from connection handler.

Browse Source
This commit is contained in:
Miroslav Šedivý
2021-08-03 17:16:04 +02:00
parent 38ba2b8f92
commit 75467865e4
3 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/component/internal/connection.ts
View File

@ -47,27 +47,25 @@ export class NekoConnection extends EventEmitter<NekoConnectionEvents> {
}
this._onConnectHandle = () => {
Vue.set(this._state.websocket, 'connected', this.websocket.connected)
Vue.set(this._state.webrtc, 'connected', this.webrtc.connected)
if (this._state.status !== 'connected' && this.websocket.connected && this.webrtc.connected) {
Vue.set(this._state, 'status', 'connected')
}
if (this._state.type !== 'webrtc' && this.webrtc.connected) {
Vue.set(this._state, 'type', 'webrtc')
}
if (this.websocket.connected && !this.webrtc.connected) {
this._reconnector.webrtc.connect()
}
}
this._onDisconnectHandle = () => {
Vue.set(this._state.websocket, 'connected', this.websocket.connected)
Vue.set(this._state.webrtc, 'connected', this.webrtc.connected)
if (this._state.status === 'connected' && this.activated) {
Vue.set(this._state, 'status', 'connecting')
}
if (this._state.type !== 'fallback' && !this.webrtc.connected) {
Vue.set(this._state, 'type', 'fallback')
}
}
this._onCloseHandle = this.close.bind(this)
@ -104,10 +102,7 @@ export class NekoConnection extends EventEmitter<NekoConnectionEvents> {
window.clearTimeout(webrtcFallbackTimeout)
}
if (this._state.type === 'fallback') {
Vue.set(this._state, 'type', 'webrtc')
}
Vue.set(this._state.webrtc, 'connected', true)
webrtcCongestion = 0
return
}
@ -115,9 +110,7 @@ export class NekoConnection extends EventEmitter<NekoConnectionEvents> {
// try to downgrade quality if it happend many times
if (++webrtcCongestion >= WEBRTC_RECONN_FAILED_ATTEMPTS) {
webrtcFallbackTimeout = window.setTimeout(() => {
if (this._state.type === 'webrtc') {
Vue.set(this._state, 'type', 'fallback')
}
Vue.set(this._state.webrtc, 'connected', false)
}, WEBRTC_FALLBACK_TIMEOUT_MS)
webrtcCongestion = 0
@ -176,7 +169,6 @@ export class NekoConnection extends EventEmitter<NekoConnectionEvents> {
Vue.set(this._state.webrtc, 'video', video)
}
Vue.set(this._state, 'type', 'fallback')
Vue.set(this._state, 'status', 'connecting')
// open all reconnecters
@ -189,7 +181,8 @@ export class NekoConnection extends EventEmitter<NekoConnectionEvents> {
if (this._open) {
this._open = false
Vue.set(this._state, 'type', 'none')
Vue.set(this._state.websocket, 'connected', false)
Vue.set(this._state.webrtc, 'connected', false)
Vue.set(this._state, 'status', 'disconnected')
this.emit('close', error)
@ -213,7 +206,8 @@ export class NekoConnection extends EventEmitter<NekoConnectionEvents> {
// destroy all reconnecters
Object.values(this._reconnector).forEach((r) => r.destroy())
Vue.set(this._state, 'type', 'none')
Vue.set(this._state.websocket, 'connected', false)
Vue.set(this._state.webrtc, 'connected', false)
Vue.set(this._state, 'status', 'disconnected')
}