[DarwinFrameworkTool] Add autoResubscribe optional parameters to comm…

…ands making subscriptions (project-chip#22339)
bzbarsky-apple · Sep 2, 2022 · 296217b · 296217b
1 parent 771f835
commit 296217b
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/examples/darwin-framework-tool/commands/clusters/ReportCommandBridge.h b/examples/darwin-framework-tool/commands/clusters/ReportCommandBridge.h
@@ -90,33 +90,31 @@ class SubscribeAttribute : public ModelCommand {
     {
         AddArgument("cluster-id", 0, UINT32_MAX, &mClusterId);
         AddArgument("attribute-id", 0, UINT32_MAX, &mAttributeId);
-        AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval);
-        AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval);
-        AddArgument("fabric-filtered", 0, 1, &mFabricFiltered);
-        AddArgument("keepSubscriptions", 0, 1, &mKeepSubscriptions);
-        ModelCommand::AddArguments();
+        AddCommonArguments();
     }
 
     SubscribeAttribute(chip::ClusterId clusterId)
         : ModelCommand("subscribe-by-id")
         , mClusterId(clusterId)
     {
         AddArgument("attribute-id", 0, UINT32_MAX, &mAttributeId);
-        AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval);
-        AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval);
-        AddArgument("fabric-filtered", 0, 1, &mFabricFiltered);
-        AddArgument("keepSubscriptions", 0, 1, &mKeepSubscriptions);
-        ModelCommand::AddArguments();
+        AddCommonArguments();
     }
 
     SubscribeAttribute(const char * _Nonnull attributeName)
         : ModelCommand("subscribe")
     {
         AddArgument("attr-name", attributeName);
+        AddCommonArguments();
+    }
+
+    void AddCommonArguments()
+    {
         AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval);
         AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval);
         AddArgument("fabric-filtered", 0, 1, &mFabricFiltered);
         AddArgument("keepSubscriptions", 0, 1, &mKeepSubscriptions);
+        AddArgument("autoResubscribe", 0, 1, &mAutoResubscribe);
         ModelCommand::AddArguments();
     }
 
@@ -125,9 +123,12 @@ class SubscribeAttribute : public ModelCommand {
     CHIP_ERROR SendCommand(MTRBaseDevice * _Nonnull device, chip::EndpointId endpointId) override
     {
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+
         MTRSubscribeParams * params = [[MTRSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.autoResubscribe = mAutoResubscribe.HasValue() ? [NSNumber numberWithBool:mAutoResubscribe.Value()] : nil;
+
         [device subscribeAttributeWithEndpointId:[NSNumber numberWithUnsignedShort:endpointId]
             clusterId:[NSNumber numberWithUnsignedInteger:mClusterId]
             attributeId:[NSNumber numberWithUnsignedInteger:mAttributeId]
@@ -154,6 +155,7 @@ class SubscribeAttribute : public ModelCommand {
 
 protected:
     chip::Optional<bool> mKeepSubscriptions;
+    chip::Optional<bool> mAutoResubscribe;
     chip::Optional<bool> mFabricFiltered;
     bool mSubscriptionEstablished = NO;
     uint16_t mMinInterval;
@@ -180,6 +182,7 @@ class SubscribeEvent : public ModelCommand {
         AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval);
         AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval);
         AddArgument("keepSubscriptions", 0, 1, &mKeepSubscriptions);
+        AddArgument("autoResubscribe", 0, 1, &mAutoResubscribe);
         ModelCommand::AddArguments();
     }
 
@@ -192,6 +195,8 @@ class SubscribeEvent : public ModelCommand {
         MTRSubscribeParams * params = [[MTRSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.autoResubscribe = mAutoResubscribe.HasValue() ? [NSNumber numberWithBool:mAutoResubscribe.Value()] : nil;
+
         [device subscribeWithQueue:callbackQueue
             minInterval:mMinInterval
             maxInterval:mMaxInterval
@@ -220,6 +225,7 @@ class SubscribeEvent : public ModelCommand {
 
 protected:
     chip::Optional<bool> mKeepSubscriptions;
+    chip::Optional<bool> mAutoResubscribe;
     chip::Optional<chip::EventNumber> mEventNumber;
     bool mSubscriptionEstablished = NO;
     uint16_t mMinInterval;