@welshman/app 0.0.43 → 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.
Files changed (59) hide show
  1. package/build/src/commands.js +7 -7
  2. package/build/src/commands.js.map +1 -1
  3. package/build/src/context.d.ts +1 -27
  4. package/build/src/context.js +1 -37
  5. package/build/src/context.js.map +1 -1
  6. package/build/src/core.d.ts +3 -5
  7. package/build/src/core.js +18 -4
  8. package/build/src/core.js.map +1 -1
  9. package/build/src/feeds.d.ts +1 -2
  10. package/build/src/feeds.js +11 -7
  11. package/build/src/feeds.js.map +1 -1
  12. package/build/src/follows.d.ts +3 -3
  13. package/build/src/follows.js +5 -2
  14. package/build/src/follows.js.map +1 -1
  15. package/build/src/handles.d.ts +2 -2
  16. package/build/src/handles.js +3 -2
  17. package/build/src/handles.js.map +1 -1
  18. package/build/src/index.d.ts +0 -9
  19. package/build/src/index.js +0 -1
  20. package/build/src/index.js.map +1 -1
  21. package/build/src/mutes.d.ts +3 -3
  22. package/build/src/mutes.js +5 -2
  23. package/build/src/mutes.js.map +1 -1
  24. package/build/src/pins.d.ts +3 -3
  25. package/build/src/pins.js +5 -2
  26. package/build/src/pins.js.map +1 -1
  27. package/build/src/profiles.d.ts +3 -3
  28. package/build/src/profiles.js +6 -13
  29. package/build/src/profiles.js.map +1 -1
  30. package/build/src/relaySelections.d.ts +4 -4
  31. package/build/src/relaySelections.js +18 -3
  32. package/build/src/relaySelections.js.map +1 -1
  33. package/build/src/relays.d.ts +3 -5
  34. package/build/src/relays.js +43 -49
  35. package/build/src/relays.js.map +1 -1
  36. package/build/src/router.d.ts +13 -9
  37. package/build/src/router.js +76 -76
  38. package/build/src/router.js.map +1 -1
  39. package/build/src/search.d.ts +4 -4
  40. package/build/src/search.js +6 -2
  41. package/build/src/search.js.map +1 -1
  42. package/build/src/storage.d.ts +5 -4
  43. package/build/src/storage.js.map +1 -1
  44. package/build/src/sync.d.ts +0 -1
  45. package/build/src/sync.js +8 -12
  46. package/build/src/sync.js.map +1 -1
  47. package/build/src/tags.js +12 -11
  48. package/build/src/tags.js.map +1 -1
  49. package/build/src/thunk.d.ts +6 -6
  50. package/build/src/thunk.js +72 -63
  51. package/build/src/thunk.js.map +1 -1
  52. package/build/src/zappers.d.ts +3 -3
  53. package/build/src/zappers.js +3 -2
  54. package/build/src/zappers.js.map +1 -1
  55. package/build/tsconfig.tsbuildinfo +1 -1
  56. package/package.json +3 -2
  57. package/build/src/subscribe.d.ts +0 -7
  58. package/build/src/subscribe.js +0 -42
  59. package/build/src/subscribe.js.map +0 -1
@@ -1,8 +1,9 @@
1
1
  import { uniq } from "@welshman/lib";
2
2
  import { INBOX_RELAYS, RELAYS, normalizeRelayUrl, asDecryptedEvent, readList, getListTags, getRelayTags, getRelayTagValues, } from "@welshman/util";
3
+ import { load } from "@welshman/net";
3
4
  import { deriveEventsMapped } from "@welshman/store";
4
5
  import { repository } from "./core.js";
5
- import { load } from "./subscribe.js";
6
+ import { Router } from "./router.js";
6
7
  import { collection } from "./collection.js";
7
8
  export const getRelayUrls = (list) => uniq(getRelayTagValues(getListTags(list)).map(normalizeRelayUrl));
8
9
  export const getReadRelayUrls = (list) => uniq(getRelayTags(getListTags(list))
@@ -20,7 +21,14 @@ export const { indexStore: relaySelectionsByPubkey, deriveItem: deriveRelaySelec
20
21
  name: "relaySelections",
21
22
  store: relaySelections,
22
23
  getKey: relaySelections => relaySelections.event.pubkey,
23
- load: (pubkey, request = {}) => load({ ...request, filters: [{ kinds: [RELAYS], authors: [pubkey] }] }),
24
+ load: async (pubkey, request = {}) => {
25
+ const router = Router.get();
26
+ await load({
27
+ relays: router.merge([router.Index(), router.FromPubkey(pubkey)]).getUrls(),
28
+ ...request,
29
+ filters: [{ kinds: [RELAYS], authors: [pubkey] }],
30
+ });
31
+ },
24
32
  });
