Support CLUSTER commands

packages/client/lib/client/commands.ts

@@ -24,13 +24,26 @@ import * as CLIENT_SETNAME from '../commands/CLIENT_SETNAME';
 import * as CLIENT_INFO from '../commands/CLIENT_INFO';
 import * as CLUSTER_ADDSLOTS from '../commands/CLUSTER_ADDSLOTS';
 import * as CLUSTER_ADDSLOTSRANGE from '../commands/CLUSTER_ADDSLOTSRANGE';
+import * as CLUSTER_BUMPEPOCH from '../commands/CLUSTER_BUMPEPOCH';
+import * as CLUSTER_COUNT_FAILURE_REPORTS from '../commands/CLUSTER_COUNT-FAILURE-REPORTS';
+import * as CLUSTER_COUNTKEYSINSLOT from '../commands/CLUSTER_COUNTKEYSINSLOT';
+import * as CLUSTER_DELSLOTS from '../commands/CLUSTER_DELSLOTS';
 import * as CLUSTER_DELSLOTSRANGE from '../commands/CLUSTER_DELSLOTSRANGE';
+import * as CLUSTER_FAILOVER from '../commands/CLUSTER_FAILOVER';
 import * as CLUSTER_FLUSHSLOTS from '../commands/CLUSTER_FLUSHSLOTS';
+import * as CLUSTER_FORGET from '../commands/CLUSTER_FORGET';
+import * as CLUSTER_GETKEYSINSLOT from '../commands/CLUSTER_GETKEYSINSLOT';
 import * as CLUSTER_INFO from '../commands/CLUSTER_INFO';
+import * as CLUSTER_KEYSLOT from '../commands/CLUSTER_KEYSLOT';
 import * as CLUSTER_LINKS from '../commands/CLUSTER_LINKS';
-import * as CLUSTER_NODES from '../commands/CLUSTER_NODES';
 import * as CLUSTER_MEET from '../commands/CLUSTER_MEET';
+import * as CLUSTER_MYID from '../commands/CLUSTER_MYID';
+import * as CLUSTER_NODES from '../commands/CLUSTER_NODES';
+import * as CLUSTER_REPLICAS from '../commands/CLUSTER_REPLICAS';
+import * as CLUSTER_REPLICATE from '../commands/CLUSTER_REPLICATE';
 import * as CLUSTER_RESET from '../commands/CLUSTER_RESET';
+import * as CLUSTER_SAVECONFIG from '../commands/CLUSTER_SAVECONFIG';
+import * as CLUSTER_SET_CONFIG_EPOCH from '../commands/CLUSTER_SET-CONFIG-EPOCH';
 import * as CLUSTER_SETSLOT from '../commands/CLUSTER_SETSLOT';
 import * as CLUSTER_SLOTS from '../commands/CLUSTER_SLOTS';
 import * as COMMAND_COUNT from '../commands/COMMAND_COUNT';
