feat: api improvements

apps/api/src/util/api.ts

···
 import { ActorIdentifier, AtprotoDid, Handle, isHandle } from '@atcute/lexicons/syntax';
 import { isAtprotoDid } from '@atcute/identity';
 import { RedisClient } from 'bun';
+import { ProfileViewBasic } from '../../../../libs/lexicons/dist/types/blue/recipes/actor/defs.js';
+import { Blob, LegacyBlob } from '@atcute/lexicons';
+import { buildCdnUrl } from './cdn.js';
 
 const handleResolver = new CompositeHandleResolver({
   strategy: 'race',
···
 
   return handle;
 }
+
+export const buildProfileViewBasic = async (author: {
+  did: AtprotoDid;
+  displayName: string;
+  pronouns: string | null;
+  avatarRef: Blob | LegacyBlob | null;
+  createdAt: Date;
+}, redis: RedisClient): Promise<ProfileViewBasic> => ({
+  did: author.did,
+  handle: await getHandle(author.did, redis),
+  displayName: author.displayName,
+  pronouns: author.pronouns ?? undefined,
+  avatar: author.avatarRef ? buildCdnUrl('avatar', author.did, author.avatarRef) : undefined,
+  createdAt: author.createdAt.toISOString(),
+});

apps/api/src/xrpc/blue.recipes.feed.getRecipe.ts

···
 import { json, XRPCRouter, XRPCError } from '@atcute/xrpc-server';
-import { BlueRecipesFeedGetRecipe, BlueRecipesFeedRecipe, BlueRecipesActorDefs } from '@cookware/lexicons';
+import { BlueRecipesFeedGetRecipe, BlueRecipesFeedRecipe } from '@cookware/lexicons';
 import { db, and, or, eq } from '@cookware/database';
-import { parseDid } from '../util/api.js';
+import { buildProfileViewBasic, parseDid } from '../util/api.js';
 import { Logger } from 'pino';
 import { parseResourceUri, ResourceUri } from '@atcute/lexicons';
 import { recipeTable } from '@cookware/database/schema';
 import { isLegacyBlob } from '@atcute/lexicons/interfaces';
 import { RedisClient } from 'bun';
+import { buildCdnUrl } from '../util/cdn.js';
 
 const invalidUriError = (uri: string) => new XRPCError({
   status: 400,
···
   description: `The provided URI is invalid: ${uri}`,
 });
 
-export const registerGetRecipe = (router: XRPCRouter, _logger: Logger, _redis: RedisClient) => {
+export const registerGetRecipe = (router: XRPCRouter, _logger: Logger, redis: RedisClient) => {
   router.addQuery(BlueRecipesFeedGetRecipe.mainSchema, {
     async handler({ params: { uris } }) {
       const whereClauses = [];
···
       const recipes = await db.query.recipeTable.findMany({
         orderBy: recipeTable.createdAt,
         where: or(...whereClauses),
+        with: {
+          author: {
+            columns: {
+              did: true,
+              displayName: true,
+              pronouns: true,
+              avatarRef: true,
+              createdAt: true,
+            },
+          },
+        },
       });
 
       return json({
-        recipes: recipes.map((recipe) => ({
-          author: {
-            $type: BlueRecipesActorDefs.profileViewBasicSchema.shape.$type.wrapped.expected,
-            did: recipe.did,
-            handle: 'hayden.moe',
-            createdAt: new Date().toISOString(),
-          },
-          cid: '',
-          indexedAt: new Date().toISOString(),
-          record: {
-            $type: BlueRecipesFeedRecipe.mainSchema.object.shape.$type.expected,
-            title: recipe.title,
-            description: recipe.description ?? undefined,
-            time: recipe.time ?? undefined,
-            serves: recipe.serves ?? undefined,
-            ingredients: recipe.ingredients as BlueRecipesFeedRecipe.Ingredient[],
-            steps: recipe.steps as BlueRecipesFeedRecipe.Step[],
-            image: isLegacyBlob(recipe.imageRef) ? undefined : recipe.imageRef ?? undefined,
-            createdAt: recipe.createdAt.toISOString(),
-          },
-          uri: recipe.uri as ResourceUri,
-        })),
+        recipes: await Promise.all(
+          recipes.map(async ({ author, ...recipe }) => ({
+            uri: recipe.uri as ResourceUri,
+            author: await buildProfileViewBasic(author, redis),
+            cid: recipe.cid,
+            indexedAt: recipe.ingestedAt.toISOString(),
+            record: {
+              $type: BlueRecipesFeedRecipe.mainSchema.object.shape.$type.expected,
+              title: recipe.title,
+              description: recipe.description ?? undefined,
+              time: recipe.time ?? undefined,
+              serves: recipe.serves ?? undefined,
+              ingredients: recipe.ingredients as BlueRecipesFeedRecipe.Ingredient[],
+              steps: recipe.steps as BlueRecipesFeedRecipe.Step[],
+              image: isLegacyBlob(recipe.imageRef) ? undefined : recipe.imageRef ?? undefined,
+              createdAt: recipe.createdAt.toISOString(),
+            },
+          }))
+        ),
       });
     },
   });

apps/api/src/xrpc/blue.recipes.feed.getRecipes.ts

···
 import { Logger } from 'pino';
 import { isLegacyBlob } from '@atcute/lexicons/interfaces';
 import { RedisClient } from 'bun';
+import { buildCdnUrl } from '../util/cdn.js';
 
 export const registerGetRecipes = (router: XRPCRouter, _logger: Logger, redis: RedisClient) => {
   router.addQuery(BlueRecipesFeedGetRecipes.mainSchema, {
···
         limit: limit,
         where: whereClauses ? and(...whereClauses) : undefined,
         with: {
-          author: true,
+          author: {
+            columns: {
+              did: true,
+              displayName: true,
+              pronouns: true,
+              avatarRef: true,
+              createdAt: true,
+            },
+          },
         },
       });
 
···
             did: recipe.author.did,
             handle: await getHandle(recipe.author.did, redis),
             displayName: recipe.author.displayName,
-            avatar: isLegacyBlob(recipe.author.avatarRef) ? undefined : recipe.author.avatarRef ?? undefined,
+            avatar: recipe.author.avatarRef ? buildCdnUrl('avatar', recipe.author.did, recipe.author.avatarRef) : undefined,
             pronouns: recipe.author.pronouns ?? undefined,
             createdAt: recipe.author.createdAt.toISOString(),
           },
-          cid: '',
+          cid: recipe.cid,
           indexedAt: recipe.ingestedAt.toISOString(),
           record: {
             $type: BlueRecipesFeedRecipe.mainSchema.object.shape.$type.expected,

libs/lexicons/lexicons/profiles/defs.tsp

···
     displayName?: string;
 
     pronouns?: string;
-    avatar?: uri;
+    avatar?: url;
 
     @format("datetime")
     createdAt?: string;

libs/lexicons/lib/types/blue/recipes/actor/defs.ts

···
   $type: /*#__PURE__*/ v.optional(
     /*#__PURE__*/ v.literal("blue.recipes.actor.defs#profileViewBasic"),
   ),
-  avatar: /*#__PURE__*/ v.optional(/*#__PURE__*/ v.genericUriString()),
+  avatar: /*#__PURE__*/ v.optional(/*#__PURE__*/ v.string()),
   createdAt: /*#__PURE__*/ v.optional(/*#__PURE__*/ v.string()),
   did: /*#__PURE__*/ v.didString(),
   /**