25
33
  export const inboxRelaySelections = deriveEventsMapped(repository, {
26
34
  filters: [{ kinds: [INBOX_RELAYS] }],
@@ -31,6 +39,13 @@ export const { indexStore: inboxRelaySelectionsByPubkey, deriveItem: deriveInbox
31
39
  name: "inboxRelaySelections",
32
40
  store: inboxRelaySelections,
33
41
  getKey: inboxRelaySelections => inboxRelaySelections.event.pubkey,
34
- load: (pubkey, request = {}) => load({ ...request, filters: [{ kinds: [INBOX_RELAYS], authors: [pubkey] }] }),
42
+ load: async (pubkey, request = {}) => {
43
+ const router = Router.get();
44
+ await load({
45
+ relays: router.merge([router.Index(), router.FromPubkey(pubkey)]).getUrls(),
46
+ ...request,
47
+ filters: [{ kinds: [INBOX_RELAYS], authors: [pubkey] }],
48
+ });
49
+ },
35
50
  });
36
51
  //# sourceMappingURL=relaySelections.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"relaySelections.js","sourceRoot":"","sources":["../../src/relaySelections.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"relaySelections.js","sourceRoot":"","sources":["../../src/relaySelections.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,eAAe,CAAA;AAClC,OAAO,EACL,YAAY,EACZ,MAAM,EACN,iBAAiB,EACjB,gBAAgB,EAChB,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,iBAAiB,GAClB,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAAC,IAAI,EAAsB,MAAM,eAAe,CAAA;AACvD,OAAO,EAAC,kBAAkB,EAAC,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,WAAW,CAAA;AACpC,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAA;AAClC,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAE1C,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAW,EAAY,EAAE,CACpD,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAA;AAEnE,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,IAAW,EAAY,EAAE,CACxD,IAAI,CACF,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;KAC5B,MAAM,CAAC,CAAC,CAAW,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC;KACjD,GAAG,CAAC,CAAC,CAAW,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACjD,CAAA;AAEH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,IAAW,EAAY,EAAE,CACzD,IAAI,CACF,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;KAC5B,MAAM,CAAC,CAAC,CAAW,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC;KAClD,GAAG,CAAC,CAAC,CAAW,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACjD,CAAA;AAEH,MAAM,CAAC,MAAM,eAAe,GAAG,kBAAkB,CAAgB,UAAU,EAAE;IAC3E,OAAO,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,MAAM,CAAC,EAAC,CAAC;IAC5B,WAAW,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK;IAC/B,WAAW,EAAE,CAAC,KAAmB,EAAE,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;CACxE,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,EACX,UAAU,EAAE,uBAAuB,EACnC,UAAU,EAAE,qBAAqB,EACjC,QAAQ,EAAE,mBAAmB,GAC9B,GAAG,UAAU,CAAC;IACb,IAAI,EAAE,iBAAiB;IACvB,KAAK,EAAE,eAAe;IACtB,MAAM,EAAE,eAAe,CAAC,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,MAAM;IACvD,IAAI,EAAE,KAAK,EAAE,MAAc,EAAE,UAAwC,EAAE,EAAE,EAAE;QACzE,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,EAAE,CAAA;QAE3B,MAAM,IAAI,CAAC;YACT,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE;YAC3E,GAAG,OAAO;YACV,OAAO,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAC,CAAC;SAChD,CAAC,CAAA;IACJ,CAAC;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,kBAAkB,CAAgB,UAAU,EAAE;IAChF,OAAO,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,YAAY,CAAC,EAAC,CAAC;IAClC,WAAW,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK;IAC/B,WAAW,EAAE,CAAC,KAAmB,EAAE,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;CACxE,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,EACX,UAAU,EAAE,4BAA4B,EACxC,UAAU,EAAE,0BAA0B,EACtC,QAAQ,EAAE,wBAAwB,GACnC,GAAG,UAAU,CAAC;IACb,IAAI,EAAE,sBAAsB;IAC5B,KAAK,EAAE,oBAAoB;IAC3B,MAAM,EAAE,oBAAoB,CAAC,EAAE,CAAC,oBAAoB,CAAC,KAAK,CAAC,MAAM;IACjE,IAAI,EAAE,KAAK,EAAE,MAAc,EAAE,UAAwC,EAAE,EAAE,EAAE;QACzE,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,EAAE,CAAA;QAE3B,MAAM,IAAI,CAAC;YACT,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE;YAC3E,GAAG,OAAO;YACV,OAAO,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAC,CAAC;SACtD,CAAC,CAAA;IACJ,CAAC;CACF,CAAC,CAAA"}
@@ -1,5 +1,5 @@
1
- import type { RelayProfile } from "@welshman/util";
2
- import type { Connection } from "@welshman/net";
1
+ import { RelayProfile } from "@welshman/util";
2
+ import { Socket } from "@welshman/net";
3
3
  export type RelayStats = {
4
4
  first_seen: number;
5
5
  recent_errors: number[];
@@ -15,11 +15,9 @@ export type RelayStats = {
15
15
  last_request: number;
16
16
  last_event: number;
17
17
  last_auth: number;
18
- publish_timer: number;
19
18
  publish_success_count: number;
20
19
  publish_failure_count: number;
21
20
  eose_count: number;
22
- eose_timer: number;
23
21
  notice_count: number;
24
22
  };
25
23
  export declare const makeRelayStats: () => RelayStats;
@@ -34,4 +32,4 @@ export declare const fetchRelayProfiles: (urls: string[]) => Promise<Map<string,
34
32
  export declare const relaysByUrl: import("@welshman/store").ReadableWithGetter<Map<string, Relay>>, deriveRelay: (key: import("@welshman/lib").Maybe<string>) => import("svelte/store").Readable<Relay | undefined>, loadRelay: (key: string) => Promise<Relay | undefined>;
35
33
  export declare const displayRelayByPubkey: (url: string) => string;
36
34
  export declare const deriveRelayDisplay: (url: string) => import("svelte/store").Readable<string>;
37
- export declare const trackRelayStats: (connection: Connection) => () => void;
35
+ export declare const trackRelayStats: (socket: Socket) => () => void;
@@ -1,9 +1,10 @@
1
1
  import { writable, derived } from "svelte/store";
2
2
  import { withGetter } from "@welshman/store";
3
- import { ctx, groupBy, indexBy, batch, now, ago, uniq, batcher, postJson } from "@welshman/lib";
3
+ import { groupBy, indexBy, batch, now, uniq, batcher, postJson } from "@welshman/lib";
4
4
  import { normalizeRelayUrl, displayRelayUrl, displayRelayProfile } from "@welshman/util";
5
- import { ConnectionEvent } from "@welshman/net";
5
+ import { SocketStatus, SocketEvent } from "@welshman/net";
6
6
  import { collection } from "./collection.js";
7
+ import { appContext } from "./context.js";
7
8
  export const makeRelayStats = () => ({
8
9
  first_seen: now(),
9
10
  recent_errors: [],
@@ -19,17 +20,15 @@ export const makeRelayStats = () => ({
19
20
  last_request: 0,
20
21
  last_event: 0,
21
22
  last_auth: 0,
22
- publish_timer: 0,
23
23
  publish_success_count: 0,
24
24
  publish_failure_count: 0,
25
25
  eose_count: 0,
26
- eose_timer: 0,
27
26
  notice_count: 0,
28
27
  });
29
28
  export const relays = withGetter(writable([]));
30
29
  export const relaysByPubkey = derived(relays, $relays => groupBy($relay => $relay.profile?.pubkey, $relays.filter($relay => $relay.profile?.pubkey)));
31
30
  export const fetchRelayProfiles = async (urls) => {
32
- const base = ctx.app.dufflepudUrl;
31
+ const base = appContext.dufflepudUrl;
33
32
  if (!base) {
34
33
  throw new Error("ctx.app.dufflepudUrl is required to fetch relay metadata");
35
34
  }
@@ -83,21 +82,7 @@ const updateRelayStats = batch(500, (updates) => {
83
82
  return Array.from($relaysByUrl.values());
84
83
  });
85
84
  });
86
- const onConnectionOpen = ({ url }) => updateRelayStats([
87
- url,
88
- stats => {
89
- stats.last_open = now();
90
- stats.open_count++;
91
- },
92
- ]);
93
- const onConnectionClose = ({ url }) => updateRelayStats([
94
- url,
95
- stats => {
96
- stats.last_close = now();
97
- stats.close_count++;
98
- },
99
- ]);
100
- const onConnectionSend = ({ url }, [verb]) => {
85
+ const onSocketSend = ([verb], url) => {
101
86
  if (verb === "REQ") {
102
87
  updateRelayStats([
103
88
  url,
@@ -117,16 +102,12 @@ const onConnectionSend = ({ url }, [verb]) => {
117
102
  ]);
118
103
  }
119
104
  };
120
- const onConnectionReceive = ({ url, state }, [verb, ...extra]) => {
105
+ const onSocketReceive = ([verb, ...extra], url) => {
121
106
  if (verb === "OK") {
122
- const [eventId, ok] = extra;
123
- const pub = state.pendingPublishes.get(eventId);
107
+ const [_, ok] = extra;
124
108
  updateRelayStats([
125
109
  url,
126
110
  stats => {
127
- if (pub) {
128
- stats.publish_timer += ago(pub.sent);
129
- }
130
111
  if (ok) {
131
112
  stats.publish_success_count++;
132
113
  }
@@ -154,17 +135,12 @@ const onConnectionReceive = ({ url, state }, [verb, ...extra]) => {
154
135
  ]);
155
136
  }
156
137
  else if (verb === "EOSE") {
157
- const request = state.pendingRequests.get(extra[0]);
158
- // Only count the first eose
159
- if (request && !request.eose) {
160
- updateRelayStats([
161
- url,
162
- stats => {
163
- stats.eose_count++;
164
- stats.eose_timer += now() - request.sent;
165
- },
166
- ]);
167
- }
138
+ updateRelayStats([
139
+ url,
140
+ stats => {
141
+ stats.eose_count++;
142
+ },
143
+ ]);
168
144
  }
169
145
  else if (verb === "NOTICE") {
170
146
  updateRelayStats([
@@ -175,25 +151,43 @@ const onConnectionReceive = ({ url, state }, [verb, ...extra]) => {
175
151
  ]);
176
152
  }
177
153
  };
178
- const onConnectionError = ({ url }) => updateRelayStats([
154
+ const onSocketStatus = (status, url) => {
155
+ if (status === SocketStatus.Open) {
156
+ updateRelayStats([
157
+ url,
158
+ stats => {
159
+ stats.last_open = now();
160
+ stats.open_count++;
161
+ },
162
+ ]);
163
+ }
164
+ if (status === SocketStatus.Closed) {
165
+ updateRelayStats([
166
+ url,
167
+ stats => {
168
+ stats.last_close = now();
169
+ stats.close_count++;
170
+ },
171
+ ]);
172
+ }
173
+ };
174
+ const onSocketError = (error, url) => updateRelayStats([
179
175
  url,
180
176
  stats => {
181
177
  stats.last_error = now();
182
178
  stats.recent_errors = uniq(stats.recent_errors.concat(now())).slice(-10);
183
179
  },
184
180
  ]);
185
- export const trackRelayStats = (connection) => {
186
- connection.on(ConnectionEvent.Open, onConnectionOpen);
187
- connection.on(ConnectionEvent.Close, onConnectionClose);
188
- connection.on(ConnectionEvent.Send, onConnectionSend);
189
- connection.on(ConnectionEvent.Receive, onConnectionReceive);
190
- connection.on(ConnectionEvent.Error, onConnectionError);
181
+ export const trackRelayStats = (socket) => {
182
+ socket.on(SocketEvent.Send, onSocketSend);
183
+ socket.on(SocketEvent.Receive, onSocketReceive);
184
+ socket.on(SocketEvent.Status, onSocketStatus);
185
+ socket.on(SocketEvent.Error, onSocketError);
191
186
  return () => {
192
- connection.off(ConnectionEvent.Open, onConnectionOpen);
193
- connection.off(ConnectionEvent.Close, onConnectionClose);
194
- connection.off(ConnectionEvent.Send, onConnectionSend);
195
- connection.off(ConnectionEvent.Receive, onConnectionReceive);
196
- connection.off(ConnectionEvent.Error, onConnectionError);
187
+ socket.off(SocketEvent.Send, onSocketSend);
188
+ socket.off(SocketEvent.Receive, onSocketReceive);
189
+ socket.off(SocketEvent.Status, onSocketStatus);
190
+ socket.off(SocketEvent.Error, onSocketError);
197
191
  };
198
192
  };
199
193
  //# sourceMappingURL=relays.js.map
@@ -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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"}
@@ -1,6 +1,9 @@
1
- import type { TrustedEvent, Filter } from "@welshman/util";
2
- import type { RelaysAndFilters } from "@welshman/net";
1
+ import { TrustedEvent, Filter } from "@welshman/util";
3
2
  export declare const INDEXED_KINDS: number[];
3
+ export type RelaysAndFilters = {
4
+ relays: string[];
5
+ filters: Filter[];
6
+ };
4
7
  export declare enum RelayMode {
5
8
  Read = "read",
6
9
  Write = "write",
@@ -23,7 +26,7 @@ export type RouterOptions = {
23
26
  * Retrieves fallback relays, for use when no other relays can be selected.
24
27
  * @returns An array of relay URLs as strings.
25
28
  */
26
- getFallbackRelays: () => string[];
29
+ getFallbackRelays?: () => string[];
27
30
  /**
28
31
  * Retrieves relays that index profiles and relay selections.
29
32
  * @returns An array of relay URLs as strings.
@@ -55,8 +58,13 @@ export type FallbackPolicy = (count: number, limit: number) => number;
55
58
  export declare const addNoFallbacks: (count: number, limit: number) => number;
56
59
  export declare const addMinimalFallbacks: (count: number, limit: number) => 0 | 1;
57
60
  export declare const addMaximalFallbacks: (count: number, limit: number) => number;
61
+ export declare const getRelayQuality: (url: string) => 0 | 1 | 0.9 | 0.8 | 0.7;
62
+ export declare const getPubkeyRelays: (pubkey: string, mode?: string) => string[];
63
+ export declare const globalRouterOptions: RouterOptions;
58
64
  export declare class Router {
59
65
  readonly options: RouterOptions;
66
+ static configure(options: RouterOptions): void;
67
+ static get(): Router;
60
68
  constructor(options: RouterOptions);
61
69
  getRelaysForPubkey: (pubkey: string, mode?: RelayMode) => string[];
62
70
  getRelaysForPubkeys: (pubkeys: string[], mode?: RelayMode) => string[][];
@@ -64,6 +72,8 @@ export declare class Router {
64
72
  scenario: (selections: Selection[]) => RouterScenario;
65
73
  merge: (scenarios: RouterScenario[]) => RouterScenario;
66
74
  FromRelays: (relays: string[]) => RouterScenario;
75
+ Search: () => RouterScenario;
76
+ Index: () => RouterScenario;
67
77
  ForUser: () => RouterScenario;
68
78
  FromUser: () => RouterScenario;
69
79
  UserInbox: () => RouterScenario;
@@ -108,12 +118,6 @@ export declare class RouterScenario {
108
118
  getUrls: () => string[];
109
119
  getUrl: () => string;
110
120
  }
111
- export declare const getRelayQuality: (url: string) => 0 | 1 | 0.9 | 0.8 | 0.7;
112
- export declare const getPubkeyRelays: (pubkey: string, mode?: string) => string[];
113
- export declare const getIndexerRelays: () => string[];
114
- export declare const getFallbackRelays: () => string[];
115
- export declare const getSearchRelays: () => string[];
116
- export declare const makeRouter: (options?: Partial<RouterOptions>) => Router;
117
121
  type FilterScenario = {
118
122
  filter: Filter;
119
123
  scenario: RouterScenario;
@@ -1,8 +1,9 @@
1
- import { intersection, first, throttleWithValue, clamp, sortBy, shuffle, pushToMapKey, ctx, always, inc, add, ago, take, chunks, MINUTE, HOUR, DAY, WEEK, } from "@welshman/lib";
1
+ import { intersection, mergeLeft, first, clamp, sortBy, shuffle, pushToMapKey, inc, add, ago, take, chunks, MINUTE, HOUR, DAY, WEEK, } from "@welshman/lib";
2
2
  import { getFilterId, isRelayUrl, isOnionUrl, isLocalUrl, isIPAddress, isShareableRelayUrl, COMMENT, PROFILE, RELAYS, INBOX_RELAYS, FOLLOWS, WRAP, getReplyTags, getCommentTags, getPubkeyTagValues, normalizeRelayUrl, } from "@welshman/util";
3
+ import { Pool } from "@welshman/net";
3
4
  import { pubkey } from "./session.js";
4
5
  import { relaySelectionsByPubkey, inboxRelaySelectionsByPubkey, getReadRelayUrls, getWriteRelayUrls, getRelayUrls, } from "./relaySelections.js";
5
- import { relays, relaysByUrl } from "./relays.js";
6
+ import { relaysByUrl } from "./relays.js";
6
7
  export const INDEXED_KINDS = [PROFILE, RELAYS, INBOX_RELAYS, FOLLOWS];
7
8
  export var RelayMode;
8
9
  (function (RelayMode) {
@@ -17,10 +18,70 @@ const makeSelection = (relays, weight = 1) => ({
17
18
  export const addNoFallbacks = (count, limit) => 0;
18
19
  export const addMinimalFallbacks = (count, limit) => (count > 0 ? 0 : 1);
19
20
  export const addMaximalFallbacks = (count, limit) => limit - count;
21
+ // Default router options
22
+ export const getRelayQuality = (url) => {
23
+ const relay = relaysByUrl.get().get(url);
24
+ // Skip non-relays entirely
25
+ if (!isRelayUrl(url))
26
+ return 0;
27
+ // If we have recent errors, skip it
28
+ if (relay?.stats) {
29
+ if (relay.stats.recent_errors.filter(n => n > ago(MINUTE)).length > 0)
30
+ return 0;
31
+ if (relay.stats.recent_errors.filter(n => n > ago(HOUR)).length > 3)
32
+ return 0;
33
+ if (relay.stats.recent_errors.filter(n => n > ago(DAY)).length > 10)
34
+ return 0;
35
+ if (relay.stats.recent_errors.filter(n => n > ago(WEEK)).length > 50)
36
+ return 0;
37
+ }
38
+ // Prefer stuff we're connected to
39
+ if (Pool.getSingleton().has(url))
40
+ return 1;
41
+ // Prefer stuff we've connected to in the past
42
+ if (relay?.stats)
43
+ return 0.9;
44
+ // If it's not weird url give it an ok score
45
+ if (!isIPAddress(url) && !isLocalUrl(url) && !isOnionUrl(url) && !url.startsWith("ws://")) {
46
+ return 0.8;
47
+ }
48
+ // Default to a "meh" score
49
+ return 0.7;
50
+ };
51
+ export const getPubkeyRelays = (pubkey, mode) => {
52
+ const $relaySelections = relaySelectionsByPubkey.get();
53
+ const $inboxSelections = inboxRelaySelectionsByPubkey.get();
54
+ switch (mode) {
55
+ case RelayMode.Read:
56
+ return getReadRelayUrls($relaySelections.get(pubkey));
57
+ case RelayMode.Write:
58
+ return getWriteRelayUrls($relaySelections.get(pubkey));
59
+ case RelayMode.Inbox:
60
+ return getRelayUrls($inboxSelections.get(pubkey));
61
+ default:
62
+ return getRelayUrls($relaySelections.get(pubkey));
63
+ }
64
+ };
65
+ export const globalRouterOptions = {
66
+ getRelayQuality,
67
+ getPubkeyRelays,
68
+ getFallbackRelays: () => ["wss://relay.damus.io/", "wss://nos.lol/"],
69
+ getIndexerRelays: () => ["wss://purplepag.es/", "wss://relay.nostr.band/"],
70
+ getSearchRelays: () => ["wss://relay.nostr.band/", "wss://nostr.wine/"],
71
+ getUserPubkey: () => pubkey.get(),
72
+ getLimit: () => 3,
73
+ };
74
+ // Router class
20
75
  export class Router {
21
76
  options;
77
+ static configure(options) {
78
+ Object.assign(globalRouterOptions, options);
79
+ }
80
+ static get() {
81
+ return new Router(globalRouterOptions);
82
+ }
22
83
  constructor(options) {
23
- this.options = options;
84
+ this.options = mergeLeft(options, globalRouterOptions);
24
85
  }
25
86
  // Utilities derived from options
26
87
  getRelaysForPubkey = (pubkey, mode) => this.options.getPubkeyRelays?.(pubkey, mode) || [];
@@ -34,6 +95,8 @@ export class Router {
34
95
  merge = (scenarios) => this.scenario(scenarios.flatMap((scenario) => scenario.selections));
35
96
  // Routing scenarios
36
97
  FromRelays = (relays) => this.scenario([makeSelection(relays)]);
98
+ Search = () => this.FromRelays(this.options.getSearchRelays?.() || []);
99
+ Index = () => this.FromRelays(this.options.getIndexerRelays?.() || []);
37
100
  ForUser = () => this.FromRelays(this.getRelaysForUser(RelayMode.Read));
38
101
  FromUser = () => this.FromRelays(this.getRelaysForUser(RelayMode.Write));
39
102
  UserInbox = () => this.FromRelays(this.getRelaysForUser(RelayMode.Inbox)).policy(addNoFallbacks);
@@ -124,8 +187,7 @@ export class RouterScenario {
124
187
  }
125
188
  }
126
189
  const scoreRelay = (relay) => {
127
- const { getRelayQuality = always(1) } = this.router.options;
128
- const quality = getRelayQuality(relay);
190
+ const quality = this.router.options.getRelayQuality?.(relay) || 1;
129
191
  const weight = relayWeights.get(relay);
130
192
  // Log the weight, since it's a straight count which ends up over-weighting hubs.
131
193
  // Also add some random noise so that we'll occasionally pick lower quality/less
@@ -134,7 +196,7 @@ export class RouterScenario {
134
196
  };
135
197
  const relays = take(limit, sortBy(scoreRelay, Array.from(relayWeights.keys()).filter(scoreRelay)));
136
198
  const fallbacksNeeded = fallbackPolicy(relays.length, limit);
137
- const allFallbackRelays = this.router.options.getFallbackRelays();
199
+ const allFallbackRelays = this.router.options.getFallbackRelays?.() || [];
138
200
  const fallbackRelays = shuffle(allFallbackRelays).slice(0, fallbacksNeeded);
139
201
  for (const fallbackRelay of fallbackRelays) {
140
202
  relays.push(fallbackRelay);
@@ -143,73 +205,11 @@ export class RouterScenario {
143
205
  };
144
206
  getUrl = () => first(this.getUrls());
145
207
  }
146
- // Default router options
147
- export const getRelayQuality = (url) => {
148
- const relay = relaysByUrl.get().get(url);
149
- // Skip non-relays entirely
150
- if (!isRelayUrl(url))
151
- return 0;
152
- // If we have recent errors, skip it
153
- if (relay?.stats) {
154
- if (relay.stats.recent_errors.filter(n => n > ago(MINUTE)).length > 0)
155
- return 0;
156
- if (relay.stats.recent_errors.filter(n => n > ago(HOUR)).length > 3)
157
- return 0;
158
- if (relay.stats.recent_errors.filter(n => n > ago(DAY)).length > 10)
159
- return 0;
160
- if (relay.stats.recent_errors.filter(n => n > ago(WEEK)).length > 50)
161
- return 0;
162
- }
163
- // Prefer stuff we're connected to
164
- if (ctx.net.pool.has(url))
165
- return 1;
166
- // Prefer stuff we've connected to in the past
167
- if (relay?.stats)
168
- return 0.9;
169
- // If it's not weird url give it an ok score
170
- if (!isIPAddress(url) && !isLocalUrl(url) && !isOnionUrl(url) && !url.startsWith("ws://")) {
171
- return 0.8;
172
- }
173
- // Default to a "meh" score
174
- return 0.7;
175
- };
176
- export const getPubkeyRelays = (pubkey, mode) => {
177
- const $relaySelections = relaySelectionsByPubkey.get();
178
- const $inboxSelections = inboxRelaySelectionsByPubkey.get();
179
- switch (mode) {
180
- case RelayMode.Read:
181
- return getReadRelayUrls($relaySelections.get(pubkey));
182
- case RelayMode.Write:
183
- return getWriteRelayUrls($relaySelections.get(pubkey));
184
- case RelayMode.Inbox:
185
- return getRelayUrls($inboxSelections.get(pubkey));
186
- default:
187
- return getRelayUrls($relaySelections.get(pubkey));
188
- }
189
- };
190
- export const getIndexerRelays = () => ctx.app.indexerRelays || getFallbackRelays();
191
- export const getFallbackRelays = throttleWithValue(300, () => sortBy(r => -getRelayQuality(r.url), relays.get())
192
- .slice(0, 30)
193
- .map(r => r.url));
194
- export const getSearchRelays = throttleWithValue(300, () => sortBy(r => -getRelayQuality(r.url), relays.get())
195
- .filter(r => r.profile?.supported_nips?.includes(50))
196
- .slice(0, 30)
197
- .map(r => r.url));
198
- export const makeRouter = (options = {}) => new Router({
199
- getPubkeyRelays,
200
- getIndexerRelays,
201
- getFallbackRelays,
202
- getSearchRelays,
203
- getRelayQuality,
204
- getUserPubkey: () => pubkey.get(),
205
- getLimit: () => 3,
206
- ...options,
207
- });
208
208
  export const getFilterSelectionsForSearch = (filter) => {
209
209
  if (!filter.search)
210
210
  return [];
211
- const relays = ctx.app.router.options.getSearchRelays?.() || [];
212
- return [{ filter, scenario: ctx.app.router.FromRelays(relays).weight(10) }];
211
+ const relays = globalRouterOptions.getSearchRelays?.() || [];
212
+ return [{ filter, scenario: Router.get().FromRelays(relays).weight(10) }];
213
213
  };
214
214
  export const getFilterSelectionsForWraps = (filter) => {
215
215
  if (!filter.kinds?.includes(WRAP) || filter.authors)
@@ -217,7 +217,7 @@ export const getFilterSelectionsForWraps = (filter) => {
217
217
  return [
218
218
  {
219
219
  filter: { ...filter, kinds: [WRAP] },
220
- scenario: ctx.app.router.UserInbox(),
220
+ scenario: Router.get().UserInbox(),
221
221
  },
222
222
  ];
223
223
  };
@@ -225,11 +225,11 @@ export const getFilterSelectionsForIndexedKinds = (filter) => {
225
225
  const kinds = intersection(INDEXED_KINDS, filter.kinds || []);
226
226
  if (kinds.length === 0)
227
227
  return [];
228
- const relays = ctx.app.router.options.getIndexerRelays?.() || [];
228
+ const relays = globalRouterOptions.getIndexerRelays?.() || [];
229
229
  return [
230
230
  {
231
231
  filter: { ...filter, kinds },
232
- scenario: ctx.app.router.FromRelays(relays),
232
+ scenario: Router.get().FromRelays(relays),
233
233
  },
234
234
  ];
235
235
  };
@@ -239,11 +239,11 @@ export const getFilterSelectionsForAuthors = (filter) => {
239
239
  const chunkCount = clamp([1, 30], Math.round(filter.authors.length / 30));
240
240
  return chunks(chunkCount, filter.authors).map(authors => ({
241
241
  filter: { ...filter, authors },
242
- scenario: ctx.app.router.FromPubkeys(authors),
242
+ scenario: Router.get().FromPubkeys(authors),
243
243
  }));
244
244
  };
245
245
  export const getFilterSelectionsForUser = (filter) => [
246
- { filter, scenario: ctx.app.router.ForUser().weight(0.2) },
246
+ { filter, scenario: Router.get().ForUser().weight(0.2) },
247
247
  ];
248
248
  export const defaultFilterSelectionRules = [
249
249
  getFilterSelectionsForSearch,
@@ -264,7 +264,7 @@ export const getFilterSelections = (filters, rules = defaultFilterSelectionRules
264
264
  }
265
265
  const result = [];
266
266
  for (const [id, filter] of filtersById.entries()) {
267
- const scenario = ctx.app.router.merge(scenariosById.get(id) || []);
267
+ const scenario = Router.get().merge(scenariosById.get(id) || []);
268
268
  result.push({ filters: [filter], relays: scenario.getUrls() });
269
269
  }
270
270
  return result;
@@ -1 +1 @@
1
- {"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/router.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/router.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,8 @@
1
- import type { IFuseOptions, FuseResult } from "fuse.js";
1
+ import { IFuseOptions, FuseResult } from "fuse.js";
2
2
  import { debounce } from "throttle-debounce";
3
- import type { PublishedProfile } from "@welshman/util";
4
- import type { Topic } from "./topics.js";
5
- import type { Relay } from "./relays.js";
3
+ import { PublishedProfile } from "@welshman/util";
4
+ import { Topic } from "./topics.js";
5
+ import { Relay } from "./relays.js";
6
6
  export type SearchOptions<V, T> = {
7
7
  getValue: (item: T) => V;
8
8
  fuseOptions?: IFuseOptions<T>;