@welshman/app 0.1.2 → 0.2.0

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

@@ -1,43 +1,7 @@
-export declare const unfollow: (value: string) => Promise<{
-    event: import("@welshman/util").TrustedEvent;
-    request: import("./thunk.js").ThunkRequest;
-    controller: AbortController;
-    result: import("@welshman/lib").Deferred<import("./thunk.js").ThunkStatusByUrl>;
-    status: import("svelte/store").Writable<import("./thunk.js").ThunkStatusByUrl>;
-}>;
-export declare const follow: (tag: string[]) => Promise<{
-    event: import("@welshman/util").TrustedEvent;
-    request: import("./thunk.js").ThunkRequest;
-    controller: AbortController;
-    result: import("@welshman/lib").Deferred<import("./thunk.js").ThunkStatusByUrl>;
-    status: import("svelte/store").Writable<import("./thunk.js").ThunkStatusByUrl>;
-}>;
-export declare const unmute: (value: string) => Promise<{
-    event: import("@welshman/util").TrustedEvent;
-    request: import("./thunk.js").ThunkRequest;
-    controller: AbortController;
-    result: import("@welshman/lib").Deferred<import("./thunk.js").ThunkStatusByUrl>;
-    status: import("svelte/store").Writable<import("./thunk.js").ThunkStatusByUrl>;
-}>;
-export declare const mute: (tag: string[]) => Promise<{
-    event: import("@welshman/util").TrustedEvent;
-    request: import("./thunk.js").ThunkRequest;
-    controller: AbortController;
-    result: import("@welshman/lib").Deferred<import("./thunk.js").ThunkStatusByUrl>;
-    status: import("svelte/store").Writable<import("./thunk.js").ThunkStatusByUrl>;
-}>;
-export declare const unpin: (value: string) => Promise<{
-    event: import("@welshman/util").TrustedEvent;
-    request: import("./thunk.js").ThunkRequest;
-    controller: AbortController;
-    result: import("@welshman/lib").Deferred<import("./thunk.js").ThunkStatusByUrl>;
-    status: import("svelte/store").Writable<import("./thunk.js").ThunkStatusByUrl>;
-}>;
-export declare const pin: (tag: string[]) => Promise<{
-    event: import("@welshman/util").TrustedEvent;
-    request: import("./thunk.js").ThunkRequest;
-    controller: AbortController;
-    result: import("@welshman/lib").Deferred<import("./thunk.js").ThunkStatusByUrl>;
-    status: import("svelte/store").Writable<import("./thunk.js").ThunkStatusByUrl>;
-}>;
+export declare const unfollow: (value: string) => Promise<import("./thunk.js").Thunk>;
+export declare const follow: (tag: string[]) => Promise<import("./thunk.js").Thunk>;
+export declare const unmute: (value: string) => Promise<import("./thunk.js").Thunk>;
+export declare const mute: (tag: string[]) => Promise<import("./thunk.js").Thunk>;
+export declare const unpin: (value: string) => Promise<import("./thunk.js").Thunk>;
+export declare const pin: (tag: string[]) => Promise<import("./thunk.js").Thunk>;
 //# sourceMappingURL=commands.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../src/commands.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,QAAQ,GAAU,OAAO,MAAM;;;;;;EAM3C,CAAA;AAED,eAAO,MAAM,MAAM,GAAU,KAAK,MAAM,EAAE;;;;;;EAMzC,CAAA;AAED,eAAO,MAAM,MAAM,GAAU,OAAO,MAAM;;;;;;EAMzC,CAAA;AAED,eAAO,MAAM,IAAI,GAAU,KAAK,MAAM,EAAE;;;;;;EAMvC,CAAA;AAED,eAAO,MAAM,KAAK,GAAU,OAAO,MAAM;;;;;;EAMxC,CAAA;AAED,eAAO,MAAM,GAAG,GAAU,KAAK,MAAM,EAAE;;;;;;EAMtC,CAAA"}
