Improve http error codes (#3186)

packages/opencode/src/storage/storage.ts

@@ -5,12 +5,21 @@ import { Global } from "../global"
 import { lazy } from "../util/lazy"
 import { Lock } from "../util/lock"
 import { $ } from "bun"
+import { NamedError } from "@/util/error"
+import z from "zod"
 
 export namespace Storage {
   const log = Log.create({ service: "storage" })
 
   type Migration = (dir: string) => Promise<void>
 
+  export const NotFoundError = NamedError.create(
+    "NotFoundError",
+    z.object({
+      message: z.string(),
+    }),
+  )
+
   const MIGRATIONS: Migration[] = [
     async (dir) => {
       const project = path.resolve(dir, "../project")
@@ -131,31 +140,51 @@ export namespace Storage {
   export async function remove(key: string[]) {
     const dir = await state().then((x) => x.dir)
     const target = path.join(dir, ...key) + ".json"
-    await fs.unlink(target).catch(() => {})
+    return withErrorHandling(async () => {
+      await fs.unlink(target).catch(() => {})
+    })
   }
 
   export async function read<T>(key: string[]) {
     const dir = await state().then((x) => x.dir)
     const target = path.join(dir, ...key) + ".json"
-    using _ = await Lock.read(target)
-    return Bun.file(target).json() as Promise<T>
+    return withErrorHandling(async () => {
+      using _ = await Lock.read(target)
+      return Bun.file(target).json() as Promise<T>
+    })
   }
 
   export async function update<T>(key: string[], fn: (draft: T) => void) {
     const dir = await state().then((x) => x.dir)
     const target = path.join(dir, ...key) + ".json"
-    using _ = await Lock.write("storage")
-    const content = await Bun.file(target).json()
-    fn(content)
-    await Bun.write(target, JSON.stringify(content, null, 2))
-    return content as T
+    return withErrorHandling(async () => {
+      using _ = await Lock.write("storage")
+      const content = await Bun.file(target).json()
+      fn(content)
+      await Bun.write(target, JSON.stringify(content, null, 2))
+      return content as T
+    })
   }
 
   export async function write<T>(key: string[], content: T) {
     const dir = await state().then((x) => x.dir)
     const target = path.join(dir, ...key) + ".json"
-    using _ = await Lock.write("storage")
-    await Bun.write(target, JSON.stringify(content, null, 2))
+    return withErrorHandling(async () => {
+      using _ = await Lock.write("storage")
+      await Bun.write(target, JSON.stringify(content, null, 2))
+    })
+  }
+
+  async function withErrorHandling<T>(body: () => Promise<T>) {
+    return body().catch((e) => {
+      if (!(e instanceof Error))
+        throw e
+      const errnoException = e as NodeJS.ErrnoException
+      if (errnoException.code === "ENOENT") {
+        throw new NotFoundError({ message: `Resource not found: ${errnoException.path}` })
+      }
+      throw e
+    })
   }
 
   const glob = new Bun.Glob("**/*")