fix first observe response not being handled (#195)

shamblett · Jun 9, 2024 · 318f5d6 · 318f5d6
1 parent 0a536ce
commit 318f5d6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/lib/src/coap_client.dart b/lib/src/coap_client.dart
@@ -525,10 +525,7 @@ class CoapClient {
       },
     );
     final relation = CoapObserveClientRelation(request, responseStream);
-    final resp = await _waitForResponse(request, responseStream);
-    if (!resp.hasOption<ObserveOption>()) {
-      relation.isCancelled = true;
-    }
+    relation.checkObserve();
     isObserving = true;
     return relation;
   }

diff --git a/lib/src/coap_observe_client_relation.dart b/lib/src/coap_observe_client_relation.dart
@@ -55,6 +55,14 @@ class CoapObserveClientRelation extends Stream<CoapResponse> {
     return requestToken.equals(responseToken);
   }
 
+  void checkObserve() {
+    _filteredStream.first.then((resp) {
+      if (!resp.hasOption<ObserveOption>()) {
+        isCancelled = true;
+      }
+    });
+  }
+
   bool _cancelled = false;
 
   /// Cancelled