Skip to content
Draft
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
6 changes: 6 additions & 0 deletions .changeset/gold-eggs-sin.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@effect/platform-node": minor
"@effect/rpc": minor
---

feat: add Scope support as context for RPC Middleware
4 changes: 2 additions & 2 deletions packages/platform-node/test/fixtures/rpc-schemas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ const rpcCount = Metric.counter("rpc_middleware_count")
const TimingLive = Layer.succeed(
TimingMiddleware,
TimingMiddleware.of((options) =>
options.next.pipe(
Effect.addFinalizer((exit) => Effect.logInfo(exit)).pipe(Effect.zipRight(options.next.pipe(
Effect.tap(Metric.increment(rpcSuccesses)),
Effect.tapDefect(() => Metric.increment(rpcDefects)),
Effect.ensuring(Metric.increment(rpcCount))
)
)))
)
)

Expand Down
6 changes: 3 additions & 3 deletions packages/rpc/src/RpcMiddleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export interface RpcMiddleware<Provides, E> {
readonly rpc: Rpc.AnyWithProps
readonly payload: unknown
readonly headers: Headers
}): Effect.Effect<Provides, E>
}): Effect.Effect<Provides, E, Scope>
}

/**
Expand All @@ -46,8 +46,8 @@ export interface RpcMiddlewareWrap<Provides, E> {
readonly rpc: Rpc.AnyWithProps
readonly payload: unknown
readonly headers: Headers
readonly next: Effect.Effect<SuccessValue, E, Provides>
}): Effect.Effect<SuccessValue, E>
readonly next: Effect.Effect<SuccessValue, E, Provides | Scope>
}): Effect.Effect<SuccessValue, E, Scope>
}

/**
Expand Down
6 changes: 3 additions & 3 deletions packages/rpc/src/RpcServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ export const makeNoSerialization: <Rpcs extends Rpc.Any>(

let responded = false
let effect = Effect.uninterruptible(Effect.matchCauseEffect(
Effect.interruptible(applyMiddleware(
Effect.interruptible(Effect.scoped(applyMiddleware(
rpc,
context,
client.id,
Expand All @@ -255,7 +255,7 @@ export const makeNoSerialization: <Rpcs extends Rpc.Any>(
isStream
? streamEffect(client, request, streamOrEffect)
: streamOrEffect as Effect.Effect<any>
)),
))),
{
onSuccess: (value) => {
responded = true
Expand Down Expand Up @@ -414,7 +414,7 @@ const applyMiddleware = <A, E, R>(
clientId: number,
payload: A,
headers: Headers.Headers,
handler: Effect.Effect<A, E, R>
handler: Effect.Effect<A, E, R | Scope.Scope>
) => {
if (rpc.middlewares.size === 0) {
return handler
Expand Down