improve makeAstroEndpoint

Author: leonitousconforti

.vscode/settings.json

@@ -62,6 +62,7 @@
         "Pdrmn",
         "Pfrns",
         "Phchat",
+        "PKCE",
         "pkgs",
         "Plbbcp",
         "Plbc",

apps/tinyburg.app/api/handler.ts

@@ -5,25 +5,32 @@ import { Context, Effect, type ManagedRuntime, type Scope } from "effect";
 import { AppRuntime } from "./runtime";
 import { AstroContext } from "./tags";
 
-export const makeAstroEndpoint = async <E>(
-    app: HttpApp.Default<E, AstroContext | Scope.Scope | ManagedRuntime.ManagedRuntime.Context<typeof AppRuntime>>,
+export const makeAstroEndpoint = <E>(
+    app: HttpApp.Default<
+        E,
+        | AstroContext
+        | Scope.Scope
+        | HttpServerRequest.HttpServerRequest
+        | ManagedRuntime.ManagedRuntime.Context<typeof AppRuntime>
+    >,
     middleware?: HttpMiddleware.HttpMiddleware | undefined
-): Promise<APIRoute> => {
-    const runtime = await AppRuntime.runtime();
-    const emptyAstroContext = Context.empty() as Context.Context<AstroContext>;
+): APIRoute => {
+    type R = ManagedRuntime.ManagedRuntime.Context<typeof AppRuntime>;
+
+    let cachedHandler:
+        | ((request: Request, context?: Context.Context<never> | undefined) => Promise<Response>)
+        | undefined = undefined;
+
     const appWithoutAstroContext = Effect.mapInputContext(
         app,
-        (
-            requiredContext: Context.Context<
-                | Scope.Scope
-                | HttpServerRequest.HttpServerRequest
-                | ManagedRuntime.ManagedRuntime.Context<typeof AppRuntime>
-            >
-        ) => Context.merge(requiredContext, emptyAstroContext)
+        (requiredContext: Context.Context<Scope.Scope | HttpServerRequest.HttpServerRequest | R>) =>
+            Context.merge(requiredContext, Context.empty() as Context.Context<AstroContext>)
     );
-    const handler = HttpApp.toWebHandlerRuntime(runtime)(appWithoutAstroContext, middleware);
+
     return async (apiContext) => {
+        const runtime = await AppRuntime.runtime();
+        cachedHandler ??= HttpApp.toWebHandlerRuntime(runtime)(appWithoutAstroContext, middleware);
         const context = Context.make(AstroContext, apiContext);
-        return await handler(apiContext.request, context);
+        return await cachedHandler(apiContext.request, context);
     };
 };

apps/tinyburg.app/src/pages/auth/google/callback.ts

@@ -15,7 +15,7 @@ import { Repository } from "../../../../domain/model";
 import { OAuthResponseSchema } from "../_shared";
 import { GoogleOAuthConfig, tokenUrl } from "./_shared";
 
-export const GET = await Effect.gen(function* () {
+export const GET = Effect.gen(function* () {
     const config = yield* Effect.orDie(GoogleOAuthConfig);
     const request = yield* HttpServerRequest.HttpServerRequest;
 

apps/tinyburg.app/src/pages/auth/google/login.ts

@@ -6,11 +6,13 @@ import { AstroContext } from "../../../../api/tags";
 import { randomStateGenerator, Sha256CodeChallenge } from "../_shared";
 import { authUrl, GoogleOAuthConfig } from "./_shared";
 
-export const GET = await Effect.gen(function* () {
+export const GET = Effect.gen(function* () {
     const Astro = yield* AstroContext;
+    const config = yield* Effect.orDie(GoogleOAuthConfig);
+
+    // Generate state and code verifier for PKCE
     const state = randomStateGenerator();
     const codeVerifier = randomStateGenerator();
-    const config = yield* Effect.orDie(GoogleOAuthConfig);
 
     // Build the Google OAuth authorization URL
     const maybeGoogleAuthorizationUrl = pipe(