applesauce-loaders 0.0.0-next-20241207161834 → 0.0.0-next-20241210184957

package/dist/loaders/replaceable-loader.js

@@ -40,16 +40,20 @@ function* cacheFirstSequence(rxNostr, pointers, log, opts) {
     // 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, opts.cacheRelays, id), 
+        const results = yield from([remaining]).pipe(replaceableRequest(rxNostr, id, opts.cacheRelays), 
         // mark the event as from the cache
         tap((p) => markFromCache(p.event)));
         if (handleResults(results))
             return;
     }
-    // finished loading from the cache, load from pointer relays
-    if (pointerRelays.length > 0) {
-        log(`Requesting`, pointerRelays, remaining);
-        const results = yield from([remaining]).pipe(replaceableRequest(rxNostr, pointerRelays, id));
+    // load from pointer relays and default relays
+    const defaultRelays = Object.entries(rxNostr.getDefaultRelays())
+        .filter(([_relay, config]) => config.read)
+        .map(([relay]) => relay);
+    const remoteRelays = [...pointerRelays, ...defaultRelays];
+    if (remoteRelays.length > 0) {
+        log(`Requesting`, remoteRelays, remaining);
+        const results = yield from([remaining]).pipe(replaceableRequest(rxNostr, id, remoteRelays));
         if (handleResults(results))
             return;
     }
@@ -59,7 +63,7 @@ function* cacheFirstSequence(rxNostr, pointers, log, opts) {
         const relays = opts.lookupRelays.filter((r) => !pointerRelays.includes(r));
         if (relays.length > 0) {
             log(`Request from lookup`, relays, remaining);
-            const results = yield from([remaining]).pipe(replaceableRequest(rxNostr, relays, id));
+            const results = yield from([remaining]).pipe(replaceableRequest(rxNostr, id, relays));
             if (handleResults(results))
                 return;
         }
@@ -67,6 +71,8 @@ function* cacheFirstSequence(rxNostr, pointers, log, opts) {
 }
 /** Batches address pointers and consolidates them */
 function multiRelayBatcher(buffer) {
+    const requestedFrom = new Map();
+    const requestedDefault = new Set();
     return (source) => source.pipe(
     // buffer on time
     bufferTime(buffer), 
@@ -102,14 +108,20 @@ function multiRelayBatcher(buffer) {
     filter((buffer) => buffer.length > 0), 
     // ensure pointers are only requested from each relay once
     map((pointers) => {
-        const requestedFrom = new Map();
         return pointers.filter((pointer) => {
-            // if this pointer does not have any relays or is forced, skip
-            if (!pointer.relays)
-                return true;
+            const id = getAddressPointerId(pointer);
+            // skip if forced
             if (pointer.force)
                 return true;
-            const id = getAddressPointerId(pointer);
+            // skip if already requested from default relays
+            if (!pointer.relays) {
+                if (requestedDefault.has(id))
+                    return false;
+                else {
+                    requestedDefault.add(id);
+                    return true;
+                }
+            }
             let set = requestedFrom.get(id);
             if (!set) {
                 set = new Set();
@@ -134,7 +146,6 @@ export class ReplaceableLoader extends Loader {
             return source.pipe(
             // filter out invalid pointers
             filter(isLoadableAddressPointer), 
-            // TODO: needs a new batching method that takes the multiple relays (and force) into account
             // batch and filter
             multiRelayBatcher(opts?.bufferTime ?? 1000), 
             // check cache, relays, lookup relays in that order

package/dist/loaders/single-relay-replaceable-loader.js

@@ -1,5 +1,6 @@
 import { bufferTime, filter, from, map, mergeMap, share } from "rxjs";
 import { getReplaceableUID } from "applesauce-core/helpers";
+import { nanoid } from "nanoid";
 import { Loader } from "./loader.js";
 import { isLoadableAddressPointer } from "../helpers/address-pointer.js";
 import { replaceableRequest } from "../operators/address-pointers-request.js";
@@ -43,7 +44,7 @@ export class SingleRelayReplaceableLoader extends Loader {
         // batch and filter
         singleRelayBatcher(opts), 
         // breakout the batches so they can complete
-        mergeMap((pointers) => from([pointers]).pipe(replaceableRequest(rxNostr, [relay]))), 
+        mergeMap((pointers) => from([pointers]).pipe(replaceableRequest(rxNostr, nanoid(8), [relay]))), 
         // share the response with all subscribers
         share()));
     }

package/dist/operators/address-pointers-request.d.ts

@@ -2,4 +2,4 @@ import { EventPacket, RxNostr } from "rx-nostr";
 import { OperatorFunction } from "rxjs";
 import { AddressPointerWithoutD } from "applesauce-core/helpers";
 /** Makes a request to relays for every set of address pointers */
-export declare function replaceableRequest<T extends AddressPointerWithoutD>(rxNostr: RxNostr, relays: string[], id?: string): OperatorFunction<T[], EventPacket>;
+export declare function replaceableRequest<T extends AddressPointerWithoutD>(rxNostr: RxNostr, id: string, relays?: string[]): OperatorFunction<T[], EventPacket>;

package/dist/operators/address-pointers-request.js

@@ -1,12 +1,10 @@
 import { map, tap } from "rxjs";
-import { nanoid } from "nanoid";
 import { logger } from "applesauce-core";
 import { relaysRequest } from "./relay-request.js";
 import { createFiltersFromAddressPointers } from "../helpers/address-pointer.js";
 /** Makes a request to relays for every set of address pointers */
-export function replaceableRequest(rxNostr, relays, id) {
+export function replaceableRequest(rxNostr, id, relays) {
     return (source) => {
-        id = id || nanoid(8);
         const log = logger.extend(`replaceableRequest:${id}`);
         return source.pipe(
         // convert pointers to filters
@@ -16,7 +14,7 @@ export function replaceableRequest(rxNostr, relays, id) {
             log(`Requesting`, relays, filters);
         }), 
         // make requests
-        relaysRequest(rxNostr, relays, id), 
+        relaysRequest(rxNostr, id, relays), 
         // log when complete
         tap({
             complete: () => {

package/dist/operators/relay-request.d.ts

@@ -1,4 +1,4 @@
 import { EventPacket, LazyFilter, RxNostr } from "rx-nostr";
 import { OperatorFunction } from "rxjs";
 /** Makes a request to relays for every set of filters */
-export declare function relaysRequest(rxNostr: RxNostr, relays: string[], id?: string): OperatorFunction<LazyFilter | LazyFilter[], EventPacket>;
+export declare function relaysRequest(rxNostr: RxNostr, id: string, relays?: string[]): OperatorFunction<LazyFilter | LazyFilter[], EventPacket>;

package/dist/operators/relay-request.js

@@ -1,7 +1,7 @@
 import { createRxOneshotReq } from "rx-nostr";
 import { map, mergeAll } from "rxjs";
 /** Makes a request to relays for every set of filters */
-export function relaysRequest(rxNostr, relays, id) {
+export function relaysRequest(rxNostr, id, relays) {
     return (source) => source.pipe(map((filters) => {
         const req = createRxOneshotReq({ filters, rxReqId: id });
         return rxNostr.use(req, { on: { relays } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-loaders",
-  "version": "0.0.0-next-20241207161834",
+  "version": "0.0.0-next-20241210184957",
   "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-20241207161834",
+    "applesauce-core": "0.0.0-next-20241210184957",
     "nanoid": "^5.0.9",
     "nostr-tools": "^2.10.3",
     "rx-nostr": "^3.4.1",