zapo-js 0.1.0 → 0.1.2
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/README.md +12 -7
- package/dist/appstate/WaAppStateCrypto.js +18 -25
- package/dist/appstate/WaAppStateSyncClient.js +181 -114
- package/dist/appstate/WaAppStateSyncResponseParser.js +16 -5
- package/dist/appstate/constants.js +4 -3
- package/dist/appstate/utils.js +10 -30
- package/dist/auth/WaAuthClient.js +48 -55
- package/dist/auth/flow/WaAuthCredentialsFlow.js +21 -14
- package/dist/auth/index.js +1 -3
- package/dist/auth/pairing/WaPairingFlow.js +21 -23
- package/dist/auth/pairing/WaQrFlow.js +37 -24
- package/dist/client/WaClient.js +103 -276
- package/dist/client/WaClientFactory.js +227 -110
- package/dist/client/connection/WaConnectionManager.js +292 -0
- package/dist/client/connection/WaKeyShareCoordinator.js +63 -0
- package/dist/client/connection/WaReceiptQueue.js +51 -0
- package/dist/client/coordinators/WaAppStateMutationCoordinator.js +471 -0
- package/dist/client/coordinators/WaGroupCoordinator.js +27 -17
- package/dist/client/coordinators/WaIncomingNodeCoordinator.js +20 -27
- package/dist/client/coordinators/WaMessageDispatchCoordinator.js +231 -686
- package/dist/client/coordinators/WaRetryCoordinator.js +70 -37
- package/dist/client/dirty.js +35 -29
- package/dist/client/events/chat.js +4 -3
- package/dist/client/events/group.js +59 -36
- package/dist/client/history-sync.js +53 -63
- package/dist/client/incoming.js +23 -20
- package/dist/client/mailbox.js +8 -8
- package/dist/client/messages.js +4 -4
- package/dist/client/messaging/fanout.js +189 -0
- package/dist/client/messaging/key-protocol.js +130 -0
- package/dist/client/messaging/participants.js +191 -0
- package/dist/crypto/core/hkdf.js +3 -8
- package/dist/crypto/core/index.js +1 -4
- package/dist/crypto/core/keys.js +2 -3
- package/dist/crypto/core/primitives.js +12 -15
- package/dist/crypto/core/random.js +7 -26
- package/dist/crypto/curves/Ed25519.js +7 -8
- package/dist/crypto/curves/X25519.js +13 -16
- package/dist/crypto/index.js +0 -5
- package/dist/esm/appstate/WaAppStateCrypto.js +6 -13
- package/dist/esm/appstate/WaAppStateSyncClient.js +174 -107
- package/dist/esm/appstate/WaAppStateSyncResponseParser.js +17 -6
- package/dist/esm/appstate/constants.js +3 -2
- package/dist/esm/appstate/utils.js +8 -27
- package/dist/esm/auth/WaAuthClient.js +48 -55
- package/dist/esm/auth/flow/WaAuthCredentialsFlow.js +21 -14
- package/dist/esm/auth/index.js +0 -1
- package/dist/esm/auth/pairing/WaPairingFlow.js +14 -16
- package/dist/esm/auth/pairing/WaQrFlow.js +37 -24
- package/dist/esm/client/WaClient.js +103 -276
- package/dist/esm/client/WaClientFactory.js +227 -110
- package/dist/esm/client/connection/WaConnectionManager.js +288 -0
- package/dist/esm/client/connection/WaKeyShareCoordinator.js +59 -0
- package/dist/esm/client/connection/WaReceiptQueue.js +47 -0
- package/dist/esm/client/coordinators/WaAppStateMutationCoordinator.js +467 -0
- package/dist/esm/client/coordinators/WaGroupCoordinator.js +20 -10
- package/dist/esm/client/coordinators/WaIncomingNodeCoordinator.js +20 -27
- package/dist/esm/client/coordinators/WaMessageDispatchCoordinator.js +232 -687
- package/dist/esm/client/coordinators/WaRetryCoordinator.js +71 -38
- package/dist/esm/client/dirty.js +30 -24
- package/dist/esm/client/events/chat.js +4 -3
- package/dist/esm/client/events/group.js +50 -28
- package/dist/esm/client/history-sync.js +50 -60
- package/dist/esm/client/incoming.js +23 -20
- package/dist/esm/client/mailbox.js +8 -8
- package/dist/esm/client/messages.js +1 -1
- package/dist/esm/client/messaging/fanout.js +186 -0
- package/dist/esm/client/messaging/key-protocol.js +127 -0
- package/dist/esm/client/messaging/participants.js +188 -0
- package/dist/esm/crypto/core/hkdf.js +3 -8
- package/dist/esm/crypto/core/index.js +0 -1
- package/dist/esm/crypto/core/keys.js +2 -3
- package/dist/esm/crypto/core/primitives.js +12 -15
- package/dist/esm/crypto/core/random.js +6 -25
- package/dist/esm/crypto/curves/Ed25519.js +4 -5
- package/dist/esm/crypto/curves/X25519.js +10 -13
- package/dist/esm/crypto/index.js +0 -2
- package/dist/esm/infra/log/ConsoleLogger.js +18 -17
- package/dist/esm/infra/log/PinoLogger.js +15 -9
- package/dist/esm/infra/log/types.js +11 -1
- package/dist/esm/infra/perf/BoundedTaskQueue.js +13 -17
- package/dist/esm/media/WaMediaCrypto.js +2 -4
- package/dist/esm/media/WaMediaTransferClient.js +226 -58
- package/dist/esm/media/conn.js +10 -6
- package/dist/esm/media/constants.js +4 -1
- package/dist/esm/message/WaMessageClient.js +4 -13
- package/dist/esm/message/ack.js +6 -6
- package/dist/esm/message/addon-crypto.js +59 -0
- package/dist/esm/message/incoming.js +106 -111
- package/dist/esm/message/index.js +2 -0
- package/dist/esm/message/reporting-token.js +438 -0
- package/dist/esm/message/use-case-secret.js +49 -0
- package/dist/esm/protocol/appstate.js +58 -0
- package/dist/esm/protocol/constants.js +2 -1
- package/dist/esm/protocol/index.js +2 -10
- package/dist/esm/protocol/jid.js +63 -51
- package/dist/esm/protocol/media.js +3 -3
- package/dist/esm/protocol/nodes.js +2 -0
- package/dist/esm/protocol/usync.js +11 -0
- package/dist/esm/retry/index.js +1 -0
- package/dist/esm/retry/outbound.js +4 -5
- package/dist/esm/retry/parse.js +58 -76
- package/dist/esm/retry/replay.js +48 -49
- package/dist/esm/retry/tracker.js +56 -0
- package/dist/esm/signal/api/SignalDeviceSyncApi.js +249 -82
- package/dist/esm/signal/api/SignalDigestSyncApi.js +6 -1
- package/dist/esm/signal/api/SignalIdentitySyncApi.js +49 -34
- package/dist/esm/signal/api/SignalMissingPreKeysSyncApi.js +70 -62
- package/dist/esm/signal/api/SignalSessionSyncApi.js +23 -30
- package/dist/esm/signal/crypto/WaAdvSignature.js +3 -5
- package/dist/esm/signal/group/SenderKeyChain.js +28 -23
- package/dist/esm/signal/group/SenderKeyCodec.js +2 -4
- package/dist/esm/signal/group/SenderKeyManager.js +26 -16
- package/dist/esm/signal/index.js +1 -0
- package/dist/esm/signal/session/SignalProtocol.js +49 -14
- package/dist/esm/signal/session/SignalRatchet.js +24 -15
- package/dist/esm/signal/session/SignalSession.js +14 -9
- package/dist/esm/signal/session/resolver.js +186 -0
- package/dist/esm/signal/store/sqlite.js +16 -37
- package/dist/esm/store/createStore.js +16 -18
- package/dist/esm/store/noop.store.js +3 -6
- package/dist/esm/store/providers/memory/appstate.store.js +30 -6
- package/dist/esm/store/providers/memory/contact.store.js +5 -0
- package/dist/esm/store/providers/memory/device-list.store.js +3 -30
- package/dist/esm/store/providers/memory/message.store.js +11 -5
- package/dist/esm/store/providers/memory/participants.store.js +1 -8
- package/dist/esm/store/providers/memory/sender-key.store.js +5 -7
- package/dist/esm/store/providers/memory/signal.store.js +13 -1
- package/dist/esm/store/providers/memory/thread.store.js +5 -0
- package/dist/esm/store/providers/sqlite/appstate.store.js +82 -1
- package/dist/esm/store/providers/sqlite/connection.js +18 -13
- package/dist/esm/store/providers/sqlite/contact.store.js +31 -18
- package/dist/esm/store/providers/sqlite/device-list.store.js +7 -35
- package/dist/esm/store/providers/sqlite/message.store.js +45 -32
- package/dist/esm/store/providers/sqlite/migrations.js +1 -1
- package/dist/esm/store/providers/sqlite/participants.store.js +1 -9
- package/dist/esm/store/providers/sqlite/retry.store.js +8 -11
- package/dist/esm/store/providers/sqlite/sender-key.store.js +25 -30
- package/dist/esm/store/providers/sqlite/signal.store.js +104 -22
- package/dist/esm/store/providers/sqlite/table-names.js +107 -0
- package/dist/esm/store/providers/sqlite/thread.store.js +35 -22
- package/dist/esm/transport/WaComms.js +25 -23
- package/dist/esm/transport/WaWebSocket.js +115 -12
- package/dist/esm/transport/binary/decoder.js +4 -4
- package/dist/esm/transport/binary/encoder.js +12 -4
- package/dist/esm/transport/index.js +1 -0
- package/dist/esm/transport/keepalive/WaKeepAlive.js +2 -8
- package/dist/esm/transport/node/WaNodeOrchestrator.js +2 -4
- package/dist/esm/transport/node/WaNodeTransport.js +0 -3
- package/dist/esm/transport/node/builders/{accountSync.js → account-sync.js} +16 -36
- package/dist/esm/transport/node/builders/index.js +2 -1
- package/dist/esm/transport/node/builders/message.js +9 -0
- package/dist/esm/transport/node/builders/pairing.js +4 -5
- package/dist/esm/transport/node/builders/usync.js +41 -0
- package/dist/esm/transport/node/helpers.js +107 -5
- package/dist/esm/transport/node/usync.js +35 -0
- package/dist/esm/transport/noise/WaFrameCodec.js +48 -33
- package/dist/esm/transport/noise/WaNoiseCert.js +3 -6
- package/dist/esm/transport/noise/WaNoiseSession.js +17 -10
- package/dist/esm/transport/proxy.js +27 -0
- package/dist/esm/transport/stream/parse.js +13 -48
- package/dist/esm/util/bytes.js +50 -32
- package/dist/esm/util/coercion.js +6 -14
- package/dist/esm/util/primitives.js +39 -14
- package/dist/infra/log/ConsoleLogger.js +18 -17
- package/dist/infra/log/PinoLogger.js +15 -9
- package/dist/infra/log/types.js +12 -0
- package/dist/infra/perf/BoundedTaskQueue.js +13 -17
- package/dist/media/WaMediaCrypto.js +1 -3
- package/dist/media/WaMediaTransferClient.js +259 -58
- package/dist/media/conn.js +10 -6
- package/dist/media/constants.js +4 -1
- package/dist/message/WaMessageClient.js +5 -14
- package/dist/message/ack.js +6 -6
- package/dist/message/addon-crypto.js +65 -0
- package/dist/message/incoming.js +104 -109
- package/dist/message/index.js +2 -0
- package/dist/message/reporting-token.js +443 -0
- package/dist/message/use-case-secret.js +55 -0
- package/dist/protocol/appstate.js +59 -1
- package/dist/protocol/constants.js +7 -1
- package/dist/protocol/index.js +20 -42
- package/dist/protocol/jid.js +64 -51
- package/dist/protocol/media.js +3 -3
- package/dist/protocol/nodes.js +2 -0
- package/dist/protocol/usync.js +14 -0
- package/dist/retry/index.js +3 -1
- package/dist/retry/outbound.js +6 -7
- package/dist/retry/parse.js +57 -75
- package/dist/retry/replay.js +46 -47
- package/dist/retry/tracker.js +59 -0
- package/dist/signal/api/SignalDeviceSyncApi.js +247 -80
- package/dist/signal/api/SignalDigestSyncApi.js +6 -1
- package/dist/signal/api/SignalIdentitySyncApi.js +49 -34
- package/dist/signal/api/SignalMissingPreKeysSyncApi.js +67 -59
- package/dist/signal/api/SignalSessionSyncApi.js +23 -30
- package/dist/signal/crypto/WaAdvSignature.js +2 -4
- package/dist/signal/group/SenderKeyChain.js +27 -22
- package/dist/signal/group/SenderKeyCodec.js +1 -3
- package/dist/signal/group/SenderKeyManager.js +26 -16
- package/dist/signal/index.js +3 -1
- package/dist/signal/session/SignalProtocol.js +49 -14
- package/dist/signal/session/SignalRatchet.js +24 -15
- package/dist/signal/session/SignalSession.js +14 -9
- package/dist/signal/session/resolver.js +189 -0
- package/dist/signal/store/sqlite.js +16 -37
- package/dist/store/createStore.js +16 -18
- package/dist/store/noop.store.js +3 -6
- package/dist/store/providers/memory/appstate.store.js +28 -4
- package/dist/store/providers/memory/contact.store.js +5 -0
- package/dist/store/providers/memory/device-list.store.js +3 -30
- package/dist/store/providers/memory/message.store.js +11 -5
- package/dist/store/providers/memory/participants.store.js +1 -8
- package/dist/store/providers/memory/sender-key.store.js +8 -10
- package/dist/store/providers/memory/signal.store.js +21 -9
- package/dist/store/providers/memory/thread.store.js +5 -0
- package/dist/store/providers/sqlite/appstate.store.js +81 -0
- package/dist/store/providers/sqlite/connection.js +18 -13
- package/dist/store/providers/sqlite/contact.store.js +31 -18
- package/dist/store/providers/sqlite/device-list.store.js +7 -35
- package/dist/store/providers/sqlite/message.store.js +45 -32
- package/dist/store/providers/sqlite/migrations.js +1 -1
- package/dist/store/providers/sqlite/participants.store.js +1 -9
- package/dist/store/providers/sqlite/retry.store.js +8 -11
- package/dist/store/providers/sqlite/sender-key.store.js +24 -29
- package/dist/store/providers/sqlite/signal.store.js +105 -23
- package/dist/store/providers/sqlite/table-names.js +113 -0
- package/dist/store/providers/sqlite/thread.store.js +35 -22
- package/dist/transport/WaComms.js +27 -25
- package/dist/transport/WaWebSocket.js +148 -12
- package/dist/transport/binary/decoder.js +4 -4
- package/dist/transport/binary/encoder.js +12 -4
- package/dist/transport/index.js +7 -1
- package/dist/transport/keepalive/WaKeepAlive.js +1 -7
- package/dist/transport/node/WaNodeOrchestrator.js +2 -4
- package/dist/transport/node/WaNodeTransport.js +0 -3
- package/dist/transport/node/builders/{accountSync.js → account-sync.js} +15 -35
- package/dist/transport/node/builders/index.js +12 -9
- package/dist/transport/node/builders/message.js +9 -0
- package/dist/transport/node/builders/pairing.js +4 -5
- package/dist/transport/node/builders/usync.js +45 -0
- package/dist/transport/node/helpers.js +112 -4
- package/dist/transport/node/usync.js +38 -0
- package/dist/transport/noise/WaFrameCodec.js +47 -32
- package/dist/transport/noise/WaNoiseCert.js +5 -8
- package/dist/transport/noise/WaNoiseSession.js +17 -10
- package/dist/transport/proxy.js +34 -0
- package/dist/transport/stream/parse.js +17 -53
- package/dist/types/appstate/WaAppStateCrypto.d.ts +0 -1
- package/dist/types/appstate/WaAppStateSyncClient.d.ts +5 -2
- package/dist/types/appstate/constants.d.ts +1 -0
- package/dist/types/appstate/store/sqlite.d.ts +4 -18
- package/dist/types/appstate/utils.d.ts +0 -1
- package/dist/types/auth/WaAuthClient.d.ts +10 -12
- package/dist/types/auth/index.d.ts +0 -2
- package/dist/types/auth/pairing/WaQrFlow.d.ts +1 -1
- package/dist/types/auth/types.d.ts +6 -9
- package/dist/types/client/WaClient.d.ts +27 -25
- package/dist/types/client/WaClientFactory.d.ts +22 -23
- package/dist/types/client/connection/WaConnectionManager.d.ts +64 -0
- package/dist/types/client/connection/WaKeyShareCoordinator.d.ts +14 -0
- package/dist/types/client/connection/WaReceiptQueue.d.ts +13 -0
- package/dist/types/client/coordinators/WaAppStateMutationCoordinator.d.ts +46 -0
- package/dist/types/client/coordinators/WaIncomingNodeCoordinator.d.ts +0 -1
- package/dist/types/client/coordinators/WaMessageDispatchCoordinator.d.ts +18 -41
- package/dist/types/client/coordinators/WaRetryCoordinator.d.ts +2 -0
- package/dist/types/client/dirty.d.ts +1 -0
- package/dist/types/client/events/group.d.ts +2 -1
- package/dist/types/client/index.d.ts +1 -1
- package/dist/types/client/messaging/fanout.d.ts +14 -0
- package/dist/types/client/messaging/key-protocol.d.ts +18 -0
- package/dist/types/client/messaging/participants.d.ts +13 -0
- package/dist/types/client/types.d.ts +24 -1
- package/dist/types/crypto/core/hkdf.d.ts +0 -6
- package/dist/types/crypto/core/index.d.ts +0 -1
- package/dist/types/crypto/core/random.d.ts +1 -7
- package/dist/types/crypto/index.d.ts +0 -2
- package/dist/types/index.d.ts +1 -1
- package/dist/types/infra/log/ConsoleLogger.d.ts +2 -1
- package/dist/types/infra/log/PinoLogger.d.ts +1 -1
- package/dist/types/infra/log/types.d.ts +1 -0
- package/dist/types/infra/perf/BoundedTaskQueue.d.ts +1 -1
- package/dist/types/media/WaMediaTransferClient.d.ts +13 -3
- package/dist/types/media/types.d.ts +5 -0
- package/dist/types/message/addon-crypto.d.ts +25 -0
- package/dist/types/message/index.d.ts +2 -0
- package/dist/types/message/reporting-token.d.ts +19 -0
- package/dist/types/message/use-case-secret.d.ts +20 -0
- package/dist/types/protocol/appstate.d.ts +58 -0
- package/dist/types/protocol/constants.d.ts +2 -1
- package/dist/types/protocol/index.d.ts +2 -10
- package/dist/types/protocol/jid.d.ts +3 -3
- package/dist/types/protocol/nodes.d.ts +2 -0
- package/dist/types/protocol/usync.d.ts +11 -0
- package/dist/types/retry/index.d.ts +1 -0
- package/dist/types/retry/replay.d.ts +0 -4
- package/dist/types/retry/tracker.d.ts +19 -0
- package/dist/types/retry/types.d.ts +4 -3
- package/dist/types/signal/api/SignalDeviceSyncApi.d.ts +13 -1
- package/dist/types/signal/group/SenderKeyCodec.d.ts +4 -6
- package/dist/types/signal/index.d.ts +1 -0
- package/dist/types/signal/session/SignalProtocol.d.ts +9 -0
- package/dist/types/signal/session/resolver.d.ts +17 -0
- package/dist/types/store/contracts/appstate.store.d.ts +3 -0
- package/dist/types/store/contracts/contact.store.d.ts +1 -0
- package/dist/types/store/contracts/device-list.store.d.ts +0 -3
- package/dist/types/store/contracts/message.store.d.ts +1 -0
- package/dist/types/store/contracts/participants.store.d.ts +0 -1
- package/dist/types/store/contracts/sender-key.store.d.ts +0 -1
- package/dist/types/store/contracts/signal.store.d.ts +6 -0
- package/dist/types/store/contracts/thread.store.d.ts +1 -0
- package/dist/types/store/index.d.ts +1 -1
- package/dist/types/store/providers/memory/appstate.store.d.ts +2 -0
- package/dist/types/store/providers/memory/contact.store.d.ts +1 -0
- package/dist/types/store/providers/memory/device-list.store.d.ts +0 -3
- package/dist/types/store/providers/memory/message.store.d.ts +1 -0
- package/dist/types/store/providers/memory/participants.store.d.ts +0 -1
- package/dist/types/store/providers/memory/sender-key.store.d.ts +0 -1
- package/dist/types/store/providers/memory/signal.store.d.ts +6 -0
- package/dist/types/store/providers/memory/thread.store.d.ts +1 -0
- package/dist/types/store/providers/sqlite/appstate.store.d.ts +2 -0
- package/dist/types/store/providers/sqlite/contact.store.d.ts +2 -0
- package/dist/types/store/providers/sqlite/device-list.store.d.ts +0 -3
- package/dist/types/store/providers/sqlite/message.store.d.ts +2 -0
- package/dist/types/store/providers/sqlite/participants.store.d.ts +0 -1
- package/dist/types/store/providers/sqlite/retry.store.d.ts +0 -1
- package/dist/types/store/providers/sqlite/sender-key.store.d.ts +0 -1
- package/dist/types/store/providers/sqlite/signal.store.d.ts +7 -0
- package/dist/types/store/providers/sqlite/table-names.d.ts +5 -0
- package/dist/types/store/providers/sqlite/thread.store.d.ts +2 -0
- package/dist/types/store/types.d.ts +3 -0
- package/dist/types/transport/WaWebSocket.d.ts +3 -0
- package/dist/types/transport/index.d.ts +2 -1
- package/dist/types/transport/keepalive/WaKeepAlive.d.ts +0 -1
- package/dist/types/transport/node/WaNodeTransport.d.ts +0 -9
- package/dist/types/transport/node/builders/group.d.ts +4 -6
- package/dist/types/transport/node/builders/index.d.ts +2 -1
- package/dist/types/transport/node/builders/message.d.ts +14 -25
- package/dist/types/transport/node/builders/retry.d.ts +2 -4
- package/dist/types/transport/node/builders/usync.d.ts +21 -0
- package/dist/types/transport/node/helpers.d.ts +8 -0
- package/dist/types/transport/node/usync.d.ts +2 -0
- package/dist/types/transport/noise/WaFrameCodec.d.ts +3 -0
- package/dist/types/transport/noise/WaNoiseSession.d.ts +1 -0
- package/dist/types/transport/proxy.d.ts +6 -0
- package/dist/types/transport/stream/parse.d.ts +0 -1
- package/dist/types/transport/types.d.ts +18 -1
- package/dist/types/util/bytes.d.ts +5 -0
- package/dist/types/util/primitives.d.ts +3 -0
- package/dist/util/bytes.js +55 -33
- package/dist/util/coercion.js +6 -14
- package/dist/util/primitives.js +42 -14
- package/package.json +27 -9
- package/proto/index.d.ts +1090 -1048
- package/proto/index.js +1 -1
- package/scripts/check-node-version.cjs +0 -1
- package/dist/crypto/core/encoding.js +0 -29
- package/dist/esm/crypto/core/encoding.js +0 -25
- package/dist/esm/util/base64.js +0 -18
- package/dist/esm/util/signal-address.js +0 -5
- package/dist/types/crypto/core/encoding.d.ts +0 -11
- package/dist/types/util/base64.d.ts +0 -4
- package/dist/types/util/signal-address.d.ts +0 -2
- package/dist/util/base64.js +0 -24
- package/dist/util/signal-address.js +0 -8
- /package/dist/types/transport/node/builders/{accountSync.d.ts → account-sync.d.ts} +0 -0
|
@@ -0,0 +1,288 @@
|
|
|
1
|
+
import { WaComms } from '../../transport/WaComms.js';
|
|
2
|
+
import { toError } from '../../util/primitives.js';
|
|
3
|
+
export class WaConnectionManager {
|
|
4
|
+
constructor(options) {
|
|
5
|
+
this.logger = options.logger;
|
|
6
|
+
this.options = options.options;
|
|
7
|
+
this.authClient = options.authClient;
|
|
8
|
+
this.keepAlive = options.keepAlive;
|
|
9
|
+
this.nodeOrchestrator = options.nodeOrchestrator;
|
|
10
|
+
this.nodeTransport = options.nodeTransport;
|
|
11
|
+
this.getPassiveTasks = options.getPassiveTasks;
|
|
12
|
+
this.clearStoredCredentialsCallback = options.clearStoredCredentials;
|
|
13
|
+
this.comms = null;
|
|
14
|
+
this.clockSkewMs = null;
|
|
15
|
+
this.mediaConnCache = null;
|
|
16
|
+
this.connectPromise = null;
|
|
17
|
+
this.pairingReconnectPromise = null;
|
|
18
|
+
this.frameHandler = null;
|
|
19
|
+
this.pendingComms = null;
|
|
20
|
+
this.lifecycleGeneration = 0;
|
|
21
|
+
this.lifecycleQueue = Promise.resolve();
|
|
22
|
+
}
|
|
23
|
+
async connect(frameHandler) {
|
|
24
|
+
if (this.connectPromise) {
|
|
25
|
+
this.logger.trace('wa client connect already in-flight');
|
|
26
|
+
return this.connectPromise;
|
|
27
|
+
}
|
|
28
|
+
this.frameHandler = frameHandler;
|
|
29
|
+
const lifecycleGeneration = this.nextLifecycleGeneration();
|
|
30
|
+
const operation = this.runLifecycleOperation(async () => {
|
|
31
|
+
await this.connectInternal(frameHandler, lifecycleGeneration);
|
|
32
|
+
});
|
|
33
|
+
this.connectPromise = operation.finally(() => {
|
|
34
|
+
if (this.connectPromise === operation) {
|
|
35
|
+
this.connectPromise = null;
|
|
36
|
+
}
|
|
37
|
+
});
|
|
38
|
+
return this.connectPromise;
|
|
39
|
+
}
|
|
40
|
+
scheduleReconnectAfterPairing() {
|
|
41
|
+
this.logger.debug('wa client scheduling reconnect after pairing');
|
|
42
|
+
setTimeout(() => {
|
|
43
|
+
void this.reconnectAsRegisteredAfterPairing().catch((error) => {
|
|
44
|
+
if (this.isLifecycleSupersededError(error)) {
|
|
45
|
+
this.logger.trace('pairing reconnect canceled by newer lifecycle');
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
this.logger.warn('failed to reconnect after pairing', {
|
|
49
|
+
message: toError(error).message
|
|
50
|
+
});
|
|
51
|
+
});
|
|
52
|
+
}, 0);
|
|
53
|
+
}
|
|
54
|
+
async disconnect() {
|
|
55
|
+
const lifecycleGeneration = this.nextLifecycleGeneration();
|
|
56
|
+
this.invalidatePendingComms('failed to stop pending comms during disconnect');
|
|
57
|
+
await this.runLifecycleOperation(async () => {
|
|
58
|
+
await this.disconnectInternal(lifecycleGeneration);
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
async clearStoredCredentials() {
|
|
62
|
+
await this.clearStoredCredentialsCallback();
|
|
63
|
+
}
|
|
64
|
+
isConnected() {
|
|
65
|
+
return !!(this.comms && this.comms.getCommsState().connected);
|
|
66
|
+
}
|
|
67
|
+
getComms() {
|
|
68
|
+
return this.comms;
|
|
69
|
+
}
|
|
70
|
+
getClockSkewMs() {
|
|
71
|
+
return this.clockSkewMs;
|
|
72
|
+
}
|
|
73
|
+
getMediaConnCache() {
|
|
74
|
+
return this.mediaConnCache;
|
|
75
|
+
}
|
|
76
|
+
setMediaConnCache(value) {
|
|
77
|
+
this.mediaConnCache = value;
|
|
78
|
+
}
|
|
79
|
+
updateClockSkewFromSuccess(serverUnixSeconds) {
|
|
80
|
+
const serverMs = serverUnixSeconds * 1000;
|
|
81
|
+
const nowMs = Date.now();
|
|
82
|
+
this.clockSkewMs = serverMs - nowMs;
|
|
83
|
+
this.logger.debug('updated clock skew from success', {
|
|
84
|
+
serverUnixSeconds,
|
|
85
|
+
clockSkewMs: this.clockSkewMs
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
async connectInternal(frameHandler, lifecycleGeneration) {
|
|
89
|
+
this.assertLifecycleCurrent(lifecycleGeneration, 'connect');
|
|
90
|
+
if (this.comms || this.pendingComms) {
|
|
91
|
+
this.logger.trace('wa client connect skipped: comms already created');
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
this.logger.info('wa client connect start');
|
|
95
|
+
let credentials = await this.authClient.loadOrCreateCredentials();
|
|
96
|
+
this.assertLifecycleCurrent(lifecycleGeneration, 'connect');
|
|
97
|
+
try {
|
|
98
|
+
await this.startCommsWithCredentials(credentials, frameHandler, lifecycleGeneration);
|
|
99
|
+
}
|
|
100
|
+
catch (error) {
|
|
101
|
+
if (this.isLifecycleSupersededError(error)) {
|
|
102
|
+
throw error;
|
|
103
|
+
}
|
|
104
|
+
if (credentials.routingInfo) {
|
|
105
|
+
this.logger.warn('connect failed with routing info, retrying without routing info', {
|
|
106
|
+
message: toError(error).message
|
|
107
|
+
});
|
|
108
|
+
await this.disconnectInternal(lifecycleGeneration);
|
|
109
|
+
this.assertLifecycleCurrent(lifecycleGeneration, 'connect');
|
|
110
|
+
credentials = await this.authClient.clearRoutingInfo();
|
|
111
|
+
this.assertLifecycleCurrent(lifecycleGeneration, 'connect');
|
|
112
|
+
await this.startCommsWithCredentials(credentials, frameHandler, lifecycleGeneration);
|
|
113
|
+
}
|
|
114
|
+
else {
|
|
115
|
+
await this.disconnectInternal(lifecycleGeneration);
|
|
116
|
+
throw error;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
this.assertLifecycleCurrent(lifecycleGeneration, 'connect');
|
|
120
|
+
this.logger.info('wa client connected');
|
|
121
|
+
}
|
|
122
|
+
async reconnectAsRegisteredAfterPairing() {
|
|
123
|
+
if (this.pairingReconnectPromise) {
|
|
124
|
+
this.logger.trace('pairing reconnect already in-flight');
|
|
125
|
+
return this.pairingReconnectPromise;
|
|
126
|
+
}
|
|
127
|
+
const operation = this.runLifecycleOperation(async () => {
|
|
128
|
+
await this.reconnectAsRegisteredAfterPairingInternal();
|
|
129
|
+
});
|
|
130
|
+
this.pairingReconnectPromise = operation.finally(() => {
|
|
131
|
+
if (this.pairingReconnectPromise === operation) {
|
|
132
|
+
this.pairingReconnectPromise = null;
|
|
133
|
+
}
|
|
134
|
+
});
|
|
135
|
+
return this.pairingReconnectPromise;
|
|
136
|
+
}
|
|
137
|
+
async reconnectAsRegisteredAfterPairingInternal() {
|
|
138
|
+
const frameHandler = this.frameHandler;
|
|
139
|
+
if (!frameHandler) {
|
|
140
|
+
throw new Error('pairing reconnect requires an active frame handler');
|
|
141
|
+
}
|
|
142
|
+
const credentials = this.authClient.getCurrentCredentials();
|
|
143
|
+
if (!credentials?.meJid) {
|
|
144
|
+
this.logger.trace('pairing reconnect skipped: still unregistered');
|
|
145
|
+
return;
|
|
146
|
+
}
|
|
147
|
+
const currentComms = this.comms;
|
|
148
|
+
if (!currentComms) {
|
|
149
|
+
this.logger.trace('pairing reconnect skipped: no active comms');
|
|
150
|
+
return;
|
|
151
|
+
}
|
|
152
|
+
const lifecycleGeneration = this.nextLifecycleGeneration();
|
|
153
|
+
this.assertLifecycleCurrent(lifecycleGeneration, 'pairing reconnect');
|
|
154
|
+
this.logger.info('pairing completed, restarting comms as registered');
|
|
155
|
+
this.keepAlive.stop();
|
|
156
|
+
this.nodeOrchestrator.clearPending(new Error('restarting comms after pairing'));
|
|
157
|
+
this.clearCommsBinding(currentComms);
|
|
158
|
+
await this.stopCommsQuietly(currentComms, 'failed to stop pre-registration comms');
|
|
159
|
+
this.assertLifecycleCurrent(lifecycleGeneration, 'pairing reconnect');
|
|
160
|
+
await this.startCommsWithCredentials(credentials, frameHandler, lifecycleGeneration);
|
|
161
|
+
this.assertLifecycleCurrent(lifecycleGeneration, 'pairing reconnect');
|
|
162
|
+
}
|
|
163
|
+
async disconnectInternal(lifecycleGeneration) {
|
|
164
|
+
if (!this.isLifecycleCurrent(lifecycleGeneration)) {
|
|
165
|
+
return;
|
|
166
|
+
}
|
|
167
|
+
this.logger.info('wa client disconnect start');
|
|
168
|
+
this.keepAlive.stop();
|
|
169
|
+
this.nodeOrchestrator.clearPending(new Error('client disconnected'));
|
|
170
|
+
this.clockSkewMs = null;
|
|
171
|
+
this.mediaConnCache = null;
|
|
172
|
+
this.frameHandler = null;
|
|
173
|
+
this.getPassiveTasks()?.resetInFlightState();
|
|
174
|
+
const currentComms = this.comms;
|
|
175
|
+
const pendingComms = this.pendingComms;
|
|
176
|
+
this.pendingComms = null;
|
|
177
|
+
this.clearCommsBinding(currentComms ?? undefined);
|
|
178
|
+
await this.authClient.clearTransientState();
|
|
179
|
+
if (pendingComms) {
|
|
180
|
+
await this.stopCommsQuietly(pendingComms, 'failed to stop pending comms during disconnect');
|
|
181
|
+
}
|
|
182
|
+
if (currentComms) {
|
|
183
|
+
await this.stopCommsQuietly(currentComms, 'failed to stop comms during disconnect');
|
|
184
|
+
}
|
|
185
|
+
if (this.isLifecycleCurrent(lifecycleGeneration)) {
|
|
186
|
+
this.logger.info('wa client disconnected');
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
async startCommsWithCredentials(credentials, frameHandler, lifecycleGeneration) {
|
|
190
|
+
this.assertLifecycleCurrent(lifecycleGeneration, 'start comms');
|
|
191
|
+
this.logger.debug('starting comms with credentials', {
|
|
192
|
+
registered: credentials.meJid !== null && credentials.meJid !== undefined
|
|
193
|
+
});
|
|
194
|
+
const commsConfig = this.authClient.buildCommsConfig(this.options);
|
|
195
|
+
const comms = new WaComms(commsConfig, this.logger);
|
|
196
|
+
this.pendingComms = comms;
|
|
197
|
+
this.mediaConnCache = null;
|
|
198
|
+
comms.startComms(async (frame) => frameHandler(frame));
|
|
199
|
+
try {
|
|
200
|
+
await comms.waitForConnection(commsConfig.connectTimeoutMs);
|
|
201
|
+
this.assertLifecycleCurrent(lifecycleGeneration, 'start comms');
|
|
202
|
+
if (this.pendingComms !== comms) {
|
|
203
|
+
throw this.createLifecycleSupersededError('start comms');
|
|
204
|
+
}
|
|
205
|
+
this.comms = comms;
|
|
206
|
+
this.pendingComms = null;
|
|
207
|
+
this.nodeTransport.bindComms(comms);
|
|
208
|
+
this.logger.info('comms connected');
|
|
209
|
+
comms.startHandlingRequests();
|
|
210
|
+
if (credentials.meJid) {
|
|
211
|
+
this.keepAlive.start();
|
|
212
|
+
}
|
|
213
|
+
else {
|
|
214
|
+
this.keepAlive.stop();
|
|
215
|
+
}
|
|
216
|
+
const serverStaticKey = comms.getServerStaticKey();
|
|
217
|
+
if (!serverStaticKey) {
|
|
218
|
+
this.logger.trace('no server static key available to persist');
|
|
219
|
+
}
|
|
220
|
+
else {
|
|
221
|
+
await this.authClient.persistServerStaticKey(serverStaticKey);
|
|
222
|
+
this.assertLifecycleCurrent(lifecycleGeneration, 'start comms');
|
|
223
|
+
this.logger.debug('persisted server static key after comms connect');
|
|
224
|
+
}
|
|
225
|
+
this.getPassiveTasks()?.startPassiveTasksAfterConnect();
|
|
226
|
+
}
|
|
227
|
+
catch (error) {
|
|
228
|
+
if (this.pendingComms === comms) {
|
|
229
|
+
this.pendingComms = null;
|
|
230
|
+
}
|
|
231
|
+
this.clearCommsBinding(comms);
|
|
232
|
+
await this.stopCommsQuietly(comms, 'failed to cleanup comms after connection start failure');
|
|
233
|
+
if (this.isLifecycleCurrent(lifecycleGeneration)) {
|
|
234
|
+
throw error;
|
|
235
|
+
}
|
|
236
|
+
throw this.createLifecycleSupersededError('start comms');
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
clearCommsBinding(expectedComms) {
|
|
240
|
+
if (expectedComms && this.comms && this.comms !== expectedComms) {
|
|
241
|
+
return;
|
|
242
|
+
}
|
|
243
|
+
this.comms = null;
|
|
244
|
+
this.nodeTransport.bindComms(null);
|
|
245
|
+
}
|
|
246
|
+
async stopCommsQuietly(comms, warningMessage) {
|
|
247
|
+
try {
|
|
248
|
+
await comms.stopComms();
|
|
249
|
+
}
|
|
250
|
+
catch (error) {
|
|
251
|
+
this.logger.warn(warningMessage, {
|
|
252
|
+
message: toError(error).message
|
|
253
|
+
});
|
|
254
|
+
}
|
|
255
|
+
}
|
|
256
|
+
nextLifecycleGeneration() {
|
|
257
|
+
this.lifecycleGeneration += 1;
|
|
258
|
+
return this.lifecycleGeneration;
|
|
259
|
+
}
|
|
260
|
+
runLifecycleOperation(operation) {
|
|
261
|
+
const run = this.lifecycleQueue.then(operation, operation);
|
|
262
|
+
this.lifecycleQueue = run.then(() => undefined, () => undefined);
|
|
263
|
+
return run;
|
|
264
|
+
}
|
|
265
|
+
invalidatePendingComms(warningMessage) {
|
|
266
|
+
const pendingComms = this.pendingComms;
|
|
267
|
+
if (!pendingComms) {
|
|
268
|
+
return;
|
|
269
|
+
}
|
|
270
|
+
this.pendingComms = null;
|
|
271
|
+
void this.stopCommsQuietly(pendingComms, warningMessage);
|
|
272
|
+
}
|
|
273
|
+
isLifecycleCurrent(lifecycleGeneration) {
|
|
274
|
+
return this.lifecycleGeneration === lifecycleGeneration;
|
|
275
|
+
}
|
|
276
|
+
assertLifecycleCurrent(lifecycleGeneration, context) {
|
|
277
|
+
if (this.isLifecycleCurrent(lifecycleGeneration)) {
|
|
278
|
+
return;
|
|
279
|
+
}
|
|
280
|
+
throw this.createLifecycleSupersededError(context);
|
|
281
|
+
}
|
|
282
|
+
createLifecycleSupersededError(context) {
|
|
283
|
+
return new Error(`${context} superseded by newer lifecycle`);
|
|
284
|
+
}
|
|
285
|
+
isLifecycleSupersededError(error) {
|
|
286
|
+
return toError(error).message.includes('superseded by newer lifecycle');
|
|
287
|
+
}
|
|
288
|
+
}
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
export class WaKeyShareCoordinator {
|
|
2
|
+
constructor() {
|
|
3
|
+
this.waiters = new Set();
|
|
4
|
+
this.version = 0;
|
|
5
|
+
this.bootstrapDone = false;
|
|
6
|
+
}
|
|
7
|
+
waitForShare(timeoutMs) {
|
|
8
|
+
return new Promise((resolve) => {
|
|
9
|
+
let settled = false;
|
|
10
|
+
let timeoutHandle = null;
|
|
11
|
+
const waiter = (received) => {
|
|
12
|
+
if (settled) {
|
|
13
|
+
return;
|
|
14
|
+
}
|
|
15
|
+
settled = true;
|
|
16
|
+
if (timeoutHandle) {
|
|
17
|
+
clearTimeout(timeoutHandle);
|
|
18
|
+
timeoutHandle = null;
|
|
19
|
+
}
|
|
20
|
+
this.waiters.delete(waiter);
|
|
21
|
+
resolve(received);
|
|
22
|
+
};
|
|
23
|
+
this.waiters.add(waiter);
|
|
24
|
+
timeoutHandle = setTimeout(() => {
|
|
25
|
+
waiter(false);
|
|
26
|
+
}, timeoutMs);
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
notifyReceived() {
|
|
30
|
+
this.version += 1;
|
|
31
|
+
this.releaseWaiters(true);
|
|
32
|
+
}
|
|
33
|
+
notifyDisconnected() {
|
|
34
|
+
this.bootstrapDone = false;
|
|
35
|
+
this.releaseWaiters(false);
|
|
36
|
+
}
|
|
37
|
+
isBootstrapDone() {
|
|
38
|
+
return this.bootstrapDone;
|
|
39
|
+
}
|
|
40
|
+
markBootstrapDone() {
|
|
41
|
+
this.bootstrapDone = true;
|
|
42
|
+
}
|
|
43
|
+
getVersion() {
|
|
44
|
+
return this.version;
|
|
45
|
+
}
|
|
46
|
+
hasWaiters() {
|
|
47
|
+
return this.waiters.size > 0;
|
|
48
|
+
}
|
|
49
|
+
releaseWaiters(received) {
|
|
50
|
+
if (this.waiters.size === 0) {
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
const waiters = [...this.waiters.values()];
|
|
54
|
+
this.waiters.clear();
|
|
55
|
+
for (const waiter of waiters) {
|
|
56
|
+
waiter(received);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import { WA_DEFAULTS, WA_MESSAGE_TAGS } from '../../protocol/constants.js';
|
|
2
|
+
export class WaReceiptQueue {
|
|
3
|
+
constructor(options = {}) {
|
|
4
|
+
this.maxSize = options.maxSize ?? WA_DEFAULTS.MAX_DANGLING_RECEIPTS;
|
|
5
|
+
this.danglingReceipts = [];
|
|
6
|
+
this.danglingHead = 0;
|
|
7
|
+
}
|
|
8
|
+
shouldQueue(node, error) {
|
|
9
|
+
if (node.tag !== WA_MESSAGE_TAGS.RECEIPT) {
|
|
10
|
+
return false;
|
|
11
|
+
}
|
|
12
|
+
const normalized = error.message.trim().toLowerCase();
|
|
13
|
+
return (normalized === 'comms is not connected' ||
|
|
14
|
+
normalized === 'websocket is not connected' ||
|
|
15
|
+
normalized === 'noise session socket closed' ||
|
|
16
|
+
normalized.startsWith('socket closed ('));
|
|
17
|
+
}
|
|
18
|
+
enqueue(node) {
|
|
19
|
+
if (this.maxSize <= 0) {
|
|
20
|
+
return;
|
|
21
|
+
}
|
|
22
|
+
if (this.size() >= this.maxSize) {
|
|
23
|
+
this.danglingHead += 1;
|
|
24
|
+
}
|
|
25
|
+
if (this.danglingHead > 64 && this.danglingHead * 2 >= this.danglingReceipts.length) {
|
|
26
|
+
const live = this.danglingReceipts.length - this.danglingHead;
|
|
27
|
+
this.danglingReceipts.copyWithin(0, this.danglingHead);
|
|
28
|
+
this.danglingReceipts.length = live;
|
|
29
|
+
this.danglingHead = 0;
|
|
30
|
+
}
|
|
31
|
+
this.danglingReceipts.push(node);
|
|
32
|
+
}
|
|
33
|
+
take() {
|
|
34
|
+
if (this.danglingHead >= this.danglingReceipts.length) {
|
|
35
|
+
this.danglingReceipts.length = 0;
|
|
36
|
+
this.danglingHead = 0;
|
|
37
|
+
return [];
|
|
38
|
+
}
|
|
39
|
+
const out = this.danglingReceipts.slice(this.danglingHead);
|
|
40
|
+
this.danglingReceipts.length = 0;
|
|
41
|
+
this.danglingHead = 0;
|
|
42
|
+
return out;
|
|
43
|
+
}
|
|
44
|
+
size() {
|
|
45
|
+
return this.danglingReceipts.length - this.danglingHead;
|
|
46
|
+
}
|
|
47
|
+
}
|