diff --git a/Caddyfile b/Caddyfile index a05ecbf..383c320 100644 --- a/Caddyfile +++ b/Caddyfile @@ -1,44 +1,40 @@ -{ - auto_https off -} - (reverse_proxy_headers) { header_up Host {upstream_hostport} } -localhost:80 { +http://* { @websockets { header Connection *Upgrade* header Upgrade websocket } handle @websockets { - reverse_proxy server { + reverse_proxy http://server { import reverse_proxy_headers } } handle /rpc* { - reverse_proxy server { + reverse_proxy http://server { import reverse_proxy_headers } } handle { - reverse_proxy webui { + reverse_proxy http://webui { import reverse_proxy_headers } } } -server.localhost:80 { - reverse_proxy server { +http://server.* { + reverse_proxy http://server { import reverse_proxy_headers } } -webui.localhost:80 { - reverse_proxy webui { +http://webui.* { + reverse_proxy http://webui { import reverse_proxy_headers } } diff --git a/docker-compose.yml b/docker-compose.yml index d8db475..e1b7c67 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,6 +23,8 @@ services: <<: *service-base container_name: server image: oven/bun:latest + ports: + - 8069:80 volumes: - *volume-app working_dir: /app/packages/server diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts index f2a2fb0..9feb87a 100644 --- a/packages/server/src/index.ts +++ b/packages/server/src/index.ts @@ -51,6 +51,15 @@ const main = Effect.gen(function*() { const mode = yield* ServerConfig.mode const todos = yield* TodoRepository + // yield* Effect.fork( + // todos.todos.changes.pipe( + // Stream.runForEach(values => Effect.gen(function*() { + // yield* Console.log("Todos updated:") + // yield* Console.log(values) + // })) + // ) + // ) + yield* todos.add(new Todo({ id: Option.none(), order: 0, diff --git a/packages/webui/src/trpc/TRPCClientProvider.tsx b/packages/webui/src/trpc/TRPCClientProvider.tsx index eae835d..8c682ce 100644 --- a/packages/webui/src/trpc/TRPCClientProvider.tsx +++ b/packages/webui/src/trpc/TRPCClientProvider.tsx @@ -12,7 +12,7 @@ export interface TRPCClientProviderProps { export function TRPCClientProvider({ children }: TRPCClientProviderProps) { const [queryClient] = useState(new QueryClient()) - const [wsClient] = useState(createWSClient({ url: "/" })) + const [wsClient] = useState(createWSClient({ url: "ws://localhost:8069" })) const [trpcClient] = useState(trpc.createClient({ links: [