Fix redisUrl and redisOptions handling

owncloud · Jul 20, 2023 · a083001 · a083001
1 parent 1c727d2
commit a083001
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/packages/@uppy/companion/src/companion.js b/packages/@uppy/companion/src/companion.js
@@ -84,8 +84,8 @@ module.exports.app = (optionsArg = {}) => {
   logger.setMaskables(getMaskableSecrets(options))
 
   // create singleton redis client
-  if (options.redisOptions) {
-    redis.client(options.redisOptions)
+  if (options.redisUrl || options.redisOptions) {
+    redis.client(options.redisUrl, options.redisOptions)
   }
   const emitter = createEmitter(options.redisOptions, options.redisPubSubScope)
 

diff --git a/packages/@uppy/companion/src/server/redis.js b/packages/@uppy/companion/src/server/redis.js
@@ -8,22 +8,27 @@ let redisClient
  * A Singleton module that provides a single redis client through out
  * the lifetime of the server
  *
- * @param {Record<string, any>} [opts] node-redis client options
+ * @param {string} [redisUrl] ioredis url
+ * @param {Record<string, any>} [redisOptions] ioredis client options
  */
-function createClient (opts) {
+function createClient (redisUrl, redisOptions) {
   if (!redisClient) {
-    redisClient = new Redis(opts)
+    if (redisUrl) {
+      redisClient = new Redis(redisUrl, redisOptions)
+    } else {
+      redisClient = new Redis(redisOptions)
+    }
 
     redisClient.on('error', err => logger.error('redis error', err.toString()))
   }
 
   return redisClient
 }
 
-module.exports.client = (redisOptions) => {
-  if (!redisOptions) {
+module.exports.client = (redisUrl, redisOptions) => {
+  if (!redisUrl && !redisOptions) {
     return redisClient
   }
 
-  return createClient(redisOptions)
+  return createClient(redisUrl, redisOptions)
 }
diff --git a/packages/@uppy/companion/src/standalone/helper.js b/packages/@uppy/companion/src/standalone/helper.js
@@ -153,18 +153,20 @@ const getConfigFromEnv = () => {
       ? parseInt(process.env.COMPANION_PERIODIC_PING_COUNT, 10) : undefined,
     filePath: process.env.COMPANION_DATADIR,
     redisPubSubScope: process.env.COMPANION_REDIS_PUBSUB_SCOPE,
+    redisUrl: process.env.COMPANION_REDIS_URL,
     // adding redisOptions to keep all companion options easily visible
     //  redisOptions refers to https://redis.github.io/ioredis/index.html#RedisOptions
     redisOptions: (() => {
       try {
+        if (!process.env.COMPANION_REDIS_OPTIONS) {
+          return undefined
+        }
         const obj = JSON.parse(process.env.COMPANION_REDIS_OPTIONS)
         return obj
       } catch (e) {
-        if (process.env.COMPANION_REDIS_OPTIONS) {
-          console.log('COMPANION_REDIS_OPTIONS parse error', e)
-        }
-        return process.env.COMPANION_REDIS_URL
+        console.log('COMPANION_REDIS_OPTIONS parse error', e)
       }
+      return undefined
     })(),
     sendSelfEndpoint: process.env.COMPANION_SELF_ENDPOINT,
     uploadUrls: uploadUrls ? uploadUrls.split(',') : null,

diff --git a/packages/@uppy/companion/src/standalone/index.js b/packages/@uppy/companion/src/standalone/index.js
@@ -109,8 +109,8 @@ module.exports = function server (inputCompanionOptions) {
     saveUninitialized: true,
   }
 
-  if (companionOptions.redisUrl) {
-    const redisClient = redis.client(companionOptions)
+  if (companionOptions.redisUrl || companionOptions.redisOptions) {
+    const redisClient = redis.client(companionOptions.redisUrl, companionOptions.redisOptions)
     // todo next major: change default prefix to something like "companion-session:" and possibly remove this option
     sessionOptions.store = new RedisStore({ client: redisClient, prefix: process.env.COMPANION_REDIS_EXPRESS_SESSION_PREFIX || 'sess:' })
   }