@open-e2ee/signal-protocol-sdk 4.0.0 → 6.0.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 +113 -0
- package/README.md +2 -2
- package/SECURITY.md +2 -2
- package/client/README.md +3 -3
- package/dist/client/client.d.ts +25 -20
- package/dist/client/client.d.ts.map +1 -1
- package/dist/client/client.js +31 -22
- package/dist/client/client.js.map +1 -1
- package/dist/client/config.d.ts +25 -25
- package/dist/client/headless.d.ts +9 -20
- package/dist/client/headless.d.ts.map +1 -1
- package/dist/client/headless.js +22 -67
- package/dist/client/headless.js.map +1 -1
- package/dist/client/hosted-anonymous-delivery.d.ts.map +1 -1
- package/dist/client/hosted-anonymous-delivery.js +15 -2
- package/dist/client/hosted-anonymous-delivery.js.map +1 -1
- package/dist/client/hosted-mailbox-subscription.d.ts +7 -1
- package/dist/client/hosted-mailbox-subscription.d.ts.map +1 -1
- package/dist/client/hosted-mailbox-subscription.js +50 -7
- package/dist/client/hosted-mailbox-subscription.js.map +1 -1
- package/dist/client/hosted-transport.d.ts +18 -7
- package/dist/client/hosted-transport.d.ts.map +1 -1
- package/dist/client/hosted-transport.js +96 -60
- package/dist/client/hosted-transport.js.map +1 -1
- package/dist/client/index.d.ts +1 -0
- package/dist/client/index.d.ts.map +1 -1
- package/dist/client/index.js +1 -0
- package/dist/client/index.js.map +1 -1
- package/dist/client/key-rotation-core.d.ts +46 -69
- package/dist/client/key-rotation-core.d.ts.map +1 -1
- package/dist/client/key-rotation-core.js +161 -256
- package/dist/client/key-rotation-core.js.map +1 -1
- package/dist/client/key-rotation.d.ts +14 -29
- package/dist/client/key-rotation.d.ts.map +1 -1
- package/dist/client/key-rotation.js +37 -61
- package/dist/client/key-rotation.js.map +1 -1
- package/dist/client/one-time-prekey-refill.d.ts +52 -0
- package/dist/client/one-time-prekey-refill.d.ts.map +1 -0
- package/dist/client/one-time-prekey-refill.js +79 -0
- package/dist/client/one-time-prekey-refill.js.map +1 -0
- package/dist/client/prekeys.d.ts.map +1 -1
- package/dist/client/prekeys.js +38 -73
- package/dist/client/prekeys.js.map +1 -1
- package/dist/client/relay-lifecycle.d.ts +57 -0
- package/dist/client/relay-lifecycle.d.ts.map +1 -0
- package/dist/client/relay-lifecycle.js +61 -0
- package/dist/client/relay-lifecycle.js.map +1 -0
- package/dist/client/signal-service-cipher.d.ts +1 -1
- package/dist/client/signal-service-cipher.js +2 -2
- package/dist/client/signal-service-cipher.js.map +1 -1
- package/dist/client/types.d.ts +1 -1
- package/dist/device/lifecycle/manager.d.ts.map +1 -1
- package/dist/device/lifecycle/manager.js +0 -3
- package/dist/device/lifecycle/manager.js.map +1 -1
- package/dist/device/lifecycle/types.d.ts +1 -9
- package/dist/device/lifecycle/types.d.ts.map +1 -1
- package/dist/device/lifecycle/utils.d.ts +2 -4
- package/dist/device/lifecycle/utils.d.ts.map +1 -1
- package/dist/device/lifecycle/utils.js +2 -4
- package/dist/device/lifecycle/utils.js.map +1 -1
- package/dist/hooks/index.d.ts +3 -2
- package/dist/hooks/index.d.ts.map +1 -1
- package/dist/hooks/index.js +2 -1
- package/dist/hooks/index.js.map +1 -1
- package/dist/hooks/use-key-rotation.d.ts +2 -5
- package/dist/hooks/use-key-rotation.d.ts.map +1 -1
- package/dist/hooks/use-key-rotation.js +8 -5
- package/dist/hooks/use-key-rotation.js.map +1 -1
- package/dist/hooks/use-relay-connection-state.d.ts +32 -0
- package/dist/hooks/use-relay-connection-state.d.ts.map +1 -0
- package/dist/hooks/use-relay-connection-state.js +31 -0
- package/dist/hooks/use-relay-connection-state.js.map +1 -0
- package/dist/hooks/use-relay-lifecycle.d.ts +36 -0
- package/dist/hooks/use-relay-lifecycle.d.ts.map +1 -0
- package/dist/hooks/use-relay-lifecycle.js +35 -0
- package/dist/hooks/use-relay-lifecycle.js.map +1 -0
- package/dist/hooks/use-single-flight.d.ts +4 -4
- package/dist/hooks/use-single-flight.js +4 -4
- package/dist/index.d.ts +3 -2
- 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 +4 -4
- package/dist/internal/manager/manager.js +4 -4
- package/dist/local/store/expo/models/ec-one-time-prekey.d.ts.map +1 -1
- package/dist/local/store/expo/models/ec-one-time-prekey.js +4 -6
- package/dist/local/store/expo/models/ec-one-time-prekey.js.map +1 -1
- package/dist/local/store/expo/models/kyber-one-time-prekey.d.ts.map +1 -1
- package/dist/local/store/expo/models/kyber-one-time-prekey.js +4 -8
- package/dist/local/store/expo/models/kyber-one-time-prekey.js.map +1 -1
- package/dist/remote/relay/connection-state.d.ts +16 -0
- package/dist/remote/relay/connection-state.d.ts.map +1 -0
- package/dist/remote/relay/connection-state.js +39 -0
- package/dist/remote/relay/connection-state.js.map +1 -0
- package/dist/remote/relay/index.d.ts +1 -1
- package/dist/remote/relay/index.d.ts.map +1 -1
- package/dist/remote/relay/index.js.map +1 -1
- package/dist/remote/relay/memory/adapter.d.ts +12 -14
- package/dist/remote/relay/memory/adapter.d.ts.map +1 -1
- package/dist/remote/relay/memory/adapter.js +28 -58
- package/dist/remote/relay/memory/adapter.js.map +1 -1
- package/dist/remote/relay/types.d.ts +66 -64
- package/dist/remote/relay/types.d.ts.map +1 -1
- package/dist/safety/index.d.ts +2 -2
- package/dist/safety/index.js +2 -2
- package/dist/types/api.d.ts +46 -13
- package/dist/types/api.d.ts.map +1 -1
- package/docs/ASSURANCE.md +5 -5
- package/docs/ERROR_HANDLING.md +2 -2
- package/docs/PACKAGE_SURFACE.md +1 -2
- package/examples/browser/index.html +1 -1
- package/hooks/README.md +41 -14
- package/package.json +1 -5
- package/dist/hooks/use-connection-presence.d.ts +0 -66
- package/dist/hooks/use-connection-presence.d.ts.map +0 -1
- package/dist/hooks/use-connection-presence.js +0 -298
- package/dist/hooks/use-connection-presence.js.map +0 -1
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
const MAILBOX_PROTOCOL = "open-e2ee-relay.v1";
|
|
2
2
|
const AUTH_PROTOCOL_PREFIX = "open-e2ee-relay.auth.";
|
|
3
3
|
const RECOVERY_MILLISECONDS = 2_000;
|
|
4
|
+
/** The Relay answers each `ping` text frame with `pong` without waking the mailbox. */
|
|
5
|
+
const PING_MILLISECONDS = 30_000;
|
|
6
|
+
/**
|
|
7
|
+
* The tick that would send this many unanswered pings closes the socket
|
|
8
|
+
* instead. That is 60 s after the last answered ping. The Relay closes a socket
|
|
9
|
+
* whose last answered ping is 75 s old, so the client gives up first.
|
|
10
|
+
*/
|
|
11
|
+
const MAXIMUM_UNANSWERED_PINGS = 2;
|
|
4
12
|
const MAXIMUM_FRAME_CHARACTERS = 1024 * 1024;
|
|
5
13
|
const MAXIMUM_PENDING_FRAMES = 100;
|
|
6
14
|
/** The Relay refuses an acknowledgment frame that carries more ids. */
|
|
@@ -19,6 +27,8 @@ export function subscribeHostedMailbox(options) {
|
|
|
19
27
|
let handshakeTimer;
|
|
20
28
|
let renewalTimer;
|
|
21
29
|
let recoveryTimer;
|
|
30
|
+
let pingTimer;
|
|
31
|
+
let unansweredPings = 0;
|
|
22
32
|
let acknowledgmentTimer;
|
|
23
33
|
let draining = false;
|
|
24
34
|
let pullRequested = false;
|
|
@@ -125,6 +135,8 @@ export function subscribeHostedMailbox(options) {
|
|
|
125
135
|
durable.length = 0;
|
|
126
136
|
clearTimeout(handshakeTimer);
|
|
127
137
|
clearTimeout(renewalTimer);
|
|
138
|
+
clearTimeout(pingTimer);
|
|
139
|
+
unansweredPings = 0;
|
|
128
140
|
try {
|
|
129
141
|
previous?.close(1000, "Subscription connection ended.");
|
|
130
142
|
}
|
|
@@ -132,10 +144,11 @@ export function subscribeHostedMailbox(options) {
|
|
|
132
144
|
/* Already closed. */
|
|
133
145
|
}
|
|
134
146
|
};
|
|
135
|
-
const retryConnection = () => {
|
|
147
|
+
const retryConnection = (reason) => {
|
|
136
148
|
if (!active || reconnectTimer !== undefined)
|
|
137
149
|
return;
|
|
138
150
|
disconnect();
|
|
151
|
+
options.onConnectionState("reconnecting", reason);
|
|
139
152
|
// One recovery pull per reconnect attempt, paced by the reconnect backoff.
|
|
140
153
|
recoverLater();
|
|
141
154
|
const delay = reconnectDelay;
|
|
@@ -158,8 +171,10 @@ export function subscribeHostedMailbox(options) {
|
|
|
158
171
|
};
|
|
159
172
|
const connect = async () => {
|
|
160
173
|
const generation = ++connectionGeneration;
|
|
174
|
+
let authenticated = false;
|
|
161
175
|
try {
|
|
162
176
|
const authority = await options.authenticate();
|
|
177
|
+
authenticated = true;
|
|
163
178
|
if (!active || generation !== connectionGeneration)
|
|
164
179
|
return;
|
|
165
180
|
const candidate = new WebSocket(authority.url, [
|
|
@@ -170,13 +185,13 @@ export function subscribeHostedMailbox(options) {
|
|
|
170
185
|
const current = () => active && socket === candidate;
|
|
171
186
|
handshakeTimer = setTimeout(() => {
|
|
172
187
|
if (current())
|
|
173
|
-
retryConnection();
|
|
188
|
+
retryConnection("handshake");
|
|
174
189
|
}, 10_000);
|
|
175
190
|
candidate.addEventListener("open", () => {
|
|
176
191
|
if (!current())
|
|
177
192
|
return;
|
|
178
193
|
if (candidate.protocol !== MAILBOX_PROTOCOL) {
|
|
179
|
-
retryConnection();
|
|
194
|
+
retryConnection("protocol");
|
|
180
195
|
return;
|
|
181
196
|
}
|
|
182
197
|
clearTimeout(handshakeTimer);
|
|
@@ -184,6 +199,28 @@ export function subscribeHostedMailbox(options) {
|
|
|
184
199
|
clearTimeout(recoveryTimer);
|
|
185
200
|
recoveryTimer = undefined;
|
|
186
201
|
reconnectDelay = 1_000;
|
|
202
|
+
options.onConnectionState("connected");
|
|
203
|
+
const schedulePing = () => {
|
|
204
|
+
pingTimer = setTimeout(() => {
|
|
205
|
+
if (!current())
|
|
206
|
+
return;
|
|
207
|
+
if (unansweredPings + 1 >= MAXIMUM_UNANSWERED_PINGS) {
|
|
208
|
+
retryConnection("silent");
|
|
209
|
+
return;
|
|
210
|
+
}
|
|
211
|
+
// Count the ping first: a pong can arrive during `send`.
|
|
212
|
+
unansweredPings++;
|
|
213
|
+
try {
|
|
214
|
+
candidate.send("ping");
|
|
215
|
+
}
|
|
216
|
+
catch {
|
|
217
|
+
retryConnection("error");
|
|
218
|
+
return;
|
|
219
|
+
}
|
|
220
|
+
schedulePing();
|
|
221
|
+
}, PING_MILLISECONDS);
|
|
222
|
+
};
|
|
223
|
+
schedulePing();
|
|
187
224
|
renewalTimer = setTimeout(() => {
|
|
188
225
|
if (!current())
|
|
189
226
|
return;
|
|
@@ -198,6 +235,10 @@ export function subscribeHostedMailbox(options) {
|
|
|
198
235
|
if (typeof event.data !== "string" ||
|
|
199
236
|
event.data.length > MAXIMUM_FRAME_CHARACTERS)
|
|
200
237
|
throw new Error("Invalid mailbox frame.");
|
|
238
|
+
if (event.data === "pong") {
|
|
239
|
+
unansweredPings = 0;
|
|
240
|
+
return;
|
|
241
|
+
}
|
|
201
242
|
const frame = JSON.parse(event.data);
|
|
202
243
|
if (typeof frame !== "object" || frame === null || !("type" in frame))
|
|
203
244
|
throw new Error("Invalid mailbox frame.");
|
|
@@ -213,23 +254,24 @@ export function subscribeHostedMailbox(options) {
|
|
|
213
254
|
throw new Error("Invalid mailbox frame.");
|
|
214
255
|
}
|
|
215
256
|
catch {
|
|
216
|
-
retryConnection();
|
|
257
|
+
retryConnection("frame");
|
|
217
258
|
}
|
|
218
259
|
});
|
|
219
260
|
candidate.addEventListener("close", () => {
|
|
220
261
|
if (current())
|
|
221
|
-
retryConnection();
|
|
262
|
+
retryConnection("closed");
|
|
222
263
|
});
|
|
223
264
|
candidate.addEventListener("error", () => {
|
|
224
265
|
if (current())
|
|
225
|
-
retryConnection();
|
|
266
|
+
retryConnection("error");
|
|
226
267
|
});
|
|
227
268
|
}
|
|
228
269
|
catch {
|
|
229
270
|
if (active && generation === connectionGeneration)
|
|
230
|
-
retryConnection();
|
|
271
|
+
retryConnection(authenticated ? "error" : "authentication");
|
|
231
272
|
}
|
|
232
273
|
};
|
|
274
|
+
options.onConnectionState("connecting");
|
|
233
275
|
void connect();
|
|
234
276
|
return {
|
|
235
277
|
acknowledge: (messageId) => {
|
|
@@ -251,6 +293,7 @@ export function subscribeHostedMailbox(options) {
|
|
|
251
293
|
clearTimeout(reconnectTimer);
|
|
252
294
|
clearTimeout(recoveryTimer);
|
|
253
295
|
disconnect();
|
|
296
|
+
options.onConnectionState("stopped");
|
|
254
297
|
},
|
|
255
298
|
};
|
|
256
299
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hosted-mailbox-subscription.js","sourceRoot":"","sources":["../../client/hosted-mailbox-subscription.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hosted-mailbox-subscription.js","sourceRoot":"","sources":["../../client/hosted-mailbox-subscription.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { AccountIdentityProvisioning, AccountIdentityRotation, DeliveryClass, DeviceInfo, DeviceRegistration,
|
|
1
|
+
import type { AccountIdentityProvisioning, AccountIdentityRotation, DeliveryClass, DeviceInfo, DeviceRegistration, Envelope, GroupChangeEntry, GroupChangePage, GroupMemberDevice, SignalProtocolRelayServer, RelayGroupServer, PreKeyBundle, PreKeyInventory, PreKeyPublicationPlan, PreKeyUpload, RelayConnectionState, SealedSenderAuth, Unsubscribe } from "../remote/relay/types.js";
|
|
2
2
|
import type { GroupAuthorization } from "../internal/groups/manager.js";
|
|
3
3
|
import type { CompositeIdentityV1, IdentityType } from "../keys/types.js";
|
|
4
4
|
import type { SignalProtocolLocalStore } from "../types/index.js";
|
|
@@ -41,7 +41,12 @@ export declare class HostedRelayHttpError extends Error {
|
|
|
41
41
|
readonly code: string;
|
|
42
42
|
readonly data?: Readonly<Record<string, unknown>>;
|
|
43
43
|
readonly status: number;
|
|
44
|
-
|
|
44
|
+
/** The Relay's own hint that the same operation can be sent again. */
|
|
45
|
+
readonly retryable: boolean;
|
|
46
|
+
constructor(status: number, code: string, message: string, options?: {
|
|
47
|
+
readonly data?: Readonly<Record<string, unknown>>;
|
|
48
|
+
readonly retryable?: boolean;
|
|
49
|
+
});
|
|
45
50
|
}
|
|
46
51
|
export declare class HostedRelayHttpTransport implements SignalProtocolRelayServer, HostedRelayPushRuntime {
|
|
47
52
|
private readonly connection;
|
|
@@ -55,6 +60,8 @@ export declare class HostedRelayHttpTransport implements SignalProtocolRelayServ
|
|
|
55
60
|
private readonly destinationGenerations;
|
|
56
61
|
private readonly ephemeralAcknowledgments;
|
|
57
62
|
private subscription?;
|
|
63
|
+
private subscriptionGeneration;
|
|
64
|
+
private readonly connectionState;
|
|
58
65
|
constructor(connection: HostedRelayConnection, storage: SignalProtocolLocalStore, deviceAuthentication: HostedRelayDeviceAuthentication, session: StoredHostedRelaySession);
|
|
59
66
|
get accountId(): string;
|
|
60
67
|
get deviceId(): number;
|
|
@@ -72,6 +79,12 @@ export declare class HostedRelayHttpTransport implements SignalProtocolRelayServ
|
|
|
72
79
|
private prekeyStatus;
|
|
73
80
|
private currentIdentity;
|
|
74
81
|
private acceptPublicationStatus;
|
|
82
|
+
/**
|
|
83
|
+
* One publication under the account's publication fence. The plan sees the
|
|
84
|
+
* inventory from the status read that opens the fence, so its decision and
|
|
85
|
+
* the publication share one observation. An empty plan with no pending
|
|
86
|
+
* publication returns after that one read.
|
|
87
|
+
*/
|
|
75
88
|
private publishCurrentPrekeys;
|
|
76
89
|
private pullIncoming;
|
|
77
90
|
/** One retained mailbox message, from a pull page or a `durable-message` frame. */
|
|
@@ -99,6 +112,8 @@ export declare class HostedRelayHttpTransport implements SignalProtocolRelayServ
|
|
|
99
112
|
onBatchStart?: () => void;
|
|
100
113
|
onBatchEnd?: () => void;
|
|
101
114
|
}): Unsubscribe;
|
|
115
|
+
get relayConnectionState(): RelayConnectionState;
|
|
116
|
+
subscribeRelayConnectionState(listener: (state: RelayConnectionState) => void): Unsubscribe;
|
|
102
117
|
/**
|
|
103
118
|
* Acknowledges over the live mailbox socket when one exists, in one frame per
|
|
104
119
|
* drained burst, and over HTTP otherwise.
|
|
@@ -111,20 +126,16 @@ export declare class HostedRelayHttpTransport implements SignalProtocolRelayServ
|
|
|
111
126
|
uploadPreKeys(userId: string, deviceId: number, keys: PreKeyUpload[], identityType?: IdentityType): Promise<void>;
|
|
112
127
|
fetchPreKeyBundle(userId: string, deviceId: number, _fetcherUserId?: string, identityType?: IdentityType): Promise<PreKeyBundle | null>;
|
|
113
128
|
getPreKeyInventory(userId: string, deviceId: number, identityType?: IdentityType): Promise<PreKeyInventory>;
|
|
129
|
+
publishPlannedPreKeys(userId: string, deviceId: number, plan: PreKeyPublicationPlan, identityType?: IdentityType): Promise<void>;
|
|
114
130
|
getPreKeyCount(userId: string, deviceId: number, type: "ec" | "kem", identityType?: IdentityType): Promise<number>;
|
|
115
131
|
getEcSignedPreKeyMetadata(userId: string, deviceId: number, identityType?: IdentityType): Promise<import("../index.js").PreKeyMetadata | null>;
|
|
116
132
|
getKemLastResortPreKeyMetadata(userId: string, deviceId: number, identityType?: IdentityType): Promise<import("../index.js").PreKeyMetadata | null>;
|
|
117
133
|
clearStaleKemPreKeys(userId: string, deviceId: number, identityType?: IdentityType): Promise<{
|
|
118
134
|
cleared: number;
|
|
119
135
|
}>;
|
|
120
|
-
uploadEcSignedPreKey(userId: string, key: EcSignedPreKeyUpload, identityType?: IdentityType): Promise<void>;
|
|
121
|
-
uploadKemLastResortPreKey(userId: string, key: KemLastResortPreKeyUpload, identityType?: IdentityType): Promise<void>;
|
|
122
136
|
rotateIdentityKey(_request: AccountIdentityRotation): Promise<void>;
|
|
123
137
|
registerDevice(_userId: string, _device: DeviceRegistration): Promise<number>;
|
|
124
138
|
removeDevice(_userId: string, _deviceId: number): Promise<void>;
|
|
125
|
-
markDeviceConnected(_deviceId: number): Promise<void>;
|
|
126
|
-
markDeviceDisconnected(_deviceId: number): Promise<void>;
|
|
127
|
-
heartbeat(_deviceId: number): Promise<void>;
|
|
128
139
|
createProvisioningSession(_userId: string, _key: string): Promise<{
|
|
129
140
|
sessionId: string;
|
|
130
141
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hosted-transport.d.ts","sourceRoot":"","sources":["../../client/hosted-transport.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,2BAA2B,EAC3B,uBAAuB,EACvB,aAAa,EACb,UAAU,EACV,kBAAkB,EAClB,
|
|
1
|
+
{"version":3,"file":"hosted-transport.d.ts","sourceRoot":"","sources":["../../client/hosted-transport.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import AsyncLock from "async-lock";
|
|
|
2
2
|
import { createCompositeIdentityV1, decodeCompositeIdentityV1, encodeCompositeIdentityV1, } from "../keys/identity.js";
|
|
3
3
|
import { base64ToBytes, bytesToBase64, bytesToUrlSafeBase64, concatBytes, generateUuidV4, sha256, stringToBytes, urlSafeToBase64, } from "../internal/crypto/index.js";
|
|
4
4
|
import { RemoteObjectUploadError } from "../remote/object-store/index.js";
|
|
5
|
+
import { RelayConnectionStateOwner } from "../remote/relay/connection-state.js";
|
|
5
6
|
import { subscribeHostedMailbox, } from "./hosted-mailbox-subscription.js";
|
|
6
7
|
import { HostedGroupServer } from "./hosted-groups.js";
|
|
7
8
|
import { HostedAnonymousDelivery, decodeHostedAnonymousEnvelope, } from "./hosted-anonymous-delivery.js";
|
|
@@ -16,17 +17,60 @@ const REGISTRATION_MATERIAL_LABEL = stringToBytes("OpenE2EE Relay registration m
|
|
|
16
17
|
const REGISTRATION_CHALLENGE_LABEL = stringToBytes("OpenE2EE Relay registration challenge v1\0");
|
|
17
18
|
const RECOVERY_CHALLENGE_LABEL = stringToBytes("OpenE2EE Relay recovery challenge v1\0");
|
|
18
19
|
const TOKEN_REFRESH_CHALLENGE_LABEL = stringToBytes("OpenE2EE Relay device token refresh challenge v1\0");
|
|
20
|
+
/** The rotation inventory that one status read describes. */
|
|
21
|
+
function inventoryFromStatus(status) {
|
|
22
|
+
const metadata = (algorithm) => {
|
|
23
|
+
const key = status.signedPreKeys.find((candidate) => candidate.algorithm === algorithm);
|
|
24
|
+
return key
|
|
25
|
+
? {
|
|
26
|
+
keyId: key.keyId,
|
|
27
|
+
createdAt: key.acceptedAtMilliseconds,
|
|
28
|
+
expiresAt: key.acceptedAtMilliseconds + PREKEY_EXPIRY_MILLISECONDS,
|
|
29
|
+
publicKey: bytesToBase64(key.publicKey),
|
|
30
|
+
}
|
|
31
|
+
: null;
|
|
32
|
+
};
|
|
33
|
+
return {
|
|
34
|
+
ecSignedPreKey: metadata("ec-x25519"),
|
|
35
|
+
kemLastResortPreKey: metadata("kem-ml-kem-1024"),
|
|
36
|
+
ecOneTimePreKeyCount: status.oneTimePreKeyCounts["ec-x25519"] ?? 0,
|
|
37
|
+
kemOneTimePreKeyCount: status.oneTimePreKeyCounts["kem-ml-kem-1024"] ?? 0,
|
|
38
|
+
};
|
|
39
|
+
}
|
|
19
40
|
const hostedPreKeyPublicationLock = new AsyncLock({ maxPending: 100 });
|
|
20
41
|
export class HostedRelayHttpError extends Error {
|
|
21
42
|
code;
|
|
22
43
|
data;
|
|
23
44
|
status;
|
|
24
|
-
|
|
45
|
+
/** The Relay's own hint that the same operation can be sent again. */
|
|
46
|
+
retryable;
|
|
47
|
+
constructor(status, code, message, options) {
|
|
25
48
|
super(message);
|
|
26
49
|
this.name = "HostedRelayHttpError";
|
|
27
50
|
this.status = status;
|
|
28
51
|
this.code = code;
|
|
29
|
-
this.data = data;
|
|
52
|
+
this.data = options?.data;
|
|
53
|
+
this.retryable = options?.retryable ?? false;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
/**
|
|
57
|
+
* A durable delivery whose mailbox reset inside its acknowledgment hold
|
|
58
|
+
* answers 503 `DELIVERY_UNCERTAIN`. The operation identifier makes a repeat
|
|
59
|
+
* exact, so the transport sends the same request once more before it
|
|
60
|
+
* surfaces the error. An ephemeral delivery is best-effort, so an uncertain
|
|
61
|
+
* answer on that class is not repeated.
|
|
62
|
+
*/
|
|
63
|
+
async function withOneUncertainRetry(deliveryClass, post) {
|
|
64
|
+
try {
|
|
65
|
+
return await post();
|
|
66
|
+
}
|
|
67
|
+
catch (error) {
|
|
68
|
+
if (deliveryClass === "ephemeral" ||
|
|
69
|
+
!(error instanceof HostedRelayHttpError) ||
|
|
70
|
+
error.code !== "DELIVERY_UNCERTAIN") {
|
|
71
|
+
throw error;
|
|
72
|
+
}
|
|
73
|
+
return post();
|
|
30
74
|
}
|
|
31
75
|
}
|
|
32
76
|
function record(value) {
|
|
@@ -105,7 +149,9 @@ async function parseResponse(response) {
|
|
|
105
149
|
const message = typeof error.message === "string"
|
|
106
150
|
? error.message
|
|
107
151
|
: "Signal Protocol Relay request failed";
|
|
108
|
-
throw new HostedRelayHttpError(response.status, code, message
|
|
152
|
+
throw new HostedRelayHttpError(response.status, code, message, {
|
|
153
|
+
retryable: error.retryable === true,
|
|
154
|
+
});
|
|
109
155
|
}
|
|
110
156
|
return parsed;
|
|
111
157
|
}
|
|
@@ -315,6 +361,8 @@ export class HostedRelayHttpTransport {
|
|
|
315
361
|
destinationGenerations = new Map();
|
|
316
362
|
ephemeralAcknowledgments = new Set();
|
|
317
363
|
subscription;
|
|
364
|
+
subscriptionGeneration = 0;
|
|
365
|
+
connectionState = new RelayConnectionStateOwner();
|
|
318
366
|
constructor(connection, storage, deviceAuthentication, session) {
|
|
319
367
|
this.connection = connection;
|
|
320
368
|
this.storage = storage;
|
|
@@ -521,6 +569,13 @@ export class HostedRelayHttpTransport {
|
|
|
521
569
|
device.mailboxGeneration < 0) {
|
|
522
570
|
throw new Error("Signal Protocol Relay returned an invalid device directory");
|
|
523
571
|
}
|
|
572
|
+
if ("lastSeenAt" in candidate) {
|
|
573
|
+
const lastSeenAt = candidate.lastSeenAt;
|
|
574
|
+
if (lastSeenAt !== null && !Number.isSafeInteger(lastSeenAt)) {
|
|
575
|
+
throw new Error("Signal Protocol Relay returned an invalid device directory");
|
|
576
|
+
}
|
|
577
|
+
device.lastSeenAt = lastSeenAt;
|
|
578
|
+
}
|
|
524
579
|
this.destinationGenerations.set(`${userId}\0${String(device.deviceId)}`, device.mailboxGeneration);
|
|
525
580
|
return device;
|
|
526
581
|
});
|
|
@@ -550,7 +605,13 @@ export class HostedRelayHttpTransport {
|
|
|
550
605
|
this.session.pendingPreKeyPublication = null;
|
|
551
606
|
await this.persistSession();
|
|
552
607
|
}
|
|
553
|
-
|
|
608
|
+
/**
|
|
609
|
+
* One publication under the account's publication fence. The plan sees the
|
|
610
|
+
* inventory from the status read that opens the fence, so its decision and
|
|
611
|
+
* the publication share one observation. An empty plan with no pending
|
|
612
|
+
* publication returns after that one read.
|
|
613
|
+
*/
|
|
614
|
+
async publishCurrentPrekeys(plan) {
|
|
554
615
|
await hostedPreKeyPublicationLock.acquire(await sessionMetadataKey(this.connection), async () => {
|
|
555
616
|
const current = await this.currentIdentity();
|
|
556
617
|
let status = await this.prekeyStatus(this.session.canonicalAccountId, this.session.deviceId);
|
|
@@ -577,6 +638,9 @@ export class HostedRelayHttpTransport {
|
|
|
577
638
|
else if (!publicationMatchesStatus(this.session.preKeyPublication, status)) {
|
|
578
639
|
throw new Error("Signal Protocol Relay prekey publication state is newer than local state");
|
|
579
640
|
}
|
|
641
|
+
const uploads = await plan(inventoryFromStatus(status));
|
|
642
|
+
if (uploads.length === 0 && retryPending === undefined)
|
|
643
|
+
return;
|
|
580
644
|
const target = retryPending === undefined
|
|
581
645
|
? applyPreKeyUploads(statusPreKeys(status), uploads)
|
|
582
646
|
: {
|
|
@@ -813,7 +877,7 @@ export class HostedRelayHttpTransport {
|
|
|
813
877
|
throw new Error("Signal Protocol Relay destination device does not exist");
|
|
814
878
|
let value;
|
|
815
879
|
try {
|
|
816
|
-
value = await this.authenticatedPost("/delivery/send", {
|
|
880
|
+
value = await withOneUncertainRetry(envelope.deliveryClass, () => this.authenticatedPost("/delivery/send", {
|
|
817
881
|
deliveryClass: envelope.deliveryClass,
|
|
818
882
|
destination: {
|
|
819
883
|
accountAddress: envelope.targetUserId,
|
|
@@ -827,16 +891,19 @@ export class HostedRelayHttpTransport {
|
|
|
827
891
|
...(envelope.recipientRegistrationId === undefined
|
|
828
892
|
? {}
|
|
829
893
|
: { recipientRegistrationId: envelope.recipientRegistrationId }),
|
|
830
|
-
});
|
|
894
|
+
}));
|
|
831
895
|
}
|
|
832
896
|
catch (error) {
|
|
833
897
|
if (error instanceof HostedRelayHttpError &&
|
|
834
898
|
error.code === "STALE_DEVICE") {
|
|
835
899
|
throw new HostedRelayHttpError(error.status, error.code, error.message, {
|
|
836
|
-
|
|
837
|
-
|
|
838
|
-
|
|
839
|
-
|
|
900
|
+
data: {
|
|
901
|
+
code: "STALE_DEVICE",
|
|
902
|
+
message: error.message,
|
|
903
|
+
reason: "device_reinstalled",
|
|
904
|
+
staleDevices: [envelope.targetDeviceId],
|
|
905
|
+
},
|
|
906
|
+
retryable: error.retryable,
|
|
840
907
|
});
|
|
841
908
|
}
|
|
842
909
|
throw error;
|
|
@@ -853,8 +920,14 @@ export class HostedRelayHttpTransport {
|
|
|
853
920
|
}
|
|
854
921
|
subscribe(userId, deviceId, onEnvelope, options) {
|
|
855
922
|
this.assertCurrentIdentity(userId, deviceId);
|
|
923
|
+
// Only the newest subscription reports the connection state.
|
|
924
|
+
const generation = ++this.subscriptionGeneration;
|
|
856
925
|
const subscription = subscribeHostedMailbox({
|
|
857
926
|
...options,
|
|
927
|
+
onConnectionState: (state, reason) => {
|
|
928
|
+
if (generation === this.subscriptionGeneration)
|
|
929
|
+
this.connectionState.move(state, reason);
|
|
930
|
+
},
|
|
858
931
|
authenticate: async () => {
|
|
859
932
|
const token = await this.token();
|
|
860
933
|
const url = new URL(`${identifiedEndpoint(this.connection)}/mailbox/connect`);
|
|
@@ -903,6 +976,12 @@ export class HostedRelayHttpTransport {
|
|
|
903
976
|
subscription.unsubscribe();
|
|
904
977
|
};
|
|
905
978
|
}
|
|
979
|
+
get relayConnectionState() {
|
|
980
|
+
return this.connectionState.current;
|
|
981
|
+
}
|
|
982
|
+
subscribeRelayConnectionState(listener) {
|
|
983
|
+
return this.connectionState.subscribe(listener);
|
|
984
|
+
}
|
|
906
985
|
/**
|
|
907
986
|
* Acknowledges over the live mailbox socket when one exists, in one frame per
|
|
908
987
|
* drained burst, and over HTTP otherwise.
|
|
@@ -920,6 +999,7 @@ export class HostedRelayHttpTransport {
|
|
|
920
999
|
registered: true,
|
|
921
1000
|
linked: device.deviceId > 1,
|
|
922
1001
|
enabled: true,
|
|
1002
|
+
...(device.lastSeenAt === undefined ? {} : { lastSeenAt: device.lastSeenAt }),
|
|
923
1003
|
}));
|
|
924
1004
|
}
|
|
925
1005
|
async getActiveDevices(userId) {
|
|
@@ -949,7 +1029,7 @@ export class HostedRelayHttpTransport {
|
|
|
949
1029
|
}
|
|
950
1030
|
async uploadPreKeys(userId, deviceId, keys, identityType = "aci") {
|
|
951
1031
|
this.assertCurrentIdentity(userId, deviceId, identityType);
|
|
952
|
-
await this.publishCurrentPrekeys(keys);
|
|
1032
|
+
await this.publishCurrentPrekeys(async () => keys);
|
|
953
1033
|
}
|
|
954
1034
|
async fetchPreKeyBundle(userId, deviceId, _fetcherUserId, identityType = "aci") {
|
|
955
1035
|
if (identityType !== "aci")
|
|
@@ -1031,24 +1111,11 @@ export class HostedRelayHttpTransport {
|
|
|
1031
1111
|
};
|
|
1032
1112
|
}
|
|
1033
1113
|
async getPreKeyInventory(userId, deviceId, identityType = "aci") {
|
|
1034
|
-
|
|
1035
|
-
|
|
1036
|
-
|
|
1037
|
-
|
|
1038
|
-
|
|
1039
|
-
keyId: key.keyId,
|
|
1040
|
-
createdAt: key.acceptedAtMilliseconds,
|
|
1041
|
-
expiresAt: key.acceptedAtMilliseconds + PREKEY_EXPIRY_MILLISECONDS,
|
|
1042
|
-
publicKey: bytesToBase64(key.publicKey),
|
|
1043
|
-
}
|
|
1044
|
-
: null;
|
|
1045
|
-
};
|
|
1046
|
-
return {
|
|
1047
|
-
ecSignedPreKey: metadata("ec-x25519"),
|
|
1048
|
-
kemLastResortPreKey: metadata("kem-ml-kem-1024"),
|
|
1049
|
-
ecOneTimePreKeyCount: status.oneTimePreKeyCounts["ec-x25519"] ?? 0,
|
|
1050
|
-
kemOneTimePreKeyCount: status.oneTimePreKeyCounts["kem-ml-kem-1024"] ?? 0,
|
|
1051
|
-
};
|
|
1114
|
+
return inventoryFromStatus(await this.prekeyStatus(userId, deviceId, identityType));
|
|
1115
|
+
}
|
|
1116
|
+
async publishPlannedPreKeys(userId, deviceId, plan, identityType = "aci") {
|
|
1117
|
+
this.assertCurrentIdentity(userId, deviceId, identityType);
|
|
1118
|
+
await this.publishCurrentPrekeys(plan);
|
|
1052
1119
|
}
|
|
1053
1120
|
async getPreKeyCount(userId, deviceId, type, identityType = "aci") {
|
|
1054
1121
|
const status = await this.prekeyStatus(userId, deviceId, identityType);
|
|
@@ -1071,28 +1138,6 @@ export class HostedRelayHttpTransport {
|
|
|
1071
1138
|
throw new Error("Signal Protocol Relay returned an invalid prekey result");
|
|
1072
1139
|
return { cleared: requiredNumber(value, "cleared") };
|
|
1073
1140
|
}
|
|
1074
|
-
async uploadEcSignedPreKey(userId, key, identityType = "aci") {
|
|
1075
|
-
this.assertCurrentIdentity(userId, this.session.deviceId, identityType);
|
|
1076
|
-
await this.publishCurrentPrekeys([
|
|
1077
|
-
{
|
|
1078
|
-
keyId: key.keyId,
|
|
1079
|
-
publicKey: key.publicKey,
|
|
1080
|
-
signature: key.signature,
|
|
1081
|
-
type: "ecSignedPreKey",
|
|
1082
|
-
},
|
|
1083
|
-
]);
|
|
1084
|
-
}
|
|
1085
|
-
async uploadKemLastResortPreKey(userId, key, identityType = "aci") {
|
|
1086
|
-
this.assertCurrentIdentity(userId, this.session.deviceId, identityType);
|
|
1087
|
-
await this.publishCurrentPrekeys([
|
|
1088
|
-
{
|
|
1089
|
-
keyId: key.keyId,
|
|
1090
|
-
publicKey: key.publicKey,
|
|
1091
|
-
signature: key.signature,
|
|
1092
|
-
type: "kemLastResortPreKey",
|
|
1093
|
-
},
|
|
1094
|
-
]);
|
|
1095
|
-
}
|
|
1096
1141
|
async rotateIdentityKey(_request) {
|
|
1097
1142
|
unsupported("identity rotation outside the hosted recovery flow");
|
|
1098
1143
|
}
|
|
@@ -1102,15 +1147,6 @@ export class HostedRelayHttpTransport {
|
|
|
1102
1147
|
async removeDevice(_userId, _deviceId) {
|
|
1103
1148
|
unsupported("direct device removal");
|
|
1104
1149
|
}
|
|
1105
|
-
async markDeviceConnected(_deviceId) {
|
|
1106
|
-
unsupported("connection presence");
|
|
1107
|
-
}
|
|
1108
|
-
async markDeviceDisconnected(_deviceId) {
|
|
1109
|
-
unsupported("connection presence");
|
|
1110
|
-
}
|
|
1111
|
-
async heartbeat(_deviceId) {
|
|
1112
|
-
unsupported("connection presence");
|
|
1113
|
-
}
|
|
1114
1150
|
async createProvisioningSession(_userId, _key) {
|
|
1115
1151
|
unsupported("legacy provisioning sessions");
|
|
1116
1152
|
}
|