From c3e28cb683c81b45922d80d5328c0f44b7d9f7e8 Mon Sep 17 00:00:00 2001 From: Matt Hill Date: Wed, 1 Sep 2021 14:27:09 -0600 Subject: [PATCH] revert source connection monitor --- client/lib/patch-db.ts | 4 ---- client/lib/source/poll-source.ts | 2 -- client/lib/source/source.ts | 1 - client/lib/source/ws-source.ts | 2 -- 4 files changed, 9 deletions(-) diff --git a/client/lib/patch-db.ts b/client/lib/patch-db.ts index cf4ecd1..0ffb947 100644 --- a/client/lib/patch-db.ts +++ b/client/lib/patch-db.ts @@ -22,8 +22,4 @@ export class PatchDB { concatMap(() => of(this.store.cache)), ) } - - connectionMade$ (): Observable { - return merge(...this.sources.map(s => s.connectionMade$)) - } } diff --git a/client/lib/source/poll-source.ts b/client/lib/source/poll-source.ts index ba7f7fe..fe8f9b4 100644 --- a/client/lib/source/poll-source.ts +++ b/client/lib/source/poll-source.ts @@ -9,7 +9,6 @@ export type PollConfig = { } export class PollSource implements Source { - connectionMade$ = new Subject() constructor ( private readonly pollConfig: PollConfig, @@ -37,7 +36,6 @@ export class PollSource implements Source { return polling$.pipe( switchMap(_ => poll$), concatMap(res => { - this.connectionMade$.next() if (Array.isArray(res)) { return from(res) // takes Revision[] and converts it into Observable } else { diff --git a/client/lib/source/source.ts b/client/lib/source/source.ts index 0f452e9..45cf1b8 100644 --- a/client/lib/source/source.ts +++ b/client/lib/source/source.ts @@ -4,5 +4,4 @@ import { Update } from '../types' export interface Source { watch$ (store?: Store): Observable> - connectionMade$: Observable } diff --git a/client/lib/source/ws-source.ts b/client/lib/source/ws-source.ts index 7ae4c92..1dcbb51 100644 --- a/client/lib/source/ws-source.ts +++ b/client/lib/source/ws-source.ts @@ -5,7 +5,6 @@ import { Source } from './source' export class WebsocketSource implements Source { private websocket$: WebSocketSubject> | undefined - connectionMade$ = new Subject() constructor ( private readonly url: string, @@ -16,7 +15,6 @@ export class WebsocketSource implements Source { url: this.url, openObserver: { next: () => { - this.connectionMade$.next() this.websocket$!.next(document.cookie as any) }, },