Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion packages/opencode/src/util/rpc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export function listen(rpc: Definition) {
postMessage(JSON.stringify({ type: "rpc.result", result, id: parsed.id }))
}
}
postMessage(JSON.stringify({ type: "rpc.ready" }))
}

export function emit(event: string, data: unknown) {
Expand All @@ -23,8 +24,13 @@ export function client<T extends Definition>(target: {
const pending = new Map<number, (result: any) => void>()
const listeners = new Map<string, Set<(data: any) => void>>()
let id = 0
// Bun drops messages that reach a worker before its module (which may have a
// top-level await) has set onmessage, so requests wait for the worker to say it listens.
let markReady!: () => void
const ready = new Promise<void>((resolve) => (markReady = resolve))
target.onmessage = async (evt) => {
const parsed = JSON.parse(evt.data)
if (parsed.type === "rpc.ready") markReady()
if (parsed.type === "rpc.result") {
const resolve = pending.get(parsed.id)
if (resolve) {
Expand All @@ -46,7 +52,7 @@ export function client<T extends Definition>(target: {
const requestId = id++
return new Promise((resolve) => {
pending.set(requestId, resolve)
target.postMessage(JSON.stringify({ type: "rpc.request", method, input, id: requestId }))
ready.then(() => target.postMessage(JSON.stringify({ type: "rpc.request", method, input, id: requestId })))
})
},
on<Data>(event: string, handler: (data: Data) => void) {
Expand Down
8 changes: 8 additions & 0 deletions packages/opencode/test/fixture/rpc-worker.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { Rpc } from "../../src/util/rpc"

Rpc.emit("started", undefined)
await new Promise((resolve) => setTimeout(resolve, 300))

Rpc.listen({
echo: (input: string) => input,
})
15 changes: 15 additions & 0 deletions packages/opencode/test/util/rpc.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { describe, expect, test } from "bun:test"
import { Rpc } from "../../src/util/rpc"

describe("util.rpc", () => {
test("delivers calls made while the worker is still in its top-level await", async () => {
const worker = new Worker(new URL("../fixture/rpc-worker.ts", import.meta.url).href)
try {
const client = Rpc.client<{ echo: (input: string) => string }>(worker)
await new Promise<void>((resolve) => client.on("started", () => resolve()))
expect(await client.call("echo", "hello")).toBe("hello")
} finally {
worker.terminate()
}
})
})
Loading