@open-e2ee/signal-protocol-sdk 9.3.0 → 9.4.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 +93 -0
- package/README.md +1 -1
- package/SECURITY.md +2 -2
- package/client/README.md +11 -14
- package/dist/client/client.d.ts +79 -8
- package/dist/client/client.d.ts.map +1 -1
- package/dist/client/client.js +246 -50
- package/dist/client/client.js.map +1 -1
- package/dist/client/config.d.ts +4 -7
- package/dist/client/config.d.ts.map +1 -1
- package/dist/client/config.js.map +1 -1
- package/dist/client/event-hooks.d.ts +1 -1
- package/dist/client/group-outbox.d.ts +2 -4
- package/dist/client/group-outbox.d.ts.map +1 -1
- package/dist/client/group-outbox.js +7 -1
- package/dist/client/group-outbox.js.map +1 -1
- package/dist/client/hosted-anonymous-delivery.d.ts.map +1 -1
- package/dist/client/hosted-anonymous-delivery.js +2 -11
- package/dist/client/hosted-anonymous-delivery.js.map +1 -1
- package/dist/client/hosted-mailbox-subscription.d.ts.map +1 -1
- package/dist/client/hosted-mailbox-subscription.js +136 -15
- package/dist/client/hosted-mailbox-subscription.js.map +1 -1
- package/dist/client/hosted-transport.d.ts +1 -1
- package/dist/client/hosted-transport.d.ts.map +1 -1
- package/dist/client/hosted-transport.js.map +1 -1
- package/dist/client/messages.d.ts.map +1 -1
- package/dist/client/messages.js +12 -2
- package/dist/client/messages.js.map +1 -1
- package/dist/client/relay-acceptance.d.ts +21 -0
- package/dist/client/relay-acceptance.d.ts.map +1 -0
- package/dist/client/relay-acceptance.js +22 -0
- package/dist/client/relay-acceptance.js.map +1 -0
- package/dist/client/relay-subscription.d.ts +31 -1
- package/dist/client/relay-subscription.d.ts.map +1 -1
- package/dist/client/relay-subscription.js +52 -20
- package/dist/client/relay-subscription.js.map +1 -1
- package/dist/client/relay-work.d.ts +7 -6
- package/dist/client/relay-work.d.ts.map +1 -1
- package/dist/client/relay-work.js +34 -9
- package/dist/client/relay-work.js.map +1 -1
- package/dist/client/retry.d.ts +3 -2
- package/dist/client/retry.d.ts.map +1 -1
- package/dist/client/retry.js +6 -4
- package/dist/client/retry.js.map +1 -1
- package/dist/client/signal-service-cipher.d.ts.map +1 -1
- package/dist/client/signal-service-cipher.js +2 -0
- package/dist/client/signal-service-cipher.js.map +1 -1
- package/dist/client/state.d.ts +5 -4
- package/dist/client/state.d.ts.map +1 -1
- package/dist/client/state.js +14 -12
- package/dist/client/state.js.map +1 -1
- package/dist/client/types.d.ts +18 -0
- package/dist/client/types.d.ts.map +1 -1
- package/dist/client/types.js.map +1 -1
- package/dist/local/store/reliability.d.ts +2 -0
- package/dist/local/store/reliability.d.ts.map +1 -1
- package/dist/local/store/reliability.js.map +1 -1
- package/dist/remote/relay/types.d.ts +9 -2
- package/dist/remote/relay/types.d.ts.map +1 -1
- package/dist/types/api.d.ts +35 -8
- package/dist/types/api.d.ts.map +1 -1
- package/docs/ASSURANCE.md +4 -4
- package/package.json +1 -1
package/dist/client/messages.js
CHANGED
|
@@ -405,12 +405,21 @@ async function sendReceiptToDevice(ctx, recipientUserId, deviceId, type, timesta
|
|
|
405
405
|
}
|
|
406
406
|
catch (error) {
|
|
407
407
|
rethrowRelayWorkStopped(error);
|
|
408
|
+
// A stopped client sends nothing more, so it makes no retry.
|
|
409
|
+
if (ctx.stopSignal?.aborted)
|
|
410
|
+
return;
|
|
408
411
|
ctx.logger.warn(`Receipt send failed, scheduling retry`, {
|
|
409
412
|
category: 'E2EE',
|
|
410
413
|
data: { recipientUserId, deviceId },
|
|
411
414
|
});
|
|
412
|
-
// Make one in-process retry after five seconds.
|
|
413
|
-
|
|
415
|
+
// Make one in-process retry after five seconds. Every receipt send
|
|
416
|
+
// carries the stop signal of the client, so stop() clears the retry
|
|
417
|
+
// timer of a receipt send that started before stop() stops its relay
|
|
418
|
+
// work.
|
|
419
|
+
const stopSignal = ctx.stopSignal;
|
|
420
|
+
const cancel = () => clearTimeout(retry);
|
|
421
|
+
const retry = setTimeout(async () => {
|
|
422
|
+
stopSignal?.removeEventListener('abort', cancel);
|
|
414
423
|
try {
|
|
415
424
|
await sendPrepared();
|
|
416
425
|
}
|
|
@@ -418,6 +427,7 @@ async function sendReceiptToDevice(ctx, recipientUserId, deviceId, type, timesta
|
|
|
418
427
|
// Give up after one retry
|
|
419
428
|
}
|
|
420
429
|
}, 5_000);
|
|
430
|
+
stopSignal?.addEventListener('abort', cancel, { once: true });
|
|
421
431
|
}
|
|
422
432
|
}
|
|
423
433
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../client/messages.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../client/messages.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
/** What the relay reports about one post that it accepted. */
|
|
2
|
+
export interface RelayPostAcceptance {
|
|
3
|
+
messageId: string;
|
|
4
|
+
serverTimestamp: number;
|
|
5
|
+
/** True when the relay had already accepted this exact post. */
|
|
6
|
+
duplicate?: boolean;
|
|
7
|
+
/** The time at which the relay drops the copy that a device has not acknowledged. */
|
|
8
|
+
expiresAt?: number;
|
|
9
|
+
}
|
|
10
|
+
/**
|
|
11
|
+
* The acceptance of a whole send from the acceptance of each of its posts.
|
|
12
|
+
*
|
|
13
|
+
* The send is a duplicate only when the relay had already accepted every
|
|
14
|
+
* post, and the earliest expiry bounds the whole send. A field is present only
|
|
15
|
+
* when every post reported it, so a send with no post has neither field.
|
|
16
|
+
*/
|
|
17
|
+
export declare function aggregateRelayAcceptance(posts: readonly Pick<RelayPostAcceptance, 'duplicate' | 'expiresAt'>[]): {
|
|
18
|
+
duplicate?: boolean;
|
|
19
|
+
expiresAt?: number;
|
|
20
|
+
};
|
|
21
|
+
//# sourceMappingURL=relay-acceptance.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"relay-acceptance.d.ts","sourceRoot":"","sources":["../../client/relay-acceptance.ts"],"names":[],"mappings":"AAAA,8DAA8D;AAC9D,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,gEAAgE;IAChE,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,qFAAqF;IACrF,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,SAAS,IAAI,CAAC,mBAAmB,EAAE,WAAW,GAAG,WAAW,CAAC,EAAE,GACrE;IAAE,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAY7C"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The acceptance of a whole send from the acceptance of each of its posts.
|
|
3
|
+
*
|
|
4
|
+
* The send is a duplicate only when the relay had already accepted every
|
|
5
|
+
* post, and the earliest expiry bounds the whole send. A field is present only
|
|
6
|
+
* when every post reported it, so a send with no post has neither field.
|
|
7
|
+
*/
|
|
8
|
+
export function aggregateRelayAcceptance(posts) {
|
|
9
|
+
if (posts.length === 0)
|
|
10
|
+
return {};
|
|
11
|
+
const duplicates = posts.map((post) => post.duplicate);
|
|
12
|
+
const expiries = posts.map((post) => post.expiresAt);
|
|
13
|
+
return {
|
|
14
|
+
...(duplicates.every((duplicate) => duplicate !== undefined) && {
|
|
15
|
+
duplicate: duplicates.every(Boolean),
|
|
16
|
+
}),
|
|
17
|
+
...(expiries.every((expiry) => expiry !== undefined) && {
|
|
18
|
+
expiresAt: Math.min(...expiries),
|
|
19
|
+
}),
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=relay-acceptance.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"relay-acceptance.js","sourceRoot":"","sources":["../../client/relay-acceptance.ts"],"names":[],"mappings":"AAUA;;;;;;GAMG;AACH,MAAM,UAAU,wBAAwB,CACtC,KAAsE;IAEtE,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAClC,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvD,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACrD,OAAO;QACL,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,KAAK,SAAS,CAAC,IAAI;YAC9D,SAAS,EAAE,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC;SACrC,CAAC;QACF,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,SAAS,CAAC,IAAI;YACtD,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,GAAI,QAAqB,CAAC;SAC/C,CAAC;KACH,CAAC;AACJ,CAAC"}
|
|
@@ -19,11 +19,33 @@ export interface RelaySubscriptionContext extends SignalProtocolClientContext {
|
|
|
19
19
|
}
|
|
20
20
|
/** Accumulates delivery receipt timestamps per sender for batching */
|
|
21
21
|
export interface ReceiptAccumulator {
|
|
22
|
-
|
|
22
|
+
/** senderUserId → the waiting timestamps, and when the first of them arrived */
|
|
23
|
+
pending: Map<string, {
|
|
24
|
+
timestamps: number[];
|
|
25
|
+
firstArrivalAt: number;
|
|
26
|
+
}>;
|
|
23
27
|
timers: Map<string, ReturnType<typeof setTimeout>>;
|
|
28
|
+
/**
|
|
29
|
+
* True from the first receipt flush of stop() to the end of the step that
|
|
30
|
+
* clears its tracking state. The hold also ends when stop() throws in
|
|
31
|
+
* those steps. A batch then sets no timer and does not flush at
|
|
32
|
+
* RECEIPT_BATCH_MAX, and stopRelaySubscription() does not flush it. stop()
|
|
33
|
+
* sends the batches that wait at each of its flushes and drops a batch
|
|
34
|
+
* made during the hold after its last flush.
|
|
35
|
+
*/
|
|
36
|
+
held: boolean;
|
|
24
37
|
}
|
|
38
|
+
/** A batch flushes this long after its last arrival. */
|
|
25
39
|
export declare const RECEIPT_BATCH_DELAY_MS = 3000;
|
|
40
|
+
/** A batch flushes no later than this long after its first arrival. */
|
|
41
|
+
export declare const RECEIPT_BATCH_MAX_AGE_MS = 30000;
|
|
42
|
+
/** A batch flushes when it holds this many timestamps. */
|
|
26
43
|
export declare const RECEIPT_BATCH_MAX = 100;
|
|
44
|
+
/**
|
|
45
|
+
* stop() waits this long, from its start, for the delivery receipt sends in
|
|
46
|
+
* progress and for the receipt sends that it starts.
|
|
47
|
+
*/
|
|
48
|
+
export declare const STOP_RECEIPT_FLUSH_MS = 5000;
|
|
27
49
|
/**
|
|
28
50
|
* Mutable state for relay subscription (passed by client, mutated in place)
|
|
29
51
|
*/
|
|
@@ -89,4 +111,12 @@ export interface RelaySubscriptionConfig {
|
|
|
89
111
|
export declare function handleRelayMessage(ctx: RelaySubscriptionContext, envelope: Envelope, state: RelaySubscriptionState, callbacks: RelaySubscriptionCallbacks, config: RelaySubscriptionConfig): Promise<void>;
|
|
90
112
|
/** Process content before either foreground or background transport acknowledges it. */
|
|
91
113
|
export declare function processRelayMessage(ctx: RelaySubscriptionContext, envelope: Envelope, state: RelaySubscriptionState, callbacks: RelaySubscriptionCallbacks, config: RelaySubscriptionConfig): Promise<boolean>;
|
|
114
|
+
/**
|
|
115
|
+
* Flush the waiting delivery receipts of every sender, once each.
|
|
116
|
+
*
|
|
117
|
+
* Each batch leaves the accumulator and its timer stops, so no later timer
|
|
118
|
+
* sends it again. Call this before the relay subscription closes. The
|
|
119
|
+
* returned promises settle when the sends finish. They never reject.
|
|
120
|
+
*/
|
|
121
|
+
export declare function flushPendingReceipts(acc: ReceiptAccumulator, flush: (userId: string, timestamps: number[]) => Promise<void>, logger: RelaySubscriptionContext['logger']): Promise<void>[];
|
|
92
122
|
//# sourceMappingURL=relay-subscription.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relay-subscription.d.ts","sourceRoot":"","sources":["../../client/relay-subscription.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAKtD,OAAO,KAAK,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACnF,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAC;AAU3D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAO3E;;GAEG;AACH,OAAO,EAAE,CAAC;AACV,MAAM,WAAW,wBAAyB,SAAQ,2BAA2B;IAC3E,MAAM,EAAE,2BAA2B,CAAC;IACpC,2DAA2D;IAC3D,UAAU,CAAC,EAAE,WAAW,CAAC;CAC1B;AAED,sEAAsE;AACtE,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"relay-subscription.d.ts","sourceRoot":"","sources":["../../client/relay-subscription.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,8 +12,17 @@ import { hasProcessedEnvelope, storeProcessedEnvelope, withProcessedEnvelopeLock
|
|
|
12
12
|
import { receivedContentId, pruneReceivedContent } from '../local/store/received-content.js';
|
|
13
13
|
import { isImplicitContentType } from './constants.js';
|
|
14
14
|
import { rethrowRelayWorkStopped } from './relay-work.js';
|
|
15
|
+
/** A batch flushes this long after its last arrival. */
|
|
15
16
|
export const RECEIPT_BATCH_DELAY_MS = 3_000;
|
|
17
|
+
/** A batch flushes no later than this long after its first arrival. */
|
|
18
|
+
export const RECEIPT_BATCH_MAX_AGE_MS = 30_000;
|
|
19
|
+
/** A batch flushes when it holds this many timestamps. */
|
|
16
20
|
export const RECEIPT_BATCH_MAX = 100;
|
|
21
|
+
/**
|
|
22
|
+
* stop() waits this long, from its start, for the delivery receipt sends in
|
|
23
|
+
* progress and for the receipt sends that it starts.
|
|
24
|
+
*/
|
|
25
|
+
export const STOP_RECEIPT_FLUSH_MS = 5_000;
|
|
17
26
|
// ════════════════════════════════════════════════════════════════════════════
|
|
18
27
|
// HELPERS
|
|
19
28
|
// ════════════════════════════════════════════════════════════════════════════
|
|
@@ -156,10 +165,10 @@ async function handleDecryptionSuccess(ctx, envelope, decryptedEnvelope, state,
|
|
|
156
165
|
await receive(decryptedEnvelope);
|
|
157
166
|
// Batch delivery receipts before sending
|
|
158
167
|
// Multi-device: sendDeliveryReceipt fans out to all sender's devices
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
168
|
+
// 'auto' is the default, and it sends as 'always' does, for a sealed,
|
|
169
|
+
// identified, or unknown arrival.
|
|
170
|
+
const receipts = ctx.config.deliveryReceipts ?? 'auto';
|
|
171
|
+
if (decryptedEnvelope.timestamp && ctx.relay && receipts !== 'off') {
|
|
163
172
|
if (inspectedContent.shouldSendDeliveryReceipt) {
|
|
164
173
|
accumulateDeliveryReceipt(state.receiptAccumulator, decryptedEnvelope.senderId, decryptedEnvelope.timestamp, callbacks.sendDeliveryReceipt, ctx.logger);
|
|
165
174
|
}
|
|
@@ -172,40 +181,63 @@ async function handleDecryptionSuccess(ctx, envelope, decryptedEnvelope, state,
|
|
|
172
181
|
/**
|
|
173
182
|
* Accumulate a delivery receipt timestamp for batched sending.
|
|
174
183
|
*
|
|
175
|
-
* Receipts are collected per
|
|
176
|
-
*
|
|
177
|
-
*
|
|
184
|
+
* Receipts are collected per sender. A batch flushes when it reaches
|
|
185
|
+
* RECEIPT_BATCH_MAX, or at the earlier of RECEIPT_BATCH_DELAY_MS after its
|
|
186
|
+
* last arrival and RECEIPT_BATCH_MAX_AGE_MS after its first arrival. So steady
|
|
187
|
+
* traffic delays a receipt by at most RECEIPT_BATCH_MAX_AGE_MS. While the
|
|
188
|
+
* accumulator is held, the batch waits for stop() to flush it.
|
|
178
189
|
*/
|
|
179
190
|
function accumulateDeliveryReceipt(acc, senderUserId, timestamp, flush, logger) {
|
|
180
|
-
const
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
191
|
+
const now = Date.now();
|
|
192
|
+
const batch = acc.pending.get(senderUserId) ?? { timestamps: [], firstArrivalAt: now };
|
|
193
|
+
batch.timestamps.push(timestamp);
|
|
194
|
+
acc.pending.set(senderUserId, batch);
|
|
195
|
+
if (acc.held)
|
|
196
|
+
return;
|
|
197
|
+
if (batch.timestamps.length >= RECEIPT_BATCH_MAX) {
|
|
184
198
|
flushReceipts(acc, senderUserId, flush, logger);
|
|
185
199
|
return;
|
|
186
200
|
}
|
|
187
|
-
// Reset timer for this sender
|
|
188
201
|
const existingTimer = acc.timers.get(senderUserId);
|
|
189
202
|
if (existingTimer)
|
|
190
203
|
clearTimeout(existingTimer);
|
|
204
|
+
const flushAt = Math.min(now + RECEIPT_BATCH_DELAY_MS, batch.firstArrivalAt + RECEIPT_BATCH_MAX_AGE_MS);
|
|
191
205
|
acc.timers.set(senderUserId, setTimeout(() => {
|
|
192
206
|
flushReceipts(acc, senderUserId, flush, logger);
|
|
193
|
-
},
|
|
207
|
+
}, Math.max(0, flushAt - now)));
|
|
208
|
+
}
|
|
209
|
+
/**
|
|
210
|
+
* Flush the waiting delivery receipts of every sender, once each.
|
|
211
|
+
*
|
|
212
|
+
* Each batch leaves the accumulator and its timer stops, so no later timer
|
|
213
|
+
* sends it again. Call this before the relay subscription closes. The
|
|
214
|
+
* returned promises settle when the sends finish. They never reject.
|
|
215
|
+
*/
|
|
216
|
+
export function flushPendingReceipts(acc, flush, logger) {
|
|
217
|
+
const sends = [];
|
|
218
|
+
for (const senderUserId of [...acc.pending.keys()]) {
|
|
219
|
+
const send = flushReceipts(acc, senderUserId, flush, logger);
|
|
220
|
+
if (send)
|
|
221
|
+
sends.push(send);
|
|
222
|
+
}
|
|
223
|
+
return sends;
|
|
194
224
|
}
|
|
195
225
|
/**
|
|
196
|
-
* Flush accumulated delivery receipts for a sender
|
|
226
|
+
* Flush accumulated delivery receipts for a sender. The returned promise
|
|
227
|
+
* settles when the send finishes, and never rejects. It is undefined when the
|
|
228
|
+
* sender has no waiting receipt.
|
|
197
229
|
*/
|
|
198
230
|
function flushReceipts(acc, senderUserId, flush, logger) {
|
|
199
|
-
const timestamps = acc.pending.get(senderUserId);
|
|
200
|
-
if (!timestamps?.length)
|
|
201
|
-
return;
|
|
202
|
-
acc.pending.delete(senderUserId);
|
|
203
231
|
const timer = acc.timers.get(senderUserId);
|
|
204
232
|
if (timer)
|
|
205
233
|
clearTimeout(timer);
|
|
206
234
|
acc.timers.delete(senderUserId);
|
|
207
|
-
|
|
208
|
-
|
|
235
|
+
const batch = acc.pending.get(senderUserId);
|
|
236
|
+
acc.pending.delete(senderUserId);
|
|
237
|
+
if (!batch?.timestamps.length)
|
|
238
|
+
return undefined;
|
|
239
|
+
// The batch timer does not wait for the send. stop() does.
|
|
240
|
+
return flush(senderUserId, batch.timestamps).catch((err) => logger.warn('Failed to flush delivery receipts', {
|
|
209
241
|
category: 'E2EE',
|
|
210
242
|
data: { senderUserId, error: err.message },
|
|
211
243
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relay-subscription.js","sourceRoot":"","sources":["../../client/relay-subscription.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"relay-subscription.js","sourceRoot":"","sources":["../../client/relay-subscription.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,12 +2,13 @@
|
|
|
2
2
|
* Relay work: the deliveries, retry requests, and receipt sends that the
|
|
3
3
|
* relay starts and that stop() must settle.
|
|
4
4
|
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
* a
|
|
5
|
+
* A relay can wait for a handler, as the hosted transport does for each
|
|
6
|
+
* envelope, or call it without waiting, as the memory and Convex adapters do.
|
|
7
|
+
* In both cases each call runs as one RelayWork item. At any time an item
|
|
8
|
+
* runs SDK work, or waits in an app hook. stop() stops every item and waits
|
|
9
|
+
* only for the items that run SDK work. It does not wait for time in app
|
|
10
|
+
* hooks, because a hook can itself await stop(), and without async context
|
|
11
|
+
* the SDK cannot tell that call from a call outside the hook.
|
|
11
12
|
*
|
|
12
13
|
* A stopped item may not enter an app hook, and an item that leaves an app
|
|
13
14
|
* hook after stop() starts throws RelayWorkStopped. So no SDK step after the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relay-work.d.ts","sourceRoot":"","sources":["../../client/relay-work.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"relay-work.d.ts","sourceRoot":"","sources":["../../client/relay-work.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AAExC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAgBzD;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,aAAa,CAEjD;AAID;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,CAIvE;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEpE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa,CAE1E;AAED,0DAA0D;AAC1D,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAE5D;AAgED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,EACnC,IAAI,EAAE,SAAS,EACf,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACtB,UAAU,CAAC,EAAE,WAAW,GACvB,OAAO,CAAC,CAAC,CAAC,CAuBZ"}
|
|
@@ -2,12 +2,13 @@
|
|
|
2
2
|
* Relay work: the deliveries, retry requests, and receipt sends that the
|
|
3
3
|
* relay starts and that stop() must settle.
|
|
4
4
|
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
* a
|
|
5
|
+
* A relay can wait for a handler, as the hosted transport does for each
|
|
6
|
+
* envelope, or call it without waiting, as the memory and Convex adapters do.
|
|
7
|
+
* In both cases each call runs as one RelayWork item. At any time an item
|
|
8
|
+
* runs SDK work, or waits in an app hook. stop() stops every item and waits
|
|
9
|
+
* only for the items that run SDK work. It does not wait for time in app
|
|
10
|
+
* hooks, because a hook can itself await stop(), and without async context
|
|
11
|
+
* the SDK cannot tell that call from a call outside the hook.
|
|
11
12
|
*
|
|
12
13
|
* A stopped item may not enter an app hook, and an item that leaves an app
|
|
13
14
|
* hook after stop() starts throws RelayWorkStopped. So no SDK step after the
|
|
@@ -176,10 +177,20 @@ export class RelayWorkTracker {
|
|
|
176
177
|
items = new Set();
|
|
177
178
|
waiters = new Set();
|
|
178
179
|
stopping = 0;
|
|
180
|
+
stopper = new AbortController();
|
|
181
|
+
/**
|
|
182
|
+
* Aborts when the next stop() starts to settle. Work that keeps this signal
|
|
183
|
+
* after it ends, such as a retry timer, sees that stop. Each stop gets a
|
|
184
|
+
* new signal for the work that starts after it.
|
|
185
|
+
*/
|
|
186
|
+
get stopSignal() {
|
|
187
|
+
return this.stopper.signal;
|
|
188
|
+
}
|
|
179
189
|
/**
|
|
180
|
-
* Run a task as a relay work item.
|
|
181
|
-
*
|
|
182
|
-
*
|
|
190
|
+
* Run a task as a relay work item. The task starts at once, before run()
|
|
191
|
+
* returns. While stop() settles, the item starts stopped. A
|
|
192
|
+
* RelayWorkStopped from the task resolves the returned promise. Other
|
|
193
|
+
* errors reject it.
|
|
183
194
|
*/
|
|
184
195
|
async run(task) {
|
|
185
196
|
const work = new RelayWork(() => this.notify());
|
|
@@ -198,6 +209,17 @@ export class RelayWorkTracker {
|
|
|
198
209
|
this.notify();
|
|
199
210
|
}
|
|
200
211
|
}
|
|
212
|
+
/**
|
|
213
|
+
* Stop every item except the given items, and do not wait. A stopped item
|
|
214
|
+
* that leaves an app hook throws RelayWorkStopped, so it writes nothing
|
|
215
|
+
* more. Items that start later are not stopped. settle() stops them.
|
|
216
|
+
*/
|
|
217
|
+
stopAllExcept(keep) {
|
|
218
|
+
for (const work of this.items) {
|
|
219
|
+
if (!keep.has(work))
|
|
220
|
+
work.stop();
|
|
221
|
+
}
|
|
222
|
+
}
|
|
201
223
|
/**
|
|
202
224
|
* Stop every item and wait until each item settles or waits in an app hook.
|
|
203
225
|
* Items that start during the wait start stopped, and the wait includes them.
|
|
@@ -205,6 +227,7 @@ export class RelayWorkTracker {
|
|
|
205
227
|
*/
|
|
206
228
|
async settle() {
|
|
207
229
|
this.stopping++;
|
|
230
|
+
this.stopper.abort();
|
|
208
231
|
try {
|
|
209
232
|
for (const work of this.items)
|
|
210
233
|
work.stop();
|
|
@@ -214,6 +237,8 @@ export class RelayWorkTracker {
|
|
|
214
237
|
}
|
|
215
238
|
finally {
|
|
216
239
|
this.stopping--;
|
|
240
|
+
if (this.stopping === 0)
|
|
241
|
+
this.stopper = new AbortController();
|
|
217
242
|
}
|
|
218
243
|
}
|
|
219
244
|
notify() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relay-work.js","sourceRoot":"","sources":["../../client/relay-work.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"relay-work.js","sourceRoot":"","sources":["../../client/relay-work.ts"],"names":[],"mappings":"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"}
|
package/dist/client/retry.d.ts
CHANGED
|
@@ -108,8 +108,9 @@ export declare function sendRetryRequestInternal(ctx: RetryContext, envelope: In
|
|
|
108
108
|
* 2. Verifies the requester is the intended recipient
|
|
109
109
|
* 3. Checks retry limits and TTL
|
|
110
110
|
* 4. Creates new session if orphaned, or uses existing different session
|
|
111
|
-
* 5. Re-encrypts and sends the original message
|
|
112
|
-
*
|
|
111
|
+
* 5. Re-encrypts and sends the original message, which replaces the old
|
|
112
|
+
* MessageRecord with the record of the new encryption. Only a delivery
|
|
113
|
+
* receipt from the device or the TTL deletes that record.
|
|
113
114
|
*
|
|
114
115
|
* @param ctx - Retry context with dependencies
|
|
115
116
|
* @param retryRequest - The retry request from the recipient
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry.d.ts","sourceRoot":"","sources":["../../client/retry.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"retry.d.ts","sourceRoot":"","sources":["../../client/retry.ts"],"names":[],"mappings":"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"}
|
package/dist/client/retry.js
CHANGED
|
@@ -268,8 +268,9 @@ export async function sendRetryRequestInternal(ctx, envelope, error, rateLimitSt
|
|
|
268
268
|
* 2. Verifies the requester is the intended recipient
|
|
269
269
|
* 3. Checks retry limits and TTL
|
|
270
270
|
* 4. Creates new session if orphaned, or uses existing different session
|
|
271
|
-
* 5. Re-encrypts and sends the original message
|
|
272
|
-
*
|
|
271
|
+
* 5. Re-encrypts and sends the original message, which replaces the old
|
|
272
|
+
* MessageRecord with the record of the new encryption. Only a delivery
|
|
273
|
+
* receipt from the device or the TTL deletes that record.
|
|
273
274
|
*
|
|
274
275
|
* @param ctx - Retry context with dependencies
|
|
275
276
|
* @param retryRequest - The retry request from the recipient
|
|
@@ -475,8 +476,9 @@ export async function handleRetryRequestAndResend(ctx, retryRequest, dedupState,
|
|
|
475
476
|
});
|
|
476
477
|
// Track retry response count
|
|
477
478
|
dedupState.retryResponseCounts.set(dedupKey, responseCount + 1);
|
|
478
|
-
// 7.
|
|
479
|
-
|
|
479
|
+
// 7. The resend replaced the MessageRecord at the same timestamp with the
|
|
480
|
+
// record of the new encryption. A delivery receipt from the device or the
|
|
481
|
+
// TTL deletes it, so a failed resend can be requested again.
|
|
480
482
|
ctx.logger.info('Message resent successfully after retry request', {
|
|
481
483
|
category: 'E2EE',
|
|
482
484
|
data: {
|