GRPC server tests updated:

- Added package recursive search test for support of proto-namespaces
- Updated tests which were testing single level proto structure

Author: anton-alation

packages/microservices/server/server-grpc.ts

@@ -76,7 +76,6 @@ export class ServerGrpc extends Server implements CustomTransportStrategy {
    * @param grpcPkg
    */
   public getServiceNames(grpcPkg: any): {name: string, service: any}[] {
-    const keys = Object.keys(grpcPkg);
     // Define accumulator to collect all of the services available to load
     const services: {name: string, service: any}[] = [];
     // Initiate recursive services collector starting with empty name
@@ -232,8 +231,12 @@ export class ServerGrpc extends Server implements CustomTransportStrategy {
         nameExtended = name + '.' + key;
       // Take nested object
       const nested = grpcDefinition[key];
-      // Check if it's in depth with service definition
-      if (nested.hasOwnProperty('service')) {
+      // Check if it's in depth with service definition available
+      const requirement1 = typeof nested.service !== 'undefined';
+      // Check if first requirement passable and service isn't a boolean value
+      const requirement2 = requirement1 ? nested.service !== false : false;
+      // Check if both requirements satisfied
+      if (requirement1 && requirement2) {
         // Add new service object to accumulator
         accumulator.push({
           name: nameExtended,

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

@@ -53,8 +53,8 @@ describe('ServerGrpc', () => {
       it('should call "addService"', async () => {
         const serviceNames = ['test', 'test2'];
         sinon.stub(server, 'lookupPackage').callsFake(() => ({
-          test: true,
-          test2: true,
+          test: {service: true},
+          test2: {service: true}
         }));
         sinon.stub(server, 'getServiceNames').callsFake(() => serviceNames);
 
@@ -73,7 +73,16 @@ describe('ServerGrpc', () => {
         key2: { service: true },
         key3: { service: false },
       };
-      const expected = ['key', 'key2'];
+      const expected = [
+        {
+          name: 'key',
+          service: {service: true}
+        },
+        {
+          name: 'key2',
+          service: {service: true}
+        }
+      ];
       expect(server.getServiceNames(obj)).to.be.eql(expected);
     });
   });
@@ -225,4 +234,57 @@ describe('ServerGrpc', () => {
       expect(server.deserialize(content)).to.equal(content);
     });
   });
+
+  describe('proto interfaces parser should account for package namespaces', () => {
+    it('should parse multi-level proto package tree"', () => {
+      const grpcPkg = {
+        A: {
+          C: {
+            E: {
+              service: {
+                serviceName: {}
+              }
+            }
+          }
+        },
+        B: {
+          D: {
+            service: {
+              serviceName: {}
+            }
+          }
+        }
+      };
+      const svcs = server.getServiceNames(grpcPkg);
+      expect(svcs.length).to
+        .be.equal(
+          2,
+        'Amount of services collected from namespace should be equal 2'
+      );
+      expect(svcs[0].name).to.be.equal('A.C.E');
+      expect(svcs[1].name).to.be.equal('B.D');
+    });
+    it('should parse single level proto package tree"', () => {
+      const grpcPkg = {
+        A: {
+          service: {
+            serviceName: {}
+          }
+        },
+        B: {
+          service: {
+            serviceName: {}
+          }
+        }
+      };
+      const services = server.getServiceNames(grpcPkg);
+      expect(services.length).to
+        .be.equal(
+        2,
+        'Amount of services collected from namespace should be equal 2'
+      );
+      expect(services[0].name).to.be.equal('A');
+      expect(services[1].name).to.be.equal('B');
+    });
+  });
 });