@matter/model 0.13.0-alpha.0-20250304-d4a7592a4 → 0.13.0-alpha.0-20250307-ebf84a05a

package/src/standard/elements/CommissionerControl.ts

@@ -0,0 +1,194 @@
+/**
+ * @license
+ * Copyright 2022-2025 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*** THIS FILE IS GENERATED, DO NOT EDIT ***/
+
+import { MatterDefinition } from "../MatterDefinition.js";
+import {
+    ClusterElement as Cluster,
+    AttributeElement as Attribute,
+    EventElement as Event,
+    FieldElement as Field,
+    CommandElement as Command,
+    DatatypeElement as Datatype
+} from "../../elements/index.js";
+
+export const CommissionerControl = Cluster(
+    {
+        name: "CommissionerControl", id: 0x751, classification: "node", pics: "CCTRL",
+
+        details: "The Commissioner Control Cluster supports the ability for clients to request the commissioning of " +
+            "themselves or other nodes onto a fabric which the cluster server can commission onto. An example " +
+            "use case is ecosystem to ecosystem Fabric Synchronization setup." +
+            "\n" +
+            "The generalized flow supported by the Commissioner Control Cluster can be seen in the following " +
+            "diagram." +
+            "\n" +
+            "Figure 101. Commissioner Control Cluster - General Flow",
+
+        xref: { document: "core", section: "11.26" }
+    },
+
+    Attribute({ name: "ClusterRevision", id: 0xfffd, type: "ClusterRevision", default: 1 }),
+
+    Attribute({
+        name: "SupportedDeviceCategories", id: 0x0, type: "SupportedDeviceCategoryBitmap", access: "R M",
+        conformance: "M", default: 0,
+        details: "Indicates the device categories specified in SupportedDeviceCategoryBitmap that are supported by " +
+            "this Commissioner Control Cluster server." +
+            "\n" +
+            "A client shall NOT send the RequestCommissioningApproval command if the intended node to be " +
+            "commissioned does not conform to any of the values specified in SupportedDeviceCategories.",
+        xref: { document: "core", section: "11.26.5.1" }
+    }),
+
+    Event(
+        {
+            name: "CommissioningRequestResult", id: 0x0, access: "S M", conformance: "M", priority: "info",
+
+            details: "This event shall be generated by the server following a RequestCommissioningApproval command which " +
+                "the server responded to with SUCCESS." +
+                "\n" +
+                "NOTE" +
+                "\n" +
+                "The approval is valid for a period determined by the manufacturer and characteristics of the node " +
+                "presenting the Commissioner Control Cluster. Clients SHOULD send the CommissionNode command " +
+                "immediately upon receiving a CommissioningRequestResult event." +
+                "\n" +
+                "11.26.7.2. RequestID / ClientNodeID Fields" +
+                "\n" +
+                "The RequestID shall match the RequestID provided to RequestCommissioningApproval and the " +
+                "ClientNodeID shall match the NodeID of the client which generated the RequestCommissioningAp" +
+                "\n" +
+                "proval command.",
+
+            xref: { document: "core", section: "11.26.7.1" }
+        },
+
+        Field({ name: "RequestId", id: 0x0, type: "uint64", access: "S", conformance: "M" }),
+        Field({ name: "ClientNodeId", id: 0x1, type: "node-id", access: "S", conformance: "M" }),
+        Field({ name: "StatusCode", id: 0x2, type: "status", access: "S", conformance: "M", constraint: "desc" }),
+        Field({ name: "FabricIndex", id: 0xfe, type: "FabricIndex" })
+    ),
+
+    Command(
+        {
+            name: "RequestCommissioningApproval", id: 0x0, access: "M", conformance: "M", direction: "request",
+            response: "status",
+
+            details: "This command is sent by a client to request approval for a future CommissionNode call. This is " +
+                "required to be a separate step in order to provide the server time for interacting with a user " +
+                "before informing the client that the CommissionNode operation may be successful." +
+                "\n" +
+                "If the command is not executed via a CASE session, the command shall fail with a status code of " +
+                "UNSUPPORTED_ACCESS." +
+                "\n" +
+                "The server may request approval from the user, but it is not required." +
+                "\n" +
+                "The server shall always return SUCCESS to a correctly formatted RequestCommissioningApproval " +
+                "command, and then generate a CommissioningRequestResult event associated with the command’s" +
+                "\n" +
+                "accessing fabric once the result is ready." +
+                "\n" +
+                "Clients SHOULD avoid using the same RequestID. If the RequestID and client NodeID of a " +
+                "RequestCommissioningApproval match a previously received RequestCommissioningApproval and the " +
+                "server has not returned an error or completed commissioning of a device for the prior request, then " +
+                "the server SHOULD return FAILURE." +
+                "\n" +
+                "The parameters for RequestCommissioningApproval command are as follows:",
+
+            xref: { document: "core", section: "11.26.6.1" }
+        },
+
+        Field({ name: "RequestId", id: 0x0, type: "uint64", conformance: "M" }),
+        Field({ name: "VendorId", id: 0x1, type: "vendor-id", conformance: "M" }),
+        Field({ name: "ProductId", id: 0x2, type: "uint16", conformance: "M" }),
+        Field({ name: "Label", id: 0x3, type: "string", conformance: "O", constraint: "max 64" })
+    ),
+
+    Command(
+        {
+            name: "CommissionNode", id: 0x1, access: "M", conformance: "M", direction: "request",
+            response: "ReverseOpenCommissioningWindow",
+
+            details: "This command is sent by a client to request that the server begins commissioning a previously " +
+                "approved request." +
+                "\n" +
+                "The server shall return FAILURE if the CommissionNode command is not sent from the same NodeID and " +
+                "on the same fabric as the RequestCommissioningApproval or if the provided RequestID to " +
+                "CommissionNode does not match the value provided to RequestCommissioningApproval." +
+                "\n" +
+                "If the command is not executed via a CASE session, the command shall fail with a status code of" +
+                "\n" +
+                "UNSUPPORTED_ACCESS." +
+                "\n" +
+                "Upon receipt, the server shall respond with ReverseOpenCommissioningWindow if " +
+                "CommissioningRequestResult was generated with StatusCode of SUCCESS for the matching RequestID " +
+                "field and NodeID of the client." +
+                "\n" +
+                "The server shall return FAILURE if the CommissionNode command is received after the server has " +
+                "already responded to a client with ReverseOpenCommissioningWindow for a matching RequestID field " +
+                "and NodeID of the client unless the client has sent another RequestCommissioningApproval and " +
+                "received an additional CommissioningRequestResult." +
+                "\n" +
+                "The parameters for CommissionNode command are as follows:",
+
+            xref: { document: "core", section: "11.26.6.5" }
+        },
+
+        Field({ name: "RequestId", id: 0x0, type: "uint64", conformance: "M" }),
+        Field({
+            name: "ResponseTimeoutSeconds", id: 0x1, type: "uint16", conformance: "M", constraint: "30 to 120",
+            default: 30
+        })
+    ),
+
+    Command(
+        {
+            name: "ReverseOpenCommissioningWindow", id: 0x2, conformance: "M", direction: "response",
+
+            details: "When received within the timeout specified by ResponseTimeoutSeconds in the CommissionNode command, " +
+                "the client shall open a commissioning window on a node which matches the VendorID and ProductID " +
+                "provided in the associated RequestCommissioningApproval command." +
+                "\n" +
+                "When commissioning this node, the server shall check that the VendorID and ProductID fields " +
+                "provided in the RequestCommissioningApproval command match the VendorID and ProductID attributes of " +
+                "the Basic Information Cluster which have already been verified during the Device Attestation " +
+                "Procedure. If they do not match, the server shall NOT complete commissioning and SHOULD indicate an " +
+                "error to the user." +
+                "\n" +
+                "NOTE" +
+                "\n" +
+                "This is an alias onto the Open Commissioning Window command within the Administrator Commissioning " +
+                "Cluster. Refer to the Open Commissioning Window command for a description of the command behavior " +
+                "and parameters." +
+                "\n" +
+                "The parameters for ReverseOpenCommissioningWindow command are as follows:",
+
+            xref: { document: "core", section: "11.26.6.8" }
+        },
+
+        Field({ name: "CommissioningTimeout", id: 0x0, type: "uint16", conformance: "M", constraint: "desc" }),
+        Field({ name: "PakePasscodeVerifier", id: 0x1, type: "octstr", conformance: "M" }),
+        Field({ name: "Discriminator", id: 0x2, type: "uint16", conformance: "M", constraint: "max 4095" }),
+        Field({ name: "Iterations", id: 0x3, type: "uint32", conformance: "M", constraint: "1000 to 100000" }),
+        Field({ name: "Salt", id: 0x4, type: "octstr", conformance: "M", constraint: "16 to 32" })
+    ),
+
+    Datatype(
+        { name: "SupportedDeviceCategoryBitmap", type: "map32", xref: { document: "core", section: "11.26.4.1" } },
+
+        Field({
+            name: "FabricSynchronization", constraint: "0",
+            description: "Aggregators which support Fabric Synchronization may be commissioned.",
+            details: "The FabricSynchronization bit shall be set to 1 if and only if the server supports commissioning " +
+                "nodes that support Fabric Synchronization.",
+            xref: { document: "core", section: "11.26.4.1.1" }
+        })
+    )
+);
+
+MatterDefinition.children.push(CommissionerControl);

