From e212297396cf70e59d6ab5bc1b5a6f0ca5500c89 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Thu, 20 Jun 2024 12:12:48 -0700
Subject: [PATCH] Bump welshman/net

---
 package-lock.json              | Bin 554689 -> 553791 bytes
 package.json                   |   2 +-
 src/app/shared/FeedCard.svelte |   6 ++++--
 src/engine/state.ts            |  14 +++++++++++++-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8d9c140e2c0220c018ac3bb8f94172666a3b1269..194e8df179a0698c05c5562fd7749efa5906ecab 100644
GIT binary patch
delta 207
zcmX^3R&oC`#SL$n7)>TOFo{j~Tf@ZB%){Ky!_2syhnY!d#q?LpnQS=oQcLu8^?~Gc
z!xc=LVQC)W+ODp?A^IuB73JPV8J@0rCB;!mW#*;sC6PrbekJ-jo=HA=$tD>FZkBmQ
zX(^fd#vV?-PM&^A6{(>~+QzAlnRzLxo~4mR&Ur58M#bI**%^-0C)zQpPtRY<#5w)J
z3MTI9nH!n-CigILfgHulXgWP+4O8ayQ_GnY+A}sV0WmWWvj8zG5VLL1*uWln3;+z1
BNiYBa

delta 247
zcmdo0O!44b#SL$n7>y@4Fo{j~U&F-F%){Ky!_2syhnY!d#q_{;%tq4{mN9Yh=cShD
z>*@nZT?0J>J;Uh>rJ0pOgDMOxvI0}w{j$s=k_<|cBRng@qLO_>1O4^$49crge9JtX
z!b(j8JPo~5%<?jlvdl`-15M2Hg0)k^46}1{T#XAtQY}IabBx3MBeKJdBU9We3Z{Qd
zV^*J@x0H!%`hyir5|ev?44}(+r@vYbWTmZPN?-vwX8QUyOyb)wEM>aO2<Mw`2dW8R
foPKIKlS2EmHB3Ov48$xz%nHP8+n=prk30qdbWB>l

diff --git a/package.json b/package.json
index 6c1a26d6..87640d8c 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "@welshman/content": "^0.0.5",
     "@welshman/feeds": "^0.0.12",
     "@welshman/lib": "^0.0.10",
-    "@welshman/net": "^0.0.13",
+    "@welshman/net": "^0.0.14",
     "@welshman/util": "^0.0.15",
     "bowser": "^2.11.0",
     "classnames": "^2.5.1",
diff --git a/src/app/shared/FeedCard.svelte b/src/app/shared/FeedCard.svelte
index 793fce1a..73db82ad 100644
--- a/src/app/shared/FeedCard.svelte
+++ b/src/app/shared/FeedCard.svelte
@@ -12,8 +12,9 @@
   import PersonBadgeSmall from "src/app/shared/PersonBadgeSmall.svelte"
   import {readFeed, readList, displayFeed, mapListToFeed, getSingletonValues} from "src/domain"
   import {
-    repository,
+    hints,
     pubkey,
+    repository,
     addFeedFavorite,
     removeFeedFavorite,
     userFeedFavorites,
@@ -26,6 +27,7 @@
   const expandDefinition = boolCtrl()
   const event = repository.getEvent(address)
   const deleted = repository.isDeleted(event)
+  const naddr = Address.from(address, hints.Event(event).getUrls()).toNaddr()
   const feed = address.startsWith(NAMED_BOOKMARKS)
     ? mapListToFeed(readList(event))
     : readFeed(event)
@@ -88,7 +90,7 @@
           on:click={toggleFavorite}>
           <i class="fa fa-bookmark" class:text-accent={isFavorite} />
         </div>
-        <CopyValueSimple label="Feed address" value={toNostrURI(Address.from(address).toNaddr())} />
+        <CopyValueSimple label="Feed address" value={toNostrURI(naddr)} />
       </div>
     </div>
     {#if $expandDefinition.enabled}
diff --git a/src/engine/state.ts b/src/engine/state.ts
index c8e5edb1..c2bd54bd 100644
--- a/src/engine/state.ts
+++ b/src/engine/state.ts
@@ -1537,6 +1537,7 @@ export const onAuth = async (url, challenge) => {
 
 export type MySubscribeRequest = SubscribeRequest & {
   onEvent?: (event: TrustedEvent) => void
+  onEose?: (url: string) => void
   onComplete?: () => void
   skipCache?: boolean
   forcePlatform?: boolean
@@ -1581,6 +1582,10 @@ export const subscribe = ({forcePlatform = true, ...request}: MySubscribeRequest
     projections.push(await ensureUnwrapped(event))
   })
 
+  if (request.onEose) {
+    sub.emitter.on("eose", request.onEose)
+  }
+
   if (request.onComplete) {
     sub.emitter.on("complete", request.onComplete)
   }
@@ -1619,7 +1624,14 @@ export const subscribePersistent = (request: MySubscribeRequest) => {
 
 export const LOAD_OPTS = {timeout: 3000, closeOnEose: true}
 
-export const load = (request: MySubscribeRequest) => subscribe({...request, ...LOAD_OPTS}).result
+export const load = (request: MySubscribeRequest) =>
+  new Promise(resolve => {
+    const events = []
+    const sub = subscribe({...request, ...LOAD_OPTS})
+
+    sub.emitter.on("event", (url: string, event: TrustedEvent) => events.push(event))
+    sub.emitter.on("complete", (url: string) => resolve(events))
+  })
 
 export const loadOne = (request: MySubscribeRequest) =>
   new Promise<TrustedEvent | null>(resolve => {