Context transaction

packages/server/src/rpc/RPCRoute.ts

@@ -3,6 +3,7 @@ import { Effect, Layer } from "effect"
 import { rpcHTTPRoot } from "../config"
 import { ExpressApp } from "../http/ExpressApp"
 import { TRPCContextCreator } from "../trpc/TRPCContextCreator"
+import { contextCreatorExpressAdapter } from "../trpc/adapters"
 import { RPCRouter } from "./RPCRouter"
 
 
@@ -13,7 +14,7 @@ export module RPCRoute {
         app.use(yield* rpcHTTPRoot,
             createExpressMiddleware({
                 router:         yield* RPCRouter,
-                createContext:  yield* TRPCContextCreator,
+                createContext:  contextCreatorExpressAdapter(yield* TRPCContextCreator),
             }),
         )
     }))

packages/server/src/rpc/RPCWebSocketHandler.ts

@@ -2,6 +2,7 @@ import { applyWSSHandler } from "@trpc/server/adapters/ws"
 import { Effect, Layer } from "effect"
 import { WebSocketServer } from "../http/WebSocketServer"
 import { TRPCContextCreator } from "../trpc/TRPCContextCreator"
+import { contextCreatorWSSAdapter } from "../trpc/adapters"
 import { RPCRouter } from "./RPCRouter"
 
 
@@ -11,7 +12,7 @@ export module RPCWebSocketHandler {
             return applyWSSHandler({
                 wss:            yield* WebSocketServer,
                 router:         yield* RPCRouter,
-                createContext:  yield* TRPCContextCreator,
+                createContext:  contextCreatorWSSAdapter(yield* TRPCContextCreator),
             })
         }),
 

packages/server/src/trpc/TRPCContext.ts

@@ -1,14 +1,13 @@
 import type { TRPCError } from "@trpc/server"
 import { Data, type Effect, type Runtime } from "effect"
 import type { RuntimeFiber } from "effect/Fiber"
-import type { Request } from "express"
+import express from "express"
 import type { IncomingMessage } from "node:http"
+import { WebSocket } from "ws"
 import type { Services } from "../Services"
 
 
 export interface TRPCContext {
-    req: TRPCContextRequest
-
     runtime: Runtime.Runtime<Services>
 
     run: <A, E>(
@@ -20,12 +19,21 @@ export interface TRPCContext {
         effect:    Effect.Effect<A, E, Services>,
         options?:  Runtime.RunForkOptions,
     ) => RuntimeFiber<A, TRPCError>
+
+    transaction: TRPCContextTransaction
 }
 
 
-export type TRPCContextRequest = Data.TaggedEnum<{
+export type TRPCContextTransaction = Data.TaggedEnum<{
-    Express:    { readonly req: Request }
+    Express: {
-    WebSocket:  { readonly req: IncomingMessage }
+        readonly req: express.Request
+        readonly res: express.Response
+    }
+
+    WebSocket: {
+        readonly req: IncomingMessage
+        readonly res: WebSocket
+    }
 }>
 
-export const TRPCContextRequestEnum = Data.taggedEnum<TRPCContextRequest>()
+export const TRPCContextTransactionEnum = Data.taggedEnum<TRPCContextTransaction>()

packages/server/src/trpc/TRPCContextCreator.ts

@@ -1,19 +1,14 @@
 import { TRPCError } from "@trpc/server"
-import type { CreateExpressContextOptions } from "@trpc/server/adapters/express"
-import type { CreateWSSContextFnOptions } from "@trpc/server/adapters/ws"
 import { Context, Effect, Layer, Runtime } from "effect"
 import type { Services } from "../Services"
-import type { TRPCContext } from "./TRPCContext"
+import type { TRPCContext, TRPCContextTransaction } from "./TRPCContext"
 
 
 /**
  * Provides a function that instantiates a fresh context for each tRPC procedure call
  */
 export class TRPCContextCreator extends Context.Tag("TRPCContextCreator")<TRPCContextCreator,
-    (opts:
+    (transaction: TRPCContextTransaction) => TRPCContext
-        | CreateExpressContextOptions
-        | CreateWSSContextFnOptions
-    ) => TRPCContext
 >() {}
 
 export module TRPCContextCreator {
@@ -36,12 +31,11 @@ export module TRPCContextCreator {
             options,
         )
 
-        return ({ req }) => ({
+        return transaction => ({
-
-
             runtime,
             run,
             fork,
+            transaction,
         })
     }))
 }

packages/server/src/trpc/adapters.ts

@@ -0,0 +1,18 @@
+import { type CreateExpressContextOptions } from "@trpc/server/adapters/express"
+import type { CreateWSSContextFnOptions } from "@trpc/server/adapters/ws"
+import type { Context } from "effect"
+import { TRPCContextTransactionEnum } from "./TRPCContext"
+import { TRPCContextCreator } from "./TRPCContextCreator"
+
+
+export const contextCreatorExpressAdapter = (
+    createContext: Context.Tag.Service<typeof TRPCContextCreator>
+) =>
+    (opts: CreateExpressContextOptions) =>
+        createContext(TRPCContextTransactionEnum.Express(opts))
+
+export const contextCreatorWSSAdapter = (
+    createContext: Context.Tag.Service<typeof TRPCContextCreator>
+) =>
+    (opts: CreateWSSContextFnOptions) =>
+        createContext(TRPCContextTransactionEnum.WebSocket(opts))

packages/server/src/trpc/handlers.ts

@@ -1,11 +0,0 @@
-import type { AnyRouter } from "@trpc/server"
-import { createExpressMiddleware } from "@trpc/server/adapters/express"
-import type { NodeHTTPHandlerOptions } from "@trpc/server/adapters/node-http"
-import express from "express"
-
-
-export const createExpressHandler = <TRouter extends AnyRouter>(
-    opts: NodeHTTPHandlerOptions<TRouter, express.Request, express.Response>,
-) => {
-    const t = createExpressMiddleware(opts)
-}