Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: multiple routers #1

Merged
merged 2 commits into from
Aug 31, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions bin/main.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import 'package:h4/create.dart';
import 'package:h4/utils/req_utils.dart';
import 'package:h4/utils/get_query.dart';

void main() async {
var app = createApp(
@@ -13,15 +11,16 @@ void main() async {
);

var router = createRouter();
var apiRouter = createRouter();

app.use(router);
app.use(router, basePath: '/');
app.use(apiRouter, basePath: '/api');

router.get<Future<String>>("/", (event) async {
// Still 'Ogunlepon'
print(event.context["user"]);
print(getQueryParams(event));
var formdata = await readFormData(event);
print(formdata.getAll('file'));
return 'Hello world';
router.get("/", (event) {
return 'Hello from /';
});

apiRouter.get("/", (event) {
return 'Hi from /api';
});
}
5 changes: 4 additions & 1 deletion lib/src/extract_path_pieces.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import 'package:h4/src/logger.dart';

List<String> extractPieces(String path) {
if (!isValidHttpPathPattern(path)) {
throw FormatException('Invalid http path, Got - $path');
logger.severe('Invalid http path, Got - $path');
}
List<String> result = path == '/' ? [] : path.split('/')
..removeWhere((piece) => piece.isEmpty);
@@ -17,6 +19,7 @@ bool isValidHttpPathPattern(String pattern) {
r'|/[\p{L}\p{N}_-]+/:[^/]+/\*\*'
r'|/[\p{L}\p{N}_-]+/\*\*'
r'|/[\p{L}\p{N}_-]+/\*'
r'|'
r'|\*'
r')$',
unicode: true,
39 changes: 34 additions & 5 deletions lib/src/h4.dart
Original file line number Diff line number Diff line change
@@ -42,6 +42,7 @@ typedef MiddlewareStack = Map<String, Either<Middleware?, ErrorHandler?>?>?;
class H4 {
HttpServer? server;
H4Router? router;
Map<String, H4Router> routeStack = {};
late MiddlewareStack middlewares;

// ignore: prefer_function_declarations_over_variables
@@ -109,7 +110,8 @@ class H4 {
}

/// Add a [H4Router] to the app instance for mapping requests.
void use(H4Router router) {
void use(H4Router router, {String basePath = '/'}) {
routeStack[basePath] = router;
this.router = router;
}

@@ -173,16 +175,43 @@ class H4 {

_bootstrap() {
server!.listen((HttpRequest request) {
if (router == null) {
logger.warning("Router instance is missing.");
if (routeStack.values.isEmpty) {
logger.warning("No router instances were found.");
return404(request)(middlewares, null);
return;
}

H4Router? hRouter;
String routeKey = '';

for (var key in routeStack.keys) {
if (!key.startsWith('/')) {
logger.warning(
'Invalid base path! - found $key - change the base path to /$key');
}

if (key != '/') {
if (request.uri.path.startsWith(key)) {
hRouter = routeStack[key];
routeKey = key;
}
} else {
hRouter = routeStack['/'];
routeKey = '/';
}
}

var routePath = request.uri.path;

if (routeKey != '/') {
routePath = request.uri.path.replaceFirstMapped(
routeKey, (m) => m.toString() == routeKey ? '/' : '');
}

// Find handler for that request
var match = router?.lookup(request.uri.path);
var match = hRouter?.lookup(routePath);

var params = router?.getParams(request.uri.path);
var params = hRouter?.getParams(routePath);
params ??= {};

// Handling starts here.
12 changes: 9 additions & 3 deletions lib/src/logger.dart
Original file line number Diff line number Diff line change
@@ -22,9 +22,15 @@ initLogger() {

case 'SEVERE':
{
Console.setFramed(true);
Console.write(record.level.name);
Console.write(record.message);
Console.setBackgroundColor(1, bright: true);
Console.setTextColor(0, bright: true);
// ignore: unnecessary_string_escapes
Console.write('\n ${record.level.name} ');
Console.resetBackgroundColor();
Console.resetTextColor();
Console.setBold(false);
Console.write(' ▲▼ ${record.message}\n');
Console.resetAll();
}
}
});
13 changes: 13 additions & 0 deletions test/h4_test.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
import 'dart:convert';

import 'package:dio/dio.dart';

import 'package:h4/create.dart';
import 'package:h4/src/h4.dart';
import 'package:h4/src/router.dart';
import 'package:h4/utils/get_query.dart';
import 'package:h4/utils/read_request_body.dart';
import 'package:test/test.dart';

@@ -133,4 +136,14 @@ void main() {
));
expect(req.data, '{"hi":12}');
});

test('Correctly parses query parameters', () async {
router.get('/body', (event) async {
return await getQueryParams(event);
});

final response = await dio.get('/body?query=iyimide&answer=laboss');

expect(jsonDecode(response.data), {"query": "iyimide", "answer": "laboss"});
});
}