@@ -138,20 +151,46 @@ export default {
  clusterAddSlots: CLUSTER_ADDSLOTS,
  CLUSTER_ADDSLOTSRANGE,
  clusterAddSlotsRange: CLUSTER_ADDSLOTSRANGE,
+ CLUSTER_BUMPEPOCH,
+ clusterBumpEpoch: CLUSTER_BUMPEPOCH,
+ CLUSTER_COUNT_FAILURE_REPORTS,
+ clusterCountFailureReports: CLUSTER_COUNT_FAILURE_REPORTS,
+ CLUSTER_COUNTKEYSINSLOT,
+ clusterCountKeysInSlot: CLUSTER_COUNTKEYSINSLOT,
+ CLUSTER_DELSLOTS,
+ clusterDelSlots: CLUSTER_DELSLOTS,
  CLUSTER_DELSLOTSRANGE,
  clusterDelSlotsRange: CLUSTER_DELSLOTSRANGE,
+ CLUSTER_FAILOVER,
+ clusterFailover: CLUSTER_FAILOVER,
  CLUSTER_FLUSHSLOTS,
  clusterFlushSlots: CLUSTER_FLUSHSLOTS,
+ CLUSTER_FORGET,
+ clusterForget: CLUSTER_FORGET,
+ CLUSTER_GETKEYSINSLOT,
+ clusterGetKeysInSlot: CLUSTER_GETKEYSINSLOT,
  CLUSTER_INFO,
  clusterInfo: CLUSTER_INFO,
+ CLUSTER_KEYSLOT,
+ clusterKeySlot: CLUSTER_KEYSLOT,
  CLUSTER_LINKS,
  clusterLinks: CLUSTER_LINKS,
- CLUSTER_NODES,
- clusterNodes: CLUSTER_NODES,
  CLUSTER_MEET,
  clusterMeet: CLUSTER_MEET,
+ CLUSTER_MYID,
+ clusterMyId: CLUSTER_MYID,
+ CLUSTER_NODES,
+ clusterNodes: CLUSTER_NODES,
+ CLUSTER_REPLICAS,
+ clusterReplicas: CLUSTER_REPLICAS,
+ CLUSTER_REPLICATE,
+ clusterReplicate: CLUSTER_REPLICATE,
  CLUSTER_RESET,
  clusterReset: CLUSTER_RESET,
+ CLUSTER_SAVECONFIG,
+ clusterSaveConfig: CLUSTER_SAVECONFIG,
+ CLUSTER_SET_CONFIG_EPOCH,
+ clusterSetConfigEpoch: CLUSTER_SET_CONFIG_EPOCH,
  CLUSTER_SETSLOT,
  clusterSetSlot: CLUSTER_SETSLOT,
  CLUSTER_SLOTS,

packages/client/lib/commands/CLUSTER_ADDSLOTS.ts

@@ -1,13 +1,11 @@
-export function transformArguments(slots: number | Array<number>): Array<string> {
- const args = ['CLUSTER', 'ADDSLOTS'];
+import { RedisCommandArguments } from '.';
+import { pushVerdictNumberArguments } from './generic-transformers';
 
- if (typeof slots === 'number') {
- args.push(slots.toString());
- } else {
- args.push(...slots.map(String));
- }
-
- return args;
+export function transformArguments(slots: number | Array<number>): RedisCommandArguments {
+ return pushVerdictNumberArguments(
+ ['CLUSTER', 'ADDSLOTS'],
+ slots
+ );
 }
 
 export declare function transformReply(): string;

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

@@ -0,0 +1,19 @@
+import { strict as assert } from 'assert';
+import testUtils, { GLOBAL } from '../test-utils';
+import { transformArguments } from './CLUSTER_BUMPEPOCH';
+
+describe('CLUSTER BUMPEPOCH', () => {
+ it('transformArguments', () => {
+ assert.deepEqual(
+ transformArguments(),
+ ['CLUSTER', 'BUMPEPOCH']
+ );
+ });
+
+ testUtils.testWithCluster('clusterNode.clusterBumpEpoch', async cluster => {
+ assert.equal(
+ typeof await cluster.getSlotMaster(0).client.clusterBumpEpoch(),
+ 'string'
+ );
+ }, GLOBAL.SERVERS.OPEN);
+});

packages/client/lib/commands/CLUSTER_BUMPEPOCH.ts

@@ -0,0 +1,5 @@
+export function transformArguments(): Array<string> {
+ return ['CLUSTER', 'BUMPEPOCH'];
+}
+
+export declare function transformReply(): 'BUMPED' | 'STILL';

packages/client/lib/commands/CLUSTER_COUNT-FAILURE-REPORTS.spec.ts

@@ -0,0 +1,22 @@
+import { strict as assert } from 'assert';
+import testUtils, { GLOBAL } from '../test-utils';
+import { transformArguments } from './CLUSTER_COUNT-FAILURE-REPORTS';
+
+describe('CLUSTER COUNT-FAILURE-REPORTS', () => {
+ it('transformArguments', () => {
+ assert.deepEqual(
+ transformArguments('0'),
+ ['CLUSTER', 'COUNT-FAILURE-REPORTS', '0']
+ );
+ });
+
+ testUtils.testWithCluster('clusterNode.clusterCountFailureReports', async cluster => {
+ const { client } = cluster.getSlotMaster(0);
+ assert.equal(
+ typeof await client.clusterCountFailureReports(
+ await client.clusterMyId()
+ ),
+ 'number'
+ );
+ }, GLOBAL.CLUSTERS.OPEN);
+});

packages/client/lib/commands/CLUSTER_COUNT-FAILURE-REPORTS.ts

@@ -0,0 +1,5 @@
+export function transformArguments(nodeId: string): Array<string> {
+ return ['CLUSTER', 'COUNT-FAILURE-REPORTS', nodeId];
+}
+
+export declare function transformReply(): number;

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

@@ -0,0 +1,19 @@
+import { strict as assert } from 'assert';
+import testUtils, { GLOBAL } from '../test-utils';
+import { transformArguments } from './CLUSTER_COUNTKEYSINSLOT';
+
+describe('CLUSTER COUNTKEYSINSLOT', () => {
+ it('transformArguments', () => {
+ assert.deepEqual(
+ transformArguments(0),
+ ['CLUSTER', 'COUNTKEYSINSLOT', '0']
+ );
+ });
+
+ testUtils.testWithCluster('clusterNode.clusterCountKeysInSlot', async cluster => {
+ assert.equal(
+ typeof await cluster.getSlotMaster(0).client.clusterCountKeysInSlot(0),
+ 'number'
+ );
+ }, GLOBAL.CLUSTERS.OPEN);
+});

packages/client/lib/commands/CLUSTER_COUNTKEYSINSLOT.ts

@@ -0,0 +1,5 @@
+export function transformArguments(slot: number): Array<string> {
+ return ['CLUSTER', 'COUNTKEYSINSLOT', slot.toString()];
+}
+
+export declare function transformReply(): number;

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

@@ -0,0 +1,20 @@
+import { strict as assert } from 'assert';
+import { transformArguments } from './CLUSTER_DELSLOTS';
+
+describe('CLUSTER DELSLOTS', () => {
+ describe('transformArguments', () => {
+ it('single', () => {
+ assert.deepEqual(
+ transformArguments(0),
+ ['CLUSTER', 'DELSLOTS', '0']
+ );
+ });
+
+ it('multiple', () => {
+ assert.deepEqual(
+ transformArguments([0, 1]),
+ ['CLUSTER', 'DELSLOTS', '0', '1']
+ );
+ });
+ });
+});

packages/client/lib/commands/CLUSTER_DELSLOTS.ts

@@ -0,0 +1,11 @@
+import { RedisCommandArguments } from '.';
+import { pushVerdictNumberArguments } from './generic-transformers';
+
+export function transformArguments(slots: number | Array<number>): RedisCommandArguments {
+ return pushVerdictNumberArguments(
+ ['CLUSTER', 'DELSLOTS'],
+ slots
+ );
+}
+
+export declare function transformReply(): 'OK';

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

@@ -0,0 +1,20 @@
+import { strict as assert } from 'assert';
+import { FailoverModes, transformArguments } from './CLUSTER_FAILOVER';
+
+describe('CLUSTER FAILOVER', () => {
+ describe('transformArguments', () => {
+ it('simple', () => {
+ assert.deepEqual(
+ transformArguments(),
+ ['CLUSTER', 'FAILOVER']
+ );
+ });
+
+ it('with mode', () => {
+ assert.deepEqual(
+ transformArguments(FailoverModes.FORCE),
+ ['CLUSTER', 'FAILOVER', 'FORCE']
+ );
+ });
+ });
+});

packages/client/lib/commands/CLUSTER_FAILOVER.ts

@@ -0,0 +1,16 @@
+export enum FailoverModes {
+ FORCE = 'FORCE',
+ TAKEOVER = 'TAKEOVER'
+}
+
+export function transformArguments(mode?: FailoverModes): Array<string> {
+ const args = ['CLUSTER', 'FAILOVER'];
+
+ if (mode) {
+ args.push(mode);
+ }
+
+ return args;
+}
+
+export declare function transformReply(): 'OK';

packages/client/lib/commands/CLUSTER_FLUSHSLOTS.ts

@@ -2,4 +2,4 @@ export function transformArguments(): Array<string> {
  return ['CLUSTER', 'FLUSHSLOTS'];
 }
 
-export declare function transformReply(): string;
+export declare function transformReply(): 'OK';

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

@@ -0,0 +1,11 @@
+import { strict as assert } from 'assert';
+import { transformArguments } from './CLUSTER_FORGET';
+
+describe('CLUSTER FORGET', () => {
+ it('transformArguments', () => {
+ assert.deepEqual(
+ transformArguments('0'),
+ ['CLUSTER', 'FORGET', '0']
+ );
+ });
+});

packages/client/lib/commands/CLUSTER_FORGET.ts

@@ -0,0 +1,5 @@
+export function transformArguments(nodeId: string): Array<string> {
+ return ['CLUSTER', 'FORGET', nodeId];
+}
+
+export declare function transformReply(): 'OK';

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

@@ -1,4 +1,5 @@
 import { strict as assert } from 'assert';
+import testUtils, { GLOBAL } from '../test-utils';
 import { transformArguments } from './CLUSTER_GETKEYSINSLOT';
 
 describe('CLUSTER GETKEYSINSLOT', () => {
@@ -8,4 +9,12 @@ describe('CLUSTER GETKEYSINSLOT', () => {
  ['CLUSTER', 'GETKEYSINSLOT', '0', '10']
  );
  });
+
+ testUtils.testWithCluster('clusterNode.clusterGetKeysInSlot', async cluster => {
+ const reply = await cluster.getSlotMaster(0).client.clusterGetKeysInSlot(0, 1);
+ assert.ok(Array.isArray(reply));
+ for (const item of reply) {
+ assert.equal(typeof item, 'string');
+ }
+ }, GLOBAL.CLUSTERS.OPEN);
 });

packages/client/lib/commands/CLUSTER_GETKEYSINSLOT.ts

@@ -2,4 +2,4 @@ export function transformArguments(slot: number, count: number): Array<string> {
  return ['CLUSTER', 'GETKEYSINSLOT', slot.toString(), count.toString()];
 }
 
-export declare function transformReply(): string;
+export declare function transformReply(): Array<string>;

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

@@ -1,4 +1,5 @@
 import { strict as assert } from 'assert';
+import testUtils, { GLOBAL } from '../test-utils';
 import { transformArguments, transformReply } from './CLUSTER_INFO';
 
 describe('CLUSTER INFO', () => {
@@ -43,4 +44,11 @@ describe('CLUSTER INFO', () => {
  }
  );
  });
+
+ testUtils.testWithCluster('clusterNode.clusterInfo', async cluster => {
+ assert.notEqual(
+ await cluster.getSlotMaster(0).client.clusterInfo(),
+ null
+ );
+ }, GLOBAL.CLUSTERS.OPEN);
 });

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

