From b7d5ce7ae2e00d5554d811b2d5a34ac21e51e9ca Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Fri, 24 May 2024 14:11:05 -0700
Subject: [PATCH] Fix dvms

---
 package-lock.json           | 14 +++++++-------
 packages/feeds/compiler.ts  |  8 +++-----
 packages/feeds/loader.ts    |  4 ++--
 packages/feeds/package.json |  4 ++--
 packages/net/package.json   |  4 ++--
 packages/util/package.json  |  2 +-
 6 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6c72d7f..18501de 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3059,10 +3059,10 @@
     },
     "packages/feeds": {
       "name": "@welshman/feeds",
-      "version": "0.0.8",
+      "version": "0.0.9",
       "license": "MIT",
       "dependencies": {
-        "@welshman/util": "0.0.10"
+        "@welshman/util": "0.0.11"
       },
       "devDependencies": {
         "gts": "^5.0.1",
@@ -3072,7 +3072,7 @@
     },
     "packages/lib": {
       "name": "@welshman/lib",
-      "version": "0.0.7",
+      "version": "0.0.8",
       "license": "MIT",
       "dependencies": {
         "@scure/base": "^1.1.6",
@@ -3099,8 +3099,8 @@
       "version": "0.0.10",
       "license": "MIT",
       "dependencies": {
-        "@welshman/lib": "0.0.7",
-        "@welshman/util": "0.0.10",
+        "@welshman/lib": "0.0.8",
+        "@welshman/util": "0.0.11",
         "isomorphic-ws": "^5.0.0",
         "ws": "^8.16.0"
       },
@@ -3112,10 +3112,10 @@
     },
     "packages/util": {
       "name": "@welshman/util",
-      "version": "0.0.10",
+      "version": "0.0.11",
       "license": "MIT",
       "dependencies": {
-        "@welshman/lib": "0.0.7",
+        "@welshman/lib": "0.0.8",
         "nostr-tools": "^2.3.2"
       },
       "devDependencies": {
diff --git a/packages/feeds/compiler.ts b/packages/feeds/compiler.ts
index a5d9a13..79d2d29 100644
--- a/packages/feeds/compiler.ts
+++ b/packages/feeds/compiler.ts
@@ -106,11 +106,9 @@ export class FeedCompiler<E extends TrustedEvent> {
         this.options.requestDVM({
           ...request,
           onEvent: async (e: E) => {
-            const tags = Tags.fromEvent(e)
-            const request = await tryCatch(() => JSON.parse(tags.get("request")?.value()))
-            const responseTags = tags.rejectByValue([request?.id, request?.pubkey])
+            const tags = Tags.wrap(await tryCatch(() => JSON.parse(e.content)) || [])
 
-            for (const feed of feedsFromTags(responseTags, mappings)) {
+            for (const feed of feedsFromTags(tags, mappings)) {
               feeds.push(feed)
             }
           },
@@ -118,7 +116,7 @@ export class FeedCompiler<E extends TrustedEvent> {
       )
     )
 
-    return this._compileUnion(feeds)
+    return await this._compileUnion(feeds)
   }
 
   async _compileIntersection(feeds: Feed[]): Promise<RequestItem[]> {
diff --git a/packages/feeds/loader.ts b/packages/feeds/loader.ts
index 6f1393e..52cf343 100644
--- a/packages/feeds/loader.ts
+++ b/packages/feeds/loader.ts
@@ -21,7 +21,7 @@ export class FeedLoader<E extends TrustedEvent> {
 
   async getLoader([type, ...feed]: Feed, loadOpts: LoadOpts<E>) {
     if (this.compiler.canCompile([type, ...feed] as Feed)) {
-      return this._getRequestsLoader(await this.compiler.compile([type, ...feed] as Feed), loadOpts)
+      return this.getRequestsLoader(await this.compiler.compile([type, ...feed] as Feed), loadOpts)
     }
 
     switch(type) {
@@ -38,7 +38,7 @@ export class FeedLoader<E extends TrustedEvent> {
     }
   }
 
-  async _getRequestsLoader(requests: RequestItem[], {onEvent, onExhausted}: LoadOpts<E>) {
+  async getRequestsLoader(requests: RequestItem[], {onEvent, onExhausted}: LoadOpts<E>) {
     const seen = new Set()
     const exhausted = new Set()
     const loaders = await Promise.all(
diff --git a/packages/feeds/package.json b/packages/feeds/package.json
index 25aee3f..6c8e638 100644
--- a/packages/feeds/package.json
+++ b/packages/feeds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@welshman/feeds",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "author": "hodlbod",
   "license": "MIT",
   "description": "Utilities for building dynamic nostr feeds.",
@@ -31,6 +31,6 @@
     "typescript": "~5.1.6"
   },
   "dependencies": {
-    "@welshman/util": "0.0.10"
+    "@welshman/util": "0.0.11"
   }
 }
diff --git a/packages/net/package.json b/packages/net/package.json
index 1a9e9b4..c1234f7 100644
--- a/packages/net/package.json
+++ b/packages/net/package.json
@@ -31,8 +31,8 @@
     "typescript": "~5.1.6"
   },
   "dependencies": {
-    "@welshman/lib": "0.0.7",
-    "@welshman/util": "0.0.10",
+    "@welshman/lib": "0.0.8",
+    "@welshman/util": "0.0.11",
     "isomorphic-ws": "^5.0.0",
     "ws": "^8.16.0"
   }
diff --git a/packages/util/package.json b/packages/util/package.json
index 49aba06..b99a439 100644
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -31,7 +31,7 @@
     "typescript": "~5.1.6"
   },
   "dependencies": {
-    "@welshman/lib": "0.0.7",
+    "@welshman/lib": "0.0.8",
     "nostr-tools": "^2.3.2"
   }
 }