chore: add timeout and sequence retrigger

This commit is contained in:
waterplea
2022-08-09 10:58:15 +03:00
parent f118b21a30
commit 001360d09a
2 changed files with 16 additions and 15 deletions

View File

@@ -1,18 +1,9 @@
import { Observable } from 'rxjs'
import { webSocket } from 'rxjs/webSocket'
import { Observable, timeout } from 'rxjs'
import { webSocket, WebSocketSubject } from 'rxjs/webSocket'
import { Update } from '../types'
import { Source } from './source'
export class WebsocketSource<T> implements Source<T> {
private websocket$ = webSocket<RPCResponse<Update<T>>>({
url: this.url,
openObserver: {
next: () => {
this.websocket$.next(this.document.cookie as any)
},
},
})
constructor(
private readonly url: string,
// TODO: Remove fallback after client app is updated
@@ -20,7 +11,14 @@ export class WebsocketSource<T> implements Source<T> {
) {}
watch$(): Observable<RPCResponse<Update<T>>> {
return this.websocket$
const stream$: WebSocketSubject<RPCResponse<Update<T>>> = webSocket({
url: this.url,
openObserver: {
next: () => stream$.next(this.document.cookie as any),
},
})
return stream$.pipe(timeout(60000))
}
}

View File

@@ -100,9 +100,12 @@ export class Store<T extends { [key: string]: any }> {
update(update: Update<T>): void {
if (this.isRevision(update)) {
// if old or known, return
if (update.id <= this.cache.sequence || this.stash.get(update.id)) return
this.handleRevision(update)
// if old or known, re-trigger the latest revision
if (update.id <= this.cache.sequence || this.stash.get(update.id)) {
this.updateSequence(this.cache.sequence)
} else {
this.handleRevision(update)
}
} else {
this.handleDump(update)
}