From 9117bc2760356c08e61a0c800390268aa79af864 Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Mon, 14 Feb 2022 08:52:56 +0200 Subject: [PATCH] Make typing of routes support synchronous values Signed-off-by: Janne Savolainen --- src/main/router.ts | 8 +++++++- .../metrics/get-metric-providers-route.injectable.ts | 2 +- src/main/routes/versions/get-version-route.injectable.ts | 4 +--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/router.ts b/src/main/router.ts index cc2cd1ea2b..8e8a402eb2 100644 --- a/src/main/router.ts +++ b/src/main/router.ts @@ -232,5 +232,11 @@ export interface LensApiResult { export interface Route { path: string; method: "get" | "post" | "put" | "patch" | "delete"; - handler: (request: LensApiRequest) => LensApiResult | Promise>; + handler: ( + request: LensApiRequest + ) => + | Promise> + | Promise + | LensApiResult + | void; } diff --git a/src/main/routes/metrics/get-metric-providers-route.injectable.ts b/src/main/routes/metrics/get-metric-providers-route.injectable.ts index fe43b21ac8..ad67d27065 100644 --- a/src/main/routes/metrics/get-metric-providers-route.injectable.ts +++ b/src/main/routes/metrics/get-metric-providers-route.injectable.ts @@ -17,7 +17,7 @@ const getMetricProvidersRouteInjectable = getInjectable({ method: "get", path: `${apiPrefix}/metrics/providers`, - handler: async () => { + handler: () => { const providers: MetricProviderInfo[] = []; for (const { name, id, isConfigurable } of PrometheusProviderRegistry.getInstance().providers.values()) { diff --git a/src/main/routes/versions/get-version-route.injectable.ts b/src/main/routes/versions/get-version-route.injectable.ts index 5a124e49ad..c0544c13e1 100644 --- a/src/main/routes/versions/get-version-route.injectable.ts +++ b/src/main/routes/versions/get-version-route.injectable.ts @@ -14,9 +14,7 @@ const getVersionRouteInjectable = getInjectable({ method: "get", path: `/version`, - handler: async () => { - return { response: { version: getAppVersion() }}; - }, + handler: () => ({ response: { version: getAppVersion() }}), }), injectionToken: routeInjectionToken,