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

uncomment some tests, fix bugs with _selectedDB

Browse Source
This commit is contained in:
Leibale
2023-12-07 09:42:04 -05:00
parent 3b28aa6c81
commit 7f7a53a1b1
3 changed files with 78 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
packages/client/lib/client/index.spec.ts
View File

@@ -1,17 +1,13 @@
import { strict as assert } from 'node:assert';
import testUtils, { GLOBAL, waitTillBeenCalled } from '../test-utils';
import RedisClient, { RedisClientType } from '.';
// import { RedisClientMultiCommandType } from './multi-command';
// import { RedisCommandRawReply, RedisModules, RedisFunctions, RedisScripts } from '../commands';
import { AbortError, ClientClosedError, ClientOfflineError, ConnectionTimeoutError, DisconnectsClientError, ErrorReply, MultiErrorReply, SocketClosedUnexpectedlyError, WatchError } from '../errors';
import { defineScript } from '../lua-script';
import { spy } from 'sinon';
import { once } from 'node:events';
// import { ClientKillFilters } from '../commands/CLIENT_KILL';
// import { promisify } from 'node:util';
import { MATH_FUNCTION, loadMathFunction } from '../commands/FUNCTION_LOAD.spec';
import { RESP_TYPES } from '../RESP/decoder';
import { NumberReply } from '../RESP/types';
import { BlobStringReply, NumberReply } from '../RESP/types';
import { SortedSetMember } from '../commands/generic-transformers';
export const SQUARE_SCRIPT = defineScript({
@@ -232,24 +228,26 @@ describe('Client', () => {
}
});
// testUtils.testWithClient('WatchError', async client => {
// await client.watch('key');
testUtils.testWithClient('WatchError', async client => {
await client.watch('key');
// await client.set(
// RedisClient.commandOptions({
// isolated: true
// }),
// 'key',
// '1'
// );
const duplicate = await client.duplicate().connect();
try {
await client.set(
'key',
'1'
);
} finally {
duplicate.destroy();
}
// await assert.rejects(
// client.multi()
// .decr('key')
// .exec(),
// WatchError
// );
// }, GLOBAL.SERVERS.OPEN);
await assert.rejects(
client.multi()
.decr('key')
.exec(),
WatchError
);
}, GLOBAL.SERVERS.OPEN);
describe('execAsPipeline', () => {
testUtils.testWithClient('exec(true)', async client => {
@@ -269,20 +267,19 @@ describe('Client', () => {
}, GLOBAL.SERVERS.OPEN);
});
// testUtils.testWithClient('should remember selected db', async client => {
// await client.multi()
// .select(1)
// .exec();
// await killClient(client);
// assert.equal(
// (await client.clientInfo()).db,
// 1
// );
// }, {
// ...GLOBAL.SERVERS.OPEN,
// minimumDockerVersion: [6, 2] // CLIENT INFO
// });
testUtils.testWithClient('should remember selected db', async client => {
await client.multi()
.select(1)
.exec();
await killClient(client);
assert.equal(
(await client.clientInfo()).db,
1
);
}, {
...GLOBAL.SERVERS.OPEN,
minimumDockerVersion: [6, 2] // CLIENT INFO
});
testUtils.testWithClient('should handle error replies (#2665)', async client => {
await assert.rejects(
@@ -320,12 +317,10 @@ describe('Client', () => {
const module = {
echo: {
transformArguments(message: string): Array<string> {
transformArguments(message: string) {
return ['ECHO', message];
},
transformReply(reply: string): string {
return reply;
}
transformReply: undefined as unknown as () => BlobStringReply
}
};
@@ -386,81 +381,34 @@ describe('Client', () => {
disableClientSetup: true,
});
// describe('isolationPool', () => {
// testUtils.testWithClient('executeIsolated', async client => {
// const id = await client.clientId(),
// isolatedId = await client.executeIsolated(isolatedClient => isolatedClient.clientId());
// assert.ok(id !== isolatedId);
// }, GLOBAL.SERVERS.OPEN);
async function killClient(
client: RedisClientType<any, any, any, any, any>,
errorClient: RedisClientType<any, any, any, any, any> = client
): Promise<void> {
const onceErrorPromise = once(errorClient, 'error');
await client.sendCommand(['QUIT']);
await Promise.all([
onceErrorPromise,
assert.rejects(client.ping(), SocketClosedUnexpectedlyError)
]);
}
// testUtils.testWithClient('should be able to use pool even before connect', async client => {
// await client.executeIsolated(() => Promise.resolve());
// // make sure to destroy isolation pool
// await client.connect();
// await client.disconnect();
// }, {
// ...GLOBAL.SERVERS.OPEN,
// disableClientSetup: true
// });
testUtils.testWithClient('should reconnect when socket disconnects', async client => {
await killClient(client);
await assert.doesNotReject(client.ping());
}, GLOBAL.SERVERS.OPEN);
// testUtils.testWithClient('should work after reconnect (#2406)', async client => {
// await client.disconnect();
// await client.connect();
// await client.executeIsolated(() => Promise.resolve());
// }, GLOBAL.SERVERS.OPEN);
// testUtils.testWithClient('should throw ClientClosedError after disconnect', async client => {
// await client.connect();
// await client.disconnect();
// await assert.rejects(
// client.executeIsolated(() => Promise.resolve()),
// ClientClosedError
// );
// }, {
// ...GLOBAL.SERVERS.OPEN,
// disableClientSetup: true
// });
// });
// async function killClient<
// M extends RedisModules,
// F extends RedisFunctions,
// S extends RedisScripts
// >(
// client: RedisClientType<M, F, S>,
// errorClient: RedisClientType<M, F, S> = client
// ): Promise<void> {
// const onceErrorPromise = once(errorClient, 'error');
// await client.sendCommand(['QUIT']);
// await Promise.all([
// onceErrorPromise,
// assert.rejects(client.ping(), SocketClosedUnexpectedlyError)
// ]);
// }
// testUtils.testWithClient('should reconnect when socket disconnects', async client => {
// await killClient(client);
// await assert.doesNotReject(client.ping());
// }, GLOBAL.SERVERS.OPEN);
// testUtils.testWithClient('should remember selected db', async client => {
// await client.select(1);
// await killClient(client);
// assert.equal(
// (await client.clientInfo()).db,
// 1
// );
// }, {
// ...GLOBAL.SERVERS.OPEN,
// minimumDockerVersion: [6, 2] // CLIENT INFO
// });
// testUtils.testWithClient('should propagated errors from "isolated" clients', client => {
// client.on('error', () => {
// // ignore errors
// });
// return client.executeIsolated(isolated => killClient(isolated, client));
// }, GLOBAL.SERVERS.OPEN);
testUtils.testWithClient('should remember selected db', async client => {
await client.select(1);
await killClient(client);
assert.equal(
(await client.clientInfo()).db,
1
);
}, {
...GLOBAL.SERVERS.OPEN,
minimumDockerVersion: [6, 2] // CLIENT INFO
});
testUtils.testWithClient('scanIterator', async client => {
const entries: Array<string> = [],

21
packages/client/lib/client/index.ts
View File

@@ -315,7 +315,7 @@ export default class RedisClient<
}
if (options?.database) {
this._selectedDB = options.database;
this.self._selectedDB = options.database;
}
if (options?.commandOptions) {
@@ -584,7 +584,7 @@ export default class RedisClient<
async SELECT(db: number): Promise<void> {
await this.sendCommand(['SELECT', db.toString()]);
this._selectedDB = db;
this.self._selectedDB = db;
}
select = this.SELECT;
@@ -742,7 +742,10 @@ export default class RedisClient<
/**
* @internal
*/
_executePipeline(commands: Array<RedisMultiQueuedCommand>) {
async _executePipeline(
commands: Array<RedisMultiQueuedCommand>,
selectedDB?: number
) {
if (!this._socket.isOpen) {
return Promise.reject(new ClientClosedError());
}
@@ -753,7 +756,13 @@ export default class RedisClient<
}))
);
this._scheduleWrite();
return promise;
const result = await promise;
if (selectedDB !== undefined) {
this.self._selectedDB = selectedDB;
}
return result;
}
/**
@@ -764,7 +773,7 @@ export default class RedisClient<
selectedDB?: number
) {
if (!this._socket.isOpen) {
return Promise.reject(new ClientClosedError());
throw new ClientClosedError();
}
const typeMapping = this._commandOptions?.typeMapping,
@@ -796,7 +805,7 @@ export default class RedisClient<
}
if (selectedDB !== undefined) {
this._selectedDB = selectedDB;
this.self._selectedDB = selectedDB;
}
return execResult as Array<unknown>;

9
packages/client/lib/client/multi-command.ts
View File

@@ -85,8 +85,6 @@ export type RedisClientMultiCommandType<
type ExecuteMulti = (commands: Array<RedisMultiQueuedCommand>, selectedDB?: number) => Promise<Array<unknown>>;
type ExecutePipeline = (commands: Array<RedisMultiQueuedCommand>) => Promise<Array<unknown>>;
export default class RedisClientMultiCommand<REPLIES = []> {
private static _createCommand(command: Command, resp: RespVersions) {
const transformReply = getTransformReply(command, resp);
@@ -153,13 +151,12 @@ export default class RedisClientMultiCommand<REPLIES = []> {
private readonly _multi = new RedisMultiCommand();
private readonly _executeMulti: ExecuteMulti;
private readonly _executePipeline: ExecutePipeline;
private readonly _executePipeline: ExecuteMulti;
private _selectedDB?: number;
constructor(executeMulti: ExecuteMulti, executePipeline: ExecutePipeline) {
constructor(executeMulti: ExecuteMulti, executePipeline: ExecuteMulti) {
this._executeMulti = executeMulti;
this._executePipeline = executePipeline;
// this._client = client;
}
SELECT(db: number, transformReply?: TransformReply): this {
@@ -193,7 +190,7 @@ export default class RedisClientMultiCommand<REPLIES = []> {
if (this._multi.queue.length === 0) return [] as MultiReplyType<T, REPLIES>;
return this._multi.transformReplies(
await this._executePipeline(this._multi.queue)
await this._executePipeline(this._multi.queue, this._selectedDB)
) as MultiReplyType<T, REPLIES>;
}