Refactoring
This commit is contained in:
@@ -1,4 +0,0 @@
|
|||||||
import * as WebRpcTest from "./WebRpcTest"
|
|
||||||
|
|
||||||
|
|
||||||
export class WebRpc extends WebRpcTest.WebRpcTest {}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
import { RpcSerialization } from "@effect/rpc"
|
|
||||||
|
|
||||||
|
|
||||||
export const WebRpcSerializationDevelopment = RpcSerialization.layerJson
|
|
||||||
export const WebRpcSerializationProduction = RpcSerialization.layerNdjson
|
|
||||||
@@ -1,3 +1,10 @@
|
|||||||
export * as WebRpc from "./WebRpc"
|
import { RpcSerialization } from "@effect/rpc"
|
||||||
export * as WebRpcSerialization from "./WebRpcSerialization"
|
import * as WebRpcTest from "./WebRpcTest"
|
||||||
|
|
||||||
|
|
||||||
|
export class WebRpc extends WebRpcTest.WebRpcTest {}
|
||||||
|
|
||||||
|
export const WebRpcSerializationDevelopment = RpcSerialization.layerJson
|
||||||
|
export const WebRpcSerializationProduction = RpcSerialization.layerNdjson
|
||||||
|
|
||||||
export * as WebRpcTest from "./WebRpcTest"
|
export * as WebRpcTest from "./WebRpcTest"
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { FileSystem, HttpMiddleware, HttpRouter, HttpServer, HttpServerRequest, HttpServerResponse, Path } from "@effect/platform"
|
import { FileSystem, HttpMiddleware, HttpRouter, HttpServer, HttpServerRequest, HttpServerResponse, Path } from "@effect/platform"
|
||||||
import { RpcServer } from "@effect/rpc"
|
import { RpcServer } from "@effect/rpc"
|
||||||
import { CommonConfig } from "@website/common/config"
|
import { CommonConfig } from "@website/common/config"
|
||||||
import { WebRpc, WebRpcSerialization } from "@website/common/webrpc"
|
import { WebRpc, WebRpcSerializationDevelopment, WebRpcSerializationProduction } from "@website/common/webrpc"
|
||||||
import { Duration, Effect, flow, Layer } from "effect"
|
import { Duration, Effect, flow, Layer } from "effect"
|
||||||
import { WebRpcLive } from "./webrpc"
|
import { WebRpcLive } from "./webrpc"
|
||||||
|
|
||||||
@@ -10,10 +10,10 @@ const router = HttpRouter.empty
|
|||||||
|
|
||||||
const makeWebRpcRoute = Effect.all([
|
const makeWebRpcRoute = Effect.all([
|
||||||
CommonConfig.webRpcHttpPath,
|
CommonConfig.webRpcHttpPath,
|
||||||
RpcServer.toHttpApp(WebRpc.WebRpc),
|
RpcServer.toHttpApp(WebRpc),
|
||||||
]).pipe(
|
]).pipe(
|
||||||
Effect.map(([path, app]) => HttpRouter.mountApp(path, app)),
|
Effect.map(([path, app]) => HttpRouter.mountApp(path, app)),
|
||||||
Effect.provide(WebRpcLive.WebRpcLive),
|
Effect.provide(WebRpcLive),
|
||||||
)
|
)
|
||||||
|
|
||||||
const makeProductionWebappMiddleware = Effect.gen(function*() {
|
const makeProductionWebappMiddleware = Effect.gen(function*() {
|
||||||
@@ -38,7 +38,7 @@ const makeProductionWebappMiddleware = Effect.gen(function*() {
|
|||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
export const HttpAppDevelopment = Effect.provide(makeWebRpcRoute, WebRpcSerialization.WebRpcSerializationDevelopment).pipe(
|
export const HttpAppDevelopment = Effect.provide(makeWebRpcRoute, WebRpcSerializationDevelopment).pipe(
|
||||||
Effect.map(serveWebRpc => router.pipe(
|
Effect.map(serveWebRpc => router.pipe(
|
||||||
serveWebRpc,
|
serveWebRpc,
|
||||||
HttpServer.serve(flow(
|
HttpServer.serve(flow(
|
||||||
@@ -52,7 +52,7 @@ export const HttpAppDevelopment = Effect.provide(makeWebRpcRoute, WebRpcSerializ
|
|||||||
)
|
)
|
||||||
|
|
||||||
export const HttpAppProduction = Effect.all([
|
export const HttpAppProduction = Effect.all([
|
||||||
Effect.provide(makeWebRpcRoute, WebRpcSerialization.WebRpcSerializationProduction),
|
Effect.provide(makeWebRpcRoute, WebRpcSerializationProduction),
|
||||||
makeProductionWebappMiddleware,
|
makeProductionWebappMiddleware,
|
||||||
]).pipe(
|
]).pipe(
|
||||||
Effect.map(([serveWebRpc, serveProductionWebapp]) => router.pipe(
|
Effect.map(([serveWebRpc, serveProductionWebapp]) => router.pipe(
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
import { Layer } from "effect"
|
|
||||||
import * as WebRpcTestLive from "./WebRpcTestLive"
|
|
||||||
import type { WebRpc } from "@website/common/webrpc"
|
|
||||||
|
|
||||||
|
|
||||||
export const WebRpcLive = Layer.mergeAll(
|
|
||||||
WebRpcTestLive.WebRpcTestLive,
|
|
||||||
) satisfies ReturnType<typeof WebRpc.WebRpc.toLayer>
|
|
||||||
@@ -1,2 +1,10 @@
|
|||||||
export * as WebRpcLive from "./WebRpcLive"
|
import type { WebRpc } from "@website/common/webrpc"
|
||||||
|
import { Layer } from "effect"
|
||||||
|
import * as WebRpcTestLive from "./WebRpcTestLive"
|
||||||
|
|
||||||
|
|
||||||
|
export const WebRpcLive = Layer.mergeAll(
|
||||||
|
WebRpcTestLive.WebRpcTestLive,
|
||||||
|
) satisfies ReturnType<typeof WebRpc.toLayer>
|
||||||
|
|
||||||
export * as WebRpcTestLive from "./WebRpcTestLive"
|
export * as WebRpcTestLive from "./WebRpcTestLive"
|
||||||
|
|||||||
Reference in New Issue
Block a user