@matter/node 0.16.0-alpha.0-20251205-dfb1e1556 → 0.16.0-alpha.0-20251207-37e501b18
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/behavior/Behavior.d.ts +5 -1
- package/dist/cjs/behavior/Behavior.d.ts.map +1 -1
- package/dist/cjs/behavior/Behavior.js +10 -0
- package/dist/cjs/behavior/Behavior.js.map +1 -1
- package/dist/cjs/behavior/Events.d.ts +7 -7
- package/dist/cjs/behavior/Events.d.ts.map +1 -1
- package/dist/cjs/behavior/Events.js.map +1 -1
- package/dist/cjs/behavior/Transitions.d.ts +2 -3
- package/dist/cjs/behavior/Transitions.d.ts.map +1 -1
- package/dist/cjs/behavior/Transitions.js +1 -2
- package/dist/cjs/behavior/Transitions.js.map +1 -1
- package/dist/cjs/behavior/cluster/ClusterBehaviorType.js.map +1 -1
- package/dist/cjs/behavior/cluster/ClusterEvents.d.ts +1 -1
- package/dist/cjs/behavior/cluster/ClusterEvents.d.ts.map +1 -1
- package/dist/cjs/behavior/context/NodeActivity.d.ts +2 -4
- package/dist/cjs/behavior/context/NodeActivity.d.ts.map +1 -1
- package/dist/cjs/behavior/context/NodeActivity.js +3 -10
- package/dist/cjs/behavior/context/NodeActivity.js.map +1 -1
- package/dist/cjs/behavior/context/server/LocalActorContext.d.ts +2 -3
- package/dist/cjs/behavior/context/server/LocalActorContext.d.ts.map +1 -1
- package/dist/cjs/behavior/context/server/LocalActorContext.js +3 -3
- package/dist/cjs/behavior/context/server/LocalActorContext.js.map +1 -1
- package/dist/cjs/behavior/context/server/RemoteActorContext.d.ts +2 -6
- package/dist/cjs/behavior/context/server/RemoteActorContext.d.ts.map +1 -1
- package/dist/cjs/behavior/context/server/RemoteActorContext.js +20 -22
- package/dist/cjs/behavior/context/server/RemoteActorContext.js.map +1 -1
- package/dist/cjs/behavior/internal/BehaviorBacking.d.ts +2 -1
- package/dist/cjs/behavior/internal/BehaviorBacking.d.ts.map +1 -1
- package/dist/cjs/behavior/internal/BehaviorBacking.js +3 -0
- package/dist/cjs/behavior/internal/BehaviorBacking.js.map +1 -1
- package/dist/cjs/behavior/internal/Reactors.d.ts.map +1 -1
- package/dist/cjs/behavior/internal/Reactors.js +2 -1
- package/dist/cjs/behavior/internal/Reactors.js.map +1 -1
- package/dist/cjs/behavior/state/managed/Datasource.d.ts.map +1 -1
- package/dist/cjs/behavior/state/managed/Datasource.js +1 -1
- package/dist/cjs/behavior/state/managed/Datasource.js.map +1 -1
- package/dist/cjs/behavior/system/commissioning/CommissioningClient.d.ts.map +1 -1
- package/dist/cjs/behavior/system/commissioning/CommissioningClient.js +5 -11
- package/dist/cjs/behavior/system/commissioning/CommissioningClient.js.map +1 -1
- package/dist/cjs/behavior/system/commissioning/CommissioningServer.d.ts +3 -2
- package/dist/cjs/behavior/system/commissioning/CommissioningServer.d.ts.map +1 -1
- package/dist/cjs/behavior/system/commissioning/CommissioningServer.js +3 -6
- package/dist/cjs/behavior/system/commissioning/CommissioningServer.js.map +1 -1
- package/dist/cjs/behavior/system/mqtt/MqttInterface.d.ts.map +1 -1
- package/dist/cjs/behavior/system/mqtt/MqttInterface.js +91 -30
- package/dist/cjs/behavior/system/mqtt/MqttInterface.js.map +1 -1
- package/dist/cjs/behavior/system/network/NetworkRuntime.d.ts.map +1 -1
- package/dist/cjs/behavior/system/network/NetworkRuntime.js +1 -3
- package/dist/cjs/behavior/system/network/NetworkRuntime.js.map +1 -1
- package/dist/cjs/behavior/system/network/ServerGroupNetworking.js +2 -2
- package/dist/cjs/behavior/system/network/ServerGroupNetworking.js.map +1 -1
- package/dist/cjs/behavior/system/network/ServerNetworkRuntime.d.ts.map +1 -1
- package/dist/cjs/behavior/system/network/ServerNetworkRuntime.js +152 -13
- package/dist/cjs/behavior/system/network/ServerNetworkRuntime.js.map +2 -2
- package/dist/cjs/behavior/system/remote/RemoteInterface.d.ts +3 -2
- package/dist/cjs/behavior/system/remote/RemoteInterface.d.ts.map +1 -1
- package/dist/cjs/behavior/system/remote/RemoteInterface.js +69 -10
- package/dist/cjs/behavior/system/remote/RemoteInterface.js.map +1 -1
- package/dist/cjs/behavior/system/remote/api/Api.d.ts.map +1 -1
- package/dist/cjs/behavior/system/remote/api/Api.js +4 -3
- package/dist/cjs/behavior/system/remote/api/Api.js.map +1 -1
- package/dist/cjs/behavior/system/sessions/SessionsBehavior.js +2 -2
- package/dist/cjs/behavior/system/sessions/SessionsBehavior.js.map +1 -1
- package/dist/cjs/behavior/system/subscriptions/SubscriptionsServer.d.ts.map +1 -1
- package/dist/cjs/behavior/system/subscriptions/SubscriptionsServer.js +14 -11
- package/dist/cjs/behavior/system/subscriptions/SubscriptionsServer.js.map +1 -1
- package/dist/cjs/behavior/system/websocket/WebSocketInterface.d.ts.map +1 -1
- package/dist/cjs/behavior/system/websocket/WebSocketInterface.js +11 -3
- package/dist/cjs/behavior/system/websocket/WebSocketInterface.js.map +1 -1
- package/dist/cjs/behaviors/access-control/AccessControlServer.js +1 -1
- package/dist/cjs/behaviors/access-control/AccessControlServer.js.map +1 -1
- package/dist/cjs/behaviors/administrator-commissioning/AdministratorCommissioningServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/administrator-commissioning/AdministratorCommissioningServer.js +65 -7
- package/dist/cjs/behaviors/administrator-commissioning/AdministratorCommissioningServer.js.map +1 -1
- package/dist/cjs/behaviors/basic-information/BasicInformationServer.js +2 -2
- package/dist/cjs/behaviors/basic-information/BasicInformationServer.js.map +1 -1
- package/dist/cjs/behaviors/general-commissioning/GeneralCommissioningServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/general-commissioning/GeneralCommissioningServer.js +12 -8
- package/dist/cjs/behaviors/general-commissioning/GeneralCommissioningServer.js.map +1 -1
- package/dist/cjs/behaviors/general-commissioning/ServerNodeFailsafeContext.d.ts +2 -3
- package/dist/cjs/behaviors/general-commissioning/ServerNodeFailsafeContext.d.ts.map +1 -1
- package/dist/cjs/behaviors/general-commissioning/ServerNodeFailsafeContext.js +2 -10
- package/dist/cjs/behaviors/general-commissioning/ServerNodeFailsafeContext.js.map +1 -1
- package/dist/cjs/behaviors/general-diagnostics/GeneralDiagnosticsServer.js +1 -1
- package/dist/cjs/behaviors/general-diagnostics/GeneralDiagnosticsServer.js.map +1 -1
- package/dist/cjs/behaviors/group-key-management/GroupKeyManagementServer.js +1 -1
- package/dist/cjs/behaviors/group-key-management/GroupKeyManagementServer.js.map +1 -1
- package/dist/cjs/behaviors/operational-credentials/OperationalCredentialsServer.d.ts +0 -1
- package/dist/cjs/behaviors/operational-credentials/OperationalCredentialsServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/operational-credentials/OperationalCredentialsServer.js +15 -14
- package/dist/cjs/behaviors/operational-credentials/OperationalCredentialsServer.js.map +1 -1
- package/dist/cjs/behaviors/scenes-management/ScenesManagementServer.js +1 -1
- package/dist/cjs/behaviors/scenes-management/ScenesManagementServer.js.map +1 -1
- package/dist/cjs/behaviors/thermostat/AtomicWriteHandler.js +1 -1
- package/dist/cjs/behaviors/thermostat/AtomicWriteHandler.js.map +1 -1
- package/dist/cjs/behaviors/window-covering/WindowCoveringServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/window-covering/WindowCoveringServer.js +21 -8
- package/dist/cjs/behaviors/window-covering/WindowCoveringServer.js.map +1 -1
- package/dist/cjs/endpoint/Endpoint.d.ts +2 -1
- package/dist/cjs/endpoint/Endpoint.d.ts.map +1 -1
- package/dist/cjs/endpoint/Endpoint.js +95 -8
- package/dist/cjs/endpoint/Endpoint.js.map +2 -2
- package/dist/cjs/endpoint/properties/Behaviors.d.ts.map +1 -1
- package/dist/cjs/endpoint/properties/Behaviors.js +11 -7
- package/dist/cjs/endpoint/properties/Behaviors.js.map +1 -1
- package/dist/cjs/endpoint/properties/Commands.js +1 -1
- package/dist/cjs/endpoint/properties/Commands.js.map +1 -1
- package/dist/cjs/endpoint/properties/EndpointLifecycle.d.ts.map +1 -1
- package/dist/cjs/endpoint/properties/EndpointLifecycle.js +3 -0
- package/dist/cjs/endpoint/properties/EndpointLifecycle.js.map +1 -1
- package/dist/cjs/node/ClientNode.d.ts.map +1 -1
- package/dist/cjs/node/ClientNode.js +2 -0
- package/dist/cjs/node/ClientNode.js.map +1 -1
- package/dist/cjs/node/Node.d.ts +2 -2
- package/dist/cjs/node/Node.d.ts.map +1 -1
- package/dist/cjs/node/Node.js +2 -1
- package/dist/cjs/node/Node.js.map +1 -1
- package/dist/cjs/node/ServerNode.d.ts.map +1 -1
- package/dist/cjs/node/ServerNode.js +54 -1
- package/dist/cjs/node/ServerNode.js.map +1 -1
- package/dist/cjs/node/client/ClientCommandMethod.d.ts.map +1 -1
- package/dist/cjs/node/client/ClientCommandMethod.js +26 -29
- package/dist/cjs/node/client/ClientCommandMethod.js.map +1 -1
- package/dist/cjs/node/client/NodePeerAddressStore.d.ts +3 -3
- package/dist/cjs/node/client/NodePeerAddressStore.d.ts.map +1 -1
- package/dist/cjs/node/client/NodePeerAddressStore.js.map +1 -1
- package/dist/cjs/node/client/Peers.d.ts.map +1 -1
- package/dist/cjs/node/client/Peers.js +14 -0
- package/dist/cjs/node/client/Peers.js.map +1 -1
- package/dist/cjs/node/integration/ProtocolService.d.ts.map +1 -1
- package/dist/cjs/node/integration/ProtocolService.js +3 -2
- package/dist/cjs/node/integration/ProtocolService.js.map +1 -1
- package/dist/cjs/node/server/InteractionServer.d.ts.map +1 -1
- package/dist/cjs/node/server/InteractionServer.js +54 -49
- package/dist/cjs/node/server/InteractionServer.js.map +2 -2
- package/dist/cjs/node/server/ServerEnvironment.js +1 -1
- package/dist/cjs/node/server/ServerEnvironment.js.map +1 -1
- package/dist/cjs/node/server/ServerSubscription.d.ts +61 -10
- package/dist/cjs/node/server/ServerSubscription.d.ts.map +1 -1
- package/dist/cjs/node/server/ServerSubscription.js +316 -157
- package/dist/cjs/node/server/ServerSubscription.js.map +2 -2
- package/dist/esm/behavior/Behavior.d.ts +5 -1
- package/dist/esm/behavior/Behavior.d.ts.map +1 -1
- package/dist/esm/behavior/Behavior.js +10 -0
- package/dist/esm/behavior/Behavior.js.map +1 -1
- package/dist/esm/behavior/Events.d.ts +7 -7
- package/dist/esm/behavior/Events.d.ts.map +1 -1
- package/dist/esm/behavior/Events.js.map +1 -1
- package/dist/esm/behavior/Transitions.d.ts +2 -3
- package/dist/esm/behavior/Transitions.d.ts.map +1 -1
- package/dist/esm/behavior/Transitions.js +1 -2
- package/dist/esm/behavior/Transitions.js.map +1 -1
- package/dist/esm/behavior/cluster/ClusterBehaviorType.js.map +1 -1
- package/dist/esm/behavior/cluster/ClusterEvents.d.ts +1 -1
- package/dist/esm/behavior/cluster/ClusterEvents.d.ts.map +1 -1
- package/dist/esm/behavior/context/NodeActivity.d.ts +2 -4
- package/dist/esm/behavior/context/NodeActivity.d.ts.map +1 -1
- package/dist/esm/behavior/context/NodeActivity.js +4 -11
- package/dist/esm/behavior/context/NodeActivity.js.map +1 -1
- package/dist/esm/behavior/context/server/LocalActorContext.d.ts +2 -3
- package/dist/esm/behavior/context/server/LocalActorContext.d.ts.map +1 -1
- package/dist/esm/behavior/context/server/LocalActorContext.js +5 -5
- package/dist/esm/behavior/context/server/LocalActorContext.js.map +1 -1
- package/dist/esm/behavior/context/server/RemoteActorContext.d.ts +2 -6
- package/dist/esm/behavior/context/server/RemoteActorContext.d.ts.map +1 -1
- package/dist/esm/behavior/context/server/RemoteActorContext.js +27 -24
- package/dist/esm/behavior/context/server/RemoteActorContext.js.map +1 -1
- package/dist/esm/behavior/internal/BehaviorBacking.d.ts +2 -1
- package/dist/esm/behavior/internal/BehaviorBacking.d.ts.map +1 -1
- package/dist/esm/behavior/internal/BehaviorBacking.js +4 -0
- package/dist/esm/behavior/internal/BehaviorBacking.js.map +1 -1
- package/dist/esm/behavior/internal/Reactors.d.ts.map +1 -1
- package/dist/esm/behavior/internal/Reactors.js +2 -1
- package/dist/esm/behavior/internal/Reactors.js.map +1 -1
- package/dist/esm/behavior/state/managed/Datasource.d.ts.map +1 -1
- package/dist/esm/behavior/state/managed/Datasource.js +2 -1
- package/dist/esm/behavior/state/managed/Datasource.js.map +1 -1
- package/dist/esm/behavior/system/commissioning/CommissioningClient.d.ts.map +1 -1
- package/dist/esm/behavior/system/commissioning/CommissioningClient.js +6 -13
- package/dist/esm/behavior/system/commissioning/CommissioningClient.js.map +1 -1
- package/dist/esm/behavior/system/commissioning/CommissioningServer.d.ts +3 -2
- package/dist/esm/behavior/system/commissioning/CommissioningServer.d.ts.map +1 -1
- package/dist/esm/behavior/system/commissioning/CommissioningServer.js +3 -7
- package/dist/esm/behavior/system/commissioning/CommissioningServer.js.map +1 -1
- package/dist/esm/behavior/system/mqtt/MqttInterface.d.ts.map +1 -1
- package/dist/esm/behavior/system/mqtt/MqttInterface.js +91 -30
- package/dist/esm/behavior/system/mqtt/MqttInterface.js.map +1 -1
- package/dist/esm/behavior/system/network/NetworkRuntime.d.ts.map +1 -1
- package/dist/esm/behavior/system/network/NetworkRuntime.js +1 -3
- package/dist/esm/behavior/system/network/NetworkRuntime.js.map +1 -1
- package/dist/esm/behavior/system/network/ServerGroupNetworking.js +2 -2
- package/dist/esm/behavior/system/network/ServerGroupNetworking.js.map +1 -1
- package/dist/esm/behavior/system/network/ServerNetworkRuntime.d.ts.map +1 -1
- package/dist/esm/behavior/system/network/ServerNetworkRuntime.js +152 -14
- package/dist/esm/behavior/system/network/ServerNetworkRuntime.js.map +2 -2
- package/dist/esm/behavior/system/remote/RemoteInterface.d.ts +3 -2
- package/dist/esm/behavior/system/remote/RemoteInterface.d.ts.map +1 -1
- package/dist/esm/behavior/system/remote/RemoteInterface.js +76 -11
- package/dist/esm/behavior/system/remote/RemoteInterface.js.map +1 -1
- package/dist/esm/behavior/system/remote/api/Api.d.ts.map +1 -1
- package/dist/esm/behavior/system/remote/api/Api.js +4 -3
- package/dist/esm/behavior/system/remote/api/Api.js.map +1 -1
- package/dist/esm/behavior/system/sessions/SessionsBehavior.js +2 -2
- package/dist/esm/behavior/system/sessions/SessionsBehavior.js.map +1 -1
- package/dist/esm/behavior/system/subscriptions/SubscriptionsServer.d.ts.map +1 -1
- package/dist/esm/behavior/system/subscriptions/SubscriptionsServer.js +17 -14
- package/dist/esm/behavior/system/subscriptions/SubscriptionsServer.js.map +1 -1
- package/dist/esm/behavior/system/websocket/WebSocketInterface.d.ts.map +1 -1
- package/dist/esm/behavior/system/websocket/WebSocketInterface.js +11 -3
- package/dist/esm/behavior/system/websocket/WebSocketInterface.js.map +1 -1
- package/dist/esm/behaviors/access-control/AccessControlServer.js +1 -1
- package/dist/esm/behaviors/access-control/AccessControlServer.js.map +1 -1
- package/dist/esm/behaviors/administrator-commissioning/AdministratorCommissioningServer.d.ts.map +1 -1
- package/dist/esm/behaviors/administrator-commissioning/AdministratorCommissioningServer.js +66 -8
- package/dist/esm/behaviors/administrator-commissioning/AdministratorCommissioningServer.js.map +1 -1
- package/dist/esm/behaviors/basic-information/BasicInformationServer.js +2 -2
- package/dist/esm/behaviors/basic-information/BasicInformationServer.js.map +1 -1
- package/dist/esm/behaviors/general-commissioning/GeneralCommissioningServer.d.ts.map +1 -1
- package/dist/esm/behaviors/general-commissioning/GeneralCommissioningServer.js +13 -9
- package/dist/esm/behaviors/general-commissioning/GeneralCommissioningServer.js.map +1 -1
- package/dist/esm/behaviors/general-commissioning/ServerNodeFailsafeContext.d.ts +2 -3
- package/dist/esm/behaviors/general-commissioning/ServerNodeFailsafeContext.d.ts.map +1 -1
- package/dist/esm/behaviors/general-commissioning/ServerNodeFailsafeContext.js +2 -10
- package/dist/esm/behaviors/general-commissioning/ServerNodeFailsafeContext.js.map +1 -1
- package/dist/esm/behaviors/general-diagnostics/GeneralDiagnosticsServer.js +1 -1
- package/dist/esm/behaviors/general-diagnostics/GeneralDiagnosticsServer.js.map +1 -1
- package/dist/esm/behaviors/group-key-management/GroupKeyManagementServer.js +1 -1
- package/dist/esm/behaviors/group-key-management/GroupKeyManagementServer.js.map +1 -1
- package/dist/esm/behaviors/operational-credentials/OperationalCredentialsServer.d.ts +0 -1
- package/dist/esm/behaviors/operational-credentials/OperationalCredentialsServer.d.ts.map +1 -1
- package/dist/esm/behaviors/operational-credentials/OperationalCredentialsServer.js +15 -15
- package/dist/esm/behaviors/operational-credentials/OperationalCredentialsServer.js.map +1 -1
- package/dist/esm/behaviors/scenes-management/ScenesManagementServer.js +1 -1
- package/dist/esm/behaviors/scenes-management/ScenesManagementServer.js.map +1 -1
- package/dist/esm/behaviors/thermostat/AtomicWriteHandler.js +1 -1
- package/dist/esm/behaviors/thermostat/AtomicWriteHandler.js.map +1 -1
- package/dist/esm/behaviors/window-covering/WindowCoveringServer.d.ts.map +1 -1
- package/dist/esm/behaviors/window-covering/WindowCoveringServer.js +22 -9
- package/dist/esm/behaviors/window-covering/WindowCoveringServer.js.map +1 -1
- package/dist/esm/endpoint/Endpoint.d.ts +2 -1
- package/dist/esm/endpoint/Endpoint.d.ts.map +1 -1
- package/dist/esm/endpoint/Endpoint.js +96 -8
- package/dist/esm/endpoint/Endpoint.js.map +2 -2
- package/dist/esm/endpoint/properties/Behaviors.d.ts.map +1 -1
- package/dist/esm/endpoint/properties/Behaviors.js +11 -7
- package/dist/esm/endpoint/properties/Behaviors.js.map +1 -1
- package/dist/esm/endpoint/properties/Commands.js +1 -1
- package/dist/esm/endpoint/properties/Commands.js.map +1 -1
- package/dist/esm/endpoint/properties/EndpointLifecycle.d.ts.map +1 -1
- package/dist/esm/endpoint/properties/EndpointLifecycle.js +3 -0
- package/dist/esm/endpoint/properties/EndpointLifecycle.js.map +1 -1
- package/dist/esm/node/ClientNode.d.ts.map +1 -1
- package/dist/esm/node/ClientNode.js +2 -0
- package/dist/esm/node/ClientNode.js.map +1 -1
- package/dist/esm/node/Node.d.ts +2 -2
- package/dist/esm/node/Node.d.ts.map +1 -1
- package/dist/esm/node/Node.js +4 -3
- package/dist/esm/node/Node.js.map +1 -1
- package/dist/esm/node/ServerNode.d.ts.map +1 -1
- package/dist/esm/node/ServerNode.js +54 -1
- package/dist/esm/node/ServerNode.js.map +1 -1
- package/dist/esm/node/client/ClientCommandMethod.d.ts.map +1 -1
- package/dist/esm/node/client/ClientCommandMethod.js +26 -29
- package/dist/esm/node/client/ClientCommandMethod.js.map +1 -1
- package/dist/esm/node/client/NodePeerAddressStore.d.ts +3 -3
- package/dist/esm/node/client/NodePeerAddressStore.d.ts.map +1 -1
- package/dist/esm/node/client/NodePeerAddressStore.js.map +1 -1
- package/dist/esm/node/client/Peers.d.ts.map +1 -1
- package/dist/esm/node/client/Peers.js +15 -1
- package/dist/esm/node/client/Peers.js.map +1 -1
- package/dist/esm/node/integration/ProtocolService.d.ts.map +1 -1
- package/dist/esm/node/integration/ProtocolService.js +4 -2
- package/dist/esm/node/integration/ProtocolService.js.map +1 -1
- package/dist/esm/node/server/InteractionServer.d.ts.map +1 -1
- package/dist/esm/node/server/InteractionServer.js +58 -50
- package/dist/esm/node/server/InteractionServer.js.map +2 -2
- package/dist/esm/node/server/ServerEnvironment.js +1 -1
- package/dist/esm/node/server/ServerEnvironment.js.map +1 -1
- package/dist/esm/node/server/ServerSubscription.d.ts +61 -10
- package/dist/esm/node/server/ServerSubscription.d.ts.map +1 -1
- package/dist/esm/node/server/ServerSubscription.js +321 -159
- package/dist/esm/node/server/ServerSubscription.js.map +2 -2
- package/package.json +7 -7
- package/src/behavior/Behavior.ts +12 -0
- package/src/behavior/Events.ts +12 -8
- package/src/behavior/Transitions.ts +3 -3
- package/src/behavior/cluster/ClusterBehaviorType.ts +2 -2
- package/src/behavior/cluster/ClusterEvents.ts +1 -1
- package/src/behavior/context/NodeActivity.ts +4 -13
- package/src/behavior/context/server/LocalActorContext.ts +6 -8
- package/src/behavior/context/server/RemoteActorContext.ts +34 -33
- package/src/behavior/internal/BehaviorBacking.ts +5 -0
- package/src/behavior/internal/Reactors.ts +1 -0
- package/src/behavior/state/managed/Datasource.ts +2 -1
- package/src/behavior/system/commissioning/CommissioningClient.ts +6 -13
- package/src/behavior/system/commissioning/CommissioningServer.ts +6 -8
- package/src/behavior/system/mqtt/MqttInterface.ts +6 -2
- package/src/behavior/system/network/NetworkRuntime.ts +1 -3
- package/src/behavior/system/network/ServerGroupNetworking.ts +2 -2
- package/src/behavior/system/network/ServerNetworkRuntime.ts +49 -15
- package/src/behavior/system/remote/RemoteInterface.ts +22 -4
- package/src/behavior/system/remote/api/Api.ts +4 -3
- package/src/behavior/system/sessions/SessionsBehavior.ts +2 -2
- package/src/behavior/system/subscriptions/SubscriptionsServer.ts +15 -13
- package/src/behavior/system/websocket/WebSocketInterface.ts +2 -1
- package/src/behaviors/access-control/AccessControlServer.ts +1 -1
- package/src/behaviors/administrator-commissioning/AdministratorCommissioningServer.ts +14 -7
- package/src/behaviors/basic-information/BasicInformationServer.ts +2 -2
- package/src/behaviors/general-commissioning/GeneralCommissioningServer.ts +14 -9
- package/src/behaviors/general-commissioning/ServerNodeFailsafeContext.ts +3 -15
- package/src/behaviors/general-diagnostics/GeneralDiagnosticsServer.ts +1 -1
- package/src/behaviors/group-key-management/GroupKeyManagementServer.ts +1 -1
- package/src/behaviors/operational-credentials/OperationalCredentialsServer.ts +22 -19
- package/src/behaviors/scenes-management/ScenesManagementServer.ts +1 -1
- package/src/behaviors/thermostat/AtomicWriteHandler.ts +1 -1
- package/src/behaviors/window-covering/WindowCoveringServer.ts +24 -9
- package/src/endpoint/Endpoint.ts +21 -4
- package/src/endpoint/properties/Behaviors.ts +11 -6
- package/src/endpoint/properties/Commands.ts +1 -1
- package/src/endpoint/properties/EndpointLifecycle.ts +4 -0
- package/src/node/ClientNode.ts +3 -0
- package/src/node/Node.ts +3 -2
- package/src/node/ServerNode.ts +1 -0
- package/src/node/client/ClientCommandMethod.ts +31 -38
- package/src/node/client/NodePeerAddressStore.ts +3 -3
- package/src/node/client/Peers.ts +19 -1
- package/src/node/integration/ProtocolService.ts +4 -2
- package/src/node/server/InteractionServer.ts +62 -51
- package/src/node/server/ServerEnvironment.ts +1 -1
- package/src/node/server/ServerSubscription.ts +225 -153
|
@@ -3,6 +3,10 @@ var __defProp = Object.defineProperty;
|
|
|
3
3
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
4
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
5
|
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
|
|
7
|
+
var __typeError = (msg) => {
|
|
8
|
+
throw TypeError(msg);
|
|
9
|
+
};
|
|
6
10
|
var __export = (target, all) => {
|
|
7
11
|
for (var name in all)
|
|
8
12
|
__defProp(target, name, { get: all[name], enumerable: true });
|
|
@@ -16,6 +20,47 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
16
20
|
return to;
|
|
17
21
|
};
|
|
18
22
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
23
|
+
var __using = (stack, value, async) => {
|
|
24
|
+
if (value != null) {
|
|
25
|
+
if (typeof value !== "object" && typeof value !== "function") __typeError("Object expected");
|
|
26
|
+
var dispose, inner;
|
|
27
|
+
if (async) dispose = value[__knownSymbol("asyncDispose")];
|
|
28
|
+
if (dispose === void 0) {
|
|
29
|
+
dispose = value[__knownSymbol("dispose")];
|
|
30
|
+
if (async) inner = dispose;
|
|
31
|
+
}
|
|
32
|
+
if (typeof dispose !== "function") __typeError("Object not disposable");
|
|
33
|
+
if (inner) dispose = function() {
|
|
34
|
+
try {
|
|
35
|
+
inner.call(this);
|
|
36
|
+
} catch (e) {
|
|
37
|
+
return Promise.reject(e);
|
|
38
|
+
}
|
|
39
|
+
};
|
|
40
|
+
stack.push([async, dispose, value]);
|
|
41
|
+
} else if (async) {
|
|
42
|
+
stack.push([async]);
|
|
43
|
+
}
|
|
44
|
+
return value;
|
|
45
|
+
};
|
|
46
|
+
var __callDispose = (stack, error, hasError) => {
|
|
47
|
+
var E = typeof SuppressedError === "function" ? SuppressedError : function(e, s, m, _) {
|
|
48
|
+
return _ = Error(m), _.name = "SuppressedError", _.error = e, _.suppressed = s, _;
|
|
49
|
+
};
|
|
50
|
+
var fail = (e) => error = hasError ? new E(e, error, "An error was suppressed during disposal") : (hasError = true, e);
|
|
51
|
+
var next = (it) => {
|
|
52
|
+
while (it = stack.pop()) {
|
|
53
|
+
try {
|
|
54
|
+
var result = it[1] && it[1].call(it[2]);
|
|
55
|
+
if (it[0]) return Promise.resolve(result).then(next, (e) => (fail(e), next()));
|
|
56
|
+
} catch (e) {
|
|
57
|
+
fail(e);
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
if (hasError) throw error;
|
|
61
|
+
};
|
|
62
|
+
return next();
|
|
63
|
+
};
|
|
19
64
|
var RemoteInterface_exports = {};
|
|
20
65
|
__export(RemoteInterface_exports, {
|
|
21
66
|
RemoteInterface: () => RemoteInterface
|
|
@@ -31,10 +76,11 @@ var import_ApiPath = require("./api/ApiPath.js");
|
|
|
31
76
|
const logger = import_general.Logger.get("RemoteAdapter");
|
|
32
77
|
class RemoteInterface {
|
|
33
78
|
#node;
|
|
79
|
+
#lifetime;
|
|
34
80
|
#address;
|
|
35
81
|
#abort = new import_general.Abort();
|
|
36
82
|
#root;
|
|
37
|
-
#workers
|
|
83
|
+
#workers;
|
|
38
84
|
constructor(node, address) {
|
|
39
85
|
if (address.appProtocol !== this.constructor.protocol) {
|
|
40
86
|
throw new import_general.ImplementationError(
|
|
@@ -42,9 +88,14 @@ class RemoteInterface {
|
|
|
42
88
|
);
|
|
43
89
|
}
|
|
44
90
|
this.#node = node;
|
|
91
|
+
this.#lifetime = node.env.join((0, import_general.decamelize)(this.constructor.name, " "));
|
|
92
|
+
this.#workers = new import_general.BasicMultiplex();
|
|
45
93
|
this.#address = address;
|
|
46
94
|
this.#root = new import_ApiPath.ApiPath(address);
|
|
47
95
|
}
|
|
96
|
+
join(...name) {
|
|
97
|
+
return this.#lifetime.join(...name);
|
|
98
|
+
}
|
|
48
99
|
get root() {
|
|
49
100
|
return this.#root;
|
|
50
101
|
}
|
|
@@ -74,14 +125,22 @@ class RemoteInterface {
|
|
|
74
125
|
return instance;
|
|
75
126
|
}
|
|
76
127
|
async close() {
|
|
77
|
-
|
|
78
|
-
return;
|
|
79
|
-
}
|
|
80
|
-
this.#abort();
|
|
128
|
+
var _stack = [];
|
|
81
129
|
try {
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
130
|
+
if (this.isAborted) {
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
133
|
+
const _closing = __using(_stack, this.#lifetime.closing());
|
|
134
|
+
this.#abort();
|
|
135
|
+
try {
|
|
136
|
+
await this.stop();
|
|
137
|
+
} catch (e) {
|
|
138
|
+
logger.error(`Error terminating API endpoint ${this.address}`);
|
|
139
|
+
}
|
|
140
|
+
} catch (_) {
|
|
141
|
+
var _error = _, _hasError = true;
|
|
142
|
+
} finally {
|
|
143
|
+
__callDispose(_stack, _error, _hasError);
|
|
85
144
|
}
|
|
86
145
|
}
|
|
87
146
|
assertProtocol(appProtocol) {
|
|
@@ -91,8 +150,8 @@ class RemoteInterface {
|
|
|
91
150
|
);
|
|
92
151
|
}
|
|
93
152
|
}
|
|
94
|
-
addWorker(worker
|
|
95
|
-
this.#workers.add(worker
|
|
153
|
+
addWorker(worker) {
|
|
154
|
+
this.#workers.add(worker);
|
|
96
155
|
}
|
|
97
156
|
static protocol = "";
|
|
98
157
|
/**
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/behavior/system/remote/RemoteInterface.ts"],
|
|
4
|
-
"mappings": "
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBASO;AAEP,qBAAwB;AAjBxB;AAAA;AAAA;AAAA;AAAA;AAmBA,MAAM,SAAS,sBAAO,IAAI,eAAe;AAKlC,MAAe,gBAAgB;AAAA,EAClC;AAAA,EACA;AAAA,EACA;AAAA,EACA,SAAS,IAAI,qBAAM;AAAA,EACnB;AAAA,EACA;AAAA,EAEA,YAAY,MAAkB,SAAqB;AAC/C,QAAI,QAAQ,gBAAiB,KAAK,YAAgD,UAAU;AACxF,YAAM,IAAI;AAAA,QACN,qBAAqB,KAAK,YAAY,IAAI,6BAA6B,OAAO;AAAA,MAClF;AAAA,IACJ;AACA,SAAK,QAAQ;AACb,SAAK,YAAY,KAAK,IAAI,SAAK,2BAAW,KAAK,YAAY,MAAM,GAAG,CAAC;AACrE,SAAK,WAAW,IAAI,8BAAe;AACnC,SAAK,WAAW;AAChB,SAAK,QAAQ,IAAI,uBAAQ,OAAO;AAAA,EACpC;AAAA,EAEA,QAAQ,MAAiB;AACrB,WAAO,KAAK,UAAU,KAAK,GAAG,IAAI;AAAA,EACtC;AAAA,EAEA,IAAI,OAAO;AACP,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,MAAM;AACN,WAAO,KAAK,MAAM;AAAA,EACtB;AAAA,EAEA,IAAI,OAAO;AACP,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,UAAU;AACV,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,YAAY;AACZ,WAAO,KAAK,OAAO;AAAA,EACvB;AAAA,EAEA,IAAI,QAAQ;AACR,WAAO,KAAK,OAAO;AAAA,EACvB;AAAA,EAEA,aAAa,OAET,MACA,SACF;AACE,UAAM,WAAW,IAAI,KAAK,MAAM,OAAO;AACvC,QAAI;AACA,YAAM,SAAS,MAAM;AAAA,IACzB,SAAS,GAAG;AACR,YAAM,SAAS,MAAM;AACrB,YAAM;AAAA,IACV;AACA,WAAO;AAAA,EACX;AAAA,EAEA,MAAM,QAAuB;AAKzB;AAAA;AAJA,UAAI,KAAK,WAAW;AAChB;AAAA,MACJ;AAEA,YAAM,WAAW,qBAAK,UAAU,QAAQ;AAExC,WAAK,OAAO;AAEZ,UAAI;AACA,cAAM,KAAK,KAAK;AAAA,MACpB,SAAS,GAAG;AACR,eAAO,MAAM,kCAAkC,KAAK,OAAO,EAAE;AAAA,MACjE;AAAA,aARA;AAAA;AAAA;AAAA;AAAA;AAAA,EASJ;AAAA,EAEU,eAAe,aAAqB;AAC1C,QAAI,KAAK,QAAQ,gBAAgB,aAAa;AAC1C,YAAM,IAAI;AAAA,QACN,oBAAoB,KAAK,OAAO,yBAAyB,KAAK,YAAY,IAAI;AAAA,MAClF;AAAA,IACJ;AAAA,EACJ;AAAA,EAEU,UAAU,QAAuB;AACvC,SAAK,SAAS,IAAI,MAAM;AAAA,EAC5B;AAAA,EAEA,OAAO,WAAW;AAAA;AAAA;AAAA;AAAA,EAUlB,MAAgB,OAAsB;AAClC,UAAM,KAAK,SAAS,MAAM;AAAA,EAC9B;AACJ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Api.d.ts","sourceRoot":"","sources":["../../../../../../src/behavior/system/remote/api/Api.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAA8C,MAAM,UAAU,CAAC;AAE7E,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"Api.d.ts","sourceRoot":"","sources":["../../../../../../src/behavior/system/remote/api/Api.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAA8C,MAAM,UAAU,CAAC;AAE7E,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGjD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAOrD;;;;;;;GAOG;AACH,yBAAiB,GAAG,CAAC;IACjB;;OAEG;IACH,SAAsB,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAwB1F;IAED,SAAgB,GAAG,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,QAM3G;IAED,SAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAElG;IAED,SAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,QAcrE;IAED;;OAEG;IACH,SAAsB,OAAO,CACzB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,KAAK,CAAC,MAAM,GACrB,OAAO,CAAC,aAAa,CAAC,CAmExB;IAED,SAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,OAAO,GAAG,aAAa,CAWvG;CACJ"}
|
|
@@ -23,6 +23,7 @@ __export(Api_exports, {
|
|
|
23
23
|
module.exports = __toCommonJS(Api_exports);
|
|
24
24
|
var import_general = require("#general");
|
|
25
25
|
var import_Node = require("#node/Node.js");
|
|
26
|
+
var import_protocol = require("#protocol");
|
|
26
27
|
var import_types = require("#types");
|
|
27
28
|
var import_ApiPath = require("./ApiPath.js");
|
|
28
29
|
var import_RemoteResponse = require("./RemoteResponse.js");
|
|
@@ -63,15 +64,15 @@ var Api;
|
|
|
63
64
|
if (!logger) {
|
|
64
65
|
loggers.set(facility, logger = import_general.Logger.get(facility));
|
|
65
66
|
}
|
|
66
|
-
logger[level](import_general.Diagnostic.via(id
|
|
67
|
+
logger[level](import_general.Diagnostic.via(id || "(anon)"), message);
|
|
67
68
|
}
|
|
68
69
|
Api2.log = log;
|
|
69
70
|
function logRequest(facility, id, method, target) {
|
|
70
|
-
log("info", facility, id,
|
|
71
|
+
log("info", facility, id, import_protocol.Mark.INBOUND, import_general.Diagnostic.strong(method), target);
|
|
71
72
|
}
|
|
72
73
|
Api2.logRequest = logRequest;
|
|
73
74
|
function logResponse(facility, response) {
|
|
74
|
-
const message = Array(
|
|
75
|
+
const message = Array(import_protocol.Mark.OUTBOUND, import_RemoteResponse.RemoteResponse.describe(response));
|
|
75
76
|
let level;
|
|
76
77
|
switch (response.kind) {
|
|
77
78
|
case "error":
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../../src/behavior/system/remote/api/Api.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,qBAAkE;AAClE,kBAAqB;AAErB,mBAAoD;AACpD,qBAAwB;AAIxB,4BAA+B;AAC/B,8BAAiC;AACjC,0BAA6B;AAC7B,gCAAmC;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["Api", "item", "value"]
|
|
6
6
|
}
|
|
@@ -40,11 +40,11 @@ class SessionsBehavior extends import_Behavior.Behavior {
|
|
|
40
40
|
}
|
|
41
41
|
#convertToExposedSession(session) {
|
|
42
42
|
return {
|
|
43
|
-
name: session.
|
|
43
|
+
name: session.via,
|
|
44
44
|
nodeId: session.nodeId,
|
|
45
45
|
peerNodeId: session.peerNodeId,
|
|
46
46
|
fabric: session.fabric?.externalInformation,
|
|
47
|
-
isPeerActive: session.isPeerActive
|
|
47
|
+
isPeerActive: session.isPeerActive,
|
|
48
48
|
lastInteractionTimestamp: session.timestamp,
|
|
49
49
|
lastActiveTimestamp: session.activeTimestamp,
|
|
50
50
|
numberOfActiveSubscriptions: session.subscriptions.size
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/behavior/system/sessions/SessionsBehavior.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAyC;AAEzC,sBAAoF;AAGpF,sBAAyB;AAXzB;AAAA;AAAA;AAAA;AAAA;AAgBO,MAAM,yBAAyB,yBAAS;AAAA,EAC3C,OAAyB,KAAK;AAAA,EAKrB,aAAa;AAClB,UAAM,MAAM,KAAK;AACjB,QAAI,IAAI,IAAI,8BAAc,GAAG;AACzB,WAAK,iBAAiB,IAAI,IAAI,8BAAc,CAAC;AAAA,IACjD;AACA,SAAK,QAAS,KAAK,SAAS,UAA4B,SAAS,KAAK,iBAAiB;AAAA,EAC3F;AAAA,EAEA,yBAAyB,SAAgD;AACrE,WAAO;AAAA,MACH,MAAM,QAAQ;AAAA,MACd,QAAQ,QAAQ;AAAA,MAChB,YAAY,QAAQ;AAAA,MACpB,QAAQ,QAAQ,QAAQ;AAAA,MACxB,cAAc,QAAQ
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAyC;AAEzC,sBAAoF;AAGpF,sBAAyB;AAXzB;AAAA;AAAA;AAAA;AAAA;AAgBO,MAAM,yBAAyB,yBAAS;AAAA,EAC3C,OAAyB,KAAK;AAAA,EAKrB,aAAa;AAClB,UAAM,MAAM,KAAK;AACjB,QAAI,IAAI,IAAI,8BAAc,GAAG;AACzB,WAAK,iBAAiB,IAAI,IAAI,8BAAc,CAAC;AAAA,IACjD;AACA,SAAK,QAAS,KAAK,SAAS,UAA4B,SAAS,KAAK,iBAAiB;AAAA,EAC3F;AAAA,EAEA,yBAAyB,SAAgD;AACrE,WAAO;AAAA,MACH,MAAM,QAAQ;AAAA,MACd,QAAQ,QAAQ;AAAA,MAChB,YAAY,QAAQ;AAAA,MACpB,QAAQ,QAAQ,QAAQ;AAAA,MACxB,cAAc,QAAQ;AAAA,MACtB,0BAA0B,QAAQ;AAAA,MAClC,qBAAqB,QAAQ;AAAA,MAC7B,6BAA6B,QAAQ,cAAc;AAAA,IACvD;AAAA,EACJ;AAAA,EAEA,iBAAiB,UAA0B;AACvC,SAAK,QAAQ,SAAS,SAAS,OAAO,KAAK,cAAc;AAEzD,SAAK,QAAQ,SAAS,SAAS,SAAS,KAAK,cAAc;AAE3D,SAAK,QAAQ,SAAS,sBAAsB,KAAK,uBAAuB,EAAE,MAAM,KAAK,CAAC;AAAA,EAC1F;AAAA,EAEA,eAAe,SAAsB;AACjC,QAAI,QAAQ,QAAQ;AAChB;AAAA,IACJ;AACA,UAAM,iBAAiB,KAAK,yBAAyB,OAAO;AAC5D,SAAK,MAAM,SAAS,QAAQ,EAAE,IAAI;AAClC,SAAK,OAAO,OAAO,KAAK,cAAc;AAAA,EAC1C;AAAA,EAEA,eAAe,SAAsB;AACjC,QAAI,EAAE,QAAQ,MAAM,KAAK,MAAM,WAAW;AACtC;AAAA,IACJ;AAEA,WAAO,KAAK,MAAM,SAAS,QAAQ,EAAE;AACrC,SAAK,OAAO,OAAO,KAAK,KAAK,yBAAyB,OAAO,CAAC;AAAA,EAClE;AAAA,EAEA,sBAAsB,SAAsB,cAA4B;AACpE,QAAI,QAAQ,QAAQ;AAChB;AAAA,IACJ;AAGA,QAAI,QAAQ,cAAc,IAAI,YAAY,GAAG;AACzC,WAAK,OAAO,kBAAkB,KAAK,YAAY;AAAA,IACnD;AAEA,UAAM,eAAe,KAAK,MAAM,SAAS,QAAQ,EAAE;AACnD,QAAI,iBAAiB,QAAW;AAC5B;AAAA,IACJ;AAEA,iBAAa,8BAA8B,QAAQ,cAAc;AACjE,SAAK,MAAM,SAAS,QAAQ,EAAE,IAAI;AAClC,SAAK,OAAO,qBAAqB,KAAK,YAAY;AAAA,EACtD;AAAA,EAEA,oBAAoB;AAChB,SAAK,MAAM,WAAW,CAAC;AAAA,EAC3B;AACJ;AAAA,CAEO,CAAUA,sBAAV;AAAA,EAYI,MAAM,MAAM;AAAA,IACf,WAAoC,CAAC;AAAA,EACzC;AAFO,EAAAA,kBAAM;AAAA,EAIN,MAAM,eAAe,4BAAa;AAAA,IACrC,aAAS,2BAA+B;AAAA,IACxC,aAAS,2BAA+B;AAAA,IACxC,2BAAuB,2BAA+B;AAAA,IACtD,wBAAoB,2BAAyC;AAAA,EACjE;AALO,EAAAA,kBAAM;AAAA,GAhBA;",
|
|
5
5
|
"names": ["SessionsBehavior"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubscriptionsServer.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/subscriptions/SubscriptionsServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,aAAa,EAAgB,MAAM,QAAQ,CAAC;AACrD,OAAO,EAAqB,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"SubscriptionsServer.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/subscriptions/SubscriptionsServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,aAAa,EAAgB,MAAM,QAAQ,CAAC;AACrD,OAAO,EAAqB,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAYxF,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAO7C;;;;;;GAMG;AACH,qBAAa,qBAAsB,SAAQ,QAAQ;;IAC/C,gBAAyB,EAAE,mBAAmB;IAEtC,KAAK,EAAE,qBAAqB,CAAC,KAAK,CAAC;IACnC,QAAQ,EAAE,qBAAqB,CAAC,QAAQ,CAAC;IAExC,UAAU;IAUnB,gBAAyB,MAAM,gBAoF7B;IAiEI,8BAA8B;CAwFvC;AAED,yBAAiB,qBAAqB,CAAC;IACnC,MAAa,KAAK;QACd,sEAAsE;QACtE,kBAAkB,UAAQ;QAE1B;;;WAGG;QACH,aAAa,EAAE,gBAAgB,EAAE,CAAM;KAC1C;IAED,MAAa,QAAQ;QACjB;;;WAGG;QACH,mBAAmB,qBAA6B;KACnD;CACJ"}
|
|
@@ -134,11 +134,11 @@ class SubscriptionsBehavior extends import_Behavior.Behavior {
|
|
|
134
134
|
#addSubscription(subscription) {
|
|
135
135
|
if (this.state.persistenceEnabled === false || !(subscription instanceof import_ServerSubscription.ServerSubscription)) return;
|
|
136
136
|
const {
|
|
137
|
-
|
|
137
|
+
request: { attributeRequests, eventRequests, isFabricFiltered },
|
|
138
138
|
session,
|
|
139
139
|
maxInterval,
|
|
140
140
|
sendInterval,
|
|
141
|
-
id,
|
|
141
|
+
subscriptionId: id,
|
|
142
142
|
maxIntervalCeiling,
|
|
143
143
|
minIntervalFloor
|
|
144
144
|
} = subscription;
|
|
@@ -146,10 +146,9 @@ class SubscriptionsBehavior extends import_Behavior.Behavior {
|
|
|
146
146
|
const { fabricIndex, nodeId } = peerAddress;
|
|
147
147
|
let operationalAddress;
|
|
148
148
|
try {
|
|
149
|
-
|
|
150
|
-
operationalAddress = (0, import_general.isIpNetworkChannel)(channel) ? channel.networkAddress : void 0;
|
|
149
|
+
operationalAddress = (0, import_general.isIpNetworkChannel)(session.channel) ? session.channel.networkAddress : void 0;
|
|
151
150
|
} catch (error) {
|
|
152
|
-
import_protocol.
|
|
151
|
+
import_protocol.SessionClosedError.accept(error);
|
|
153
152
|
}
|
|
154
153
|
const peerSubscription = {
|
|
155
154
|
subscriptionId: id,
|
|
@@ -173,7 +172,7 @@ class SubscriptionsBehavior extends import_Behavior.Behavior {
|
|
|
173
172
|
}
|
|
174
173
|
#subscriptionCancelled(subscription) {
|
|
175
174
|
if (subscription.isCanceledByPeer && this.state.persistenceEnabled !== false) {
|
|
176
|
-
const { id } = subscription;
|
|
175
|
+
const { subscriptionId: id } = subscription;
|
|
177
176
|
const subscriptionIndex = this.state.subscriptions.findIndex(({ subscriptionId }) => id === subscriptionId);
|
|
178
177
|
if (subscriptionIndex !== -1) {
|
|
179
178
|
return this.#removeSubscriptionIndex(subscriptionIndex);
|
|
@@ -210,8 +209,10 @@ class SubscriptionsBehavior extends import_Behavior.Behavior {
|
|
|
210
209
|
logger.debug(`Skip reestablishing former subscription to ${peerAddress}`);
|
|
211
210
|
continue;
|
|
212
211
|
}
|
|
213
|
-
logger.debug(
|
|
214
|
-
|
|
212
|
+
logger.debug(
|
|
213
|
+
`Try to reestablish former subscription ${import_protocol.Subscription.idStrOf(subscription)} to ${peerAddress}`
|
|
214
|
+
);
|
|
215
|
+
if (sessions.maybeSessionFor(peerAddress) !== void 0) {
|
|
215
216
|
logger.debug(`We already have and existing session for peer ${peerAddress}`);
|
|
216
217
|
} else {
|
|
217
218
|
try {
|
|
@@ -233,10 +234,12 @@ class SubscriptionsBehavior extends import_Behavior.Behavior {
|
|
|
233
234
|
}
|
|
234
235
|
try {
|
|
235
236
|
if (peerStopList.has(peerAddress)) {
|
|
236
|
-
logger.debug(
|
|
237
|
+
logger.debug(
|
|
238
|
+
`Skip re-establishing former subscription ${import_protocol.Subscription.idStrOf(subscriptionId)} to ${peerAddress}`
|
|
239
|
+
);
|
|
237
240
|
continue;
|
|
238
241
|
}
|
|
239
|
-
const session = sessions.
|
|
242
|
+
const session = sessions.maybeSessionFor(peerAddress);
|
|
240
243
|
if (session === void 0) {
|
|
241
244
|
peerStopList.add(peerAddress);
|
|
242
245
|
logger.debug(`Could not connect to peer ${peerAddress}`);
|
|
@@ -245,7 +248,7 @@ class SubscriptionsBehavior extends import_Behavior.Behavior {
|
|
|
245
248
|
await interactionServer.establishFormerSubscription(subscription, session);
|
|
246
249
|
} catch (error) {
|
|
247
250
|
logger.debug(
|
|
248
|
-
`Failed to re-establish former subscription ${subscriptionId} to ${peerAddress}`,
|
|
251
|
+
`Failed to re-establish former subscription ${import_protocol.Subscription.idStrOf(subscriptionId)} to ${peerAddress}`,
|
|
249
252
|
import_types.StatusResponseError.is(error) ? error.code === import_types.StatusCode.InvalidSubscription ? "Subscription no langer valid for peer" : error.message : error
|
|
250
253
|
);
|
|
251
254
|
continue;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/behavior/system/subscriptions/SubscriptionsServer.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAA2G;AAC3G,mBAA4C;AAC5C,+BAAoD;AACpD,gCAAmC;AACnC,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["SubscriptionsBehavior"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSocketInterface.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/websocket/WebSocketInterface.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AASH,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAI/D;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,eAAe;;IACnD,OAAgB,QAAQ,SAAQ;cAKP,KAAK;cAKL,IAAI;
|
|
1
|
+
{"version":3,"file":"WebSocketInterface.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/websocket/WebSocketInterface.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AASH,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAI/D;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,eAAe;;IACnD,OAAgB,QAAQ,SAAQ;cAKP,KAAK;cAKL,IAAI;CAgGhC"}
|
|
@@ -160,11 +160,19 @@ class WebSocketInterface extends import_RemoteInterface.RemoteInterface {
|
|
|
160
160
|
return;
|
|
161
161
|
}
|
|
162
162
|
await send({ id: request.id, kind: "ok" });
|
|
163
|
-
this.addWorker(this.#handleSubscription(response.stream, send)
|
|
163
|
+
this.addWorker(this.#handleSubscription(response.stream, send));
|
|
164
164
|
}
|
|
165
165
|
async #handleSubscription(stream, send) {
|
|
166
|
-
|
|
167
|
-
|
|
166
|
+
var _stack = [];
|
|
167
|
+
try {
|
|
168
|
+
const _streaming = __using(_stack, this.join("streaming"));
|
|
169
|
+
for await (const update of stream) {
|
|
170
|
+
await send(update.js);
|
|
171
|
+
}
|
|
172
|
+
} catch (_) {
|
|
173
|
+
var _error = _, _hasError = true;
|
|
174
|
+
} finally {
|
|
175
|
+
__callDispose(_stack, _error, _hasError);
|
|
168
176
|
}
|
|
169
177
|
}
|
|
170
178
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/behavior/system/websocket/WebSocketInterface.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAA2F;AAC3F,mBAAoD;AACpD,iBAAoB;AACpB,qBAAwB;AAExB,2BAA8B;AAC9B,4BAA+B;AAC/B,6BAAgC;AAbhC;AAAA;AAAA;AAAA;AAAA;AAeA,MAAM,eAAe;AAKd,MAAM,2BAA2B,uCAAgB;AAAA,EACpD,OAAgB,WAAW;AAAA,EAE3B;AAAA,EACA,SAAS,IAAI,qBAAM,IAAI;AAAA,EAEvB,MAAyB,QAAQ;AAC7B,SAAK,QAAQ,MAAM,KAAK,IAAI,IAAI,0BAAW,EAAE,OAAO,KAAK,OAAO;AAChE,SAAK,MAAM,KAAK,KAAK,kBAAkB,KAAK,IAAI;AAAA,EACpD;AAAA,EAEA,MAAyB,OAAO;AAC5B,UAAM,MAAM,KAAK;AACjB,UAAM,KAAK,OAAO,MAAM;AAAA,EAC5B;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,MAAM,kBAAkB,SAAkB,SAAmD;AAczF;AAAA;AAZA,YAAM,UAAU,IAAI,0BAAW,QAAQ,GAAG;AAC1C,YAAM,OAAO,IAAI,uBAAQ,OAAO,EAAE,SAAS;AAC3C,UAAI,SAAS,KAAK,KAAK,SAAS,GAAG;AAC/B;AAAA,MACJ;AAGA,YAAM,KAAK,MAAM,qBAAM,KAAK,KAAK,OAAO,MAAM,QAAQ,CAAC;AACvD,UAAI,CAAC,IAAI;AACL;AAAA,MACJ;AAEA,YAAM,UAAU,qCAAM,QAAQ,KAAK,KAAK;AAExC,YAAM,OAAO,OAAO,UAAyB;AACzC,cAAM,KAAK,OAAO,QAAQ,YAAY;AAClC,gBAAM,cAAU,sCAAe,KAAK;AACpC,yBAAI,YAAY,cAAc,OAAO;AACrC,gBAAM,SAAS,GAAG,SAAS,UAAU;AACrC,cAAI;AACA,kBAAM,OAAO,UAAM,uBAAO,OAAO,CAAC;AAAA,UACtC,UAAE;AACE,mBAAO,YAAY;AAAA,UACvB;AAAA,QACJ,CAAC;AAAA,MACL;AAEA,qBAAe,WAAW,sBAAO,SAAS,GAAG,QAAQ,GAAG;AACpD,YAAI;AACJ,YAAI;AACA,oBAAU,qBAAM,SAAS,OAAO;AAEhC,cAAI;AACJ,cAAI;AACA,qBAAS,KAAK,MAAM,OAAO;AAAA,UAC/B,SAAS,GAAG;AACR,gBAAI,aAAa,aAAa;AAC1B,oBAAM,IAAI,4BAAe,oBAAoB,wBAAwB,EAAE,OAAO,EAAE;AAAA,YACpF;AACA,kBAAM;AAAA,UACV;AACA,sBAAa,QAA0B;AAEvC,gBAAMA,eAAU,oCAAc,MAAM;AAEpC,gBAAM,KAAK,eAAeA,UAAS,SAAS,IAAI;AAAA,QACpD,SAAS,OAAO;AACZ,2CAAoB,OAAO,KAAK;AAEhC,gBAAM,KAAK;AAAA,YACP,MAAM;AAAA,YACN,IAAI;AAAA,YACJ;AAAA,UACJ,CAAC;AAAA,QACL;AAAA,MACJ;AAGA,cAAQ,MAAM;AAAA,aA9Cd;AAAA;AAAA;AAAA;AAAA;AAAA,EA+CJ;AAAA,EAEA,MAAM,eACF,SACA,OACA,MACF;AACE,UAAM,WAAW,MAAM,KAAK,OAAO,QAAQ,MAAM,eAAI,QAAQ,cAAc,KAAK,MAAM,SAAS,KAAK,CAAC;AAErG,QAAI,SAAS,SAAS,gBAAgB;AAClC,YAAM,KAAK,QAAQ;AACnB;AAAA,IACJ;AAEA,UAAM,KAAK,EAAE,IAAI,QAAQ,IAAI,MAAM,KAAK,CAAC;AAEzC,SAAK,UAAU,KAAK,oBAAoB,SAAS,QAAQ,IAAI,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["request"]
|
|
6
6
|
}
|
|
@@ -63,7 +63,7 @@ class AccessControlServer extends import_AccessControlBehavior.AccessControlBeha
|
|
|
63
63
|
fabric.accessControl.aclList = fabricAcls;
|
|
64
64
|
fabric.accessControl.extensionEntryAccessCheck = this.extensionEntryAccessCheck.bind(this);
|
|
65
65
|
}
|
|
66
|
-
this.reactTo(fabrics.events.
|
|
66
|
+
this.reactTo(fabrics.events.replaced, this.#updateFabricAcls);
|
|
67
67
|
this.reactTo(fabrics.events.added, this.#updateFabricAcls);
|
|
68
68
|
this.reactTo(this.events.interactionBegin, this.#handleInteractionBegin);
|
|
69
69
|
this.reactTo(this.events.interactionEnd, this.#handleInteractionEnd);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/behaviors/access-control/AccessControlServer.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,4BAAoD;AACpD,qBAAqE;AAErE,sBAaO;AACP,mBAaO;AACP,mCAAsC;AAtCtC;AAAA;AAAA;AAAA;AAAA;AAwCA,MAAM,SAAS,sBAAO,IAAI,qBAAqB;AAQxC,MAAM,4BAA4B,mDAAsB,KAAK,WAAW,EAAE;AAAA,EAGpE,aAA2B;AAChC,SAAK,QAAQ,KAAK,OAAO,cAAc,KAAK,iCAAiC;AAC7E,SAAK,QAAQ,KAAK,OAAO,aAAa,KAAK,8BAA8B;AACzE,QAAI,KAAK,MAAM,cAAc,QAAW;AACpC,WAAK,aAAa,KAAK,OAAO,oBAAoB,KAAK,sCAAsC;AAC7F,WAAK,aAAa,KAAK,OAAO,mBAAmB,KAAK,mCAAmC;AAAA,IAC7F;AAEA,UAAM,YAAY,KAAK,SAAS;AAChC,SAAK,QAAQ,UAAU,QAAQ,KAAK,OAAO;AAAA,EAC/C;AAAA,EAEA,UAAU;AACN,UAAM,gBAAgB,KAAK,eAAe;AAG1C,UAAM,UAAU,KAAK,IAAI,IAAI,6BAAa;AAC1C,eAAW,UAAU,SAAS;AAC1B,YAAM,aAAa,cAAc,IAAI,OAAO,WAAW,KAAK,CAAC;AAE7D,UAAI,CAAC,WAAW,QAAQ;AAGpB,cAAM,cAAqD;AAAA,UACvD,WAAW,sBAAAA,cAAmB,4BAA4B;AAAA,UAC1D,UAAU,sBAAAA,cAAmB,2BAA2B;AAAA,UACxD,UAAU,CAAC,OAAO,UAAU;AAAA,UAC5B,SAAS;AAAA;AAAA,UACT,aAAa,OAAO;AAAA,QACxB;AACA,aAAK,MAAM,IAAI,KAAK,WAAW;AAC/B,mBAAW,KAAK,WAAW;AAAA,MAC/B;AACA,aAAO,cAAc,UAAU;AAC/B,aAAO,cAAc,4BAA4B,KAAK,0BAA0B,KAAK,IAAI;AAAA,IAC7F;AAGA,SAAK,QAAQ,QAAQ,OAAO,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["AccessControlTypes", "AccessControlServer"]
|
|
6
6
|
}
|
package/dist/cjs/behaviors/administrator-commissioning/AdministratorCommissioningServer.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AdministratorCommissioningServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/administrator-commissioning/AdministratorCommissioningServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"AdministratorCommissioningServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/administrator-commissioning/AdministratorCommissioningServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,QAAQ,EAAwC,KAAK,EAAU,MAAM,UAAU,CAAC;AAwBzF,OAAO,EAAE,kCAAkC,EAAE,MAAM,yCAAyC,CAAC;AA6B7F;;;;;GAKG;AACH,qBAAa,gCAAiC,SAAQ,kCAAkC;;IAC5E,QAAQ,EAAE,gCAAgC,CAAC,QAAQ,CAAC;IACpD,KAAK,EAAE,gCAAgC,CAAC,KAAK,CAAC;IAEtD,OAAgB,YAAY,UAAS;IAErC;;OAEG;IACY,uBAAuB,CAAC,EACnC,oBAAoB,EACpB,aAAa,EACb,UAAU,EACV,IAAI,EACJ,oBAAoB,GACvB,EAAE,0BAA0B,CAAC,8BAA8B;IAiC5D,oFAAoF;IAC9E,4BAA4B,CAAC,EAC/B,oBAAoB,GACvB,EAAE,0BAA0B,CAAC,mCAAmC;IAejE,4DAA4D;IAC7C,mBAAmB;IAiIlC;;OAEG;IACM,CAAC,MAAM,CAAC,YAAY,CAAC;CAMjC;AAED,yBAAiB,gCAAgC,CAAC;IAC9C,MAAa,QAAQ;QACjB,0BAA0B,CAAC,EAAE,KAAK,CAAC;QACnC,8BAA8B,CAAC,EAAE,MAAM,IAAI,CAAC;QAE5C;;WAEG;QACH,2BAA2B,WAAiC;QAE5D;;;WAGG;QACH,2BAA2B,WAAkC;KAChE;IAED,MAAa,KAAM,SAAQ,kCAAkC,CAAC,KAAK;QAEtD,YAAY,uDAAsE;KAC9F;CACJ"}
|
|
@@ -3,6 +3,10 @@ var __defProp = Object.defineProperty;
|
|
|
3
3
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
4
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
5
|
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
|
|
7
|
+
var __typeError = (msg) => {
|
|
8
|
+
throw TypeError(msg);
|
|
9
|
+
};
|
|
6
10
|
var __export = (target, all) => {
|
|
7
11
|
for (var name in all)
|
|
8
12
|
__defProp(target, name, { get: all[name], enumerable: true });
|
|
@@ -16,6 +20,47 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
16
20
|
return to;
|
|
17
21
|
};
|
|
18
22
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
23
|
+
var __using = (stack, value, async) => {
|
|
24
|
+
if (value != null) {
|
|
25
|
+
if (typeof value !== "object" && typeof value !== "function") __typeError("Object expected");
|
|
26
|
+
var dispose, inner;
|
|
27
|
+
if (async) dispose = value[__knownSymbol("asyncDispose")];
|
|
28
|
+
if (dispose === void 0) {
|
|
29
|
+
dispose = value[__knownSymbol("dispose")];
|
|
30
|
+
if (async) inner = dispose;
|
|
31
|
+
}
|
|
32
|
+
if (typeof dispose !== "function") __typeError("Object not disposable");
|
|
33
|
+
if (inner) dispose = function() {
|
|
34
|
+
try {
|
|
35
|
+
inner.call(this);
|
|
36
|
+
} catch (e) {
|
|
37
|
+
return Promise.reject(e);
|
|
38
|
+
}
|
|
39
|
+
};
|
|
40
|
+
stack.push([async, dispose, value]);
|
|
41
|
+
} else if (async) {
|
|
42
|
+
stack.push([async]);
|
|
43
|
+
}
|
|
44
|
+
return value;
|
|
45
|
+
};
|
|
46
|
+
var __callDispose = (stack, error, hasError) => {
|
|
47
|
+
var E = typeof SuppressedError === "function" ? SuppressedError : function(e, s, m, _) {
|
|
48
|
+
return _ = Error(m), _.name = "SuppressedError", _.error = e, _.suppressed = s, _;
|
|
49
|
+
};
|
|
50
|
+
var fail = (e) => error = hasError ? new E(e, error, "An error was suppressed during disposal") : (hasError = true, e);
|
|
51
|
+
var next = (it) => {
|
|
52
|
+
while (it = stack.pop()) {
|
|
53
|
+
try {
|
|
54
|
+
var result = it[1] && it[1].call(it[2]);
|
|
55
|
+
if (it[0]) return Promise.resolve(result).then(next, (e) => (fail(e), next()));
|
|
56
|
+
} catch (e) {
|
|
57
|
+
fail(e);
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
if (hasError) throw error;
|
|
61
|
+
};
|
|
62
|
+
return next();
|
|
63
|
+
};
|
|
19
64
|
var AdministratorCommissioningServer_exports = {};
|
|
20
65
|
__export(AdministratorCommissioningServer_exports, {
|
|
21
66
|
AdministratorCommissioningServer: () => AdministratorCommissioningServer
|
|
@@ -109,12 +154,12 @@ class AdministratorCommissioningServer extends import_AdministratorCommissioning
|
|
|
109
154
|
"No commissioning window is opened that could be revoked."
|
|
110
155
|
);
|
|
111
156
|
}
|
|
112
|
-
logger.debug("Revoking commissioning window
|
|
157
|
+
logger.debug("Revoking commissioning window");
|
|
113
158
|
await this.#closeCommissioningWindow();
|
|
114
159
|
if (this.env.has(import_protocol.FailsafeContext)) {
|
|
115
160
|
const failsafeContext = this.env.get(import_protocol.FailsafeContext);
|
|
116
161
|
if (failsafeContext) {
|
|
117
|
-
await failsafeContext.close();
|
|
162
|
+
await failsafeContext.close(this.context.exchange);
|
|
118
163
|
}
|
|
119
164
|
}
|
|
120
165
|
}
|
|
@@ -126,7 +171,7 @@ class AdministratorCommissioningServer extends import_AdministratorCommissioning
|
|
|
126
171
|
if (this.internal.commissioningWindowTimeout !== void 0) {
|
|
127
172
|
throw new import_general.InternalError("Commissioning window already initialized.");
|
|
128
173
|
}
|
|
129
|
-
const actor = (0, import_protocol.hasRemoteActor)(this.context) ? this.context.session.
|
|
174
|
+
const actor = (0, import_protocol.hasRemoteActor)(this.context) ? this.context.session.via : "local actor";
|
|
130
175
|
logger.debug(`Commissioning window timer started for ${commissioningTimeout} seconds for ${actor}.`);
|
|
131
176
|
this.internal.commissioningWindowTimeout = import_general.Time.getTimer(
|
|
132
177
|
"Commissioning timeout",
|
|
@@ -140,9 +185,9 @@ class AdministratorCommissioningServer extends import_AdministratorCommissioning
|
|
|
140
185
|
this.state.adminVendorId = adminFabric.rootVendorId;
|
|
141
186
|
const removeCallback = this.callback(this.#fabricRemovedCallback);
|
|
142
187
|
this.internal.stopMonitoringFabricForRemoval = () => {
|
|
143
|
-
adminFabric.
|
|
188
|
+
adminFabric.deleting.off(removeCallback);
|
|
144
189
|
};
|
|
145
|
-
this.context.session.associatedFabric.
|
|
190
|
+
this.context.session.associatedFabric.deleting.on(removeCallback);
|
|
146
191
|
}
|
|
147
192
|
/**
|
|
148
193
|
* This method validates if a commissioning window can be opened and throws various exceptions in case of failures.
|
|
@@ -186,13 +231,26 @@ class AdministratorCommissioningServer extends import_AdministratorCommissioning
|
|
|
186
231
|
* Closes the commissioning window per the matter specification.
|
|
187
232
|
*/
|
|
188
233
|
async #closeCommissioningWindow() {
|
|
189
|
-
|
|
234
|
+
var _stack = [];
|
|
235
|
+
try {
|
|
236
|
+
const _closing = __using(_stack, this.lifetime.join("closing commissioning window"));
|
|
237
|
+
await this.env.get(import_protocol.DeviceCommissioner).endCommissioning();
|
|
238
|
+
} catch (_) {
|
|
239
|
+
var _error = _, _hasError = true;
|
|
240
|
+
} finally {
|
|
241
|
+
__callDispose(_stack, _error, _hasError);
|
|
242
|
+
}
|
|
190
243
|
}
|
|
191
244
|
/**
|
|
192
245
|
* Close commissioning window on timeout when there's nobody to await the resulting promise
|
|
193
246
|
* */
|
|
194
247
|
#commissioningTimeout() {
|
|
195
|
-
this.env.runtime.add(
|
|
248
|
+
this.env.runtime.add(
|
|
249
|
+
(0, import_general.Worker)({
|
|
250
|
+
name: "closing commissioning window",
|
|
251
|
+
done: this.#closeCommissioningWindow()
|
|
252
|
+
})
|
|
253
|
+
);
|
|
196
254
|
}
|
|
197
255
|
/**
|
|
198
256
|
* Invoked when fabric is removed.
|
package/dist/cjs/behaviors/administrator-commissioning/AdministratorCommissioningServer.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/behaviors/administrator-commissioning/AdministratorCommissioningServer.ts"],
|
|
4
|
-
"mappings": "
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["AdministratorCommissioningServer"]
|
|
6
6
|
}
|
|
@@ -102,7 +102,7 @@ class BasicInformationServer extends Base {
|
|
|
102
102
|
#online() {
|
|
103
103
|
this.events.startUp.emit({ softwareVersion: this.state.softwareVersion }, this.context);
|
|
104
104
|
const fabricManager = this.env.get(import_protocol.FabricManager);
|
|
105
|
-
this.reactTo(fabricManager.events.
|
|
105
|
+
this.reactTo(fabricManager.events.leaving, this.#handleFabricLeave);
|
|
106
106
|
}
|
|
107
107
|
#goingOffline() {
|
|
108
108
|
this.events.shutDown?.emit(void 0, this.context);
|
|
@@ -110,7 +110,7 @@ class BasicInformationServer extends Base {
|
|
|
110
110
|
#emitReachableChange(reachable) {
|
|
111
111
|
this.events.reachableChanged?.emit({ reachableNewValue: reachable }, this.context);
|
|
112
112
|
}
|
|
113
|
-
#
|
|
113
|
+
#handleFabricLeave({ fabricIndex }) {
|
|
114
114
|
this.events.leave.emit({ fabricIndex }, this.context);
|
|
115
115
|
}
|
|
116
116
|
}
|