Merge remote-tracking branch 'upstream/v5' into v5-search-broken

Author: sjpotter

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

@@ -65,6 +65,16 @@ describe('CLIENT KILL', () => {
       );
     });
 
+    it('MAXAGE', () => {
+      assert.deepEqual(
+        CLIENT_KILL.transformArguments({
+          filter: CLIENT_KILL_FILTERS.MAXAGE,
+          maxAge: 10
+        }),
+        ['CLIENT', 'KILL', 'MAXAGE', '10']
+      );
+    });
+
     describe('SKIP_ME', () => {
       it('undefined', () => {
         assert.deepEqual(

packages/client/lib/commands/CLIENT_KILL.ts

@@ -6,7 +6,8 @@ export const CLIENT_KILL_FILTERS = {
   ID: 'ID',
   TYPE: 'TYPE',
   USER: 'USER',
-  SKIP_ME: 'SKIPME'
+  SKIP_ME: 'SKIPME',
+  MAXAGE: 'MAXAGE'
 } as const;
 
 type CLIENT_KILL_FILTERS = typeof CLIENT_KILL_FILTERS;
@@ -39,7 +40,11 @@ export type ClientKillSkipMe = CLIENT_KILL_FILTERS['SKIP_ME'] | (ClientKillFilte
   skipMe: boolean;
 });
 
-export type ClientKillFilter = ClientKillAddress | ClientKillLocalAddress | ClientKillId | ClientKillType | ClientKillUser | ClientKillSkipMe;
+export interface ClientKillMaxAge extends ClientKillFilterCommon<CLIENT_KILL_FILTERS['MAXAGE']> {
+  maxAge: number;
+}
+
+export type ClientKillFilter = ClientKillAddress | ClientKillLocalAddress | ClientKillId | ClientKillType | ClientKillUser | ClientKillSkipMe | ClientKillMaxAge;
 
 export default {
   FIRST_KEY_INDEX: undefined,
@@ -96,5 +101,9 @@ function pushFilter(args: Array<RedisArgument>, filter: ClientKillFilter): void
     case CLIENT_KILL_FILTERS.SKIP_ME:
       args.push(filter.skipMe ? 'yes' : 'no');
       break;
+    
+    case CLIENT_KILL_FILTERS.MAXAGE:
+      args.push(filter.maxAge.toString());
+      break;
   }
 }

packages/search/lib/commands/SUGADD.ts

@@ -6,7 +6,7 @@ export interface FtSugAddOptions {
 }
 
 export default {
-  FIRST_KEY_INDEX: undefined,
+  FIRST_KEY_INDEX: 1,
   IS_READ_ONLY: true,
   transformArguments(key: RedisArgument, string: RedisArgument, score: number, options?: FtSugAddOptions) {
     const args = ['FT.SUGADD', key, string, score.toString()];

packages/search/lib/commands/SUGDEL.ts

@@ -1,7 +1,7 @@
 import { RedisArgument, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
-  FIRST_KEY_INDEX: undefined,
+  FIRST_KEY_INDEX: 1,
   IS_READ_ONLY: true,
   transformArguments(key: RedisArgument, string: RedisArgument) {
     return ['FT.SUGDEL', key, string];

packages/search/lib/commands/SUGGET.ts

@@ -6,7 +6,7 @@ export interface FtSugGetOptions {
 }
 
 export default {
-  FIRST_KEY_INDEX: undefined,
+  FIRST_KEY_INDEX: 1,
   IS_READ_ONLY: true,
   transformArguments(key: RedisArgument, prefix: RedisArgument, options?: FtSugGetOptions) {
     const args = ['FT.SUGGET', key, prefix];

packages/search/lib/commands/SUGLEN.ts

@@ -1,7 +1,7 @@
 import { RedisArgument, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
-  FIRST_KEY_INDEX: undefined,
+  FIRST_KEY_INDEX: 1,
   IS_READ_ONLY: true,
   transformArguments(key: RedisArgument) {
     return ['FT.SUGLEN', key];