@welshman/app 0.0.44 → 0.1.0
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/build/src/commands.js +7 -7
- package/build/src/commands.js.map +1 -1
- package/build/src/context.d.ts +1 -27
- package/build/src/context.js +1 -37
- package/build/src/context.js.map +1 -1
- package/build/src/core.d.ts +3 -5
- package/build/src/core.js +18 -4
- package/build/src/core.js.map +1 -1
- package/build/src/feeds.d.ts +1 -2
- package/build/src/feeds.js +11 -7
- package/build/src/feeds.js.map +1 -1
- package/build/src/follows.d.ts +3 -3
- package/build/src/follows.js +5 -2
- package/build/src/follows.js.map +1 -1
- package/build/src/handles.d.ts +2 -2
- package/build/src/handles.js +3 -2
- package/build/src/handles.js.map +1 -1
- package/build/src/index.d.ts +0 -9
- package/build/src/index.js +0 -1
- package/build/src/index.js.map +1 -1
- package/build/src/mutes.d.ts +3 -3
- package/build/src/mutes.js +5 -2
- package/build/src/mutes.js.map +1 -1
- package/build/src/pins.d.ts +3 -3
- package/build/src/pins.js +5 -2
- package/build/src/pins.js.map +1 -1
- package/build/src/profiles.d.ts +3 -3
- package/build/src/profiles.js +6 -13
- package/build/src/profiles.js.map +1 -1
- package/build/src/relaySelections.d.ts +4 -4
- package/build/src/relaySelections.js +18 -3
- package/build/src/relaySelections.js.map +1 -1
- package/build/src/relays.d.ts +3 -5
- package/build/src/relays.js +43 -49
- package/build/src/relays.js.map +1 -1
- package/build/src/router.d.ts +13 -9
- package/build/src/router.js +76 -76
- package/build/src/router.js.map +1 -1
- package/build/src/search.d.ts +4 -4
- package/build/src/search.js +6 -2
- package/build/src/search.js.map +1 -1
- package/build/src/storage.d.ts +5 -4
- package/build/src/storage.js.map +1 -1
- package/build/src/sync.d.ts +0 -1
- package/build/src/sync.js +8 -12
- package/build/src/sync.js.map +1 -1
- package/build/src/tags.js +12 -11
- package/build/src/tags.js.map +1 -1
- package/build/src/thunk.d.ts +6 -6
- package/build/src/thunk.js +72 -63
- package/build/src/thunk.js.map +1 -1
- package/build/src/zappers.d.ts +3 -3
- package/build/src/zappers.js +3 -2
- package/build/src/zappers.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -2
- package/build/src/subscribe.d.ts +0 -7
- package/build/src/subscribe.js +0 -42
- package/build/src/subscribe.js.map +0 -1
package/build/src/search.js
CHANGED
|
@@ -3,12 +3,13 @@ import { debounce } from "throttle-debounce";
|
|
|
3
3
|
import { derived } from "svelte/store";
|
|
4
4
|
import { dec, sortBy } from "@welshman/lib";
|
|
5
5
|
import { PROFILE } from "@welshman/util";
|
|
6
|
+
import { load } from "@welshman/net";
|
|
6
7
|
import { throttled } from "@welshman/store";
|
|
7
|
-
import { load } from "./subscribe.js";
|
|
8
8
|
import { wotGraph } from "./wot.js";
|
|
9
9
|
import { profiles } from "./profiles.js";
|
|
10
10
|
import { topics } from "./topics.js";
|
|
11
11
|
import { relays } from "./relays.js";
|
|
12
|
+
import { Router } from "./router.js";
|
|
12
13
|
import { handlesByNip05 } from "./handles.js";
|
|
13
14
|
export const createSearch = (options, opts) => {
|
|
14
15
|
const fuse = new Fuse(options, { ...opts.fuseOptions, includeScore: true });
|
|
@@ -31,7 +32,10 @@ export const createSearch = (options, opts) => {
|
|
|
31
32
|
};
|
|
32
33
|
export const searchProfiles = debounce(500, (search) => {
|
|
33
34
|
if (search.length > 2) {
|
|
34
|
-
load({
|
|
35
|
+
load({
|
|
36
|
+
filters: [{ kinds: [PROFILE], search }],
|
|
37
|
+
relays: Router.get().Search().getUrls(),
|
|
38
|
+
});
|
|
35
39
|
}
|
|
36
40
|
});
|
|
37
41
|
export const profileSearch = derived([throttled(800, profiles), throttled(800, handlesByNip05)], ([$profiles, $handlesByNip05]) => {
|
package/build/src/search.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/search.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/search.ts"],"names":[],"mappings":"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"}
|
package/build/src/storage.d.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
3
|
-
import
|
|
4
|
-
import
|
|
1
|
+
import { IDBPDatabase } from "idb";
|
|
2
|
+
import { Unsubscriber, Writable } from "svelte/store";
|
|
3
|
+
import { TrustedEvent } from "@welshman/util";
|
|
4
|
+
import { Repository } from "@welshman/relay";
|
|
5
|
+
import { Tracker } from "@welshman/net";
|
|
5
6
|
export type StorageAdapterOptions = {
|
|
6
7
|
throttle?: number;
|
|
7
8
|
migrate?: (items: any[]) => any[];
|
package/build/src/storage.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,QAAQ,EAAC,MAAM,KAAK,CAAA;AAEpC,OAAO,EAAC,QAAQ,EAAC,MAAM,cAAc,CAAA;AAErC,OAAO,EAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAC,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/storage.ts"],"names":[],"mappings":"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"}
|
package/build/src/sync.d.ts
CHANGED
|
@@ -6,4 +6,3 @@ export type AppSyncOpts = {
|
|
|
6
6
|
};
|
|
7
7
|
export declare const pull: ({ relays, filters }: AppSyncOpts) => Promise<void>;
|
|
8
8
|
export declare const push: ({ relays, filters }: AppSyncOpts) => Promise<void>;
|
|
9
|
-
export declare const sync: ({ relays, filters }: AppSyncOpts) => Promise<void>;
|
package/build/src/sync.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { isSignedEvent } from "@welshman/util";
|
|
2
|
-
import { push as basePush, pull as basePull,
|
|
2
|
+
import { push as basePush, pull as basePull, PublishEvent, RequestEvent, SinglePublish, SingleRequest, } from "@welshman/net";
|
|
3
3
|
import { repository } from "./core.js";
|
|
4
4
|
import { relaysByUrl } from "./relays.js";
|
|
5
5
|
const query = (filters) => repository.query(filters, { shouldSort: filters.every(f => f.limit === undefined) });
|
|
@@ -12,11 +12,13 @@ export const hasNegentropy = (url) => {
|
|
|
12
12
|
return false;
|
|
13
13
|
};
|
|
14
14
|
export const pull = async ({ relays, filters }) => {
|
|
15
|
-
const events = query(filters);
|
|
15
|
+
const events = query(filters).filter(isSignedEvent);
|
|
16
16
|
await Promise.all(relays.map(async (relay) => {
|
|
17
17
|
await (hasNegentropy(relay)
|
|
18
18
|
? basePull({ filters, events, relays: [relay] })
|
|
19
|
-
:
|
|
19
|
+
: new Promise(resolve => {
|
|
20
|
+
new SingleRequest({ filters, relay, autoClose: true }).on(RequestEvent.Close, resolve);
|
|
21
|
+
}));
|
|
20
22
|
}));
|
|
21
23
|
};
|
|
22
24
|
export const push = async ({ relays, filters }) => {
|
|
@@ -24,15 +26,9 @@ export const push = async ({ relays, filters }) => {
|
|
|
24
26
|
await Promise.all(relays.map(async (relay) => {
|
|
25
27
|
await (hasNegentropy(relay)
|
|
26
28
|
? basePush({ filters, events, relays: [relay] })
|
|
27
|
-
:
|
|
28
|
-
|
|
29
|
-
};
|
|
30
|
-
export const sync = async ({ relays, filters }) => {
|
|
31
|
-
const events = query(filters).filter(isSignedEvent);
|
|
32
|
-
await Promise.all(relays.map(async (relay) => {
|
|
33
|
-
await (hasNegentropy(relay)
|
|
34
|
-
? baseSync({ filters, events, relays: [relay] })
|
|
35
|
-
: syncWithoutNegentropy({ filters, events, relays: [relay] }));
|
|
29
|
+
: Promise.all(events.map((event) => new Promise(resolve => {
|
|
30
|
+
new SinglePublish({ event, relay }).on(PublishEvent.Complete, resolve);
|
|
31
|
+
}))));
|
|
36
32
|
}));
|
|
37
33
|
};
|
|
38
34
|
//# sourceMappingURL=sync.js.map
|
package/build/src/sync.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/sync.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,aAAa,
|
|
1
|
+
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/sync.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,aAAa,EAAc,MAAM,gBAAgB,CAAA;AACzD,OAAO,EACL,IAAI,IAAI,QAAQ,EAChB,IAAI,IAAI,QAAQ,EAChB,YAAY,EACZ,YAAY,EACZ,aAAa,EACb,aAAa,GACd,MAAM,eAAe,CAAA;AACtB,OAAO,EAAC,UAAU,EAAC,MAAM,WAAW,CAAA;AACpC,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAA;AAEvC,MAAM,KAAK,GAAG,CAAC,OAAiB,EAAE,EAAE,CAClC,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,EAAC,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,EAAC,CAAC,CAAA;AAEpF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,GAAW,EAAE,EAAE;IAC3C,MAAM,CAAC,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,OAAO,CAAA;IAE7C,IAAI,CAAC,EAAE,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC;QAAE,OAAO,IAAI,CAAA;IAChD,IAAI,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAA;IAE9E,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAOD,MAAM,CAAC,MAAM,IAAI,GAAG,KAAK,EAAE,EAAC,MAAM,EAAE,OAAO,EAAc,EAAE,EAAE;IAC3D,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;IAEnD,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,GAAG,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;QACvB,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC;YACzB,CAAC,CAAC,QAAQ,CAAC,EAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAC,CAAC;YAC9C,CAAC,CAAC,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;gBAC1B,IAAI,aAAa,CAAC,EAAC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;YACtF,CAAC,CAAC,CAAC,CAAA;IACT,CAAC,CAAC,CACH,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,IAAI,GAAG,KAAK,EAAE,EAAC,MAAM,EAAE,OAAO,EAAc,EAAE,EAAE;IAC3D,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;IAEnD,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,GAAG,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;QACvB,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC;YACzB,CAAC,CAAC,QAAQ,CAAC,EAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAC,CAAC;YAC9C,CAAC,CAAC,OAAO,CAAC,GAAG,CACT,MAAM,CAAC,GAAG,CACR,CAAC,KAAkB,EAAE,EAAE,CACrB,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;gBAC1B,IAAI,aAAa,CAAC,EAAC,KAAK,EAAE,KAAK,EAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;YACtE,CAAC,CAAC,CACL,CACF,CAAC,CAAA;IACR,CAAC,CAAC,CACH,CAAA;AACH,CAAC,CAAA"}
|
package/build/src/tags.js
CHANGED
|
@@ -1,21 +1,22 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { uniq, remove, nthEq } from "@welshman/lib";
|
|
2
2
|
import { getAddress, isReplaceable, getReplyTags, getPubkeyTagValues, isReplaceableKind, } from "@welshman/util";
|
|
3
3
|
import { displayProfileByPubkey } from "./profiles.js";
|
|
4
4
|
import { pubkey } from "./session.js";
|
|
5
|
+
import { Router } from "./router.js";
|
|
5
6
|
export const tagZapSplit = (pubkey, split = 1) => [
|
|
6
7
|
"zap",
|
|
7
8
|
pubkey,
|
|
8
|
-
|
|
9
|
+
Router.get().FromPubkey(pubkey).getUrl(),
|
|
9
10
|
String(split),
|
|
10
11
|
];
|
|
11
12
|
export const tagPubkey = (pubkey, ...args) => [
|
|
12
13
|
"p",
|
|
13
14
|
pubkey,
|
|
14
|
-
|
|
15
|
+
Router.get().FromPubkey(pubkey).getUrl(),
|
|
15
16
|
displayProfileByPubkey(pubkey),
|
|
16
17
|
];
|
|
17
18
|
export const tagEvent = (event, mark = "") => {
|
|
18
|
-
const url =
|
|
19
|
+
const url = Router.get().Event(event).getUrl();
|
|
19
20
|
const tags = [["e", event.id, url, mark, event.pubkey]];
|
|
20
21
|
if (isReplaceable(event)) {
|
|
21
22
|
tags.push(["a", getAddress(event), url, mark, event.pubkey]);
|
|
@@ -26,7 +27,7 @@ export const tagEventPubkeys = (event) => uniq(remove(pubkey.get(), [event.pubke
|
|
|
26
27
|
export const tagEventForQuote = (event) => [
|
|
27
28
|
"q",
|
|
28
29
|
event.id,
|
|
29
|
-
|
|
30
|
+
Router.get().Event(event).getUrl(),
|
|
30
31
|
event.pubkey,
|
|
31
32
|
];
|
|
32
33
|
export const tagEventForReply = (event) => {
|
|
@@ -36,12 +37,12 @@ export const tagEventForReply = (event) => {
|
|
|
36
37
|
// Root comes first
|
|
37
38
|
if (roots.length > 0) {
|
|
38
39
|
for (const t of roots) {
|
|
39
|
-
tags.push([...t.slice(0, 2),
|
|
40
|
+
tags.push([...t.slice(0, 2), Router.get().EventRoots(event).getUrl(), "root"]);
|
|
40
41
|
}
|
|
41
42
|
}
|
|
42
43
|
else {
|
|
43
44
|
for (const t of replies) {
|
|
44
|
-
tags.push([...t.slice(0, 2),
|
|
45
|
+
tags.push([...t.slice(0, 2), Router.get().EventParents(event).getUrl(), "root"]);
|
|
45
46
|
}
|
|
46
47
|
}
|
|
47
48
|
// Inherit mentions
|
|
@@ -60,7 +61,7 @@ export const tagEventForReply = (event) => {
|
|
|
60
61
|
}
|
|
61
62
|
// Finally, tag the event itself
|
|
62
63
|
const mark = replies.length > 0 ? "reply" : "root";
|
|
63
|
-
const hint =
|
|
64
|
+
const hint = Router.get().Event(event).getUrl();
|
|
64
65
|
// e-tag the event
|
|
65
66
|
tags.push(["e", event.id, hint, mark, event.pubkey]);
|
|
66
67
|
// a-tag the event
|
|
@@ -70,8 +71,8 @@ export const tagEventForReply = (event) => {
|
|
|
70
71
|
return tags;
|
|
71
72
|
};
|
|
72
73
|
export const tagEventForComment = (event) => {
|
|
73
|
-
const pubkeyHint =
|
|
74
|
-
const eventHint =
|
|
74
|
+
const pubkeyHint = Router.get().FromPubkey(event.pubkey).getUrl();
|
|
75
|
+
const eventHint = Router.get().Event(event).getUrl();
|
|
75
76
|
const address = getAddress(event);
|
|
76
77
|
const seenRoots = new Set();
|
|
77
78
|
const tags = [];
|
|
@@ -98,7 +99,7 @@ export const tagEventForComment = (event) => {
|
|
|
98
99
|
return tags;
|
|
99
100
|
};
|
|
100
101
|
export const tagEventForReaction = (event) => {
|
|
101
|
-
const hint =
|
|
102
|
+
const hint = Router.get().Event(event).getUrl();
|
|
102
103
|
const tags = [];
|
|
103
104
|
// Mention the event's author
|
|
104
105
|
if (event.pubkey !== pubkey.get()) {
|
package/build/src/tags.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tags.js","sourceRoot":"","sources":["../../src/tags.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"tags.js","sourceRoot":"","sources":["../../src/tags.ts"],"names":[],"mappings":"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"}
|
package/build/src/thunk.d.ts
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import
|
|
2
|
-
import {
|
|
3
|
-
import
|
|
4
|
-
import
|
|
5
|
-
import { PublishStatus } from "@welshman/net";
|
|
1
|
+
import { Writable, Readable } from "svelte/store";
|
|
2
|
+
import { Deferred, TaskQueue } from "@welshman/lib";
|
|
3
|
+
import { TrustedEvent, EventTemplate, StampedEvent, OwnedEvent } from "@welshman/util";
|
|
4
|
+
import { AdapterContext, PublishStatus } from "@welshman/net";
|
|
6
5
|
export type ThunkEvent = EventTemplate | StampedEvent | OwnedEvent | TrustedEvent;
|
|
7
6
|
export type ThunkRequest = {
|
|
8
7
|
event: ThunkEvent;
|
|
9
8
|
relays: string[];
|
|
10
9
|
delay?: number;
|
|
10
|
+
context?: AdapterContext;
|
|
11
11
|
};
|
|
12
12
|
export type ThunkStatus = {
|
|
13
13
|
message: string;
|
|
@@ -58,4 +58,4 @@ export declare const publishThunks: (requests: ThunkRequest[]) => {
|
|
|
58
58
|
status: Readable<ThunkStatusByUrl>;
|
|
59
59
|
};
|
|
60
60
|
export declare const abortThunk: (thunk: Thunk) => void;
|
|
61
|
-
export declare const
|
|
61
|
+
export declare const thunkQueue: TaskQueue<Thunk>;
|
package/build/src/thunk.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { writable, derived, get } from "svelte/store";
|
|
2
|
-
import {
|
|
2
|
+
import { TaskQueue, dissoc, identity, uniq, defer, sleep, assoc } from "@welshman/lib";
|
|
3
3
|
import { stamp, own, hash } from "@welshman/signer";
|
|
4
4
|
import { isStampedEvent, isOwnedEvent, isHashedEvent, isUnwrappedEvent, isSignedEvent, } from "@welshman/util";
|
|
5
|
-
import {
|
|
5
|
+
import { MultiPublish, PublishStatus, PublishEvent } from "@welshman/net";
|
|
6
6
|
import { repository, tracker } from "./core.js";
|
|
7
7
|
import { pubkey, getSession, getSigner } from "./session.js";
|
|
8
8
|
const { Pending, Success, Failure, Timeout, Aborted } = PublishStatus;
|
|
@@ -65,7 +65,7 @@ export function* walkThunks(thunks) {
|
|
|
65
65
|
export const thunks = writable({});
|
|
66
66
|
export const publishThunk = (request) => {
|
|
67
67
|
const thunk = makeThunk(request);
|
|
68
|
-
|
|
68
|
+
thunkQueue.push(thunk);
|
|
69
69
|
repository.publish(thunk.event);
|
|
70
70
|
thunks.update(assoc(thunk.event.id, thunk));
|
|
71
71
|
thunk.controller.signal.addEventListener("abort", () => {
|
|
@@ -77,7 +77,7 @@ export const publishThunks = (requests) => {
|
|
|
77
77
|
const newThunks = requests.map(makeThunk);
|
|
78
78
|
const mergedThunk = mergeThunks(newThunks);
|
|
79
79
|
for (const thunk of newThunks) {
|
|
80
|
-
|
|
80
|
+
thunkQueue.push(thunk);
|
|
81
81
|
repository.publish(thunk.event);
|
|
82
82
|
thunks.update(assoc(thunk.event.id, mergedThunk));
|
|
83
83
|
thunk.controller.signal.addEventListener("abort", () => {
|
|
@@ -91,70 +91,79 @@ export const abortThunk = (thunk) => {
|
|
|
91
91
|
thunks.update(dissoc(thunk.event.id));
|
|
92
92
|
repository.removeEvent(thunk.event.id);
|
|
93
93
|
};
|
|
94
|
-
export const
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
// If we were given a wrapped event, make sure to publish the wrapper, not the rumor
|
|
101
|
-
if (isUnwrappedEvent(event)) {
|
|
102
|
-
event = event.wrap;
|
|
103
|
-
}
|
|
104
|
-
// Avoid making this function async so multiple publishes can run concurrently
|
|
105
|
-
Promise.resolve().then(async () => {
|
|
106
|
-
const fail = (message) => {
|
|
107
|
-
const status = {};
|
|
108
|
-
for (const url of thunk.request.relays) {
|
|
109
|
-
status[url] = { status: PublishStatus.Failure, message };
|
|
110
|
-
}
|
|
111
|
-
thunk.status.set(status);
|
|
112
|
-
};
|
|
113
|
-
// If the event was already signed, leave it alone. Otherwise, sign it now. This is to
|
|
114
|
-
// decrease apparent latency in the UI that results from waiting for remote signers
|
|
115
|
-
if (!isSignedEvent(event)) {
|
|
116
|
-
const signer = getSigner(getSession(event.pubkey));
|
|
117
|
-
if (!signer) {
|
|
118
|
-
return fail(`No signer found for ${event.pubkey}`);
|
|
119
|
-
}
|
|
120
|
-
try {
|
|
121
|
-
event = await signer.sign(event);
|
|
122
|
-
}
|
|
123
|
-
catch (e) {
|
|
124
|
-
return fail(String(e.error || e));
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
|
-
// We're guaranteed to have a signed event at this point
|
|
128
|
-
const signedEvent = event;
|
|
129
|
-
// Wait if the thunk is to be delayed
|
|
130
|
-
if (thunk.request.delay) {
|
|
131
|
-
await sleep(thunk.request.delay);
|
|
132
|
-
}
|
|
133
|
-
// Skip publishing if aborted
|
|
134
|
-
if (thunk.controller.signal.aborted) {
|
|
94
|
+
export const thunkQueue = new TaskQueue({
|
|
95
|
+
batchSize: 50,
|
|
96
|
+
processItem: (thunk) => {
|
|
97
|
+
let event = thunk.event;
|
|
98
|
+
// Handle abort immediately if possible
|
|
99
|
+
if (thunk.controller.signal.aborted)
|
|
135
100
|
return;
|
|
101
|
+
// If we were given a wrapped event, make sure to publish the wrapper, not the rumor
|
|
102
|
+
if (isUnwrappedEvent(event)) {
|
|
103
|
+
event = event.wrap;
|
|
136
104
|
}
|
|
137
|
-
//
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
if (
|
|
149
|
-
|
|
105
|
+
// Avoid making this function async so multiple publishes can run concurrently
|
|
106
|
+
Promise.resolve().then(async () => {
|
|
107
|
+
const fail = (message) => {
|
|
108
|
+
const status = {};
|
|
109
|
+
for (const url of thunk.request.relays) {
|
|
110
|
+
status[url] = { status: PublishStatus.Failure, message };
|
|
111
|
+
}
|
|
112
|
+
thunk.status.set(status);
|
|
113
|
+
};
|
|
114
|
+
// If the event was already signed, leave it alone. Otherwise, sign it now. This is to
|
|
115
|
+
// decrease apparent latency in the UI that results from waiting for remote signers
|
|
116
|
+
if (!isSignedEvent(event)) {
|
|
117
|
+
const signer = getSigner(getSession(event.pubkey));
|
|
118
|
+
if (!signer) {
|
|
119
|
+
return fail(`No signer found for ${event.pubkey}`);
|
|
120
|
+
}
|
|
121
|
+
try {
|
|
122
|
+
event = await signer.sign(event);
|
|
123
|
+
}
|
|
124
|
+
catch (e) {
|
|
125
|
+
return fail(String(e.error || e));
|
|
126
|
+
}
|
|
150
127
|
}
|
|
151
|
-
|
|
152
|
-
|
|
128
|
+
// We're guaranteed to have a signed event at this point
|
|
129
|
+
const signedEvent = event;
|
|
130
|
+
// Wait if the thunk is to be delayed
|
|
131
|
+
if (thunk.request.delay) {
|
|
132
|
+
await sleep(thunk.request.delay);
|
|
153
133
|
}
|
|
154
|
-
|
|
155
|
-
|
|
134
|
+
// Skip publishing if aborted
|
|
135
|
+
if (thunk.controller.signal.aborted) {
|
|
136
|
+
return;
|
|
137
|
+
}
|
|
138
|
+
// Send it off
|
|
139
|
+
const pub = new MultiPublish({
|
|
140
|
+
event: signedEvent,
|
|
141
|
+
relays: thunk.request.relays,
|
|
142
|
+
context: thunk.request.context,
|
|
143
|
+
});
|
|
144
|
+
// Copy the signature over since we had deferred it
|
|
145
|
+
const savedEvent = repository.getEvent(signedEvent.id);
|
|
146
|
+
// The event may already be replaced or deleted
|
|
147
|
+
if (savedEvent) {
|
|
148
|
+
savedEvent.sig = signedEvent.sig;
|
|
156
149
|
}
|
|
150
|
+
pub.on(PublishEvent.Success, (id, message, url) => {
|
|
151
|
+
tracker.track(id, url);
|
|
152
|
+
thunk.status.update(assoc(url, { status: PublishStatus.Success, message }));
|
|
153
|
+
});
|
|
154
|
+
pub.on(PublishEvent.Failure, (id, message, url) => {
|
|
155
|
+
thunk.status.update(assoc(url, { status: PublishStatus.Failure, message }));
|
|
156
|
+
});
|
|
157
|
+
pub.on(PublishEvent.Timeout, (url) => {
|
|
158
|
+
thunk.status.update(assoc(url, { status: PublishStatus.Timeout, message: "Publish timed out" }));
|
|
159
|
+
});
|
|
160
|
+
pub.on(PublishEvent.Aborted, (url) => {
|
|
161
|
+
thunk.status.update(assoc(url, { status: PublishStatus.Aborted, message: "Publish was aborted" }));
|
|
162
|
+
});
|
|
163
|
+
pub.on(PublishEvent.Complete, () => {
|
|
164
|
+
thunk.result.resolve(get(thunk.status));
|
|
165
|
+
});
|
|
157
166
|
});
|
|
158
|
-
}
|
|
167
|
+
},
|
|
159
168
|
});
|
|
160
169
|
//# sourceMappingURL=thunk.js.map
|
package/build/src/thunk.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thunk.js","sourceRoot":"","sources":["../../src/thunk.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"thunk.js","sourceRoot":"","sources":["../../src/thunk.ts"],"names":[],"mappings":"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"}
|
package/build/src/zappers.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { Zapper } from "@welshman/util";
|
|
2
|
+
import { MultiRequestOptions } from "@welshman/net";
|
|
3
3
|
export declare const zappers: import("svelte/store").Writable<Zapper[]>;
|
|
4
4
|
export declare const fetchZappers: (lnurls: string[]) => Promise<Map<string, Zapper>>;
|
|
5
5
|
export declare const zappersByLnurl: import("@welshman/store").ReadableWithGetter<Map<string, Zapper>>, deriveZapper: (key: import("@welshman/lib").Maybe<string>) => import("svelte/store").Readable<Zapper | undefined>, loadZapper: (key: string) => Promise<Zapper | undefined>;
|
|
6
|
-
export declare const deriveZapperForPubkey: (pubkey: string, request?: Partial<
|
|
6
|
+
export declare const deriveZapperForPubkey: (pubkey: string, request?: Partial<MultiRequestOptions>) => import("svelte/store").Readable<Zapper | undefined>;
|
package/build/src/zappers.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { writable, derived } from "svelte/store";
|
|
2
|
-
import {
|
|
2
|
+
import { identity, fetchJson, uniq, bech32ToHex, hexToBech32, tryCatch, batcher, postJson, } from "@welshman/lib";
|
|
3
3
|
import { collection } from "./collection.js";
|
|
4
4
|
import { deriveProfile } from "./profiles.js";
|
|
5
|
+
import { appContext } from "./context.js";
|
|
5
6
|
export const zappers = writable([]);
|
|
6
7
|
export const fetchZappers = async (lnurls) => {
|
|
7
|
-
const base =
|
|
8
|
+
const base = appContext.dufflepudUrl;
|
|
8
9
|
const zappersByLnurl = new Map();
|
|
9
10
|
// Use dufflepud if we it's set up to protect user privacy, otherwise fetch directly
|
|
10
11
|
if (base) {
|
package/build/src/zappers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zappers.js","sourceRoot":"","sources":["../../src/zappers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,OAAO,EAAC,MAAM,cAAc,CAAA;AAG9C,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"zappers.js","sourceRoot":"","sources":["../../src/zappers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,OAAO,EAAC,MAAM,cAAc,CAAA;AAG9C,OAAO,EACL,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,WAAW,EACX,WAAW,EACX,QAAQ,EACR,OAAO,EACP,QAAQ,GACT,MAAM,eAAe,CAAA;AACtB,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAC,aAAa,EAAC,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAA;AAEvC,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAW,EAAE,CAAC,CAAA;AAE7C,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,MAAgB,EAAE,EAAE;IACrD,MAAM,IAAI,GAAG,UAAU,CAAC,YAAY,CAAA;IACpC,MAAM,cAAc,GAAG,IAAI,GAAG,EAAkB,CAAA;IAEhD,oFAAoF;IACpF,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QAExF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,MAAM,GAAG,GAAQ,MAAM,QAAQ,CAC7B,KAAK,IAAI,EAAE,CAAC,MAAM,QAAQ,CAAC,GAAG,IAAI,cAAc,EAAE,EAAC,MAAM,EAAE,OAAO,EAAC,CAAC,CACrE,CAAA;YAED,KAAK,MAAM,EAAC,KAAK,EAAE,IAAI,EAAC,IAAI,GAAG,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC;gBAC5C,QAAQ,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC,CAAA;YACvE,CAAC;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,MAAM,CAAC,GAAG,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;YACvB,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAA;YACjD,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YAErF,OAAO,EAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAC,CAAA;QAC9B,CAAC,CAAC,CACH,CAAA;QAED,KAAK,MAAM,EAAC,KAAK,EAAE,IAAI,EAAC,IAAI,OAAO,EAAE,CAAC;YACpC,IAAI,IAAI,EAAE,CAAC;gBACT,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;YACjC,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,cAAc,CAAA;AACvB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,EACX,UAAU,EAAE,cAAc,EAC1B,UAAU,EAAE,YAAY,EACxB,QAAQ,EAAE,UAAU,GACrB,GAAG,UAAU,CAAC;IACb,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK;IACxC,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,MAAgB,EAAE,EAAE;QAC5C,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;QAC9C,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,EAAE,CAAA;QAElC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;YAElC,IAAI,SAAS,EAAE,CAAC;gBACd,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,EAAC,GAAG,SAAS,EAAE,KAAK,EAAC,CAAC,CAAA;YACzC,CAAC;QACH,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;QAEvC,OAAO,MAAM,CAAA;IACf,CAAC,CAAC;CACH,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,MAAc,EAAE,UAAwC,EAAE,EAAE,EAAE,CAClG,OAAO,CAAC,CAAC,cAAc,EAAE,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,eAAe,EAAE,QAAQ,CAAC,EAAE,EAAE;IACxF,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC;QACrB,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAE1B,OAAO,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;AAC5C,CAAC,CAAC,CAAA"}
|