Merge pull request #17 from hfour/fix/formatting-check

Set up prettier check

Author: spion

package.json

@@ -9,8 +9,9 @@
   "scripts": {
     "build": "tsc -p tsconfig.json",
     "prepublish": "tsc -p tsconfig.json",
+    "prettier:check": "prettier --no-color --check  \"src/**/*.ts\" \"test/**/*.ts\"",
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
-    "test": "jest",
+    "test": "yarn prettier:check && jest",
     "test:watch": "jest --watch",
     "test:cov": "jest --coverage"
   },

src/index.spec.ts

@@ -1,4 +1,4 @@
-import * as request from 'supertest';
+import * as request from "supertest";
 
 import { Test } from "@nestjs/testing";
 import { INestApplication, INestMicroservice } from "@nestjs/common";
@@ -15,7 +15,7 @@ describe("json-rpc-e2e", () => {
   let service: ITestClientService;
   let unauthorizedService: ITestClientService;
 
-  describe('standalone', () => {
+  describe("standalone", () => {
     beforeAll(async () => {
       let moduleRef = await Test.createTestingModule({
         controllers: [TestService]
@@ -61,7 +61,10 @@ describe("json-rpc-e2e", () => {
     });
 
     it(`should fail to invoke unexposed methods`, async () => {
-      const expectedCodedException = new CodedRpcException("Method not found: test.notExposed", 404);
+      const expectedCodedException = new CodedRpcException(
+        "Method not found: test.notExposed",
+        404
+      );
       const resp = service.notExposed({ test: "data" });
       await expect(resp).rejects.toThrowError(expectedCodedException);
     });
@@ -83,17 +86,17 @@ describe("json-rpc-e2e", () => {
     });
   });
 
-  describe('hybrid', () => {
+  describe("hybrid", () => {
     beforeAll(async () => {
       let moduleRef = await Test.createTestingModule({
         controllers: [TestService]
       }).compile();
-    
+
       app = moduleRef.createNestApplication();
 
       server = new JsonRpcServer({
-        path: '/rpc',
-        adapter: app.getHttpAdapter(),
+        path: "/rpc",
+        adapter: app.getHttpAdapter()
       });
 
       app.connectMicroservice({ strategy: server });
@@ -102,46 +105,46 @@ describe("json-rpc-e2e", () => {
       await app.init();
     });
 
-    it('should invoke RPC methods on incoming HTTP requests', async () => {
+    it("should invoke RPC methods on incoming HTTP requests", async () => {
       await request(app.getHttpServer())
-        .post('/rpc')
-        .set('Authorization', 'Bearer xyz')
+        .post("/rpc")
+        .set("Authorization", "Bearer xyz")
         .send({
-          jsonrpc: '2.0',
-          method: 'test.invokeClientService',
-          id: '1',
+          jsonrpc: "2.0",
+          method: "test.invokeClientService",
+          id: "1",
           params: {
-            test: 'hi',
-          },
+            test: "hi"
+          }
         })
         .expect({
-          jsonrpc: '2.0',
-          id: '1',
-          result: { test: 'hi' }
+          jsonrpc: "2.0",
+          id: "1",
+          result: { test: "hi" }
         });
     });
 
-    it('should wrap json-rpc errors in http 200', async () => {
+    it("should wrap json-rpc errors in http 200", async () => {
       await request(app.getHttpServer())
-      .post('/rpc')
-      .set('Authorization', 'Bearer xyz')
-      .send({
-        jsonrpc: '2.0',
-        method: 'test.notExposed',
-        id: '1',
-        params: {
-          test: 'hi',
-        },
-      })
-      .expect({
-        jsonrpc: '2.0',
-        id: '1',
-        error: { 
-          code: 404, 
-          data: {}, 
-          message: 'Method not found: test.notExposed',
-        }
-      });
+        .post("/rpc")
+        .set("Authorization", "Bearer xyz")
+        .send({
+          jsonrpc: "2.0",
+          method: "test.notExposed",
+          id: "1",
+          params: {
+            test: "hi"
+          }
+        })
+        .expect({
+          jsonrpc: "2.0",
+          id: "1",
+          error: {
+            code: 404,
+            data: {},
+            message: "Method not found: test.notExposed"
+          }
+        });
     });
   });
 });

src/server.ts

@@ -2,7 +2,7 @@ import * as express from "express";
 import * as http from "http";
 
 import { Server, CustomTransportStrategy } from "@nestjs/microservices";
-import { ExpressAdapter } from '@nestjs/platform-express';
+import { ExpressAdapter } from "@nestjs/platform-express";
 
 import { JsonRpcResponse } from "./transport-types";
 import { CodedRpcException } from "./coded-error";
@@ -30,11 +30,11 @@ interface HybridJsonRpcServerOptions {
 }
 
 interface StandaloneJsonRpcServerOptions {
- /**
-  * Listening port for the HTTP server
-  */
+  /**
+   * Listening port for the HTTP server
+   */
   port: number;
- 
+
   /**
    * Listening host (optional, defaults to any)
    */
@@ -90,26 +90,34 @@ export class JsonRpcServer extends Server implements CustomTransportStrategy {
       app.initHttpServer({});
     }
 
-    app.getInstance().post(this.options.path, express.json(), async (req: express.Request, res: express.Response) => {
-      let handler = this.getHandlerByPattern(req.body.method);
+    app
+      .getInstance()
+      .post(
+        this.options.path,
+        express.json(),
+        async (req: express.Request, res: express.Response) => {
+          let handler = this.getHandlerByPattern(req.body.method);
 
-      if (handler == null) {
-        let error = new CodedRpcException("Method not found: " + req.body.method, 404);
-        return res.status(200).json(serializeResponse(req.body.id, { error }));
-      }
+          if (handler == null) {
+            let error = new CodedRpcException("Method not found: " + req.body.method, 404);
+            return res.status(200).json(serializeResponse(req.body.id, { error }));
+          }
 
-      let context = new JsonRpcContext(req, app.getHttpServer());
+          let context = new JsonRpcContext(req, app.getHttpServer());
 
-      let observableResult = this.transformToObservable(await handler(req.body.params, context));
-      let promiseResult = observableResult.toPromise();
+          let observableResult = this.transformToObservable(
+            await handler(req.body.params, context)
+          );
+          let promiseResult = observableResult.toPromise();
 
-      let response = await promiseResult.then(
-        value => ({ value }),
-        error => ({ error })
-      );
+          let response = await promiseResult.then(
+            value => ({ value }),
+            error => ({ error })
+          );
 
-      res.status(200).json(serializeResponse(req.body.id, response));
-    });
+          res.status(200).json(serializeResponse(req.body.id, response));
+        }
+      );
 
     await invokeAsync(cb => {
       if (this.isStandalone(this.options)) {
@@ -122,7 +130,7 @@ export class JsonRpcServer extends Server implements CustomTransportStrategy {
         cb();
       }
     });
-    
+
     callback();
   }