@matter/node 0.16.0-alpha.0-20251108-514b3f69e → 0.16.0-alpha.0-20251110-c4c70a41b
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/cluster/ClientBehavior.d.ts +0 -7
- package/dist/cjs/behavior/cluster/ClientBehavior.d.ts.map +1 -1
- package/dist/cjs/behavior/cluster/ClientBehavior.js +2 -8
- package/dist/cjs/behavior/cluster/ClientBehavior.js.map +2 -2
- package/dist/cjs/behavior/cluster/ClusterBehavior.d.ts +1 -1
- package/dist/cjs/behavior/cluster/ClusterBehavior.d.ts.map +1 -1
- package/dist/cjs/behavior/cluster/ClusterBehavior.js +9 -4
- package/dist/cjs/behavior/cluster/ClusterBehavior.js.map +1 -1
- package/dist/cjs/behavior/cluster/ClusterBehaviorCache.d.ts +7 -1
- package/dist/cjs/behavior/cluster/ClusterBehaviorCache.d.ts.map +1 -1
- package/dist/cjs/behavior/cluster/ClusterBehaviorCache.js +7 -5
- package/dist/cjs/behavior/cluster/ClusterBehaviorCache.js.map +1 -1
- package/dist/cjs/behavior/cluster/ClusterBehaviorType.d.ts +57 -0
- package/dist/cjs/behavior/cluster/ClusterBehaviorType.d.ts.map +1 -0
- package/dist/cjs/behavior/cluster/{ClusterBehaviorUtil.js → ClusterBehaviorType.js} +70 -39
- package/dist/cjs/behavior/cluster/ClusterBehaviorType.js.map +6 -0
- 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/cluster/ClusterState.d.ts +1 -1
- package/dist/cjs/behavior/cluster/ClusterState.d.ts.map +1 -1
- package/dist/cjs/behavior/cluster/ValidatedElements.js +2 -2
- package/dist/cjs/behavior/cluster/ValidatedElements.js.map +1 -1
- package/dist/cjs/behavior/cluster/{ClusterBehaviorUtil.d.ts → cluster-behavior-utils.d.ts} +10 -8
- package/dist/cjs/behavior/cluster/cluster-behavior-utils.d.ts.map +1 -0
- package/dist/cjs/behavior/cluster/cluster-behavior-utils.js +41 -0
- package/dist/cjs/behavior/cluster/cluster-behavior-utils.js.map +6 -0
- package/dist/cjs/behavior/cluster/index.d.ts +2 -1
- package/dist/cjs/behavior/cluster/index.d.ts.map +1 -1
- package/dist/cjs/behavior/cluster/index.js +2 -1
- package/dist/cjs/behavior/cluster/index.js.map +1 -1
- package/dist/cjs/behavior/context/server/LocalActorContext.d.ts +4 -0
- package/dist/cjs/behavior/context/server/LocalActorContext.d.ts.map +1 -1
- package/dist/cjs/behavior/context/server/LocalActorContext.js +2 -3
- package/dist/cjs/behavior/context/server/LocalActorContext.js.map +1 -1
- package/dist/cjs/behavior/context/server/RemoteActorContext.d.ts +4 -0
- package/dist/cjs/behavior/context/server/RemoteActorContext.d.ts.map +1 -1
- package/dist/cjs/behavior/context/server/RemoteActorContext.js +1 -0
- package/dist/cjs/behavior/context/server/RemoteActorContext.js.map +1 -1
- package/dist/cjs/behavior/internal/BehaviorBacking.js +2 -2
- package/dist/cjs/behavior/internal/BehaviorBacking.js.map +1 -1
- package/dist/cjs/behavior/system/commissioning/CommissioningServer.d.ts.map +1 -1
- package/dist/cjs/behavior/system/commissioning/CommissioningServer.js +3 -3
- package/dist/cjs/behavior/system/commissioning/CommissioningServer.js.map +1 -1
- package/dist/cjs/behaviors/operational-credentials/OperationalCredentialsServer.js +1 -1
- package/dist/cjs/behaviors/operational-credentials/OperationalCredentialsServer.js.map +1 -1
- package/dist/cjs/behaviors/operational-credentials/VendorIdVerification.d.ts +6 -1
- package/dist/cjs/behaviors/operational-credentials/VendorIdVerification.d.ts.map +1 -1
- package/dist/cjs/behaviors/operational-credentials/VendorIdVerification.js +2 -2
- package/dist/cjs/behaviors/operational-credentials/VendorIdVerification.js.map +1 -1
- package/dist/cjs/endpoint/Endpoint.d.ts +8 -0
- package/dist/cjs/endpoint/Endpoint.d.ts.map +1 -1
- package/dist/cjs/endpoint/Endpoint.js +11 -3
- package/dist/cjs/endpoint/Endpoint.js.map +1 -1
- package/dist/cjs/endpoint/properties/Behaviors.d.ts +1 -1
- package/dist/cjs/endpoint/properties/Behaviors.d.ts.map +1 -1
- package/dist/cjs/endpoint/properties/Behaviors.js +6 -3
- package/dist/cjs/endpoint/properties/Behaviors.js.map +1 -1
- package/dist/cjs/endpoint/properties/EndpointInitializer.d.ts +0 -4
- package/dist/cjs/endpoint/properties/EndpointInitializer.d.ts.map +1 -1
- package/dist/cjs/endpoint/properties/EndpointInitializer.js +0 -6
- package/dist/cjs/endpoint/properties/EndpointInitializer.js.map +1 -1
- 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/client/ClientCommandMethod.d.ts +11 -0
- package/dist/cjs/node/client/ClientCommandMethod.d.ts.map +1 -0
- package/dist/cjs/node/client/ClientCommandMethod.js +69 -0
- package/dist/cjs/node/client/ClientCommandMethod.js.map +6 -0
- package/dist/cjs/node/client/ClientEndpointInitializer.d.ts +0 -2
- package/dist/cjs/node/client/ClientEndpointInitializer.d.ts.map +1 -1
- package/dist/cjs/node/client/ClientEndpointInitializer.js +3 -34
- package/dist/cjs/node/client/ClientEndpointInitializer.js.map +1 -1
- package/dist/cjs/node/client/ClientStructure.d.ts.map +1 -1
- package/dist/cjs/node/client/ClientStructure.js +164 -32
- package/dist/cjs/node/client/ClientStructure.js.map +2 -2
- package/dist/cjs/node/client/ClientStructureEvents.d.ts +22 -0
- package/dist/cjs/node/client/ClientStructureEvents.d.ts.map +1 -0
- package/dist/cjs/node/client/ClientStructureEvents.js +92 -0
- package/dist/cjs/node/client/ClientStructureEvents.js.map +6 -0
- package/dist/cjs/node/client/PeerBehavior.d.ts +14 -1
- package/dist/cjs/node/client/PeerBehavior.d.ts.map +1 -1
- package/dist/cjs/node/client/PeerBehavior.js +111 -71
- package/dist/cjs/node/client/PeerBehavior.js.map +1 -1
- package/dist/cjs/node/client/Peers.d.ts +17 -0
- package/dist/cjs/node/client/Peers.d.ts.map +1 -1
- package/dist/cjs/node/client/Peers.js +96 -42
- package/dist/cjs/node/client/Peers.js.map +1 -1
- package/dist/cjs/node/server/ServerSubscription.d.ts +1 -1
- package/dist/cjs/node/server/ServerSubscription.d.ts.map +1 -1
- package/dist/cjs/node/server/ServerSubscription.js +2 -3
- package/dist/cjs/node/server/ServerSubscription.js.map +1 -1
- package/dist/esm/behavior/cluster/ClientBehavior.d.ts +0 -7
- package/dist/esm/behavior/cluster/ClientBehavior.d.ts.map +1 -1
- package/dist/esm/behavior/cluster/ClientBehavior.js +2 -8
- package/dist/esm/behavior/cluster/ClientBehavior.js.map +2 -2
- package/dist/esm/behavior/cluster/ClusterBehavior.d.ts +1 -1
- package/dist/esm/behavior/cluster/ClusterBehavior.d.ts.map +1 -1
- package/dist/esm/behavior/cluster/ClusterBehavior.js +9 -4
- package/dist/esm/behavior/cluster/ClusterBehavior.js.map +1 -1
- package/dist/esm/behavior/cluster/ClusterBehaviorCache.d.ts +7 -1
- package/dist/esm/behavior/cluster/ClusterBehaviorCache.d.ts.map +1 -1
- package/dist/esm/behavior/cluster/ClusterBehaviorCache.js +7 -5
- package/dist/esm/behavior/cluster/ClusterBehaviorCache.js.map +1 -1
- package/dist/esm/behavior/cluster/ClusterBehaviorType.d.ts +57 -0
- package/dist/esm/behavior/cluster/ClusterBehaviorType.d.ts.map +1 -0
- package/dist/esm/behavior/cluster/{ClusterBehaviorUtil.js → ClusterBehaviorType.js} +66 -35
- package/dist/esm/behavior/cluster/ClusterBehaviorType.js.map +6 -0
- 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/cluster/ClusterState.d.ts +1 -1
- package/dist/esm/behavior/cluster/ClusterState.d.ts.map +1 -1
- package/dist/esm/behavior/cluster/ValidatedElements.js +1 -1
- package/dist/esm/behavior/cluster/{ClusterBehaviorUtil.d.ts → cluster-behavior-utils.d.ts} +10 -8
- package/dist/esm/behavior/cluster/cluster-behavior-utils.d.ts.map +1 -0
- package/dist/esm/behavior/cluster/cluster-behavior-utils.js +21 -0
- package/dist/esm/behavior/cluster/cluster-behavior-utils.js.map +6 -0
- package/dist/esm/behavior/cluster/index.d.ts +2 -1
- package/dist/esm/behavior/cluster/index.d.ts.map +1 -1
- package/dist/esm/behavior/cluster/index.js +2 -1
- package/dist/esm/behavior/cluster/index.js.map +1 -1
- package/dist/esm/behavior/context/server/LocalActorContext.d.ts +4 -0
- package/dist/esm/behavior/context/server/LocalActorContext.d.ts.map +1 -1
- package/dist/esm/behavior/context/server/LocalActorContext.js +2 -3
- package/dist/esm/behavior/context/server/LocalActorContext.js.map +1 -1
- package/dist/esm/behavior/context/server/RemoteActorContext.d.ts +4 -0
- package/dist/esm/behavior/context/server/RemoteActorContext.d.ts.map +1 -1
- package/dist/esm/behavior/context/server/RemoteActorContext.js +1 -0
- package/dist/esm/behavior/context/server/RemoteActorContext.js.map +1 -1
- package/dist/esm/behavior/internal/BehaviorBacking.js +2 -2
- package/dist/esm/behavior/internal/BehaviorBacking.js.map +1 -1
- package/dist/esm/behavior/system/commissioning/CommissioningServer.d.ts.map +1 -1
- package/dist/esm/behavior/system/commissioning/CommissioningServer.js +4 -3
- package/dist/esm/behavior/system/commissioning/CommissioningServer.js.map +1 -1
- package/dist/esm/behaviors/operational-credentials/OperationalCredentialsServer.js +1 -1
- package/dist/esm/behaviors/operational-credentials/OperationalCredentialsServer.js.map +1 -1
- package/dist/esm/behaviors/operational-credentials/VendorIdVerification.d.ts +6 -1
- package/dist/esm/behaviors/operational-credentials/VendorIdVerification.d.ts.map +1 -1
- package/dist/esm/behaviors/operational-credentials/VendorIdVerification.js +1 -1
- package/dist/esm/behaviors/operational-credentials/VendorIdVerification.js.map +1 -1
- package/dist/esm/endpoint/Endpoint.d.ts +8 -0
- package/dist/esm/endpoint/Endpoint.d.ts.map +1 -1
- package/dist/esm/endpoint/Endpoint.js +11 -3
- package/dist/esm/endpoint/Endpoint.js.map +1 -1
- package/dist/esm/endpoint/properties/Behaviors.d.ts +1 -1
- package/dist/esm/endpoint/properties/Behaviors.d.ts.map +1 -1
- package/dist/esm/endpoint/properties/Behaviors.js +6 -3
- package/dist/esm/endpoint/properties/Behaviors.js.map +1 -1
- package/dist/esm/endpoint/properties/EndpointInitializer.d.ts +0 -4
- package/dist/esm/endpoint/properties/EndpointInitializer.d.ts.map +1 -1
- package/dist/esm/endpoint/properties/EndpointInitializer.js +0 -6
- package/dist/esm/endpoint/properties/EndpointInitializer.js.map +1 -1
- package/dist/esm/node/Node.d.ts.map +1 -1
- package/dist/esm/node/Node.js +2 -1
- package/dist/esm/node/Node.js.map +1 -1
- package/dist/esm/node/client/ClientCommandMethod.d.ts +11 -0
- package/dist/esm/node/client/ClientCommandMethod.d.ts.map +1 -0
- package/dist/esm/node/client/ClientCommandMethod.js +49 -0
- package/dist/esm/node/client/ClientCommandMethod.js.map +6 -0
- package/dist/esm/node/client/ClientEndpointInitializer.d.ts +0 -2
- package/dist/esm/node/client/ClientEndpointInitializer.d.ts.map +1 -1
- package/dist/esm/node/client/ClientEndpointInitializer.js +3 -34
- package/dist/esm/node/client/ClientEndpointInitializer.js.map +1 -1
- package/dist/esm/node/client/ClientStructure.d.ts.map +1 -1
- package/dist/esm/node/client/ClientStructure.js +164 -32
- package/dist/esm/node/client/ClientStructure.js.map +2 -2
- package/dist/esm/node/client/ClientStructureEvents.d.ts +22 -0
- package/dist/esm/node/client/ClientStructureEvents.d.ts.map +1 -0
- package/dist/esm/node/client/ClientStructureEvents.js +72 -0
- package/dist/esm/node/client/ClientStructureEvents.js.map +6 -0
- package/dist/esm/node/client/PeerBehavior.d.ts +14 -1
- package/dist/esm/node/client/PeerBehavior.d.ts.map +1 -1
- package/dist/esm/node/client/PeerBehavior.js +119 -74
- package/dist/esm/node/client/PeerBehavior.js.map +1 -1
- package/dist/esm/node/client/Peers.d.ts +17 -0
- package/dist/esm/node/client/Peers.d.ts.map +1 -1
- package/dist/esm/node/client/Peers.js +106 -43
- package/dist/esm/node/client/Peers.js.map +1 -1
- package/dist/esm/node/server/ServerSubscription.d.ts +1 -1
- package/dist/esm/node/server/ServerSubscription.d.ts.map +1 -1
- package/dist/esm/node/server/ServerSubscription.js +2 -3
- package/dist/esm/node/server/ServerSubscription.js.map +1 -1
- package/package.json +7 -7
- package/src/behavior/cluster/ClientBehavior.ts +2 -16
- package/src/behavior/cluster/ClusterBehavior.ts +9 -4
- package/src/behavior/cluster/ClusterBehaviorCache.ts +16 -9
- package/src/behavior/cluster/{ClusterBehaviorUtil.ts → ClusterBehaviorType.ts} +160 -64
- package/src/behavior/cluster/ClusterEvents.ts +1 -1
- package/src/behavior/cluster/ClusterState.ts +1 -1
- package/src/behavior/cluster/ValidatedElements.ts +1 -1
- package/src/behavior/cluster/cluster-behavior-utils.ts +48 -0
- package/src/behavior/cluster/index.ts +2 -1
- package/src/behavior/context/server/LocalActorContext.ts +8 -4
- package/src/behavior/context/server/RemoteActorContext.ts +6 -0
- package/src/behavior/internal/BehaviorBacking.ts +2 -2
- package/src/behavior/system/commissioning/CommissioningServer.ts +4 -3
- package/src/behaviors/operational-credentials/OperationalCredentialsServer.ts +1 -1
- package/src/behaviors/operational-credentials/VendorIdVerification.ts +3 -2
- package/src/endpoint/Endpoint.ts +23 -3
- package/src/endpoint/properties/Behaviors.ts +12 -6
- package/src/endpoint/properties/EndpointInitializer.ts +0 -7
- package/src/node/Node.ts +2 -1
- package/src/node/client/ClientCommandMethod.ts +63 -0
- package/src/node/client/ClientEndpointInitializer.ts +6 -39
- package/src/node/client/ClientStructure.ts +133 -27
- package/src/node/client/ClientStructureEvents.ts +97 -0
- package/src/node/client/PeerBehavior.ts +185 -104
- package/src/node/client/Peers.ts +131 -51
- package/src/node/server/ServerSubscription.ts +3 -3
- package/dist/cjs/behavior/cluster/ClusterBehaviorUtil.d.ts.map +0 -1
- package/dist/cjs/behavior/cluster/ClusterBehaviorUtil.js.map +0 -6
- package/dist/esm/behavior/cluster/ClusterBehaviorUtil.d.ts.map +0 -1
- package/dist/esm/behavior/cluster/ClusterBehaviorUtil.js.map +0 -6
|
@@ -4,27 +4,52 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { ClusterBehavior } from "#behavior/cluster/ClusterBehavior.js";
|
|
7
|
+
import { ClusterBehaviorType } from "#behavior/cluster/ClusterBehaviorType.js";
|
|
7
8
|
import { camelize, capitalize, InternalError } from "#general";
|
|
8
|
-
import {
|
|
9
|
-
|
|
10
|
-
|
|
9
|
+
import {
|
|
10
|
+
AttributeModel,
|
|
11
|
+
ClusterModel,
|
|
12
|
+
CommandModel,
|
|
13
|
+
Conformance,
|
|
14
|
+
EncodedBitmap,
|
|
15
|
+
Matter
|
|
16
|
+
} from "#model";
|
|
11
17
|
import {
|
|
12
18
|
Attribute,
|
|
13
19
|
ClusterComposer,
|
|
14
20
|
ClusterRegistry,
|
|
15
21
|
Command,
|
|
16
22
|
MutableCluster,
|
|
17
|
-
Status,
|
|
18
|
-
StatusResponseError,
|
|
19
23
|
TlvAny,
|
|
20
24
|
TlvNoResponse
|
|
21
25
|
} from "#types";
|
|
26
|
+
import { ClientCommandMethod } from "./ClientCommandMethod.js";
|
|
22
27
|
const BIT_BLOCK_SIZE = Math.log2(Number.MAX_SAFE_INTEGER);
|
|
23
|
-
const
|
|
28
|
+
const discoveredCache = {};
|
|
29
|
+
const knownCache = /* @__PURE__ */ new WeakMap();
|
|
30
|
+
const isPeer = Symbol("is-peer");
|
|
24
31
|
function PeerBehavior(shape) {
|
|
25
|
-
|
|
32
|
+
let type;
|
|
33
|
+
switch (shape.kind) {
|
|
34
|
+
case "known":
|
|
35
|
+
if (Object.hasOwn(shape.behavior, isPeer)) {
|
|
36
|
+
return shape.behavior;
|
|
37
|
+
}
|
|
38
|
+
type = instrumentKnownShape(shape);
|
|
39
|
+
break;
|
|
40
|
+
case "discovered":
|
|
41
|
+
type = instrumentDiscoveredShape(shape);
|
|
42
|
+
break;
|
|
43
|
+
default:
|
|
44
|
+
throw new InternalError(`Unknown cluster shape kind ${shape.kind}`);
|
|
45
|
+
}
|
|
46
|
+
type[isPeer] = true;
|
|
47
|
+
return type;
|
|
48
|
+
}
|
|
49
|
+
function instrumentDiscoveredShape(shape) {
|
|
50
|
+
const analysis = DiscoveredShapeAnalysis(shape);
|
|
26
51
|
const fingerprint = createFingerprint(analysis);
|
|
27
|
-
let type =
|
|
52
|
+
let type = discoveredCache[fingerprint];
|
|
28
53
|
if (type) {
|
|
29
54
|
return type;
|
|
30
55
|
}
|
|
@@ -35,15 +60,32 @@ function PeerBehavior(shape) {
|
|
|
35
60
|
} else {
|
|
36
61
|
baseType = ClusterBehavior;
|
|
37
62
|
}
|
|
38
|
-
type =
|
|
63
|
+
type = discoveredCache[fingerprint] = generateDiscoveredType(analysis, baseType);
|
|
64
|
+
return type;
|
|
65
|
+
}
|
|
66
|
+
function instrumentKnownShape(shape) {
|
|
67
|
+
let type = knownCache.get(shape.behavior);
|
|
68
|
+
if (type) {
|
|
69
|
+
return type;
|
|
70
|
+
}
|
|
71
|
+
const base = shape.behavior;
|
|
72
|
+
type = ClusterBehaviorType({
|
|
73
|
+
base,
|
|
74
|
+
cluster: base.cluster,
|
|
75
|
+
schema: base.schema,
|
|
76
|
+
name: `${base.schema.name}Client`,
|
|
77
|
+
forClient: true,
|
|
78
|
+
commandFactory: ClientCommandMethod
|
|
79
|
+
});
|
|
80
|
+
knownCache.set(shape.behavior, type);
|
|
39
81
|
return type;
|
|
40
82
|
}
|
|
41
|
-
function
|
|
83
|
+
function generateDiscoveredType(analysis, baseType) {
|
|
42
84
|
if (!ClusterBehavior.is(baseType)) {
|
|
43
|
-
throw new InternalError(`Base
|
|
85
|
+
throw new InternalError(`Base for cluster ${analysis.schema.name} is not a ClusterBehavior`);
|
|
44
86
|
}
|
|
45
87
|
let { schema } = analysis;
|
|
46
|
-
let
|
|
88
|
+
let isExtended = false;
|
|
47
89
|
const { attrSupportOverrides, extraAttrs, commandSupportOverrides, extraCommands } = analysis;
|
|
48
90
|
let { cluster } = baseType;
|
|
49
91
|
if (!cluster) {
|
|
@@ -59,18 +101,18 @@ function generateType(analysis, baseType) {
|
|
|
59
101
|
}
|
|
60
102
|
const featureNames = Object.entries(supportedFeatures).filter(([, v]) => v).map(([k]) => k);
|
|
61
103
|
if (featureNames.length) {
|
|
62
|
-
|
|
104
|
+
extendSchema();
|
|
63
105
|
cluster = new ClusterComposer(cluster, true).compose(featureNames.map(capitalize));
|
|
64
106
|
}
|
|
65
|
-
if (schema.revision !== analysis.shape.revision || extraAttrs.size || extraCommands.size ||
|
|
66
|
-
|
|
107
|
+
if (schema.revision !== analysis.shape.revision || extraAttrs.size || extraCommands.size || attrSupportOverrides.size || commandSupportOverrides.size) {
|
|
108
|
+
extendSchema();
|
|
67
109
|
cluster = {
|
|
68
110
|
...cluster,
|
|
69
111
|
supportedFeatures,
|
|
70
112
|
attributes: { ...cluster.attributes },
|
|
71
113
|
commands: { ...cluster.commands }
|
|
72
114
|
};
|
|
73
|
-
if (attrSupportOverrides) {
|
|
115
|
+
if (attrSupportOverrides.size) {
|
|
74
116
|
for (const [attr, isSupported] of attrSupportOverrides.entries()) {
|
|
75
117
|
schema.children.push(attr.extend({ operationalIsSupported: isSupported }));
|
|
76
118
|
}
|
|
@@ -80,7 +122,7 @@ function generateType(analysis, baseType) {
|
|
|
80
122
|
cluster.attributes[camelize(name, false)] = Attribute(id, TlvAny);
|
|
81
123
|
schema.children.push(new AttributeModel({ id, name, type: "any" }));
|
|
82
124
|
}
|
|
83
|
-
if (commandSupportOverrides) {
|
|
125
|
+
if (commandSupportOverrides.size) {
|
|
84
126
|
for (const [command, isSupported] of commandSupportOverrides.entries()) {
|
|
85
127
|
schema.children.push(command.extend({ operationalIsSupported: isSupported }));
|
|
86
128
|
}
|
|
@@ -91,56 +133,37 @@ function generateType(analysis, baseType) {
|
|
|
91
133
|
schema.children.push(new CommandModel({ id, name, type: "any" }));
|
|
92
134
|
}
|
|
93
135
|
}
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
136
|
+
return ClusterBehaviorType({
|
|
137
|
+
base: baseType,
|
|
138
|
+
cluster,
|
|
139
|
+
schema,
|
|
140
|
+
name: `${schema.name}Client`,
|
|
141
|
+
forClient: true,
|
|
142
|
+
commandFactory: ClientCommandMethod
|
|
143
|
+
});
|
|
144
|
+
function extendSchema() {
|
|
145
|
+
if (isExtended) {
|
|
102
146
|
return;
|
|
103
147
|
}
|
|
104
|
-
schema = schema.
|
|
148
|
+
schema = schema.extend();
|
|
105
149
|
schema.supportedFeatures = featureNames;
|
|
106
|
-
|
|
107
|
-
}
|
|
108
|
-
function implementCommand(command) {
|
|
109
|
-
return async function(fields) {
|
|
110
|
-
const node = this.env.get(Node);
|
|
111
|
-
const chunks = node.interaction.invoke(
|
|
112
|
-
Invoke({
|
|
113
|
-
commands: [
|
|
114
|
-
Invoke.ConcreteCommandRequest({
|
|
115
|
-
endpoint: this.endpoint,
|
|
116
|
-
cluster,
|
|
117
|
-
command,
|
|
118
|
-
fields
|
|
119
|
-
})
|
|
120
|
-
]
|
|
121
|
-
})
|
|
122
|
-
);
|
|
123
|
-
for await (const chunk of chunks) {
|
|
124
|
-
for (const entry of chunk) {
|
|
125
|
-
switch (entry.kind) {
|
|
126
|
-
case "cmd-status":
|
|
127
|
-
if (entry.status !== Status.Success) {
|
|
128
|
-
throw StatusResponseError.create(entry.status, void 0, entry.clusterStatus);
|
|
129
|
-
}
|
|
130
|
-
return;
|
|
131
|
-
case "cmd-response":
|
|
132
|
-
return entry.data;
|
|
133
|
-
}
|
|
134
|
-
}
|
|
135
|
-
}
|
|
136
|
-
};
|
|
150
|
+
isExtended = true;
|
|
137
151
|
}
|
|
138
152
|
}
|
|
139
153
|
function createFingerprint(analysis) {
|
|
140
154
|
const fingerprint = [analysis.shape.id];
|
|
155
|
+
if (analysis.featureBitmap) {
|
|
156
|
+
fingerprint.push("f", analysis.featureBitmap);
|
|
157
|
+
}
|
|
158
|
+
if (analysis.attrSupportOverrides.size) {
|
|
159
|
+
addSupportFingerprints("a", analysis.attrSupportOverrides);
|
|
160
|
+
}
|
|
141
161
|
if (analysis.extraAttrs.size) {
|
|
142
162
|
fingerprint.push("a", createElementFingerprint(analysis.extraAttrs));
|
|
143
163
|
}
|
|
164
|
+
if (analysis.commandSupportOverrides.size) {
|
|
165
|
+
addSupportFingerprints("c", analysis.commandSupportOverrides);
|
|
166
|
+
}
|
|
144
167
|
if (analysis.extraCommands.size) {
|
|
145
168
|
fingerprint.push("c", createElementFingerprint(analysis.extraCommands));
|
|
146
169
|
}
|
|
@@ -153,30 +176,51 @@ function createFingerprint(analysis) {
|
|
|
153
176
|
}
|
|
154
177
|
return Object.entries(blocks).sort(([a], [b]) => a.localeCompare(b)).map(([block, map]) => block ? `${block}:${map}` : map).join(",");
|
|
155
178
|
}
|
|
179
|
+
function addSupportFingerprints(prefix, elements) {
|
|
180
|
+
let supported;
|
|
181
|
+
let unsupported;
|
|
182
|
+
for (const [{ id }, isSupported] of elements) {
|
|
183
|
+
if (id === void 0) {
|
|
184
|
+
continue;
|
|
185
|
+
}
|
|
186
|
+
if (isSupported) {
|
|
187
|
+
if (supported) {
|
|
188
|
+
supported.push(id);
|
|
189
|
+
} else {
|
|
190
|
+
supported = [id];
|
|
191
|
+
}
|
|
192
|
+
} else {
|
|
193
|
+
if (unsupported) {
|
|
194
|
+
unsupported.push(id);
|
|
195
|
+
} else {
|
|
196
|
+
unsupported = [id];
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
if (supported) {
|
|
201
|
+
fingerprint.push(`${prefix}+`, createElementFingerprint(supported));
|
|
202
|
+
}
|
|
203
|
+
if (unsupported) {
|
|
204
|
+
fingerprint.push(`${prefix}-`, createElementFingerprint(unsupported));
|
|
205
|
+
}
|
|
206
|
+
}
|
|
156
207
|
}
|
|
157
208
|
function createUnknownName(prefix, id) {
|
|
158
209
|
return `${prefix}$${id.toString(16)}`;
|
|
159
210
|
}
|
|
160
|
-
function
|
|
211
|
+
function DiscoveredShapeAnalysis(shape) {
|
|
161
212
|
const standardCluster = Matter.get(ClusterModel, shape.id);
|
|
162
213
|
const schema = standardCluster ?? new ClusterModel({ id: shape.id, name: createUnknownName("Cluster", shape.id), revision: shape.revision });
|
|
214
|
+
let featureBitmap;
|
|
215
|
+
if (typeof shape.features === "number") {
|
|
216
|
+
featureBitmap = shape.features;
|
|
217
|
+
} else {
|
|
218
|
+
featureBitmap = EncodedBitmap(schema.featureMap, shape.features);
|
|
219
|
+
}
|
|
163
220
|
const attrSupportOverrides = /* @__PURE__ */ new Map();
|
|
164
221
|
const extraAttrs = new Set(shape.attributes);
|
|
165
222
|
for (const attr of schema.attributes) {
|
|
166
223
|
maybeOverrideSupport(standardCluster, attr, extraAttrs, attrSupportOverrides);
|
|
167
|
-
if (standardCluster) {
|
|
168
|
-
const supported = extraAttrs.has(attr.id);
|
|
169
|
-
const applicability = attr.conformance.applicabilityFor(standardCluster);
|
|
170
|
-
if (!supported) {
|
|
171
|
-
if (applicability) {
|
|
172
|
-
attrSupportOverrides.set(attr, false);
|
|
173
|
-
}
|
|
174
|
-
} else {
|
|
175
|
-
if (applicability !== Conformance.Applicability.Mandatory) {
|
|
176
|
-
attrSupportOverrides.set(attr, true);
|
|
177
|
-
}
|
|
178
|
-
}
|
|
179
|
-
}
|
|
180
224
|
extraAttrs.delete(attr.id);
|
|
181
225
|
}
|
|
182
226
|
const commandSupportOverrides = /* @__PURE__ */ new Map();
|
|
@@ -187,6 +231,7 @@ function ShapeAnalysis(shape) {
|
|
|
187
231
|
}
|
|
188
232
|
return {
|
|
189
233
|
schema,
|
|
234
|
+
featureBitmap,
|
|
190
235
|
shape,
|
|
191
236
|
attrSupportOverrides,
|
|
192
237
|
extraAttrs,
|
|
@@ -198,10 +243,10 @@ function maybeOverrideSupport(standardCluster, element, supported, overrides) {
|
|
|
198
243
|
if (!standardCluster) {
|
|
199
244
|
return;
|
|
200
245
|
}
|
|
201
|
-
const isSupported = supported.has(element.id);
|
|
202
|
-
const applicability = element.
|
|
246
|
+
const isSupported = supported === true || supported.has(element.id);
|
|
247
|
+
const applicability = element.effectiveConformance.applicabilityFor(standardCluster);
|
|
203
248
|
if (!isSupported) {
|
|
204
|
-
if (applicability) {
|
|
249
|
+
if (applicability === Conformance.Applicability.Mandatory) {
|
|
205
250
|
overrides.set(element, false);
|
|
206
251
|
}
|
|
207
252
|
} else {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/node/client/PeerBehavior.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,SAAS,uBAAuB;AAChC,SAAS,UAAU,YAAY,qBAAqB;AACpD,
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,SAAS,uBAAuB;AAChC,SAAS,2BAA2B;AACpC,SAAS,UAAU,YAAY,qBAAqB;AACpD;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAGA;AAAA,OAEG;AACP;AAAA,EACI;AAAA,EAEA;AAAA,EAEA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAAS,2BAA2B;AAEpC,MAAM,iBAAiB,KAAK,KAAK,OAAO,gBAAgB;AAExD,MAAM,kBAAkB,CAAC;AACzB,MAAM,aAAa,oBAAI,QAAoD;AAE3E,MAAM,SAAS,OAAO,SAAS;AAKxB,SAAS,aAAa,OAAwD;AACjF,MAAI;AAEJ,UAAQ,MAAM,MAAM;AAAA,IAChB,KAAK;AACD,UAAI,OAAO,OAAO,MAAM,UAAU,MAAM,GAAG;AACvC,eAAO,MAAM;AAAA,MACjB;AACA,aAAO,qBAAqB,KAAK;AACjC;AAAA,IAEJ,KAAK;AACD,aAAO,0BAA0B,KAAK;AACtC;AAAA,IAEJ;AACI,YAAM,IAAI,cAAc,8BAA+B,MAAc,IAAI,EAAE;AAAA,EACnF;AAEA,EAAC,KAAa,MAAM,IAAI;AAExB,SAAO;AACX;AA6BA,SAAS,0BAA0B,OAA4C;AAC3E,QAAM,WAAW,wBAAwB,KAAK;AAE9C,QAAM,cAAc,kBAAkB,QAAQ;AAC9C,MAAI,OAAO,gBAAgB,WAAW;AACtC,MAAI,MAAM;AACN,WAAO;AAAA,EACX;AAEA,MAAI;AACJ,QAAM,kBAAkB,gBAAgB,IAAI,MAAM,EAAE;AACpD,MAAI,iBAAiB;AACjB,eAAW,gBAAgB,IAAI,eAAe;AAAA,EAClD,OAAO;AACH,eAAW;AAAA,EACf;AAEA,SAAO,gBAAgB,WAAW,IAAI,uBAAuB,UAAU,QAAQ;AAE/E,SAAO;AACX;AAEA,SAAS,qBAAqB,OAAuC;AACjE,MAAI,OAAO,WAAW,IAAI,MAAM,QAAQ;AACxC,MAAI,MAAM;AACN,WAAO;AAAA,EACX;AAEA,QAAM,OAAO,MAAM;AAEnB,SAAO,oBAAoB;AAAA,IACvB;AAAA,IACA,SAAS,KAAK;AAAA,IACd,QAAQ,KAAK;AAAA,IACb,MAAM,GAAG,KAAK,OAAO,IAAI;AAAA,IACzB,WAAW;AAAA,IACX,gBAAgB;AAAA,EACpB,CAAC;AAED,aAAW,IAAI,MAAM,UAAU,IAAI;AAEnC,SAAO;AACX;AAEA,SAAS,uBAAuB,UAAmC,UAA+C;AAE9G,MAAI,CAAC,gBAAgB,GAAG,QAAQ,GAAG;AAC/B,UAAM,IAAI,cAAc,oBAAoB,SAAS,OAAO,IAAI,2BAA2B;AAAA,EAC/F;AAEA,MAAI,EAAE,OAAO,IAAI;AACjB,MAAI,aAAa;AACjB,QAAM,EAAE,sBAAsB,YAAY,yBAAyB,cAAc,IAAI;AAGrF,MAAI,EAAE,QAAQ,IAAI;AAClB,MAAI,CAAC,SAAS;AACV,cAAU,eAAe,EAAE,IAAI,OAAO,IAAI,MAAM,OAAO,MAAM,UAAU,OAAO,SAAS,CAAC;AAAA,EAC5F;AAGA,MAAI,oBAAoB,SAAS,MAAM;AACvC,MAAI,OAAO,sBAAsB,UAAU;AACvC,QAAI,mBAAmB;AACnB,0BAAoB,QAAQ,WAAW,WAAW,OAAO,OAAO,iBAAwB;AAAA,IAC5F,OAAO;AACH,0BAAoB,CAAC;AAAA,IACzB;AAAA,EACJ;AAGA,QAAM,eAAe,OAAO,QAAQ,iBAAiB,EAChD,OAAO,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,EACnB,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;AACnB,MAAI,aAAa,QAAQ;AAErB,iBAAa;AAGb,cAAU,IAAI,gBAAgB,SAAS,IAAI,EAAE,QAAQ,aAAa,IAAI,UAAU,CAAC;AAAA,EACrF;AAIA,MACI,OAAO,aAAa,SAAS,MAAM,YACnC,WAAW,QACX,cAAc,QACd,qBAAqB,QACrB,wBAAwB,MAC1B;AACE,iBAAa;AAEb,cAAU;AAAA,MACN,GAAG;AAAA,MACH;AAAA,MACA,YAAY,EAAE,GAAG,QAAQ,WAAW;AAAA,MACpC,UAAU,EAAE,GAAG,QAAQ,SAAS;AAAA,IACpC;AAEA,QAAI,qBAAqB,MAAM;AAC3B,iBAAW,CAAC,MAAM,WAAW,KAAK,qBAAqB,QAAQ,GAAG;AAC9D,eAAO,SAAS,KAAK,KAAK,OAAO,EAAE,wBAAwB,YAAY,CAAC,CAAC;AAAA,MAC7E;AAAA,IACJ;AAEA,eAAW,MAAM,YAAY;AACzB,YAAM,OAAO,kBAAkB,QAAQ,EAAE;AACzC,cAAQ,WAAW,SAAS,MAAM,KAAK,CAAC,IAAI,UAAU,IAAI,MAAM;AAChE,aAAO,SAAS,KAAK,IAAI,eAAe,EAAE,IAAI,MAAM,MAAM,MAAM,CAAC,CAAC;AAAA,IACtE;AAEA,QAAI,wBAAwB,MAAM;AAC9B,iBAAW,CAAC,SAAS,WAAW,KAAK,wBAAwB,QAAQ,GAAG;AACpE,eAAO,SAAS,KAAK,QAAQ,OAAO,EAAE,wBAAwB,YAAY,CAAC,CAAC;AAAA,MAChF;AAAA,IACJ;AAEA,eAAW,MAAM,eAAe;AAC5B,YAAM,OAAO,kBAAkB,WAAW,EAAE;AAC5C,cAAQ,SAAS,SAAS,MAAM,KAAK,CAAC,IAAI,QAAQ,IAAI,QAAQ,GAAG,aAAa;AAC9E,aAAO,SAAS,KAAK,IAAI,aAAa,EAAE,IAAI,MAAM,MAAM,MAAM,CAAC,CAAC;AAAA,IACpE;AAAA,EACJ;AAGA,SAAO,oBAAoB;AAAA,IACvB,MAAM;AAAA,IACN;AAAA,IACA;AAAA,IACA,MAAM,GAAG,OAAO,IAAI;AAAA,IACpB,WAAW;AAAA,IACX,gBAAgB;AAAA,EACpB,CAAC;AAED,WAAS,eAAe;AACpB,QAAI,YAAY;AACZ;AAAA,IACJ;AACA,aAAS,OAAO,OAAO;AACvB,WAAO,oBAAoB;AAC3B,iBAAa;AAAA,EACjB;AACJ;AAKA,SAAS,kBAAkB,UAAmC;AAC1D,QAAM,cAAc,CAAC,SAAS,MAAM,EAAE;AAEtC,MAAI,SAAS,eAAe;AACxB,gBAAY,KAAK,KAAK,SAAS,aAAa;AAAA,EAChD;AAEA,MAAI,SAAS,qBAAqB,MAAM;AACpC,2BAAuB,KAAK,SAAS,oBAAoB;AAAA,EAC7D;AAEA,MAAI,SAAS,WAAW,MAAM;AAC1B,gBAAY,KAAK,KAAK,yBAAyB,SAAS,UAAU,CAAC;AAAA,EACvE;AAEA,MAAI,SAAS,wBAAwB,MAAM;AACvC,2BAAuB,KAAK,SAAS,uBAAuB;AAAA,EAChE;AAEA,MAAI,SAAS,cAAc,MAAM;AAC7B,gBAAY,KAAK,KAAK,yBAAyB,SAAS,aAAa,CAAC;AAAA,EAC1E;AAEA,SAAO,YAAY,KAAK,GAAG;AAW3B,WAAS,yBAAyB,KAAuB;AACrD,UAAM,SAAS,CAAC;AAEhB,eAAW,MAAM,KAAK;AAClB,YAAM,QAAQ,KAAK,MAAM,KAAK,cAAc;AAC5C,aAAO,KAAK,KAAK,OAAO,KAAK,KAAK,KAAM,KAAK,KAAK;AAAA,IACtD;AAEA,WAAO,OAAO,QAAQ,MAAM,EACvB,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,EACrC,IAAI,CAAC,CAAC,OAAO,GAAG,MAAO,QAAQ,GAAG,KAAK,IAAI,GAAG,KAAK,GAAI,EACvD,KAAK,GAAG;AAAA,EACjB;AAOA,WAAS,uBAAuB,QAAgB,UAAoC;AAChF,QAAI;AACJ,QAAI;AAEJ,eAAW,CAAC,EAAE,GAAG,GAAG,WAAW,KAAK,UAAU;AAC1C,UAAI,OAAO,QAAW;AAClB;AAAA,MACJ;AAEA,UAAI,aAAa;AACb,YAAI,WAAW;AACX,oBAAU,KAAK,EAAE;AAAA,QACrB,OAAO;AACH,sBAAY,CAAC,EAAE;AAAA,QACnB;AAAA,MACJ,OAAO;AACH,YAAI,aAAa;AACb,sBAAY,KAAK,EAAE;AAAA,QACvB,OAAO;AACH,wBAAc,CAAC,EAAE;AAAA,QACrB;AAAA,MACJ;AAAA,IACJ;AAEA,QAAI,WAAW;AACX,kBAAY,KAAK,GAAG,MAAM,KAAK,yBAAyB,SAAS,CAAC;AAAA,IACtE;AACA,QAAI,aAAa;AACb,kBAAY,KAAK,GAAG,MAAM,KAAK,yBAAyB,WAAW,CAAC;AAAA,IACxE;AAAA,EACJ;AACJ;AAEA,SAAS,kBAAkB,QAAgB,IAAY;AACnD,SAAO,GAAG,MAAM,IAAI,GAAG,SAAS,EAAE,CAAC;AACvC;AAeA,SAAS,wBAAwB,OAAqE;AAClG,QAAM,kBAAkB,OAAO,IAAI,cAAc,MAAM,EAAE;AACzD,QAAM,SACF,mBACA,IAAI,aAAa,EAAE,IAAI,MAAM,IAAI,MAAM,kBAAkB,WAAW,MAAM,EAAE,GAAG,UAAU,MAAM,SAAS,CAAC;AAE7G,MAAI;AACJ,MAAI,OAAO,MAAM,aAAa,UAAU;AACpC,oBAAgB,MAAM;AAAA,EAC1B,OAAO;AACH,oBAAgB,cAAc,OAAO,YAAY,MAAM,QAAQ;AAAA,EACnE;AAEA,QAAM,uBAAuB,oBAAI,IAA6B;AAC9D,QAAM,aAAa,IAAI,IAAY,MAAM,UAAU;AACnD,aAAW,QAAQ,OAAO,YAAY;AAClC,yBAAqB,iBAAiB,MAAM,YAAY,oBAAoB;AAC5E,eAAW,OAAO,KAAK,EAAiB;AAAA,EAC5C;AAEA,QAAM,0BAA0B,oBAAI,IAA2B;AAC/D,QAAM,gBAAgB,IAAI,IAAI,MAAM,QAAQ;AAC5C,aAAW,WAAW,OAAO,UAAU;AACnC,yBAAqB,iBAAiB,SAAS,eAAe,uBAAuB;AACrF,kBAAc,OAAO,QAAQ,EAAe;AAAA,EAChD;AAEA,SAAO;AAAA,IACH;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACJ;AACJ;AAWA,SAAS,qBACL,iBACA,SACA,WACA,WACF;AACE,MAAI,CAAC,iBAAiB;AAClB;AAAA,EACJ;AAEA,QAAM,cAAc,cAAc,QAAQ,UAAU,IAAI,QAAQ,EAAE;AAClE,QAAM,gBAAgB,QAAQ,qBAAqB,iBAAiB,eAAe;AACnF,MAAI,CAAC,aAAa;AACd,QAAI,kBAAkB,YAAY,cAAc,WAAW;AAEvD,gBAAU,IAAI,SAAS,KAAK;AAAA,IAChC;AAAA,EACJ,OAAO;AACH,QAAI,kBAAkB,YAAY,cAAc,WAAW;AAEvD,gBAAU,IAAI,SAAS,IAAI;AAAA,IAC/B;AAAA,EACJ;AACJ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -3,11 +3,15 @@
|
|
|
3
3
|
* Copyright 2022-2025 Matter.js Authors
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
+
import { type ClusterBehavior } from "#behavior/cluster/ClusterBehavior.js";
|
|
6
7
|
import { CommissioningDiscovery } from "#behavior/system/controller/discovery/CommissioningDiscovery.js";
|
|
7
8
|
import { ContinuousDiscovery } from "#behavior/system/controller/discovery/ContinuousDiscovery.js";
|
|
8
9
|
import { Discovery } from "#behavior/system/controller/discovery/Discovery.js";
|
|
9
10
|
import { InstanceDiscovery } from "#behavior/system/controller/discovery/InstanceDiscovery.js";
|
|
11
|
+
import { Endpoint } from "#endpoint/Endpoint.js";
|
|
10
12
|
import { EndpointContainer } from "#endpoint/properties/EndpointContainer.js";
|
|
13
|
+
import { EndpointType } from "#endpoint/type/EndpointType.js";
|
|
14
|
+
import { Observable } from "#general";
|
|
11
15
|
import { PeerAddress } from "#protocol";
|
|
12
16
|
import { ClientNode } from "../ClientNode.js";
|
|
13
17
|
import type { ServerNode } from "../ServerNode.js";
|
|
@@ -38,11 +42,24 @@ export declare class Peers extends EndpointContainer<ClientNode> {
|
|
|
38
42
|
* Find a specific commissionable node and commission.
|
|
39
43
|
*/
|
|
40
44
|
commission(options: CommissioningDiscovery.Options): CommissioningDiscovery;
|
|
45
|
+
/**
|
|
46
|
+
* Obtain an {@link Observable} that emits when a specific type of endpoint initializes for a peer.
|
|
47
|
+
*
|
|
48
|
+
* This is useful for initializing general behavior on any peer endpoint of the specified type.
|
|
49
|
+
*/
|
|
50
|
+
endpointInstalled<T extends EndpointType>(type: T): Observable<[endpoint: Endpoint<T>]>;
|
|
51
|
+
/**
|
|
52
|
+
* Obtain a {@link Observable} that emits when a specific type of cluster initializes for a peer.
|
|
53
|
+
*
|
|
54
|
+
* This is useful for initializing general behavior on any peer endpoint with the specified cluster.
|
|
55
|
+
*/
|
|
56
|
+
clusterInstalled<T extends ClusterBehavior.Type>(type: T): Observable<[endpoint: Endpoint<EndpointType.Empty>, type: T], void>;
|
|
41
57
|
get(id: number | string | PeerAddress): ClientNode | undefined;
|
|
42
58
|
get owner(): ServerNode;
|
|
43
59
|
add(node: ClientNode): void;
|
|
44
60
|
/**
|
|
45
61
|
* Get or create a client node for the given peer address.
|
|
62
|
+
*
|
|
46
63
|
* This is mainly used to communicate to other known nodes on the fabric without having a formal commissioning
|
|
47
64
|
* process.
|
|
48
65
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Peers.d.ts","sourceRoot":"","sources":["../../../../src/node/client/Peers.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"Peers.d.ts","sourceRoot":"","sources":["../../../../src/node/client/Peers.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAI5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iEAAiE,CAAC;AACzG,OAAO,EAAE,mBAAmB,EAAE,MAAM,8DAA8D,CAAC;AACnG,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAC/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,4DAA4D,CAAC;AAG/F,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAQH,UAAU,EAIb,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAiE,WAAW,EAAE,MAAM,WAAW,CAAC;AAGvG,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AASnD;;;;GAIG;AACH,qBAAa,KAAM,SAAQ,iBAAiB,CAAC,UAAU,CAAC;;gBAMxC,KAAK,EAAE,UAAU;IAe7B;;OAEG;IACH,UAAU;IAeV;;OAEG;IACH,MAAM,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO;IAIlC;;;;;OAKG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO;IAIpC;;OAEG;IACH,UAAU,CAAC,OAAO,EAAE,sBAAsB,CAAC,OAAO;IAIlD;;;;OAIG;IACH,iBAAiB,CAAC,CAAC,SAAS,YAAY,EAAE,IAAI,EAAE,CAAC,GAAG,UAAU,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAIvF;;;;OAIG;IACH,gBAAgB,CAAC,CAAC,SAAS,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;IAI/C,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,WAAW;IAe9C,IAAa,KAAK,IACQ,UAAU,CACnC;IAEQ,GAAG,CAAC,IAAI,EAAE,UAAU;IAM7B;;;;;OAKG;IACG,UAAU,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,GAAE,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAM;IAuB3E,KAAK;CAuKvB"}
|
|
@@ -3,25 +3,39 @@
|
|
|
3
3
|
* Copyright 2022-2025 Matter.js Authors
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
+
import { LocalActorContext } from "#behavior/context/server/LocalActorContext.js";
|
|
7
|
+
import { CommissioningClient } from "#behavior/system/commissioning/CommissioningClient.js";
|
|
6
8
|
import { RemoteDescriptor } from "#behavior/system/commissioning/RemoteDescriptor.js";
|
|
7
9
|
import { CommissioningDiscovery } from "#behavior/system/controller/discovery/CommissioningDiscovery.js";
|
|
8
10
|
import { ContinuousDiscovery } from "#behavior/system/controller/discovery/ContinuousDiscovery.js";
|
|
9
11
|
import { InstanceDiscovery } from "#behavior/system/controller/discovery/InstanceDiscovery.js";
|
|
12
|
+
import { BasicInformationClient } from "#behaviors/basic-information";
|
|
13
|
+
import { OperationalCredentialsClient } from "#behaviors/operational-credentials";
|
|
10
14
|
import { EndpointContainer } from "#endpoint/properties/EndpointContainer.js";
|
|
11
|
-
import {
|
|
15
|
+
import {
|
|
16
|
+
Diagnostic,
|
|
17
|
+
ImplementationError,
|
|
18
|
+
Logger,
|
|
19
|
+
Minutes,
|
|
20
|
+
Mutex,
|
|
21
|
+
Seconds,
|
|
22
|
+
Time,
|
|
23
|
+
Timestamp
|
|
24
|
+
} from "#general";
|
|
12
25
|
import { ClientGroup } from "#node/ClientGroup.js";
|
|
13
26
|
import { InteractionServer } from "#node/server/InteractionServer.js";
|
|
14
27
|
import { ClientSubscriptionHandler, ClientSubscriptions, FabricManager, PeerAddress } from "#protocol";
|
|
15
28
|
import { ServerNodeStore } from "#storage/server/ServerNodeStore.js";
|
|
16
29
|
import { ClientNode } from "../ClientNode.js";
|
|
17
30
|
import { ClientNodeFactory } from "./ClientNodeFactory.js";
|
|
18
|
-
|
|
31
|
+
import { ClientStructureEvents } from "./ClientStructureEvents.js";
|
|
32
|
+
const logger = Logger.get("Peers");
|
|
19
33
|
const DEFAULT_TTL = Minutes(15);
|
|
20
34
|
const EXPIRATION_INTERVAL = Minutes.one;
|
|
21
35
|
class Peers extends EndpointContainer {
|
|
22
36
|
#expirationInterval;
|
|
23
|
-
#expirationWorker;
|
|
24
37
|
#subscriptionHandler;
|
|
38
|
+
#mutex = new Mutex(this);
|
|
25
39
|
#closed = false;
|
|
26
40
|
constructor(owner) {
|
|
27
41
|
super(owner);
|
|
@@ -31,6 +45,7 @@ class Peers extends EndpointContainer {
|
|
|
31
45
|
owner.env.applyTo(InteractionServer, this.#configureInteractionServer.bind(this));
|
|
32
46
|
this.added.on(this.#handlePeerAdded.bind(this));
|
|
33
47
|
this.deleted.on(this.#manageExpiration.bind(this));
|
|
48
|
+
this.clusterInstalled(BasicInformationClient).on(this.#instrumentBasicInformation.bind(this));
|
|
34
49
|
}
|
|
35
50
|
/**
|
|
36
51
|
* Load nodes. Invoked automatically by owner.
|
|
@@ -68,6 +83,22 @@ class Peers extends EndpointContainer {
|
|
|
68
83
|
commission(options) {
|
|
69
84
|
return new CommissioningDiscovery(this.owner, options);
|
|
70
85
|
}
|
|
86
|
+
/**
|
|
87
|
+
* Obtain an {@link Observable} that emits when a specific type of endpoint initializes for a peer.
|
|
88
|
+
*
|
|
89
|
+
* This is useful for initializing general behavior on any peer endpoint of the specified type.
|
|
90
|
+
*/
|
|
91
|
+
endpointInstalled(type) {
|
|
92
|
+
return this.owner.env.get(ClientStructureEvents).endpointInstalled(type);
|
|
93
|
+
}
|
|
94
|
+
/**
|
|
95
|
+
* Obtain a {@link Observable} that emits when a specific type of cluster initializes for a peer.
|
|
96
|
+
*
|
|
97
|
+
* This is useful for initializing general behavior on any peer endpoint with the specified cluster.
|
|
98
|
+
*/
|
|
99
|
+
clusterInstalled(type) {
|
|
100
|
+
return this.owner.env.get(ClientStructureEvents).clusterInstalled(type);
|
|
101
|
+
}
|
|
71
102
|
get(id) {
|
|
72
103
|
if (typeof id !== "string" && typeof id !== "number") {
|
|
73
104
|
const address = PeerAddress(id);
|
|
@@ -90,6 +121,7 @@ class Peers extends EndpointContainer {
|
|
|
90
121
|
}
|
|
91
122
|
/**
|
|
92
123
|
* Get or create a client node for the given peer address.
|
|
124
|
+
*
|
|
93
125
|
* This is mainly used to communicate to other known nodes on the fabric without having a formal commissioning
|
|
94
126
|
* process.
|
|
95
127
|
*/
|
|
@@ -113,7 +145,7 @@ class Peers extends EndpointContainer {
|
|
|
113
145
|
this.#closed = true;
|
|
114
146
|
await this.#subscriptionHandler?.close();
|
|
115
147
|
this.#cancelExpiration();
|
|
116
|
-
await this.#
|
|
148
|
+
await this.#mutex;
|
|
117
149
|
await super.close();
|
|
118
150
|
}
|
|
119
151
|
#cancelExpiration() {
|
|
@@ -149,9 +181,6 @@ class Peers extends EndpointContainer {
|
|
|
149
181
|
if (this.#closed) {
|
|
150
182
|
return;
|
|
151
183
|
}
|
|
152
|
-
if (this.#expirationWorker) {
|
|
153
|
-
return;
|
|
154
|
-
}
|
|
155
184
|
if (this.#expirationInterval) {
|
|
156
185
|
if (!this.size) {
|
|
157
186
|
this.#cancelExpiration();
|
|
@@ -166,50 +195,84 @@ class Peers extends EndpointContainer {
|
|
|
166
195
|
);
|
|
167
196
|
}
|
|
168
197
|
#onExpirationIntervalElapsed() {
|
|
169
|
-
this.#
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
198
|
+
this.#mutex.run(
|
|
199
|
+
() => this.#cullExpiredNodesAndAddresses().catch((error) => {
|
|
200
|
+
logger.error("Error culling expired nodes", error);
|
|
201
|
+
}).finally(() => {
|
|
202
|
+
this.#manageExpiration();
|
|
203
|
+
})
|
|
204
|
+
);
|
|
176
205
|
}
|
|
177
206
|
async #cullExpiredNodesAndAddresses() {
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
const
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
let newAddresses = addresses.filter((addr) => {
|
|
187
|
-
const exp = expirationOf(addr);
|
|
188
|
-
if (exp === void 0) {
|
|
189
|
-
return true;
|
|
207
|
+
try {
|
|
208
|
+
const now = Time.nowMs;
|
|
209
|
+
for (const node of this) {
|
|
210
|
+
const state = node.state.commissioning;
|
|
211
|
+
const { addresses } = state;
|
|
212
|
+
const isCommissioned = state.peerAddress !== void 0;
|
|
213
|
+
if (addresses === void 0 || isCommissioned && addresses.length === 1) {
|
|
214
|
+
return;
|
|
190
215
|
}
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
216
|
+
let newAddresses = addresses.filter((addr) => {
|
|
217
|
+
const exp = expirationOf(addr);
|
|
218
|
+
if (exp === void 0) {
|
|
219
|
+
return true;
|
|
220
|
+
}
|
|
221
|
+
return exp > now;
|
|
222
|
+
});
|
|
223
|
+
if (!isCommissioned) {
|
|
224
|
+
if (!newAddresses?.length || (expirationOf(state) ?? 0) <= now) {
|
|
225
|
+
await node.delete();
|
|
226
|
+
continue;
|
|
227
|
+
}
|
|
197
228
|
}
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
229
|
+
if (isCommissioned && addresses.length && !newAddresses.length) {
|
|
230
|
+
if (addresses.length === 1) {
|
|
231
|
+
return;
|
|
232
|
+
}
|
|
233
|
+
const freshestExp = addresses.reduce((freshestExp2, addr) => {
|
|
234
|
+
return Math.max(freshestExp2, expirationOf(addr));
|
|
235
|
+
}, 0);
|
|
236
|
+
newAddresses = addresses.filter((addr) => expirationOf(addr) === freshestExp);
|
|
237
|
+
}
|
|
238
|
+
if (addresses.length !== newAddresses.length) {
|
|
239
|
+
await node.set({ commissioning: { addresses } });
|
|
202
240
|
}
|
|
203
|
-
const freshestExp = addresses.reduce((freshestExp2, addr) => {
|
|
204
|
-
return Math.max(freshestExp2, expirationOf(addr));
|
|
205
|
-
}, 0);
|
|
206
|
-
newAddresses = addresses.filter((addr) => expirationOf(addr) === freshestExp);
|
|
207
|
-
}
|
|
208
|
-
if (addresses.length !== newAddresses.length) {
|
|
209
|
-
await node.set({ commissioning: { addresses } });
|
|
210
241
|
}
|
|
242
|
+
} finally {
|
|
243
|
+
this.#expirationInterval = void 0;
|
|
211
244
|
}
|
|
212
245
|
}
|
|
246
|
+
#instrumentBasicInformation(node, type) {
|
|
247
|
+
if (!(node instanceof ClientNode)) {
|
|
248
|
+
return;
|
|
249
|
+
}
|
|
250
|
+
node.eventsOf(type).leave?.on(({ fabricIndex }) => this.#onLeave(node, fabricIndex));
|
|
251
|
+
node.eventsOf(type).shutDown?.on(() => this.#onShutdown(node));
|
|
252
|
+
}
|
|
253
|
+
#onLeave(node, fabricIndex) {
|
|
254
|
+
this.#mutex.run(async () => {
|
|
255
|
+
const { fabrics: peerFabrics } = node.maybeStateOf(OperationalCredentialsClient);
|
|
256
|
+
const peerFabric = peerFabrics.find((fabric) => fabric.fabricIndex === fabricIndex);
|
|
257
|
+
if (!peerFabric) {
|
|
258
|
+
return;
|
|
259
|
+
}
|
|
260
|
+
const peerAddress = node.maybeStateOf(CommissioningClient).peerAddress;
|
|
261
|
+
if (!peerAddress) {
|
|
262
|
+
return;
|
|
263
|
+
}
|
|
264
|
+
const localFabrics = this.owner.env.get(FabricManager);
|
|
265
|
+
const localFabric = localFabrics.forDescriptor(peerFabric);
|
|
266
|
+
if (!localFabric || localFabric.fabricIndex !== peerAddress.fabricIndex) {
|
|
267
|
+
return;
|
|
268
|
+
}
|
|
269
|
+
logger.notice("Peer", Diagnostic.strong(node.id), "has left the fabric");
|
|
270
|
+
node.lifecycle.decommissioned.emit(LocalActorContext.ReadOnly);
|
|
271
|
+
await node.delete();
|
|
272
|
+
});
|
|
273
|
+
}
|
|
274
|
+
#onShutdown(_node) {
|
|
275
|
+
}
|
|
213
276
|
}
|
|
214
277
|
class Factory extends ClientNodeFactory {
|
|
215
278
|
#owner;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/node/client/Peers.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["freshestExp"]
|
|
6
6
|
}
|
|
@@ -78,6 +78,6 @@ export declare class ServerSubscription extends Subscription {
|
|
|
78
78
|
/**
|
|
79
79
|
* Closes the subscription and flushes all outstanding data updates if requested.
|
|
80
80
|
*/
|
|
81
|
-
close(
|
|
81
|
+
close(flush?: boolean, cancelledByPeer?: boolean): Promise<void>;
|
|
82
82
|
}
|
|
83
83
|
//# sourceMappingURL=ServerSubscription.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServerSubscription.d.ts","sourceRoot":"","sources":["../../../../src/node/server/ServerSubscription.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AACpF,OAAO,EACH,QAAQ,EAaX,MAAM,UAAU,CAAC;AAElB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAuB,eAAe,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACnF,OAAO,EAIH,0BAA0B,EAG1B,WAAW,EAGX,YAAY,EACZ,oBAAoB,EACvB,MAAM,WAAW,CAAC;AAuBnB,eAAO,MAAM,4BAA4B,UAAY,CAAC;AACtD,eAAO,MAAM,iCAAiC,UAAa,CAAC;AAC5D,eAAO,MAAM,YAAY,UAAa,CAAC;AACvC,eAAO,MAAM,4BAA4B,UAAc,CAAC;AAExD;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACrC;;;OAGG;IACH,WAAW,EAAE,QAAQ,CAAC;IAEtB;;;;OAIG;IACH,WAAW,EAAE,QAAQ,CAAC;IAEtB;;;;OAIG;IACH,mBAAmB,EAAE,QAAQ,CAAC;CACjC;AAED,yBAAiB,wBAAwB,CAAC;IACtC;;;;OAIG;IACH,SAAgB,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,wBAAwB,CAAC;;;;MAM7D;CACJ;AAED;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACtC,OAAO,EAAE,WAAW,CAAC;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,gBAAgB,CAAC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,GAAG,eAAe,CAAC;CAC/E;AAED;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,YAAY;;gBAwBpC,OAAO,EAAE;QACjB,EAAE,EAAE,MAAM,CAAC;QACX,OAAO,EAAE,yBAAyB,CAAC;QACnC,QAAQ,EAAE,oBAAoB,CAAC;QAC/B,gBAAgB,EAAE,QAAQ,CAAC;QAC3B,kBAAkB,EAAE,QAAQ,CAAC;QAC7B,mBAAmB,EAAE,wBAAwB,CAAC;QAC9C,gBAAgB,CAAC,EAAE,QAAQ,CAAC;QAC5B,iBAAiB,CAAC,EAAE,QAAQ,CAAC;KAChC;IAgJD,IAAI,YAAY,aAEf;IAED,IAAI,gBAAgB,aAEnB;IAED,IAAI,kBAAkB,aAErB;IAEQ,QAAQ;
|
|
1
|
+
{"version":3,"file":"ServerSubscription.d.ts","sourceRoot":"","sources":["../../../../src/node/server/ServerSubscription.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AACpF,OAAO,EACH,QAAQ,EAaX,MAAM,UAAU,CAAC;AAElB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAuB,eAAe,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACnF,OAAO,EAIH,0BAA0B,EAG1B,WAAW,EAGX,YAAY,EACZ,oBAAoB,EACvB,MAAM,WAAW,CAAC;AAuBnB,eAAO,MAAM,4BAA4B,UAAY,CAAC;AACtD,eAAO,MAAM,iCAAiC,UAAa,CAAC;AAC5D,eAAO,MAAM,YAAY,UAAa,CAAC;AACvC,eAAO,MAAM,4BAA4B,UAAc,CAAC;AAExD;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACrC;;;OAGG;IACH,WAAW,EAAE,QAAQ,CAAC;IAEtB;;;;OAIG;IACH,WAAW,EAAE,QAAQ,CAAC;IAEtB;;;;OAIG;IACH,mBAAmB,EAAE,QAAQ,CAAC;CACjC;AAED,yBAAiB,wBAAwB,CAAC;IACtC;;;;OAIG;IACH,SAAgB,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,wBAAwB,CAAC;;;;MAM7D;CACJ;AAED;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACtC,OAAO,EAAE,WAAW,CAAC;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,gBAAgB,CAAC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,GAAG,eAAe,CAAC;CAC/E;AAED;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,YAAY;;gBAwBpC,OAAO,EAAE;QACjB,EAAE,EAAE,MAAM,CAAC;QACX,OAAO,EAAE,yBAAyB,CAAC;QACnC,QAAQ,EAAE,oBAAoB,CAAC;QAC/B,gBAAgB,EAAE,QAAQ,CAAC;QAC3B,kBAAkB,EAAE,QAAQ,CAAC;QAC7B,mBAAmB,EAAE,wBAAwB,CAAC;QAC9C,gBAAgB,CAAC,EAAE,QAAQ,CAAC;QAC5B,iBAAiB,CAAC,EAAE,QAAQ,CAAC;KAChC;IAgJD,IAAI,YAAY,aAEf;IAED,IAAI,gBAAgB,aAEnB;IAED,IAAI,kBAAkB,aAErB;IAEQ,QAAQ;IAqPX,iBAAiB,CACnB,SAAS,EAAE,0BAA0B,EACrC,WAAW,EAAE,kBAAkB,CAAC,OAAO,EACvC,qBAAqB,CAAC,EAAE,OAAO;cAqCV,OAAO;IAUhC;;OAEG;IACY,KAAK,CAAC,KAAK,UAAQ,EAAE,eAAe,UAAQ;CA8H9D"}
|