You've already forked node-redis
mirror of
https://github.com/redis/node-redis.git
synced 2025-08-09 00:22:08 +03:00
* update workflows & README * add .deepsource.toml * fix client.quit, add error events on cluster, fix some "deepsource.io" warnings * Release 4.0.0-rc.1 * add cluster.duplicate, add some tests * fix #1650 - add support for Buffer in some commands, add GET_BUFFER command * fix GET and GET_BUFFER return type * update FAQ * Update invalid code example in README.md (#1654) * Update invalid code example in README.md * Update README.md Co-authored-by: Leibale Eidelman <leibale1998@gmail.com> * fix #1652 * ref #1653 - better types * better types * fix54124793ad
* Update GEOSEARCHSTORE.spec.ts * fix #1660 - add support for client.HSET('key', 'field', 'value') * upgrade dependencies, update README * fix #1659 - add support for db-number in client options url * fix README, remove unused import, downgrade typedoc & typedoc-plugin-markdown * update client-configurations.md * fix README * add CLUSTER_SLOTS, add some tests * fix "createClient with url" test with redis 5 * remove unused imports * Release 4.0.0-rc.2 * add missing semicolon * replace empty "transformReply" functions with typescript "declare" * fix EVAL & EVALSHA, add some tests, npm update * fix #1665 - add ZRANGEBYLEX, ZRANGEBYSCORE, ZRANGEBYSCORE_WITHSCORES * new issue templates * add all COMMAND commands * run COMMAND & COMMAND INFO tests only on redis >6 * Create SECURITY.md * fix #1671 - add support for all client configurations in cluster * ref #1671 - add support for defaults * remove some commands from cluster, npm update, clean code, * lock benny version * fix #1674 - remove `isolationPoolOptions` when creating isolated connection * increase test coverage * update .npmignore * Release 4.0.0-rc.3 * fix README * remove whitespace from LICENSE * use "export { x as y }" instead of import & const * move from "NodeRedis" to "Redis" * fix #1676 * update comments * Auth before select database (#1679) * Auth before select database * fix #1681 Co-authored-by: leibale <leibale1998@gmail.com> * Adds connect-as-acl-user example. (#1684) * Adds connect-as-acl-user example. * Adds blank line at end. * Set to private. * Adds examples folder to npmignore. * Adds Apple .DS_Store file to .gitignore (#1685) * Adds Apple .DS_Store file. * Add .DS_Store to .npmignore too Co-authored-by: Leibale Eidelman <leibale1998@gmail.com> * move examples * clean some tests * clean code * Adds examples table of contents and contribution guidelines. (#1686) * Updated examples to use named functions. (#1687) * Updated examples to user named functions. * Update README.md Co-authored-by: Leibale Eidelman <leibale1998@gmail.com> * update docs, add 6.0.x to the tests matrix, add eslint, npm update, fix some commands, fix some types Co-authored-by: Simon Prickett <simon@crudworks.org> * fix tests with redis 6.0.x * fix ACL GETUSER test * fix client.quit and client.disconnect * fix ACL GETUSER * Adds TypeScript note and corrects a typo. * Fixes a bug in the Scan Iterator section. (#1694) * Made examples use local version. * Add `lua-multi-incr.js` example (#1692) Also fix syntax error in the lua example in the README Closes #1689. * Add(examples): Create an example for blPop & lPush (#1696) * Add(examples): Create an example for blPop & lPush Signed-off-by: Aditya Rastogi <adit.rastogi2014@gmail.com> * Update(examples): fix case, add timeout, update readme Signed-off-by: Aditya Rastogi <adit.rastogi2014@gmail.com> Closes #1693. * Add command-with-modifiers.js example (#1695) * Adds TypeScript note and corrects a typo. * Adds command-with-modifiers example. (redis#1688) * Adds command-with-modifiers example. (redis#1688) * Adds command-with-modifiers example. (redis#1688) * Removed callbacks. Co-authored-by: Simon Prickett <simon@redislabs.com> Closes #1688. * Issue # 1697 FIX - creates an example script that shows how to use the SSCAN iterator (#1699) * #1697 fix for set scan example * adds the js file * adds comment * Minor layout and comment adjustment. Co-authored-by: srawat2 <shashank19aug> Co-authored-by: Simon Prickett <simon@redislabs.com> Closes #1697. * fix #1706 - HSET return type should be number * use dockers for tests, fix some bugs * increase dockers timeout to 30s * release drafter (#1683) * release drafter * fixing contributors * use dockers for tests, use npm workspaces, add rejson & redisearch modules, fix some bugs * fix #1712 - fix LINDEX return type * uncomment TIME tests * use codecov * fix tests.yml * uncomment "should handle live resharding" test * fix #1714 - update README(s) * add package-lock.json * update CONTRIBUTING.md * update examples * uncomment some tests * fix test-utils * move "all-in-one" to root folder * fix tests workflow * fix bug in cluster slots, enhance live resharding test * fix live resharding test * fix #1707 - handle number arguments in legacy mode * Add rejectedUnauthorized and other TLS options (#1708) * Update socket.ts * fix #1716 - decode username and password from url * fix some Z (sorted list) commands, increase commands test coverage * remove empty lines * fix 'Scenario' typo (#1720) * update readmes, add createCluster to the `redis` package * add .release-it.json files, update some md files * run tests on pull requests too * Support esModuleInterop set to false. (#1717) * Support esModuleInterop set to false. When testing the upcoming 4.x release, we got a bunch of typescript errors emitted from this project. We quickly realized this is because the library uses the esModuleInterop flag. This makes some imports _slightly_ easier to write, but it comes at a cost: it forces any application or library using this library to *also* have esModuleInterop on. The `esModuleInterop` flag is a bit of a holdover from an earlier time, and I would not recommend using it in libraries. The main issue is that if it's set to true, you are forcing any users of the library to also have `esModuleInterop`, where if you keep have it set to `false` (the default), you leave the decision to the user. This change should have no rammifications to users with `esModuleInterop` on, but it will enable support for those that have it off. This is especially good for library authors such as myself, because I would also like to keep this flag off to not force *my* users into this feature. * All tests now pass! * Move @types/redis-parser into client sub-package and removed a comma * npm update, remove html from readme * add tests and licence badges * update changelog.md * update .npmignore and .release-it.json * update .release-it.json * Release client@1.0.0-rc.0 * revertd32f1edf8a
* fix .npmignore * replace @redis with @node-redis * Release client@1.0.0-rc.0 * update json & search version * Release json@1.0.0-rc.0 * Release search@1.0.0-rc.0 * update dependencies * Release redis@4.0.0-rc.4 * fix #1724 - fix LINDEX signature * add positive test for LINDEX * fix #1718 - add support for buffers in pubsub * Fixed a few typos. * fix ARRPOP * fix #1726 * enhance cluster reshard handling * Adds RediSearch demo. * Adds intro sentence. * Made top level comment more descriptive. * Adds RedisJSON example. * Renamed JSON search example. * Some refactoring. * Fixed search example for JSON. * Minor wording updates. * Added missing pet name. * Adds JSON package overview. * Fixed typo. * Search package README initial version. * remove echo from docker entrypoint.sh * npm update * update docs * fix merge * fix merge * Release client@1.0.0 * npm update * Release search@1.0.0 * update sub modules * Release redis@4.0.0 Co-authored-by: Richard Samuelsson <noobtoothfairy@gmail.com> Co-authored-by: mustard <mhqnwt@gmail.com> Co-authored-by: Simon Prickett <simon@redislabs.com> Co-authored-by: Simon Prickett <simon@crudworks.org> Co-authored-by: Suze Shardlow <SuzeShardlow@users.noreply.github.com> Co-authored-by: Joshua T <buildingsomethingfun@gmail.com> Co-authored-by: Aditya Rastogi <adit.rastogi2014@gmail.com> Co-authored-by: Rohan Kumar <rohan.kr20@gmail.com> Co-authored-by: Kalki <shashank.kviit@gmail.com> Co-authored-by: Chayim <chayim@users.noreply.github.com> Co-authored-by: Da-Jin Chu <dajinchu@gmail.com> Co-authored-by: Henrique Corrêa <75134774+HeCorr@users.noreply.github.com> Co-authored-by: Evert Pot <me@evertpot.com>
207 lines
7.8 KiB
TypeScript
207 lines
7.8 KiB
TypeScript
import COMMANDS from './commands';
|
|
import { RedisCommand, RedisCommandArguments, RedisCommandReply, RedisModules, RedisPlugins, RedisScript, RedisScripts } from '../commands';
|
|
import { ClientCommandOptions, RedisClientCommandSignature, RedisClientOptions, RedisClientType, WithModules, WithScripts } from '../client';
|
|
import RedisClusterSlots, { ClusterNode } from './cluster-slots';
|
|
import { extendWithModulesAndScripts, transformCommandArguments, transformCommandReply, extendWithCommands } from '../commander';
|
|
import { EventEmitter } from 'events';
|
|
import RedisClusterMultiCommand, { RedisClusterMultiCommandType } from './multi-command';
|
|
import { RedisMultiQueuedCommand } from '../multi-command';
|
|
|
|
export type RedisClusterClientOptions = Omit<RedisClientOptions<Record<string, never>, Record<string, never>>, 'modules' | 'scripts'>;
|
|
|
|
export interface RedisClusterOptions<M extends RedisModules, S extends RedisScripts> extends RedisPlugins<M, S> {
|
|
rootNodes: Array<RedisClusterClientOptions>;
|
|
defaults?: Partial<RedisClusterClientOptions>;
|
|
useReplicas?: boolean;
|
|
maxCommandRedirections?: number;
|
|
}
|
|
|
|
type WithCommands = {
|
|
[P in keyof typeof COMMANDS]: RedisClientCommandSignature<(typeof COMMANDS)[P]>;
|
|
};
|
|
|
|
export type RedisClusterType<M extends RedisModules = Record<string, never>, S extends RedisScripts = Record<string, never>> =
|
|
RedisCluster<M, S> & WithCommands & WithModules<M> & WithScripts<S>;
|
|
|
|
export default class RedisCluster<M extends RedisModules = Record<string, never>, S extends RedisScripts = Record<string, never>> extends EventEmitter {
|
|
static extractFirstKey(command: RedisCommand, originalArgs: Array<unknown>, redisArgs: RedisCommandArguments): string | Buffer | undefined {
|
|
if (command.FIRST_KEY_INDEX === undefined) {
|
|
return undefined;
|
|
} else if (typeof command.FIRST_KEY_INDEX === 'number') {
|
|
return redisArgs[command.FIRST_KEY_INDEX];
|
|
}
|
|
|
|
return command.FIRST_KEY_INDEX(...originalArgs);
|
|
}
|
|
|
|
static create<M extends RedisModules = Record<string, never>, S extends RedisScripts = Record<string, never>>(options?: RedisClusterOptions<M, S>): RedisClusterType<M, S> {
|
|
return new (<any>extendWithModulesAndScripts({
|
|
BaseClass: RedisCluster,
|
|
modules: options?.modules,
|
|
modulesCommandsExecutor: RedisCluster.prototype.commandsExecutor,
|
|
scripts: options?.scripts,
|
|
scriptsExecutor: RedisCluster.prototype.scriptsExecutor
|
|
}))(options);
|
|
}
|
|
|
|
readonly #options: RedisClusterOptions<M, S>;
|
|
readonly #slots: RedisClusterSlots<M, S>;
|
|
readonly #Multi: new (...args: ConstructorParameters<typeof RedisClusterMultiCommand>) => RedisClusterMultiCommandType<M, S>;
|
|
|
|
constructor(options: RedisClusterOptions<M, S>) {
|
|
super();
|
|
|
|
this.#options = options;
|
|
this.#slots = new RedisClusterSlots(options, err => this.emit('error', err));
|
|
this.#Multi = RedisClusterMultiCommand.extend(options);
|
|
}
|
|
|
|
duplicate(overrides?: Partial<RedisClusterOptions<M, S>>): RedisClusterType<M, S> {
|
|
return new (Object.getPrototypeOf(this).constructor)({
|
|
...this.#options,
|
|
...overrides
|
|
});
|
|
}
|
|
|
|
async connect(): Promise<void> {
|
|
return this.#slots.connect();
|
|
}
|
|
|
|
async commandsExecutor(command: RedisCommand, args: Array<unknown>): Promise<RedisCommandReply<typeof command>> {
|
|
const { args: redisArgs, options } = transformCommandArguments<ClientCommandOptions>(command, args);
|
|
|
|
return transformCommandReply(
|
|
command,
|
|
await this.sendCommand(
|
|
RedisCluster.extractFirstKey(command, args, redisArgs),
|
|
command.IS_READ_ONLY,
|
|
redisArgs,
|
|
options,
|
|
command.BUFFER_MODE
|
|
),
|
|
redisArgs.preserve
|
|
);
|
|
}
|
|
|
|
async sendCommand<C extends RedisCommand>(
|
|
firstKey: string | Buffer | undefined,
|
|
isReadonly: boolean | undefined,
|
|
args: RedisCommandArguments,
|
|
options?: ClientCommandOptions,
|
|
bufferMode?: boolean,
|
|
redirections = 0
|
|
): Promise<RedisCommandReply<C>> {
|
|
const client = this.#slots.getClient(firstKey, isReadonly);
|
|
|
|
try {
|
|
return await client.sendCommand(args, options, bufferMode);
|
|
} catch (err: any) {
|
|
const shouldRetry = await this.#handleCommandError(err, client, redirections);
|
|
if (shouldRetry === true) {
|
|
return this.sendCommand(firstKey, isReadonly, args, options, bufferMode, redirections + 1);
|
|
} else if (shouldRetry) {
|
|
return shouldRetry.sendCommand(args, options, bufferMode);
|
|
}
|
|
|
|
throw err;
|
|
}
|
|
}
|
|
|
|
async scriptsExecutor(script: RedisScript, args: Array<unknown>): Promise<RedisCommandReply<typeof script>> {
|
|
const { args: redisArgs, options } = transformCommandArguments<ClientCommandOptions>(script, args);
|
|
|
|
return transformCommandReply(
|
|
script,
|
|
await this.executeScript(
|
|
script,
|
|
args,
|
|
redisArgs,
|
|
options
|
|
),
|
|
redisArgs.preserve
|
|
);
|
|
}
|
|
|
|
async executeScript(
|
|
script: RedisScript,
|
|
originalArgs: Array<unknown>,
|
|
redisArgs: RedisCommandArguments,
|
|
options?: ClientCommandOptions,
|
|
redirections = 0
|
|
): Promise<RedisCommandReply<typeof script>> {
|
|
const client = this.#slots.getClient(
|
|
RedisCluster.extractFirstKey(script, originalArgs, redisArgs),
|
|
script.IS_READ_ONLY
|
|
);
|
|
|
|
try {
|
|
return await client.executeScript(script, redisArgs, options, script.BUFFER_MODE);
|
|
} catch (err: any) {
|
|
const shouldRetry = await this.#handleCommandError(err, client, redirections);
|
|
if (shouldRetry === true) {
|
|
return this.executeScript(script, originalArgs, redisArgs, options, redirections + 1);
|
|
} else if (shouldRetry) {
|
|
return shouldRetry.executeScript(script, redisArgs, options, script.BUFFER_MODE);
|
|
}
|
|
|
|
throw err;
|
|
}
|
|
}
|
|
|
|
async #handleCommandError(err: Error, client: RedisClientType<M, S>, redirections: number): Promise<boolean | RedisClientType<M, S>> {
|
|
if (redirections > (this.#options.maxCommandRedirections ?? 16)) {
|
|
throw err;
|
|
}
|
|
|
|
if (err.message.startsWith('ASK')) {
|
|
const url = err.message.substring(err.message.lastIndexOf(' ') + 1);
|
|
let node = this.#slots.getNodeByUrl(url);
|
|
if (!node) {
|
|
await this.#slots.rediscover(client);
|
|
node = this.#slots.getNodeByUrl(url);
|
|
|
|
if (!node) {
|
|
throw new Error(`Cannot find node ${url}`);
|
|
}
|
|
}
|
|
|
|
await node.client.asking();
|
|
return node.client;
|
|
} else if (err.message.startsWith('MOVED')) {
|
|
await this.#slots.rediscover(client);
|
|
return true;
|
|
}
|
|
|
|
throw err;
|
|
}
|
|
|
|
multi(routing?: string | Buffer): RedisClusterMultiCommandType<M, S> {
|
|
return new this.#Multi(
|
|
async (commands: Array<RedisMultiQueuedCommand>, firstKey?: string | Buffer, chainId?: symbol) => {
|
|
return this.#slots
|
|
.getClient(firstKey)
|
|
.multiExecutor(commands, chainId);
|
|
},
|
|
routing
|
|
);
|
|
}
|
|
|
|
getMasters(): Array<ClusterNode<M, S>> {
|
|
return this.#slots.getMasters();
|
|
}
|
|
|
|
getSlotMaster(slot: number): ClusterNode<M, S> {
|
|
return this.#slots.getSlotMaster(slot);
|
|
}
|
|
|
|
disconnect(): Promise<void> {
|
|
return this.#slots.disconnect();
|
|
}
|
|
}
|
|
|
|
extendWithCommands({
|
|
BaseClass: RedisCluster,
|
|
commands: COMMANDS,
|
|
executor: RedisCluster.prototype.commandsExecutor
|
|
});
|