@open-e2ee/signal-protocol-sdk 14.3.0 → 14.4.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.
Files changed (63) hide show
  1. package/CHANGELOG.md +70 -0
  2. package/README.md +1 -1
  3. package/SECURITY.md +2 -2
  4. package/dist/client/delivery-status.d.ts.map +1 -1
  5. package/dist/client/delivery-status.js +8 -7
  6. package/dist/client/delivery-status.js.map +1 -1
  7. package/dist/client/hosted-anonymous-delivery.d.ts +10 -4
  8. package/dist/client/hosted-anonymous-delivery.d.ts.map +1 -1
  9. package/dist/client/hosted-anonymous-delivery.js +17 -8
  10. package/dist/client/hosted-anonymous-delivery.js.map +1 -1
  11. package/dist/client/hosted-device-link-transport.d.ts +6 -2
  12. package/dist/client/hosted-device-link-transport.d.ts.map +1 -1
  13. package/dist/client/hosted-device-link-transport.js +10 -5
  14. package/dist/client/hosted-device-link-transport.js.map +1 -1
  15. package/dist/client/hosted-group-authority.d.ts +4 -2
  16. package/dist/client/hosted-group-authority.d.ts.map +1 -1
  17. package/dist/client/hosted-group-authority.js +10 -7
  18. package/dist/client/hosted-group-authority.js.map +1 -1
  19. package/dist/client/hosted-groups.d.ts +8 -3
  20. package/dist/client/hosted-groups.d.ts.map +1 -1
  21. package/dist/client/hosted-groups.js +15 -9
  22. package/dist/client/hosted-groups.js.map +1 -1
  23. package/dist/client/hosted-mailbox-subscription.d.ts +6 -2
  24. package/dist/client/hosted-mailbox-subscription.d.ts.map +1 -1
  25. package/dist/client/hosted-mailbox-subscription.js +20 -8
  26. package/dist/client/hosted-mailbox-subscription.js.map +1 -1
  27. package/dist/client/hosted-sandbox-identity.d.ts +23 -19
  28. package/dist/client/hosted-sandbox-identity.d.ts.map +1 -1
  29. package/dist/client/hosted-sandbox-identity.js +23 -19
  30. package/dist/client/hosted-sandbox-identity.js.map +1 -1
  31. package/dist/client/hosted-store-records.d.ts +22 -17
  32. package/dist/client/hosted-store-records.d.ts.map +1 -1
  33. package/dist/client/hosted-store-records.js +15 -10
  34. package/dist/client/hosted-store-records.js.map +1 -1
  35. package/dist/client/hosted-transport.d.ts +10 -6
  36. package/dist/client/hosted-transport.d.ts.map +1 -1
  37. package/dist/client/hosted-transport.js +132 -87
  38. package/dist/client/hosted-transport.js.map +1 -1
  39. package/dist/client/hosted.d.ts +15 -4
  40. package/dist/client/hosted.d.ts.map +1 -1
  41. package/dist/client/hosted.js +6 -6
  42. package/dist/client/hosted.js.map +1 -1
  43. package/dist/client/receive-work-seed.d.ts +4 -4
  44. package/dist/client/receive-work-seed.d.ts.map +1 -1
  45. package/dist/client/receive-work-seed.js +1 -1
  46. package/dist/client/receive-work-seed.js.map +1 -1
  47. package/dist/client/signal-relay-protocol.d.ts +83 -18
  48. package/dist/client/signal-relay-protocol.d.ts.map +1 -1
  49. package/dist/client/signal-relay-protocol.js +186 -15
  50. package/dist/client/signal-relay-protocol.js.map +1 -1
  51. package/dist/client/signal-relay-subscription.js +1 -1
  52. package/dist/client/signal-relay-subscription.js.map +1 -1
  53. package/dist/local/store/receive-work.d.ts +5 -5
  54. package/dist/local/store/receive-work.d.ts.map +1 -1
  55. package/dist/local/store/receive-work.js +10 -12
  56. package/dist/local/store/receive-work.js.map +1 -1
  57. package/dist/local/store/reliability.d.ts +7 -4
  58. package/dist/local/store/reliability.d.ts.map +1 -1
  59. package/dist/local/store/reliability.js.map +1 -1
  60. package/dist/types/api.d.ts +12 -9
  61. package/dist/types/api.d.ts.map +1 -1
  62. package/docs/ASSURANCE.md +3 -3
  63. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,5 +1,75 @@
1
1
  # Changelog
2
2
 
3
+ ## 14.4.0
4
+
5
+ ### Changed
6
+
7
+ - **The SDK speaks protocol version 3 of the OpenE2EE Signal Protocol Relay.**
8
+ Version 3 keeps the behavior of version 2 and uses the Signal Relay names.
9
+ It sends the header `x-signal-relay-protocol: 3`, and the mailbox socket
10
+ offers `signal-relay.v3` with `signal-relay.auth.<token>`. Each device proof
11
+ signs a version 3 label, for example
12
+ `signal-relay-device-authentication-v2\0`. The Relay issues a device token
13
+ with the issuer `signal-relay`, the audience `signal-relay-device`, and the
14
+ claim `signal_relay_scope_id`. A version 3 response names the scope
15
+ `signalRelayScopeId` and the receipts capability `signalRelayReceipts`. The
16
+ SDK reads the earlier names too, and it refuses a response that gives two
17
+ different values.
18
+ - **The SDK falls back to version 2.** When the Relay refuses version 3 with
19
+ `PROTOCOL_UNSUPPORTED`, the client sends the refused request again with
20
+ version 2, and it offers version 2 until it stops. The Relay refuses the
21
+ version before it reads the request, so the refused request had no effect.
22
+ A socket that the Relay closes with 4400 reconnects with version 2 after its
23
+ usual backoff. A client with an explicit protocol version never falls back.
24
+ A Relay that predates version 3 does not refuse version 3 with
25
+ `PROTOCOL_UNSUPPORTED`, so the client does not fall back to version 2.
26
+ Use this release with a Relay that serves version 3.
27
+ - **`HostedSignalProtocolRelayDeviceAuthentication` signs the label of a
28
+ protocol version.** `signChallenge` and `signCertificateRequest` take an
29
+ optional last argument, `protocolVersion`. A call without it signs the
30
+ version 1 label, which the Relay verifies on versions 1 and 2 and on a
31
+ request without a version. An adapter that sends the proof with
32
+ `x-signal-relay-protocol: 3` must pass `3`. An adapter that sends no version
33
+ needs no change.
34
+ - **This release writes the Signal Relay values to the local store.** A new
35
+ receive record holds the origin `'signal-relay'` and the receipt decision
36
+ `signalProtocolRelayOwnsReceipt`. A new Relay delivery status holds the
37
+ source `'signal-relay'`. A hosted record goes to its `signalRelay.<record>.v2:`
38
+ key only. When only the earlier `.v1:` key holds a record, a read copies the
39
+ record to the current key and keeps the earlier key. The SDK still reports
40
+ `'relay'` to the application for `DeliverySource`, `PendingReceive.origin`,
41
+ and `ReceiveExpiredEvent.origin`, as in SDK 14.3.0.
42
+
43
+ #### Store compatibility
44
+
45
+ - A store that SDK 14.0.0 through 14.3.0 wrote opens with this release. This
46
+ release reads the origin `'relay'`, the receipt decision
47
+ `relayOwnsReceipt`, the source `'relay'`, and each `.v1:` key. SDK 15.0.0
48
+ still reads them. A record that an earlier release wrote keeps the origin
49
+ `'relay'` when this release changes it.
50
+ - A return to SDK 14.2.0 or 14.3.0 is supported. Those releases read each
51
+ value that this release writes, and they read the current key of a hosted
52
+ record first.
53
+ - A return to SDK 14.1.0 or earlier is not supported for a store that this
54
+ release wrote. Those releases refuse the origin `'signal-relay'`. They read
55
+ only the `.v1:` key of a hosted record, so they do not find a record that
56
+ this release created, and they read an earlier value of a record that this
57
+ release changed.
58
+ - Do not ship SDK 14.1.0 or earlier to a device after it runs this release.
59
+ To roll back, ship SDK 14.2.0 or 14.3.0. A device that goes back to SDK
60
+ 14.1.0 or earlier can have these failures:
61
+ - Messages that the device received but did not complete can stay
62
+ unprocessed. The receive queue fails each time it reads a stored receive
63
+ with the origin `'signal-relay'`.
64
+ - A device that registered with this release cannot resume its Relay
65
+ connection. The earlier release does not find the device authentication
66
+ key, and the resume fails with `RETAINED_DEVICE_AUTHENTICATION_UNAVAILABLE`.
67
+ - A device-owned identity that this release created is lost. The earlier
68
+ release does not find the key, so it creates a new key. The Relay binds
69
+ an account to that key, so the device gets a new account.
70
+ - A hosted record that this release changed goes back to its earlier
71
+ value. An example is the stored Relay session.
72
+
3
73
  ## 14.3.0
