wip

Effect-TS · Feb 4, 2025 · 0b76e34 · 0b76e34
1 parent 5fe4d5e
commit 0b76e34
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/packages/rpc/src/RpcGroup.ts b/packages/rpc/src/RpcGroup.ts
@@ -30,7 +30,7 @@ export type TypeId = typeof TypeId
  * @since 1.0.0
  * @category groups
  */
-export interface RpcGroup<Rpcs extends Rpc.Any> extends Pipeable {
+export interface RpcGroup<in out Rpcs extends Rpc.Any> extends Pipeable {
   new(_: never): {}
 
   readonly [TypeId]: TypeId
@@ -66,11 +66,7 @@ export interface RpcGroup<Rpcs extends Rpc.Any> extends Pipeable {
   >(
     build:
       | Handlers
-      | Effect.Effect<
-        Handlers,
-        EX,
-        RX
-      >
+      | Effect.Effect<Handlers, EX, RX>
   ): Layer.Layer<
     Rpc.ToHandler<Rpcs>,
     EX,

diff --git a/packages/rpc/src/RpcServer.ts b/packages/rpc/src/RpcServer.ts
@@ -343,7 +343,7 @@ export const make: <Rpcs extends Rpc.Any>(
 ) => Effect.Effect<
   never,
   never,
-  Scope.Scope | Protocol | Rpc.ToHandler<Rpcs> | Rpc.Middleware<Rpcs>
+  Protocol | Rpc.ToHandler<Rpcs> | Rpc.Middleware<Rpcs>
 > = Effect.fnUntraced(function*<Rpcs extends Rpc.Any>(
   group: RpcGroup.RpcGroup<Rpcs>,
   options?: {
@@ -584,7 +584,7 @@ export const make: <Rpcs extends Rpc.Any>(
       module: "RpcServer"
     })
   )
-})
+}, Effect.scoped)
 
 /**
  * @since 1.0.0