applesauce-loaders 0.11.0 → 0.12.0

package/dist/loaders/request-loader.d.ts

@@ -1,4 +1,4 @@
-import { EventStore, QueryStore } from "applesauce-core";
+import { IEventStore, QueryStore } from "applesauce-core";
 import { ProfilePointer } from "nostr-tools/nip19";
 import { Observable } from "rxjs";
 import { ReplaceableLoader } from "./replaceable-loader.js";
@@ -11,7 +11,7 @@ export declare class RequestLoader {
     constructor(store: QueryStore);
     protected runWithTimeout<T extends unknown, Args extends Array<any>>(queryConstructor: (...args: Args) => {
         key: string;
-        run: (events: EventStore, store: QueryStore) => Observable<T>;
+        run: (events: IEventStore, store: QueryStore) => Observable<T>;
     }, ...args: Args): Promise<NonNullable<T>>;
     protected checkReplaceable(): ReplaceableLoader;
     /** Requests a single replaceable event */
@@ -25,4 +25,6 @@ export declare class RequestLoader {
     }>;
     /** Loads a pubkeys profile */
     contacts(pointer: ProfilePointer, force?: boolean): Promise<ProfilePointer[]>;
+    /** Loads a pubkeys blossom servers */
+    blossomServers(pointer: ProfilePointer, force?: boolean): Promise<URL[]>;
 }

package/dist/loaders/request-loader.js

@@ -1,7 +1,8 @@
 import { kinds } from "nostr-tools";
-import { MailboxesQuery, ProfileQuery, ReplaceableQuery, UserContactsQuery } from "applesauce-core/queries";
+import { MailboxesQuery, ProfileQuery, ReplaceableQuery, UserBlossomServersQuery, UserContactsQuery, } from "applesauce-core/queries";
 import { getObservableValue, simpleTimeout } from "applesauce-core/observable";
 import { filter } from "rxjs";
+import { BLOSSOM_SERVER_LIST_KIND } from "applesauce-core/helpers";
 /** A special Promised based loader built on the {@link QueryStore} */
 export class RequestLoader {
     store;
@@ -12,7 +13,11 @@ export class RequestLoader {
     }
     // hacky method to run queries with timeouts
     async runWithTimeout(queryConstructor, ...args) {
-        return getObservableValue(this.store.createQuery(queryConstructor, ...args).pipe(filter((v) => v !== undefined && v !== null), simpleTimeout(this.requestTimeout)));
+        return getObservableValue(this.store.createQuery(queryConstructor, ...args).pipe(
+        // ignore undefined and null values
+        filter((v) => v !== undefined && v !== null), 
+        // timeout with an error is not values
+        simpleTimeout(this.requestTimeout)));
     }
     checkReplaceable() {
         if (!this.replaceableLoader)
@@ -39,4 +44,14 @@ export class RequestLoader {
         this.checkReplaceable().next({ kind: kinds.Contacts, pubkey: pointer.pubkey, relays: pointer.relays, force });
         return this.runWithTimeout(UserContactsQuery, pointer.pubkey);
     }
+    /** Loads a pubkeys blossom servers */
+    blossomServers(pointer, force) {
+        this.checkReplaceable().next({
+            kind: BLOSSOM_SERVER_LIST_KIND,
+            pubkey: pointer.pubkey,
+            relays: pointer.relays,
+            force,
+        });
+        return this.runWithTimeout(UserBlossomServersQuery, pointer.pubkey);
+    }
 }

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "applesauce-loaders",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "A collection of observable based loaders built on rx-nostr",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "keywords": [
-    "nostr"
+    "nostr",
+    "applesauce"
   ],
   "author": "hzrd149",
   "license": "MIT",
@@ -52,7 +53,7 @@
     }
   },
   "dependencies": {
-    "applesauce-core": "^0.11.0",
+    "applesauce-core": "^0.12.0",
     "nanoid": "^5.0.9",
     "nostr-tools": "^2.10.4",
     "rx-nostr": "^3.5.0",