wip: cloud

cloud/app/src/context/auth.ts

@@ -18,12 +18,15 @@ export const getActor = async (): Promise<Actor.Info> => {
   "use server"
   const evt = getRequestEvent()
   if (!evt) throw new Error("No request event")
+  if (evt.locals.actor) return evt.locals.actor
+  evt.locals.actor = (async () => {
+    console.log("getActor")
     const url = new URL(evt.request.headers.has("x-server-id") ? evt.request.headers.get("referer")! : evt.request.url)
     const auth = await useAuthSession()
-  auth.data.account = auth.data.account ?? {}
     const splits = url.pathname.split("/").filter(Boolean)
     if (splits[0] !== "workspace") {
-    const current = auth.data.account[auth.data.current ?? ""]
+      const account = auth.data.account ?? {}
+      const current = account[auth.data.current ?? ""]
       if (current) {
         return {
           type: "account",
@@ -33,8 +36,8 @@ export const getActor = async (): Promise<Actor.Info> => {
           },
         }
       }
-    if (Object.keys(auth.data.account ?? {}).length > 0) {
+      if (Object.keys(account).length > 0) {
-      const current = Object.values(auth.data.account)[0]
+        const current = Object.values(account)[0]
         await auth.update((val) => ({
           ...val,
           current: current.id,
@@ -79,4 +82,6 @@ export const getActor = async (): Promise<Actor.Info> => {
       }
     }
     throw redirect("/auth/authorize")
+  })()
+  return evt.locals.actor
 }

cloud/app/src/context/auth.withActor.ts

@@ -1,5 +1,6 @@
 import { Actor } from "@opencode/cloud-core/actor.js"
 import { getActor } from "./auth"
+import { getRequestEvent } from "solid-js/web"
 
 export async function withActor<T>(fn: () => T) {
   const actor = await getActor()

cloud/app/src/routes/workspace/[id].tsx

@@ -42,12 +42,14 @@ const getBillingInfo = query(async () => {
   "use server"
   return withActor(async () => {
     const actor = Actor.assert("user")
+    const now = Date.now()
     const [user, billing, payments, usage] = await Promise.all([
       User.fromID(actor.properties.userID),
       Billing.get(),
       Billing.payments(),
       Billing.usages(),
     ])
+    console.log("duration", Date.now() - now)
     return { user, billing, payments, usage }
   })
 }, "billingInfo")
@@ -67,9 +69,7 @@ export default function () {
   /////////////////
   // Keys section
   /////////////////
-  const keys = createAsync(() => listKeys(), {
+  const keys = createAsync(() => listKeys())
-    deferStream: true,
-  })
   const createKeyAction = useAction(createKey)
   const removeKeyAction = useAction(removeKey)
   const createKeySubmission = useSubmission(createKey)