support global exception catch

ConchbrainClub · Jan 19, 2024 · 7c18185 · 7c18185
1 parent 3f014a7
commit 7c18185
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 11 deletions.
diff --git a/src/core/app.js b/src/core/app.js
@@ -36,13 +36,10 @@ export class App {
             return
         }
 
-        try {
-            action.invoke(req, res)
-        }
-        catch (err) {
+        action.invoke(req, res).catch(err => {
             this.logger.error(err)
             res.error('Server Error')
-        }
+        })
     }
 
     use(callback) {
@@ -54,18 +51,40 @@ export class App {
         }
         return this
     }
-    
+
     useLogger(logger) {
         this.logger = logger
     }
 
     map(routePath, callback) {
         routePath = routePath.replaceAll('\\', '/')
 
-        this.actions.push({
-            path: routePath,
-            invoke: callback
-        })
+        switch (Object.prototype.toString.call(callback)) {
+
+            case '[object AsyncFunction]':
+                this.actions.push({
+                    path: routePath,
+                    invoke: callback
+                })
+                break
+
+            case '[object Function]':
+                this.actions.push({
+                    path: routePath,
+                    invoke: (req, res) => new Promise((resolve, reject) => {
+                        try {
+                            callback(req, res)
+                            resolve()
+                        } 
+                        catch (err) { reject(err) }
+                    })
+                })
+                break
+
+            default:
+                throw 'need [ Function / AsyncFunction ]'
+        }
+
         return this
     }
 

diff --git a/src/core/logger.js b/src/core/logger.js
@@ -1,4 +1,3 @@
-
 export default {
     info(msg) {
         console.log(msg)