wip: fixed test & fixing single queue clients type

SerhiyGreench · SerhiyGreench · commit a129b358d5fe · 2025-03-13T15:59:29.000+02:00
diff --git a/src/IMQClient.ts b/src/IMQClient.ts
@@ -101,7 +101,7 @@ export abstract class IMQClient extends EventEmitter {
         this.options = { ...DEFAULT_IMQ_CLIENT_OPTIONS, ...options };
         this.id = pid(baseName);
         this.logger = this.options.logger || /* istanbul ignore next */ console;
-        this.hostName = `${osUuid()}-${1 || this.id}:client`;
+        this.hostName = `${osUuid()}-${this.id}:client`;
         this.name = `${baseName}-${this.hostName}`;
         this.serviceName = serviceName || baseName.replace(/Client$/, '');
         this.queueName = this.options.singleQueue ? this.hostName : this.name;
diff --git a/src/cache/RedisCache.ts b/src/cache/RedisCache.ts
@@ -26,7 +26,7 @@ import {
 import * as os from 'os';
 
 export interface IRedisCacheOptions extends Partial<IMQOptions> {
-    conn?: IRedisClient
+    conn?: IRedisClient;
 }
 
 export const DEFAULT_REDIS_CACHE_OPTIONS = {
diff --git a/test/IMQCache.ts b/test/IMQCache.ts
@@ -53,7 +53,6 @@ describe('IMQCache', () => {
 
             expect(IMQCache.adapters['RedisCache'])
                 .to.be.instanceOf(RedisCache);
-
         });
     });
 
diff --git a/test/IMQClient.ts b/test/IMQClient.ts
@@ -24,7 +24,7 @@ import {
     IMQDelay,
     Description,
     expose,
-    remote
+    remote,
 } from '..';
 import * as sinon from 'sinon';
 import * as fs from 'fs';
@@ -133,6 +133,24 @@ describe('IMQClient', () => {
             expect(new TestServiceClient({}, undefined, 'TestClient').name)
                 .to.contain('TestClient');
         });
+
+        it('should re-use existing redis connection if singleQueue option '
+            + 'enabled', () => {
+            const options = { logger, singleQueue: true };
+            const client1: any = new TestServiceClient(options);
+            const client2: any = new TestServiceClient(options);
+
+            expect(client1.imq).to.equal(client2.imq);
+        });
+
+        it('should not re-use existing redis connection if singleQueue option '
+            + 'disabled', () => {
+            const options = { logger, singleQueue: false };
+            const client1: any = new TestServiceClient(options);
+            const client2: any = new TestServiceClient(options);
+
+            expect(client1.imq).to.not.equal(client2.imq);
+        });
     });
 
     describe('describe()', () => {
diff --git a/test/cache/RedisCache.ts b/test/cache/RedisCache.ts
@@ -18,7 +18,7 @@
 import { Redis, logger } from '../mocks';
 import { expect } from 'chai';
 import { RedisCache } from '../..';
-import { uuid } from '@imqueue/core';
+import { IRedisClient, uuid } from '@imqueue/core';
 
 describe('cache/RedisCache', () => {
     it('should be a class', () => {
@@ -55,7 +55,7 @@ describe('cache/RedisCache', () => {
         });
 
         it('should use connection from options if passed', async () => {
-            const conn = new Redis();
+            const conn = new Redis() as unknown as IRedisClient;
             const cache = new RedisCache();
 
             await cache.init({ conn, logger });
@@ -74,7 +74,6 @@ describe('cache/RedisCache', () => {
 
         after(async () => RedisCache.destroy());
 
-
         it('should return undefined if nothing found', async () => {
             expect(await cache.get(uuid())).to.be.undefined;
         });
diff --git a/test/mocks/redis.ts b/test/mocks/redis.ts
@@ -53,11 +53,39 @@ export class RedisClientMock extends EventEmitter {
     public quit() {}
 
     // noinspection JSMethodCanBeStatic
-    public set(...args: any[]): number {
-        const [key, val] = args;
+    public async set(...args: any[]): Promise<boolean> {
+        let [key, val, units, expire, nx] = args;
+
+        if (
+            (units === 'NX' || nx === 'NX') &&
+            RedisClientMock.__keys[key] !== undefined
+        ) {
+            const cb = args.pop();
+            typeof cb === 'function' && cb(null, 0);
+            return true;
+        }
+
         RedisClientMock.__keys[key] = val;
-        this.cbExecute(args.pop(), null, 1);
-        return 1;
+
+        if (typeof units === 'string' && typeof expire === 'number') {
+            if (units === 'EX') {
+                expire *= 1000;
+            }
+            setTimeout(() => { delete RedisClientMock.__keys[key] }, expire);
+        }
+
+        const cb = args.pop();
+        typeof cb === 'function' && cb(null, 1);
+        return true;
+    }
+
+    // noinspection JSUnusedGlobalSymbols,JSMethodCanBeStatic
+    public async get(...args: any[]): Promise<string> {
+        const [key] = args;
+        const val = RedisClientMock.__keys[key];
+        const cb = args.pop();
+        typeof cb === 'function' && cb(null, val);
+        return val;
     }
 
     // noinspection JSUnusedGlobalSymbols,JSMethodCanBeStatic
@@ -288,12 +316,13 @@ export class RedisClientMock extends EventEmitter {
     }
 }
 
-mock('ioredis', {
-    default: RedisClientMock,
-    Redis: RedisClientMock,
-});
+const Redis = RedisClientMock;
+
+mock('ioredis', { Redis, default: Redis });
 
 // @ts-ignore
-export * as Redis from 'ioredis';
+export * from 'ioredis';
+
+export { Redis };
 
-export default { Redis: RedisClientMock };
+export default Redis;

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import {`
`26`	`26`	`import * as os from 'os';`
`27`	`27`
`28`	`28`	`export interface IRedisCacheOptions extends Partial<IMQOptions> {`
`29`		`- conn?: IRedisClient`
	`29`	`+ conn?: IRedisClient;`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`export const DEFAULT_REDIS_CACHE_OPTIONS = {`