Skip to content

fix(host): satisfy dsh 0.2.1 mandatory Peer (assertPeerLive / prepareInvocation) #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
qihaonanren wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(host): satisfy dsh 0.2.1 mandatory Peer (assertPeerLive / prepareInvocation) #135

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 32 additions & 2 deletions packages/browser/bridge-browser/src/remote-host-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ export interface TypertGatewayLike {
readonly method: string
readonly args: Readonly<Record<string, unknown>>
readonly signal?: AbortSignal
/** dsh 0.2.1: mandatory Peer the call speaks for (0.2.0 and older ignore it). */
readonly peer?: unknown
}): Promise<unknown>
}

Expand All @@ -56,6 +58,22 @@ const EMPTY_WIRE_UPLINK: AsyncIterable<unknown> = {
async *[Symbol.asyncIterator]() { /* no uplink items */ },
}

/**
* A never-disposed owner Peer for Host-side calls.
*
* dsh 0.2.1 makes the Peer mandatory: `assertPeerLive(peer)` reads
* `peer.signal`, `requireInteractions(peer)` demands
* `peer.interactions === 'answer'`, and `openRemoteEvents` reads
* `peer.principal.kind` to decide whether forwarded events may be answered.
* Passing `undefined` throws `Cannot read properties of undefined
* (reading 'signal')` right after `hello.ok` (WS close 1011).
*/
const HOST_PEER = {
signal: new AbortController().signal,
principal: { kind: 'owner' as const },
interactions: 'answer' as const,
}

/**
* Open a Host wire stream against either dsh 0.2 or the legacy three-arg form.
*
Expand All @@ -70,7 +88,7 @@ function openWireStream(gateway: TypertGatewayLike, endpoint: string, payload: u
if (open.length === 3) {
return open(endpoint, payload, signal)
}
return open(endpoint, payload, EMPTY_WIRE_UPLINK, undefined, signal)
return open(endpoint, payload, EMPTY_WIRE_UPLINK, HOST_PEER, signal)
}

/** Structural subset of dsh 0.2's Host Connection service. */
Expand Down Expand Up @@ -107,7 +125,19 @@ export function createRemoteHostApi(
gateway: TypertGatewayLike,
connection: HostConnectionLike,
): BrowserHostApi {
return new RemoteHostApi(gateway, connection)
// dsh 0.2.1 validates `request.peer` inside prepareInvocation, while every call
// site in this module passes only { namespace, method, args, signal }. Wrap the
// gateway once instead of editing every call site.
// `Object.create` keeps the prototype chain: TypertGatewayService methods live
// on the prototype, so spreading into an object literal would drop them.
const withPeer = Object.create(gateway) as TypertGatewayLike
Object.defineProperty(withPeer, 'invoke', {
value: (request: Parameters<TypertGatewayLike['invoke']>[0]) =>
gateway.invoke({ ...request, peer: HOST_PEER }),
configurable: true,
writable: true,
})
return new RemoteHostApi(withPeer, connection)
}

class RemoteHostApi implements BrowserHostApi {
Expand Down