@open-e2ee/signal-protocol-sdk 13.4.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 +417 -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 +46 -6
- package/dist/client/client.d.ts.map +1 -1
- package/dist/client/client.js +181 -66
- 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-transport.d.ts +11 -1
- package/dist/client/hosted-transport.d.ts.map +1 -1
- package/dist/client/hosted-transport.js +75 -30
- package/dist/client/hosted-transport.js.map +1 -1
- package/dist/client/hosted.d.ts.map +1 -1
- package/dist/client/hosted.js +1 -1
- package/dist/client/hosted.js.map +1 -1
- package/dist/client/index.d.ts +1 -1
- package/dist/client/index.d.ts.map +1 -1
- 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/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 +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- 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/package.json +1 -1
|
@@ -26,13 +26,54 @@ export declare function aggregateRelayAcceptance(posts: readonly Pick<RelayPostA
|
|
|
26
26
|
expiresAt?: number;
|
|
27
27
|
};
|
|
28
28
|
/**
|
|
29
|
-
* The Relay's refusal of one delivery operation.
|
|
30
|
-
*
|
|
31
|
-
*
|
|
29
|
+
* The Relay's refusal of one delivery operation.
|
|
30
|
+
*
|
|
31
|
+
* OPERATION_EXPIRED has four sources: an operation epoch more than 5 minutes
|
|
32
|
+
* ahead of the Relay clock, an epoch older than the 24-hour replay horizon, an
|
|
33
|
+
* accepted operation before the end of the retained period, and an epoch
|
|
34
|
+
* older than the admission window with no stored operation.
|
|
35
|
+
*
|
|
36
|
+
* RETRY_CONFLICT has three sources: the Relay holds the same operation with
|
|
37
|
+
* other bytes, the same operation under another accepted class, or another
|
|
38
|
+
* operation under the same message ID. A direct post that never changed its
|
|
39
|
+
* bytes counts it as an earlier acceptance, under protocol version 1 and
|
|
40
|
+
* version 2.
|
|
41
|
+
*
|
|
42
|
+
* DELIVERY_ALREADY_ACCEPTED is a protocol version 2 code: the Relay already
|
|
43
|
+
* holds an accepted post under the message ID, so it refused this post
|
|
44
|
+
* before it stored anything. A post and a retry request both read it as
|
|
45
|
+
* RETRY_CONFLICT. Under version 1 the Relay sends RETRY_CONFLICT in its
|
|
46
|
+
* place, so a version 1 answer with this code is an unknown code.
|
|
47
|
+
*/
|
|
48
|
+
export type RelayOperationRefusal = 'OPERATION_EXPIRED' | 'RETRY_CONFLICT' | 'DELIVERY_ALREADY_ACCEPTED';
|
|
49
|
+
/**
|
|
50
|
+
* The acceptance of a post that got RETRY_CONFLICT, or DELIVERY_ALREADY_ACCEPTED
|
|
51
|
+
* under protocol version 2: the Relay already holds a post under its message
|
|
52
|
+
* ID. Neither answer carries a Relay receipt, so the acceptance carries only
|
|
53
|
+
* the client message ID of the post and the time of the answer on the SDK
|
|
54
|
+
* clock.
|
|
55
|
+
*/
|
|
56
|
+
export declare function conflictAcceptance(clientMessageId: string, serverTimestamp: number): RelayPostAcceptance;
|
|
57
|
+
/** True for an acceptance that `conflictAcceptance` made. */
|
|
58
|
+
export declare function isConflictAcceptance(acceptance: RelayPostAcceptance): boolean;
|
|
59
|
+
/**
|
|
60
|
+
* The acceptance that gives the message ID and time of a send result: the
|
|
61
|
+
* first one with a Relay receipt, else the first one.
|
|
62
|
+
*/
|
|
63
|
+
export declare function sendResultAcceptance(acceptances: readonly RelayPostAcceptance[]): RelayPostAcceptance | undefined;
|
|
64
|
+
/**
|
|
65
|
+
* The operation refusal that a relay error carries as its code, if any.
|
|
66
|
+
* DELIVERY_ALREADY_ACCEPTED is a refusal only when a hosted carrier marked
|
|
67
|
+
* the error as the answer to a request of protocol version 2 or later. An
|
|
68
|
+
* unmarked error and a version 1 answer carry it as an unknown code.
|
|
32
69
|
*/
|
|
33
|
-
export type RelayOperationRefusal = 'OPERATION_EXPIRED' | 'RETRY_CONFLICT';
|
|
34
|
-
/** The operation refusal that a relay error carries as its code, if any. */
|
|
35
70
|
export declare function relayOperationRefusal(error: unknown): RelayOperationRefusal | undefined;
|
|
71
|
+
/**
|
|
72
|
+
* True when a relay error says that the Relay already holds a post under the
|
|
73
|
+
* message ID of the post: RETRY_CONFLICT, or DELIVERY_ALREADY_ACCEPTED under
|
|
74
|
+
* protocol version 2. A post reads both answers in the same way.
|
|
75
|
+
*/
|
|
76
|
+
export declare function relayHoldsMessageId(error: unknown): boolean;
|
|
36
77
|
/** The class of a retry request post that the Relay or the transport refused. */
|
|
37
78
|
export type RetryRequestPostFailure = {
|
|
38
79
|
terminal: RetryTerminalClass;
|
|
@@ -53,7 +94,9 @@ export type RetryRequestPostFailure = {
|
|
|
53
94
|
* AUTHORITY_OVERRIDE, TOKEN_INVALID, 401 or 403 is a revoked authority.
|
|
54
95
|
* QUOTA_EXCEEDED, MAILBOX_FULL and 429 are a rate refusal. Every other
|
|
55
96
|
* error, a network error and a lost answer included, is a transport outage.
|
|
56
|
-
* The caller handles OPERATION_EXPIRED and
|
|
97
|
+
* The caller handles OPERATION_EXPIRED, RETRY_CONFLICT and the version 2
|
|
98
|
+
* DELIVERY_ALREADY_ACCEPTED first. A version 1 DELIVERY_ALREADY_ACCEPTED is
|
|
99
|
+
* an unknown code, so it is a transport outage.
|
|
57
100
|
*/
|
|
58
101
|
export declare function classifyRetryRequestPostFailure(error: unknown): RetryRequestPostFailure;
|
|
59
102
|
//# sourceMappingURL=relay-acceptance.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relay-acceptance.d.ts","sourceRoot":"","sources":["../../client/relay-acceptance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"relay-acceptance.d.ts","sourceRoot":"","sources":["../../client/relay-acceptance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAGxF,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;IACnB,yEAAyE;IACzE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,4EAA4E;IAC5E,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;;;;;;;GAQG;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;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,MAAM,qBAAqB,GAC7B,mBAAmB,GACnB,gBAAgB,GAChB,2BAA2B,CAAC;AAIhC;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,eAAe,EAAE,MAAM,EACvB,eAAe,EAAE,MAAM,GACtB,mBAAmB,CAIrB;AAED,6DAA6D;AAC7D,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,mBAAmB,GAAG,OAAO,CAE7E;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,SAAS,mBAAmB,EAAE,GAC1C,mBAAmB,GAAG,SAAS,CAEjC;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,qBAAqB,GAAG,SAAS,CAQvF;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAG3D;AAED,iFAAiF;AACjF,MAAM,MAAM,uBAAuB,GAC/B;IAAE,QAAQ,EAAE,kBAAkB,CAAA;CAAE,GAChC;IAAE,KAAK,EAAE,iBAAiB,CAAA;CAAE,CAAC;AAmBjC;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,OAAO,GAAG,uBAAuB,CAkBvF"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { relayAnswerVersion } from './relay-protocol.js';
|
|
1
2
|
/**
|
|
2
3
|
* The acceptance of a whole send from the acceptance of each of its posts.
|
|
3
4
|
*
|
|
@@ -21,12 +22,55 @@ export function aggregateRelayAcceptance(posts) {
|
|
|
21
22
|
}),
|
|
22
23
|
};
|
|
23
24
|
}
|
|
24
|
-
|
|
25
|
+
const conflictAcceptances = new WeakSet();
|
|
26
|
+
/**
|
|
27
|
+
* The acceptance of a post that got RETRY_CONFLICT, or DELIVERY_ALREADY_ACCEPTED
|
|
28
|
+
* under protocol version 2: the Relay already holds a post under its message
|
|
29
|
+
* ID. Neither answer carries a Relay receipt, so the acceptance carries only
|
|
30
|
+
* the client message ID of the post and the time of the answer on the SDK
|
|
31
|
+
* clock.
|
|
32
|
+
*/
|
|
33
|
+
export function conflictAcceptance(clientMessageId, serverTimestamp) {
|
|
34
|
+
const acceptance = { messageId: clientMessageId, serverTimestamp };
|
|
35
|
+
conflictAcceptances.add(acceptance);
|
|
36
|
+
return acceptance;
|
|
37
|
+
}
|
|
38
|
+
/** True for an acceptance that `conflictAcceptance` made. */
|
|
39
|
+
export function isConflictAcceptance(acceptance) {
|
|
40
|
+
return conflictAcceptances.has(acceptance);
|
|
41
|
+
}
|
|
42
|
+
/**
|
|
43
|
+
* The acceptance that gives the message ID and time of a send result: the
|
|
44
|
+
* first one with a Relay receipt, else the first one.
|
|
45
|
+
*/
|
|
46
|
+
export function sendResultAcceptance(acceptances) {
|
|
47
|
+
return acceptances.find((acceptance) => !isConflictAcceptance(acceptance)) ?? acceptances[0];
|
|
48
|
+
}
|
|
49
|
+
/**
|
|
50
|
+
* The operation refusal that a relay error carries as its code, if any.
|
|
51
|
+
* DELIVERY_ALREADY_ACCEPTED is a refusal only when a hosted carrier marked
|
|
52
|
+
* the error as the answer to a request of protocol version 2 or later. An
|
|
53
|
+
* unmarked error and a version 1 answer carry it as an unknown code.
|
|
54
|
+
*/
|
|
25
55
|
export function relayOperationRefusal(error) {
|
|
26
56
|
if (error === null || typeof error !== 'object')
|
|
27
57
|
return undefined;
|
|
28
58
|
const { code } = error;
|
|
29
|
-
|
|
59
|
+
if (code === 'OPERATION_EXPIRED' || code === 'RETRY_CONFLICT')
|
|
60
|
+
return code;
|
|
61
|
+
if (code === 'DELIVERY_ALREADY_ACCEPTED' && (relayAnswerVersion(error) ?? 1) >= 2) {
|
|
62
|
+
return code;
|
|
63
|
+
}
|
|
64
|
+
return undefined;
|
|
65
|
+
}
|
|
66
|
+
/**
|
|
67
|
+
* True when a relay error says that the Relay already holds a post under the
|
|
68
|
+
* message ID of the post: RETRY_CONFLICT, or DELIVERY_ALREADY_ACCEPTED under
|
|
69
|
+
* protocol version 2. A post reads both answers in the same way.
|
|
70
|
+
*/
|
|
71
|
+
export function relayHoldsMessageId(error) {
|
|
72
|
+
const refusal = relayOperationRefusal(error);
|
|
73
|
+
return refusal === 'RETRY_CONFLICT' || refusal === 'DELIVERY_ALREADY_ACCEPTED';
|
|
30
74
|
}
|
|
31
75
|
/**
|
|
32
76
|
* The codes that end a retry request when the Relay does not mark them
|
|
@@ -57,7 +101,9 @@ const RATE_CODES = new Set(['QUOTA_EXCEEDED', 'MAILBOX_FULL']);
|
|
|
57
101
|
* AUTHORITY_OVERRIDE, TOKEN_INVALID, 401 or 403 is a revoked authority.
|
|
58
102
|
* QUOTA_EXCEEDED, MAILBOX_FULL and 429 are a rate refusal. Every other
|
|
59
103
|
* error, a network error and a lost answer included, is a transport outage.
|
|
60
|
-
* The caller handles OPERATION_EXPIRED and
|
|
104
|
+
* The caller handles OPERATION_EXPIRED, RETRY_CONFLICT and the version 2
|
|
105
|
+
* DELIVERY_ALREADY_ACCEPTED first. A version 1 DELIVERY_ALREADY_ACCEPTED is
|
|
106
|
+
* an unknown code, so it is a transport outage.
|
|
61
107
|
*/
|
|
62
108
|
export function classifyRetryRequestPostFailure(error) {
|
|
63
109
|
if (error === null || typeof error !== 'object')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relay-acceptance.js","sourceRoot":"","sources":["../../client/relay-acceptance.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"relay-acceptance.js","sourceRoot":"","sources":["../../client/relay-acceptance.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,17 +6,29 @@
|
|
|
6
6
|
* public HTTP route except the connection document carries the version in
|
|
7
7
|
* the `x-open-e2ee-relay-protocol` header. A Relay that no longer serves the
|
|
8
8
|
* version refuses it with `UPGRADE_REQUIRED`: close code 4426 on the socket,
|
|
9
|
-
* and the body code on HTTP. That refusal is terminal for this SDK.
|
|
9
|
+
* and the body code on HTTP. That refusal is terminal for this SDK. A Relay
|
|
10
|
+
* that does not serve the version yet refuses it with the retryable
|
|
11
|
+
* `PROTOCOL_UNSUPPORTED`. The SDK never sends an older version in its place.
|
|
10
12
|
*/
|
|
11
|
-
/**
|
|
12
|
-
|
|
13
|
+
/**
|
|
14
|
+
* The Relay protocol version that this SDK speaks by default. Each client
|
|
15
|
+
* holds its own version, which starts at this one.
|
|
16
|
+
*
|
|
17
|
+
* Version 2 adds `DELIVERY_ALREADY_ACCEPTED`: the Relay refuses a post
|
|
18
|
+
* before it stores anything, because it already holds an accepted post
|
|
19
|
+
* under the message ID. Under version 1 the Relay sends RETRY_CONFLICT for
|
|
20
|
+
* the same refusal.
|
|
21
|
+
*/
|
|
22
|
+
export declare const RELAY_PROTOCOL_VERSION = 2;
|
|
13
23
|
/** The prefix of the subprotocol token that carries the device token. */
|
|
14
24
|
export declare const RELAY_AUTH_PROTOCOL_PREFIX = "open-e2ee-relay.auth.";
|
|
15
25
|
/** The HTTP header that carries the protocol version. */
|
|
16
26
|
export declare const RELAY_PROTOCOL_HEADER = "x-open-e2ee-relay-protocol";
|
|
17
27
|
/** The subprotocol token of a protocol version, for example `open-e2ee-relay.v1`. */
|
|
18
28
|
export declare function relayProtocolToken(version: number): string;
|
|
19
|
-
/** The headers that put
|
|
29
|
+
/** The headers that put a protocol version on an HTTP request. */
|
|
30
|
+
export declare function relayProtocolHeadersFor(version: number): Record<string, string>;
|
|
31
|
+
/** The headers that put this SDK's default protocol version on an HTTP request. */
|
|
20
32
|
export declare function relayProtocolHeaders(): Record<string, string>;
|
|
21
33
|
/**
|
|
22
34
|
* The Relay no longer serves the protocol version of this SDK. The same
|
|
@@ -30,12 +42,30 @@ export declare class HostedRelayUpgradeRequiredError extends Error {
|
|
|
30
42
|
readonly status: number;
|
|
31
43
|
/** Always false: only a newer SDK can send the request again. */
|
|
32
44
|
readonly retryable = false;
|
|
33
|
-
|
|
45
|
+
/**
|
|
46
|
+
* @param status - The HTTP status of the refusal.
|
|
47
|
+
* @param version - The Relay protocol version that the client sent. The
|
|
48
|
+
* message names it. Without it, the message names version 1.
|
|
49
|
+
*/
|
|
50
|
+
constructor(status: number, version?: number);
|
|
34
51
|
}
|
|
35
52
|
/**
|
|
36
53
|
* Throws `HostedRelayUpgradeRequiredError` when a Relay error body has the
|
|
37
54
|
* code `UPGRADE_REQUIRED`, at any error status. The body code is the
|
|
38
|
-
* contract, not the status.
|
|
55
|
+
* contract, not the status. The error names `version`, the protocol version
|
|
56
|
+
* that the request sent.
|
|
57
|
+
*/
|
|
58
|
+
export declare function throwIfUpgradeRequired(status: number, body: unknown, version?: number): void;
|
|
59
|
+
/**
|
|
60
|
+
* Record that `error` is the Relay's answer to a request that sent protocol
|
|
61
|
+
* `version`. The meaning of some codes depends on that version. Returns
|
|
62
|
+
* the same error.
|
|
63
|
+
*/
|
|
64
|
+
export declare function markRelayAnswerVersion<T extends object>(error: T, version: number): T;
|
|
65
|
+
/**
|
|
66
|
+
* The protocol version of the request that a Relay error answers, or
|
|
67
|
+
* undefined when no hosted carrier marked the error. A custom relay marks
|
|
68
|
+
* no error.
|
|
39
69
|
*/
|
|
40
|
-
export declare function
|
|
70
|
+
export declare function relayAnswerVersion(error: unknown): number | undefined;
|
|
41
71
|
//# sourceMappingURL=relay-protocol.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relay-protocol.d.ts","sourceRoot":"","sources":["../../client/relay-protocol.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"relay-protocol.d.ts","sourceRoot":"","sources":["../../client/relay-protocol.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH;;;;;;;;GAQG;AACH,eAAO,MAAM,sBAAsB,IAAI,CAAC;AAQxC,yEAAyE;AACzE,eAAO,MAAM,0BAA0B,0BAA0B,CAAC;AAElE,yDAAyD;AACzD,eAAO,MAAM,qBAAqB,+BAA+B,CAAC;AAElE,qFAAqF;AACrF,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,kEAAkE;AAClE,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAE/E;AAED,mFAAmF;AACnF,wBAAgB,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAE7D;AAED;;;;;GAKG;AACH,qBAAa,+BAAgC,SAAQ,KAAK;IACxD,SAAgB,IAAI,sBAAsB;IAC1C,gEAAgE;IAChE,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,iEAAiE;IACjE,SAAgB,SAAS,SAAS;IAElC;;;;OAIG;IACH,YAAmB,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAMlD;CACF;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,OAAO,EACb,OAAO,CAAC,EAAE,MAAM,GACf,IAAI,CAWN;AAKD;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,GAAG,CAAC,CAGrF;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAIrE"}
|
|
@@ -6,10 +6,22 @@
|
|
|
6
6
|
* public HTTP route except the connection document carries the version in
|
|
7
7
|
* the `x-open-e2ee-relay-protocol` header. A Relay that no longer serves the
|
|
8
8
|
* version refuses it with `UPGRADE_REQUIRED`: close code 4426 on the socket,
|
|
9
|
-
* and the body code on HTTP. That refusal is terminal for this SDK.
|
|
9
|
+
* and the body code on HTTP. That refusal is terminal for this SDK. A Relay
|
|
10
|
+
* that does not serve the version yet refuses it with the retryable
|
|
11
|
+
* `PROTOCOL_UNSUPPORTED`. The SDK never sends an older version in its place.
|
|
10
12
|
*/
|
|
11
|
-
/**
|
|
12
|
-
|
|
13
|
+
/**
|
|
14
|
+
* The Relay protocol version that this SDK speaks by default. Each client
|
|
15
|
+
* holds its own version, which starts at this one.
|
|
16
|
+
*
|
|
17
|
+
* Version 2 adds `DELIVERY_ALREADY_ACCEPTED`: the Relay refuses a post
|
|
18
|
+
* before it stores anything, because it already holds an accepted post
|
|
19
|
+
* under the message ID. Under version 1 the Relay sends RETRY_CONFLICT for
|
|
20
|
+
* the same refusal.
|
|
21
|
+
*/
|
|
22
|
+
export const RELAY_PROTOCOL_VERSION = 2;
|
|
23
|
+
/** The first Relay protocol version. A request without the header is this version. */
|
|
24
|
+
const FIRST_RELAY_PROTOCOL_VERSION = 1;
|
|
13
25
|
/** The prefix of a protocol version token. The version number follows it. */
|
|
14
26
|
const RELAY_PROTOCOL_TOKEN_PREFIX = "open-e2ee-relay.v";
|
|
15
27
|
/** The prefix of the subprotocol token that carries the device token. */
|
|
@@ -20,9 +32,13 @@ export const RELAY_PROTOCOL_HEADER = "x-open-e2ee-relay-protocol";
|
|
|
20
32
|
export function relayProtocolToken(version) {
|
|
21
33
|
return `${RELAY_PROTOCOL_TOKEN_PREFIX}${version}`;
|
|
22
34
|
}
|
|
23
|
-
/** The headers that put
|
|
35
|
+
/** The headers that put a protocol version on an HTTP request. */
|
|
36
|
+
export function relayProtocolHeadersFor(version) {
|
|
37
|
+
return { [RELAY_PROTOCOL_HEADER]: String(version) };
|
|
38
|
+
}
|
|
39
|
+
/** The headers that put this SDK's default protocol version on an HTTP request. */
|
|
24
40
|
export function relayProtocolHeaders() {
|
|
25
|
-
return
|
|
41
|
+
return relayProtocolHeadersFor(RELAY_PROTOCOL_VERSION);
|
|
26
42
|
}
|
|
27
43
|
/**
|
|
28
44
|
* The Relay no longer serves the protocol version of this SDK. The same
|
|
@@ -36,8 +52,13 @@ export class HostedRelayUpgradeRequiredError extends Error {
|
|
|
36
52
|
status;
|
|
37
53
|
/** Always false: only a newer SDK can send the request again. */
|
|
38
54
|
retryable = false;
|
|
39
|
-
|
|
40
|
-
|
|
55
|
+
/**
|
|
56
|
+
* @param status - The HTTP status of the refusal.
|
|
57
|
+
* @param version - The Relay protocol version that the client sent. The
|
|
58
|
+
* message names it. Without it, the message names version 1.
|
|
59
|
+
*/
|
|
60
|
+
constructor(status, version) {
|
|
61
|
+
super(`The Relay no longer accepts Relay protocol version ${version ?? FIRST_RELAY_PROTOCOL_VERSION}. Update the SDK.`);
|
|
41
62
|
this.name = "HostedRelayUpgradeRequiredError";
|
|
42
63
|
this.status = status;
|
|
43
64
|
}
|
|
@@ -45,9 +66,10 @@ export class HostedRelayUpgradeRequiredError extends Error {
|
|
|
45
66
|
/**
|
|
46
67
|
* Throws `HostedRelayUpgradeRequiredError` when a Relay error body has the
|
|
47
68
|
* code `UPGRADE_REQUIRED`, at any error status. The body code is the
|
|
48
|
-
* contract, not the status.
|
|
69
|
+
* contract, not the status. The error names `version`, the protocol version
|
|
70
|
+
* that the request sent.
|
|
49
71
|
*/
|
|
50
|
-
export function throwIfUpgradeRequired(status, body) {
|
|
72
|
+
export function throwIfUpgradeRequired(status, body, version) {
|
|
51
73
|
if (typeof body === "object" &&
|
|
52
74
|
body !== null &&
|
|
53
75
|
"error" in body &&
|
|
@@ -55,6 +77,27 @@ export function throwIfUpgradeRequired(status, body) {
|
|
|
55
77
|
body.error !== null &&
|
|
56
78
|
"code" in body.error &&
|
|
57
79
|
body.error.code === "UPGRADE_REQUIRED")
|
|
58
|
-
throw new HostedRelayUpgradeRequiredError(status);
|
|
80
|
+
throw new HostedRelayUpgradeRequiredError(status, version);
|
|
81
|
+
}
|
|
82
|
+
/** The protocol version of the request that each Relay error answers. */
|
|
83
|
+
const answerVersions = new WeakMap();
|
|
84
|
+
/**
|
|
85
|
+
* Record that `error` is the Relay's answer to a request that sent protocol
|
|
86
|
+
* `version`. The meaning of some codes depends on that version. Returns
|
|
87
|
+
* the same error.
|
|
88
|
+
*/
|
|
89
|
+
export function markRelayAnswerVersion(error, version) {
|
|
90
|
+
answerVersions.set(error, version);
|
|
91
|
+
return error;
|
|
92
|
+
}
|
|
93
|
+
/**
|
|
94
|
+
* The protocol version of the request that a Relay error answers, or
|
|
95
|
+
* undefined when no hosted carrier marked the error. A custom relay marks
|
|
96
|
+
* no error.
|
|
97
|
+
*/
|
|
98
|
+
export function relayAnswerVersion(error) {
|
|
99
|
+
return error !== null && typeof error === "object"
|
|
100
|
+
? answerVersions.get(error)
|
|
101
|
+
: undefined;
|
|
59
102
|
}
|
|
60
103
|
//# sourceMappingURL=relay-protocol.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relay-protocol.js","sourceRoot":"","sources":["../../client/relay-protocol.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"relay-protocol.js","sourceRoot":"","sources":["../../client/relay-protocol.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AAExC,sFAAsF;AACtF,MAAM,4BAA4B,GAAG,CAAC,CAAC;AAEvC,6EAA6E;AAC7E,MAAM,2BAA2B,GAAG,mBAAmB,CAAC;AAExD,yEAAyE;AACzE,MAAM,CAAC,MAAM,0BAA0B,GAAG,uBAAuB,CAAC;AAElE,yDAAyD;AACzD,MAAM,CAAC,MAAM,qBAAqB,GAAG,4BAA4B,CAAC;AAElE,qFAAqF;AACrF,MAAM,UAAU,kBAAkB,CAAC,OAAe;IAChD,OAAO,GAAG,2BAA2B,GAAG,OAAO,EAAE,CAAC;AACpD,CAAC;AAED,kEAAkE;AAClE,MAAM,UAAU,uBAAuB,CAAC,OAAe;IACrD,OAAO,EAAE,CAAC,qBAAqB,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;AACtD,CAAC;AAED,mFAAmF;AACnF,MAAM,UAAU,oBAAoB;IAClC,OAAO,uBAAuB,CAAC,sBAAsB,CAAC,CAAC;AACzD,CAAC;AAED;;;;;GAKG;AACH,MAAM,OAAO,+BAAgC,SAAQ,KAAK;IACxC,IAAI,GAAG,kBAAkB,CAAC;IAC1C,gEAAgE;IAChD,MAAM,CAAS;IAC/B,iEAAiE;IACjD,SAAS,GAAG,KAAK,CAAC;IAElC;;;;OAIG;IACH,YAAmB,MAAc,EAAE,OAAgB;QACjD,KAAK,CACH,sDAAsD,OAAO,IAAI,4BAA4B,mBAAmB,CACjH,CAAC;QACF,IAAI,CAAC,IAAI,GAAG,iCAAiC,CAAC;QAC9C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;CACF;AAED;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB,CACpC,MAAc,EACd,IAAa,EACb,OAAgB;IAEhB,IACE,OAAO,IAAI,KAAK,QAAQ;QACxB,IAAI,KAAK,IAAI;QACb,OAAO,IAAI,IAAI;QACf,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ;QAC9B,IAAI,CAAC,KAAK,KAAK,IAAI;QACnB,MAAM,IAAI,IAAI,CAAC,KAAK;QACpB,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,kBAAkB;QAEtC,MAAM,IAAI,+BAA+B,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAC/D,CAAC;AAED,yEAAyE;AACzE,MAAM,cAAc,GAAG,IAAI,OAAO,EAAkB,CAAC;AAErD;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CAAmB,KAAQ,EAAE,OAAe;IAChF,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACnC,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,KAAc;IAC/C,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ;QAChD,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC;QAC3B,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC"}
|
|
@@ -170,9 +170,9 @@ export interface RetryFamilyReceive {
|
|
|
170
170
|
* @param fingerprint - The fingerprint of the received envelope.
|
|
171
171
|
* @param post - Posts the request for the given failure, and gives what
|
|
172
172
|
* it did.
|
|
173
|
-
* @returns The outcome of `post`. After a `posted
|
|
174
|
-
* a member is processed, so a redelivery of it on
|
|
175
|
-
* nothing. Any other outcome leaves it unprocessed. `skipped` with no
|
|
173
|
+
* @returns The outcome of `post`. After a `posted`, `waiting` or
|
|
174
|
+
* `terminal` outcome, a member is processed, so a redelivery of it on
|
|
175
|
+
* either path posts nothing. Any other outcome leaves it unprocessed. `skipped` with no
|
|
176
176
|
* post, and one warn line with the behavior
|
|
177
177
|
* RETRY_REQUEST_ENVELOPE_CHANGED, when the relay changed the failed
|
|
178
178
|
* envelope after its retry request.
|
|
@@ -295,7 +295,7 @@ function retryFamilyReceive(storage, logger, delivered, envelopeId, resolved, re
|
|
|
295
295
|
stored,
|
|
296
296
|
...(envelopeId !== undefined && { member: envelopeId }),
|
|
297
297
|
});
|
|
298
|
-
if ((outcome === 'posted' || outcome === 'terminal') && envelopeId) {
|
|
298
|
+
if ((outcome === 'posted' || outcome === 'waiting' || outcome === 'terminal') && envelopeId) {
|
|
299
299
|
await storeProcessedEnvelope(storage, envelopeId, Date.now(), fingerprint);
|
|
300
300
|
}
|
|
301
301
|
return outcome;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry-family.js","sourceRoot":"","sources":["../../client/retry-family.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"retry-family.js","sourceRoot":"","sources":["../../client/retry-family.ts"],"names":[],"mappings":"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"}
|
|
@@ -156,6 +156,8 @@ export declare function retryRequestPost(seal: SealRetryRequest | undefined, rel
|
|
|
156
156
|
export type RetryPostOutcome =
|
|
157
157
|
/** The Relay holds the request attempt. */
|
|
158
158
|
'posted'
|
|
159
|
+
/** The request attempt stays as stored and nothing was posted. */
|
|
160
|
+
| 'waiting'
|
|
159
161
|
/** The post failed with a retryable class. The record holds the next attempt time. */
|
|
160
162
|
| 'pending'
|
|
161
163
|
/** The request ended. The record holds the terminal state. */
|
|
@@ -177,10 +179,16 @@ export declare function answeredLastRetryAttempt(stored: StoredRetryRequest): bo
|
|
|
177
179
|
* record that ended posts nothing. At the deadline of the record, the
|
|
178
180
|
* request ends as `expired-content` and posts nothing. When a member
|
|
179
181
|
* failed and the stored attempt is answered, it creates the next attempt
|
|
180
|
-
* under the same retry ID, with the same
|
|
182
|
+
* under the same retry ID, with the same deadlines, and posts it. When that
|
|
181
183
|
* answered attempt is the last one, as `answeredLastRetryAttempt` tells,
|
|
182
|
-
* the request ends as `attempts-exhausted` and posts nothing.
|
|
183
|
-
*
|
|
184
|
+
* the request ends as `attempts-exhausted` and posts nothing. At or after
|
|
185
|
+
* the posting deadline, `retryRequestPostingDeadlineAt`, an answered
|
|
186
|
+
* attempt gets no next attempt and gives `waiting`: the Relay accepted the
|
|
187
|
+
* request, so it waits, and its deadline ends it as `expired-content`. The
|
|
188
|
+
* Relay also holds a stored attempt with no next attempt time, so after
|
|
189
|
+
* the posting deadline that attempt is not posted again and gives
|
|
190
|
+
* `waiting`. Otherwise it posts the stored attempt, as
|
|
191
|
+
* `postStoredRetryRequest` does.
|
|
184
192
|
*
|
|
185
193
|
* Each new attempt carries the failed client message ID, the content hint,
|
|
186
194
|
* the sender, the receive time and the delivery error state of the stored
|
|
@@ -197,12 +205,14 @@ export declare function answeredLastRetryAttempt(stored: StoredRetryRequest): bo
|
|
|
197
205
|
export declare function postRetryRequest(store: Parameters<typeof storeRetryRequest>[0], failed: RetryRequestFailure, createRequest: () => Promise<RetryRequest>, sender: RetryRequestDevice, send: (envelope: Envelope) => Promise<unknown>): Promise<RetryPostOutcome>;
|
|
198
206
|
/**
|
|
199
207
|
* Post the stored attempt of a retry request again, with its stored bytes
|
|
200
|
-
* and ID.
|
|
201
|
-
*
|
|
202
|
-
* the
|
|
208
|
+
* and ID. At or after its posting deadline, `retryRequestPostingDeadlineAt`,
|
|
209
|
+
* the request ends as `posting-deadline` and posts nothing. When the Relay
|
|
210
|
+
* refuses the post with OPERATION_EXPIRED, the request ends as
|
|
211
|
+
* `posting-deadline` with acceptance unknown, and posts no replacement.
|
|
203
212
|
*
|
|
204
|
-
* Each post classifies its failure. A RETRY_CONFLICT answer
|
|
205
|
-
*
|
|
213
|
+
* Each post classifies its failure. A RETRY_CONFLICT answer, or a
|
|
214
|
+
* DELIVERY_ALREADY_ACCEPTED answer under protocol version 2, completes the
|
|
215
|
+
* attempt, because the Relay holds an earlier post of it. A
|
|
206
216
|
* conclusive class stores the terminal state, with `emitted` false, and
|
|
207
217
|
* gives 'terminal'. A retryable class stores the class and the next
|
|
208
218
|
* attempt time, the age of the attempt from 1 minute to 1 hour from now,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry-request-envelope.d.ts","sourceRoot":"","sources":["../../client/retry-request-envelope.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAEjF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAe,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAI1E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,
|
|
1
|
+
{"version":3,"file":"retry-request-envelope.d.ts","sourceRoot":"","sources":["../../client/retry-request-envelope.ts"],"names":[],"mappings":"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"}
|