|
1 | 1 | import Redlock from 'redlock' |
2 | 2 | import redisPubSub from 'sharedb-redis-pubsub' |
3 | | -import { getRedis, Redis, RedisMock } from './getRedis.js' |
| 3 | +import { getIoRedis, Redis, RedisMock } from './getIoRedis.js' |
| 4 | +import { getNodeRedis } from './getNodeRedis.js' |
4 | 5 |
|
5 | 6 | const ENABLE_REDIS = !process.env.NO_REDIS |
| 7 | +const ENABLE_REDIS_PUBSUB = ENABLE_REDIS && !!(process.env.REDIS_URL || process.env.REDIS_OPTS) |
6 | 8 |
|
7 | 9 | const RedisClient = ENABLE_REDIS ? Redis : RedisMock |
8 | | -export { RedisClient as Redis, getRedis, getRedisOptions, generatePrefix } |
| 10 | +export { |
| 11 | + RedisClient as Redis, |
| 12 | + getRedisOptions, |
| 13 | + generatePrefix |
| 14 | +} |
| 15 | +export const getRedis = getIoRedis |
9 | 16 | export const prefix = generatePrefix({ |
10 | 17 | mongoUrl: process.env.MONGO_URL, |
11 | 18 | baseUrl: process.env.BASE_URL |
12 | 19 | }) |
13 | | -export const redis = getRedis(getRedisOptions()) |
14 | | -export const redisObserver = getRedis(getRedisOptions()) |
| 20 | +export const redis = getIoRedis(getRedisOptions()) |
15 | 21 |
|
16 | | -export const pubsub = redisPubSub({ |
17 | | - client: redis, |
18 | | - observer: redisObserver, |
19 | | - prefix |
20 | | -}) |
| 22 | +// Teamplay exposes ioredis for the rest of the backend ecosystem |
| 23 | +// (BullMQ, Redlock, mocks), but sharedb-redis-pubsub@5 expects node-redis. |
| 24 | +// We therefore create separate node-redis clients only for ShareDB pubsub. |
| 25 | +export const pubsub = ENABLE_REDIS_PUBSUB |
| 26 | + ? redisPubSub({ |
| 27 | + client: getNodeRedis(getRedisOptions({ addPrefix: false })), |
| 28 | + observer: getNodeRedis(getRedisOptions({ addPrefix: false })), |
| 29 | + prefix |
| 30 | + }) |
| 31 | + : undefined |
21 | 32 |
|
22 | 33 | export const redlock = getRedlock(redis) |
23 | 34 |
|
|
0 commit comments