convert share backend to hono app

2025-12-21 01:34:22 +01:00 · 2025-07-29 16:39:48 -04:00
parent a129e122aa
commit 4a46144419
8 changed files with 202 additions and 238 deletions
--- a/bun.lock
+++ b/bun.lock
@@ -14,6 +14,7 @@
      "dependencies": {
        "@octokit/auth-app": "8.0.1",
        "@octokit/rest": "22.0.0",
+        "hono": "catalog:",
        "jose": "6.0.11",
      },
      "devDependencies": {
@@ -41,7 +42,7 @@
        "decimal.js": "10.5.0",
        "diff": "8.0.2",
        "gray-matter": "4.0.3",
-        "hono": "4.7.10",
+        "hono": "catalog:",
        "hono-openapi": "0.4.8",
        "isomorphic-git": "1.32.1",
        "open": "10.1.2",
@@ -133,6 +134,7 @@
  "catalog": {
    "@types/node": "22.13.9",
    "ai": "5.0.0-beta.21",
+    "hono": "4.7.10",
    "typescript": "5.8.2",
    "zod": "3.25.49",
  },
--- a/package.json
+++ b/package.json
@@ -15,10 +15,11 @@
      "packages/*"
    ],
    "catalog": {
-      "typescript": "5.8.2",
      "@types/node": "22.13.9",
-      "zod": "3.25.49",
-      "ai": "5.0.0-beta.21"
+      "ai": "5.0.0-beta.21",
+      "hono": "4.7.10",
+      "typescript": "5.8.2",
+      "zod": "3.25.49"
    }
  },
  "devDependencies": {
--- a/packages/function/package.json
+++ b/packages/function/package.json
@@ -12,6 +12,7 @@
  "dependencies": {
    "@octokit/auth-app": "8.0.1",
    "@octokit/rest": "22.0.0",
+    "hono": "catalog:",
    "jose": "6.0.11"
  }
 }
--- a/packages/function/src/api.ts
+++ b/packages/function/src/api.ts
@@ -1,3 +1,4 @@
+import { Hono } from "hono"
 import { DurableObject } from "cloudflare:workers"
 import { randomUUID } from "node:crypto"
 import { jwtVerify, createRemoteJWKSet } from "jose"
@@ -111,94 +112,66 @@ export class SyncServer extends DurableObject<Env> {
  }
 }

