Add image_ref column and improve API handlers

Author: richiemcilroy

apps/admin/src/app/api/simulate/sandbox/route.ts

@@ -1,20 +1,6 @@
 import { NextResponse } from 'next/server'
-import type { ProfileName } from '@sandchest/contract'
 import { createClient } from '@/lib/simulate-sdk'
 
-function sdkErrorStatus(err: unknown): number {
-  if (typeof err === 'object' && err !== null && 'status' in err) {
-    const s = (err as { status: number }).status
-    if (s >= 400 && s < 600) return s
-  }
-  return 500
-}
-
-function sdkErrorMessage(err: unknown): string {
-  if (err instanceof Error) return err.message
-  return 'Unknown error'
-}
-
 export async function POST(request: Request) {
   try {
     const body = (await request.json()) as {
@@ -25,24 +11,49 @@ export async function POST(request: Request) {
       ttlSeconds?: number | undefined
     }
 
-    const client = createClient(body.apiKey, body.baseUrl)
-    const sandbox = await client.create({
-      image: body.image || undefined,
-      profile: (body.profile as ProfileName) || undefined,
-      ttlSeconds: body.ttlSeconds || undefined,
-      waitReady: false,
+    const baseUrl = body.baseUrl.replace(/\/$/, '')
+    const apiBody: Record<string, unknown> = {
+      profile: body.profile || 'small',
+      ttl_seconds: body.ttlSeconds || 3600,
+    }
+    if (body.image) {
+      apiBody.image = body.image
+    }
+
+    const res = await fetch(`${baseUrl}/v1/sandboxes`, {
+      method: 'POST',
+      headers: {
+        'Authorization': `Bearer ${body.apiKey}`,
+        'Content-Type': 'application/json',
+        'Accept': 'application/json',
+      },
+      body: JSON.stringify(apiBody),
     })
 
+    const text = await res.text()
+    let data: Record<string, unknown>
+    try {
+      data = JSON.parse(text) as Record<string, unknown>
+    } catch {
+      return NextResponse.json(
+        { error: `API returned ${res.status}: ${text.slice(0, 500)}` },
+        { status: res.status || 500 },
+      )
+    }
+
+    if (!res.ok) {
+      const msg = (data.message as string) || (data.error as string) || `API ${res.status}`
+      return NextResponse.json({ error: msg }, { status: res.status })
+    }
+
     return NextResponse.json({
-      id: sandbox.id,
-      status: sandbox.status,
-      replayUrl: sandbox.replayUrl,
+      id: data.sandbox_id,
+      status: data.status,
+      replayUrl: data.replay_url,
     })
   } catch (err) {
-    return NextResponse.json(
-      { error: sdkErrorMessage(err) },
-      { status: sdkErrorStatus(err) },
-    )
+    const message = err instanceof Error ? err.message : 'Unknown error'
+    return NextResponse.json({ error: message }, { status: 500 })
   }
 }
 
@@ -60,9 +71,7 @@ export async function DELETE(request: Request) {
 
     return NextResponse.json({ ok: true })
   } catch (err) {
-    return NextResponse.json(
-      { error: sdkErrorMessage(err) },
-      { status: sdkErrorStatus(err) },
-    )
+    const message = err instanceof Error ? err.message : 'Unknown error'
+    return NextResponse.json({ error: message }, { status: 500 })
   }
 }

apps/api/src/index.ts

@@ -1,10 +1,11 @@
-import { HttpServer } from '@effect/platform'
+import { HttpMiddleware, HttpServer } from '@effect/platform'
 import { NodeHttpServer, NodeRuntime } from '@effect/platform-node'
 import { Duration, Effect, Layer } from 'effect'
 import { createServer } from 'node:http'
 import { createDatabase } from '@sandchest/db/client'
 import { loadEnv } from './env.js'
 import { ApiRouter } from './server.js'
+import { formatApiError } from './errors.js'
 import { withAuth, withRequestId } from './middleware.js'
 import { withConnectionDrain } from './middleware/connection-drain.js'
 import { withRateLimit } from './middleware/rate-limit.js'
@@ -37,8 +38,18 @@ const { PORT, DATABASE_URL, REDIS_URL, REDIS_FAMILY, DRAIN_TIMEOUT_MS, SANDCHEST
 
 const db = createDatabase(DATABASE_URL)
 
+/** Catches Effect defects (unexpected errors) and returns a proper JSON 500 response. */
+const withDefectHandler = HttpMiddleware.make((app) =>
+  app.pipe(
+    Effect.catchAllDefect(() =>
+      Effect.succeed(formatApiError(new Error('internal defect'))),
+    ),
+  ),
+)
+
 // Production pipeline: connection drain is outermost so it gates all requests
 const AppLive = ApiRouter.pipe(
+  withDefectHandler,
   withConnectionDrain,
   withRateLimit,
   withAuth,

packages/db/drizzle/0002_majestic_carnage.sql

@@ -0,0 +1 @@
+ALTER TABLE `sandboxes` ADD `image_ref` varchar(1024) DEFAULT '' NOT NULL;