top-level awaitでOAuthクライアントを初期化 (#98)

app/routes/client-metadata[.json].tsx

···
-import { createOAuthClient } from "~/server/oauth/client";
+import { oauthClient } from "~/server/oauth/client";
 
-export async function loader() {
-  const oauthClient = await createOAuthClient();
+export function loader() {
   return Response.json(oauthClient.clientMetadata);
 }

app/routes/jwks[.json].tsx

···
-import { createOAuthClient } from "~/server/oauth/client";
+import { oauthClient } from "~/server/oauth/client";
 
-export async function loader() {
-  const oauthClient = await createOAuthClient();
+export function loader() {
   return Response.json(oauthClient.jwks);
 }

app/routes/login.tsx

···
 import { LoginForm } from "~/features/login/login-form";
 import { RouteToaster } from "~/features/toast/route";
 import { i18nServer } from "~/i18n/i18n";
-import { createOAuthClient } from "~/server/oauth/client";
+import { oauthClient } from "~/server/oauth/client";
 import { getSessionUserDid } from "~/server/oauth/session";
 import { createLogger } from "~/utils/logger";
 
···
     return { error: t("login.unknown-error") };
   }
   try {
-    const oauthClient = await createOAuthClient();
     const url = await oauthClient.authorize(handle, {
       scope: "atproto transition:generic",
     });

app/routes/oauth.callback.tsx

···
 import { redirect } from "react-router";
 
-import { createOAuthClient } from "~/server/oauth/client";
+import { oauthClient } from "~/server/oauth/client";
 import { commitSession, getSession } from "~/server/oauth/session";
 import { createLogger } from "~/utils/logger";
 
···
 export async function loader({ request }: Route.LoaderArgs) {
   const remixSession = await getSession(request);
   try {
-    const oauthClient = await createOAuthClient();
     const { session: oauthSession } = await oauthClient.callback(
       new URL(request.url).searchParams,
     );

app/server/oauth/client.ts

···
 
 import { SessionStore, StateStore } from "./storage";
 
-let oauthClient: NodeOAuthClient | null = null;
+const baseUrl = isProduction ? env.PUBLIC_URL : "http://127.0.0.1:3000";
 
-export const createOAuthClient = async () => {
-  if (oauthClient) {
-    return oauthClient;
-  }
-  const baseUrl = isProduction ? env.PUBLIC_URL : "http://127.0.0.1:3000";
-  const privateKeyPKCS8 = Buffer.from(
-    env.PRIVATE_KEY_ES256_B64,
-    "base64",
-  ).toString();
-  const privateKey = await JoseKey.fromImportable(privateKeyPKCS8, "key1");
-  const oauthClientOptions: NodeOAuthClientOptions = {
-    clientMetadata: {
-      client_name: "Linkat",
-      client_id: isProduction
-        ? `${env.PUBLIC_URL}/client-metadata.json`
-        : `http://localhost?redirect_uri=${encodeURIComponent(`${baseUrl}/oauth/callback`)}`,
-      client_uri: baseUrl,
-      jwks_uri: `${baseUrl}/jwks.json`,
-      redirect_uris: [`${baseUrl}/oauth/callback`],
-      scope: "atproto transition:generic",
-      grant_types: ["authorization_code", "refresh_token"],
-      response_types: ["code"],
-      application_type: "web",
-      token_endpoint_auth_method: "private_key_jwt",
-      token_endpoint_auth_signing_alg: "ES256",
-      dpop_bound_access_tokens: true,
-    },
-    keyset: [privateKey],
-    plcDirectoryUrl: env.ATPROTO_PLC_URL,
-    stateStore: new StateStore(),
-    sessionStore: new SessionStore(),
-  };
-  if (!isProduction) {
-    oauthClientOptions.handleResolver = env.BSKY_PUBLIC_API_URL;
-    oauthClientOptions.allowHttp = true; // httpを許可しないとOAuthProtectedResourceMetadataResolverがエラーを投げる
-  }
-  oauthClient = new NodeOAuthClient(oauthClientOptions);
-  return oauthClient;
+const privateKey = Buffer.from(env.PRIVATE_KEY_ES256_B64, "base64").toString();
+
+const oauthClientOptions: NodeOAuthClientOptions = {
+  clientMetadata: {
+    client_name: "Linkat",
+    client_id: isProduction
+      ? `${env.PUBLIC_URL}/client-metadata.json`
+      : `http://localhost?redirect_uri=${encodeURIComponent(`${baseUrl}/oauth/callback`)}`,
+    client_uri: baseUrl,
+    jwks_uri: `${baseUrl}/jwks.json`,
+    redirect_uris: [`${baseUrl}/oauth/callback`],
+    scope: "atproto transition:generic",
+    grant_types: ["authorization_code", "refresh_token"],
+    response_types: ["code"],
+    application_type: "web",
+    token_endpoint_auth_method: "private_key_jwt",
+    token_endpoint_auth_signing_alg: "ES256",
+    dpop_bound_access_tokens: true,
+  },
+  keyset: [await JoseKey.fromImportable(privateKey, "key1")],
+  plcDirectoryUrl: env.ATPROTO_PLC_URL,
+  stateStore: new StateStore(),
+  sessionStore: new SessionStore(),
 };
+
+if (!isProduction) {
+  oauthClientOptions.handleResolver = env.BSKY_PUBLIC_API_URL;
+  oauthClientOptions.allowHttp = true; // httpを許可しないとOAuthProtectedResourceMetadataResolverがエラーを投げる
+}
+
+export const oauthClient = new NodeOAuthClient(oauthClientOptions);

app/server/oauth/session.ts

···
 import { userService } from "~/server/service/userService";
 import { env } from "~/utils/env";
 
-import { createOAuthClient } from "./client";
+import { oauthClient } from "./client";
 
 type SessionData = {
   did: string;
···
   if (!userDid) {
     return null;
   }
-  const oauthClient = await createOAuthClient();
   const oauthSession = await oauthClient.restore(userDid);
   return new LinkatAgent(oauthSession);
 };

vite.config.ts

···
 export default defineConfig({
   base: process.env.VITE_CONFIG_BASE ?? "/",
   plugins: [reactRouter(), tsconfigPaths()],
+  build: {
+    target: "es2022",
+  },
   test: {
     include: ["app/**/*.spec.ts"],
     coverage: {