Handle SDK errors, optional image, and defects

Author: richiemcilroy

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

@@ -2,6 +2,19 @@ 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 {
@@ -17,6 +30,7 @@ export async function POST(request: Request) {
       image: body.image || undefined,
       profile: (body.profile as ProfileName) || undefined,
       ttlSeconds: body.ttlSeconds || undefined,
+      waitReady: false,
     })
 
     return NextResponse.json({
@@ -25,8 +39,10 @@ export async function POST(request: Request) {
       replayUrl: sandbox.replayUrl,
     })
   } catch (err) {
-    const message = err instanceof Error ? err.message : 'Unknown error'
-    return NextResponse.json({ error: message }, { status: 500 })
+    return NextResponse.json(
+      { error: sdkErrorMessage(err) },
+      { status: sdkErrorStatus(err) },
+    )
   }
 }
 
@@ -44,7 +60,9 @@ export async function DELETE(request: Request) {
 
     return NextResponse.json({ ok: true })
   } catch (err) {
-    const message = err instanceof Error ? err.message : 'Unknown error'
-    return NextResponse.json({ error: message }, { status: 500 })
+    return NextResponse.json(
+      { error: sdkErrorMessage(err) },
+      { status: sdkErrorStatus(err) },
+    )
   }
 }

apps/admin/src/app/simulate/page.tsx

@@ -53,7 +53,7 @@ export default function SimulatePage() {
     setActiveSandboxId(null)
   }
 
-  async function handleCreateSandbox(opts: { image: string; profile: string; ttlSeconds: number }) {
+  async function handleCreateSandbox(opts: { image: string | undefined; profile: string; ttlSeconds: number }) {
     const result = await createSandbox.mutateAsync({
       ...creds,
       image: opts.image,

apps/admin/src/components/simulate/SandboxInventory.tsx

@@ -13,7 +13,7 @@ interface SandboxInventoryProps {
   sandboxes: TrackedSandbox[]
   activeSandboxId: string | null
   onSelect: (id: string) => void
-  onCreateSandbox: (opts: { image: string; profile: string; ttlSeconds: number }) => void
+  onCreateSandbox: (opts: { image: string | undefined; profile: string; ttlSeconds: number }) => void
   onStopSandbox: (id: string) => void
   onDestroySandbox: (id: string) => void
   onForkSandbox: (id: string) => void
@@ -40,7 +40,7 @@ export default function SandboxInventory({
   function handleCreate(e: React.FormEvent) {
     e.preventDefault()
     onCreateSandbox({
-      image: image || 'default',
+      image: image || undefined,
       profile,
       ttlSeconds: parseInt(ttl, 10) || 3600,
     })
@@ -68,7 +68,7 @@ export default function SandboxInventory({
             className="form-input"
             value={image}
             onChange={(e) => setImage(e.target.value)}
-            placeholder="Image (default)"
+            placeholder="Image (ubuntu-22.04)"
             style={{ fontSize: '0.75rem', padding: '0.25rem 0.5rem' }}
           />
           <select

apps/api/src/server.ts

@@ -1,4 +1,4 @@
-import { HttpRouter, HttpServer, HttpServerRequest, HttpServerResponse } from '@effect/platform'
+import { HttpMiddleware, HttpRouter, HttpServer, HttpServerRequest, HttpServerResponse } from '@effect/platform'
 import { Effect } from 'effect'
 import { auth } from './auth.js'
 import { formatApiError } from './errors.js'
@@ -42,4 +42,13 @@ export const ApiRouter = HttpRouter.empty.pipe(
   HttpRouter.catchAll((error) => Effect.succeed(formatApiError(error))),
 )
 
-export const AppLive = ApiRouter.pipe(withConnectionDrain, withRateLimit, withRequestId, withSecurityHeaders, HttpServer.serve())
+/** 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'))),
+    ),
+  ),
+)
+
+export const AppLive = ApiRouter.pipe(withDefectHandler, withConnectionDrain, withRateLimit, withRequestId, withSecurityHeaders, HttpServer.serve())