Fix list loading in feeds hanging and pagination in feeds with since/until

packages/feeds/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/feeds",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "author": "hodlbod",
   "license": "MIT",
   "description": "Utilities for building dynamic nostr feeds.",

packages/feeds/src/compiler.ts

@@ -267,6 +267,7 @@ export class FeedCompiler {
     const eventsByAddress = new Map<string, TrustedEvent>()
 
     await requestPage({
+      autoClose: true,
       signal: this.options.signal,
       context: this.options.context,
       filters: getIdFilters(addresses),
@@ -302,9 +303,10 @@ export class FeedCompiler {
     await Promise.all(
       labelItems.map(({mappings, relays, ...filter}) =>
         requestPage({
+          relays,
+          autoClose: true,
           signal: this.options.signal,
           context: this.options.context,
-          relays,
           filters: [{kinds: [1985], ...filter}],
           onEvent: (e: TrustedEvent) => events.push(e),
         }),

packages/feeds/src/controller.ts

@@ -147,7 +147,7 @@ export class FeedController {
           return filterSince < until && filterUntil > since
         })
         // Modify the filters to define our window
-        .map((filter: Filter) => ({...filter, until, limit, since}))
+        .map((filter: Filter) => ({since, until, limit, ...filter}))
 
       if (requestFilters.length === 0) {
         return onExhausted?.()