Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

fix: use ctx.waitUntil for WebSocket broadcasts (#40)

Gener25a4da365d36
diff --git a/src/web/src/app/api/daemon/register/route.ts b/src/web/src/app/api/daemon/register/route.ts
index 49d466e03..73657d815 100644
--- a/src/web/src/app/api/daemon/register/route.ts
+++ b/src/web/src/app/api/daemon/register/route.ts
@@ -45,7 +45,7 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {
const deviceInfo = deviceName.trim();
const metadata: Record<string, unknown> = {
version: rt.version || "",
- cli_version: cliVersion,
+ ...(cliVersion ? { cli_version: cliVersion } : {}),
};
const result = await queries.runtime.upsertAgentRuntime(db, {
diff --git a/src/web/src/lib/broadcast.ts b/src/web/src/lib/broadcast.ts
index 11efd0f8a..298d60adf 100644
--- a/src/web/src/lib/broadcast.ts
+++ b/src/web/src/lib/broadcast.ts
@@ -4,19 +4,18 @@ import { DEV_WS_DO_URL, createLogger } from "@alook/shared"
const log = createLogger({ service: "broadcast" })
-export async function broadcastToUser(userId: string, message: WsMessage) {
- const body = JSON.stringify(message)
- const url = `/broadcast/user/${userId}`
-
- // In dev, service bindings from OpenNext don't route to ws-do.
- // Try service binding first, fall back to direct HTTP.
+async function sendBroadcast(url: string, body: string, label: Record<string, string>) {
try {
- const { env } = getCloudflareContext()
+ const { env, ctx } = getCloudflareContext()
const wsEnv = env as Env
- await wsEnv.WS_DO_WORKER.fetch(`http://internal${url}`, {
+ const promise = wsEnv.WS_DO_WORKER.fetch(`http://internal${url}`, {
method: "POST",
body,
- })
+ }).then(
+ () => {},
+ (err) => log.warn("broadcast service-binding failed", { ...label, err: String(err) }),
+ )
+ ctx.waitUntil(promise)
} catch {
const res = await fetch(`${DEV_WS_DO_URL}${url}`, {
method: "POST",
@@ -24,30 +23,23 @@ export async function broadcastToUser(userId: string, message: WsMessage) {
body,
})
if (!res.ok) {
- log.warn("broadcast fallback failed", { userId, status: res.status, type: message.type })
+ log.warn("broadcast fallback failed", { ...label, status: res.status })
}
}
}
-export async function broadcastToAgent(agentId: string, message: WsMessage) {
- const body = JSON.stringify(message)
- const url = `/broadcast/${agentId}`
+export async function broadcastToUser(userId: string, message: WsMessage) {
+ await sendBroadcast(
+ `/broadcast/user/${userId}`,
+ JSON.stringify(message),
+ { userId, type: message.type },
+ )
+}
- try {
- const { env } = getCloudflareContext()
- const wsEnv = env as Env
- await wsEnv.WS_DO_WORKER.fetch(`http://internal${url}`, {
- method: "POST",
- body,
- })
- } catch {
- const res = await fetch(`${DEV_WS_DO_URL}${url}`, {
- method: "POST",
- headers: { "Content-Type": "application/json" },
- body,
- })
- if (!res.ok) {
- log.warn("broadcast fallback failed", { agentId, status: res.status, type: message.type })
- }
- }
+export async function broadcastToAgent(agentId: string, message: WsMessage) {
+ await sendBroadcast(
+ `/broadcast/${agentId}`,
+ JSON.stringify(message),
+ { agentId, type: message.type },
+ )
}
diff --git a/src/web/src/test/helpers/seed.ts b/src/web/src/test/helpers/seed.ts
index 3fcd75dd5..4f233f383 100644
--- a/src/web/src/test/helpers/seed.ts
+++ b/src/web/src/test/helpers/seed.ts
@@ -42,7 +42,7 @@ export function seedTestData(): TestSeed {
sql(`INSERT INTO workspace (id, name, slug, created_at, updated_at) VALUES ('${workspaceId}', 'Test Workspace', '${slug}', '${now}', '${now}')`)
sql(`INSERT INTO member (id, workspace_id, user_id, role, created_at) VALUES ('${memberId}', '${workspaceId}', '${userId}', 'owner', '${now}')`)
sql(`INSERT INTO machine (daemon_id, workspace_id, device_info, last_seen_at, created_at, updated_at) VALUES ('${daemonId}', '${workspaceId}', 'test-device', '${now}', '${now}', '${now}')`)
- sql(`INSERT INTO agent_runtime (id, workspace_id, daemon_id, name, runtime_mode, provider, status, device_info, created_at, updated_at) VALUES ('${runtimeId}', '${workspaceId}', '${daemonId}', 'Test Runtime', 'local', 'claude', 'online', 'test-device', '${now}', '${now}')`)
+ sql(`INSERT INTO agent_runtime (id, workspace_id, daemon_id, runtime_mode, provider, status, device_info, created_at, updated_at) VALUES ('${runtimeId}', '${workspaceId}', '${daemonId}', 'local', 'claude', 'online', 'test-device', '${now}', '${now}')`)
sql(`INSERT INTO agent (id, workspace_id, name, runtime_id, email_handle, owner_id, created_at, updated_at) VALUES ('${agentId}', '${workspaceId}', 'Test Agent', '${runtimeId}', '${emailHandle}', '${userId}', '${now}', '${now}')`)
sql(`INSERT INTO machine_token (id, user_id, workspace_id, token, name, status, created_at) VALUES ('${machineTokenId}', '${userId}', '${workspaceId}', '${rawToken}', 'test-token', 'active', '${now}')`)
sql(`INSERT INTO agent_whitelist (id, agent_id, workspace_id, email, created_at) VALUES ('${whitelistId}', '${agentId}', '${workspaceId}', '${userId}@test.local', '${now}')`)