Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/fifty-clocks-search.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@effect/experimental": minor
---

Change from `ioredis` package to `redis` package for redis persistence layer.
6 changes: 3 additions & 3 deletions packages/experimental/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@
"peerDependencies": {
"@effect/platform": "workspace:^",
"effect": "workspace:^",
"ioredis": "^5",
"redis": "^5",
"lmdb": "^3"
},
"peerDependenciesMeta": {
"ioredis": {
"redis": {
"optional": true
},
"lmdb": {
Expand All @@ -66,7 +66,7 @@
"@cloudflare/workers-types": "^4.20250515.0",
"@effect/platform-node": "workspace:^",
"@types/ws": "^8.18.1",
"ioredis": "^5.6.1",
"redis": "^5.8.3",
"lmdb": "^3.3.0"
}
}
28 changes: 15 additions & 13 deletions packages/experimental/src/Persistence/Redis.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ import * as Effect from "effect/Effect"
import { identity } from "effect/Function"
import * as Layer from "effect/Layer"
import * as Option from "effect/Option"
import type { RedisOptions } from "ioredis"
import { Redis } from "ioredis"
import type { RedisClientOptions } from "redis"
import { createClient } from "redis"
import * as Persistence from "../Persistence.js"

/**
* @since 1.0.0
* @category constructors
*/
export const make = Effect.fnUntraced(function*(options: RedisOptions) {
export const make = Effect.fnUntraced(function*(options: RedisClientOptions) {
const redis = yield* Effect.acquireRelease(
Effect.sync(() => new Redis(options)),
(redis) => Effect.promise(() => redis.quit())
Effect.promise(() => createClient(options).connect()),
(redis) => Effect.sync(() => redis.destroy())
)
return Persistence.BackingPersistence.of({
[Persistence.BackingPersistenceTypeId]: Persistence.BackingPersistenceTypeId,
Expand Down Expand Up @@ -48,7 +48,7 @@ export const make = Effect.fnUntraced(function*(options: RedisOptions) {
getMany: (keys) =>
Effect.flatMap(
Effect.tryPromise({
try: () => redis.mget(keys.map(prefixed)),
try: () => redis.mGet(keys.map(prefixed)),
catch: (error) => Persistence.PersistenceBackingError.make("getMany", error)
}),
Effect.forEach(parse("getMany"))
Expand All @@ -63,7 +63,9 @@ export const make = Effect.fnUntraced(function*(options: RedisOptions) {
try: (value) =>
ttl._tag === "None"
? redis.set(prefixed(key), value)
: redis.set(prefixed(key), value, "PX", Duration.toMillis(ttl.value)),
: redis.set(prefixed(key), value, {
expiration: { type: "PX", value: Duration.toMillis(ttl.value) }
}),
catch: (error) => Persistence.PersistenceBackingError.make("set", error)
}
),
Expand All @@ -79,9 +81,9 @@ export const make = Effect.fnUntraced(function*(options: RedisOptions) {
}
}
const multi = redis.multi()
multi.mset(sets)
multi.mSet(Object.fromEntries(sets))
for (const [key, ms] of expires) {
multi.pexpire(key, ms)
multi.pExpire(key, ms)
}
return Effect.tryPromise({
try: () => multi.exec(),
Expand All @@ -107,7 +109,7 @@ export const make = Effect.fnUntraced(function*(options: RedisOptions) {
* @category layers
*/
export const layer = (
options: RedisOptions
options: RedisClientOptions
): Layer.Layer<Persistence.BackingPersistence> =>
Layer.scoped(
Persistence.BackingPersistence,
Expand All @@ -119,7 +121,7 @@ export const layer = (
* @category layers
*/
export const layerConfig = (
options: Config.Config.Wrap<RedisOptions>
options: Config.Config.Wrap<RedisClientOptions>
): Layer.Layer<Persistence.BackingPersistence, ConfigError> =>
Layer.scoped(
Persistence.BackingPersistence,
Expand All @@ -131,7 +133,7 @@ export const layerConfig = (
* @category layers
*/
export const layerResult = (
options: RedisOptions
options: RedisClientOptions
): Layer.Layer<Persistence.ResultPersistence> =>
Persistence.layerResult.pipe(
Layer.provide(layer(options))
Expand All @@ -142,7 +144,7 @@ export const layerResult = (
* @category layers
*/
export const layerResultConfig = (
options: Config.Config.Wrap<RedisOptions>
options: Config.Config.Wrap<RedisClientOptions>
): Layer.Layer<Persistence.ResultPersistence, ConfigError> =>
Persistence.layerResult.pipe(
Layer.provide(layerConfig(options))
Expand Down
112 changes: 60 additions & 52 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.