From 78d9b8da55140a200c78270055a22ad498ff130f Mon Sep 17 00:00:00 2001
From: Sandwich <299465+dskvr@users.noreply.github.com>
Date: Mon, 27 Jan 2025 16:01:13 +0700
Subject: [PATCH] fix most of the memory leaks in feeds, need to find a
 solution for observe

---
 apps/gui/package.json                         |   2 +-
 apps/gui/rollup.config.js                     |  30 ------
 .../lib/components/partials/Debugger.svelte   |   2 +-
 .../src/lib/components/partials/Feed.svelte   |   9 +-
 .../lib/components/partials/FeedNote.svelte   |  63 +++++------
 .../partials/FeedNoteComments.svelte          |  14 +++
 .../partials/FeedNoteReactions.svelte         |  14 +++
 .../components/partials/FeedNoteZaps.svelte   |  47 ++++++++
 .../components/partials/MonitorActions.svelte |   6 +-
 .../components/partials/OperatorRelays.svelte |  21 ++--
 .../gui/src/lib/services/FeedService/index.ts |   7 +-
 .../src/lib/stores/helpers/helpers-relay.ts   |  21 ++--
 apps/gui/src/lib/utils/lifecycle.ts           |   2 +-
 apps/gui/src/lib/utils/ux.ts                  |  32 ++++--
 .../relays/[protocol]/[...relay]/+page.svelte |  36 ++++---
 .../[...relay]/components/RelayAudits.svelte  |   3 +-
 apps/gui/vite.production.js                   |   3 +-
 apps/nocapd/docker-compose.gluetun.yaml       |  48 +++++++++
 internal/announce/.gitignore                  |   1 +
 internal/announce/dist/index.d.ts             |  27 +++++
 internal/announce/dist/index.js               | 101 ++++++++++++++++++
 .../src/NostrSqliteAdapter.ts                 |   4 +
 .../NostrToolsAdapter/src/NostrToolsWorker.ts |   2 +-
 23 files changed, 375 insertions(+), 120 deletions(-)
 create mode 100644 apps/gui/src/lib/components/partials/FeedNoteComments.svelte
 create mode 100644 apps/gui/src/lib/components/partials/FeedNoteReactions.svelte
 create mode 100644 apps/gui/src/lib/components/partials/FeedNoteZaps.svelte
 create mode 100644 apps/nocapd/docker-compose.gluetun.yaml
 create mode 100644 internal/announce/.gitignore
 create mode 100644 internal/announce/dist/index.d.ts
 create mode 100644 internal/announce/dist/index.js

diff --git a/apps/gui/package.json b/apps/gui/package.json
index afd4b658..ddbb2168 100755
--- a/apps/gui/package.json
+++ b/apps/gui/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@nostrwatch/gui",
 	"description": "",
-	"version": "0.6.23",
+	"version": "0.6.24",
 	"license": "MIT",
 	"keywords": [
 		"svelte",
diff --git a/apps/gui/rollup.config.js b/apps/gui/rollup.config.js
index 95028106..6525b7e0 100644
--- a/apps/gui/rollup.config.js
+++ b/apps/gui/rollup.config.js
@@ -64,35 +64,5 @@ export default [
 		watch: {
 			clearScreen: false
 		}
-	},
-	{
-		treeshake: production,
-		input: 'src/main.js',
-		output: {
-			sourcemap: true,
-			format: 'iife',
-			name: 'app',
-			file: 'public/build/bundle.js',
-			inlineDynamicImports: true
-		},
-		plugins: [
-			svelte({
-				compilerOptions: {
-					dev: !production
-				}
-			}),
-			css({ output: 'bundle.css' }),
-			resolve({
-				browser: true,
-				dedupe: ['svelte', '@nostrwatch/route66', '@nostrwatch/route66-cacheadapter-dexieetl', '@nostrwatch/route66-wsadapter-nostrtools'],
-				exportConditions: ['svelte']
-			}),
-			commonjs(),
-			!production && livereload('public'),
-			production && terser()
-		],
-		watch: {
-			clearScreen: false
-		}
 	}
 ];
diff --git a/apps/gui/src/lib/components/partials/Debugger.svelte b/apps/gui/src/lib/components/partials/Debugger.svelte
index 948485ad..d28025af 100644
--- a/apps/gui/src/lib/components/partials/Debugger.svelte
+++ b/apps/gui/src/lib/components/partials/Debugger.svelte
@@ -126,7 +126,7 @@
         addDebug('route66:websocketAdapter', $route66?.websocketAdapter.isReady? true: false);
         addDebug('route66:initialized', $route66?.initialized? true: false);
         addDebug('route66:numSubscriptions', $route66?.websocketAdapter?.subscriptions.size);
