@matter/model 0.17.4 → 0.17.5-alpha.0-20260702-a2cd6f764

package/src/standard/resources/thermostat-device.resource.ts

@@ -25,6 +25,7 @@ Resource.add({
         { tag: "requirement", name: "ThermostatUserInterfaceConfiguration", xref: "device§9.1.4" },
         { tag: "requirement", name: "TemperatureMeasurement", xref: "device§9.1.4" },
         { tag: "requirement", name: "RelativeHumidityMeasurement", xref: "device§9.1.4" },
-        { tag: "requirement", name: "OccupancySensing", xref: "device§9.1.4" }
+        { tag: "requirement", name: "OccupancySensing", xref: "device§9.1.4" },
+        { tag: "requirement", name: "AmbientContextSensing", xref: "device§9.1.4" }
     ]
 });

package/src/standard/resources/web-rtc-transport-definitions.resource.ts

@@ -13,7 +13,7 @@ Resource.add({
 
     children: [
         {
-            tag: "datatype", name: "WebRTCSessionID", xref: "cluster§11.4.6.1",
+            tag: "datatype", name: "WebRTCSessionID", xref: "cluster§11.4.5.1",
             details: "It represents an active WebRTC session. This value starts at 0 and monotonically increases by 1 with " +
                 "each new allocation provisioned by the Node. A value incremented past 65534 shall wrap to 0. The " +
                 "Node shall verify that the incremented ID does not match any other active session ID. If such a " +
@@ -21,7 +21,7 @@ Resource.add({
         },
 
         {
-            tag: "datatype", name: "WebRTCEndReasonEnum", xref: "cluster§11.4.6.2",
+            tag: "datatype", name: "WebRTCEndReasonEnum", xref: "cluster§11.4.5.2",
 
             children: [
                 {
@@ -62,7 +62,7 @@ Resource.add({
         },
 
         {
-            tag: "datatype", name: "ICEServerStruct", xref: "cluster§11.4.6.3",
+            tag: "datatype", name: "ICEServerStruct", xref: "cluster§11.4.5.3",
 
             details: "This type shall specify the RFC 8825 compliant ICE servers used to facilitate the negotiation of " +
                 "peer-to-peer connections through NATs (Network Address Translators) and firewalls. It mimics the " +
@@ -83,28 +83,28 @@ Resource.add({
 
             children: [
                 {
-                    tag: "field", name: "UrLs", xref: "cluster§11.4.6.3.1",
+                    tag: "field", name: "UrLs", xref: "cluster§11.4.5.3.1",
                     details: "This field shall specify a list of URLs pointing to the STUN and/or TURN servers. The URL scheme " +
                         "distinguishes whether it is a STUN or TURN server (stun:, stuns:, turn:, or turns: respectively). " +
                         "This field maps to the RTCIceServer urls field."
                 },
 
                 {
-                    tag: "field", name: "Username", xref: "cluster§11.4.6.3.2",
+                    tag: "field", name: "Username", xref: "cluster§11.4.5.3.2",
                     details: "(Optional for STUN, usually required for TURN) The RFC 8489 compliant UTF-8 encoded username " +
                         "required for authentication with the STUN or TURN servers found in the URLs field. This field maps " +
                         "to the RTCIceServer username field."
                 },
 
                 {
-                    tag: "field", name: "Credential", xref: "cluster§11.4.6.3.3",
+                    tag: "field", name: "Credential", xref: "cluster§11.4.5.3.3",
                     details: "(Optional for STUN, usually required for TURN) The RFC 8489 compliant UTF-8 encoded short-term " +
                         "credential (password) used for authentication with the STUN or TURN servers found in the URLs field. " +
                         "This field maps to the RTCIceServer credential field."
                 },
 
                 {
-                    tag: "field", name: "Caid", xref: "cluster§11.4.6.3.4",
+                    tag: "field", name: "Caid", xref: "cluster§11.4.5.3.4",
                     details: "This field represents the TLSRCAC via its assigned TLSCAID (see Chapter 14, Certificate Authority ID " +
                         "(CAID) Mapping and TLS Certificate Management Commands sections in [[MatterCore]](#ref_MatterCore)) " +
                         "that will validate the certificate chain presented by the entries in the urls field. It shall be set " +
@@ -115,14 +115,14 @@ Resource.add({
         },
 
         {
-            tag: "datatype", name: "ICECandidateStruct", xref: "cluster§11.4.6.4",
+            tag: "datatype", name: "ICECandidateStruct", xref: "cluster§11.4.5.4",
             details: "This type shall specify the RFC 8825 compliant ICE Candidate used to facilitate the negotiation of " +
                 "peer-to-peer connections through NATs (Network Address Translators) and firewalls. It mimics the " +
                 "model used in the W3C WebRTC API RTCIceCandidate dictionary.",
 
             children: [
                 {
-                    tag: "field", name: "Candidate", xref: "cluster§11.4.6.4.1",
+                    tag: "field", name: "Candidate", xref: "cluster§11.4.5.4.1",
 
                     details: "This field shall specify the RFC 8825 compliant RFC 8839 candidate-attribute field in string form. " +
                         "This is the same value as the W3C WebRTC API RTCIceCandidate candidate value. The RFCs define no min " +
@@ -136,7 +136,7 @@ Resource.add({
                 },
 
                 {
-                    tag: "field", name: "SdpMid", xref: "cluster§11.4.6.4.2",
+                    tag: "field", name: "SdpMid", xref: "cluster§11.4.5.4.2",
                     details: "This field shall specify the Candidate's media stream identification tag which uniquely identifies " +
                         "the media stream within the component with which the candidate is associated, or null if no such " +
                         "association exists. This is the same value as the W3C WebRTC API RTCIceCandidate sdpMid value. The " +
@@ -144,7 +144,7 @@ Resource.add({
                 },
 
                 {
-                    tag: "field", name: "SdpmLineIndex", xref: "cluster§11.4.6.4.3",
+                    tag: "field", name: "SdpmLineIndex", xref: "cluster§11.4.5.4.3",
                     details: "This field shall specify the zero-based index number of the media description (as defined in RFC " +
                         "8866) in the SDP with which the Candidate is associated or null if no such association exists. This " +
                         "is the same value as the W3C WebRTC API RTCIceCandidate sdpMLineIndex value."
@@ -153,7 +153,7 @@ Resource.add({
         },
 
         {
-            tag: "datatype", name: "WebRTCSessionStruct", xref: "cluster§11.4.6.5",
+            tag: "datatype", name: "WebRTCSessionStruct", xref: "cluster§11.4.5.5",
             details: "This type stores all the relevant values associated with an active WebRTC session." +
                 "\n" +
                 "This values of PeerNodeID and FabricIndex are used to validate the source of, or select the correct " +
@@ -162,24 +162,24 @@ Resource.add({
 
             children: [
                 {
-                    tag: "field", name: "Id", xref: "cluster§11.4.6.5.1",
+                    tag: "field", name: "Id", xref: "cluster§11.4.5.5.1",
                     details: "This field contains the WebRTC Session ID for this session."
                 },
                 {
-                    tag: "field", name: "PeerNodeId", xref: "cluster§11.4.6.5.2",
+                    tag: "field", name: "PeerNodeId", xref: "cluster§11.4.5.5.2",
                     details: "This field contains the NodeId for the peer entity involved in this session."
                 },
                 {
-                    tag: "field", name: "PeerEndpointId", xref: "cluster§11.4.6.5.3",
+                    tag: "field", name: "PeerEndpointId", xref: "cluster§11.4.5.5.3",
                     details: "This field contains the EndpointId for the peer entity involved in this session."
                 },
                 {
-                    tag: "field", name: "StreamUsage", xref: "cluster§11.4.6.5.4",
+                    tag: "field", name: "StreamUsage", xref: "cluster§11.4.5.5.4",
                     details: "This field contains the StreamUsageEnum of this session."
                 },
 
                 {
-                    tag: "field", name: "VideoStreamId", xref: "cluster§11.4.6.5.5",
+                    tag: "field", name: "VideoStreamId", xref: "cluster§11.4.5.5.5",
                     details: "This field is deprecated and the VideoStreams field used instead." +
                         "\n" +
                         "For compatibility with clients implementing cluster revision 1, the first video stream found in the " +
@@ -188,7 +188,7 @@ Resource.add({
                 },
 
                 {
-                    tag: "field", name: "AudioStreamId", xref: "cluster§11.4.6.5.6",
+                    tag: "field", name: "AudioStreamId", xref: "cluster§11.4.5.5.6",
                     details: "This field is deprecated and the AudioStreams field used instead." +
                         "\n" +
                         "For compatibility with clients implementing cluster revision 1, the first audio stream found in the " +
@@ -197,12 +197,12 @@ Resource.add({
                 },
 
                 {
-                    tag: "field", name: "MetadataEnabled", xref: "cluster§11.4.6.5.7",
+                    tag: "field", name: "MetadataEnabled", xref: "cluster§11.4.5.5.7",
                     details: "This field indicates if metadata is active in this session."
                 },
 
                 {
-                    tag: "field", name: "VideoStreams", xref: "cluster§11.4.6.5.8",
+                    tag: "field", name: "VideoStreams", xref: "cluster§11.4.5.5.8",
 
                     details: "This field shall be a list of all video streams used by this session. Each VideoStreamID entry " +
                         "corresponds to an entry in the AllocatedVideoStreams attribute." +
@@ -213,7 +213,7 @@ Resource.add({
                 },
 
                 {
-                    tag: "field", name: "AudioStreams", xref: "cluster§11.4.6.5.9",
+                    tag: "field", name: "AudioStreams", xref: "cluster§11.4.5.5.9",
 
                     details: "This field shall be a list of all audio streams used by this session. Each VideoStreamID entry " +
                         "corresponds to an entry in the AllocatedVideoStreams attribute." +

package/src/standard/resources/web-rtc-transport-provider.resource.ts

@@ -26,39 +26,35 @@ Resource.add({
                     "metadata is supported on a per session basis." +
                     "\n" +
                     "This feature is designed to be JSEP compliant with the RTCDataChannel object interface and consists " +
-                    "of AVMetadataStruct content." +
-                    "\n" +
-                    "If SFrame End-to-End Encryption is active in a session, all metadata transmissions shall be sent " +
-                    "using the protocol name urn:csa:matter:sframe:av-metadata instead with each transmission being " +
-                    "wrapped in SFrames."
+                    "of AVMetadataStruct content."
             }]
         },
 
         {
-            tag: "attribute", name: "CurrentSessions", xref: "cluster§11.5.6.1",
+            tag: "attribute", name: "CurrentSessions", xref: "cluster§11.5.5.1",
             details: "This attribute shall be a list of WebRTCSessionStruct, which represents all the active WebRTC " +
                 "Sessions."
         },
 
         {
-            tag: "command", name: "SolicitOffer", xref: "cluster§11.5.7.1",
+            tag: "command", name: "SolicitOffer", xref: "cluster§11.5.6.1",
             details: "Requests that the Provider initiates a new session with the Offer / Answer flow in a way that allows " +
                 "for options to be passed and work with devices needing the standby flow.",
 
             children: [
                 {
-                    tag: "field", name: "StreamUsage", xref: "cluster§11.5.7.1.1",
+                    tag: "field", name: "StreamUsage", xref: "cluster§11.5.6.1.1",
                     details: "This field shall contain the StreamUsageEnum that indicates the stream usage for this session and is " +
                         "used per Resource Management and Stream Priorities."
                 },
                 {
-                    tag: "field", name: "OriginatingEndpointId", xref: "cluster§11.5.7.1.2",
+                    tag: "field", name: "OriginatingEndpointId", xref: "cluster§11.5.6.1.2",
                     details: "This field shall indicate the endpoint that originates this command. This endpoint shall be used " +
                         "when acting as a client to invoke the commands on the Requestor cluster."
                 },
 
                 {
-                    tag: "field", name: "VideoStreamId", xref: "cluster§11.5.7.1.4",
+                    tag: "field", name: "VideoStreamId", xref: "cluster§11.5.6.1.4",
 
                     details: "This field is deprecated and the VideoStreams field used instead." +
                         "\n" +
@@ -74,7 +70,7 @@ Resource.add({
                 },
 
                 {
-                    tag: "field", name: "AudioStreamId", xref: "cluster§11.5.7.1.3",
+                    tag: "field", name: "AudioStreamId", xref: "cluster§11.5.6.1.3",
 
                     details: "This field is deprecated and the AudioStreams field used instead." +
                         "\n" +
@@ -90,13 +86,13 @@ Resource.add({
                 },
 
                 {
-                    tag: "field", name: "IceServers", xref: "cluster§11.5.7.1.5",
+                    tag: "field", name: "IceServers", xref: "cluster§11.5.6.1.5",
                     details: "This field shall be a list of ICEServerStruct which contains the ICE servers and their credentials " +
                         "to use for this session. See ICEServerStruct for further details."
                 },
 
                 {
-                    tag: "field", name: "IceTransportPolicy", xref: "cluster§11.5.7.1.6",
+                    tag: "field", name: "IceTransportPolicy", xref: "cluster§11.5.6.1.6",
 
                     details: "This field shall contain a string which dictates the gathering and usage of ICE candidates. " +
                         "Specifically whether all candidates are used or if restrictions are applied to only use TURN server " +
@@ -107,21 +103,16 @@ Resource.add({
                 },
 
                 {
-                    tag: "field", name: "MetadataEnabled", xref: "cluster§11.5.7.1.7",
+                    tag: "field", name: "MetadataEnabled", xref: "cluster§11.5.6.1.7",
                     details: "This field indicates if metadata transmission shall be active in this session."
                 },
                 {
-                    tag: "field", name: "SFrameConfig", xref: "cluster§11.5.7.1.8",
-                    details: "This field if present indicates that SFrame End-to-End Encryption shall be active in this session " +
-                        "using the configuration provided."
-                },
-                {
-                    tag: "field", name: "VideoStreams", xref: "cluster§11.5.7.1.9",
+                    tag: "field", name: "VideoStreams", xref: "cluster§11.5.6.1.8",
                     details: "This field shall be the list of requested VideoStreamID for this session. Valid values are found in " +
                         "the AllocatedVideoStreams attribute."
                 },
                 {
-                    tag: "field", name: "AudioStreams", xref: "cluster§11.5.7.1.10",
+                    tag: "field", name: "AudioStreams", xref: "cluster§11.5.6.1.9",
                     details: "This field shall be a list of requested AudioStreamID for this session. Valid values are found in " +
                         "the AllocatedAudioStreams attribute."
                 }
@@ -129,7 +120,7 @@ Resource.add({
         },
 
         {
-            tag: "command", name: "SolicitOfferResponse", xref: "cluster§11.5.7.2",
+            tag: "command", name: "SolicitOfferResponse", xref: "cluster§11.5.6.2",
 
             details: "This command shall be generated in response to a SolicitOffer command." +
                 "\n" +
@@ -146,12 +137,12 @@ Resource.add({
 
             children: [
                 {
-                    tag: "field", name: "WebRtcSessionId", xref: "cluster§11.5.7.2.1",
+                    tag: "field", name: "WebRtcSessionId", xref: "cluster§11.5.6.2.1",
                     details: "This field shall contain the ID of the established WebRTC session."
                 },
 
                 {
-                    tag: "field", name: "DeferredOffer", xref: "cluster§11.5.7.2.2",
+                    tag: "field", name: "DeferredOffer", xref: "cluster§11.5.6.2.2",
 
                     details: "This field shall indicates the delayed processing hint of the provider." +
                         "\n" +
@@ -166,14 +157,14 @@ Resource.add({
                 },
 
                 {
-                    tag: "field", name: "VideoStreamId", xref: "cluster§11.5.7.2.3",
+                    tag: "field", name: "VideoStreamId", xref: "cluster§11.5.6.2.3",
                     details: "This field is deprecated and is only present when clients implementing cluster revision 1 included " +
                         "the VideoStreamID field in the request. When included, it shall contain a VideoStreamID used for the " +
                         "session if known or null if unknown at this time."
                 },
 
                 {
-                    tag: "field", name: "AudioStreamId", xref: "cluster§11.5.7.2.4",
+                    tag: "field", name: "AudioStreamId", xref: "cluster§11.5.6.2.4",
                     details: "This field is deprecated and is only present when clients implementing cluster revision 1 included " +
                         "the AudioStreamID field in the request. When included, it shall contain a AudioStreamID used for the " +
                         "session if known or null if unknown at this time."
@@ -182,34 +173,34 @@ Resource.add({
         },
 
         {
-            tag: "command", name: "ProvideOffer", xref: "cluster§11.5.7.3",
+            tag: "command", name: "ProvideOffer", xref: "cluster§11.5.6.3",
             details: "This command allows an SDP Offer to be set and start a new session. This command can also be used in " +
                 "the re-offer flow of an existing session to change the details of the SDP (e.g. to enable/disable " +
                 "two-way talk).",
 
             children: [
                 {
-                    tag: "field", name: "WebRtcSessionId", xref: "cluster§11.5.7.3.1",
+                    tag: "field", name: "WebRtcSessionId", xref: "cluster§11.5.6.3.1",
                     details: "This field shall be a WebRTCSessionID and contain the ID of an established WebRTC session or null if " +
                         "requesting a new session."
                 },
                 {
-                    tag: "field", name: "Sdp", xref: "cluster§11.5.7.3.2",
+                    tag: "field", name: "Sdp", xref: "cluster§11.5.6.3.2",
                     details: "This field shall contain the string based SDP Offer. See WebRTC Transport for further details on SDP " +
                         "and Offer/Answer semantics."
                 },
                 {
-                    tag: "field", name: "StreamUsage", xref: "cluster§11.5.7.3.3",
+                    tag: "field", name: "StreamUsage", xref: "cluster§11.5.6.3.3",
                     details: "This field shall contain the StreamUsageEnum that indicates the stream usage for this session."
                 },
                 {
-                    tag: "field", name: "OriginatingEndpointId", xref: "cluster§11.5.7.3.4",
+                    tag: "field", name: "OriginatingEndpointId", xref: "cluster§11.5.6.3.4",
                     details: "This field shall indicate the endpoint that originates this command. This endpoint shall be used " +
                         "when acting as a client to invoke the commands on the Requestor cluster."
                 },
 
                 {
-                    tag: "field", name: "VideoStreamId", xref: "cluster§11.5.7.3.5",
+                    tag: "field", name: "VideoStreamId", xref: "cluster§11.5.6.3.5",
 
                     details: "This field is deprecated and the VideoStreams field used instead." +
                         "\n" +
@@ -225,7 +216,7 @@ Resource.add({
                 },
 
                 {
-                    tag: "field", name: "AudioStreamId", xref: "cluster§11.5.7.3.6",
+                    tag: "field", name: "AudioStreamId", xref: "cluster§11.5.6.3.6",
 
                     details: "This field is deprecated and the AudioStreams field used instead." +
                         "\n" +
@@ -241,31 +232,26 @@ Resource.add({
                 },
 
                 {
-                    tag: "field", name: "IceServers", xref: "cluster§11.5.7.3.7",
+                    tag: "field", name: "IceServers", xref: "cluster§11.5.6.3.7",
                     details: "This field shall be a list of ICEServerStruct which contains the ICE servers and their credentials " +
                         "to use for this session. See ICEServerStruct for further details."
                 },
                 {
-                    tag: "field", name: "IceTransportPolicy", xref: "cluster§11.5.7.3.8",
+                    tag: "field", name: "IceTransportPolicy", xref: "cluster§11.5.6.3.8",
                     details: "This field controls the gathering and usage of ICE candidates and shall have one of the values found " +
                         "in ICETransportPolicy."
                 },
                 {
-                    tag: "field", name: "MetadataEnabled", xref: "cluster§11.5.7.3.9",
+                    tag: "field", name: "MetadataEnabled", xref: "cluster§11.5.6.3.9",
                     details: "This field indicates if metadata transmission shall be active in this session."
                 },
                 {
-                    tag: "field", name: "SFrameConfig", xref: "cluster§11.5.7.3.10",
-                    details: "This field if present indicates that SFrame End-to-End Encryption shall be active in this session " +
-                        "using the configuration provided."
-                },
-                {
-                    tag: "field", name: "VideoStreams", xref: "cluster§11.5.7.3.11",
+                    tag: "field", name: "VideoStreams", xref: "cluster§11.5.6.3.10",
                     details: "This field shall be the list of requested VideoStreamID for this session. Valid values are found in " +
                         "the AllocatedVideoStreams attribute."
                 },
                 {
-                    tag: "field", name: "AudioStreams", xref: "cluster§11.5.7.3.12",
+                    tag: "field", name: "AudioStreams", xref: "cluster§11.5.6.3.11",
                     details: "This field shall be a list of requested AudioStreamID for this session. Valid values are found in " +
                         "the AllocatedAudioStreams attribute."
                 }
@@ -273,7 +259,7 @@ Resource.add({
         },
 
         {
-            tag: "command", name: "ProvideOfferResponse", xref: "cluster§11.5.7.4",
+            tag: "command", name: "ProvideOfferResponse", xref: "cluster§11.5.6.4",
 
             details: "This command contains information about the session and streams created as a response to the " +
                 "requestor's offer." +
@@ -285,19 +271,19 @@ Resource.add({
 
             children: [
                 {
-                    tag: "field", name: "WebRtcSessionId", xref: "cluster§11.5.7.4.1",
+                    tag: "field", name: "WebRtcSessionId", xref: "cluster§11.5.6.4.1",
                     details: "This field shall contain the WebRTCSessionID of the established WebRTC session."
                 },
 
                 {
-                    tag: "field", name: "VideoStreamId", xref: "cluster§11.5.7.4.2",
+                    tag: "field", name: "VideoStreamId", xref: "cluster§11.5.6.4.2",
                     details: "This field is deprecated and is only present when clients implementing cluster revision 1 included " +
                         "the VideoStreamID field in the request. When included, it shall contain a VideoStreamID used for the " +
                         "session if known or null if unknown at this time."
                 },
 
                 {
-                    tag: "field", name: "AudioStreamId", xref: "cluster§11.5.7.4.3",
+                    tag: "field", name: "AudioStreamId", xref: "cluster§11.5.6.4.3",
                     details: "This field is deprecated and is only present when clients implementing cluster revision 1 included " +
                         "the AudioStreamID field in the request. When included, shall contain a AudioStreamID used for the " +
                         "session if known or null if unknown at this time."
@@ -306,7 +292,7 @@ Resource.add({
         },
 
         {
-            tag: "command", name: "ProvideAnswer", xref: "cluster§11.5.7.5",
+            tag: "command", name: "ProvideAnswer", xref: "cluster§11.5.6.5",
 
             details: "This command shall be initiated from a Node in response to an Offer that was previously received " +
                 "from a remote peer. It shall have the following data fields:" +
@@ -318,11 +304,11 @@ Resource.add({
 
             children: [
                 {
-                    tag: "field", name: "WebRtcSessionId", xref: "cluster§11.5.7.5.1",
+                    tag: "field", name: "WebRtcSessionId", xref: "cluster§11.5.6.5.1",
                     details: "This field shall contain the WebRTCSessionID of the established WebRTC session."
                 },
                 {
-                    tag: "field", name: "Sdp", xref: "cluster§11.5.7.5.2",
+                    tag: "field", name: "Sdp", xref: "cluster§11.5.6.5.2",
                     details: "This field shall contain the string based SDP Answer. See WebRTC Transport for further details on " +
                         "SDP and Offer/Answer semantics."
                 }
@@ -330,7 +316,7 @@ Resource.add({
         },
 
         {
-            tag: "command", name: "ProvideIceCandidates", xref: "cluster§11.5.7.6",
+            tag: "command", name: "ProvideIceCandidates", xref: "cluster§11.5.6.6",
 
             details: "This command allows for string based ICE candidates generated after the initial Offer / Answer " +
                 "exchange, via a JSEP onicecandidate event, a DOM rtcpeerconnectioniceevent event, or other WebRTC " +
@@ -344,54 +330,30 @@ Resource.add({
 
             children: [
                 {
-                    tag: "field", name: "WebRtcSessionId", xref: "cluster§11.5.7.6.1",
+                    tag: "field", name: "WebRtcSessionId", xref: "cluster§11.5.6.6.1",
                     details: "This field shall contain the WebRTCSessionID of the established WebRTC session."
                 },
                 {
-                    tag: "field", name: "IceCandidates", xref: "cluster§11.5.7.6.2",
+                    tag: "field", name: "IceCandidates", xref: "cluster§11.5.6.6.2",
                     details: "This field shall contain a list of JSEP compliant ICE Candidate Format objects."
                 }
             ]
         },
 
         {
-            tag: "command", name: "EndSession", xref: "cluster§11.5.7.7",
+            tag: "command", name: "EndSession", xref: "cluster§11.5.6.7",
             details: "This command instructs the stream provider to end the WebRTC session.",
 
             children: [
                 {
-                    tag: "field", name: "WebRtcSessionId", xref: "cluster§11.5.7.7.1",
+                    tag: "field", name: "WebRtcSessionId", xref: "cluster§11.5.6.7.1",
                     details: "This field shall contain the WebRTCSessionID of the established WebRTC session."
                 },
                 {
-                    tag: "field", name: "Reason", xref: "cluster§11.5.7.7.2",
+                    tag: "field", name: "Reason", xref: "cluster§11.5.6.7.2",
                     details: "This field shall be one of the values in WebRTCEndReasonEnum."
                 }
             ]
-        },
-
-        {
-            tag: "datatype", name: "SFrameStruct", xref: "cluster§11.5.5.1",
-            details: "This type shall specify the RFC 9605 data needed to use SFrames as an end-to-end encryption " +
-                "mechanism with WebRTC.",
-
-            children: [
-                {
-                    tag: "field", name: "CipherSuite", xref: "cluster§11.5.5.1.1",
-                    details: "This field shall specify the SFrame cipher suite value as defined in RFC 9605 Section 8.1 Cipher " +
-                        "Suites table, and maintained in the IANA SFrame Registry."
-                },
-                {
-                    tag: "field", name: "BaseKey", xref: "cluster§11.5.5.1.2",
-                    details: "This field shall specify the SFrame base_key value to use for a session. The length of this key " +
-                        "depends on the selected cipher suite's Nk value as defined in Section 4.5 Cipher Suites."
-                },
-                {
-                    tag: "field", name: "Kid", xref: "cluster§11.5.5.1.3",
-                    details: "This field shall specify the initial SFrame KID (Key Id) value to be used. The bottom 8 bits of this " +
-                        "value will be overwritten and used for ratchet step tracking."
-                }
-            ]
         }
     ]
 });

package/src/standard/resources/window-covering-cluster.resource.ts

@@ -36,7 +36,7 @@ Resource.add(
             },
 
             {
-                tag: "attribute", name: "Type", xref: "cluster§5.3.6.1",
+                tag: "attribute", name: "Type", xref: "cluster§5.3.6.2",
 
                 details: "This attribute shall identify the type of window covering." +
                     "\n" +
@@ -51,18 +51,18 @@ Resource.add(
             },
 
             {
-                tag: "attribute", name: "NumberOfActuationsLift", xref: "cluster§5.3.6.2",
+                tag: "attribute", name: "NumberOfActuationsLift", xref: "cluster§5.3.6.3",
                 details: "Indicates the total number of lift/slide actuations applied to the window covering since the device " +
                     "was installed."
             },
             {
-                tag: "attribute", name: "NumberOfActuationsTilt", xref: "cluster§5.3.6.3",
+                tag: "attribute", name: "NumberOfActuationsTilt", xref: "cluster§5.3.6.4",
                 details: "Indicates the total number of tilt actuations applied to the window covering since the device was " +
                     "installed."
             },
 
             {
-                tag: "attribute", name: "ConfigStatus", xref: "cluster§5.3.6.4",
+                tag: "attribute", name: "ConfigStatus", xref: "cluster§5.3.6.5",
                 details: "This attribute specifies the configuration and status information of the window covering." +
                     "\n" +
                     "To change settings, devices shall write to the Mode attribute. The behavior causing the setting or " +
@@ -70,32 +70,32 @@ Resource.add(
             },
 
             {
-                tag: "attribute", name: "CurrentPositionLiftPercentage", xref: "cluster§5.3.6.7",
+                tag: "attribute", name: "CurrentPositionLiftPercentage", xref: "cluster§5.3.6.8",
                 details: "Indicates the actual position as a percentage from 0% to 100% with 1% default step. This attribute " +
                     "is equal to CurrentPositionLiftPercent100ths attribute divided by 100."
             },
             {
-                tag: "attribute", name: "CurrentPositionTiltPercentage", xref: "cluster§5.3.6.8",
+                tag: "attribute", name: "CurrentPositionTiltPercentage", xref: "cluster§5.3.6.9",
                 details: "Indicates the actual position as a percentage from 0% to 100% with 1% default step. This attribute " +
                     "is equal to CurrentPositionTiltPercent100ths attribute divided by 100."
             },
             {
-                tag: "attribute", name: "OperationalStatus", xref: "cluster§5.3.6.11",
+                tag: "attribute", name: "OperationalStatus", xref: "cluster§5.3.6.12",
                 details: "Indicates the currently ongoing operations and applies to all type of devices."
             },
             {
-                tag: "attribute", name: "TargetPositionLiftPercent100ths", xref: "cluster§5.3.6.9",
+                tag: "attribute", name: "TargetPositionLiftPercent100ths", xref: "cluster§5.3.6.10",
                 details: "Indicates the position where the window covering lift will go or is moving to as a percentage (Unit " +
                     "0.01%)."
             },
             {
-                tag: "attribute", name: "TargetPositionTiltPercent100ths", xref: "cluster§5.3.6.10",
+                tag: "attribute", name: "TargetPositionTiltPercent100ths", xref: "cluster§5.3.6.11",
                 details: "Indicates the position where the window covering tilt will go or is moving to as a percentage (Unit " +
                     "0.01%)."
             },
 
             {
-                tag: "attribute", name: "EndProductType", xref: "cluster§5.3.6.12",
+                tag: "attribute", name: "EndProductType", xref: "cluster§5.3.6.13",
 
                 details: "This attribute SHOULD provide more detail about the product type than can be determined from the " +
                     "main category indicated by the Type attribute." +
@@ -113,18 +113,18 @@ Resource.add(
             },
 
             {
-                tag: "attribute", name: "CurrentPositionLiftPercent100ths", xref: "cluster§5.3.6.5",
+                tag: "attribute", name: "CurrentPositionLiftPercent100ths", xref: "cluster§5.3.6.6",
                 details: "Indicates the actual position as a percentage with a minimal step of 0.01%. E.g Max 10000 equals " +
                     "100.00%."
             },
             {
-                tag: "attribute", name: "CurrentPositionTiltPercent100ths", xref: "cluster§5.3.6.6",
+                tag: "attribute", name: "CurrentPositionTiltPercent100ths", xref: "cluster§5.3.6.7",
                 details: "Indicates the actual position as a percentage with a minimal step of 0.01%. E.g Max 10000 equals " +
                     "100.00%."
             },
 
             {
-                tag: "attribute", name: "Mode", xref: "cluster§5.3.6.13",
+                tag: "attribute", name: "Mode", xref: "cluster§5.3.6.14",
 
                 details: "The Mode attribute allows configuration of the window covering, such as: reversing the motor " +
                     "direction, placing the window covering into calibration mode, placing the motor into maintenance " +
@@ -137,7 +137,7 @@ Resource.add(
             },
 
             {
-                tag: "attribute", name: "SafetyStatus", xref: "cluster§5.3.6.14",
+                tag: "attribute", name: "SafetyStatus", xref: "cluster§5.3.6.15",
                 details: "The SafetyStatus attribute reflects the state of the safety sensors and the common issues preventing " +
                     "movements. By default for nominal operation all flags are cleared (0). A device might support none, " +
                     "one or several bit flags from this attribute (all optional)."