@open-e2ee/signal-protocol-sdk 2.0.2 → 4.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ADAPTERS.md +14 -21
- package/ARCHITECTURE.md +1 -2
- package/CHANGELOG.md +90 -0
- package/LICENSE +11 -655
- package/LICENSE-APACHE +201 -0
- package/LICENSE-MIT +21 -0
- package/NOTICE +5 -7
- package/README.md +11 -11
- package/SECURITY.md +2 -2
- package/TROUBLESHOOTING.md +6 -10
- package/client/README.md +36 -18
- package/device/README.md +1 -1
- package/dist/blocking/manager.d.ts +2 -2
- package/dist/blocking/manager.d.ts.map +1 -1
- package/dist/blocking/manager.js.map +1 -1
- package/dist/client/client.d.ts +45 -34
- package/dist/client/client.d.ts.map +1 -1
- package/dist/client/client.js +178 -115
- package/dist/client/client.js.map +1 -1
- package/dist/client/compose.d.ts +7 -7
- package/dist/client/compose.d.ts.map +1 -1
- package/dist/client/compose.js +2 -2
- package/dist/client/compose.js.map +1 -1
- package/dist/client/config.d.ts +24 -28
- package/dist/client/config.d.ts.map +1 -1
- package/dist/client/config.js.map +1 -1
- package/dist/client/content-adapter.d.ts +2 -0
- package/dist/client/content-adapter.d.ts.map +1 -1
- package/dist/client/content-adapter.js +4 -0
- package/dist/client/content-adapter.js.map +1 -1
- package/dist/client/dual-store.d.ts +5 -5
- package/dist/client/dual-store.d.ts.map +1 -1
- package/dist/client/dual-store.js.map +1 -1
- package/dist/client/endorsement-manager.d.ts +6 -3
- package/dist/client/endorsement-manager.d.ts.map +1 -1
- package/dist/client/endorsement-manager.js +14 -6
- package/dist/client/endorsement-manager.js.map +1 -1
- package/dist/client/files.d.ts +1 -1
- package/dist/client/files.js +1 -1
- package/dist/client/group-authority.d.ts +8 -0
- package/dist/client/group-authority.d.ts.map +1 -0
- package/dist/client/group-authority.js +2 -0
- package/dist/client/group-authority.js.map +1 -0
- package/dist/client/group-outbox.d.ts +4 -4
- package/dist/client/group-outbox.d.ts.map +1 -1
- package/dist/client/group-sealed-sender.d.ts +2 -2
- package/dist/client/group-sealed-sender.d.ts.map +1 -1
- package/dist/client/groups.d.ts +1 -1
- package/dist/client/groups.js +1 -1
- package/dist/client/headless.d.ts +11 -16
- package/dist/client/headless.d.ts.map +1 -1
- package/dist/client/headless.js +4 -9
- package/dist/client/headless.js.map +1 -1
- package/dist/client/hosted-anonymous-delivery.d.ts +32 -0
- package/dist/client/hosted-anonymous-delivery.d.ts.map +1 -0
- package/dist/client/hosted-anonymous-delivery.js +239 -0
- package/dist/client/hosted-anonymous-delivery.js.map +1 -0
- package/dist/client/hosted-connection.d.ts +1 -1
- package/dist/client/hosted-connection.d.ts.map +1 -1
- package/dist/client/hosted-connection.js +18 -51
- package/dist/client/hosted-connection.js.map +1 -1
- package/dist/client/hosted-group-authority.d.ts +11 -0
- package/dist/client/hosted-group-authority.d.ts.map +1 -0
- package/dist/client/hosted-group-authority.js +96 -0
- package/dist/client/hosted-group-authority.js.map +1 -0
- package/dist/client/hosted-groups.d.ts +31 -0
- package/dist/client/hosted-groups.d.ts.map +1 -0
- package/dist/client/hosted-groups.js +217 -0
- package/dist/client/hosted-groups.js.map +1 -0
- package/dist/client/hosted-mailbox-subscription.d.ts +34 -0
- package/dist/client/hosted-mailbox-subscription.d.ts.map +1 -0
- package/dist/client/hosted-mailbox-subscription.js +257 -0
- package/dist/client/hosted-mailbox-subscription.js.map +1 -0
- package/dist/client/hosted-prekey-publication.d.ts +51 -0
- package/dist/client/hosted-prekey-publication.d.ts.map +1 -0
- package/dist/client/hosted-prekey-publication.js +249 -0
- package/dist/client/hosted-prekey-publication.js.map +1 -0
- package/dist/client/hosted-push.d.ts +5 -6
- package/dist/client/hosted-push.d.ts.map +1 -1
- package/dist/client/hosted-push.js +22 -22
- package/dist/client/hosted-push.js.map +1 -1
- package/dist/client/hosted-transport.d.ts +62 -40
- package/dist/client/hosted-transport.d.ts.map +1 -1
- package/dist/client/hosted-transport.js +666 -341
- package/dist/client/hosted-transport.js.map +1 -1
- package/dist/client/hosted-trust.d.ts +29 -0
- package/dist/client/hosted-trust.d.ts.map +1 -0
- package/dist/client/hosted-trust.js +28 -0
- package/dist/client/hosted-trust.js.map +1 -0
- package/dist/client/hosted.d.ts +26 -21
- package/dist/client/hosted.d.ts.map +1 -1
- package/dist/client/hosted.js +80 -36
- package/dist/client/hosted.js.map +1 -1
- package/dist/client/index.d.ts +15 -15
- package/dist/client/index.d.ts.map +1 -1
- package/dist/client/index.js +7 -7
- package/dist/client/index.js.map +1 -1
- package/dist/client/key-rotation-core.d.ts +16 -8
- package/dist/client/key-rotation-core.d.ts.map +1 -1
- package/dist/client/key-rotation-core.js +14 -3
- package/dist/client/key-rotation-core.js.map +1 -1
- package/dist/client/key-rotation.d.ts +3 -2
- package/dist/client/key-rotation.d.ts.map +1 -1
- package/dist/client/key-rotation.js +5 -5
- package/dist/client/key-rotation.js.map +1 -1
- package/dist/client/media-queue-persistence.d.ts +14 -0
- package/dist/client/media-queue-persistence.d.ts.map +1 -0
- package/dist/client/media-queue-persistence.js +123 -0
- package/dist/client/media-queue-persistence.js.map +1 -0
- package/dist/client/media-upload-budget.d.ts +3 -0
- package/dist/client/media-upload-budget.d.ts.map +1 -0
- package/dist/client/media-upload-budget.js +27 -0
- package/dist/client/media-upload-budget.js.map +1 -0
- package/dist/client/media.d.ts +51 -15
- package/dist/client/media.d.ts.map +1 -1
- package/dist/client/media.js +541 -73
- package/dist/client/media.js.map +1 -1
- package/dist/client/messages.d.ts +1 -1
- package/dist/client/messages.d.ts.map +1 -1
- package/dist/client/messages.js +14 -15
- package/dist/client/messages.js.map +1 -1
- package/dist/client/multi-device.d.ts +1 -1
- package/dist/client/multi-device.js +1 -1
- package/dist/client/prekeys.d.ts +1 -1
- package/dist/client/prekeys.d.ts.map +1 -1
- package/dist/client/prekeys.js +132 -44
- package/dist/client/prekeys.js.map +1 -1
- package/dist/client/relay-subscription.d.ts +5 -1
- package/dist/client/relay-subscription.d.ts.map +1 -1
- package/dist/client/relay-subscription.js +59 -26
- package/dist/client/relay-subscription.js.map +1 -1
- package/dist/client/retry.d.ts +3 -3
- package/dist/client/retry.d.ts.map +1 -1
- package/dist/client/retry.js +1 -1
- package/dist/client/retry.js.map +1 -1
- package/dist/client/sealed-sender.d.ts +5 -5
- package/dist/client/sealed-sender.d.ts.map +1 -1
- package/dist/client/sealed-sender.js.map +1 -1
- package/dist/client/sender-key-distribution.d.ts +8 -0
- package/dist/client/sender-key-distribution.d.ts.map +1 -0
- package/dist/client/sender-key-distribution.js +59 -0
- package/dist/client/sender-key-distribution.js.map +1 -0
- package/dist/client/sessions.d.ts +3 -3
- package/dist/client/sessions.d.ts.map +1 -1
- package/dist/client/sessions.js +1 -1
- package/dist/client/sessions.js.map +1 -1
- package/dist/client/signal-service-cipher.d.ts +12 -8
- package/dist/client/signal-service-cipher.d.ts.map +1 -1
- package/dist/client/signal-service-cipher.js +41 -16
- package/dist/client/signal-service-cipher.js.map +1 -1
- package/dist/client/state.d.ts +1 -1
- package/dist/client/state.js +1 -1
- package/dist/client/types.d.ts +10 -10
- package/dist/client/types.d.ts.map +1 -1
- package/dist/client/types.js +1 -1
- package/dist/device/connection.d.ts.map +1 -1
- package/dist/device/connection.js.map +1 -1
- package/dist/device/device-id.d.ts +2 -2
- package/dist/device/device-id.d.ts.map +1 -1
- package/dist/device/device-id.js.map +1 -1
- package/dist/device/{expo-metadata.d.ts → expo/index.d.ts} +3 -3
- package/dist/device/expo/index.d.ts.map +1 -0
- package/dist/device/{expo-metadata.js → expo/index.js} +2 -2
- package/dist/device/expo/index.js.map +1 -0
- package/dist/device/index.d.ts +1 -1
- package/dist/device/index.d.ts.map +1 -1
- package/dist/device/index.js +1 -1
- package/dist/device/index.js.map +1 -1
- package/dist/device/lifecycle/index.d.ts +1 -1
- package/dist/device/lifecycle/index.d.ts.map +1 -1
- package/dist/device/lifecycle/types.d.ts +8 -8
- package/dist/device/lifecycle/types.d.ts.map +1 -1
- package/dist/device/provisioning.d.ts +13 -13
- package/dist/device/provisioning.d.ts.map +1 -1
- package/dist/device/provisioning.js +1 -1
- package/dist/device/provisioning.js.map +1 -1
- package/dist/device/transfer.d.ts +13 -13
- package/dist/device/transfer.d.ts.map +1 -1
- package/dist/device/transfer.js.map +1 -1
- package/dist/device/types.d.ts +3 -3
- package/dist/device/types.d.ts.map +1 -1
- package/dist/groups/index.d.ts +1 -1
- package/dist/groups/index.d.ts.map +1 -1
- package/dist/groups/server.d.ts +10 -0
- package/dist/groups/server.d.ts.map +1 -0
- package/dist/groups/server.js +6 -0
- package/dist/groups/server.js.map +1 -0
- package/dist/hooks/use-connection-presence.d.ts +6 -8
- package/dist/hooks/use-connection-presence.d.ts.map +1 -1
- package/dist/hooks/use-connection-presence.js +2 -4
- package/dist/hooks/use-connection-presence.js.map +1 -1
- package/dist/hooks/use-group-membership.d.ts +2 -2
- package/dist/hooks/use-group-membership.d.ts.map +1 -1
- package/dist/hooks/use-group-membership.js.map +1 -1
- package/dist/hooks/use-key-rotation.d.ts +2 -2
- package/dist/hooks/use-key-rotation.d.ts.map +1 -1
- package/dist/hooks/use-session-health.d.ts +2 -2
- package/dist/hooks/use-session-health.d.ts.map +1 -1
- package/dist/index.d.ts +57 -55
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +27 -26
- package/dist/index.js.map +1 -1
- package/dist/internal/crypto/ec/x25519-validation.d.ts +4 -4
- package/dist/internal/crypto/ec/x25519-validation.d.ts.map +1 -1
- package/dist/internal/crypto/ec/x25519-validation.js.map +1 -1
- package/dist/internal/groups/authority-certificate.d.ts +22 -0
- package/dist/internal/groups/authority-certificate.d.ts.map +1 -0
- package/dist/internal/groups/authority-certificate.js +99 -0
- package/dist/internal/groups/authority-certificate.js.map +1 -0
- package/dist/internal/groups/error-details.d.ts +9 -0
- package/dist/internal/groups/error-details.d.ts.map +1 -0
- package/dist/internal/groups/error-details.js +30 -0
- package/dist/internal/groups/error-details.js.map +1 -0
- package/dist/internal/groups/index.d.ts +1 -1
- package/dist/internal/groups/index.d.ts.map +1 -1
- package/dist/internal/groups/manager.d.ts +9 -4
- package/dist/internal/groups/manager.d.ts.map +1 -1
- package/dist/internal/groups/manager.js +3 -0
- package/dist/internal/groups/manager.js.map +1 -1
- package/dist/internal/groups/sdk-store.d.ts +4 -4
- package/dist/internal/groups/sdk-store.d.ts.map +1 -1
- package/dist/internal/groups/sdk-store.js.map +1 -1
- package/dist/internal/groups/server-engine.d.ts +9 -2
- package/dist/internal/groups/server-engine.d.ts.map +1 -1
- package/dist/internal/groups/server-engine.js +51 -19
- package/dist/internal/groups/server-engine.js.map +1 -1
- package/dist/internal/groups/wire.d.ts.map +1 -1
- package/dist/internal/groups/wire.js +10 -9
- package/dist/internal/groups/wire.js.map +1 -1
- package/dist/internal/manager/index.d.ts +2 -2
- package/dist/internal/manager/index.d.ts.map +1 -1
- package/dist/internal/manager/index.js +1 -1
- package/dist/internal/manager/index.js.map +1 -1
- package/dist/internal/manager/manager.d.ts +23 -23
- package/dist/internal/manager/manager.d.ts.map +1 -1
- package/dist/internal/manager/manager.js +40 -43
- package/dist/internal/manager/manager.js.map +1 -1
- package/dist/internal/protocol/double-ratchet/chains.d.ts +9 -9
- package/dist/internal/protocol/double-ratchet/chains.d.ts.map +1 -1
- package/dist/internal/protocol/double-ratchet/chains.js.map +1 -1
- package/dist/internal/protocol/double-ratchet/ratchet.d.ts +2 -2
- package/dist/internal/protocol/double-ratchet/ratchet.d.ts.map +1 -1
- package/dist/internal/protocol/double-ratchet/ratchet.js.map +1 -1
- package/dist/internal/protocol/pqxdh/pqxdh.d.ts +3 -3
- package/dist/internal/protocol/pqxdh/pqxdh.d.ts.map +1 -1
- package/dist/internal/protocol/pqxdh/pqxdh.js.map +1 -1
- package/dist/internal/protocol/sender-keys/manager.d.ts +4 -4
- package/dist/internal/protocol/sender-keys/manager.d.ts.map +1 -1
- package/dist/internal/protocol/sender-keys/manager.js +27 -14
- package/dist/internal/protocol/sender-keys/manager.js.map +1 -1
- package/dist/internal/protocol/spqr/ml-kem-braid/authenticator.d.ts +3 -3
- package/dist/internal/protocol/spqr/ml-kem-braid/authenticator.d.ts.map +1 -1
- package/dist/internal/protocol/spqr/ml-kem-braid/incremental-kem.d.ts +3 -3
- package/dist/internal/protocol/spqr/ml-kem-braid/incremental-kem.d.ts.map +1 -1
- package/dist/internal/protocol/spqr/ml-kem-braid/index.d.ts +2 -2
- package/dist/internal/protocol/spqr/ml-kem-braid/index.d.ts.map +1 -1
- package/dist/internal/protocol/spqr/ml-kem-braid/index.js +1 -1
- package/dist/internal/protocol/spqr/ml-kem-braid/index.js.map +1 -1
- package/dist/internal/protocol/spqr/ml-kem-braid/state-machine.d.ts +3 -3
- package/dist/internal/protocol/spqr/ml-kem-braid/state-machine.d.ts.map +1 -1
- package/dist/internal/protocol/spqr/ml-kem-braid/state-machine.js +2 -2
- package/dist/internal/protocol/spqr/ml-kem-braid/state-machine.js.map +1 -1
- package/dist/internal/protocol/spqr/ml-kem-braid/types.d.ts +3 -3
- package/dist/internal/protocol/spqr/ml-kem-braid/types.d.ts.map +1 -1
- package/dist/internal/protocol/spqr/spqr.d.ts +5 -5
- package/dist/internal/protocol/spqr/spqr.d.ts.map +1 -1
- package/dist/internal/protocol/spqr/spqr.js.map +1 -1
- package/dist/internal/protocol/triple-ratchet/ratchet.d.ts +4 -4
- package/dist/internal/protocol/triple-ratchet/ratchet.d.ts.map +1 -1
- package/dist/internal/protocol/triple-ratchet/ratchet.js.map +1 -1
- package/dist/internal/protocol/x3dh/x3dh.d.ts +3 -3
- package/dist/internal/protocol/x3dh/x3dh.d.ts.map +1 -1
- package/dist/internal/protocol/x3dh/x3dh.js.map +1 -1
- package/dist/internal/sesame/device-registry.d.ts +16 -16
- package/dist/internal/sesame/device-registry.d.ts.map +1 -1
- package/dist/internal/sesame/device-registry.js +6 -6
- package/dist/internal/sesame/device-registry.js.map +1 -1
- package/dist/internal/sesame/index.d.ts +4 -4
- package/dist/internal/sesame/index.d.ts.map +1 -1
- package/dist/internal/sesame/index.js +2 -2
- package/dist/internal/sesame/index.js.map +1 -1
- package/dist/internal/sesame/manager.d.ts +10 -10
- package/dist/internal/sesame/manager.d.ts.map +1 -1
- package/dist/internal/sesame/manager.js +13 -13
- package/dist/internal/sesame/manager.js.map +1 -1
- package/dist/internal/sesame/types.d.ts +5 -5
- package/dist/internal/sesame/types.d.ts.map +1 -1
- package/dist/internal/session/cipher.d.ts +4 -4
- package/dist/internal/session/cipher.d.ts.map +1 -1
- package/dist/internal/session/cipher.js +31 -28
- package/dist/internal/session/cipher.js.map +1 -1
- package/dist/internal/session/decryption.js.map +1 -1
- package/dist/internal/session/factory.d.ts +3 -3
- package/dist/internal/session/factory.d.ts.map +1 -1
- package/dist/internal/session/factory.js.map +1 -1
- package/dist/internal/session/handshake.d.ts +2 -2
- package/dist/internal/session/handshake.d.ts.map +1 -1
- package/dist/internal/session/handshake.js.map +1 -1
- package/dist/internal/session/ratchet.d.ts +4 -4
- package/dist/internal/session/ratchet.d.ts.map +1 -1
- package/dist/internal/session/ratchet.js.map +1 -1
- package/dist/internal/session/types.d.ts +5 -5
- package/dist/internal/session/types.d.ts.map +1 -1
- package/dist/internal/session/validation.d.ts +3 -3
- package/dist/internal/session/validation.d.ts.map +1 -1
- package/dist/internal/session/validation.js.map +1 -1
- package/dist/layers.d.ts +4 -4
- package/dist/layers.d.ts.map +1 -1
- package/dist/layers.js +12 -12
- package/dist/layers.js.map +1 -1
- package/dist/local/store/expo/adapter.d.ts +15 -9
- package/dist/local/store/expo/adapter.d.ts.map +1 -1
- package/dist/local/store/expo/adapter.js +29 -10
- package/dist/local/store/expo/adapter.js.map +1 -1
- package/dist/local/store/expo/database-key.d.ts +5 -5
- package/dist/local/store/expo/database-key.d.ts.map +1 -1
- package/dist/local/store/expo/database-key.js.map +1 -1
- package/dist/local/store/expo/index.d.ts +3 -3
- package/dist/local/store/expo/index.d.ts.map +1 -1
- package/dist/local/store/expo/key-storage.d.ts +11 -5
- package/dist/local/store/expo/key-storage.d.ts.map +1 -1
- package/dist/local/store/expo/key-storage.js +82 -17
- package/dist/local/store/expo/key-storage.js.map +1 -1
- package/dist/local/store/expo/models/kyber-prekey-used.d.ts +1 -4
- package/dist/local/store/expo/models/kyber-prekey-used.d.ts.map +1 -1
- package/dist/local/store/expo/models/kyber-prekey-used.js +23 -9
- package/dist/local/store/expo/models/kyber-prekey-used.js.map +1 -1
- package/dist/local/store/expo/models/kyber-prekey.d.ts +4 -4
- package/dist/local/store/expo/models/kyber-prekey.d.ts.map +1 -1
- package/dist/local/store/expo/models/kyber-prekey.js +67 -26
- package/dist/local/store/expo/models/kyber-prekey.js.map +1 -1
- package/dist/local/store/expo/schema.d.ts +21 -2
- package/dist/local/store/expo/schema.d.ts.map +1 -1
- package/dist/local/store/expo/schema.js +10 -2
- package/dist/local/store/expo/schema.js.map +1 -1
- package/dist/local/store/index.d.ts +3 -3
- package/dist/local/store/index.d.ts.map +1 -1
- package/dist/local/store/index.js +1 -1
- package/dist/local/store/kyber-prekey-lifecycle.d.ts +46 -0
- package/dist/local/store/kyber-prekey-lifecycle.d.ts.map +1 -0
- package/dist/local/store/kyber-prekey-lifecycle.js +88 -0
- package/dist/local/store/kyber-prekey-lifecycle.js.map +1 -0
- package/dist/local/store/memory/adapter.d.ts +14 -6
- package/dist/local/store/memory/adapter.d.ts.map +1 -1
- package/dist/local/store/memory/adapter.js +114 -29
- package/dist/local/store/memory/adapter.js.map +1 -1
- package/dist/local/store/node/adapter.d.ts +9 -3
- package/dist/local/store/node/adapter.d.ts.map +1 -1
- package/dist/local/store/node/adapter.js +31 -13
- package/dist/local/store/node/adapter.js.map +1 -1
- package/dist/local/store/node/database-file-commit.d.ts +8 -0
- package/dist/local/store/node/database-file-commit.d.ts.map +1 -0
- package/dist/local/store/node/database-file-commit.js +62 -0
- package/dist/local/store/node/database-file-commit.js.map +1 -0
- package/dist/local/store/node/database-key.d.ts +6 -1
- package/dist/local/store/node/database-key.d.ts.map +1 -1
- package/dist/local/store/node/database-key.js +79 -44
- package/dist/local/store/node/database-key.js.map +1 -1
- package/dist/local/store/node/database-lock.d.ts +8 -0
- package/dist/local/store/node/database-lock.d.ts.map +1 -0
- package/dist/local/store/node/database-lock.js +44 -0
- package/dist/local/store/node/database-lock.js.map +1 -0
- package/dist/local/store/node/database.d.ts +17 -16
- package/dist/local/store/node/database.d.ts.map +1 -1
- package/dist/local/store/node/database.js +197 -202
- package/dist/local/store/node/database.js.map +1 -1
- package/dist/local/store/react-native/adapter.d.ts +10 -4
- package/dist/local/store/react-native/adapter.d.ts.map +1 -1
- package/dist/local/store/react-native/adapter.js +151 -66
- package/dist/local/store/react-native/adapter.js.map +1 -1
- package/dist/local/store/received-content.d.ts +9 -0
- package/dist/local/store/received-content.d.ts.map +1 -0
- package/dist/local/store/received-content.js +46 -0
- package/dist/local/store/received-content.js.map +1 -0
- package/dist/local/store/reliability.d.ts +4 -4
- package/dist/local/store/reliability.d.ts.map +1 -1
- package/dist/local/store/reliability.js +7 -4
- package/dist/local/store/reliability.js.map +1 -1
- package/dist/local/store/web/adapter.d.ts +11 -5
- package/dist/local/store/web/adapter.d.ts.map +1 -1
- package/dist/local/store/web/adapter.js +207 -74
- package/dist/local/store/web/adapter.js.map +1 -1
- package/dist/local/vault/expo-secure-store.d.ts +2 -2
- package/dist/local/vault/expo-secure-store.d.ts.map +1 -1
- package/dist/local/vault/index.d.ts +1 -1
- package/dist/local/vault/index.d.ts.map +1 -1
- package/dist/logger.d.ts +4 -4
- package/dist/logger.d.ts.map +1 -1
- package/dist/logger.js.map +1 -1
- package/dist/media/index.d.ts +71 -61
- package/dist/media/index.d.ts.map +1 -1
- package/dist/media/index.js +550 -386
- package/dist/media/index.js.map +1 -1
- package/dist/media/prepared-upload.d.ts +37 -0
- package/dist/media/prepared-upload.d.ts.map +1 -0
- package/dist/media/prepared-upload.js +46 -0
- package/dist/media/prepared-upload.js.map +1 -0
- package/dist/profile/contact-state.d.ts +2 -2
- package/dist/profile/contact-state.d.ts.map +1 -1
- package/dist/profile/contact-state.js.map +1 -1
- package/dist/profile/profile-key.d.ts +2 -2
- package/dist/profile/profile-key.d.ts.map +1 -1
- package/dist/profile/profile-key.js.map +1 -1
- package/dist/profile/update-service.d.ts +2 -2
- package/dist/profile/update-service.d.ts.map +1 -1
- package/dist/profile/update-service.js.map +1 -1
- package/dist/remote/object-store/convex-r2/server.d.ts +2 -1
- package/dist/remote/object-store/convex-r2/server.d.ts.map +1 -1
- package/dist/remote/object-store/convex-r2/server.js +4 -0
- package/dist/remote/object-store/convex-r2/server.js.map +1 -1
- package/dist/remote/object-store/convex-r2/storage.d.ts.map +1 -1
- package/dist/remote/object-store/convex-r2/storage.js +1 -0
- package/dist/remote/object-store/convex-r2/storage.js.map +1 -1
- package/dist/remote/object-store/index.d.ts +3 -1
- package/dist/remote/object-store/index.d.ts.map +1 -1
- package/dist/remote/object-store/index.js +1 -1
- package/dist/remote/object-store/index.js.map +1 -1
- package/dist/remote/object-store/s3/storage.d.ts +3 -1
- package/dist/remote/object-store/s3/storage.d.ts.map +1 -1
- package/dist/remote/object-store/s3/storage.js +9 -2
- package/dist/remote/object-store/s3/storage.js.map +1 -1
- package/dist/remote/object-store/types.d.ts +33 -4
- package/dist/remote/object-store/types.d.ts.map +1 -1
- package/dist/remote/object-store/upload-error.d.ts +23 -0
- package/dist/remote/object-store/upload-error.d.ts.map +1 -0
- package/dist/remote/object-store/upload-error.js +33 -0
- package/dist/remote/object-store/upload-error.js.map +1 -0
- package/dist/remote/object-store/validation.d.ts +7 -1
- package/dist/remote/object-store/validation.d.ts.map +1 -1
- package/dist/remote/object-store/validation.js +39 -25
- package/dist/remote/object-store/validation.js.map +1 -1
- package/dist/remote/relay/index.d.ts +7 -14
- package/dist/remote/relay/index.d.ts.map +1 -1
- package/dist/remote/relay/index.js +6 -13
- package/dist/remote/relay/index.js.map +1 -1
- package/dist/remote/relay/memory/adapter.d.ts +5 -4
- package/dist/remote/relay/memory/adapter.d.ts.map +1 -1
- package/dist/remote/relay/memory/adapter.js +14 -4
- package/dist/remote/relay/memory/adapter.js.map +1 -1
- package/dist/remote/relay/types.d.ts +36 -25
- package/dist/remote/relay/types.d.ts.map +1 -1
- package/dist/remote/relay/types.js +1 -1
- package/dist/types/api.d.ts +59 -24
- package/dist/types/api.d.ts.map +1 -1
- package/dist/types/index.js +1 -1
- package/dist/types/index.js.map +1 -1
- package/dist/types/session.d.ts +6 -0
- package/dist/types/session.d.ts.map +1 -1
- package/dist/types/session.js.map +1 -1
- package/docs/ASSURANCE.md +7 -7
- package/docs/CLIENT_COMPOSITION.md +16 -23
- package/docs/DEVIATIONS.md +1 -1
- package/docs/DOCUMENTATION_STANDARDS.md +4 -0
- package/docs/ERROR_HANDLING.md +2 -2
- package/docs/GETTING_STARTED.md +23 -38
- package/docs/INTERFACES.md +36 -27
- package/docs/PACKAGE_SURFACE.md +9 -16
- package/docs/RECIPES.md +10 -23
- package/examples/browser/index.html +2 -2
- package/groups/README.md +4 -4
- package/local/store/README.md +22 -7
- package/local/store/expo/README.md +24 -20
- package/local/store/memory/README.md +1 -1
- package/local/store/node/README.md +31 -2
- package/local/store/react-native/README.md +1 -1
- package/local/store/web/README.md +1 -1
- package/local/vault/README.md +1 -1
- package/media/README.md +94 -0
- package/package.json +17 -27
- package/remote/README.md +24 -24
- package/remote/object-store/README.md +8 -0
- package/remote/object-store/s3/README.md +10 -1
- package/remote/relay/README.md +4 -3
- package/remote/relay/memory/README.md +1 -1
- package/types/README.md +2 -2
- package/COMMERCIAL.md +0 -56
- package/dist/device/expo-metadata.d.ts.map +0 -1
- package/dist/device/expo-metadata.js.map +0 -1
- package/dist/remote/relay/convex/backend.d.ts +0 -394
- package/dist/remote/relay/convex/backend.d.ts.map +0 -1
- package/dist/remote/relay/convex/backend.js +0 -678
- package/dist/remote/relay/convex/backend.js.map +0 -1
- package/dist/remote/relay/convex/component/_generated/api.d.ts +0 -58
- package/dist/remote/relay/convex/component/_generated/api.d.ts.map +0 -1
- package/dist/remote/relay/convex/component/_generated/api.js +0 -31
- package/dist/remote/relay/convex/component/_generated/api.js.map +0 -1
- package/dist/remote/relay/convex/component/_generated/component.d.ts +0 -475
- package/dist/remote/relay/convex/component/_generated/component.d.ts.map +0 -1
- package/dist/remote/relay/convex/component/_generated/component.js +0 -11
- package/dist/remote/relay/convex/component/_generated/component.js.map +0 -1
- package/dist/remote/relay/convex/component/_generated/dataModel.d.ts +0 -46
- package/dist/remote/relay/convex/component/_generated/dataModel.d.ts.map +0 -1
- package/dist/remote/relay/convex/component/_generated/dataModel.js +0 -11
- package/dist/remote/relay/convex/component/_generated/dataModel.js.map +0 -1
- package/dist/remote/relay/convex/component/_generated/server.d.ts +0 -129
- package/dist/remote/relay/convex/component/_generated/server.d.ts.map +0 -1
- package/dist/remote/relay/convex/component/_generated/server.js +0 -79
- package/dist/remote/relay/convex/component/_generated/server.js.map +0 -1
- package/dist/remote/relay/convex/component/accounts.d.ts +0 -45
- package/dist/remote/relay/convex/component/accounts.d.ts.map +0 -1
- package/dist/remote/relay/convex/component/accounts.js +0 -184
- package/dist/remote/relay/convex/component/accounts.js.map +0 -1
- package/dist/remote/relay/convex/component/certificates.d.ts +0 -10
- package/dist/remote/relay/convex/component/certificates.d.ts.map +0 -1
- package/dist/remote/relay/convex/component/certificates.js +0 -126
- package/dist/remote/relay/convex/component/certificates.js.map +0 -1
- package/dist/remote/relay/convex/component/cleanup.d.ts +0 -32
- package/dist/remote/relay/convex/component/cleanup.d.ts.map +0 -1
- package/dist/remote/relay/convex/component/cleanup.js +0 -146
- package/dist/remote/relay/convex/component/cleanup.js.map +0 -1
- package/dist/remote/relay/convex/component/convex.config.d.ts +0 -5
- package/dist/remote/relay/convex/component/convex.config.d.ts.map +0 -1
- package/dist/remote/relay/convex/component/convex.config.js +0 -35
- package/dist/remote/relay/convex/component/convex.config.js.map +0 -1
- package/dist/remote/relay/convex/component/crons.d.ts +0 -3
- package/dist/remote/relay/convex/component/crons.d.ts.map +0 -1
- package/dist/remote/relay/convex/component/crons.js +0 -10
- package/dist/remote/relay/convex/component/crons.js.map +0 -1
- package/dist/remote/relay/convex/component/devices.d.ts +0 -102
- package/dist/remote/relay/convex/component/devices.d.ts.map +0 -1
- package/dist/remote/relay/convex/component/devices.js +0 -300
- package/dist/remote/relay/convex/component/devices.js.map +0 -1
- package/dist/remote/relay/convex/component/errors.d.ts +0 -22
- package/dist/remote/relay/convex/component/errors.d.ts.map +0 -1
- package/dist/remote/relay/convex/component/errors.js +0 -17
- package/dist/remote/relay/convex/component/errors.js.map +0 -1
- package/dist/remote/relay/convex/component/groups.d.ts +0 -63
- package/dist/remote/relay/convex/component/groups.d.ts.map +0 -1
- package/dist/remote/relay/convex/component/groups.js +0 -341
- package/dist/remote/relay/convex/component/groups.js.map +0 -1
- package/dist/remote/relay/convex/component/keys.d.ts +0 -130
- package/dist/remote/relay/convex/component/keys.d.ts.map +0 -1
- package/dist/remote/relay/convex/component/keys.js +0 -578
- package/dist/remote/relay/convex/component/keys.js.map +0 -1
- package/dist/remote/relay/convex/component/messages.d.ts +0 -105
- package/dist/remote/relay/convex/component/messages.d.ts.map +0 -1
- package/dist/remote/relay/convex/component/messages.js +0 -702
- package/dist/remote/relay/convex/component/messages.js.map +0 -1
- package/dist/remote/relay/convex/component/provisioning.d.ts +0 -92
- package/dist/remote/relay/convex/component/provisioning.d.ts.map +0 -1
- package/dist/remote/relay/convex/component/provisioning.js +0 -360
- package/dist/remote/relay/convex/component/provisioning.js.map +0 -1
- package/dist/remote/relay/convex/component/runtime.d.ts +0 -18
- package/dist/remote/relay/convex/component/runtime.d.ts.map +0 -1
- package/dist/remote/relay/convex/component/runtime.js +0 -144
- package/dist/remote/relay/convex/component/runtime.js.map +0 -1
- package/dist/remote/relay/convex/component/schema.d.ts +0 -358
- package/dist/remote/relay/convex/component/schema.d.ts.map +0 -1
- package/dist/remote/relay/convex/component/schema.js +0 -288
- package/dist/remote/relay/convex/component/schema.js.map +0 -1
- package/dist/remote/relay/convex/component/zkAuth.d.ts +0 -18
- package/dist/remote/relay/convex/component/zkAuth.d.ts.map +0 -1
- package/dist/remote/relay/convex/component/zkAuth.js +0 -86
- package/dist/remote/relay/convex/component/zkAuth.js.map +0 -1
- package/dist/remote/relay/convex/constants.d.ts +0 -3
- package/dist/remote/relay/convex/constants.d.ts.map +0 -1
- package/dist/remote/relay/convex/constants.js +0 -3
- package/dist/remote/relay/convex/constants.js.map +0 -1
- package/dist/remote/relay/convex/group-server.d.ts +0 -123
- package/dist/remote/relay/convex/group-server.d.ts.map +0 -1
- package/dist/remote/relay/convex/group-server.js +0 -184
- package/dist/remote/relay/convex/group-server.js.map +0 -1
- package/dist/remote/relay/convex/index.d.ts +0 -42
- package/dist/remote/relay/convex/index.d.ts.map +0 -1
- package/dist/remote/relay/convex/index.js +0 -38
- package/dist/remote/relay/convex/index.js.map +0 -1
- package/dist/remote/relay/convex/relay.d.ts +0 -323
- package/dist/remote/relay/convex/relay.d.ts.map +0 -1
- package/dist/remote/relay/convex/relay.js +0 -1144
- package/dist/remote/relay/convex/relay.js.map +0 -1
- package/dist/remote/relay/convex/types.d.ts +0 -24
- package/dist/remote/relay/convex/types.d.ts.map +0 -1
- package/dist/remote/relay/convex/types.js +0 -14
- package/dist/remote/relay/convex/types.js.map +0 -1
- package/remote/relay/convex/README.md +0 -61
- package/remote/relay/convex/component/README.md +0 -462
package/dist/client/prekeys.js
CHANGED
|
@@ -1,16 +1,99 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Prekey management and server synchronization for SignalProtocolClient
|
|
3
3
|
*
|
|
4
|
-
* Extracted from
|
|
4
|
+
* Extracted from DefaultSignalProtocolClient class to reduce file size.
|
|
5
5
|
* Handles prekey bundle upload, verification, and regeneration.
|
|
6
6
|
*/
|
|
7
7
|
import { EncryptionError, EncryptionErrorCode, ONE_TIME_PREKEY_BATCH_SIZE } from '../types/index.js';
|
|
8
8
|
import { generateKemOneTimePreKeys, generateEcOneTimePreKeys, generateEcSignedPreKey, generateKyberLastResortPreKey, } from '../keys/index.js';
|
|
9
9
|
import { getActiveIdentityTypes, PREKEY_CHECK_THROTTLE_MS_DEFAULT, } from './config.js';
|
|
10
10
|
import { MAX_UNACKNOWLEDGED_SESSION_AGE_MS } from './config.js';
|
|
11
|
-
import { MIN_PREKEY_REPLENISHMENT_THRESHOLD } from './key-rotation-core.js';
|
|
11
|
+
import { MIN_PREKEY_REPLENISHMENT_THRESHOLD, nextKyberLastResortPreKeyId, } from './key-rotation-core.js';
|
|
12
12
|
const lastPreKeySyncTimeByClient = new Map();
|
|
13
13
|
const lastPreKeyStatusCheckTimeByIdentity = new Map();
|
|
14
|
+
const PREKEY_PUBLICATION_CANDIDATE_VERSION = 1;
|
|
15
|
+
function publicationCandidateKey(ctx, identityType) {
|
|
16
|
+
return `signal:prekey-publication-candidate:v1:${encodeURIComponent(ctx.userId)}:${String(ctx.deviceId)}:${identityType}`;
|
|
17
|
+
}
|
|
18
|
+
function parsePublicationCandidate(value) {
|
|
19
|
+
let parsed;
|
|
20
|
+
try {
|
|
21
|
+
parsed = JSON.parse(value);
|
|
22
|
+
}
|
|
23
|
+
catch {
|
|
24
|
+
throw new Error('Stored prekey publication candidate is invalid');
|
|
25
|
+
}
|
|
26
|
+
if (typeof parsed !== 'object' ||
|
|
27
|
+
parsed === null ||
|
|
28
|
+
Array.isArray(parsed) ||
|
|
29
|
+
!('version' in parsed) ||
|
|
30
|
+
parsed.version !== PREKEY_PUBLICATION_CANDIDATE_VERSION ||
|
|
31
|
+
!('uploads' in parsed) ||
|
|
32
|
+
!Array.isArray(parsed.uploads) ||
|
|
33
|
+
parsed.uploads.length > ONE_TIME_PREKEY_BATCH_SIZE * 2 ||
|
|
34
|
+
Object.keys(parsed).sort().join(',') !== 'uploads,version') {
|
|
35
|
+
throw new Error('Stored prekey publication candidate is invalid');
|
|
36
|
+
}
|
|
37
|
+
const identifiers = new Set();
|
|
38
|
+
const counts = new Map();
|
|
39
|
+
return parsed.uploads.map((value) => {
|
|
40
|
+
if (typeof value !== 'object' ||
|
|
41
|
+
value === null ||
|
|
42
|
+
Array.isArray(value) ||
|
|
43
|
+
!('type' in value) ||
|
|
44
|
+
(value.type !== 'ecPreKey' && value.type !== 'kemOneTimePreKey') ||
|
|
45
|
+
!('keyId' in value) ||
|
|
46
|
+
!Number.isSafeInteger(value.keyId) ||
|
|
47
|
+
value.keyId < 0 ||
|
|
48
|
+
!('publicKey' in value) ||
|
|
49
|
+
typeof value.publicKey !== 'string' ||
|
|
50
|
+
value.publicKey.length === 0 ||
|
|
51
|
+
('signature' in value && value.signature !== undefined && typeof value.signature !== 'string')) {
|
|
52
|
+
throw new Error('Stored prekey publication candidate is invalid');
|
|
53
|
+
}
|
|
54
|
+
const upload = value;
|
|
55
|
+
const expectedKeys = upload.type === 'ecPreKey' ? 'keyId,publicKey,type' : 'keyId,publicKey,signature,type';
|
|
56
|
+
if (Object.keys(value).sort().join(',') !== expectedKeys ||
|
|
57
|
+
(upload.type === 'ecPreKey' && upload.signature !== undefined) ||
|
|
58
|
+
(upload.type === 'kemOneTimePreKey' && !upload.signature)) {
|
|
59
|
+
throw new Error('Stored prekey publication candidate is invalid');
|
|
60
|
+
}
|
|
61
|
+
const identifier = `${upload.type}:${String(upload.keyId)}`;
|
|
62
|
+
if (identifiers.has(identifier)) {
|
|
63
|
+
throw new Error('Stored prekey publication candidate is invalid');
|
|
64
|
+
}
|
|
65
|
+
const count = (counts.get(upload.type) ?? 0) + 1;
|
|
66
|
+
if (count > ONE_TIME_PREKEY_BATCH_SIZE) {
|
|
67
|
+
throw new Error('Stored prekey publication candidate is invalid');
|
|
68
|
+
}
|
|
69
|
+
identifiers.add(identifier);
|
|
70
|
+
counts.set(upload.type, count);
|
|
71
|
+
return { ...upload };
|
|
72
|
+
});
|
|
73
|
+
}
|
|
74
|
+
async function loadPublicationCandidate(ctx, identityType) {
|
|
75
|
+
const stored = await ctx.storage.getMetadata(publicationCandidateKey(ctx, identityType));
|
|
76
|
+
return stored === null ? null : parsePublicationCandidate(stored);
|
|
77
|
+
}
|
|
78
|
+
async function storePublicationCandidate(ctx, identityType, uploads) {
|
|
79
|
+
const candidate = {
|
|
80
|
+
uploads: uploads.map((upload) => ({ ...upload })),
|
|
81
|
+
version: PREKEY_PUBLICATION_CANDIDATE_VERSION,
|
|
82
|
+
};
|
|
83
|
+
await ctx.storage.setMetadata(publicationCandidateKey(ctx, identityType), JSON.stringify(candidate));
|
|
84
|
+
}
|
|
85
|
+
function assertPublicationCandidatePrivateKeys(candidate, ecPreKeys, kemPreKeys) {
|
|
86
|
+
for (const upload of candidate) {
|
|
87
|
+
const retained = upload.type === 'ecPreKey'
|
|
88
|
+
? ecPreKeys.some((prekey) => prekey.keyId === upload.keyId && prekey.publicKey === upload.publicKey)
|
|
89
|
+
: kemPreKeys.some((prekey) => prekey.keyId === upload.keyId &&
|
|
90
|
+
prekey.publicKey === upload.publicKey &&
|
|
91
|
+
prekey.signature === upload.signature);
|
|
92
|
+
if (!retained) {
|
|
93
|
+
throw new Error('Stored prekey publication candidate has no matching private key');
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
}
|
|
14
97
|
function getClientThrottleKey(ctx) {
|
|
15
98
|
return `${ctx.userId}:${ctx.deviceId}`;
|
|
16
99
|
}
|
|
@@ -28,12 +111,7 @@ async function isServerInSyncForIdentity(ctx, identityType) {
|
|
|
28
111
|
if (!localSignedPreKey || !localKyberPreKey) {
|
|
29
112
|
return false;
|
|
30
113
|
}
|
|
31
|
-
const
|
|
32
|
-
ctx.relay.getEcSignedPreKeyMetadata(ctx.userId, ctx.deviceId, identityType),
|
|
33
|
-
ctx.relay.getKemLastResortPreKeyMetadata(ctx.userId, ctx.deviceId, identityType),
|
|
34
|
-
ctx.relay.getPreKeyCount(ctx.userId, ctx.deviceId, 'ec', identityType),
|
|
35
|
-
ctx.relay.getPreKeyCount(ctx.userId, ctx.deviceId, 'kem', identityType),
|
|
36
|
-
]);
|
|
114
|
+
const { ecSignedPreKey: serverSignedMeta, kemLastResortPreKey: serverKyberMeta, ecOneTimePreKeyCount: serverEcCount, kemOneTimePreKeyCount: serverKemCount, } = await ctx.relay.getPreKeyInventory(ctx.userId, ctx.deviceId, identityType);
|
|
37
115
|
if (!serverSignedMeta || !serverKyberMeta) {
|
|
38
116
|
return false;
|
|
39
117
|
}
|
|
@@ -171,12 +249,8 @@ export async function syncIdentityToServer(ctx, identityType, onProgress) {
|
|
|
171
249
|
detail: { current: 1, total: 1 },
|
|
172
250
|
});
|
|
173
251
|
}
|
|
174
|
-
//
|
|
175
|
-
|
|
176
|
-
const serverSignedMeta = await ctx.relay.getEcSignedPreKeyMetadata(ctx.userId, ctx.deviceId, identityType);
|
|
177
|
-
const serverKyberMeta = await ctx.relay.getKemLastResortPreKeyMetadata(ctx.userId, ctx.deviceId, identityType);
|
|
178
|
-
const serverEcCount = await ctx.relay.getPreKeyCount(ctx.userId, ctx.deviceId, 'ec', identityType);
|
|
179
|
-
const serverKemCount = await ctx.relay.getPreKeyCount(ctx.userId, ctx.deviceId, 'kem', identityType);
|
|
252
|
+
// Read again after local key generation. Do not reuse the throttle snapshot.
|
|
253
|
+
const { ecSignedPreKey: serverSignedMeta, kemLastResortPreKey: serverKyberMeta, ecOneTimePreKeyCount: serverEcCount, kemOneTimePreKeyCount: serverKemCount, } = await ctx.relay.getPreKeyInventory(ctx.userId, ctx.deviceId, identityType);
|
|
180
254
|
const signedKeyMatches = serverSignedMeta &&
|
|
181
255
|
serverSignedMeta.keyId === signedPreKey.keyId &&
|
|
182
256
|
serverSignedMeta.publicKey === signedPreKey.publicKey;
|
|
@@ -187,7 +261,8 @@ export async function syncIdentityToServer(ctx, identityType, onProgress) {
|
|
|
187
261
|
// Require independent EC and KEM inventory thresholds.
|
|
188
262
|
const hasEnoughPreKeys = serverEcCount >= MIN_PREKEY_REPLENISHMENT_THRESHOLD &&
|
|
189
263
|
serverKemCount >= MIN_PREKEY_REPLENISHMENT_THRESHOLD;
|
|
190
|
-
|
|
264
|
+
const pendingOneTimeUploads = await loadPublicationCandidate(ctx, identityType);
|
|
265
|
+
if (signedKeyMatches && kyberKeyMatches && hasEnoughPreKeys && pendingOneTimeUploads === null) {
|
|
191
266
|
ctx.logger.debug(`syncToServer: ${identityType} server already in sync, skipping uploads`, {
|
|
192
267
|
category: 'E2EE',
|
|
193
268
|
data: { identityType, serverEcCount, serverKemCount },
|
|
@@ -209,39 +284,44 @@ export async function syncIdentityToServer(ctx, identityType, onProgress) {
|
|
|
209
284
|
registrationId: identityKey.registrationId,
|
|
210
285
|
identityType,
|
|
211
286
|
});
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
287
|
+
const oneTimeUploads = pendingOneTimeUploads
|
|
288
|
+
? pendingOneTimeUploads.map((upload) => ({ ...upload }))
|
|
289
|
+
: [];
|
|
290
|
+
// Retained private keys are decrypt-only. A depleted server receives one
|
|
291
|
+
// exact fresh batch, never an arbitrary prefix of the private-key store.
|
|
292
|
+
if (pendingOneTimeUploads === null && serverEcCount < MIN_PREKEY_REPLENISHMENT_THRESHOLD) {
|
|
217
293
|
// Mark existing active one-time prekeys as replaced before generating new batch
|
|
218
294
|
await preKeyMaintenance?.markEcOneTimePreKeysReplaced(identityType);
|
|
219
295
|
// Determine next key ID from existing local prekeys
|
|
220
296
|
const maxExistingId = oneTimePreKeys.reduce((max, k) => Math.max(max, k.keyId), -1);
|
|
221
297
|
const startId = maxExistingId + 1;
|
|
222
|
-
const
|
|
223
|
-
const freshPreKeys = await generateEcOneTimePreKeys(toGenerate, startId);
|
|
298
|
+
const freshPreKeys = await generateEcOneTimePreKeys(ONE_TIME_PREKEY_BATCH_SIZE, startId);
|
|
224
299
|
await ctx.storage.storeEcOneTimePreKeys(freshPreKeys, identityType);
|
|
225
|
-
|
|
300
|
+
oneTimeUploads.push(...freshPreKeys.map((prekey) => ({
|
|
301
|
+
type: 'ecPreKey',
|
|
302
|
+
keyId: prekey.keyId,
|
|
303
|
+
publicKey: prekey.publicKey,
|
|
304
|
+
})));
|
|
226
305
|
onProgress?.({
|
|
227
306
|
stage: 'generating-keys',
|
|
228
307
|
percent: 30,
|
|
229
308
|
message: 'Encryption keys ready',
|
|
230
|
-
detail: {
|
|
309
|
+
detail: {
|
|
310
|
+
current: freshPreKeys.length,
|
|
311
|
+
total: ONE_TIME_PREKEY_BATCH_SIZE,
|
|
312
|
+
},
|
|
231
313
|
});
|
|
232
314
|
ctx.logger.debug('Generated fresh EC one-time prekeys', {
|
|
233
315
|
category: 'E2EE',
|
|
234
316
|
data: { identityType, count: freshPreKeys.length, startId },
|
|
235
317
|
});
|
|
236
318
|
}
|
|
237
|
-
const oneTimePreKeysToUpload = oneTimePreKeys.slice(0, availableSlots);
|
|
238
319
|
ctx.logger.debug('One-time prekey upload calculation', {
|
|
239
320
|
category: 'E2EE',
|
|
240
321
|
data: {
|
|
241
322
|
identityType,
|
|
242
323
|
serverPreKeyCount: serverEcCount,
|
|
243
|
-
|
|
244
|
-
uploading: oneTimePreKeysToUpload.length,
|
|
324
|
+
uploading: oneTimeUploads.filter((upload) => upload.type === 'ecPreKey').length,
|
|
245
325
|
},
|
|
246
326
|
});
|
|
247
327
|
// Build prekey batch for upload
|
|
@@ -253,12 +333,6 @@ export async function syncIdentityToServer(ctx, identityType, onProgress) {
|
|
|
253
333
|
publicKey: signedPreKey.publicKey,
|
|
254
334
|
signature: signedPreKey.signature,
|
|
255
335
|
},
|
|
256
|
-
// One-time prekeys (consumed on use) - only upload what server can accept
|
|
257
|
-
...oneTimePreKeysToUpload.map((k) => ({
|
|
258
|
-
type: 'ecPreKey',
|
|
259
|
-
keyId: k.keyId,
|
|
260
|
-
publicKey: k.publicKey,
|
|
261
|
-
})),
|
|
262
336
|
];
|
|
263
337
|
// Add Kyber last-resort prekey if available (for post-quantum security)
|
|
264
338
|
if (kyberPreKey) {
|
|
@@ -272,7 +346,7 @@ export async function syncIdentityToServer(ctx, identityType, onProgress) {
|
|
|
272
346
|
// Check and upload KEM one-time prekeys (per-session post-quantum forward secrecy)
|
|
273
347
|
// Re-fetch KEM count because a concurrent consumer may have changed it.
|
|
274
348
|
const serverKemPreKeyCount = await ctx.relay.getPreKeyCount(ctx.userId, ctx.deviceId, 'kem', identityType);
|
|
275
|
-
if (serverKemPreKeyCount < MIN_PREKEY_REPLENISHMENT_THRESHOLD) {
|
|
349
|
+
if (pendingOneTimeUploads === null && serverKemPreKeyCount < MIN_PREKEY_REPLENISHMENT_THRESHOLD) {
|
|
276
350
|
// Mark existing active KEM one-time prekeys as replaced before generating new batch
|
|
277
351
|
await preKeyMaintenance?.markKyberOneTimePreKeysReplaced(identityType);
|
|
278
352
|
// Get existing local KEM one-time prekeys to determine next ID
|
|
@@ -287,11 +361,14 @@ export async function syncIdentityToServer(ctx, identityType, onProgress) {
|
|
|
287
361
|
stage: 'generating-kyber',
|
|
288
362
|
percent: 65,
|
|
289
363
|
message: 'Post-quantum prekeys ready',
|
|
290
|
-
detail: {
|
|
364
|
+
detail: {
|
|
365
|
+
current: kemOneTimePreKeys.length,
|
|
366
|
+
total: ONE_TIME_PREKEY_BATCH_SIZE,
|
|
367
|
+
},
|
|
291
368
|
});
|
|
292
|
-
// Add to
|
|
369
|
+
// Add the exact fresh batch to the persistent publication candidate.
|
|
293
370
|
for (const k of kemOneTimePreKeys) {
|
|
294
|
-
|
|
371
|
+
oneTimeUploads.push({
|
|
295
372
|
type: 'kemOneTimePreKey',
|
|
296
373
|
keyId: k.keyId,
|
|
297
374
|
publicKey: k.publicKey,
|
|
@@ -303,6 +380,14 @@ export async function syncIdentityToServer(ctx, identityType, onProgress) {
|
|
|
303
380
|
data: { identityType, count: kemOneTimePreKeys.length, startId },
|
|
304
381
|
});
|
|
305
382
|
}
|
|
383
|
+
if (pendingOneTimeUploads === null && oneTimeUploads.length > 0) {
|
|
384
|
+
await storePublicationCandidate(ctx, identityType, oneTimeUploads);
|
|
385
|
+
}
|
|
386
|
+
if (oneTimeUploads.length > 0) {
|
|
387
|
+
const retainedKemPreKeys = await ctx.storage.getKemOneTimePreKeys(identityType);
|
|
388
|
+
assertPublicationCandidatePrivateKeys(oneTimeUploads, await ctx.storage.getEcOneTimePreKeys(identityType), retainedKemPreKeys);
|
|
389
|
+
preKeyUploads.push(...oneTimeUploads);
|
|
390
|
+
}
|
|
306
391
|
// Upload all prekeys to server (with identity type)
|
|
307
392
|
onProgress?.({
|
|
308
393
|
stage: 'uploading',
|
|
@@ -310,6 +395,9 @@ export async function syncIdentityToServer(ctx, identityType, onProgress) {
|
|
|
310
395
|
message: 'Syncing keys to your account...',
|
|
311
396
|
});
|
|
312
397
|
await ctx.relay.uploadPreKeys(ctx.userId, ctx.deviceId, preKeyUploads, identityType);
|
|
398
|
+
if (oneTimeUploads.length > 0) {
|
|
399
|
+
await ctx.storage.deleteMetadata(publicationCandidateKey(ctx, identityType));
|
|
400
|
+
}
|
|
313
401
|
onProgress?.({
|
|
314
402
|
stage: 'uploading',
|
|
315
403
|
percent: 95,
|
|
@@ -361,15 +449,15 @@ export async function regeneratePreKeysWithFreshIds(ctx, identityType = 'aci') {
|
|
|
361
449
|
// Get current max ID for signed prekey (uses sequential IDs)
|
|
362
450
|
const currentSignedId = await ctx.storage.getEcSignedPreKeyMaxId(identityType);
|
|
363
451
|
const newSignedId = currentSignedId + 1;
|
|
364
|
-
//
|
|
365
|
-
//
|
|
366
|
-
const newKyberId =
|
|
452
|
+
// The Kyber last-resort prekey also takes the next id. The store retains the
|
|
453
|
+
// replaced key under its own id for in-flight PQXDH messages.
|
|
454
|
+
const newKyberId = await nextKyberLastResortPreKeyId(ctx.storage, identityType);
|
|
367
455
|
ctx.logger.info('Regenerating prekeys with fresh IDs (identifier collision recovery)', {
|
|
368
456
|
category: 'E2EE',
|
|
369
457
|
data: {
|
|
370
458
|
oldSignedId: currentSignedId,
|
|
371
459
|
newSignedId,
|
|
372
|
-
|
|
460
|
+
newKyberId,
|
|
373
461
|
},
|
|
374
462
|
});
|
|
375
463
|
// Generate new signed prekey with fresh sequential ID
|
|
@@ -451,11 +539,11 @@ export async function forceCompleteKeyReset(ctx, identityType = 'aci') {
|
|
|
451
539
|
const deletedSessions = sessionStats.sessions; // Should be 0 after clear
|
|
452
540
|
// Delete all prekeys
|
|
453
541
|
const deletedPreKeys = await ctx.storage.deleteAllPreKeys(identityType);
|
|
454
|
-
// Generate fresh prekeys
|
|
542
|
+
// Generate fresh prekeys. The reset removed every retained prekey, so the
|
|
543
|
+
// Kyber id starts at 1 again.
|
|
455
544
|
const newSignedPreKey = await generateEcSignedPreKey(identityKey, 1 // Start fresh with ID 1
|
|
456
545
|
);
|
|
457
|
-
const newKyberPreKey = await generateKyberLastResortPreKey(identityKey,
|
|
458
|
-
);
|
|
546
|
+
const newKyberPreKey = await generateKyberLastResortPreKey(identityKey, await nextKyberLastResortPreKeyId(ctx.storage, identityType));
|
|
459
547
|
// Store new prekeys
|
|
460
548
|
await ctx.storage.storeEcSignedPreKey(newSignedPreKey, identityType);
|
|
461
549
|
await ctx.storage.storeKyberPreKey(newKyberPreKey, identityType);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prekeys.js","sourceRoot":"","sources":["../../client/prekeys.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"prekeys.js","sourceRoot":"","sources":["../../client/prekeys.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Relay subscription operations for SignalProtocolClient
|
|
3
3
|
*
|
|
4
|
-
* Extracted from
|
|
4
|
+
* Extracted from DefaultSignalProtocolClient class to reduce file size (~330 lines).
|
|
5
5
|
* Handles the relay subscription callback logic for incoming message processing.
|
|
6
6
|
*/
|
|
7
7
|
import type { Envelope } from '../remote/relay/types.js';
|
|
@@ -55,6 +55,8 @@ export interface RelaySubscriptionCallbacks {
|
|
|
55
55
|
export interface RelaySubscriptionConfig {
|
|
56
56
|
/** Debounce interval for forced prekey rotations in ms */
|
|
57
57
|
keyRotationDebounceMs: number;
|
|
58
|
+
/** Background pulls retain failed envelopes instead of acknowledging retry requests. */
|
|
59
|
+
acknowledgeFailures?: boolean;
|
|
58
60
|
}
|
|
59
61
|
/**
|
|
60
62
|
* Handle incoming relay message - main subscription callback
|
|
@@ -83,4 +85,6 @@ export interface RelaySubscriptionConfig {
|
|
|
83
85
|
* - No schema validation or domain routing needed for these
|
|
84
86
|
*/
|
|
85
87
|
export declare function handleRelayMessage(ctx: RelaySubscriptionContext, envelope: Envelope, state: RelaySubscriptionState, callbacks: RelaySubscriptionCallbacks, config: RelaySubscriptionConfig): Promise<void>;
|
|
88
|
+
/** Process content before either foreground or background transport acknowledges it. */
|
|
89
|
+
export declare function processRelayMessage(ctx: RelaySubscriptionContext, envelope: Envelope, state: RelaySubscriptionState, callbacks: RelaySubscriptionCallbacks, config: RelaySubscriptionConfig): Promise<boolean>;
|
|
86
90
|
//# sourceMappingURL=relay-subscription.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relay-subscription.d.ts","sourceRoot":"","sources":["../../client/relay-subscription.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAKtD,OAAO,KAAK,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACnF,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"relay-subscription.d.ts","sourceRoot":"","sources":["../../client/relay-subscription.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAKtD,OAAO,KAAK,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACnF,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAC;AAU3D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAM3E;;GAEG;AACH,OAAO,EAAE,CAAC;AACV,MAAM,WAAW,wBAAyB,SAAQ,2BAA2B;IAC3E,MAAM,EAAE,2BAA2B,CAAC;CACrC;AAED,sEAAsE;AACtE,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC/B,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC;CACpD;AAED,eAAO,MAAM,sBAAsB,OAAQ,CAAC;AAC5C,eAAO,MAAM,iBAAiB,MAAM,CAAC;AAErC;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,+CAA+C;IAC/C,sBAAsB,EAAE,MAAM,CAAC;IAC/B,6EAA6E;IAC7E,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,gBAAgB,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/E,iDAAiD;IACjD,kBAAkB,EAAE,kBAAkB,CAAC;CACxC;AAED;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC,qEAAqE;IACrE,mBAAmB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,sCAAsC;IACtC,qBAAqB,EAAE,CACrB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,oBAAoB,GAAG,IAAI,KACjC,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,sCAAsC;IACtC,qBAAqB,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,mBAAmB,GAAG,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACjG,yDAAyD;IACzD,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9E;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,0DAA0D;IAC1D,qBAAqB,EAAE,MAAM,CAAC;IAC9B,wFAAwF;IACxF,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AA8BD;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,wBAAwB,EAC7B,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,sBAAsB,EAC7B,SAAS,EAAE,0BAA0B,EACrC,MAAM,EAAE,uBAAuB,GAC9B,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,wFAAwF;AACxF,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,wBAAwB,EAC7B,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,sBAAsB,EAC7B,SAAS,EAAE,0BAA0B,EACrC,MAAM,EAAE,uBAAuB,GAC9B,OAAO,CAAC,OAAO,CAAC,CAOlB"}
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Relay subscription operations for SignalProtocolClient
|
|
3
3
|
*
|
|
4
|
-
* Extracted from
|
|
4
|
+
* Extracted from DefaultSignalProtocolClient class to reduce file size (~330 lines).
|
|
5
5
|
* Handles the relay subscription callback logic for incoming message processing.
|
|
6
6
|
*/
|
|
7
7
|
import { EncryptionError, EncryptionErrorCode } from '../types/index.js';
|
|
8
8
|
import { determineRetryReason, isRetryableDecryptionError } from './retry-utils.js';
|
|
9
9
|
import { checkRetryRateLimit, RETRY_REQUEST_WINDOW_MS } from './retry.js';
|
|
10
|
-
import { callHook } from './event-hooks.js';
|
|
11
10
|
import { base64ToBytes } from '../internal/crypto/index.js';
|
|
12
11
|
import { hasProcessedEnvelope, storeProcessedEnvelope, withProcessedEnvelopeLock, } from '../local/store/reliability.js';
|
|
12
|
+
import { receivedContentId, pruneReceivedContent } from '../local/store/received-content.js';
|
|
13
13
|
import { isImplicitContentType } from './constants.js';
|
|
14
14
|
export const RECEIPT_BATCH_DELAY_MS = 3_000;
|
|
15
15
|
export const RECEIPT_BATCH_MAX = 100;
|
|
@@ -62,13 +62,26 @@ async function markDeliveredSilently(relay, envelopeId, logger) {
|
|
|
62
62
|
* - No schema validation or domain routing needed for these
|
|
63
63
|
*/
|
|
64
64
|
export async function handleRelayMessage(ctx, envelope, state, callbacks, config) {
|
|
65
|
+
if (await processRelayMessage(ctx, envelope, state, callbacks, config)) {
|
|
66
|
+
await markDeliveredSilently(ctx.relay, envelope.id, ctx.logger);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
/** Process content before either foreground or background transport acknowledges it. */
|
|
70
|
+
export async function processRelayMessage(ctx, envelope, state, callbacks, config) {
|
|
65
71
|
if (!envelope.id) {
|
|
66
72
|
return handleRelayMessageLocked(ctx, envelope, state, callbacks, config);
|
|
67
73
|
}
|
|
68
74
|
return withProcessedEnvelopeLock(ctx.storage, envelope.id, () => handleRelayMessageLocked(ctx, envelope, state, callbacks, config));
|
|
69
75
|
}
|
|
70
76
|
async function handleRelayMessageLocked(ctx, envelope, state, callbacks, config) {
|
|
71
|
-
|
|
77
|
+
const receiveId = envelope.id
|
|
78
|
+
? await receivedContentId(ctx.userId, ctx.deviceId, envelope)
|
|
79
|
+
: undefined;
|
|
80
|
+
await pruneReceivedContent(ctx.storage);
|
|
81
|
+
if (envelope.id &&
|
|
82
|
+
(await hasProcessedEnvelope(ctx.storage, envelope.id, Date.now(), receiveId))) {
|
|
83
|
+
if (receiveId)
|
|
84
|
+
await ctx.storage.deleteReceivedContent(receiveId);
|
|
72
85
|
ctx.logger.debug('Acknowledging previously processed relay envelope', {
|
|
73
86
|
category: 'E2EE',
|
|
74
87
|
data: {
|
|
@@ -76,24 +89,28 @@ async function handleRelayMessageLocked(ctx, envelope, state, callbacks, config)
|
|
|
76
89
|
behavior: 'PERSISTENT_DUPLICATE_DISCARD',
|
|
77
90
|
},
|
|
78
91
|
});
|
|
79
|
-
|
|
80
|
-
return;
|
|
92
|
+
return true;
|
|
81
93
|
}
|
|
94
|
+
if (!ctx.hooks?.onMessageDecrypted) {
|
|
95
|
+
throw new Error('Register onMessageDecrypted before receiving Relay messages');
|
|
96
|
+
}
|
|
97
|
+
let decryptedEnvelope;
|
|
82
98
|
try {
|
|
83
99
|
// Delegate decryption to SignalProtocolServiceCipher
|
|
84
100
|
// Pass sealed sender config for unidentified_sender envelope handling
|
|
85
|
-
|
|
86
|
-
// SUCCESS: Handle successful decryption
|
|
87
|
-
await handleDecryptionSuccess(ctx, envelope, decryptedEnvelope, state, callbacks);
|
|
101
|
+
decryptedEnvelope = await ctx.cipher.decrypt(envelope, ctx.config.sealedSender, receiveId);
|
|
88
102
|
}
|
|
89
103
|
catch (error) {
|
|
90
104
|
// ERROR: Handle decryption failure
|
|
91
105
|
await handleDecryptionError(ctx, envelope, error, state, callbacks, config);
|
|
92
|
-
return;
|
|
106
|
+
return false;
|
|
93
107
|
}
|
|
108
|
+
await handleDecryptionSuccess(ctx, envelope, decryptedEnvelope, state, callbacks);
|
|
94
109
|
if (envelope.id)
|
|
95
|
-
await storeProcessedEnvelope(ctx.storage, envelope.id);
|
|
96
|
-
|
|
110
|
+
await storeProcessedEnvelope(ctx.storage, envelope.id, Date.now(), receiveId);
|
|
111
|
+
if (receiveId)
|
|
112
|
+
await ctx.storage.deleteReceivedContent(receiveId);
|
|
113
|
+
return true;
|
|
97
114
|
}
|
|
98
115
|
/**
|
|
99
116
|
* Handle successful message decryption
|
|
@@ -103,21 +120,33 @@ async function handleDecryptionSuccess(ctx, envelope, decryptedEnvelope, state,
|
|
|
103
120
|
// Parse content to determine if it is a receipt, typing indicator, or data message.
|
|
104
121
|
const inspectedContent = ctx.contentAdapter.inspectContent(decryptedEnvelope.content);
|
|
105
122
|
const { receipt, typing } = inspectedContent;
|
|
106
|
-
|
|
107
|
-
|
|
123
|
+
const authenticatedEnvelope = {
|
|
124
|
+
...envelope,
|
|
125
|
+
senderUserId: decryptedEnvelope.senderId,
|
|
126
|
+
senderDeviceId: decryptedEnvelope.senderDeviceId,
|
|
127
|
+
};
|
|
128
|
+
if (inspectedContent.senderKeyDistribution) {
|
|
129
|
+
// The cipher installed this authenticated distribution before returning.
|
|
130
|
+
return;
|
|
131
|
+
}
|
|
132
|
+
else if (receipt) {
|
|
133
|
+
await callbacks.handleDeliveryReceipt(authenticatedEnvelope, receipt);
|
|
108
134
|
}
|
|
109
135
|
else if (typing) {
|
|
110
136
|
// Typing indicators are transient - no storage, no delivery receipt
|
|
111
|
-
await callbacks.handleTypingIndicator(
|
|
137
|
+
await callbacks.handleTypingIndicator(authenticatedEnvelope, typing);
|
|
112
138
|
}
|
|
113
139
|
else {
|
|
114
140
|
// Call hook: message decrypted (ContentManager stores in encrypted DB)
|
|
115
|
-
|
|
141
|
+
const receive = ctx.hooks?.onMessageDecrypted;
|
|
142
|
+
if (!receive)
|
|
143
|
+
throw new Error('Register onMessageDecrypted before receiving Relay messages');
|
|
144
|
+
await receive(decryptedEnvelope);
|
|
116
145
|
// Batch delivery receipts before sending
|
|
117
146
|
// Multi-device: sendDeliveryReceipt fans out to all sender's devices
|
|
118
147
|
if (decryptedEnvelope.timestamp && ctx.relay) {
|
|
119
148
|
if (inspectedContent.shouldSendDeliveryReceipt) {
|
|
120
|
-
accumulateDeliveryReceipt(state.receiptAccumulator,
|
|
149
|
+
accumulateDeliveryReceipt(state.receiptAccumulator, decryptedEnvelope.senderId, decryptedEnvelope.timestamp, callbacks.sendDeliveryReceipt, ctx.logger);
|
|
121
150
|
}
|
|
122
151
|
}
|
|
123
152
|
}
|
|
@@ -174,20 +203,18 @@ function flushReceipts(acc, senderUserId, flush, logger) {
|
|
|
174
203
|
* - RESENDABLE: request retry from sender
|
|
175
204
|
*/
|
|
176
205
|
async function handleDecryptionError(ctx, envelope, error, state, callbacks, config) {
|
|
177
|
-
//
|
|
178
|
-
//
|
|
179
|
-
// sender to create a fresh ciphertext for plaintext already delivered.
|
|
206
|
+
// A consumed ratchet key proves decryption, not application persistence.
|
|
207
|
+
// Only the processed-envelope receipt above can authorize duplicate ACKs.
|
|
180
208
|
if (error instanceof EncryptionError && error.code === EncryptionErrorCode.MESSAGE_DUPLICATE) {
|
|
181
|
-
ctx.logger.debug('
|
|
209
|
+
ctx.logger.debug('Retaining unhandled duplicate relay envelope without retry', {
|
|
182
210
|
category: 'E2EE',
|
|
183
211
|
data: {
|
|
184
212
|
envelopeId: envelope.id,
|
|
185
213
|
senderUserId: envelope.senderUserId,
|
|
186
214
|
senderDeviceId: envelope.senderDeviceId,
|
|
187
|
-
behavior: '
|
|
215
|
+
behavior: 'UNHANDLED_DUPLICATE',
|
|
188
216
|
},
|
|
189
217
|
});
|
|
190
|
-
await markDeliveredSilently(ctx.relay, envelope.id, ctx.logger);
|
|
191
218
|
return;
|
|
192
219
|
}
|
|
193
220
|
// Early exit: Implicit messages (typing indicators, receipts) should be
|
|
@@ -207,7 +234,9 @@ async function handleDecryptionError(ctx, envelope, error, state, callbacks, con
|
|
|
207
234
|
errorType: error.name,
|
|
208
235
|
},
|
|
209
236
|
});
|
|
210
|
-
|
|
237
|
+
if (config.acknowledgeFailures !== false) {
|
|
238
|
+
await markDeliveredSilently(ctx.relay, envelope.id, ctx.logger);
|
|
239
|
+
}
|
|
211
240
|
return;
|
|
212
241
|
}
|
|
213
242
|
// Log errors for non-implicit messages that actually matter
|
|
@@ -251,7 +280,9 @@ async function handleDecryptionError(ctx, envelope, error, state, callbacks, con
|
|
|
251
280
|
behavior: 'IMPLICIT_DISCARD',
|
|
252
281
|
},
|
|
253
282
|
});
|
|
254
|
-
|
|
283
|
+
if (config.acknowledgeFailures !== false) {
|
|
284
|
+
await markDeliveredSilently(ctx.relay, envelope.id, ctx.logger);
|
|
285
|
+
}
|
|
255
286
|
return;
|
|
256
287
|
}
|
|
257
288
|
// RESENDABLE behavior: request retry from sender
|
|
@@ -286,7 +317,9 @@ async function sendRetryRequest(ctx, envelope, error, state, callbacks, config)
|
|
|
286
317
|
windowMs: RETRY_REQUEST_WINDOW_MS,
|
|
287
318
|
},
|
|
288
319
|
});
|
|
289
|
-
|
|
320
|
+
if (config.acknowledgeFailures !== false) {
|
|
321
|
+
await markDeliveredSilently(ctx.relay, envelope.id, ctx.logger);
|
|
322
|
+
}
|
|
290
323
|
return;
|
|
291
324
|
}
|
|
292
325
|
// Handle stale prekey indicators
|
|
@@ -315,7 +348,7 @@ async function sendRetryRequest(ctx, envelope, error, state, callbacks, config)
|
|
|
315
348
|
},
|
|
316
349
|
});
|
|
317
350
|
// Mark failed message as delivered so it does not reappear
|
|
318
|
-
if (envelope.id) {
|
|
351
|
+
if (envelope.id && config.acknowledgeFailures !== false) {
|
|
319
352
|
try {
|
|
320
353
|
await ctx.relay.markDelivered(envelope.id);
|
|
321
354
|
ctx.logger.debug('Marked failed message as delivered after retry request', {
|