From 31f11d2389defe029ae946a3d2a574115bb56ced Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Sat, 9 Mar 2024 23:06:00 +0100 Subject: [PATCH] Correct usages of `stop` to conform to new semantics --- packages/service/src/index.ts | 4 ++-- packages/ws-relay/src/index.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/service/src/index.ts b/packages/service/src/index.ts index 85cf389..71ceecd 100644 --- a/packages/service/src/index.ts +++ b/packages/service/src/index.ts @@ -22,8 +22,8 @@ export function service(handler: (args: AnyValue) => void, options?: ServiceOpti packetWriter: (bs: Uint8Array) => process.stdout.write(bs), setup(r: Relay.Relay) { process.stdin.on('data', bs => facet.turn(() => r.accept(new Uint8Array(bs)))); - process.stdin.on('close', () => facet.turn(() => { stop {} })); - process.stdin.on('end', () => facet.turn(() => { stop {} })); + process.stdin.on('close', () => facet.turn(() => { stop facet; })); + process.stdin.on('end', () => facet.turn(() => { stop facet; })); }, initialRef: Turn.ref(assertionFacetObserver(handler)), }, options ?? {})); diff --git a/packages/ws-relay/src/index.ts b/packages/ws-relay/src/index.ts index b1e8e20..10bbf5a 100644 --- a/packages/ws-relay/src/index.ts +++ b/packages/ws-relay/src/index.ts @@ -64,7 +64,7 @@ export function boot(ds = Dataspace.global, debug: boolean = false, WebSocketCon message(a0: Assertion): void { const a = G.toTransportControl(a0); if (!a) return; - stop {} // ForceDisconnect + stop facet; // ForceDisconnect }, }; let final = false; @@ -76,7 +76,7 @@ export function boot(ds = Dataspace.global, debug: boolean = false, WebSocketCon console.log('closing', addr.url); ws.close(); } - ws.onclose = () => facet.turn(() => { stop {} }); + ws.onclose = () => facet.turn(() => { stop facet; }); ws.onerror = () => facet.turn(() => Turn.active.crash(new Error("WebSocket error"))); const relay = new Relay.Relay({ @@ -109,7 +109,7 @@ export function boot(ds = Dataspace.global, debug: boolean = false, WebSocketCon "resolved": G.Resolved.Rejected(G.Rejected(detail)), }); } - setTimeout(() => facet.turn(() => { stop {} }), 10000); + setTimeout(() => facet.turn(() => { stop facet; }), 10000); } try { const ws = new (WebSocketConstructor ?? WebSocket)(addr.url);