@estiva-app/protocol 0.45.0 → 0.46.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -4,6 +4,35 @@ Every entry answers the wire question explicitly, including when the answer is
4
4
  nothing (ADR 0002 §4b). A change to the bytes an app publishes is a MAJOR — in
5
5
  `0.x`, a MINOR — even when no TypeScript signature moved.
6
6
 
7
+ ## 0.46.0 — 2026-10-28
8
+
9
+ **Wire behaviour: a busy relay is asked again; nothing an app publishes
10
+ changes** (SPEC §2; APP-9; record
11
+ [a busy relay says it is busy](https://github.com/estiva-app/estiva-docs/blob/main/decisions/a-busy-relay-says-it-is-busy.md)).
12
+ When the relay cannot reach its database it now answers `503` with
13
+ `Retry-After` on HTTP and `CLOSED "error: relay busy"` on a read. `Relay`
14
+ asks again quietly, three times over about seven seconds (jittered), on a
15
+ `503` that is not `query timed out` and on a proxy's `502`; if the relay
16
+ stays busy, `query` throws a `RelayBusyError` and `publish` returns
17
+ `{ ok: false, reason: RELAY_BUSY_MESSAGE }`, both reading "the relay is busy,
18
+ try again in a moment". An app with its own transport gets the same quiet
19
+ retries from `retryWhileBusy(send)`, which `Relay` uses. `createLiveRelay` re-issues a subscription the relay
20
+ closed as busy, with backoff, up to four times before its `onClosed` hears
21
+ `RELAY_BUSY_CLOSED`; the count starts again after an `EOSE`. A read cut off
22
+ for running too long (`query timed out`) is still not asked again.
23
+
24
+ ## 0.45.1 — 2026-10-28
25
+
26
+ **Wire behaviour: nothing changes** (APP-6). `Relay.queryAll` keeps a pooled
27
+ first page it used to throw away. When every filter of the batch is a plain
28
+ NIP-01 filter and every two ask disjoint values of some field, each event is
29
+ put in the run of the one filter it matches; a run that came back short is
30
+ settled, a full one pages on from where it ended. Before, a batch whose filters
31
+ named no Folder and shared a kind (a Folder listing's changes, in groups of ten
32
+ addresses) could not be split: its whole answer, 23.8 MB on production 27 Oct,
33
+ was discarded and every filter asked again. An event matching two filters still
34
+ leaves the batch unsplit, read the old way.
35
+
7
36
  ## 0.45.0 — 2026-10-27
8
37
 
9
38
  **Wire behaviour: nothing changes** (PEEKM-7). `linksOnWordsOf(text)` reads
package/dist/bridge.d.ts CHANGED
@@ -141,6 +141,44 @@ export interface QueryResult {
141
141
  }
142
142
  /** The relay's answer to `POST /query`, interpreted. */
143
143
  export declare function parseQueryResponse(status: number, text: string): QueryResult;
144
+ /** What a person reads when the relay stays busy through the quiet retries. */
145
+ export declare const RELAY_BUSY_MESSAGE = "the relay is busy, try again in a moment";
146
+ /**
147
+ * The relay, or the proxy in front of it, cannot answer right now and asking
148
+ * again shortly will help: a `503` that is not a cut-off query, or a `502`
149
+ * from the proxy while the relay restarts. Not a proxy's `504`: that is a
150
+ * request that ran too long, which asking again repeats.
151
+ *
152
+ * Decided on the status and on upstream's stable `query timed out` body, never
153
+ * on prose. A cut-off query is not busy: the same query would be cut off again,
154
+ * and repeating it adds to the load that cut it off.
155
+ *
156
+ * why: https://github.com/estiva-app/estiva-docs/blob/main/decisions/a-busy-relay-says-it-is-busy.md
157
+ */
158
+ export declare function isRelayBusyResponse(status: number, text: string): boolean;
159
+ /** A read the relay kept answering "busy" to, after the quiet retries. */
160
+ export declare class RelayBusyError extends Error {
161
+ readonly httpStatus: number;
162
+ constructor(httpStatus: number);
163
+ }
164
+ /**
165
+ * `send`, asked again after a jittered wait while the relay says it is busy
166
+ * ({@link isRelayBusyResponse}), at most once per entry of `delaysMs`. The last
167
+ * answer is returned as it came, busy or not; the caller turns a busy one into
168
+ * {@link RELAY_BUSY_MESSAGE}.
169
+ *
170
+ * Takes the request as a function rather than a URL, so an app with its own
171
+ * transport (Peek signs through Estiva ID, not a {@link Signer}) gets the same
172
+ * quiet retries as {@link Relay}. `send` is called afresh each time, so a
173
+ * request that signs NIP-98 auth signs a new one per ask.
174
+ */
175
+ export declare function retryWhileBusy(send: () => Promise<{
176
+ status: number;
177
+ text: string;
178
+ }>, delaysMs?: readonly number[]): Promise<{
179
+ status: number;
180
+ text: string;
181
+ }>;
144
182
  /**
145
183
  * Just enough of `fetch` to post a body and read the answer.
146
184
  *
@@ -177,6 +215,12 @@ export interface RelayOptions {
177
215
  headers?: RelayHeaders;
178
216
  /** Override the transport. Defaults to the runtime's `fetch`. */
179
217
  fetch?: FetchLike;
218
+ /**
219
+ * Waits before each quiet retry of a busy answer ({@link isRelayBusyResponse}).
220
+ * Its length is the number of retries. A test seam; the default is about
221
+ * seven seconds over three retries.
222
+ */
223
+ busyRetryDelaysMs?: readonly number[];
180
224
  }
181
225
  export declare class Relay {
182
226
  private readonly url;
@@ -196,7 +240,10 @@ export declare class Relay {
196
240
  */
197
241
  private observedPageCeiling;
198
242
  constructor(url: string, signer: Signer, options?: RelayOptions | RelayHeaders);
243
+ private readonly busyRetryDelaysMs;
244
+ /** {@link Relay.send} through {@link retryWhileBusy}. */
199
245
  private post;
246
+ private send;
200
247
  publish(event: SignedEvent): Promise<PublishResult>;
201
248
  /**
202
249
  * `filters` is an array — the bridge expects `Vec<Value>`.
@@ -204,6 +251,8 @@ export declare class Relay {
204
251
  * Throws on a transport-level failure rather than returning an empty array,
205
252
  * because "no events" and "the relay refused you" are not the same answer and
206
253
  * a caller that cannot tell them apart renders an empty screen either way.
254
+ * A relay that stays busy through the quiet retries throws a
255
+ * {@link RelayBusyError}.
207
256
  */
208
257
  query(filters: Record<string, unknown>[]): Promise<SignedEvent[]>;
209
258
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"bridge.d.ts","sourceRoot":"","sources":["../src/bridge.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bridge.d.ts","sourceRoot":"","sources":["../src/bridge.ts"],"names":[],"mappings":"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"}
package/dist/bridge.js CHANGED
@@ -180,6 +180,70 @@ export function parseQueryResponse(status, text) {
180
180
  return { ok: false, events: [], reason: `unparseable response: ${text.slice(0, 200)}`, httpStatus: status };
181
181
  }
182
182
  }
183
+ /** What a person reads when the relay stays busy through the quiet retries. */
184
+ export const RELAY_BUSY_MESSAGE = 'the relay is busy, try again in a moment';
185
+ /**
186
+ * The relay, or the proxy in front of it, cannot answer right now and asking
187
+ * again shortly will help: a `503` that is not a cut-off query, or a `502`
188
+ * from the proxy while the relay restarts. Not a proxy's `504`: that is a
189
+ * request that ran too long, which asking again repeats.
190
+ *
191
+ * Decided on the status and on upstream's stable `query timed out` body, never
192
+ * on prose. A cut-off query is not busy: the same query would be cut off again,
193
+ * and repeating it adds to the load that cut it off.
194
+ *
195
+ * why: https://github.com/estiva-app/estiva-docs/blob/main/decisions/a-busy-relay-says-it-is-busy.md
196
+ */
197
+ export function isRelayBusyResponse(status, text) {
198
+ if (status === 502)
199
+ return true;
200
+ if (status !== 503)
201
+ return false;
202
+ let error;
203
+ try {
204
+ error = JSON.parse(text)?.error;
205
+ }
206
+ catch {
207
+ error = text.trim();
208
+ }
209
+ return error !== 'query timed out';
210
+ }
211
+ /** A read the relay kept answering "busy" to, after the quiet retries. */
212
+ export class RelayBusyError extends Error {
213
+ httpStatus;
214
+ constructor(httpStatus) {
215
+ super(RELAY_BUSY_MESSAGE);
216
+ this.name = 'RelayBusyError';
217
+ this.httpStatus = httpStatus;
218
+ }
219
+ }
220
+ /**
221
+ * Waits before each quiet retry of a busy answer, in milliseconds: three
222
+ * retries, about seven seconds in all, each jittered so several apps refused
223
+ * together do not come back together.
224
+ */
225
+ const BUSY_RETRY_DELAYS_MS = [1_000, 2_000, 4_000];
226
+ /**
227
+ * `send`, asked again after a jittered wait while the relay says it is busy
228
+ * ({@link isRelayBusyResponse}), at most once per entry of `delaysMs`. The last
229
+ * answer is returned as it came, busy or not; the caller turns a busy one into
230
+ * {@link RELAY_BUSY_MESSAGE}.
231
+ *
232
+ * Takes the request as a function rather than a URL, so an app with its own
233
+ * transport (Peek signs through Estiva ID, not a {@link Signer}) gets the same
234
+ * quiet retries as {@link Relay}. `send` is called afresh each time, so a
235
+ * request that signs NIP-98 auth signs a new one per ask.
236
+ */
237
+ export async function retryWhileBusy(send, delaysMs = BUSY_RETRY_DELAYS_MS) {
238
+ for (const delay of delaysMs) {
239
+ const answer = await send();
240
+ if (!isRelayBusyResponse(answer.status, answer.text))
241
+ return answer;
242
+ const jittered = delay * (0.5 + Math.random() / 2);
243
+ await new Promise((resolve) => setTimeout(resolve, jittered));
244
+ }
245
+ return send();
246
+ }
183
247
  function byFolder(filters) {
184
248
  const slot = new Map();
185
249
  for (const [index, filter] of filters.entries()) {
@@ -220,8 +284,92 @@ function byKind(filters) {
220
284
  }
221
285
  return (event) => slot.get(event.kind) ?? null;
222
286
  }
287
+ const NIP01_LISTS = new Set(['ids', 'authors', 'kinds']);
288
+ /**
289
+ * NIP-01's match of one plain filter, or `null` for a filter with anything
290
+ * else in it (`search`, an extension), whose matches only the relay knows.
291
+ */
292
+ function matcherOf(filter) {
293
+ const sets = new Map();
294
+ for (const [key, value] of Object.entries(filter)) {
295
+ if (key === 'limit')
296
+ continue;
297
+ if (key === 'since' || key === 'until') {
298
+ if (typeof value !== 'number')
299
+ return null;
300
+ continue;
301
+ }
302
+ if (!NIP01_LISTS.has(key) && !/^#[A-Za-z]$/.test(key))
303
+ return null;
304
+ if (!Array.isArray(value))
305
+ return null;
306
+ sets.set(key, new Set(value));
307
+ }
308
+ const { since, until } = filter;
309
+ return (event) => {
310
+ if (since !== undefined && event.created_at < since)
311
+ return false;
312
+ if (until !== undefined && event.created_at > until)
313
+ return false;
314
+ for (const [key, want] of sets) {
315
+ if (key === 'ids' && !want.has(event.id))
316
+ return false;
317
+ if (key === 'authors' && !want.has(event.pubkey))
318
+ return false;
319
+ if (key === 'kinds' && !want.has(event.kind))
320
+ return false;
321
+ if (key.startsWith('#') && !event.tags.some((tag) => tag[0] === key[1] && want.has(tag[1])))
322
+ return false;
323
+ }
324
+ return true;
325
+ };
326
+ }
327
+ /**
328
+ * **By match**, for any batch of plain filters: an event the relay sent
329
+ * matching exactly one filter of the batch can only be in that filter's run.
330
+ * One matching two is refused, not guessed. This is the listing's read, a
331
+ * Folder's files and their changes in groups of ten addresses (APP-6), where
332
+ * no filter names a Folder and several ask the same kind: its 21 change
333
+ * filters' first page, 23.8 MB on production 27 Oct, was thrown away and every
334
+ * filter asked again.
335
+ *
336
+ * Offered only when every two filters ask disjoint values of some one field,
337
+ * so the answer is likely to split: two that could select the same events
338
+ * (`{kinds:[8,9]}` and `{kinds:[9]}`) would spend the request for nothing.
339
+ */
340
+ function byMatch(filters) {
341
+ const matchers = filters.map(matcherOf);
342
+ if (matchers.some((matcher) => matcher === null))
343
+ return null;
344
+ const lists = filters.map((filter) => new Map(Object.entries(filter).flatMap(([key, values]) => (Array.isArray(values) ? [[key, new Set(values)]] : []))));
345
+ const apart = (a, b) => [...a].some(([key, values]) => {
346
+ const other = b.get(key);
347
+ if (!other)
348
+ return false;
349
+ for (const value of values)
350
+ if (other.has(value))
351
+ return false;
352
+ return true;
353
+ });
354
+ for (let i = 0; i < lists.length; i++) {
355
+ for (let j = i + 1; j < lists.length; j++)
356
+ if (!apart(lists[i], lists[j]))
357
+ return null;
358
+ }
359
+ return (event) => {
360
+ let found = null;
361
+ for (const [index, matches] of matchers.entries()) {
362
+ if (!matches(event))
363
+ continue;
364
+ if (found !== null)
365
+ return null;
366
+ found = index;
367
+ }
368
+ return found;
369
+ };
370
+ }
223
371
  function discriminate(filters) {
224
- return byFolder(filters) ?? byKind(filters);
372
+ return byFolder(filters) ?? byKind(filters) ?? byMatch(filters);
225
373
  }
226
374
  /** The batched response split into one run per filter, or `null` if any event is unclaimed. */
227
375
  function splitRuns(count, events, which) {
@@ -260,8 +408,14 @@ export class Relay {
260
408
  const opts = typeof options === 'function' ? { headers: options } : options;
261
409
  this.headers = opts.headers ?? (() => ({}));
262
410
  this.transport = opts.fetch;
411
+ this.busyRetryDelaysMs = opts.busyRetryDelaysMs ?? BUSY_RETRY_DELAYS_MS;
412
+ }
413
+ busyRetryDelaysMs;
414
+ /** {@link Relay.send} through {@link retryWhileBusy}. */
415
+ post(path, payload) {
416
+ return retryWhileBusy(() => this.send(path, payload), this.busyRetryDelaysMs);
263
417
  }
264
- async post(path, payload) {
418
+ async send(path, payload) {
265
419
  const url = `${this.url}${path}`;
266
420
  const body = JSON.stringify(payload);
267
421
  const auth = await authorizationHeader(this.signer, { url, method: 'POST', body });
@@ -286,6 +440,8 @@ export class Relay {
286
440
  }
287
441
  async publish(event) {
288
442
  const { status, text } = await this.post('/events', event);
443
+ if (isRelayBusyResponse(status, text))
444
+ return { ok: false, reason: RELAY_BUSY_MESSAGE, httpStatus: status };
289
445
  return parsePublishResponse(status, text);
290
446
  }
291
447
  /**
@@ -294,9 +450,13 @@ export class Relay {
294
450
  * Throws on a transport-level failure rather than returning an empty array,
295
451
  * because "no events" and "the relay refused you" are not the same answer and
296
452
  * a caller that cannot tell them apart renders an empty screen either way.
453
+ * A relay that stays busy through the quiet retries throws a
454
+ * {@link RelayBusyError}.
297
455
  */
298
456
  async query(filters) {
299
457
  const { status, text } = await this.post('/query', filters);
458
+ if (isRelayBusyResponse(status, text))
459
+ throw new RelayBusyError(status);
300
460
  const result = parseQueryResponse(status, text);
301
461
  if (!result.ok)
302
462
  throw new Error(`query failed: ${result.reason}`);
@@ -1 +1 @@
1
- {"version":3,"file":"bridge.js","sourceRoot":"","sources":["../src/bridge.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bridge.js","sourceRoot":"","sources":["../src/bridge.ts"],"names":[],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -46,13 +46,13 @@
46
46
  /** Bumped by hand with the version in package.json — `test/version.test.ts`
47
47
  * pins the two together. It exists so "the upgrade reached the app" can be
48
48
  * checked by grepping a built bundle rather than by trusting a lockfile. */
49
- export declare const PROTOCOL_VERSION = "0.45.0";
49
+ export declare const PROTOCOL_VERSION = "0.46.0";
50
50
  export { type NostrTag, type UnsignedEvent, type SignedEvent, type Profile, type ThreadRef, type ChannelVisibility, type ChannelKind, type MemberRole, type FolderOp, type Label, type ResolutionAction, KIND, MAX_EMOJI_CHARS, MAX_MESSAGE_BYTES, MAX_MENTIONS, MAX_DM_OTHERS, MAX_RATIONALE_BYTES, RELAY_AUTH_TOLERANCE_SECS, ASSERTION_SUBTYPE, computeEventId, toNostrSeconds, canonicalChannelName, threadTags, addr, relayAuthUrl, buildProfile, parseProfile, buildCreateChannel, buildDeleteChannel, buildEditChannelMetadata, buildFolderCommand, buildAddMember, buildDmOpen, buildDmHide, buildReaction, buildDeletion, buildEdit, buildMessage, buildResolution, buildBareFile, buildDocument, buildHighlight, buildUnsignedRelayAuthEvent, } from './events.js';
51
51
  export { type AddressPointer, type EventPointer, encodeNevent, decodeNevent, convertBits, bech32Encode, bech32Decode, encodeNaddr, decodeNaddr, pointerToAddress, addressToPointer, addrToNaddr, naddrToAddr, referenceToPointer, NADDR_RE, findNaddrs, stripNaddrs, encodeNpub, decodeNpub, NOSTR_URI_RE, findNostrUris, } from './nip19.js';
52
52
  export { type AuthEventArgs, TIMESTAMP_TOLERANCE_SECS, normalizeUrl, buildUnsignedAuthEvent, base64, authorizationHeaderFor, authorizationHeader, } from './nip98.js';
53
53
  export { type Signer, type SignerKind, publicKeyFromSecret, signEvent, secretKeySigner, } from './sign.js';
54
- export { type PublishResult, type QueryResult, type RelayHeaders, type RelayOptions, type FetchLike, type QueryAllOptions, parsePublishResponse, parseQueryResponse, commandPayload, RELAY_PAGE_CEILING, DEFAULT_QUERY_CONCURRENCY, MAX_FILTERS_PER_QUERY, Relay, } from './bridge.js';
55
- export { type RelayState, type SocketLike, type RelayCredential, type LiveRelayOptions, type Subscription, type LiveRelay, toWebSocketUrl, parseFrame, createLiveRelay, } from './live.js';
54
+ export { type PublishResult, type QueryResult, type RelayHeaders, type RelayOptions, type FetchLike, type QueryAllOptions, parsePublishResponse, parseQueryResponse, commandPayload, RELAY_PAGE_CEILING, DEFAULT_QUERY_CONCURRENCY, MAX_FILTERS_PER_QUERY, Relay, RELAY_BUSY_MESSAGE, RelayBusyError, isRelayBusyResponse, retryWhileBusy, } from './bridge.js';
55
+ export { type RelayState, type SocketLike, type RelayCredential, type LiveRelayOptions, type Subscription, type LiveRelay, toWebSocketUrl, parseFrame, createLiveRelay, RELAY_BUSY_CLOSED, } from './live.js';
56
56
  export { type ChannelEventHandler, type ChannelSubscription, type ChannelSubscriptions, createChannelSubscriptions, } from './subscriptions.js';
57
57
  export { type InlineMark, type InlineMarkSpan, type BodySegment, type InlineMarkNode, type InlineTextNode, parseInlineMarks, wrapInlineMarks, parseBodySegments, stripInlineFormatting, markersToInlineNodes, inlineNodesToMarkers, inlineNodesToText, } from './content.js';
58
58
  export { type Block, type BlockDocument, type KnownBlockType, KNOWN_BLOCK_TYPES, BlockDocumentError, validateBlockDocument, parseBlockDocument, serializeBlockDocument, newBlockId, assignMissingBlockIds, blockIds, findBlock, listItemDepths, MAX_LIST_DEPTH, listItemChecked, CALLOUT_TONES, type CalloutTone, calloutTone, inlineTextOf, documentText, } from './blocks.js';
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/dist/index.js CHANGED
@@ -46,7 +46,7 @@
46
46
  /** Bumped by hand with the version in package.json — `test/version.test.ts`
47
47
  * pins the two together. It exists so "the upgrade reached the app" can be
48
48
  * checked by grepping a built bundle rather than by trusting a lockfile. */
49
- export const PROTOCOL_VERSION = '0.45.0';
49
+ export const PROTOCOL_VERSION = '0.46.0';
50
50
  export {
51
51
  // constants
52
52
  KIND, MAX_EMOJI_CHARS, MAX_MESSAGE_BYTES, MAX_MENTIONS, MAX_DM_OTHERS, MAX_RATIONALE_BYTES, RELAY_AUTH_TOLERANCE_SECS, ASSERTION_SUBTYPE,
@@ -57,8 +57,8 @@ buildProfile, parseProfile, buildCreateChannel, buildDeleteChannel, buildEditCha
57
57
  export { encodeNevent, decodeNevent, convertBits, bech32Encode, bech32Decode, encodeNaddr, decodeNaddr, pointerToAddress, addressToPointer, addrToNaddr, naddrToAddr, referenceToPointer, NADDR_RE, findNaddrs, stripNaddrs, encodeNpub, decodeNpub, NOSTR_URI_RE, findNostrUris, } from './nip19.js';
58
58
  export { TIMESTAMP_TOLERANCE_SECS, normalizeUrl, buildUnsignedAuthEvent, base64, authorizationHeaderFor, authorizationHeader, } from './nip98.js';
59
59
  export { publicKeyFromSecret, signEvent, secretKeySigner, } from './sign.js';
60
- export { parsePublishResponse, parseQueryResponse, commandPayload, RELAY_PAGE_CEILING, DEFAULT_QUERY_CONCURRENCY, MAX_FILTERS_PER_QUERY, Relay, } from './bridge.js';
61
- export { toWebSocketUrl, parseFrame, createLiveRelay, } from './live.js';
60
+ export { parsePublishResponse, parseQueryResponse, commandPayload, RELAY_PAGE_CEILING, DEFAULT_QUERY_CONCURRENCY, MAX_FILTERS_PER_QUERY, Relay, RELAY_BUSY_MESSAGE, RelayBusyError, isRelayBusyResponse, retryWhileBusy, } from './bridge.js';
61
+ export { toWebSocketUrl, parseFrame, createLiveRelay, RELAY_BUSY_CLOSED, } from './live.js';
62
62
  export { createChannelSubscriptions, } from './subscriptions.js';
63
63
  export { parseInlineMarks, wrapInlineMarks, parseBodySegments, stripInlineFormatting, markersToInlineNodes, inlineNodesToMarkers, inlineNodesToText, } from './content.js';
64
64
  export { KNOWN_BLOCK_TYPES, BlockDocumentError, validateBlockDocument, parseBlockDocument, serializeBlockDocument, newBlockId, assignMissingBlockIds, blockIds, findBlock, listItemDepths, MAX_LIST_DEPTH, listItemChecked, CALLOUT_TONES, calloutTone, inlineTextOf, documentText, } from './blocks.js';
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/dist/live.d.ts CHANGED
@@ -166,6 +166,15 @@ export interface LiveRelay {
166
166
  /** Stop for good. Does not reconnect afterwards. */
167
167
  close(): void;
168
168
  }
169
+ /**
170
+ * The CLOSED reason of a read the relay could not run because it was too busy
171
+ * (its database pool was full or unreachable). Asking again shortly helps,
172
+ * unlike upstream's `error: query timed out`, which the same read would hit
173
+ * again.
174
+ *
175
+ * why: https://github.com/estiva-app/estiva-docs/blob/main/decisions/a-busy-relay-says-it-is-busy.md
176
+ */
177
+ export declare const RELAY_BUSY_CLOSED = "error: relay busy";
169
178
  /** `https://` → `wss://`, `http://` → `ws://`; a `ws`-scheme URL is left alone. */
170
179
  export declare function toWebSocketUrl(url: string): string;
171
180
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"live.d.ts","sourceRoot":"","sources":["../src/live.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"live.d.ts","sourceRoot":"","sources":["../src/live.ts"],"names":[],"mappings":"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"}
package/dist/live.js CHANGED
@@ -69,6 +69,21 @@
69
69
  import { buildUnsignedRelayAuthEvent, } from './events.js';
70
70
  /** How many consecutive AUTH refusals before giving up rather than looping. */
71
71
  const MAX_AUTH_FAILURES = 3;
72
+ /**
73
+ * The CLOSED reason of a read the relay could not run because it was too busy
74
+ * (its database pool was full or unreachable). Asking again shortly helps,
75
+ * unlike upstream's `error: query timed out`, which the same read would hit
76
+ * again.
77
+ *
78
+ * why: https://github.com/estiva-app/estiva-docs/blob/main/decisions/a-busy-relay-says-it-is-busy.md
79
+ */
80
+ export const RELAY_BUSY_CLOSED = 'error: relay busy';
81
+ /**
82
+ * How many times a subscription the relay closed as busy is re-issued, with
83
+ * backoff, before its `onClosed` hears about it: about 15 s at the default
84
+ * backoff.
85
+ */
86
+ const MAX_BUSY_RETRIES = 4;
72
87
  /** `https://` → `wss://`, `http://` → `ws://`; a `ws`-scheme URL is left alone. */
73
88
  export function toWebSocketUrl(url) {
74
89
  const trimmed = url.trim().replace(/\/+$/, '');
@@ -163,8 +178,42 @@ export function createLiveRelay(options) {
163
178
  }
164
179
  }
165
180
  function openSubscription(sub) {
181
+ // A reconnect re-issues it now; a busy retry still pending would send it twice.
182
+ cancelBusyRetry(sub);
166
183
  send(['REQ', sub.id, ...sub.filters]);
167
184
  }
185
+ function cancelBusyRetry(sub) {
186
+ if (sub.busyTimer === null)
187
+ return;
188
+ clearTimer(sub.busyTimer);
189
+ sub.busyTimer = null;
190
+ }
191
+ /**
192
+ * The relay closed `sub` as busy: ask again after a backoff, quietly, so the
193
+ * app keeps what it shows. Returns false once the retries are spent, and the
194
+ * subscriber is told.
195
+ */
196
+ function retryBusy(sub) {
197
+ if (sub.busyRetries >= MAX_BUSY_RETRIES) {
198
+ sub.busyRetries = 0;
199
+ return false;
200
+ }
201
+ const delay = Math.min(backoff.maxMs, backoff.baseMs * 2 ** sub.busyRetries) * (0.5 + backoff.jitter() / 2);
202
+ sub.busyRetries += 1;
203
+ log('relay busy; re-issuing the subscription', {
204
+ subId: sub.id,
205
+ delayMs: Math.round(delay),
206
+ attempt: sub.busyRetries,
207
+ });
208
+ cancelBusyRetry(sub);
209
+ sub.busyTimer = setTimer(() => {
210
+ sub.busyTimer = null;
211
+ // Closed meanwhile, or the socket is down: a reconnect re-issues it.
212
+ if (subscriptions.get(sub.id) === sub && state === 'live')
213
+ openSubscription(sub);
214
+ }, delay);
215
+ return true;
216
+ }
168
217
  /**
169
218
  * Tear the socket down and schedule another attempt.
170
219
  *
@@ -271,12 +320,18 @@ export function createLiveRelay(options) {
271
320
  case 'EVENT':
272
321
  subscriptions.get(frame.subId)?.onEvent(frame.event);
273
322
  return;
274
- case 'EOSE':
275
- subscriptions.get(frame.subId)?.onEose?.();
323
+ case 'EOSE': {
324
+ const sub = subscriptions.get(frame.subId);
325
+ if (sub)
326
+ sub.busyRetries = 0;
327
+ sub?.onEose?.();
276
328
  return;
329
+ }
277
330
  case 'CLOSED': {
278
331
  const sub = subscriptions.get(frame.subId);
279
332
  log('subscription closed by the relay', { subId: frame.subId, reason: frame.message });
333
+ if (sub && frame.message === RELAY_BUSY_CLOSED && retryBusy(sub))
334
+ return;
280
335
  sub?.onClosed?.(frame.message);
281
336
  // `auth-required` here means the connection is unauthenticated — the
282
337
  // poisoned-but-open state. Reconnecting is the only fix, and dropping
@@ -338,6 +393,8 @@ export function createLiveRelay(options) {
338
393
  onEvent,
339
394
  onEose: subOptions?.onEose,
340
395
  onClosed: subOptions?.onClosed,
396
+ busyRetries: 0,
397
+ busyTimer: null,
341
398
  };
342
399
  subscriptions.set(id, sub);
343
400
  if (state === 'live')
@@ -346,6 +403,7 @@ export function createLiveRelay(options) {
346
403
  close() {
347
404
  if (!subscriptions.delete(id))
348
405
  return;
406
+ cancelBusyRetry(sub);
349
407
  if (state === 'live')
350
408
  send(['CLOSE', id]);
351
409
  },
@@ -381,6 +439,8 @@ export function createLiveRelay(options) {
381
439
  clearTimer(reconnectTimer);
382
440
  reconnectTimer = null;
383
441
  }
442
+ for (const sub of subscriptions.values())
443
+ cancelBusyRetry(sub);
384
444
  subscriptions.clear();
385
445
  if (socket) {
386
446
  socket.onopen = socket.onmessage = socket.onclose = socket.onerror = null;
package/dist/live.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"live.js","sourceRoot":"","sources":["../src/live.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"live.js","sourceRoot":"","sources":["../src/live.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@estiva-app/protocol",
3
- "version": "0.45.0",
3
+ "version": "0.46.0",
4
4
  "description": "The Estiva wire format: Buzz-shaped Nostr event builders, NIP-01 ids, NIP-19 naddr, NIP-98 HTTP auth, and the relay clients. Speaks the protocol; interprets nothing.",
5
5
  "license": "MIT",
6
6
  "type": "module",
package/src/bridge.ts CHANGED
@@ -231,6 +231,76 @@ export function parseQueryResponse(status: number, text: string): QueryResult {
231
231
  }
232
232
  }
233
233
 
234
+ /** What a person reads when the relay stays busy through the quiet retries. */
235
+ export const RELAY_BUSY_MESSAGE = 'the relay is busy, try again in a moment'
236
+
237
+ /**
238
+ * The relay, or the proxy in front of it, cannot answer right now and asking
239
+ * again shortly will help: a `503` that is not a cut-off query, or a `502`
240
+ * from the proxy while the relay restarts. Not a proxy's `504`: that is a
241
+ * request that ran too long, which asking again repeats.
242
+ *
243
+ * Decided on the status and on upstream's stable `query timed out` body, never
244
+ * on prose. A cut-off query is not busy: the same query would be cut off again,
245
+ * and repeating it adds to the load that cut it off.
246
+ *
247
+ * why: https://github.com/estiva-app/estiva-docs/blob/main/decisions/a-busy-relay-says-it-is-busy.md
248
+ */
249
+ export function isRelayBusyResponse(status: number, text: string): boolean {
250
+ if (status === 502) return true
251
+ if (status !== 503) return false
252
+ let error: unknown
253
+ try {
254
+ error = JSON.parse(text)?.error
255
+ } catch {
256
+ error = text.trim()
257
+ }
258
+ return error !== 'query timed out'
259
+ }
260
+
261
+ /** A read the relay kept answering "busy" to, after the quiet retries. */
262
+ export class RelayBusyError extends Error {
263
+ readonly httpStatus: number
264
+ constructor(httpStatus: number) {
265
+ super(RELAY_BUSY_MESSAGE)
266
+ this.name = 'RelayBusyError'
267
+ this.httpStatus = httpStatus
268
+ }
269
+ }
270
+
271
+ /**
272
+ * Waits before each quiet retry of a busy answer, in milliseconds: three
273
+ * retries, about seven seconds in all, each jittered so several apps refused
274
+ * together do not come back together.
275
+ */
276
+ const BUSY_RETRY_DELAYS_MS: readonly number[] = [1_000, 2_000, 4_000]
277
+
278
+ declare const setTimeout: (fn: () => void, ms: number) => unknown
279
+
280
+ /**
281
+ * `send`, asked again after a jittered wait while the relay says it is busy
282
+ * ({@link isRelayBusyResponse}), at most once per entry of `delaysMs`. The last
283
+ * answer is returned as it came, busy or not; the caller turns a busy one into
284
+ * {@link RELAY_BUSY_MESSAGE}.
285
+ *
286
+ * Takes the request as a function rather than a URL, so an app with its own
287
+ * transport (Peek signs through Estiva ID, not a {@link Signer}) gets the same
288
+ * quiet retries as {@link Relay}. `send` is called afresh each time, so a
289
+ * request that signs NIP-98 auth signs a new one per ask.
290
+ */
291
+ export async function retryWhileBusy(
292
+ send: () => Promise<{ status: number; text: string }>,
293
+ delaysMs: readonly number[] = BUSY_RETRY_DELAYS_MS,
294
+ ): Promise<{ status: number; text: string }> {
295
+ for (const delay of delaysMs) {
296
+ const answer = await send()
297
+ if (!isRelayBusyResponse(answer.status, answer.text)) return answer
298
+ const jittered = delay * (0.5 + Math.random() / 2)
299
+ await new Promise<void>((resolve) => setTimeout(resolve, jittered))
300
+ }
301
+ return send()
302
+ }
303
+
234
304
  /**
235
305
  * Just enough of `fetch` to post a body and read the answer.
236
306
  *
@@ -268,6 +338,12 @@ export interface RelayOptions {
268
338
  headers?: RelayHeaders
269
339
  /** Override the transport. Defaults to the runtime's `fetch`. */
270
340
  fetch?: FetchLike
341
+ /**
342
+ * Waits before each quiet retry of a busy answer ({@link isRelayBusyResponse}).
343
+ * Its length is the number of retries. A test seam; the default is about
344
+ * seven seconds over three retries.
345
+ */
346
+ busyRetryDelaysMs?: readonly number[]
271
347
  }
272
348
 
273
349
  /**
@@ -281,7 +357,7 @@ export interface RelayOptions {
281
357
  * A function saying which filter of a batch an event came from, or `null` when
282
358
  * that cannot be decided with certainty.
283
359
  *
284
- * Two discriminators, both exact, and between them they cover every batched
360
+ * Three discriminators, all exact, and between them they cover every batched
285
361
  * read the suite performs:
286
362
  *
287
363
  * - **`#h`**, when every filter names exactly one Folder and no two name the
@@ -292,6 +368,7 @@ export interface RelayOptions {
292
368
  * else the filters constrain — extra constraints only ever narrow a filter,
293
369
  * they cannot make it match a kind it did not ask for. This is the discovery
294
370
  * pair, `{kinds:[30850]}` and `{kinds:[30851]}`.
371
+ * - **By match**, when every filter is a plain NIP-01 filter: see {@link byMatch}.
295
372
  *
296
373
  * Anything else returns `null` and the chunk is paged the old way. The bar is
297
374
  * "certain", not "usually right": a wrong attribution under-counts a run,
@@ -335,8 +412,80 @@ function byKind(filters: Record<string, unknown>[]): Discriminator | null {
335
412
  return (event) => slot.get(event.kind) ?? null
336
413
  }
337
414
 
415
+ const NIP01_LISTS = new Set(['ids', 'authors', 'kinds'])
416
+
417
+ /**
418
+ * NIP-01's match of one plain filter, or `null` for a filter with anything
419
+ * else in it (`search`, an extension), whose matches only the relay knows.
420
+ */
421
+ function matcherOf(filter: Record<string, unknown>): ((event: SignedEvent) => boolean) | null {
422
+ const sets = new Map<string, Set<unknown>>()
423
+ for (const [key, value] of Object.entries(filter)) {
424
+ if (key === 'limit') continue
425
+ if (key === 'since' || key === 'until') {
426
+ if (typeof value !== 'number') return null
427
+ continue
428
+ }
429
+ if (!NIP01_LISTS.has(key) && !/^#[A-Za-z]$/.test(key)) return null
430
+ if (!Array.isArray(value)) return null
431
+ sets.set(key, new Set(value))
432
+ }
433
+ const { since, until } = filter as { since?: number; until?: number }
434
+ return (event) => {
435
+ if (since !== undefined && event.created_at < since) return false
436
+ if (until !== undefined && event.created_at > until) return false
437
+ for (const [key, want] of sets) {
438
+ if (key === 'ids' && !want.has(event.id)) return false
439
+ if (key === 'authors' && !want.has(event.pubkey)) return false
440
+ if (key === 'kinds' && !want.has(event.kind)) return false
441
+ if (key.startsWith('#') && !event.tags.some((tag) => tag[0] === key[1] && want.has(tag[1]))) return false
442
+ }
443
+ return true
444
+ }
445
+ }
446
+
447
+ /**
448
+ * **By match**, for any batch of plain filters: an event the relay sent
449
+ * matching exactly one filter of the batch can only be in that filter's run.
450
+ * One matching two is refused, not guessed. This is the listing's read, a
451
+ * Folder's files and their changes in groups of ten addresses (APP-6), where
452
+ * no filter names a Folder and several ask the same kind: its 21 change
453
+ * filters' first page, 23.8 MB on production 27 Oct, was thrown away and every
454
+ * filter asked again.
455
+ *
456
+ * Offered only when every two filters ask disjoint values of some one field,
457
+ * so the answer is likely to split: two that could select the same events
458
+ * (`{kinds:[8,9]}` and `{kinds:[9]}`) would spend the request for nothing.
459
+ */
460
+ function byMatch(filters: Record<string, unknown>[]): Discriminator | null {
461
+ const matchers = filters.map(matcherOf)
462
+ if (matchers.some((matcher) => matcher === null)) return null
463
+ const lists = filters.map(
464
+ (filter) => new Map(Object.entries(filter).flatMap(([key, values]) => (Array.isArray(values) ? [[key, new Set(values)] as const] : []))),
465
+ )
466
+ const apart = (a: Map<string, Set<unknown>>, b: Map<string, Set<unknown>>) =>
467
+ [...a].some(([key, values]) => {
468
+ const other = b.get(key)
469
+ if (!other) return false
470
+ for (const value of values) if (other.has(value)) return false
471
+ return true
472
+ })
473
+ for (let i = 0; i < lists.length; i++) {
474
+ for (let j = i + 1; j < lists.length; j++) if (!apart(lists[i], lists[j])) return null
475
+ }
476
+ return (event) => {
477
+ let found: number | null = null
478
+ for (const [index, matches] of matchers.entries()) {
479
+ if (!matches!(event)) continue
480
+ if (found !== null) return null
481
+ found = index
482
+ }
483
+ return found
484
+ }
485
+ }
486
+
338
487
  function discriminate(filters: Record<string, unknown>[]): Discriminator | null {
339
- return byFolder(filters) ?? byKind(filters)
488
+ return byFolder(filters) ?? byKind(filters) ?? byMatch(filters)
340
489
  }
341
490
 
342
491
  /** The batched response split into one run per filter, or `null` if any event is unclaimed. */
@@ -381,9 +530,17 @@ export class Relay {
381
530
  const opts: RelayOptions = typeof options === 'function' ? { headers: options } : options
382
531
  this.headers = opts.headers ?? (() => ({}))
383
532
  this.transport = opts.fetch
533
+ this.busyRetryDelaysMs = opts.busyRetryDelaysMs ?? BUSY_RETRY_DELAYS_MS
534
+ }
535
+
536
+ private readonly busyRetryDelaysMs: readonly number[]
537
+
538
+ /** {@link Relay.send} through {@link retryWhileBusy}. */
539
+ private post(path: string, payload: unknown): Promise<{ status: number; text: string }> {
540
+ return retryWhileBusy(() => this.send(path, payload), this.busyRetryDelaysMs)
384
541
  }
385
542
 
386
- private async post(path: string, payload: unknown): Promise<{ status: number; text: string }> {
543
+ private async send(path: string, payload: unknown): Promise<{ status: number; text: string }> {
387
544
  const url = `${this.url}${path}`
388
545
  const body = JSON.stringify(payload)
389
546
  const auth = await authorizationHeader(this.signer, { url, method: 'POST', body })
@@ -409,6 +566,7 @@ export class Relay {
409
566
 
410
567
  async publish(event: SignedEvent): Promise<PublishResult> {
411
568
  const { status, text } = await this.post('/events', event)
569
+ if (isRelayBusyResponse(status, text)) return { ok: false, reason: RELAY_BUSY_MESSAGE, httpStatus: status }
412
570
  return parsePublishResponse(status, text)
413
571
  }
414
572
 
@@ -418,9 +576,12 @@ export class Relay {
418
576
  * Throws on a transport-level failure rather than returning an empty array,
419
577
  * because "no events" and "the relay refused you" are not the same answer and
420
578
  * a caller that cannot tell them apart renders an empty screen either way.
579
+ * A relay that stays busy through the quiet retries throws a
580
+ * {@link RelayBusyError}.
421
581
  */
422
582
  async query(filters: Record<string, unknown>[]): Promise<SignedEvent[]> {
423
583
  const { status, text } = await this.post('/query', filters)
584
+ if (isRelayBusyResponse(status, text)) throw new RelayBusyError(status)
424
585
  const result = parseQueryResponse(status, text)
425
586
  if (!result.ok) throw new Error(`query failed: ${result.reason}`)
426
587
  return result.events
package/src/index.ts CHANGED
@@ -47,7 +47,7 @@
47
47
  /** Bumped by hand with the version in package.json — `test/version.test.ts`
48
48
  * pins the two together. It exists so "the upgrade reached the app" can be
49
49
  * checked by grepping a built bundle rather than by trusting a lockfile. */
50
- export const PROTOCOL_VERSION = '0.45.0'
50
+ export const PROTOCOL_VERSION = '0.46.0'
51
51
 
52
52
  export {
53
53
  // types
@@ -155,6 +155,10 @@ export {
155
155
  DEFAULT_QUERY_CONCURRENCY,
156
156
  MAX_FILTERS_PER_QUERY,
157
157
  Relay,
158
+ RELAY_BUSY_MESSAGE,
159
+ RelayBusyError,
160
+ isRelayBusyResponse,
161
+ retryWhileBusy,
158
162
  } from './bridge.js'
159
163
 
160
164
  export {
@@ -167,6 +171,7 @@ export {
167
171
  toWebSocketUrl,
168
172
  parseFrame,
169
173
  createLiveRelay,
174
+ RELAY_BUSY_CLOSED,
170
175
  } from './live.js'
171
176
 
172
177
  export {
package/src/live.ts CHANGED
@@ -189,12 +189,33 @@ export interface LiveRelay {
189
189
  /** How many consecutive AUTH refusals before giving up rather than looping. */
190
190
  const MAX_AUTH_FAILURES = 3
191
191
 
192
+ /**
193
+ * The CLOSED reason of a read the relay could not run because it was too busy
194
+ * (its database pool was full or unreachable). Asking again shortly helps,
195
+ * unlike upstream's `error: query timed out`, which the same read would hit
196
+ * again.
197
+ *
198
+ * why: https://github.com/estiva-app/estiva-docs/blob/main/decisions/a-busy-relay-says-it-is-busy.md
199
+ */
200
+ export const RELAY_BUSY_CLOSED = 'error: relay busy'
201
+
202
+ /**
203
+ * How many times a subscription the relay closed as busy is re-issued, with
204
+ * backoff, before its `onClosed` hears about it: about 15 s at the default
205
+ * backoff.
206
+ */
207
+ const MAX_BUSY_RETRIES = 4
208
+
192
209
  interface LiveSubscription {
193
210
  id: string
194
211
  filters: Record<string, unknown>[]
195
212
  onEvent: (event: SignedEvent) => void
196
213
  onEose?: (() => void) | undefined
197
214
  onClosed?: ((reason: string) => void) | undefined
215
+ /** Busy closes since the last EOSE. */
216
+ busyRetries: number
217
+ /** The pending re-issue after a busy close, if any. */
218
+ busyTimer: unknown
198
219
  }
199
220
 
200
221
  /** `https://` → `wss://`, `http://` → `ws://`; a `ws`-scheme URL is left alone. */
@@ -306,9 +327,44 @@ export function createLiveRelay(options: LiveRelayOptions): LiveRelay {
306
327
  }
307
328
 
308
329
  function openSubscription(sub: LiveSubscription) {
330
+ // A reconnect re-issues it now; a busy retry still pending would send it twice.
331
+ cancelBusyRetry(sub)
309
332
  send(['REQ', sub.id, ...sub.filters])
310
333
  }
311
334
 
335
+ function cancelBusyRetry(sub: LiveSubscription) {
336
+ if (sub.busyTimer === null) return
337
+ clearTimer(sub.busyTimer)
338
+ sub.busyTimer = null
339
+ }
340
+
341
+ /**
342
+ * The relay closed `sub` as busy: ask again after a backoff, quietly, so the
343
+ * app keeps what it shows. Returns false once the retries are spent, and the
344
+ * subscriber is told.
345
+ */
346
+ function retryBusy(sub: LiveSubscription): boolean {
347
+ if (sub.busyRetries >= MAX_BUSY_RETRIES) {
348
+ sub.busyRetries = 0
349
+ return false
350
+ }
351
+ const delay =
352
+ Math.min(backoff.maxMs, backoff.baseMs * 2 ** sub.busyRetries) * (0.5 + backoff.jitter() / 2)
353
+ sub.busyRetries += 1
354
+ log('relay busy; re-issuing the subscription', {
355
+ subId: sub.id,
356
+ delayMs: Math.round(delay),
357
+ attempt: sub.busyRetries,
358
+ })
359
+ cancelBusyRetry(sub)
360
+ sub.busyTimer = setTimer(() => {
361
+ sub.busyTimer = null
362
+ // Closed meanwhile, or the socket is down: a reconnect re-issues it.
363
+ if (subscriptions.get(sub.id) === sub && state === 'live') openSubscription(sub)
364
+ }, delay)
365
+ return true
366
+ }
367
+
312
368
  /**
313
369
  * Tear the socket down and schedule another attempt.
314
370
  *
@@ -416,12 +472,16 @@ export function createLiveRelay(options: LiveRelayOptions): LiveRelay {
416
472
  case 'EVENT':
417
473
  subscriptions.get(frame.subId)?.onEvent(frame.event)
418
474
  return
419
- case 'EOSE':
420
- subscriptions.get(frame.subId)?.onEose?.()
475
+ case 'EOSE': {
476
+ const sub = subscriptions.get(frame.subId)
477
+ if (sub) sub.busyRetries = 0
478
+ sub?.onEose?.()
421
479
  return
480
+ }
422
481
  case 'CLOSED': {
423
482
  const sub = subscriptions.get(frame.subId)
424
483
  log('subscription closed by the relay', { subId: frame.subId, reason: frame.message })
484
+ if (sub && frame.message === RELAY_BUSY_CLOSED && retryBusy(sub)) return
425
485
  sub?.onClosed?.(frame.message)
426
486
  // `auth-required` here means the connection is unauthenticated — the
427
487
  // poisoned-but-open state. Reconnecting is the only fix, and dropping
@@ -482,12 +542,15 @@ export function createLiveRelay(options: LiveRelayOptions): LiveRelay {
482
542
  onEvent,
483
543
  onEose: subOptions?.onEose,
484
544
  onClosed: subOptions?.onClosed,
545
+ busyRetries: 0,
546
+ busyTimer: null,
485
547
  }
486
548
  subscriptions.set(id, sub)
487
549
  if (state === 'live') openSubscription(sub)
488
550
  return {
489
551
  close() {
490
552
  if (!subscriptions.delete(id)) return
553
+ cancelBusyRetry(sub)
491
554
  if (state === 'live') send(['CLOSE', id])
492
555
  },
493
556
  }
@@ -521,6 +584,7 @@ export function createLiveRelay(options: LiveRelayOptions): LiveRelay {
521
584
  clearTimer(reconnectTimer)
522
585
  reconnectTimer = null
523
586
  }
587
+ for (const sub of subscriptions.values()) cancelBusyRetry(sub)
524
588
  subscriptions.clear()
525
589
  if (socket) {
526
590
  socket.onopen = socket.onmessage = socket.onclose = socket.onerror = null