+{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../src/commands.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,QAAQ,GAAU,OAAO,MAAM,wCAM3C,CAAA;AAED,eAAO,MAAM,MAAM,GAAU,KAAK,MAAM,EAAE,wCAMzC,CAAA;AAED,eAAO,MAAM,MAAM,GAAU,OAAO,MAAM,wCAMzC,CAAA;AAED,eAAO,MAAM,IAAI,GAAU,KAAK,MAAM,EAAE,wCAMvC,CAAA;AAED,eAAO,MAAM,KAAK,GAAU,OAAO,MAAM,wCAMxC,CAAA;AAED,eAAO,MAAM,GAAG,GAAU,KAAK,MAAM,EAAE,wCAMtC,CAAA"}

package/dist/app/src/commands.js

@@ -1,9 +1,9 @@
 import { get } from "svelte/store";
 import { addToListPublicly, removeFromList, makeList, FOLLOWS, MUTES, PINS } from "@welshman/util";
+import { Router, addMaximalFallbacks } from "@welshman/router";
 import { userFollows, userMutes, userPins } from "./user.js";
 import { nip44EncryptToSelf } from "./session.js";
 import { publishThunk } from "./thunk.js";
-import { Router, addMaximalFallbacks } from "./router.js";
 export const unfollow = async (value) => {
     const list = get(userFollows) || makeList({ kind: FOLLOWS });
     const event = await removeFromList(list, value).reconcile(nip44EncryptToSelf);

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../src/core.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,UAAU,EAAE,UAAU,EAAC,MAAM,iBAAiB,CAAA;AACtD,OAAO,EAAO,OAAO,EAA4B,MAAM,eAAe,CAAA;AAItE,eAAO,MAAM,UAAU,mDAA4B,CAAA;AAEnD,eAAO,MAAM,KAAK,mDAA6B,CAAA;AAE/C,eAAO,MAAM,OAAO,SAAgB,CAAA;AAoBpC,eAAO,MAAM,mBAAmB,GAAI,kBAAqB;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAM,oGAiB9E,CAAA;AAEH,eAAO,MAAM,gBAAgB,GAAI,kBAAqB;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAM,0DAiB3E,CAAA"}
+{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../src/core.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,UAAU,EAAE,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAEtD,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAA;AAErC,eAAO,MAAM,UAAU,mDAAmB,CAAA;AAE1C,eAAO,MAAM,KAAK,mDAA6B,CAAA;AAE/C,eAAO,MAAM,OAAO,SAAgB,CAAA;AAIpC,eAAO,MAAM,mBAAmB,GAAI,kBAAqB;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAM,oGAiB9E,CAAA;AAEH,eAAO,MAAM,gBAAgB,GAAI,kBAAqB;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAM,0DAiB3E,CAAA"}

package/dist/app/src/core.js

@@ -1,25 +1,10 @@
 import { throttle } from "@welshman/lib";
-import { verifyEvent, isEphemeralKind, isDVMKind } from "@welshman/util";
 import { Repository, LocalRelay } from "@welshman/relay";
-import { Pool, Tracker, SocketEvent, isRelayEvent } from "@welshman/net";
 import { custom } from "@welshman/store";
-import { loadRelay, trackRelayStats } from "./relays.js";
-export const repository = Repository.getSingleton();
+import { Tracker } from "@welshman/net";
+export const repository = Repository.get();
 export const relay = new LocalRelay(repository);
 export const tracker = new Tracker();
-Pool.getSingleton().subscribe(socket => {
-    loadRelay(socket.url);
-    trackRelayStats(socket);
-    socket.on(SocketEvent.Receive, message => {
-        if (isRelayEvent(message)) {
-            const event = message[2];
-            if (!isEphemeralKind(event.kind) && !isDVMKind(event.kind) && verifyEvent(event)) {
-                tracker.track(event.id, socket.url);
-                repository.publish(event);
-            }
-        }
-    });
-});
 // Adapt above objects to stores
 export const makeRepositoryStore = ({ throttle: t = 300 } = {}) => custom(setter => {
     let onUpdate = () => setter(repository);

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

@@ -1 +1 @@
-{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../src/core.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../src/core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAA;AACtC,OAAO,EAAC,UAAU,EAAE,UAAU,EAAC,MAAM,iBAAiB,CAAA;AACtD,OAAO,EAAC,MAAM,EAAC,MAAM,iBAAiB,CAAA;AACtC,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAA;AAErC,MAAM,CAAC,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,EAAE,CAAA;AAE1C,MAAM,CAAC,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,UAAU,CAAC,CAAA;AAE/C,MAAM,CAAC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAA;AAEpC,gCAAgC;AAEhC,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,EAAC,QAAQ,EAAE,CAAC,GAAG,GAAG,KAAyB,EAAE,EAAE,EAAE,CACnF,MAAM,CACJ,MAAM,CAAC,EAAE;IACP,IAAI,QAAQ,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IAEvC,IAAI,CAAC,EAAE,CAAC;QACN,QAAQ,GAAG,QAAQ,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA;IAClC,CAAC;IAED,QAAQ,EAAE,CAAA;IACV,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;IAEjC,OAAO,GAAG,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;AACjD,CAAC,EACD;IACE,GAAG,EAAE,CAAC,KAAiB,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;CAC1D,CACF,CAAA;AAEH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,EAAC,QAAQ,EAAE,CAAC,GAAG,GAAG,KAAyB,EAAE,EAAE,EAAE,CAChF,MAAM,CACJ,MAAM,CAAC,EAAE;IACP,IAAI,QAAQ,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IAEpC,IAAI,CAAC,EAAE,CAAC;QACN,QAAQ,GAAG,QAAQ,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA;IAClC,CAAC;IAED,QAAQ,EAAE,CAAA;IACV,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;IAE9B,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;AAC9C,CAAC,EACD;IACE,GAAG,EAAE,CAAC,KAAc,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;CACxD,CACF,CAAA"}

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

@@ -1,11 +1,9 @@
-import { FeedController, RequestOpts, FeedOptions, DVMOpts, Feed } from "@welshman/feeds";
-export declare const request: ({ filters, relays, onEvent }: RequestOpts) => Promise<void>;
-export declare const requestDVM: ({ kind, onEvent, ...request }: DVMOpts) => Promise<void>;
+import { FeedController, FeedControllerOptions, Feed } from "@welshman/feeds";
 export declare const getPubkeysForScope: (scope: string) => string[];
 export declare const getPubkeysForWOTRange: (min: number, max: number) => string[];
-type _FeedOptions = Partial<Omit<FeedOptions, "feed">> & {
+type MakeFeedControllerOptions = Partial<Omit<FeedControllerOptions, "feed">> & {
     feed: Feed;
 };
-export declare const createFeedController: (options: _FeedOptions) => FeedController;
+export declare const makeFeedController: (options: MakeFeedControllerOptions) => FeedController;
 export {};
 //# sourceMappingURL=feeds.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"feeds.d.ts","sourceRoot":"","sources":["../../../src/feeds.ts"],"names":[],"mappings":"AAGA,OAAO,EAAQ,cAAc,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAC,MAAM,iBAAiB,CAAA;AAQ9F,eAAO,MAAM,OAAO,GAAU,8BAAwC,WAAW,kBAWhF,CAAA;AAED,eAAO,MAAM,UAAU,GAAU,+BAA6B,OAAO,kBAwCpE,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,OAAO,MAAM,aAmB/C,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAI,KAAK,MAAM,EAAE,KAAK,MAAM,aAY7D,CAAA;AAED,KAAK,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,GAAG;IAAC,IAAI,EAAE,IAAI,CAAA;CAAC,CAAA;AAErE,eAAO,MAAM,oBAAoB,GAAI,SAAS,YAAY,mBAOtD,CAAA"}
+{"version":3,"file":"feeds.d.ts","sourceRoot":"","sources":["../../../src/feeds.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,cAAc,EAAE,qBAAqB,EAAE,IAAI,EAAC,MAAM,iBAAiB,CAAA;AAKlF,eAAO,MAAM,kBAAkB,GAAI,OAAO,MAAM,aAmB/C,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAI,KAAK,MAAM,EAAE,KAAK,MAAM,aAY7D,CAAA;AAED,KAAK,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC,GAAG;IAAC,IAAI,EAAE,IAAI,CAAA;CAAC,CAAA;AAE5F,eAAO,MAAM,kBAAkB,GAAI,SAAS,yBAAyB,mBAOjE,CAAA"}

package/dist/app/src/feeds.js

@@ -1,58 +1,7 @@
-import { nthEq, now } from "@welshman/lib";
-import { createEvent, getPubkeyTagValues } from "@welshman/util";
-import { MultiRequest, RequestEvent } from "@welshman/net";
 import { Scope, FeedController } from "@welshman/feeds";
-import { makeDvmRequest, DVMEvent } from "@welshman/dvm";
-import { makeSecret, Nip01Signer } from "@welshman/signer";
 import { pubkey, signer } from "./session.js";
-import { Router, addMinimalFallbacks, getFilterSelections } from "./router.js";
-import { loadRelaySelections } from "./relaySelections.js";
 import { wotGraph, maxWot, getFollows, getNetwork, getFollowers } from "./wot.js";
-export const request = async ({ filters = [{}], relays = [], onEvent }) => {
-    if (relays.length > 0) {
-        await new Promise(resolve => {
-            const sub = new MultiRequest({ filters, relays, timeout: 5000, autoClose: true });
-            sub.on(RequestEvent.Event, onEvent);
-            sub.on(RequestEvent.Close, resolve);
-        });
-    }
-    else {
-        await Promise.all(getFilterSelections(filters).map(opts => request({ ...opts, onEvent })));
-    }
-};
-export const requestDVM = async ({ kind, onEvent, ...request }) => {
-    // Make sure we know what relays to use for target dvms
-    if (request.tags && !request.relays) {
-        for (const pubkey of getPubkeyTagValues(request.tags)) {
-            await loadRelaySelections(pubkey);
-        }
-    }
-    const tags = request.tags || [];
-    const $signer = signer.get() || new Nip01Signer(makeSecret());
-    const pubkey = await $signer.getPubkey();
-    const relays = request.relays ||
-        Router.get().FromPubkeys(getPubkeyTagValues(tags)).policy(addMinimalFallbacks).getUrls();
-    if (!tags.some(nthEq(0, "expiration"))) {
-        tags.push(["expiration", String(now() + 60)]);
-    }
-    if (!tags.some(nthEq(0, "relays"))) {
-        tags.push(["relays", ...relays]);
-    }
-    if (!tags.some(nthEq(1, "user"))) {
-        tags.push(["param", "user", pubkey]);
-    }
-    if (!tags.some(nthEq(1, "max_results"))) {
-        tags.push(["param", "max_results", "200"]);
-    }
-    const event = await $signer.sign(createEvent(kind, { tags }));
-    const req = makeDvmRequest({ event, relays });
-    await new Promise(resolve => {
-        req.emitter.on(DVMEvent.Result, (url, event) => {
-            onEvent(event);
-            resolve();
-        });
-    });
-};
+import { repository } from "./core.js";
 export const getPubkeysForScope = (scope) => {
     const $pubkey = pubkey.get();
     if (!$pubkey) {
@@ -82,11 +31,11 @@ export const getPubkeysForWOTRange = (min, max) => {
     }
     return pubkeys;
 };
-export const createFeedController = (options) => new FeedController({
-    request,
-    requestDVM,
+export const makeFeedController = (options) => new FeedController({
+    repository,
     getPubkeysForScope,
     getPubkeysForWOTRange,
+    signer: signer.get(),
     ...options,
 });
 //# sourceMappingURL=feeds.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"feeds.js","sourceRoot":"","sources":["../../../src/feeds.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"feeds.js","sourceRoot":"","sources":["../../../src/feeds.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAE,cAAc,EAA8B,MAAM,iBAAiB,CAAA;AAClF,OAAO,EAAC,MAAM,EAAE,MAAM,EAAC,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAC,MAAM,UAAU,CAAA;AAC/E,OAAO,EAAC,UAAU,EAAC,MAAM,WAAW,CAAA;AAEpC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,KAAa,EAAE,EAAE;IAClD,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,EAAE,CAAA;IAE5B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,CAAA;IACX,CAAC;IAED,QAAQ,KAAK,EAAE,CAAC;QACd,KAAK,KAAK,CAAC,IAAI;YACb,OAAO,CAAC,OAAO,CAAC,CAAA;QAClB,KAAK,KAAK,CAAC,OAAO;YAChB,OAAO,UAAU,CAAC,OAAO,CAAC,CAAA;QAC5B,KAAK,KAAK,CAAC,OAAO;YAChB,OAAO,UAAU,CAAC,OAAO,CAAC,CAAA;QAC5B,KAAK,KAAK,CAAC,SAAS;YAClB,OAAO,YAAY,CAAC,OAAO,CAAC,CAAA;QAC9B;YACE,OAAO,EAAE,CAAA;IACb,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,GAAW,EAAE,GAAW,EAAE,EAAE;IAChE,MAAM,OAAO,GAAG,EAAE,CAAA;IAClB,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,EAAE,GAAG,GAAG,CAAA;IACvC,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,EAAE,GAAG,GAAG,CAAA;IAEvC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC;QACpD,IAAI,KAAK,IAAI,YAAY,IAAI,KAAK,IAAI,YAAY,EAAE,CAAC;YACnD,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACnB,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAID,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,OAAkC,EAAE,EAAE,CACvE,IAAI,cAAc,CAAC;IACjB,UAAU;IACV,kBAAkB;IAClB,qBAAqB;IACrB,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE;IACpB,GAAG,OAAO;CACX,CAAC,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"follows.d.ts","sourceRoot":"","sources":["../../../src/follows.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,aAAa,EAAC,MAAM,gBAAgB,CAAA;AAM1D,eAAO,MAAM,OAAO,+DAIlB,CAAA;AAEF,eAAO,MACO,eAAe,4EACf,aAAa,8GACf,WAAW,wEAOrB,CAAA"}
+{"version":3,"file":"follows.d.ts","sourceRoot":"","sources":["../../../src/follows.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,aAAa,EAAC,MAAM,gBAAgB,CAAA;AAK1D,eAAO,MAAM,OAAO,+DAIlB,CAAA;AAEF,eAAO,MACO,eAAe,4EACf,aAAa,8GACf,WAAW,wEAMrB,CAAA"}

package/dist/app/src/follows.js

@@ -1,8 +1,7 @@
 import { FOLLOWS, asDecryptedEvent, readList } from "@welshman/util";
-import { deriveEventsMapped } from "@welshman/store";
+import { deriveEventsMapped, collection } from "@welshman/store";
 import { repository } from "./core.js";
-import { collection } from "./collection.js";
-import { loadWithAsapMetaRelayUrls } from "./relaySelections.js";
+import { makeOutboxLoader } from "./relaySelections.js";
 export const follows = deriveEventsMapped(repository, {
     filters: [{ kinds: [FOLLOWS] }],
     itemToEvent: item => item.event,
@@ -12,6 +11,6 @@ export const { indexStore: followsByPubkey, deriveItem: deriveFollows, loadItem:
     name: "follows",
     store: follows,
     getKey: follows => follows.event.pubkey,
-    load: (pubkey, relays) => loadWithAsapMetaRelayUrls(pubkey, relays, [{ kinds: [FOLLOWS], authors: [pubkey] }]),
+    load: makeOutboxLoader(FOLLOWS),
 });
 //# sourceMappingURL=follows.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"follows.js","sourceRoot":"","sources":["../../../src/follows.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAC,MAAM,gBAAgB,CAAA;AAElE,OAAO,EAAC,kBAAkB,EAAC,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,WAAW,CAAA;AACpC,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAC,yBAAyB,EAAC,MAAM,sBAAsB,CAAA;AAE9D,MAAM,CAAC,MAAM,OAAO,GAAG,kBAAkB,CAAgB,UAAU,EAAE;IACnE,OAAO,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,OAAO,CAAC,EAAC,CAAC;IAC7B,WAAW,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK;IAC/B,WAAW,EAAE,CAAC,KAAmB,EAAE,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;CACxE,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,EACX,UAAU,EAAE,eAAe,EAC3B,UAAU,EAAE,aAAa,EACzB,QAAQ,EAAE,WAAW,GACtB,GAAG,UAAU,CAAC;IACb,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM;IACvC,IAAI,EAAE,CAAC,MAAc,EAAE,MAAgB,EAAE,EAAE,CACzC,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAC,CAAC,CAAC;CACrF,CAAC,CAAA"}
+{"version":3,"file":"follows.js","sourceRoot":"","sources":["../../../src/follows.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAC,MAAM,gBAAgB,CAAA;AAElE,OAAO,EAAC,kBAAkB,EAAE,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAC9D,OAAO,EAAC,UAAU,EAAC,MAAM,WAAW,CAAA;AACpC,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAA;AAErD,MAAM,CAAC,MAAM,OAAO,GAAG,kBAAkB,CAAgB,UAAU,EAAE;IACnE,OAAO,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,OAAO,CAAC,EAAC,CAAC;IAC7B,WAAW,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK;IAC/B,WAAW,EAAE,CAAC,KAAmB,EAAE,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;CACxE,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,EACX,UAAU,EAAE,eAAe,EAC3B,UAAU,EAAE,aAAa,EACzB,QAAQ,EAAE,WAAW,GACtB,GAAG,UAAU,CAAC;IACb,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM;IACvC,IAAI,EAAE,gBAAgB,CAAC,OAAO,CAAC;CAChC,CAAC,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"handles.d.ts","sourceRoot":"","sources":["../../../src/handles.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,MAAM,GAAG;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,WAAW,QAA4C,CAAA;AAEpE,wBAAsB,YAAY,CAAC,KAAK,EAAE,MAAM;;;;;eA6B/C;AAED,eAAO,MAAM,OAAO,2CAAyB,CAAA;AAE7C,eAAO,MAAM,YAAY,GAAU,QAAQ,MAAM,EAAE,iCA6BlD,CAAA;AAED,eAAO,MACO,cAAc,qEACd,YAAY,uGACd,UAAU,mEACZ,QAAQ,+DAqBhB,CAAA;AAEF,eAAO,MAAM,qBAAqB,GAAI,QAAQ,MAAM,EAAE,SAAQ,MAAM,EAAO,wDASvE,CAAA;AAEJ,eAAO,MAAM,YAAY,GAAI,OAAO,MAAM,WACgB,CAAA;AAE1D,eAAO,MAAM,aAAa,GAAI,QAAQ,MAAM,WAA+B,CAAA"}
+{"version":3,"file":"handles.d.ts","sourceRoot":"","sources":["../../../src/handles.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,MAAM,GAAG;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,WAAW,QAA4C,CAAA;AAEpE,wBAAsB,YAAY,CAAC,KAAK,EAAE,MAAM;;;;;eA6B/C;AAED,eAAO,MAAM,OAAO,2CAAyB,CAAA;AAE7C,eAAO,MAAM,YAAY,GAAU,QAAQ,MAAM,EAAE,iCA+BlD,CAAA;AAED,eAAO,MACO,cAAc,qEACd,YAAY,uGACd,UAAU,mEACZ,QAAQ,+DAqBhB,CAAA;AAEF,eAAO,MAAM,qBAAqB,GAAI,QAAQ,MAAM,EAAE,SAAQ,MAAM,EAAO,wDASvE,CAAA;AAEJ,eAAO,MAAM,YAAY,GAAI,OAAO,MAAM,WACgB,CAAA;AAE1D,eAAO,MAAM,aAAa,GAAI,QAAQ,MAAM,WAA+B,CAAA"}

package/dist/app/src/handles.js

@@ -1,6 +1,6 @@
 import { writable, derived } from "svelte/store";
 import { tryCatch, fetchJson, uniq, batcher, postJson, last } from "@welshman/lib";
-import { collection } from "./collection.js";
+import { collection } from "@welshman/store";
 import { deriveProfile } from "./profiles.js";
 import { appContext } from "./context.js";
 export const NIP05_REGEX = /^(?:([\w.+-]+)@)?([\w_-]+(\.[\w_-]+)+)$/;
@@ -34,7 +34,9 @@ export const fetchHandles = async (nip05s) => {
     if (base) {
         const res = await tryCatch(async () => await postJson(`${base}/handle/info`, { handles: nip05s }));
         for (const { handle: nip05, info } of res?.data || []) {
-            handlesByNip05.set(nip05, info);
+            if (info) {
+                handlesByNip05.set(nip05, info);
+            }
         }
     }
     else {

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

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

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

@@ -1,10 +1,7 @@
-export * from "./adapters.js";
 export * from "./context.js";
 export * from "./core.js";
-export * from "./collection.js";
 export * from "./commands.js";
 export * from "./feeds.js";
-export * from "./freshness.js";
 export * from "./follows.js";
 export * from "./handles.js";
 export * from "./mutes.js";
@@ -13,10 +10,10 @@ export * from "./profiles.js";
 export * from "./pins.js";
 export * from "./relays.js";
 export * from "./relaySelections.js";
-export * from "./router.js";
 export * from "./search.js";
 export * from "./session.js";
 export * from "./storage.js";
+export * from "./storageAdapters.js";
 export * from "./sync.js";
 export * from "./tags.js";
 export * from "./thunk.js";

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA;AACzB,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA;AAC7B,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA;AAC5B,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA;AAC7B,cAAc,WAAW,CAAA;AACzB,cAAc,aAAa,CAAA;AAC3B,cAAc,sBAAsB,CAAA;AACpC,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA;AACzB,cAAc,eAAe,CAAA;AAC7B,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA;AAC5B,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA;AAC7B,cAAc,WAAW,CAAA;AACzB,cAAc,aAAa,CAAA;AAC3B,cAAc,sBAAsB,CAAA;AACpC,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA;AAC5B,cAAc,sBAAsB,CAAA;AACpC,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,cAAc,CAAA"}

package/dist/app/src/index.js

@@ -1,10 +1,7 @@
-export * from "./adapters.js";
 export * from "./context.js";
 export * from "./core.js";
-export * from "./collection.js";
 export * from "./commands.js";
 export * from "./feeds.js";
-export * from "./freshness.js";
 export * from "./follows.js";
 export * from "./handles.js";
 export * from "./mutes.js";
@@ -13,10 +10,10 @@ export * from "./profiles.js";
 export * from "./pins.js";
 export * from "./relays.js";
 export * from "./relaySelections.js";
-export * from "./router.js";
 export * from "./search.js";
 export * from "./session.js";
 export * from "./storage.js";
+export * from "./storageAdapters.js";
 export * from "./sync.js";
 export * from "./tags.js";
 export * from "./thunk.js";
@@ -25,4 +22,42 @@ export * from "./user.js";
 export * from "./util.js";
 export * from "./wot.js";
 export * from "./zappers.js";
+import { sortBy, throttleWithValue, tryCatch } from "@welshman/lib";
+import { verifyEvent, isEphemeralKind, isDVMKind } from "@welshman/util";
+import { routerContext } from "@welshman/router";
+import { Pool, SocketEvent, isRelayEvent } from "@welshman/net";
+import { pubkey } from "./session.js";
+import { repository, tracker } from "./core.js";
+import { getPubkeyRelays } from "./relaySelections.js";
+import { relays, loadRelay, trackRelayStats, getRelayQuality } from "./relays.js";
+// Sync relays with our database
+Pool.get().subscribe(socket => {
+    loadRelay(socket.url);
+    trackRelayStats(socket);
+    socket.on(SocketEvent.Receive, message => {
+        if (isRelayEvent(message)) {
+            const event = message[2];
+            if (!isEphemeralKind(event.kind) && !isDVMKind(event.kind) && verifyEvent(event)) {
+                tracker.track(event.id, socket.url);
+                repository.publish(event);
+            }
+        }
+    });
+});
+// Configure the router
+const _relayGetter = (fn) => throttleWithValue(200, () => {
+    let _relays = relays.get();
+    if (fn) {
+        _relays = _relays.filter(fn);
+    }
+    return sortBy(r => -getRelayQuality(r.url), _relays)
+        .slice(0, 5)
+        .map(r => r.url);
+});
+routerContext.getUserPubkey = () => pubkey.get();
+routerContext.getPubkeyRelays = getPubkeyRelays;
+routerContext.getRelayQuality = getRelayQuality;
+routerContext.getDefaultRelays = _relayGetter();
+routerContext.getIndexerRelays = _relayGetter();
+routerContext.getSearchRelays = _relayGetter(r => tryCatch(() => r.profile?.supported_nips?.includes(50)));
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA;AACzB,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA;AAC7B,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA;AAC5B,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA;AAC7B,cAAc,WAAW,CAAA;AACzB,cAAc,aAAa,CAAA;AAC3B,cAAc,sBAAsB,CAAA;AACpC,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"mutes.d.ts","sourceRoot":"","sources":["../../../src/mutes.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,aAAa,EAAC,MAAM,gBAAgB,CAAA;AAO1D,eAAO,MAAM,KAAK,+DAShB,CAAA;AAEF,eAAO,MACO,aAAa,4EACb,WAAW,8GACb,SAAS,wEAOnB,CAAA"}
+{"version":3,"file":"mutes.d.ts","sourceRoot":"","sources":["../../../src/mutes.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,aAAa,EAAC,MAAM,gBAAgB,CAAA;AAM1D,eAAO,MAAM,KAAK,+DAShB,CAAA;AAEF,eAAO,MACO,aAAa,4EACb,WAAW,8GACb,SAAS,wEAMnB,CAAA"}

package/dist/app/src/mutes.js

@@ -1,9 +1,8 @@
 import { MUTES, asDecryptedEvent, readList } from "@welshman/util";
-import { deriveEventsMapped } from "@welshman/store";
+import { deriveEventsMapped, collection } from "@welshman/store";
 import { repository } from "./core.js";
-import { collection } from "./collection.js";
 import { ensurePlaintext } from "./plaintext.js";
-import { loadWithAsapMetaRelayUrls } from "./relaySelections.js";
+import { makeOutboxLoader } from "./relaySelections.js";
 export const mutes = deriveEventsMapped(repository, {
     filters: [{ kinds: [MUTES] }],
     itemToEvent: item => item.event,
@@ -15,6 +14,6 @@ export const { indexStore: mutesByPubkey, deriveItem: deriveMutes, loadItem: loa
     name: "mutes",
     store: mutes,
     getKey: mute => mute.event.pubkey,
-    load: (pubkey, relays) => loadWithAsapMetaRelayUrls(pubkey, relays, [{ kinds: [MUTES], authors: [pubkey] }]),
+    load: makeOutboxLoader(MUTES),
 });
 //# sourceMappingURL=mutes.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"mutes.js","sourceRoot":"","sources":["../../../src/mutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAC,MAAM,gBAAgB,CAAA;AAEhE,OAAO,EAAC,kBAAkB,EAAC,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,WAAW,CAAA;AACpC,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAC,eAAe,EAAC,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAC,yBAAyB,EAAC,MAAM,sBAAsB,CAAA;AAE9D,MAAM,CAAC,MAAM,KAAK,GAAG,kBAAkB,CAAgB,UAAU,EAAE;IACjE,OAAO,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,KAAK,CAAC,EAAC,CAAC;IAC3B,WAAW,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK;IAC/B,WAAW,EAAE,KAAK,EAAE,KAAmB,EAAE,EAAE,CACzC,QAAQ,CACN,gBAAgB,CAAC,KAAK,EAAE;QACtB,OAAO,EAAE,MAAM,eAAe,CAAC,KAAK,CAAC;KACtC,CAAC,CACH;CACJ,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,EACX,UAAU,EAAE,aAAa,EACzB,UAAU,EAAE,WAAW,EACvB,QAAQ,EAAE,SAAS,GACpB,GAAG,UAAU,CAAC;IACb,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,KAAK;IACZ,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM;IACjC,IAAI,EAAE,CAAC,MAAc,EAAE,MAAgB,EAAE,EAAE,CACzC,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAC,CAAC,CAAC;CACnF,CAAC,CAAA"}
+{"version":3,"file":"mutes.js","sourceRoot":"","sources":["../../../src/mutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAC,MAAM,gBAAgB,CAAA;AAEhE,OAAO,EAAC,kBAAkB,EAAE,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAC9D,OAAO,EAAC,UAAU,EAAC,MAAM,WAAW,CAAA;AACpC,OAAO,EAAC,eAAe,EAAC,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAA;AAErD,MAAM,CAAC,MAAM,KAAK,GAAG,kBAAkB,CAAgB,UAAU,EAAE;IACjE,OAAO,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,KAAK,CAAC,EAAC,CAAC;IAC3B,WAAW,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK;IAC/B,WAAW,EAAE,KAAK,EAAE,KAAmB,EAAE,EAAE,CACzC,QAAQ,CACN,gBAAgB,CAAC,KAAK,EAAE;QACtB,OAAO,EAAE,MAAM,eAAe,CAAC,KAAK,CAAC;KACtC,CAAC,CACH;CACJ,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,EACX,UAAU,EAAE,aAAa,EACzB,UAAU,EAAE,WAAW,EACvB,QAAQ,EAAE,SAAS,GACpB,GAAG,UAAU,CAAC;IACb,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,KAAK;IACZ,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM;IACjC,IAAI,EAAE,gBAAgB,CAAC,KAAK,CAAC;CAC9B,CAAC,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"pins.d.ts","sourceRoot":"","sources":["../../../src/pins.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,aAAa,EAAC,MAAM,gBAAgB,CAAA;AAM1D,eAAO,MAAM,IAAI,+DAIf,CAAA;AAEF,eAAO,MACO,YAAY,4EACZ,UAAU,8GACZ,QAAQ,wEAOlB,CAAA"}
+{"version":3,"file":"pins.d.ts","sourceRoot":"","sources":["../../../src/pins.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,aAAa,EAAC,MAAM,gBAAgB,CAAA;AAK1D,eAAO,MAAM,IAAI,+DAIf,CAAA;AAEF,eAAO,MACO,YAAY,4EACZ,UAAU,8GACZ,QAAQ,wEAMlB,CAAA"}

package/dist/app/src/pins.js

@@ -1,8 +1,7 @@
 import { PINS, asDecryptedEvent, readList } from "@welshman/util";
-import { deriveEventsMapped } from "@welshman/store";
+import { deriveEventsMapped, collection } from "@welshman/store";
 import { repository } from "./core.js";
-import { collection } from "./collection.js";
-import { loadWithAsapMetaRelayUrls } from "./relaySelections.js";
+import { makeOutboxLoader } from "./relaySelections.js";
 export const pins = deriveEventsMapped(repository, {
     filters: [{ kinds: [PINS] }],
     itemToEvent: item => item.event,
@@ -12,6 +11,6 @@ export const { indexStore: pinsByPubkey, deriveItem: derivePins, loadItem: loadP
     name: "pins",
     store: pins,
     getKey: pins => pins.event.pubkey,
-    load: (pubkey, relays) => loadWithAsapMetaRelayUrls(pubkey, relays, [{ kinds: [PINS], authors: [pubkey] }]),
+    load: makeOutboxLoader(PINS),
 });
 //# sourceMappingURL=pins.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"pins.js","sourceRoot":"","sources":["../../../src/pins.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,gBAAgB,EAAE,QAAQ,EAAC,MAAM,gBAAgB,CAAA;AAE/D,OAAO,EAAC,kBAAkB,EAAC,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,WAAW,CAAA;AACpC,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAC,yBAAyB,EAAC,MAAM,sBAAsB,CAAA;AAE9D,MAAM,CAAC,MAAM,IAAI,GAAG,kBAAkB,CAAgB,UAAU,EAAE;IAChE,OAAO,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,IAAI,CAAC,EAAC,CAAC;IAC1B,WAAW,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK;IAC/B,WAAW,EAAE,CAAC,KAAmB,EAAE,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;CACxE,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,EACX,UAAU,EAAE,YAAY,EACxB,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,QAAQ,GACnB,GAAG,UAAU,CAAC;IACb,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM;IACjC,IAAI,EAAE,CAAC,MAAc,EAAE,MAAgB,EAAE,EAAE,CACzC,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAC,CAAC,CAAC;CAClF,CAAC,CAAA"}
+{"version":3,"file":"pins.js","sourceRoot":"","sources":["../../../src/pins.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,gBAAgB,EAAE,QAAQ,EAAC,MAAM,gBAAgB,CAAA;AAE/D,OAAO,EAAC,kBAAkB,EAAE,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAC9D,OAAO,EAAC,UAAU,EAAC,MAAM,WAAW,CAAA;AACpC,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAA;AAErD,MAAM,CAAC,MAAM,IAAI,GAAG,kBAAkB,CAAgB,UAAU,EAAE;IAChE,OAAO,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,IAAI,CAAC,EAAC,CAAC;IAC1B,WAAW,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK;IAC/B,WAAW,EAAE,CAAC,KAAmB,EAAE,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;CACxE,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,EACX,UAAU,EAAE,YAAY,EACxB,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,QAAQ,GACnB,GAAG,UAAU,CAAC;IACb,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM;IACjC,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC;CAC7B,CAAC,CAAA"}

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

@@ -2,5 +2,5 @@ import { PublishedProfile } from "@welshman/util";
 export declare const profiles: import("@welshman/store").WritableWithGetter<PublishedProfile[]>;
 export declare const profilesByPubkey: import("@welshman/store").ReadableWithGetter<Map<string, PublishedProfile>>, deriveProfile: (key: string | undefined, relays?: string[]) => import("svelte/store").Readable<PublishedProfile | undefined>, loadProfile: (key: string, relays?: string[]) => Promise<PublishedProfile | undefined>;
 export declare const displayProfileByPubkey: (pubkey: string | undefined) => string;
-export declare const deriveProfileDisplay: (pubkey: string | undefined) => import("svelte/store").Readable<string>;
+export declare const deriveProfileDisplay: (pubkey: string | undefined, relays?: string[]) => import("svelte/store").Readable<string>;
 //# sourceMappingURL=profiles.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"profiles.d.ts","sourceRoot":"","sources":["../../../src/profiles.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,gBAAgB,EAAC,MAAM,gBAAgB,CAAA;AAM/C,eAAO,MAAM,QAAQ,kEAMpB,CAAA;AAED,eAAO,MACO,gBAAgB,+EAChB,aAAa,iHACf,WAAW,2EAOrB,CAAA;AAEF,eAAO,MAAM,sBAAsB,GAAI,QAAQ,MAAM,GAAG,SAAS,WACwB,CAAA;AAEzF,eAAO,MAAM,oBAAoB,GAAI,QAAQ,MAAM,GAAG,SAAS,4CAG7C,CAAA"}
+{"version":3,"file":"profiles.d.ts","sourceRoot":"","sources":["../../../src/profiles.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,gBAAgB,EAAC,MAAM,gBAAgB,CAAA;AAK/C,eAAO,MAAM,QAAQ,kEAMpB,CAAA;AAED,eAAO,MACO,gBAAgB,+EAChB,aAAa,iHACf,WAAW,2EAMrB,CAAA;AAEF,eAAO,MAAM,sBAAsB,GAAI,QAAQ,MAAM,GAAG,SAAS,WACwB,CAAA;AAEzF,eAAO,MAAM,oBAAoB,GAAI,QAAQ,MAAM,GAAG,SAAS,EAAE,SAAQ,MAAM,EAAO,4CAKpE,CAAA"}

package/dist/app/src/profiles.js

@@ -1,9 +1,8 @@
 import { derived, readable } from "svelte/store";
 import { readProfile, displayProfile, displayPubkey, PROFILE } from "@welshman/util";
-import { deriveEventsMapped, withGetter } from "@welshman/store";
+import { deriveEventsMapped, collection, withGetter } from "@welshman/store";
 import { repository } from "./core.js";
-import { collection } from "./collection.js";
-import { loadWithAsapMetaRelayUrls } from "./relaySelections.js";
+import { makeOutboxLoader } from "./relaySelections.js";
 export const profiles = withGetter(deriveEventsMapped(repository, {
     filters: [{ kinds: [PROFILE] }],
     eventToItem: readProfile,
@@ -13,10 +12,10 @@ export const { indexStore: profilesByPubkey, deriveItem: deriveProfile, loadItem
     name: "profiles",
     store: profiles,
     getKey: profile => profile.event.pubkey,
-    load: (pubkey, relays) => loadWithAsapMetaRelayUrls(pubkey, relays, [{ kinds: [PROFILE], authors: [pubkey] }]),
+    load: makeOutboxLoader(PROFILE),
 });
 export const displayProfileByPubkey = (pubkey) => pubkey ? displayProfile(profilesByPubkey.get().get(pubkey), displayPubkey(pubkey)) : "";
-export const deriveProfileDisplay = (pubkey) => pubkey
-    ? derived(deriveProfile(pubkey), $profile => displayProfile($profile, displayPubkey(pubkey)))
+export const deriveProfileDisplay = (pubkey, relays = []) => pubkey
+    ? derived(deriveProfile(pubkey, relays), $profile => displayProfile($profile, displayPubkey(pubkey)))
     : readable("");
 //# sourceMappingURL=profiles.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"profiles.js","sourceRoot":"","sources":["../../../src/profiles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAC,WAAW,EAAE,cAAc,EAAE,aAAa,EAAE,OAAO,EAAC,MAAM,gBAAgB,CAAA;AAElF,OAAO,EAAC,kBAAkB,EAAE,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAC9D,OAAO,EAAC,UAAU,EAAC,MAAM,WAAW,CAAA;AACpC,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAC,yBAAyB,EAAC,MAAM,sBAAsB,CAAA;AAE9D,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAChC,kBAAkB,CAAmB,UAAU,EAAE;IAC/C,OAAO,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,OAAO,CAAC,EAAC,CAAC;IAC7B,WAAW,EAAE,WAAW;IACxB,WAAW,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK;CAChC,CAAC,CACH,CAAA;AAED,MAAM,CAAC,MAAM,EACX,UAAU,EAAE,gBAAgB,EAC5B,UAAU,EAAE,aAAa,EACzB,QAAQ,EAAE,WAAW,GACtB,GAAG,UAAU,CAAC;IACb,IAAI,EAAE,UAAU;IAChB,KAAK,EAAE,QAAQ;IACf,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM;IACvC,IAAI,EAAE,CAAC,MAAc,EAAE,MAAgB,EAAE,EAAE,CACzC,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAC,CAAC,CAAC;CACrF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,MAA0B,EAAE,EAAE,CACnE,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;AAEzF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,MAA0B,EAAE,EAAE,CACjE,MAAM;IACJ,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,EAAE,CAAC,cAAc,CAAC,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;IAC7F,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA"}
+{"version":3,"file":"profiles.js","sourceRoot":"","sources":["../../../src/profiles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAC,WAAW,EAAE,cAAc,EAAE,aAAa,EAAE,OAAO,EAAC,MAAM,gBAAgB,CAAA;AAElF,OAAO,EAAC,kBAAkB,EAAE,UAAU,EAAE,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAC1E,OAAO,EAAC,UAAU,EAAC,MAAM,WAAW,CAAA;AACpC,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAA;AAErD,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAChC,kBAAkB,CAAmB,UAAU,EAAE;IAC/C,OAAO,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,OAAO,CAAC,EAAC,CAAC;IAC7B,WAAW,EAAE,WAAW;IACxB,WAAW,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK;CAChC,CAAC,CACH,CAAA;AAED,MAAM,CAAC,MAAM,EACX,UAAU,EAAE,gBAAgB,EAC5B,UAAU,EAAE,aAAa,EACzB,QAAQ,EAAE,WAAW,GACtB,GAAG,UAAU,CAAC;IACb,IAAI,EAAE,UAAU;IAChB,KAAK,EAAE,QAAQ;IACf,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM;IACvC,IAAI,EAAE,gBAAgB,CAAC,OAAO,CAAC;CAChC,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,MAA0B,EAAE,EAAE,CACnE,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;AAEzF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,MAA0B,EAAE,SAAmB,EAAE,EAAE,EAAE,CACxF,MAAM;IACJ,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC,EAAE,CAChD,cAAc,CAAC,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAChD;IACH,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA"}

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

@@ -1,10 +1,15 @@
-import { Filter, PublishedList, List } from "@welshman/util";
-export declare const getRelayUrls: (list?: List) => string[];
-export declare const getReadRelayUrls: (list?: List) => string[];
-export declare const getWriteRelayUrls: (list?: List) => string[];
+import { TrustedEvent, PublishedList, RelayMode } from "@welshman/util";
+export type OutboxLoaderRequest = {
+    pubkey: string;
+    relays: string[];
+    kind: number;
+};
+export declare const loadUsingOutbox: (request: OutboxLoaderRequest) => Promise<Promise<TrustedEvent[]>>;
+export declare const makeOutboxLoader: (kind: number) => (pubkey: string, relays: string[]) => Promise<Promise<TrustedEvent[]>>;
 export declare const relaySelections: import("@welshman/store").WritableWithGetter<PublishedList[]>;
 export declare const relaySelectionsByPubkey: import("@welshman/store").ReadableWithGetter<Map<string, PublishedList>>, deriveRelaySelections: (key: string | undefined, relays?: string[]) => import("svelte/store").Readable<PublishedList | undefined>, loadRelaySelections: (key: string, relays?: string[]) => Promise<PublishedList | undefined>;
-export declare const loadWithAsapMetaRelayUrls: (pubkey: string, relays: string[], filters: Filter[]) => Promise<unknown>;
+export declare const getPubkeyRelays: (pubkey: string, mode?: RelayMode) => string[];
+export declare const derivePubkeyRelays: (pubkey: string, mode?: RelayMode) => import("svelte/store").Readable<string[]>;
 export declare const inboxRelaySelections: import("@welshman/store").WritableWithGetter<PublishedList[]>;
 export declare const inboxRelaySelectionsByPubkey: import("@welshman/store").ReadableWithGetter<Map<string, PublishedList>>, deriveInboxRelaySelections: (key: string | undefined, relays?: string[]) => import("svelte/store").Readable<PublishedList | undefined>, loadInboxRelaySelections: (key: string, relays?: string[]) => Promise<PublishedList | undefined>;
 //# sourceMappingURL=relaySelections.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"relaySelections.d.ts","sourceRoot":"","sources":["../../../src/relaySelections.ts"],"names":[],"mappings":"AAWA,OAAO,EAAe,MAAM,EAAE,aAAa,EAAE,IAAI,EAAC,MAAM,gBAAgB,CAAA;AAOxE,eAAO,MAAM,YAAY,GAAI,OAAO,IAAI,KAAG,MAAM,EACkB,CAAA;AAEnE,eAAO,MAAM,gBAAgB,GAAI,OAAO,IAAI,KAAG,MAAM,EAKlD,CAAA;AAEH,eAAO,MAAM,iBAAiB,GAAI,OAAO,IAAI,KAAG,MAAM,EAKnD,CAAA;AAEH,eAAO,MAAM,eAAe,+DAI1B,CAAA;AAEF,eAAO,MACO,uBAAuB,4EACvB,qBAAqB,8GACvB,mBAAmB,wEAe7B,CAAA;AAEF,eAAO,MAAM,yBAAyB,GAAI,QAAQ,MAAM,EAAE,QAAQ,MAAM,EAAE,EAAE,SAAS,MAAM,EAAE,qBAqB5F,CAAA;AAED,eAAO,MAAM,oBAAoB,+DAI/B,CAAA;AAEF,eAAO,MACO,4BAA4B,4EAC5B,0BAA0B,8GAC5B,wBAAwB,wEAOlC,CAAA"}
+{"version":3,"file":"relaySelections.d.ts","sourceRoot":"","sources":["../../../src/relaySelections.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,YAAY,EAAE,aAAa,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAA;AAMrE,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,eAAO,MAAM,eAAe,oEAiB1B,CAAA;AAEF,eAAO,MAAM,gBAAgB,GAAI,MAAM,MAAM,MAAM,QAAQ,MAAM,EAAE,QAAQ,MAAM,EAAE,qCAC1C,CAAA;AAEzC,eAAO,MAAM,eAAe,+DAI1B,CAAA;AAEF,eAAO,MACO,uBAAuB,4EACvB,qBAAqB,8GACvB,mBAAmB,wEAM7B,CAAA;AAEF,eAAO,MAAM,eAAe,GAAI,QAAQ,MAAM,EAAE,OAAO,SAAS,aAGQ,CAAA;AAExE,eAAO,MAAM,kBAAkB,GAAI,QAAQ,MAAM,EAAE,OAAO,SAAS,8CAGkB,CAAA;AAErF,eAAO,MAAM,oBAAoB,+DAI/B,CAAA;AAEF,eAAO,MACO,4BAA4B,4EAC5B,0BAA0B,8GAC5B,wBAAwB,wEAMlC,CAAA"}