@@ -0,0 +1,19 @@
+import { strict as assert } from 'assert';
+import testUtils, { GLOBAL } from '../test-utils';
+import { transformArguments } from './CLUSTER_KEYSLOT';
+
+describe('CLUSTER KEYSLOT', () => {
+ it('transformArguments', () => {
+ assert.deepEqual(
+ transformArguments('key'),
+ ['CLUSTER', 'KEYSLOT', 'key']
+ );
+ });
+
+ testUtils.testWithCluster('clusterNode.clusterKeySlot', async cluster => {
+ assert.equal(
+ typeof await cluster.getSlotMaster(0).client.clusterKeySlot('key'),
+ 'number'
+ );
+ }, GLOBAL.CLUSTERS.OPEN);
+});

packages/client/lib/commands/CLUSTER_KEYSLOT.ts

@@ -0,0 +1,5 @@
+export function transformArguments(key: string): Array<string> {
+ return ['CLUSTER', 'KEYSLOT', key];
+}
+
+export declare function transformReply(): number;

packages/client/lib/commands/CLUSTER_MEET.ts

@@ -2,4 +2,4 @@ export function transformArguments(ip: string, port: number): Array<string> {
  return ['CLUSTER', 'MEET', ip, port.toString()];
 }
 
-export declare function transformReply(): string;
+export declare function transformReply(): 'OK';

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

