significant refactor

src/features/players/server.ts

@@ -1,60 +1,48 @@
 import { setUserMetadata, superTokensFunctionMiddleware, verifySuperTokensSession } from "@/utils/supertokens";
 import { createServerFn } from "@tanstack/react-start";
-import { playerInputSchema, playerUpdateSchema } from "@/features/players/types";
+import { Player, playerInputSchema, playerUpdateSchema } from "@/features/players/types";
 import { pbAdmin } from "@/lib/pocketbase/client";
 import { z } from "zod";
 import { logger } from ".";
 import { getWebRequest } from "@tanstack/react-start/server";
+import { toServerResult } from "@/lib/tanstack-query/utils/to-server-result";
 
 export const fetchMe = createServerFn()
-  .handler(async ({ response }) => {
-    const request = getWebRequest();
-    const { context } = await verifySuperTokensSession(request, response);
+  .handler(async ({ response }) => 
+    toServerResult(async () => {
+      const request = getWebRequest();
+      const { context } = await verifySuperTokensSession(request, response);
 
-    if (!context || !context.userAuthId) return { user: undefined, roles: [], metadata: {} };
+      if (!context || !context.userAuthId) return { user: undefined, roles: [], metadata: {} };
 
-    try {
       await pbAdmin.authPromise;
       const result = await pbAdmin.getPlayerByAuthId(context.userAuthId);
-      logger.info('Fetched player', result);
       return {
         user: result || undefined, 
         roles: context.roles, 
         metadata: context.metadata 
       };
-    } catch (error) {
-      logger.error('Error fetching player:', error);
-      return { user: undefined, roles: context.roles, metadata: context.metadata };
-    }
-  });
+    })
+  );
 
 export const getPlayer = createServerFn()
   .validator(z.string())
   .middleware([superTokensFunctionMiddleware])
-  .handler(async ({ data }) => {
-    try {
-      const player = await pbAdmin.getPlayer(data);
-      return player;
-    } catch (error) {
-      logger.error('Error getting player', error);
-      return undefined;
-    }
-  });
+  .handler(async ({ data }) => 
+    toServerResult<Player>(async () => await pbAdmin.getPlayer(data))
+  );
 
 export const updatePlayer = createServerFn()
   .validator(playerUpdateSchema)
   .middleware([superTokensFunctionMiddleware])
-  .handler(async ({ context, data }) => {
-    const userAuthId = context.userAuthId;
-    if (!userAuthId) return;
+  .handler(async ({ context, data }) => 
+    toServerResult(async () => {
+      const userAuthId = context.userAuthId;
+      if (!userAuthId) return;
 
-    try {
-      // Find the player by authId first
       const existing = await pbAdmin.getPlayerByAuthId(userAuthId);
-
       if (!existing) return;
 
-      // Update the player
       const updatedPlayer = await pbAdmin.updatePlayer(
         existing.id!,
         {
@@ -68,20 +56,17 @@ export const updatePlayer = createServerFn()
       await setUserMetadata({ data: { first_name: data.first_name, last_name: data.last_name } });
 
       return updatedPlayer;
-    } catch (error) {
-      logger.error('Error updating player name', error);
-      return undefined;
-    }
-  });
+    })
+  );
 
 export const createPlayer = createServerFn()
   .validator(playerInputSchema)
   .middleware([superTokensFunctionMiddleware])
-  .handler(async ({ context, data }) => {
-    const userAuthId = context.userAuthId;
-    if (!userAuthId) return;
+  .handler(async ({ context, data }) => 
+    toServerResult(async () => {
+      const userAuthId = context.userAuthId;
+      if (!userAuthId) return;
 
-    try {
       const existing = await pbAdmin.getPlayerByAuthId(userAuthId);
       if (existing) return;
 
@@ -96,20 +81,17 @@ export const createPlayer = createServerFn()
       await setUserMetadata({ data: { first_name: data.first_name, last_name: data.last_name, player_id: newPlayer?.id?.toString() } });
       logger.info('Created player', newPlayer);
       return newPlayer;
-    } catch (error) {
-      logger.error('Error creating player', error);
-      return undefined;
-    }
-  });
+    })
+  );
 
 export const associatePlayer = createServerFn()
   .validator(z.string())
   .middleware([superTokensFunctionMiddleware])
-  .handler(async ({ context, data }) => {
-    const userAuthId = context.userAuthId;
-    if (!userAuthId) return;
+  .handler(async ({ context, data }) => 
+    toServerResult(async () => {
+      const userAuthId = context.userAuthId;
+      if (!userAuthId) return;
 
-    try {
       await pbAdmin.updatePlayer(data, {
         auth_id: userAuthId
       });
@@ -119,30 +101,17 @@ export const associatePlayer = createServerFn()
       const player = await pbAdmin.getPlayer(data);
       logger.info('Associated player', player);
       return player;
-    } catch (error) {
-      logger.error('Error associating player', error);
-      return undefined;
-    }
-  });
+    })
+  );
 
 export const listPlayers = createServerFn()
   .middleware([superTokensFunctionMiddleware])
-  .handler(async () => {
-    try {
-      return await pbAdmin.listPlayers();
-    } catch (error) {
-      logger.error('Error listing players', error);
-      return [];
-    }
-  });
+  .handler(async () => 
+    toServerResult(pbAdmin.listPlayers)
+  );
 
 export const getUnassociatedPlayers = createServerFn()
   .middleware([superTokensFunctionMiddleware])
-  .handler(async () => {
-    try {
-      return await pbAdmin.getUnassociatedPlayers();
-    } catch (error) {
-      logger.error('Error getting unassociated players', error);
-      return [];
-    }
-  });
+  .handler(async () => 
+    toServerResult(pbAdmin.getUnassociatedPlayers)
+  );