-export default {
-  async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
-    const url = new URL(request.url)
-    const splits = url.pathname.split("/")
-    const method = splits[1]
-
-    if (request.method === "GET" && method === "") {
-      return new Response("Hello, world!", {
-        headers: { "Content-Type": "text/plain" },
-      })
-    }
-
-    if (request.method === "POST" && method === "share_create") {
-      const body = await request.json<any>()
+export default new Hono<{ Bindings: Env }>()
+  .get("/", (c) => c.text("Hello, world!"))
+  .post("/share_create", async (c) => {
+    const body = await c.req.json<{ sessionID: string }>()
    const sessionID = body.sessionID
    const short = SyncServer.shortName(sessionID)
-      const id = env.SYNC_SERVER.idFromName(short)
-      const stub = env.SYNC_SERVER.get(id)
+    const id = c.env.SYNC_SERVER.idFromName(short)
+    const stub = c.env.SYNC_SERVER.get(id)
    const secret = await stub.share(sessionID)
-      return new Response(
-        JSON.stringify({
+    return c.json({
      secret,
-          url: `https://${env.WEB_DOMAIN}/s/${short}`,
-        }),
-        {
-          headers: { "Content-Type": "application/json" },
-        },
-      )
-    }
-
-    if (request.method === "POST" && method === "share_delete") {
-      const body = await request.json<any>()
+      url: `https://${c.env.WEB_DOMAIN}/s/${short}`,
+    })
+  })
+  .post("/share_delete", async (c) => {
+    const body = await c.req.json<{ sessionID: string; secret: string }>()
    const sessionID = body.sessionID
    const secret = body.secret
-      const id = env.SYNC_SERVER.idFromName(SyncServer.shortName(sessionID))
-      const stub = env.SYNC_SERVER.get(id)
+    const id = c.env.SYNC_SERVER.idFromName(SyncServer.shortName(sessionID))
+    const stub = c.env.SYNC_SERVER.get(id)
    await stub.assertSecret(secret)
    await stub.clear()
-      return new Response(JSON.stringify({}), {
-        headers: { "Content-Type": "application/json" },
+    return c.json({})
  })
-    }
-
-    if (request.method === "POST" && method === "share_delete_admin") {
-      const id = env.SYNC_SERVER.idFromName("oVF8Rsiv")
-      const stub = env.SYNC_SERVER.get(id)
+  .post("/share_delete_admin", async (c) => {
+    const id = c.env.SYNC_SERVER.idFromName("oVF8Rsiv")
+    const stub = c.env.SYNC_SERVER.get(id)
    await stub.clear()
-      return new Response(JSON.stringify({}), {
-        headers: { "Content-Type": "application/json" },
+    return c.json({})
  })
-    }
-
-    if (request.method === "POST" && method === "share_sync") {
-      const body = await request.json<{
+  .post("/share_sync", async (c) => {
+    const body = await c.req.json<{
      sessionID: string
      secret: string
      key: string
      content: any
    }>()
    const name = SyncServer.shortName(body.sessionID)
-      const id = env.SYNC_SERVER.idFromName(name)
-      const stub = env.SYNC_SERVER.get(id)
+    const id = c.env.SYNC_SERVER.idFromName(name)
+    const stub = c.env.SYNC_SERVER.get(id)
    await stub.assertSecret(body.secret)
    await stub.publish(body.key, body.content)
-      return new Response(JSON.stringify({}), {
-        headers: { "Content-Type": "application/json" },
+    return c.json({})
  })
-    }
-
-    if (request.method === "GET" && method === "share_poll") {
-      const upgradeHeader = request.headers.get("Upgrade")
+  .get("/share_poll", async (c) => {
+    const upgradeHeader = c.req.header("Upgrade")
    if (!upgradeHeader || upgradeHeader !== "websocket") {
-        return new Response("Error: Upgrade header is required", {
-          status: 426,
-        })
+      return c.text("Error: Upgrade header is required", { status: 426 })
    }
-      const id = url.searchParams.get("id")
+    const id = c.req.query("id")
    console.log("share_poll", id)
-      if (!id) return new Response("Error: Share ID is required", { status: 400 })
-      const stub = env.SYNC_SERVER.get(env.SYNC_SERVER.idFromName(id))
-      return stub.fetch(request)
-    }
-
-    if (request.method === "GET" && method === "share_data") {
-      const id = url.searchParams.get("id")
+    if (!id) return c.text("Error: Share ID is required", { status: 400 })
+    const stub = c.env.SYNC_SERVER.get(c.env.SYNC_SERVER.idFromName(id))
+    return stub.fetch(c.req.raw)
+  })
+  .get("/share_data", async (c) => {
+    const id = c.req.query("id")
    console.log("share_data", id)
-      if (!id) return new Response("Error: Share ID is required", { status: 400 })
-      const stub = env.SYNC_SERVER.get(env.SYNC_SERVER.idFromName(id))
+    if (!id) return c.text("Error: Share ID is required", { status: 400 })
+    const stub = c.env.SYNC_SERVER.get(c.env.SYNC_SERVER.idFromName(id))
    const data = await stub.getData()

    let info
@@ -221,33 +194,19 @@ export default {
      }
    })

-      return new Response(
-        JSON.stringify({
-          info,
-          messages,
-        }),
-        {
-          headers: { "Content-Type": "application/json" },
-        },
-      )
-    }
-
+    return c.json({ info, messages })
+  })
  /**
   * Used by the GitHub action to get GitHub installation access token given the OIDC token
   */
-    if (request.method === "POST" && method === "exchange_github_app_token") {
+  .post("/exchange_github_app_token", async (c) => {
    const EXPECTED_AUDIENCE = "opencode-github-action"
    const GITHUB_ISSUER = "https://token.actions.githubusercontent.com"
    const JWKS_URL = `${GITHUB_ISSUER}/.well-known/jwks`

    // get Authorization header
-      const authHeader = request.headers.get("Authorization")
-      const token = authHeader?.replace(/^Bearer /, "")
-      if (!token)
-        return new Response(JSON.stringify({ error: "Authorization header is required" }), {
-          status: 401,
-          headers: { "Content-Type": "application/json" },
-        })
+    const token = c.req.header("Authorization")?.replace(/^Bearer /, "")
+    if (!token) return c.json({ error: "Authorization header is required" }, { status: 401 })

    // verify token
    const JWKS = createRemoteJWKSet(new URL(JWKS_URL))
@@ -263,10 +222,7 @@ export default {
      repo = parts[1]
    } catch (err) {
      console.error("Token verification failed:", err)
-        return new Response(JSON.stringify({ error: "Invalid or expired token" }), {
-          status: 403,
-          headers: { "Content-Type": "application/json" },
-        })
+      return c.json({ error: "Invalid or expired token" }, { status: 403 })
    }

    // Create app JWT token
@@ -283,22 +239,19 @@ export default {
    // Get installation token
    const installationAuth = await auth({ type: "installation", installationId: installation.id })

-      return new Response(JSON.stringify({ token: installationAuth.token }), {
-        headers: { "Content-Type": "application/json" },
+    return c.json({ token: installationAuth.token })
  })
-    }
-
  /**
   * Used by the GitHub action to get GitHub installation access token given user PAT token (used when testing `opencode github run` locally)
   */
-    if (request.method === "POST" && method === "exchange_github_app_token_with_pat") {
-      const body = await request.json<any>()
+  .post("/exchange_github_app_token_with_pat", async (c) => {
+    const body = await c.req.json<{ owner: string; repo: string }>()
    const owner = body.owner
    const repo = body.repo

    try {
      // get Authorization header
-        const authHeader = request.headers.get("Authorization")
+      const authHeader = c.req.header("Authorization")
      const token = authHeader?.replace(/^Bearer /, "")
      if (!token) throw new Error("Authorization header is required")

@@ -322,28 +275,22 @@ export default {
      // Get installation token
      const installationAuth = await auth({ type: "installation", installationId: installation.id })

-        return new Response(JSON.stringify({ token: installationAuth.token }), {
-          headers: { "Content-Type": "application/json" },
-        })
+      return c.json({ token: installationAuth.token })
    } catch (e: any) {
      let error = e
      if (e instanceof Error) {
        error = e.message
      }

-        return new Response(JSON.stringify({ error }), {
-          status: 401,
-          headers: { "Content-Type": "application/json" },
+      return c.json({ error }, { status: 401 })
+    }
  })
-      }
-    }
-
  /**
   * Used by the opencode CLI to check if the GitHub app is installed
   */
-    if (request.method === "GET" && method === "get_github_app_installation") {
-      const owner = url.searchParams.get("owner")
-      const repo = url.searchParams.get("repo")
+  .get("/get_github_app_installation", async (c) => {
+    const owner = c.req.query("owner")
+    const repo = c.req.query("repo")

    const auth = createAppAuth({
      appId: Resource.GITHUB_APP_ID.value,
@@ -365,11 +312,6 @@ export default {
      }
    }

-      return new Response(JSON.stringify({ installation }), {
-        headers: { "Content-Type": "application/json" },
+    return c.json({ installation })
  })
-    }
-
-    return new Response("Not Found", { status: 404 })
-  },
-}
+  .all("*", (c) => c.text("Not Found"))
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -40,7 +40,7 @@
    "decimal.js": "10.5.0",
    "diff": "8.0.2",
    "gray-matter": "4.0.3",
-    "hono": "4.7.10",
+    "hono": "catalog:",
    "hono-openapi": "0.4.8",
    "isomorphic-git": "1.32.1",
    "open": "10.1.2",
--- a/packages/opencode/src/cli/cmd/github.ts
+++ b/packages/opencode/src/cli/cmd/github.ts
@@ -274,7 +274,7 @@ export const GithubInstallCommand = cmd({

        // Wait for installation
        s.message("Waiting for GitHub app to be installed")
-        const MAX_RETRIES = 60
+        const MAX_RETRIES = 120
        let retries = 0
        do {
          const installation = await getInstallation()
--- a/packages/sdk/sst-env.d.ts
+++ b/packages/sdk/sst-env.d.ts
@@ -0,0 +1,9 @@
+/* This file is auto-generated by SST. Do not edit. */
+/* tslint:disable */
+/* eslint-disable */
+/* deno-fmt-ignore-file */
+
+/// <reference path="../../sst-env.d.ts" />
+
+import "sst"
+export {}
--- a/sdks/vscode/sst-env.d.ts
+++ b/sdks/vscode/sst-env.d.ts
@@ -0,0 +1,9 @@
+/* This file is auto-generated by SST. Do not edit. */
+/* tslint:disable */
+/* eslint-disable */
+/* deno-fmt-ignore-file */
+
+/// <reference path="../../sst-env.d.ts" />
+
+import "sst"
+export {}