Merge branch 'RivaCode-message_pattern_string-key'

Author: Kamil

packages/microservices/server/server.ts

@@ -1,7 +1,7 @@
 import { Logger } from '@nestjs/common/services/logger.service';
 import { loadPackage } from '@nestjs/common/utils/load-package.util';
-import { isFunction } from '@nestjs/common/utils/shared.utils';
-import { EMPTY as empty, Observable, Subscription, from as fromPromise, of } from 'rxjs';
+import { isFunction, isString } from '@nestjs/common/utils/shared.utils';
+import { EMPTY as empty, from as fromPromise, Observable, of, Subscription } from 'rxjs';
 import { catchError, finalize } from 'rxjs/operators';
 import { MessageHandlers } from '../interfaces/message-handlers.interface';
 import { MicroserviceOptions, WritePacket } from './../interfaces';
@@ -10,6 +10,14 @@ export abstract class Server {
   protected readonly messageHandlers: MessageHandlers = {};
   protected readonly logger = new Logger(Server.name);
 
+  public addHandler(
+    pattern: any,
+    callback: (data) => Promise<Observable<any>>,
+  ) {
+    const key = isString(pattern) ? pattern : JSON.stringify(pattern);
+    this.messageHandlers[key] = callback;
+  }
+
   public getHandlers(): MessageHandlers {
     return this.messageHandlers;
   }
@@ -20,13 +28,6 @@ export abstract class Server {
     return this.messageHandlers[pattern] ? this.messageHandlers[pattern] : null;
   }
 
-  public addHandler(
-    pattern: any,
-    callback: (data) => Promise<Observable<any>>,
-  ) {
-    this.messageHandlers[JSON.stringify(pattern)] = callback;
-  }
-
   public send(
     stream$: Observable<any>,
     respond: (data: WritePacket) => void,

packages/microservices/test/server/server.spec.ts

@@ -11,7 +11,7 @@ class TestServer extends Server {
 describe('Server', () => {
   const server = new TestServer();
   const callback = () => {},
-    pattern = { test: 'test' };
+    pattern = { test: 'test pattern' };
 
   describe('add', () => {
     it(`should add handler as a stringified pattern key`, () => {
@@ -20,6 +20,12 @@ describe('Server', () => {
       const handlers = server.getHandlers();
       expect(handlers[JSON.stringify(pattern)]).to.equal(callback);
     });
+
+    it(`should add handler as string pattern key`, () => {
+      server.addHandler(pattern.test, callback as any);
+      const handlers = server.getHandlers();
+      expect(handlers[pattern.test]).to.equal(callback);
+    });
   });
   describe('send', () => {
     let stream$: Observable<string>;
@@ -73,9 +79,7 @@ describe('Server', () => {
         it('should returns Observable', async () => {
           const value = 100;
           expect(
-            await server
-              .transformToObservable(of(value))
-              .toPromise(),
+            await server.transformToObservable(of(value)).toPromise(),
           ).to.be.eq(100);
         });
       });