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

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@welshman",
   "private": true,
-  "version": "0.4.0",
+  "version": "0.4.1",
   "workspaces": [
     "packages/*"
   ],
@@ -12,8 +12,7 @@
     "lint": "eslint .",
     "test": "vitest",
     "docs": "typedoc && vitepress build docs",
-    "prepare": "husky",
+    "prepare": "husky"
-    "apply-version": "./scripts/apply_version.sh"
   },
   "devDependencies": {
     "@eslint/js": "~9.23.0",

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/app",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A collection of svelte stores for use in building nostr client applications.",

packages/content/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/content",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A collection of utilities for parsing nostr note content.",

packages/editor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/editor",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A batteries-included nostr editor.",

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?.()

packages/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/lib",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A collection of utilities.",

packages/net/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/net",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "author": "hodlbod",
   "license": "MIT",
   "description": "Utilities for connecting with nostr relays.",

packages/relay/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/relay",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "author": "hodlbod",
   "license": "MIT",
   "description": "An in-memory nostr relay implementation.",

packages/router/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/router",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A collection of utilities for nostr relay selection.",

packages/signer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/signer",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A nostr signer implemenation supporting several login methods.",

packages/store/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/store",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A collection of utilities based on svelte/store for use with welshman",

packages/util/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/util",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A collection of nostr-related utilities.",