From ed52d2a8d4fb5c9bd856f93e98c9abc85077ccb9 Mon Sep 17 00:00:00 2001 From: monlovesmango <96307647+monlovesmango@users.noreply.github.com> Date: Wed, 22 Jun 2022 14:49:26 -0500 Subject: [PATCH] updating cb property for subControllers entries when updating subscription or adding new relays, subsequent events that are received have the relay as undefined. by updating cb property for the subControllers entries to be an arrow function (when calling sub.sub or sub.addRelay), subsequent events now return the relay url appropriately --- pool.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pool.js b/pool.js index ada6e32..96b9266 100644 --- a/pool.js +++ b/pool.js @@ -34,7 +34,7 @@ export function relayPool() { .filter(({policy}) => policy.read) .map(({relay}) => [ relay.url, - relay.sub({filter, cb: event => cb(event, relay.url), beforeSend}, id) + relay.sub({ cb: event => cb(event, relay.url), filter, beforeSend}, id) ]) ) @@ -53,12 +53,12 @@ export function relayPool() { }) => { Object.entries(subControllers).map(([relayURL, sub]) => [ relayURL, - sub.sub({cb, filter, beforeSend}, id) + sub.sub({cb: event => cb(event, relayURL), filter, beforeSend}, id) ]) return activeSubscriptions[id] } const addRelay = relay => { - subControllers[relay.url] = relay.sub({cb, filter}, id) + subControllers[relay.url] = relay.sub({cb: event => cb(event, relay.url), filter}, id) return activeSubscriptions[id] } const removeRelay = relayURL => {