simplify websocket opening and response types from BE

This commit is contained in:
Matt Hill
2022-08-15 16:59:05 -06:00
parent ebbb347128
commit 4aadfed740
5 changed files with 27 additions and 82 deletions

View File

@@ -1,54 +1,12 @@
import { Observable, timeout } from 'rxjs'
import { webSocket, WebSocketSubject } from 'rxjs/webSocket'
import { webSocket } from 'rxjs/webSocket'
import { Update } from '../types'
import { Source } from './source'
export class WebsocketSource<T> implements Source<T> {
constructor(
private readonly url: string,
// TODO: Remove fallback after client app is updated
private readonly document: Document = document,
) {}
constructor(private readonly url: string) {}
watch$(): Observable<RPCResponse<Update<T>>> {
const stream$: WebSocketSubject<RPCResponse<Update<T>>> = webSocket({
url: this.url,
openObserver: {
next: () => stream$.next(this.document.cookie as any),
},
})
return stream$.pipe(timeout({ first: 60000 }))
}
}
interface RPCBase {
jsonrpc: '2.0'
}
export interface RPCSuccess<T> extends RPCBase {
result: T
}
export interface RPCError extends RPCBase {
error: {
code: number // 34 means unauthenticated
message: string
data: {
details: string
}
}
}
export type RPCResponse<T> = RPCSuccess<T> | RPCError
class RpcError {
code: number
message: string
details: string
constructor(e: RPCError['error']) {
this.code = e.code
this.message = e.message
this.details = e.data.details
watch$(): Observable<Update<T>> {
return webSocket<Update<T>>(this.url).pipe(timeout({ first: 60000 }))
}
}