@open-e2ee/signal-protocol-sdk 13.3.0 → 13.5.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 +436 -0
- package/README.md +1 -1
- package/SECURITY.md +2 -2
- package/dist/client/binary-send.d.ts +28 -0
- package/dist/client/binary-send.d.ts.map +1 -0
- package/dist/client/binary-send.js +26 -0
- package/dist/client/binary-send.js.map +1 -0
- package/dist/client/client.d.ts +47 -6
- package/dist/client/client.d.ts.map +1 -1
- package/dist/client/client.js +288 -136
- package/dist/client/client.js.map +1 -1
- package/dist/client/content-adapter.d.ts +18 -0
- package/dist/client/content-adapter.d.ts.map +1 -1
- package/dist/client/content-adapter.js.map +1 -1
- package/dist/client/device-set-reconciliation.d.ts +23 -8
- package/dist/client/device-set-reconciliation.d.ts.map +1 -1
- package/dist/client/device-set-reconciliation.js +25 -11
- package/dist/client/device-set-reconciliation.js.map +1 -1
- package/dist/client/event-hooks.d.ts +88 -8
- package/dist/client/event-hooks.d.ts.map +1 -1
- package/dist/client/event-hooks.js +1 -0
- package/dist/client/event-hooks.js.map +1 -1
- package/dist/client/group-outbox.d.ts +45 -10
- package/dist/client/group-outbox.d.ts.map +1 -1
- package/dist/client/group-outbox.js +246 -154
- package/dist/client/group-outbox.js.map +1 -1
- package/dist/client/group-receive-authorization.d.ts +10 -1
- package/dist/client/group-receive-authorization.d.ts.map +1 -1
- package/dist/client/group-receive-authorization.js.map +1 -1
- package/dist/client/hosted-anonymous-delivery.d.ts +18 -1
- package/dist/client/hosted-anonymous-delivery.d.ts.map +1 -1
- package/dist/client/hosted-anonymous-delivery.js +84 -12
- package/dist/client/hosted-anonymous-delivery.js.map +1 -1
- package/dist/client/hosted-connection.js +1 -1
- package/dist/client/hosted-connection.js.map +1 -1
- package/dist/client/hosted-group-authority.d.ts +6 -2
- package/dist/client/hosted-group-authority.d.ts.map +1 -1
- package/dist/client/hosted-group-authority.js +11 -7
- package/dist/client/hosted-group-authority.js.map +1 -1
- package/dist/client/hosted-groups.d.ts +5 -1
- package/dist/client/hosted-groups.d.ts.map +1 -1
- package/dist/client/hosted-groups.js +8 -4
- package/dist/client/hosted-groups.js.map +1 -1
- package/dist/client/hosted-http-error.d.ts +5 -1
- package/dist/client/hosted-http-error.d.ts.map +1 -1
- package/dist/client/hosted-http-error.js +5 -1
- package/dist/client/hosted-http-error.js.map +1 -1
- package/dist/client/hosted-mailbox-subscription.d.ts +2 -0
- package/dist/client/hosted-mailbox-subscription.d.ts.map +1 -1
- package/dist/client/hosted-mailbox-subscription.js +5 -5
- package/dist/client/hosted-mailbox-subscription.js.map +1 -1
- package/dist/client/hosted-resume-error.d.ts +19 -0
- package/dist/client/hosted-resume-error.d.ts.map +1 -0
- package/dist/client/hosted-resume-error.js +44 -0
- package/dist/client/hosted-resume-error.js.map +1 -0
- package/dist/client/hosted-resume.d.ts +24 -0
- package/dist/client/hosted-resume.d.ts.map +1 -0
- package/dist/client/hosted-resume.js +82 -0
- package/dist/client/hosted-resume.js.map +1 -0
- package/dist/client/hosted-transport.d.ts +11 -1
- package/dist/client/hosted-transport.d.ts.map +1 -1
- package/dist/client/hosted-transport.js +102 -33
- package/dist/client/hosted-transport.js.map +1 -1
- package/dist/client/hosted.d.ts.map +1 -1
- package/dist/client/hosted.js +29 -6
- package/dist/client/hosted.js.map +1 -1
- package/dist/client/index.d.ts +3 -1
- package/dist/client/index.d.ts.map +1 -1
- package/dist/client/index.js +2 -0
- package/dist/client/index.js.map +1 -1
- package/dist/client/receive-queue.d.ts +5 -2
- package/dist/client/receive-queue.d.ts.map +1 -1
- package/dist/client/receive-queue.js +55 -18
- package/dist/client/receive-queue.js.map +1 -1
- package/dist/client/relay-acceptance.d.ts +49 -6
- package/dist/client/relay-acceptance.d.ts.map +1 -1
- package/dist/client/relay-acceptance.js +49 -3
- package/dist/client/relay-acceptance.js.map +1 -1
- package/dist/client/relay-protocol.d.ts +37 -7
- package/dist/client/relay-protocol.d.ts.map +1 -1
- package/dist/client/relay-protocol.js +53 -10
- package/dist/client/relay-protocol.js.map +1 -1
- package/dist/client/retry-family.d.ts +3 -3
- package/dist/client/retry-family.js +1 -1
- package/dist/client/retry-family.js.map +1 -1
- package/dist/client/retry-request-envelope.d.ts +18 -8
- package/dist/client/retry-request-envelope.d.ts.map +1 -1
- package/dist/client/retry-request-envelope.js +57 -29
- package/dist/client/retry-request-envelope.js.map +1 -1
- package/dist/client/retry-request-lifecycle.d.ts +24 -11
- package/dist/client/retry-request-lifecycle.d.ts.map +1 -1
- package/dist/client/retry-request-lifecycle.js +46 -20
- package/dist/client/retry-request-lifecycle.js.map +1 -1
- package/dist/client/retry-terminal-recovery.d.ts +11 -8
- package/dist/client/retry-terminal-recovery.d.ts.map +1 -1
- package/dist/client/retry-terminal-recovery.js +18 -12
- package/dist/client/retry-terminal-recovery.js.map +1 -1
- package/dist/client/retry.d.ts +8 -7
- package/dist/client/retry.d.ts.map +1 -1
- package/dist/client/retry.js +30 -22
- package/dist/client/retry.js.map +1 -1
- package/dist/client/send-deadline.d.ts +308 -0
- package/dist/client/send-deadline.d.ts.map +1 -0
- package/dist/client/send-deadline.js +914 -0
- package/dist/client/send-deadline.js.map +1 -0
- package/dist/client/send-intent-driver.d.ts +116 -0
- package/dist/client/send-intent-driver.d.ts.map +1 -0
- package/dist/client/send-intent-driver.js +373 -0
- package/dist/client/send-intent-driver.js.map +1 -0
- package/dist/client/signal-service-cipher.d.ts +257 -27
- package/dist/client/signal-service-cipher.d.ts.map +1 -1
- package/dist/client/signal-service-cipher.js +1274 -283
- package/dist/client/signal-service-cipher.js.map +1 -1
- package/dist/client/startup-cleanup.d.ts +2 -0
- package/dist/client/startup-cleanup.d.ts.map +1 -0
- package/dist/client/startup-cleanup.js +14 -0
- package/dist/client/startup-cleanup.js.map +1 -0
- package/dist/client/types.d.ts +48 -5
- package/dist/client/types.d.ts.map +1 -1
- package/dist/client/types.js.map +1 -1
- package/dist/index.d.ts +3 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/internal/manager/manager.d.ts +1 -0
- package/dist/internal/manager/manager.d.ts.map +1 -1
- package/dist/internal/manager/manager.js +17 -2
- package/dist/internal/manager/manager.js.map +1 -1
- package/dist/internal/manager/retained-identity.d.ts +2 -0
- package/dist/internal/manager/retained-identity.d.ts.map +1 -0
- package/dist/internal/manager/retained-identity.js +57 -0
- package/dist/internal/manager/retained-identity.js.map +1 -0
- package/dist/local/store/conformance/cases/metadata.d.ts +3 -2
- package/dist/local/store/conformance/cases/metadata.d.ts.map +1 -1
- package/dist/local/store/conformance/cases/metadata.js +153 -2
- package/dist/local/store/conformance/cases/metadata.js.map +1 -1
- package/dist/local/store/key-value/adapter.d.ts +2 -1
- package/dist/local/store/key-value/adapter.d.ts.map +1 -1
- package/dist/local/store/key-value/adapter.js +9 -0
- package/dist/local/store/key-value/adapter.js.map +1 -1
- package/dist/local/store/memory/adapter.d.ts +2 -1
- package/dist/local/store/memory/adapter.d.ts.map +1 -1
- package/dist/local/store/memory/adapter.js +4 -0
- package/dist/local/store/memory/adapter.js.map +1 -1
- package/dist/local/store/metadata-keys.d.ts +13 -0
- package/dist/local/store/metadata-keys.d.ts.map +1 -0
- package/dist/local/store/metadata-keys.js +20 -0
- package/dist/local/store/metadata-keys.js.map +1 -0
- package/dist/local/store/receive-work.d.ts.map +1 -1
- package/dist/local/store/receive-work.js +12 -1
- package/dist/local/store/receive-work.js.map +1 -1
- package/dist/local/store/reliability.d.ts +482 -33
- package/dist/local/store/reliability.d.ts.map +1 -1
- package/dist/local/store/reliability.js +690 -48
- package/dist/local/store/reliability.js.map +1 -1
- package/dist/local/store/sqlite/key-storage/index.d.ts +2 -1
- package/dist/local/store/sqlite/key-storage/index.d.ts.map +1 -1
- package/dist/local/store/sqlite/key-storage/index.js +3 -0
- package/dist/local/store/sqlite/key-storage/index.js.map +1 -1
- package/dist/local/store/sqlite/key-storage/metadata.d.ts +9 -0
- package/dist/local/store/sqlite/key-storage/metadata.d.ts.map +1 -1
- package/dist/local/store/sqlite/key-storage/metadata.js +12 -0
- package/dist/local/store/sqlite/key-storage/metadata.js.map +1 -1
- package/dist/local/store/sqlite/store.d.ts +2 -1
- package/dist/local/store/sqlite/store.d.ts.map +1 -1
- package/dist/local/store/sqlite/store.js +3 -0
- package/dist/local/store/sqlite/store.js.map +1 -1
- package/dist/local/store/web/adapter.d.ts +8 -1
- package/dist/local/store/web/adapter.d.ts.map +1 -1
- package/dist/local/store/web/adapter.js +18 -0
- package/dist/local/store/web/adapter.js.map +1 -1
- package/dist/remote/relay/request-admission.d.ts +49 -0
- package/dist/remote/relay/request-admission.d.ts.map +1 -0
- package/dist/remote/relay/request-admission.js +74 -0
- package/dist/remote/relay/request-admission.js.map +1 -0
- package/dist/types/api.d.ts +77 -0
- package/dist/types/api.d.ts.map +1 -1
- package/dist/types/errors.d.ts +144 -1
- package/dist/types/errors.d.ts.map +1 -1
- package/dist/types/errors.js +146 -1
- package/dist/types/errors.js.map +1 -1
- package/docs/ASSURANCE.md +5 -5
- package/docs/DEVIATIONS.md +34 -4
- package/docs/ERROR_HANDLING.md +134 -7
- package/docs/PACKAGE_SURFACE.md +21 -0
- package/docs/RECIPES.md +3 -2
- package/package.json +1 -1
|
@@ -6,15 +6,16 @@
|
|
|
6
6
|
* failed envelope posts nothing while the record exists. A post that fails
|
|
7
7
|
* with a retryable class is posted again by the scheduler at its next
|
|
8
8
|
* attempt time. A post that fails with a conclusive class, the deadline of
|
|
9
|
-
* the record, a
|
|
10
|
-
*
|
|
9
|
+
* the record, a post due at or after its posting deadline, an
|
|
10
|
+
* OPERATION_EXPIRED refusal, a failed resend of the last answered attempt,
|
|
11
|
+
* and an exhausted abuse allowance end the request. Each end calls the
|
|
11
12
|
* `onRetryTerminal` hook at least once: the record is marked emitted only
|
|
12
13
|
* after the hook returns. Each request and each scheduler pass also checks
|
|
13
14
|
* the delivery error of the record, as `reportDeliveryError` tells. Each
|
|
14
15
|
* scheduler pass also runs a recovery that the hook did not mark, as
|
|
15
16
|
* `reportDeliveryRecovered` tells.
|
|
16
17
|
*/
|
|
17
|
-
import { getProcessedEnvelope, getRetryRequest, listRetryRequestIds, RETRY_REQUEST_DEADLINE_MS, storeRetryRequest, updateRetryRequest, withProcessedEnvelopeLock, } from '../local/store/reliability.js';
|
|
18
|
+
import { getProcessedEnvelope, getRetryRequest, listRetryRequestIds, RETRY_REQUEST_DEADLINE_MS, RETRY_REQUEST_POSTING_WINDOW_MS, retryRequestPostingDeadlineAt, storeRetryRequest, updateRetryRequest, withProcessedEnvelopeLock, } from '../local/store/reliability.js';
|
|
18
19
|
import { generateUuidV4 } from '../internal/crypto/index.js';
|
|
19
20
|
import { reportDeliveryError, reportDeliveryRecovered } from './delivery-error.js';
|
|
20
21
|
import { answeredLastRetryAttempt, postRetryRequest, postStoredRetryRequest, readRetryRequestEnvelope, } from './retry-request-envelope.js';
|
|
@@ -23,20 +24,22 @@ import { resetRetryTerminalSession, } from './retry-terminal-recovery.js';
|
|
|
23
24
|
/**
|
|
24
25
|
* Tell whether the receive path acknowledges a failed envelope after its
|
|
25
26
|
* retry request. A failed envelope is acknowledged once a record owns its
|
|
26
|
-
* request. A member is acknowledged only when its request attempt is
|
|
27
|
-
*
|
|
27
|
+
* request. A member is acknowledged only when its request attempt is
|
|
28
|
+
* posted, held by the Relay with nothing to post (`waiting`), or ended, so
|
|
29
|
+
* a deferred or skipped member is delivered again.
|
|
28
30
|
*/
|
|
29
31
|
export function acknowledgesRetryRequest(outcome, member) {
|
|
30
32
|
if (outcome === 'deferred' || outcome === 'skipped')
|
|
31
33
|
return false;
|
|
32
|
-
return !member || outcome === 'posted' || outcome === 'terminal';
|
|
34
|
+
return !member || outcome === 'posted' || outcome === 'waiting' || outcome === 'terminal';
|
|
33
35
|
}
|
|
34
36
|
/**
|
|
35
37
|
* Call the `onRetryTerminal` hook for the terminal state of a request
|
|
36
38
|
* record, once. It reads the record, and when the terminal state is not
|
|
37
|
-
* emitted, it first resets the session of an `expired-content`
|
|
38
|
-
* `resetRetryTerminalSession`. It then calls
|
|
39
|
-
* as emitted. The other classes reset
|
|
39
|
+
* emitted, it first resets the session of an `expired-content` or
|
|
40
|
+
* `posting-deadline` end with `resetRetryTerminalSession`. It then calls
|
|
41
|
+
* the hook and stores the state as emitted. The other classes reset
|
|
42
|
+
* nothing.
|
|
40
43
|
*
|
|
41
44
|
* The hook is called directly, not through `callHook`, so a hook that
|
|
42
45
|
* throws, and the RelayWorkStopped of a stop or of the reset, propagate and
|
|
@@ -94,6 +97,10 @@ export async function emitRetryTerminal(context, failedEnvelopeId) {
|
|
|
94
97
|
* end of the limit window and gives `deferred`.
|
|
95
98
|
* - A member whose stored attempt is not answered posts it again, with no
|
|
96
99
|
* rate limit.
|
|
100
|
+
* - A member at or after the posting deadline of its stored attempt,
|
|
101
|
+
* `retryRequestPostingDeadlineAt`, spends no request of the rate limit.
|
|
102
|
+
* An answered or held attempt posts nothing and gives `waiting`. A due
|
|
103
|
+
* attempt ends as `posting-deadline`.
|
|
97
104
|
*
|
|
98
105
|
* After a post, a terminal outcome calls the hook, and any other outcome
|
|
99
106
|
* arms the scheduler for the record. Then, for each failed envelope with
|
|
@@ -143,6 +150,7 @@ export async function requestRetryInFamily(family, fingerprint, source) {
|
|
|
143
150
|
...(own?.contentHint !== undefined && { contentHint: own.contentHint }),
|
|
144
151
|
failedSender: sender,
|
|
145
152
|
deadlineAt: now + RETRY_REQUEST_DEADLINE_MS,
|
|
153
|
+
postingDeadlineAt: now + RETRY_REQUEST_POSTING_WINDOW_MS,
|
|
146
154
|
terminal: { class: 'abuse-allowance-exhausted', at: now, emitted: false },
|
|
147
155
|
});
|
|
148
156
|
await emitRetryTerminal(source, failedEnvelopeId);
|
|
@@ -153,8 +161,10 @@ export async function requestRetryInFamily(family, fingerprint, source) {
|
|
|
153
161
|
await emitRetryTerminal(source, failedEnvelopeId);
|
|
154
162
|
return 'terminal';
|
|
155
163
|
}
|
|
156
|
-
else if (stored &&
|
|
157
|
-
|
|
164
|
+
else if (stored &&
|
|
165
|
+
(answeredLastRetryAttempt(stored) || Date.now() >= retryRequestPostingDeadlineAt(stored))) {
|
|
166
|
+
// The post ends the request or posts nothing, so it spends no request
|
|
167
|
+
// of the rate limit.
|
|
158
168
|
}
|
|
159
169
|
else if (!stored || stored.answered) {
|
|
160
170
|
const now = Date.now();
|
|
@@ -195,7 +205,7 @@ export async function requestRetryInFamily(family, fingerprint, source) {
|
|
|
195
205
|
else {
|
|
196
206
|
const record = await getRetryRequest(storage, failedEnvelopeId);
|
|
197
207
|
if (record && !record.terminal)
|
|
198
|
-
source.schedule?.(record
|
|
208
|
+
source.schedule?.(nextPassAt(record));
|
|
199
209
|
}
|
|
200
210
|
return outcome;
|
|
201
211
|
};
|
|
@@ -222,15 +232,16 @@ const MAX_TIMER_DELAY_MS = 2 ** 31 - 1;
|
|
|
222
232
|
/**
|
|
223
233
|
* Posts each stored retry request whose next attempt time has come, ends
|
|
224
234
|
* each request at its deadline, also when its stored attempt is answered,
|
|
225
|
-
*
|
|
226
|
-
*
|
|
227
|
-
*
|
|
235
|
+
* ends as `posting-deadline` each request whose post is due at or after its
|
|
236
|
+
* posting deadline, and calls the hook for each terminal state that is not
|
|
237
|
+
* emitted. A request whose failed envelope is fulfilled has its content,
|
|
238
|
+
* so the scheduler neither posts nor ends it. It then runs `onDeliveryError` for each record whose
|
|
228
239
|
* error is due, and `onDeliveryRecovered` for each fulfilled record whose
|
|
229
240
|
* recovery the hook did not mark. A hook error for one record is logged,
|
|
230
241
|
* the record keeps the time of its next attempt or deadline, and the pass
|
|
231
242
|
* goes on with the next record. A pass runs at start() and at
|
|
232
243
|
* the earliest next attempt
|
|
233
|
-
* time, deadline or error time of the records. Each pass is relay work, so a
|
|
244
|
+
* time, posting deadline, deadline or error time of the records. Each pass is relay work, so a
|
|
234
245
|
* client stop stops it. Each record is read and posted under the processed
|
|
235
246
|
* lock of its failed envelope, as a receive does.
|
|
236
247
|
*
|
|
@@ -378,6 +389,7 @@ export class RetryRequestScheduler {
|
|
|
378
389
|
await updateRetryRequest(storage, failedEnvelopeId, record.retryId, record.attempt, {
|
|
379
390
|
terminal: { class: 'expired-content', at: now, emitted: false },
|
|
380
391
|
nextAttemptAt: undefined,
|
|
392
|
+
lastFailureClass: undefined,
|
|
381
393
|
});
|
|
382
394
|
await emitRetryTerminal(pass, failedEnvelopeId);
|
|
383
395
|
return Infinity;
|
|
@@ -385,9 +397,12 @@ export class RetryRequestScheduler {
|
|
|
385
397
|
// An answered attempt waits for its resend, or for its deadline.
|
|
386
398
|
if (record.answered)
|
|
387
399
|
return record.deadlineAt;
|
|
388
|
-
// With no next attempt time, the Relay holds the stored attempt.
|
|
389
|
-
|
|
390
|
-
|
|
400
|
+
// With no next attempt time, the Relay holds the stored attempt. A due
|
|
401
|
+
// attempt at or after its posting deadline ends in the post.
|
|
402
|
+
if (record.nextAttemptAt === undefined)
|
|
403
|
+
return record.deadlineAt;
|
|
404
|
+
if (record.nextAttemptAt > now && now < retryRequestPostingDeadlineAt(record)) {
|
|
405
|
+
return nextPassAt(record);
|
|
391
406
|
}
|
|
392
407
|
const outcome = await postStoredRetryRequest(storage, record, () => storedRequest(record), pass.local, send);
|
|
393
408
|
if (outcome === 'terminal') {
|
|
@@ -399,9 +414,20 @@ export class RetryRequestScheduler {
|
|
|
399
414
|
return Infinity;
|
|
400
415
|
if (after.answered)
|
|
401
416
|
return after.deadlineAt;
|
|
402
|
-
return
|
|
417
|
+
return nextPassAt(after);
|
|
403
418
|
}
|
|
404
419
|
}
|
|
420
|
+
/**
|
|
421
|
+
* The time of the next pass for a record that has not ended: its next
|
|
422
|
+
* attempt time, at most its posting deadline and its deadline. With no next
|
|
423
|
+
* attempt time, the Relay holds the stored attempt, and the record waits
|
|
424
|
+
* for its deadline.
|
|
425
|
+
*/
|
|
426
|
+
function nextPassAt(record) {
|
|
427
|
+
if (record.nextAttemptAt === undefined)
|
|
428
|
+
return record.deadlineAt;
|
|
429
|
+
return Math.min(record.nextAttemptAt, retryRequestPostingDeadlineAt(record), record.deadlineAt);
|
|
430
|
+
}
|
|
405
431
|
/**
|
|
406
432
|
* Log a delivery hook that failed in a scheduler pass. A stop still ends the
|
|
407
433
|
* pass.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry-request-lifecycle.js","sourceRoot":"","sources":["../../client/retry-request-lifecycle.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"retry-request-lifecycle.js","sourceRoot":"","sources":["../../client/retry-request-lifecycle.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAMH,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,mBAAmB,EACnB,yBAAyB,EACzB,+BAA+B,EAC/B,6BAA6B,EAC7B,iBAAiB,EACjB,kBAAkB,EAClB,yBAAyB,GAE1B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAEhF,OAAO,EACL,wBAAwB,EACxB,gBAAgB,EAChB,sBAAsB,EACtB,wBAAwB,GAIzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,uBAAuB,EAAyC,MAAM,cAAc,CAAC;AAC9F,OAAO,EACL,yBAAyB,GAG1B,MAAM,2BAA2B,CAAC;AAiBnC;;;;;;GAMG;AACH,MAAM,UAAU,wBAAwB,CAAC,OAA4B,EAAE,MAAe;IACpF,IAAI,OAAO,KAAK,UAAU,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAClE,OAAO,CAAC,MAAM,IAAI,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,UAAU,CAAC;AAC5F,CAAC;AAyDD;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,OAAkC,EAClC,gBAAwB;IAExB,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IACnC,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAC1E,MAAM,QAAQ,GAAG,MAAM,EAAE,QAAQ,CAAC;IAClC,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,OAAO;QAAE,OAAO;IACrD,MAAM,IAAI,GAAG,KAAK,EAAE,eAAe,CAAC;IACpC,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QAC5B,MAAM,IAAI,CAAC;YACT,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,gBAAgB;YAChB,GAAG,CAAC,QAAQ,EAAE,WAAW,IAAI;gBAC3B,QAAQ,EAAE;oBACR,MAAM,EAAE,QAAQ,CAAC,MAAM;oBACvB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;oBAC3B,SAAS,EAAE,QAAQ,CAAC,SAAS;oBAC7B,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,OAAO;iBAC1C;aACF,CAAC;SACH,CAAC,CAAC;IACL,CAAC;IACD,MAAM,kBAAkB,CAAC,OAAO,EAAE,gBAAgB,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE;QAClF,QAAQ,EAAE,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE;KACzC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,MAA0B,EAC1B,WAA+B,EAC/B,MAA0B;IAE1B,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAC1C,MAAM,OAAO,GAAG,GAAS,EAAE;QACzB,MAAM,CAAC,IAAI,CAAC,sCAAsC,EAAE;YAClD,QAAQ,EAAE,MAAM;YAChB,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE;SACnE,CAAC,CAAC;IACL,CAAC,CAAC;IACF,MAAM,MAAM,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,MAAM,CAAC,cAAc,EAAE,CAAC;IAChF,MAAM,OAAO,GAAG,KAAK,EAAE,MAA2B,EAAgC,EAAE;QAClF,MAAM,gBAAgB,GAAG,MAAM,CAAC,EAAE,CAAC;QACnC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;QAC1B,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;YACnC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;gBACpB,OAAO,EAAE,CAAC;gBACV,OAAO,SAAS,CAAC;YACnB,CAAC;QACH,CAAC;aAAM,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YACvC,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;gBAClD,OAAO,OAAO,CAAC;YACjB,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;gBACpB,OAAO,EAAE,CAAC;gBACV,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBACvB,MAAM,GAAG,GAAG,MAAM,CAAC,cAAc,CAAC;gBAClC,MAAM,iBAAiB,CAAC,OAAO,EAAE;oBAC/B,gBAAgB;oBAChB,OAAO,EAAE,MAAM,cAAc,EAAE;oBAC/B,OAAO,EAAE,CAAC;oBACV,WAAW,EAAE,GAAG;oBAChB,GAAG,CAAC,MAAM,CAAC,WAAW,KAAK,SAAS,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC;oBAC5E,QAAQ,EAAE,KAAK;oBACf,GAAG,CAAC,GAAG,EAAE,YAAY,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;oBAChD,GAAG,CAAC,GAAG,EAAE,eAAe,KAAK,SAAS,IAAI;wBACxC,qBAAqB,EAAE,GAAG,CAAC,eAAe;qBAC3C,CAAC;oBACF,GAAG,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,SAAS,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC9E,UAAU,EAAE,GAAG;oBACf,GAAG,CAAC,GAAG,EAAE,WAAW,KAAK,SAAS,IAAI,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC;oBACvE,YAAY,EAAE,MAAM;oBACpB,UAAU,EAAE,GAAG,GAAG,yBAAyB;oBAC3C,iBAAiB,EAAE,GAAG,GAAG,+BAA+B;oBACxD,QAAQ,EAAE,EAAE,KAAK,EAAE,2BAA2B,EAAE,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE;iBAC1E,CAAC,CAAC;gBACH,MAAM,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;gBAClD,OAAO,UAAU,CAAC;YACpB,CAAC;QACH,CAAC;aAAM,IAAI,MAAM,EAAE,QAAQ,EAAE,CAAC;YAC5B,MAAM,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;YAClD,OAAO,UAAU,CAAC;QACpB,CAAC;aAAM,IACL,MAAM;YACN,CAAC,wBAAwB,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,6BAA6B,CAAC,MAAM,CAAC,CAAC,EACzF,CAAC;YACD,sEAAsE;YACtE,qBAAqB;QACvB,CAAC;aAAM,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACtC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,IAAI,MAAM,EAAE,gBAAgB,KAAK,cAAc,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC;gBACrF,OAAO,UAAU,CAAC;YACpB,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;gBACpB,OAAO,EAAE,CAAC;gBACV,IAAI,MAAM,EAAE,CAAC;oBACX,MAAM,kBAAkB,CAAC,OAAO,EAAE,gBAAgB,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE;wBAClF,aAAa,EAAE,GAAG,GAAG,MAAM,CAAC,QAAQ;wBACpC,gBAAgB,EAAE,cAAc;qBACjC,CAAC,CAAC;gBACL,CAAC;gBACD,OAAO,UAAU,CAAC;YACpB,CAAC;QACH,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACjB,MAAM,CAAC,IAAI,CAAC,iDAAiD,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;YACrF,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5E,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAChF,MAAM,SAAS,GACb,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,YAAY,KAAK,IAAI,CAAC;QACxF,MAAM,OAAO,GAAG,MAAM,gBAAgB,CACpC,OAAO,EACP;YACE,GAAG,MAAM;YACT,GAAG,CAAC,GAAG,EAAE,YAAY,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;YAChD,GAAG,CAAC,GAAG,EAAE,eAAe,KAAK,SAAS,IAAI,EAAE,eAAe,EAAE,GAAG,CAAC,eAAe,EAAE,CAAC;YACnF,GAAG,CAAC,OAAO,KAAK,SAAS,IAAI,EAAE,OAAO,EAAE,CAAC;YACzC,GAAG,CAAC,GAAG,EAAE,WAAW,KAAK,SAAS,IAAI,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC;YACvE,MAAM;SACP,EACD,GAAG,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,EACrC,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,IAAI,CACZ,CAAC;QACF,IAAI,gBAAgB,KAAK,SAAS;YAAE,OAAO,OAAO,CAAC;QACnD,IAAI,OAAO,KAAK,UAAU,EAAE,CAAC;YAC3B,MAAM,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACN,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YAChE,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ;gBAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;QACxE,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;IACF,OAAO,MAAM,CAAC,YAAY,CAAC,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACvD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,MAAM,CAAC,EAAE,KAAK,SAAS,EAAE,CAAC;YAC5B,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;YACrE,IAAI,OAAO,KAAK,QAAQ;gBAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,CAAC;QACvD,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,SAAS,aAAa,CAAC,MAA0B;IAC/C,OAAO,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,cAAc,EAAE,OAAO,CAAC;AAC1D,CAAC;AAED,4CAA4C;AAC5C,MAAM,kBAAkB,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAoBvC;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,OAAO,qBAAqB;IAQb,SAAS;IACT,IAAI;IARf,KAAK,CAA4C;IACjD,OAAO,GAAG,QAAQ,CAAC;IACnB,OAAO,CAA4B;IACnC,KAAK,GAAG,KAAK,CAAC;IACd,OAAO,GAAG,IAAI,CAAC;IAEvB,YACmB,SAA2B,EAC3B,IAA2C;yBAD3C,SAAS;oBACT,IAAI;IACpB,CAAC;IAEJ,6EAA6E;IAC7E,KAAK;QACH,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,OAAO,IAAI,CAAC,GAAG,EAAE,CAAC;IACpB,CAAC;IAED,8DAA8D;IAC9D,IAAI;QACF,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,KAAK,EAAE,CAAC;IACf,CAAC;IAED,+EAA+E;IAC/E,QAAQ,CAAC,EAAU;QACjB,IAAI,IAAI,CAAC,OAAO,IAAI,EAAE,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO;QAC/C,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,kBAAkB,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACzE,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK;gBAAE,OAAO;YACjC,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;YACvB,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC;YACxB,KAAK,IAAI,CAAC,GAAG,EAAE,CAAC;QAClB,CAAC,EAAE,KAAK,CAAC,CAAC;QACT,KAAgC,CAAC,KAAK,EAAE,EAAE,CAAC;QAC5C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAEO,KAAK;QACX,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS;YAAE,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvD,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC;IAC1B,CAAC;IAED,oEAAoE;IAC5D,GAAG;QACT,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,OAAO,IAAI,CAAC,OAAO,CAAC;QACtB,CAAC;QACD,MAAM,OAAO,GAAG,CAAC,KAAK,IAAI,EAAE;YAC1B,GAAG,CAAC;gBACF,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;gBACnB,IAAI,IAAI,CAAC,OAAO;oBAAE,OAAO;gBACzB,+DAA+D;gBAC/D,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YAChF,CAAC,QAAQ,IAAI,CAAC,KAAK,EAAE;QACvB,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE;YAChB,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,IAAe;QACnC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7B,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACjC,IAAI,GAAa,CAAC;QAClB,IAAI,CAAC;YACH,GAAG,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAC3C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,uBAAuB,CAAC,KAAK,CAAC,CAAC;YAC/B,MAAM,CAAC,IAAI,CAAC,gEAAgE,EAAE;gBAC5E,QAAQ,EAAE,MAAM;gBAChB,IAAI,EAAE,EAAE,QAAQ,EAAE,+BAA+B,EAAE,KAAK,EAAG,KAAe,CAAC,OAAO,EAAE;aACrF,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,IAAI,IAAI,GAAG,QAAQ,CAAC;QACpB,KAAK,MAAM,gBAAgB,IAAI,GAAG,EAAE,CAAC;YACnC,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,IAAI,CAAC;gBACH,MAAM,EAAE,GAAG,MAAM,yBAAyB,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,EAAE,CACzE,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,gBAAgB,CAAC,CACxC,CAAC;gBACF,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC5B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,uBAAuB,CAAC,KAAK,CAAC,CAAC;gBAC/B,MAAM,CAAC,IAAI,CAAC,gDAAgD,EAAE;oBAC5D,QAAQ,EAAE,MAAM;oBAChB,IAAI,EAAE;wBACJ,gBAAgB;wBAChB,QAAQ,EAAE,+BAA+B;wBACzC,KAAK,EAAG,KAAe,CAAC,OAAO;qBAChC;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,IAAI,IAAI,KAAK,QAAQ;YAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,UAAU,CAAC,IAAsB,EAAE,gBAAwB;QACvE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAC9D,IAAI,OAAO,GAAG,QAAQ,CAAC;QACvB,IAAI,CAAC;YACH,OAAO,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;QAClF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,IAAI,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,KAAK,CAAC,CAAC;QAC/D,CAAC;QACD,IAAI,CAAC;YACH,MAAM,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;QAC5E,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,IAAI,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,KAAK,CAAC,CAAC;QACnE,CAAC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjC,CAAC;IAED,sFAAsF;IAC9E,KAAK,CAAC,aAAa,CAAC,IAAsB,EAAE,gBAAwB;QAC1E,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QAC/B,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAChE,IAAI,MAAM,EAAE,QAAQ,EAAE,CAAC;YACrB,MAAM,iBAAiB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;YAChD,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI;YAAE,OAAO,QAAQ,CAAC;QACtC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,MAAM,oBAAoB,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,CAAC,CAAC,EAAE,SAAS;YAAE,OAAO,QAAQ,CAAC;QAC7F,IAAI,GAAG,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YAC7B,MAAM,kBAAkB,CAAC,OAAO,EAAE,gBAAgB,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE;gBAClF,QAAQ,EAAE,EAAE,KAAK,EAAE,iBAAiB,EAAE,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE;gBAC/D,aAAa,EAAE,SAAS;gBACxB,gBAAgB,EAAE,SAAS;aAC5B,CAAC,CAAC;YACH,MAAM,iBAAiB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;YAChD,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,iEAAiE;QACjE,IAAI,MAAM,CAAC,QAAQ;YAAE,OAAO,MAAM,CAAC,UAAU,CAAC;QAC9C,uEAAuE;QACvE,6DAA6D;QAC7D,IAAI,MAAM,CAAC,aAAa,KAAK,SAAS;YAAE,OAAO,MAAM,CAAC,UAAU,CAAC;QACjE,IAAI,MAAM,CAAC,aAAa,GAAG,GAAG,IAAI,GAAG,GAAG,6BAA6B,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9E,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;QAC5B,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,sBAAsB,CAC1C,OAAO,EACP,MAAM,EACN,GAAG,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,EAC3B,IAAI,CAAC,KAAK,EACV,IAAI,CACL,CAAC;QACF,IAAI,OAAO,KAAK,UAAU,EAAE,CAAC;YAC3B,MAAM,iBAAiB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;YAChD,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAC/D,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,QAAQ;YAAE,OAAO,QAAQ,CAAC;QAC9C,IAAI,KAAK,CAAC,QAAQ;YAAE,OAAO,KAAK,CAAC,UAAU,CAAC;QAC5C,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;CACF;AAED;;;;;GAKG;AACH,SAAS,UAAU,CAAC,MAA0B;IAC5C,IAAI,MAAM,CAAC,aAAa,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC,UAAU,CAAC;IACjE,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,EAAE,6BAA6B,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;AAClG,CAAC;AAED;;;GAGG;AACH,SAAS,UAAU,CACjB,IAAsB,EACtB,gBAAwB,EACxB,IAA+C,EAC/C,KAAc;IAEd,uBAAuB,CAAC,KAAK,CAAC,CAAC;IAC/B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,cAAc,EAAE;QAC1C,QAAQ,EAAE,MAAM;QAChB,IAAI,EAAE;YACJ,gBAAgB;YAChB,QAAQ,EACN,IAAI,KAAK,iBAAiB;gBACxB,CAAC,CAAC,4BAA4B;gBAC9B,CAAC,CAAC,gCAAgC;YACtC,KAAK,EAAG,KAAe,CAAC,OAAO;SAChC;KACF,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,aAAa,CAAC,MAA0B;IACrD,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAS,CAAC;IAClC,MAAM,IAAI,GAAG,wBAAwB,CAAC,QAAQ,EAAE;QAC9C,MAAM,EAAE,QAAQ,CAAC,YAAY;QAC7B,QAAQ,EAAE,QAAQ,CAAC,cAAc;KAClC,CAAC,CAAC;IACH,IAAI,CAAC,IAAI,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,6CAA6C,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IACzF,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;AACpD,CAAC"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* The session reset of the requester after a retry request ends as
|
|
3
|
-
* `expired-content`.
|
|
3
|
+
* `expired-content` or `posting-deadline`.
|
|
4
4
|
*
|
|
5
|
-
* The request got no
|
|
6
|
-
*
|
|
5
|
+
* The request got no content before its deadline, or it can post no more
|
|
6
|
+
* before its posting deadline, so the session with the device that sent
|
|
7
|
+
* the failed envelope can be out of step. The requester
|
|
7
8
|
* archives that session, deletes its sender-key handoff rows for each device
|
|
8
9
|
* of that account in every group, and sends one null message to the
|
|
9
10
|
* device, at most once an hour for each device. The null message, or else
|
|
@@ -59,9 +60,9 @@ export interface RetryTerminalResetContext {
|
|
|
59
60
|
readonly reset: RetryTerminalResetSteps | undefined;
|
|
60
61
|
}
|
|
61
62
|
/**
|
|
62
|
-
* Reset the session with the sender device of an `expired-content`
|
|
63
|
-
* whose terminal state is not emitted. Another
|
|
64
|
-
* a context with no reset steps do nothing.
|
|
63
|
+
* Reset the session with the sender device of an `expired-content` or
|
|
64
|
+
* `posting-deadline` request whose terminal state is not emitted. Another
|
|
65
|
+
* class, an emitted state, and a context with no reset steps do nothing.
|
|
65
66
|
*
|
|
66
67
|
* The steps run in this order. A step that a stored marker shows as done
|
|
67
68
|
* does not run again.
|
|
@@ -85,13 +86,15 @@ export interface RetryTerminalResetContext {
|
|
|
85
86
|
* archives again at the replay. A failed null message is stored as
|
|
86
87
|
* `failed`.
|
|
87
88
|
*
|
|
88
|
-
* @returns The stored record after the reset
|
|
89
|
+
* @returns The stored record after the reset of an `expired-content` or
|
|
90
|
+
* `posting-deadline` end, else the stored record.
|
|
89
91
|
*/
|
|
90
92
|
export declare function resetRetryTerminalSession(context: RetryTerminalResetContext, failedEnvelopeId: string): Promise<StoredRetryRequest | null>;
|
|
91
93
|
/**
|
|
92
94
|
* Attach the raw group ID of a group message to an error that its decrypt
|
|
93
95
|
* threw. The retry request record of the failed envelope then keeps the
|
|
94
|
-
* group, so an `expired-content` end marks the sender
|
|
96
|
+
* group, so an `expired-content` or `posting-deadline` end marks the sender
|
|
97
|
+
* key of that group.
|
|
95
98
|
*/
|
|
96
99
|
export declare function attachFailedGroup(error: unknown, groupId: string): void;
|
|
97
100
|
/** The raw group ID that `attachFailedGroup` attached to an error. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry-terminal-recovery.d.ts","sourceRoot":"","sources":["../../client/retry-terminal-recovery.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"retry-terminal-recovery.d.ts","sourceRoot":"","sources":["../../client/retry-terminal-recovery.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EACL,eAAe,EAMf,KAAK,kBAAkB,EACxB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAY,KAAK,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAGzE,KAAK,gBAAgB,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9D,8CAA8C;AAC9C,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B;AAED;;;GAGG;AACH,MAAM,WAAW,uBAAuB;IACtC;;;;OAIG;IACH,cAAc,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D;;;;;;;;OAQG;IACH,kCAAkC,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClG;;;OAGG;IACH,eAAe,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7D;AAED,iDAAiD;AACjD,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC;IACnC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAClC,QAAQ,CAAC,KAAK,EAAE,yBAAyB,GAAG,SAAS,CAAC;IACtD,uDAAuD;IACvD,QAAQ,CAAC,KAAK,EAAE,uBAAuB,GAAG,SAAS,CAAC;CACrD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,yBAAyB,EAClC,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAuDpC;AAkED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAEvE;AAED,sEAAsE;AACtE,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAEhE"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* The session reset of the requester after a retry request ends as
|
|
3
|
-
* `expired-content`.
|
|
3
|
+
* `expired-content` or `posting-deadline`.
|
|
4
4
|
*
|
|
5
|
-
* The request got no
|
|
6
|
-
*
|
|
5
|
+
* The request got no content before its deadline, or it can post no more
|
|
6
|
+
* before its posting deadline, so the session with the device that sent
|
|
7
|
+
* the failed envelope can be out of step. The requester
|
|
7
8
|
* archives that session, deletes its sender-key handoff rows for each device
|
|
8
9
|
* of that account in every group, and sends one null message to the
|
|
9
10
|
* device, at most once an hour for each device. The null message, or else
|
|
@@ -19,9 +20,9 @@ import { createKeyedLocks, withKeyedLock } from '../utils/keyed-lock.js';
|
|
|
19
20
|
import { callHook } from './event-hooks.js';
|
|
20
21
|
import { rethrowRelayWorkStopped } from './relay-work.js';
|
|
21
22
|
/**
|
|
22
|
-
* Reset the session with the sender device of an `expired-content`
|
|
23
|
-
* whose terminal state is not emitted. Another
|
|
24
|
-
* a context with no reset steps do nothing.
|
|
23
|
+
* Reset the session with the sender device of an `expired-content` or
|
|
24
|
+
* `posting-deadline` request whose terminal state is not emitted. Another
|
|
25
|
+
* class, an emitted state, and a context with no reset steps do nothing.
|
|
25
26
|
*
|
|
26
27
|
* The steps run in this order. A step that a stored marker shows as done
|
|
27
28
|
* does not run again.
|
|
@@ -45,17 +46,21 @@ import { rethrowRelayWorkStopped } from './relay-work.js';
|
|
|
45
46
|
* archives again at the replay. A failed null message is stored as
|
|
46
47
|
* `failed`.
|
|
47
48
|
*
|
|
48
|
-
* @returns The stored record after the reset
|
|
49
|
+
* @returns The stored record after the reset of an `expired-content` or
|
|
50
|
+
* `posting-deadline` end, else the stored record.
|
|
49
51
|
*/
|
|
50
52
|
export async function resetRetryTerminalSession(context, failedEnvelopeId) {
|
|
51
53
|
const { storage, reset } = context;
|
|
52
54
|
let record = await getRetryRequest(storage, failedEnvelopeId);
|
|
53
55
|
const terminal = record?.terminal;
|
|
54
|
-
if (!record ||
|
|
56
|
+
if (!record ||
|
|
57
|
+
!terminal ||
|
|
58
|
+
terminal.emitted ||
|
|
59
|
+
(terminal.class !== 'expired-content' && terminal.class !== 'posting-deadline')) {
|
|
55
60
|
return record;
|
|
56
61
|
}
|
|
57
|
-
// An expired request always has its stored envelope.
|
|
58
|
-
// device that sent the failed envelope.
|
|
62
|
+
// An expired or posting-deadline request always has its stored envelope.
|
|
63
|
+
// Its target is the device that sent the failed envelope.
|
|
59
64
|
if (!reset || !record.envelope)
|
|
60
65
|
return record;
|
|
61
66
|
const device = {
|
|
@@ -74,7 +79,7 @@ export async function resetRetryTerminalSession(context, failedEnvelopeId) {
|
|
|
74
79
|
});
|
|
75
80
|
if (!record)
|
|
76
81
|
return null;
|
|
77
|
-
context.logger.info('Archived the session with the sender of an
|
|
82
|
+
context.logger.info('Archived the session with the sender of an ended retry request', {
|
|
78
83
|
category: 'E2EE',
|
|
79
84
|
data: {
|
|
80
85
|
failedEnvelopeId,
|
|
@@ -151,7 +156,8 @@ const failedGroups = new WeakMap();
|
|
|
151
156
|
/**
|
|
152
157
|
* Attach the raw group ID of a group message to an error that its decrypt
|
|
153
158
|
* threw. The retry request record of the failed envelope then keeps the
|
|
154
|
-
* group, so an `expired-content` end marks the sender
|
|
159
|
+
* group, so an `expired-content` or `posting-deadline` end marks the sender
|
|
160
|
+
* key of that group.
|
|
155
161
|
*/
|
|
156
162
|
export function attachFailedGroup(error, groupId) {
|
|
157
163
|
if (typeof error === 'object' && error !== null)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry-terminal-recovery.js","sourceRoot":"","sources":["../../client/retry-terminal-recovery.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"retry-terminal-recovery.js","sourceRoot":"","sources":["../../client/retry-terminal-recovery.ts"],"names":[],"mappings":"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"}
|
package/dist/client/retry.d.ts
CHANGED
|
@@ -60,13 +60,14 @@ export interface RetryCallbacks {
|
|
|
60
60
|
* sender keeps one resend record for the device and the failed envelope.
|
|
61
61
|
* A call for the request attempt and the kind of that record posts its
|
|
62
62
|
* stored bytes again under their own ID. A call for another request
|
|
63
|
-
* attempt or kind encrypts
|
|
64
|
-
* number of the request.
|
|
65
|
-
*
|
|
66
|
-
*
|
|
67
|
-
*
|
|
68
|
-
* stored
|
|
69
|
-
* attempt
|
|
63
|
+
* attempt or kind encrypts once under its own attempt ID, and the resend
|
|
64
|
+
* takes the attempt number of the request. When the Relay refuses the
|
|
65
|
+
* stored bytes as expired, the record is marked acceptance-unknown, and
|
|
66
|
+
* nothing more posts under that ID: no new encryption replaces it. Null
|
|
67
|
+
* content posts only a stored attempt. It returns false when null content
|
|
68
|
+
* posted no stored bytes in this call. It returns true when the stored
|
|
69
|
+
* bytes posted, or when content exists and the stored attempt has unknown
|
|
70
|
+
* acceptance, and then nothing posts.
|
|
70
71
|
*/
|
|
71
72
|
resend: (userId: string, deviceId: number, content: string | null, options: {
|
|
72
73
|
timestamp: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry.d.ts","sourceRoot":"","sources":["../../client/retry.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAInD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,KAAK,EACV,2BAA2B,EAC3B,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,SAAS,CAAC;AACjB,OAAO,EAGL,KAAK,aAAa,EAElB,KAAK,YAAY,EAClB,MAAM,0BAA0B,CAAC;AAgBlC,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,kCAAkC,CAAC;AAErF,OAAO,EAA4B,KAAK,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACtG,OAAO,EAKL,KAAK,iBAAiB,EAGvB,MAAM,4BAA4B,CAAC;AAGpC;;GAEG;AACH,OAAO,EAAE,CAAC;AACV,MAAM,WAAW,kBAAkB;IACjC;;;;OAIG;IACH,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC;;;OAGG;IACH,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAClC;AAED;;GAEG;AACH,MAAM,WAAW,YAAa,SAAQ,2BAA2B;IAC/D,aAAa,EAAE,aAAa,CAAC;CAC9B;AAED;;;GAGG;AACH,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;AAgBlE;;;GAGG;AACH,wBAAgB,WAAW,CAAC,iBAAiB,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,CAEtF;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,wDAAwD;IACxD,cAAc,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5D,iDAAiD;IACjD,gBAAgB,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpF
|
|
1
|
+
{"version":3,"file":"retry.d.ts","sourceRoot":"","sources":["../../client/retry.ts"],"names":[],"mappings":"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"}
|
package/dist/client/retry.js
CHANGED
|
@@ -147,10 +147,13 @@ async function emitRetryResendTerminal(ctx, ended) {
|
|
|
147
147
|
/**
|
|
148
148
|
* Post the stored resend or null message that answered this request
|
|
149
149
|
* envelope again: the post of that answer did not complete. It does no
|
|
150
|
-
* session work.
|
|
151
|
-
*
|
|
152
|
-
*
|
|
153
|
-
*
|
|
150
|
+
* session work. When the Relay refuses the stored answer as expired, or
|
|
151
|
+
* marked it so earlier, the answer has unknown acceptance and nothing more
|
|
152
|
+
* posts under its ID. It returns false when the sender stored no answer to
|
|
153
|
+
* this request envelope, or when the plaintext is gone and no stored bytes
|
|
154
|
+
* posted. Then only a null-message reset under its own ID can follow. A
|
|
155
|
+
* stored answer to another request envelope is an earlier attempt: the
|
|
156
|
+
* caller answers this one with a new encryption.
|
|
154
157
|
*/
|
|
155
158
|
async function replayStoredResend(ctx, retryRequest, record, callbacks, retry) {
|
|
156
159
|
const { requesterUserId, requesterDeviceId } = retryRequest;
|
|
@@ -392,8 +395,8 @@ export async function sendRetryRequestInternal(ctx, envelope, error, rateLimitSt
|
|
|
392
395
|
}
|
|
393
396
|
// The record of the failed envelope owns its request, so the envelope
|
|
394
397
|
// is acknowledged. A member is acknowledged only when its request
|
|
395
|
-
// attempt is posted or ended: a deferred
|
|
396
|
-
// redelivery after the rate limit window.
|
|
398
|
+
// attempt is posted, waiting (nothing to post), or ended: a deferred
|
|
399
|
+
// member asks again on its redelivery after the rate limit window.
|
|
397
400
|
if (!acknowledgesRetryRequest(outcome, family.member !== undefined))
|
|
398
401
|
return;
|
|
399
402
|
// Mark failed message as delivered so it does not reappear
|
|
@@ -535,13 +538,14 @@ export async function handleRetryRequestAndResend(ctx, retryRequest, responseSta
|
|
|
535
538
|
// The sender already answered this request envelope, and the post did
|
|
536
539
|
// not complete. Post the stored bytes again, with no session work. A
|
|
537
540
|
// group answer posts only stored bytes here. When they expired, the
|
|
538
|
-
//
|
|
541
|
+
// record is marked acceptance-unknown, and only a null-message reset
|
|
542
|
+
// under its own ID can follow.
|
|
539
543
|
if (retry !== undefined &&
|
|
540
544
|
(await replayStoredResend(ctx, retryRequest, entries.length > 0 ? null : record, callbacks, retry))) {
|
|
541
545
|
if (entries.length === 0) {
|
|
542
546
|
responseState.retryResponseCounts.set(dedupKey, (responseState.retryResponseCounts.get(dedupKey) ?? 0) + 1);
|
|
543
547
|
}
|
|
544
|
-
ctx.logger.info('
|
|
548
|
+
ctx.logger.info('Answered the stored resend of this request attempt', {
|
|
545
549
|
category: 'E2EE',
|
|
546
550
|
data: { sessionId, failedTimestamp: retryRequest.failedTimestamp },
|
|
547
551
|
});
|
|
@@ -697,7 +701,7 @@ export async function handleRetryRequestAndResend(ctx, retryRequest, responseSta
|
|
|
697
701
|
return;
|
|
698
702
|
// 5. SESAME Step 4-5: Re-encrypt the original message and send it only
|
|
699
703
|
// to the device that asked. Reuse the original timestamp for envelope
|
|
700
|
-
// alignment.
|
|
704
|
+
// alignment. A new request attempt gets one encryption under its own ID.
|
|
701
705
|
await callbacks.resend(retryRequest.requesterUserId, retryRequest.requesterDeviceId, record.plaintext, {
|
|
702
706
|
timestamp: record.timestamp,
|
|
703
707
|
...(retry && { retry: { ...retry, kind: 'resend' } }),
|
|
@@ -815,7 +819,8 @@ async function resendLoggedGroupContent(ctx, retryRequest, entries, responseStat
|
|
|
815
819
|
* Write the pending resend job of one logged entry for a request attempt.
|
|
816
820
|
* The job of the first entry that the request names holds the failed
|
|
817
821
|
* envelope. A redelivered request envelope writes the same job again and
|
|
818
|
-
* keeps its attempts
|
|
822
|
+
* keeps its creation time and its attempts, so the one-day end of the job
|
|
823
|
+
* counts from the first write.
|
|
819
824
|
*/
|
|
820
825
|
async function storePendingResendJob(ctx, device, payload, retry, answersFailedEnvelope) {
|
|
821
826
|
const jobId = resendJobId(retry.requestEnvelopeId, payload.clientMessageId);
|
|
@@ -828,7 +833,7 @@ async function storePendingResendJob(ctx, device, payload, retry, answersFailedE
|
|
|
828
833
|
retryId: retry.retryId,
|
|
829
834
|
requestEnvelopeId: retry.requestEnvelopeId,
|
|
830
835
|
...(answersFailedEnvelope && { failedEnvelopeId: retry.failedEnvelopeId }),
|
|
831
|
-
createdAt: Date.now(),
|
|
836
|
+
createdAt: existing?.createdAt ?? Date.now(),
|
|
832
837
|
attempts: existing?.attempts ?? 0,
|
|
833
838
|
state: 'pending',
|
|
834
839
|
};
|
|
@@ -984,7 +989,8 @@ function handoffOf(current) {
|
|
|
984
989
|
* sender-key distribution of the group alone. The caller checked the
|
|
985
990
|
* membership of the requester. The requester then decrypts the later group
|
|
986
991
|
* messages of this device, but not the failed one. It returns true when it
|
|
987
|
-
* posted the distribution
|
|
992
|
+
* posted the distribution, or when the stored answer of this request attempt
|
|
993
|
+
* has unknown acceptance. In that case nothing posts.
|
|
988
994
|
*/
|
|
989
995
|
async function resendCurrentDistribution(ctx, retryRequest, groupId, callbacks, retry) {
|
|
990
996
|
const current = await callbacks.currentGroupDistribution(groupId);
|
|
@@ -997,20 +1003,22 @@ async function resendCurrentDistribution(ctx, retryRequest, groupId, callbacks,
|
|
|
997
1003
|
}
|
|
998
1004
|
if (!(await prepareAnswerSession(ctx, retryRequest, callbacks, retry, null)))
|
|
999
1005
|
return false;
|
|
1000
|
-
await callbacks.resend(retryRequest.requesterUserId, retryRequest.requesterDeviceId, ctx.contentAdapter.serializeSenderKeyDistributionText(current.groupId, current.distribution), {
|
|
1006
|
+
const answered = await callbacks.resend(retryRequest.requesterUserId, retryRequest.requesterDeviceId, ctx.contentAdapter.serializeSenderKeyDistributionText(current.groupId, current.distribution), {
|
|
1001
1007
|
timestamp: retryRequest.failedTimestamp,
|
|
1002
1008
|
...(retry && { retry: { ...retry, kind: 'resend' } }),
|
|
1003
1009
|
senderKeyHandoff: handoffOf(current),
|
|
1004
1010
|
});
|
|
1005
|
-
|
|
1006
|
-
|
|
1007
|
-
|
|
1008
|
-
|
|
1009
|
-
|
|
1010
|
-
|
|
1011
|
-
|
|
1012
|
-
|
|
1013
|
-
|
|
1011
|
+
if (answered) {
|
|
1012
|
+
ctx.logger.info('Answered a group retry request with the current sender-key distribution', {
|
|
1013
|
+
category: 'E2EE',
|
|
1014
|
+
data: {
|
|
1015
|
+
recipient: `${retryRequest.requesterUserId}:${retryRequest.requesterDeviceId}`,
|
|
1016
|
+
groupId: current.groupId,
|
|
1017
|
+
failedTimestamp: retryRequest.failedTimestamp,
|
|
1018
|
+
},
|
|
1019
|
+
});
|
|
1020
|
+
}
|
|
1021
|
+
return answered;
|
|
1014
1022
|
}
|
|
1015
1023
|
/**
|
|
1016
1024
|
* True when the requester is a current member of the group. A group with no
|