fixup! feat: implement exploreDirectory method

eclipse-thingweb · Dec 23, 2023 · 9ff5152 · 9ff5152
1 parent 20f14b0
commit 9ff5152
Showing 1 changed file with 36 additions and 27 deletions.
diff --git a/lib/src/core/wot.dart b/lib/src/core/wot.dart
@@ -127,33 +127,7 @@ class WoT implements scripting_api.WoT {
 
     final thingDescriptionStream = Stream.fromIterable(
       rawThingDescriptions.whereType<Map<String, dynamic>>(),
-    ).transform(
-      StreamTransformer<Map<String, dynamic>, ThingDescription>(
-        (stream, cancelOnError) {
-          final streamController = StreamController<ThingDescription>();
-
-          final streamSubscription = stream.listen(
-            (rawThingDescription) {
-              try {
-                streamController
-                    .add(ThingDescription.fromJson(rawThingDescription));
-              } on Exception catch (exception) {
-                streamController.addError(exception);
-              }
-            },
-            onDone: streamController.close,
-            onError: streamController.addError,
-            cancelOnError: cancelOnError,
-          );
-          streamController
-            ..onPause = streamSubscription.pause
-            ..onResume = streamSubscription.resume
-            ..onCancel = streamSubscription.cancel;
-
-          return streamController.stream.listen(null);
-        },
-      ),
-    );
+    ).toThingDescriptionStream();
 
     return ThingDiscoveryProcess(thingDescriptionStream, filter);
   }
@@ -179,3 +153,38 @@ extension _DirectoryValidationExtension on ThingDescription {
         atTypes.contains(type);
   }
 }
+
+extension _DirectoryTdDeserializationExtension on Stream<Map<String, dynamic>> {
+  Stream<ThingDescription> toThingDescriptionStream() {
+    const streamTransformer = StreamTransformer(_transformerMethod);
+
+    return transform(streamTransformer);
+  }
+
+  static StreamSubscription<ThingDescription> _transformerMethod(
+    Stream<Map<String, dynamic>> rawThingDescriptionStream,
+    bool cancelOnError,
+  ) {
+    final streamController = StreamController<ThingDescription>();
+
+    final streamSubscription = rawThingDescriptionStream.listen(
+      (rawThingDescription) {
+        try {
+          streamController.add(ThingDescription.fromJson(rawThingDescription));
+        } on Exception catch (exception) {
+          streamController.addError(exception);
+        }
+      },
+      onDone: streamController.close,
+      onError: streamController.addError,
+      cancelOnError: cancelOnError,
+    );
+
+    streamController
+      ..onPause = streamSubscription.pause
+      ..onResume = streamSubscription.resume
+      ..onCancel = streamSubscription.cancel;
+
+    return streamController.stream.listen(null);
+  }
+}