@@ -0,0 +1,19 @@
+import { strict as assert } from 'assert';
+import testUtils, { GLOBAL } from '../test-utils';
+import { transformArguments } from './CLUSTER_MYID';
+
+describe('CLUSTER MYID', () => {
+ it('transformArguments', () => {
+ assert.deepEqual(
+ transformArguments(),
+ ['CLUSTER', 'MYID']
+ );
+ });
+
+ testUtils.testWithCluster('clusterNode.clusterMyId', async cluster => {
+ assert.equal(
+ typeof await cluster.getSlotMaster(0).client.clusterMyId(),
+ 'string'
+ );
+ }, GLOBAL.CLUSTERS.OPEN);
+});

packages/client/lib/commands/CLUSTER_MYID.ts

@@ -0,0 +1,5 @@
+export function transformArguments(): Array<string> {
+ return ['CLUSTER', 'MYID'];
+}
+
+export declare function transformReply(): string;

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

@@ -0,0 +1,11 @@
+import { strict as assert } from 'assert';
+import { transformArguments } from './CLUSTER_REPLICAS';
+
+describe('CLUSTER REPLICAS', () => {
+ it('transformArguments', () => {
+ assert.deepEqual(
+ transformArguments('0'),
+ ['CLUSTER', 'REPLICAS', '0']
+ );
+ });
+});

packages/client/lib/commands/CLUSTER_REPLICAS.ts

@@ -0,0 +1,5 @@
+export function transformArguments(nodeId: string): Array<string> {
+ return ['CLUSTER', 'REPLICAS', nodeId];
+}
+
+export { transformReply } from './CLUSTER_NODES';