fix(router): added async handler for skill routes

botpress · Nov 9, 2018 · ffcde57 · ffcde57
1 parent 71a5772
commit ffcde57
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 23 deletions.
diff --git a/src/bp/core/routers/modules.ts b/src/bp/core/routers/modules.ts
@@ -1,13 +1,17 @@
+import { Logger } from 'botpress/sdk'
 import { Router } from 'express'
 
 import { ModuleLoader } from '../module-loader'
 import { SkillService } from '../services/dialog/skill/service'
 
 import { CustomRouter } from '.'
+import { asyncMiddleware, error as sendError, success as sendSuccess } from './util'
 export class ModulesRouter implements CustomRouter {
   public readonly router: Router
+  private asyncMiddleware!: Function
 
-  constructor(private moduleLoader: ModuleLoader, private skillService: SkillService) {
+  constructor(logger: Logger, private moduleLoader: ModuleLoader, private skillService: SkillService) {
+    this.asyncMiddleware = asyncMiddleware({ logger })
     this.router = Router({ mergeParams: true })
     this.setupRoutes()
   }
@@ -17,26 +21,32 @@ export class ModulesRouter implements CustomRouter {
       res.json(this.moduleLoader.getLoadedModules())
     })
 
-    this.router.get('/skills', async (req, res, next) => {
-      try {
-        res.send(await this.moduleLoader.getAllSkills())
-      } catch (err) {
-        next(err)
-      }
-    })
-
-    this.router.post('/:moduleName/skill/:skillId/generateFlow', async (req, res) => {
-      const flowGenerator = await this.moduleLoader.getFlowGenerator(req.params.moduleName, req.params.skillId)
-
-      if (!flowGenerator) {
-        return res.status(404).send('Invalid module name or flow name')
-      }
-
-      try {
-        res.send(await this.skillService.finalizeFlow(flowGenerator(req.body)))
-      } catch (err) {
-        res.status(400).send(`Error while trying to generate the flow: ${err}`)
-      }
-    })
+    this.router.get(
+      '/skills',
+      this.asyncMiddleware(async (req, res, next) => {
+        try {
+          res.send(await this.moduleLoader.getAllSkills())
+        } catch (err) {
+          next(err)
+        }
+      })
+    )
+
+    this.router.post(
+      '/:moduleName/skill/:skillId/generateFlow',
+      this.asyncMiddleware(async (req, res) => {
+        const flowGenerator = await this.moduleLoader.getFlowGenerator(req.params.moduleName, req.params.skillId)
+
+        if (!flowGenerator) {
+          return res.status(404).send('Invalid module name or flow name')
+        }
+
+        try {
+          res.send(await this.skillService.finalizeFlow(flowGenerator(req.body)))
+        } catch (err) {
+          res.status(400).send(`Error while trying to generate the flow: ${err}`)
+        }
+      })
+    )
   }
 }
diff --git a/src/bp/core/server.ts b/src/bp/core/server.ts
@@ -69,7 +69,7 @@ export default class HTTPServer {
 
     this.httpServer = createServer(this.app)
 
-    this.modulesRouter = new ModulesRouter(moduleLoader, skillService)
+    this.modulesRouter = new ModulesRouter(this.logger, moduleLoader, skillService)
     this.authRouter = new AuthRouter(this.logger, this.authService, this.adminService)
     this.adminRouter = new AdminRouter(this.logger, this.authService, this.adminService, licenseService)
     this.shortlinksRouter = new ShortLinksRouter()