4
74
 
5
75
  ### Changed
package/README.md CHANGED
@@ -35,7 +35,7 @@ The relay never needs message plaintext or device private keys.
35
35
 
36
36
  The OpenE2EE Signal Protocol SDK implements a versioned profile of the published Signal Protocol specifications. It is not affiliated with Signal Messenger and is **not wire-compatible with Signal Messenger or libsignal**. Messages, identities, and safety numbers do not interoperate. See the [notice](./NOTICE) and [documented deviations](./docs/DEVIATIONS.md).
37
37
 
38
- Version `14.3.x`. Public APIs and persisted formats follow semantic versioning.
38
+ Version `14.4.x`. Public APIs and persisted formats follow semantic versioning.
39
39
 
40
40
  ## Install
41
41
 
package/SECURITY.md CHANGED
@@ -7,8 +7,8 @@ backports.
7
7
 
8
8
  | Version | Supported |
9
9
  | -------- | ------------------ |
10
- | 14.3.x | :white_check_mark: |
11
- | < 14.3.0 | :x: |
10
+ | 14.4.x | :white_check_mark: |
11
+ | < 14.4.0 | :x: |
12
12
 
13
13
  ## Reporting a Vulnerability
14
14
 
@@ -1 +1 @@
1
- {"version":3,"file":"delivery-status.d.ts","sourceRoot":"","sources":["../../client/delivery-status.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAWH,OAAO,KAAK,EAAE,cAAc,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAC/E,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,+BAA+B,CAAC;AAExF,KAAK,mBAAmB,GAAG,IAAI,CAC7B,wBAAwB,EACxB,aAAa,GAAG,aAAa,GAAG,gBAAgB,GAAG,oCAAoC,CACxF,CAAC;AAuCF,qBAAa,qBAAqB;IAIpB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAHlC,+FAA+F;IAC/F,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA6B;IAErD,YAA6B,KAAK,EAAE,mBAAmB,EAAI;IAE3D,kFAAkF;IAC3E,SAAS,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAE9C;IAED,2DAA2D;IACpD,OAAO,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAI5C;IAED,4EAA4E;IAC/D,+BAA+B,CAAC,OAAO,EAAE,kCAAkC,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,CAcnH;IAED;;;;;;;;;OASG;IACU,gBAAgB,CAC3B,WAAW,EAAE,MAAM,EACnB,iBAAiB,EAAE,MAAM,EACzB,UAAU,EAAE,SAAS,MAAM,EAAE,EAC7B,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,EAAE,CAAC,CAe3B;IAED;;;OAGG;IACU,OAAO,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,CAOvE;IAED;;;;;;;;OAQG;IACU,QAAQ,CACnB,KAAK,EAAE,yBAAyB,GAAG,SAAS,EAC5C,MAAM,EAAE,SAAS,cAAc,EAAE,GAChC,OAAO,CAAC,IAAI,CAAC,CAMf;IAED;;;;OAIG;YACW,aAAa;YAcb,KAAK;CA0BpB"}
1
+ {"version":3,"file":"delivery-status.d.ts","sourceRoot":"","sources":["../../client/delivery-status.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAWH,OAAO,KAAK,EAAE,cAAc,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAC/E,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,+BAA+B,CAAC;AAExF,KAAK,mBAAmB,GAAG,IAAI,CAC7B,wBAAwB,EACxB,aAAa,GAAG,aAAa,GAAG,gBAAgB,GAAG,oCAAoC,CACxF,CAAC;AAuCF,qBAAa,qBAAqB;IAIpB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAHlC,+FAA+F;IAC/F,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA6B;IAErD,YAA6B,KAAK,EAAE,mBAAmB,EAAI;IAE3D,kFAAkF;IAC3E,SAAS,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAE9C;IAED,2DAA2D;IACpD,OAAO,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAI5C;IAED,4EAA4E;IAC/D,+BAA+B,CAAC,OAAO,EAAE,kCAAkC,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,CAcnH;IAED;;;;;;;;;OASG;IACU,gBAAgB,CAC3B,WAAW,EAAE,MAAM,EACnB,iBAAiB,EAAE,MAAM,EACzB,UAAU,EAAE,SAAS,MAAM,EAAE,EAC7B,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,EAAE,CAAC,CAe3B;IAED;;;OAGG;IACU,OAAO,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,CAOvE;IAED;;;;;;;;OAQG;IACU,QAAQ,CACnB,KAAK,EAAE,yBAAyB,GAAG,SAAS,EAC5C,MAAM,EAAE,SAAS,cAAc,EAAE,GAChC,OAAO,CAAC,IAAI,CAAC,CAMf;IAED;;;;OAIG;YACW,aAAa;YAcb,KAAK;CA2BpB"}
@@ -80,7 +80,7 @@ export class DeliveryStatusTracker {
80
80
  async applySignalProtocolRelayReceipt(receipt) {
81
81
  const events = [];
82
82
  for (const clientMessageId of new Set(receipt.messageIds)) {
83
- events.push(...(await this.apply(clientMessageId, 'relay', receipt.recipient.accountId, receipt.recipient.deviceId, receipt.deliveredAt)));
83
+ events.push(...(await this.apply(clientMessageId, 'signal-relay', receipt.recipient.accountId, receipt.recipient.deviceId, receipt.deliveredAt)));
84
84
  }
85
85
  return events;
86
86
  }
@@ -146,11 +146,11 @@ export class DeliveryStatusTracker {
146
146
  delivery.announced = announced;
147
147
  });
148
148
  }
149
- // The source is the stored value. This release stores and reports
150
- // 'relay' for a Relay receipt. The public DeliverySource also accepts
151
- // 'signal-relay', the value of SDK 15.0.0, which the client does not emit.
152
- // A status that a later release wrote can hold 'signal-relay'. It is the
153
- // same source as 'relay', and the client keeps the stored value.
149
+ // The source is the stored value. This release stores 'signal-relay' for a
150
+ // Relay receipt, and reports it as 'relay'. The public DeliverySource also
151
+ // accepts 'signal-relay', the value that SDK 15.0.0 reports. A status that
152
+ // SDK 14.3.0 or earlier wrote holds 'relay'. It is the same source, and
153
+ // the client keeps the stored value.
154
154
  async apply(clientMessageId, source, recipientId, recipientDeviceId, deliveredAt) {
155
155
  return ((await updateDeliveryStatus(this.store, clientMessageId, (status, intent) => {
156
156
  if (!addresses(intent, recipientId))
@@ -163,7 +163,8 @@ export class DeliveryStatusTracker {
163
163
  });
164
164
  // A replay of a source adds nothing. It still announces each source
165
165
  // whose hook did not return.
166
- if (!delivery.sources.some((stored) => reportedDeliverySource(stored) === source)) {
166
+ const reported = reportedDeliverySource(source);
167
+ if (!delivery.sources.some((stored) => reportedDeliverySource(stored) === reported)) {
167
168
  delivery.sources.push(source);
168
169
  }
169
170
  if (!intent.result || this.sending.has(clientMessageId))
@@ -1 +1 @@
1
- {"version":3,"file":"delivery-status.js","sourceRoot":"","sources":["../../client/delivery-status.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"delivery-status.js","sourceRoot":"","sources":["../../client/delivery-status.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAGH,OAAO,EACL,uBAAuB,EACvB,sBAAsB,EACtB,oBAAoB,GAIrB,MAAM,4BAA4B,CAAC;AASpC,SAAS,SAAS,CAAC,MAAmC,EAAE,WAAmB;IACzE,OAAO,MAAM,CAAC,IAAI,KAAK,OAAO;QAC5B,CAAC,CAAC,CAAC,MAAM,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC;QACzD,CAAC,CAAC,MAAM,CAAC,WAAW,KAAK,WAAW,CAAC;AACzC,CAAC;AAED;;;;GAIG;AACH,SAAS,WAAW,CAClB,MAA4B,EAC5B,MAAmC;IAEnC,MAAM,MAAM,GAAqB,EAAE,CAAC;IACpC,KAAK,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QACpE,KAAK,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3D,KAAK,IAAI,KAAK,GAAG,QAAQ,CAAC,SAAS,EAAE,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;gBAC9E,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;gBACjF,MAAM,CAAC,IAAI,CAAC;oBACV,eAAe,EAAE,MAAM,CAAC,eAAe;oBACvC,WAAW;oBACX,iBAAiB,EAAE,MAAM,CAAC,QAAQ,CAAC;oBACnC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC;oBACtB,OAAO;oBACP,mBAAmB,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;oBAC7C,WAAW,EAAE,QAAQ,CAAC,WAAW;oBACjC,eAAe,EAAE,MAAM,CAAC,eAAe;oBACvC,GAAG,CAAC,MAAM,CAAC,IAAI,KAAK,OAAO,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC;iBAChE,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,OAAO,qBAAqB;IAIH,KAAK;IAHlC,+FAA+F;IAC9E,OAAO,GAAG,IAAI,GAAG,EAAkB,CAAC;IAErD,YAA6B,KAA0B;qBAA1B,KAAK;IAAwB,CAAC;IAE3D,kFAAkF;IAC3E,SAAS,CAAC,eAAuB;QACtC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAClF,CAAC;IAED,2DAA2D;IACpD,OAAO,CAAC,eAAuB;QACpC,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QAC3D,IAAI,KAAK,GAAG,CAAC;YAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;;YACnD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAC5C,CAAC;IAED,4EAA4E;IACrE,KAAK,CAAC,+BAA+B,CAAC,OAA2C;QACtF,MAAM,MAAM,GAAqB,EAAE,CAAC;QACpC,KAAK,MAAM,eAAe,IAAI,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YAC1D,MAAM,CAAC,IAAI,CACT,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAClB,eAAe,EACf,cAAc,EACd,OAAO,CAAC,SAAS,CAAC,SAAS,EAC3B,OAAO,CAAC,SAAS,CAAC,QAAQ,EAC1B,OAAO,CAAC,WAAW,CACpB,CAAC,CACH,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;;;;;;OASG;IACI,KAAK,CAAC,gBAAgB,CAC3B,WAAmB,EACnB,iBAAyB,EACzB,UAA6B,EAC7B,WAAmB;QAEnB,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;QACxC,MAAM,IAAI,CAAC,KAAK,CAAC,kCAAkC,CACjD,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,iBAAiB,EAAE,EACpD,MAAM,CACP,CAAC;QACF,MAAM,MAAM,GAAqB,EAAE,CAAC;QACpC,KAAK,MAAM,SAAS,IAAI,MAAM,EAAE,CAAC;YAC/B,KAAK,MAAM,eAAe,IAAI,MAAM,uBAAuB,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,CAAC;gBACnF,MAAM,CAAC,IAAI,CACT,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,WAAW,CAAC,CAAC,CAC5F,CAAC;YACJ,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,OAAO,CAAC,eAAuB;QAC1C,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YAAE,OAAO,EAAE,CAAC;QACjD,OAAO,CACL,CAAC,MAAM,oBAAoB,CAAC,IAAI,CAAC,KAAK,EAAE,eAAe,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CAC1E,MAAM,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CACvF,CAAC,IAAI,EAAE,CACT,CAAC;IACJ,CAAC;IAED;;;;;;;;OAQG;IACI,KAAK,CAAC,QAAQ,CACnB,KAA4C,EAC5C,MAAiC;QAEjC,MAAM,OAAO,GAAG,KAAK,EAAE,WAAW,CAAC;QACnC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,IAAI,OAAO;gBAAE,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC;YAClC,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,aAAa,CAAC,KAAqB;QAC/C,MAAM,oBAAoB,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,eAAe,EAAE,CAAC,MAAM,EAAE,EAAE;YACvE,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;YACtF,IAAI,CAAC,QAAQ;gBAAE,OAAO;YACtB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAC1E,IAAI,SAAS,GAAG,QAAQ,CAAC,SAAS;gBAAE,QAAQ,CAAC,SAAS,GAAG,SAAS,CAAC;QACrE,CAAC,CAAC,CAAC;IACL,CAAC;IAED,2EAA2E;IAC3E,2EAA2E;IAC3E,2EAA2E;IAC3E,wEAAwE;IACxE,qCAAqC;IAC7B,KAAK,CAAC,KAAK,CACjB,eAAuB,EACvB,MAA6B,EAC7B,WAAmB,EACnB,iBAAyB,EACzB,WAAmB;QAEnB,OAAO,CACL,CAAC,MAAM,oBAAoB,CAAC,IAAI,CAAC,KAAK,EAAE,eAAe,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;YAC1E,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC;gBAAE,OAAO,EAAE,CAAC;YAC/C,MAAM,OAAO,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC;YACrD,MAAM,QAAQ,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,KAAK;gBACvD,OAAO,EAAE,EAAE;gBACX,WAAW;gBACX,SAAS,EAAE,CAAC;aACb,CAAC,CAAC;YACH,oEAAoE;YACpE,6BAA6B;YAC7B,MAAM,QAAQ,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;YAChD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,KAAK,QAAQ,CAAC,EAAE,CAAC;gBACpF,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAChC,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;gBAAE,OAAO,EAAE,CAAC;YACnE,OAAO,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC,IAAI,EAAE,CACV,CAAC;IACJ,CAAC;CACF"}
@@ -2,6 +2,7 @@ import type { ContentKind, DeliveryClass, SealedSenderAuth } from "../remote/sig
2
2
  import { type BoundedFanOut } from "../utils/bounded-fan-out.js";
3
3
  import type { HostedSignalProtocolRelayConnection } from "./hosted-connection.js";
4
4
  import { type RepeatRequest } from "../remote/signal-relay/request-admission.js";
5
+ import { type SignalRelayProtocolOffer } from "./signal-relay-protocol.js";
5
6
  type Destination = {
6
7
  accountAddress: string;
7
8
  deviceId: number;
@@ -67,14 +68,14 @@ export declare class HostedAnonymousDelivery {
67
68
  * for each destination device. When it rejects, no repeat starts.
68
69
  */
69
70
  private readonly beforeRepeat;
70
- /** The Relay protocol version of the client that owns this delivery. */
71
- private readonly signalRelayProtocolVersion;
72
71
  /**
73
72
  * Runs after the Relay refuses a direct post as NOT_FOUND. True when the
74
73
  * device directory lists the device at another mailbox generation than
75
74
  * the posted destination: a recovery retired the posted generation.
76
75
  */
77
76
  private readonly destinationRecovered;
77
+ /** The Relay protocol version of the client that owns this delivery. */
78
+ private readonly signalRelayProtocol;
78
79
  constructor(connection: HostedSignalProtocolRelayConnection, fanOut: BoundedFanOut,
79
80
  /**
80
81
  * The destination of one device. `declaredDeviceIds` is the declared
@@ -89,8 +90,12 @@ export declare class HostedAnonymousDelivery {
89
90
  * for each destination device. When it rejects, no repeat starts.
90
91
  */
91
92
  beforeRepeat?: (clientMessageId: string, request: RepeatRequest) => Promise<void>,
92
- /** The Relay protocol version of the client that owns this delivery. */
93
- signalRelayProtocolVersion?: number,
93
+ /**
94
+ * The selected Relay protocol version, or the offer of the client that
95
+ * owns this delivery. Without it, the delivery offers version 3 first
96
+ * and falls back to version 2.
97
+ */
98
+ signalRelayProtocol?: number | SignalRelayProtocolOffer,
94
99
  /**
95
100
  * Runs after the Relay refuses a direct post as NOT_FOUND. True when the
96
101
  * device directory lists the device at another mailbox generation than
@@ -110,6 +115,7 @@ export declare class HostedAnonymousDelivery {
110
115
  */
111
116
  private resolveAll;
112
117
  private post;
118
+ private postWith;
113
119
  send(sentMessageBase64: string, auth: SealedSenderAuth, timestamp: number, deliveryClass: DeliveryClass, recipientUserIds?: string[], clientMessageId?: string, operationEpochMilliseconds?: number, contentKind?: ContentKind, declaredDeviceSets?: readonly {
114
120
  userId: string;
115
121
  deviceIds: readonly number[];
@@ -1 +1 @@
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,8BAA8B,CAAC;AAGtC,OAAO,EAAe,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,qBAAqB,CAAC;AAU/E,OAAO,EAEL,KAAK,aAAa,EACnB,MAAM,0CAA0C,CAAC;AAkBlD,KAAK,WAAW,GAAG;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAUF,KAAK,gBAAgB,GAAG;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CACjE,CAAC;AAiCF,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;IAC5B;;;;;OAKG;aACa,IAAI,CAAC,EAAE,QAAQ,CAAC;QAAE,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;KAAE,CAAC;IATjF,YACkB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM;IAC5B;;;;;OAKG;IACa,IAAI,CAAC,EAAE,QAAQ,CAAC;QAAE,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;KAAE,CAAC,YAAA,EAIhF;CACF;AA4DD,qFAAqF;AACrF,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IAKnC;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,YAAY;IAI7B,wEAAwE;IACxE,OAAO,CAAC,QAAQ,CAAC,0BAA0B;IAC3C;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IA9BvC,YACmB,UAAU,EAAE,mCAAmC,EAC/C,MAAM,EAAE,aAAa;IACtC;;;;;OAKG;IACc,kBAAkB,EAAE,CACnC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,iBAAiB,CAAC,EAAE,SAAS,MAAM,EAAE,KAClC,OAAO,CAAC,WAAW,CAAC;IACzB;;;;OAIG;IACc,YAAY,GAAE,CAC7B,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,aAAa,KACnB,OAAO,CAAC,IAAI,CAAkB;IACnC,wEAAwE;IACvD,0BAA0B,GAAE,MAA+B;IAC5E;;;;OAIG;IACc,oBAAoB,GAAE,CACrC,WAAW,EAAE,WAAW,KACrB,OAAO,CAAC,OAAO,CAAqB,EACvC;IAEJ;;;;OAIG;YACW,IAAI;IAWlB;;;;OAIG;YACW,UAAU;IA2BxB,OAAO,CAAC,IAAI;IA8FC,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,EACpC,kBAAkB,CAAC,EAAE,SAAS;QAC5B,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;KAC9B,EAAE,GACF,OAAO,CAAC,gBAAgB,CAAC,CA6J3B;IAED,gEAAgE;YAClD,SAAS;IAkGvB,sDAAsD;YACxC,UAAU;CAkJzB"}
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,8BAA8B,CAAC;AAGtC,OAAO,EAAe,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,qBAAqB,CAAC;AAU/E,OAAO,EAEL,KAAK,aAAa,EACnB,MAAM,0CAA0C,CAAC;AAKlD,OAAO,EAOL,KAAK,wBAAwB,EAC9B,MAAM,yBAAyB,CAAC;AAQjC,KAAK,WAAW,GAAG;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAUF,KAAK,gBAAgB,GAAG;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CACjE,CAAC;AAiCF,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;IAC5B;;;;;OAKG;aACa,IAAI,CAAC,EAAE,QAAQ,CAAC;QAAE,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;KAAE,CAAC;IATjF,YACkB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM;IAC5B;;;;;OAKG;IACa,IAAI,CAAC,EAAE,QAAQ,CAAC;QAAE,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;KAAE,CAAC,YAAA,EAIhF;CACF;AA4DD,qFAAqF;AACrF,qBAAa,uBAAuB;IAKhC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IAKnC;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,YAAY;IAU7B;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IArCvC,wEAAwE;IACxE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA2B;IAE/D,YACmB,UAAU,EAAE,mCAAmC,EAC/C,MAAM,EAAE,aAAa;IACtC;;;;;OAKG;IACc,kBAAkB,EAAE,CACnC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,iBAAiB,CAAC,EAAE,SAAS,MAAM,EAAE,KAClC,OAAO,CAAC,WAAW,CAAC;IACzB;;;;OAIG;IACc,YAAY,GAAE,CAC7B,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,aAAa,KACnB,OAAO,CAAC,IAAI,CAAkB;IACnC;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,MAAM,GAAG,wBAAwB;IACvD;;;;OAIG;IACc,oBAAoB,GAAE,CACrC,WAAW,EAAE,WAAW,KACrB,OAAO,CAAC,OAAO,CAAqB,EAG1C;IAED;;;;OAIG;YACW,IAAI;IAWlB;;;;OAIG;YACW,UAAU;IA2BxB,OAAO,CAAC,IAAI;IAMZ,OAAO,CAAC,QAAQ;IAmGH,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,EACpC,kBAAkB,CAAC,EAAE,SAAS;QAC5B,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;KAC9B,EAAE,GACF,OAAO,CAAC,gBAAgB,CAAC,CA6J3B;IAED,gEAAgE;YAClD,SAAS;IAkGvB,sDAAsD;YACxC,UAAU;CAkJzB"}
@@ -9,7 +9,7 @@ import { markPeriodClosed, onePeriodClosedRetry } from "./signal-relay-period-cl
9
9
  import { deviceSetRefusal, markDeviceSetRefusal, parseDeviceSetRefusal, } from "../remote/signal-relay/device-set.js";
10
10
  import { markAfterRepeatedRequest, } from "../remote/signal-relay/request-admission.js";
11
11
  import { markGroupRouteFallback, takesDirectSealedRoute, } from "./signal-relay-sealed-route.js";
12
- import { RELAY_PROTOCOL_VERSION, markSignalProtocolRelayAnswerVersion, signalRelayProtocolHeadersFor, throwIfUpgradeRequired, } from "./signal-relay-protocol.js";
12
+ import { markSignalProtocolRelayAnswerVersion, sendOnSignalRelayProtocol, signalRelayProtocolHeadersFor, signalRelayProtocolOffer, throwIfProtocolFallBack, throwIfUpgradeRequired, } from "./signal-relay-protocol.js";
13
13
  import { withSignalProtocolRelayRequestDeadline } from "./signal-relay-request-deadline.js";
14
14
  const FRAME_VERSION = 1;
15
15
  const FRAME_HEADER_BYTES = 9;
@@ -124,8 +124,9 @@ export class HostedAnonymousDelivery {
124
124
  fanOut;
125
125
  resolveDestination;
126
126
  beforeRepeat;
127
- signalRelayProtocolVersion;
128
127
  destinationRecovered;
128
+ /** The Relay protocol version of the client that owns this delivery. */
129
+ signalRelayProtocol;
129
130
  constructor(connection, fanOut,
130
131
  /**
131
132
  * The destination of one device. `declaredDeviceIds` is the declared
@@ -140,8 +141,12 @@ export class HostedAnonymousDelivery {
140
141
  * for each destination device. When it rejects, no repeat starts.
141
142
  */
142
143
  beforeRepeat = async () => { },
143
- /** The Relay protocol version of the client that owns this delivery. */
144
- signalRelayProtocolVersion = RELAY_PROTOCOL_VERSION,
144
+ /**
145
+ * The selected Relay protocol version, or the offer of the client that
146
+ * owns this delivery. Without it, the delivery offers version 3 first
147
+ * and falls back to version 2.
148
+ */
149
+ signalRelayProtocol,
145
150
  /**
146
151
  * Runs after the Relay refuses a direct post as NOT_FOUND. True when the
147
152
  * device directory lists the device at another mailbox generation than
@@ -152,8 +157,8 @@ export class HostedAnonymousDelivery {
152
157
  this.fanOut = fanOut;
153
158
  this.resolveDestination = resolveDestination;
154
159
  this.beforeRepeat = beforeRepeat;
155
- this.signalRelayProtocolVersion = signalRelayProtocolVersion;
156
160
  this.destinationRecovered = destinationRecovered;
161
+ this.signalRelayProtocol = signalRelayProtocolOffer(signalRelayProtocol);
157
162
  }
158
163
  /**
159
164
  * Run task for each item at the same time. After every item settles, a
@@ -198,6 +203,9 @@ export class HostedAnonymousDelivery {
198
203
  }
199
204
  }
200
205
  post(path, body) {
206
+ return sendOnSignalRelayProtocol(this.signalRelayProtocol, (signalRelayProtocolVersion) => this.postWith(signalRelayProtocolVersion, path, body));
207
+ }
208
+ postWith(signalRelayProtocolVersion, path, body) {
201
209
  return withSignalProtocolRelayRequestDeadline(async (signal) => {
202
210
  let response;
203
211
  try {
@@ -208,7 +216,7 @@ export class HostedAnonymousDelivery {
208
216
  headers: {
209
217
  accept: "application/json",
210
218
  "content-type": "application/json",
211
- ...signalRelayProtocolHeadersFor(this.signalRelayProtocolVersion),
219
+ ...signalRelayProtocolHeadersFor(signalRelayProtocolVersion),
212
220
  },
213
221
  body: JSON.stringify({
214
222
  ...body,
@@ -224,7 +232,8 @@ export class HostedAnonymousDelivery {
224
232
  }
225
233
  const value = await responseObject(response);
226
234
  if (!response.ok) {
227
- throwIfUpgradeRequired(response.status, value, this.signalRelayProtocolVersion);
235
+ throwIfProtocolFallBack(this.signalRelayProtocol, signalRelayProtocolVersion, value);
236
+ throwIfUpgradeRequired(response.status, value, signalRelayProtocolVersion);
228
237
  const code = record(value.error) ? value.error.code : undefined;
229
238
  // Each route answers a rejected credential with the code of its
230
239
  // type. A Relay without the endorsement on the direct route answers
@@ -258,7 +267,7 @@ export class HostedAnonymousDelivery {
258
267
  : undefined;
259
268
  // The meaning of DELIVERY_ALREADY_ACCEPTED depends on the protocol
260
269
  // version of the request, so the error records it.
261
- const error = markSignalProtocolRelayAnswerVersion(new HostedAnonymousDeliveryError(response.status, safeCode, details === undefined ? undefined : { details }), this.signalRelayProtocolVersion);
270
+ const error = markSignalProtocolRelayAnswerVersion(new HostedAnonymousDeliveryError(response.status, safeCode, details === undefined ? undefined : { details }), signalRelayProtocolVersion);
262
271
  // The public code stays DELIVERY_FAILED. The mark lets the send
263
272
  // repeat the post once and keep the device pending.
264
273
  if (code === "PERIOD_CLOSED")
@@ -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,11 +1,15 @@
1
1
  import type { HostedSignalProtocolRelayManagedDeviceLinkRequest } from './hosted.js';
2
2
  type JsonRecord = Record<string, unknown>;
3
- /** Compose the existing link protocol under a private current-token capability. */
3
+ /**
4
+ * Compose the existing link protocol under a private current-token
5
+ * capability. `post` gives the body the token ID and the Relay protocol
6
+ * version of the request, which selects the labels of the two proofs.
7
+ */
4
8
  export declare function submitHostedSignalProtocolRelayDeviceLink(request: HostedSignalProtocolRelayManagedDeviceLinkRequest, protocol: {
5
9
  readonly relayScopeId: string;
6
10
  readonly materialFingerprint: string;
7
11
  readonly signalRegistration: JsonRecord;
8
- readonly post: (body: (tokenId: string) => Promise<JsonRecord>) => Promise<unknown>;
12
+ readonly post: (body: (tokenId: string, protocolVersion: number) => Promise<JsonRecord>) => Promise<unknown>;
9
13
  }): Promise<unknown>;
10
14
  export {};
11
15
  //# sourceMappingURL=hosted-device-link-transport.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"hosted-device-link-transport.d.ts","sourceRoot":"","sources":["../../client/hosted-device-link-transport.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iDAAiD,EAAE,MAAM,UAAU,CAAC;AAElF,KAAK,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAO1C,mFAAmF;AACnF,wBAAsB,yCAAyC,CAC7D,OAAO,EAAE,iDAAiD,EAC1D,QAAQ,EAAE;IACR,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,kBAAkB,EAAE,UAAU,CAAC;IACxC,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CACrF,GACA,OAAO,CAAC,OAAO,CAAC,CAqBlB"}
1
+ {"version":3,"file":"hosted-device-link-transport.d.ts","sourceRoot":"","sources":["../../client/hosted-device-link-transport.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iDAAiD,EAAE,MAAM,UAAU,CAAC;AAGlF,KAAK,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAO1C;;;;GAIG;AACH,wBAAsB,yCAAyC,CAC7D,OAAO,EAAE,iDAAiD,EAC1D,QAAQ,EAAE;IACR,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,kBAAkB,EAAE,UAAU,CAAC;IACxC,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC9G,GACA,OAAO,CAAC,OAAO,CAAC,CAqBlB"}
@@ -1,16 +1,21 @@
1
1
  import { bytesToBase64, concatBytes, sha256, stringToBytes } from '../internal/crypto/index.js';
2
+ import { signalRelayProofLabels } from './signal-relay-protocol.js';
2
3
  function lengthPrefixed(value) {
3
4
  const size = value.length;
4
5
  return concatBytes(new Uint8Array([size >>> 24, size >>> 16, size >>> 8, size]), value);
5
6
  }
6
- /** Compose the existing link protocol under a private current-token capability. */
7
+ /**
8
+ * Compose the existing link protocol under a private current-token
9
+ * capability. `post` gives the body the token ID and the Relay protocol
10
+ * version of the request, which selects the labels of the two proofs.
11
+ */
7
12
  export async function submitHostedSignalProtocolRelayDeviceLink(request, protocol) {
8
- return protocol.post(async (tokenId) => {
9
- const challenge = await sha256(concatBytes(stringToBytes('OpenE2EE Relay device link challenge v1\0'), ...[protocol.relayScopeId, tokenId, request.operationId, protocol.materialFingerprint]
13
+ return protocol.post(async (tokenId, protocolVersion) => {
14
+ const challenge = await sha256(concatBytes(signalRelayProofLabels(protocolVersion).deviceLinkChallenge, ...[protocol.relayScopeId, tokenId, request.operationId, protocol.materialFingerprint]
10
15
  .map((value) => lengthPrefixed(stringToBytes(value))), lengthPrefixed(request.newDeviceAuthentication.publicKey)));
11
16
  const [activeDeviceProof, newDeviceProof] = await Promise.all([
12
- request.activeDeviceAuthentication.signChallenge(challenge),
13
- request.newDeviceAuthentication.signChallenge(challenge),
17
+ request.activeDeviceAuthentication.signChallenge(challenge, protocolVersion),
18
+ request.newDeviceAuthentication.signChallenge(challenge, protocolVersion),
14
19
  ]);
15
20
  return {
16
21
  publishableKey: request.publishableKey,
@@ -1 +1 @@
1
- {"version":3,"file":"hosted-device-link-transport.js","sourceRoot":"","sources":["../../client/hosted-device-link-transport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAKvF,SAAS,cAAc,CAAC,KAAiB;IACvC,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC;IAC1B,OAAO,WAAW,CAAC,IAAI,UAAU,CAAC,CAAC,IAAI,KAAK,EAAE,EAAE,IAAI,KAAK,EAAE,EAAE,IAAI,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;AAC1F,CAAC;AAED,mFAAmF;AACnF,MAAM,CAAC,KAAK,UAAU,yCAAyC,CAC7D,OAA0D,EAC1D,QAKC;IAED,OAAO,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACrC,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,WAAW,CACxC,aAAa,CAAC,2CAA2C,CAAC,EAC1D,GAAG,CAAC,QAAQ,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,mBAAmB,CAAC;aACnF,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,EACvD,cAAc,CAAC,OAAO,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAC1D,CAAC,CAAC;QACH,MAAM,CAAC,iBAAiB,EAAE,cAAc,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC5D,OAAO,CAAC,0BAA0B,CAAC,aAAa,CAAC,SAAS,CAAC;YAC3D,OAAO,CAAC,uBAAuB,CAAC,aAAa,CAAC,SAAS,CAAC;SACzD,CAAC,CAAC;QACH,OAAO;YACL,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB;YAC/C,gCAAgC,EAAE,aAAa,CAAC,OAAO,CAAC,uBAAuB,CAAC,SAAS,CAAC;YAC1F,iBAAiB,EAAE,aAAa,CAAC,iBAAiB,CAAC;YACnD,cAAc,EAAE,aAAa,CAAC,cAAc,CAAC;SAC9C,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"hosted-device-link-transport.js","sourceRoot":"","sources":["../../client/hosted-device-link-transport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEvF,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAIjE,SAAS,cAAc,CAAC,KAAiB;IACvC,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC;IAC1B,OAAO,WAAW,CAAC,IAAI,UAAU,CAAC,CAAC,IAAI,KAAK,EAAE,EAAE,IAAI,KAAK,EAAE,EAAE,IAAI,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;AAC1F,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,yCAAyC,CAC7D,OAA0D,EAC1D,QAKC;IAED,OAAO,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,EAAE;QACtD,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,WAAW,CACxC,sBAAsB,CAAC,eAAe,CAAC,CAAC,mBAAmB,EAC3D,GAAG,CAAC,QAAQ,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,mBAAmB,CAAC;aACnF,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,EACvD,cAAc,CAAC,OAAO,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAC1D,CAAC,CAAC;QACH,MAAM,CAAC,iBAAiB,EAAE,cAAc,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC5D,OAAO,CAAC,0BAA0B,CAAC,aAAa,CAAC,SAAS,EAAE,eAAe,CAAC;YAC5E,OAAO,CAAC,uBAAuB,CAAC,aAAa,CAAC,SAAS,EAAE,eAAe,CAAC;SAC1E,CAAC,CAAC;QACH,OAAO;YACL,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB;YAC/C,gCAAgC,EAAE,aAAa,CAAC,OAAO,CAAC,uBAAuB,CAAC,SAAS,CAAC;YAC1F,iBAAiB,EAAE,aAAa,CAAC,iBAAiB,CAAC;YACnD,cAAc,EAAE,aAAa,CAAC,cAAc,CAAC;SAC9C,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
@@ -1,5 +1,6 @@
1
1
  import type { SignalProtocolClientCompositionOptions } from './compose.js';
2
2
  import type { HostedSignalProtocolRelayConnection } from './hosted-connection.js';
3
+ import { type SignalRelayProtocolOffer } from './signal-relay-protocol.js';
3
4
  import { type EndorsementCacheStore } from './endorsement-manager.js';
4
5
  type GroupOptions = NonNullable<SignalProtocolClientCompositionOptions['groups']>;
5
6
  export type HostedGroupOptions = Pick<GroupOptions, 'profileKey' | 'store'> & {
@@ -8,8 +9,9 @@ export type HostedGroupOptions = Pick<GroupOptions, 'profileKey' | 'store'> & {
8
9
  /**
9
10
  * Managed group keys come from a signed response under the compiled
10
11
  * environment root. Each authority request carries the Relay protocol version
11
- * of the client.
12
+ * of the client: a selected version, or the offer of the client. Without
13
+ * either, the requests offer version 3 first and fall back to version 2.
12
14
  */
13
- export declare function resolveHostedGroupOptions(connection: HostedSignalProtocolRelayConnection, options: HostedGroupOptions, signalRelayProtocolVersion?: number): Promise<GroupOptions>;
15
+ export declare function resolveHostedGroupOptions(connection: HostedSignalProtocolRelayConnection, options: HostedGroupOptions, signalRelayProtocol?: number | SignalRelayProtocolOffer): Promise<GroupOptions>;
14
16
  export {};
15
17
  //# sourceMappingURL=hosted-group-authority.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"hosted-group-authority.d.ts","sourceRoot":"","sources":["../../client/hosted-group-authority.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sCAAsC,EAAE,MAAM,WAAW,CAAC;AACxE,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,qBAAqB,CAAC;AAO/E,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,uBAAuB,CAAC;AAK/B,KAAK,YAAY,GAAG,WAAW,CAC7B,sCAAsC,CAAC,QAAQ,CAAC,CACjD,CAAC;AACF,MAAM,MAAM,kBAAkB,GAAG,IAAI,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,GAAG;IAC5E,QAAQ,CAAC,gBAAgB,CAAC,EAAE,qBAAqB,CAAC;CACnD,CAAC;AAyEF;;;;GAIG;AACH,wBAAsB,yBAAyB,CAC7C,UAAU,EAAE,mCAAmC,EAC/C,OAAO,EAAE,kBAAkB,EAC3B,0BAA0B,GAAE,MAA+B,GAC1D,OAAO,CAAC,YAAY,CAAC,CAoDvB"}
1
+ {"version":3,"file":"hosted-group-authority.d.ts","sourceRoot":"","sources":["../../client/hosted-group-authority.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sCAAsC,EAAE,MAAM,WAAW,CAAC;AACxE,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,qBAAqB,CAAC;AAE/E,OAAO,EAML,KAAK,wBAAwB,EAC9B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,uBAAuB,CAAC;AAK/B,KAAK,YAAY,GAAG,WAAW,CAC7B,sCAAsC,CAAC,QAAQ,CAAC,CACjD,CAAC;AACF,MAAM,MAAM,kBAAkB,GAAG,IAAI,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,GAAG;IAC5E,QAAQ,CAAC,gBAAgB,CAAC,EAAE,qBAAqB,CAAC;CACnD,CAAC;AA2EF;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAC7C,UAAU,EAAE,mCAAmC,EAC/C,OAAO,EAAE,kBAAkB,EAC3B,mBAAmB,CAAC,EAAE,MAAM,GAAG,wBAAwB,GACtD,OAAO,CAAC,YAAY,CAAC,CAqDvB"}
@@ -1,11 +1,11 @@
1
1
  import { utf8Decode } from '../internal/platform/index.js';
2
2
  import { withSignalProtocolRelayRequestDeadline } from './signal-relay-request-deadline.js';
3
- import { RELAY_PROTOCOL_VERSION, signalRelayProtocolHeadersFor, throwIfUpgradeRequired, } from './signal-relay-protocol.js';
3
+ import { sendOnSignalRelayProtocol, signalRelayProtocolHeadersFor, signalRelayProtocolOffer, throwIfProtocolFallBack, throwIfUpgradeRequired, } from './signal-relay-protocol.js';
4
4
  import { EndorsementManager, } from './endorsement-manager.js';
5
5
  import { verifyGroupAuthority } from '../internal/groups/authority-certificate.js';
6
6
  import { decodeGroupTrustRoot } from '../internal/groups/trust-root.js';
7
- async function fetchAuthority(connection, signalRelayProtocolVersion) {
8
- const buffer = await withSignalProtocolRelayRequestDeadline(async (signal) => {
7
+ async function fetchAuthority(connection, offer) {
8
+ const buffer = await sendOnSignalRelayProtocol(offer, (signalRelayProtocolVersion) => withSignalProtocolRelayRequestDeadline(async (signal) => {
9
9
  const response = await fetch(`${connection.protocolEndpoint}/groups/authority`, {
10
10
  method: 'POST',
11
11
  credentials: 'omit',
@@ -56,11 +56,12 @@ async function fetchAuthority(connection, signalRelayProtocolVersion) {
56
56
  catch {
57
57
  error = undefined;
58
58
  }
59
+ throwIfProtocolFallBack(offer, signalRelayProtocolVersion, error);
59
60
  throwIfUpgradeRequired(response.status, error, signalRelayProtocolVersion);
60
61
  throw new Error('Managed group authority is unavailable');
61
62
  }
62
63
  return body;
63
- });
64
+ }));
64
65
  return verifyGroupAuthority(JSON.parse(utf8Decode(buffer, { fatal: true })), {
65
66
  ...connection.certificateTrust,
66
67
  relayScopeId: connection.relayScopeId,
@@ -70,9 +71,11 @@ async function fetchAuthority(connection, signalRelayProtocolVersion) {
70
71
  /**
71
72
  * Managed group keys come from a signed response under the compiled
72
73
  * environment root. Each authority request carries the Relay protocol version
73
- * of the client.
74
+ * of the client: a selected version, or the offer of the client. Without
75
+ * either, the requests offer version 3 first and fall back to version 2.
74
76
  */
75
- export async function resolveHostedGroupOptions(connection, options, signalRelayProtocolVersion = RELAY_PROTOCOL_VERSION) {
77
+ export async function resolveHostedGroupOptions(connection, options, signalRelayProtocol) {
78
+ const offer = signalRelayProtocolOffer(signalRelayProtocol);
76
79
  if (Object.keys(options).some((key) => !['profileKey', 'store', 'endorsementCache'].includes(key)))
77
80
  throw new Error('Hosted group configuration cannot override managed authority');
78
81
  let current;
@@ -84,7 +87,7 @@ export async function resolveHostedGroupOptions(connection, options, signalRelay
84
87
  if (pending)
85
88
  return pending;
86
89
  pending = (async () => {
87
- const authority = await fetchAuthority(connection, signalRelayProtocolVersion);
90
+ const authority = await fetchAuthority(connection, offer);
88
91
  const root = decodeGroupTrustRoot(authority.trustRoot);
89
92
  const value = {
90
93
  trustRoot: authority.trustRoot,
@@ -1 +1 @@
1
- {"version":3,"file":"hosted-group-authority.js","sourceRoot":"","sources":["../../client/hosted-group-authority.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"hosted-group-authority.js","sourceRoot":"","sources":["../../client/hosted-group-authority.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGlD,OAAO,EAAE,sCAAsC,EAAE,MAAM,iCAAiC,CAAC;AACzF,OAAO,EACL,yBAAyB,EACzB,6BAA6B,EAC7B,wBAAwB,EACxB,uBAAuB,EACvB,sBAAsB,GAEvB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,kBAAkB,GAEnB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAUrE,KAAK,UAAU,cAAc,CAC3B,UAA+C,EAC/C,KAA+B;IAE/B,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,KAAK,EAAE,CAAC,0BAA0B,EAAE,EAAE,CACnF,sCAAsC,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QACxD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAC1B,GAAG,UAAU,CAAC,gBAAgB,mBAAmB,EACjD;YACE,MAAM,EAAE,MAAM;YACd,WAAW,EAAE,MAAM;YACnB,QAAQ,EAAE,OAAO;YACjB,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,MAAM,EAAE,kBAAkB;gBAC1B,GAAG,6BAA6B,CAAC,0BAA0B,CAAC;aAC7D;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,cAAc,EAAE,UAAU,CAAC,cAAc,EAAE,CAAC;YACnE,MAAM;SACP,CACF,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;QAC9E,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;QACzC,MAAM,MAAM,GAAiB,EAAE,CAAC;QAChC,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,IAAI,CAAC;YACH,SAAS,CAAC;gBACR,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;gBACjC,IAAI,IAAI,CAAC,IAAI;oBAAE,MAAM;gBACrB,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;gBAC5B,IAAI,MAAM,GAAG,IAAI,EAAE,CAAC;oBAClB,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC;oBACtB,MAAM,IAAI,KAAK,CACb,QAAQ,CAAC,EAAE;wBACT,CAAC,CAAC,gDAAgD;wBAClD,CAAC,CAAC,wCAAwC,CAC7C,CAAC;gBACJ,CAAC;gBACD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,MAAM,CAAC,WAAW,EAAE,CAAC;QACvB,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;YAC1B,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACvB,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC;QACxB,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,0EAA0E;YAC1E,IAAI,KAAc,CAAC;YACnB,IAAI,CAAC;gBACH,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YACxD,CAAC;YAAC,MAAM,CAAC;gBACP,KAAK,GAAG,SAAS,CAAC;YACpB,CAAC;YACD,uBAAuB,CAAC,KAAK,EAAE,0BAA0B,EAAE,KAAK,CAAC,CAAC;YAClE,sBAAsB,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,0BAA0B,CAAC,CAAC;YAC3E,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;QAC5D,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC,CAAC;IACJ,OAAO,oBAAoB,CACzB,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,EAC/C;QACE,GAAG,UAAU,CAAC,gBAAgB;QAC9B,YAAY,EAAE,UAAU,CAAC,YAAY;QACrC,eAAe,EAAE,IAAI,CAAC,GAAG,EAAE;KAC5B,CACF,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,UAA+C,EAC/C,OAA2B,EAC3B,mBAAuD;IAEvD,MAAM,KAAK,GAAG,wBAAwB,CAAC,mBAAmB,CAAC,CAAC;IAC5D,IACE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CACvB,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CACpE;QAED,MAAM,IAAI,KAAK,CACb,8DAA8D,CAC/D,CAAC;IACJ,IAAI,OACwE,CAAC;IAC7E,IAAI,OAA4C,CAAC;IACjD,MAAM,gBAAgB,GAAG,KAAK,IAA6B,EAAE;QAC3D,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,IAAI,OAAO,IAAI,GAAG,IAAI,OAAO,CAAC,SAAS,IAAI,GAAG,GAAG,OAAO,CAAC,QAAQ;YAC/D,OAAO,OAAO,CAAC,KAAK,CAAC;QACvB,IAAI,OAAO;YAAE,OAAO,OAAO,CAAC;QAC5B,OAAO,GAAG,CAAC,KAAK,IAAI,EAAE;YACpB,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;YAC1D,MAAM,IAAI,GAAG,oBAAoB,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YACvD,MAAM,KAAK,GAAmB;gBAC5B,SAAS,EAAE,SAAS,CAAC,SAAS;gBAC9B,cAAc,EAAE,SAAS,CAAC,KAAK;gBAC/B,GAAG,CAAC,OAAO,CAAC,gBAAgB,KAAK,SAAS;oBACxC,CAAC,CAAC,EAAE;oBACJ,CAAC,CAAC;wBACE,kBAAkB,EAAE,IAAI,kBAAkB,CACxC,OAAO,CAAC,gBAAgB,EACxB,IAAI,CAAC,wBAAwB,CAC9B;qBACF,CAAC;aACP,CAAC;YACF,OAAO,GAAG;gBACR,KAAK;gBACL,SAAS,EAAE,SAAS,CAAC,qBAAqB;gBAC1C,QAAQ,EAAE,SAAS,CAAC,oBAAoB;aACzC,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,EAAE,CAAC;QACL,IAAI,CAAC;YACH,OAAO,MAAM,OAAO,CAAC;QACvB,CAAC;gBAAS,CAAC;YACT,OAAO,GAAG,SAAS,CAAC;QACtB,CAAC;IACH,CAAC,CAAC;IACF,MAAM,SAAS,GAAG,MAAM,gBAAgB,EAAE,CAAC;IAC3C,OAAO;QACL,GAAG,SAAS;QACZ,gBAAgB;QAChB,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,GAAG,CAAC,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC;KACjE,CAAC;AACJ,CAAC"}
@@ -1,5 +1,6 @@
1
1
  import type { GroupAuthorization, GroupChangeLogEntry, GroupChangeLogPage, GroupSnapshot, GroupServer } from '../internal/groups/manager.js';
2
2
  import type { HostedSignalProtocolRelayConnection } from './hosted-connection.js';
3
+ import { type SignalRelayProtocolOffer } from './signal-relay-protocol.js';
3
4
  import { type GroupErrorDetail } from '../internal/groups/error-details.js';
4
5
  export declare class HostedGroupError extends Error {
5
6
  readonly data: {
@@ -14,10 +15,14 @@ export declare class HostedGroupError extends Error {
14
15
  export declare class HostedGroupServer implements GroupServer {
15
16
  private readonly connection;
16
17
  /** The Relay protocol version of the client that owns this server. */
17
- private readonly signalRelayProtocolVersion;
18
+ private readonly signalRelayProtocol;
18
19
  constructor(connection: HostedSignalProtocolRelayConnection,
19
- /** The Relay protocol version of the client that owns this server. */
20
- signalRelayProtocolVersion?: number);
20
+ /**
21
+ * The selected Relay protocol version, or the offer of the client that
22
+ * owns this server. Without it, the server offers version 3 first and
23
+ * falls back to version 2.
24
+ */
25
+ signalRelayProtocol?: number | SignalRelayProtocolOffer);
21
26
  private request;
22
27
  refreshGroupSendEndorsements(groupId: Uint8Array, authorization: GroupAuthorization): Promise<{
23
28
  endorsements: Uint8Array;