@welshman/app 0.0.29 → 0.0.31
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/core.cjs +3 -3
- package/build/src/core.cjs.map +1 -1
- package/build/src/core.mjs +4 -4
- package/build/src/core.mjs.map +1 -1
- package/build/src/feeds.cjs +23 -3
- package/build/src/feeds.cjs.map +1 -1
- package/build/src/feeds.mjs +25 -5
- package/build/src/feeds.mjs.map +1 -1
- package/build/src/session.cjs +3 -2
- package/build/src/session.cjs.map +1 -1
- package/build/src/session.d.ts +27 -7
- package/build/src/session.mjs +3 -2
- package/build/src/session.mjs.map +1 -1
- package/package.json +6 -6
package/build/src/core.cjs
CHANGED
|
@@ -50,7 +50,7 @@ const subscribe = (request) => {
|
|
|
50
50
|
// Keep cached results async so the caller can set up handlers
|
|
51
51
|
setTimeout(() => {
|
|
52
52
|
for (const event of events) {
|
|
53
|
-
sub.emitter.emit(
|
|
53
|
+
sub.emitter.emit(net_1.SubscriptionEvent.Event, util_1.LOCAL_RELAY_URL, event);
|
|
54
54
|
}
|
|
55
55
|
});
|
|
56
56
|
return sub;
|
|
@@ -59,8 +59,8 @@ exports.subscribe = subscribe;
|
|
|
59
59
|
const load = (request) => new Promise(resolve => {
|
|
60
60
|
const sub = (0, exports.subscribe)({ closeOnEose: true, timeout: lib_1.ctx.app.requestTimeout, ...request });
|
|
61
61
|
const events = [];
|
|
62
|
-
sub.emitter.on(
|
|
63
|
-
sub.emitter.on(
|
|
62
|
+
sub.emitter.on(net_1.SubscriptionEvent.Event, (url, e) => events.push(e));
|
|
63
|
+
sub.emitter.on(net_1.SubscriptionEvent.Complete, () => resolve(events));
|
|
64
64
|
});
|
|
65
65
|
exports.load = load;
|
|
66
66
|
//# sourceMappingURL=core.cjs.map
|
package/build/src/core.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.cjs","sourceRoot":"","sources":["../../src/core.ts"],"names":[],"mappings":";;;AAAA,uCAAwC;AACxC,yCAA6F;AAE7F,
|
|
1
|
+
{"version":3,"file":"core.cjs","sourceRoot":"","sources":["../../src/core.ts"],"names":[],"mappings":"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"}
|
package/build/src/core.mjs
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ctx, isNil } from "@welshman/lib";
|
|
2
2
|
import { Repository, Relay, LOCAL_RELAY_URL, getFilterResultCardinality } from "@welshman/util";
|
|
3
|
-
import { Tracker, subscribe as baseSubscribe } from "@welshman/net";
|
|
3
|
+
import { Tracker, subscribe as baseSubscribe, SubscriptionEvent } from "@welshman/net";
|
|
4
4
|
import { custom } from "@welshman/store";
|
|
5
5
|
export const repository = new Repository();
|
|
6
6
|
export const repositoryStore = custom(setter => {
|
|
@@ -47,7 +47,7 @@ export const subscribe = (request) => {
|
|
|
47
47
|
// Keep cached results async so the caller can set up handlers
|
|
48
48
|
setTimeout(() => {
|
|
49
49
|
for (const event of events) {
|
|
50
|
-
sub.emitter.emit(
|
|
50
|
+
sub.emitter.emit(SubscriptionEvent.Event, LOCAL_RELAY_URL, event);
|
|
51
51
|
}
|
|
52
52
|
});
|
|
53
53
|
return sub;
|
|
@@ -55,7 +55,7 @@ export const subscribe = (request) => {
|
|
|
55
55
|
export const load = (request) => new Promise(resolve => {
|
|
56
56
|
const sub = subscribe({ closeOnEose: true, timeout: ctx.app.requestTimeout, ...request });
|
|
57
57
|
const events = [];
|
|
58
|
-
sub.emitter.on(
|
|
59
|
-
sub.emitter.on(
|
|
58
|
+
sub.emitter.on(SubscriptionEvent.Event, (url, e) => events.push(e));
|
|
59
|
+
sub.emitter.on(SubscriptionEvent.Complete, () => resolve(events));
|
|
60
60
|
});
|
|
61
61
|
//# sourceMappingURL=core.mjs.map
|
package/build/src/core.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.mjs","sourceRoot":"","sources":["../../src/core.ts"],"names":[],"mappings":"OAAO,EAAC,GAAG,EAAE,KAAK,EAAC,MAAM,eAAe;OACjC,EAAC,UAAU,EAAE,KAAK,EAAE,eAAe,EAAE,0BAA0B,EAAC,MAAM,gBAAgB;OAEtF,EAAC,OAAO,EAAE,SAAS,IAAI,aAAa,EAAC,MAAM,eAAe;
|
|
1
|
+
{"version":3,"file":"core.mjs","sourceRoot":"","sources":["../../src/core.ts"],"names":[],"mappings":"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"}
|
package/build/src/feeds.cjs
CHANGED
|
@@ -8,6 +8,7 @@ const dvm_1 = require("@welshman/dvm");
|
|
|
8
8
|
const signer_1 = require("@welshman/signer");
|
|
9
9
|
const session_1 = require("./session.cjs");
|
|
10
10
|
const router_1 = require("./router.cjs");
|
|
11
|
+
const relaySelections_1 = require("./relaySelections.cjs");
|
|
11
12
|
const wot_1 = require("./wot.cjs");
|
|
12
13
|
const core_1 = require("./core.cjs");
|
|
13
14
|
const request = async ({ filters = [{}], relays = [], onEvent }) => {
|
|
@@ -21,15 +22,34 @@ const request = async ({ filters = [{}], relays = [], onEvent }) => {
|
|
|
21
22
|
};
|
|
22
23
|
exports.request = request;
|
|
23
24
|
const requestDVM = async ({ kind, onEvent, ...request }) => {
|
|
24
|
-
|
|
25
|
+
// Make sure we know what relays to use for target dvms
|
|
26
|
+
if (request.tags && !request.relays) {
|
|
27
|
+
for (const pubkey of (0, util_1.getPubkeyTagValues)(request.tags)) {
|
|
28
|
+
await (0, relaySelections_1.loadRelaySelections)(pubkey);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
const tags = request.tags || [];
|
|
25
32
|
const $signer = session_1.signer.get() || new signer_1.Nip01Signer((0, signer_1.makeSecret)());
|
|
26
|
-
const
|
|
33
|
+
const pubkey = await $signer.getPubkey();
|
|
27
34
|
const relays = request.relays
|
|
28
35
|
? lib_1.ctx.app.router.FromRelays(request.relays).getUrls()
|
|
29
36
|
: lib_1.ctx.app.router.FromPubkeys((0, util_1.getPubkeyTagValues)(tags)).getUrls();
|
|
37
|
+
if (!tags.some((0, lib_1.nthEq)(0, 'expiration'))) {
|
|
38
|
+
tags.push(["expiration", String((0, lib_1.now)() + 60)]);
|
|
39
|
+
}
|
|
40
|
+
if (!tags.some((0, lib_1.nthEq)(0, 'relays'))) {
|
|
41
|
+
tags.push(["relays", ...relays]);
|
|
42
|
+
}
|
|
43
|
+
if (!tags.some((0, lib_1.nthEq)(1, 'user'))) {
|
|
44
|
+
tags.push(["param", "user", pubkey]);
|
|
45
|
+
}
|
|
46
|
+
if (!tags.some((0, lib_1.nthEq)(1, 'max_results'))) {
|
|
47
|
+
tags.push(["param", "max_results", "200"]);
|
|
48
|
+
}
|
|
49
|
+
const event = await $signer.sign((0, util_1.createEvent)(kind, { tags }));
|
|
30
50
|
const req = (0, dvm_1.makeDvmRequest)({ event, relays });
|
|
31
51
|
await new Promise(resolve => {
|
|
32
|
-
req.emitter.on(
|
|
52
|
+
req.emitter.on(dvm_1.DVMEvent.Result, (url, event) => {
|
|
33
53
|
onEvent(event);
|
|
34
54
|
resolve();
|
|
35
55
|
});
|
package/build/src/feeds.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feeds.cjs","sourceRoot":"","sources":["../../src/feeds.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"feeds.cjs","sourceRoot":"","sources":["../../src/feeds.ts"],"names":[],"mappings":"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"}
|
package/build/src/feeds.mjs
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { ctx, now } from '@welshman/lib';
|
|
1
|
+
import { ctx, nthEq, now } from '@welshman/lib';
|
|
2
2
|
import { createEvent, getPubkeyTagValues } from '@welshman/util';
|
|
3
3
|
import { Scope, FeedController } from '@welshman/feeds';
|
|
4
|
-
import { makeDvmRequest } from '@welshman/dvm';
|
|
4
|
+
import { makeDvmRequest, DVMEvent } from '@welshman/dvm';
|
|
5
5
|
import { makeSecret, Nip01Signer } from '@welshman/signer';
|
|
6
6
|
import { pubkey, signer } from "./session.mjs";
|
|
7
7
|
import { getFilterSelections } from "./router.mjs";
|
|
8
|
+
import { loadRelaySelections } from "./relaySelections.mjs";
|
|
8
9
|
import { wotGraph, maxWot, getFollows, getNetwork, getFollowers } from "./wot.mjs";
|
|
9
10
|
import { load } from "./core.mjs";
|
|
10
11
|
export const request = async ({ filters = [{}], relays = [], onEvent }) => {
|
|
@@ -17,15 +18,34 @@ export const request = async ({ filters = [{}], relays = [], onEvent }) => {
|
|
|
17
18
|
}
|
|
18
19
|
};
|
|
19
20
|
export const requestDVM = async ({ kind, onEvent, ...request }) => {
|
|
20
|
-
|
|
21
|
+
// Make sure we know what relays to use for target dvms
|
|
22
|
+
if (request.tags && !request.relays) {
|
|
23
|
+
for (const pubkey of getPubkeyTagValues(request.tags)) {
|
|
24
|
+
await loadRelaySelections(pubkey);
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
const tags = request.tags || [];
|
|
21
28
|
const $signer = signer.get() || new Nip01Signer(makeSecret());
|
|
22
|
-
const
|
|
29
|
+
const pubkey = await $signer.getPubkey();
|
|
23
30
|
const relays = request.relays
|
|
24
31
|
? ctx.app.router.FromRelays(request.relays).getUrls()
|
|
25
32
|
: ctx.app.router.FromPubkeys(getPubkeyTagValues(tags)).getUrls();
|
|
33
|
+
if (!tags.some(nthEq(0, 'expiration'))) {
|
|
34
|
+
tags.push(["expiration", String(now() + 60)]);
|
|
35
|
+
}
|
|
36
|
+
if (!tags.some(nthEq(0, 'relays'))) {
|
|
37
|
+
tags.push(["relays", ...relays]);
|
|
38
|
+
}
|
|
39
|
+
if (!tags.some(nthEq(1, 'user'))) {
|
|
40
|
+
tags.push(["param", "user", pubkey]);
|
|
41
|
+
}
|
|
42
|
+
if (!tags.some(nthEq(1, 'max_results'))) {
|
|
43
|
+
tags.push(["param", "max_results", "200"]);
|
|
44
|
+
}
|
|
45
|
+
const event = await $signer.sign(createEvent(kind, { tags }));
|
|
26
46
|
const req = makeDvmRequest({ event, relays });
|
|
27
47
|
await new Promise(resolve => {
|
|
28
|
-
req.emitter.on(
|
|
48
|
+
req.emitter.on(DVMEvent.Result, (url, event) => {
|
|
29
49
|
onEvent(event);
|
|
30
50
|
resolve();
|
|
31
51
|
});
|
package/build/src/feeds.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feeds.mjs","sourceRoot":"","sources":["../../src/feeds.ts"],"names":[],"mappings":"OAAO,EAAC,GAAG,EAAE,GAAG,EAAC,MAAM,eAAe;
|
|
1
|
+
{"version":3,"file":"feeds.mjs","sourceRoot":"","sources":["../../src/feeds.ts"],"names":[],"mappings":"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"}
|
package/build/src/session.cjs
CHANGED
|
@@ -37,8 +37,9 @@ exports.getSigner = (0, lib_1.cached)({
|
|
|
37
37
|
return new signer_1.Nip01Signer(session.secret);
|
|
38
38
|
case "nip46":
|
|
39
39
|
return new signer_1.Nip46Signer(signer_1.Nip46Broker.get({
|
|
40
|
-
|
|
41
|
-
|
|
40
|
+
clientSecret: session.secret,
|
|
41
|
+
relays: session.handler.relays,
|
|
42
|
+
signerPubkey: session.handler.pubkey,
|
|
42
43
|
}));
|
|
43
44
|
case "nip55":
|
|
44
45
|
return new signer_1.Nip55Signer(session.signer);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.cjs","sourceRoot":"","sources":["../../src/session.ts"],"names":[],"mappings":";;;AAAA,wCAAoC;AACpC,uCAA+D;AAC/D,2CAAkD;
|
|
1
|
+
{"version":3,"file":"session.cjs","sourceRoot":"","sources":["../../src/session.ts"],"names":[],"mappings":"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"}
|
package/build/src/session.d.ts
CHANGED
|
@@ -1,13 +1,33 @@
|
|
|
1
|
-
import { type Nip46Handler } from "@welshman/signer";
|
|
2
1
|
import { Nip46Signer, Nip07Signer, Nip01Signer, Nip55Signer } from "@welshman/signer";
|
|
3
|
-
export type
|
|
4
|
-
method:
|
|
2
|
+
export type SessionNip01 = {
|
|
3
|
+
method: 'nip01';
|
|
5
4
|
pubkey: string;
|
|
6
|
-
|
|
7
|
-
secret?: string;
|
|
8
|
-
handler?: Nip46Handler;
|
|
9
|
-
signer?: string;
|
|
5
|
+
secret: string;
|
|
10
6
|
};
|
|
7
|
+
export type SessionNip07 = {
|
|
8
|
+
method: 'nip07';
|
|
9
|
+
pubkey: string;
|
|
10
|
+
};
|
|
11
|
+
export type SessionNip46 = {
|
|
12
|
+
method: 'nip46';
|
|
13
|
+
pubkey: string;
|
|
14
|
+
secret: string;
|
|
15
|
+
handler: {
|
|
16
|
+
pubkey: string;
|
|
17
|
+
relays: string[];
|
|
18
|
+
};
|
|
19
|
+
};
|
|
20
|
+
export type SessionNip55 = {
|
|
21
|
+
method: 'nip55';
|
|
22
|
+
pubkey: string;
|
|
23
|
+
signer: string;
|
|
24
|
+
};
|
|
25
|
+
export type SessionPubkey = {
|
|
26
|
+
method: 'pubkey';
|
|
27
|
+
pubkey: string;
|
|
28
|
+
};
|
|
29
|
+
export type SessionAnyMethod = SessionNip01 | SessionNip07 | SessionNip46 | SessionNip55 | SessionPubkey;
|
|
30
|
+
export type Session = SessionAnyMethod & Record<string, any>;
|
|
11
31
|
export declare const pubkey: import("@welshman/store").WritableWithGetter<string | null>;
|
|
12
32
|
export declare const sessions: import("@welshman/store").WritableWithGetter<Record<string, Session>>;
|
|
13
33
|
export declare const session: import("@welshman/store").ReadableWithGetter<Session | null>;
|
package/build/src/session.mjs
CHANGED
|
@@ -29,8 +29,9 @@ export const getSigner = cached({
|
|
|
29
29
|
return new Nip01Signer(session.secret);
|
|
30
30
|
case "nip46":
|
|
31
31
|
return new Nip46Signer(Nip46Broker.get({
|
|
32
|
-
|
|
33
|
-
|
|
32
|
+
clientSecret: session.secret,
|
|
33
|
+
relays: session.handler.relays,
|
|
34
|
+
signerPubkey: session.handler.pubkey,
|
|
34
35
|
}));
|
|
35
36
|
case "nip55":
|
|
36
37
|
return new Nip55Signer(session.signer);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.mjs","sourceRoot":"","sources":["../../src/session.ts"],"names":[],"mappings":"OAAO,EAAC,OAAO,EAAC,MAAM,cAAc;OAC7B,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAC,MAAM,eAAe;OACxD,EAAC,UAAU,EAAE,MAAM,EAAC,MAAM,iBAAiB;
|
|
1
|
+
{"version":3,"file":"session.mjs","sourceRoot":"","sources":["../../src/session.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@welshman/app",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.31",
|
|
4
4
|
"author": "hodlbod",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"description": "A collection of svelte stores for use in building nostr client applications.",
|
|
@@ -31,13 +31,13 @@
|
|
|
31
31
|
"typescript": "~5.1.6"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@welshman/lib": "~0.0.
|
|
35
|
-
"@welshman/feeds": "~0.0.
|
|
34
|
+
"@welshman/lib": "~0.0.28",
|
|
35
|
+
"@welshman/feeds": "~0.0.26",
|
|
36
36
|
"@welshman/dvm": "~0.0.10",
|
|
37
|
-
"@welshman/net": "~0.0.
|
|
38
|
-
"@welshman/signer": "~0.0.
|
|
37
|
+
"@welshman/net": "~0.0.39",
|
|
38
|
+
"@welshman/signer": "~0.0.16",
|
|
39
39
|
"@welshman/store": "~0.0.12",
|
|
40
|
-
"@welshman/util": "~0.0.
|
|
40
|
+
"@welshman/util": "~0.0.46",
|
|
41
41
|
"fuse.js": "^7.0.0",
|
|
42
42
|
"idb": "^8.0.0",
|
|
43
43
|
"svelte": "^4.2.18",
|