Do not reset state when commissionNode fail to allow retry

Author: yufengwangca

examples/fabric-bridge-app/linux/CommissionerControl.cpp

@@ -49,7 +49,7 @@ namespace CommissionerControl {
 void CommissionerControlDelegate::ResetDelegateState()
 {
     // Reset the step to the initial state
-    mNextStep = Step::kAcceptCommissioningApproval;
+    mNextStep = Step::kIdle;
 
     // Reset identifiers and product information
     mRequestId    = 0;
@@ -71,7 +71,7 @@ void CommissionerControlDelegate::ResetDelegateState()
 
 CHIP_ERROR CommissionerControlDelegate::HandleCommissioningApprovalRequest(const CommissioningApprovalRequest & request)
 {
-    VerifyOrReturnError(mNextStep == Step::kAcceptCommissioningApproval, CHIP_ERROR_BUSY);
+    VerifyOrReturnError(mNextStep == Step::kIdle, CHIP_ERROR_INCORRECT_STATE);
 
     CommissionerControl::Events::CommissioningRequestResult::Type result;
     result.requestId    = request.requestId;
@@ -113,7 +113,14 @@ CHIP_ERROR CommissionerControlDelegate::HandleCommissioningApprovalRequest(const
 
     CHIP_ERROR err = CommissionerControlServer::Instance().GenerateCommissioningRequestResultEvent(result);
 
-    mNextStep = (err == CHIP_NO_ERROR) ? Step::kWaitCommissionNodeRequest : Step::kAcceptCommissioningApproval;
+    if (err == CHIP_NO_ERROR)
+    {
+        mNextStep = Step::kWaitCommissionNodeRequest;
+    }
+    else
+    {
+        ResetDelegateState();
+    }
 
     return err;
 }
@@ -162,22 +169,29 @@ CHIP_ERROR CommissionerControlDelegate::GetCommissioningWindowParams(Commissioni
 CHIP_ERROR CommissionerControlDelegate::HandleCommissionNode(const CommissioningWindowParams & params,
                                                              const Optional<ByteSpan> & ipAddress, const Optional<uint16_t> & port)
 {
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
     ChipLogProgress(NotSpecified, "CommissionerControlDelegate::HandleCommissionNode");
 
     VerifyOrReturnError(mNextStep == Step::kStartCommissionNode, CHIP_ERROR_INCORRECT_STATE);
 
 #if defined(PW_RPC_FABRIC_BRIDGE_SERVICE) && PW_RPC_FABRIC_BRIDGE_SERVICE
-    return CommissionNode(Controller::CommissioningWindowPasscodeParams()
-                              .SetSetupPIN(kSetupPinCode)
-                              .SetTimeout(params.commissioningTimeout)
-                              .SetDiscriminator(params.discriminator)
-                              .SetIteration(params.iterations)
-                              .SetSalt(params.salt),
-                          mVendorId, mProductId);
+    err = CommissionNode(Controller::CommissioningWindowPasscodeParams()
+                             .SetSetupPIN(kSetupPinCode)
+                             .SetTimeout(params.commissioningTimeout)
+                             .SetDiscriminator(params.discriminator)
+                             .SetIteration(params.iterations)
+                             .SetSalt(params.salt),
+                         mVendorId, mProductId);
 #else
     ChipLogProgress(NotSpecified, "Failed to reverse commission bridge: PW_RPC_FABRIC_BRIDGE_SERVICE not defined");
-    return CHIP_ERROR_NOT_IMPLEMENTED;
+    err = CHIP_ERROR_NOT_IMPLEMENTED;
 #endif // defined(PW_RPC_FABRIC_BRIDGE_SERVICE) && PW_RPC_FABRIC_BRIDGE_SERVICE
+
+    // Reset the delegate's state to prepare for a new commissioning sequence.
+    ResetDelegateState();
+
+    return err;
 }
 
 } // namespace CommissionerControl

examples/fabric-bridge-app/linux/include/CommissionerControl.h

@@ -29,7 +29,6 @@ namespace CommissionerControl {
 class CommissionerControlDelegate : public Delegate
 {
 public:
-    void ResetDelegateState() override;
     CHIP_ERROR HandleCommissioningApprovalRequest(const CommissioningApprovalRequest & request) override;
     CHIP_ERROR ValidateCommissionNodeCommand(NodeId clientNodeId, uint64_t requestId) override;
     CHIP_ERROR GetCommissioningWindowParams(CommissioningWindowParams & outParams) override;
@@ -42,16 +41,18 @@ class CommissionerControlDelegate : public Delegate
     enum class Step : uint8_t
     {
         // Ready to start reverse commissioning.
-        kAcceptCommissioningApproval,
+        kIdle,
         // Wait for the commission node command.
         kWaitCommissionNodeRequest,
         // Need to commission node.
         kStartCommissionNode,
     };
 
+    void ResetDelegateState();
+
     static constexpr size_t kLabelBufferSize = 64;
 
-    Step mNextStep       = Step::kAcceptCommissioningApproval;
+    Step mNextStep       = Step::kIdle;
     uint64_t mRequestId  = 0;
     NodeId mClientNodeId = kUndefinedNodeId;
     VendorId mVendorId   = VendorId::Unspecified;

src/app/clusters/commissioner-control-server/commissioner-control-server.cpp

@@ -265,7 +265,6 @@ bool emberAfCommissionerControlClusterCommissionNodeCallback(
     {
         ChipLogError(Zcl, "emberAfCommissionerControlClusterCommissionNodeCallback error: %" CHIP_ERROR_FORMAT, err.Format());
         commandObj->AddStatus(commandPath, StatusIB(err).mStatus);
-        delegate->ResetDelegateState();
     }
 
     return true;

src/app/clusters/commissioner-control-server/commissioner-control-server.h

@@ -137,15 +137,6 @@ class Delegate
     virtual CHIP_ERROR HandleCommissionNode(const CommissioningWindowParams & params, const Optional<ByteSpan> & ipAddress,
                                             const Optional<uint16_t> & port) = 0;
 
-    /**
-     * @brief Reset the state of the delegate.
-     *
-     * This method is used to reset the internal state of the delegate to its initial state.
-     * It should be called whenever the delegate needs to be reinitialized or cleaned up
-     * before handling a new commissioning sequence.
-     */
-    virtual void ResetDelegateState() = 0;
-
     virtual ~Delegate() = default;
 };