@open-e2ee/signal-protocol-sdk 9.5.0 → 10.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 +53 -0
- package/README.md +1 -1
- package/SECURITY.md +4 -4
- package/client/README.md +29 -12
- package/dist/client/client.d.ts +14 -1
- package/dist/client/client.d.ts.map +1 -1
- package/dist/client/client.js +83 -13
- package/dist/client/client.js.map +1 -1
- package/dist/client/config.d.ts +18 -3
- package/dist/client/config.d.ts.map +1 -1
- package/dist/client/config.js.map +1 -1
- package/dist/client/constants.d.ts +2 -10
- package/dist/client/constants.d.ts.map +1 -1
- package/dist/client/constants.js +3 -12
- package/dist/client/constants.js.map +1 -1
- package/dist/client/delivery-status.d.ts +50 -0
- package/dist/client/delivery-status.d.ts.map +1 -0
- package/dist/client/delivery-status.js +121 -0
- package/dist/client/delivery-status.js.map +1 -0
- package/dist/client/event-hooks.d.ts +44 -10
- package/dist/client/event-hooks.d.ts.map +1 -1
- package/dist/client/event-hooks.js +26 -0
- package/dist/client/event-hooks.js.map +1 -1
- package/dist/client/hosted-anonymous-delivery.d.ts +2 -2
- package/dist/client/hosted-anonymous-delivery.d.ts.map +1 -1
- package/dist/client/hosted-anonymous-delivery.js +5 -2
- package/dist/client/hosted-anonymous-delivery.js.map +1 -1
- package/dist/client/hosted-mailbox-subscription.d.ts +39 -6
- package/dist/client/hosted-mailbox-subscription.d.ts.map +1 -1
- package/dist/client/hosted-mailbox-subscription.js +133 -26
- package/dist/client/hosted-mailbox-subscription.js.map +1 -1
- package/dist/client/hosted-push.d.ts +4 -3
- package/dist/client/hosted-push.d.ts.map +1 -1
- package/dist/client/hosted-push.js +18 -6
- package/dist/client/hosted-push.js.map +1 -1
- package/dist/client/hosted-transport.d.ts +26 -6
- package/dist/client/hosted-transport.d.ts.map +1 -1
- package/dist/client/hosted-transport.js +83 -11
- package/dist/client/hosted-transport.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/messages.d.ts +4 -2
- package/dist/client/messages.d.ts.map +1 -1
- package/dist/client/messages.js +32 -7
- package/dist/client/messages.js.map +1 -1
- package/dist/client/relay-receipt-intake.d.ts +70 -0
- package/dist/client/relay-receipt-intake.d.ts.map +1 -0
- package/dist/client/relay-receipt-intake.js +111 -0
- package/dist/client/relay-receipt-intake.js.map +1 -0
- package/dist/client/relay-receipt-join.d.ts +50 -0
- package/dist/client/relay-receipt-join.d.ts.map +1 -0
- package/dist/client/relay-receipt-join.js +106 -0
- package/dist/client/relay-receipt-join.js.map +1 -0
- package/dist/client/relay-subscription.d.ts.map +1 -1
- package/dist/client/relay-subscription.js +20 -3
- package/dist/client/relay-subscription.js.map +1 -1
- package/dist/client/signal-service-cipher.d.ts +12 -1
- package/dist/client/signal-service-cipher.d.ts.map +1 -1
- package/dist/client/signal-service-cipher.js +28 -1
- package/dist/client/signal-service-cipher.js.map +1 -1
- package/dist/client/types.d.ts +1 -1
- package/dist/client/types.d.ts.map +1 -1
- package/dist/client/types.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/local/store/reliability.d.ts +33 -0
- package/dist/local/store/reliability.d.ts.map +1 -1
- package/dist/local/store/reliability.js +61 -1
- package/dist/local/store/reliability.js.map +1 -1
- 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/types.d.ts +14 -3
- package/dist/remote/relay/types.d.ts.map +1 -1
- package/docs/ASSURANCE.md +5 -5
- package/package.json +1 -1
|
@@ -42,6 +42,36 @@
|
|
|
42
42
|
* The content is the raw decrypted plaintext (typically JSON).
|
|
43
43
|
*/
|
|
44
44
|
export {};
|
|
45
|
+
/**
|
|
46
|
+
* A source that reports that a recipient device has a message.
|
|
47
|
+
*
|
|
48
|
+
* - `'relay'`: the Relay handed the message to the device. The device has not
|
|
49
|
+
* yet decrypted it.
|
|
50
|
+
* - `'e2ee'`: the device decrypted the message and sent an encrypted delivery
|
|
51
|
+
* receipt.
|
|
52
|
+
*/
|
|
53
|
+
export type DeliverySource = 'relay' | 'e2ee';
|
|
54
|
+
/** The delivery of one outgoing message to one recipient device. */
|
|
55
|
+
export interface DeliveredEvent {
|
|
56
|
+
/** The client message ID of the send. */
|
|
57
|
+
clientMessageId: string;
|
|
58
|
+
/** The recipient user. For a group message, the group member. */
|
|
59
|
+
recipientId: string;
|
|
60
|
+
/** The recipient device. */
|
|
61
|
+
recipientDeviceId: number;
|
|
62
|
+
/** The source that this event reports. */
|
|
63
|
+
source: DeliverySource;
|
|
64
|
+
/** Each source of the delivery so far, in the order of arrival. */
|
|
65
|
+
sources: DeliverySource[];
|
|
66
|
+
/** True when `sources` includes `'e2ee'`: the device decrypted the message. */
|
|
67
|
+
decryptionConfirmed: boolean;
|
|
68
|
+
/** The time of the first source, in epoch milliseconds. */
|
|
69
|
+
deliveredAt: number;
|
|
70
|
+
/** The client timestamp of the send. */
|
|
71
|
+
clientTimestamp: number;
|
|
72
|
+
/** The group ID, for a group message. */
|
|
73
|
+
groupId?: string;
|
|
74
|
+
}
|
|
45
75
|
export interface DecryptedEnvelope {
|
|
46
76
|
/** Unique message ID (from server or generated) */
|
|
47
77
|
messageId: string;
|
|
@@ -249,24 +279,28 @@ export interface SignalProtocolClientHooks {
|
|
|
249
279
|
*/
|
|
250
280
|
onKeysCleanedUp?: (sessionId: string, removedCount: number) => void | Promise<void>;
|
|
251
281
|
/**
|
|
252
|
-
* Runs when
|
|
282
|
+
* Runs when a recipient device gets one of this client's messages
|
|
253
283
|
*
|
|
254
|
-
*
|
|
255
|
-
* The
|
|
284
|
+
* A message to one device goes from accepted (the send resolved) to
|
|
285
|
+
* delivered. The hook runs once for each source that reports the delivery:
|
|
286
|
+
* `'relay'` when the Relay hands the message to the device, and `'e2ee'`
|
|
287
|
+
* when the device decrypts it and sends an encrypted delivery receipt. A
|
|
288
|
+
* second report from the same source does not run the hook. A receipt that
|
|
289
|
+
* arrives before the send resolves runs the hook after the send resolves.
|
|
256
290
|
*
|
|
257
|
-
* @param
|
|
258
|
-
* @param timestamps - Array of message timestamps for the delivered messages
|
|
291
|
+
* @param event - The delivery and its sources so far
|
|
259
292
|
*
|
|
260
293
|
* @example
|
|
261
294
|
* ```typescript
|
|
262
|
-
*
|
|
263
|
-
*
|
|
264
|
-
*
|
|
265
|
-
*
|
|
295
|
+
* onDelivered: async (event) => {
|
|
296
|
+
* await updateMessageStatus(event.clientMessageId, event.recipientDeviceId, {
|
|
297
|
+
* status: 'delivered',
|
|
298
|
+
* decryptionConfirmed: event.decryptionConfirmed,
|
|
299
|
+
* });
|
|
266
300
|
* }
|
|
267
301
|
* ```
|
|
268
302
|
*/
|
|
269
|
-
|
|
303
|
+
onDelivered?: (event: DeliveredEvent) => void | Promise<void>;
|
|
270
304
|
/**
|
|
271
305
|
* Runs when the client receives a read receipt
|
|
272
306
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event-hooks.d.ts","sourceRoot":"","sources":["../../client/event-hooks.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AAIH;;;;;GAKG;AACH,OAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"event-hooks.d.ts","sourceRoot":"","sources":["../../client/event-hooks.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,6 +36,32 @@
|
|
|
36
36
|
* ```
|
|
37
37
|
*/
|
|
38
38
|
import { rethrowRelayWorkStopped } from './relay-work.js';
|
|
39
|
+
const HOOK_NAMES = {
|
|
40
|
+
onSessionEstablished: true,
|
|
41
|
+
onSessionDeleted: true,
|
|
42
|
+
onSessionArchived: true,
|
|
43
|
+
onKeyRotated: true,
|
|
44
|
+
onMessageEncrypted: true,
|
|
45
|
+
onMessageDecrypted: true,
|
|
46
|
+
onDecryptionError: true,
|
|
47
|
+
onEncryptionError: true,
|
|
48
|
+
onKeysCleanedUp: true,
|
|
49
|
+
onDelivered: true,
|
|
50
|
+
onReadReceiptReceived: true,
|
|
51
|
+
onViewedReceiptReceived: true,
|
|
52
|
+
onTypingIndicatorReceived: true,
|
|
53
|
+
};
|
|
54
|
+
/**
|
|
55
|
+
* Throw for a name that is not a client hook, so that a misspelled or removed
|
|
56
|
+
* hook fails at registration and not silently.
|
|
57
|
+
*
|
|
58
|
+
* @internal
|
|
59
|
+
*/
|
|
60
|
+
export function assertHookName(name) {
|
|
61
|
+
if (!Object.prototype.hasOwnProperty.call(HOOK_NAMES, name)) {
|
|
62
|
+
throw new Error(`Unknown Signal Protocol client hook: ${name}`);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
39
65
|
/**
|
|
40
66
|
* Helper to safely call a hook if it exists
|
|
41
67
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event-hooks.js","sourceRoot":"","sources":["../../client/event-hooks.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AAEH,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"event-hooks.js","sourceRoot":"","sources":["../../client/event-hooks.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AAEH,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAmWvD,MAAM,UAAU,GAAG;IACjB,oBAAoB,EAAE,IAAI;IAC1B,gBAAgB,EAAE,IAAI;IACtB,iBAAiB,EAAE,IAAI;IACvB,YAAY,EAAE,IAAI;IAClB,kBAAkB,EAAE,IAAI;IACxB,kBAAkB,EAAE,IAAI;IACxB,iBAAiB,EAAE,IAAI;IACvB,iBAAiB,EAAE,IAAI;IACvB,eAAe,EAAE,IAAI;IACrB,WAAW,EAAE,IAAI;IACjB,qBAAqB,EAAE,IAAI;IAC3B,uBAAuB,EAAE,IAAI;IAC7B,yBAAyB,EAAE,IAAI;CACU,CAAC;AAE5C;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,IAAY;IACzC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,CAAC;QAC5D,MAAM,IAAI,KAAK,CAAC,wCAAwC,IAAI,EAAE,CAAC,CAAC;IAClE,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,QAAQ,CAC5B,KAA4C,EAC5C,QAAW,EACX,GAAG,IAA2D;IAE9D,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC/B,OAAO;IACT,CAAC;IAED,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,CAA8C,CAAC;QAC1E,MAAM,OAAO,CAAC,OAAO,CACnB,OAAO,CAAC,KAAK,CAAC,IAA2C,EAAE,SAAS,EAAE,IAAiB,CAAC,CACzF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,uBAAuB,CAAC,KAAK,CAAC,CAAC;QAC/B,4DAA4D;QAC5D,OAAO,CAAC,KAAK,CAAC,QAAQ,QAAQ,UAAU,EAAE,KAAK,CAAC,CAAC;IACnD,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,UAAU,CAAC,KAA4C;IAIrE,MAAM,MAAM,GAAiC,EAAE,CAAC;IAChD,MAAM,QAAQ,GAAiD,EAAE,CAAC;IAClE,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,CAAC;QACvD,IAAI,OAAO,IAAI,KAAK,UAAU;YAAE,SAAS;QACzC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,EAAE;YAC3B,MAAM,CAAC,IAAI,CAAC,CAAC,IAAgB,EAAE,IAAI,CAAC,CAAC,CAAC;QACxC,CAAC,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,GAAG,QAIK,CAAC;IACnB,OAAO;QACL,KAAK,EAAE,QAAqC;QAC5C,KAAK,CAAC,KAAK;YACT,KAAK,IAAI,IAAI,GAAG,MAAM,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,GAAG,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;gBAC5D,MAAM,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { DeliveryClass, SealedSenderAuth } from "../remote/relay/types.js";
|
|
1
|
+
import type { ContentKind, DeliveryClass, SealedSenderAuth } from "../remote/relay/types.js";
|
|
2
2
|
import { type BoundedFanOut } from "../utils/bounded-fan-out.js";
|
|
3
3
|
import type { HostedRelayConnection } from "./hosted-connection.js";
|
|
4
4
|
type Destination = {
|
|
@@ -30,7 +30,7 @@ export declare class HostedAnonymousDelivery {
|
|
|
30
30
|
*/
|
|
31
31
|
private each;
|
|
32
32
|
private post;
|
|
33
|
-
send(sentMessageBase64: string, auth: SealedSenderAuth, timestamp: number, deliveryClass: DeliveryClass, recipientUserIds?: string[], clientMessageId?: string, operationEpochMilliseconds?: number): Promise<{
|
|
33
|
+
send(sentMessageBase64: string, auth: SealedSenderAuth, timestamp: number, deliveryClass: DeliveryClass, recipientUserIds?: string[], clientMessageId?: string, operationEpochMilliseconds?: number, contentKind?: ContentKind): Promise<{
|
|
34
34
|
messageId: string;
|
|
35
35
|
serverTimestamp: number;
|
|
36
36
|
uuids404: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hosted-anonymous-delivery.d.ts","sourceRoot":"","sources":["../../client/hosted-anonymous-delivery.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"hosted-anonymous-delivery.d.ts","sourceRoot":"","sources":["../../client/hosted-anonymous-delivery.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACb,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAe,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAUjE,KAAK,WAAW,GAAG;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAsBF,wFAAwF;AACxF,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,UAAU,GAAG;IAChE,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,qBAAqB,CAAC;IACnC,SAAS,EAAE,MAAM,CAAC;CACnB,CAiBA;AAED,qBAAa,4BAA6B,SAAQ,KAAK;aAEnC,MAAM,EAAE,MAAM;aACd,IAAI,EAAE,MAAM;IAF9B,YACkB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EAI7B;CACF;AAiDD,qFAAqF;AACrF,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IAHrC,YACmB,UAAU,EAAE,qBAAqB,EACjC,MAAM,EAAE,aAAa,EACrB,kBAAkB,EAAE,CACnC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,KACb,OAAO,CAAC,WAAW,CAAC,EACvB;IAEJ;;;;OAIG;YACW,IAAI;IAWlB,OAAO,CAAC,IAAI;IAqDC,IAAI,CACf,iBAAiB,EAAE,MAAM,EACzB,IAAI,EAAE,gBAAgB,EACtB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,aAAa,EAC5B,gBAAgB,CAAC,EAAE,MAAM,EAAE,EAC3B,eAAe,CAAC,EAAE,MAAM,EACxB,0BAA0B,SAAY,EACtC,WAAW,GAAE,WAAuB,GACnC,OAAO,CAAC;QACT,SAAS,EAAE,MAAM,CAAC;QAClB,eAAe,EAAE,MAAM,CAAC;QACxB,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC,CAgMD;CACF"}
|
|
@@ -163,11 +163,12 @@ export class HostedAnonymousDelivery {
|
|
|
163
163
|
return value;
|
|
164
164
|
});
|
|
165
165
|
}
|
|
166
|
-
async send(sentMessageBase64, auth, timestamp, deliveryClass, recipientUserIds, clientMessageId, operationEpochMilliseconds = timestamp) {
|
|
166
|
+
async send(sentMessageBase64, auth, timestamp, deliveryClass, recipientUserIds, clientMessageId, operationEpochMilliseconds = timestamp, contentKind = "message") {
|
|
167
167
|
const header = timestampHeader(timestamp);
|
|
168
168
|
if (!clientMessageId ||
|
|
169
169
|
clientMessageId.length > 128 ||
|
|
170
|
-
!["user-visible", "background-sync", "ephemeral"].includes(deliveryClass)
|
|
170
|
+
!["user-visible", "background-sync", "ephemeral"].includes(deliveryClass) ||
|
|
171
|
+
!["message", "receipt"].includes(contentKind))
|
|
171
172
|
throw new Error("Anonymous delivery operation is invalid");
|
|
172
173
|
const parsed = deserializeSentMessage(bytes(sentMessageBase64));
|
|
173
174
|
if (!parsed.recipients.length ||
|
|
@@ -232,6 +233,7 @@ export class HostedAnonymousDelivery {
|
|
|
232
233
|
},
|
|
233
234
|
body: bytesToBase64(parsed.messageCiphertext),
|
|
234
235
|
destinations,
|
|
236
|
+
contentKind,
|
|
235
237
|
deliveryClass,
|
|
236
238
|
logicalSendId: clientMessageId,
|
|
237
239
|
operationEpochMilliseconds,
|
|
@@ -259,6 +261,7 @@ export class HostedAnonymousDelivery {
|
|
|
259
261
|
const body = {
|
|
260
262
|
auth,
|
|
261
263
|
destination,
|
|
264
|
+
contentKind,
|
|
262
265
|
deliveryClass,
|
|
263
266
|
messageId: clientMessageId,
|
|
264
267
|
operationEpochMilliseconds,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hosted-anonymous-delivery.js","sourceRoot":"","sources":["../../client/hosted-anonymous-delivery.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"hosted-anonymous-delivery.js","sourceRoot":"","sources":["../../client/hosted-anonymous-delivery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { Envelope, RelayConnectionReason, RelayConnectionState, Unsubscribe } from "../remote/relay/types.js";
|
|
2
2
|
import { type HostedRelayPresenceRequest, type HostedRelayPresenceUpdate } from "./hosted-presence-frames.js";
|
|
3
|
+
import { type RelayDeliveryReceipt } from "./relay-receipt-intake.js";
|
|
3
4
|
/**
|
|
4
5
|
* A presence event of the live socket: `open` when a new socket opens, which
|
|
5
6
|
* holds no presence watch, and `update` for each pushed presence edge.
|
|
@@ -10,6 +11,20 @@ export type PresenceSocketEvent = {
|
|
|
10
11
|
readonly type: "update";
|
|
11
12
|
readonly update: HostedRelayPresenceUpdate;
|
|
12
13
|
};
|
|
14
|
+
/**
|
|
15
|
+
* One HTTP pull page: the retained messages, then, on a page of fewer than
|
|
16
|
+
* 100 messages from a Relay that advertised Relay receipts, the retained
|
|
17
|
+
* Relay delivery receipts.
|
|
18
|
+
*/
|
|
19
|
+
export interface MailboxPage {
|
|
20
|
+
readonly messages: readonly Envelope[];
|
|
21
|
+
readonly receipts: readonly RelayDeliveryReceipt[];
|
|
22
|
+
}
|
|
23
|
+
/** The Relay's answer to one HTTP acknowledgment. */
|
|
24
|
+
export interface MailboxAcknowledgment {
|
|
25
|
+
/** The acknowledged message ids whose delivery receipt the Relay owns. */
|
|
26
|
+
readonly receipted: readonly string[];
|
|
27
|
+
}
|
|
13
28
|
interface MailboxSubscription {
|
|
14
29
|
authenticate(): Promise<{
|
|
15
30
|
url: string;
|
|
@@ -18,11 +33,27 @@ interface MailboxSubscription {
|
|
|
18
33
|
}>;
|
|
19
34
|
/** Decodes the `message` of a `durable-message` frame. */
|
|
20
35
|
decodeDurable(message: unknown): Envelope;
|
|
21
|
-
/** Recovers retained
|
|
22
|
-
pull(): Promise<
|
|
23
|
-
/**
|
|
24
|
-
|
|
36
|
+
/** Recovers retained work over HTTP while no socket delivers it. */
|
|
37
|
+
pull(): Promise<MailboxPage>;
|
|
38
|
+
/**
|
|
39
|
+
* Acknowledges messages and Relay receipts over HTTP when queued socket
|
|
40
|
+
* acknowledgments lose their socket.
|
|
41
|
+
*/
|
|
42
|
+
acknowledge(messageIds: readonly string[], receiptIds: readonly string[]): Promise<MailboxAcknowledgment>;
|
|
25
43
|
receive(envelope: Envelope): void | Promise<void>;
|
|
44
|
+
/**
|
|
45
|
+
* Hands one Relay delivery receipt off. The receipt is acknowledged after
|
|
46
|
+
* the hand-off resolves. A rejection leaves it in the mailbox for a replay.
|
|
47
|
+
*/
|
|
48
|
+
receiveReceipt(receipt: RelayDeliveryReceipt): Promise<void>;
|
|
49
|
+
/**
|
|
50
|
+
* Receives the reply to the acknowledgment of each message that this
|
|
51
|
+
* subscription acknowledged. `receipted` is true only when the reply lists
|
|
52
|
+
* the message. It is false when the reply omits it, when the HTTP
|
|
53
|
+
* acknowledgment fails, when the socket that carried it closes before the
|
|
54
|
+
* reply, and when that socket did not advertise Relay receipts.
|
|
55
|
+
*/
|
|
56
|
+
onAcknowledgmentReply(messageId: string, receipted: boolean): void;
|
|
26
57
|
receiveEphemeral(message: unknown, current: () => boolean): Promise<string>;
|
|
27
58
|
onBatchStart?(): void;
|
|
28
59
|
onBatchEnd?(): void;
|
|
@@ -55,8 +86,10 @@ export interface MailboxSubscriptionHandle {
|
|
|
55
86
|
}
|
|
56
87
|
/**
|
|
57
88
|
* Delivers durable and ephemeral frames from the mailbox socket and acknowledges
|
|
58
|
-
* durable frames over the same socket.
|
|
59
|
-
*
|
|
89
|
+
* durable frames over the same socket. Relay delivery receipts share the
|
|
90
|
+
* durable queue, so each one is handed off behind the messages that came
|
|
91
|
+
* before it. HTTP pull recovers retained work only while the socket is down
|
|
92
|
+
* or after a handler failure.
|
|
60
93
|
*/
|
|
61
94
|
export declare function subscribeHostedMailbox(options: MailboxSubscription): MailboxSubscriptionHandle;
|
|
62
95
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hosted-mailbox-subscription.d.ts","sourceRoot":"","sources":["../../client/hosted-mailbox-subscription.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,qBAAqB,EACrB,oBAAoB,EACpB,WAAW,EACZ,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAOL,KAAK,0BAA0B,EAC/B,KAAK,yBAAyB,EAC/B,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"hosted-mailbox-subscription.d.ts","sourceRoot":"","sources":["../../client/hosted-mailbox-subscription.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,qBAAqB,EACrB,oBAAoB,EACpB,WAAW,EACZ,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAOL,KAAK,0BAA0B,EAC/B,KAAK,yBAAyB,EAC/B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,wBAAwB,CAAC;AA8DhC;;;GAGG;AACH,MAAM,MAAM,mBAAmB,GAC3B;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACzB;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,yBAAyB,CAAA;CAAE,CAAC;AAE5E;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,QAAQ,EAAE,SAAS,QAAQ,EAAE,CAAC;IACvC,QAAQ,CAAC,QAAQ,EAAE,SAAS,oBAAoB,EAAE,CAAC;CACpD;AAED,qDAAqD;AACrD,MAAM,WAAW,qBAAqB;IACpC,0EAA0E;IAC1E,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;CACvC;AAED,UAAU,mBAAmB;IAC3B,YAAY,IAAI,OAAO,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACzE,0DAA0D;IAC1D,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,QAAQ,CAAC;IAC1C,oEAAoE;IACpE,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC;IAC7B;;;OAGG;IACH,WAAW,CACT,UAAU,EAAE,SAAS,MAAM,EAAE,EAC7B,UAAU,EAAE,SAAS,MAAM,EAAE,GAC5B,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAClC,OAAO,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClD;;;OAGG;IACH,cAAc,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7D;;;;;;OAMG;IACH,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,GAAG,IAAI,CAAC;IACnE,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5E,YAAY,CAAC,IAAI,IAAI,CAAC;IACtB,UAAU,CAAC,IAAI,IAAI,CAAC;IACpB;;;;OAIG;IACH,iBAAiB,CACf,KAAK,EAAE,oBAAoB,CAAC,OAAO,CAAC,EACpC,MAAM,CAAC,EAAE,qBAAqB,GAC7B,IAAI,CAAC;IACR;;;OAGG;IACH,UAAU,CAAC,CAAC,KAAK,EAAE,mBAAmB,GAAG,IAAI,CAAC;CAC/C;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC;;;OAGG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;IACxC;;;;;OAKG;IACH,QAAQ,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACjE;AAqBD;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,mBAAmB,GAC3B,yBAAyB,CAulB3B"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { HostedRelayPresenceError, decodePresenceAnswer, decodePresenceUpdate, encodePresenceFrame, isPresenceAnswerType, isPresenceUpdateType, } from "./hosted-presence-frames.js";
|
|
2
|
+
import { MAXIMUM_RECEIPTS_PER_FRAME, decodeRelayDeliveryReceipts, } from "./relay-receipt-intake.js";
|
|
2
3
|
const MAILBOX_PROTOCOL = "open-e2ee-relay.v1";
|
|
3
4
|
const AUTH_PROTOCOL_PREFIX = "open-e2ee-relay.auth.";
|
|
4
5
|
/**
|
|
@@ -47,7 +48,10 @@ const PING_MILLISECONDS = 30_000;
|
|
|
47
48
|
const MAXIMUM_UNANSWERED_PINGS = 2;
|
|
48
49
|
const MAXIMUM_FRAME_CHARACTERS = 1024 * 1024;
|
|
49
50
|
const MAXIMUM_PENDING_FRAMES = 100;
|
|
50
|
-
/**
|
|
51
|
+
/**
|
|
52
|
+
* The Relay refuses an `acknowledge` or `acknowledge-receipts` frame, and an
|
|
53
|
+
* HTTP acknowledgment list, that carries more ids.
|
|
54
|
+
*/
|
|
51
55
|
const MAXIMUM_ACKNOWLEDGMENT_IDS = 100;
|
|
52
56
|
/** A presence request fails with `BUSY` while this many wait for an answer. */
|
|
53
57
|
const MAXIMUM_PENDING_PRESENCE_REQUESTS = 16;
|
|
@@ -60,8 +64,10 @@ function notConnected() {
|
|
|
60
64
|
}
|
|
61
65
|
/**
|
|
62
66
|
* Delivers durable and ephemeral frames from the mailbox socket and acknowledges
|
|
63
|
-
* durable frames over the same socket.
|
|
64
|
-
*
|
|
67
|
+
* durable frames over the same socket. Relay delivery receipts share the
|
|
68
|
+
* durable queue, so each one is handed off behind the messages that came
|
|
69
|
+
* before it. HTTP pull recovers retained work only while the socket is down
|
|
70
|
+
* or after a handler failure.
|
|
65
71
|
*/
|
|
66
72
|
export function subscribeHostedMailbox(options) {
|
|
67
73
|
let active = true;
|
|
@@ -91,6 +97,15 @@ export function subscribeHostedMailbox(options) {
|
|
|
91
97
|
const ephemeral = [];
|
|
92
98
|
const durable = [];
|
|
93
99
|
const acknowledgments = [];
|
|
100
|
+
/** The ids of the Relay receipts handed off and not yet acknowledged. */
|
|
101
|
+
const receiptAcknowledgments = [];
|
|
102
|
+
/**
|
|
103
|
+
* True after the live socket advertised Relay receipts in its
|
|
104
|
+
* `mailbox-capabilities` frame. Each new socket starts at false.
|
|
105
|
+
*/
|
|
106
|
+
let relayReceipts = false;
|
|
107
|
+
/** The messages acknowledged on the live socket that wait for its reply. */
|
|
108
|
+
const awaitingReply = new Set();
|
|
94
109
|
const presenceRequests = new Map();
|
|
95
110
|
let presenceSequence = 0;
|
|
96
111
|
const liveSocket = () => active && socket?.readyState === 1 ? socket : undefined;
|
|
@@ -116,20 +131,62 @@ export function subscribeHostedMailbox(options) {
|
|
|
116
131
|
else
|
|
117
132
|
request.resolve(answer.result);
|
|
118
133
|
};
|
|
134
|
+
/** Gives each message the reply of an HTTP acknowledgment. */
|
|
135
|
+
const answerHttpAcknowledgment = (messageIds, request) => {
|
|
136
|
+
request.then(({ receipted }) => {
|
|
137
|
+
for (const messageId of messageIds)
|
|
138
|
+
options.onAcknowledgmentReply(messageId, receipted.includes(messageId));
|
|
139
|
+
}, () => {
|
|
140
|
+
for (const messageId of messageIds)
|
|
141
|
+
options.onAcknowledgmentReply(messageId, false);
|
|
142
|
+
});
|
|
143
|
+
};
|
|
119
144
|
const flushAcknowledgments = () => {
|
|
120
145
|
clearTimeout(acknowledgmentTimer);
|
|
121
146
|
acknowledgmentTimer = undefined;
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
147
|
+
const live = socket?.readyState === 1 ? socket : undefined;
|
|
148
|
+
if (live !== undefined) {
|
|
149
|
+
while (acknowledgments.length > 0) {
|
|
150
|
+
const messageIds = acknowledgments.splice(0, MAXIMUM_ACKNOWLEDGMENT_IDS);
|
|
151
|
+
// Only a socket that advertised Relay receipts replies with
|
|
152
|
+
// `receipted`, so the reply of any other socket is known now.
|
|
153
|
+
for (const messageId of messageIds)
|
|
154
|
+
if (relayReceipts)
|
|
155
|
+
awaitingReply.add(messageId);
|
|
156
|
+
else
|
|
157
|
+
options.onAcknowledgmentReply(messageId, false);
|
|
126
158
|
live.send(JSON.stringify({ type: "acknowledge", messageIds }));
|
|
127
|
-
continue;
|
|
128
159
|
}
|
|
129
|
-
//
|
|
130
|
-
//
|
|
131
|
-
|
|
160
|
+
// A socket that did not advertise Relay receipts closes on an
|
|
161
|
+
// `acknowledge-receipts` frame, so the receipts of a pull page go over
|
|
162
|
+
// HTTP while it is live. A replay acknowledges a lost receipt again.
|
|
163
|
+
while (receiptAcknowledgments.length > 0) {
|
|
164
|
+
const receiptIds = receiptAcknowledgments.splice(0, MAXIMUM_ACKNOWLEDGMENT_IDS);
|
|
165
|
+
if (relayReceipts)
|
|
166
|
+
live.send(JSON.stringify({ type: "acknowledge-receipts", receiptIds }));
|
|
167
|
+
else
|
|
168
|
+
options.acknowledge([], receiptIds).catch(() => undefined);
|
|
169
|
+
}
|
|
170
|
+
return;
|
|
132
171
|
}
|
|
172
|
+
// The socket left after delivery. Reconnect redelivery re-acknowledges
|
|
173
|
+
// anything this request loses.
|
|
174
|
+
while (acknowledgments.length > 0 || receiptAcknowledgments.length > 0) {
|
|
175
|
+
const messageIds = acknowledgments.splice(0, MAXIMUM_ACKNOWLEDGMENT_IDS);
|
|
176
|
+
const receiptIds = receiptAcknowledgments.splice(0, MAXIMUM_ACKNOWLEDGMENT_IDS);
|
|
177
|
+
answerHttpAcknowledgment(messageIds, options.acknowledge(messageIds, receiptIds));
|
|
178
|
+
}
|
|
179
|
+
};
|
|
180
|
+
/** Gives each message of an `acknowledged` frame the reply of its socket. */
|
|
181
|
+
const answerAcknowledgment = (frame) => {
|
|
182
|
+
const { messageIds, receipted = [] } = frame;
|
|
183
|
+
const ids = (value) => Array.isArray(value) &&
|
|
184
|
+
value.every((messageId) => typeof messageId === "string");
|
|
185
|
+
if (!ids(messageIds) || !ids(receipted))
|
|
186
|
+
throw new Error("Invalid mailbox frame.");
|
|
187
|
+
for (const messageId of messageIds)
|
|
188
|
+
if (awaitingReply.delete(messageId))
|
|
189
|
+
options.onAcknowledgmentReply(messageId, receipted.includes(messageId));
|
|
133
190
|
};
|
|
134
191
|
/**
|
|
135
192
|
* Schedules one recovery pull. A pending pull that starts sooner stays, and
|
|
@@ -160,25 +217,37 @@ export function subscribeHostedMailbox(options) {
|
|
|
160
217
|
failedWorkRecoveryDelay = Math.min(MAXIMUM_RECOVERY_MILLISECONDS, failedWorkRecoveryDelay * 2);
|
|
161
218
|
};
|
|
162
219
|
/**
|
|
163
|
-
* Receives each message
|
|
164
|
-
* in the mailbox, and the next recovery
|
|
165
|
-
*
|
|
166
|
-
*
|
|
167
|
-
*
|
|
168
|
-
*
|
|
169
|
-
*
|
|
170
|
-
*
|
|
220
|
+
* Receives each message and hands off each Relay receipt in mailbox order.
|
|
221
|
+
* A message whose work fails stays in the mailbox, and the next recovery
|
|
222
|
+
* pull or socket replay gives it again. A receipt whose hand-off fails is
|
|
223
|
+
* not acknowledged, so it stays too. The batch continues with the next item
|
|
224
|
+
* at once, whatever its sender, so the order is not kept across a failed
|
|
225
|
+
* item. Resolves with `failed` true when the work of an item failed, and
|
|
226
|
+
* with the number of message acknowledgments made during the batch. A
|
|
227
|
+
* message that resolves without an acknowledgment, as an unhandled
|
|
228
|
+
* duplicate or a failed retry-request send does, is not counted.
|
|
171
229
|
*/
|
|
172
|
-
const receiveBatch = async (
|
|
173
|
-
if (!active ||
|
|
230
|
+
const receiveBatch = async (batch) => {
|
|
231
|
+
if (!active || batch.length === 0)
|
|
174
232
|
return { failed: false, acknowledged: 0 };
|
|
175
233
|
let failed = false;
|
|
176
234
|
const acknowledgmentsBefore = acknowledgmentCount;
|
|
177
235
|
options.onBatchStart?.();
|
|
178
236
|
try {
|
|
179
|
-
for (const
|
|
237
|
+
for (const work of batch) {
|
|
180
238
|
if (!active)
|
|
181
239
|
break;
|
|
240
|
+
if ("receipt" in work) {
|
|
241
|
+
try {
|
|
242
|
+
await options.receiveReceipt(work.receipt);
|
|
243
|
+
receiptAcknowledgments.push(work.receipt.receiptId);
|
|
244
|
+
}
|
|
245
|
+
catch {
|
|
246
|
+
failed = true;
|
|
247
|
+
}
|
|
248
|
+
continue;
|
|
249
|
+
}
|
|
250
|
+
const { message } = work;
|
|
182
251
|
try {
|
|
183
252
|
await options.receive(message);
|
|
184
253
|
if (message.id !== undefined)
|
|
@@ -247,8 +316,11 @@ export function subscribeHostedMailbox(options) {
|
|
|
247
316
|
pullRequested = false;
|
|
248
317
|
flushAcknowledgments();
|
|
249
318
|
const pulledAt = Date.now();
|
|
250
|
-
const messages = await options.pull();
|
|
251
|
-
const { failed, acknowledged } = await receiveBatch(
|
|
319
|
+
const { messages, receipts } = await options.pull();
|
|
320
|
+
const { failed, acknowledged } = await receiveBatch([
|
|
321
|
+
...messages.map((message) => ({ message })),
|
|
322
|
+
...receipts.map((receipt) => ({ receipt })),
|
|
323
|
+
]);
|
|
252
324
|
flushAcknowledgments();
|
|
253
325
|
// A failed message can be missing from the page while it waits in the
|
|
254
326
|
// Relay's hot delivery window, so a pull follows while one remains.
|
|
@@ -292,6 +364,12 @@ export function subscribeHostedMailbox(options) {
|
|
|
292
364
|
connectionGeneration++;
|
|
293
365
|
ephemeral.length = 0;
|
|
294
366
|
durable.length = 0;
|
|
367
|
+
relayReceipts = false;
|
|
368
|
+
// A reply can arrive only on the socket that carried the acknowledgment.
|
|
369
|
+
const unanswered = [...awaitingReply];
|
|
370
|
+
awaitingReply.clear();
|
|
371
|
+
for (const messageId of unanswered)
|
|
372
|
+
options.onAcknowledgmentReply(messageId, false);
|
|
295
373
|
clearTimeout(handshakeTimer);
|
|
296
374
|
clearTimeout(renewalTimer);
|
|
297
375
|
clearTimeout(pingTimer);
|
|
@@ -327,7 +405,21 @@ export function subscribeHostedMailbox(options) {
|
|
|
327
405
|
return;
|
|
328
406
|
}
|
|
329
407
|
if (socket === candidate)
|
|
330
|
-
durable.push(envelope);
|
|
408
|
+
durable.push({ message: envelope });
|
|
409
|
+
void drain();
|
|
410
|
+
};
|
|
411
|
+
const queueReceipts = (candidate, frame) => {
|
|
412
|
+
const receipts = decodeRelayDeliveryReceipts(frame, MAXIMUM_RECEIPTS_PER_FRAME);
|
|
413
|
+
for (const receipt of receipts) {
|
|
414
|
+
if (durable.length >= MAXIMUM_PENDING_FRAMES) {
|
|
415
|
+
// The receipt stays retained until it is acknowledged; the recovery
|
|
416
|
+
// pull collects it.
|
|
417
|
+
recoverLater();
|
|
418
|
+
break;
|
|
419
|
+
}
|
|
420
|
+
if (socket === candidate)
|
|
421
|
+
durable.push({ receipt });
|
|
422
|
+
}
|
|
331
423
|
void drain();
|
|
332
424
|
};
|
|
333
425
|
const connect = async () => {
|
|
@@ -418,7 +510,22 @@ export function subscribeHostedMailbox(options) {
|
|
|
418
510
|
!("type" in frame) ||
|
|
419
511
|
typeof frame.type !== "string")
|
|
420
512
|
throw new Error("Invalid mailbox frame.");
|
|
421
|
-
if (
|
|
513
|
+
if (frame.type === "mailbox-capabilities") {
|
|
514
|
+
const advertised = frame
|
|
515
|
+
.relayReceipts;
|
|
516
|
+
if (typeof advertised !== "boolean")
|
|
517
|
+
throw new Error("Invalid mailbox frame.");
|
|
518
|
+
relayReceipts = advertised;
|
|
519
|
+
}
|
|
520
|
+
else if (frame.type === "acknowledged")
|
|
521
|
+
answerAcknowledgment(frame);
|
|
522
|
+
else if (frame.type === "delivery-receipt") {
|
|
523
|
+
// Only a socket that advertised Relay receipts sends them.
|
|
524
|
+
if (!relayReceipts || !("receipts" in frame))
|
|
525
|
+
throw new Error("Invalid mailbox frame.");
|
|
526
|
+
queueReceipts(candidate, frame.receipts);
|
|
527
|
+
}
|
|
528
|
+
else if (isPresenceAnswerType(frame.type))
|
|
422
529
|
answerPresence(frame);
|
|
423
530
|
else if (isPresenceUpdateType(frame.type)) {
|
|
424
531
|
const update = decodePresenceUpdate(frame);
|