@open-e2ee/signal-protocol-sdk 13.3.0 → 13.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (187) hide show
  1. package/CHANGELOG.md +436 -0
  2. package/README.md +1 -1
  3. package/SECURITY.md +2 -2
  4. package/dist/client/binary-send.d.ts +28 -0
  5. package/dist/client/binary-send.d.ts.map +1 -0
  6. package/dist/client/binary-send.js +26 -0
  7. package/dist/client/binary-send.js.map +1 -0
  8. package/dist/client/client.d.ts +47 -6
  9. package/dist/client/client.d.ts.map +1 -1
  10. package/dist/client/client.js +288 -136
  11. package/dist/client/client.js.map +1 -1
  12. package/dist/client/content-adapter.d.ts +18 -0
  13. package/dist/client/content-adapter.d.ts.map +1 -1
  14. package/dist/client/content-adapter.js.map +1 -1
  15. package/dist/client/device-set-reconciliation.d.ts +23 -8
  16. package/dist/client/device-set-reconciliation.d.ts.map +1 -1
  17. package/dist/client/device-set-reconciliation.js +25 -11
  18. package/dist/client/device-set-reconciliation.js.map +1 -1
  19. package/dist/client/event-hooks.d.ts +88 -8
  20. package/dist/client/event-hooks.d.ts.map +1 -1
  21. package/dist/client/event-hooks.js +1 -0
  22. package/dist/client/event-hooks.js.map +1 -1
  23. package/dist/client/group-outbox.d.ts +45 -10
  24. package/dist/client/group-outbox.d.ts.map +1 -1
  25. package/dist/client/group-outbox.js +246 -154
  26. package/dist/client/group-outbox.js.map +1 -1
  27. package/dist/client/group-receive-authorization.d.ts +10 -1
  28. package/dist/client/group-receive-authorization.d.ts.map +1 -1
  29. package/dist/client/group-receive-authorization.js.map +1 -1
  30. package/dist/client/hosted-anonymous-delivery.d.ts +18 -1
  31. package/dist/client/hosted-anonymous-delivery.d.ts.map +1 -1
  32. package/dist/client/hosted-anonymous-delivery.js +84 -12
  33. package/dist/client/hosted-anonymous-delivery.js.map +1 -1
  34. package/dist/client/hosted-connection.js +1 -1
  35. package/dist/client/hosted-connection.js.map +1 -1
  36. package/dist/client/hosted-group-authority.d.ts +6 -2
  37. package/dist/client/hosted-group-authority.d.ts.map +1 -1
  38. package/dist/client/hosted-group-authority.js +11 -7
  39. package/dist/client/hosted-group-authority.js.map +1 -1
  40. package/dist/client/hosted-groups.d.ts +5 -1
  41. package/dist/client/hosted-groups.d.ts.map +1 -1
  42. package/dist/client/hosted-groups.js +8 -4
  43. package/dist/client/hosted-groups.js.map +1 -1
  44. package/dist/client/hosted-http-error.d.ts +5 -1
  45. package/dist/client/hosted-http-error.d.ts.map +1 -1
  46. package/dist/client/hosted-http-error.js +5 -1
  47. package/dist/client/hosted-http-error.js.map +1 -1
  48. package/dist/client/hosted-mailbox-subscription.d.ts +2 -0
  49. package/dist/client/hosted-mailbox-subscription.d.ts.map +1 -1
  50. package/dist/client/hosted-mailbox-subscription.js +5 -5
  51. package/dist/client/hosted-mailbox-subscription.js.map +1 -1
  52. package/dist/client/hosted-resume-error.d.ts +19 -0
  53. package/dist/client/hosted-resume-error.d.ts.map +1 -0
  54. package/dist/client/hosted-resume-error.js +44 -0
  55. package/dist/client/hosted-resume-error.js.map +1 -0
  56. package/dist/client/hosted-resume.d.ts +24 -0
  57. package/dist/client/hosted-resume.d.ts.map +1 -0
  58. package/dist/client/hosted-resume.js +82 -0
  59. package/dist/client/hosted-resume.js.map +1 -0
  60. package/dist/client/hosted-transport.d.ts +11 -1
  61. package/dist/client/hosted-transport.d.ts.map +1 -1
  62. package/dist/client/hosted-transport.js +102 -33
  63. package/dist/client/hosted-transport.js.map +1 -1
  64. package/dist/client/hosted.d.ts.map +1 -1
  65. package/dist/client/hosted.js +29 -6
  66. package/dist/client/hosted.js.map +1 -1
  67. package/dist/client/index.d.ts +3 -1
  68. package/dist/client/index.d.ts.map +1 -1
  69. package/dist/client/index.js +2 -0
  70. package/dist/client/index.js.map +1 -1
  71. package/dist/client/receive-queue.d.ts +5 -2
  72. package/dist/client/receive-queue.d.ts.map +1 -1
  73. package/dist/client/receive-queue.js +55 -18
  74. package/dist/client/receive-queue.js.map +1 -1
  75. package/dist/client/relay-acceptance.d.ts +49 -6
  76. package/dist/client/relay-acceptance.d.ts.map +1 -1
  77. package/dist/client/relay-acceptance.js +49 -3
  78. package/dist/client/relay-acceptance.js.map +1 -1
  79. package/dist/client/relay-protocol.d.ts +37 -7
  80. package/dist/client/relay-protocol.d.ts.map +1 -1
  81. package/dist/client/relay-protocol.js +53 -10
  82. package/dist/client/relay-protocol.js.map +1 -1
  83. package/dist/client/retry-family.d.ts +3 -3
  84. package/dist/client/retry-family.js +1 -1
  85. package/dist/client/retry-family.js.map +1 -1
  86. package/dist/client/retry-request-envelope.d.ts +18 -8
  87. package/dist/client/retry-request-envelope.d.ts.map +1 -1
  88. package/dist/client/retry-request-envelope.js +57 -29
  89. package/dist/client/retry-request-envelope.js.map +1 -1
  90. package/dist/client/retry-request-lifecycle.d.ts +24 -11
  91. package/dist/client/retry-request-lifecycle.d.ts.map +1 -1
  92. package/dist/client/retry-request-lifecycle.js +46 -20
  93. package/dist/client/retry-request-lifecycle.js.map +1 -1
  94. package/dist/client/retry-terminal-recovery.d.ts +11 -8
  95. package/dist/client/retry-terminal-recovery.d.ts.map +1 -1
  96. package/dist/client/retry-terminal-recovery.js +18 -12
  97. package/dist/client/retry-terminal-recovery.js.map +1 -1
  98. package/dist/client/retry.d.ts +8 -7
  99. package/dist/client/retry.d.ts.map +1 -1
  100. package/dist/client/retry.js +30 -22
  101. package/dist/client/retry.js.map +1 -1
  102. package/dist/client/send-deadline.d.ts +308 -0
  103. package/dist/client/send-deadline.d.ts.map +1 -0
  104. package/dist/client/send-deadline.js +914 -0
  105. package/dist/client/send-deadline.js.map +1 -0
  106. package/dist/client/send-intent-driver.d.ts +116 -0
  107. package/dist/client/send-intent-driver.d.ts.map +1 -0
  108. package/dist/client/send-intent-driver.js +373 -0
  109. package/dist/client/send-intent-driver.js.map +1 -0
  110. package/dist/client/signal-service-cipher.d.ts +257 -27
  111. package/dist/client/signal-service-cipher.d.ts.map +1 -1
  112. package/dist/client/signal-service-cipher.js +1274 -283
  113. package/dist/client/signal-service-cipher.js.map +1 -1
  114. package/dist/client/startup-cleanup.d.ts +2 -0
  115. package/dist/client/startup-cleanup.d.ts.map +1 -0
  116. package/dist/client/startup-cleanup.js +14 -0
  117. package/dist/client/startup-cleanup.js.map +1 -0
  118. package/dist/client/types.d.ts +48 -5
  119. package/dist/client/types.d.ts.map +1 -1
  120. package/dist/client/types.js.map +1 -1
  121. package/dist/index.d.ts +3 -1
  122. package/dist/index.d.ts.map +1 -1
  123. package/dist/index.js +1 -0
  124. package/dist/index.js.map +1 -1
  125. package/dist/internal/manager/manager.d.ts +1 -0
  126. package/dist/internal/manager/manager.d.ts.map +1 -1
  127. package/dist/internal/manager/manager.js +17 -2
  128. package/dist/internal/manager/manager.js.map +1 -1
  129. package/dist/internal/manager/retained-identity.d.ts +2 -0
  130. package/dist/internal/manager/retained-identity.d.ts.map +1 -0
  131. package/dist/internal/manager/retained-identity.js +57 -0
  132. package/dist/internal/manager/retained-identity.js.map +1 -0
  133. package/dist/local/store/conformance/cases/metadata.d.ts +3 -2
  134. package/dist/local/store/conformance/cases/metadata.d.ts.map +1 -1
  135. package/dist/local/store/conformance/cases/metadata.js +153 -2
  136. package/dist/local/store/conformance/cases/metadata.js.map +1 -1
  137. package/dist/local/store/key-value/adapter.d.ts +2 -1
  138. package/dist/local/store/key-value/adapter.d.ts.map +1 -1
  139. package/dist/local/store/key-value/adapter.js +9 -0
  140. package/dist/local/store/key-value/adapter.js.map +1 -1
  141. package/dist/local/store/memory/adapter.d.ts +2 -1
  142. package/dist/local/store/memory/adapter.d.ts.map +1 -1
  143. package/dist/local/store/memory/adapter.js +4 -0
  144. package/dist/local/store/memory/adapter.js.map +1 -1
  145. package/dist/local/store/metadata-keys.d.ts +13 -0
  146. package/dist/local/store/metadata-keys.d.ts.map +1 -0
  147. package/dist/local/store/metadata-keys.js +20 -0
  148. package/dist/local/store/metadata-keys.js.map +1 -0
  149. package/dist/local/store/receive-work.d.ts.map +1 -1
  150. package/dist/local/store/receive-work.js +12 -1
  151. package/dist/local/store/receive-work.js.map +1 -1
  152. package/dist/local/store/reliability.d.ts +482 -33
  153. package/dist/local/store/reliability.d.ts.map +1 -1
  154. package/dist/local/store/reliability.js +690 -48
  155. package/dist/local/store/reliability.js.map +1 -1
  156. package/dist/local/store/sqlite/key-storage/index.d.ts +2 -1
  157. package/dist/local/store/sqlite/key-storage/index.d.ts.map +1 -1
  158. package/dist/local/store/sqlite/key-storage/index.js +3 -0
  159. package/dist/local/store/sqlite/key-storage/index.js.map +1 -1
  160. package/dist/local/store/sqlite/key-storage/metadata.d.ts +9 -0
  161. package/dist/local/store/sqlite/key-storage/metadata.d.ts.map +1 -1
  162. package/dist/local/store/sqlite/key-storage/metadata.js +12 -0
  163. package/dist/local/store/sqlite/key-storage/metadata.js.map +1 -1
  164. package/dist/local/store/sqlite/store.d.ts +2 -1
  165. package/dist/local/store/sqlite/store.d.ts.map +1 -1
  166. package/dist/local/store/sqlite/store.js +3 -0
  167. package/dist/local/store/sqlite/store.js.map +1 -1
  168. package/dist/local/store/web/adapter.d.ts +8 -1
  169. package/dist/local/store/web/adapter.d.ts.map +1 -1
  170. package/dist/local/store/web/adapter.js +18 -0
  171. package/dist/local/store/web/adapter.js.map +1 -1
  172. package/dist/remote/relay/request-admission.d.ts +49 -0
  173. package/dist/remote/relay/request-admission.d.ts.map +1 -0
  174. package/dist/remote/relay/request-admission.js +74 -0
  175. package/dist/remote/relay/request-admission.js.map +1 -0
  176. package/dist/types/api.d.ts +77 -0
  177. package/dist/types/api.d.ts.map +1 -1
  178. package/dist/types/errors.d.ts +144 -1
  179. package/dist/types/errors.d.ts.map +1 -1
  180. package/dist/types/errors.js +146 -1
  181. package/dist/types/errors.js.map +1 -1
  182. package/docs/ASSURANCE.md +5 -5
  183. package/docs/DEVIATIONS.md +34 -4
  184. package/docs/ERROR_HANDLING.md +134 -7
  185. package/docs/PACKAGE_SURFACE.md +21 -0
  186. package/docs/RECIPES.md +3 -2
  187. package/package.json +1 -1
