feat(dart_frog): add fromShelfHandler and fromShelfMiddleware adapters (#56)

Author: felangel

packages/dart_frog/lib/src/_internal.dart

@@ -12,3 +12,4 @@ part 'request_logger.dart';
 part 'response.dart';
 part 'router.dart';
 part 'serve.dart';
+part 'shelf_adapters.dart';

packages/dart_frog/lib/src/request_logger.dart

@@ -13,19 +13,5 @@ part of '_internal.dart';
 Middleware requestLogger({
   void Function(String message, bool isError)? logger,
 }) {
-  return _fromShelfMiddleware(shelf.logRequests(logger: logger));
-}
-
-Middleware _fromShelfMiddleware(shelf.Middleware middleware) {
-  return (handler) {
-    return (context) async {
-      final response = await middleware(
-        (request) async {
-          final response = await handler(RequestContext._(request));
-          return response._response;
-        },
-      )(context.request._request);
-      return Response._(response);
-    };
-  };
+  return fromShelfMiddleware(shelf.logRequests(logger: logger));
 }

packages/dart_frog/lib/src/shelf_adapters.dart

@@ -0,0 +1,24 @@
+part of '_internal.dart';
+
+/// Convert from [shelf.Middleware] into [Middleware].
+Middleware fromShelfMiddleware(shelf.Middleware middleware) {
+  return (handler) {
+    return (context) async {
+      final response = await middleware(
+        (request) async {
+          final response = await handler(RequestContext._(request));
+          return response._response;
+        },
+      )(context.request._request);
+      return Response._(response);
+    };
+  };
+}
+
+/// Convert from a [shelf.Handler] into a [Handler].
+Handler fromShelfHandler(shelf.Handler handler) {
+  return (context) async {
+    final response = await handler(context.request._request);
+    return Response._(response);
+  };
+}

packages/dart_frog/test/src/shelf_adapters_test.dart

@@ -0,0 +1,52 @@
+import 'dart:io';
+
+import 'package:dart_frog/src/_internal.dart';
+import 'package:http/http.dart' as http;
+import 'package:shelf/shelf.dart' as shelf;
+import 'package:test/test.dart';
+
+void main() {
+  group('fromShelfHandler', () {
+    test('converts a shelf.Handler into a Handler', () async {
+      Future<shelf.Response> handler(shelf.Request request) async {
+        return shelf.Response.ok('Hello World');
+      }
+
+      final server = await serve(fromShelfHandler(handler), 'localhost', 8000);
+      final response = await http.get(Uri.parse('http://localhost:8000'));
+      expect(response.statusCode, equals(HttpStatus.ok));
+      expect(response.body, equals('Hello World'));
+      await server.close();
+    });
+  });
+
+  group('fromShelfMiddleware', () {
+    test('converts a shelf.Middleware into a Middleware', () async {
+      shelf.Handler middleware(shelf.Handler handler) {
+        return (request) {
+          if (request.url.queryParameters.containsKey('foo')) {
+            return shelf.Response.badRequest(body: 'oops!');
+          }
+          return handler(request);
+        };
+      }
+
+      final handler = const Pipeline()
+          .addMiddleware(fromShelfMiddleware(middleware))
+          .addHandler((_) => Response(body: 'Hello World'));
+
+      final server = await serve(handler, 'localhost', 8001);
+      var response = await http.get(Uri.parse('http://localhost:8001'));
+      expect(response.statusCode, equals(HttpStatus.ok));
+      expect(response.body, equals('Hello World'));
+      response = await http.get(
+        Uri.parse('http://localhost:8001').replace(
+          queryParameters: const <String, String>{'foo': 'bar'},
+        ),
+      );
+      expect(response.statusCode, equals(HttpStatus.badRequest));
+      expect(response.body, equals('oops!'));
+      await server.close();
+    });
+  });
+}