From e6aabf65b157f1b255755d2266a1fbb74036f809 Mon Sep 17 00:00:00 2001
From: Nick Cooper <nick@not.fun>
Date: Sun, 23 Oct 2022 19:07:18 -0400
Subject: [PATCH 1/3] Add missing typing for
 xautoclaim/xautoclaimBuffer/xreadgroup/xreadgroupBuffer

---
 lib/utils/RedisCommander.ts | 292 ++++++++++++++++++++++++++++++++----
 1 file changed, 261 insertions(+), 31 deletions(-)

diff --git a/lib/utils/RedisCommander.ts b/lib/utils/RedisCommander.ts
index 49388d8ed..7e4d0c5a0 100644
--- a/lib/utils/RedisCommander.ts
+++ b/lib/utils/RedisCommander.ts
@@ -8547,8 +8547,8 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
     consumer: string | Buffer,
     minIdleTime: string | Buffer | number,
     start: string | Buffer | number,
-    callback?: Callback<unknown[]>
-  ): Result<unknown[], Context>;
+    callback?: Callback<[id: string, messages: [id: string, fields: string[]][]][]>
+  ): Result<[id: string, messages: [id: string, fields: string[]][]][], Context>;
   xautoclaim(
     key: RedisKey,
     group: string | Buffer,
@@ -8556,8 +8556,8 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
     minIdleTime: string | Buffer | number,
     start: string | Buffer | number,
     justid: "JUSTID",
-    callback?: Callback<unknown[]>
-  ): Result<unknown[], Context>;
+    callback?: Callback<[id: string, messages: [id: string, fields: string[]][]][]>
+  ): Result<[id: string, messages: [id: string, fields: string[]][]][], Context>;
   xautoclaim(
     key: RedisKey,
     group: string | Buffer,
@@ -8566,8 +8566,8 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
     start: string | Buffer | number,
     countToken: "COUNT",
     count: number | string,
-    callback?: Callback<unknown[]>
-  ): Result<unknown[], Context>;
+    callback?: Callback<[id: string, messages: [id: string, fields: string[]][]][]>
+  ): Result<[id: string, messages: [id: string, fields: string[]][]][], Context>;
   xautoclaim(
     key: RedisKey,
     group: string | Buffer,
@@ -8577,8 +8577,46 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
     countToken: "COUNT",
     count: number | string,
     justid: "JUSTID",
-    callback?: Callback<unknown[]>
-  ): Result<unknown[], Context>;
+    callback?: Callback<[id: string, messages: [id: string, fields: string[]][]][]>
+  ): Result<[id: string, messages: [id: string, fields: string[]][]], Context>;
+  xautoclaimBuffer(
+    key: RedisKey,
+    group: string | Buffer,
+    consumer: string | Buffer,
+    minIdleTime: string | Buffer | number,
+    start: string | Buffer | number,
+    callback?: Callback<[id: Buffer, messages: [id: Buffer, fields: Buffer[]][]]>
+  ): Result<[id: Buffer, messages: [id: Buffer, fields: Buffer[]][]], Context>;
+  xautoclaimBuffer(
+    key: RedisKey,
+    group: string | Buffer,
+    consumer: string | Buffer,
+    minIdleTime: string | Buffer | number,
+    start: string | Buffer | number,
+    justid: "JUSTID",
+    callback?: Callback<[id: Buffer, messages: [id: Buffer, fields: Buffer[]][]]>
+  ): Result<[id: Buffer, messages: [id: Buffer, fields: Buffer[]][]], Context>;
+  xautoclaimBuffer(
+    key: RedisKey,
+    group: string | Buffer,
+    consumer: string | Buffer,
+    minIdleTime: string | Buffer | number,
+    start: string | Buffer | number,
+    countToken: "COUNT",
+    count: number | string,
+    callback?: Callback<[id: Buffer, messages: [id: Buffer, fields: Buffer[]][]]>
+  ): Result<[id: Buffer, messages: [id: Buffer, fields: Buffer[]][]], Context>;
+  xautoclaimBuffer(
+    key: RedisKey,
+    group: string | Buffer,
+    consumer: string | Buffer,
+    minIdleTime: string | Buffer | number,
+    start: string | Buffer | number,
+    countToken: "COUNT",
+    count: number | string,
+    justid: "JUSTID",
+    callback?: Callback<[id: Buffer, messages: [id: Buffer, fields: Buffer[]][]]>
+  ): Result<[id: Buffer, messages: [id: Buffer, fields: Buffer[]][]], Context>;
 
   /**
    * Changes (or acquires) ownership of a message in a consumer group, as if the message was delivered to the specified consumer.
@@ -10003,9 +10041,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       consumer: string | Buffer,
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<unknown[]>
+      callback: Callback<[key: string, entries: [id: string, fields: string[]]][]>
     ]
-  ): Result<unknown[], Context>;
+  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10014,7 +10052,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<unknown[], Context>;
+  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10023,9 +10061,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       noack: "NOACK",
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<unknown[]>
+      callback: Callback<[key: string, entries: [id: string, fields: string[]]][]>
     ]
-  ): Result<unknown[], Context>;
+  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10035,7 +10073,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<unknown[], Context>;
+  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10045,9 +10083,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       milliseconds: number | string,
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<unknown[]>
+      callback: Callback<null | [key: string, entries: [id: string, fields: string[]]][]>
     ]
-  ): Result<unknown[], Context>;
+  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10058,7 +10096,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<unknown[], Context>;
+  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10069,9 +10107,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       noack: "NOACK",
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<unknown[]>
+      callback: Callback<null | [key: string, entries: [id: string, fields: string[]]][]>
     ]
-  ): Result<unknown[], Context>;
+  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10083,7 +10121,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<unknown[], Context>;
+  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10095,7 +10133,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       ...args: RedisValue[],
       callback: Callback<unknown[]>
     ]
-  ): Result<unknown[], Context>;
+  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10106,7 +10144,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<unknown[], Context>;
+  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10117,9 +10155,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       noack: "NOACK",
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<unknown[]>
+      callback: Callback<[key: string, entries: [id: string, fields: string[]]][]>
     ]
-  ): Result<unknown[], Context>;
+  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10131,7 +10169,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<unknown[], Context>;
+  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10143,9 +10181,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       milliseconds: number | string,
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<unknown[]>
+      callback: Callback<null | [key: string, entries: [id: string, fields: string[]]][]>
     ]
-  ): Result<unknown[], Context>;
+  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10158,7 +10196,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<unknown[], Context>;
+  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10171,9 +10209,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       noack: "NOACK",
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<unknown[]>
+      callback: Callback<null | [key: string, entries: [id: string, fields: string[]]][]>
     ]
-  ): Result<unknown[], Context>;
+  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10187,7 +10225,199 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<unknown[], Context>;
+  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
+  xreadgroupBuffer(
+    ...args: [
+      groupConsumerToken: "GROUP",
+      group: string | Buffer,
+      consumer: string | Buffer,
+      streamsToken: "STREAMS",
+      ...args: RedisValue[],
+      callback: Callback<[key: string, entries: [id: string, fields: string[]]][]>
+    ]
+  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
+  xreadgroupBuffer(
+    ...args: [
+      groupConsumerToken: "GROUP",
+      group: string | Buffer,
+      consumer: string | Buffer,
+      streamsToken: "STREAMS",
+      ...args: RedisValue[]
+    ]
+  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
+  xreadgroupBuffer(
+    ...args: [
+      groupConsumerToken: "GROUP",
+      group: string | Buffer,
+      consumer: string | Buffer,
+      noack: "NOACK",
+      streamsToken: "STREAMS",
+      ...args: RedisValue[],
+      callback: Callback<[key: string, entries: [id: string, fields: string[]]][]>
+    ]
+  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
+  xreadgroupBuffer(
+    ...args: [
+      groupConsumerToken: "GROUP",
+      group: string | Buffer,
+      consumer: string | Buffer,
+      noack: "NOACK",
+      streamsToken: "STREAMS",
+      ...args: RedisValue[]
+    ]
+  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
+  xreadgroupBuffer(
+    ...args: [
+      groupConsumerToken: "GROUP",
+      group: string | Buffer,
+      consumer: string | Buffer,
+      millisecondsToken: "BLOCK",
+      milliseconds: number | string,
+      streamsToken: "STREAMS",
+      ...args: RedisValue[],
+      callback: Callback<null | [key: string, entries: [id: string, fields: string[]]][]>
+    ]
+  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
+  xreadgroupBuffer(
+    ...args: [
+      groupConsumerToken: "GROUP",
+      group: string | Buffer,
+      consumer: string | Buffer,
+      millisecondsToken: "BLOCK",
+      milliseconds: number | string,
+      streamsToken: "STREAMS",
+      ...args: RedisValue[]
+    ]
+  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
+  xreadgroupBuffer(
+    ...args: [
+      groupConsumerToken: "GROUP",
+      group: string | Buffer,
+      consumer: string | Buffer,
+      millisecondsToken: "BLOCK",
+      milliseconds: number | string,
+      noack: "NOACK",
+      streamsToken: "STREAMS",
+      ...args: RedisValue[],
+      callback: Callback<null | [key: string, entries: [id: string, fields: string[]]][]>
+    ]
+  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
+  xreadgroupBuffer(
+    ...args: [
+      groupConsumerToken: "GROUP",
+      group: string | Buffer,
+      consumer: string | Buffer,
+      millisecondsToken: "BLOCK",
+      milliseconds: number | string,
+      noack: "NOACK",
+      streamsToken: "STREAMS",
+      ...args: RedisValue[]
+    ]
+  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
+  xreadgroupBuffer(
+    ...args: [
+      groupConsumerToken: "GROUP",
+      group: string | Buffer,
+      consumer: string | Buffer,
+      countToken: "COUNT",
+      count: number | string,
+      streamsToken: "STREAMS",
+      ...args: RedisValue[],
+      callback: Callback<unknown[]>
+    ]
+  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
+  xreadgroupBuffer(
+    ...args: [
+      groupConsumerToken: "GROUP",
+      group: string | Buffer,
+      consumer: string | Buffer,
+      countToken: "COUNT",
+      count: number | string,
+      streamsToken: "STREAMS",
+      ...args: RedisValue[]
+    ]
+  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
+  xreadgroupBuffer(
+    ...args: [
+      groupConsumerToken: "GROUP",
+      group: string | Buffer,
+      consumer: string | Buffer,
+      countToken: "COUNT",
+      count: number | string,
+      noack: "NOACK",
+      streamsToken: "STREAMS",
+      ...args: RedisValue[],
+      callback: Callback<[key: string, entries: [id: string, fields: string[]]][]>
+    ]
+  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
+  xreadgroupBuffer(
+    ...args: [
+      groupConsumerToken: "GROUP",
+      group: string | Buffer,
+      consumer: string | Buffer,
+      countToken: "COUNT",
+      count: number | string,
+      noack: "NOACK",
+      streamsToken: "STREAMS",
+      ...args: RedisValue[]
+    ]
+  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
+  xreadgroupBuffer(
+    ...args: [
+      groupConsumerToken: "GROUP",
+      group: string | Buffer,
+      consumer: string | Buffer,
+      countToken: "COUNT",
+      count: number | string,
+      millisecondsToken: "BLOCK",
+      milliseconds: number | string,
+      streamsToken: "STREAMS",
+      ...args: RedisValue[],
+      callback: Callback<null | [key: string, entries: [id: string, fields: string[]]][]>
+    ]
+  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
+  xreadgroupBuffer(
+    ...args: [
+      groupConsumerToken: "GROUP",
+      group: string | Buffer,
+      consumer: string | Buffer,
+      countToken: "COUNT",
+      count: number | string,
+      millisecondsToken: "BLOCK",
+      milliseconds: number | string,
+      streamsToken: "STREAMS",
+      ...args: RedisValue[]
+    ]
+  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
+  xreadgroupBuffer(
+    ...args: [
+      groupConsumerToken: "GROUP",
+      group: string | Buffer,
+      consumer: string | Buffer,
+      countToken: "COUNT",
+      count: number | string,
+      millisecondsToken: "BLOCK",
+      milliseconds: number | string,
+      noack: "NOACK",
+      streamsToken: "STREAMS",
+      ...args: RedisValue[],
+      callback: Callback<null | [key: string, entries: [id: string, fields: string[]]][]>
+    ]
+  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
+  xreadgroupBuffer(
+    ...args: [
+      groupConsumerToken: "GROUP",
+      group: string | Buffer,
+      consumer: string | Buffer,
+      countToken: "COUNT",
+      count: number | string,
+      millisecondsToken: "BLOCK",
+      milliseconds: number | string,
+      noack: "NOACK",
+      streamsToken: "STREAMS",
+      ...args: RedisValue[]
+    ]
+  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
 
   /**
    * Return a range of elements in a stream, with IDs matching the specified IDs interval, in reverse order (from greater to smaller IDs) compared to XRANGE

From ae3f431c9de3fbaeae5c1efeb17437e48361b1f2 Mon Sep 17 00:00:00 2001
From: Nick Cooper <nick@not.fun>
Date: Sun, 23 Oct 2022 19:22:20 -0400
Subject: [PATCH 2/3] actually commit more types

---
 lib/utils/RedisCommander.ts | 52 ++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/lib/utils/RedisCommander.ts b/lib/utils/RedisCommander.ts
index 7e4d0c5a0..8452e5ca7 100644
--- a/lib/utils/RedisCommander.ts
+++ b/lib/utils/RedisCommander.ts
@@ -10131,13 +10131,13 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       count: number | string,
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<unknown[]>
+      callback: Callback<[key: string, entries: [id: string, fields: string[]]][]>
     ]
   ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
-      group: string | Buffer,
+      group: string | Buffer,k
       consumer: string | Buffer,
       countToken: "COUNT",
       count: number | string,
@@ -10233,9 +10233,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       consumer: string | Buffer,
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<[key: string, entries: [id: string, fields: string[]]][]>
+      callback: Callback<[key: Buffer, entries: [id: Buffer, fields: Buffer[]]][]>
     ]
-  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<[key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10244,7 +10244,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<[key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10253,9 +10253,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       noack: "NOACK",
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<[key: string, entries: [id: string, fields: string[]]][]>
+      callback: Callback<[key: Buffer, entries: [id: Buffer, fields: Buffer[]]][]>
     ]
-  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<[key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10265,7 +10265,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<[key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10275,9 +10275,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       milliseconds: number | string,
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<null | [key: string, entries: [id: string, fields: string[]]][]>
+      callback: Callback<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]]][]>
     ]
-  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10288,7 +10288,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10299,9 +10299,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       noack: "NOACK",
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<null | [key: string, entries: [id: string, fields: string[]]][]>
+      callback: Callback<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]]][]>
     ]
-  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10313,7 +10313,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10323,9 +10323,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       count: number | string,
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<unknown[]>
+      callback: Callback<[key: Buffer, entries: [id: Buffer, fields: Buffer[]]][]>
     ]
-  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<[key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10336,7 +10336,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<[key: string, entries: [id: Buffer, fields: Buffer[]]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10347,9 +10347,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       noack: "NOACK",
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<[key: string, entries: [id: string, fields: string[]]][]>
+      callback: Callback<[key: Buffer, entries: [id: Buffer, fields: Buffer[]]][]>
     ]
-  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<[key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10361,7 +10361,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<[key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10373,9 +10373,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       milliseconds: number | string,
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<null | [key: string, entries: [id: string, fields: string[]]][]>
+      callback: Callback<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]]][]>
     ]
-  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10388,7 +10388,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10401,9 +10401,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       noack: "NOACK",
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<null | [key: string, entries: [id: string, fields: string[]]][]>
+      callback: Callback<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]]][]>
     ]
-  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10417,7 +10417,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
 
   /**
    * Return a range of elements in a stream, with IDs matching the specified IDs interval, in reverse order (from greater to smaller IDs) compared to XRANGE

From a8a2521156ce7668189a1801fd9919c514d420df Mon Sep 17 00:00:00 2001
From: Nick Cooper <nick@not.fun>
Date: Sun, 23 Oct 2022 19:27:22 -0400
Subject: [PATCH 3/3] correction to appropriate iteration

---
 lib/utils/RedisCommander.ts | 154 ++++++++++++++++++------------------
 1 file changed, 77 insertions(+), 77 deletions(-)

diff --git a/lib/utils/RedisCommander.ts b/lib/utils/RedisCommander.ts
index 8452e5ca7..d62585836 100644
--- a/lib/utils/RedisCommander.ts
+++ b/lib/utils/RedisCommander.ts
@@ -8585,8 +8585,8 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
     consumer: string | Buffer,
     minIdleTime: string | Buffer | number,
     start: string | Buffer | number,
-    callback?: Callback<[id: Buffer, messages: [id: Buffer, fields: Buffer[]][]]>
-  ): Result<[id: Buffer, messages: [id: Buffer, fields: Buffer[]][]], Context>;
+    callback?: Callback<[id: Buffer, messages: [id: Buffer, fields: Buffer[]][][]]>
+  ): Result<[id: Buffer, messages: [id: Buffer, fields: Buffer[]][][]], Context>;
   xautoclaimBuffer(
     key: RedisKey,
     group: string | Buffer,
@@ -8594,8 +8594,8 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
     minIdleTime: string | Buffer | number,
     start: string | Buffer | number,
     justid: "JUSTID",
-    callback?: Callback<[id: Buffer, messages: [id: Buffer, fields: Buffer[]][]]>
-  ): Result<[id: Buffer, messages: [id: Buffer, fields: Buffer[]][]], Context>;
+    callback?: Callback<[id: Buffer, messages: [id: Buffer, fields: Buffer[]][][]]>
+  ): Result<[id: Buffer, messages: [id: Buffer, fields: Buffer[]][][]], Context>;
   xautoclaimBuffer(
     key: RedisKey,
     group: string | Buffer,
@@ -8604,8 +8604,8 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
     start: string | Buffer | number,
     countToken: "COUNT",
     count: number | string,
-    callback?: Callback<[id: Buffer, messages: [id: Buffer, fields: Buffer[]][]]>
-  ): Result<[id: Buffer, messages: [id: Buffer, fields: Buffer[]][]], Context>;
+    callback?: Callback<[id: Buffer, messages: [id: Buffer, fields: Buffer[]][][]]>
+  ): Result<[id: Buffer, messages: [id: Buffer, fields: Buffer[]][][]], Context>;
   xautoclaimBuffer(
     key: RedisKey,
     group: string | Buffer,
@@ -8615,8 +8615,8 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
     countToken: "COUNT",
     count: number | string,
     justid: "JUSTID",
-    callback?: Callback<[id: Buffer, messages: [id: Buffer, fields: Buffer[]][]]>
-  ): Result<[id: Buffer, messages: [id: Buffer, fields: Buffer[]][]], Context>;
+    callback?: Callback<[id: Buffer, messages: [id: Buffer, fields: Buffer[]][][]]>
+  ): Result<[id: Buffer, messages: [id: Buffer, fields: Buffer[]][][]], Context>;
 
   /**
    * Changes (or acquires) ownership of a message in a consumer group, as if the message was delivered to the specified consumer.
@@ -9808,8 +9808,8 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
     key: RedisKey,
     start: string | Buffer | number,
     end: string | Buffer | number,
-    callback?: Callback<[id: Buffer, fields: Buffer[]][]>
-  ): Result<[id: Buffer, fields: Buffer[]][], Context>;
+    callback?: Callback<[id: Buffer, fields: Buffer[]][][]>
+  ): Result<[id: Buffer, fields: Buffer[]][][], Context>;
   xrange(
     key: RedisKey,
     start: string | Buffer | number,
@@ -9824,8 +9824,8 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
     end: string | Buffer | number,
     countToken: "COUNT",
     count: number | string,
-    callback?: Callback<[id: Buffer, fields: Buffer[]][]>
-  ): Result<[id: Buffer, fields: Buffer[]][], Context>;
+    callback?: Callback<[id: Buffer, fields: Buffer[]][][]>
+  ): Result<[id: Buffer, fields: Buffer[]][][], Context>;
 
   /**
    * Return never seen elements in multiple streams, with IDs greater than the ones reported by the caller for each stream. Can block.
@@ -9850,11 +9850,11 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[],
       callback: Callback<
-        [key: Buffer, items: [id: Buffer, fields: Buffer[]][]][] | null
+        [key: Buffer, items: [id: Buffer, fields: Buffer[]][][]][] | null
       >
     ]
   ): Result<
-    [key: Buffer, items: [id: Buffer, fields: Buffer[]][]][] | null,
+    [key: Buffer, items: [id: Buffer, fields: Buffer[]][][]][] | null,
     Context
   >;
   xread(
@@ -9866,7 +9866,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
   xreadBuffer(
     ...args: [streamsToken: "STREAMS", ...args: RedisValue[]]
   ): Result<
-    [key: Buffer, items: [id: Buffer, fields: Buffer[]][]][] | null,
+    [key: Buffer, items: [id: Buffer, fields: Buffer[]][][]][] | null,
     Context
   >;
   xread(
@@ -9890,11 +9890,11 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[],
       callback: Callback<
-        [key: Buffer, items: [id: Buffer, fields: Buffer[]][]][] | null
+        [key: Buffer, items: [id: Buffer, fields: Buffer[]][][]][] | null
       >
     ]
   ): Result<
-    [key: Buffer, items: [id: Buffer, fields: Buffer[]][]][] | null,
+    [key: Buffer, items: [id: Buffer, fields: Buffer[]][][]][] | null,
     Context
   >;
   xread(
@@ -9916,7 +9916,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       ...args: RedisValue[]
     ]
   ): Result<
-    [key: Buffer, items: [id: Buffer, fields: Buffer[]][]][] | null,
+    [key: Buffer, items: [id: Buffer, fields: Buffer[]][][]][] | null,
     Context
   >;
   xread(
@@ -9940,11 +9940,11 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[],
       callback: Callback<
-        [key: Buffer, items: [id: Buffer, fields: Buffer[]][]][] | null
+        [key: Buffer, items: [id: Buffer, fields: Buffer[]][][]][] | null
       >
     ]
   ): Result<
-    [key: Buffer, items: [id: Buffer, fields: Buffer[]][]][] | null,
+    [key: Buffer, items: [id: Buffer, fields: Buffer[]][][]][] | null,
     Context
   >;
   xread(
@@ -9966,7 +9966,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       ...args: RedisValue[]
     ]
   ): Result<
-    [key: Buffer, items: [id: Buffer, fields: Buffer[]][]][] | null,
+    [key: Buffer, items: [id: Buffer, fields: Buffer[]][][]][] | null,
     Context
   >;
   xread(
@@ -9994,11 +9994,11 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[],
       callback: Callback<
-        [key: Buffer, items: [id: Buffer, fields: Buffer[]][]][] | null
+        [key: Buffer, items: [id: Buffer, fields: Buffer[]][][]][] | null
       >
     ]
   ): Result<
-    [key: Buffer, items: [id: Buffer, fields: Buffer[]][]][] | null,
+    [key: Buffer, items: [id: Buffer, fields: Buffer[]][][]][] | null,
     Context
   >;
   xread(
@@ -10024,7 +10024,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       ...args: RedisValue[]
     ]
   ): Result<
-    [key: Buffer, items: [id: Buffer, fields: Buffer[]][]][] | null,
+    [key: Buffer, items: [id: Buffer, fields: Buffer[]][][]][] | null,
     Context
   >;
 
@@ -10041,9 +10041,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       consumer: string | Buffer,
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<[key: string, entries: [id: string, fields: string[]]][]>
+      callback: Callback<[key: string, entries: [id: string, fields: string[]][]][]>
     ]
-  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<[key: string, entries: [id: string, fields: string[]][]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10052,7 +10052,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<[key: string, entries: [id: string, fields: string[]][]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10061,9 +10061,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       noack: "NOACK",
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<[key: string, entries: [id: string, fields: string[]]][]>
+      callback: Callback<[key: string, entries: [id: string, fields: string[]][]][]>
     ]
-  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<[key: string, entries: [id: string, fields: string[]][]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10073,7 +10073,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<[key: string, entries: [id: string, fields: string[]][]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10083,9 +10083,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       milliseconds: number | string,
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<null | [key: string, entries: [id: string, fields: string[]]][]>
+      callback: Callback<null | [key: string, entries: [id: string, fields: string[]][]][]>
     ]
-  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<null | [key: string, entries: [id: string, fields: string[]][]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10096,7 +10096,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<null | [key: string, entries: [id: string, fields: string[]][]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10107,9 +10107,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       noack: "NOACK",
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<null | [key: string, entries: [id: string, fields: string[]]][]>
+      callback: Callback<null | [key: string, entries: [id: string, fields: string[]][]][]>
     ]
-  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<null | [key: string, entries: [id: string, fields: string[]][]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10121,7 +10121,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<null | [key: string, entries: [id: string, fields: string[]][]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10131,20 +10131,20 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       count: number | string,
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<[key: string, entries: [id: string, fields: string[]]][]>
+      callback: Callback<[key: string, entries: [id: string, fields: string[]][]][]>
     ]
-  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<[key: string, entries: [id: string, fields: string[]][]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
-      group: string | Buffer,k
+      group: string | Buffer,
       consumer: string | Buffer,
       countToken: "COUNT",
       count: number | string,
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<[key: string, entries: [id: string, fields: string[]][]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10155,9 +10155,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       noack: "NOACK",
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<[key: string, entries: [id: string, fields: string[]]][]>
+      callback: Callback<[key: string, entries: [id: string, fields: string[]][]][]>
     ]
-  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<[key: string, entries: [id: string, fields: string[]][]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10169,7 +10169,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<[key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<[key: string, entries: [id: string, fields: string[]][]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10181,9 +10181,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       milliseconds: number | string,
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<null | [key: string, entries: [id: string, fields: string[]]][]>
+      callback: Callback<null | [key: string, entries: [id: string, fields: string[]][]][]>
     ]
-  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<null | [key: string, entries: [id: string, fields: string[]][]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10196,7 +10196,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<null | [key: string, entries: [id: string, fields: string[]][]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10209,9 +10209,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       noack: "NOACK",
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<null | [key: string, entries: [id: string, fields: string[]]][]>
+      callback: Callback<null | [key: string, entries: [id: string, fields: string[]][]][]>
     ]
-  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<null | [key: string, entries: [id: string, fields: string[]][]][], Context>;
   xreadgroup(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10225,7 +10225,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<null | [key: string, entries: [id: string, fields: string[]]][], Context>;
+  ): Result<null | [key: string, entries: [id: string, fields: string[]][]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10233,9 +10233,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       consumer: string | Buffer,
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<[key: Buffer, entries: [id: Buffer, fields: Buffer[]]][]>
+      callback: Callback<[key: Buffer, entries: [id: Buffer, fields: Buffer[]][]][]>
     ]
-  ): Result<[key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
+  ): Result<[key: Buffer, entries: [id: Buffer, fields: Buffer[]][]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10244,7 +10244,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<[key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
+  ): Result<[key: Buffer, entries: [id: Buffer, fields: Buffer[]][]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10253,9 +10253,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       noack: "NOACK",
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<[key: Buffer, entries: [id: Buffer, fields: Buffer[]]][]>
+      callback: Callback<[key: Buffer, entries: [id: Buffer, fields: Buffer[]][]][]>
     ]
-  ): Result<[key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
+  ): Result<[key: Buffer, entries: [id: Buffer, fields: Buffer[]][]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10265,7 +10265,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<[key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
+  ): Result<[key: Buffer, entries: [id: Buffer, fields: Buffer[]][]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10275,9 +10275,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       milliseconds: number | string,
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]]][]>
+      callback: Callback<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]][]][]>
     ]
-  ): Result<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
+  ): Result<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]][]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10288,7 +10288,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
+  ): Result<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]][]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10299,9 +10299,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       noack: "NOACK",
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]]][]>
+      callback: Callback<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]][]][]>
     ]
-  ): Result<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
+  ): Result<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]][]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10313,7 +10313,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
+  ): Result<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]][]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10323,9 +10323,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       count: number | string,
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<[key: Buffer, entries: [id: Buffer, fields: Buffer[]]][]>
+      callback: Callback<[key: Buffer, entries: [id: Buffer, fields: Buffer[]][]][]>
     ]
-  ): Result<[key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
+  ): Result<[key: Buffer, entries: [id: Buffer, fields: Buffer[]][]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10336,7 +10336,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<[key: string, entries: [id: Buffer, fields: Buffer[]]][], Context>;
+  ): Result<[key: string, entries: [id: Buffer, fields: Buffer[]][]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10347,9 +10347,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       noack: "NOACK",
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<[key: Buffer, entries: [id: Buffer, fields: Buffer[]]][]>
+      callback: Callback<[key: Buffer, entries: [id: Buffer, fields: Buffer[]][]][]>
     ]
-  ): Result<[key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
+  ): Result<[key: Buffer, entries: [id: Buffer, fields: Buffer[]][]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10361,7 +10361,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<[key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
+  ): Result<[key: Buffer, entries: [id: Buffer, fields: Buffer[]][]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10373,9 +10373,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       milliseconds: number | string,
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]]][]>
+      callback: Callback<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]][]][]>
     ]
-  ): Result<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
+  ): Result<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]][]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10388,7 +10388,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
+  ): Result<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]][]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10401,9 +10401,9 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       noack: "NOACK",
       streamsToken: "STREAMS",
       ...args: RedisValue[],
-      callback: Callback<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]]][]>
+      callback: Callback<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]][]][]>
     ]
-  ): Result<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
+  ): Result<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]][]][], Context>;
   xreadgroupBuffer(
     ...args: [
       groupConsumerToken: "GROUP",
@@ -10417,7 +10417,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
       streamsToken: "STREAMS",
       ...args: RedisValue[]
     ]
-  ): Result<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]]][], Context>;
+  ): Result<null | [key: Buffer, entries: [id: Buffer, fields: Buffer[]][]][], Context>;
 
   /**
    * Return a range of elements in a stream, with IDs matching the specified IDs interval, in reverse order (from greater to smaller IDs) compared to XRANGE
@@ -10435,8 +10435,8 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
     key: RedisKey,
     end: string | Buffer | number,
     start: string | Buffer | number,
-    callback?: Callback<[id: Buffer, fields: Buffer[]][]>
-  ): Result<[id: Buffer, fields: Buffer[]][], Context>;
+    callback?: Callback<[id: Buffer, fields: Buffer[]][][]>
+  ): Result<[id: Buffer, fields: Buffer[]][][], Context>;
   xrevrange(
     key: RedisKey,
     end: string | Buffer | number,
@@ -10451,8 +10451,8 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
     start: string | Buffer | number,
     countToken: "COUNT",
     count: number | string,
-    callback?: Callback<[id: Buffer, fields: Buffer[]][]>
-  ): Result<[id: Buffer, fields: Buffer[]][], Context>;
+    callback?: Callback<[id: Buffer, fields: Buffer[]][][]>
+  ): Result<[id: Buffer, fields: Buffer[]][][], Context>;
 
   /**
    * An internal command for replicating stream values