samples: matter: Fixed extension handling for manufacturer sample

The extension handling did not work for basic information cluster
and it had to be aligned with the new code-gen style.

Created an extension class that inherits by BasicInformation
cluster and implements custom attribute, command and event
handling.

Signed-off-by: Kamil Kasperczyk <[email protected]>

Author: kkasperczyk-no

samples/matter/manufacturer_specific/CMakeLists.txt

@@ -36,6 +36,7 @@ target_sources(app PRIVATE
   src/app_task.cpp
   src/zcl_callbacks.cpp
   src/main.cpp
+  src/basic_information_extension.cpp
 )
 
 ncs_configure_data_model(

samples/matter/manufacturer_specific/src/app_task.cpp

@@ -6,6 +6,8 @@
 
 #include "app_task.h"
 
+#include "basic_information_extension.h"
+
 #include "app/matter_init.h"
 #include "app/task_executor.h"
 #include "board/board.h"
@@ -18,6 +20,8 @@
 #include <app/util/attribute-storage.h>
 #include <setup_payload/OnboardingCodesUtil.h>
 
+#include <data-model-providers/codegen/CodegenDataModelProvider.h>
+
 #include <dk_buttons_and_leds.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/random/random.h>
@@ -33,6 +37,8 @@ namespace
 #define BUTTON2_MASK DK_BTN2_MSK
 constexpr EndpointId kBasicInformationEndpointId = 0;
 constexpr EndpointId kNordicDevKitEndpointId = 1;
+
+RegisteredServerCluster<BasicInformationExtension> sBasicInformationExtension;
 } /* namespace */
 
 static void ButtonEventHandler(Nrf::ButtonState /* unused */, Nrf::ButtonMask has_changed)
