You've already forked node-redis
mirror of
https://github.com/redis/node-redis.git
synced 2025-08-07 13:22:56 +03:00
* init v4 * add .gitignore to benchmark * spawn redis-servers for tests, add some tests, fix client auth on connect * add tests coverage report * add tests workflow, replace nyc text reporter with text-summary * run tests with node 16.x & redis 6.x only (for now) * add socket events on client, stop reconnectiong when manually calling disconnect, remove abort signal listener when a command is written on the socket * add isOpen boolean getter on client, add maxLength option to command queue, add test for client.multi * move to use CommonJS * add MULTI and EXEC commands to when executing multi command, make client.multi return type innerit the module commands, clean some tests, exclute spec files from coverage report * missing file from commit61edd4f1b5
* exclude spec files from coverage report * add support for options in a command function (.get, .set, ...), add support for the SELECT command, implement a couple of commands, fix client socket reconnection strategy, add support for using replicas (RO) in cluster, and more.. * fix client.blPop test * use which to find redis-server path * change command options to work with Symbol rather then WeakSet * implement more commands * Add support for lua scripts in client & muilti, fix client socket initiator, implement simple cluster nodes discovery strategy * replace `callbackify` with `legacyMode` * add the SCAN command and client.scanIterator * rename scanIterator * init benchmark workflow * fix benchmark workflow * fix benchmark workflow * fix benchmark workflow * push coverage report to Coveralls * fix Coveralls * generator lcov (for Coveralls) * fix .nycrc.json * PubSub * add support for all set commands (including sScanIterator) * support pipeline * fix KEEPTTL in SET * remove console.log * add HyperLogLog commands * update README.md (thanks to @guyroyse) * add support for most of the "keys commands" * fix EXPIREAT.spec.ts * add support for date in both EXPIREAT & EXPIRE * add tests * better cluster nodes discorvery strategy after MOVED error, add PubSub test * fix PubSub UNSUBSCRIBE/PUNSUBSCRIBE without channel and/or listener * fix PubSub * add release-it to dev dependencies * Release 4.0.0-next.0 * fix .npmignore * Release 4.0.0-next.1 * fix links in README.md * fix .npmignore * Release 4.0.0-next.2 * add support for all sorted set commands * add support for most stream commands * add missing file from commit53de279afe
* lots of todo commends * make PubSub test more stable * clean ZPOPMAX * add support for lua scripts and modules in cluster, spawn cluster for tests, add some cluster tests, fix pubsub listener arguments * GET.spec.ts * add support for List commands, fix some Sorted Set commands, add some cluster commands, spawn cluster for testing, add support for command options in cluster, and more * add missing file from commitfaab94fab2
* clean ZRANK and ZREVRANK * add XREAD and XREADGROUP commands * remove unused files * implement a couple of more commands, make cluster random iterator be per node (instead of per slot) * Release 4.0.0-next.3 * app spec files to npmignore * fix some code analyzers (LGTM, deepsource, codeclimate) issues * fix CLUSTER_NODES, add some tests * add HSCAN, clean some commands, add tests for generic transformers * add missing files from0feb35a1fb
* update README.md (thanks to @guyroyse) * handle ASK errors, add some commands and tests * Release 4.0.0-next.4 * replace "modern" with "v4" * remove unused imports * add all ACL subcommands, all MODULE subcommands, and some other commands * remove 2 unused imports * fix BITFIELD command * fix XTRIM spec file * clean code * fix package.json types field * better modules support, fix some bugs in legacy mode, add some tests * remove unused function * add test for hScanIterator * change node mimimum version to 12 (latest LTS) * update tsconfig.json to support node 12, run tests on Redis 5 & 6 and on all node live versions * remove future node releases :P * remove "lib" from ts compiler options * Update tsconfig.json * fix build * run some tests only on supported redis versions, use coveralls parallel mode * fix tests * Do not use "timers/promises", fix "isRedisVersionGreaterThan" * skip AbortController tests when not available * use 'fs'.promises instead of 'fs/promises' * add some missing commands * run GETDEL tests only if the redis version is greater than 6.2 * implement some GEO commands, improve scan generic transformer, expose RPUSHX * fix GEOSEARCH & GEOSEARCHSTORE * use socket.setNoDelay and queueMicrotask to improve latency * commands-queue.ts: String length / byte length counting issue (#1630) * Update commands-queue.ts Hopefully fixing #1628 * Reverted 2fa5ea6, and implemented test for byte length check * Changed back to Buffer.byteLength, due to issue author input. Updated test to look for 4 bytes. * Fixed. There were two places that length was calculated. * Removed redundant string assignment * add 2 bytes test as well Co-authored-by: Leibale Eidelman <leibale1998@gmail.com> * fix scripts in multi * do not hide bugs in redis * fix fore7bf09644b
* remove unused import * implement WATCH command, fix ZRANGESTORE & GEOSEARCHSTORE tests * update README.md Co-authored-by: @GuyRoyse * use typedoc to auto generate documentation * run "npm install" before "npm run documentation" * clean documentation workflow * fix WATCH spec file * increase "CLUSTER_NODE_TIMEOUT" to 5000ms to avoid "CLUSTERDOWN" errors in tests * pull cluster state every 100 ms * await meetPromises before pulling the cluster state * enhance the way commanders (client/multi/cluster) get extended with modules and scripts * add test for socket retry strategy * implement more commands * set GETEX minimum version to 6.2 * remove unused imports * add support for multi in cluster * upgrade dependencies * Release 4.0.0-next.5 * remove unused imports * improve benchmarking * use the same Multi with duplicated clients * exclude some files from the documentation, add some exports, clean code * fix #1636 - handle null in multi.exec * remove unused import * add supoprt for tuples in HSET * add FIRST_KEY_INDEX to HSET * add a bunch of missing commands, fix MSET and HELLO, add some tests * add FIRST_KEY_INDEX to MSET and MSETNX * upgrade actions * fix coverallsapp/github-action version * Update documentation.yml * Update documentation.yml * clean code * remove unused imports * use "npm ci" instead of "npm install" * fix `self` binding on client modules, use connection pool for `duplicateConnection` * add client.executeIsolated, rename "duplicateConnection" to "isolated", update README.md (thanks to @GuyRoyse and @SimonPrickett) * update README (thanks to @GuyRoyse), add some tests * try to fix "cluster is down" errors in tests * try to fix "cluster is down" errors in tests * upgrade dependencies * update package-lock * Release 4.0.0-next.6 * fix #1636 - fix WatchError * fix forf1bf0beebf
- remove .only from multi tests * Release 4.0.0-next.7 * update README and other markdown files Co-authored-by: @GuyRoyse & @SimonPrickett * Doc updates. (#1640) * update docs, upgrade dependencies * fix README * Release 4.0.0-rc.0 * Update README.md * update docs, add `connectTimeout` options, fix tls Co-authored-by: Guy Royse <guy@guyroyse.com> * npm update, "fix" some tests, clean code * fix AssertionError import * fix #1642 - fix XREAD, XREADGROUP and XTRIM * fix #1644 - add the QUIT command * add socket.noDelay and socket.keepAlive configurations * Update README.md (#1645) * Update README.md Fixed issue with how connection string was specified. Now you can have user@host without having to specify a password, which just makes more sense * Update client-configuration.md as well Co-authored-by: Leibale Eidelman <leibale1998@gmail.com> * update socket.reconnectStrategy description * fix borken link in v3-to-v4.md * increase test coverage, fix bug in cluster redirection strategy, implement CLIENT_ID, remove unused EXEC command Co-authored-by: Nova <novaw@warrenservices.co.uk> Co-authored-by: Simon Prickett <simon@crudworks.org> Co-authored-by: Guy Royse <guy@guyroyse.com>
255 lines
7.4 KiB
TypeScript
255 lines
7.4 KiB
TypeScript
import EventEmitter from 'events';
|
|
import net from 'net';
|
|
import tls from 'tls';
|
|
import { URL } from 'url';
|
|
import { ConnectionTimeoutError, ClientClosedError } from './errors';
|
|
import { promiseTimeout } from './utils';
|
|
|
|
export interface RedisSocketCommonOptions {
|
|
username?: string;
|
|
password?: string;
|
|
connectTimeout?: number;
|
|
noDelay?: boolean;
|
|
keepAlive?: number | false;
|
|
reconnectStrategy?(retries: number): number | Error;
|
|
}
|
|
|
|
export interface RedisNetSocketOptions extends RedisSocketCommonOptions {
|
|
port?: number;
|
|
host?: string;
|
|
}
|
|
|
|
export interface RedisUrlSocketOptions extends RedisSocketCommonOptions {
|
|
url: string;
|
|
}
|
|
|
|
export interface RedisUnixSocketOptions extends RedisSocketCommonOptions {
|
|
path: string;
|
|
}
|
|
|
|
export interface RedisTlsSocketOptions extends RedisNetSocketOptions, tls.SecureContextOptions {
|
|
tls: true;
|
|
}
|
|
|
|
export type RedisSocketOptions = RedisNetSocketOptions | RedisUrlSocketOptions | RedisUnixSocketOptions | RedisTlsSocketOptions;
|
|
|
|
interface CreateSocketReturn<T> {
|
|
connectEvent: string;
|
|
socket: T;
|
|
}
|
|
|
|
export type RedisSocketInitiator = () => Promise<void>;
|
|
|
|
export default class RedisSocket extends EventEmitter {
|
|
static #initiateOptions(options?: RedisSocketOptions): RedisSocketOptions {
|
|
options ??= {};
|
|
if (!RedisSocket.#isUnixSocket(options)) {
|
|
if (RedisSocket.#isUrlSocket(options)) {
|
|
const url = new URL(options.url);
|
|
(options as RedisNetSocketOptions).port = Number(url.port);
|
|
(options as RedisNetSocketOptions).host = url.hostname;
|
|
options.username = url.username;
|
|
options.password = url.password;
|
|
}
|
|
|
|
(options as RedisNetSocketOptions).port ??= 6379;
|
|
(options as RedisNetSocketOptions).host ??= '127.0.0.1';
|
|
}
|
|
|
|
options.connectTimeout ??= 5000;
|
|
options.keepAlive ??= 5000;
|
|
options.noDelay ??= true;
|
|
|
|
return options;
|
|
}
|
|
|
|
static #defaultReconnectStrategy(retries: number): number {
|
|
return Math.min(retries * 50, 500);
|
|
}
|
|
|
|
static #isUrlSocket(options: RedisSocketOptions): options is RedisUrlSocketOptions {
|
|
return Object.prototype.hasOwnProperty.call(options, 'url');
|
|
}
|
|
|
|
static #isUnixSocket(options: RedisSocketOptions): options is RedisUnixSocketOptions {
|
|
return Object.prototype.hasOwnProperty.call(options, 'path');
|
|
}
|
|
|
|
static #isTlsSocket(options: RedisSocketOptions): options is RedisTlsSocketOptions {
|
|
return (options as RedisTlsSocketOptions).tls === true;
|
|
}
|
|
|
|
readonly #initiator?: RedisSocketInitiator;
|
|
|
|
readonly #options: RedisSocketOptions;
|
|
|
|
#socket?: net.Socket | tls.TLSSocket;
|
|
|
|
#isOpen = false;
|
|
|
|
get isOpen(): boolean {
|
|
return this.#isOpen;
|
|
}
|
|
|
|
get chunkRecommendedSize(): number {
|
|
if (!this.#socket) return 0;
|
|
|
|
return this.#socket.writableHighWaterMark - this.#socket.writableLength;
|
|
}
|
|
|
|
constructor(initiator?: RedisSocketInitiator, options?: RedisSocketOptions) {
|
|
super();
|
|
|
|
this.#initiator = initiator;
|
|
this.#options = RedisSocket.#initiateOptions(options);
|
|
}
|
|
|
|
async connect(): Promise<void> {
|
|
if (this.#isOpen) {
|
|
throw new Error('Socket is connection/connecting');
|
|
}
|
|
|
|
this.#isOpen = true;
|
|
|
|
try {
|
|
await this.#connect();
|
|
} catch (err) {
|
|
this.#isOpen = false;
|
|
throw err;
|
|
}
|
|
}
|
|
|
|
async #connect(hadError?: boolean): Promise<void> {
|
|
this.#socket = await this.#retryConnection(0, hadError);
|
|
this.emit('connect');
|
|
|
|
if (this.#initiator) {
|
|
try {
|
|
await this.#initiator();
|
|
} catch (err) {
|
|
this.#socket.end();
|
|
this.#socket = undefined;
|
|
throw err;
|
|
}
|
|
}
|
|
|
|
this.emit('ready');
|
|
}
|
|
|
|
async #retryConnection(retries: number, hadError?: boolean): Promise<net.Socket | tls.TLSSocket> {
|
|
if (retries > 0 || hadError) {
|
|
this.emit('reconnecting');
|
|
}
|
|
|
|
try {
|
|
return await this.#createSocket();
|
|
} catch (err) {
|
|
this.emit('error', err);
|
|
|
|
if (!this.#isOpen) {
|
|
throw err;
|
|
}
|
|
|
|
const retryIn = (this.#options?.reconnectStrategy ?? RedisSocket.#defaultReconnectStrategy)(retries);
|
|
if (retryIn instanceof Error) {
|
|
throw retryIn;
|
|
}
|
|
|
|
await promiseTimeout(retryIn);
|
|
return this.#retryConnection(retries + 1);
|
|
}
|
|
}
|
|
|
|
#createSocket(): Promise<net.Socket | tls.TLSSocket> {
|
|
return new Promise((resolve, reject) => {
|
|
const {connectEvent, socket} = RedisSocket.#isTlsSocket(this.#options) ?
|
|
this.#createTlsSocket() :
|
|
this.#createNetSocket();
|
|
|
|
if (this.#options.connectTimeout) {
|
|
socket.setTimeout(this.#options.connectTimeout, () => socket.destroy(new ConnectionTimeoutError()));
|
|
}
|
|
|
|
socket
|
|
.setNoDelay(this.#options.noDelay)
|
|
.setKeepAlive(this.#options.keepAlive !== false, this.#options.keepAlive || 0)
|
|
.once('error', reject)
|
|
.once(connectEvent, () => {
|
|
socket
|
|
.setTimeout(0)
|
|
.off('error', reject)
|
|
.once('error', (err: Error) => this.#onSocketError(err))
|
|
.once('close', hadError => {
|
|
if (!hadError && this.#isOpen) {
|
|
this.#onSocketError(new Error('Socket closed unexpectedly'));
|
|
}
|
|
})
|
|
.on('drain', () => this.emit('drain'))
|
|
.on('data', (data: Buffer) => this.emit('data', data));
|
|
|
|
resolve(socket);
|
|
});
|
|
});
|
|
}
|
|
|
|
#createNetSocket(): CreateSocketReturn<net.Socket> {
|
|
return {
|
|
connectEvent: 'connect',
|
|
socket: net.connect(this.#options as net.NetConnectOpts) // TODO
|
|
};
|
|
}
|
|
|
|
#createTlsSocket(): CreateSocketReturn<tls.TLSSocket> {
|
|
return {
|
|
connectEvent: 'secureConnect',
|
|
socket: tls.connect(this.#options as tls.ConnectionOptions) // TODO
|
|
};
|
|
}
|
|
|
|
#onSocketError(err: Error): void {
|
|
this.#socket = undefined;
|
|
this.emit('error', err);
|
|
|
|
this.#connect(true)
|
|
.catch(err => this.emit('error', err));
|
|
}
|
|
|
|
write(encodedCommands: string): boolean {
|
|
if (!this.#socket) {
|
|
throw new ClientClosedError();
|
|
}
|
|
|
|
return this.#socket.write(encodedCommands);
|
|
}
|
|
|
|
async disconnect(ignoreIsOpen = false): Promise<void> {
|
|
if ((!ignoreIsOpen && !this.#isOpen) || !this.#socket) {
|
|
throw new ClientClosedError();
|
|
} else {
|
|
this.#isOpen = false;
|
|
}
|
|
|
|
this.#socket.end();
|
|
await EventEmitter.once(this.#socket, 'end');
|
|
this.#socket = undefined;
|
|
this.emit('end');
|
|
}
|
|
|
|
async quit(fn: () => Promise<unknown>): Promise<void> {
|
|
if (!this.#isOpen) {
|
|
throw new ClientClosedError();
|
|
}
|
|
|
|
this.#isOpen = false;
|
|
|
|
|
|
try {
|
|
await fn();
|
|
await this.disconnect(true);
|
|
} catch (err) {
|
|
this.#isOpen = true;
|
|
throw err;
|
|
}
|
|
}
|
|
}
|