Refactor admin status, update DB config & scripts

Author: richiemcilroy

apps/api/src/routes/admin-status.ts

@@ -19,56 +19,73 @@ const WORKER_NAMES = [
   'vm-teardown',
 ]
 
-export const AdminStatusRouter = HttpRouter.empty.pipe(
-  HttpRouter.get(
-    '/v1/admin/status',
-    Effect.gen(function* () {
-      const redis = yield* RedisService
-      const nodeRepo = yield* NodeRepo
-      const shutdown = yield* ShutdownController
+const handler = Effect.gen(function* () {
+  const redis = yield* RedisService
+  const nodeRepo = yield* NodeRepo
+  const shutdown = yield* ShutdownController
 
-      // Redis health
-      const redisOk = yield* redis.ping()
+  // Redis health
+  const redisOk = yield* redis.ping()
 
-      // Worker leader info
-      const workers = yield* redis.getWorkerLeaderInfo(WORKER_NAMES)
+  // Worker leader info
+  const workers = yield* redis.getWorkerLeaderInfo(WORKER_NAMES)
 
-      // Nodes with heartbeat status
-      const nodeRows = yield* nodeRepo.list()
-      const nodes = yield* Effect.all(
-        nodeRows.map((node) =>
-          Effect.gen(function* () {
-            const nodeIdStr = bytesToId(NODE_PREFIX, node.id)
-            const heartbeatActive = yield* redis.hasNodeHeartbeat(nodeIdStr)
-            return {
-              id: nodeIdStr,
-              status: node.status,
-              heartbeat_active: heartbeatActive,
-            }
-          }),
-        ),
-      )
+  // Nodes with heartbeat status
+  const nodeRows = yield* nodeRepo.list()
+  const nodes = yield* Effect.all(
+    nodeRows.map((node) =>
+      Effect.gen(function* () {
+        const nodeIdStr = bytesToId(NODE_PREFIX, node.id)
+        const heartbeatActive = yield* redis.hasNodeHeartbeat(nodeIdStr)
+        return {
+          id: nodeIdStr,
+          status: node.status,
+          heartbeat_active: heartbeatActive,
+        }
+      }),
+    ),
+  )
 
-      // Drain state
-      const draining = yield* shutdown.isDraining
+  // Drain state
+  const draining = yield* shutdown.isDraining
 
-      return HttpServerResponse.unsafeJson({
-        api: {
-          status: 'ok',
-          uptime_seconds: Math.floor(process.uptime()),
-          version: '0.0.1',
-          draining,
-        },
-        redis: {
-          status: redisOk ? 'ok' : 'fail',
+  return HttpServerResponse.unsafeJson({
+    api: {
+      status: 'ok',
+      uptime_seconds: Math.floor(process.uptime()),
+      version: '0.0.1',
+      draining,
+    },
+    redis: {
+      status: redisOk ? 'ok' : 'fail',
+    },
+    workers: workers.map((w) => ({
+      name: w.name,
+      active: w.active,
+      ttl_ms: w.ttlMs,
+    })),
+    nodes,
+  })
+}).pipe(
+  Effect.catchAllDefect((defect) =>
+    Effect.gen(function* () {
+      const message = defect instanceof Error ? defect.message : String(defect)
+      const stack = defect instanceof Error ? defect.stack : undefined
+      yield* Effect.logError(`Admin status defect: ${message}`, stack ? { stack } : {})
+      return HttpServerResponse.unsafeJson(
+        {
+          api: { status: 'error', uptime_seconds: Math.floor(process.uptime()), version: '0.0.1', draining: false },
+          redis: { status: 'unknown' },
+          workers: [],
+          nodes: [],
+          error: message,
         },
-        workers: workers.map((w) => ({
-          name: w.name,
-          active: w.active,
-          ttl_ms: w.ttlMs,
-        })),
-        nodes,
-      })
+        { status: 500 },
+      )
     }),
   ),
 )
+
+export const AdminStatusRouter = HttpRouter.empty.pipe(
+  HttpRouter.get('/v1/admin/status', handler),
+)

packages/db/drizzle.config.ts

@@ -5,7 +5,7 @@ import { defineConfig } from 'drizzle-kit'
 config({ path: resolve(process.cwd(), '../../.env') })
 
 export default defineConfig({
-  schema: './src/schema/index.ts',
+  schema: './src/schema/*.ts',
   out: './drizzle',
   dialect: 'mysql',
   dbCredentials: {

packages/db/package.json

@@ -15,13 +15,13 @@
     "typecheck": "tsc --noEmit",
     "lint": "echo 'no lint configured yet'",
     "test": "bun test",
-    "db:generate": "tsx ./node_modules/.bin/drizzle-kit generate",
-    "db:push": "tsx ./node_modules/.bin/drizzle-kit push",
-    "db:migrate": "tsx ./node_modules/.bin/drizzle-kit migrate",
+    "db:generate": "bunx drizzle-kit generate",
+    "db:push": "bunx drizzle-kit push",
+    "db:migrate": "bunx drizzle-kit migrate",
     "db:migrate:run": "bun run src/migrate.ts",
     "db:seed": "bun run src/seed.ts",
     "db:seed:dev": "bun run src/seed.ts --dev",
-    "db:studio": "tsx ./node_modules/.bin/drizzle-kit studio"
+    "db:studio": "bunx drizzle-kit studio"
   },
   "dependencies": {
     "drizzle-orm": "^0.39.0",

patches/drizzle-kit@0.31.9.patch

@@ -1,12 +1,16 @@
-diff --git a/bin.cjs b/bin.cjs
-index 327fdfde1aac8ddf7a0db6dc357796757be8986a..f4908ec68633aa2f5388db46197fa466f1d9cbf4 100755
 --- a/bin.cjs
 +++ b/bin.cjs
-@@ -18404,6 +18404,7 @@ AND
-         const constraintValue = checkConstraintRow["CHECK_CLAUSE"];
-         const tableName = checkConstraintRow["TABLE_NAME"];
-         const tableInResult = result[tableName];
-+        if (!tableInResult) continue;
-         tableInResult.checkConstraint[constraintName] = {
-           name: constraintName,
-           value: constraintValue
+@@ -16797,6 +16797,13 @@
+       Module._resolveFilename = function(request, _parent) {
+         const isCoreModule = _module2.builtinModules.includes(request);
+         if (!isCoreModule) {
++          if (request.endsWith('.js')) {
++            const tsRequest = request.replace(/\.js$/, '.ts');
++            try {
++              const modifiedArguments2 = [tsRequest, ...[].slice.call(arguments, 1)];
++              return originalResolveFilename.apply(this, modifiedArguments2);
++            } catch (e) {}
++          }
+           const found = matchPath(request);
+           if (found) {
+             const modifiedArguments = [found, ...[].slice.call(arguments, 1)];