feat(expressjs): make mware be always async

qiwi · Mar 25, 2020 · 047ebb1 · 047ebb1
1 parent aa1c00b
commit 047ebb1
Show file tree

Hide file tree

Showing 4 changed files with 141 additions and 81 deletions.
diff --git a/packages/expressjs/package.json b/packages/expressjs/package.json
@@ -40,6 +40,8 @@
     "postupdate": "yarn && yarn build && yarn test"
   },
   "dependencies": {
+    "@qiwi/decorator-utils": "^1.3.1",
+    "@qiwi/mware": "^1.10.0",
     "@qiwi/json-rpc-common": "^1.0.2",
     "@qiwi/substrate": "^1.18.16",
     "@types/express": "^4.17.3",

diff --git a/packages/expressjs/src/main/ts/index.ts b/packages/expressjs/src/main/ts/index.ts
@@ -2,7 +2,7 @@ import 'reflect-metadata'
 
 import {get} from 'lodash'
 
-import {Request, Response} from 'express'
+import {Request, Response, NextFunction} from 'express'
 
 import {
   JSON_RPC_METADATA,
@@ -18,6 +18,8 @@ import {
   OK,
 } from '@qiwi/json-rpc-common'
 import {IMetaTypedValue} from '@qiwi/substrate'
+import {constructDecorator, METHOD} from '@qiwi/decorator-utils'
+
 export * from '@qiwi/json-rpc-common'
 
 export const enum JsonRpcDecoratorType {
@@ -26,6 +28,16 @@ export const enum JsonRpcDecoratorType {
   PARAMS = 'params',
 }
 
+const asyncMiddleware = (fn: Function) => function(this: any, req: Request, res: Response, next: NextFunction) {
+  return Promise.resolve(fn.call(this, req, res, next)).catch(next)
+}
+
+const AsyncMiddleware = constructDecorator((targetType, target) => {
+  if (targetType === METHOD) {
+    return asyncMiddleware(target)
+  }
+})
+
 type IJsonRpcMetaTypedValue = IMetaTypedValue<IParsedObject, 'jsonRpc', {}>
 
 export function JsonRpcMiddleware(): ClassDecorator {
@@ -34,6 +46,7 @@ export function JsonRpcMiddleware(): ClassDecorator {
     const extend: Extender = (base) => {
       class Extended extends base {
 
+        @AsyncMiddleware()
         protected middleware(req: Request, res: Response): any {
           const boxedJsonRpc = (this.constructor as any).parseRequest(req)
           if (!boxedJsonRpc) {

diff --git a/packages/expressjs/src/test/ts/index.ts b/packages/expressjs/src/test/ts/index.ts
@@ -46,7 +46,7 @@ describe('expressjs-json-rpc', () => {
     const controller = new SomeJsonRpcController()
     const mware = controller.middleware.bind(controller)
 
-    it('properly handles request', () => {
+    it('properly handles request', async() => {
       const {req, res} = reqresnext({
         body: {
           jsonrpc: '2.0',
@@ -59,7 +59,7 @@ describe('expressjs-json-rpc', () => {
         },
       })
 
-      mware(req, res)
+      await mware(req, res)
 
       expect(res.statusCode).toBe(OK)
       expect(res.body).toBe(
@@ -71,7 +71,7 @@ describe('expressjs-json-rpc', () => {
       )
     })
 
-    it('finds proper method', () => {
+    it('finds proper method', async() => {
       const {req, res} = reqresnext({
         body: {
           jsonrpc: '2.0',
@@ -84,7 +84,7 @@ describe('expressjs-json-rpc', () => {
         },
       })
 
-      mware(req, res)
+      await mware(req, res)
 
       expect(res.statusCode).toBe(OK)
       expect(res.body).toBe(
@@ -96,7 +96,7 @@ describe('expressjs-json-rpc', () => {
       )
     })
 
-    it('returns error if method does not exist', () => {
+    it('returns error if method does not exist', async() => {
       const {req, res} = reqresnext({
         body: {
           jsonrpc: '2.0',
@@ -106,7 +106,7 @@ describe('expressjs-json-rpc', () => {
         },
       })
 
-      mware(req, res)
+      await mware(req, res)
 
       expect(res.statusCode).toBe(OK)
       expect(res.body).toBe(
@@ -122,7 +122,7 @@ describe('expressjs-json-rpc', () => {
       )
     })
 
-    it('returns error if method returns JsonRpcError', () => {
+    it('returns error if method returns JsonRpcError', async() => {
       const {req, res} = reqresnext({
         body: {
           jsonrpc: '2.0',
@@ -132,7 +132,7 @@ describe('expressjs-json-rpc', () => {
         },
       })
 
-      mware(req, res)
+      await mware(req, res)
 
       expect(res.statusCode).toBe(OK)
       expect(res.body).toBe(
@@ -148,7 +148,7 @@ describe('expressjs-json-rpc', () => {
     })
 
     describe('static', () => {
-      describe('parseRequest', () => {
+      describe('#parseRequest', () => {
         it('parseRequest return IJsonRpcMetaTypedValue', () => {
           // @ts-ignore
           const res = SomeJsonRpcController.parseRequest({
@@ -180,7 +180,7 @@ describe('expressjs-json-rpc', () => {
         })
       })
 
-      describe('resolveHandler', () => {
+      describe('#resolveHandler', () => {
         it('work correctly', () => {
           // @ts-ignore
           const boxedRpc = SomeJsonRpcController.parseRequest({
@@ -205,7 +205,7 @@ describe('expressjs-json-rpc', () => {
         })
       })
 
-      describe('resolveParam', () => {
+      describe('#resolveParam', () => {
         it('work correctly', () => {
           // @ts-ignore
           const boxedRpc = SomeJsonRpcController.parseRequest({