@welshman/app 0.4.2 → 0.4.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/app/src/index.d.ts.map +1 -1
- package/dist/app/src/index.js +5 -3
- package/dist/app/src/index.js.map +1 -1
- package/dist/app/src/relaySelections.d.ts +3 -3
- package/dist/app/src/relaySelections.d.ts.map +1 -1
- package/dist/app/src/relaySelections.js +5 -5
- package/dist/app/src/relaySelections.js.map +1 -1
- package/dist/app/src/relays.d.ts.map +1 -1
- package/dist/app/src/relays.js +8 -0
- package/dist/app/src/relays.js.map +1 -1
- package/dist/app/src/session.d.ts +6 -2
- package/dist/app/src/session.d.ts.map +1 -1
- package/dist/app/src/session.js +1 -0
- package/dist/app/src/session.js.map +1 -1
- package/dist/app/src/thunk.d.ts +14 -10
- package/dist/app/src/thunk.d.ts.map +1 -1
- package/dist/app/src/thunk.js +77 -73
- package/dist/app/src/thunk.js.map +1 -1
- package/dist/lib/src/Tools.d.ts.map +1 -1
- package/dist/lib/src/Tools.js +8 -1
- package/dist/lib/src/Tools.js.map +1 -1
- package/dist/net/src/auth.d.ts +5 -2
- package/dist/net/src/auth.d.ts.map +1 -1
- package/dist/net/src/auth.js +8 -0
- package/dist/net/src/auth.js.map +1 -1
- package/dist/net/src/message.d.ts +1 -1
- package/dist/net/src/message.d.ts.map +1 -1
- package/dist/net/src/policy.d.ts +2 -8
- package/dist/net/src/policy.d.ts.map +1 -1
- package/dist/net/src/policy.js +21 -35
- package/dist/net/src/policy.js.map +1 -1
- package/dist/store/src/synced.d.ts +5 -2
- package/dist/store/src/synced.d.ts.map +1 -1
- package/dist/store/src/synced.js +6 -7
- package/dist/store/src/synced.js.map +1 -1
- package/package.json +9 -9
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,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,2BAA2B,CAAA;AACzC,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,UAAU,CAAA;AACxB,cAAc,cAAc,CAAA;AAI5B,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,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,2BAA2B,CAAA;AACzC,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,UAAU,CAAA;AACxB,cAAc,cAAc,CAAA;AAI5B,OAAO,EAA6B,SAAS,EAAoB,MAAM,gBAAgB,CAAA;AA8CvF,eAAO,MAAM,eAAe,GAAI,QAAQ,MAAM,EAAE,OAAO,SAAS,aAGQ,CAAA;AAExE,eAAO,MAAM,kBAAkB,GAAI,QAAQ,MAAM,EAAE,OAAO,SAAS,8CAGkB,CAAA"}
|
package/dist/app/src/index.js
CHANGED
|
@@ -25,9 +25,9 @@ export * from "./wot.js";
|
|
|
25
25
|
export * from "./zappers.js";
|
|
26
26
|
import { derived } from "svelte/store";
|
|
27
27
|
import { sortBy, throttleWithValue, tryCatch } from "@welshman/lib";
|
|
28
|
-
import {
|
|
28
|
+
import { isEphemeralKind, isDVMKind, RelayMode, getRelaysFromList } from "@welshman/util";
|
|
29
29
|
import { routerContext } from "@welshman/router";
|
|
30
|
-
import { Pool, SocketEvent, isRelayEvent } from "@welshman/net";
|
|
30
|
+
import { Pool, SocketEvent, isRelayEvent, netContext } from "@welshman/net";
|
|
31
31
|
import { pubkey } from "./session.js";
|
|
32
32
|
import { repository, tracker } from "./core.js";
|
|
33
33
|
import { relays, loadRelay, trackRelayStats, getRelayQuality } from "./relays.js";
|
|
@@ -40,7 +40,9 @@ Pool.get().subscribe(socket => {
|
|
|
40
40
|
socket.on(SocketEvent.Receive, message => {
|
|
41
41
|
if (isRelayEvent(message)) {
|
|
42
42
|
const event = message[2];
|
|
43
|
-
if (!isEphemeralKind(event.kind) &&
|
|
43
|
+
if (!isEphemeralKind(event.kind) &&
|
|
44
|
+
!isDVMKind(event.kind) &&
|
|
45
|
+
netContext.isEventValid(event, socket.url)) {
|
|
44
46
|
tracker.track(event.id, socket.url);
|
|
45
47
|
repository.publish(event);
|
|
46
48
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,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,2BAA2B,CAAA;AACzC,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,UAAU,CAAA;AACxB,cAAc,cAAc,CAAA;AAE5B,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAA;AACpC,OAAO,EAAC,MAAM,EAAE,iBAAiB,EAAE,QAAQ,EAAC,MAAM,eAAe,CAAA;AACjE,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { TrustedEvent, PublishedList } from "@welshman/util";
|
|
1
|
+
import { Filter, TrustedEvent, PublishedList } from "@welshman/util";
|
|
2
2
|
import { LoadOptions } from "@welshman/net";
|
|
3
3
|
export type LoadUsingOutboxOptions = Omit<LoadOptions, "relays">;
|
|
4
4
|
export declare const loadUsingOutbox: (request: LoadUsingOutboxOptions) => Promise<Promise<TrustedEvent[]>>;
|
|
5
|
-
export declare const makeOutboxLoader: (kind: number) => (pubkey: string, relays: string[]) => Promise<[TrustedEvent[], TrustedEvent[]]>;
|
|
6
|
-
export declare const makeOutboxLoaderWithIndexers: (kind: number) => (pubkey: string, relays: string[]) => Promise<[TrustedEvent[], TrustedEvent[], TrustedEvent[]]>;
|
|
5
|
+
export declare const makeOutboxLoader: (kind: number, filter?: Filter) => (pubkey: string, relays: string[]) => Promise<[TrustedEvent[], TrustedEvent[]]>;
|
|
6
|
+
export declare const makeOutboxLoaderWithIndexers: (kind: number, filter?: Filter) => (pubkey: string, relays: string[]) => Promise<[TrustedEvent[], TrustedEvent[], TrustedEvent[]]>;
|
|
7
7
|
export declare const relaySelections: import("@welshman/store").WritableWithGetter<PublishedList[]>;
|
|
8
8
|
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[], force?: boolean) => Promise<PublishedList | undefined>;
|
|
9
9
|
//# sourceMappingURL=relaySelections.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relaySelections.d.ts","sourceRoot":"","sources":["../../../src/relaySelections.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"relaySelections.d.ts","sourceRoot":"","sources":["../../../src/relaySelections.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,MAAM,EAGN,YAAY,EACZ,aAAa,EACd,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAAO,WAAW,EAAC,MAAM,eAAe,CAAA;AAI/C,MAAM,MAAM,sBAAsB,GAAG,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;AAEhE,eAAO,MAAM,eAAe,uEAK1B,CAAA;AAEF,eAAO,MAAM,gBAAgB,GAC1B,MAAM,MAAM,EAAE,SAAQ,MAAW,MACjC,QAAQ,MAAM,EAAE,QAAQ,MAAM,EAAE,8CAIhC,CAAA;AAEH,eAAO,MAAM,4BAA4B,GACtC,MAAM,MAAM,EAAE,SAAQ,MAAW,MACjC,QAAQ,MAAM,EAAE,QAAQ,MAAM,EAAE,8DAQhC,CAAA;AAEH,eAAO,MAAM,eAAe,+DAI1B,CAAA;AAEF,eAAO,MACO,uBAAuB,4EACvB,qBAAqB,8GACvB,mBAAmB,yFAM7B,CAAA"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { batcher } from "@welshman/lib";
|
|
2
|
-
import { RELAYS, asDecryptedEvent, readList } from "@welshman/util";
|
|
2
|
+
import { RELAYS, asDecryptedEvent, readList, } from "@welshman/util";
|
|
3
3
|
import { deriveEventsMapped, collection } from "@welshman/store";
|
|
4
4
|
import { load } from "@welshman/net";
|
|
5
5
|
import { Router } from "@welshman/router";
|
|
@@ -9,12 +9,12 @@ export const loadUsingOutbox = batcher(200, (optionses) => {
|
|
|
9
9
|
const relays = Router.get().FromPubkeys(pubkeys).getUrls();
|
|
10
10
|
return optionses.map(options => load({ ...options, relays }));
|
|
11
11
|
});
|
|
12
|
-
export const makeOutboxLoader = (kind) => (pubkey, relays) => {
|
|
13
|
-
const filters = [{ authors: [pubkey], kinds: [kind] }];
|
|
12
|
+
export const makeOutboxLoader = (kind, filter = {}) => (pubkey, relays) => {
|
|
13
|
+
const filters = [{ ...filter, authors: [pubkey], kinds: [kind] }];
|
|
14
14
|
return Promise.all([load({ relays, filters }), loadUsingOutbox({ filters })]);
|
|
15
15
|
};
|
|
16
|
-
export const makeOutboxLoaderWithIndexers = (kind) => (pubkey, relays) => {
|
|
17
|
-
const filters = [{ authors: [pubkey], kinds: [kind] }];
|
|
16
|
+
export const makeOutboxLoaderWithIndexers = (kind, filter = {}) => (pubkey, relays) => {
|
|
17
|
+
const filters = [{ ...filter, authors: [pubkey], kinds: [kind] }];
|
|
18
18
|
return Promise.all([
|
|
19
19
|
load({ relays, filters }),
|
|
20
20
|
loadUsingOutbox({ filters }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relaySelections.js","sourceRoot":"","sources":["../../../src/relaySelections.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAA;AACrC,OAAO,
|
|
1
|
+
{"version":3,"file":"relaySelections.js","sourceRoot":"","sources":["../../../src/relaySelections.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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,mFACX,OAAO,
|
|
1
|
+
{"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,mFACX,OAAO,8DA4Bf,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;AAwID,eAAO,MAAM,eAAe,GAAI,QAAQ,MAAM,eAU7C,CAAA"}
|
package/dist/app/src/relays.js
CHANGED
|
@@ -50,6 +50,10 @@ export const { indexStore: relaysByUrl, deriveItem: deriveRelay, loadItem: loadR
|
|
|
50
50
|
for (const url of urls) {
|
|
51
51
|
const relay = stale.get(url);
|
|
52
52
|
const profile = fresh.get(url);
|
|
53
|
+
if (!url || !isRelayUrl(url)) {
|
|
54
|
+
console.warn(`Attempted to load invalid relay url: ${url}`);
|
|
55
|
+
continue;
|
|
56
|
+
}
|
|
53
57
|
if (profile) {
|
|
54
58
|
stale.set(url, { ...relay, profile, url });
|
|
55
59
|
}
|
|
@@ -93,6 +97,10 @@ const updateRelayStats = batch(500, (updates) => {
|
|
|
93
97
|
const $itemsByUrl = groupBy(([url]) => url, updates);
|
|
94
98
|
for (const [url, items] of $itemsByUrl.entries()) {
|
|
95
99
|
const $relay = $relaysByUrl.get(url) || { url };
|
|
100
|
+
if (!url || !isRelayUrl(url)) {
|
|
101
|
+
console.warn(`Attempted to update stats for an invalid relay url: ${url}`);
|
|
102
|
+
continue;
|
|
103
|
+
}
|
|
96
104
|
if (!$relay.stats) {
|
|
97
105
|
$relay.stats = makeRelayStats();
|
|
98
106
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relays.js","sourceRoot":"","sources":["../../../src/relays.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"relays.js","sourceRoot":"","sources":["../../../src/relays.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,8 @@ export declare enum SessionMethod {
|
|
|
5
5
|
Nip07 = "nip07",
|
|
6
6
|
Nip46 = "nip46",
|
|
7
7
|
Nip55 = "nip55",
|
|
8
|
-
Pubkey = "pubkey"
|
|
8
|
+
Pubkey = "pubkey",
|
|
9
|
+
Anonymous = "anonymous"
|
|
9
10
|
}
|
|
10
11
|
export type SessionNip01 = {
|
|
11
12
|
method: SessionMethod.Nip01;
|
|
@@ -34,7 +35,10 @@ export type SessionPubkey = {
|
|
|
34
35
|
method: SessionMethod.Pubkey;
|
|
35
36
|
pubkey: string;
|
|
36
37
|
};
|
|
37
|
-
export type
|
|
38
|
+
export type SessionAnonymous = {
|
|
39
|
+
method: SessionMethod.Anonymous;
|
|
40
|
+
};
|
|
41
|
+
export type SessionAnyMethod = SessionNip01 | SessionNip07 | SessionNip46 | SessionNip55 | SessionPubkey | SessionAnonymous;
|
|
38
42
|
export type Session = SessionAnyMethod & {
|
|
39
43
|
wallet?: Wallet;
|
|
40
44
|
} & Record<string, any>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/session.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,MAAM,EAAC,MAAM,gBAAgB,CAAA;AACrC,OAAO,EACL,aAAa,EAOb,OAAO,EACR,MAAM,kBAAkB,CAAA;AAEzB,oBAAY,aAAa;IACvB,KAAK,UAAU;IACf,KAAK,UAAU;IACf,KAAK,UAAU;IACf,KAAK,UAAU;IACf,MAAM,WAAW;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/session.ts"],"names":[],"mappings":"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"}
|
package/dist/app/src/session.js
CHANGED
|
@@ -9,6 +9,7 @@ export var SessionMethod;
|
|
|
9
9
|
SessionMethod["Nip46"] = "nip46";
|
|
10
10
|
SessionMethod["Nip55"] = "nip55";
|
|
11
11
|
SessionMethod["Pubkey"] = "pubkey";
|
|
12
|
+
SessionMethod["Anonymous"] = "anonymous";
|
|
12
13
|
})(SessionMethod || (SessionMethod = {}));
|
|
13
14
|
export const pubkey = withGetter(writable(undefined));
|
|
14
15
|
export const sessions = withGetter(writable({}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAC,MAAM,eAAe,CAAA;AAC3E,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAE1C,OAAO,EACL,aAAa,EACb,WAAW,EACX,WAAW,EACX,WAAW,EACX,WAAW,EACX,WAAW,EACX,SAAS,GAEV,MAAM,kBAAkB,CAAA;AAEzB,MAAM,CAAN,IAAY,
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/session.ts"],"names":[],"mappings":"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"}
|
package/dist/app/src/thunk.d.ts
CHANGED
|
@@ -19,13 +19,15 @@ export declare class Thunk {
|
|
|
19
19
|
constructor(options: ThunkOptions);
|
|
20
20
|
_notify(): void;
|
|
21
21
|
_fail(message: string): void;
|
|
22
|
+
_setPending(relay: string): void;
|
|
23
|
+
_setTimeout(relay: string): void;
|
|
24
|
+
_setAborted(relay: string): void;
|
|
22
25
|
publish(): Promise<void>;
|
|
23
26
|
subscribe(subscriber: Subscriber<Thunk>): () => void;
|
|
24
27
|
}
|
|
25
28
|
export declare class MergedThunk {
|
|
26
29
|
readonly thunks: Thunk[];
|
|
27
30
|
_subs: Subscriber<MergedThunk>[];
|
|
28
|
-
controller: AbortController;
|
|
29
31
|
status: PublishStatusByRelay;
|
|
30
32
|
details: Record<string, string>;
|
|
31
33
|
constructor(thunks: Thunk[]);
|
|
@@ -35,17 +37,19 @@ export declare class MergedThunk {
|
|
|
35
37
|
export type AbstractThunk = Thunk | MergedThunk;
|
|
36
38
|
export declare const isThunk: (thunk: AbstractThunk) => thunk is Thunk;
|
|
37
39
|
export declare const isMergedThunk: (thunk: AbstractThunk) => thunk is MergedThunk;
|
|
38
|
-
export declare const
|
|
39
|
-
export declare const
|
|
40
|
-
export declare const
|
|
41
|
-
export declare const
|
|
40
|
+
export declare const getThunkUrlsWithStatus: (statuses: PublishStatus | PublishStatus[], thunk: AbstractThunk) => string[];
|
|
41
|
+
export declare const getCompleteThunkUrls: (thunk: AbstractThunk) => string[];
|
|
42
|
+
export declare const getIncompleteThunkUrls: (thunk: AbstractThunk) => string[];
|
|
43
|
+
export declare const getFailedThunkUrls: (thunk: AbstractThunk) => string[];
|
|
44
|
+
export declare const thunkHasStatus: (statuses: PublishStatus | PublishStatus[], thunk: AbstractThunk) => boolean;
|
|
42
45
|
export declare const thunkIsComplete: (thunk: AbstractThunk) => boolean;
|
|
43
|
-
export declare const getThunkError: (thunk: Thunk) =>
|
|
44
|
-
export declare const
|
|
45
|
-
export declare const waitForThunkCompletion: (thunk: Thunk) => Promise<void>;
|
|
46
|
-
export declare function walkThunks(thunks: AbstractThunk[]): Iterable<Thunk>;
|
|
46
|
+
export declare const getThunkError: (thunk: Thunk) => string | undefined;
|
|
47
|
+
export declare const waitForThunkError: (thunk: Thunk) => Promise<string>;
|
|
47
48
|
export declare const thunks: import("svelte/store").Writable<Record<string, AbstractThunk>>;
|
|
48
49
|
export declare const thunkQueue: TaskQueue<Thunk>;
|
|
50
|
+
export declare const mergeThunks: (thunks: AbstractThunk[]) => MergedThunk;
|
|
51
|
+
export declare function flattenThunks(thunks: AbstractThunk[]): Iterable<Thunk>;
|
|
49
52
|
export declare const publishThunk: (options: ThunkOptions) => Thunk;
|
|
50
|
-
export declare const abortThunk: (thunk:
|
|
53
|
+
export declare const abortThunk: (thunk: AbstractThunk) => void;
|
|
54
|
+
export declare const retryThunk: (thunk: AbstractThunk) => Thunk | MergedThunk;
|
|
51
55
|
//# sourceMappingURL=thunk.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thunk.d.ts","sourceRoot":"","sources":["../../../src/thunk.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,cAAc,CAAA;AAE5C,OAAO,EACL,SAAS,
|
|
1
|
+
{"version":3,"file":"thunk.d.ts","sourceRoot":"","sources":["../../../src/thunk.ts"],"names":[],"mappings":"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"}
|
package/dist/app/src/thunk.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { writable, get } from "svelte/store";
|
|
2
|
-
import { TaskQueue, ifLet, dissoc, remove, defer, sleep, assoc,
|
|
2
|
+
import { TaskQueue, ifLet, ensurePlural, dissoc, remove, defer, sleep, assoc, nth, } from "@welshman/lib";
|
|
3
3
|
import { stamp, own, hash } from "@welshman/signer";
|
|
4
4
|
import { isStampedEvent, isOwnedEvent, isHashedEvent, isUnwrappedEvent, isSignedEvent, } from "@welshman/util";
|
|
5
5
|
import { publish, PublishStatus } from "@welshman/net";
|
|
@@ -31,6 +31,11 @@ export class Thunk {
|
|
|
31
31
|
for (const relay of options.relays) {
|
|
32
32
|
this.status[relay] = PublishStatus.Sending;
|
|
33
33
|
}
|
|
34
|
+
this.controller.signal.addEventListener("abort", () => {
|
|
35
|
+
for (const relay of options.relays) {
|
|
36
|
+
this._setAborted(relay);
|
|
37
|
+
}
|
|
38
|
+
});
|
|
34
39
|
}
|
|
35
40
|
_notify() {
|
|
36
41
|
for (const subscriber of this._subs) {
|
|
@@ -44,6 +49,23 @@ export class Thunk {
|
|
|
44
49
|
}
|
|
45
50
|
this._notify();
|
|
46
51
|
}
|
|
52
|
+
_setPending(relay) {
|
|
53
|
+
this.options.onPending?.(relay);
|
|
54
|
+
this.status[relay] = PublishStatus.Pending;
|
|
55
|
+
this._notify();
|
|
56
|
+
}
|
|
57
|
+
_setTimeout(relay) {
|
|
58
|
+
this.options.onTimeout?.(relay);
|
|
59
|
+
this.status[relay] = PublishStatus.Timeout;
|
|
60
|
+
this.details[relay] = "Publish timed out";
|
|
61
|
+
this._notify();
|
|
62
|
+
}
|
|
63
|
+
_setAborted(relay) {
|
|
64
|
+
this.options.onAborted?.(relay);
|
|
65
|
+
this.status[relay] = PublishStatus.Aborted;
|
|
66
|
+
this.details[relay] = "Publish was aborted";
|
|
67
|
+
this._notify();
|
|
68
|
+
}
|
|
47
69
|
async publish() {
|
|
48
70
|
let event = this.event;
|
|
49
71
|
// Handle abort immediately if possible
|
|
@@ -99,21 +121,13 @@ export class Thunk {
|
|
|
99
121
|
this._notify();
|
|
100
122
|
},
|
|
101
123
|
onPending: (relay) => {
|
|
102
|
-
this.
|
|
103
|
-
this.status[relay] = PublishStatus.Pending;
|
|
104
|
-
this._notify();
|
|
124
|
+
this._setPending(relay);
|
|
105
125
|
},
|
|
106
126
|
onTimeout: (relay) => {
|
|
107
|
-
this.
|
|
108
|
-
this.status[relay] = PublishStatus.Timeout;
|
|
109
|
-
this.details[relay] = "Publish timed out";
|
|
110
|
-
this._notify();
|
|
127
|
+
this._setTimeout(relay);
|
|
111
128
|
},
|
|
112
129
|
onAborted: (relay) => {
|
|
113
|
-
this.
|
|
114
|
-
this.status[relay] = PublishStatus.Aborted;
|
|
115
|
-
this.details[relay] = "Publish was aborted";
|
|
116
|
-
this._notify();
|
|
130
|
+
this._setAborted(relay);
|
|
117
131
|
},
|
|
118
132
|
onComplete: () => {
|
|
119
133
|
this.options.onComplete?.();
|
|
@@ -132,21 +146,19 @@ export class Thunk {
|
|
|
132
146
|
export class MergedThunk {
|
|
133
147
|
thunks;
|
|
134
148
|
_subs = [];
|
|
135
|
-
controller = new AbortController();
|
|
136
149
|
status = {};
|
|
137
150
|
details = {};
|
|
138
151
|
constructor(thunks) {
|
|
139
152
|
this.thunks = thunks;
|
|
140
|
-
const { Aborted, Failure, Timeout, Pending, Success } = PublishStatus;
|
|
141
|
-
const relays = new Set(thunks.flatMap(thunk =>
|
|
153
|
+
const { Aborted, Failure, Timeout, Pending, Sending, Success } = PublishStatus;
|
|
154
|
+
const relays = new Set(thunks.flatMap(thunk => thunk.options.relays));
|
|
142
155
|
for (const thunk of thunks) {
|
|
143
|
-
this.controller.signal.addEventListener("abort", () => thunk.controller.abort());
|
|
144
156
|
thunk.subscribe($thunk => {
|
|
145
157
|
this.status = {};
|
|
146
158
|
this.details = {};
|
|
147
159
|
for (const relay of relays) {
|
|
148
|
-
for (const status of [Aborted, Failure, Timeout, Pending, Success]) {
|
|
149
|
-
const thunk = thunks.find(
|
|
160
|
+
for (const status of [Aborted, Failure, Timeout, Pending, Sending, Success]) {
|
|
161
|
+
const thunk = thunks.find(t => t.status[relay] === status);
|
|
150
162
|
if (thunk) {
|
|
151
163
|
this.status[relay] = thunk.status[relay];
|
|
152
164
|
this.details[relay] = thunk.details[relay];
|
|
@@ -154,7 +166,7 @@ export class MergedThunk {
|
|
|
154
166
|
}
|
|
155
167
|
}
|
|
156
168
|
this._notify();
|
|
157
|
-
if (thunks.
|
|
169
|
+
if (thunks.every(thunkIsComplete)) {
|
|
158
170
|
this._subs = [];
|
|
159
171
|
}
|
|
160
172
|
});
|
|
@@ -175,82 +187,74 @@ export class MergedThunk {
|
|
|
175
187
|
}
|
|
176
188
|
export const isThunk = (thunk) => thunk instanceof Thunk;
|
|
177
189
|
export const isMergedThunk = (thunk) => thunk instanceof MergedThunk;
|
|
178
|
-
|
|
179
|
-
export const
|
|
180
|
-
|
|
181
|
-
const incompleteStatuses = [PublishStatus.Sending, PublishStatus.Pending];
|
|
182
|
-
return Object.entries(thunk.status)
|
|
183
|
-
.filter(([_, s]) => !incompleteStatuses.includes(s))
|
|
184
|
-
.map(nth(1));
|
|
185
|
-
};
|
|
186
|
-
export const thunkIncompleteUrls = (thunk) => {
|
|
187
|
-
const incompleteStatuses = [PublishStatus.Sending, PublishStatus.Pending];
|
|
190
|
+
// Thunk status urls
|
|
191
|
+
export const getThunkUrlsWithStatus = (statuses, thunk) => {
|
|
192
|
+
statuses = ensurePlural(statuses);
|
|
188
193
|
return Object.entries(thunk.status)
|
|
189
|
-
.filter(([_,
|
|
190
|
-
.map(nth(
|
|
194
|
+
.filter(([_, status]) => statuses.includes(status))
|
|
195
|
+
.map(nth(0));
|
|
191
196
|
};
|
|
192
|
-
export const
|
|
193
|
-
export const
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
197
|
+
export const getCompleteThunkUrls = (thunk) => getThunkUrlsWithStatus([PublishStatus.Sending, PublishStatus.Pending], thunk);
|
|
198
|
+
export const getIncompleteThunkUrls = (thunk) => getThunkUrlsWithStatus([PublishStatus.Sending, PublishStatus.Pending], thunk);
|
|
199
|
+
export const getFailedThunkUrls = (thunk) => getThunkUrlsWithStatus([PublishStatus.Failure, PublishStatus.Timeout], thunk);
|
|
200
|
+
// Thunk status checks
|
|
201
|
+
export const thunkHasStatus = (statuses, thunk) => getThunkUrlsWithStatus(statuses, thunk).length > 0;
|
|
202
|
+
export const thunkIsComplete = (thunk) => !thunkHasStatus([PublishStatus.Sending, PublishStatus.Pending], thunk);
|
|
203
|
+
// Thunk errors
|
|
204
|
+
export const getThunkError = (thunk) => {
|
|
205
|
+
for (const [relay, status] of Object.entries(thunk.status)) {
|
|
206
|
+
if (status === PublishStatus.Failure) {
|
|
207
|
+
return thunk.details[relay];
|
|
199
208
|
}
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
}
|
|
204
|
-
}
|
|
205
|
-
|
|
209
|
+
}
|
|
210
|
+
if (thunkIsComplete(thunk)) {
|
|
211
|
+
return "";
|
|
212
|
+
}
|
|
213
|
+
};
|
|
214
|
+
// Thunk utilities that return promises
|
|
215
|
+
export const waitForThunkError = (thunk) => new Promise(resolve => {
|
|
206
216
|
thunk.subscribe($thunk => {
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
}
|
|
211
|
-
}
|
|
212
|
-
if (thunkIsComplete($thunk)) {
|
|
213
|
-
resolve(false);
|
|
217
|
+
const error = getThunkError($thunk);
|
|
218
|
+
if (error !== undefined) {
|
|
219
|
+
resolve(error);
|
|
214
220
|
}
|
|
215
221
|
});
|
|
216
222
|
});
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
+
// Thunk state
|
|
224
|
+
export const thunks = writable({});
|
|
225
|
+
export const thunkQueue = new TaskQueue({
|
|
226
|
+
batchSize: 50,
|
|
227
|
+
processItem: (thunk) => {
|
|
228
|
+
thunk.publish();
|
|
229
|
+
},
|
|
223
230
|
});
|
|
224
|
-
|
|
231
|
+
// Other thunk utilities
|
|
232
|
+
export const mergeThunks = (thunks) => new MergedThunk(Array.from(flattenThunks(thunks)));
|
|
233
|
+
export function* flattenThunks(thunks) {
|
|
225
234
|
for (const thunk of thunks) {
|
|
226
|
-
if (thunk
|
|
227
|
-
yield*
|
|
235
|
+
if (isMergedThunk(thunk)) {
|
|
236
|
+
yield* flattenThunks(thunk.thunks);
|
|
228
237
|
}
|
|
229
238
|
else {
|
|
230
239
|
yield thunk;
|
|
231
240
|
}
|
|
232
241
|
}
|
|
233
242
|
}
|
|
234
|
-
export const thunks = writable({});
|
|
235
|
-
export const thunkQueue = new TaskQueue({
|
|
236
|
-
batchSize: 50,
|
|
237
|
-
processItem: (thunk) => {
|
|
238
|
-
thunk.publish();
|
|
239
|
-
},
|
|
240
|
-
});
|
|
241
243
|
export const publishThunk = (options) => {
|
|
242
244
|
const thunk = new Thunk(options);
|
|
243
245
|
thunkQueue.push(thunk);
|
|
244
246
|
repository.publish(thunk.event);
|
|
245
247
|
thunks.update(assoc(thunk.event.id, thunk));
|
|
246
|
-
thunk.controller.signal.addEventListener("abort", () => {
|
|
247
|
-
repository.removeEvent(thunk.event.id);
|
|
248
|
-
});
|
|
249
248
|
return thunk;
|
|
250
249
|
};
|
|
251
250
|
export const abortThunk = (thunk) => {
|
|
252
|
-
thunk
|
|
253
|
-
|
|
254
|
-
|
|
251
|
+
for (const child of flattenThunks([thunk])) {
|
|
252
|
+
child.controller.abort();
|
|
253
|
+
thunks.update(dissoc(child.event.id));
|
|
254
|
+
repository.removeEvent(child.event.id);
|
|
255
|
+
}
|
|
255
256
|
};
|
|
257
|
+
export const retryThunk = (thunk) => isMergedThunk(thunk)
|
|
258
|
+
? mergeThunks(thunk.thunks.map(t => publishThunk(t.options)))
|
|
259
|
+
: publishThunk(thunk.options);
|
|
256
260
|
//# sourceMappingURL=thunk.js.map
|