redis/node-redis
1
0
Fork 0
mirror of https://github.com/redis/node-redis.git synced 2025-08-06 02:15:48 +03:00
Code Activity

new "transform arguments" API for better key and metadata extraction (#2733)

Browse Source 
* Parser support with all commands

* remove "dist" from all imports for consistency

* address most of my review comments

* small tweak to multi type mapping handling

* tweak multi commands / fix addScript cases

* nits

* addressed all in person review comments

* revert addCommand/addScript changes to multi-commands

addCommand needs to be there for sendCommand like ability within a multi.

If its there, it might as well be used by createCommand() et al, to avoid repeating code.

addScript is there (even though only used once), but now made private to keep the logic for bookkeeping near each other.
This commit is contained in:
Shaya Potter
2024-10-31 18:16:59 +02:00
committed by GitHub
parent 5ace34b9c9
commit 4708736f3b
1016 changed files with 6347 additions and 6542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
packages/client/lib/sentinel/utils.ts
View File

@@ -1,3 +1,4 @@
import { BasicCommandParser } from '../client/parser';
import { ArrayReply, Command, RedisFunction, RedisScript, RespVersions, UnwrapReply } from '../RESP/types';
import { RedisSocketOptions, RedisTcpSocketOptions } from '../client/socket';
import { functionArgumentsPrefix, getTransformReply, scriptArgumentsPrefix } from '../commander';
@@ -38,77 +39,60 @@ export function clientSocketToNode(socket: RedisSocketOptions): RedisNode {
export function createCommand<T extends ProxySentinel | ProxySentinelClient>(command: Command, resp: RespVersions) {
const transformReply = getTransformReply(command, resp);
return async function (this: T, ...args: Array<unknown>) {
const redisArgs = command.transformArguments(...args);
const typeMapping = this._self.commandOptions?.typeMapping;
const parser = new BasicCommandParser();
command.parseCommand(parser, ...args);
const reply = await this._self.sendCommand(
return this._self._execute(
command.IS_READ_ONLY,
redisArgs,
this._self.commandOptions
client => client._executeCommand(command, parser, this.commandOptions, transformReply)
);
return transformReply ?
transformReply(reply, redisArgs.preserve, typeMapping) :
reply;
};
}
export function createFunctionCommand<T extends NamespaceProxySentinel | NamespaceProxySentinelClient>(name: string, fn: RedisFunction, resp: RespVersions) {
const prefix = functionArgumentsPrefix(name, fn),
transformReply = getTransformReply(fn, resp);
const prefix = functionArgumentsPrefix(name, fn);
const transformReply = getTransformReply(fn, resp);
return async function (this: T, ...args: Array<unknown>) {
const fnArgs = fn.transformArguments(...args);
const redisArgs = prefix.concat(fnArgs);
const typeMapping = this._self._self.commandOptions?.typeMapping;
const parser = new BasicCommandParser();
parser.push(...prefix);
fn.parseCommand(parser, ...args);
const reply = await this._self._self.sendCommand(
return this._self._execute(
fn.IS_READ_ONLY,
redisArgs,
this._self._self.commandOptions
client => client._executeCommand(fn, parser, this._self.commandOptions, transformReply)
);
return transformReply ?
transformReply(reply, fnArgs.preserve, typeMapping) :
reply;
}
};
export function createModuleCommand<T extends NamespaceProxySentinel | NamespaceProxySentinelClient>(command: Command, resp: RespVersions) {
const transformReply = getTransformReply(command, resp);
return async function (this: T, ...args: Array<unknown>) {
const redisArgs = command.transformArguments(...args);
const typeMapping = this._self._self.commandOptions?.typeMapping;
const parser = new BasicCommandParser();
command.parseCommand(parser, ...args);
const reply = await this._self._self.sendCommand(
return this._self._execute(
command.IS_READ_ONLY,
redisArgs,
this._self._self.commandOptions
client => client._executeCommand(command, parser, this._self.commandOptions, transformReply)
);
return transformReply ?
transformReply(reply, redisArgs.preserve, typeMapping) :
reply;
}
};
export function createScriptCommand<T extends ProxySentinel | ProxySentinelClient>(script: RedisScript, resp: RespVersions) {
const prefix = scriptArgumentsPrefix(script),
transformReply = getTransformReply(script, resp);
const prefix = scriptArgumentsPrefix(script);
const transformReply = getTransformReply(script, resp);
return async function (this: T, ...args: Array<unknown>) {
const scriptArgs = script.transformArguments(...args);
const redisArgs = prefix.concat(scriptArgs);
const typeMapping = this._self.commandOptions?.typeMapping;
const parser = new BasicCommandParser();
parser.push(...prefix);
script.parseCommand(parser, ...args);
const reply = await this._self.executeScript(
script,
return this._self._execute(
script.IS_READ_ONLY,
redisArgs,
this._self.commandOptions
client => client._executeScript(script, parser, this.commandOptions, transformReply)
);
return transformReply ?
transformReply(reply, scriptArgs.preserve, typeMapping) :
reply;
};
}