From d8ac846fae96b1a45742fb60e4da0d7aa54d822c Mon Sep 17 00:00:00 2001
From: pablof7z <pfer@me.com>
Date: Thu, 16 Mar 2023 16:58:16 +0100
Subject: [PATCH] buffer subsequent requests to avoid hammering relays

---
 demo.html                  | 12 ++++--------
 src/ConnectedWidget.svelte |  9 +++++++--
 src/NostrNote.svelte       | 13 +++++++++++--
 src/lib/adapters/index.js  | 27 +++++++++++++++++----------
 src/routes/+page.svelte    |  2 +-
 5 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/demo.html b/demo.html
index bc55eb6..de1df54 100644
--- a/demo.html
+++ b/demo.html
@@ -11,15 +11,11 @@
   <p>Below, we have inserted a <code>script</code> tag that should
   renter a Svelte component upon loading this page.</p>
 
-  <script
-  src="public/bundle.js"
-	data-chat-type="GLOBAL"
-	data-chat-tags="nostrica"
-	data-relays="ws://localhost:8080"
+  <script src="public/bundle.js"
+    data-chat-type="GLOBAL"
+    data-chat-tags="nostrica,nostrica2023"
+    data-relays="wss://relay.nostrica.com,wss://relay.f7z.io,wss://nos.lol,wss://relay.nostr.info,wss://nostr-pub.wellorder.net,wss://relay.current.fyi,wss://relay.nostr.band"
 ></script>
-<link rel="stylesheet" href="public/bundle.css">
-  ></script>
-
 
   <p>This text will come after the embedded content.</p>
 </body>
diff --git a/src/ConnectedWidget.svelte b/src/ConnectedWidget.svelte
index 0f13224..a5393e7 100644
--- a/src/ConnectedWidget.svelte
+++ b/src/ConnectedWidget.svelte
@@ -91,11 +91,16 @@
             isThread = new Set(pubkeysTagged).size >= 2;
         }
 
-        responses[message.id] = [];
+        if (!responses[message.id]) { responses[message.id] = [] };
 
         if (isThread) {
+            // get the last "e" tag, which is tagging the immediate parent
             const lastETag = message.tags.filter(tag => tag[0] === 'e').pop();
-            if (lastETag && lastETag[1] && responses[lastETag[1]]) {
+            if (lastETag && lastETag[1]) {
+                // if there is one, add it to the response
+                if (!responses[lastETag[1]]) {
+                    responses[lastETag[1]] = [];
+                }
                 responses[lastETag[1]].push(message);
             }
 
diff --git a/src/NostrNote.svelte b/src/NostrNote.svelte
index c982d14..93c6d3b 100644
--- a/src/NostrNote.svelte
+++ b/src/NostrNote.svelte
@@ -1,6 +1,8 @@
 <script>
+    import { onMount } from 'svelte';
 	import { selectedMessage } from './lib/store';
-    import { chatData } from './lib/store';
+    import { chatData, chatAdapter } from './lib/store';
+    // import { prettifyContent } from '$lib/utils';
     export let event;
     export let responses;
     export let websiteOwnerPubkey;
@@ -16,13 +18,20 @@
         }
     }
 
+    // delay-fetch responses
+    onMount(() => {
+        $chatAdapter.delayedSubscribe(
+            {kinds: [1], '#e': [event.id]}
+        , 'responses', 500)
+    })
+
     const byWebsiteOwner = !!websiteOwnerPubkey === event.pubkey;
 
     $: profiles = $chatData.profiles;
     $: displayName = profiles[event.pubkey] && profiles[event.pubkey].display_name || `[${event.pubkey.slice(0, 6)}]`;
     $: nip05 = profiles[event.pubkey] && profiles[event.pubkey].nip05;
 
-    $: profilePicture = profiles[event.pubkey] && profiles[event.pubkey].picture || `https://robohash.org/${event.pubkey}.png?set=set1`;
+    $: profilePicture = profiles[event.pubkey] && profiles[event.pubkey].picture || `https://robohash.org/${event.pubkey.slice(0, 2)}.png?set=set1`;
 
     const repliedIds = event.tags.filter(e => e[0] === 'e').map(e => e[1]);
 
diff --git a/src/lib/adapters/index.js b/src/lib/adapters/index.js
index c3bf828..63cd521 100644
--- a/src/lib/adapters/index.js
+++ b/src/lib/adapters/index.js
@@ -25,6 +25,8 @@ class NstrAdapter {
     #profileRequestQueue = [];
     #requestedProfiles = [];
     #profileRequestTimer;
+    #delayedSubscriptions = {};
+    #delayedSubscriptionTimeouts = {};
 
     constructor(clientPubkey, {tags, referenceTags, type='DM', websiteOwnerPubkey, relays} = {}) {
         this.pubkey = clientPubkey;
@@ -72,8 +74,6 @@ class NstrAdapter {
                 break;
         }
 
-        console.log('filters', filters);
-
         if (filters && filters.length > 0) {
             this.subscribe(filters, (e) => { this.#emitMessage(e) })
         }
@@ -170,6 +170,21 @@ class NstrAdapter {
         messageCallback(event)
     }
 
+    async delayedSubscribe(filters, family, timeout) {
+        this.#delayedSubscriptions[family] = this.#delayedSubscriptions[family] || []
+        this.#delayedSubscriptions[family].push(filters);
+
+        if (!this.#delayedSubscriptionTimeouts[family]) {
+            this.#delayedSubscriptionTimeouts[family] = setTimeout(() => {
+                delete this.#delayedSubscriptionTimeouts[family];
+                filters = this.#delayedSubscriptions[family];
+                delete this.#delayedSubscriptions[family];
+
+                this.subscribe(filters, (e) => { this.#emitMessage(e)});
+            }, timeout)
+        }
+    }
+
     async subscribe(filters, messageCallback=null) {
         if (!messageCallback) { messageCallback = (e) => { this.#emitMessage(e) } }
         return this.#_subscribe(filters, messageCallback)
@@ -200,14 +215,6 @@ class NstrAdapter {
             event.content = await this.decrypt(this.#websiteOwnerPubkey, event.content);
         }
 
-        // if we have tags we were filtering for, filter here in case the relay doesn't support filtering
-        if (this.tags && this.tags.length > 0) {
-            if (!event.tags.find(t => t[0] === 't' && this.tags.includes(t[1]))) {
-                console.log(`discarded event not tagged with [${this.tags.join(', ')}], tags: ${event.tags.filter(t => t[0] === 't').map(t => t[1]).join(', ')}`);
-                return;
-            }
-        }
-
         if (event.kind === 1) {
             if (!event.tags.find(t => t[0] === 'e')) {
                 // a top level message that we should subscribe to since responses won't tag the url
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index fc724b2..d8fee70 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -88,7 +88,7 @@
 					chatType,
 					chatTags,
 					chatReferenceTags,
-				}} {websiteOwnerPubkey} {relays} bind:chatStarted={chatStarted} />
+				}} {relays} bind:chatStarted={chatStarted} />
 			</div>
 		</div>
 	</div>