applesauce-loaders 0.0.0-next-20241213171848 → 0.10.0

package/README.md

@@ -20,10 +20,23 @@ export const rxNostr = createRxNostr({
   connectionStrategy: "lazy-keep",
 });
 
+// create method to load events from the cache relay
+function cacheRequest(filters: Filter[]) {
+  return new Observable((observer) => {
+    const sub = cacheRelay.subscribe(filters, {
+      onevent: (event) => observer.next(event),
+      oneose: () => {
+        sub.close();
+        observer.complete();
+      },
+    });
+  });
+}
+
 const replaceableLoader = new ReplaceableLoader(rxNostr, {
   bufferTime: 1000,
-  // cache relays will always be checked first
-  cacheRelays: ["ws://localhost:4869/"],
+  // check the cache first for events
+  cacheRequest: cacheRequest,
   // lookup relays are used as a fallback if the event cant be found
   lookupRelays: ["wss://purplepag.es/"],
 });

package/dist/helpers/address-pointer.d.ts

@@ -1,9 +1,9 @@
 import { AddressPointerWithoutD } from "applesauce-core/helpers";
-import { LazyFilter } from "rx-nostr";
+import { Filter } from "nostr-tools";
 /** Converts an array of address pointers to a filter */
-export declare function createFilterFromAddressPointers(pointers: AddressPointerWithoutD[]): LazyFilter;
+export declare function createFilterFromAddressPointers(pointers: AddressPointerWithoutD[]): Filter;
 /** Takes a set of address pointers, groups them, then returns filters for the groups */
-export declare function createFiltersFromAddressPointers(pointers: AddressPointerWithoutD[]): LazyFilter[];
+export declare function createFiltersFromAddressPointers(pointers: AddressPointerWithoutD[]): Filter[];
 /** Checks if a relay will understand an address pointer */
 export declare function isLoadableAddressPointer<T extends AddressPointerWithoutD>(pointer: T): boolean;
 /** Group an array of address pointers by kind */

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

@@ -1,4 +1,6 @@
+import { Observable } from "rxjs";
 import { EventPacket, RxNostr } from "rx-nostr";
+import { Filter, NostrEvent } from "nostr-tools";
 import { logger } from "applesauce-core";
 import { Loader } from "./loader.js";
 export type LoadableAddressPointer = {
@@ -11,14 +13,15 @@ export type LoadableAddressPointer = {
     /** Load this address pointer even if it has already been loaded */
     force?: boolean;
 };
+export type CacheRequest = (filters: Filter[]) => Observable<NostrEvent>;
 export type ReplaceableLoaderOptions = {
     /**
      * Time interval to buffer requests in ms
      * @default 1000
      */
     bufferTime?: number;
-    /** The cache relays to check first */
-    cacheRelays?: string[];
+    /** Request events from the cache first */
+    cacheRequest?: CacheRequest;
     /** Fallback lookup relays to check when event cant be found */
     lookupRelays?: string[];
 };

package/dist/loaders/replaceable-loader.js

@@ -1,11 +1,11 @@
-import { share, tap, from, filter, bufferTime, map } from "rxjs";
+import { share, tap, from, filter, bufferTime, map, mergeMap } from "rxjs";
 import { getEventUID, getReplaceableUID, markFromCache } from "applesauce-core/helpers";
 import { logger } from "applesauce-core";
 import { nanoid } from "nanoid";
 import { Loader } from "./loader.js";
 import { generatorSequence } from "../operators/generator-sequence.js";
 import { replaceableRequest } from "../operators/address-pointers-request.js";
-import { getAddressPointerId, getRelaysFromPointers, isLoadableAddressPointer } from "../helpers/address-pointer.js";
+import { createFiltersFromAddressPointers, getAddressPointerId, getRelaysFromPointers, isLoadableAddressPointer, } from "../helpers/address-pointer.js";
 import { unique } from "../helpers/array.js";
 /** deep clone a loadable pointer to ensure its safe to modify */
 function cloneLoadablePointer(pointer) {
@@ -38,11 +38,17 @@ function* cacheFirstSequence(rxNostr, pointers, log, opts) {
         return false;
     };
     // first attempt, load from cache relays
-    if (opts?.cacheRelays && opts?.cacheRelays.length > 0) {
-        log(`Checking cache`, opts.cacheRelays, remaining);
-        const results = yield from([remaining]).pipe(replaceableRequest(rxNostr, id, opts.cacheRelays), 
+    if (opts?.cacheRequest) {
+        log(`Checking cache`, remaining);
+        const results = yield from([remaining]).pipe(
+        // convert pointers to filters
+        map(createFiltersFromAddressPointers), 
+        // make requests
+        mergeMap((filters) => opts.cacheRequest(filters)), 
         // mark the event as from the cache
-        tap((p) => markFromCache(p.event)));
+        tap((event) => markFromCache(event)), 
+        // convert to event packets
+        map((e) => ({ event: e, from: "cache", subId: "cache", type: "EVENT" })));
         if (handleResults(results))
             return;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-loaders",
-  "version": "0.0.0-next-20241213171848",
+  "version": "0.10.0",
   "description": "A collection of observable based loaders built on rx-nostr",
   "type": "module",
   "main": "dist/index.js",
@@ -36,7 +36,7 @@
     }
   },
   "dependencies": {
-    "applesauce-core": "0.0.0-next-20241213171848",
+    "applesauce-core": "^0.10.0",
     "nanoid": "^5.0.9",
     "nostr-tools": "^2.10.3",
     "rx-nostr": "^3.4.1",