feat: more code improvements for ingester & libsd

apps/ingester/package.json

···
     "@atcute/identity": "^1.1.3",
     "@atcute/jetstream": "^1.1.2",
     "@atcute/lexicons": "catalog:",
+    "@badrap/valita": "^0.4.6",
+    "@cookware/database": "workspace:^",
     "@cookware/lexicons": "workspace:*",
-    "@cookware/database": "workspace:^",
     "@sentry/node": "^8.42.0",
     "pino": "^9.5.0"
   },

apps/ingester/src/config.ts

···
-import { z } from "zod";
+import * as v from "@badrap/valita";
 
-const envSchema = z.object({
-  TURSO_CONNECTION_URL: z.string().default('https://turso.dev.hayden.moe'),
-  TURSO_AUTH_TOKEN: z.string().or(z.undefined()),
+const envSchema = v.object({
+  TURSO_CONNECTION_URL: v.string().optional(() => 'https://turso.dev.hayden.moe'),
+  TURSO_AUTH_TOKEN: v.string().optional(),
 
-  JETSTREAM_ENDPOINT: z
-    .string()
-    .url()
-    .default('wss://jetstream1.us-east.bsky.network/subscribe'),
-  PLC_DIRECTORY_URL: z.string().url().default('https://plc.directory'),
+  JETSTREAM_ENDPOINT: v.string()
+    .optional(() => 'wss://jetstream2.us-east.bsky.network'),
+  PLC_DIRECTORY_URL: v.string().optional(() => 'https://plc.directory'),
 
-  ENV: z
-    .union([
-      z.literal('development'),
-      z.literal('production'),
-    ])
-    .default('development'),
+  ENV: v
+    .union(v.literal('development'), v.literal('production'))
+    .optional(() => 'development'),
 });
 
-const env = envSchema.parse(process.env);
+const env = envSchema.parse(process.env, { mode: 'strip' });
 
 export default env;
-export type Env = z.infer<typeof envSchema>;
+export type Env = v.Infer<typeof envSchema>;

apps/ingester/src/index.ts

···
 import { JetstreamSubscription } from "@atcute/jetstream";
-import { ingestLogger } from "./logger.js";
 import env from "./config.js";
 import { db, and, eq } from "@cookware/database";
 import { BlueRecipesFeedRecipe } from "@cookware/lexicons";
 import { recipeTable } from "@cookware/database/schema";
 import { is } from '@atcute/lexicons';
 import { isAtprotoDid } from '@atcute/identity';
+import pino from "pino";
 
 export const newIngester = () => {
+  const logger = pino({
+    name: 'recipes.ingester',
+    level: env.ENV === 'development' ? 'debug' : 'info',
+  });
+
   const subscription = new JetstreamSubscription({
     url: env.JETSTREAM_ENDPOINT,
     wantedCollections: ['blue.recipes.*'],
     cursor: 0,
+    onConnectionOpen: () => logger.info('Connected to Jetstream'),
+    onConnectionError: err => {
+      logger.error(err, 'Failed to connect to Jetstream');
+      process.exit(1);
+    },
+    onConnectionClose: () => logger.info('Disconnected from Jetstream'),
   });
 
   return {
···
       for await (const event of subscription) {
         const authorDid = event.did;
         if (!isAtprotoDid(authorDid)) {
-          ingestLogger.warn(`Invalid did: ${authorDid}`);
+          logger.warn(`Invalid did: ${authorDid}`);
           continue;
         }
 
···
           const commit = event.commit;
 
           if (commit.collection !== 'blue.recipes.feed.recipe') {
+            logger.trace(`Skipping unknown collection: ${commit.collection}`);
             continue;
           }
 
···
             const record = commit.record;
 
             if (!is(BlueRecipesFeedRecipe.mainSchema, record)) {
-              ingestLogger.warn(`Invalid recipe schema for ${commit['operation']} ${authorDid}/${rkey}`);
+              logger.warn(`Invalid recipe schema for ${commit['operation']} ${authorDid}/${rkey}`);
               continue;
             }
 
···
                 },
               });
 
-            ingestLogger.info(`Upserted recipe ${authorDid}/${rkey}`);
+            logger.info(`Upserted recipe ${authorDid}/${rkey}`);
           } else if (commit.operation == 'delete') {
             const rkey = commit.rkey;
             db
···
                 eq(recipeTable.authorDid, authorDid),
                 eq(recipeTable.rkey, rkey),
               ));
-            ingestLogger.info(`Deleted recipe ${authorDid}/${rkey}`);
+            logger.info(`Deleted recipe ${authorDid}/${rkey}`);
           } else {
-            ingestLogger.warn(`Unknown operation type: ${commit['operation']}`);
+            logger.warn(`Unknown operation type: ${commit['operation']}`);
             continue;
           }
+        } else {
+          logger.trace({ kind: event.kind, authorDid }, `Skipping non-commit event for did: ${event.did}`);
+          continue;
         }
       }
     },

apps/ingester/src/logger.ts

···
-import { pino } from "pino";
-
-export const rootLogger = pino({ name: 'recipes' });
-export const ingestLogger = pino({ name: 'recipes.ingest' });

bun.lock

···
         "@atcute/identity": "^1.1.3",
         "@atcute/jetstream": "^1.1.2",
         "@atcute/lexicons": "catalog:",
+        "@badrap/valita": "^0.4.6",
         "@cookware/database": "workspace:^",
         "@cookware/lexicons": "workspace:*",
         "@sentry/node": "^8.42.0",

libs/database/package.json

···
     "./schema": "./dist/schema.js"
   },
   "scripts": {
-    "dev": "tsc --watch",
+    "dev": "tsc --watch --project tsconfig.build.json",
     "build": "tsc --project tsconfig.build.json",
     "db:generate": "drizzle-kit generate",
     "db:migrate": "drizzle-kit migrate",

libs/database/tsconfig.build.json

···
 {
-  "extends": "@cookware/tsconfig/base.json",
-  "include": ["lib"],
+  "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "dist"
+    "noEmit": false,
+    "outDir": "./dist"
   }
 }

libs/database/tsconfig.json

···
 {
   "extends": "@cookware/tsconfig/base.json",
-  "include": ["lib", "drizzle.config.ts"]
+  "include": ["lib", "drizzle.config.ts"],
+  "compilerOptions": {
+    "noEmit": true
+  }
 }

libs/lexicons/package.json

···
     "./did": "./dist/did.js"
   },
   "scripts": {
-    "build": "tsc",
+    "dev": "tsc --watch --project tsconfig.build.json",
+    "build": "tsc --project tsconfig.build.json",
     "lexgen": "lex-cli generate --config ./lex.config.ts",
     "prepublish": "rm -rf dist; bun run build"
   },

libs/lexicons/tsconfig.build.json

···
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "noEmit": false,
+    "outDir": "./dist"
+  }
+}

libs/lexicons/tsconfig.json

···
   "extends": "@cookware/tsconfig/base.json",
   "include": ["lib"],
   "compilerOptions": {
-    "outDir": "./dist"
+    "noEmit": true
   }
 }