diff --git a/package.json b/package.json index 02ba05acd..52c0e2c1a 100644 --- a/package.json +++ b/package.json @@ -42,8 +42,8 @@ "@uiw/react-codemirror": "^4.21.21", "@webscopeio/react-textarea-autocomplete": "^4.9.2", "bech32": "^2.0.0", - "blossom-client-sdk": "^0.4.0", - "blossom-drive-sdk": "^0.1.1", + "blossom-client-sdk": "^0.5.1", + "blossom-drive-sdk": "^0.3.0", "blurhash": "^2.0.5", "chart.js": "^4.4.1", "cheerio": "^1.0.0-rc.12", diff --git a/src/services/replaceable-events.ts b/src/services/replaceable-events.ts index fcbcb04fc..05769844e 100644 --- a/src/services/replaceable-events.ts +++ b/src/services/replaceable-events.ts @@ -35,8 +35,8 @@ class ReplaceableEventsService { private subjects = new SuperMap>(() => new Subject()); - private cacheLoader: BatchKindLoader | null = null; - private loaders = new SuperMap((relay) => { + cacheLoader: BatchKindLoader | null = null; + loaders = new SuperMap((relay) => { const loader = new BatchKindLoader(relayPoolService.requestRelay(relay), this.log.extend(relay)); loader.events.onEvent.subscribe((e) => this.handleEvent(e)); this.process.addChild(loader.process); diff --git a/src/services/user-mailboxes.ts b/src/services/user-mailboxes.ts index a4340434b..becf65a5e 100644 --- a/src/services/user-mailboxes.ts +++ b/src/services/user-mailboxes.ts @@ -7,7 +7,6 @@ import replaceableEventsService, { RequestOptions } from "./replaceable-events"; import RelaySet from "../classes/relay-set"; import { RelayMode } from "../classes/relay"; import { relaysFromContactsEvent } from "../helpers/nostr/contacts"; -import { createCoordinate } from "../classes/batch-kind-loader"; export type UserMailboxes = { pubkey: string; @@ -62,7 +61,9 @@ class UserMailboxesService { async loadFromCache(pubkey: string) { const sub = this.subjects.get(pubkey); - await replaceableEventsService.loadFromCache(createCoordinate(kinds.RelayList, pubkey)); + if (replaceableEventsService.cacheLoader) { + await replaceableEventsService.cacheLoader?.requestEvent(kinds.RelayList, pubkey); + } return sub; } diff --git a/yarn.lock b/yarn.lock index 9d8b0c47e..492c0e84b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3419,22 +3419,22 @@ better-path-resolve@1.0.0: resolved "https://registry.yarnpkg.com/bezier-js/-/bezier-js-6.1.4.tgz#c7828f6c8900562b69d5040afb881bcbdad82001" integrity sha512-PA0FW9ZpcHbojUCMu28z9Vg/fNkwTj5YhusSAjHHDfHDGLxJ6YUKrAN2vk1fP2MMOxVw4Oko16FMlRGVBGqLKg== -blossom-client-sdk@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/blossom-client-sdk/-/blossom-client-sdk-0.4.0.tgz#3b40e478dbe1a324f579e29570b46eb12968074d" - integrity sha512-xw1lq15VCfwb8RrmKvwxV92bwD5qwou97PpZvutH+WHT87bokZrx1uCBh0Ww3x+eJqamevvW2w6QAc+BYwILCg== +blossom-client-sdk@^0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/blossom-client-sdk/-/blossom-client-sdk-0.5.1.tgz#9b07ed2ebd29903268a44ea1b7f1b54d2edace46" + integrity sha512-RuT+uyNLVToSivANQrrA2Kmio8l0Z2lEIs3e7OwBnd/gxcl+KoINwuZ/JVjsquOPNcjkXBVbsvmRzJnesmkjWg== dependencies: cross-fetch "^4.0.0" -blossom-drive-sdk@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/blossom-drive-sdk/-/blossom-drive-sdk-0.1.1.tgz#7b196548b85bb1141c32ed37dec37e412f5984f1" - integrity sha512-p7IaQUvK4j1nDcP4EhVXI5Yeoyfyigq9M44My6rn/98dWMFLEHQGMEbJICwuEDcjwT9VKbHAwxMeoRrgSsDPhg== +blossom-drive-sdk@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/blossom-drive-sdk/-/blossom-drive-sdk-0.3.0.tgz#35ab1afebbc8c79bd86af10628291b3e06935f35" + integrity sha512-K2mhnIO1WVSb7Ua9wcgv4ra3rnoIfp1X8oKdHOFNNosuCVI5dBZumDvYJlrn4ZztE9UZslIqlb/swr0PZcGmgw== dependencies: "@noble/hashes" "^1.4.0" "@scure/base" "^1.1.6" - blossom-client-sdk "^0.4.0" - events "^3.3.0" + blossom-client-sdk "^0.5.1" + eventemitter3 "^5.0.1" mime "^4.0.1" nanoid "^5.0.6" nostr-tools "^2.3.2"