@@ -81,23 +87,11 @@ void AppTask::UpdateNordicDevkitClusterState()
 void AppTask::UpdateBasicInformationClusterState()
 {
 	SystemLayer().ScheduleLambda([] {
-		Protocols::InteractionModel::Status status;
-
-		status = Clusters::BasicInformation::Attributes::RandomNumber::Set(kBasicInformationEndpointId,
-										   sys_rand16_get());
-
-		if (status != Protocols::InteractionModel::Status::Success) {
-			LOG_ERR("Updating Basic information cluster failed: %x", to_underlying(status));
-		}
+		DataModel::ActionReturnStatus status =
+			sBasicInformationExtension.Cluster().SetRandomNumber(sys_rand16_get());
 
-		for (auto endpoint : EnabledEndpointsWithServerCluster(Clusters::BasicInformation::Id)) {
-			/* If Basic cluster is implemented on this endpoint */
-			Clusters::BasicInformation::Events::RandomNumberChanged::Type event;
-			EventNumber eventNumber;
-
-			if (CHIP_NO_ERROR != LogEvent(event, endpoint, eventNumber)) {
-				ChipLogError(Zcl, "Failed to emit RandomNumberChanged event");
-			}
+		if (status != CHIP_NO_ERROR) {
+			ChipLogError(Zcl, "Updating Basic information cluster failed");
 		}
 	});
 }
@@ -123,6 +117,17 @@ CHIP_ERROR AppTask::StartApp()
 {
 	ReturnErrorOnFailure(Init());
 
+	/* Replaces the registered BasicInformation cluster with a customized one that adds random number handling. */
+	auto &registry = chip::app::CodegenDataModelProvider::Instance().Registry();
+
+	ServerClusterInterface *interface =
+		registry.Get({ kRootEndpointId, chip::app::Clusters::BasicInformation::Id });
+
+	VerifyOrDie(interface != nullptr);
+
+	registry.Unregister(interface);
+	VerifyOrDie(registry.Register(sBasicInformationExtension.Registration()) == CHIP_NO_ERROR);
+
 	while (true) {
 		Nrf::DispatchNextTask();
 	}

samples/matter/manufacturer_specific/src/basic_information_extension.cpp

@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#include "basic_information_extension.h"
+
+#include <app/EventLogging.h>
+#include <app/util/attribute-storage.h>
+#include <clusters/BasicInformation/Events.h>
+#include <clusters/BasicInformation/Metadata.h>
+
+using namespace chip;
+using namespace chip::app;
+
+constexpr AttributeId kRandomNumberAttributeId = 0x17;
+
+constexpr DataModel::AttributeEntry kExtraAttributeMetadata[] = {
+	{ kRandomNumberAttributeId,
+	  {} /* qualities */,
+	  Access::Privilege::kView /* readPriv */,
+	  std::nullopt /* writePriv */ },
+};
+
+DataModel::ActionReturnStatus BasicInformationExtension::SetRandomNumber(int16_t newRandomNumber)
+{
+	mRandomNumber = newRandomNumber;
+
+	Clusters::BasicInformation::Events::RandomNumberChanged::Type event;
+	EventNumber eventNumber;
+
+	for (auto endpoint : EnabledEndpointsWithServerCluster(Clusters::BasicInformation::Id)) {
+		/* If Basic cluster is implemented on this endpoint */
+		if (CHIP_NO_ERROR != LogEvent(event, endpoint, eventNumber)) {
+			ChipLogError(Zcl, "Failed to emit RandomNumberChanged event");
+		}
+	}
+
+	return CHIP_NO_ERROR;
+}
+
+DataModel::ActionReturnStatus BasicInformationExtension::ReadAttribute(const DataModel::ReadAttributeRequest &request,
+								       AttributeValueEncoder &encoder)
+{
+	switch (request.path.mAttributeId) {
+	case kRandomNumberAttributeId:
+		return encoder.Encode(mRandomNumber);
+	default:
+		return chip::app::Clusters::BasicInformationCluster::ReadAttribute(request, encoder);
+	}
+}
+
+DataModel::ActionReturnStatus BasicInformationExtension::WriteAttribute(const DataModel::WriteAttributeRequest &request,
+									AttributeValueDecoder &decoder)
+{
+	switch (request.path.mAttributeId) {
+	case kRandomNumberAttributeId:
+		int16_t newRandomNumber;
+		ReturnErrorOnFailure(decoder.Decode(newRandomNumber));
+		return NotifyAttributeChangedIfSuccess(request.path.mAttributeId, SetRandomNumber(newRandomNumber));
+	default:
+		return chip::app::Clusters::BasicInformationCluster::WriteAttribute(request, decoder);
+	}
+}
+
+CHIP_ERROR BasicInformationExtension::Attributes(const ConcreteClusterPath &path,
+						 ReadOnlyBufferBuilder<DataModel::AttributeEntry> &builder)
+{
+	ReturnErrorOnFailure(builder.ReferenceExisting(kExtraAttributeMetadata));
+
+	return chip::app::Clusters::BasicInformationCluster::Attributes(path, builder);
+}
+
+CHIP_ERROR BasicInformationExtension::AcceptedCommands(const ConcreteClusterPath &path,
+						       ReadOnlyBufferBuilder<DataModel::AcceptedCommandEntry> &builder)
+{
+	/* The BasicInformationCluster does not have any commands, so it is not necessary to call the implementation of the base class. */
+	static constexpr DataModel::AcceptedCommandEntry kAcceptedCommands[] = {
+		Clusters::BasicInformation::Commands::GenerateRandom::kMetadataEntry
+	};
+	return builder.ReferenceExisting(kAcceptedCommands);
+}
+
+std::optional<DataModel::ActionReturnStatus>
+BasicInformationExtension::InvokeCommand(const DataModel::InvokeRequest &request, chip::TLV::TLVReader &input_arguments,
+					 CommandHandler *handler)
+{
+	switch (request.path.mCommandId) {
+	case Clusters::BasicInformation::Commands::GenerateRandom::Id: {
+		return SetRandomNumber(sys_rand16_get());
+	}
+	default:
+		/* The BasicInformationCluster does not have any commands, so it is not necessary to call the implementation of the base class. */
+		return Protocols::InteractionModel::Status::UnsupportedCommand;
+	}
+}

samples/matter/manufacturer_specific/src/basic_information_extension.h

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#pragma once
+
+#include <app/clusters/basic-information/BasicInformationCluster.h>
+#include <app/server-cluster/ServerClusterContext.h>
+#include <app/server-cluster/ServerClusterInterface.h>
+
+#include <zephyr/random/random.h>
+
+class BasicInformationExtension : public chip::app::Clusters::BasicInformationCluster {
+public:
+	BasicInformationExtension() : mRandomNumber(sys_rand16_get()) {}
+
+	chip::app::DataModel::ActionReturnStatus SetRandomNumber(int16_t newRandomNumber);
+
+	/* Overrides the default BasicInformationCluster implementation. */
+	chip::app::DataModel::ActionReturnStatus
+	ReadAttribute(const chip::app::DataModel::ReadAttributeRequest &request,
+		      chip::app::AttributeValueEncoder &encoder) override;
+
+	chip::app::DataModel::ActionReturnStatus
+	WriteAttribute(const chip::app::DataModel::WriteAttributeRequest &request,
+		       chip::app::AttributeValueDecoder &decoder) override;
+
+	CHIP_ERROR Attributes(const chip::app::ConcreteClusterPath &path,
+			      chip::ReadOnlyBufferBuilder<chip::app::DataModel::AttributeEntry> &builder) override;
+
+	CHIP_ERROR
+	AcceptedCommands(const chip::app::ConcreteClusterPath &path,
+			 chip::ReadOnlyBufferBuilder<chip::app::DataModel::AcceptedCommandEntry> &builder) override;
+
+	std::optional<chip::app::DataModel::ActionReturnStatus>
+	InvokeCommand(const chip::app::DataModel::InvokeRequest &request, chip::TLV::TLVReader &input_arguments,
+		      chip::app::CommandHandler *handler) override;
+
+private:
+	int16_t mRandomNumber;
+};

samples/matter/manufacturer_specific/src/zcl_callbacks.cpp

@@ -80,15 +80,6 @@ void emberAfNordicDevKitClusterInitCallback(EndpointId endpoint)
 	}
 }
 
-bool emberAfBasicInformationClusterGenerateRandomCallback(CommandHandler *commandObj,
-							  const ConcreteCommandPath &commandPath,
-							  const GenerateRandom::DecodableType & /* unused */)
-{
-	AppTask::Instance().UpdateBasicInformationClusterState();
-	commandObj->AddStatus(commandPath, Protocols::InteractionModel::Status::Success);
-	return true;
-}
-
 /** @brief Basic Information Cluster Init
  *
  * This function is called when a specific cluster is initialized. It gives the