session取得時のエラーハンドリング

Author: na-trium-144

app/accountMenu.tsx

@@ -42,7 +42,7 @@ export function AccountMenu() {
     }
   };
 
-  if (isPending) {
+  if (isPending || !session) {
     return <div className="w-10 h-10 skeleton rounded-full"></div>;
   }
 

app/lib/chatHistory.ts

@@ -37,11 +37,15 @@ async function initAll(ctx?: Partial<Context>): Promise<Context> {
     ctx.auth = await getAuthServer(ctx.drizzle);
   }
   if (!ctx.userId) {
-    const session = await ctx.auth.api.getSession({
-      headers: await headers(),
-    });
-    if (session) {
-      ctx.userId = session.user.id;
+    try {
+      const session = await ctx.auth.api.getSession({
+        headers: await headers(),
+      });
+      if (session) {
+        ctx.userId = session.user.id;
+      }
+    } catch (e) {
+      console.error("Failed to get session in initAll:", e);
     }
   }
   return ctx as Context;