@welshman/app 0.6.1 → 0.6.3
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 +1 -0
- package/dist/app/src/index.d.ts.map +1 -1
- package/dist/app/src/index.js +6 -4
- package/dist/app/src/index.js.map +1 -1
- package/dist/app/src/relayStats.d.ts +29 -0
- package/dist/app/src/relayStats.d.ts.map +1 -0
- package/dist/app/src/relayStats.js +183 -0
- package/dist/app/src/relayStats.js.map +1 -0
- package/dist/app/src/relays.d.ts +2 -32
- package/dist/app/src/relays.d.ts.map +1 -1
- package/dist/app/src/relays.js +5 -189
- package/dist/app/src/relays.js.map +1 -1
- package/dist/app/src/search.d.ts +2 -3
- package/dist/app/src/search.d.ts.map +1 -1
- package/dist/app/src/search.js.map +1 -1
- package/dist/app/src/sync.js +4 -4
- package/dist/app/src/sync.js.map +1 -1
- package/dist/lib/src/Tools.d.ts +1 -1
- package/dist/lib/src/Tools.d.ts.map +1 -1
- package/dist/lib/src/Tools.js.map +1 -1
- package/dist/net/src/adapter.d.ts +1 -1
- package/dist/net/src/adapter.d.ts.map +1 -1
- package/dist/net/src/adapter.js +1 -1
- package/dist/net/src/adapter.js.map +1 -1
- package/dist/net/src/diff.d.ts +2 -2
- package/dist/net/src/diff.d.ts.map +1 -1
- package/dist/net/src/diff.js +8 -2
- package/dist/net/src/diff.js.map +1 -1
- package/dist/net/src/repository.d.ts +1 -0
- package/dist/net/src/repository.d.ts.map +1 -1
- package/dist/net/src/repository.js +15 -4
- package/dist/net/src/repository.js.map +1 -1
- package/dist/net/src/socket.d.ts +1 -0
- package/dist/net/src/socket.d.ts.map +1 -1
- package/dist/net/src/socket.js +3 -2
- package/dist/net/src/socket.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +8 -8
package/dist/app/src/index.d.ts
CHANGED
|
@@ -10,6 +10,7 @@ export * from "./plaintext.js";
|
|
|
10
10
|
export * from "./profiles.js";
|
|
11
11
|
export * from "./pins.js";
|
|
12
12
|
export * from "./relays.js";
|
|
13
|
+
export * from "./relayStats.js";
|
|
13
14
|
export * from "./relaySelections.js";
|
|
14
15
|
export * from "./inboxRelaySelections.js";
|
|
15
16
|
export * from "./search.js";
|
|
@@ -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,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,iBAAiB,CAAA;AAC/B,cAAc,sBAAsB,CAAA;AACpC,cAAc,2BAA2B,CAAA;AACzC,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,cAAc,CAAA;AAI5B,OAAO,EAIL,SAAS,EAGV,MAAM,gBAAgB,CAAA;AAoDvB,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
|
@@ -10,6 +10,7 @@ export * from "./plaintext.js";
|
|
|
10
10
|
export * from "./profiles.js";
|
|
11
11
|
export * from "./pins.js";
|
|
12
12
|
export * from "./relays.js";
|
|
13
|
+
export * from "./relayStats.js";
|
|
13
14
|
export * from "./relaySelections.js";
|
|
14
15
|
export * from "./inboxRelaySelections.js";
|
|
15
16
|
export * from "./search.js";
|
|
@@ -22,13 +23,14 @@ export * from "./user.js";
|
|
|
22
23
|
export * from "./wot.js";
|
|
23
24
|
export * from "./zappers.js";
|
|
24
25
|
import { derived } from "svelte/store";
|
|
25
|
-
import { sortBy, throttleWithValue
|
|
26
|
-
import { isEphemeralKind, isDVMKind, WRAP, RelayMode, getRelaysFromList } from "@welshman/util";
|
|
26
|
+
import { sortBy, throttleWithValue } from "@welshman/lib";
|
|
27
|
+
import { isEphemeralKind, isDVMKind, WRAP, RelayMode, getRelaysFromList, } from "@welshman/util";
|
|
27
28
|
import { routerContext } from "@welshman/router";
|
|
28
29
|
import { Pool, SocketEvent, isRelayEvent, netContext } from "@welshman/net";
|
|
29
30
|
import { pubkey, unwrapAndStore } from "./session.js";
|
|
30
31
|
import { repository, tracker } from "./core.js";
|
|
31
|
-
import { relays, loadRelay
|
|
32
|
+
import { relays, loadRelay } from "./relays.js";
|
|
33
|
+
import { trackRelayStats, getRelayQuality } from "./relayStats.js";
|
|
32
34
|
import { relaySelectionsByPubkey } from "./relaySelections.js";
|
|
33
35
|
import { inboxRelaySelectionsByPubkey } from "./inboxRelaySelections.js";
|
|
34
36
|
// Sync relays with our database
|
|
@@ -73,5 +75,5 @@ routerContext.getPubkeyRelays = getPubkeyRelays;
|
|
|
73
75
|
routerContext.getRelayQuality = getRelayQuality;
|
|
74
76
|
routerContext.getDefaultRelays = _relayGetter();
|
|
75
77
|
routerContext.getIndexerRelays = _relayGetter();
|
|
76
|
-
routerContext.getSearchRelays = _relayGetter(r =>
|
|
78
|
+
routerContext.getSearchRelays = _relayGetter(r => r?.supported_nips?.includes?.(50));
|
|
77
79
|
//# sourceMappingURL=index.js.map
|
|
@@ -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,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,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import { Socket } from "@welshman/net";
|
|
2
|
+
export type RelayStats = {
|
|
3
|
+
url: string;
|
|
4
|
+
first_seen: number;
|
|
5
|
+
recent_errors: number[];
|
|
6
|
+
open_count: number;
|
|
7
|
+
close_count: number;
|
|
8
|
+
publish_count: number;
|
|
9
|
+
request_count: number;
|
|
10
|
+
event_count: number;
|
|
11
|
+
last_open: number;
|
|
12
|
+
last_close: number;
|
|
13
|
+
last_error: number;
|
|
14
|
+
last_publish: number;
|
|
15
|
+
last_request: number;
|
|
16
|
+
last_event: number;
|
|
17
|
+
last_auth: number;
|
|
18
|
+
publish_success_count: number;
|
|
19
|
+
publish_failure_count: number;
|
|
20
|
+
eose_count: number;
|
|
21
|
+
notice_count: number;
|
|
22
|
+
};
|
|
23
|
+
export declare const makeRelayStats: (url: string) => RelayStats;
|
|
24
|
+
export declare const relayStats: import("@welshman/store").WritableWithGetter<RelayStats[]>;
|
|
25
|
+
export declare const relayStatsByUrl: import("@welshman/store").ReadableWithGetter<Map<unknown, RelayStats>>;
|
|
26
|
+
export declare const deriveRelayStats: (url: string) => import("svelte/store").Readable<RelayStats | undefined>;
|
|
27
|
+
export declare const getRelayQuality: (url: string) => 1 | 0 | 0.8 | 0.9 | 0.7;
|
|
28
|
+
export declare const trackRelayStats: (socket: Socket) => () => void;
|
|
29
|
+
//# sourceMappingURL=relayStats.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"relayStats.d.ts","sourceRoot":"","sources":["../../../src/relayStats.ts"],"names":[],"mappings":"AAIA,OAAO,EAAO,MAAM,EAAyD,MAAM,eAAe,CAAA;AAElG,MAAM,MAAM,UAAU,GAAG;IACvB,GAAG,EAAE,MAAM,CAAA;IACX,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,GAAI,KAAK,MAAM,KAAG,UAoB3C,CAAA;AAEF,eAAO,MAAM,UAAU,4DAAyC,CAAA;AAEhE,eAAO,MAAM,eAAe,wEAE3B,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,KAAK,MAAM,4DAC6B,CAAA;AAEzE,eAAO,MAAM,eAAe,GAAI,KAAK,MAAM,4BA0B1C,CAAA;AAgID,eAAO,MAAM,eAAe,GAAI,QAAQ,MAAM,eAU7C,CAAA"}
|
|
@@ -0,0 +1,183 @@
|
|
|
1
|
+
import { writable, derived } from "svelte/store";
|
|
2
|
+
import { withGetter } from "@welshman/store";
|
|
3
|
+
import { prop, groupBy, indexBy, batch, now, uniq, ago, DAY, HOUR, MINUTE } from "@welshman/lib";
|
|
4
|
+
import { isOnionUrl, isLocalUrl, isIPAddress, isRelayUrl } from "@welshman/util";
|
|
5
|
+
import { Pool, SocketStatus, SocketEvent } from "@welshman/net";
|
|
6
|
+
export const makeRelayStats = (url) => ({
|
|
7
|
+
url,
|
|
8
|
+
first_seen: now(),
|
|
9
|
+
recent_errors: [],
|
|
10
|
+
open_count: 0,
|
|
11
|
+
close_count: 0,
|
|
12
|
+
publish_count: 0,
|
|
13
|
+
request_count: 0,
|
|
14
|
+
event_count: 0,
|
|
15
|
+
last_open: 0,
|
|
16
|
+
last_close: 0,
|
|
17
|
+
last_error: 0,
|
|
18
|
+
last_publish: 0,
|
|
19
|
+
last_request: 0,
|
|
20
|
+
last_event: 0,
|
|
21
|
+
last_auth: 0,
|
|
22
|
+
publish_success_count: 0,
|
|
23
|
+
publish_failure_count: 0,
|
|
24
|
+
eose_count: 0,
|
|
25
|
+
notice_count: 0,
|
|
26
|
+
});
|
|
27
|
+
export const relayStats = withGetter(writable([]));
|
|
28
|
+
export const relayStatsByUrl = withGetter(derived(relayStats, $relayStats => indexBy(prop("url"), $relayStats)));
|
|
29
|
+
export const deriveRelayStats = (url) => derived(relayStatsByUrl, $relayStatsByUrl => $relayStatsByUrl.get(url));
|
|
30
|
+
export const getRelayQuality = (url) => {
|
|
31
|
+
// Skip non-relays entirely
|
|
32
|
+
if (!isRelayUrl(url))
|
|
33
|
+
return 0;
|
|
34
|
+
const relayStats = relayStatsByUrl.get().get(url);
|
|
35
|
+
// If we have recent errors, skip it
|
|
36
|
+
if (relayStats) {
|
|
37
|
+
if (relayStats.recent_errors.filter(n => n > ago(MINUTE)).length > 0)
|
|
38
|
+
return 0;
|
|
39
|
+
if (relayStats.recent_errors.filter(n => n > ago(HOUR)).length > 3)
|
|
40
|
+
return 0;
|
|
41
|
+
if (relayStats.recent_errors.filter(n => n > ago(DAY)).length > 10)
|
|
42
|
+
return 0;
|
|
43
|
+
}
|
|
44
|
+
// Prefer stuff we're connected to
|
|
45
|
+
if (Pool.get().has(url))
|
|
46
|
+
return 1;
|
|
47
|
+
// Prefer stuff we've connected to in the past
|
|
48
|
+
if (relayStats)
|
|
49
|
+
return 0.9;
|
|
50
|
+
// If it's not weird url give it an ok score
|
|
51
|
+
if (!isIPAddress(url) && !isLocalUrl(url) && !isOnionUrl(url) && !url.startsWith("ws://")) {
|
|
52
|
+
return 0.8;
|
|
53
|
+
}
|
|
54
|
+
// Default to a "meh" score
|
|
55
|
+
return 0.7;
|
|
56
|
+
};
|
|
57
|
+
const updateRelayStats = batch(500, (updates) => {
|
|
58
|
+
relayStats.update($relayStats => {
|
|
59
|
+
const $relayStatsByUrl = indexBy(r => r.url, $relayStats);
|
|
60
|
+
for (const [url, items] of groupBy(([url]) => url, updates)) {
|
|
61
|
+
if (!url || !isRelayUrl(url)) {
|
|
62
|
+
console.warn(`Attempted to update stats for an invalid relay url: ${url}`);
|
|
63
|
+
continue;
|
|
64
|
+
}
|
|
65
|
+
const $relayStatsItem = $relayStatsByUrl.get(url) || makeRelayStats(url);
|
|
66
|
+
for (const [_, update] of items) {
|
|
67
|
+
update($relayStatsItem);
|
|
68
|
+
}
|
|
69
|
+
// Copy so the database gets updated, since we're mutating in updates
|
|
70
|
+
$relayStatsByUrl.set(url, { ...$relayStatsItem });
|
|
71
|
+
}
|
|
72
|
+
return Array.from($relayStatsByUrl.values());
|
|
73
|
+
});
|
|
74
|
+
});
|
|
75
|
+
const onSocketSend = ([verb], url) => {
|
|
76
|
+
if (verb === "REQ") {
|
|
77
|
+
updateRelayStats([
|
|
78
|
+
url,
|
|
79
|
+
stats => {
|
|
80
|
+
stats.request_count++;
|
|
81
|
+
stats.last_request = now();
|
|
82
|
+
},
|
|
83
|
+
]);
|
|
84
|
+
}
|
|
85
|
+
else if (verb === "EVENT") {
|
|
86
|
+
updateRelayStats([
|
|
87
|
+
url,
|
|
88
|
+
stats => {
|
|
89
|
+
stats.publish_count++;
|
|
90
|
+
stats.last_publish = now();
|
|
91
|
+
},
|
|
92
|
+
]);
|
|
93
|
+
}
|
|
94
|
+
};
|
|
95
|
+
const onSocketReceive = ([verb, ...extra], url) => {
|
|
96
|
+
if (verb === "OK") {
|
|
97
|
+
const [_, ok] = extra;
|
|
98
|
+
updateRelayStats([
|
|
99
|
+
url,
|
|
100
|
+
stats => {
|
|
101
|
+
if (ok) {
|
|
102
|
+
stats.publish_success_count++;
|
|
103
|
+
}
|
|
104
|
+
else {
|
|
105
|
+
stats.publish_failure_count++;
|
|
106
|
+
}
|
|
107
|
+
},
|
|
108
|
+
]);
|
|
109
|
+
}
|
|
110
|
+
else if (verb === "AUTH") {
|
|
111
|
+
updateRelayStats([
|
|
112
|
+
url,
|
|
113
|
+
stats => {
|
|
114
|
+
stats.last_auth = now();
|
|
115
|
+
},
|
|
116
|
+
]);
|
|
117
|
+
}
|
|
118
|
+
else if (verb === "EVENT") {
|
|
119
|
+
updateRelayStats([
|
|
120
|
+
url,
|
|
121
|
+
stats => {
|
|
122
|
+
stats.event_count++;
|
|
123
|
+
stats.last_event = now();
|
|
124
|
+
},
|
|
125
|
+
]);
|
|
126
|
+
}
|
|
127
|
+
else if (verb === "EOSE") {
|
|
128
|
+
updateRelayStats([
|
|
129
|
+
url,
|
|
130
|
+
stats => {
|
|
131
|
+
stats.eose_count++;
|
|
132
|
+
},
|
|
133
|
+
]);
|
|
134
|
+
}
|
|
135
|
+
else if (verb === "NOTICE") {
|
|
136
|
+
updateRelayStats([
|
|
137
|
+
url,
|
|
138
|
+
stats => {
|
|
139
|
+
stats.notice_count++;
|
|
140
|
+
},
|
|
141
|
+
]);
|
|
142
|
+
}
|
|
143
|
+
};
|
|
144
|
+
const onSocketStatus = (status, url) => {
|
|
145
|
+
if (status === SocketStatus.Open) {
|
|
146
|
+
updateRelayStats([
|
|
147
|
+
url,
|
|
148
|
+
stats => {
|
|
149
|
+
stats.last_open = now();
|
|
150
|
+
stats.open_count++;
|
|
151
|
+
},
|
|
152
|
+
]);
|
|
153
|
+
}
|
|
154
|
+
if (status === SocketStatus.Closed) {
|
|
155
|
+
updateRelayStats([
|
|
156
|
+
url,
|
|
157
|
+
stats => {
|
|
158
|
+
stats.last_close = now();
|
|
159
|
+
stats.close_count++;
|
|
160
|
+
},
|
|
161
|
+
]);
|
|
162
|
+
}
|
|
163
|
+
if (status === SocketStatus.Error) {
|
|
164
|
+
updateRelayStats([
|
|
165
|
+
url,
|
|
166
|
+
stats => {
|
|
167
|
+
stats.last_error = now();
|
|
168
|
+
stats.recent_errors = uniq(stats.recent_errors.concat(now())).slice(-10);
|
|
169
|
+
},
|
|
170
|
+
]);
|
|
171
|
+
}
|
|
172
|
+
};
|
|
173
|
+
export const trackRelayStats = (socket) => {
|
|
174
|
+
socket.on(SocketEvent.Send, onSocketSend);
|
|
175
|
+
socket.on(SocketEvent.Receive, onSocketReceive);
|
|
176
|
+
socket.on(SocketEvent.Status, onSocketStatus);
|
|
177
|
+
return () => {
|
|
178
|
+
socket.off(SocketEvent.Send, onSocketSend);
|
|
179
|
+
socket.off(SocketEvent.Receive, onSocketReceive);
|
|
180
|
+
socket.off(SocketEvent.Status, onSocketStatus);
|
|
181
|
+
};
|
|
182
|
+
};
|
|
183
|
+
//# sourceMappingURL=relayStats.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"relayStats.js","sourceRoot":"","sources":["../../../src/relayStats.ts"],"names":[],"mappings":"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"}
|
package/dist/app/src/relays.d.ts
CHANGED
|
@@ -1,37 +1,7 @@
|
|
|
1
1
|
import { RelayProfile } from "@welshman/util";
|
|
2
|
-
|
|
3
|
-
export type RelayStats = {
|
|
4
|
-
first_seen: number;
|
|
5
|
-
recent_errors: number[];
|
|
6
|
-
open_count: number;
|
|
7
|
-
close_count: number;
|
|
8
|
-
publish_count: number;
|
|
9
|
-
request_count: number;
|
|
10
|
-
event_count: number;
|
|
11
|
-
last_open: number;
|
|
12
|
-
last_close: number;
|
|
13
|
-
last_error: number;
|
|
14
|
-
last_publish: number;
|
|
15
|
-
last_request: number;
|
|
16
|
-
last_event: number;
|
|
17
|
-
last_auth: number;
|
|
18
|
-
publish_success_count: number;
|
|
19
|
-
publish_failure_count: number;
|
|
20
|
-
eose_count: number;
|
|
21
|
-
notice_count: number;
|
|
22
|
-
};
|
|
23
|
-
export declare const makeRelayStats: () => RelayStats;
|
|
24
|
-
export type Relay = {
|
|
25
|
-
url: string;
|
|
26
|
-
stats?: RelayStats;
|
|
27
|
-
profile?: RelayProfile;
|
|
28
|
-
};
|
|
29
|
-
export declare const relays: import("@welshman/store").WritableWithGetter<Relay[]>;
|
|
30
|
-
export declare const relaysByPubkey: import("svelte/store").Readable<Map<string | undefined, Relay[]>>;
|
|
2
|
+
export declare const relays: import("@welshman/store").WritableWithGetter<RelayProfile[]>;
|
|
31
3
|
export declare const fetchRelayProfiles: (urls: string[]) => Promise<Map<string, RelayProfile>>;
|
|
32
|
-
export declare const relaysByUrl: import("@welshman/store").ReadableWithGetter<Map<string,
|
|
4
|
+
export declare const relaysByUrl: import("@welshman/store").ReadableWithGetter<Map<string, RelayProfile>>, deriveRelay: (key: string | undefined, relays?: string[]) => import("svelte/store").Readable<RelayProfile | undefined>, loadRelay: (key: string, relays?: string[], force?: boolean) => Promise<RelayProfile | undefined>, onRelay: (cb: import("svelte/store").Subscriber<RelayProfile>) => () => void;
|
|
33
5
|
export declare const displayRelayByPubkey: (url: string) => string;
|
|
34
6
|
export declare const deriveRelayDisplay: (url: string) => import("svelte/store").Readable<string>;
|
|
35
|
-
export declare const getRelayQuality: (url: string) => 1 | 0 | 0.8 | 0.9 | 0.7;
|
|
36
|
-
export declare const trackRelayStats: (socket: Socket) => () => void;
|
|
37
7
|
//# sourceMappingURL=relays.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relays.d.ts","sourceRoot":"","sources":["../../../src/relays.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"relays.d.ts","sourceRoot":"","sources":["../../../src/relays.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAK3C,eAAO,MAAM,MAAM,8DAA2C,CAAA;AAE9D,eAAO,MAAM,kBAAkB,GAAU,MAAM,MAAM,EAAE,uCA4BtD,CAAA;AAED,eAAO,MACO,WAAW,2EACX,WAAW,6GACb,SAAS,0FACX,OAAO,qEA2Bf,CAAA;AAEF,eAAO,MAAM,oBAAoB,GAAI,KAAK,MAAM,WACuB,CAAA;AAEvE,eAAO,MAAM,kBAAkB,GAAI,KAAK,MAAM,4CAC0C,CAAA"}
|
package/dist/app/src/relays.js
CHANGED
|
@@ -1,32 +1,10 @@
|
|
|
1
1
|
import { writable, derived } from "svelte/store";
|
|
2
2
|
import { withGetter } from "@welshman/store";
|
|
3
|
-
import {
|
|
4
|
-
import { normalizeRelayUrl, displayRelayUrl, displayRelayProfile,
|
|
5
|
-
import { Pool, SocketStatus, SocketEvent } from "@welshman/net";
|
|
3
|
+
import { uniq, batcher, postJson } from "@welshman/lib";
|
|
4
|
+
import { normalizeRelayUrl, displayRelayUrl, displayRelayProfile, isRelayUrl } from "@welshman/util";
|
|
6
5
|
import { collection } from "@welshman/store";
|
|
7
6
|
import { appContext } from "./context.js";
|
|
8
|
-
export const makeRelayStats = () => ({
|
|
9
|
-
first_seen: now(),
|
|
10
|
-
recent_errors: [],
|
|
11
|
-
open_count: 0,
|
|
12
|
-
close_count: 0,
|
|
13
|
-
publish_count: 0,
|
|
14
|
-
request_count: 0,
|
|
15
|
-
event_count: 0,
|
|
16
|
-
last_open: 0,
|
|
17
|
-
last_close: 0,
|
|
18
|
-
last_error: 0,
|
|
19
|
-
last_publish: 0,
|
|
20
|
-
last_request: 0,
|
|
21
|
-
last_event: 0,
|
|
22
|
-
last_auth: 0,
|
|
23
|
-
publish_success_count: 0,
|
|
24
|
-
publish_failure_count: 0,
|
|
25
|
-
eose_count: 0,
|
|
26
|
-
notice_count: 0,
|
|
27
|
-
});
|
|
28
7
|
export const relays = withGetter(writable([]));
|
|
29
|
-
export const relaysByPubkey = derived(relays, $relays => groupBy($relay => $relay.profile?.pubkey, $relays.filter($relay => $relay.profile?.pubkey)));
|
|
30
8
|
export const fetchRelayProfiles = async (urls) => {
|
|
31
9
|
const profilesByUrl = new Map();
|
|
32
10
|
if (appContext.dufflepudUrl) {
|
|
@@ -61,181 +39,19 @@ export const { indexStore: relaysByUrl, deriveItem: deriveRelay, loadItem: loadR
|
|
|
61
39
|
const fresh = await fetchRelayProfiles(uniq(urls));
|
|
62
40
|
const stale = relaysByUrl.get();
|
|
63
41
|
for (const url of urls) {
|
|
64
|
-
const relay = stale.get(url);
|
|
65
42
|
const profile = fresh.get(url);
|
|
66
43
|
if (!url || !isRelayUrl(url)) {
|
|
67
44
|
console.warn(`Attempted to load invalid relay url: ${url}`);
|
|
68
45
|
continue;
|
|
69
46
|
}
|
|
70
47
|
if (profile) {
|
|
71
|
-
stale.set(url, { ...
|
|
48
|
+
stale.set(url, { ...profile, url });
|
|
72
49
|
}
|
|
73
50
|
}
|
|
74
51
|
relays.set(Array.from(stale.values()));
|
|
75
52
|
return urls;
|
|
76
53
|
}),
|
|
77
54
|
});
|
|
78
|
-
export const displayRelayByPubkey = (url) => displayRelayProfile(relaysByUrl.get().get(url)
|
|
79
|
-
export const deriveRelayDisplay = (url) => derived(deriveRelay(url), $relay => displayRelayProfile($relay
|
|
80
|
-
export const getRelayQuality = (url) => {
|
|
81
|
-
const relay = relaysByUrl.get().get(url);
|
|
82
|
-
// Skip non-relays entirely
|
|
83
|
-
if (!isRelayUrl(url))
|
|
84
|
-
return 0;
|
|
85
|
-
// If we have recent errors, skip it
|
|
86
|
-
if (relay?.stats) {
|
|
87
|
-
if (relay.stats.recent_errors.filter(n => n > ago(MINUTE)).length > 0)
|
|
88
|
-
return 0;
|
|
89
|
-
if (relay.stats.recent_errors.filter(n => n > ago(HOUR)).length > 3)
|
|
90
|
-
return 0;
|
|
91
|
-
if (relay.stats.recent_errors.filter(n => n > ago(DAY)).length > 10)
|
|
92
|
-
return 0;
|
|
93
|
-
}
|
|
94
|
-
// Prefer stuff we're connected to
|
|
95
|
-
if (Pool.get().has(url))
|
|
96
|
-
return 1;
|
|
97
|
-
// Prefer stuff we've connected to in the past
|
|
98
|
-
if (relay?.stats)
|
|
99
|
-
return 0.9;
|
|
100
|
-
// If it's not weird url give it an ok score
|
|
101
|
-
if (!isIPAddress(url) && !isLocalUrl(url) && !isOnionUrl(url) && !url.startsWith("ws://")) {
|
|
102
|
-
return 0.8;
|
|
103
|
-
}
|
|
104
|
-
// Default to a "meh" score
|
|
105
|
-
return 0.7;
|
|
106
|
-
};
|
|
107
|
-
const updateRelayStats = batch(500, (updates) => {
|
|
108
|
-
relays.update($relays => {
|
|
109
|
-
const $relaysByUrl = indexBy(r => r.url, $relays);
|
|
110
|
-
const $itemsByUrl = groupBy(([url]) => url, updates);
|
|
111
|
-
for (const [url, items] of $itemsByUrl.entries()) {
|
|
112
|
-
const $relay = $relaysByUrl.get(url) || { url };
|
|
113
|
-
if (!url || !isRelayUrl(url)) {
|
|
114
|
-
console.warn(`Attempted to update stats for an invalid relay url: ${url}`);
|
|
115
|
-
continue;
|
|
116
|
-
}
|
|
117
|
-
if (!$relay.stats) {
|
|
118
|
-
$relay.stats = makeRelayStats();
|
|
119
|
-
}
|
|
120
|
-
else if ($relay.stats.notice_count === undefined) {
|
|
121
|
-
// Migrate from old stats
|
|
122
|
-
$relay.stats = { ...makeRelayStats(), ...$relay.stats };
|
|
123
|
-
}
|
|
124
|
-
for (const [_, update] of items) {
|
|
125
|
-
update($relay.stats);
|
|
126
|
-
}
|
|
127
|
-
// Copy so the database gets updated, since we're mutating in updates
|
|
128
|
-
$relaysByUrl.set(url, { ...$relay });
|
|
129
|
-
}
|
|
130
|
-
return Array.from($relaysByUrl.values());
|
|
131
|
-
});
|
|
132
|
-
});
|
|
133
|
-
const onSocketSend = ([verb], url) => {
|
|
134
|
-
if (verb === "REQ") {
|
|
135
|
-
updateRelayStats([
|
|
136
|
-
url,
|
|
137
|
-
stats => {
|
|
138
|
-
stats.request_count++;
|
|
139
|
-
stats.last_request = now();
|
|
140
|
-
},
|
|
141
|
-
]);
|
|
142
|
-
}
|
|
143
|
-
else if (verb === "EVENT") {
|
|
144
|
-
updateRelayStats([
|
|
145
|
-
url,
|
|
146
|
-
stats => {
|
|
147
|
-
stats.publish_count++;
|
|
148
|
-
stats.last_publish = now();
|
|
149
|
-
},
|
|
150
|
-
]);
|
|
151
|
-
}
|
|
152
|
-
};
|
|
153
|
-
const onSocketReceive = ([verb, ...extra], url) => {
|
|
154
|
-
if (verb === "OK") {
|
|
155
|
-
const [_, ok] = extra;
|
|
156
|
-
updateRelayStats([
|
|
157
|
-
url,
|
|
158
|
-
stats => {
|
|
159
|
-
if (ok) {
|
|
160
|
-
stats.publish_success_count++;
|
|
161
|
-
}
|
|
162
|
-
else {
|
|
163
|
-
stats.publish_failure_count++;
|
|
164
|
-
}
|
|
165
|
-
},
|
|
166
|
-
]);
|
|
167
|
-
}
|
|
168
|
-
else if (verb === "AUTH") {
|
|
169
|
-
updateRelayStats([
|
|
170
|
-
url,
|
|
171
|
-
stats => {
|
|
172
|
-
stats.last_auth = now();
|
|
173
|
-
},
|
|
174
|
-
]);
|
|
175
|
-
}
|
|
176
|
-
else if (verb === "EVENT") {
|
|
177
|
-
updateRelayStats([
|
|
178
|
-
url,
|
|
179
|
-
stats => {
|
|
180
|
-
stats.event_count++;
|
|
181
|
-
stats.last_event = now();
|
|
182
|
-
},
|
|
183
|
-
]);
|
|
184
|
-
}
|
|
185
|
-
else if (verb === "EOSE") {
|
|
186
|
-
updateRelayStats([
|
|
187
|
-
url,
|
|
188
|
-
stats => {
|
|
189
|
-
stats.eose_count++;
|
|
190
|
-
},
|
|
191
|
-
]);
|
|
192
|
-
}
|
|
193
|
-
else if (verb === "NOTICE") {
|
|
194
|
-
updateRelayStats([
|
|
195
|
-
url,
|
|
196
|
-
stats => {
|
|
197
|
-
stats.notice_count++;
|
|
198
|
-
},
|
|
199
|
-
]);
|
|
200
|
-
}
|
|
201
|
-
};
|
|
202
|
-
const onSocketStatus = (status, url) => {
|
|
203
|
-
if (status === SocketStatus.Open) {
|
|
204
|
-
updateRelayStats([
|
|
205
|
-
url,
|
|
206
|
-
stats => {
|
|
207
|
-
stats.last_open = now();
|
|
208
|
-
stats.open_count++;
|
|
209
|
-
},
|
|
210
|
-
]);
|
|
211
|
-
}
|
|
212
|
-
if (status === SocketStatus.Closed) {
|
|
213
|
-
updateRelayStats([
|
|
214
|
-
url,
|
|
215
|
-
stats => {
|
|
216
|
-
stats.last_close = now();
|
|
217
|
-
stats.close_count++;
|
|
218
|
-
},
|
|
219
|
-
]);
|
|
220
|
-
}
|
|
221
|
-
if (status === SocketStatus.Error) {
|
|
222
|
-
updateRelayStats([
|
|
223
|
-
url,
|
|
224
|
-
stats => {
|
|
225
|
-
stats.last_error = now();
|
|
226
|
-
stats.recent_errors = uniq(stats.recent_errors.concat(now())).slice(-10);
|
|
227
|
-
},
|
|
228
|
-
]);
|
|
229
|
-
}
|
|
230
|
-
};
|
|
231
|
-
export const trackRelayStats = (socket) => {
|
|
232
|
-
socket.on(SocketEvent.Send, onSocketSend);
|
|
233
|
-
socket.on(SocketEvent.Receive, onSocketReceive);
|
|
234
|
-
socket.on(SocketEvent.Status, onSocketStatus);
|
|
235
|
-
return () => {
|
|
236
|
-
socket.off(SocketEvent.Send, onSocketSend);
|
|
237
|
-
socket.off(SocketEvent.Receive, onSocketReceive);
|
|
238
|
-
socket.off(SocketEvent.Status, onSocketStatus);
|
|
239
|
-
};
|
|
240
|
-
};
|
|
55
|
+
export const displayRelayByPubkey = (url) => displayRelayProfile(relaysByUrl.get().get(url), displayRelayUrl(url));
|
|
56
|
+
export const deriveRelayDisplay = (url) => derived(deriveRelay(url), $relay => displayRelayProfile($relay, displayRelayUrl(url)));
|
|
241
57
|
//# sourceMappingURL=relays.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relays.js","sourceRoot":"","sources":["../../../src/relays.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,OAAO,EAAC,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAC1C,OAAO,
|
|
1
|
+
{"version":3,"file":"relays.js","sourceRoot":"","sources":["../../../src/relays.ts"],"names":[],"mappings":"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"}
|
package/dist/app/src/search.d.ts
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { IFuseOptions, FuseResult } from "fuse.js";
|
|
2
2
|
import { debounce } from "throttle-debounce";
|
|
3
|
-
import { PublishedProfile } from "@welshman/util";
|
|
3
|
+
import { PublishedProfile, RelayProfile } from "@welshman/util";
|
|
4
4
|
import { Topic } from "./topics.js";
|
|
5
|
-
import { Relay } from "./relays.js";
|
|
6
5
|
export type SearchOptions<V, T> = {
|
|
7
6
|
getValue: (item: T) => V;
|
|
8
7
|
fuseOptions?: IFuseOptions<T>;
|
|
@@ -20,5 +19,5 @@ export declare const createSearch: <V, T>(options: T[], opts: SearchOptions<V, T
|
|
|
20
19
|
export declare const searchProfiles: debounce<(search: string) => void>;
|
|
21
20
|
export declare const profileSearch: import("svelte/store").Readable<Search<string, PublishedProfile>>;
|
|
22
21
|
export declare const topicSearch: import("svelte/store").Readable<Search<string, Topic>>;
|
|
23
|
-
export declare const relaySearch: import("svelte/store").Readable<Search<string,
|
|
22
|
+
export declare const relaySearch: import("svelte/store").Readable<Search<string, RelayProfile>>;
|
|
24
23
|
//# sourceMappingURL=search.d.ts.map
|
|
@@ -1 +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,
|
|
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,EAAE,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAMtE,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,mEA8BzB,CAAA;AAED,eAAO,MAAM,WAAW,wDAKvB,CAAA;AAED,eAAO,MAAM,WAAW,+DAOvB,CAAA"}
|
|
@@ -1 +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,GAAG,EAAE,MAAM,EAAC,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../src/search.ts"],"names":[],"mappings":"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"}
|