@estiva-app/protocol 0.55.1 → 0.57.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 +26 -0
- package/dist/index.d.ts +1 -1
- package/dist/index.js +1 -1
- package/dist/live.d.ts +6 -0
- package/dist/live.d.ts.map +1 -1
- package/dist/live.js +34 -10
- package/dist/live.js.map +1 -1
- package/package.json +1 -1
- package/src/index.ts +1 -1
- package/src/live.ts +47 -14
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,32 @@ 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.57.0 — 2026-11-11
|
|
8
|
+
|
|
9
|
+
**Wire: unchanged by default; an app can keep a one-shot read's refusal**
|
|
10
|
+
(ALO-13). `subscribe(…, { retryRateLimited: false })` hands a `rate-limited:`
|
|
11
|
+
close to `onClosed` at once, as before 0.56.0, instead of asking again after the
|
|
12
|
+
5–6 s wait. It is for a one-shot read that has somewhere else to ask: Peek's
|
|
13
|
+
socket reader moves a refused read to HTTP at once. Live watches keep the
|
|
14
|
+
default and are asked again. A busy close is asked again either way.
|
|
15
|
+
|
|
16
|
+
## 0.56.0 — 2026-11-11
|
|
17
|
+
|
|
18
|
+
**Wire: a live watch the relay refused as rate-limited is asked again** (ALO-13;
|
|
19
|
+
SPEC §2). Buzz closes a read past its per-person frame quota with
|
|
20
|
+
`CLOSED "rate-limited: quota exceeded; retry in 2s"` (NIP-01's prefix), which
|
|
21
|
+
two of one person's tabs opening within a second hit. The live client passed
|
|
22
|
+
it to `onClosed`, and an app that only logs that (Peek's Topics column and
|
|
23
|
+
conversation list) got no live updates in that tab until a reload. It now
|
|
24
|
+
re-sends the same `REQ` under the same id, quietly, as for a busy relay
|
|
25
|
+
(`error: relay busy`, unchanged): the same jittered backoff and the same cap of
|
|
26
|
+
four, after which `onClosed` hears the relay's reason, but each wait is at least
|
|
27
|
+
5–6 s, so the re-ask lands past buzz's 5 s window instead of being refused
|
|
28
|
+
again and spending frames the person's other reads and sends need. It decides by the `rate-limited:` prefix
|
|
29
|
+
alone and does not read the relay's `retry in <n>s` (SPEC §2: never by other
|
|
30
|
+
prose). An unsubscribe or a reconnect while it waits cancels the re-issue. A
|
|
31
|
+
MINOR, since the client now sends a `REQ` it did not before.
|
|
32
|
+
|
|
7
33
|
## 0.55.1 — 2026-11-06
|
|
8
34
|
|
|
9
35
|
**Wire: nothing** (ALO-16; SPEC §13.3). `textAsksOf` kept none of my changes
|
package/dist/index.d.ts
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 declare const PROTOCOL_VERSION = "0.
|
|
49
|
+
export declare const PROTOCOL_VERSION = "0.57.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, buildJoinGroup, buildLeaveGroup, 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';
|
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.
|
|
49
|
+
export const PROTOCOL_VERSION = '0.57.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,
|
package/dist/live.d.ts
CHANGED
|
@@ -157,10 +157,16 @@ export interface LiveRelay {
|
|
|
157
157
|
*
|
|
158
158
|
* Registering before `live` is normal and supported — that is what makes a
|
|
159
159
|
* subscription survive a reconnect rather than being lost with the socket.
|
|
160
|
+
*
|
|
161
|
+
* `retryRateLimited: false` hands a `rate-limited:` refusal to `onClosed` at
|
|
162
|
+
* once instead of asking again after the wait: for a one-shot read that has
|
|
163
|
+
* somewhere else to ask (an app's HTTP fallback). A live watch keeps the
|
|
164
|
+
* default and is asked again.
|
|
160
165
|
*/
|
|
161
166
|
subscribe(filters: Record<string, unknown>[], onEvent: (event: SignedEvent) => void, options?: {
|
|
162
167
|
onEose?: () => void;
|
|
163
168
|
onClosed?: (reason: string) => void;
|
|
169
|
+
retryRateLimited?: boolean;
|
|
164
170
|
}): Subscription;
|
|
165
171
|
state(): RelayState;
|
|
166
172
|
/** Stop for good. Does not reconnect afterwards. */
|
package/dist/live.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"live.d.ts","sourceRoot":"","sources":["../src/live.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmEG;AACH,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,aAAa,EACnB,MAAM,aAAa,CAAA;AAgBpB;;;;;;;GAOG;AACH,MAAM,MAAM,UAAU,GAAG,YAAY,GAAG,gBAAgB,GAAG,MAAM,GAAG,cAAc,GAAG,QAAQ,CAAA;AAE7F,wDAAwD;AACxD,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,KAAK,IAAI,IAAI,CAAA;IACb,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,KAAK,OAAO,CAAC,GAAG,IAAI,CAAA;IACxD,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;QAAE,IAAI,EAAE,OAAO,CAAA;KAAE,KAAK,OAAO,CAAC,GAAG,IAAI,CAAA;IACrE,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,KAAK,OAAO,CAAC,GAAG,IAAI,CAAA;IACzD,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,KAAK,OAAO,CAAC,GAAG,IAAI,CAAA;CAC1D;AAED,4EAA4E;AAC5E,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B;;;;;;OAMG;IACH,GAAG,EAAE,MAAM,CAAA;IACX,4EAA4E;IAC5E,aAAa,EAAE,MAAM,eAAe,GAAG,IAAI,CAAA;IAC3C;;;;;;;OAOG;IACH,IAAI,EAAE,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAA;IAC9F,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAA;IACrC,kDAAkD;IAClD,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAA;IACjE,kBAAkB;IAClB,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,UAAU,CAAA;IAC3C,GAAG,CAAC,EAAE,MAAM,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,EAAE,EAAE,EAAE,MAAM,KAAK,OAAO,CAAA;IAClD,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAA;IACtC,mEAAmE;IACnE,OAAO,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,MAAM,CAAA;KAAE,CAAA;IACjE;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAC5B;AAED,MAAM,WAAW,YAAY;IAC3B,kFAAkF;IAClF,KAAK,IAAI,IAAI,CAAA;CACd;AAED,MAAM,WAAW,SAAS;IACxB;;;;;;;;;;;;OAYG;IACH,SAAS,IAAI,IAAI,CAAA;IACjB
|
|
1
|
+
{"version":3,"file":"live.d.ts","sourceRoot":"","sources":["../src/live.ts"],"names":[],"mappings":"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"}
|
package/dist/live.js
CHANGED
|
@@ -79,9 +79,25 @@ const MAX_AUTH_FAILURES = 3;
|
|
|
79
79
|
*/
|
|
80
80
|
export const RELAY_BUSY_CLOSED = 'error: relay busy';
|
|
81
81
|
/**
|
|
82
|
-
*
|
|
83
|
-
*
|
|
84
|
-
*
|
|
82
|
+
* NIP-01's prefix for a read the relay refused because this person asked for
|
|
83
|
+
* too much too fast (buzz: a per-person frame quota over a 5 s window). Two of
|
|
84
|
+
* one person's tabs opening within a second hit it. It is asked again exactly
|
|
85
|
+
* as busy is: the client decides by the prefix and never reads the rest of the
|
|
86
|
+
* reason (SPEC §2), so the relay's `retry in <n>s` prose is not parsed.
|
|
87
|
+
*/
|
|
88
|
+
const RATE_LIMITED_PREFIX = 'rate-limited:';
|
|
89
|
+
/**
|
|
90
|
+
* The least a rate-limited read waits before it is asked again, jittered up to
|
|
91
|
+
* a fifth more. NIP-01 does not say how long a quota lasts; buzz counts frames
|
|
92
|
+
* per person over 5 s, and a re-ask inside that window is refused for certain
|
|
93
|
+
* while still using up frames the person's other reads and sends need.
|
|
94
|
+
*/
|
|
95
|
+
const RATE_LIMITED_MIN_WAIT_MS = 5_000;
|
|
96
|
+
/**
|
|
97
|
+
* How many times a subscription the relay closed as busy or rate-limited is
|
|
98
|
+
* re-issued, with backoff, before its `onClosed` hears about it. At the default
|
|
99
|
+
* backoff the four busy waits are 1, 2, 4 and 8 s, each jittered to between half
|
|
100
|
+
* and all of it; a rate-limited wait is at least {@link RATE_LIMITED_MIN_WAIT_MS}.
|
|
85
101
|
*/
|
|
86
102
|
const MAX_BUSY_RETRIES = 4;
|
|
87
103
|
/** `https://` → `wss://`, `http://` → `ws://`; a `ws`-scheme URL is left alone. */
|
|
@@ -189,18 +205,23 @@ export function createLiveRelay(options) {
|
|
|
189
205
|
sub.busyTimer = null;
|
|
190
206
|
}
|
|
191
207
|
/**
|
|
192
|
-
* The relay closed `sub` as busy: ask again after a
|
|
193
|
-
* app keeps what it shows. Returns false once the
|
|
194
|
-
* subscriber is told.
|
|
208
|
+
* The relay closed `sub` as busy, or as rate-limited: ask again after a
|
|
209
|
+
* backoff, quietly, so the app keeps what it shows. Returns false once the
|
|
210
|
+
* retries are spent, and the subscriber is told.
|
|
195
211
|
*/
|
|
196
|
-
function retryBusy(sub) {
|
|
212
|
+
function retryBusy(sub, reason) {
|
|
197
213
|
if (sub.busyRetries >= MAX_BUSY_RETRIES) {
|
|
198
214
|
sub.busyRetries = 0;
|
|
199
215
|
return false;
|
|
200
216
|
}
|
|
201
|
-
const
|
|
217
|
+
const jitter = backoff.jitter();
|
|
218
|
+
const busyDelay = Math.min(backoff.maxMs, backoff.baseMs * 2 ** sub.busyRetries) * (0.5 + jitter / 2);
|
|
219
|
+
const delay = reason.startsWith(RATE_LIMITED_PREFIX)
|
|
220
|
+
? Math.max(busyDelay, RATE_LIMITED_MIN_WAIT_MS * (1 + jitter / 5))
|
|
221
|
+
: busyDelay;
|
|
202
222
|
sub.busyRetries += 1;
|
|
203
|
-
log('
|
|
223
|
+
log('re-issuing the subscription', {
|
|
224
|
+
reason,
|
|
204
225
|
subId: sub.id,
|
|
205
226
|
delayMs: Math.round(delay),
|
|
206
227
|
attempt: sub.busyRetries,
|
|
@@ -330,7 +351,9 @@ export function createLiveRelay(options) {
|
|
|
330
351
|
case 'CLOSED': {
|
|
331
352
|
const sub = subscriptions.get(frame.subId);
|
|
332
353
|
log('subscription closed by the relay', { subId: frame.subId, reason: frame.message });
|
|
333
|
-
|
|
354
|
+
const askAgain = frame.message === RELAY_BUSY_CLOSED ||
|
|
355
|
+
(frame.message.startsWith(RATE_LIMITED_PREFIX) && sub?.retryRateLimited === true);
|
|
356
|
+
if (sub && askAgain && retryBusy(sub, frame.message))
|
|
334
357
|
return;
|
|
335
358
|
sub?.onClosed?.(frame.message);
|
|
336
359
|
// `auth-required` here means the connection is unauthenticated — the
|
|
@@ -393,6 +416,7 @@ export function createLiveRelay(options) {
|
|
|
393
416
|
onEvent,
|
|
394
417
|
onEose: subOptions?.onEose,
|
|
395
418
|
onClosed: subOptions?.onClosed,
|
|
419
|
+
retryRateLimited: subOptions?.retryRateLimited ?? true,
|
|
396
420
|
busyRetries: 0,
|
|
397
421
|
busyTimer: null,
|
|
398
422
|
};
|
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.
|
|
3
|
+
"version": "0.57.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/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.
|
|
50
|
+
export const PROTOCOL_VERSION = '0.57.0'
|
|
51
51
|
|
|
52
52
|
export {
|
|
53
53
|
// types
|
package/src/live.ts
CHANGED
|
@@ -175,11 +175,16 @@ export interface LiveRelay {
|
|
|
175
175
|
*
|
|
176
176
|
* Registering before `live` is normal and supported — that is what makes a
|
|
177
177
|
* subscription survive a reconnect rather than being lost with the socket.
|
|
178
|
+
*
|
|
179
|
+
* `retryRateLimited: false` hands a `rate-limited:` refusal to `onClosed` at
|
|
180
|
+
* once instead of asking again after the wait: for a one-shot read that has
|
|
181
|
+
* somewhere else to ask (an app's HTTP fallback). A live watch keeps the
|
|
182
|
+
* default and is asked again.
|
|
178
183
|
*/
|
|
179
184
|
subscribe(
|
|
180
185
|
filters: Record<string, unknown>[],
|
|
181
186
|
onEvent: (event: SignedEvent) => void,
|
|
182
|
-
options?: { onEose?: () => void; onClosed?: (reason: string) => void },
|
|
187
|
+
options?: { onEose?: () => void; onClosed?: (reason: string) => void; retryRateLimited?: boolean },
|
|
183
188
|
): Subscription
|
|
184
189
|
state(): RelayState
|
|
185
190
|
/** Stop for good. Does not reconnect afterwards. */
|
|
@@ -200,9 +205,27 @@ const MAX_AUTH_FAILURES = 3
|
|
|
200
205
|
export const RELAY_BUSY_CLOSED = 'error: relay busy'
|
|
201
206
|
|
|
202
207
|
/**
|
|
203
|
-
*
|
|
204
|
-
*
|
|
205
|
-
*
|
|
208
|
+
* NIP-01's prefix for a read the relay refused because this person asked for
|
|
209
|
+
* too much too fast (buzz: a per-person frame quota over a 5 s window). Two of
|
|
210
|
+
* one person's tabs opening within a second hit it. It is asked again exactly
|
|
211
|
+
* as busy is: the client decides by the prefix and never reads the rest of the
|
|
212
|
+
* reason (SPEC §2), so the relay's `retry in <n>s` prose is not parsed.
|
|
213
|
+
*/
|
|
214
|
+
const RATE_LIMITED_PREFIX = 'rate-limited:'
|
|
215
|
+
|
|
216
|
+
/**
|
|
217
|
+
* The least a rate-limited read waits before it is asked again, jittered up to
|
|
218
|
+
* a fifth more. NIP-01 does not say how long a quota lasts; buzz counts frames
|
|
219
|
+
* per person over 5 s, and a re-ask inside that window is refused for certain
|
|
220
|
+
* while still using up frames the person's other reads and sends need.
|
|
221
|
+
*/
|
|
222
|
+
const RATE_LIMITED_MIN_WAIT_MS = 5_000
|
|
223
|
+
|
|
224
|
+
/**
|
|
225
|
+
* How many times a subscription the relay closed as busy or rate-limited is
|
|
226
|
+
* re-issued, with backoff, before its `onClosed` hears about it. At the default
|
|
227
|
+
* backoff the four busy waits are 1, 2, 4 and 8 s, each jittered to between half
|
|
228
|
+
* and all of it; a rate-limited wait is at least {@link RATE_LIMITED_MIN_WAIT_MS}.
|
|
206
229
|
*/
|
|
207
230
|
const MAX_BUSY_RETRIES = 4
|
|
208
231
|
|
|
@@ -212,9 +235,11 @@ interface LiveSubscription {
|
|
|
212
235
|
onEvent: (event: SignedEvent) => void
|
|
213
236
|
onEose?: (() => void) | undefined
|
|
214
237
|
onClosed?: ((reason: string) => void) | undefined
|
|
215
|
-
/**
|
|
238
|
+
/** Whether a `rate-limited:` close is asked again (the default) or handed to `onClosed`. */
|
|
239
|
+
retryRateLimited: boolean
|
|
240
|
+
/** Busy or rate-limited closes since the last EOSE. */
|
|
216
241
|
busyRetries: number
|
|
217
|
-
/** The pending re-issue after a busy close, if any. */
|
|
242
|
+
/** The pending re-issue after a busy or rate-limited close, if any. */
|
|
218
243
|
busyTimer: unknown
|
|
219
244
|
}
|
|
220
245
|
|
|
@@ -339,19 +364,23 @@ export function createLiveRelay(options: LiveRelayOptions): LiveRelay {
|
|
|
339
364
|
}
|
|
340
365
|
|
|
341
366
|
/**
|
|
342
|
-
* The relay closed `sub` as busy: ask again after a
|
|
343
|
-
* app keeps what it shows. Returns false once the
|
|
344
|
-
* subscriber is told.
|
|
367
|
+
* The relay closed `sub` as busy, or as rate-limited: ask again after a
|
|
368
|
+
* backoff, quietly, so the app keeps what it shows. Returns false once the
|
|
369
|
+
* retries are spent, and the subscriber is told.
|
|
345
370
|
*/
|
|
346
|
-
function retryBusy(sub: LiveSubscription): boolean {
|
|
371
|
+
function retryBusy(sub: LiveSubscription, reason: string): boolean {
|
|
347
372
|
if (sub.busyRetries >= MAX_BUSY_RETRIES) {
|
|
348
373
|
sub.busyRetries = 0
|
|
349
374
|
return false
|
|
350
375
|
}
|
|
351
|
-
const
|
|
352
|
-
|
|
376
|
+
const jitter = backoff.jitter()
|
|
377
|
+
const busyDelay = Math.min(backoff.maxMs, backoff.baseMs * 2 ** sub.busyRetries) * (0.5 + jitter / 2)
|
|
378
|
+
const delay = reason.startsWith(RATE_LIMITED_PREFIX)
|
|
379
|
+
? Math.max(busyDelay, RATE_LIMITED_MIN_WAIT_MS * (1 + jitter / 5))
|
|
380
|
+
: busyDelay
|
|
353
381
|
sub.busyRetries += 1
|
|
354
|
-
log('
|
|
382
|
+
log('re-issuing the subscription', {
|
|
383
|
+
reason,
|
|
355
384
|
subId: sub.id,
|
|
356
385
|
delayMs: Math.round(delay),
|
|
357
386
|
attempt: sub.busyRetries,
|
|
@@ -481,7 +510,10 @@ export function createLiveRelay(options: LiveRelayOptions): LiveRelay {
|
|
|
481
510
|
case 'CLOSED': {
|
|
482
511
|
const sub = subscriptions.get(frame.subId)
|
|
483
512
|
log('subscription closed by the relay', { subId: frame.subId, reason: frame.message })
|
|
484
|
-
|
|
513
|
+
const askAgain =
|
|
514
|
+
frame.message === RELAY_BUSY_CLOSED ||
|
|
515
|
+
(frame.message.startsWith(RATE_LIMITED_PREFIX) && sub?.retryRateLimited === true)
|
|
516
|
+
if (sub && askAgain && retryBusy(sub, frame.message)) return
|
|
485
517
|
sub?.onClosed?.(frame.message)
|
|
486
518
|
// `auth-required` here means the connection is unauthenticated — the
|
|
487
519
|
// poisoned-but-open state. Reconnecting is the only fix, and dropping
|
|
@@ -542,6 +574,7 @@ export function createLiveRelay(options: LiveRelayOptions): LiveRelay {
|
|
|
542
574
|
onEvent,
|
|
543
575
|
onEose: subOptions?.onEose,
|
|
544
576
|
onClosed: subOptions?.onClosed,
|
|
577
|
+
retryRateLimited: subOptions?.retryRateLimited ?? true,
|
|
545
578
|
busyRetries: 0,
|
|
546
579
|
busyTimer: null,
|
|
547
580
|
}
|