refactor(backend, server): move 'getUniversalRedis' to helper and exp…

…ort it, export Redis (#9)

packages/backend/index.js

@@ -7,7 +7,7 @@ import initValidateSchema from './features/validateSchema.js'
 import initServerAggregate from './features/serverAggregate.js'
 import initAccessControl from './features/accessControl.js'
 
-export { redis, redlock, Redlock } from './redis/index.js'
+export { redis, redlock, Redlock, getRedis, Redis } from './redis/index.js'
 export { db, mongo, mongoClient, createMongoIndex, sqlite } from './db/index.js'
 
 const usersConnectionCounter = {}

packages/backend/redis/getRedis.js

@@ -0,0 +1,49 @@
+import { readFileSync } from 'fs'
+import Redis from 'ioredis'
+import RedisMock from 'ioredis-mock'
+
+export { Redis, RedisMock }
+
+export function getRedis ({ enableRedis = true, redisOpts, redisUrl, keyPrefix }) {
+  if (enableRedis) {
+    if (typeof redisOpts === 'string') {
+      redisOpts = JSON.parse(redisOpts)
+      let tls = {}
+
+      if (redisOpts.key) {
+        tls = {
+          key: readFileSync(redisOpts.key),
+          cert: readFileSync(redisOpts.cert),
+          ca: readFileSync(redisOpts.ca)
+        }
+      }
+
+      const options = {
+        sentinels: redisOpts.sentinels,
+        sslPort: redisOpts.ssl_port || '6380',
+        tls,
+        name: 'mymaster',
+        db: redisOpts.db || 0,
+        password: redisOpts.password
+      }
+
+      _maybeAddKeyPrefixToOptions(options, keyPrefix)
+
+      return new Redis(options)
+    } else if (redisUrl) {
+      const options = {}
+      _maybeAddKeyPrefixToOptions(options, keyPrefix)
+
+      return new Redis(redisUrl, options)
+    }
+  }
+
+  const options = {}
+  _maybeAddKeyPrefixToOptions(options, keyPrefix)
+
+  return new RedisMock(options)
+}
+
+function _maybeAddKeyPrefixToOptions (options, keyPrefix) {
+  if (keyPrefix) options.keyPrefix = keyPrefix
+}

packages/backend/redis/index.js

@@ -1,21 +1,24 @@
-import { readFileSync } from 'fs'
-import Redis from 'ioredis'
-import RedisMock from 'ioredis-mock'
 import Redlock from 'redlock'
 import redisPubSub from 'sharedb-redis-pubsub'
+import { getRedis, Redis, RedisMock } from './getRedis.js'
 
-export const {
-  redis,
-  redisObserver
-} = getUniversalRedis({
-  disableRedis: process.env.NO_REDIS,
+const enableRedis = !process.env.NO_REDIS
+
+const getRedisOptions = {
+  enableRedis,
   redisOpts: process.env.REDIS_OPTS,
   redisUrl: process.env.REDIS_URL,
   keyPrefix: generatePrefix({
     mongoUrl: process.env.MONGO_URL,
     baseUrl: process.env.BASE_URL
   })
-})
+}
+
+const RedisClient = enableRedis ? Redis : RedisMock
+export { RedisClient as Redis }
+export { getRedis }
+export const redis = getRedis(getRedisOptions)
+export const redisObserver = getRedis(getRedisOptions)
 
 export const pubsub = redisPubSub({
   client: redis,
@@ -26,47 +29,6 @@ export const redlock = getRedlock(redis)
 
 export { Redlock }
 
-function getUniversalRedis ({ disableRedis, redisOpts, redisUrl, keyPrefix }) {
-  if (!disableRedis) {
-    if (typeof redisOpts === 'string') {
-      redisOpts = JSON.parse(redisOpts)
-      let tls = {}
-
-      if (redisOpts.key) {
-        tls = {
-          key: readFileSync(redisOpts.key),
-          cert: readFileSync(redisOpts.cert),
-          ca: readFileSync(redisOpts.ca)
-        }
-      }
-
-      const options = {
-        sentinels: redisOpts.sentinels,
-        sslPort: redisOpts.ssl_port || '6380',
-        tls,
-        name: 'mymaster',
-        db: redisOpts.db || 0,
-        password: redisOpts.password,
-        keyPrefix
-      }
-
-      return {
-        redis: new Redis(options),
-        redisObserver: new Redis(options)
-      }
-    } else if (redisUrl) {
-      return {
-        redis: new Redis(redisUrl, { keyPrefix }),
-        redisObserver: new Redis(redisUrl, { keyPrefix })
-      }
-    }
-  }
-  return {
-    redis: new RedisMock({ keyPrefix }),
-    redisObserver: new RedisMock({ keyPrefix })
-  }
-}
-
 function getRedlock (redis) {
   return new Redlock([redis], {
     driftFactor: 0.01,

packages/teamplay/server.js

@@ -4,7 +4,7 @@ import { connection, setConnection, setFetchOnly, setPublicOnly } from './orm/co
 export { default as ShareDB } from 'sharedb'
 export {
   default as createBackend,
-  mongo, mongoClient, createMongoIndex, redis, redlock, sqlite
+  mongo, mongoClient, createMongoIndex, redis, redlock, sqlite, getRedis, Redis
 } from '@teamplay/backend'
 
 export function initConnection (backend, {