Merge remote-tracking branch 'origin/v5-search-broken' into cmd-parser-with-commands

Author: sjpotter

packages/client/lib/commands/XREAD.spec.ts

@@ -101,14 +101,7 @@ describe('XREAD', () => {
       }),
     ])
 
-    const arr = ['key', [{
-      'id': id,
-      'message': [
-        'field',
-        'value',
-      ]
-    }]];
-
+    // FUTURE resp3 compatible
     const obj = Object.assign(Object.create(null), {
       'key': [{
         id: id,
@@ -122,7 +115,18 @@ describe('XREAD', () => {
       }]
     });
 
-    assert.deepStrictEqual(reply, arr);
+    // v4 compatible
+    const expected = [{
+      name: 'key',
+      messages: [{
+        id: id,
+        message: Object.assign(Object.create(null), {
+          field: 'value'
+        })
+      }]
+    }];
+
+    assert.deepStrictEqual(reply, expected);
   }, {
     client: GLOBAL.SERVERS.OPEN,
     cluster: GLOBAL.CLUSTERS.OPEN

packages/client/lib/commands/XREADGROUP.spec.ts

@@ -124,14 +124,8 @@ describe('XREADGROUP', () => {
       })
     ]);
 
-    const arr = ['key', [{
-      'id': id,
-      'message': [
-        'field',
-        'value',
-      ]
-    }]];    
 
+    // FUTURE resp3 compatible
     const obj = Object.assign(Object.create(null), {
       'key': [{
         id: id,
@@ -145,7 +139,18 @@ describe('XREADGROUP', () => {
       }]
     });
 
-    assert.deepStrictEqual(readGroupReply, arr);
+    // v4 compatible
+    const expected = [{
+      name: 'key',
+      messages: [{
+        id: id,
+        message: Object.assign(Object.create(null), {
+          field: 'value'
+        })
+      }]
+    }];
+
+    assert.deepStrictEqual(readGroupReply, expected);
   }, {
     client: GLOBAL.SERVERS.OPEN,
     cluster: GLOBAL.CLUSTERS.OPEN

packages/client/lib/commands/generic-transformers.ts

@@ -553,11 +553,13 @@ export function transformStreamsMessagesReplyResp2(
   reply: UnwrapReply<StreamsMessagesRawReply2 | NullReply>,
   preserve?: any,
   typeMapping?: TypeMapping
-): MapReply<BlobStringReply | string, StreamMessagesReply> | NullReply {
+): StreamsMessagesReply | NullReply { 
+  // FUTURE: resposne type if resp3 was working, reverting to old v4 for now
+  //: MapReply<BlobStringReply | string, StreamMessagesReply> | NullReply {
   if (reply === null) return null as unknown as NullReply;
 
   switch (typeMapping? typeMapping[RESP_TYPES.MAP] : undefined) {
-/*    
+/* FUTURE: a response type for when resp3 is working properly
     case Map: {
       const ret = new Map<string, StreamMessagesReply>();
 
@@ -572,14 +574,6 @@ export function transformStreamsMessagesReplyResp2(
     
       return ret as unknown as MapReply<string, StreamMessagesReply>;
     }
-*/
-    /* work around for now */
-    default:
-      if (!typeMapping) {
-        typeMapping = {};
-      }
-      // console.log("forcing map type map to array");
-      // typeMapping[RESP_TYPES.MAP] = Array;
     case Array: {
       const ret: Array<BlobStringReply | StreamMessagesReply> = [];
 
@@ -595,7 +589,6 @@ export function transformStreamsMessagesReplyResp2(
 
       return ret as unknown as MapReply<string, StreamMessagesReply>;
     }
-/*    
     default: {
       const ret: Record<string, StreamMessagesReply> = Object.create(null);
 
@@ -611,6 +604,21 @@ export function transformStreamsMessagesReplyResp2(
       return ret as unknown as MapReply<string, StreamMessagesReply>;
     }
 */
+    // V4 compatible response type
+    default: {
+      const ret: StreamsMessagesReply = [];
+
+      for (let i=0; i < reply.length; i++) {
+        const stream = reply[i] as unknown as UnwrapReply<StreamMessagesRawReply>;
+
+        ret.push({
+          name: stream[0],
+          messages: transformStreamMessagesReply(stream[1])
+        });
+      }
+
+      return ret;
+    }
   }
 }