feat: support for more routing patterns with tests

Author: iyifr

bin/run.dart

@@ -29,7 +29,7 @@ void main(List<String> arguments) async {
 
   router.get<Stream<String>>('/', (event) {
     setResponseHeader(event, HttpHeaders.contentTypeHeader,
-        value: 'text/event-stream text/html');
+        value: 'text/event-stream');
 
     setResponseHeader(event, HttpHeaders.cacheControlHeader,
         value:
@@ -47,24 +47,17 @@ void main(List<String> arguments) async {
     return countStream(8);
   });
 
-  router.get("/hi/:id", (event) {
-    throw Exception('Yo');
-    // return 'Hey ${event.params["id"]}';
-  });
-
-  router.post("/vamos", (event) async {
+  router.post("/vamos/:id/**", (event) async {
     var body = await readRequestBody(event);
     var header = getHeader(event, HttpHeaders.userAgentHeader);
     var query = getQueryParams(event);
     setResponseHeader(event, HttpHeaders.contentTypeHeader,
         value: 'application/json');
-    return [header, body, query];
+    return [header, body, query, event.params];
   });
 
-  router.get<Future<int>>('/int', (event) async {
-    await Future.delayed(Duration(seconds: 4));
-    var res = await Future.value(23994);
-    return res;
+  router.get<Future<dynamic>>('/int', (event) async {
+    return Future.error(Exception('Hula ballo'));
   });
 
   router.get("/vamos", (event) {

lib/src/event.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:convert';
 import 'dart:core';
 import 'dart:io';
@@ -95,20 +96,26 @@ class H4Event {
   ///
   /// If the [handlerResult] is `null`, the response will be closed without writing any content.
   /// The [handled] flag is set to `true` after the response is sent.
-  void respond(dynamic handlerResult) {
+  void respond(dynamic handlerResult) async {
     if (_handled) {
       return;
     }
 
     if (handlerResult is Stream) {
       _request.response.persistentConnection = true;
+
+      final controller = StreamController<dynamic>.broadcast();
+
       handlerResult.listen((value) {
-        print(value);
         _request.response.write('data: ${value.toString()} \n');
+        _request.response.flush();
       }, onDone: () {
-        print('stram finished');
+        _request.response.write('data: [DONE]\n');
         _shutDown();
+        controller.close();
       });
+
+      await controller.stream.drain();
       return;
     }
 

lib/src/index.dart

@@ -16,6 +16,7 @@ Function(HttpRequest) defineEventHandler(
   Map<String, String>? params,
 }) {
   return (HttpRequest request) {
+    request.response.headers.contentType = null;
     // Create an event with the incoming request.
     var event = H4Event(request);
 

lib/src/router.dart

@@ -50,11 +50,12 @@ class H4Router {
   /// - A normalized request method string [GET, POST, PUT, DELETE, PATCH]
   Map<String, EventHandler?>? lookup(path) {
     var pathChunks = extractPieces(path);
+
     var result = routes.search(pathChunks);
 
     result ??= routes.matchParamRoute(pathChunks);
 
-    result ??= routes.matchWildCardRoute(extractPieces(path));
+    result ??= routes.matchWildCardRoute(pathChunks);
 
     return result;
   }

lib/src/trie.dart

@@ -72,13 +72,15 @@ class Trie {
     TrieNode? currNode = root;
 
     for (String pathPiece in pathPieces) {
+      int index = pathPieces.indexOf(pathPiece);
       if (currNode?.children[pathPiece] == null) {
         currNode?.children.forEach((key, value) {
-          if ((key.startsWith(":") || key.startsWith("*")) &&
-              value.handlers.isNotEmpty) {
+          if ((key.startsWith(":") || key.startsWith("*")) && value.isLeaf) {
             // Do not behave like a wildcard. Only match if the param route is an exact match.
             if (pathPieces.lastOrNull == pathPiece) {
-              laHandler = value.handlers;
+              if (index == pathPieces.length - 1) {
+                laHandler = value.handlers;
+              }
             } else {
               // Handle weird edge case where a handler with id as a leaf is defined in route trie
               var result = deepTraverse(value.children);
@@ -141,6 +143,9 @@ class Trie {
         currNode?.children.forEach((key, value) {
           if (key.startsWith("**") && value.isLeaf) {
             laHandler = value.handlers;
+          } else {
+            var result = deepTraverse(value.children);
+            laHandler = result["handlers"];
           }
         });
       }

test/h4_test.dart

@@ -83,4 +83,39 @@ void main() {
     final response = await dio.get('/async');
     expect(response.data, '6700');
   });
+
+  test('Handles single dynamic routes', () async {
+    router.get('/user/:id', (event) => event.params['id']);
+
+    final response = await dio.get('/user/xyz_abc_123');
+    expect(response.data, 'xyz_abc_123');
+  });
+
+  test('Handles match-all wildcard routes', () async {
+    router.get('/user/**', (event) => "Welcome to H4!");
+
+    final req1 = dio.get('/user/fun');
+    final req2 = dio.get('/user/fun/me');
+    final req3 = dio.get('/user/fun/me/you');
+
+    final responses = await Future.wait([req1, req2, req3]);
+
+    for (final response in responses) {
+      expect(response.data, "Welcome to H4!");
+    }
+  });
+
+  test('Handles paramaterized match-all requests', () async {
+    router.get('/donut/:id/**', (event) => "Welcome to H4!");
+
+    final req1 = dio.get('/donut/user/fun');
+    final req2 = dio.get('/donut/user/fun/me');
+    final req3 = dio.get('/donut/user/fun/me/you');
+
+    final responses = await Future.wait([req1, req2, req3]);
+
+    for (final response in responses) {
+      expect(response.data, "Welcome to H4!");
+    }
+  });
 }