- removed console.logs, moved CodedRPCException to index.ts, removed comments

Author: goce-h4

src/index.spec.ts

@@ -3,7 +3,7 @@ import * as request from "supertest";
 import { Test } from "@nestjs/testing";
 import { INestMicroservice } from "@nestjs/common";
 
-import { TestService, CodedRpcException } from "./test-handler";
+import { TestService } from "./test-handler";
 import { JSONRPCServer } from ".";
 
 describe("json-rpc-e2e", () => {
@@ -48,19 +48,6 @@ describe("json-rpc-e2e", () => {
       .send({ method: "test.testError", params: { data: "hi" } })
       .expect(403)
       .expect(errorObj);
-
-    // The testing with expect(req).rejects doesn't work
-
-    // const req = request(server.server)
-    //   .post("/rpc/v1")
-    //   .send({ method: "test.testError", params: { data: "hi" } });
-
-    // expect(req).rejects.toEqual(
-    //   new CodedRpcException("RPC EXCEPTION", 403, {
-    //     fromService: "Test Service",
-    //     params: { data: "hi" }
-    //   })
-    //);
   });
 
   afterAll(async () => {

src/index.ts

@@ -1,7 +1,7 @@
 import * as express from "express";
 import * as http from "http";
 
-import { Server, CustomTransportStrategy } from "@nestjs/microservices";
+import { Server, CustomTransportStrategy, RpcException } from "@nestjs/microservices";
 import { Injectable, Controller } from "@nestjs/common";
 import { MessagePattern } from "@nestjs/microservices";
 
@@ -73,8 +73,6 @@ export class JSONRPCServer extends Server implements CustomTransportStrategy {
           error => ({ error })
         );
 
-      console.log(response);
-
       if ("error" in response) {
         let resp = { code: 500, message: response.error.message, data: undefined };
         if ("code" in response.error) resp.code = response.error.code;
@@ -101,3 +99,9 @@ export class JSONRPCServer extends Server implements CustomTransportStrategy {
     // do nothing, maybe block further requests
   }
 }
+
+export class CodedRpcException extends RpcException {
+  constructor(message: string, public code: number = 500, public data: any = {}) {
+    super({ message, code, data });
+  }
+}

src/test-handler.ts

@@ -12,8 +12,7 @@ import {
   Scope
 } from "@nestjs/common";
 
-import { JSONRpcService } from ".";
-import { RpcException } from "@nestjs/microservices";
+import { JSONRpcService, CodedRpcException } from ".";
 
 const initialModuleState = {
   pipeCalled: false,
@@ -83,15 +82,7 @@ export class TestService {
   @UseInterceptors(TestInterceptor)
   @UseGuards(TestGuard)
   public async testError(params: any) {
-    console.log("Throw an error !!!");
-
     // construct the error object with some data inside
     throw new CodedRpcException("RPC EXCEPTION", 403, { fromService: "Test Service", params });
   }
 }
-
-export class CodedRpcException extends RpcException {
-  constructor(message: string, public code: number = 500, public data: any = {}) {
-    super({ message, code, data });
-  }
-}