@welshman/app 0.1.2 → 0.2.0

package/dist/app/src/relaySelections.js

@@ -1,17 +1,27 @@
-import { uniq } from "@welshman/lib";
-import { INBOX_RELAYS, RELAYS, normalizeRelayUrl, asDecryptedEvent, readList, getListTags, getRelayTags, getRelayTagValues, } from "@welshman/util";
-import { load } from "@welshman/net";
-import { deriveEventsMapped } from "@welshman/store";
+import { derived } from "svelte/store";
+import { batcher, always } from "@welshman/lib";
+import { INBOX_RELAYS, RELAYS, asDecryptedEvent, readList, getRelaysFromList } from "@welshman/util";
+import { RelayMode } from "@welshman/util";
+import { request } from "@welshman/net";
+import { deriveEventsMapped, collection } from "@welshman/store";
+import { Router } from "@welshman/router";
 import { repository } from "./core.js";
-import { Router } from "./router.js";
-import { collection } from "./collection.js";
-export const getRelayUrls = (list) => uniq(getRelayTagValues(getListTags(list)).map(normalizeRelayUrl));
-export const getReadRelayUrls = (list) => uniq(getRelayTags(getListTags(list))
-    .filter((t) => !t[2] || t[2] === "read")
-    .map((t) => normalizeRelayUrl(t[1])));
-export const getWriteRelayUrls = (list) => uniq(getRelayTags(getListTags(list))
-    .filter((t) => !t[2] || t[2] === "write")
-    .map((t) => normalizeRelayUrl(t[1])));
+export const loadUsingOutbox = batcher(200, (requests) => {
+    const router = Router.get();
+    const authors = [];
+    const scenarios = [router.Index()];
+    const kinds = new Set();
+    for (const { pubkey, relays, kind } of requests) {
+        kinds.add(kind);
+        authors.push(pubkey);
+        scenarios.push(router.FromPubkey(pubkey), router.FromRelays(relays));
+    }
+    const relays = router.merge(scenarios).getUrls();
+    const filters = [{ authors, kinds: Array.from(kinds) }];
+    const promise = request({ filters, relays, autoClose: true });
+    return requests.map(always(promise));
+});
+export const makeOutboxLoader = (kind) => (pubkey, relays) => loadUsingOutbox({ pubkey, relays, kind });
 export const relaySelections = deriveEventsMapped(repository, {
     filters: [{ kinds: [RELAYS] }],
     itemToEvent: item => item.event,
@@ -21,34 +31,14 @@ export const { indexStore: relaySelectionsByPubkey, deriveItem: deriveRelaySelec
     name: "relaySelections",
     store: relaySelections,
     getKey: relaySelections => relaySelections.event.pubkey,
-    load: async (pubkey, relays) => {
-        const router = Router.get();
-        await load({
-            relays: router
-                .merge([router.Index(), router.FromRelays(relays), router.FromPubkey(pubkey)])
-                .getUrls(),
-            filters: [{ kinds: [RELAYS], authors: [pubkey] }],
-        });
-    },
+    load: makeOutboxLoader(RELAYS),
 });
-export const loadWithAsapMetaRelayUrls = (pubkey, relays, filters) => {
-    const router = Router.get();
-    return new Promise(resolve => {
-        let resolved = 0;
-        const onLoad = (events) => {
-            if (++resolved === 2 || events.length > 0) {
-                resolve(events);
-            }
-        };
-        load({
-            filters,
-            relays: router.merge([router.Index(), router.FromRelays(relays)]).getUrls(),
-        }).then(onLoad);
-        loadRelaySelections(pubkey, relays)
-            .then(() => load({ filters, relays: router.FromPubkey(pubkey).getUrls() }))
-            .then(onLoad);
-    });
-};
+export const getPubkeyRelays = (pubkey, mode) => mode === RelayMode.Inbox
+    ? getRelaysFromList(inboxRelaySelectionsByPubkey.get().get(pubkey))
+    : getRelaysFromList(relaySelectionsByPubkey.get().get(pubkey), mode);
+export const derivePubkeyRelays = (pubkey, mode) => mode === RelayMode.Inbox
+    ? derived(inboxRelaySelectionsByPubkey, $m => getRelaysFromList($m.get(pubkey)))
+    : derived(relaySelectionsByPubkey, $m => getRelaysFromList($m.get(pubkey), mode));
 export const inboxRelaySelections = deriveEventsMapped(repository, {
     filters: [{ kinds: [INBOX_RELAYS] }],
     itemToEvent: item => item.event,
@@ -58,6 +48,6 @@ export const { indexStore: inboxRelaySelectionsByPubkey, deriveItem: deriveInbox
     name: "inboxRelaySelections",
     store: inboxRelaySelections,
     getKey: inboxRelaySelections => inboxRelaySelections.event.pubkey,
-    load: (pubkey, relays) => loadWithAsapMetaRelayUrls(pubkey, relays, [{ kinds: [INBOX_RELAYS], authors: [pubkey] }]),
+    load: makeOutboxLoader(INBOX_RELAYS),
 });
 //# sourceMappingURL=relaySelections.js.map

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

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

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

@@ -32,5 +32,6 @@ export declare const fetchRelayProfiles: (urls: string[]) => Promise<Map<string,
 export declare const relaysByUrl: import("@welshman/store").ReadableWithGetter<Map<string, Relay>>, deriveRelay: (key: string | undefined, relays?: string[]) => import("svelte/store").Readable<Relay | undefined>, loadRelay: (key: string, relays?: string[]) => Promise<Relay | undefined>, onRelay: (cb: import("svelte/store").Subscriber<Relay>) => () => void;
 export declare const displayRelayByPubkey: (url: string) => string;
 export declare const deriveRelayDisplay: (url: string) => import("svelte/store").Readable<string>;
+export declare const getRelayQuality: (url: string) => 1 | 0 | 0.8 | 0.9 | 0.7;
 export declare const trackRelayStats: (socket: Socket) => () => void;
 //# sourceMappingURL=relays.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"relays.d.ts","sourceRoot":"","sources":["../../../src/relays.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAE3C,OAAO,EAAC,MAAM,EAAyD,MAAM,eAAe,CAAA;AAI5F,MAAM,MAAM,UAAU,GAAG;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;IACnB,aAAa,EAAE,MAAM,CAAA;IACrB,aAAa,EAAE,MAAM,CAAA;IACrB,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,qBAAqB,EAAE,MAAM,CAAA;IAC7B,qBAAqB,EAAE,MAAM,CAAA;IAC7B,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,cAAc,QAAO,UAmBhC,CAAA;AAEF,MAAM,MAAM,KAAK,GAAG;IAClB,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,CAAC,EAAE,UAAU,CAAA;IAClB,OAAO,CAAC,EAAE,YAAY,CAAA;CACvB,CAAA;AAED,eAAO,MAAM,MAAM,uDAAoC,CAAA;AAEvD,eAAO,MAAM,cAAc,mEAK1B,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAU,MAAM,MAAM,EAAE,uCAetD,CAAA;AAED,eAAO,MACO,WAAW,oEACX,WAAW,sGACb,SAAS,kEACX,OAAO,8DAuBf,CAAA;AAEF,eAAO,MAAM,oBAAoB,GAAI,KAAK,MAAM,WACgC,CAAA;AAEhF,eAAO,MAAM,kBAAkB,GAAI,KAAK,MAAM,4CACmD,CAAA;AAmIjG,eAAO,MAAM,eAAe,GAAI,QAAQ,MAAM,eAU7C,CAAA"}
+{"version":3,"file":"relays.d.ts","sourceRoot":"","sources":["../../../src/relays.ts"],"names":[],"mappings":"AAeA,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAU3C,OAAO,EAAO,MAAM,EAAyD,MAAM,eAAe,CAAA;AAIlG,MAAM,MAAM,UAAU,GAAG;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;IACnB,aAAa,EAAE,MAAM,CAAA;IACrB,aAAa,EAAE,MAAM,CAAA;IACrB,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,qBAAqB,EAAE,MAAM,CAAA;IAC7B,qBAAqB,EAAE,MAAM,CAAA;IAC7B,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,cAAc,QAAO,UAmBhC,CAAA;AAEF,MAAM,MAAM,KAAK,GAAG;IAClB,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,CAAC,EAAE,UAAU,CAAA;IAClB,OAAO,CAAC,EAAE,YAAY,CAAA;CACvB,CAAA;AAED,eAAO,MAAM,MAAM,uDAAoC,CAAA;AAEvD,eAAO,MAAM,cAAc,mEAK1B,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAU,MAAM,MAAM,EAAE,uCAetD,CAAA;AAED,eAAO,MACO,WAAW,oEACX,WAAW,sGACb,SAAS,kEACX,OAAO,8DAuBf,CAAA;AAEF,eAAO,MAAM,oBAAoB,GAAI,KAAK,MAAM,WACgC,CAAA;AAEhF,eAAO,MAAM,kBAAkB,GAAI,KAAK,MAAM,4CACmD,CAAA;AAEjG,eAAO,MAAM,eAAe,GAAI,KAAK,MAAM,4BA0B1C,CAAA;AAmID,eAAO,MAAM,eAAe,GAAI,QAAQ,MAAM,eAU7C,CAAA"}

package/dist/app/src/relays.js

@@ -1,9 +1,9 @@
 import { writable, derived } from "svelte/store";
 import { withGetter } from "@welshman/store";
-import { groupBy, indexBy, batch, now, uniq, batcher, postJson } from "@welshman/lib";
-import { normalizeRelayUrl, displayRelayUrl, displayRelayProfile } from "@welshman/util";
-import { SocketStatus, SocketEvent } from "@welshman/net";
-import { collection } from "./collection.js";
+import { groupBy, indexBy, batch, now, uniq, batcher, postJson, ago, DAY, HOUR, MINUTE, } from "@welshman/lib";
+import { normalizeRelayUrl, displayRelayUrl, displayRelayProfile, isOnionUrl, isLocalUrl, isIPAddress, isRelayUrl, } from "@welshman/util";
+import { Pool, SocketStatus, SocketEvent } from "@welshman/net";
+import { collection } from "@welshman/store";
 import { appContext } from "./context.js";
 export const makeRelayStats = () => ({
     first_seen: now(),
@@ -60,6 +60,33 @@ export const { indexStore: relaysByUrl, deriveItem: deriveRelay, loadItem: loadR
 });
 export const displayRelayByPubkey = (url) => displayRelayProfile(relaysByUrl.get().get(url)?.profile, displayRelayUrl(url));
 export const deriveRelayDisplay = (url) => derived(deriveRelay(url), $relay => displayRelayProfile($relay?.profile, displayRelayUrl(url)));
+export const getRelayQuality = (url) => {
+    const relay = relaysByUrl.get().get(url);
+    // Skip non-relays entirely
+    if (!isRelayUrl(url))
+        return 0;
+    // If we have recent errors, skip it
+    if (relay?.stats) {
+        if (relay.stats.recent_errors.filter(n => n > ago(MINUTE)).length > 0)
+            return 0;
+        if (relay.stats.recent_errors.filter(n => n > ago(HOUR)).length > 3)
+            return 0;
+        if (relay.stats.recent_errors.filter(n => n > ago(DAY)).length > 10)
+            return 0;
+    }
+    // Prefer stuff we're connected to
+    if (Pool.get().has(url))
+        return 1;
+    // Prefer stuff we've connected to in the past
+    if (relay?.stats)
+        return 0.9;
+    // If it's not weird url give it an ok score
+    if (!isIPAddress(url) && !isLocalUrl(url) && !isOnionUrl(url) && !url.startsWith("ws://")) {
+        return 0.8;
+    }
+    // Default to a "meh" score
+    return 0.7;
+};
 const updateRelayStats = batch(500, (updates) => {
     relays.update($relays => {
         const $relaysByUrl = indexBy(r => r.url, $relays);

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../src/search.ts"],"names":[],"mappings":"AAAA,OAAa,EAAC,YAAY,EAAE,UAAU,EAAC,MAAM,SAAS,CAAA;AACtD,OAAO,EAAC,QAAQ,EAAC,MAAM,mBAAmB,CAAA;AAG1C,OAAO,EAAU,gBAAgB,EAAC,MAAM,gBAAgB,CAAA;AAKxD,OAAO,EAAS,KAAK,EAAC,MAAM,aAAa,CAAA;AACzC,OAAO,EAAS,KAAK,EAAC,MAAM,aAAa,CAAA;AAIzC,MAAM,MAAM,aAAa,CAAC,CAAC,EAAE,CAAC,IAAI;IAChC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAA;IACxB,WAAW,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAA;IAC7B,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;IACjC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,GAAG,CAAA;CACvC,CAAA;AAED,MAAM,MAAM,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI;IACzB,OAAO,EAAE,CAAC,EAAE,CAAA;IACZ,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAA;IACxB,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,SAAS,CAAA;IACtC,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,CAAC,EAAE,CAAA;IACpC,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,CAAC,EAAE,CAAA;CACpC,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,CAAC,EAAE,CAAC,EAAE,SAAS,CAAC,EAAE,EAAE,MAAM,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,KAAG,MAAM,CAAC,CAAC,EAAE,CAAC,CAuBvF,CAAA;AAED,eAAO,MAAM,cAAc,oBAA0B,MAAM,UAOzD,CAAA;AAEF,eAAO,MAAM,aAAa,mEAgCzB,CAAA;AAED,eAAO,MAAM,WAAW,wDAKvB,CAAA;AAED,eAAO,MAAM,WAAW,wDAOvB,CAAA"}
+{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../src/search.ts"],"names":[],"mappings":"AAAA,OAAa,EAAC,YAAY,EAAE,UAAU,EAAC,MAAM,SAAS,CAAA;AACtD,OAAO,EAAC,QAAQ,EAAC,MAAM,mBAAmB,CAAA;AAG1C,OAAO,EAAU,gBAAgB,EAAC,MAAM,gBAAgB,CAAA;AAMxD,OAAO,EAAS,KAAK,EAAC,MAAM,aAAa,CAAA;AACzC,OAAO,EAAS,KAAK,EAAC,MAAM,aAAa,CAAA;AAGzC,MAAM,MAAM,aAAa,CAAC,CAAC,EAAE,CAAC,IAAI;IAChC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAA;IACxB,WAAW,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAA;IAC7B,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;IACjC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,GAAG,CAAA;CACvC,CAAA;AAED,MAAM,MAAM,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI;IACzB,OAAO,EAAE,CAAC,EAAE,CAAA;IACZ,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAA;IACxB,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,SAAS,CAAA;IACtC,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,CAAC,EAAE,CAAA;IACpC,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,CAAC,EAAE,CAAA;CACpC,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,CAAC,EAAE,CAAC,EAAE,SAAS,CAAC,EAAE,EAAE,MAAM,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,KAAG,MAAM,CAAC,CAAC,EAAE,CAAC,CAuBvF,CAAA;AAED,eAAO,MAAM,cAAc,oBAA0B,MAAM,UAOzD,CAAA;AAEF,eAAO,MAAM,aAAa,mEAgCzB,CAAA;AAED,eAAO,MAAM,WAAW,wDAKvB,CAAA;AAED,eAAO,MAAM,WAAW,wDAOvB,CAAA"}

package/dist/app/src/search.js

@@ -5,11 +5,11 @@ import { dec, sortBy } from "@welshman/lib";
 import { PROFILE } from "@welshman/util";
 import { load } from "@welshman/net";
 import { throttled } from "@welshman/store";
+import { Router } from "@welshman/router";
 import { wotGraph } from "./wot.js";
 import { profiles } from "./profiles.js";
 import { topics } from "./topics.js";
 import { relays } from "./relays.js";
-import { Router } from "./router.js";
 import { handlesByNip05 } from "./handles.js";
 export const createSearch = (options, opts) => {
     const fuse = new Fuse(options, { ...opts.fuseOptions, includeScore: true });

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

@@ -1 +1 @@
-{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../src/search.ts"],"names":[],"mappings":"AAAA,OAAO,IAAgC,MAAM,SAAS,CAAA;AACtD,OAAO,EAAC,QAAQ,EAAC,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAA;AACpC,OAAO,EAAC,GAAG,EAAE,MAAM,EAAC,MAAM,eAAe,CAAA;AACzC,OAAO,EAAC,OAAO,EAAmB,MAAM,gBAAgB,CAAA;AACxD,OAAO,EAAC,IAAI,EAAC,MAAM,eAAe,CAAA;AAClC,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAA;AACzC,OAAO,EAAC,QAAQ,EAAC,MAAM,UAAU,CAAA;AACjC,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAA;AACtC,OAAO,EAAC,MAAM,EAAQ,MAAM,aAAa,CAAA;AACzC,OAAO,EAAC,MAAM,EAAQ,MAAM,aAAa,CAAA;AACzC,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAA;AAClC,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAA;AAiB3C,MAAM,CAAC,MAAM,YAAY,GAAG,CAAO,OAAY,EAAE,IAAyB,EAAgB,EAAE;IAC1F,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,OAAO,EAAE,EAAC,GAAG,IAAI,CAAC,WAAW,EAAE,YAAY,EAAE,IAAI,EAAC,CAAC,CAAA;IACzE,MAAM,GAAG,GAAG,IAAI,GAAG,CAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAA;IAE3E,MAAM,MAAM,GAAG,CAAC,IAAY,EAAE,EAAE;QAC9B,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAA;QAErB,IAAI,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAC,IAAI,EAAC,CAAkB,CAAC,CAAA;QAEvF,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACxC,CAAC;QAED,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAC3C,CAAC,CAAA;IAED,OAAO;QACL,OAAO;QACP,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,SAAS,EAAE,CAAC,KAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC;QACvC,aAAa,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;QAC7C,YAAY,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;KAChE,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,MAAc,EAAE,EAAE;IAC7D,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,IAAI,CAAC;YACH,OAAO,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,EAAC,CAAC;YACrC,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;SACxC,CAAC,CAAA;IACJ,CAAC;AACH,CAAC,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAClC,CAAC,SAAS,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,SAAS,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,EAC1D,CAAC,CAAC,SAAS,EAAE,eAAe,CAAC,EAAE,EAAE;IAC/B,uCAAuC;IACvC,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;QAChC,MAAM,YAAY,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,CAAC,CAAC,KAAK,CAAC,MAAM,CAAA;QAExF,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAC,GAAG,CAAC,EAAE,KAAK,EAAE,EAAE,EAAC,CAAA;IAC7C,CAAC,CAAC,CAAA;IAEF,OAAO,YAAY,CAAC,OAAO,EAAE;QAC3B,QAAQ,EAAE,cAAc;QACxB,QAAQ,EAAE,CAAC,OAAyB,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM;QAC7D,MAAM,EAAE,CAAC,EAAC,KAAK,EAAE,IAAI,EAAC,EAAE,EAAE;YACxB,IAAI,KAAK,IAAI,KAAK,GAAG,GAAG;gBAAE,OAAO,CAAC,KAAM,CAAA;YAExC,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YAE3D,OAAO,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAA;QAClD,CAAC;QACD,WAAW,EAAE;YACX,IAAI,EAAE;gBACJ,OAAO;gBACP,EAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAC;gBAC3B,EAAC,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,EAAC;gBACnC,EAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAC;aAC7B;YACD,SAAS,EAAE,GAAG;YACd,UAAU,EAAE,KAAK;SAClB;KACF,CAAC,CAAA;AACJ,CAAC,CACF,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CACnD,YAAY,CAAC,OAAO,EAAE;IACpB,QAAQ,EAAE,CAAC,KAAY,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI;IACtC,WAAW,EAAE,EAAC,IAAI,EAAE,CAAC,MAAM,CAAC,EAAC;CAC9B,CAAC,CACH,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CACnD,YAAY,CAAC,OAAO,EAAE;IACpB,QAAQ,EAAE,CAAC,KAAY,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG;IACrC,WAAW,EAAE;QACX,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,EAAC,CAAC;KAC1D;CACF,CAAC,CACH,CAAA"}
+{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../src/search.ts"],"names":[],"mappings":"AAAA,OAAO,IAAgC,MAAM,SAAS,CAAA;AACtD,OAAO,EAAC,QAAQ,EAAC,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAA;AACpC,OAAO,EAAC,GAAG,EAAE,MAAM,EAAC,MAAM,eAAe,CAAA;AACzC,OAAO,EAAC,OAAO,EAAmB,MAAM,gBAAgB,CAAA;AACxD,OAAO,EAAC,IAAI,EAAC,MAAM,eAAe,CAAA;AAClC,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAA;AACzC,OAAO,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAA;AACvC,OAAO,EAAC,QAAQ,EAAC,MAAM,UAAU,CAAA;AACjC,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAA;AACtC,OAAO,EAAC,MAAM,EAAQ,MAAM,aAAa,CAAA;AACzC,OAAO,EAAC,MAAM,EAAQ,MAAM,aAAa,CAAA;AACzC,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAA;AAiB3C,MAAM,CAAC,MAAM,YAAY,GAAG,CAAO,OAAY,EAAE,IAAyB,EAAgB,EAAE;IAC1F,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,OAAO,EAAE,EAAC,GAAG,IAAI,CAAC,WAAW,EAAE,YAAY,EAAE,IAAI,EAAC,CAAC,CAAA;IACzE,MAAM,GAAG,GAAG,IAAI,GAAG,CAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAA;IAE3E,MAAM,MAAM,GAAG,CAAC,IAAY,EAAE,EAAE;QAC9B,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAA;QAErB,IAAI,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAC,IAAI,EAAC,CAAkB,CAAC,CAAA;QAEvF,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACxC,CAAC;QAED,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAC3C,CAAC,CAAA;IAED,OAAO;QACL,OAAO;QACP,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,SAAS,EAAE,CAAC,KAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC;QACvC,aAAa,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;QAC7C,YAAY,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;KAChE,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,MAAc,EAAE,EAAE;IAC7D,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,IAAI,CAAC;YACH,OAAO,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,EAAC,CAAC;YACrC,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;SACxC,CAAC,CAAA;IACJ,CAAC;AACH,CAAC,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAClC,CAAC,SAAS,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,SAAS,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,EAC1D,CAAC,CAAC,SAAS,EAAE,eAAe,CAAC,EAAE,EAAE;IAC/B,uCAAuC;IACvC,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;QAChC,MAAM,YAAY,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,CAAC,CAAC,KAAK,CAAC,MAAM,CAAA;QAExF,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAC,GAAG,CAAC,EAAE,KAAK,EAAE,EAAE,EAAC,CAAA;IAC7C,CAAC,CAAC,CAAA;IAEF,OAAO,YAAY,CAAC,OAAO,EAAE;QAC3B,QAAQ,EAAE,cAAc;QACxB,QAAQ,EAAE,CAAC,OAAyB,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM;QAC7D,MAAM,EAAE,CAAC,EAAC,KAAK,EAAE,IAAI,EAAC,EAAE,EAAE;YACxB,IAAI,KAAK,IAAI,KAAK,GAAG,GAAG;gBAAE,OAAO,CAAC,KAAM,CAAA;YAExC,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YAE3D,OAAO,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAA;QAClD,CAAC;QACD,WAAW,EAAE;YACX,IAAI,EAAE;gBACJ,OAAO;gBACP,EAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAC;gBAC3B,EAAC,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,EAAC;gBACnC,EAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAC;aAC7B;YACD,SAAS,EAAE,GAAG;YACd,UAAU,EAAE,KAAK;SAClB;KACF,CAAC,CAAA;AACJ,CAAC,CACF,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CACnD,YAAY,CAAC,OAAO,EAAE;IACpB,QAAQ,EAAE,CAAC,KAAY,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI;IACtC,WAAW,EAAE,EAAC,IAAI,EAAE,CAAC,MAAM,CAAC,EAAC;CAC9B,CAAC,CACH,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CACnD,YAAY,CAAC,OAAO,EAAE;IACpB,QAAQ,EAAE,CAAC,KAAY,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG;IACrC,WAAW,EAAE;QACX,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,EAAC,CAAC;KAC1D;CACF,CAAC,CACH,CAAA"}

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

@@ -1,15 +1,22 @@
 import { Nip46Signer, Nip07Signer, Nip01Signer, Nip55Signer } from "@welshman/signer";
+export declare enum SessionMethod {
+    Nip01 = "nip01",
+    Nip07 = "nip07",
+    Nip46 = "nip46",
+    Nip55 = "nip55",
+    Pubkey = "pubkey"
+}
 export type SessionNip01 = {
-    method: "nip01";
+    method: SessionMethod.Nip01;
     pubkey: string;
     secret: string;
 };
 export type SessionNip07 = {
-    method: "nip07";
+    method: SessionMethod.Nip07;
     pubkey: string;
 };
 export type SessionNip46 = {
-    method: "nip46";
+    method: SessionMethod.Nip46;
     pubkey: string;
     secret: string;
     handler: {
@@ -18,24 +25,35 @@ export type SessionNip46 = {
     };
 };
 export type SessionNip55 = {
-    method: "nip55";
+    method: SessionMethod.Nip55;
     pubkey: string;
     signer: string;
 };
 export type SessionPubkey = {
-    method: "pubkey";
+    method: SessionMethod.Pubkey;
     pubkey: string;
 };
 export type SessionAnyMethod = SessionNip01 | SessionNip07 | SessionNip46 | SessionNip55 | SessionPubkey;
 export type Session = SessionAnyMethod & Record<string, any>;
-export declare const pubkey: import("@welshman/store").WritableWithGetter<string | null>;
+export declare const pubkey: import("@welshman/store").WritableWithGetter<string | undefined>;
 export declare const sessions: import("@welshman/store").WritableWithGetter<Record<string, Session>>;
 export declare const session: import("@welshman/store").ReadableWithGetter<Session | null>;
 export declare const getSession: (pubkey: string) => Session;
 export declare const addSession: (session: Session) => void;
 export declare const putSession: (session: Session) => void;
 export declare const updateSession: (pubkey: string, f: (session: Session) => Session) => void;
-export declare const dropSession: (pubkey: string) => void;
+export declare const dropSession: (_pubkey: string) => void;
+export declare const clearSessions: () => void;
+export declare const makeNip01Session: (secret: string) => SessionNip01;
+export declare const makeNip07Session: (pubkey: string) => SessionNip07;
+export declare const makeNip46Session: (pubkey: string, clientSecret: string, signerPubkey: string, relays: string[]) => SessionNip46;
+export declare const makeNip55Session: (pubkey: string, signer: string) => SessionNip55;
+export declare const makePubkeySession: (pubkey: string) => SessionPubkey;
+export declare const loginWithNip01: (secret: string) => void;
+export declare const loginWithNip07: (pubkey: string) => void;
+export declare const loginWithNip46: (pubkey: string, clientSecret: string, signerPubkey: string, relays: string[]) => void;
+export declare const loginWithNip55: (pubkey: string, signer: string) => void;
+export declare const loginWithPubkey: (pubkey: string) => void;
 export declare const nip46Perms = "sign_event:22242,nip04_encrypt,nip04_decrypt,nip44_encrypt,nip44_decrypt";
 export declare const getSigner: {
     (args_0: Session | null): NonNullable<Nip01Signer | Nip07Signer | Nip46Signer | Nip55Signer | null>;

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

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/session.ts"],"names":[],"mappings":"AAGA,OAAO,EAAc,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAA;AAEhG,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE;QACP,MAAM,EAAE,MAAM,CAAA;QACd,MAAM,EAAE,MAAM,EAAE,CAAA;KACjB,CAAA;CACF,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,QAAQ,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,gBAAgB,GACxB,YAAY,GACZ,YAAY,GACZ,YAAY,GACZ,YAAY,GACZ,aAAa,CAAA;AAEjB,MAAM,MAAM,OAAO,GAAG,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAE5D,eAAO,MAAM,MAAM,6DAAoD,CAAA;AAEvE,eAAO,MAAM,QAAQ,uEAA8D,CAAA;AAEnF,eAAO,MAAM,OAAO,8DAEnB,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,QAAQ,MAAM,YAA2B,CAAA;AAEpE,eAAO,MAAM,UAAU,GAAI,SAAS,OAAO,SAG1C,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,SAAS,OAAO,SAI1C,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,QAAQ,MAAM,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,SAC3C,CAAA;AAEnC,eAAO,MAAM,WAAW,GAAI,QAAQ,MAAM,SACe,CAAA;AAEzD,eAAO,MAAM,UAAU,6EAA6E,CAAA;AAEpG,eAAO,MAAM,SAAS;;;;;CAuBpB,CAAA;AAEF,eAAO,MAAM,MAAM,yHAA0C,CAAA;AAE7D,eAAO,MAAM,kBAAkB,GAAI,SAAS,MAAM,oBASjD,CAAA"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/session.ts"],"names":[],"mappings":"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"}

package/dist/app/src/session.js

@@ -1,8 +1,16 @@
 import { derived } from "svelte/store";
 import { cached, hash, omit, equals, assoc } from "@welshman/lib";
 import { withGetter, synced } from "@welshman/store";
-import { Nip46Broker, Nip46Signer, Nip07Signer, Nip01Signer, Nip55Signer } from "@welshman/signer";
-export const pubkey = withGetter(synced("pubkey", null));
+import { Nip46Broker, Nip46Signer, Nip07Signer, Nip01Signer, Nip55Signer, getPubkey, } from "@welshman/signer";
+export var SessionMethod;
+(function (SessionMethod) {
+    SessionMethod["Nip01"] = "nip01";
+    SessionMethod["Nip07"] = "nip07";
+    SessionMethod["Nip46"] = "nip46";
+    SessionMethod["Nip55"] = "nip55";
+    SessionMethod["Pubkey"] = "pubkey";
+})(SessionMethod || (SessionMethod = {}));
+export const pubkey = withGetter(synced("pubkey", undefined));
 export const sessions = withGetter(synced("sessions", {}));
 export const session = withGetter(derived([pubkey, sessions], ([$pubkey, $sessions]) => ($pubkey ? $sessions[$pubkey] : null)));
 export const getSession = (pubkey) => sessions.get()[pubkey];
@@ -16,7 +24,46 @@ export const putSession = (session) => {
     }
 };
 export const updateSession = (pubkey, f) => putSession(f(getSession(pubkey)));
-export const dropSession = (pubkey) => sessions.update($sessions => omit([pubkey], $sessions));
+export const dropSession = (_pubkey) => {
+    pubkey.update($pubkey => ($pubkey === _pubkey ? undefined : $pubkey));
+    sessions.update($sessions => omit([_pubkey], $sessions));
+};
+export const clearSessions = () => {
+    pubkey.set(undefined);
+    sessions.set({});
+};
+// Session factories
+export const makeNip01Session = (secret) => ({
+    method: SessionMethod.Nip01,
+    secret,
+    pubkey: getPubkey(secret),
+});
+export const makeNip07Session = (pubkey) => ({
+    method: SessionMethod.Nip07,
+    pubkey,
+});
+export const makeNip46Session = (pubkey, clientSecret, signerPubkey, relays) => ({
+    method: SessionMethod.Nip46,
+    pubkey,
+    secret: clientSecret,
+    handler: { pubkey: signerPubkey, relays },
+});
+export const makeNip55Session = (pubkey, signer) => ({
+    method: SessionMethod.Nip55,
+    pubkey,
+    signer,
+});
+export const makePubkeySession = (pubkey) => ({
+    method: SessionMethod.Pubkey,
+    pubkey,
+});
+// Login utilities
+export const loginWithNip01 = (secret) => addSession(makeNip01Session(secret));
+export const loginWithNip07 = (pubkey) => addSession(makeNip07Session(pubkey));
+export const loginWithNip46 = (pubkey, clientSecret, signerPubkey, relays) => addSession(makeNip46Session(pubkey, clientSecret, signerPubkey, relays));
+export const loginWithNip55 = (pubkey, signer) => addSession(makeNip55Session(pubkey, signer));
+export const loginWithPubkey = (pubkey) => addSession(makePubkeySession(pubkey));
+// Other stuff
 export const nip46Perms = "sign_event:22242,nip04_encrypt,nip04_decrypt,nip44_encrypt,nip44_decrypt";
 export const getSigner = cached({
     maxSize: 100,

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

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

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

@@ -10,6 +10,7 @@ export type StorageAdapter = {
     sync: () => Unsubscriber;
 };
 export declare let db: IDBPDatabase | undefined;
+export declare const ready: import("@welshman/lib").Deferred<void, void>;
 export declare const dead: import("@welshman/store").WritableWithGetter<boolean>;
 export declare const subs: Unsubscriber[];
 export declare const getAll: (name: string) => Promise<any[]>;

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

@@ -1 +1 @@
-{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../../src/storage.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,KAAK,CAAA;AAEhC,OAAO,EAAC,YAAY,EAAC,MAAM,cAAc,CAAA;AAIzC,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,GAAG,EAAE,CAAA;CAClC,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IACzB,IAAI,EAAE,MAAM,YAAY,CAAA;CACzB,CAAA;AAED,eAAO,IAAI,EAAE,EAAE,YAAY,GAAG,SAAS,CAAA;AAEvC,eAAO,MAAM,IAAI,uDAA8B,CAAA;AAE/C,eAAO,MAAM,IAAI,EAAE,YAAY,EAAO,CAAA;AAEtC,eAAO,MAAM,MAAM,GAAU,MAAM,MAAM,mBAQxC,CAAA;AAED,eAAO,MAAM,OAAO,GAAU,MAAM,MAAM,EAAE,MAAM,GAAG,EAAE,kBAetD,CAAA;AAED,eAAO,MAAM,UAAU,GAAU,MAAM,MAAM,EAAE,KAAK,MAAM,EAAE,kBAM3D,CAAA;AAED,eAAO,MAAM,WAAW,GACtB,MAAM,MAAM,EACZ,SAAS,MAAM,EACf,UAAU,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,sCAmCzC,CAAA;AAED,eAAO,MAAM,YAAY,qBAIxB,CAAA;AAED,eAAO,MAAM,YAAY,qBAMxB,CAAA"}
+{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../../src/storage.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,KAAK,CAAA;AAEhC,OAAO,EAAC,YAAY,EAAC,MAAM,cAAc,CAAA;AAIzC,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,GAAG,EAAE,CAAA;CAClC,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IACzB,IAAI,EAAE,MAAM,YAAY,CAAA;CACzB,CAAA;AAED,eAAO,IAAI,EAAE,EAAE,YAAY,GAAG,SAAS,CAAA;AAEvC,eAAO,MAAM,KAAK,8CAAgB,CAAA;AAElC,eAAO,MAAM,IAAI,uDAA8B,CAAA;AAE/C,eAAO,MAAM,IAAI,EAAE,YAAY,EAAO,CAAA;AAEtC,eAAO,MAAM,MAAM,GAAU,MAAM,MAAM,mBAUxC,CAAA;AAED,eAAO,MAAM,OAAO,GAAU,MAAM,MAAM,EAAE,MAAM,GAAG,EAAE,kBAiBtD,CAAA;AAED,eAAO,MAAM,UAAU,GAAU,MAAM,MAAM,EAAE,KAAK,MAAM,EAAE,kBAQ3D,CAAA;AAED,eAAO,MAAM,WAAW,GACtB,MAAM,MAAM,EACZ,SAAS,MAAM,EACf,UAAU,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,sCAqCzC,CAAA;AAED,eAAO,MAAM,YAAY,qBAIxB,CAAA;AAED,eAAO,MAAM,YAAY,qBAMxB,CAAA"}

package/dist/app/src/storage.js

@@ -1,11 +1,13 @@
 import { openDB, deleteDB } from "idb";
 import { writable } from "svelte/store";
-import { call } from "@welshman/lib";
+import { call, defer } from "@welshman/lib";
 import { withGetter } from "@welshman/store";
 export let db;
+export const ready = defer();
 export const dead = withGetter(writable(false));
 export const subs = [];
 export const getAll = async (name) => {
+    await ready;
     const tx = db.transaction(name, "readwrite");
     const store = tx.objectStore(name);
     const result = await store.getAll();
@@ -13,6 +15,7 @@ export const getAll = async (name) => {
     return result;
 };
 export const bulkPut = async (name, data) => {
+    await ready;
     const tx = db.transaction(name, "readwrite");
     const store = tx.objectStore(name);
     await Promise.all(data.map(item => {
@@ -26,6 +29,7 @@ export const bulkPut = async (name, data) => {
     await tx.done;
 };
 export const bulkDelete = async (name, ids) => {
+    await ready;
     const tx = db.transaction(name, "readwrite");
     const store = tx.objectStore(name);
     await Promise.all(ids.map(id => store.delete(id)));
@@ -56,6 +60,7 @@ export const initStorage = async (name, version, adapters) => {
             }
         },
     });
+    ready.resolve();
     await Promise.all(Object.values(adapters).map(adapter => adapter.init()));
     const unsubscribers = Object.values(adapters).map(adapter => adapter.sync());
     return () => unsubscribers.forEach(call);

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

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

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

@@ -0,0 +1,88 @@
+import { TrustedEvent } from "@welshman/util";
+import { Tracker } from "@welshman/net";
+import { Repository } from "@welshman/relay";
+export type RelaysStorageAdapterOptions = {
+    name: string;
+};
+export declare class RelaysStorageAdapter {
+    readonly options: RelaysStorageAdapterOptions;
+    keyPath: string;
+    constructor(options: RelaysStorageAdapterOptions);
+    init(): Promise<void>;
+    sync(): import("svelte/store").Unsubscriber;
+}
+export type HandlesStorageAdapterOptions = {
+    name: string;
+};
+export declare class HandlesStorageAdapter {
+    readonly options: HandlesStorageAdapterOptions;
+    keyPath: string;
+    constructor(options: HandlesStorageAdapterOptions);
+    init(): Promise<void>;
+    sync(): () => void;
+}
+export type ZappersStorageAdapterOptions = {
+    name: string;
+};
+export declare class ZappersStorageAdapter {
+    readonly options: ZappersStorageAdapterOptions;
+    keyPath: string;
+    constructor(options: ZappersStorageAdapterOptions);
+    init(): Promise<void>;
+    sync(): () => void;
+}
+export type FreshnessStorageAdapterOptions = {
+    name: string;
+};
+export declare class FreshnessStorageAdapter {
+    readonly options: FreshnessStorageAdapterOptions;
+    keyPath: string;
+    constructor(options: FreshnessStorageAdapterOptions);
+    init(): Promise<void>;
+    sync(): () => void;
+}
+export type PlaintextStorageAdapterOptions = {
+    name: string;
+};
+export declare class PlaintextStorageAdapter {
+    readonly options: PlaintextStorageAdapterOptions;
+    keyPath: string;
+    constructor(options: PlaintextStorageAdapterOptions);
+    init(): Promise<void>;
+    sync(): () => void;
+}
+export type TrackerStorageAdapterOptions = {
+    name: string;
+    tracker: Tracker;
+};
+export declare class TrackerStorageAdapter {
+    readonly options: TrackerStorageAdapterOptions;
+    keyPath: string;
+    constructor(options: TrackerStorageAdapterOptions);
+    init(): Promise<void>;
+    sync(): () => Tracker;
+}
+export type EventsStorageAdapterOptions = {
+    name: string;
+    limit: number;
+    repository: Repository;
+    rankEvent: (event: TrustedEvent) => number;
+};
+export declare class EventsStorageAdapter {
+    readonly options: EventsStorageAdapterOptions;
+    keyPath: string;
+    eventCount: number;
+    constructor(options: EventsStorageAdapterOptions);
+    init(): Promise<void>;
+    sync(): () => Repository<TrustedEvent>;
+}
+export declare const defaultStorageAdapters: {
+    relays: RelaysStorageAdapter;
+    handles: HandlesStorageAdapter;
+    zappers: ZappersStorageAdapter;
+    freshness: FreshnessStorageAdapter;
+    plaintext: PlaintextStorageAdapter;
+    tracker: TrackerStorageAdapter;
+    events: EventsStorageAdapter;
+};
+//# sourceMappingURL=storageAdapters.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"storageAdapters.d.ts","sourceRoot":"","sources":["../../../src/storageAdapters.ts"],"names":[],"mappings":"AAEA,OAAO,EAQL,YAAY,EACb,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAA;AAErC,OAAO,EAAC,UAAU,EAAmB,MAAM,iBAAiB,CAAA;AAU5D,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,qBAAa,oBAAoB;IAGnB,QAAQ,CAAC,OAAO,EAAE,2BAA2B;IAFzD,OAAO,SAAQ;gBAEM,OAAO,EAAE,2BAA2B;IAEnD,IAAI;IAIV,IAAI;CAGL;AAED,MAAM,MAAM,4BAA4B,GAAG;IACzC,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,qBAAa,qBAAqB;IAGpB,QAAQ,CAAC,OAAO,EAAE,4BAA4B;IAF1D,OAAO,SAAU;gBAEI,OAAO,EAAE,4BAA4B;IAEpD,IAAI;IAIV,IAAI;CAGL;AAED,MAAM,MAAM,4BAA4B,GAAG;IACzC,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,qBAAa,qBAAqB;IAGpB,QAAQ,CAAC,OAAO,EAAE,4BAA4B;IAF1D,OAAO,SAAU;gBAEI,OAAO,EAAE,4BAA4B;IAEpD,IAAI;IAIV,IAAI;CAGL;AAED,MAAM,MAAM,8BAA8B,GAAG;IAC3C,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,qBAAa,uBAAuB;IAGtB,QAAQ,CAAC,OAAO,EAAE,8BAA8B;IAF5D,OAAO,SAAQ;gBAEM,OAAO,EAAE,8BAA8B;IAEtD,IAAI;IAMV,IAAI;CAUL;AAED,MAAM,MAAM,8BAA8B,GAAG;IAC3C,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,qBAAa,uBAAuB;IAGtB,QAAQ,CAAC,OAAO,EAAE,8BAA8B;IAF5D,OAAO,SAAQ;gBAEM,OAAO,EAAE,8BAA8B;IAEtD,IAAI;IAMV,IAAI;CAUL;AAED,MAAM,MAAM,4BAA4B,GAAG;IACzC,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,qBAAa,qBAAqB;IAGpB,QAAQ,CAAC,OAAO,EAAE,4BAA4B;IAF1D,OAAO,SAAO;gBAEO,OAAO,EAAE,4BAA4B;IAEpD,IAAI;IAUV,IAAI;CAeL;AAED,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,EAAE,UAAU,CAAA;IACtB,SAAS,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,MAAM,CAAA;CAC3C,CAAA;AAED,qBAAa,oBAAoB;IAInB,QAAQ,CAAC,OAAO,EAAE,2BAA2B;IAHzD,OAAO,SAAO;IACd,UAAU,SAAI;gBAEO,OAAO,EAAE,2BAA2B;IAEnD,IAAI;IAQV,IAAI;CAiCL;AAED,eAAO,MAAM,sBAAsB;;;;;;;;CA6BlC,CAAA"}