@welshman/app 0.6.7 → 0.7.0

package/dist/app/src/user.js

@@ -1,61 +1,46 @@
 import { derived } from "svelte/store";
-import { withGetter, memoized } from "@welshman/store";
 import { pubkey } from "./session.js";
-import { profilesByPubkey, loadProfile } from "./profiles.js";
-import { followsByPubkey, loadFollows } from "./follows.js";
-import { loadPins, pinsByPubkey } from "./pins.js";
-import { mutesByPubkey, loadMutes } from "./mutes.js";
-import { blossomServersByPubkey, loadBlossomServers } from "./blossom.js";
-import { relaySelectionsByPubkey, loadRelaySelections } from "./relaySelections.js";
-import { inboxRelaySelectionsByPubkey, loadInboxRelaySelections } from "./inboxRelaySelections.js";
-import { wotGraph } from "./wot.js";
-export const makeUserData = ({ mapStore, loadItem }) => withGetter(memoized(derived([mapStore, pubkey], ([$mapStore, $pubkey]) => {
+import { profilesByPubkey, forceLoadProfile, loadProfile } from "./profiles.js";
+import { followListsByPubkey, forceLoadFollowList, loadFollowList } from "./follows.js";
+import { pinListsByPubkey, forceLoadPinList, loadPinList } from "./pins.js";
+import { muteListsByPubkey, forceLoadMuteList, loadMuteList } from "./mutes.js";
+import { blossomServerListsByPubkey, forceLoadBlossomServerList, loadBlossomServerList, } from "./blossom.js";
+import { relayListsByPubkey, forceLoadRelayList, loadRelayList } from "./relayLists.js";
+import { messagingRelayListsByPubkey, forceLoadMessagingRelayList, loadMessagingRelayList, } from "./messagingRelayLists.js";
+import { wotGraph, getWotGraph } from "./wot.js";
+export const makeUserData = (itemsByKey, onDerive) => derived([itemsByKey, pubkey], ([$itemsByKey, $pubkey]) => {
     if (!$pubkey)
         return undefined;
-    loadItem($pubkey);
-    return $mapStore.get($pubkey);
-})));
-export const makeUserLoader = (loadItem) => async (relays = [], force = false) => {
+    onDerive?.($pubkey);
+    return $itemsByKey.get($pubkey);
+});
+export const makeUserLoader = (loadItem) => async (...args) => {
     const $pubkey = pubkey.get();
     if ($pubkey) {
-        await loadItem($pubkey, relays, force);
+        await loadItem($pubkey, ...args);
     }
 };
-export const userProfile = makeUserData({
-    mapStore: profilesByPubkey,
-    loadItem: loadProfile,
-});
+export const userProfile = makeUserData(profilesByPubkey, loadProfile);
+export const forceLoadUserProfile = makeUserLoader(forceLoadProfile);
 export const loadUserProfile = makeUserLoader(loadProfile);
-export const userFollows = makeUserData({
-    mapStore: followsByPubkey,
-    loadItem: loadFollows,
-});
-export const loadUserFollows = makeUserLoader(loadFollows);
-export const userMutes = makeUserData({
-    mapStore: mutesByPubkey,
-    loadItem: loadMutes,
-});
-export const loadUserMutes = makeUserLoader(loadMutes);
-export const userPins = makeUserData({
-    mapStore: pinsByPubkey,
-    loadItem: loadPins,
-});
-export const loadUserPins = makeUserLoader(loadPins);
-export const userRelaySelections = makeUserData({
-    mapStore: relaySelectionsByPubkey,
-    loadItem: loadRelaySelections,
-});
-export const loadUserRelaySelections = makeUserLoader(loadRelaySelections);
-export const userInboxRelaySelections = makeUserData({
-    mapStore: inboxRelaySelectionsByPubkey,
-    loadItem: loadInboxRelaySelections,
-});
-export const loadUserInboxRelaySelections = makeUserLoader(loadInboxRelaySelections);
-export const userBlossomServers = makeUserData({
-    mapStore: blossomServersByPubkey,
-    loadItem: loadBlossomServers,
-});
-export const loadUserBlossomServers = makeUserLoader(loadBlossomServers);
-export const getUserWotScore = (tpk) => wotGraph.get().get(tpk) || 0;
+export const userFollowList = makeUserData(followListsByPubkey, loadFollowList);
+export const forceLoadUserFollowList = makeUserLoader(forceLoadFollowList);
+export const loadUserFollowList = makeUserLoader(loadFollowList);
+export const userMuteList = makeUserData(muteListsByPubkey, loadMuteList);
+export const forceLoadUserMuteList = makeUserLoader(forceLoadMuteList);
+export const loadUserMuteList = makeUserLoader(loadMuteList);
+export const userPinList = makeUserData(pinListsByPubkey, loadPinList);
+export const forceLoadUserPinList = makeUserLoader(forceLoadPinList);
+export const loadUserPinList = makeUserLoader(loadPinList);
+export const userRelayList = makeUserData(relayListsByPubkey, loadRelayList);
+export const forceLoadUserRelayList = makeUserLoader(forceLoadRelayList);
+export const loadUserRelayList = makeUserLoader(loadRelayList);
+export const userMessagingRelayList = makeUserData(messagingRelayListsByPubkey, loadMessagingRelayList);
+export const forceLoadUserMessagingRelayList = makeUserLoader(forceLoadMessagingRelayList);
+export const loadUserMessagingRelayList = makeUserLoader(loadMessagingRelayList);
+export const userBlossomServerList = makeUserData(blossomServerListsByPubkey, loadBlossomServerList);
+export const forceLoadUserBlossomServerList = makeUserLoader(forceLoadBlossomServerList);
+export const loadUserBlossomServerList = makeUserLoader(loadBlossomServerList);
+export const getUserWotScore = (tpk) => getWotGraph().get(tpk) || 0;
 export const deriveUserWotScore = (tpk) => derived(wotGraph, $g => $g.get(tpk) || 0);
 //# sourceMappingURL=user.js.map

package/dist/app/src/user.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../src/user.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../src/user.ts"],"names":[],"mappings":"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"}

package/dist/app/src/wot.d.ts

@@ -1,13 +1,17 @@
 export declare const getFollows: (pubkey: string) => string[];
 export declare const getMutes: (pubkey: string) => string[];
 export declare const getNetwork: (pubkey: string) => string[];
-export declare const followersByPubkey: import("@welshman/store").ReadableWithGetter<Map<string, Set<string>>>;
-export declare const mutersByPubkey: import("@welshman/store").ReadableWithGetter<Map<string, Set<string>>>;
+export declare const followersByPubkey: import("svelte/store").Readable<Map<string, Set<string>>>;
+export declare const getFollowersByPubkey: () => Map<string, Set<string>>;
+export declare const mutersByPubkey: import("svelte/store").Readable<Map<string, Set<string>>>;
+export declare const getMutersByPubkey: () => Map<string, Set<string>>;
 export declare const getFollowers: (pubkey: string) => string[];
 export declare const getMuters: (pubkey: string) => string[];
 export declare const getFollowsWhoFollow: (pubkey: string, target: string) => string[];
 export declare const getFollowsWhoMute: (pubkey: string, target: string) => string[];
-export declare const wotGraph: import("@welshman/store").WritableWithGetter<Map<string, number>>;
-export declare const maxWot: import("@welshman/store").ReadableWithGetter<number>;
+export declare const wotGraph: import("svelte/store").Writable<Map<string, number>>;
+export declare const getWotGraph: () => Map<string, number>;
+export declare const maxWot: import("svelte/store").Readable<number>;
+export declare const getMaxWot: () => number;
 export declare const getWotScore: (pubkey: string, target: string) => number;
 //# sourceMappingURL=wot.d.ts.map

package/dist/app/src/wot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wot.d.ts","sourceRoot":"","sources":["../../../src/wot.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,UAAU,GAAI,QAAQ,MAAM,aAC2B,CAAA;AAEpE,eAAO,MAAM,QAAQ,GAAI,QAAQ,MAAM,aAC2B,CAAA;AAElE,eAAO,MAAM,UAAU,GAAI,QAAQ,MAAM,aAaxC,CAAA;AAED,eAAO,MAAM,iBAAiB,wEAY7B,CAAA;AAED,eAAO,MAAM,cAAc,wEAY1B,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,QAAQ,MAAM,aACY,CAAA;AAEvD,eAAO,MAAM,SAAS,GAAI,QAAQ,MAAM,aAAuD,CAAA;AAE/F,eAAO,MAAM,mBAAmB,GAAI,QAAQ,MAAM,EAAE,QAAQ,MAAM,aACM,CAAA;AAExE,eAAO,MAAM,iBAAiB,GAAI,QAAQ,MAAM,EAAE,QAAQ,MAAM,aACM,CAAA;AAEtE,eAAO,MAAM,QAAQ,mEAAkD,CAAA;AAEvE,eAAO,MAAM,MAAM,sDAAoE,CAAA;AAwBvF,eAAO,MAAM,WAAW,GAAI,QAAQ,MAAM,EAAE,QAAQ,MAAM,WAKzD,CAAA"}
+{"version":3,"file":"wot.d.ts","sourceRoot":"","sources":["../../../src/wot.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,UAAU,GAAI,QAAQ,MAAM,aAA2D,CAAA;AAEpG,eAAO,MAAM,QAAQ,GAAI,QAAQ,MAAM,aAAyD,CAAA;AAEhG,eAAO,MAAM,UAAU,GAAI,QAAQ,MAAM,aAaxC,CAAA;AAED,eAAO,MAAM,iBAAiB,2DAU5B,CAAA;AAEF,eAAO,MAAM,oBAAoB,gCAA4B,CAAA;AAE7D,eAAO,MAAM,cAAc,2DAUzB,CAAA;AAEF,eAAO,MAAM,iBAAiB,gCAAyB,CAAA;AAEvD,eAAO,MAAM,YAAY,GAAI,QAAQ,MAAM,aAAyD,CAAA;AAEpG,eAAO,MAAM,SAAS,GAAI,QAAQ,MAAM,aAAsD,CAAA;AAE9F,eAAO,MAAM,mBAAmB,GAAI,QAAQ,MAAM,EAAE,QAAQ,MAAM,aACM,CAAA;AAExE,eAAO,MAAM,iBAAiB,GAAI,QAAQ,MAAM,EAAE,QAAQ,MAAM,aACM,CAAA;AAEtE,eAAO,MAAM,QAAQ,sDAAsC,CAAA;AAE3D,eAAO,MAAM,WAAW,2BAAmB,CAAA;AAE3C,eAAO,MAAM,MAAM,yCAAwD,CAAA;AAE3E,eAAO,MAAM,SAAS,cAAiB,CAAA;AAwBvC,eAAO,MAAM,WAAW,GAAI,QAAQ,MAAM,EAAE,QAAQ,MAAM,WAKzD,CAAA"}

package/dist/app/src/wot.js

@@ -1,12 +1,12 @@
 import { derived, writable } from "svelte/store";
 import { max, throttle, addToMapKey, inc, dec } from "@welshman/lib";
 import { getListTags, getPubkeyTagValues } from "@welshman/util";
-import { throttled, withGetter } from "@welshman/store";
+import { throttled, getter } from "@welshman/store";
 import { pubkey } from "./session.js";
-import { follows, followsByPubkey } from "./follows.js";
-import { mutes, mutesByPubkey } from "./mutes.js";
-export const getFollows = (pubkey) => getPubkeyTagValues(getListTags(followsByPubkey.get().get(pubkey)));
-export const getMutes = (pubkey) => getPubkeyTagValues(getListTags(mutesByPubkey.get().get(pubkey)));
+import { followLists, getFollowListsByPubkey, getFollowList } from "./follows.js";
+import { muteLists, getMuteList } from "./mutes.js";
+export const getFollows = (pubkey) => getPubkeyTagValues(getListTags(getFollowList(pubkey)));
+export const getMutes = (pubkey) => getPubkeyTagValues(getListTags(getMuteList(pubkey)));
 export const getNetwork = (pubkey) => {
     const pubkeys = new Set(getFollows(pubkey));
     const network = new Set();
@@ -19,7 +19,7 @@ export const getNetwork = (pubkey) => {
     }
     return Array.from(network);
 };
-export const followersByPubkey = withGetter(derived(throttled(1000, follows), lists => {
+export const followersByPubkey = derived(throttled(1000, followLists), lists => {
     const $followersByPubkey = new Map();
     for (const list of lists) {
         for (const pubkey of getPubkeyTagValues(getListTags(list))) {
@@ -27,8 +27,9 @@ export const followersByPubkey = withGetter(derived(throttled(1000, follows), li
         }
     }
     return $followersByPubkey;
-}));
-export const mutersByPubkey = withGetter(derived(throttled(1000, mutes), lists => {
+});
+export const getFollowersByPubkey = getter(followersByPubkey);
+export const mutersByPubkey = derived(throttled(1000, muteLists), lists => {
     const $mutersByPubkey = new Map();
     for (const list of lists) {
         for (const pubkey of getPubkeyTagValues(getListTags(list))) {
@@ -36,17 +37,20 @@ export const mutersByPubkey = withGetter(derived(throttled(1000, mutes), lists =
         }
     }
     return $mutersByPubkey;
-}));
-export const getFollowers = (pubkey) => Array.from(followersByPubkey.get().get(pubkey) || []);
-export const getMuters = (pubkey) => Array.from(mutersByPubkey.get().get(pubkey) || []);
+});
+export const getMutersByPubkey = getter(mutersByPubkey);
+export const getFollowers = (pubkey) => Array.from(getFollowersByPubkey().get(pubkey) || []);
+export const getMuters = (pubkey) => Array.from(getMutersByPubkey().get(pubkey) || []);
 export const getFollowsWhoFollow = (pubkey, target) => getFollows(pubkey).filter(other => getFollows(other).includes(target));
 export const getFollowsWhoMute = (pubkey, target) => getFollows(pubkey).filter(other => getMutes(other).includes(target));
-export const wotGraph = withGetter(writable(new Map()));
-export const maxWot = withGetter(derived(wotGraph, $g => max(Array.from($g.values()))));
+export const wotGraph = writable(new Map());
+export const getWotGraph = getter(wotGraph);
+export const maxWot = derived(wotGraph, $g => max(Array.from($g.values())));
+export const getMaxWot = getter(maxWot);
 const buildGraph = throttle(1000, () => {
     const $pubkey = pubkey.get();
     const $graph = new Map();
-    const $follows = $pubkey ? getFollows($pubkey) : followsByPubkey.get().keys();
+    const $follows = $pubkey ? getFollows($pubkey) : getFollowListsByPubkey().keys();
     for (const follow of $follows) {
         for (const pubkey of getFollows(follow)) {
             $graph.set(pubkey, inc($graph.get(pubkey)));
@@ -58,8 +62,8 @@ const buildGraph = throttle(1000, () => {
     wotGraph.set($graph);
 });
 pubkey.subscribe(buildGraph);
-follows.subscribe(buildGraph);
-mutes.subscribe(buildGraph);
+followLists.subscribe(buildGraph);
+muteLists.subscribe(buildGraph);
 export const getWotScore = (pubkey, target) => {
     const follows = pubkey ? getFollowsWhoFollow(pubkey, target) : getFollowers(target);
     const mutes = pubkey ? getFollowsWhoMute(pubkey, target) : getMuters(target);

package/dist/app/src/wot.js.map

@@ -1 +1 @@
-{"version":3,"file":"wot.js","sourceRoot":"","sources":["../../../src/wot.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wot.js","sourceRoot":"","sources":["../../../src/wot.ts"],"names":[],"mappings":"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"}

package/dist/app/src/zappers.d.ts

@@ -1,13 +1,28 @@
+import { Subscriber } from "svelte/store";
 import { Zapper, TrustedEvent, Zap } from "@welshman/util";
-export declare const zappers: import("svelte/store").Writable<Zapper[]>;
-export declare const fetchZappers: (lnurls: string[]) => Promise<Map<string, Zapper>>;
-export declare const zappersByLnurl: import("@welshman/store").ReadableWithGetter<Map<string, Zapper>>, deriveZapper: (key: string | undefined, relays?: string[]) => import("svelte/store").Readable<undefined> | {
-    subscribe: (f: import("svelte/store").Subscriber<Zapper | undefined>) => import("svelte/store").Unsubscriber;
-}, loadZapper: (key: string, relays?: string[], force?: boolean) => Promise<Zapper | undefined>, onZapper: (cb: import("svelte/store").Subscriber<Zapper>) => () => void;
-export declare const loadZapperForPubkey: (pubkey: string, relays?: string[]) => Promise<Zapper | undefined>;
+export declare const zappersByLnurl: import("svelte/store").Writable<Map<string, Zapper>>;
+export declare const zappers: import("svelte/store").Readable<Zapper[]>;
+export declare const getZappersByLnurl: () => Map<string, Zapper>;
+export declare const getZapper: (lnurl: string) => Zapper | undefined;
+export declare const zapperSubscribers: Subscriber<Zapper>[];
+export declare const notifyZapper: (zapper: Zapper) => void;
+export declare const onZapper: (sub: (zapper: Zapper) => void) => () => Subscriber<Zapper>[];
+export declare const fetchZapper: (request: string) => Promise<{
+    lnurl: string;
+    pubkey?: string;
+    callback?: string;
+    minSendable?: number;
+    maxSendable?: number;
+    nostrPubkey?: string;
+    allowsNostr?: boolean;
+} | undefined>;
+export declare const forceLoadZapper: (key: string, ...args: any[]) => Promise<Zapper | undefined>;
+export declare const loadZapper: (key: string, ...args: any[]) => Promise<import("@welshman/lib").Maybe<Zapper>>;
+export declare const deriveZapper: (key?: string, ...args: any[]) => import("svelte/store").Readable<Zapper | undefined>;
+export declare const loadZapperForPubkey: (pubkey: string, relays?: string[]) => Promise<import("@welshman/lib").Maybe<Zapper>>;
 export declare const deriveZapperForPubkey: (pubkey: string, relays?: string[]) => import("svelte/store").Readable<Zapper | undefined>;
 export declare const getLnUrlsForEvent: (event: TrustedEvent) => Promise<string[]>;
-export declare const getZapperForZap: (zap: TrustedEvent, parent: TrustedEvent) => Promise<Zapper | undefined>;
+export declare const getZapperForZap: (zap: TrustedEvent, parent: TrustedEvent) => Promise<import("@welshman/lib").Maybe<Zapper>>;
 export declare const getValidZap: (zap: TrustedEvent, parent: TrustedEvent) => Promise<Zap | undefined>;
 export declare const getValidZaps: (zaps: TrustedEvent[], parent: TrustedEvent) => Promise<Zap[]>;
 export declare const deriveValidZaps: (zaps: TrustedEvent[], parent: TrustedEvent) => import("svelte/store").Writable<Zap[]>;

package/dist/app/src/zappers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zappers.d.ts","sourceRoot":"","sources":["../../../src/zappers.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAE,YAAY,EAAE,GAAG,EAAuC,MAAM,gBAAgB,CAAA;AAe9F,eAAO,MAAM,OAAO,2CAAyB,CAAA;AAE7C,eAAO,MAAM,YAAY,GAAU,QAAQ,MAAM,EAAE,iCAmClD,CAAA;AAED,eAAO,MACO,cAAc,qEACd,YAAY;;GACd,UAAU,oFACZ,QAAQ,+DAqBhB,CAAA;AAEF,eAAO,MAAM,mBAAmB,GAAU,QAAQ,MAAM,EAAE,SAAQ,MAAM,EAAO,gCAQ9E,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAI,QAAQ,MAAM,EAAE,SAAQ,MAAM,EAAO,wDASvE,CAAA;AAEJ,eAAO,MAAM,iBAAiB,GAAU,OAAO,YAAY,sBAU1D,CAAA;AAED,eAAO,MAAM,eAAe,GAAU,KAAK,YAAY,EAAE,QAAQ,YAAY,gCAI5E,CAAA;AAED,eAAO,MAAM,WAAW,GAAU,KAAK,YAAY,EAAE,QAAQ,YAAY,6BAIxE,CAAA;AAED,eAAO,MAAM,YAAY,GAAU,MAAM,YAAY,EAAE,EAAE,QAAQ,YAAY,mBACJ,CAAA;AAEzE,eAAO,MAAM,eAAe,GAAI,MAAM,YAAY,EAAE,EAAE,QAAQ,YAAY,2CAQzE,CAAA"}
+{"version":3,"file":"zappers.d.ts","sourceRoot":"","sources":["../../../src/zappers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,UAAU,EAAC,MAAM,cAAc,CAAA;AAC1D,OAAO,EAAC,MAAM,EAAE,YAAY,EAAE,GAAG,EAAuC,MAAM,gBAAgB,CAAA;AAc9F,eAAO,MAAM,cAAc,sDAAsC,CAAA;AAEjE,eAAO,MAAM,OAAO,2CAA8B,CAAA;AAElD,eAAO,MAAM,iBAAiB,2BAAyB,CAAA;AAEvD,eAAO,MAAM,SAAS,GAAI,OAAO,MAAM,uBAAmC,CAAA;AAE1E,eAAO,MAAM,iBAAiB,EAAE,UAAU,CAAC,MAAM,CAAC,EAAO,CAAA;AAEzD,eAAO,MAAM,YAAY,GAAI,QAAQ,MAAM,SAAkD,CAAA;AAE7F,eAAO,MAAM,QAAQ,GAAI,KAAK,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,+BAQrD,CAAA;AAED,eAAO,MAAM,WAAW;;;;;;;;cAyDtB,CAAA;AAEF,eAAO,MAAM,eAAe,8DAA4C,CAAA;AAExE,eAAO,MAAM,UAAU,iFAAuC,CAAA;AAE9D,eAAO,MAAM,YAAY,uFAA6C,CAAA;AAEtE,eAAO,MAAM,mBAAmB,GAAU,QAAQ,MAAM,EAAE,SAAQ,MAAM,EAAO,mDAI9E,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAI,QAAQ,MAAM,EAAE,SAAQ,MAAM,EAAO,wDAM1E,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAU,OAAO,YAAY,sBAU1D,CAAA;AAED,eAAO,MAAM,eAAe,GAAU,KAAK,YAAY,EAAE,QAAQ,YAAY,mDAI5E,CAAA;AAED,eAAO,MAAM,WAAW,GAAU,KAAK,YAAY,EAAE,QAAQ,YAAY,6BAIxE,CAAA;AAED,eAAO,MAAM,YAAY,GAAU,MAAM,YAAY,EAAE,EAAE,QAAQ,YAAY,mBACE,CAAA;AAE/E,eAAO,MAAM,eAAe,GAAI,MAAM,YAAY,EAAE,EAAE,QAAQ,YAAY,2CAQzE,CAAA"}

package/dist/app/src/zappers.js

@@ -1,20 +1,32 @@
 import { writable, derived } from "svelte/store";
 import { getTagValues, getLnUrl, zapFromEvent } from "@welshman/util";
-import { removeNil, fetchJson, uniq, bech32ToHex, hexToBech32, tryCatch, batcher, postJson, } from "@welshman/lib";
-import { collection } from "@welshman/store";
+import { removeUndefined, fetchJson, bech32ToHex, hexToBech32, tryCatch, batcher, postJson, } from "@welshman/lib";
+import { getter, deriveItems, makeForceLoadItem, makeLoadItem, makeDeriveItem } from "@welshman/store";
 import { deriveProfile, loadProfile } from "./profiles.js";
 import { appContext } from "./context.js";
-export const zappers = writable([]);
-export const fetchZappers = async (lnurls) => {
+export const zappersByLnurl = writable(new Map());
+export const zappers = deriveItems(zappersByLnurl);
+export const getZappersByLnurl = getter(zappersByLnurl);
+export const getZapper = (lnurl) => getZappersByLnurl().get(lnurl);
+export const zapperSubscribers = [];
+export const notifyZapper = (zapper) => zapperSubscribers.forEach(sub => sub(zapper));
+export const onZapper = (sub) => {
+    zapperSubscribers.push(sub);
+    return () => zapperSubscribers.splice(zapperSubscribers.findIndex(s => s === sub), 1);
+};
+export const fetchZapper = batcher(800, async (lnurls) => {
     const base = appContext.dufflepudUrl;
-    const zappersByLnurl = new Map();
+    const result = new Map();
     // Use dufflepud if we it's set up to protect user privacy, otherwise fetch directly
     if (base) {
-        const hexUrls = removeNil(lnurls.map(lnurl => tryCatch(() => bech32ToHex(lnurl))));
+        const hexUrls = removeUndefined(lnurls.map(lnurl => tryCatch(() => bech32ToHex(lnurl))));
         if (hexUrls.length > 0) {
             const res = await tryCatch(async () => await postJson(`${base}/zapper/info`, { lnurls: hexUrls }));
-            for (const { lnurl, info } of res?.data || []) {
-                tryCatch(() => zappersByLnurl.set(hexToBech32("lnurl", lnurl), info));
+            for (const { hexUrl, info } of res?.data || []) {
+                if (info) {
+                    const lnurl = hexToBech32("lnurl", hexUrl);
+                    tryCatch(() => result.set(lnurl, { ...info, lnurl }));
+                }
             }
         }
     }
@@ -26,50 +38,46 @@ export const fetchZappers = async (lnurls) => {
         }));
         for (const { lnurl, info } of results) {
             if (info) {
-                zappersByLnurl.set(lnurl, info);
+                result.set(lnurl, { ...info, lnurl });
             }
         }
     }
-    return zappersByLnurl;
-};
-export const { indexStore: zappersByLnurl, deriveItem: deriveZapper, loadItem: loadZapper, onItem: onZapper, } = collection({
-    name: "zappers",
-    store: zappers,
-    getKey: (zapper) => zapper.lnurl,
-    load: batcher(800, async (lnurls) => {
-        const fresh = await fetchZappers(uniq(lnurls));
-        const stale = zappersByLnurl.get();
-        for (const lnurl of lnurls) {
-            const newZapper = fresh.get(lnurl);
-            if (newZapper) {
-                stale.set(lnurl, { ...newZapper, lnurl });
-            }
+    zappersByLnurl.update($zappersByLnurl => {
+        for (const [nip05, info] of result) {
+            $zappersByLnurl.set(nip05, info);
         }
-        zappers.set(Array.from(stale.values()));
-        return lnurls;
-    }),
+        return $zappersByLnurl;
+    });
+    for (const info of result.values()) {
+        notifyZapper(info);
+    }
+    return lnurls.map(lnurl => {
+        const info = result.get(lnurl);
+        if (info) {
+            return { ...info, lnurl };
+        }
+    });
 });
+export const forceLoadZapper = makeForceLoadItem(fetchZapper, getZapper);
+export const loadZapper = makeLoadItem(fetchZapper, getZapper);
+export const deriveZapper = makeDeriveItem(zappersByLnurl, loadZapper);
 export const loadZapperForPubkey = async (pubkey, relays = []) => {
     const $profile = await loadProfile(pubkey, relays);
-    if (!$profile?.lnurl) {
-        return undefined;
-    }
-    return loadZapper($profile.lnurl);
+    return $profile?.lnurl ? loadZapper($profile.lnurl) : undefined;
+};
+export const deriveZapperForPubkey = (pubkey, relays = []) => {
+    loadZapperForPubkey(pubkey, relays);
+    return derived([zappersByLnurl, deriveProfile(pubkey, relays)], ([$zappersByLnurl, $profile]) => {
+        return $profile?.lnurl ? $zappersByLnurl.get($profile.lnurl) : undefined;
+    });
 };
-export const deriveZapperForPubkey = (pubkey, relays = []) => derived([zappersByLnurl, deriveProfile(pubkey, relays)], ([$zappersByLnurl, $profile]) => {
-    if (!$profile?.lnurl) {
-        return undefined;
-    }
-    loadZapper($profile.lnurl);
-    return $zappersByLnurl.get($profile.lnurl);
-});
 export const getLnUrlsForEvent = async (event) => {
-    const lnurls = removeNil(getTagValues("zap", event.tags).map(getLnUrl));
+    const lnurls = removeUndefined(getTagValues("zap", event.tags).map(getLnUrl));
     if (lnurls.length > 0) {
         return lnurls;
     }
     const profile = await loadProfile(event.pubkey);
-    return removeNil([profile?.lnurl]);
+    return removeUndefined([profile?.lnurl]);
 };
 export const getZapperForZap = async (zap, parent) => {
     const lnurls = await getLnUrlsForEvent(parent);
@@ -79,7 +87,7 @@ export const getValidZap = async (zap, parent) => {
     const zapper = await getZapperForZap(zap, parent);
     return zapper ? zapFromEvent(zap, zapper) : undefined;
 };
-export const getValidZaps = async (zaps, parent) => removeNil(await Promise.all(zaps.map(zap => getValidZap(zap, parent))));
+export const getValidZaps = async (zaps, parent) => removeUndefined(await Promise.all(zaps.map(zap => getValidZap(zap, parent))));
 export const deriveValidZaps = (zaps, parent) => {
     const store = writable([]);
     getValidZaps(zaps, parent).then(validZaps => {

package/dist/app/src/zappers.js.map

@@ -1 +1 @@
-{"version":3,"file":"zappers.js","sourceRoot":"","sources":["../../../src/zappers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"zappers.js","sourceRoot":"","sources":["../../../src/zappers.ts"],"names":[],"mappings":"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"}

package/dist/feeds/src/controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../../feeds/src/controller.ts"],"names":[],"mappings":"AAYA,OAAO,EAAuC,YAAY,EAAS,MAAM,gBAAgB,CAAA;AACzF,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAA;AACrC,OAAO,EAAC,IAAI,EAAY,WAAW,EAAC,MAAM,WAAW,CAAA;AACrD,OAAO,EAAC,YAAY,EAAE,mBAAmB,EAAC,MAAM,eAAe,CAAA;AAG/D,MAAM,MAAM,qBAAqB,GAAG,mBAAmB,GAAG;IACxD,IAAI,EAAE,IAAI,CAAA;IACV,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAA;IACvC,WAAW,CAAC,EAAE,MAAM,IAAI,CAAA;IACxB,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAED,qBAAa,cAAc;IAGb,QAAQ,CAAC,OAAO,EAAE,qBAAqB;IAFnD,QAAQ,EAAE,YAAY,CAAA;gBAED,OAAO,EAAE,qBAAqB;IAInD,eAAe,2CAIb;IAEF,SAAS,wBAiEc,MAAM,oBA/C3B;IAEF,IAAI,GAAU,OAAO,MAAM,mBAAoC;IAE/D,WAAW,kCAkBT;IAEF,MAAM,4BAIL;IAEK,kBAAkB,CAAC,QAAQ,EAAE,WAAW,EAAE,mBAiBzB,MAAM;IASvB,iBAAiB,CACrB,EAAC,MAAM,EAAE,OAAO,EAAC,EAAE,WAAW,EAC9B,EAAC,OAAO,EAAE,WAAW,EAAC,EAAE,IAAI,CAAC,qBAAqB,EAAE,SAAS,GAAG,aAAa,CAAC,mBAkBzD,MAAM;IA8D7B,oBAAoB,CAAC,KAAK,EAAE,IAAI,EAAE,IAsBlB,OAAO,MAAM;IAwB7B,sBAAsB,CAAC,KAAK,EAAE,IAAI,EAAE,IAmBpB,OAAO,MAAM;IAwB7B,eAAe,CAAC,KAAK,EAAE,IAAI,EAAE,IAmBb,OAAO,MAAM;IAiBvB,oBAAoB,CAAC,QAAQ,EAAE,WAAW,EAAE;IAsB5C,mBAAmB,CACvB,EAAC,MAAM,EAAE,OAAO,EAAC,EAAE,WAAW,EAC9B,EAAC,OAAO,EAAC,EAAE,IAAI,CAAC,qBAAqB,EAAE,SAAS,CAAC;IA2BnD,sBAAsB,CAAC,KAAK,EAAE,IAAI,EAAE;IAyBpC,wBAAwB,CAAC,KAAK,EAAE,IAAI,EAAE;IA2BtC,iBAAiB,CAAC,KAAK,EAAE,IAAI,EAAE;CAuBhC"}
+{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../../feeds/src/controller.ts"],"names":[],"mappings":"AAYA,OAAO,EAAuC,YAAY,EAAS,MAAM,gBAAgB,CAAA;AACzF,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAA;AACrC,OAAO,EAAC,IAAI,EAAY,WAAW,EAAC,MAAM,WAAW,CAAA;AACrD,OAAO,EAAC,YAAY,EAAE,mBAAmB,EAAC,MAAM,eAAe,CAAA;AAG/D,MAAM,MAAM,qBAAqB,GAAG,mBAAmB,GAAG;IACxD,IAAI,EAAE,IAAI,CAAA;IACV,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAA;IACvC,WAAW,CAAC,EAAE,MAAM,IAAI,CAAA;IACxB,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAED,qBAAa,cAAc;IAGb,QAAQ,CAAC,OAAO,EAAE,qBAAqB;IAFnD,QAAQ,EAAE,YAAY,CAAA;gBAED,OAAO,EAAE,qBAAqB;IAInD,eAAe,2CAIb;IAEF,SAAS,wBAiEc,MAAM,oBA/C3B;IAEF,IAAI,GAAU,OAAO,MAAM,mBAAoC;IAE/D,WAAW,kCAkBT;IAEF,MAAM,4BAIL;IAEK,kBAAkB,CAAC,QAAQ,EAAE,WAAW,EAAE,mBAiBzB,MAAM;IASvB,iBAAiB,CACrB,EAAC,MAAM,EAAE,OAAO,EAAC,EAAE,WAAW,EAC9B,EAAC,OAAO,EAAE,WAAW,EAAC,EAAE,IAAI,CAAC,qBAAqB,EAAE,SAAS,GAAG,aAAa,CAAC,mBAmBzD,MAAM;IAgE7B,oBAAoB,CAAC,KAAK,EAAE,IAAI,EAAE,IAsBlB,OAAO,MAAM;IAwB7B,sBAAsB,CAAC,KAAK,EAAE,IAAI,EAAE,IAmBpB,OAAO,MAAM;IAwB7B,eAAe,CAAC,KAAK,EAAE,IAAI,EAAE,IAmBb,OAAO,MAAM;IAiBvB,oBAAoB,CAAC,QAAQ,EAAE,WAAW,EAAE;IAsB5C,mBAAmB,CACvB,EAAC,MAAM,EAAE,OAAO,EAAC,EAAE,WAAW,EAC9B,EAAC,OAAO,EAAC,EAAE,IAAI,CAAC,qBAAqB,EAAE,SAAS,CAAC;IA2BnD,sBAAsB,CAAC,KAAK,EAAE,IAAI,EAAE;IAyBpC,wBAAwB,CAAC,KAAK,EAAE,IAAI,EAAE;IA2BtC,iBAAiB,CAAC,KAAK,EAAE,IAAI,EAAE;CAuBhC"}

package/dist/feeds/src/controller.js

@@ -1,4 +1,4 @@
-import { inc, removeNil, call, defer, memoize, omitVals, max, min, now, } from "@welshman/lib";
+import { inc, removeUndefined, call, defer, memoize, omitVals, max, min, now, } from "@welshman/lib";
 import { EPOCH, trimFilters, guessFilterDelta } from "@welshman/util";
 import { FeedType } from "./core.js";
 import { FeedCompiler } from "./compiler.js";
@@ -87,8 +87,9 @@ export class FeedController {
         let delta = initialDelta;
         let since = this.options.useWindowing ? maxUntil - delta : 0;
         let until = maxUntil;
+        let exhausted = false;
         return async (limit) => {
-            if (promise) {
+            if (promise || exhausted) {
                 return promise;
             }
             promise = defer();
@@ -120,6 +121,7 @@ export class FeedController {
             }));
             if (this.options.useWindowing) {
                 if (since === minSince) {
+                    exhausted = true;
                     onExhausted?.();
                 }
                 // Relays can't be relied upon to return events in descending order, do exponential
@@ -131,6 +133,7 @@ export class FeedController {
                 since = Math.max(minSince, until - delta);
             }
             else if (count === 0) {
+                exhausted = true;
                 onExhausted?.();
             }
             promise.resolve();
@@ -253,7 +256,7 @@ export class FeedController {
         }
         return () => {
             const controller = new AbortController();
-            const signal = AbortSignal.any(removeNil([controller.signal, this.options.signal]));
+            const signal = AbortSignal.any(removeUndefined([controller.signal, this.options.signal]));
             const requestFilters = filters.map((filter) => ({ ...filter, limit: 0 }));
             requestPage(omitVals([undefined], {
                 relays,

package/dist/feeds/src/controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../../feeds/src/controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../../feeds/src/controller.ts"],"names":[],"mappings":"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"}