@matter/protocol 0.16.0-alpha.0-20250816-d22ad240d → 0.16.0-alpha.0-20250819-0a388db8b
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/dist/cjs/action/Val.d.ts +6 -0
- package/dist/cjs/action/Val.d.ts.map +1 -1
- package/dist/cjs/action/Val.js.map +1 -1
- package/dist/cjs/action/client/ClientInteraction.d.ts +1 -1
- package/dist/cjs/action/client/ClientInteraction.d.ts.map +1 -1
- package/dist/cjs/action/client/ClientInteraction.js +4 -4
- package/dist/cjs/action/client/ClientInteraction.js.map +1 -1
- package/dist/cjs/action/client/ClientSubscription.d.ts +2 -1
- package/dist/cjs/action/client/ClientSubscription.d.ts.map +1 -1
- package/dist/cjs/action/client/ClientSubscriptionHandler.js +2 -2
- package/dist/cjs/action/client/ClientSubscriptionHandler.js.map +1 -1
- package/dist/cjs/action/client/ClientSubscriptions.d.ts.map +1 -1
- package/dist/cjs/action/client/ClientSubscriptions.js +11 -7
- package/dist/cjs/action/client/ClientSubscriptions.js.map +1 -1
- package/dist/cjs/action/request/Subscribe.d.ts +6 -6
- package/dist/cjs/action/request/Subscribe.d.ts.map +1 -1
- package/dist/cjs/action/request/Subscribe.js +11 -9
- package/dist/cjs/action/request/Subscribe.js.map +1 -1
- package/dist/cjs/advertisement/Advertisement.d.ts +3 -3
- package/dist/cjs/advertisement/Advertisement.d.ts.map +1 -1
- package/dist/cjs/advertisement/Advertisement.js +5 -5
- package/dist/cjs/advertisement/Advertisement.js.map +1 -1
- package/dist/cjs/advertisement/ble/BleAdvertisement.d.ts.map +1 -1
- package/dist/cjs/advertisement/ble/BleAdvertisement.js +7 -6
- package/dist/cjs/advertisement/ble/BleAdvertisement.js.map +1 -1
- package/dist/cjs/advertisement/ble/BleAdvertiser.d.ts +11 -10
- package/dist/cjs/advertisement/ble/BleAdvertiser.d.ts.map +1 -1
- package/dist/cjs/advertisement/ble/BleAdvertiser.js +4 -4
- package/dist/cjs/advertisement/ble/BleAdvertiser.js.map +1 -1
- package/dist/cjs/advertisement/mdns/MdnsAdvertisement.d.ts.map +1 -1
- package/dist/cjs/advertisement/mdns/MdnsAdvertisement.js +7 -7
- package/dist/cjs/advertisement/mdns/MdnsAdvertisement.js.map +1 -1
- package/dist/cjs/advertisement/mdns/MdnsAdvertiser.d.ts +2 -2
- package/dist/cjs/advertisement/mdns/MdnsAdvertiser.d.ts.map +1 -1
- package/dist/cjs/advertisement/mdns/MdnsAdvertiser.js +4 -4
- package/dist/cjs/advertisement/mdns/MdnsAdvertiser.js.map +1 -1
- package/dist/cjs/ble/Ble.d.ts +2 -2
- package/dist/cjs/ble/Ble.d.ts.map +1 -1
- package/dist/cjs/ble/Ble.js.map +1 -1
- package/dist/cjs/ble/BleConsts.d.ts +4 -4
- package/dist/cjs/ble/BleConsts.d.ts.map +1 -1
- package/dist/cjs/ble/BleConsts.js +7 -7
- package/dist/cjs/ble/BleConsts.js.map +1 -1
- package/dist/cjs/ble/BtpSessionHandler.js +2 -2
- package/dist/cjs/ble/BtpSessionHandler.js.map +1 -1
- package/dist/cjs/certificate/AttestationCertificateManager.js +3 -3
- package/dist/cjs/certificate/AttestationCertificateManager.js.map +1 -1
- package/dist/cjs/certificate/CertificateAuthority.js +2 -2
- package/dist/cjs/certificate/CertificateAuthority.js.map +1 -1
- package/dist/cjs/certificate/kinds/OperationalBase.js +2 -2
- package/dist/cjs/certificate/kinds/OperationalBase.js.map +1 -1
- package/dist/cjs/cluster/client/ClusterClient.js +5 -5
- package/dist/cjs/cluster/client/ClusterClient.js.map +1 -1
- package/dist/cjs/cluster/client/ClusterClientTypes.d.ts +3 -3
- package/dist/cjs/cluster/client/ClusterClientTypes.d.ts.map +1 -1
- package/dist/cjs/cluster/client/EventClient.d.ts +2 -1
- package/dist/cjs/cluster/client/EventClient.d.ts.map +1 -1
- package/dist/cjs/cluster/client/EventClient.js +3 -3
- package/dist/cjs/cluster/client/EventClient.js.map +1 -1
- package/dist/cjs/common/FailsafeContext.d.ts +4 -4
- package/dist/cjs/common/FailsafeContext.d.ts.map +1 -1
- package/dist/cjs/common/FailsafeContext.js +8 -8
- package/dist/cjs/common/FailsafeContext.js.map +1 -1
- package/dist/cjs/common/FailsafeTimer.d.ts +3 -3
- package/dist/cjs/common/FailsafeTimer.d.ts.map +1 -1
- package/dist/cjs/common/FailsafeTimer.js +8 -8
- package/dist/cjs/common/FailsafeTimer.js.map +1 -1
- package/dist/cjs/common/Scanner.d.ts +7 -7
- package/dist/cjs/common/Scanner.d.ts.map +1 -1
- package/dist/cjs/common/Scanner.js.map +1 -1
- package/dist/cjs/events/OccurrenceManager.js +1 -1
- package/dist/cjs/events/OccurrenceManager.js.map +1 -1
- package/dist/cjs/groups/FabricGroups.d.ts +1 -1
- package/dist/cjs/groups/FabricGroups.js +1 -1
- package/dist/cjs/groups/Groups.d.ts +1 -1
- package/dist/cjs/groups/KeySets.d.ts +3 -3
- package/dist/cjs/groups/KeySets.d.ts.map +1 -1
- package/dist/cjs/groups/KeySets.js +12 -4
- package/dist/cjs/groups/KeySets.js.map +1 -1
- package/dist/cjs/interaction/InteractionClient.d.ts +9 -9
- package/dist/cjs/interaction/InteractionClient.d.ts.map +1 -1
- package/dist/cjs/interaction/InteractionClient.js +33 -33
- package/dist/cjs/interaction/InteractionClient.js.map +1 -1
- package/dist/cjs/interaction/InteractionMessenger.d.ts +10 -10
- package/dist/cjs/interaction/InteractionMessenger.d.ts.map +1 -1
- package/dist/cjs/interaction/InteractionMessenger.js +15 -15
- package/dist/cjs/interaction/InteractionMessenger.js.map +1 -1
- package/dist/cjs/interaction/Subscription.d.ts +3 -4
- package/dist/cjs/interaction/Subscription.d.ts.map +1 -1
- package/dist/cjs/interaction/Subscription.js +9 -12
- package/dist/cjs/interaction/Subscription.js.map +1 -1
- package/dist/cjs/interaction/SubscriptionClient.d.ts +3 -3
- package/dist/cjs/interaction/SubscriptionClient.d.ts.map +1 -1
- package/dist/cjs/interaction/SubscriptionClient.js +3 -3
- package/dist/cjs/interaction/SubscriptionClient.js.map +1 -1
- package/dist/cjs/mdns/MdnsClient.d.ts +9 -9
- package/dist/cjs/mdns/MdnsClient.d.ts.map +1 -1
- package/dist/cjs/mdns/MdnsClient.js +86 -82
- package/dist/cjs/mdns/MdnsClient.js.map +1 -1
- package/dist/cjs/mdns/MdnsServer.d.ts.map +1 -1
- package/dist/cjs/mdns/MdnsServer.js +11 -9
- package/dist/cjs/mdns/MdnsServer.js.map +1 -1
- package/dist/cjs/peer/ControllerCommissioner.d.ts +2 -2
- package/dist/cjs/peer/ControllerCommissioner.d.ts.map +1 -1
- package/dist/cjs/peer/ControllerCommissioner.js +7 -7
- package/dist/cjs/peer/ControllerCommissioner.js.map +1 -1
- package/dist/cjs/peer/ControllerCommissioningFlow.d.ts.map +1 -1
- package/dist/cjs/peer/ControllerCommissioningFlow.js +37 -35
- package/dist/cjs/peer/ControllerCommissioningFlow.js.map +1 -1
- package/dist/cjs/peer/ControllerDiscovery.d.ts +4 -4
- package/dist/cjs/peer/ControllerDiscovery.d.ts.map +1 -1
- package/dist/cjs/peer/ControllerDiscovery.js +12 -17
- package/dist/cjs/peer/ControllerDiscovery.js.map +1 -1
- package/dist/cjs/peer/InteractionQueue.d.ts.map +1 -1
- package/dist/cjs/peer/InteractionQueue.js +2 -2
- package/dist/cjs/peer/InteractionQueue.js.map +1 -1
- package/dist/cjs/peer/PeerSet.d.ts +2 -2
- package/dist/cjs/peer/PeerSet.d.ts.map +1 -1
- package/dist/cjs/peer/PeerSet.js +25 -25
- package/dist/cjs/peer/PeerSet.js.map +1 -1
- package/dist/cjs/protocol/DeviceCommissioner.d.ts.map +1 -1
- package/dist/cjs/protocol/DeviceCommissioner.js +1 -1
- package/dist/cjs/protocol/DeviceCommissioner.js.map +1 -1
- package/dist/cjs/protocol/ExchangeManager.d.ts +1 -1
- package/dist/cjs/protocol/ExchangeManager.d.ts.map +1 -1
- package/dist/cjs/protocol/ExchangeManager.js +2 -5
- package/dist/cjs/protocol/ExchangeManager.js.map +1 -1
- package/dist/cjs/protocol/ExchangeProvider.d.ts +4 -4
- package/dist/cjs/protocol/ExchangeProvider.d.ts.map +1 -1
- package/dist/cjs/protocol/ExchangeProvider.js +3 -3
- package/dist/cjs/protocol/ExchangeProvider.js.map +1 -1
- package/dist/cjs/protocol/MessageChannel.d.ts +5 -5
- package/dist/cjs/protocol/MessageChannel.d.ts.map +1 -1
- package/dist/cjs/protocol/MessageChannel.js +19 -15
- package/dist/cjs/protocol/MessageChannel.js.map +1 -1
- package/dist/cjs/protocol/MessageExchange.d.ts +6 -6
- package/dist/cjs/protocol/MessageExchange.d.ts.map +1 -1
- package/dist/cjs/protocol/MessageExchange.js +35 -33
- package/dist/cjs/protocol/MessageExchange.js.map +1 -1
- package/dist/cjs/securechannel/SecureChannelMessenger.d.ts +8 -8
- package/dist/cjs/securechannel/SecureChannelMessenger.d.ts.map +1 -1
- package/dist/cjs/securechannel/SecureChannelMessenger.js +17 -17
- package/dist/cjs/securechannel/SecureChannelMessenger.js.map +1 -1
- package/dist/cjs/session/InsecureSession.d.ts +2 -2
- package/dist/cjs/session/InsecureSession.d.ts.map +1 -1
- package/dist/cjs/session/InsecureSession.js.map +1 -1
- package/dist/cjs/session/NodeSession.js +3 -3
- package/dist/cjs/session/Session.d.ts +7 -7
- package/dist/cjs/session/Session.d.ts.map +1 -1
- package/dist/cjs/session/Session.js +19 -19
- package/dist/cjs/session/Session.js.map +1 -1
- package/dist/cjs/session/SessionIntervals.d.ts +7 -6
- package/dist/cjs/session/SessionIntervals.d.ts.map +1 -1
- package/dist/cjs/session/SessionIntervals.js +8 -8
- package/dist/cjs/session/SessionIntervals.js.map +1 -1
- package/dist/cjs/session/SessionManager.d.ts +2 -2
- package/dist/cjs/session/SessionManager.d.ts.map +1 -1
- package/dist/cjs/session/SessionManager.js +6 -6
- package/dist/cjs/session/SessionManager.js.map +1 -1
- package/dist/cjs/session/case/CaseClient.d.ts +2 -1
- package/dist/cjs/session/case/CaseClient.d.ts.map +1 -1
- package/dist/cjs/session/case/CaseClient.js +2 -2
- package/dist/cjs/session/case/CaseClient.js.map +1 -1
- package/dist/cjs/session/pase/PaseMessenger.d.ts.map +1 -1
- package/dist/cjs/session/pase/PaseMessenger.js +4 -7
- package/dist/cjs/session/pase/PaseMessenger.js.map +1 -1
- package/dist/cjs/session/pase/PaseServer.d.ts.map +1 -1
- package/dist/cjs/session/pase/PaseServer.js +1 -1
- package/dist/cjs/session/pase/PaseServer.js.map +1 -1
- package/dist/esm/action/Val.d.ts +6 -0
- package/dist/esm/action/Val.d.ts.map +1 -1
- package/dist/esm/action/Val.js.map +1 -1
- package/dist/esm/action/client/ClientInteraction.d.ts +1 -1
- package/dist/esm/action/client/ClientInteraction.d.ts.map +1 -1
- package/dist/esm/action/client/ClientInteraction.js +5 -5
- package/dist/esm/action/client/ClientInteraction.js.map +1 -1
- package/dist/esm/action/client/ClientSubscription.d.ts +2 -1
- package/dist/esm/action/client/ClientSubscription.d.ts.map +1 -1
- package/dist/esm/action/client/ClientSubscriptionHandler.js +2 -2
- package/dist/esm/action/client/ClientSubscriptionHandler.js.map +1 -1
- package/dist/esm/action/client/ClientSubscriptions.d.ts.map +1 -1
- package/dist/esm/action/client/ClientSubscriptions.js +14 -8
- package/dist/esm/action/client/ClientSubscriptions.js.map +1 -1
- package/dist/esm/action/request/Subscribe.d.ts +6 -6
- package/dist/esm/action/request/Subscribe.d.ts.map +1 -1
- package/dist/esm/action/request/Subscribe.js +12 -10
- package/dist/esm/action/request/Subscribe.js.map +1 -1
- package/dist/esm/advertisement/Advertisement.d.ts +3 -3
- package/dist/esm/advertisement/Advertisement.d.ts.map +1 -1
- package/dist/esm/advertisement/Advertisement.js +16 -7
- package/dist/esm/advertisement/Advertisement.js.map +1 -1
- package/dist/esm/advertisement/ble/BleAdvertisement.d.ts.map +1 -1
- package/dist/esm/advertisement/ble/BleAdvertisement.js +7 -6
- package/dist/esm/advertisement/ble/BleAdvertisement.js.map +1 -1
- package/dist/esm/advertisement/ble/BleAdvertiser.d.ts +11 -10
- package/dist/esm/advertisement/ble/BleAdvertiser.d.ts.map +1 -1
- package/dist/esm/advertisement/ble/BleAdvertiser.js +6 -6
- package/dist/esm/advertisement/ble/BleAdvertiser.js.map +1 -1
- package/dist/esm/advertisement/mdns/MdnsAdvertisement.d.ts.map +1 -1
- package/dist/esm/advertisement/mdns/MdnsAdvertisement.js +17 -8
- package/dist/esm/advertisement/mdns/MdnsAdvertisement.js.map +1 -1
- package/dist/esm/advertisement/mdns/MdnsAdvertiser.d.ts +2 -2
- package/dist/esm/advertisement/mdns/MdnsAdvertiser.d.ts.map +1 -1
- package/dist/esm/advertisement/mdns/MdnsAdvertiser.js +14 -6
- package/dist/esm/advertisement/mdns/MdnsAdvertiser.js.map +1 -1
- package/dist/esm/ble/Ble.d.ts +2 -2
- package/dist/esm/ble/Ble.d.ts.map +1 -1
- package/dist/esm/ble/Ble.js +5 -1
- package/dist/esm/ble/Ble.js.map +1 -1
- package/dist/esm/ble/BleConsts.d.ts +4 -4
- package/dist/esm/ble/BleConsts.d.ts.map +1 -1
- package/dist/esm/ble/BleConsts.js +8 -8
- package/dist/esm/ble/BleConsts.js.map +1 -1
- package/dist/esm/ble/BtpSessionHandler.js +4 -4
- package/dist/esm/ble/BtpSessionHandler.js.map +1 -1
- package/dist/esm/certificate/AttestationCertificateManager.js +3 -3
- package/dist/esm/certificate/AttestationCertificateManager.js.map +1 -1
- package/dist/esm/certificate/CertificateAuthority.js +2 -2
- package/dist/esm/certificate/CertificateAuthority.js.map +1 -1
- package/dist/esm/certificate/kinds/OperationalBase.js +2 -2
- package/dist/esm/certificate/kinds/OperationalBase.js.map +1 -1
- package/dist/esm/cluster/client/ClusterClient.js +5 -5
- package/dist/esm/cluster/client/ClusterClient.js.map +1 -1
- package/dist/esm/cluster/client/ClusterClientTypes.d.ts +3 -3
- package/dist/esm/cluster/client/ClusterClientTypes.d.ts.map +1 -1
- package/dist/esm/cluster/client/EventClient.d.ts +2 -1
- package/dist/esm/cluster/client/EventClient.d.ts.map +1 -1
- package/dist/esm/cluster/client/EventClient.js +3 -3
- package/dist/esm/cluster/client/EventClient.js.map +1 -1
- package/dist/esm/common/FailsafeContext.d.ts +4 -4
- package/dist/esm/common/FailsafeContext.d.ts.map +1 -1
- package/dist/esm/common/FailsafeContext.js +9 -8
- package/dist/esm/common/FailsafeContext.js.map +1 -1
- package/dist/esm/common/FailsafeTimer.d.ts +3 -3
- package/dist/esm/common/FailsafeTimer.d.ts.map +1 -1
- package/dist/esm/common/FailsafeTimer.js +8 -8
- package/dist/esm/common/FailsafeTimer.js.map +1 -1
- package/dist/esm/common/Scanner.d.ts +7 -7
- package/dist/esm/common/Scanner.d.ts.map +1 -1
- package/dist/esm/common/Scanner.js +5 -1
- package/dist/esm/common/Scanner.js.map +1 -1
- package/dist/esm/events/OccurrenceManager.js +1 -1
- package/dist/esm/events/OccurrenceManager.js.map +1 -1
- package/dist/esm/groups/FabricGroups.d.ts +1 -1
- package/dist/esm/groups/FabricGroups.js +1 -1
- package/dist/esm/groups/Groups.d.ts +1 -1
- package/dist/esm/groups/KeySets.d.ts +3 -3
- package/dist/esm/groups/KeySets.d.ts.map +1 -1
- package/dist/esm/groups/KeySets.js +13 -5
- package/dist/esm/groups/KeySets.js.map +1 -1
- package/dist/esm/interaction/InteractionClient.d.ts +9 -9
- package/dist/esm/interaction/InteractionClient.d.ts.map +1 -1
- package/dist/esm/interaction/InteractionClient.js +34 -33
- package/dist/esm/interaction/InteractionClient.js.map +1 -1
- package/dist/esm/interaction/InteractionMessenger.d.ts +10 -10
- package/dist/esm/interaction/InteractionMessenger.d.ts.map +1 -1
- package/dist/esm/interaction/InteractionMessenger.js +16 -15
- package/dist/esm/interaction/InteractionMessenger.js.map +1 -1
- package/dist/esm/interaction/Subscription.d.ts +3 -4
- package/dist/esm/interaction/Subscription.d.ts.map +1 -1
- package/dist/esm/interaction/Subscription.js +9 -12
- package/dist/esm/interaction/Subscription.js.map +1 -1
- package/dist/esm/interaction/SubscriptionClient.d.ts +3 -3
- package/dist/esm/interaction/SubscriptionClient.d.ts.map +1 -1
- package/dist/esm/interaction/SubscriptionClient.js +4 -4
- package/dist/esm/interaction/SubscriptionClient.js.map +1 -1
- package/dist/esm/mdns/MdnsClient.d.ts +9 -9
- package/dist/esm/mdns/MdnsClient.d.ts.map +1 -1
- package/dist/esm/mdns/MdnsClient.js +94 -82
- package/dist/esm/mdns/MdnsClient.js.map +1 -1
- package/dist/esm/mdns/MdnsServer.d.ts.map +1 -1
- package/dist/esm/mdns/MdnsServer.js +14 -9
- package/dist/esm/mdns/MdnsServer.js.map +1 -1
- package/dist/esm/peer/ControllerCommissioner.d.ts +2 -2
- package/dist/esm/peer/ControllerCommissioner.d.ts.map +1 -1
- package/dist/esm/peer/ControllerCommissioner.js +11 -8
- package/dist/esm/peer/ControllerCommissioner.js.map +1 -1
- package/dist/esm/peer/ControllerCommissioningFlow.d.ts.map +1 -1
- package/dist/esm/peer/ControllerCommissioningFlow.js +44 -35
- package/dist/esm/peer/ControllerCommissioningFlow.js.map +1 -1
- package/dist/esm/peer/ControllerDiscovery.d.ts +4 -4
- package/dist/esm/peer/ControllerDiscovery.d.ts.map +1 -1
- package/dist/esm/peer/ControllerDiscovery.js +20 -18
- package/dist/esm/peer/ControllerDiscovery.js.map +1 -1
- package/dist/esm/peer/InteractionQueue.d.ts.map +1 -1
- package/dist/esm/peer/InteractionQueue.js +3 -3
- package/dist/esm/peer/InteractionQueue.js.map +1 -1
- package/dist/esm/peer/PeerSet.d.ts +2 -2
- package/dist/esm/peer/PeerSet.d.ts.map +1 -1
- package/dist/esm/peer/PeerSet.js +29 -26
- package/dist/esm/peer/PeerSet.js.map +1 -1
- package/dist/esm/protocol/DeviceCommissioner.d.ts.map +1 -1
- package/dist/esm/protocol/DeviceCommissioner.js +2 -2
- package/dist/esm/protocol/DeviceCommissioner.js.map +1 -1
- package/dist/esm/protocol/ExchangeManager.d.ts +1 -1
- package/dist/esm/protocol/ExchangeManager.d.ts.map +1 -1
- package/dist/esm/protocol/ExchangeManager.js +3 -6
- package/dist/esm/protocol/ExchangeManager.js.map +1 -1
- package/dist/esm/protocol/ExchangeProvider.d.ts +4 -4
- package/dist/esm/protocol/ExchangeProvider.d.ts.map +1 -1
- package/dist/esm/protocol/ExchangeProvider.js +4 -4
- package/dist/esm/protocol/ExchangeProvider.js.map +1 -1
- package/dist/esm/protocol/MessageChannel.d.ts +5 -5
- package/dist/esm/protocol/MessageChannel.d.ts.map +1 -1
- package/dist/esm/protocol/MessageChannel.js +20 -16
- package/dist/esm/protocol/MessageChannel.js.map +1 -1
- package/dist/esm/protocol/MessageExchange.d.ts +6 -6
- package/dist/esm/protocol/MessageExchange.d.ts.map +1 -1
- package/dist/esm/protocol/MessageExchange.js +39 -34
- package/dist/esm/protocol/MessageExchange.js.map +1 -1
- package/dist/esm/securechannel/SecureChannelMessenger.d.ts +8 -8
- package/dist/esm/securechannel/SecureChannelMessenger.d.ts.map +1 -1
- package/dist/esm/securechannel/SecureChannelMessenger.js +18 -18
- package/dist/esm/securechannel/SecureChannelMessenger.js.map +1 -1
- package/dist/esm/session/InsecureSession.d.ts +2 -2
- package/dist/esm/session/InsecureSession.d.ts.map +1 -1
- package/dist/esm/session/InsecureSession.js.map +1 -1
- package/dist/esm/session/NodeSession.js +3 -3
- package/dist/esm/session/Session.d.ts +7 -7
- package/dist/esm/session/Session.d.ts.map +1 -1
- package/dist/esm/session/Session.js +27 -20
- package/dist/esm/session/Session.js.map +1 -1
- package/dist/esm/session/SessionIntervals.d.ts +7 -6
- package/dist/esm/session/SessionIntervals.d.ts.map +1 -1
- package/dist/esm/session/SessionIntervals.js +8 -8
- package/dist/esm/session/SessionIntervals.js.map +1 -1
- package/dist/esm/session/SessionManager.d.ts +2 -2
- package/dist/esm/session/SessionManager.d.ts.map +1 -1
- package/dist/esm/session/SessionManager.js +6 -6
- package/dist/esm/session/SessionManager.js.map +1 -1
- package/dist/esm/session/case/CaseClient.d.ts +2 -1
- package/dist/esm/session/case/CaseClient.d.ts.map +1 -1
- package/dist/esm/session/case/CaseClient.js +2 -2
- package/dist/esm/session/case/CaseClient.js.map +1 -1
- package/dist/esm/session/pase/PaseMessenger.d.ts.map +1 -1
- package/dist/esm/session/pase/PaseMessenger.js +5 -11
- package/dist/esm/session/pase/PaseMessenger.js.map +1 -1
- package/dist/esm/session/pase/PaseServer.d.ts.map +1 -1
- package/dist/esm/session/pase/PaseServer.js +2 -1
- package/dist/esm/session/pase/PaseServer.js.map +1 -1
- package/package.json +6 -6
- package/src/action/Val.ts +5 -0
- package/src/action/client/ClientInteraction.ts +4 -4
- package/src/action/client/ClientSubscription.ts +2 -1
- package/src/action/client/ClientSubscriptionHandler.ts +2 -2
- package/src/action/client/ClientSubscriptions.ts +14 -8
- package/src/action/request/Subscribe.ts +17 -15
- package/src/advertisement/Advertisement.ts +18 -8
- package/src/advertisement/ble/BleAdvertisement.ts +7 -6
- package/src/advertisement/ble/BleAdvertiser.ts +11 -11
- package/src/advertisement/mdns/MdnsAdvertisement.ts +20 -9
- package/src/advertisement/mdns/MdnsAdvertiser.ts +17 -7
- package/src/ble/Ble.ts +11 -2
- package/src/ble/BleConsts.ts +5 -5
- package/src/ble/BtpSessionHandler.ts +4 -4
- package/src/certificate/AttestationCertificateManager.ts +3 -3
- package/src/certificate/CertificateAuthority.ts +2 -2
- package/src/certificate/kinds/OperationalBase.ts +3 -3
- package/src/cluster/client/ClusterClient.ts +8 -8
- package/src/cluster/client/ClusterClientTypes.ts +3 -3
- package/src/cluster/client/EventClient.ts +5 -5
- package/src/common/FailsafeContext.ts +11 -13
- package/src/common/FailsafeTimer.ts +11 -13
- package/src/common/Scanner.ts +16 -7
- package/src/events/OccurrenceManager.ts +1 -1
- package/src/groups/FabricGroups.ts +1 -1
- package/src/groups/KeySets.ts +14 -6
- package/src/interaction/InteractionClient.ts +46 -44
- package/src/interaction/InteractionMessenger.ts +24 -22
- package/src/interaction/Subscription.ts +10 -14
- package/src/interaction/SubscriptionClient.ts +6 -6
- package/src/mdns/MdnsClient.ts +105 -82
- package/src/mdns/MdnsServer.ts +14 -9
- package/src/peer/ControllerCommissioner.ts +12 -9
- package/src/peer/ControllerCommissioningFlow.ts +48 -39
- package/src/peer/ControllerDiscovery.ts +22 -18
- package/src/peer/InteractionQueue.ts +3 -3
- package/src/peer/PeerSet.ts +34 -28
- package/src/protocol/DeviceCommissioner.ts +2 -2
- package/src/protocol/ExchangeManager.ts +3 -6
- package/src/protocol/ExchangeProvider.ts +6 -6
- package/src/protocol/MessageChannel.ts +26 -21
- package/src/protocol/MessageExchange.ts +42 -38
- package/src/securechannel/SecureChannelMessenger.ts +16 -22
- package/src/session/InsecureSession.ts +2 -2
- package/src/session/NodeSession.ts +3 -3
- package/src/session/Session.ts +31 -21
- package/src/session/SessionIntervals.ts +11 -11
- package/src/session/SessionManager.ts +10 -9
- package/src/session/case/CaseClient.ts +3 -3
- package/src/session/pase/PaseMessenger.ts +5 -11
- package/src/session/pase/PaseServer.ts +2 -1
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { BlePeripheralInterface } from "#ble/Ble.js";
|
|
7
|
+
import { Bytes, Duration } from "#general";
|
|
7
8
|
import { DatatypeModel } from "#model";
|
|
8
9
|
import { Advertisement } from "../Advertisement.js";
|
|
9
10
|
import { Advertiser } from "../Advertiser.js";
|
|
@@ -25,38 +26,38 @@ export declare namespace BleAdvertiser {
|
|
|
25
26
|
/**
|
|
26
27
|
* Additional advertisement data.
|
|
27
28
|
*/
|
|
28
|
-
readonly aad?:
|
|
29
|
+
readonly aad?: Bytes;
|
|
29
30
|
/**
|
|
30
31
|
* Advertisement timeout.
|
|
31
32
|
*/
|
|
32
|
-
readonly timeout:
|
|
33
|
+
readonly timeout: Duration;
|
|
33
34
|
/**
|
|
34
35
|
* Transmission interval for first 30 seconds.
|
|
35
36
|
*
|
|
36
37
|
* Per core spec 5.4.2.5.3 should be 20-60ms.
|
|
37
38
|
*/
|
|
38
|
-
readonly earlyInterval:
|
|
39
|
+
readonly earlyInterval: Duration;
|
|
39
40
|
/**
|
|
40
41
|
* Transmission interval after first 30 seconds but before 15 minutes.
|
|
41
42
|
*
|
|
42
43
|
* Per core spec 5.4.2.5.3 should be 150-1285ms.
|
|
43
44
|
*/
|
|
44
|
-
readonly lateInterval:
|
|
45
|
+
readonly lateInterval: Duration;
|
|
45
46
|
/**
|
|
46
47
|
* Transmission interval after 15 minutes.
|
|
47
48
|
*
|
|
48
49
|
* Per core spec 5.4.2.5.3 should be ~1285ms.
|
|
49
50
|
*/
|
|
50
|
-
readonly extendedInterval:
|
|
51
|
+
readonly extendedInterval: Duration;
|
|
51
52
|
}
|
|
52
53
|
interface Options extends Partial<Configuration> {
|
|
53
54
|
}
|
|
54
55
|
function Configuration(options?: Options): {
|
|
55
|
-
aad?:
|
|
56
|
-
timeout:
|
|
57
|
-
earlyInterval:
|
|
58
|
-
lateInterval:
|
|
59
|
-
extendedInterval:
|
|
56
|
+
aad?: Bytes;
|
|
57
|
+
timeout: Duration;
|
|
58
|
+
earlyInterval: Duration;
|
|
59
|
+
lateInterval: Duration;
|
|
60
|
+
extendedInterval: Duration;
|
|
60
61
|
};
|
|
61
62
|
/**
|
|
62
63
|
* Data model for BLE advertiser configuration.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BleAdvertiser.d.ts","sourceRoot":"","sources":["../../../../src/advertisement/ble/BleAdvertiser.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"BleAdvertiser.d.ts","sourceRoot":"","sources":["../../../../src/advertisement/ble/BleAdvertiser.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,QAAQ,EAA+B,MAAM,UAAU,CAAC;AACxE,OAAO,EAAE,aAAa,EAAgB,MAAM,QAAQ,CAAC;AAErD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAG9D,qBAAa,aAAc,SAAQ,UAAU;;gBAK7B,UAAU,EAAE,sBAAsB,EAAE,OAAO,CAAC,EAAE,aAAa,CAAC,OAAO;IAO/E,IAAI,UAAU,2BAEb;IAED,IAAI,MAAM,gCAET;IAED,gBAAgB,CAAC,WAAW,EAAE,kBAAkB,GAAG,aAAa,GAAG,SAAS;CAe/E;AAED,yBAAiB,aAAa,CAAC;IAC3B;;;;OAIG;IACH,UAAiB,aAAa;QAC1B;;WAEG;QACH,QAAQ,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC;QAErB;;WAEG;QACH,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC;QAE3B;;;;WAIG;QACH,QAAQ,CAAC,aAAa,EAAE,QAAQ,CAAC;QAEjC;;;;WAIG;QACH,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC;QAEhC;;;;WAIG;QACH,QAAQ,CAAC,gBAAgB,EAAE,QAAQ,CAAC;KACvC;IAED,UAAiB,OAAQ,SAAQ,OAAO,CAAC,aAAa,CAAC;KAAG;IAE1D,SAAgB,aAAa,CAAC,OAAO,CAAC,EAAE,OAAO;cA/B5B,KAAK;iBAKF,QAAQ;uBAOF,QAAQ;sBAOT,QAAQ;0BAOJ,QAAQ;MAatC;IAED;;OAEG;IACI,MAAM,aAAa,eAOzB,CAAC;CACL"}
|
|
@@ -3,9 +3,9 @@
|
|
|
3
3
|
* Copyright 2022-2025 Matter.js Authors
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { ImplementationError } from "#general";
|
|
6
|
+
import { ImplementationError, Millis } from "#general";
|
|
7
7
|
import { DatatypeModel, FieldElement } from "#model";
|
|
8
|
-
import {
|
|
8
|
+
import { MAXIMUM_COMMISSIONING_TIMEOUT } from "#types";
|
|
9
9
|
import { Advertiser } from "../Advertiser.js";
|
|
10
10
|
import { CommissioningMode } from "../CommissioningMode.js";
|
|
11
11
|
import { BleAdvertisement } from "./BleAdvertisement.js";
|
|
@@ -40,10 +40,10 @@ class BleAdvertiser extends Advertiser {
|
|
|
40
40
|
((BleAdvertiser2) => {
|
|
41
41
|
function Configuration(options) {
|
|
42
42
|
return {
|
|
43
|
-
timeout:
|
|
44
|
-
earlyInterval: 20,
|
|
45
|
-
lateInterval: 150,
|
|
46
|
-
extendedInterval: 1285,
|
|
43
|
+
timeout: MAXIMUM_COMMISSIONING_TIMEOUT,
|
|
44
|
+
earlyInterval: Millis(20),
|
|
45
|
+
lateInterval: Millis(150),
|
|
46
|
+
extendedInterval: Millis(1285),
|
|
47
47
|
...options
|
|
48
48
|
};
|
|
49
49
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/advertisement/ble/BleAdvertiser.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,SAA0B,qBAAqB,cAAc;AAC7D,SAAS,eAAe,oBAAoB;AAC5C,SAAS,qCAAqC;AAE9C,SAAS,kBAAkB;AAC3B,SAAS,yBAAyB;AAElC,SAAS,wBAAwB;AAE1B,MAAM,sBAAsB,WAAW;AAAA,EAC1C;AAAA,EACA;AAAA,EACA,YAAY;AAAA,EAEZ,YAAY,YAAoC,SAAiC;AAC7E,UAAM;AAEN,SAAK,cAAc;AACnB,SAAK,UAAU,cAAc,cAAc,OAAO;AAAA,EACtD;AAAA,EAEA,IAAI,aAAa;AACb,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,SAAS;AACT,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,iBAAiB,aAA4D;AACzE,SAAK,YAAY;AAEjB,QAAI,YAAY,SAAS,oBAAoB,YAAY,SAAS,kBAAkB,OAAO;AACvF;AAAA,IACJ;AAEA,WAAO,IAAI,iBAAiB,MAAM,WAAW;AAAA,EACjD;AAAA,EAEA,cAAc;AACV,QAAI,KAAK,WAAW;AAChB,YAAM,IAAI,oBAAoB,4CAA4C;AAAA,IAC9E;AAAA,EACJ;AACJ;AAAA,CAEO,CAAUA,mBAAV;AAyCI,WAAS,cAAc,SAAmB;AAC7C,WAAO;AAAA,MACH,SAAS;AAAA,MACT,eAAe,OAAO,EAAE;AAAA,MACxB,cAAc,OAAO,GAAG;AAAA,MACxB,kBAAkB,OAAO,IAAI;AAAA,MAC7B,GAAG;AAAA,IACP;AAAA,EACJ;AARO,EAAAA,eAAS;AAaT,EAAMA,eAAA,gBAAgB,IAAI;AAAA,IAC7B,EAAE,MAAM,wBAAwB,MAAM,SAAS;AAAA,IAC/C,aAAa,EAAE,MAAM,OAAO,MAAM,SAAS,CAAC;AAAA,IAC5C,aAAa,EAAE,MAAM,WAAW,MAAM,SAAS,CAAC;AAAA,IAChD,aAAa,EAAE,MAAM,iBAAiB,MAAM,SAAS,CAAC;AAAA,IACtD,aAAa,EAAE,MAAM,gBAAgB,MAAM,SAAS,CAAC;AAAA,IACrD,aAAa,EAAE,MAAM,oBAAoB,MAAM,SAAS,CAAC;AAAA,EAC7D;AAAA,GA7Da;",
|
|
5
5
|
"names": ["BleAdvertiser"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MdnsAdvertisement.d.ts","sourceRoot":"","sources":["../../../../src/advertisement/mdns/MdnsAdvertisement.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,OAAO,
|
|
1
|
+
{"version":3,"file":"MdnsAdvertisement.d.ts","sourceRoot":"","sources":["../../../../src/advertisement/mdns/MdnsAdvertisement.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,OAAO,EAGH,SAAS,EAQZ,MAAM,UAAU,CAAC;AAGlB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAI1D;;;;GAIG;AACH,8BAAsB,iBAAiB,CAAC,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,CAAE,SAAQ,aAAa,CAAC,CAAC,CAAC;;IACvG,UAAU,EAAE,cAAc,CAAC;IAEnC;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;gBAKF,UAAU,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;IAUrE,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,SAAS,EAAE,CAAC;IAE3C,SAAS,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAEjD;IAEc,GAAG,CAAC,OAAO,EAAE,aAAa,CAAC,eAAe,EAAE,KAAK,GAAE,UAAU,CAAC,cAA0B;IAevG;;OAEG;IACG,SAAS;IASf;;OAEG;IACG,MAAM;IAKH,gBAAgB;IAehB,mBAAmB;cAIH,QAAQ;cASR,OAAO;CAsDnC"}
|
|
@@ -5,7 +5,16 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { Advertisement } from "#advertisement/Advertisement.js";
|
|
7
7
|
import { SupportedTransportsSchema } from "#common/SupportedTransportsBitmap.js";
|
|
8
|
-
import {
|
|
8
|
+
import {
|
|
9
|
+
AAAARecord,
|
|
10
|
+
ARecord,
|
|
11
|
+
Duration,
|
|
12
|
+
Logger,
|
|
13
|
+
SrvRecord,
|
|
14
|
+
Time,
|
|
15
|
+
Timestamp,
|
|
16
|
+
TxtRecord
|
|
17
|
+
} from "#general";
|
|
9
18
|
import { SessionIntervals } from "#session/SessionIntervals.js";
|
|
10
19
|
const logger = Logger.get("MdnsAdvertisement");
|
|
11
20
|
class MdnsAdvertisement extends Advertisement {
|
|
@@ -31,11 +40,11 @@ class MdnsAdvertisement extends Advertisement {
|
|
|
31
40
|
this.#stopAt = void 0;
|
|
32
41
|
let number = 0;
|
|
33
42
|
for (const retryInterval of this.advertiser.broadcastScheduleFor(this, event)) {
|
|
34
|
-
if (this.#stopAt !== void 0 && this.#stopAt <= Time.nowMs
|
|
43
|
+
if (this.#stopAt !== void 0 && this.#stopAt <= Time.nowMs) {
|
|
35
44
|
break;
|
|
36
45
|
}
|
|
37
46
|
number++;
|
|
38
|
-
logger.debug("Broadcast", this.dict({ number, next: retryInterval }));
|
|
47
|
+
logger.debug("Broadcast", this.dict({ number, next: Duration.format(retryInterval) }));
|
|
39
48
|
await this.broadcast();
|
|
40
49
|
await context.sleep("MDNS repeat", retryInterval);
|
|
41
50
|
}
|
|
@@ -54,7 +63,7 @@ class MdnsAdvertisement extends Advertisement {
|
|
|
54
63
|
* Broadcast expiration announcement immediately.
|
|
55
64
|
*/
|
|
56
65
|
async expire() {
|
|
57
|
-
logger.info("Unpublishing", this.dict({ time: this.duration }));
|
|
66
|
+
logger.info("Unpublishing", this.dict({ time: Duration.format(this.duration) }));
|
|
58
67
|
await this.advertiser.server.expireAnnouncements(this.service);
|
|
59
68
|
}
|
|
60
69
|
serviceConnected() {
|
|
@@ -66,7 +75,7 @@ class MdnsAdvertisement extends Advertisement {
|
|
|
66
75
|
this.stop();
|
|
67
76
|
return;
|
|
68
77
|
}
|
|
69
|
-
this.#stopAt = Time.nowMs
|
|
78
|
+
this.#stopAt = Timestamp(Time.nowMs + broadcastAfterConnection);
|
|
70
79
|
}
|
|
71
80
|
serviceDisconnected() {
|
|
72
81
|
this.start("reconnect");
|
|
@@ -105,9 +114,9 @@ class MdnsAdvertisement extends Advertisement {
|
|
|
105
114
|
}
|
|
106
115
|
get #txtValues() {
|
|
107
116
|
const values = {
|
|
108
|
-
SII: this.description.
|
|
109
|
-
SAI: this.description.
|
|
110
|
-
SAT: this.description.
|
|
117
|
+
SII: this.description.idleInterval,
|
|
118
|
+
SAI: this.description.activeInterval,
|
|
119
|
+
SAT: this.description.activeThreshold,
|
|
111
120
|
...this.txtValues
|
|
112
121
|
};
|
|
113
122
|
if (this.description.tcp !== void 0) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/advertisement/mdns/MdnsAdvertisement.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,qBAAqB;AAG9B,SAAS,iCAAiC;AAC1C,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { Advertiser } from "#advertisement/Advertiser.js";
|
|
7
7
|
import { ServiceDescription } from "#advertisement/ServiceDescription.js";
|
|
8
|
-
import { Crypto, RetrySchedule } from "#general";
|
|
8
|
+
import { Crypto, Duration, RetrySchedule } from "#general";
|
|
9
9
|
import type { MdnsServer } from "#mdns/MdnsServer.js";
|
|
10
10
|
import { DatatypeModel } from "#model";
|
|
11
11
|
import type { MdnsAdvertisement } from "./MdnsAdvertisement.js";
|
|
@@ -81,7 +81,7 @@ export declare namespace MdnsAdvertiser {
|
|
|
81
81
|
* Set to zero to terminate broadcast immediately after connection. If undefined broadcasts will continue until
|
|
82
82
|
* terminated by {@link timeout} or {@link maximumCount}.
|
|
83
83
|
*/
|
|
84
|
-
readonly broadcastAfterConnection?:
|
|
84
|
+
readonly broadcastAfterConnection?: Duration;
|
|
85
85
|
}
|
|
86
86
|
/**
|
|
87
87
|
* Default schedule for automatic broadcast.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MdnsAdvertiser.d.ts","sourceRoot":"","sources":["../../../../src/advertisement/mdns/MdnsAdvertiser.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC1E,OAAO,
|
|
1
|
+
{"version":3,"file":"MdnsAdvertiser.d.ts","sourceRoot":"","sources":["../../../../src/advertisement/mdns/MdnsAdvertiser.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAEH,MAAM,EACN,QAAQ,EAIR,aAAa,EAGhB,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAgB,MAAM,QAAQ,CAAC;AAIrD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAGhE;;GAEG;AACH,qBAAa,cAAe,SAAQ,UAAU;;IAOtC,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,MAAM,EAAE,UAAU;IAP/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,kBAAkB,EAAE,OAAO,CAAC;gBAKxB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,UAAU,EAC3B,OAAO,CAAC,EAAE,cAAc,CAAC,OAAO;IAkCpC;;OAEG;IACM,gBAAgB,CAAC,WAAW,EAAE,kBAAkB,GAAG,iBAAiB,GAAG,SAAS;IAqBzF;;OAEG;IACH,gBAAgB;IAIhB;;OAEG;IACH,oBAAoB,CAAC,aAAa,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,UAAU,CAAC,cAAc;IAaxF;;OAEG;IACH,kBAAkB,CAAC,aAAa,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,UAAU,CAAC,cAAc;CAyBzF;AAED,yBAAiB,cAAc,CAAC;IAC5B;;OAEG;IACH,UAAiB,OAAO;QACpB;;;;WAIG;QACH,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAEvB;;WAEG;QACH,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAC;QAEtC;;;;;;;WAOG;QACH,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;KACrD;IAED;;;;OAIG;IACH,UAAiB,iBAAkB,SAAQ,aAAa,CAAC,aAAa;QAClE;;WAEG;QACH,QAAQ,CAAC,WAAW,CAAC,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAElD;;WAEG;QACH,QAAQ,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC,cAAc,CAAC;QAE3C;;;;;WAKG;QACH,QAAQ,CAAC,wBAAwB,CAAC,EAAE,QAAQ,CAAC;KAChD;IAED;;OAEG;IACI,MAAM,wBAAwB,EAAE,iBAmBtC,CAAC;IAEF;;OAEG;IACI,MAAM,+BAA+B,EAAE,iBAK7C,CAAC;IAEF;;OAEG;IACI,MAAM,aAAa,eAgBzB,CAAC;CACL"}
|
|
@@ -4,9 +4,17 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { Advertiser } from "#advertisement/Advertiser.js";
|
|
7
|
-
import {
|
|
7
|
+
import {
|
|
8
|
+
Bytes,
|
|
9
|
+
ImplementationError,
|
|
10
|
+
Instant,
|
|
11
|
+
InternalError,
|
|
12
|
+
RetrySchedule,
|
|
13
|
+
Seconds,
|
|
14
|
+
STANDARD_MATTER_PORT
|
|
15
|
+
} from "#general";
|
|
8
16
|
import { DatatypeModel, FieldElement } from "#model";
|
|
9
|
-
import {
|
|
17
|
+
import { MAXIMUM_COMMISSIONING_TIMEOUT } from "#types";
|
|
10
18
|
import { CommissionableMdnsAdvertisement } from "./CommissionableMdnsAdvertisement.js";
|
|
11
19
|
import { CommissionerMdnsAdvertisement } from "./CommissionerMdnsAdvertisement.js";
|
|
12
20
|
import { OperationalMdnsAdvertisement } from "./OperationalMdnsAdvertisement.js";
|
|
@@ -104,18 +112,18 @@ class MdnsAdvertiser extends Advertiser {
|
|
|
104
112
|
((MdnsAdvertiser2) => {
|
|
105
113
|
MdnsAdvertiser2.DefaultBroadcastSchedule = {
|
|
106
114
|
// Mandated by MDNS specification
|
|
107
|
-
initialInterval:
|
|
115
|
+
initialInterval: Seconds.one,
|
|
108
116
|
// Maximum commissioning timeout per Matter specification 5.4.2.3.1, although
|
|
109
|
-
timeout:
|
|
117
|
+
timeout: MAXIMUM_COMMISSIONING_TIMEOUT,
|
|
110
118
|
// Minimum per MDNS specification
|
|
111
119
|
backoffFactor: 2,
|
|
112
120
|
// Technically this may result in us emitting more than 8 packets which is the maximum per the MDNS
|
|
113
121
|
// specification but extra packets will only come every 90 seconds
|
|
114
|
-
maximumInterval:
|
|
122
|
+
maximumInterval: Seconds(90),
|
|
115
123
|
// Not in any specification AFAIK but common sense to reduce thundering herd
|
|
116
124
|
jitterFactor: 0.25,
|
|
117
125
|
// Generally operational broadcast is unnecessary once an operational connection is established
|
|
118
|
-
broadcastAfterConnection:
|
|
126
|
+
broadcastAfterConnection: Instant
|
|
119
127
|
};
|
|
120
128
|
MdnsAdvertiser2.RetransmissionBroadcastSchedule = {
|
|
121
129
|
event: "retransmit",
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/advertisement/mdns/MdnsAdvertiser.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,kBAAkB;AAE3B,
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,kBAAkB;AAE3B;AAAA,EACI;AAAA,EAGA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AAEP,SAAS,eAAe,oBAAoB;AAC5C,SAAS,qCAAqC;AAC9C,SAAS,uCAAuC;AAChD,SAAS,qCAAqC;AAE9C,SAAS,oCAAoC;AAKtC,MAAM,uBAAuB,WAAW;AAAA,EAM3C,YACa,QACA,QACT,SACF;AACE,UAAM;AAJG;AACA;AAKT,SAAK,OAAO,SAAS,QAAQ;AAC7B,SAAK,qBAAqB,SAAS,sBAAsB;AAEzD,QAAI,qBAAqB;AACzB,QAAI,wBAAwB;AAC5B,QAAI,SAAS,WAAW;AACpB,iBAAW,YAAY,QAAQ,WAAW;AACtC,YAAI,SAAS,gBAAgB,QAAW;AACpC,cAAI,SAAS,UAAU,QAAW;AAC9B,iCAAqB;AAAA,UACzB;AAEA,cAAI,SAAS,UAAU,cAAc;AACjC,oCAAwB;AAAA,UAC5B;AAAA,QACJ;AAEA,aAAK,WAAW,KAAK,EAAE,QAAQ,SAAS,CAAC;AAAA,MAC7C;AAAA,IACJ;AAEA,QAAI,CAAC,uBAAuB;AACxB,WAAK,WAAW,KAAK,EAAE,QAAQ,eAAe,gCAAgC,CAAC;AAAA,IACnF;AAEA,QAAI,CAAC,oBAAoB;AACrB,WAAK,WAAW,KAAK,EAAE,QAAQ,eAAe,yBAAyB,CAAC;AAAA,IAC5E;AAAA,EACJ;AAAA,EAxCS;AAAA,EACA;AAAA,EAET,aAAa,IAAI,MAA8E;AAAA;AAAA;AAAA;AAAA,EA0CtF,iBAAiB,aAAgE;AACtF,YAAQ,YAAY,MAAM;AAAA,MACtB,KAAK;AACD,eACK,KAAK,uBAAuB,YAAY,MAAM,KAC/C,IAAI,6BAA6B,MAAM,WAAW;AAAA,MAG1D,KAAK;AACD,eAAO,IAAI,gCAAgC,MAAM,WAAW;AAAA,MAEhE,KAAK;AACD,eAAO,IAAI,8BAA8B,MAAM,WAAW;AAAA,MAE9D;AACI,cAAM,IAAI;AAAA,UACN,yCAA0C,YAAmC,IAAI;AAAA,QACrF;AAAA,IACR;AAAA,EACJ;AAAA;AAAA;AAAA;AAAA,EAKA,mBAAmB;AACf,WAAO,MAAM,MAAM,KAAK,OAAO,YAAY,CAAC,CAAC,EAAE,YAAY;AAAA,EAC/D;AAAA;AAAA;AAAA;AAAA,EAKA,qBAAqB,eAAkC,OAAmC;AACtF,UAAM,QAAQ,KAAK,aAAa,eAAe,KAAK;AAEpD,QAAI,MAAM,aAAa,QAAW;AAC9B,YAAM,WAAW,IAAI;AAAA,QACjB,KAAK;AAAA,QACL,cAAc,cAAc,eAAe,0BAA0B,MAAM,MAAM;AAAA,MACrF;AAAA,IACJ;AAEA,WAAO,MAAM;AAAA,EACjB;AAAA;AAAA;AAAA;AAAA,EAKA,mBAAmB,eAAkC,OAAmC;AACpF,WAAO,KAAK,aAAa,eAAe,KAAK,EAAE;AAAA,EACnD;AAAA,EAEA,aAAa,eAAkC,OAAmC;AAC9E,QAAI,CAAC,OAAO;AACR,cAAQ;AAAA,IACZ;AAEA,eAAW,SAAS,KAAK,YAAY;AACjC,YAAM,EAAE,aAAa,OAAO,OAAO,IAAI,MAAM;AAE7C,UAAI,gBAAgB,UAAa,gBAAgB,cAAc,YAAY,MAAM;AAC7E;AAAA,MACJ;AAEA,UAAI,WAAW,UAAa,WAAW,OAAO;AAC1C;AAAA,MACJ;AAEA,aAAO;AAAA,IACX;AAEA,UAAM,IAAI,cAAc,oCAAoC;AAAA,EAChE;AACJ;AAAA,CAEO,CAAUA,oBAAV;AAwDI,EAAMA,gBAAA,2BAA8C;AAAA;AAAA,IAEvD,iBAAiB,QAAQ;AAAA;AAAA,IAGzB,SAAS;AAAA;AAAA,IAGT,eAAe;AAAA;AAAA;AAAA,IAIf,iBAAiB,QAAQ,EAAE;AAAA;AAAA,IAG3B,cAAc;AAAA;AAAA,IAGd,0BAA0B;AAAA,EAC9B;AAKO,EAAMA,gBAAA,kCAAqD;AAAA,IAC9D,OAAO;AAAA;AAAA,IAGP,cAAc;AAAA,EAClB;AAKO,EAAMA,gBAAA,gBAAgB,IAAI;AAAA,IAC7B,EAAE,MAAM,yBAAyB,MAAM,SAAS;AAAA,IAChD,aAAa,EAAE,MAAM,sBAAsB,MAAM,OAAO,CAAC;AAAA,IACzD;AAAA,MACI,EAAE,MAAM,aAAa,MAAM,OAAO;AAAA,MAClC;AAAA,QACI,EAAE,MAAM,SAAS,MAAM,SAAS;AAAA,QAChC,aAAa,EAAE,MAAM,mBAAmB,MAAM,SAAS,CAAC;AAAA,QACxD,aAAa,EAAE,MAAM,WAAW,MAAM,SAAS,CAAC;AAAA,QAChD,aAAa,EAAE,MAAM,iBAAiB,MAAM,QAAQ,CAAC;AAAA,QACrD,aAAa,EAAE,MAAM,mBAAmB,MAAM,SAAS,CAAC;AAAA,QACxD,aAAa,EAAE,MAAM,gBAAgB,MAAM,SAAS,CAAC;AAAA,QACrD,aAAa,EAAE,MAAM,eAAe,MAAM,SAAS,CAAC;AAAA,QACpD,aAAa,EAAE,MAAM,SAAS,MAAM,SAAS,CAAC;AAAA,MAClD;AAAA,IACJ;AAAA,EACJ;AAAA,GA1Ga;",
|
|
5
5
|
"names": ["MdnsAdvertiser"]
|
|
6
6
|
}
|
package/dist/esm/ble/Ble.d.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Copyright 2022-2025 Matter.js Authors
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { Bytes, Channel, ChannelType, MatterError, NetInterface, TransportInterface } from "#general";
|
|
6
|
+
import { Bytes, Channel, ChannelType, Duration, MatterError, NetInterface, TransportInterface } from "#general";
|
|
7
7
|
import { Scanner } from "../common/Scanner.js";
|
|
8
8
|
export declare class BleError extends MatterError {
|
|
9
9
|
}
|
|
@@ -16,7 +16,7 @@ export declare abstract class Ble {
|
|
|
16
16
|
abstract get scanner(): Scanner;
|
|
17
17
|
}
|
|
18
18
|
export interface BlePeripheralInterface extends TransportInterface {
|
|
19
|
-
advertise(advertiseData: Bytes, additionalAdvertisementData?: Bytes,
|
|
19
|
+
advertise(advertiseData: Bytes, additionalAdvertisementData?: Bytes, interval?: Duration): Promise<void>;
|
|
20
20
|
stopAdvertising(): Promise<void>;
|
|
21
21
|
}
|
|
22
22
|
export declare abstract class BleChannel<T> implements Channel<T> {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Ble.d.ts","sourceRoot":"","sources":["../../../src/ble/Ble.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"Ble.d.ts","sourceRoot":"","sources":["../../../src/ble/Ble.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,KAAK,EACL,OAAO,EACP,WAAW,EACX,QAAQ,EACR,WAAW,EACX,YAAY,EAEZ,kBAAkB,EACrB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAG/C,qBAAa,QAAS,SAAQ,WAAW;CAAG;AAE5C,iBAAS,WAAW,IAAI,GAAG,CAE1B;AAGD,8BAAsB,GAAG;IACrB,MAAM,CAAC,GAAG,qBAAe;IAEzB,MAAM,KAAK,OAAO,YAEjB;IAED,QAAQ,KAAK,mBAAmB,IAAI,sBAAsB,CAAC;IAC3D,QAAQ,KAAK,gBAAgB,IAAI,YAAY,CAAC;IAC9C,QAAQ,KAAK,OAAO,IAAI,OAAO,CAAC;CACnC;AAED,MAAM,WAAW,sBAAuB,SAAQ,kBAAkB;IAC9D,SAAS,CAAC,aAAa,EAAE,KAAK,EAAE,2BAA2B,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC;AAED,8BAAsB,UAAU,CAAC,CAAC,CAAE,YAAW,OAAO,CAAC,CAAC,CAAC;IACrD,QAAQ,CAAC,cAAc,SAA+B;IACtD,QAAQ,CAAC,UAAU,QAAQ;IAC3B,QAAQ,CAAC,IAAI,mBAAmB;IAEhC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IACrC,QAAQ,CAAC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAClC"}
|
package/dist/esm/ble/Ble.js
CHANGED
|
@@ -3,7 +3,11 @@
|
|
|
3
3
|
* Copyright 2022-2025 Matter.js Authors
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import {
|
|
6
|
+
import {
|
|
7
|
+
ChannelType,
|
|
8
|
+
MatterError,
|
|
9
|
+
NoProviderError
|
|
10
|
+
} from "#general";
|
|
7
11
|
import { BLE_MAX_MATTER_PAYLOAD_SIZE } from "./BleConsts.js";
|
|
8
12
|
class BleError extends MatterError {
|
|
9
13
|
}
|
package/dist/esm/ble/Ble.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/ble/Ble.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA;AAAA,EAGI;AAAA,EAEA;AAAA,EAEA;AAAA,OAEG;AAEP,SAAS,mCAAmC;AAErC,MAAM,iBAAiB,YAAY;AAAC;AAE3C,SAAS,cAAmB;AACxB,QAAM,IAAI,gBAAgB,wBAAwB;AACtD;AAGO,MAAe,IAAI;AAAA,EACtB,OAAO,MAAM;AAAA,EAEb,WAAW,UAAU;AACjB,WAAO,KAAK,QAAQ;AAAA,EACxB;AAKJ;AAOO,MAAe,WAAoC;AAAA,EAC7C,iBAAiB;AAAA,EACjB,aAAa;AAAA;AAAA,EACb,OAAO,YAAY;AAKhC;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -16,15 +16,15 @@ export declare const BTP_MAXIMUM_WINDOW_SIZE = 255;
|
|
|
16
16
|
* The maximum amount of time after sending a BTP Session Handshake request to wait for a BTP Session Handshake response
|
|
17
17
|
* before closing the connection.
|
|
18
18
|
*/
|
|
19
|
-
export declare const
|
|
19
|
+
export declare const BTP_CONN_RSP_TIMEOUT: import("#general").Duration;
|
|
20
20
|
/** The maximum amount of time after receipt of a segment before a stand-alone ACK must be sent. */
|
|
21
|
-
export declare const
|
|
22
|
-
export declare const
|
|
21
|
+
export declare const BTP_ACK_TIMEOUT: import("#general").Duration;
|
|
22
|
+
export declare const BTP_SEND_ACK_TIMEOUT: import("#general").Duration;
|
|
23
23
|
/**
|
|
24
24
|
* The maximum amount of time no unique data has been sent over a BTP session before the Central Device must close the
|
|
25
25
|
* BTP session.
|
|
26
26
|
*/
|
|
27
|
-
export declare const BTP_CONN_IDLE_TIMEOUT
|
|
27
|
+
export declare const BTP_CONN_IDLE_TIMEOUT: import("#general").Duration;
|
|
28
28
|
/**
|
|
29
29
|
* The maximum message size that can be transported in a Matter message via BTP.
|
|
30
30
|
* Seems the chip code in BTPEngine limits the size currently to "one pbuf" which should mean one UDP message.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BleConsts.d.ts","sourceRoot":"","sources":["../../../src/ble/BleConsts.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,2DAA2D;AAC3D,eAAO,MAAM,6BAA6B,SAAS,CAAC;AACpD,eAAO,MAAM,uBAAuB,yCAAyC,CAAC;AAC9E,eAAO,MAAM,iCAAiC,yCAAyC,CAAC;AACxF,eAAO,MAAM,iCAAiC,yCAAyC,CAAC;AACxF,eAAO,MAAM,iCAAiC,yCAAyC,CAAC;AAExF,eAAO,MAAM,mBAAmB,KAAK,CAAC;AACtC,eAAO,MAAM,mBAAmB,MAAM,CAAC;AAEvC,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAE3C;;;GAGG;AACH,eAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"BleConsts.d.ts","sourceRoot":"","sources":["../../../src/ble/BleConsts.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,2DAA2D;AAC3D,eAAO,MAAM,6BAA6B,SAAS,CAAC;AACpD,eAAO,MAAM,uBAAuB,yCAAyC,CAAC;AAC9E,eAAO,MAAM,iCAAiC,yCAAyC,CAAC;AACxF,eAAO,MAAM,iCAAiC,yCAAyC,CAAC;AACxF,eAAO,MAAM,iCAAiC,yCAAyC,CAAC;AAExF,eAAO,MAAM,mBAAmB,KAAK,CAAC;AACtC,eAAO,MAAM,mBAAmB,MAAM,CAAC;AAEvC,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAE3C;;;GAGG;AACH,eAAO,MAAM,oBAAoB,6BAAa,CAAC;AAE/C,mGAAmG;AACnG,eAAO,MAAM,eAAe,6BAAc,CAAC;AAE3C,eAAO,MAAM,oBAAoB,6BAA8B,CAAC;AAEhE;;;GAGG;AACH,eAAO,MAAM,qBAAqB,6BAAc,CAAC;AAEjD;;;GAGG;AACH,eAAO,MAAM,2BAA2B,QAAuB,CAAC"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Copyright 2022-2025 Matter.js Authors
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { MAX_UDP_MESSAGE_SIZE } from "#general";
|
|
6
|
+
import { MAX_UDP_MESSAGE_SIZE, Millis, Seconds } from "#general";
|
|
7
7
|
const BLE_MATTER_SERVICE_UUID_SHORT = "fff6";
|
|
8
8
|
const BLE_MATTER_SERVICE_UUID = "0000FFF6-0000-1000-8000-00805F9B34FB";
|
|
9
9
|
const BLE_MATTER_C1_CHARACTERISTIC_UUID = "18EE2EF5-263D-4559-959F-4F9C429F9D11";
|
|
@@ -12,10 +12,10 @@ const BLE_MATTER_C3_CHARACTERISTIC_UUID = "64630238-8772-45F2-B87D-748A83218F04"
|
|
|
12
12
|
const BLE_MINIMUM_ATT_MTU = 20;
|
|
13
13
|
const BLE_MAXIMUM_BTP_MTU = 244;
|
|
14
14
|
const BTP_MAXIMUM_WINDOW_SIZE = 255;
|
|
15
|
-
const
|
|
16
|
-
const
|
|
17
|
-
const
|
|
18
|
-
const BTP_CONN_IDLE_TIMEOUT =
|
|
15
|
+
const BTP_CONN_RSP_TIMEOUT = Seconds(5);
|
|
16
|
+
const BTP_ACK_TIMEOUT = Seconds(15);
|
|
17
|
+
const BTP_SEND_ACK_TIMEOUT = Millis(BTP_ACK_TIMEOUT / 3);
|
|
18
|
+
const BTP_CONN_IDLE_TIMEOUT = Seconds(30);
|
|
19
19
|
const BLE_MAX_MATTER_PAYLOAD_SIZE = MAX_UDP_MESSAGE_SIZE;
|
|
20
20
|
export {
|
|
21
21
|
BLE_MATTER_C1_CHARACTERISTIC_UUID,
|
|
@@ -26,10 +26,10 @@ export {
|
|
|
26
26
|
BLE_MAXIMUM_BTP_MTU,
|
|
27
27
|
BLE_MAX_MATTER_PAYLOAD_SIZE,
|
|
28
28
|
BLE_MINIMUM_ATT_MTU,
|
|
29
|
-
|
|
29
|
+
BTP_ACK_TIMEOUT,
|
|
30
30
|
BTP_CONN_IDLE_TIMEOUT,
|
|
31
|
-
|
|
31
|
+
BTP_CONN_RSP_TIMEOUT,
|
|
32
32
|
BTP_MAXIMUM_WINDOW_SIZE,
|
|
33
|
-
|
|
33
|
+
BTP_SEND_ACK_TIMEOUT
|
|
34
34
|
};
|
|
35
35
|
//# sourceMappingURL=BleConsts.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/ble/BleConsts.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,sBAAsB,QAAQ,eAAe;AAG/C,MAAM,gCAAgC;AACtC,MAAM,0BAA0B;AAChC,MAAM,oCAAoC;AAC1C,MAAM,oCAAoC;AAC1C,MAAM,oCAAoC;AAE1C,MAAM,sBAAsB;AAC5B,MAAM,sBAAsB;AAE5B,MAAM,0BAA0B;AAMhC,MAAM,uBAAuB,QAAQ,CAAC;AAGtC,MAAM,kBAAkB,QAAQ,EAAE;AAElC,MAAM,uBAAuB,OAAO,kBAAkB,CAAC;AAMvD,MAAM,wBAAwB,QAAQ,EAAE;AAMxC,MAAM,8BAA8B;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -8,10 +8,10 @@ import { BtpCodec } from "../codec/BtpCodec.js";
|
|
|
8
8
|
import {
|
|
9
9
|
BLE_MAXIMUM_BTP_MTU,
|
|
10
10
|
BLE_MINIMUM_ATT_MTU,
|
|
11
|
-
|
|
11
|
+
BTP_ACK_TIMEOUT,
|
|
12
12
|
BTP_CONN_IDLE_TIMEOUT,
|
|
13
13
|
BTP_MAXIMUM_WINDOW_SIZE,
|
|
14
|
-
|
|
14
|
+
BTP_SEND_ACK_TIMEOUT
|
|
15
15
|
} from "./BleConsts.js";
|
|
16
16
|
class BtpMatterError extends MatterError {
|
|
17
17
|
}
|
|
@@ -61,7 +61,7 @@ class BtpSessionHandler {
|
|
|
61
61
|
// Previous ackNumber received
|
|
62
62
|
ackReceiveTimer = Time.getTimer(
|
|
63
63
|
"BTP ack timeout",
|
|
64
|
-
|
|
64
|
+
BTP_ACK_TIMEOUT,
|
|
65
65
|
() => this.btpAckTimeoutTriggered()
|
|
66
66
|
);
|
|
67
67
|
sequenceNumber = 0;
|
|
@@ -72,7 +72,7 @@ class BtpSessionHandler {
|
|
|
72
72
|
sendInProgress = false;
|
|
73
73
|
sendAckTimer = Time.getTimer(
|
|
74
74
|
"BTP send timeout",
|
|
75
|
-
|
|
75
|
+
BTP_SEND_ACK_TIMEOUT,
|
|
76
76
|
() => this.btpSendAckTimeoutTriggered()
|
|
77
77
|
);
|
|
78
78
|
isActive = true;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/ble/BtpSessionHandler.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,OAAO,YAAY,YAAY,QAAQ,QAAQ,aAAa,YAAY;AACjF,SAAS,gBAAgB;AACzB;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AAEA,MAAM,uBAAuB,YAAY;AAAC;AAC1C,MAAM,yBAAyB,eAAe;AAAC;AAC/C,MAAM,qBAAqB,eAAe;AAAC;AAE3C,MAAM,yBAAyB,CAAC,CAAC;AACxC,MAAM,0BAA0B;AAEhC,MAAM,SAAS,OAAO,IAAI,mBAAmB;AAEtC,MAAM,kBAAkB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EA+H3B,YACqB,MACjB,YACiB,cACA,kBACA,kBACA,uBACA,4BACnB;AAPmB;AAEA;AACA;AACA;AACA;AACA;AAEjB,QAAI,eAAe,GAAG;AAClB,YAAM,IAAI,iBAAiB,2BAA2B,UAAU,EAAE;AAAA,IACtE;AACA,QAAI,SAAS,cAAc;AACvB,WAAK,gBAAgB,MAAM;AAAA,IAC/B,OAAO;AACH,WAAK,aAAa,MAAM;AACxB,WAAK,6BAA6B;AAClC,WAAK,wBAAwB;AAC7B,WAAK,iBAAiB;AAAA,IAC1B;AAAA,EACJ;AAAA,EAlJQ;AAAA,EACA;AAAA,EACA,6BAA6B;AAAA;AAAA,EAC7B,wBAAwB;AAAA;AAAA,EACf,kBAAkB,KAAK;AAAA,IAAS;AAAA,IAAmB;AAAA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["version"]
|
|
6
6
|
}
|
|
@@ -61,7 +61,7 @@ class AttestationCertificateManager {
|
|
|
61
61
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
62
62
|
// @ts-ignore
|
|
63
63
|
async generatePAACert(vendorId) {
|
|
64
|
-
const now = Time.
|
|
64
|
+
const now = Time.now;
|
|
65
65
|
const cert = new Paa({
|
|
66
66
|
serialNumber: Bytes.fromHex(toHex(this.paaCertId)),
|
|
67
67
|
signatureAlgorithm: 1,
|
|
@@ -95,7 +95,7 @@ class AttestationCertificateManager {
|
|
|
95
95
|
return cert.asSignedAsn1();
|
|
96
96
|
}
|
|
97
97
|
async generatePAICert(vendorId, productId) {
|
|
98
|
-
const now = Time.
|
|
98
|
+
const now = Time.now;
|
|
99
99
|
const cert = new Pai({
|
|
100
100
|
serialNumber: Bytes.fromHex(toHex(this.#paiCertId)),
|
|
101
101
|
signatureAlgorithm: 1,
|
|
@@ -129,7 +129,7 @@ class AttestationCertificateManager {
|
|
|
129
129
|
return cert.asSignedAsn1();
|
|
130
130
|
}
|
|
131
131
|
async generateDaCert(publicKey, vendorId, productId) {
|
|
132
|
-
const now = Time.
|
|
132
|
+
const now = Time.now;
|
|
133
133
|
const certId = this.#nextCertificateId++;
|
|
134
134
|
const cert = new Dac({
|
|
135
135
|
serialNumber: Bytes.fromHex(toHex(certId)),
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/certificate/AttestationCertificateManager.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,OAAe,YAAY,MAAM,aAAa;AAEvD;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAAS,KAAK,KAAK,WAAW;AAC9B,SAAS,sBAAsB;AAE/B,SAAS,iBAAiB,UAAoB,WAAoB;AAC9D,SAAO,yBAAyB,SAAS,SAAS,EAAE,EAAE,YAAY,CAAC,IAC/D,cAAc,SAAY,WAAW,KAAK,UAAU,SAAS,EAAE,EAAE,YAAY,CAAC,EAClF;AACJ;AAEA,SAAS,iBAAiB,UAAoB,WAAmB;AAC7D,SAAO,yBAAyB,SAAS,SAAS,EAAE,EAAE,YAAY,CAAC,MAAM,UAAU,SAAS,EAAE,EAAE,YAAY,CAAC;AACjH;AAEA,SAAS,mBAAmB;AAExB,SAAO;AACX;AAEO,MAAM,8BAA8B;AAAA,EAC/B,YAAY,OAAO,CAAC;AAAA;AAAA;AAAA,EAInB,cAAc,WAAW,+BAA+B;AAAA,IAC7D,WAAW;AAAA,EACf,CAAC;AAAA,EACQ;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,oBAAoB;AAAA,EACpB,aAAa,OAAO,CAAC;AAAA,EACrB;AAAA,EACT,qBAAqB;AAAA,EAErB,YAAY,QAAgB,UAAoB,YAAwB,kBAAyB;AAC7F,SAAK,UAAU;AACf,SAAK,YAAY;AACjB,SAAK,cAAc;AACnB,SAAK,oBAAoB;AACzB,SAAK,gBAAgB,KAAK,gBAAgB,QAAQ;AAAA,EACtD;AAAA,EAEA,aAAa,OAAO,QAAgB,UAAoB;AACpD,UAAM,MAAM,MAAM,OAAO,cAAc;AACvC,UAAM,aAAa,MAAM,GAAG,MAAM,OAAO,cAAc,IAAI,SAAS,CAAC;AACrE,WAAO,IAAI,8BAA8B,QAAQ,UAAU,KAAK,WAAW,MAAM,GAAG,EAAE,CAAC;AAAA,EAC3F;AAAA,EAEA,aAAa;AACT,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,MAAM,UAAU,WAAmB;AAC/B,UAAM,aAAa,MAAM,KAAK,QAAQ,cAAc;AACpD,WAAO;AAAA,MACH,SAAS;AAAA,MACT,KAAK,MAAM,KAAK,eAAe,WAAW,WAAW,KAAK,WAAW,SAAS;AAAA,IAClF;AAAA,EACJ;AAAA;AAAA;AAAA;AAAA,EAKA,MAAc,gBAAgB,UAAqB;AAC/C,UAAM,MAAM,KAAK
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,OAAe,YAAY,MAAM,aAAa;AAEvD;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAAS,KAAK,KAAK,WAAW;AAC9B,SAAS,sBAAsB;AAE/B,SAAS,iBAAiB,UAAoB,WAAoB;AAC9D,SAAO,yBAAyB,SAAS,SAAS,EAAE,EAAE,YAAY,CAAC,IAC/D,cAAc,SAAY,WAAW,KAAK,UAAU,SAAS,EAAE,EAAE,YAAY,CAAC,EAClF;AACJ;AAEA,SAAS,iBAAiB,UAAoB,WAAmB;AAC7D,SAAO,yBAAyB,SAAS,SAAS,EAAE,EAAE,YAAY,CAAC,MAAM,UAAU,SAAS,EAAE,EAAE,YAAY,CAAC;AACjH;AAEA,SAAS,mBAAmB;AAExB,SAAO;AACX;AAEO,MAAM,8BAA8B;AAAA,EAC/B,YAAY,OAAO,CAAC;AAAA;AAAA;AAAA,EAInB,cAAc,WAAW,+BAA+B;AAAA,IAC7D,WAAW;AAAA,EACf,CAAC;AAAA,EACQ;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,oBAAoB;AAAA,EACpB,aAAa,OAAO,CAAC;AAAA,EACrB;AAAA,EACT,qBAAqB;AAAA,EAErB,YAAY,QAAgB,UAAoB,YAAwB,kBAAyB;AAC7F,SAAK,UAAU;AACf,SAAK,YAAY;AACjB,SAAK,cAAc;AACnB,SAAK,oBAAoB;AACzB,SAAK,gBAAgB,KAAK,gBAAgB,QAAQ;AAAA,EACtD;AAAA,EAEA,aAAa,OAAO,QAAgB,UAAoB;AACpD,UAAM,MAAM,MAAM,OAAO,cAAc;AACvC,UAAM,aAAa,MAAM,GAAG,MAAM,OAAO,cAAc,IAAI,SAAS,CAAC;AACrE,WAAO,IAAI,8BAA8B,QAAQ,UAAU,KAAK,WAAW,MAAM,GAAG,EAAE,CAAC;AAAA,EAC3F;AAAA,EAEA,aAAa;AACT,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,MAAM,UAAU,WAAmB;AAC/B,UAAM,aAAa,MAAM,KAAK,QAAQ,cAAc;AACpD,WAAO;AAAA,MACH,SAAS;AAAA,MACT,KAAK,MAAM,KAAK,eAAe,WAAW,WAAW,KAAK,WAAW,SAAS;AAAA,IAClF;AAAA,EACJ;AAAA;AAAA;AAAA;AAAA,EAKA,MAAc,gBAAgB,UAAqB;AAC/C,UAAM,MAAM,KAAK;AACjB,UAAM,OAAO,IAAI,IAAI;AAAA,MACjB,cAAc,MAAM,QAAQ,MAAM,KAAK,SAAS,CAAC;AAAA,MACjD,oBAAoB;AAAA,MACpB,oBAAoB;AAAA,MACpB,yBAAyB;AAAA,MACzB,QAAQ;AAAA,QACJ,YAAY,iBAAiB;AAAA,QAC7B;AAAA,MACJ;AAAA,MACA,WAAW,eAAe,KAAK,EAAE;AAAA,MACjC,UAAU,eAAe,KAAK,EAAE;AAAA,MAChC,SAAS;AAAA,QACL,YAAY,iBAAiB;AAAA,QAC7B;AAAA,MACJ;AAAA,MACA,wBAAwB,KAAK,YAAY;AAAA,MACzC,YAAY;AAAA,QACR,kBAAkB;AAAA,UACd,MAAM;AAAA,UACN,SAAS;AAAA,QACb;AAAA,QACA,UAAU;AAAA,UACN,aAAa;AAAA,UACb,SAAS;AAAA,QACb;AAAA,QACA,sBAAsB,KAAK;AAAA,QAC3B,wBAAwB,KAAK;AAAA,MACjC;AAAA,IACJ,CAAC;AACD,UAAM,KAAK,KAAK,KAAK,SAAS,KAAK,WAAW;AAC9C,WAAO,KAAK,aAAa;AAAA,EAC7B;AAAA,EAEA,MAAc,gBAAgB,UAAoB,WAAoB;AAClE,UAAM,MAAM,KAAK;AACjB,UAAM,OAAO,IAAI,IAAI;AAAA,MACjB,cAAc,MAAM,QAAQ,MAAM,KAAK,UAAU,CAAC;AAAA,MAClD,oBAAoB;AAAA,MACpB,oBAAoB;AAAA,MACpB,yBAAyB;AAAA,MACzB,QAAQ;AAAA,QACJ,YAAY,iBAAiB;AAAA,MACjC;AAAA,MACA,WAAW,eAAe,KAAK,EAAE;AAAA,MACjC,UAAU,eAAe,KAAK,EAAE;AAAA,MAChC,SAAS;AAAA,QACL,YAAY,iBAAiB,UAAU,SAAS;AAAA,QAChD;AAAA,QACA;AAAA,MACJ;AAAA,MACA,wBAAwB,KAAK,YAAY;AAAA,MACzC,YAAY;AAAA,QACR,kBAAkB;AAAA,UACd,MAAM;AAAA,UACN,SAAS;AAAA,QACb;AAAA,QACA,UAAU;AAAA,UACN,aAAa;AAAA,UACb,SAAS;AAAA,QACb;AAAA,QACA,sBAAsB,KAAK;AAAA,QAC3B,wBAAwB,KAAK;AAAA,MACjC;AAAA,IACJ,CAAC;AACD,UAAM,KAAK,KAAK,KAAK,SAAS,KAAK,WAAW;AAC9C,WAAO,KAAK,aAAa;AAAA,EAC7B;AAAA,EAEA,MAAM,eAAe,WAAkB,UAAoB,WAAmB;AAC1E,UAAM,MAAM,KAAK;AACjB,UAAM,SAAS,KAAK;AACpB,UAAM,OAAO,IAAI,IAAI;AAAA,MACjB,cAAc,MAAM,QAAQ,MAAM,MAAM,CAAC;AAAA,MACzC,oBAAoB;AAAA,MACpB,oBAAoB;AAAA,MACpB,yBAAyB;AAAA,MACzB,WAAW,eAAe,KAAK,EAAE;AAAA,MACjC,UAAU,eAAe,KAAK,EAAE;AAAA,MAChC,QAAQ;AAAA,QACJ,YAAY,iBAAiB,QAAQ;AAAA,QACrC;AAAA,MACJ;AAAA,MACA,SAAS;AAAA,QACL,YAAY,iBAAiB,UAAU,SAAS;AAAA,QAChD;AAAA,QACA;AAAA,MACJ;AAAA,MACA,wBAAwB;AAAA,MACxB,YAAY;AAAA,QACR,kBAAkB;AAAA,UACd,MAAM;AAAA,QACV;AAAA,QACA,UAAU;AAAA,UACN,kBAAkB;AAAA,QACtB;AAAA,QACA,sBAAsB,MAAM,GAAG,MAAM,KAAK,QAAQ,cAAc,SAAS,CAAC,EAAE,MAAM,GAAG,EAAE;AAAA,QACvF,wBAAwB,KAAK;AAAA,MACjC;AAAA,IACJ,CAAC;AACD,UAAM,KAAK,KAAK,KAAK,SAAS,KAAK,WAAW;AAC9C,WAAO,KAAK,aAAa;AAAA,EAC7B;AACJ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -88,7 +88,7 @@ class CertificateAuthority {
|
|
|
88
88
|
};
|
|
89
89
|
}
|
|
90
90
|
async #generateRootCert() {
|
|
91
|
-
const now = Time.
|
|
91
|
+
const now = Time.now;
|
|
92
92
|
const cert = new Rcac({
|
|
93
93
|
serialNumber: Bytes.fromHex(toHex(this.#rootCertId)),
|
|
94
94
|
signatureAlgorithm: 1,
|
|
@@ -113,7 +113,7 @@ class CertificateAuthority {
|
|
|
113
113
|
return cert.asSignedTlv();
|
|
114
114
|
}
|
|
115
115
|
async generateNoc(publicKey, fabricId, nodeId, caseAuthenticatedTags) {
|
|
116
|
-
const now = Time.
|
|
116
|
+
const now = Time.now;
|
|
117
117
|
const certId = this.#nextCertificateId++;
|
|
118
118
|
const cert = new Noc({
|
|
119
119
|
serialNumber: Bytes.fromHex(toHex(certId)),
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/certificate/CertificateAuthority.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -37,8 +37,8 @@ class OperationalBase extends X509Base {
|
|
|
37
37
|
if (Object.keys(cert.issuer).length > 5) {
|
|
38
38
|
throw new CertificateError(`Certificate issuer must not contain more than 5 RDNs.`);
|
|
39
39
|
}
|
|
40
|
-
if (cert.notBefore * 1e3 > Time.nowMs
|
|
41
|
-
logger.warn(`Certificate notBefore date is in the future: ${cert.notBefore * 1e3} vs ${Time.nowMs
|
|
40
|
+
if (cert.notBefore * 1e3 > Time.nowMs) {
|
|
41
|
+
logger.warn(`Certificate notBefore date is in the future: ${cert.notBefore * 1e3} vs ${Time.nowMs}`);
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
44
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/certificate/kinds/OperationalBase.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAgB,QAAQ,YAAY;AACpC,SAAS,gBAAgB;AACzB,SAAS,wBAAkC;AAG3C,MAAM,SAAS,OAAO,IAAI,4BAA4B;AAK/C,MAAe,wBAAoD,SAAa;AAAA,EACnF,YAAY,MAAyB;AACjC,UAAM,IAAI;AACV,SAAK,eAAe;AAAA,EACxB;AAAA;AAAA;AAAA;AAAA;AAAA,EAYA,gBAAgB;AACZ,UAAM,OAAO,KAAK;AAClB,QAAI,KAAK,aAAa,aAAa;AAC/B,YAAM,IAAI;AAAA,QACN,8EAA8E,KAAK,aAAa,UAAU;AAAA,MAC9G;AAEJ,QAAI,KAAK,uBAAuB,GAAG;AAE/B,YAAM,IAAI,iBAAiB,oCAAoC,KAAK,kBAAkB,EAAE;AAAA,IAC5F;AAEA,QAAI,KAAK,uBAAuB,GAAG;AAE/B,YAAM,IAAI,iBAAiB,qCAAqC,KAAK,kBAAkB,EAAE;AAAA,IAC7F;AAEA,QAAI,KAAK,4BAA4B,GAAG;AAEpC,YAAM,IAAI,iBAAiB,0CAA0C,KAAK,uBAAuB,EAAE;AAAA,IACvG;AAGA,QAAI,OAAO,KAAK,KAAK,OAAO,EAAE,SAAS,GAAG;AACtC,YAAM,IAAI,iBAAiB,wDAAwD;AAAA,IACvF;AACA,QAAI,OAAO,KAAK,KAAK,MAAM,EAAE,SAAS,GAAG;AACrC,YAAM,IAAI,iBAAiB,uDAAuD;AAAA,IACtF;AAIA,QAAI,KAAK,YAAY,MAAO,KAAK,
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAgB,QAAQ,YAAY;AACpC,SAAS,gBAAgB;AACzB,SAAS,wBAAkC;AAG3C,MAAM,SAAS,OAAO,IAAI,4BAA4B;AAK/C,MAAe,wBAAoD,SAAa;AAAA,EACnF,YAAY,MAAyB;AACjC,UAAM,IAAI;AACV,SAAK,eAAe;AAAA,EACxB;AAAA;AAAA;AAAA;AAAA;AAAA,EAYA,gBAAgB;AACZ,UAAM,OAAO,KAAK;AAClB,QAAI,KAAK,aAAa,aAAa;AAC/B,YAAM,IAAI;AAAA,QACN,8EAA8E,KAAK,aAAa,UAAU;AAAA,MAC9G;AAEJ,QAAI,KAAK,uBAAuB,GAAG;AAE/B,YAAM,IAAI,iBAAiB,oCAAoC,KAAK,kBAAkB,EAAE;AAAA,IAC5F;AAEA,QAAI,KAAK,uBAAuB,GAAG;AAE/B,YAAM,IAAI,iBAAiB,qCAAqC,KAAK,kBAAkB,EAAE;AAAA,IAC7F;AAEA,QAAI,KAAK,4BAA4B,GAAG;AAEpC,YAAM,IAAI,iBAAiB,0CAA0C,KAAK,uBAAuB,EAAE;AAAA,IACvG;AAGA,QAAI,OAAO,KAAK,KAAK,OAAO,EAAE,SAAS,GAAG;AACtC,YAAM,IAAI,iBAAiB,wDAAwD;AAAA,IACvF;AACA,QAAI,OAAO,KAAK,KAAK,MAAM,EAAE,SAAS,GAAG;AACrC,YAAM,IAAI,iBAAiB,uDAAuD;AAAA,IACtF;AAIA,QAAI,KAAK,YAAY,MAAO,KAAK,OAAO;AACpC,aAAO,KAAK,gDAAgD,KAAK,YAAY,GAAI,OAAO,KAAK,KAAK,EAAE;AAAA,IAIxG;AAAA,EACJ;AACJ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|