-        addDebug('route66:subscriptions', Array.from($route66?.websocketAdapter?.subscriptions));
+        // addDebug('route66:subscriptions', Array.from($route66?.websocketAdapter?.subscriptions));
     }
 
     const debugCacheAdapter = async () => {
diff --git a/apps/gui/src/lib/components/partials/Feed.svelte b/apps/gui/src/lib/components/partials/Feed.svelte
index c3a421e6..ebaa625c 100644
--- a/apps/gui/src/lib/components/partials/Feed.svelte
+++ b/apps/gui/src/lib/components/partials/Feed.svelte
@@ -29,7 +29,7 @@
     const busy: Writable<boolean> = writable(false);
     let items: Readable<NostrEvent[]> | undefined;
 
-    let [minColWidth, maxColWidth, gap] = [300, 500, 21]
+    let [minColWidth, maxColWidth, gap] = [400, 600, 21]
     let width:number, height: number
     
     const lastItemId = () => {
@@ -54,7 +54,10 @@
     }
 
     const destroy = () => {
-        $feedService!.unsubscribeAll();
+        $feedService!.unsubscribeAll().then( () => {
+            $feedService!.destroy();
+            feedService.set(null) 
+        });
         resumer?.()
     }
 
@@ -71,8 +74,6 @@
         </div>
     {/if}
 
-    {$items?.length}
-
     {#if $feedService && $items?.length}
     <Masonry
         items={$items as NostrEvent[]}
diff --git a/apps/gui/src/lib/components/partials/FeedNote.svelte b/apps/gui/src/lib/components/partials/FeedNote.svelte
index 0238cb33..ae1c2715 100644
--- a/apps/gui/src/lib/components/partials/FeedNote.svelte
+++ b/apps/gui/src/lib/components/partials/FeedNote.svelte
@@ -7,19 +7,17 @@
 	import { observeViewport } from '$lib/utils/ux';
 	import { onDestroy, onMount } from 'svelte';
     import { writable, type Readable, type Writable } from 'svelte/store';
-    import Bolt11 from 'light-bolt11-decoder';
 	import { pubkeyUserInstance } from '$stores/helpers/helpers-pubkey';
 	import type { SvelteMemoryRelay } from '@nostrwatch/memory-relay';
     import { noteCommentsCount$, noteReactionsCount$, noteZaps$ } from '$stores/helpers/helpers-notes';  
 	import { activeMonitorChecksCount } from '$stores/monitors';
+	import FeedNoteComments from './FeedNoteComments.svelte';
+	import FeedNoteZaps from './FeedNoteZaps.svelte';
+	import FeedNoteReactions from './FeedNoteReactions.svelte';
 
     export let note: NostrEvent;
     export let memoryRelay: SvelteMemoryRelay<IEvent, NostrEvent>;
 
-    const comments: Readable<number> = noteCommentsCount$<NostrEvent>(note.id, memoryRelay); 
-    const zaps: Readable<NostrEvent[]> = noteZaps$<NostrEvent>(note.id, memoryRelay);
-    const reactions: Readable<number> = noteReactionsCount$<NostrEvent>(note.id, memoryRelay);
-
     let content: Writable<string>;
   
     const mount = () => {
@@ -46,44 +44,24 @@
     $: isComment = note.isComment
     $: user = pubkeyUserInstance(note.pubkey)
     $: name = user?.name || user?.pubkey
-    // $: animationClass = $relativesFetched? 'animate' : ''
-    $: bolt11s = $zaps.map(zap => {
-            const b11 = zap.tags.find(tag => tag[0] === 'bolt11')?.[1]
-            if(!b11) return null
-            return Bolt11.decode(b11)
-        }).filter( b11 => b11 !== null )
-    $: zapSum = isVisible? abbrNum(
-        Math
-            .round(
-                bolt11s
-                    .reduce((acc, b11) => acc += parseInt(
-                        b11.sections.find( 
-                            section => section?.name === 'amount')?.value || "0"
-                        )
-                        , 0)
-                /1000
-            )
-        ): '';
     
     let isVisible: boolean = true;
 
     $: actionsClass = isVisible? '' : 'opacity-0';
 
-    function abbrNum(num: number): string {
-        if(num === 0) return '';
-        if (num < 1000) return num.toString();
-        const units = ["", "K", "M", "B", "T", "P", "E"];
-        const magnitude = Math.floor(Math.log10(num) / 3);
-        const precision = magnitude - 1; 
-        const scaled = num / Math.pow(1000, magnitude); 
-        return `${scaled.toFixed(precision + 1)}${units[magnitude]}`;
-    }
+    let commentsCountCache: number | undefined;
+    let reactionsCountCache: number | undefined;
+    let zapSumCache: string = '';
 </script>
 
 <section 
     tabindex="-1" 
     id="note-{note.id}" 
     class="note px-8 py-5 rounded-lg bg-black/5 dark:bg-white/5 text-md block mb-3" 
+    use:observeViewport
+    on:viewportchange={(event: any) => {
+        isVisible = event.detail.isIntersecting;
+    }}
     >
     <div class="text-xs text-gray-400">
             <span class="text-xs text-gray-400">
@@ -106,22 +84,31 @@
         {@html $content}
     </div>
     <div class="actions flex mt-2 hover:opacity-100 {actionsClass} min-h-6">
-        {#if isVisible}
         <div class="flex-grow">
             <a href="">♡</a>
-            {$reactions? $reactions : ''}
+            {#if isVisible}
+            <FeedNoteReactions {note} {memoryRelay} bind:reactionsCountCache={reactionsCountCache} />
+            {:else}
+            {reactionsCountCache? reactionsCountCache : ''}
+            {/if}
         </div>
         <div class="flex-grow">
             <a href="">⚡</a>
-            {zapSum}
+            {#if isVisible}
+            <FeedNoteZaps {note} {memoryRelay} bind:zapSumCache={zapSumCache} />
+            {:else}
+            {zapSumCache? zapSumCache : ''}
+            {/if}
         </div>
         <div class="flex-grow">
             <a href="">🗨</a>
-            {$comments? $comments : ''}
+            {#if isVisible}
+            <FeedNoteComments {note} {memoryRelay} bind:commentsCountCache={commentsCountCache} />
+            {:else}
+            {commentsCountCache? commentsCountCache : ''}
+            {/if}
         </div>
-        {/if}
     </div>
-    
 </section>
   
 <style global>
diff --git a/apps/gui/src/lib/components/partials/FeedNoteComments.svelte b/apps/gui/src/lib/components/partials/FeedNoteComments.svelte
new file mode 100644
index 00000000..ed6d6681
--- /dev/null
+++ b/apps/gui/src/lib/components/partials/FeedNoteComments.svelte
@@ -0,0 +1,14 @@
+<script lang="ts">
+    import { type Readable } from 'svelte/store';
+    import { noteCommentsCount$ } from '$stores/helpers/helpers-notes';
+    import type { NostrEvent } from '@nostrwatch/route66/models';
+	import type { SvelteMemoryRelay } from '@nostrwatch/memory-relay';
+
+    export let note: NostrEvent;
+    export let memoryRelay: SvelteMemoryRelay<NostrEvent, NostrEvent>;
+    export let commentsCountCache: number; 
+    const comments: Readable<number> = noteCommentsCount$<NostrEvent>(note.id, memoryRelay); 
+    comments.subscribe( count => commentsCountCache = count )
+</script>
+
+{commentsCountCache? commentsCountCache : ''}
\ No newline at end of file
diff --git a/apps/gui/src/lib/components/partials/FeedNoteReactions.svelte b/apps/gui/src/lib/components/partials/FeedNoteReactions.svelte
new file mode 100644
index 00000000..059a40d0
--- /dev/null
+++ b/apps/gui/src/lib/components/partials/FeedNoteReactions.svelte
@@ -0,0 +1,14 @@
+<script lang="ts">
+    import { type Readable } from 'svelte/store';
+    import { noteReactionsCount$ } from '$stores/helpers/helpers-notes';
+    import type { NostrEvent } from '@nostrwatch/route66/models';
+	import type { SvelteMemoryRelay } from '@nostrwatch/memory-relay';
+
+    export let note: NostrEvent;
+    export let memoryRelay: SvelteMemoryRelay<NostrEvent, NostrEvent>;
+    export let reactionsCountCache: number; 
+    const reactions: Readable<number> = noteReactionsCount$<NostrEvent>(note.id, memoryRelay);
+    reactions.subscribe( count => reactionsCountCache = count )
+</script>
+
+{$reactions? $reactions : ''}
\ No newline at end of file
diff --git a/apps/gui/src/lib/components/partials/FeedNoteZaps.svelte b/apps/gui/src/lib/components/partials/FeedNoteZaps.svelte
new file mode 100644
index 00000000..457fd878
--- /dev/null
+++ b/apps/gui/src/lib/components/partials/FeedNoteZaps.svelte
@@ -0,0 +1,47 @@
+<script lang="ts">
+    import Bolt11 from 'light-bolt11-decoder';
+    import { type Readable } from 'svelte/store';
+    import { noteCommentsCount$, noteZaps$ } from '$stores/helpers/helpers-notes';
+    import type { NostrEvent } from '@nostrwatch/route66/models';
+	import type { SvelteMemoryRelay } from '@nostrwatch/memory-relay';
+
+    export let note: NostrEvent;
+    export let memoryRelay: SvelteMemoryRelay<NostrEvent, NostrEvent>;
+    export let zapSumCache: string; 
+    const zaps: Readable<NostrEvent[]> = noteZaps$<NostrEvent>(note.id, memoryRelay);
+
+    $: bolt11s = $zaps.map(zap => {
+            const b11 = zap.tags.find(tag => tag[0] === 'bolt11')?.[1]
+            if(!b11) return null
+            return Bolt11.decode(b11)
+        }).filter( b11 => b11 !== null )
+
+    $: zapSum = abbrNum(
+        Math
+            .round(
+                bolt11s
+                    .reduce((acc, b11) => acc += parseInt(
+                        b11.sections.find( 
+                            section => section?.name === 'amount')?.value || "0"
+                        )
+                        , 0)
+                /1000
+            )
+        );
+
+
+    zaps.subscribe( sum => zapSumCache = zapSum )
+
+    function abbrNum(num: number): string {
+        if(num === 0) return '';
+        if (num < 1000) return num.toString();
+        const units = ["", "K", "M", "B", "T", "P", "E"];
+        const magnitude = Math.floor(Math.log10(num) / 3);
+        const precision = magnitude - 1; 
+        const scaled = num / Math.pow(1000, magnitude); 
+        return `${scaled.toFixed(precision + 1)}${units[magnitude]}`;
+    }
+    
+</script>
+
+{zapSum? zapSum : ''}
\ No newline at end of file
diff --git a/apps/gui/src/lib/components/partials/MonitorActions.svelte b/apps/gui/src/lib/components/partials/MonitorActions.svelte
index 91169514..98184594 100644
--- a/apps/gui/src/lib/components/partials/MonitorActions.svelte
+++ b/apps/gui/src/lib/components/partials/MonitorActions.svelte
@@ -34,7 +34,7 @@
             if(!$monitor) return;
             if($monitor?.enabled) {
                 $monitor.disable();
-                ([...$eventsArray] as IEvent[]).filter( event => event.pubkey === monitor.pubkey).forEach( event => {
+                ([...$eventsArray] as IEvent[]).filter( event => event.pubkey === $monitor.pubkey).forEach( event => {
                     const key = eventKey(event);
                     $events.delete(key)
                 });
@@ -56,9 +56,7 @@
                     relays: [ ...($route66?.services?.monitors?.nip66Relays || []), ...$monitor.relays ],
                     priority: 20
                 }
-                const onevents = (events: IEvent[]) => {
-                    publishEventsToMemoryRelay(events)
-                }
+                const onevents = publishEventsToMemoryRelay
                 await $route66?.services?.monitors?.subscribe(options, { onevents })
                 await resumer();
                 disabled.set(false);
diff --git a/apps/gui/src/lib/components/partials/OperatorRelays.svelte b/apps/gui/src/lib/components/partials/OperatorRelays.svelte
index 36d2be38..d0334023 100644
--- a/apps/gui/src/lib/components/partials/OperatorRelays.svelte
+++ b/apps/gui/src/lib/components/partials/OperatorRelays.svelte
@@ -4,7 +4,7 @@
     import { derived, writable, type Writable } from 'svelte/store';
     
 	
-	import { eventsArray, route66 } from '$lib/stores';
+	import { eventsArray, route66, type StoreEventType } from '$lib/stores';
 	import { type IEvent, Monitor, Nip66CheckEvent } from '@nostrwatch/route66/models';
 	import OperatorRelay from './OperatorRelay.svelte';
 
@@ -15,6 +15,13 @@
 
     const deadRelays: Writable<Nip66CheckEvent[]> = writable([])
 
+    const deduplicate = (events: Nip66CheckEvent[]): Nip66CheckEvent[] => {
+        return events.reduce( (acc: Nip66CheckEvent[], event: Nip66CheckEvent) => {
+            if(acc.find( (e: Nip66CheckEvent) => e.relay === event.relay)) return acc;
+            return [...acc, event]
+        }, [])
+    }
+
     const fetchDeadRelays = async () => {
         const dead = await $route66.services.monitors.fetchOperatorRelaysNotOnline(pubkey) || []
         dead?.forEach( (event: IEvent) => {
@@ -28,17 +35,17 @@
     }
 
     const onlineRelays = derived(eventsArray, ($eventsArray) => {
-        return $eventsArray.filter((event: Nip66CheckEvent) => {
-            return  event?.operatorPubkey 
-                    && event.operatorPubkey === pubkey 
-                    && event?.relay !== relayUrl;
-        })
+        return deduplicate($eventsArray.filter( (event: StoreEventType) => {
+            return  (event as Nip66CheckEvent)?.operatorPubkey 
+                    && (event as Nip66CheckEvent).operatorPubkey === pubkey 
+                    && (event as Nip66CheckEvent)?.relay !== relayUrl;
+        }) as Nip66CheckEvent[])
     });
 
     const allOperatorRelays = derived([onlineRelays, deadRelays], ([$onlineRelays, $deadRelays]) => {
         const all = [...$onlineRelays, ...$deadRelays]
         otherRelaysCount = $onlineRelays.length
-        return all
+        return deduplicate(all)
     });
 
     const mount = async () => {
diff --git a/apps/gui/src/lib/services/FeedService/index.ts b/apps/gui/src/lib/services/FeedService/index.ts
index 63b58953..b5145c1e 100644
--- a/apps/gui/src/lib/services/FeedService/index.ts
+++ b/apps/gui/src/lib/services/FeedService/index.ts
@@ -194,14 +194,17 @@ export class FeedService extends Service {
             keepAlive: false,
             batch: 10
         }
-        const hash = `${note.id}-${user.pubkey}`
+        // const hash = `${note.id}-${user.pubkey}`
         const args: UserFetchArgs = {
             filters,
             relays,
             options,
-            hash,
             priority: 5
         }
         return this.subscribe(args, callbacks) as Promise<IEvent[]>
     }
+
+    destroy(){
+        this.memoryRelay.destroy()
+    }
 }
\ No newline at end of file
diff --git a/apps/gui/src/lib/stores/helpers/helpers-relay.ts b/apps/gui/src/lib/stores/helpers/helpers-relay.ts
index 8b444d41..4d1a4c05 100644
--- a/apps/gui/src/lib/stores/helpers/helpers-relay.ts
+++ b/apps/gui/src/lib/stores/helpers/helpers-relay.ts
@@ -5,24 +5,29 @@ import type { Nip66CheckEvent } from "@nostrwatch/route66/models/Nip66CheckEvent
 import { events, eventsArray, type StoreEventType } from "$stores/events";
 import type { NostrEvent } from "nostr-tools";
 
+type AggregateType = Record<string, {
+    a: Record<string, any>;
+    checks: any[];
+    aggregate?: any;
+}>
 
-export const relayLivenessAggregate = (relayUrl: string): any | undefined => {
-    return get(eventsChecks).find((aggregate: any) => aggregate.relay === relayUrl) || undefined
+export const relayLivenessAggregate = (relayUrl: string): AggregateType | undefined => {
+    return get(relayChecks)?.[relayUrl]?.aggregate;
 }
 
-export const relayLivenessAggregate$ = (relayUrl: string): Readable<any | undefined> => {
-    return derived(eventsChecks, ($eventsChecks) => {
-        return $eventsChecks.find((aggregate: any) => aggregate.relay === relayUrl) || undefined
+export const relayLivenessAggregate$ = (relayUrl: string): Readable<AggregateType> | undefined => {
+    return derived(relayChecks, ($relayChecks) => {
+        return $relayChecks?.[relayUrl]?.aggregate;
     })
 }
 
 export const relayLivenessChecks = (relayUrl: string): Nip66CheckEvent[] => {
-    return relayLivenessAggregate(relayUrl)?.checks || [];
+    return get(eventsChecks)?.filter(event => (event as Nip66CheckEvent).relay === relayUrl) as Nip66CheckEvent[]; 
 }
 
 export const relayLivenessChecks$ = (relayUrl: string): Readable<Nip66CheckEvent[]> => {
-    return derived(eventsArray, ($eventsArray: StoreEventType[]) => {
-        return $eventsArray.filter(event => event!.relay === relayUrl) as Nip66CheckEvent[];  
+    return derived(eventsArray, ($relayChecks: StoreEventType[]) => {
+        return $relayChecks.filter(event => (event as Nip66CheckEvent).relay === relayUrl) as Nip66CheckEvent[];  
     })
 }
 
diff --git a/apps/gui/src/lib/utils/lifecycle.ts b/apps/gui/src/lib/utils/lifecycle.ts
index d80f9a90..2ae7f8c1 100644
--- a/apps/gui/src/lib/utils/lifecycle.ts
+++ b/apps/gui/src/lib/utils/lifecycle.ts
@@ -168,7 +168,7 @@ export const bootstrap = async () => {
             await fetchNip11s()
             await bootstrapOperatorMeta()
             isBootstrapping.set(false)
-            seedFromCache();
+            // seedFromCache();
             updateLastSync();
             removeStaleChecksFromStore()
         })
diff --git a/apps/gui/src/lib/utils/ux.ts b/apps/gui/src/lib/utils/ux.ts
index d12bdefc..ba9acfd5 100644
--- a/apps/gui/src/lib/utils/ux.ts
+++ b/apps/gui/src/lib/utils/ux.ts
@@ -30,22 +30,33 @@ export const clickToCopy = (node: HTMLElement, target?: string) => {
   };
 };
 
-export function observeViewport(node: HTMLElement, options = {}) {
+export function observeViewport(node: HTMLElement, options = {}, debounceTime = 500) {
   let lastIsIntersecting = false; // Track state to avoid redundant events
+  let timeoutId: number | null = null;
+
+  const debounceEvent = (callback: () => void, delay: number) => {
+    if (timeoutId) {
+      clearTimeout(timeoutId);
+    }
+    timeoutId = window.setTimeout(callback, delay);
+  };
 
   const observer = new IntersectionObserver(([entry]) => {
     const isIntersecting = entry.isIntersecting;
 
     if (isIntersecting !== lastIsIntersecting) {
       lastIsIntersecting = isIntersecting;
-      node.dispatchEvent(
-        new CustomEvent('viewportchange', {
-          detail: {
-            isIntersecting: isIntersecting,
-            intersectionRatio: entry.intersectionRatio,
-          },
-        })
-      );
+
+      debounceEvent(() => {
+        node.dispatchEvent(
+          new CustomEvent('viewportchange', {
+            detail: {
+              isIntersecting: isIntersecting,
+              intersectionRatio: entry.intersectionRatio,
+            },
+          })
+        );
+      }, debounceTime);
     }
   }, options);
 
@@ -53,6 +64,9 @@ export function observeViewport(node: HTMLElement, options = {}) {
 
   return {
     destroy() {
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+      }
       observer.unobserve(node);
     },
   };
diff --git a/apps/gui/src/routes/relays/[protocol]/[...relay]/+page.svelte b/apps/gui/src/routes/relays/[protocol]/[...relay]/+page.svelte
index c0f6456b..515982c5 100644
--- a/apps/gui/src/routes/relays/[protocol]/[...relay]/+page.svelte
+++ b/apps/gui/src/routes/relays/[protocol]/[...relay]/+page.svelte
@@ -4,7 +4,7 @@
   import { doBootstrap } from '$lib/stores/routines.js';
   import { derived, writable, type Readable, type Writable } from 'svelte/store';
   import { Nip66CheckEvent, PubkeyProfile, PubkeyRelays, type Monitor, type INip11, type IEvent } from '@nostrwatch/route66/models';
-  import { relayCheckAggregates, relayCheckAggregator } from '$lib/stores/checks.js';
+  import { eventsChecks, relayCheckAggregates, relayCheckAggregator } from '$lib/stores/checks.js';
   import { nip11s, nip11Service, nip11sLocal } from '$lib/stores/nip11s.js';
   import { isSeeded } from '$lib/stores/app.js';
   import { eventsArray } from '$lib/stores/events.js';
@@ -23,6 +23,8 @@
 	import { NocapService } from '$lib/services/NocapService';
 	import { relayLivenessAggregate, relayLivenessAggregate$, relayLivenessChecks, relayLivenessChecks$ } from '$stores/helpers/helpers-relay';
 	import { finalizeEvent, generateSecretKey, getPublicKey } from 'nostr-tools';
+	import { eventKey } from '$utils/event-keys';
+	import { NostrEvent } from '@nostrwatch/route66/models';
 	
 
   let ProfileCompact: typeof import('$lib/components/partials/ProfileCompact.svelte').default | null = null;
@@ -98,10 +100,20 @@
   const lastSeen: Writable<number | null> = writable(null);
   const lastSeenBy: Writable<Monitor | null> = writable(null); 
 
+  const deduplicateEvents = ( events: NostrEvent[] ) => {
+    const deduped = new Map();
+    events.forEach( event => {
+      const key = eventKey(event);
+      deduped.set(key, event);
+    });
+    return Array.from(deduped.values());
+  }
+
   const relayAggregate: Readable<any | undefined> = relayLivenessAggregate$(relayUrl);
   const relayChecks: Readable<Nip66CheckEvent[]> = derived([oldChecks, relayCheckAggregates], ([$oldChecks]) => {
+    const checks = relayLivenessChecks(relayUrl)
     if($oldChecks.length) {
-      return $oldChecks;
+      return deduplicateEvents([...$oldChecks, ...checks]);
     }
     return relayLivenessChecks(relayUrl);
   })
@@ -122,8 +134,10 @@
 
     await route66Ready()
     await $route66.services.relay.ready()
+    
     await detectLiveness();
     await loadNip11().then(loadOperatorMeta)
+    
 
     loading = false
 
@@ -136,6 +150,9 @@
   const detectLiveness = async () => {
     if($relayChecks.length) {
       liveness.set('online')
+      const latestEvent = $relayChecks.sort((a, b) => b.created_at - a.created_at)[0]
+      lastCheck.set(latestEvent)
+      lastSeen.set(latestEvent?.created_at ?? null)
       return;
     }
 
@@ -158,8 +175,8 @@
 
       console.log('no online checks')
 
-      const nocap = new NocapService() 
-      const result = await nocap.check(relayUrl, ['open', 'read', 'dns', 'info'])
+      const nocap = new NocapService({ timeouts: { open: 5000 }}) 
+      const result = await nocap.check(relayUrl, ['open'])
       let onlineButNoRecentData = false;
 
       console.log(result)
@@ -175,7 +192,6 @@
           content: JSON.stringify(result.info.data),
           tags: [ 
             ['rtt-open', `${result.open.duration}`], 
-            ['rtt-read', `${result.read.duration}`],
             ['network', 'clearnet']
           ]
         }
@@ -204,9 +220,7 @@
         lastCheck.set(latestEvent)
         lastSeen.set(latestEvent?.created_at ?? null)
         lastSeenBy.set(mons.get(latestEvent?.pubkey ?? null))
-        if(onlineButNoRecentData){
-          liveness.set('offline')
-        }
+        liveness.set('offline')
         return
       }
 
@@ -222,9 +236,7 @@
         lastCheck.set(latestEvent)
         lastSeen.set(latestEvent?.created_at ?? null)
         lastSeenBy.set(mons.get(latestEvent?.pubkey ?? null))
-        if(onlineButNoRecentData){
-          liveness.set('dead')
-        }
+        liveness.set('dead')
         return 
       }
 
@@ -386,7 +398,7 @@
   $: protocolsMatch = $page.params.protocol === 'wss' && location.protocol.replace(':', '') === 'https' 
                       || $page.params.protocol === 'ws' && location.protocol.replace(':', '') === 'http' 
 
-  $: probablyOnline = $relayChecks.length;
+  $: probablyOnline = $liveness === 'online';
 
   let [minColWidth, maxColWidth, gap] = [400, 800, 21];
   let width: number, height: number;
diff --git a/apps/gui/src/routes/relays/[protocol]/[...relay]/components/RelayAudits.svelte b/apps/gui/src/routes/relays/[protocol]/[...relay]/components/RelayAudits.svelte
index a36ab199..42ebc465 100644
--- a/apps/gui/src/routes/relays/[protocol]/[...relay]/components/RelayAudits.svelte
+++ b/apps/gui/src/routes/relays/[protocol]/[...relay]/components/RelayAudits.svelte
@@ -220,7 +220,8 @@
         expandedSamples = { ...expandedSamples, [id]: !expandedSamples[id] };
     }
 </script>
-{relayUrl}
+
+
 <div class="p-6 min-h-screen text-white">
 
     <Alert.Root class="mb-2">
diff --git a/apps/gui/vite.production.js b/apps/gui/vite.production.js
index f01e9352..25eb7624 100644
--- a/apps/gui/vite.production.js
+++ b/apps/gui/vite.production.js
@@ -8,6 +8,7 @@ export default defineConfig({
     preserveSymlinks: false,
   },
   worker: {
+    format: 'es',
     plugins: [
       sveltekit(),
       nodePolyfills({ })
@@ -20,7 +21,7 @@ export default defineConfig({
     rollupOptions: {
       output: {
         assetFileNames: (assetInfo) => {
-          if (assetInfo.name && assetInfo.name.endsWith('.worker.js')) {
+          if (assetInfo.names.length && assetInfo.names.filter(name => name.endsWith('.worker.js'))) {
             return 'workers/[name][extname]';
           }
           return 'assets/[name]-[hash][extname]';
diff --git a/apps/nocapd/docker-compose.gluetun.yaml b/apps/nocapd/docker-compose.gluetun.yaml
new file mode 100644
index 00000000..754b3efc
--- /dev/null
+++ b/apps/nocapd/docker-compose.gluetun.yaml
@@ -0,0 +1,48 @@
+version: "3.8"
+services:
+  gluetun:
+    image: qmcgaw/gluetun
+    container_name: gluetun
+    cap_add:
+      - NET_ADMIN
+    devices:
+      - /dev/net/tun:/dev/net/tun
+    env_file:
+      - ./.env.gluetun
+    environment:
+      - VPN_SERVICE_PROVIDER=mullvad
+    restart: always
+
+    # Updated Docker healthcheck
+    # healthcheck:
+      # Curl the internal healthcheck endpoint
+      # test: ["CMD-SHELL", "curl -fsS http://127.0.0.1:9999/health || exit 1"]
+      # interval: 30s
+      # timeout: 5s
+      # retries: 5
+      # start_period: 30s
+
+  nocapd:
+    container_name: nocapd
+    network_mode: "container:gluetun"
+    restart: always
+    tty: true
+    build:
+      context: .
+      dockerfile: Dockerfile
+      args:
+        BUILDKIT_INLINE_CACHE: 0
+    volumes:
+      - ./.lmdb:/app/nostr-watch/apps/nocapd/.lmdb:rw
+      - ./.env.docker:/app/nostr-watch/apps/nocapd/.env:ro
+      - ./config.yaml:/app/nostr-watch/apps/nocapd/config.yaml:ro
+    env_file:
+      - .env.docker
+    environment:
+      DOCKER: "yes"
+    depends_on:
+      - gluetun
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "2m"
diff --git a/internal/announce/.gitignore b/internal/announce/.gitignore
new file mode 100644
index 00000000..586e3d7a
--- /dev/null
+++ b/internal/announce/.gitignore
@@ -0,0 +1 @@
+!dist
\ No newline at end of file
diff --git a/internal/announce/dist/index.d.ts b/internal/announce/dist/index.d.ts
new file mode 100644
index 00000000..57eeae62
--- /dev/null
+++ b/internal/announce/dist/index.d.ts
@@ -0,0 +1,27 @@
+interface AnnounceMonitorOptions {
+    geo?: object;
+    kinds?: number[];
+    timeouts?: object;
+    networks?: string[];
+    checks?: string[];
+    owner?: string;
+    frequency?: string;
+    relays?: string[];
+    profile?: object;
+}
+export declare class AnnounceMonitor {
+    events?: any;
+    monReg?: any;
+    monRelays: string[];
+    monProfile: any;
+    private publisher;
+    private pubkey;
+    constructor(options: AnnounceMonitorOptions, pubkey: string);
+    setup(options: AnnounceMonitorOptions): void;
+    static formatChecks(checks: Array<string>): Array<string>;
+    generate(): any;
+    sign(sk: Uint8Array): any;
+    publish(): Promise<string[]>;
+    static verify(ev: any): boolean;
+}
+export {};
diff --git a/internal/announce/dist/index.js b/internal/announce/dist/index.js
new file mode 100644
index 00000000..b34f5b41
--- /dev/null
+++ b/internal/announce/dist/index.js
@@ -0,0 +1,101 @@
+import chalk from 'chalk';
+import { verifyEvent } from "nostr-tools";
+import { Publisher, Kind10166, Kind0, Kind10002 } from "@nostrwatch/publisher";
+import Logger from "@nostrwatch/logger";
+const log = new Logger('@nostrwatch/announce');
+const NIP66_MONITOR_REGISTER = 10166;
+export class AnnounceMonitor {
+    events = {};
+    monReg;
+    monRelays = [];
+    monProfile;
+    publisher;
+    pubkey = null;
+    constructor(options, pubkey) {
+        log.debug(`announce::constructor(): ${pubkey}`);
+        this.setup(options);
+        this.pubkey = pubkey;
+        this.publisher = new Publisher(pubkey, this.monRelays);
+    }
+    setup(options) {
+        const { geo = {}, kinds = [], timeouts = {}, networks = {}, checks = [], owner = '', frequency = '', profile = {}, relays = [], } = options;
+        this.monReg = {};
+        if (!(geo instanceof Object))
+            throw new Error("geo must be object");
+        if (!(timeouts instanceof Object))
+            throw new Error("timeouts must be object");
+        if (!(kinds instanceof Array))
+            throw new Error("kinds must be array");
+        if (!(checks instanceof Array))
+            throw new Error("checks must be array");
+        if (!(networks instanceof Array))
+            throw new Error("checks must be array");
+        if (typeof owner !== "string")
+            throw new Error("owner must be string");
+        if (typeof frequency !== "string")
+            throw new Error("frequency must be string");
+        if (!(relays instanceof Array))
+            throw new Error("relays must be an array");
+        if (!(profile instanceof Object))
+            throw new Error("profile must be an object");
+        this.monReg.geo = geo;
+        this.monReg.kinds = kinds;
+        this.monReg.timeouts = timeouts;
+        this.monReg.owner = owner;
+        this.monReg.frequency = frequency;
+        this.monReg.networks = networks;
+        this.monReg.checks = AnnounceMonitor.formatChecks(checks);
+        this.monRelays = relays;
+        this.monProfile = profile;
+    }
+    static formatChecks(checks) {
+        if (checks.includes('all'))
+            return ['websocket', 'ws', 'info', 'dns', 'geo', 'ssl'];
+        return checks;
+    }
+    generate() {
+        log.debug(`announce::generate(): ${this.pubkey}`);
+        const $monReg = new Kind10166(this.pubkey);
+        $monReg.generateEvent({ ...$monReg });
+        this.events["10166"] = $monReg;
+        const $monRelays = new Kind10002(this.pubkey);
+        if (this.monRelays.length) {
+            $monRelays.generateEvent([...this.monRelays]);
+            this.events["10002"] = $monRelays;
+        }
+        const $monProfile = new Kind0(this.pubkey);
+        if (Object.keys(this.monProfile).length) {
+            $monProfile.generateEvent({ ...this.monProfile });
+            this.events["0"] = $monProfile;
+        }
+        return this.events;
+    }
+    sign(sk) {
+        if (!this.events)
+            throw new Error("Event has not yet been generated (run generate() first)");
+        Object.values(this.events).forEach((event) => {
+            this.events[event.kind] = event.signEvent();
+        });
+    }
+    async publish() {
+        if (!this.events)
+            throw new Error("Event has not yet been generated");
+        const pubbedIds = [];
+        const kinds = Object.keys(this.events);
+        for (let i = 0; i < kinds.length; i++) {
+            const kind = kinds[i];
+            try {
+                await Promise.any(this.publisher.publishEvent(this.events[kind]));
+            }
+            catch (e) {
+                log.error(`${chalk.red.bold(kind)} ${chalk.gray.italic('failed to publish to')} ${chalk.white.bold(this.monRelays.join(','))}`);
+            }
+            log.info(`${chalk.yellow.bold(kind)} ${chalk.gray.italic('published to')} ${chalk.white.bold(this.monRelays.join(','))}`);
+            pubbedIds.push(this.events[kind].id);
+        }
+        return pubbedIds;
+    }
+    static verify(ev) {
+        return verifyEvent(ev);
+    }
+}
diff --git a/libraries/route66/adapters/cache/NostrSqliteAdapter/src/NostrSqliteAdapter.ts b/libraries/route66/adapters/cache/NostrSqliteAdapter/src/NostrSqliteAdapter.ts
index 6b1414b8..214c11d2 100644
--- a/libraries/route66/adapters/cache/NostrSqliteAdapter/src/NostrSqliteAdapter.ts
+++ b/libraries/route66/adapters/cache/NostrSqliteAdapter/src/NostrSqliteAdapter.ts
@@ -10,6 +10,10 @@ import { OkResponse, ReqCommand, ReqFilter } from "@nostrwatch/worker-relay/dist
 import { generateSubId, randomInRange } from "./utils";
 import { NostrEvent } from "nostr-tools";
 
+import PQueue from 'p-queue';
+
+const queue = new PQueue({ concurrency: 10 });
+
 export interface INostrSqliteAdapter extends ICacheAdapter {
     REQ(filters: ReqFilter[]): Promise<IEvent[]>;
     COUNT(filters: ReqFilter[]): Promise<number>;
diff --git a/libraries/route66/adapters/websocket/NostrToolsAdapter/src/NostrToolsWorker.ts b/libraries/route66/adapters/websocket/NostrToolsAdapter/src/NostrToolsWorker.ts
index d51c8ecd..f24809ed 100644
--- a/libraries/route66/adapters/websocket/NostrToolsAdapter/src/NostrToolsWorker.ts
+++ b/libraries/route66/adapters/websocket/NostrToolsAdapter/src/NostrToolsWorker.ts
@@ -11,7 +11,7 @@ import {  WorkerOptions, AdapterWorkerResult, AdapterWebsocketWorker, IAdapterWe
 import { AdapterWebsocketWorkerCommand, IWebsocketAdapterCallbacks, defaultWebsocketAdapterOptions, defaultWebsocketRequestBody, WebsocketAdapterResult, WebsocketAdapterOptions, WebsocketRequestBody  } from '@nostrwatch/route66/core'
 import { IEvent } from "@nostrwatch/route66/interfaces";
 
-const queue = new PQueue({ concurrency: 10 });
+const queue = new PQueue({ concurrency: 5 });
 
 interface NostrToolsWorkerCommand extends AdapterWebsocketWorkerCommand {}