Extract a Redis layer

PREreview · Dec 4, 2023 · 8a6751a · 8a6751a
1 parent 8c40b8d
commit 8a6751a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/Redis.ts b/src/Redis.ts
@@ -1,5 +1,5 @@
-import { Context, Data, Effect } from 'effect'
-import type IoRedis from 'ioredis'
+import { Context, Data, Effect, Layer } from 'effect'
+import IoRedis from 'ioredis'
 
 export type Redis = IoRedis.Redis
 
@@ -9,6 +9,11 @@ export class RedisError extends Data.TaggedError('RedisError')<{
   readonly error: unknown
 }> {}
 
+export const layer: Layer.Layer<never, never, Redis> = Layer.scoped(
+  Redis,
+  Effect.acquireRelease(Effect.succeed(new IoRedis.Redis()), redis => Effect.sync(() => redis.disconnect())),
+)
+
 export const ping = (): Effect.Effect<Redis, RedisError, 'PONG'> =>
   Effect.gen(function* (_) {
     const redis = yield* _(Redis)

diff --git a/src/index.ts b/src/index.ts
@@ -1,7 +1,6 @@
 import { HttpClient, HttpServer, Runtime } from '@effect/platform-node'
 import { Schema } from '@effect/schema'
 import { Effect, Layer } from 'effect'
-import IoRedis from 'ioredis'
 import { createServer } from 'node:http'
 import * as CoarNotify from './CoarNotify.js'
 import { ConfigLive } from './Config.js'
@@ -112,13 +111,10 @@ const serve = HttpServer.router.empty.pipe(
 
 const ServerLive = HttpServer.server.layer(() => createServer(), { port: 3000 })
 
-const RedisLive = Layer.effect(
-  Redis.Redis,
-  Effect.acquireRelease(Effect.succeed(new IoRedis.Redis()), redis => Effect.sync(() => redis.disconnect())),
-)
+const RedisLive = Redis.layer
 
 const HttpLive = Layer.scopedDiscard(serve).pipe(
   Layer.provide(Layer.mergeAll(ConfigLive, HttpClient.client.layer, ServerLive, RedisLive)),
 )
 
-Layer.launch(HttpLive).pipe(Effect.tapErrorCause(Effect.logError), Effect.scoped, Runtime.runMain)
+Layer.launch(HttpLive).pipe(Effect.tapErrorCause(Effect.logError), Runtime.runMain)