fix excessive stopStreaming calls when socket breaks
This commit is contained in:
parent
ed9b308456
commit
88b93788ef
1 changed files with 9 additions and 1 deletions
|
|
@ -60,6 +60,7 @@ export const useStreamingStore = defineStore('streaming', {
|
||||||
error: null,
|
error: null,
|
||||||
state: null,
|
state: null,
|
||||||
retryMultiplier: 1,
|
retryMultiplier: 1,
|
||||||
|
retrying: false,
|
||||||
subscribers: new Set(),
|
subscribers: new Set(),
|
||||||
subscriptions: new Map(),
|
subscriptions: new Map(),
|
||||||
globalSubscriptions: new Set(),
|
globalSubscriptions: new Set(),
|
||||||
|
|
@ -126,6 +127,7 @@ export const useStreamingStore = defineStore('streaming', {
|
||||||
},
|
},
|
||||||
stopSocket() {
|
stopSocket() {
|
||||||
this.socket.close()
|
this.socket.close()
|
||||||
|
this.state = WSConnectionStatus.CLOSED
|
||||||
},
|
},
|
||||||
|
|
||||||
getSubArgs(stream) {
|
getSubArgs(stream) {
|
||||||
|
|
@ -150,6 +152,8 @@ export const useStreamingStore = defineStore('streaming', {
|
||||||
},
|
},
|
||||||
onOpen() {
|
onOpen() {
|
||||||
this.retryMultiplier = 1
|
this.retryMultiplier = 1
|
||||||
|
this.retrying = false,
|
||||||
|
this.error = null
|
||||||
this.subscribers.forEach(({ stream, et }) => {
|
this.subscribers.forEach(({ stream, et }) => {
|
||||||
et.dispatchEvent(new StreamStateEvent('open'))
|
et.dispatchEvent(new StreamStateEvent('open'))
|
||||||
})
|
})
|
||||||
|
|
@ -195,6 +199,7 @@ export const useStreamingStore = defineStore('streaming', {
|
||||||
this.subscribers.forEach(({ stream, et }) => {
|
this.subscribers.forEach(({ stream, et }) => {
|
||||||
et.dispatchEvent(new StreamErrorEvent(error))
|
et.dispatchEvent(new StreamErrorEvent(error))
|
||||||
})
|
})
|
||||||
|
this.error = error
|
||||||
console.error('Error in MastoAPI websocket:', error)
|
console.error('Error in MastoAPI websocket:', error)
|
||||||
},
|
},
|
||||||
onClose({ data: closeEvent }) {
|
onClose({ data: closeEvent }) {
|
||||||
|
|
@ -210,6 +215,8 @@ export const useStreamingStore = defineStore('streaming', {
|
||||||
)
|
)
|
||||||
|
|
||||||
this.state = WSConnectionStatus.CLOSED
|
this.state = WSConnectionStatus.CLOSED
|
||||||
|
this.retrying = false
|
||||||
|
this.error = null
|
||||||
this.retryMultiplier = 1
|
this.retryMultiplier = 1
|
||||||
|
|
||||||
this.subscribers.forEach(({ et }) => {
|
this.subscribers.forEach(({ et }) => {
|
||||||
|
|
@ -226,12 +233,13 @@ export const useStreamingStore = defineStore('streaming', {
|
||||||
|
|
||||||
this.retryMultiplier += 1
|
this.retryMultiplier += 1
|
||||||
|
|
||||||
if (this.state !== WSConnectionStatus.ERROR) {
|
if (!this.retrying) {
|
||||||
this.subscribers.forEach(({ et }) => {
|
this.subscribers.forEach(({ et }) => {
|
||||||
et.dispatchEvent(new StreamStateEvent('close', closeEvent))
|
et.dispatchEvent(new StreamStateEvent('close', closeEvent))
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.retrying = true
|
||||||
this.state = WSConnectionStatus.ERROR
|
this.state = WSConnectionStatus.ERROR
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue