From 2e08045b25941c37a634effe5ed947fb1a3c2b20 Mon Sep 17 00:00:00 2001
From: Jan Romann <jan.romann@uni-bremen.de>
Date: Fri, 31 May 2024 13:47:26 +0200
Subject: [PATCH] fix: prevent premature cancellation of observerelation (#192)

---
 lib/src/coap_client.dart | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/src/coap_client.dart b/lib/src/coap_client.dart
index c8c4edf3..0c8f8f4d 100644
--- a/lib/src/coap_client.dart
+++ b/lib/src/coap_client.dart
@@ -513,16 +513,23 @@ class CoapClient {
     final CoapRequest request, {
     final int maxRetransmit = 0,
   }) async {
+    var isObserving = false;
     request
       ..observe = ObserveRegistration.register.value
       ..maxRetransmit = maxRetransmit;
-    final responseStream = _sendWithStreamResponse(request)
-        .asBroadcastStream(onCancel: (final sub) => sub.cancel());
+    final responseStream = _sendWithStreamResponse(request).asBroadcastStream(
+      onCancel: (final sub) {
+        if (isObserving) {
+          sub.cancel();
+        }
+      },
+    );
     final relation = CoapObserveClientRelation(request, responseStream);
     final resp = await _waitForResponse(request, responseStream);
     if (!resp.hasOption<ObserveOption>()) {
       relation.isCancelled = true;
     }
+    isObserving = true;
     return relation;
   }