hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Remove return from routeRequest as unused.

Browse Source 
- Add log line for when route is not found

Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2023-01-19 15:55:18 -05:00
parent fdae7870da
commit 4d16079ab6
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/router/route-request.injectable.ts
View File

@ -11,6 +11,7 @@ import Subtext from "@hapi/subtext";
import type { Cluster } from "../../common/cluster/cluster"; import type { Cluster } from "../../common/cluster/cluster";
import type { RouteHandler } from "./create-handler-for-route.injectable"; import type { RouteHandler } from "./create-handler-for-route.injectable";
import type { IncomingMessage, ServerResponse } from "http"; import type { IncomingMessage, ServerResponse } from "http";
import loggerInjectable from "../../common/logger.injectable";
export const routeInjectionToken = getInjectionToken<Route<unknown, string>>({ export const routeInjectionToken = getInjectionToken<Route<unknown, string>>({
id: "route-injection-token", id: "route-injection-token",
@ -25,7 +26,7 @@ export function getRouteInjectable<T, Path extends string>(
}); });
} }
export type RouteRequest = (cluster: Cluster | undefined, req: IncomingMessage, res: ServerResponse) => Promise<boolean>; export type RouteRequest = (cluster: Cluster | undefined, req: IncomingMessage, res: ServerResponse) => Promise<void>;
const routeRequestInjectable = getInjectable({ const routeRequestInjectable = getInjectable({
id: "route-request", id: "route-request",
@ -33,6 +34,7 @@ const routeRequestInjectable = getInjectable({
const routes = di.injectMany(routeInjectionToken); const routes = di.injectMany(routeInjectionToken);
const createHandlerForRoute = di.inject(createHandlerForRouteInjectable); const createHandlerForRoute = di.inject(createHandlerForRouteInjectable);
const router = new Call.Router<RouteHandler>(); const router = new Call.Router<RouteHandler>();
const logger = di.inject(loggerInjectable);
for (const route of routes) { for (const route of routes) {
router.add({ method: route.method, path: route.path }, createHandlerForRoute(route)); router.add({ method: route.method, path: route.path }, createHandlerForRoute(route));
@ -40,14 +42,16 @@ const routeRequestInjectable = getInjectable({
return async (cluster, req, res) => { return async (cluster, req, res) => {
if (!req.url || !req.method) { if (!req.url || !req.method) {
return false; return;
} }
const url = new URL(req.url, "https://localhost"); const url = new URL(req.url, "https://localhost");
const matchingRoute = router.route(req.method?.toLowerCase() ?? "get", url.pathname); const matchingRoute = router.route(req.method?.toLowerCase() ?? "get", url.pathname);
if (matchingRoute instanceof Error) { if (matchingRoute instanceof Error) {
return false; logger.warn(`[ROUTE-REQUEST]: ${matchingRoute}`, { url: url.pathname });
return;
} }
const { payload } = await Subtext.parse(req, null, { const { payload } = await Subtext.parse(req, null, {
@ -68,7 +72,7 @@ const routeRequestInjectable = getInjectable({
await matchingRoute.route(request, res); await matchingRoute.route(request, res);
return true; return;
}; };
}, },
}); });