package/src/standard/elements/ConcentrationMeasurement.ts

@@ -64,8 +64,8 @@ export const ConcentrationMeasurement = Cluster(
     }),
 
     Attribute({
-        name: "MinMeasuredValue", id: 0x1, type: "single", access: "R V", conformance: "MEA",
-        constraint: "max maxMeasuredValue", default: null, quality: "X",
+        name: "MinMeasuredValue", id: 0x1, type: "single", access: "R V", conformance: "MEA", default: null,
+        quality: "X",
         details: "Indicates the minimum value of MeasuredValue that is capable of being measured. A MinMeasuredValue " +
             "of null indicates that the MinMeasuredValue is not defined.",
         xref: { document: "cluster", section: "2.10.6.2" }

package/src/standard/elements/ContentControl.ts

@@ -182,9 +182,8 @@ export const ContentControl = Cluster(
         name: "BlockUnrated", id: 0x7, type: "bool", access: "R V", conformance: "BU",
 
         details: "Indicates whether the playback of unrated content is allowed when the Content Control feature is " +
-            "activated. If this attribute equals FALSE, then playback of unrated content" +
-            "\n" +
-            "shall be permitted. Otherwise, the media device shall prevent the playback of unrated content." +
+            "activated. If this attribute equals FALSE, then playback of unrated content shall be permitted. " +
+            "Otherwise, the media device shall prevent the playback of unrated content." +
             "\n" +
             "When this attribute changes, the device SHOULD make the user aware of any limits of this feature. " +
             "For example, if the feature does not control content within apps, then the device should make this " +
@@ -220,7 +219,7 @@ export const ContentControl = Cluster(
                 "when the Content Control feature is activated. The media device shall reject any request to play " +
                 "content during one period of this attribute. If it is entering any one period of this attribute, " +
                 "the media device shall block content which is playing and generate an event " +
-                "EnteringBlockContentTimeWindow. There shall not be multiple entries in this attribute list for the " +
+                "EnteringBlockContentTimeWindow. There shall NOT be multiple entries in this attribute list for the " +
                 "same day of week.",
 
             xref: { document: "cluster", section: "6.13.7.11" }
@@ -326,9 +325,8 @@ export const ContentControl = Cluster(
 
             details: "The purpose of this command is to add the extra screen time for the user." +
                 "\n" +
-                "If a client with Operate privilege invokes this command, the media device shall check whether" +
-                "\n" +
-                "the PINCode passed in the command matches the current PINCode value. If these match, then the " +
+                "If a client with Operate privilege invokes this command, the media device shall check whether the " +
+                "PINCode passed in the command matches the current PINCode value. If these match, then the " +
                 "RemainingScreenTime attribute shall be increased by the specified BonusTime value." +
                 "\n" +
                 "If the PINs do not match, then a response with InvalidPINCode error status shall be returned, and " +
@@ -364,7 +362,7 @@ export const ContentControl = Cluster(
         Field({
             name: "BonusTime", id: 0x1, type: "elapsed-s", conformance: "M", constraint: "desc", default: 300,
             details: "This field shall indicate the amount of extra time (in seconds) to increase RemainingScreenTime. " +
-                "This field shall not exceed the remaining time of this day.",
+                "This field shall NOT exceed the remaining time of this day.",
             xref: { document: "cluster", section: "6.13.8.6.2" }
         })
     ),
@@ -382,8 +380,7 @@ export const ContentControl = Cluster(
 
         Field({
             name: "ScreenTime", id: 0x0, type: "elapsed-s", conformance: "M", constraint: "max 86400",
-            details: "This field shall indicate the time (in seconds) which the User is allowed to spend watching TV on" +
-                "\n" +
+            details: "This field shall indicate the time (in seconds) which the User is allowed to spend watching TV on " +
                 "this media device within one day.",
             xref: { document: "cluster", section: "6.13.8.7.1" }
         })
@@ -446,9 +443,7 @@ export const ContentControl = Cluster(
         Field({
             name: "Rating", id: 0x0, type: "string", conformance: "M", constraint: "max 8",
             details: "This field indicates a threshold rating for filtering scheduled content. This field shall be set to " +
-                "one" +
-                "\n" +
-                "of the values present in the ScheduledContentRatings attribute.",
+                "one of the values present in the ScheduledContentRatings attribute.",
             xref: { document: "cluster", section: "6.13.8.11.1" }
         })
     ),
@@ -460,9 +455,10 @@ export const ContentControl = Cluster(
 
             details: "The purpose of this command is to set BlockChannelList attribute." +
                 "\n" +
-                "Upon receipt of the AddBlockChannels command, the media device shall check if the channels passed " +
-                "in this command are valid. If the channel is invalid, then a response with InvalidChannel error " +
-                "Status shall be returned." +
+                "Upon receipt of the AddBlockChannels command, the media device shall check if the channels" +
+                "\n" +
+                "passed in this command are valid. If the channel is invalid, then a response with InvalidChannel " +
+                "error Status shall be returned." +
                 "\n" +
                 "If there is at least one channel in Channels field which is not in the BlockChannelList attribute, " +
                 "the media device shall process the request by adding these new channels into the BlockChannelList " +
@@ -524,7 +520,8 @@ export const ContentControl = Cluster(
                 "\n" +
                 "Upon receipt of the AddBlockApplications command, the media device shall check if the Applications " +
                 "passed in this command are installed. If there is an application in Applications field which is not " +
-                "identified by media device, then a response with UnidentifiableApplication error Status may be " +
+                "identified by media device, then a response with UnidentifiableApplication error Status may be" +
+                "\n" +
                 "returned." +
                 "\n" +
                 "If there is one or more applications which are not present in BlockApplicationList attribute, the " +
@@ -583,8 +580,7 @@ export const ContentControl = Cluster(
 
             details: "The purpose of this command is to set the BlockContentTimeWindow attribute." +
                 "\n" +
-                "Upon receipt of the SetBlockContentTimeWindow command, the media device shall check if the" +
-                "\n" +
+                "Upon receipt of the SetBlockContentTimeWindow command, the media device shall check if the " +
                 "TimeWindowIndex field passed in this command is NULL. If the TimeWindowIndex field is NULL, the " +
                 "media device shall check if there is an entry in the BlockContentTimeWindow attribute which matches " +
                 "with the TimePeriod and DayOfWeek fields passed in this command. * If Yes, then a response with " +
@@ -634,35 +630,42 @@ export const ContentControl = Cluster(
     ),
 
     Datatype(
-        { name: "RatingNameStruct", type: "struct", xref: { document: "cluster", section: "6.13.5.1" } },
+        { name: "DayOfWeekBitmap", type: "map8", xref: { document: "cluster", section: "6.13.5.1" } },
+        Field({ name: "Sunday", constraint: "0", description: "Sunday" }),
+        Field({ name: "Monday", constraint: "1", description: "Monday" }),
+        Field({ name: "Tuesday", constraint: "2", description: "Tuesday" }),
+        Field({ name: "Wednesday", constraint: "3", description: "Wednesday" }),
+        Field({ name: "Thursday", constraint: "4", description: "Thursday" }),
+        Field({ name: "Friday", constraint: "5", description: "Friday" }),
+        Field({ name: "Saturday", constraint: "6", description: "Saturday" })
+    ),
+
+    Datatype(
+        { name: "RatingNameStruct", type: "struct", xref: { document: "cluster", section: "6.13.5.2" } },
 
         Field({
             name: "RatingName", id: 0x0, type: "string", conformance: "M", constraint: "max 8",
             details: "This field shall indicate the name of the rating level of the applied rating system. The applied " +
                 "rating system is dependent upon the region or country where the Node has been provisioned, and may " +
                 "vary from one country to another.",
-            xref: { document: "cluster", section: "6.13.5.1.1" }
+            xref: { document: "cluster", section: "6.13.5.2.1" }
         }),
 
         Field({
             name: "RatingNameDesc", id: 0x1, type: "string", conformance: "O", constraint: "max 64",
             details: "This field shall specify a human readable (displayable) description for RatingName.",
-            xref: { document: "cluster", section: "6.13.5.1.2" }
+            xref: { document: "cluster", section: "6.13.5.2.2" }
         })
     ),
 
     Datatype(
-        {
-            name: "BlockChannelStruct", type: "struct",
-            details: "[options=\"header\",valign=\"middle\"]b",
-            xref: { document: "cluster", section: "6.13.5.2" }
-        },
+        { name: "BlockChannelStruct", type: "struct", xref: { document: "cluster", section: "6.13.5.3" } },
 
         Field({
             name: "BlockChannelIndex", id: 0x0, type: "uint16", conformance: "M", quality: "X",
             details: "This field shall indicate a unique index value for a blocked channel. This value may be used to " +
                 "indicate one selected channel which will be removed from BlockChannelList attribute.",
-            xref: { document: "cluster", section: "6.13.5.2.1" }
+            xref: { document: "cluster", section: "6.13.5.3.1" }
         }),
 
         Field({
@@ -671,7 +674,7 @@ export const ContentControl = Cluster(
                 "channel number is expressed as a string, such as \"13.1\" or \"256\", the major number would be 13 or " +
                 "256, respectively. This field is required but shall be set to 0 for channels such as over-the-top " +
                 "channels that are not represented by a major or minor number.",
-            xref: { document: "cluster", section: "6.13.5.2.2" }
+            xref: { document: "cluster", section: "6.13.5.3.2" }
         }),
 
         Field({
@@ -680,19 +683,19 @@ export const ContentControl = Cluster(
                 "channel number is expressed as a string, such as \"13.1\" or \"256\", the minor number would be 1 or 0, " +
                 "respectively. This field is required but shall be set to 0 for channels such as over-the-top " +
                 "channels that are not represented by a major or minor number.",
-            xref: { document: "cluster", section: "6.13.5.2.3" }
+            xref: { document: "cluster", section: "6.13.5.3.3" }
         }),
 
         Field({
             name: "Identifier", id: 0x3, type: "string", conformance: "O",
             details: "This field shall indicate the unique identifier for a specific channel. This field is optional, but " +
                 "SHOULD be provided when MajorNumber and MinorNumber are not available.",
-            xref: { document: "cluster", section: "6.13.5.2.4" }
+            xref: { document: "cluster", section: "6.13.5.3.4" }
         })
     ),
 
     Datatype(
-        { name: "AppInfoStruct", type: "struct", xref: { document: "cluster", section: "6.13.5.3" } },
+        { name: "AppInfoStruct", type: "struct", xref: { document: "cluster", section: "6.13.5.4" } },
 
         Field({
             name: "CatalogVendorId", id: 0x0, type: "uint16", conformance: "M",
@@ -701,54 +704,43 @@ export const ContentControl = Cluster(
                 "\n" +
                 "Content App Platform providers will have their own catalog vendor ID (set to their own Vendor ID) " +
                 "and will assign an ApplicationID to each Content App.",
-            xref: { document: "cluster", section: "6.13.5.3.1" }
+            xref: { document: "cluster", section: "6.13.5.4.1" }
         }),
 
         Field({
             name: "ApplicationId", id: 0x1, type: "string", conformance: "M",
             details: "This field shall indicate the application identifier, expressed as a string, such as \"PruneVideo\" " +
                 "or \"Company X\". This field shall be unique within a catalog.",
-            xref: { document: "cluster", section: "6.13.5.3.2" }
+            xref: { document: "cluster", section: "6.13.5.4.2" }
         })
     ),
 
     Datatype(
-        { name: "TimeWindowStruct", type: "struct", xref: { document: "cluster", section: "6.13.5.4" } },
+        { name: "TimeWindowStruct", type: "struct", xref: { document: "cluster", section: "6.13.5.5" } },
 
         Field({
             name: "TimeWindowIndex", id: 0x0, type: "uint16", conformance: "M", quality: "X",
             details: "This field shall indicate a unique index of a specific time window. This value may be used to " +
                 "indicate a selected time window which will be removed from the BlockContentTimeWindow attribute.",
-            xref: { document: "cluster", section: "6.13.5.4.1" }
+            xref: { document: "cluster", section: "6.13.5.5.1" }
         }),
 
         Field({
             name: "DayOfWeek", id: 0x1, type: "DayOfWeekBitmap", conformance: "M", constraint: "desc",
             details: "This field shall indicate a day of week.",
-            xref: { document: "cluster", section: "6.13.5.4.2" }
+            xref: { document: "cluster", section: "6.13.5.5.2" }
         }),
 
         Field(
             {
                 name: "TimePeriod", id: 0x2, type: "list", conformance: "M", constraint: "desc",
                 details: "This field shall indicate one or more discrete time periods.",
-                xref: { document: "cluster", section: "6.13.5.4.3" }
+                xref: { document: "cluster", section: "6.13.5.5.3" }
             },
             Field({ name: "entry", type: "TimePeriodStruct" })
         )
     ),
 
-    Datatype(
-        { name: "DayOfWeekBitmap", type: "enum8", xref: { document: "cluster", section: "6.13.5.5" } },
-        Field({ name: "Sunday", id: 0x0, description: "Sunday" }),
-        Field({ name: "Monday", id: 0x1, description: "Monday" }),
-        Field({ name: "Tuesday", id: 0x2, description: "Tuesday" }),
-        Field({ name: "Wednesday", id: 0x3, description: "Wednesday" }),
-        Field({ name: "Thursday", id: 0x4, description: "Thursday" }),
-        Field({ name: "Friday", id: 0x5, description: "Friday" }),
-        Field({ name: "Saturday", id: 0x6, description: "Saturday" })
-    ),
-
     Datatype(
         { name: "TimePeriodStruct", type: "struct", xref: { document: "cluster", section: "6.13.5.6" } },
         Field({

package/src/standard/elements/ContentLauncher.ts

@@ -17,8 +17,7 @@ import {
 
 export const ContentLauncher = Cluster(
     {
-        name: "ContentLauncher", id: 0x50a, asOf: "1.3", classification: "application",
-        pics: "CONTENTLAUNCHER",
+        name: "ContentLauncher", id: 0x50a, classification: "application", pics: "CONTENTLAUNCHER",
 
         details: "This cluster provides an interface for launching content on a Video Player device such as a " +
             "Streaming Media Player, Smart TV or Smart Screen." +
@@ -63,7 +62,8 @@ export const ContentLauncher = Cluster(
         {
             name: "AcceptHeader", id: 0x0, type: "list", access: "R V", conformance: "UP",
             constraint: "max 100[max 1024]", default: [], quality: "N",
-            details: "This attribute shall provide a list of content types supported by the Video Player or Content App " +
+            details: "This attribute shall provide a list of content types supported by the Video Player or Content App" +
+                "\n" +
                 "in the form of entries in the HTTP \"Accept\" request header.",
             xref: { document: "cluster", section: "6.7.6.1" }
         },
@@ -147,9 +147,8 @@ export const ContentLauncher = Cluster(
 
             details: "Upon receipt, this shall launch content from the specified URL." +
                 "\n" +
-                "The content types supported include those identified in the AcceptHeader and SupportedStreaming" +
-                "\n" +
-                "Protocols attributes." +
+                "The content types supported include those identified in the AcceptHeader and " +
+                "SupportedStreamingProtocols attributes." +
                 "\n" +
                 "A check shall be made to ensure the URL is secure (uses HTTPS)." +
                 "\n" +
@@ -166,13 +165,14 @@ export const ContentLauncher = Cluster(
         },
 
         Field({
-            name: "ContentUrl", id: 0x0, type: "string", conformance: "M",
-            details: "This field shall indicate the URL of content to launch.",
+            name: "ContentUrl", id: 0x0, type: "string", conformance: "M", constraint: "any",
+            details: "This field shall indicate the URL of content to launch. The syntax of this field shall follow the " +
+                "syntax as specified in RFC 1738 and shall use the https scheme.",
             xref: { document: "cluster", section: "6.7.7.2.1" }
         }),
 
         Field({
-            name: "DisplayString", id: 0x1, type: "string", conformance: "O",
+            name: "DisplayString", id: 0x1, type: "string", conformance: "O", constraint: "any",
             details: "This field, if present, shall provide a string that may be used to describe the content being " +
                 "accessed at the given URL.",
             xref: { document: "cluster", section: "6.7.7.2.2" }
@@ -180,6 +180,7 @@ export const ContentLauncher = Cluster(
 
         Field({
             name: "BrandingInformation", id: 0x2, type: "BrandingInformationStruct", conformance: "O",
+            constraint: "any",
             details: "This field, if present, shall indicate the branding information that may be displayed when playing " +
                 "back the given content.",
             xref: { document: "cluster", section: "6.7.7.2.3" }
@@ -187,6 +188,7 @@ export const ContentLauncher = Cluster(
 
         Field({
             name: "PlaybackPreferences", id: 0x3, type: "PlaybackPreferencesStruct", conformance: "O",
+            constraint: "any",
 
             details: "This field, if present, shall indicate the user’s preferred Text/AudioTracks and playbackPosition " +
                 "for the media, sent from the client to the server. If the server does not find an available track " +
@@ -434,7 +436,8 @@ export const ContentLauncher = Cluster(
         Field({
             name: "ImageUrl", id: 0x0, type: "string", conformance: "O", constraint: "max 8192",
             details: "This field shall indicate the URL of image used for Styling different Video Player sections like " +
-                "Logo, Watermark etc.",
+                "Logo, Watermark etc. The syntax of this field shall follow the syntax as specified in RFC 1738 and " +
+                "shall use the https scheme.",
             xref: { document: "cluster", section: "6.7.5.9.1" }
         }),
 
@@ -458,7 +461,9 @@ export const ContentLauncher = Cluster(
         Field({
             name: "Size", id: 0x2, type: "DimensionStruct", conformance: "O",
             details: "This field shall indicate the size of the image used for Styling different Video Player sections " +
-                "like Logo, Watermark etc.",
+                "like" +
+                "\n" +
+                "Logo, Watermark etc.",
             xref: { document: "cluster", section: "6.7.5.9.3" }
         })
     ),
@@ -527,9 +532,8 @@ export const ContentLauncher = Cluster(
                 "from. In case the position falls in the middle of a frame, the server shall set the position to the " +
                 "beginning of that frame and set the SampledPosition attribute on the MediaPlayback cluster " +
                 "accordingly. A value of null shall indicate that playback position is not applicable for the " +
-                "current state of the media playback." +
-                "\n" +
-                "ported).",
+                "current state of the media playback. (For example : Live media with no known duration and where " +
+                "seek is not supported).",
 
             xref: { document: "cluster", section: "6.7.5.11.1" }
         }),
@@ -579,7 +583,7 @@ export const ContentLauncher = Cluster(
                 xref: { document: "cluster", section: "6.7.5.12.2" }
             },
 
-            Field({ name: "entry", type: "CharacteristicEnum" })
+            Field({ name: "entry", type: "MediaPlayback.CharacteristicEnum" })
         ),
 
         Field({
@@ -591,15 +595,12 @@ export const ContentLauncher = Cluster(
                 "\n" +
                 "This field shall NOT be present if the track is not an audio track." +
                 "\n" +
-                "If the track is an audio track, this field MUST be present. A value of null shall indicate that the" +
-                "\n" +
+                "If the track is an audio track, this field MUST be present. A value of null shall indicate that the " +
                 "server can choose the audio output(s) to play the Audio Track on.",
 
             xref: { document: "cluster", section: "6.7.5.12.3" }
         })
-    ),
-
-    Datatype({ name: "CharacteristicEnum", type: "MediaPlayback.CharacteristicEnum" })
+    )
 );
 
 MatterDefinition.children.push(ContentLauncher);