@@ -1 +1 @@
1
- {"version":3,"file":"relay-protocol.d.ts","sourceRoot":"","sources":["../../client/relay-protocol.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,uDAAuD;AACvD,eAAO,MAAM,sBAAsB,IAAI,CAAC;AAKxC,yEAAyE;AACzE,eAAO,MAAM,0BAA0B,0BAA0B,CAAC;AAElE,yDAAyD;AACzD,eAAO,MAAM,qBAAqB,+BAA+B,CAAC;AAElE,qFAAqF;AACrF,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,2EAA2E;AAC3E,wBAAgB,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAE7D;AAED;;;;;GAKG;AACH,qBAAa,+BAAgC,SAAQ,KAAK;IACxD,SAAgB,IAAI,sBAAsB;IAC1C,gEAAgE;IAChE,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,iEAAiE;IACjE,SAAgB,SAAS,SAAS;IAElC,YAAmB,MAAM,EAAE,MAAM,EAMhC;CACF;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,IAAI,CAW1E"}
1
+ {"version":3,"file":"relay-protocol.d.ts","sourceRoot":"","sources":["../../client/relay-protocol.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH;;;;;;;;GAQG;AACH,eAAO,MAAM,sBAAsB,IAAI,CAAC;AAQxC,yEAAyE;AACzE,eAAO,MAAM,0BAA0B,0BAA0B,CAAC;AAElE,yDAAyD;AACzD,eAAO,MAAM,qBAAqB,+BAA+B,CAAC;AAElE,qFAAqF;AACrF,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,kEAAkE;AAClE,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAE/E;AAED,mFAAmF;AACnF,wBAAgB,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAE7D;AAED;;;;;GAKG;AACH,qBAAa,+BAAgC,SAAQ,KAAK;IACxD,SAAgB,IAAI,sBAAsB;IAC1C,gEAAgE;IAChE,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,iEAAiE;IACjE,SAAgB,SAAS,SAAS;IAElC;;;;OAIG;IACH,YAAmB,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAMlD;CACF;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,OAAO,EACb,OAAO,CAAC,EAAE,MAAM,GACf,IAAI,CAWN;AAKD;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,GAAG,CAAC,CAGrF;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAIrE"}
@@ -6,10 +6,22 @@
6
6
  * public HTTP route except the connection document carries the version in
7
7
  * the `x-open-e2ee-relay-protocol` header. A Relay that no longer serves the
8
8
  * version refuses it with `UPGRADE_REQUIRED`: close code 4426 on the socket,
9
- * and the body code on HTTP. That refusal is terminal for this SDK.
9
+ * and the body code on HTTP. That refusal is terminal for this SDK. A Relay
10
+ * that does not serve the version yet refuses it with the retryable
11
+ * `PROTOCOL_UNSUPPORTED`. The SDK never sends an older version in its place.
10
12
  */
11
- /** The Relay protocol version that this SDK speaks. */
12
- export const RELAY_PROTOCOL_VERSION = 1;
13
+ /**
14
+ * The Relay protocol version that this SDK speaks by default. Each client
15
+ * holds its own version, which starts at this one.
16
+ *
17
+ * Version 2 adds `DELIVERY_ALREADY_ACCEPTED`: the Relay refuses a post
18
+ * before it stores anything, because it already holds an accepted post
19
+ * under the message ID. Under version 1 the Relay sends RETRY_CONFLICT for
20
+ * the same refusal.
21
+ */
22
+ export const RELAY_PROTOCOL_VERSION = 2;
23
+ /** The first Relay protocol version. A request without the header is this version. */
24
+ const FIRST_RELAY_PROTOCOL_VERSION = 1;
13
25
  /** The prefix of a protocol version token. The version number follows it. */
14
26
  const RELAY_PROTOCOL_TOKEN_PREFIX = "open-e2ee-relay.v";
15
27
  /** The prefix of the subprotocol token that carries the device token. */
@@ -20,9 +32,13 @@ export const RELAY_PROTOCOL_HEADER = "x-open-e2ee-relay-protocol";
20
32
  export function relayProtocolToken(version) {
21
33
  return `${RELAY_PROTOCOL_TOKEN_PREFIX}${version}`;
22
34
  }
23
- /** The headers that put this SDK's protocol version on an HTTP request. */
35
+ /** The headers that put a protocol version on an HTTP request. */
36
+ export function relayProtocolHeadersFor(version) {
37
+ return { [RELAY_PROTOCOL_HEADER]: String(version) };
38
+ }
39
+ /** The headers that put this SDK's default protocol version on an HTTP request. */
24
40
  export function relayProtocolHeaders() {
25
- return { [RELAY_PROTOCOL_HEADER]: String(RELAY_PROTOCOL_VERSION) };
41
+ return relayProtocolHeadersFor(RELAY_PROTOCOL_VERSION);
26
42
  }
27
43
  /**
28
44
  * The Relay no longer serves the protocol version of this SDK. The same
@@ -36,8 +52,13 @@ export class HostedRelayUpgradeRequiredError extends Error {
36
52
  status;
37
53
  /** Always false: only a newer SDK can send the request again. */
38
54
  retryable = false;
39
- constructor(status) {
40
- super(`The Relay no longer accepts Relay protocol version ${RELAY_PROTOCOL_VERSION}. Update the SDK.`);
55
+ /**
56
+ * @param status - The HTTP status of the refusal.
57
+ * @param version - The Relay protocol version that the client sent. The
58
+ * message names it. Without it, the message names version 1.
59
+ */
60
+ constructor(status, version) {
61
+ super(`The Relay no longer accepts Relay protocol version ${version ?? FIRST_RELAY_PROTOCOL_VERSION}. Update the SDK.`);
41
62
  this.name = "HostedRelayUpgradeRequiredError";
42
63
  this.status = status;
43
64
  }
@@ -45,9 +66,10 @@ export class HostedRelayUpgradeRequiredError extends Error {
45
66
  /**
46
67
  * Throws `HostedRelayUpgradeRequiredError` when a Relay error body has the
47
68
  * code `UPGRADE_REQUIRED`, at any error status. The body code is the
48
- * contract, not the status.
69
+ * contract, not the status. The error names `version`, the protocol version
70
+ * that the request sent.
49
71
  */
50
- export function throwIfUpgradeRequired(status, body) {
72
+ export function throwIfUpgradeRequired(status, body, version) {
51
73
  if (typeof body === "object" &&
52
74
  body !== null &&
53
75
  "error" in body &&
@@ -55,6 +77,27 @@ export function throwIfUpgradeRequired(status, body) {
55
77
  body.error !== null &&
56
78
  "code" in body.error &&
57
79
  body.error.code === "UPGRADE_REQUIRED")
58
- throw new HostedRelayUpgradeRequiredError(status);
80
+ throw new HostedRelayUpgradeRequiredError(status, version);
81
+ }
82
+ /** The protocol version of the request that each Relay error answers. */
83
+ const answerVersions = new WeakMap();
84
+ /**
85
+ * Record that `error` is the Relay's answer to a request that sent protocol
86
+ * `version`. The meaning of some codes depends on that version. Returns
87
+ * the same error.
88
+ */
89
+ export function markRelayAnswerVersion(error, version) {
90
+ answerVersions.set(error, version);
91
+ return error;
92
+ }
93
+ /**
94
+ * The protocol version of the request that a Relay error answers, or
95
+ * undefined when no hosted carrier marked the error. A custom relay marks
96
+ * no error.
97
+ */
98
+ export function relayAnswerVersion(error) {
99
+ return error !== null && typeof error === "object"
100
+ ? answerVersions.get(error)
101
+ : undefined;
59
102
  }
60
103
  //# sourceMappingURL=relay-protocol.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"relay-protocol.js","sourceRoot":"","sources":["../../client/relay-protocol.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,uDAAuD;AACvD,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AAExC,6EAA6E;AAC7E,MAAM,2BAA2B,GAAG,mBAAmB,CAAC;AAExD,yEAAyE;AACzE,MAAM,CAAC,MAAM,0BAA0B,GAAG,uBAAuB,CAAC;AAElE,yDAAyD;AACzD,MAAM,CAAC,MAAM,qBAAqB,GAAG,4BAA4B,CAAC;AAElE,qFAAqF;AACrF,MAAM,UAAU,kBAAkB,CAAC,OAAe;IAChD,OAAO,GAAG,2BAA2B,GAAG,OAAO,EAAE,CAAC;AACpD,CAAC;AAED,2EAA2E;AAC3E,MAAM,UAAU,oBAAoB;IAClC,OAAO,EAAE,CAAC,qBAAqB,CAAC,EAAE,MAAM,CAAC,sBAAsB,CAAC,EAAE,CAAC;AACrE,CAAC;AAED;;;;;GAKG;AACH,MAAM,OAAO,+BAAgC,SAAQ,KAAK;IACxC,IAAI,GAAG,kBAAkB,CAAC;IAC1C,gEAAgE;IAChD,MAAM,CAAS;IAC/B,iEAAiE;IACjD,SAAS,GAAG,KAAK,CAAC;IAElC,YAAmB,MAAc;QAC/B,KAAK,CACH,sDAAsD,sBAAsB,mBAAmB,CAChG,CAAC;QACF,IAAI,CAAC,IAAI,GAAG,iCAAiC,CAAC;QAC9C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;CACF;AAED;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CAAC,MAAc,EAAE,IAAa;IAClE,IACE,OAAO,IAAI,KAAK,QAAQ;QACxB,IAAI,KAAK,IAAI;QACb,OAAO,IAAI,IAAI;QACf,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ;QAC9B,IAAI,CAAC,KAAK,KAAK,IAAI;QACnB,MAAM,IAAI,IAAI,CAAC,KAAK;QACpB,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,kBAAkB;QAEtC,MAAM,IAAI,+BAA+B,CAAC,MAAM,CAAC,CAAC;AACtD,CAAC"}
1
+ {"version":3,"file":"relay-protocol.js","sourceRoot":"","sources":["../../client/relay-protocol.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AAExC,sFAAsF;AACtF,MAAM,4BAA4B,GAAG,CAAC,CAAC;AAEvC,6EAA6E;AAC7E,MAAM,2BAA2B,GAAG,mBAAmB,CAAC;AAExD,yEAAyE;AACzE,MAAM,CAAC,MAAM,0BAA0B,GAAG,uBAAuB,CAAC;AAElE,yDAAyD;AACzD,MAAM,CAAC,MAAM,qBAAqB,GAAG,4BAA4B,CAAC;AAElE,qFAAqF;AACrF,MAAM,UAAU,kBAAkB,CAAC,OAAe;IAChD,OAAO,GAAG,2BAA2B,GAAG,OAAO,EAAE,CAAC;AACpD,CAAC;AAED,kEAAkE;AAClE,MAAM,UAAU,uBAAuB,CAAC,OAAe;IACrD,OAAO,EAAE,CAAC,qBAAqB,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;AACtD,CAAC;AAED,mFAAmF;AACnF,MAAM,UAAU,oBAAoB;IAClC,OAAO,uBAAuB,CAAC,sBAAsB,CAAC,CAAC;AACzD,CAAC;AAED;;;;;GAKG;AACH,MAAM,OAAO,+BAAgC,SAAQ,KAAK;IACxC,IAAI,GAAG,kBAAkB,CAAC;IAC1C,gEAAgE;IAChD,MAAM,CAAS;IAC/B,iEAAiE;IACjD,SAAS,GAAG,KAAK,CAAC;IAElC;;;;OAIG;IACH,YAAmB,MAAc,EAAE,OAAgB;QACjD,KAAK,CACH,sDAAsD,OAAO,IAAI,4BAA4B,mBAAmB,CACjH,CAAC;QACF,IAAI,CAAC,IAAI,GAAG,iCAAiC,CAAC;QAC9C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;CACF;AAED;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB,CACpC,MAAc,EACd,IAAa,EACb,OAAgB;IAEhB,IACE,OAAO,IAAI,KAAK,QAAQ;QACxB,IAAI,KAAK,IAAI;QACb,OAAO,IAAI,IAAI;QACf,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ;QAC9B,IAAI,CAAC,KAAK,KAAK,IAAI;QACnB,MAAM,IAAI,IAAI,CAAC,KAAK;QACpB,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,kBAAkB;QAEtC,MAAM,IAAI,+BAA+B,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAC/D,CAAC;AAED,yEAAyE;AACzE,MAAM,cAAc,GAAG,IAAI,OAAO,EAAkB,CAAC;AAErD;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CAAmB,KAAQ,EAAE,OAAe;IAChF,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACnC,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,KAAc;IAC/C,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ;QAChD,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC;QAC3B,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC"}
@@ -170,9 +170,9 @@ export interface RetryFamilyReceive {
170
170
  * @param fingerprint - The fingerprint of the received envelope.
171
171
  * @param post - Posts the request for the given failure, and gives what
172
172
  * it did.
173
- * @returns The outcome of `post`. After a `posted` or `terminal` outcome,
174
- * a member is processed, so a redelivery of it on either path posts
175
- * nothing. Any other outcome leaves it unprocessed. `skipped` with no
173
+ * @returns The outcome of `post`. After a `posted`, `waiting` or
174
+ * `terminal` outcome, a member is processed, so a redelivery of it on
175
+ * either path posts nothing. Any other outcome leaves it unprocessed. `skipped` with no
176
176
  * post, and one warn line with the behavior
177
177
  * RETRY_REQUEST_ENVELOPE_CHANGED, when the relay changed the failed
178
178
  * envelope after its retry request.
@@ -295,7 +295,7 @@ function retryFamilyReceive(storage, logger, delivered, envelopeId, resolved, re
295
295
  stored,
296
296
  ...(envelopeId !== undefined && { member: envelopeId }),
297
297
  });
298
- if ((outcome === 'posted' || outcome === 'terminal') && envelopeId) {
298
+ if ((outcome === 'posted' || outcome === 'waiting' || outcome === 'terminal') && envelopeId) {
299
299
  await storeProcessedEnvelope(storage, envelopeId, Date.now(), fingerprint);
300
300
  }
301
301
  return outcome;
@@ -1 +1 @@
1
- {"version":3,"file":"retry-family.js","sourceRoot":"","sources":["../../client/retry-family.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"retry-family.js","sourceRoot":"","sources":["../../client/retry-family.ts"],"names":[],"mappings":"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"}
@@ -156,6 +156,8 @@ export declare function retryRequestPost(seal: SealRetryRequest | undefined, rel
156
156
  export type RetryPostOutcome =
157
157
  /** The Relay holds the request attempt. */
158
158
  'posted'
159
+ /** The request attempt stays as stored and nothing was posted. */
160
+ | 'waiting'
159
161
  /** The post failed with a retryable class. The record holds the next attempt time. */
160
162
  | 'pending'
161
163
  /** The request ended. The record holds the terminal state. */
@@ -177,10 +179,16 @@ export declare function answeredLastRetryAttempt(stored: StoredRetryRequest): bo
177
179
  * record that ended posts nothing. At the deadline of the record, the
178
180
  * request ends as `expired-content` and posts nothing. When a member
179
181
  * failed and the stored attempt is answered, it creates the next attempt
180
- * under the same retry ID, with the same deadline, and posts it. When that
182
+ * under the same retry ID, with the same deadlines, and posts it. When that
181
183
  * answered attempt is the last one, as `answeredLastRetryAttempt` tells,
182
- * the request ends as `attempts-exhausted` and posts nothing. Otherwise it
183
- * posts the stored attempt, as `postStoredRetryRequest` does.
184
+ * the request ends as `attempts-exhausted` and posts nothing. At or after
185
+ * the posting deadline, `retryRequestPostingDeadlineAt`, an answered
186
+ * attempt gets no next attempt and gives `waiting`: the Relay accepted the
187
+ * request, so it waits, and its deadline ends it as `expired-content`. The
188
+ * Relay also holds a stored attempt with no next attempt time, so after
189
+ * the posting deadline that attempt is not posted again and gives
190
+ * `waiting`. Otherwise it posts the stored attempt, as
191
+ * `postStoredRetryRequest` does.
184
192
  *
185
193
  * Each new attempt carries the failed client message ID, the content hint,
186
194
  * the sender, the receive time and the delivery error state of the stored
@@ -197,12 +205,14 @@ export declare function answeredLastRetryAttempt(stored: StoredRetryRequest): bo
197
205
  export declare function postRetryRequest(store: Parameters<typeof storeRetryRequest>[0], failed: RetryRequestFailure, createRequest: () => Promise<RetryRequest>, sender: RetryRequestDevice, send: (envelope: Envelope) => Promise<unknown>): Promise<RetryPostOutcome>;
198
206
  /**
199
207
  * Post the stored attempt of a retry request again, with its stored bytes
200
- * and ID. When the Relay refuses it with OPERATION_EXPIRED, it creates the
201
- * next attempt under the same retry ID, with the same deadline, replaces
202
- * the record in one write, and posts it.
208
+ * and ID. At or after its posting deadline, `retryRequestPostingDeadlineAt`,
209
+ * the request ends as `posting-deadline` and posts nothing. When the Relay
210
+ * refuses the post with OPERATION_EXPIRED, the request ends as
211
+ * `posting-deadline` with acceptance unknown, and posts no replacement.
203
212
  *
204
- * Each post classifies its failure. A RETRY_CONFLICT answer completes the
205
- * attempt, because the Relay holds an earlier encryption of it. A
213
+ * Each post classifies its failure. A RETRY_CONFLICT answer, or a
214
+ * DELIVERY_ALREADY_ACCEPTED answer under protocol version 2, completes the
215
+ * attempt, because the Relay holds an earlier post of it. A
206
216
  * conclusive class stores the terminal state, with `emitted` false, and
207
217
  * gives 'terminal'. A retryable class stores the class and the next
208
218
  * attempt time, the age of the attempt from 1 minute to 1 hour from now,
@@ -1 +1 @@
1
- {"version":3,"file":"retry-request-envelope.d.ts","sourceRoot":"","sources":["../../client/retry-request-envelope.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"retry-request-envelope.d.ts","sourceRoot":"","sources":["../../client/retry-request-envelope.ts"],"names":[],"mappings":"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"}
@@ -32,8 +32,8 @@ import { SealedSenderAuthError } from '../types/errors.js';
32
32
  import { RetryReason } from '../internal/sesame/types.js';
33
33
  import { base64ToBytes, bytesToBase64, generateUuidV4, stringToBytes } from '../internal/crypto/index.js';
34
34
  import { utf8Decode } from '../internal/platform/index.js';
35
- import { isRetryId, RETRY_REQUEST_DEADLINE_MS, retryAttemptClientMessageId, retryRequestClientMessageId, storeRetryRequest, updateRetryRequest, } from '../local/store/reliability.js';
36
- import { classifyRetryRequestPostFailure, relayOperationRefusal, } from './relay-acceptance.js';
35
+ import { isRetryId, RETRY_REQUEST_DEADLINE_MS, RETRY_REQUEST_POSTING_WINDOW_MS, retryAttemptClientMessageId, retryRequestClientMessageId, retryRequestPostingDeadlineAt, storeRetryRequest, updateRetryRequest, } from '../local/store/reliability.js';
36
+ import { classifyRetryRequestPostFailure, relayHoldsMessageId, relayOperationRefusal, } from './relay-acceptance.js';
37
37
  import { rethrowRelayWorkStopped } from './relay-work.js';
38
38
  import { isStaleDeviceRefusal } from './relay-device-refusal.js';
39
39
  import { MAX_RETRY_RESPONSES_PER_MESSAGE } from './constants.js';
@@ -179,10 +179,16 @@ const MAX_RETRY_REQUEST_BACKOFF_MS = 60 * 60_000;
179
179
  * record that ended posts nothing. At the deadline of the record, the
180
180
  * request ends as `expired-content` and posts nothing. When a member
181
181
  * failed and the stored attempt is answered, it creates the next attempt
182
- * under the same retry ID, with the same deadline, and posts it. When that
182
+ * under the same retry ID, with the same deadlines, and posts it. When that
183
183
  * answered attempt is the last one, as `answeredLastRetryAttempt` tells,
184
- * the request ends as `attempts-exhausted` and posts nothing. Otherwise it
185
- * posts the stored attempt, as `postStoredRetryRequest` does.
184
+ * the request ends as `attempts-exhausted` and posts nothing. At or after
185
+ * the posting deadline, `retryRequestPostingDeadlineAt`, an answered
186
+ * attempt gets no next attempt and gives `waiting`: the Relay accepted the
187
+ * request, so it waits, and its deadline ends it as `expired-content`. The
188
+ * Relay also holds a stored attempt with no next attempt time, so after
189
+ * the posting deadline that attempt is not posted again and gives
190
+ * `waiting`. Otherwise it posts the stored attempt, as
191
+ * `postStoredRetryRequest` does.
186
192
  *
187
193
  * Each new attempt carries the failed client message ID, the content hint,
188
194
  * the sender, the receive time and the delivery error state of the stored
@@ -228,18 +234,27 @@ export async function postRetryRequest(store, failed, createRequest, sender, sen
228
234
  if (failed.member !== undefined && stored.answered) {
229
235
  if (answeredLastRetryAttempt(stored))
230
236
  return attempts.end(stored, 'attempts-exhausted');
237
+ // The answer proves that the Relay accepted the request, so it waits
238
+ // for its deadline.
239
+ if (Date.now() >= retryRequestPostingDeadlineAt(stored))
240
+ return 'waiting';
231
241
  return attempts.postNew(await attempts.next(stored));
232
242
  }
243
+ if (stored.nextAttemptAt === undefined && Date.now() >= retryRequestPostingDeadlineAt(stored)) {
244
+ return 'waiting';
245
+ }
233
246
  return attempts.postStored(stored);
234
247
  }
235
248
  /**
236
249
  * Post the stored attempt of a retry request again, with its stored bytes
237
- * and ID. When the Relay refuses it with OPERATION_EXPIRED, it creates the
238
- * next attempt under the same retry ID, with the same deadline, replaces
239
- * the record in one write, and posts it.
250
+ * and ID. At or after its posting deadline, `retryRequestPostingDeadlineAt`,
251
+ * the request ends as `posting-deadline` and posts nothing. When the Relay
252
+ * refuses the post with OPERATION_EXPIRED, the request ends as
253
+ * `posting-deadline` with acceptance unknown, and posts no replacement.
240
254
  *
241
- * Each post classifies its failure. A RETRY_CONFLICT answer completes the
242
- * attempt, because the Relay holds an earlier encryption of it. A
255
+ * Each post classifies its failure. A RETRY_CONFLICT answer, or a
256
+ * DELIVERY_ALREADY_ACCEPTED answer under protocol version 2, completes the
257
+ * attempt, because the Relay holds an earlier post of it. A
243
258
  * conclusive class stores the terminal state, with `emitted` false, and
244
259
  * gives 'terminal'. A retryable class stores the class and the next
245
260
  * attempt time, the age of the attempt from 1 minute to 1 hour from now,
@@ -259,9 +274,10 @@ function retryRequestAttempts(store, createRequest, sender, send) {
259
274
  const update = (record, changes) => updateRetryRequest(store, record.failedEnvelopeId, record.retryId, record.attempt, changes);
260
275
  /**
261
276
  * Create and store a new attempt. Attempt 1 sets the deadline from its
262
- * own time, the first failure. The attempt is due at its own time until
263
- * its post settles, so the scheduler posts it again when a stop or a
264
- * crash ends the post.
277
+ * own time, and the posting deadline from the first failure,
278
+ * `receivedAt`. The attempt is due at its own time until its post
279
+ * settles, so the scheduler posts it again when a stop or a crash ends
280
+ * the post.
265
281
  */
266
282
  const create = async (attempt) => {
267
283
  const request = withFailedClientMessageId(await createRequest(), attempt.failedClientMessageId);
@@ -285,13 +301,15 @@ function retryRequestAttempts(store, createRequest, sender, send) {
285
301
  ...(attempt.errorShown && { errorShown: true }),
286
302
  ...(attempt.recoveredEmitted && { recoveredEmitted: true }),
287
303
  deadlineAt: attempt.deadlineAt ?? envelope.timestamp + RETRY_REQUEST_DEADLINE_MS,
304
+ postingDeadlineAt: attempt.postingDeadlineAt ??
305
+ (attempt.receivedAt ?? envelope.timestamp) + RETRY_REQUEST_POSTING_WINDOW_MS,
288
306
  nextAttemptAt: envelope.timestamp,
289
307
  envelope,
290
308
  };
291
309
  await storeRetryRequest(store, record);
292
310
  return record;
293
311
  };
294
- /** Create the attempt after the stored one, with the same retry ID and deadline. */
312
+ /** Create the attempt after the stored one, with the same retry ID and deadlines. */
295
313
  const next = (stored) => create({
296
314
  failedEnvelopeId: stored.failedEnvelopeId,
297
315
  retryId: stored.retryId,
@@ -306,35 +324,45 @@ function retryRequestAttempts(store, createRequest, sender, send) {
306
324
  errorShown: stored.errorShown,
307
325
  recoveredEmitted: stored.recoveredEmitted,
308
326
  deadlineAt: stored.deadlineAt,
327
+ postingDeadlineAt: retryRequestPostingDeadlineAt(stored),
309
328
  });
310
329
  const end = async (stored, terminal) => {
311
330
  await update(stored, {
312
331
  terminal: { class: terminal, at: Date.now(), emitted: false },
313
332
  nextAttemptAt: undefined,
333
+ lastFailureClass: undefined,
314
334
  });
315
335
  return 'terminal';
316
336
  };
317
337
  /**
318
- * Post one attempt. `fresh` is true for an attempt that this call
319
- * created: OPERATION_EXPIRED then means a clock outside the admission
320
- * window, and counts as a transport outage.
338
+ * Post one attempt. At or after its posting deadline, the request ends as
339
+ * `posting-deadline` and posts nothing.
340
+ *
341
+ * OPERATION_EXPIRED ends the request as `posting-deadline` with
342
+ * acceptance unknown, and no replacement posts. The Relay may have
343
+ * accepted an earlier post of the attempt and since dropped it.
344
+ *
345
+ * DELIVERY_ALREADY_ACCEPTED under protocol version 2 means that the
346
+ * Relay already holds an accepted post, or a delivered row, under the
347
+ * message ID of the attempt. Each attempt has its own message ID, so the
348
+ * attempt is at the Relay or was delivered. The call reads the code as
349
+ * it reads RETRY_CONFLICT: the request is posted, and no replacement
350
+ * posts. Attempts advance only when a member answers the stored attempt.
321
351
  */
322
- const post = async (record, fresh) => {
352
+ const post = async (record) => {
353
+ if (Date.now() >= retryRequestPostingDeadlineAt(record)) {
354
+ return end(record, 'posting-deadline');
355
+ }
323
356
  try {
324
357
  await send(record.envelope);
325
358
  }
326
359
  catch (error) {
327
360
  rethrowRelayWorkStopped(error);
328
361
  const refusal = relayOperationRefusal(error);
329
- if (refusal === 'OPERATION_EXPIRED' && !fresh) {
330
- // The Relay no longer admits or replays the stored operation. The
331
- // new attempt replaces the record before its post.
332
- return post(await next(record), true);
333
- }
334
- if (refusal !== 'RETRY_CONFLICT') {
335
- const failure = refusal === 'OPERATION_EXPIRED'
336
- ? { retry: 'transport-outage' }
337
- : classifyRetryRequestPostFailure(error);
362
+ if (refusal === 'OPERATION_EXPIRED')
363
+ return end(record, 'posting-deadline');
364
+ if (!relayHoldsMessageId(error)) {
365
+ const failure = classifyRetryRequestPostFailure(error);
338
366
  if ('terminal' in failure) {
339
367
  await update(record, {
340
368
  terminal: { class: failure.terminal, at: Date.now(), emitted: false },
@@ -358,8 +386,8 @@ function retryRequestAttempts(store, createRequest, sender, send) {
358
386
  create,
359
387
  next,
360
388
  end,
361
- postNew: (record) => post(record, true),
362
- postStored: (stored) => post(stored, false),
389
+ postNew: (record) => post(record),
390
+ postStored: (stored) => post(stored),
363
391
  };
364
392
  }
365
393
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"retry-request-envelope.js","sourceRoot":"","sources":["../../client/retry-request-envelope.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"retry-request-envelope.js","sourceRoot":"","sources":["../../client/retry-request-envelope.ts"],"names":[],"mappings":"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"}
@@ -6,8 +6,9 @@
6
6
  * failed envelope posts nothing while the record exists. A post that fails
7
7
  * with a retryable class is posted again by the scheduler at its next
8
8
  * attempt time. A post that fails with a conclusive class, the deadline of
9
- * the record, a failed resend of the last answered attempt, and an
10
- * exhausted abuse allowance end the request. Each end calls the
9
+ * the record, a post due at or after its posting deadline, an
10
+ * OPERATION_EXPIRED refusal, a failed resend of the last answered attempt,
11
+ * and an exhausted abuse allowance end the request. Each end calls the
11
12
  * `onRetryTerminal` hook at least once: the record is marked emitted only
12
13
  * after the hook returns. Each request and each scheduler pass also checks
13
14
  * the delivery error of the record, as `reportDeliveryError` tells. Each
@@ -27,8 +28,8 @@ type RetryRequestStore = Parameters<typeof storeRetryRequest>[0];
27
28
  /**
28
29
  * What the retry request of one failed decrypt did.
29
30
  *
30
- * - `posted`, `pending`, `terminal`: as `postRetryRequest` gives them. A
31
- * terminal request also called the hook.
31
+ * - `posted`, `waiting`, `pending`, `terminal`: as `postRetryRequest`
32
+ * gives them. A terminal request also called the hook.
32
33
  * - `owned`: the record of the failed envelope owns the request, so a
33
34
  * redelivery of the failed envelope posted nothing.
34
35
  * - `deferred`: the rate limit refused a member, and the next attempt waits
@@ -39,8 +40,9 @@ export type RetryRequestOutcome = RetryPostOutcome | 'owned' | 'deferred' | 'ski
39
40
  /**
40
41
  * Tell whether the receive path acknowledges a failed envelope after its
41
42
  * retry request. A failed envelope is acknowledged once a record owns its
42
- * request. A member is acknowledged only when its request attempt is posted
43
- * or ended, so a member that waits is delivered again.
43
+ * request. A member is acknowledged only when its request attempt is
44
+ * posted, held by the Relay with nothing to post (`waiting`), or ended, so
45
+ * a deferred or skipped member is delivered again.
44
46
  */
45
47
  export declare function acknowledgesRetryRequest(outcome: RetryRequestOutcome, member: boolean): boolean;
46
48
  /** What the requester uses to ask for a resend after one failed decrypt. */
@@ -91,15 +93,19 @@ export interface RetryRequestSource {
91
93
  * group of `failedEnvelope`.
92
94
  */
93
95
  readonly groupId?: string;
94
- /** The session reset of an `expired-content` end. Without it, nothing resets. */
96
+ /**
97
+ * The session reset of an `expired-content` or `posting-deadline` end.
98
+ * Without it, nothing resets.
99
+ */
95
100
  readonly reset: RetryTerminalResetSteps | undefined;
96
101
  }
97
102
  /**
98
103
  * Call the `onRetryTerminal` hook for the terminal state of a request
99
104
  * record, once. It reads the record, and when the terminal state is not
100
- * emitted, it first resets the session of an `expired-content` end with
101
- * `resetRetryTerminalSession`. It then calls the hook and stores the state
102
- * as emitted. The other classes reset nothing.
105
+ * emitted, it first resets the session of an `expired-content` or
106
+ * `posting-deadline` end with `resetRetryTerminalSession`. It then calls
107
+ * the hook and stores the state as emitted. The other classes reset
108
+ * nothing.
103
109
  *
104
110
  * The hook is called directly, not through `callHook`, so a hook that
105
111
  * throws, and the RelayWorkStopped of a stop or of the reset, propagate and
@@ -132,6 +138,10 @@ export declare function emitRetryTerminal(context: RetryTerminalResetContext, fa
132
138
  * end of the limit window and gives `deferred`.
133
139
  * - A member whose stored attempt is not answered posts it again, with no
134
140
  * rate limit.
141
+ * - A member at or after the posting deadline of its stored attempt,
142
+ * `retryRequestPostingDeadlineAt`, spends no request of the rate limit.
143
+ * An answered or held attempt posts nothing and gives `waiting`. A due
144
+ * attempt ends as `posting-deadline`.
135
145
  *
136
146
  * After a post, a terminal outcome calls the hook, and any other outcome
137
147
  * arms the scheduler for the record. Then, for each failed envelope with
@@ -150,7 +160,10 @@ export interface RetryRequestPass {
150
160
  readonly hooks: SignalProtocolClientHooks | undefined;
151
161
  readonly local: RetryRequestDevice;
152
162
  readonly send: ((envelope: Envelope) => Promise<unknown>) | undefined;
153
- /** The session reset of an `expired-content` end. Without it, nothing resets. */
163
+ /**
164
+ * The session reset of an `expired-content` or `posting-deadline` end.
165
+ * Without it, nothing resets.
166
+ */
154
167
  readonly reset: RetryTerminalResetSteps | undefined;
155
168
  }
156
169
  export {};
@@ -1 +1 @@
1
- {"version":3,"file":"retry-request-lifecycle.d.ts","sourceRoot":"","sources":["../../client/retry-request-lifecycle.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"retry-request-lifecycle.d.ts","sourceRoot":"","sources":["../../client/retry-request-lifecycle.ts"],"names":[],"mappings":"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"}