From 151d70ef4324d23ae7241537914e56c2bca8a4fa Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Fri, 2 Sep 2022 18:35:06 +0100
Subject: [PATCH] improvements to redis connector - multi line pipelines and
 lowercase commands

---
 packages/server/src/integrations/redis.ts     | 20 ++++++++++++++-----
 .../src/integrations/tests/redis.spec.js      | 19 ++++++++++++++++--
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/packages/server/src/integrations/redis.ts b/packages/server/src/integrations/redis.ts
index e8aa13560c..6764e20dca 100644
--- a/packages/server/src/integrations/redis.ts
+++ b/packages/server/src/integrations/redis.ts
@@ -132,12 +132,22 @@ module RedisModule {
 
     async command(query: { json: string }) {
       return this.redisContext(async () => {
-        const commands = query.json.trim().split(" ")
-        const pipeline = this.client.pipeline([commands])
-        const result = await pipeline.exec()
-        return {
-          response: result[0][1],
+        // commands split line by line
+        const commands = query.json.trim().split("\n")
+        let pipelineCommands = []
+
+        // process each command separately
+        for (let command of commands) {
+          const tokenised = command.trim().split(" ")
+          // Pipeline only accepts lower case commands
+          tokenised[0] = tokenised[0].toLowerCase()
+          pipelineCommands.push(tokenised)
         }
+
+        const pipeline = this.client.pipeline(pipelineCommands)
+        const result = await pipeline.exec()
+
+        return result.map((output: string | string[]) => output[1])
       })
     }
   }
diff --git a/packages/server/src/integrations/tests/redis.spec.js b/packages/server/src/integrations/tests/redis.spec.js
index 219584bdb2..2483ccc382 100644
--- a/packages/server/src/integrations/tests/redis.spec.js
+++ b/packages/server/src/integrations/tests/redis.spec.js
@@ -46,7 +46,7 @@ describe("Redis Integration", () => {
     expect(await config.redis.get(body.key)).toEqual(null)
   })
 
-  it("calls the command method with the correct params", async () => {
+  it("calls the pipeline method with the correct params", async () => {
     const body = {
       json: "KEYS *"
     }
@@ -55,6 +55,21 @@ describe("Redis Integration", () => {
     config.integration.client.pipeline = jest.fn(() => ({ exec: jest.fn(() => [[]]) }))
 
     await config.integration.command(body)
-    expect(config.integration.client.pipeline).toHaveBeenCalledWith([["KEYS", "*"]])
+    expect(config.integration.client.pipeline).toHaveBeenCalledWith([["keys", "*"]])
+  })
+
+  it("calls the pipeline method with several separated commands when there are newlines", async () => {
+    const body = {
+      json: 'SET foo "bar"\nGET foo'
+    }
+
+    // ioredis-mock doesn't support pipelines
+    config.integration.client.pipeline = jest.fn(() => ({ exec: jest.fn(() => [[]]) }))
+
+    await config.integration.command(body)
+    expect(config.integration.client.pipeline).toHaveBeenCalledWith([
+      ["set", 'foo', '"bar"'],
+      ["get", 'foo']
+    ])
   })
 })
\ No newline at end of file