applesauce-relay 0.0.0-next-20250930093922 → 0.0.0-next-20251015123951
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/group.d.ts +4 -1
- package/dist/group.js +2 -2
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/liveness.d.ts +125 -0
- package/dist/liveness.js +327 -0
- package/dist/operators/index.d.ts +1 -0
- package/dist/operators/index.js +1 -0
- package/dist/operators/liveness.d.ts +17 -0
- package/dist/operators/liveness.js +47 -0
- package/dist/types.d.ts +3 -0
- package/package.json +3 -3
package/dist/group.d.ts
CHANGED
|
@@ -28,7 +28,10 @@ export declare class RelayGroup implements IGroup {
|
|
|
28
28
|
* Make a request to all relays
|
|
29
29
|
* @note This does not deduplicate events
|
|
30
30
|
*/
|
|
31
|
-
req(filters: FilterInput, id?: string
|
|
31
|
+
req(filters: FilterInput, id?: string, opts?: {
|
|
32
|
+
/** Deduplicate events with an event store (default is a temporary instance of EventMemory), null will disable deduplication */
|
|
33
|
+
eventStore?: IEventStoreActions | IAsyncEventStoreActions | null;
|
|
34
|
+
}): Observable<SubscriptionResponse>;
|
|
32
35
|
/** Send an event to all relays */
|
|
33
36
|
event(event: NostrEvent): Observable<PublishResponse>;
|
|
34
37
|
/** Negentropy sync events with the relays and an event store */
|
package/dist/group.js
CHANGED
|
@@ -28,12 +28,12 @@ export class RelayGroup {
|
|
|
28
28
|
* Make a request to all relays
|
|
29
29
|
* @note This does not deduplicate events
|
|
30
30
|
*/
|
|
31
|
-
req(filters, id = nanoid(8)) {
|
|
31
|
+
req(filters, id = nanoid(8), opts) {
|
|
32
32
|
const requests = this.relays.map((relay) => relay.req(filters, id).pipe(
|
|
33
33
|
// Ignore connection errors
|
|
34
34
|
catchError(() => of("EOSE"))));
|
|
35
35
|
// Merge events and the single EOSE stream
|
|
36
|
-
return this.mergeEOSE(requests);
|
|
36
|
+
return this.mergeEOSE(requests, opts?.eventStore);
|
|
37
37
|
}
|
|
38
38
|
/** Send an event to all relays */
|
|
39
39
|
event(event) {
|
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
|
@@ -0,0 +1,125 @@
|
|
|
1
|
+
import { Observable } from "rxjs";
|
|
2
|
+
import { IPool } from "./types.js";
|
|
3
|
+
/** Relay health states for liveness tracking */
|
|
4
|
+
export type RelayHealthState = "online" | "offline" | "dead";
|
|
5
|
+
/**
|
|
6
|
+
* State information for a relay's health tracking
|
|
7
|
+
*/
|
|
8
|
+
export interface RelayState {
|
|
9
|
+
/** Current relay health state */
|
|
10
|
+
state: RelayHealthState;
|
|
11
|
+
/** Number of consecutive failures */
|
|
12
|
+
failureCount: number;
|
|
13
|
+
/** Timestamp of last failure */
|
|
14
|
+
lastFailureTime: number;
|
|
15
|
+
/** Timestamp of last success */
|
|
16
|
+
lastSuccessTime: number;
|
|
17
|
+
/** When the backoff period ends (timestamp) */
|
|
18
|
+
backoffUntil?: number;
|
|
19
|
+
}
|
|
20
|
+
/** Storage adapter interface for persisting relay liveness state */
|
|
21
|
+
export interface LivenessStorage {
|
|
22
|
+
/**
|
|
23
|
+
* Get an item from storage
|
|
24
|
+
* @param key The storage key
|
|
25
|
+
* @returns The stored value or null if not found
|
|
26
|
+
*/
|
|
27
|
+
getItem(key: string): Promise<any> | any;
|
|
28
|
+
/**
|
|
29
|
+
* Set an item in storage
|
|
30
|
+
* @param key The storage key
|
|
31
|
+
* @param value The value to store
|
|
32
|
+
*/
|
|
33
|
+
setItem(key: string, value: any): Promise<void> | void;
|
|
34
|
+
}
|
|
35
|
+
/** Configuration options for RelayLiveness */
|
|
36
|
+
export interface LivenessOptions {
|
|
37
|
+
/** Optional async storage adapter for persistence */
|
|
38
|
+
storage?: LivenessStorage;
|
|
39
|
+
/** Maximum failures before moving from offline to dead */
|
|
40
|
+
maxFailuresBeforeDead?: number;
|
|
41
|
+
/** Base delay for exponential backoff (ms) */
|
|
42
|
+
backoffBaseDelay?: number;
|
|
43
|
+
/** Maximum backoff delay (ms) */
|
|
44
|
+
backoffMaxDelay?: number;
|
|
45
|
+
}
|
|
46
|
+
/** Record and manage liveness reports for relays */
|
|
47
|
+
export declare class RelayLiveness {
|
|
48
|
+
private log;
|
|
49
|
+
private readonly options;
|
|
50
|
+
private readonly states$;
|
|
51
|
+
/** Relays that have been seen this session. this should be used when checking dead relays for liveness */
|
|
52
|
+
readonly seen: Set<string>;
|
|
53
|
+
/** Storage adapter for persistence */
|
|
54
|
+
readonly storage?: LivenessStorage;
|
|
55
|
+
/** An observable of all relays that are online */
|
|
56
|
+
online$: Observable<string[]>;
|
|
57
|
+
/** An observable of all relays that are offline */
|
|
58
|
+
offline$: Observable<string[]>;
|
|
59
|
+
/** An observable of all relays that are dead */
|
|
60
|
+
dead$: Observable<string[]>;
|
|
61
|
+
/** An observable of all relays that are online or not in backoff */
|
|
62
|
+
healthy$: Observable<string[]>;
|
|
63
|
+
/** An observable of all relays that are dead or in backoff */
|
|
64
|
+
unhealthy$: Observable<string[]>;
|
|
65
|
+
/** Relays that are known to be online */
|
|
66
|
+
get online(): string[];
|
|
67
|
+
/** Relays that are known to be offline */
|
|
68
|
+
get offline(): string[];
|
|
69
|
+
/** Relays that are known to be dead */
|
|
70
|
+
get dead(): string[];
|
|
71
|
+
/** Relays that are online or not in backoff */
|
|
72
|
+
get healthy(): string[];
|
|
73
|
+
/** Relays that are dead or in backoff */
|
|
74
|
+
get unhealthy(): string[];
|
|
75
|
+
/**
|
|
76
|
+
* Create a new RelayLiveness instance
|
|
77
|
+
* @param options Configuration options for the liveness tracker
|
|
78
|
+
*/
|
|
79
|
+
constructor(options?: LivenessOptions);
|
|
80
|
+
/** Load relay states from storage */
|
|
81
|
+
load(): Promise<void>;
|
|
82
|
+
/** Save all known relays and their states to storage */
|
|
83
|
+
save(): Promise<void>;
|
|
84
|
+
/** Filter relay list, removing dead relays and relays in backoff */
|
|
85
|
+
filter(relays: string[]): string[];
|
|
86
|
+
/** Subscribe to a relays state */
|
|
87
|
+
state(relay: string): Observable<RelayState | undefined>;
|
|
88
|
+
/** Revive a dead relay with the max backoff delay */
|
|
89
|
+
revive(relay: string): void;
|
|
90
|
+
/** Get current relay health state for a relay */
|
|
91
|
+
getState(relay: string): RelayState | undefined;
|
|
92
|
+
/** Check if a relay is currently in backoff period */
|
|
93
|
+
isInBackoff(relay: string): boolean;
|
|
94
|
+
/** Get remaining backoff time for a relay (in ms) */
|
|
95
|
+
getBackoffRemaining(relay: string): number;
|
|
96
|
+
/** Calculate backoff delay based on failure count */
|
|
97
|
+
private calculateBackoffDelay;
|
|
98
|
+
/**
|
|
99
|
+
* Record a successful connection
|
|
100
|
+
* @param relay The relay URL that succeeded
|
|
101
|
+
*/
|
|
102
|
+
recordSuccess(relay: string): void;
|
|
103
|
+
/**
|
|
104
|
+
* Record a failed connection
|
|
105
|
+
* @param relay The relay URL that failed
|
|
106
|
+
*/
|
|
107
|
+
recordFailure(relay: string): void;
|
|
108
|
+
/**
|
|
109
|
+
* Get all seen relays (for debugging/monitoring)
|
|
110
|
+
*/
|
|
111
|
+
getSeenRelays(): string[];
|
|
112
|
+
/**
|
|
113
|
+
* Reset state for one or all relays
|
|
114
|
+
* @param relay Optional specific relay URL to reset, or reset all if not provided
|
|
115
|
+
*/
|
|
116
|
+
reset(relay?: string): void;
|
|
117
|
+
private connections;
|
|
118
|
+
/** Connect to a {@link RelayPool} instance and track relay connections */
|
|
119
|
+
connectToPool(pool: IPool): void;
|
|
120
|
+
/** Disconnect from a {@link RelayPool} instance */
|
|
121
|
+
disconnectFromPool(pool: IPool): void;
|
|
122
|
+
private updateRelayState;
|
|
123
|
+
private saveKnownRelays;
|
|
124
|
+
private saveRelayState;
|
|
125
|
+
}
|
package/dist/liveness.js
ADDED
|
@@ -0,0 +1,327 @@
|
|
|
1
|
+
import { logger } from "applesauce-core";
|
|
2
|
+
import { BehaviorSubject, map } from "rxjs";
|
|
3
|
+
/** Record and manage liveness reports for relays */
|
|
4
|
+
export class RelayLiveness {
|
|
5
|
+
log = logger.extend("RelayLiveness");
|
|
6
|
+
options;
|
|
7
|
+
states$ = new BehaviorSubject({});
|
|
8
|
+
/** Relays that have been seen this session. this should be used when checking dead relays for liveness */
|
|
9
|
+
seen = new Set();
|
|
10
|
+
/** Storage adapter for persistence */
|
|
11
|
+
storage;
|
|
12
|
+
/** An observable of all relays that are online */
|
|
13
|
+
online$;
|
|
14
|
+
/** An observable of all relays that are offline */
|
|
15
|
+
offline$;
|
|
16
|
+
/** An observable of all relays that are dead */
|
|
17
|
+
dead$;
|
|
18
|
+
/** An observable of all relays that are online or not in backoff */
|
|
19
|
+
healthy$;
|
|
20
|
+
/** An observable of all relays that are dead or in backoff */
|
|
21
|
+
unhealthy$;
|
|
22
|
+
/** Relays that are known to be online */
|
|
23
|
+
get online() {
|
|
24
|
+
return Object.keys(this.states$.value).filter((relay) => this.states$.value[relay].state === "online");
|
|
25
|
+
}
|
|
26
|
+
/** Relays that are known to be offline */
|
|
27
|
+
get offline() {
|
|
28
|
+
return Object.keys(this.states$.value).filter((relay) => this.states$.value[relay].state === "offline");
|
|
29
|
+
}
|
|
30
|
+
/** Relays that are known to be dead */
|
|
31
|
+
get dead() {
|
|
32
|
+
return Object.keys(this.states$.value).filter((relay) => this.states$.value[relay].state === "dead");
|
|
33
|
+
}
|
|
34
|
+
/** Relays that are online or not in backoff */
|
|
35
|
+
get healthy() {
|
|
36
|
+
return Object.keys(this.states$.value).filter((relay) => {
|
|
37
|
+
const state = this.states$.value[relay];
|
|
38
|
+
return state.state === "online" || (state.state === "offline" && !this.isInBackoff(relay));
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
/** Relays that are dead or in backoff */
|
|
42
|
+
get unhealthy() {
|
|
43
|
+
return Object.keys(this.states$.value).filter((relay) => {
|
|
44
|
+
const state = this.states$.value[relay];
|
|
45
|
+
return state.state === "dead" || (state.state === "offline" && this.isInBackoff(relay));
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* Create a new RelayLiveness instance
|
|
50
|
+
* @param options Configuration options for the liveness tracker
|
|
51
|
+
*/
|
|
52
|
+
constructor(options = {}) {
|
|
53
|
+
this.options = {
|
|
54
|
+
maxFailuresBeforeDead: options.maxFailuresBeforeDead ?? 5,
|
|
55
|
+
backoffBaseDelay: options.backoffBaseDelay ?? 30 * 1000, // 30 seconds
|
|
56
|
+
backoffMaxDelay: options.backoffMaxDelay ?? 5 * 60 * 1000, // 5 minutes
|
|
57
|
+
};
|
|
58
|
+
this.storage = options.storage;
|
|
59
|
+
// Create observable interfaces
|
|
60
|
+
this.online$ = this.states$.pipe(map((states) => Object.keys(states).filter((relay) => states[relay].state === "online")));
|
|
61
|
+
this.offline$ = this.states$.pipe(map((states) => Object.keys(states).filter((relay) => states[relay].state === "offline")));
|
|
62
|
+
this.dead$ = this.states$.pipe(map((states) => Object.keys(states).filter((relay) => states[relay].state === "dead")));
|
|
63
|
+
this.healthy$ = this.states$.pipe(map((states) => Object.keys(states).filter((relay) => {
|
|
64
|
+
const state = states[relay];
|
|
65
|
+
return state.state === "online" || (state.state === "offline" && !this.isInBackoff(relay));
|
|
66
|
+
})));
|
|
67
|
+
this.unhealthy$ = this.states$.pipe(map((states) => Object.keys(states).filter((relay) => {
|
|
68
|
+
const state = states[relay];
|
|
69
|
+
return state.state === "dead" || (state.state === "offline" && this.isInBackoff(relay));
|
|
70
|
+
})));
|
|
71
|
+
}
|
|
72
|
+
/** Load relay states from storage */
|
|
73
|
+
async load() {
|
|
74
|
+
if (!this.storage)
|
|
75
|
+
return;
|
|
76
|
+
const known = await this.storage.getItem("known");
|
|
77
|
+
if (!Array.isArray(known))
|
|
78
|
+
return;
|
|
79
|
+
this.log(`Loading states for ${known.length} known relays`);
|
|
80
|
+
const states = {};
|
|
81
|
+
for (const relay of known) {
|
|
82
|
+
try {
|
|
83
|
+
const state = await this.storage.getItem(relay);
|
|
84
|
+
if (state)
|
|
85
|
+
states[relay] = state;
|
|
86
|
+
}
|
|
87
|
+
catch (error) {
|
|
88
|
+
// Ignore relay loading errors
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
this.states$.next(states);
|
|
92
|
+
}
|
|
93
|
+
/** Save all known relays and their states to storage */
|
|
94
|
+
async save() {
|
|
95
|
+
await this.saveKnownRelays();
|
|
96
|
+
await Promise.all(Object.entries(this.states$.value).map(([relay, state]) => this.saveRelayState(relay, state)));
|
|
97
|
+
this.log("Relay states saved to storage");
|
|
98
|
+
}
|
|
99
|
+
/** Filter relay list, removing dead relays and relays in backoff */
|
|
100
|
+
filter(relays) {
|
|
101
|
+
const results = [];
|
|
102
|
+
for (const relay of relays) {
|
|
103
|
+
// Track that this relay has been seen
|
|
104
|
+
this.seen.add(relay);
|
|
105
|
+
const state = this.getState(relay);
|
|
106
|
+
// Filter based on state and backoff
|
|
107
|
+
switch (state?.state) {
|
|
108
|
+
case undefined: // unknown state
|
|
109
|
+
case "online":
|
|
110
|
+
results.push(relay);
|
|
111
|
+
break;
|
|
112
|
+
case "offline":
|
|
113
|
+
// Only include if not in backoff
|
|
114
|
+
if (!this.isInBackoff(relay))
|
|
115
|
+
results.push(relay);
|
|
116
|
+
break;
|
|
117
|
+
case "dead":
|
|
118
|
+
default:
|
|
119
|
+
// Don't include dead relays
|
|
120
|
+
break;
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
return results;
|
|
124
|
+
}
|
|
125
|
+
/** Subscribe to a relays state */
|
|
126
|
+
state(relay) {
|
|
127
|
+
return this.states$.pipe(map((states) => states[relay]));
|
|
128
|
+
}
|
|
129
|
+
/** Revive a dead relay with the max backoff delay */
|
|
130
|
+
revive(relay) {
|
|
131
|
+
const state = this.getState(relay);
|
|
132
|
+
if (!state)
|
|
133
|
+
return;
|
|
134
|
+
this.updateRelayState(relay, {
|
|
135
|
+
state: "offline",
|
|
136
|
+
failureCount: 0,
|
|
137
|
+
lastFailureTime: 0,
|
|
138
|
+
lastSuccessTime: Date.now(),
|
|
139
|
+
backoffUntil: this.options.backoffMaxDelay,
|
|
140
|
+
});
|
|
141
|
+
this.log(`Relay ${relay} revived to offline state with max backoff delay`);
|
|
142
|
+
}
|
|
143
|
+
/** Get current relay health state for a relay */
|
|
144
|
+
getState(relay) {
|
|
145
|
+
return this.states$.value[relay];
|
|
146
|
+
}
|
|
147
|
+
/** Check if a relay is currently in backoff period */
|
|
148
|
+
isInBackoff(relay) {
|
|
149
|
+
const state = this.getState(relay);
|
|
150
|
+
if (!state?.backoffUntil)
|
|
151
|
+
return false;
|
|
152
|
+
return Date.now() < state.backoffUntil;
|
|
153
|
+
}
|
|
154
|
+
/** Get remaining backoff time for a relay (in ms) */
|
|
155
|
+
getBackoffRemaining(relay) {
|
|
156
|
+
const state = this.getState(relay);
|
|
157
|
+
if (!state?.backoffUntil)
|
|
158
|
+
return 0;
|
|
159
|
+
return Math.max(0, state.backoffUntil - Date.now());
|
|
160
|
+
}
|
|
161
|
+
/** Calculate backoff delay based on failure count */
|
|
162
|
+
calculateBackoffDelay(failureCount) {
|
|
163
|
+
const delay = this.options.backoffBaseDelay * Math.pow(2, failureCount - 1);
|
|
164
|
+
return Math.min(delay, this.options.backoffMaxDelay);
|
|
165
|
+
}
|
|
166
|
+
/**
|
|
167
|
+
* Record a successful connection
|
|
168
|
+
* @param relay The relay URL that succeeded
|
|
169
|
+
*/
|
|
170
|
+
recordSuccess(relay) {
|
|
171
|
+
const now = Date.now();
|
|
172
|
+
const state = this.getState(relay);
|
|
173
|
+
// Don't update dead relays
|
|
174
|
+
if (state?.state === "dead") {
|
|
175
|
+
this.log(`Ignoring success for dead relay ${relay}`);
|
|
176
|
+
return;
|
|
177
|
+
}
|
|
178
|
+
// Record new relays
|
|
179
|
+
if (state === undefined) {
|
|
180
|
+
this.seen.add(relay);
|
|
181
|
+
this.saveKnownRelays();
|
|
182
|
+
}
|
|
183
|
+
// TODO: resetting the state back to online might be too aggressive?
|
|
184
|
+
const newState = {
|
|
185
|
+
state: "online",
|
|
186
|
+
failureCount: 0,
|
|
187
|
+
lastFailureTime: 0,
|
|
188
|
+
lastSuccessTime: now,
|
|
189
|
+
};
|
|
190
|
+
this.updateRelayState(relay, newState);
|
|
191
|
+
// Log transition if it's not the first time we've seen the relay
|
|
192
|
+
if (state && state.state !== newState.state)
|
|
193
|
+
this.log(`Relay ${relay} transitioned ${state?.state} -> online`);
|
|
194
|
+
}
|
|
195
|
+
/**
|
|
196
|
+
* Record a failed connection
|
|
197
|
+
* @param relay The relay URL that failed
|
|
198
|
+
*/
|
|
199
|
+
recordFailure(relay) {
|
|
200
|
+
const state = this.getState(relay);
|
|
201
|
+
// Don't update dead relays
|
|
202
|
+
if (state?.state === "dead")
|
|
203
|
+
return;
|
|
204
|
+
// Ignore failures during backoff, this should help catch double reporting of failures
|
|
205
|
+
if (this.isInBackoff(relay))
|
|
206
|
+
return;
|
|
207
|
+
const now = Date.now();
|
|
208
|
+
const failureCount = (state?.failureCount || 0) + 1;
|
|
209
|
+
// Record new relays
|
|
210
|
+
if (state === undefined) {
|
|
211
|
+
this.seen.add(relay);
|
|
212
|
+
this.saveKnownRelays();
|
|
213
|
+
}
|
|
214
|
+
// Calculate backoff delay
|
|
215
|
+
const backoffDelay = this.calculateBackoffDelay(failureCount);
|
|
216
|
+
const newState = failureCount >= this.options.maxFailuresBeforeDead ? "dead" : "offline";
|
|
217
|
+
const relayState = {
|
|
218
|
+
state: newState,
|
|
219
|
+
failureCount,
|
|
220
|
+
lastFailureTime: now,
|
|
221
|
+
lastSuccessTime: state?.lastSuccessTime || 0,
|
|
222
|
+
backoffUntil: now + backoffDelay,
|
|
223
|
+
};
|
|
224
|
+
this.updateRelayState(relay, relayState);
|
|
225
|
+
// Log transition if it's not the first time we've seen the relay
|
|
226
|
+
if (newState !== state?.state)
|
|
227
|
+
this.log(`Relay ${relay} transitioned ${state?.state} -> ${newState}`);
|
|
228
|
+
// Set a timeout that will clear the backoff period
|
|
229
|
+
setTimeout(() => {
|
|
230
|
+
const state = this.getState(relay);
|
|
231
|
+
if (!state || state.backoffUntil === undefined)
|
|
232
|
+
return;
|
|
233
|
+
this.updateRelayState(relay, { ...state, backoffUntil: undefined });
|
|
234
|
+
}, backoffDelay);
|
|
235
|
+
}
|
|
236
|
+
/**
|
|
237
|
+
* Get all seen relays (for debugging/monitoring)
|
|
238
|
+
*/
|
|
239
|
+
getSeenRelays() {
|
|
240
|
+
return Array.from(this.seen);
|
|
241
|
+
}
|
|
242
|
+
/**
|
|
243
|
+
* Reset state for one or all relays
|
|
244
|
+
* @param relay Optional specific relay URL to reset, or reset all if not provided
|
|
245
|
+
*/
|
|
246
|
+
reset(relay) {
|
|
247
|
+
if (relay) {
|
|
248
|
+
const newStates = { ...this.states$.value };
|
|
249
|
+
delete newStates[relay];
|
|
250
|
+
this.states$.next(newStates);
|
|
251
|
+
this.seen.delete(relay);
|
|
252
|
+
}
|
|
253
|
+
else {
|
|
254
|
+
// Reset all relays
|
|
255
|
+
this.states$.next({});
|
|
256
|
+
this.seen.clear();
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
// The connected pools and cleanup methods
|
|
260
|
+
connections = new Map();
|
|
261
|
+
/** Connect to a {@link RelayPool} instance and track relay connections */
|
|
262
|
+
connectToPool(pool) {
|
|
263
|
+
// Relay cleanup methods
|
|
264
|
+
const relays = new Map();
|
|
265
|
+
// Listen for relays being added
|
|
266
|
+
const add = pool.add$.subscribe((relay) => {
|
|
267
|
+
// Record seen relays
|
|
268
|
+
this.seen.add(relay.url);
|
|
269
|
+
const open = relay.open$.subscribe(() => {
|
|
270
|
+
this.recordSuccess(relay.url);
|
|
271
|
+
});
|
|
272
|
+
const close = relay.close$.subscribe((event) => {
|
|
273
|
+
if (event.wasClean === false)
|
|
274
|
+
this.recordFailure(relay.url);
|
|
275
|
+
});
|
|
276
|
+
// Register the cleanup method
|
|
277
|
+
relays.set(relay, () => {
|
|
278
|
+
open.unsubscribe();
|
|
279
|
+
close.unsubscribe();
|
|
280
|
+
});
|
|
281
|
+
});
|
|
282
|
+
// Listen for relays being removed
|
|
283
|
+
const remove = pool.remove$.subscribe((relay) => {
|
|
284
|
+
const cleanup = relays.get(relay);
|
|
285
|
+
if (cleanup)
|
|
286
|
+
cleanup();
|
|
287
|
+
relays.delete(relay);
|
|
288
|
+
});
|
|
289
|
+
// register the cleanup method
|
|
290
|
+
this.connections.set(pool, () => {
|
|
291
|
+
add.unsubscribe();
|
|
292
|
+
remove.unsubscribe();
|
|
293
|
+
});
|
|
294
|
+
}
|
|
295
|
+
/** Disconnect from a {@link RelayPool} instance */
|
|
296
|
+
disconnectFromPool(pool) {
|
|
297
|
+
const cleanup = this.connections.get(pool);
|
|
298
|
+
if (cleanup)
|
|
299
|
+
cleanup();
|
|
300
|
+
this.connections.delete(pool);
|
|
301
|
+
}
|
|
302
|
+
updateRelayState(relay, state) {
|
|
303
|
+
this.states$.next({ ...this.states$.value, [relay]: state });
|
|
304
|
+
// Auto-save to storage
|
|
305
|
+
this.saveRelayState(relay, state);
|
|
306
|
+
}
|
|
307
|
+
async saveKnownRelays() {
|
|
308
|
+
if (!this.storage)
|
|
309
|
+
return;
|
|
310
|
+
try {
|
|
311
|
+
await this.storage.setItem("known", Object.keys(this.states$.value));
|
|
312
|
+
}
|
|
313
|
+
catch (error) {
|
|
314
|
+
// Ignore storage errors
|
|
315
|
+
}
|
|
316
|
+
}
|
|
317
|
+
async saveRelayState(relay, state) {
|
|
318
|
+
if (!this.storage)
|
|
319
|
+
return;
|
|
320
|
+
try {
|
|
321
|
+
await this.storage.setItem(relay, state);
|
|
322
|
+
}
|
|
323
|
+
catch (error) {
|
|
324
|
+
// Ignore storage errors
|
|
325
|
+
}
|
|
326
|
+
}
|
|
327
|
+
}
|
package/dist/operators/index.js
CHANGED
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { MonoTypeOperatorFunction, Observable } from "rxjs";
|
|
2
|
+
type ILivenessTracker = {
|
|
3
|
+
unhealthy$: Observable<string[]>;
|
|
4
|
+
seen?: Set<string>;
|
|
5
|
+
};
|
|
6
|
+
/** Filters out unhealthy relays from an array of pointers */
|
|
7
|
+
export declare function ignoreUnhealthyRelaysOnPointers<T extends {
|
|
8
|
+
relays?: string[];
|
|
9
|
+
}, Tracker extends ILivenessTracker>(liveness: Tracker): MonoTypeOperatorFunction<T[]>;
|
|
10
|
+
/** Filters out unhealthy relays from the inboxes and outboxes */
|
|
11
|
+
export declare function ignoreUnhealthyMailboxes<T extends {
|
|
12
|
+
inboxes?: string[];
|
|
13
|
+
outboxes?: string[];
|
|
14
|
+
}, Tracker extends ILivenessTracker>(liveness: Tracker): MonoTypeOperatorFunction<T>;
|
|
15
|
+
/** Filters out unhealthy relays from an array of relays */
|
|
16
|
+
export declare function ignoreUnhealthyRelays<Tracker extends ILivenessTracker>(liveness: Tracker): MonoTypeOperatorFunction<string[]>;
|
|
17
|
+
export {};
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import { combineLatestWith, map } from "rxjs";
|
|
2
|
+
function filterRelays(relays, unhealthy, liveness) {
|
|
3
|
+
return (relays &&
|
|
4
|
+
relays.filter((relay) => {
|
|
5
|
+
// Notify the liveness tracker that we've seen this relay
|
|
6
|
+
liveness.seen?.add(relay);
|
|
7
|
+
// Exclude unhealthy relays
|
|
8
|
+
return !unhealthy.includes(relay);
|
|
9
|
+
}));
|
|
10
|
+
}
|
|
11
|
+
/** Filters out unhealthy relays from an array of pointers */
|
|
12
|
+
export function ignoreUnhealthyRelaysOnPointers(liveness) {
|
|
13
|
+
return (source) => source.pipe(
|
|
14
|
+
// Combine with the liveness observable
|
|
15
|
+
combineLatestWith(liveness.unhealthy$),
|
|
16
|
+
// Filters out unhealthy relays from the pointers
|
|
17
|
+
map(([pointers, unhealthy]) => pointers.map((pointer) => {
|
|
18
|
+
if (!pointer.relays)
|
|
19
|
+
return pointer;
|
|
20
|
+
// Exclude unhealthy relays
|
|
21
|
+
return { ...pointer, relays: filterRelays(pointer.relays, unhealthy, liveness) };
|
|
22
|
+
})));
|
|
23
|
+
}
|
|
24
|
+
/** Filters out unhealthy relays from the inboxes and outboxes */
|
|
25
|
+
export function ignoreUnhealthyMailboxes(liveness) {
|
|
26
|
+
return (source) => source.pipe(
|
|
27
|
+
// Combine with the liveness observable
|
|
28
|
+
combineLatestWith(liveness.unhealthy$),
|
|
29
|
+
// Filters out unhealthy relays from the inboxes and outboxes
|
|
30
|
+
map(([mailboxes, unhealthy]) => {
|
|
31
|
+
if (!mailboxes.inboxes && !mailboxes.outboxes)
|
|
32
|
+
return mailboxes;
|
|
33
|
+
return {
|
|
34
|
+
...mailboxes,
|
|
35
|
+
inboxes: filterRelays(mailboxes.inboxes, unhealthy, liveness),
|
|
36
|
+
outboxes: filterRelays(mailboxes.outboxes, unhealthy, liveness),
|
|
37
|
+
};
|
|
38
|
+
}));
|
|
39
|
+
}
|
|
40
|
+
/** Filters out unhealthy relays from an array of relays */
|
|
41
|
+
export function ignoreUnhealthyRelays(liveness) {
|
|
42
|
+
return (source) => source.pipe(
|
|
43
|
+
// Combine with the liveness observable
|
|
44
|
+
combineLatestWith(liveness.unhealthy$),
|
|
45
|
+
// Filters out unhealthy relays from the array
|
|
46
|
+
map(([relays, unhealthy]) => filterRelays(relays, unhealthy, liveness)));
|
|
47
|
+
}
|
package/dist/types.d.ts
CHANGED
|
@@ -65,6 +65,9 @@ export interface IRelay extends MultiplexWebSocket {
|
|
|
65
65
|
challenge$: Observable<string | null>;
|
|
66
66
|
authenticated$: Observable<boolean>;
|
|
67
67
|
notices$: Observable<string[]>;
|
|
68
|
+
open$: Observable<Event>;
|
|
69
|
+
close$: Observable<CloseEvent>;
|
|
70
|
+
closing$: Observable<void>;
|
|
68
71
|
error$: Observable<Error | null>;
|
|
69
72
|
readonly connected: boolean;
|
|
70
73
|
readonly authenticated: boolean;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "applesauce-relay",
|
|
3
|
-
"version": "0.0.0-next-
|
|
3
|
+
"version": "0.0.0-next-20251015123951",
|
|
4
4
|
"description": "nostr relay communication framework built on rxjs",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -52,14 +52,14 @@
|
|
|
52
52
|
},
|
|
53
53
|
"dependencies": {
|
|
54
54
|
"@noble/hashes": "^1.7.1",
|
|
55
|
-
"applesauce-core": "0.0.0-next-
|
|
55
|
+
"applesauce-core": "0.0.0-next-20251015123951",
|
|
56
56
|
"nanoid": "^5.0.9",
|
|
57
57
|
"nostr-tools": "~2.17",
|
|
58
58
|
"rxjs": "^7.8.1"
|
|
59
59
|
},
|
|
60
60
|
"devDependencies": {
|
|
61
61
|
"@hirez_io/observer-spy": "^2.2.0",
|
|
62
|
-
"applesauce-signers": "0.0.0-next-
|
|
62
|
+
"applesauce-signers": "0.0.0-next-20251015123951",
|
|
63
63
|
"rimraf": "^6.0.1",
|
|
64
64
|
"typescript": "^5.7.3",
|
|
65
65
|
"vitest": "^3.2.4",
|