@open-e2ee/signal-protocol-sdk 9.1.0 → 9.3.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 +82 -0
- package/README.md +2 -2
- package/SECURITY.md +2 -2
- package/client/README.md +25 -0
- package/dist/client/client.d.ts.map +1 -1
- package/dist/client/client.js +4 -0
- package/dist/client/client.js.map +1 -1
- package/dist/client/config.d.ts +26 -0
- package/dist/client/config.d.ts.map +1 -1
- package/dist/client/config.js.map +1 -1
- package/dist/client/event-hooks.d.ts +5 -0
- package/dist/client/event-hooks.d.ts.map +1 -1
- package/dist/client/event-hooks.js.map +1 -1
- package/dist/client/hosted-anonymous-delivery.d.ts +2 -0
- package/dist/client/hosted-anonymous-delivery.d.ts.map +1 -1
- package/dist/client/hosted-anonymous-delivery.js +81 -48
- package/dist/client/hosted-anonymous-delivery.js.map +1 -1
- package/dist/client/hosted-connection.d.ts.map +1 -1
- package/dist/client/hosted-connection.js +29 -18
- package/dist/client/hosted-connection.js.map +1 -1
- package/dist/client/hosted-group-authority.d.ts.map +1 -1
- package/dist/client/hosted-group-authority.js +42 -37
- package/dist/client/hosted-group-authority.js.map +1 -1
- package/dist/client/hosted-groups.d.ts.map +1 -1
- package/dist/client/hosted-groups.js +24 -20
- package/dist/client/hosted-groups.js.map +1 -1
- package/dist/client/hosted-mailbox-subscription.d.ts.map +1 -1
- package/dist/client/hosted-mailbox-subscription.js +36 -10
- package/dist/client/hosted-mailbox-subscription.js.map +1 -1
- package/dist/client/hosted-presence-frames.js +1 -1
- package/dist/client/hosted-profile-keys.d.ts +8 -1
- package/dist/client/hosted-profile-keys.d.ts.map +1 -1
- package/dist/client/hosted-profile-keys.js +64 -3
- package/dist/client/hosted-profile-keys.js.map +1 -1
- package/dist/client/hosted-transport.d.ts +2 -0
- package/dist/client/hosted-transport.d.ts.map +1 -1
- package/dist/client/hosted-transport.js +52 -30
- package/dist/client/hosted-transport.js.map +1 -1
- package/dist/client/hosted.d.ts +9 -0
- package/dist/client/hosted.d.ts.map +1 -1
- package/dist/client/hosted.js +4 -1
- package/dist/client/hosted.js.map +1 -1
- package/dist/client/relay-request-deadline.d.ts +26 -0
- package/dist/client/relay-request-deadline.d.ts.map +1 -0
- package/dist/client/relay-request-deadline.js +47 -0
- package/dist/client/relay-request-deadline.js.map +1 -0
- package/dist/client/relay-subscription.js +4 -1
- package/dist/client/relay-subscription.js.map +1 -1
- package/dist/client/signal-service-cipher.d.ts.map +1 -1
- package/dist/client/signal-service-cipher.js +3 -1
- package/dist/client/signal-service-cipher.js.map +1 -1
- package/dist/client/types.d.ts +2 -3
- package/dist/client/types.d.ts.map +1 -1
- package/dist/client/types.js.map +1 -1
- package/dist/remote/relay/types.d.ts +35 -3
- package/dist/remote/relay/types.d.ts.map +1 -1
- package/docs/ASSURANCE.md +5 -5
- package/docs/DEVIATIONS.md +17 -16
- package/docs/DOCUMENTATION_STANDARDS.md +4 -4
- package/docs/GETTING_STARTED.md +6 -0
- package/package.json +1 -1
|
@@ -1,7 +1,24 @@
|
|
|
1
1
|
import { HostedRelayPresenceError, decodePresenceAnswer, decodePresenceUpdate, encodePresenceFrame, isPresenceAnswerType, isPresenceUpdateType, } from "./hosted-presence-frames.js";
|
|
2
2
|
const MAILBOX_PROTOCOL = "open-e2ee-relay.v1";
|
|
3
3
|
const AUTH_PROTOCOL_PREFIX = "open-e2ee-relay.auth.";
|
|
4
|
+
/**
|
|
5
|
+
* The recovery pull waits a random time from half to one and a half of this
|
|
6
|
+
* value. The mean pull rate stays at one per 2 s, the 1 s floor keeps a
|
|
7
|
+
* failing pull from looping fast, and clients that lose their sockets together
|
|
8
|
+
* do not pull together.
|
|
9
|
+
*/
|
|
4
10
|
const RECOVERY_MILLISECONDS = 2_000;
|
|
11
|
+
/**
|
|
12
|
+
* The reconnect ceiling starts at 1 s and doubles to 30 s. Each wait is a
|
|
13
|
+
* random time from zero up to the ceiling (full jitter), the first one too, so
|
|
14
|
+
* clients that lose their sockets together, for example in a Relay deploy, do
|
|
15
|
+
* not reconnect together. The ceiling starts again at 1 s when the Relay
|
|
16
|
+
* answers a ping, 30 s after the socket opens. A socket that closes sooner,
|
|
17
|
+
* for example on a frame that the client refuses on each connect, keeps the
|
|
18
|
+
* ceiling growing, so a loop of short connections backs off to 30 s.
|
|
19
|
+
*/
|
|
20
|
+
const FIRST_RECONNECT_MILLISECONDS = 1_000;
|
|
21
|
+
const MAXIMUM_RECONNECT_MILLISECONDS = 30_000;
|
|
5
22
|
/** The Relay answers each `ping` text frame with `pong` without waking the mailbox. */
|
|
6
23
|
const PING_MILLISECONDS = 30_000;
|
|
7
24
|
/**
|
|
@@ -32,7 +49,7 @@ export function subscribeHostedMailbox(options) {
|
|
|
32
49
|
let active = true;
|
|
33
50
|
let socket;
|
|
34
51
|
let connectionGeneration = 0;
|
|
35
|
-
let reconnectDelay =
|
|
52
|
+
let reconnectDelay = FIRST_RECONNECT_MILLISECONDS;
|
|
36
53
|
let reconnectTimer;
|
|
37
54
|
let handshakeTimer;
|
|
38
55
|
let renewalTimer;
|
|
@@ -91,7 +108,7 @@ export function subscribeHostedMailbox(options) {
|
|
|
91
108
|
recoveryTimer = setTimeout(() => {
|
|
92
109
|
recoveryTimer = undefined;
|
|
93
110
|
requestPull();
|
|
94
|
-
}, RECOVERY_MILLISECONDS);
|
|
111
|
+
}, RECOVERY_MILLISECONDS * (0.5 + Math.random()));
|
|
95
112
|
};
|
|
96
113
|
const receiveBatch = async (messages) => {
|
|
97
114
|
if (!active || messages.length === 0)
|
|
@@ -187,8 +204,8 @@ export function subscribeHostedMailbox(options) {
|
|
|
187
204
|
options.onConnectionState("reconnecting", reason);
|
|
188
205
|
// One recovery pull per reconnect attempt, paced by the reconnect backoff.
|
|
189
206
|
recoverLater();
|
|
190
|
-
const delay = reconnectDelay;
|
|
191
|
-
reconnectDelay = Math.min(
|
|
207
|
+
const delay = Math.floor(Math.random() * reconnectDelay);
|
|
208
|
+
reconnectDelay = Math.min(MAXIMUM_RECONNECT_MILLISECONDS, reconnectDelay * 2);
|
|
192
209
|
reconnectTimer = setTimeout(() => {
|
|
193
210
|
reconnectTimer = undefined;
|
|
194
211
|
void connect();
|
|
@@ -234,7 +251,6 @@ export function subscribeHostedMailbox(options) {
|
|
|
234
251
|
// The Relay replays retained messages over the socket on connect.
|
|
235
252
|
clearTimeout(recoveryTimer);
|
|
236
253
|
recoveryTimer = undefined;
|
|
237
|
-
reconnectDelay = 1_000;
|
|
238
254
|
options.onConnectionState("connected");
|
|
239
255
|
options.onPresence?.({ type: "open" });
|
|
240
256
|
const schedulePing = () => {
|
|
@@ -274,10 +290,15 @@ export function subscribeHostedMailbox(options) {
|
|
|
274
290
|
throw new Error("Invalid mailbox frame.");
|
|
275
291
|
if (event.data === "pong") {
|
|
276
292
|
unansweredPings = 0;
|
|
293
|
+
// The socket stayed open and the Relay answers it.
|
|
294
|
+
reconnectDelay = FIRST_RECONNECT_MILLISECONDS;
|
|
277
295
|
return;
|
|
278
296
|
}
|
|
279
297
|
const frame = JSON.parse(event.data);
|
|
280
|
-
if (typeof frame !== "object" ||
|
|
298
|
+
if (typeof frame !== "object" ||
|
|
299
|
+
frame === null ||
|
|
300
|
+
!("type" in frame) ||
|
|
301
|
+
typeof frame.type !== "string")
|
|
281
302
|
throw new Error("Invalid mailbox frame.");
|
|
282
303
|
if (isPresenceAnswerType(frame.type))
|
|
283
304
|
answerPresence(frame);
|
|
@@ -285,16 +306,21 @@ export function subscribeHostedMailbox(options) {
|
|
|
285
306
|
const update = decodePresenceUpdate(frame);
|
|
286
307
|
options.onPresence?.({ type: "update", update });
|
|
287
308
|
}
|
|
288
|
-
else if (frame.type === "durable-message"
|
|
309
|
+
else if (frame.type === "durable-message") {
|
|
310
|
+
if (!("message" in frame))
|
|
311
|
+
throw new Error("Invalid mailbox frame.");
|
|
289
312
|
queueDurable(candidate, frame.message);
|
|
290
|
-
|
|
313
|
+
}
|
|
314
|
+
else if (frame.type === "ephemeral-message") {
|
|
315
|
+
if (!("message" in frame))
|
|
316
|
+
throw new Error("Invalid mailbox frame.");
|
|
291
317
|
if (ephemeral.length >= MAXIMUM_PENDING_FRAMES)
|
|
292
318
|
throw new Error("Mailbox frame queue is full.");
|
|
293
319
|
ephemeral.push({ socket: candidate, message: frame.message });
|
|
294
320
|
void drain();
|
|
295
321
|
}
|
|
296
|
-
|
|
297
|
-
|
|
322
|
+
// A newer Relay can send a frame type that this client does not
|
|
323
|
+
// know. The client ignores it and keeps the socket.
|
|
298
324
|
}
|
|
299
325
|
catch {
|
|
300
326
|
retryConnection("frame");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hosted-mailbox-subscription.js","sourceRoot":"","sources":["../../client/hosted-mailbox-subscription.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"hosted-mailbox-subscription.js","sourceRoot":"","sources":["../../client/hosted-mailbox-subscription.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* The presence wire contract of the
|
|
2
|
+
* The presence wire contract of the OpenE2EE Signal Protocol Relay, version 1.
|
|
3
3
|
*
|
|
4
4
|
* A device with a mailbox socket sends each presence request as one text frame
|
|
5
5
|
* on that socket. The frame carries `type`, `version`, and an `id` that the
|
|
@@ -8,7 +8,14 @@ export interface HostedRelayProfileKeys {
|
|
|
8
8
|
* account must return the same key.
|
|
9
9
|
*/
|
|
10
10
|
getOwnProfileKey(): Promise<Uint8Array | null>;
|
|
11
|
-
/**
|
|
11
|
+
/**
|
|
12
|
+
* Keeps the profile key that each contact sent. The client sends a sealed
|
|
13
|
+
* message only to a contact whose profile key this store holds, and sends
|
|
14
|
+
* an identified message to each other contact. The client also records
|
|
15
|
+
* here when the Relay refuses a sealed message to a contact. It then sends
|
|
16
|
+
* identified messages to that contact until the contact's profile key
|
|
17
|
+
* changes.
|
|
18
|
+
*/
|
|
12
19
|
readonly contacts: MutableContactProfileStateStore;
|
|
13
20
|
}
|
|
14
21
|
//# sourceMappingURL=hosted-profile-keys.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hosted-profile-keys.d.ts","sourceRoot":"","sources":["../../client/hosted-profile-keys.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hosted-profile-keys.d.ts","sourceRoot":"","sources":["../../client/hosted-profile-keys.ts"],"names":[],"mappings":"AAmBA,OAAO,EAIL,KAAK,+BAA+B,EACrC,MAAM,0BAA0B,CAAC;AAelC,yEAAyE;AACzE,MAAM,WAAW,sBAAsB;IACrC;;;;;OAKG;IACH,gBAAgB,IAAI,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IAC/C;;;;;;;OAOG;IACH,QAAQ,CAAC,QAAQ,EAAE,+BAA+B,CAAC;CACpD"}
|
|
@@ -8,20 +8,48 @@
|
|
|
8
8
|
*
|
|
9
9
|
* The profile key goes only in encrypted content. The presence key goes only
|
|
10
10
|
* in the `presence-key`, `presence-read`, and `presence-watch` frames.
|
|
11
|
+
*
|
|
12
|
+
* The same profile key also controls sealed sender. The client registers the
|
|
13
|
+
* access key that it derives from this account's profile key, so a contact
|
|
14
|
+
* that holds the profile key can send sealed messages to this account. The
|
|
15
|
+
* client sends a sealed message only to a contact whose profile key it holds.
|
|
11
16
|
*/
|
|
12
17
|
import { base64ToBytes, bytesToBase64 } from "../internal/crypto/index.js";
|
|
13
|
-
import {
|
|
18
|
+
import { deriveAccessKey } from "../internal/protocol/sealed-sender/delivery-token.js";
|
|
19
|
+
import { UnidentifiedAccessMode, storeReceivedProfileKey, } from "../profile/contact-state.js";
|
|
14
20
|
import { asBase64 } from "../types/utils.js";
|
|
15
21
|
import { HostedRelayPresenceError, derivePresenceKey, hostedRelayPresence, } from "./hosted-presence.js";
|
|
22
|
+
import { HostedRelayHttpError } from "./hosted-transport.js";
|
|
16
23
|
import { PROFILE_KEY_UPDATE_FLAG, bindProfileKeyExchange, } from "./profile-key-exchange.js";
|
|
17
24
|
const DELIVERED_METADATA_PREFIX = "hostedRelay.profileKeyDelivered.v1:";
|
|
18
25
|
/** @internal Throws unless the option has the members that the SDK calls. */
|
|
19
26
|
export function assertHostedRelayProfileKeys(keys) {
|
|
20
27
|
if (typeof keys?.getOwnProfileKey !== "function" ||
|
|
21
28
|
typeof keys.contacts?.storeContactProfileKey !== "function" ||
|
|
29
|
+
typeof keys.contacts.getContactProfileKey !== "function" ||
|
|
30
|
+
typeof keys.contacts.getUnidentifiedAccessMode !== "function" ||
|
|
22
31
|
typeof keys.contacts.updateUnidentifiedAccessMode !== "function")
|
|
23
32
|
throw new Error("Signal Protocol Relay profile keys are invalid");
|
|
24
33
|
}
|
|
34
|
+
/**
|
|
35
|
+
* @internal The contact store that the sealed-sender cipher reads for a
|
|
36
|
+
* hosted client. The Relay admits a sealed message only with the
|
|
37
|
+
* access key that the recipient registered, and it has no unrestricted
|
|
38
|
+
* access. A contact is therefore enabled unless the Relay refused a sealed
|
|
39
|
+
* message to it. The cipher then sends sealed only to a contact whose profile
|
|
40
|
+
* key the store holds, and never sends a sealed message that the Relay must
|
|
41
|
+
* refuse.
|
|
42
|
+
*/
|
|
43
|
+
export function hostedSealedSenderContacts(contacts) {
|
|
44
|
+
return {
|
|
45
|
+
getContactProfileKey: (userId) => contacts.getContactProfileKey(userId),
|
|
46
|
+
getUnidentifiedAccessMode: async (userId) => (await contacts.getUnidentifiedAccessMode(userId)) ===
|
|
47
|
+
UnidentifiedAccessMode.DISABLED
|
|
48
|
+
? UnidentifiedAccessMode.DISABLED
|
|
49
|
+
: UnidentifiedAccessMode.ENABLED,
|
|
50
|
+
updateUnidentifiedAccessMode: (userId, mode) => contacts.updateUnidentifiedAccessMode(userId, mode),
|
|
51
|
+
};
|
|
52
|
+
}
|
|
25
53
|
/** @internal Bind the presence key exchange of a hosted client. */
|
|
26
54
|
export function bindHostedRelayProfileKeys(client, runtime, keys, logger) {
|
|
27
55
|
assertHostedRelayProfileKeys(keys);
|
|
@@ -31,6 +59,11 @@ export function bindHostedRelayProfileKeys(client, runtime, keys, logger) {
|
|
|
31
59
|
/** A presence key that the Relay refused. The client does not send it again. */
|
|
32
60
|
let refused;
|
|
33
61
|
let registering;
|
|
62
|
+
/** The access key that the Relay holds from this client. */
|
|
63
|
+
let accessRegistered;
|
|
64
|
+
/** An access key that the Relay refused. The client does not send it again. */
|
|
65
|
+
let accessRefused;
|
|
66
|
+
let accessRegistering;
|
|
34
67
|
const offers = new Map();
|
|
35
68
|
const warn = (message, error) => logger.warn(message, {
|
|
36
69
|
category: "E2EE",
|
|
@@ -42,14 +75,38 @@ export function bindHostedRelayProfileKeys(client, runtime, keys, logger) {
|
|
|
42
75
|
if (bytes === null)
|
|
43
76
|
return undefined;
|
|
44
77
|
const presenceKey = await derivePresenceKey(bytes);
|
|
45
|
-
|
|
78
|
+
const accessKey = bytesToBase64(await deriveAccessKey(bytes));
|
|
79
|
+
return { bytes, profileKey: bytesToBase64(bytes), presenceKey, accessKey };
|
|
46
80
|
};
|
|
47
81
|
const deliveredMetadataKey = (recipient) => `${DELIVERED_METADATA_PREFIX}${runtime.presenceScope}:${recipient}`;
|
|
82
|
+
/**
|
|
83
|
+
* Registers the access key once for each client and again after each
|
|
84
|
+
* profile key change. A later send or connect retries a retryable failure
|
|
85
|
+
* and a failure that has no Relay answer.
|
|
86
|
+
*/
|
|
87
|
+
const registerAccess = (key) => {
|
|
88
|
+
if (accessRegistering !== undefined ||
|
|
89
|
+
key.accessKey === accessRegistered ||
|
|
90
|
+
key.accessKey === accessRefused)
|
|
91
|
+
return;
|
|
92
|
+
accessRegistering = runtime
|
|
93
|
+
.setUnidentifiedAccessKey(runtime.accountId, base64ToBytes(asBase64(key.accessKey)))
|
|
94
|
+
.then(() => {
|
|
95
|
+
accessRegistered = key.accessKey;
|
|
96
|
+
}, (error) => {
|
|
97
|
+
if (error instanceof HostedRelayHttpError && !error.retryable)
|
|
98
|
+
accessRefused = key.accessKey;
|
|
99
|
+
warn("Signal Protocol Relay access key registration failed", error);
|
|
100
|
+
})
|
|
101
|
+
.finally(() => {
|
|
102
|
+
accessRegistering = undefined;
|
|
103
|
+
});
|
|
104
|
+
};
|
|
48
105
|
/**
|
|
49
106
|
* Registers the presence key once for each client and again after each
|
|
50
107
|
* profile key change. A later send or connect retries a retryable failure.
|
|
51
108
|
*/
|
|
52
|
-
const
|
|
109
|
+
const registerPresence = (key) => {
|
|
53
110
|
if (registering !== undefined ||
|
|
54
111
|
key.presenceKey === registered ||
|
|
55
112
|
key.presenceKey === refused ||
|
|
@@ -68,6 +125,10 @@ export function bindHostedRelayProfileKeys(client, runtime, keys, logger) {
|
|
|
68
125
|
registering = undefined;
|
|
69
126
|
});
|
|
70
127
|
};
|
|
128
|
+
const register = (key) => {
|
|
129
|
+
registerAccess(key);
|
|
130
|
+
registerPresence(key);
|
|
131
|
+
};
|
|
71
132
|
runtime.subscribeRelayConnectionState((state) => {
|
|
72
133
|
if (state.state !== "connected")
|
|
73
134
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hosted-profile-keys.js","sourceRoot":"","sources":["../../client/hosted-profile-keys.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"hosted-profile-keys.js","sourceRoot":"","sources":["../../client/hosted-profile-keys.ts"],"names":[],"mappings":"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"}
|
|
@@ -116,6 +116,8 @@ export declare class HostedRelayHttpTransport implements SignalProtocolRelayServ
|
|
|
116
116
|
messageId: string;
|
|
117
117
|
serverTimestamp: number;
|
|
118
118
|
uuids404: string[];
|
|
119
|
+
duplicate?: boolean;
|
|
120
|
+
expiresAt?: number;
|
|
119
121
|
}>;
|
|
120
122
|
private acknowledge;
|
|
121
123
|
registerPush(registration: HostedRelayPushRegistration): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hosted-transport.d.ts","sourceRoot":"","sources":["../../client/hosted-transport.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,2BAA2B,EAC3B,uBAAuB,EACvB,aAAa,EACb,UAAU,EACV,kBAAkB,EAClB,QAAQ,EACR,gBAAgB,EAChB,eAAe,EACf,iBAAiB,EACjB,yBAAyB,EACzB,gBAAgB,EAChB,YAAY,EACZ,eAAe,EACf,qBAAqB,EACrB,YAAY,EACZ,oBAAoB,EACpB,gBAAgB,EAChB,WAAW,EACZ,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAErE,OAAO,KAAK,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAiBvE,OAAO,KAAK,EAAU,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAEjE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,KAAK,EACV,+BAA+B,EAE/B,8BAA8B,EAC/B,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAMV,+BAA+B,EAChC,MAAM,wBAAwB,CAAC;AAGhC,OAAO,KAAK,EACV,2BAA2B,EAC3B,sBAAsB,EACvB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAEL,KAAK,0BAA0B,EAChC,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAEL,KAAK,yBAAyB,EAC9B,KAAK,mBAAmB,EACzB,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"hosted-transport.d.ts","sourceRoot":"","sources":["../../client/hosted-transport.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ import { subscribeHostedMailbox, } from "./hosted-mailbox-subscription.js";
|
|
|
9
9
|
import { HostedGroupServer } from "./hosted-groups.js";
|
|
10
10
|
import { HostedAnonymousDelivery, decodeHostedAnonymousEnvelope, } from "./hosted-anonymous-delivery.js";
|
|
11
11
|
import { createAdapterRelayFanOut } from "./relay-work.js";
|
|
12
|
+
import { withRelayRequestDeadline } from "./relay-request-deadline.js";
|
|
12
13
|
import { applyPreKeyUploads, parseHostedPreKeyStatus, parseStoredPendingPublication, parseStoredPublication, publicationMatchesStatus, registrationPreKey, statusPreKeys, storedPreKey, storedPublication, } from "./hosted-prekey-publication.js";
|
|
13
14
|
import { declareRefusesRemovedDevices, markRelayDeviceRefusal, } from "./relay-device-refusal.js";
|
|
14
15
|
const SESSION_METADATA_PREFIX = "hostedRelay.session.v1:";
|
|
@@ -173,20 +174,23 @@ async function postJson(connection, path, body, token) {
|
|
|
173
174
|
});
|
|
174
175
|
if (token !== undefined)
|
|
175
176
|
headers.set("authorization", `Bearer ${token}`);
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
177
|
+
return withRelayRequestDeadline(async (signal) => {
|
|
178
|
+
let response;
|
|
179
|
+
try {
|
|
180
|
+
response = await fetch(`${identifiedEndpoint(connection)}${path}`, {
|
|
181
|
+
body: JSON.stringify(body),
|
|
182
|
+
headers,
|
|
183
|
+
method: "POST",
|
|
184
|
+
credentials: "omit",
|
|
185
|
+
redirect: "error",
|
|
186
|
+
signal,
|
|
187
|
+
});
|
|
188
|
+
}
|
|
189
|
+
catch (cause) {
|
|
190
|
+
throw new Error("Signal Protocol Relay request could not be completed", { cause });
|
|
191
|
+
}
|
|
192
|
+
return parseResponse(response);
|
|
193
|
+
});
|
|
190
194
|
}
|
|
191
195
|
function assertionIdentifier(assertion) {
|
|
192
196
|
const parts = assertion.split(".");
|
|
@@ -971,22 +975,26 @@ export class HostedRelayHttpTransport {
|
|
|
971
975
|
if (generation === undefined)
|
|
972
976
|
throw missingDestination(envelope.targetUserId, envelope.targetDeviceId);
|
|
973
977
|
let value;
|
|
978
|
+
let attempts = 0;
|
|
974
979
|
try {
|
|
975
|
-
value = await withOneUncertainRetry(envelope.deliveryClass, () =>
|
|
976
|
-
|
|
977
|
-
|
|
978
|
-
|
|
979
|
-
|
|
980
|
-
|
|
981
|
-
|
|
982
|
-
|
|
983
|
-
|
|
984
|
-
|
|
985
|
-
|
|
986
|
-
|
|
987
|
-
|
|
988
|
-
|
|
989
|
-
|
|
980
|
+
value = await withOneUncertainRetry(envelope.deliveryClass, () => {
|
|
981
|
+
attempts++;
|
|
982
|
+
return this.authenticatedPost("/delivery/send", {
|
|
983
|
+
deliveryClass: envelope.deliveryClass,
|
|
984
|
+
destination: {
|
|
985
|
+
accountAddress: envelope.targetUserId,
|
|
986
|
+
deviceId: envelope.targetDeviceId,
|
|
987
|
+
generation,
|
|
988
|
+
},
|
|
989
|
+
envelope: bytesToBase64(encodeDeliveryWire(envelope)),
|
|
990
|
+
messageId,
|
|
991
|
+
operationEpochMilliseconds: envelope.timestamp,
|
|
992
|
+
publishableKey: this.connection.publishableKey,
|
|
993
|
+
...(envelope.recipientRegistrationId === undefined
|
|
994
|
+
? {}
|
|
995
|
+
: { recipientRegistrationId: envelope.recipientRegistrationId }),
|
|
996
|
+
});
|
|
997
|
+
});
|
|
990
998
|
}
|
|
991
999
|
catch (error) {
|
|
992
1000
|
const device = {
|
|
@@ -1011,14 +1019,28 @@ export class HostedRelayHttpTransport {
|
|
|
1011
1019
|
throw markRelayDeviceRefusal(error, { code: "NOT_FOUND", ...device });
|
|
1012
1020
|
throw error;
|
|
1013
1021
|
}
|
|
1014
|
-
if (!record(value) ||
|
|
1022
|
+
if (!record(value) ||
|
|
1023
|
+
requiredString(value, "messageId") !== messageId ||
|
|
1024
|
+
(value.duplicate !== undefined && typeof value.duplicate !== "boolean") ||
|
|
1025
|
+
(value.expiresAt !== undefined &&
|
|
1026
|
+
(!Number.isSafeInteger(value.expiresAt) ||
|
|
1027
|
+
value.expiresAt <= 0))) {
|
|
1015
1028
|
throw new Error("Signal Protocol Relay returned an invalid delivery receipt");
|
|
1016
1029
|
}
|
|
1030
|
+
// An ephemeral receipt carries neither field, so each one is optional.
|
|
1031
|
+
// After an uncertain answer, the first request can have stored the copy
|
|
1032
|
+
// that the repeat finds, so the repeat's duplicate tells nothing.
|
|
1017
1033
|
return {
|
|
1018
1034
|
messageId,
|
|
1019
1035
|
serverTimestamp: typeof value.enqueuedAt === "number"
|
|
1020
1036
|
? value.enqueuedAt
|
|
1021
1037
|
: envelope.timestamp,
|
|
1038
|
+
...(typeof value.duplicate === "boolean" && attempts === 1
|
|
1039
|
+
? { duplicate: value.duplicate }
|
|
1040
|
+
: {}),
|
|
1041
|
+
...(typeof value.expiresAt === "number"
|
|
1042
|
+
? { expiresAt: value.expiresAt }
|
|
1043
|
+
: {}),
|
|
1022
1044
|
};
|
|
1023
1045
|
}
|
|
1024
1046
|
subscribe(userId, deviceId, onEnvelope, options) {
|