index.js

@@ -9,59 +9,52 @@ export default class Controller {
 
   // 定义一个模板变量
   assign(key, val) {
-    if (this.context.$$views) {
-      if (val === undefined || val === null) {
-        val = ''
-      }
-      key += ''
+    if (val === undefined || val === null) {
+      val = ''
+    }
+    key += ''
 
-      if (key) {
-        this.context.$$views.assign(key, val)
-      }
-    } else {
-      throw new Error('Views module not installed.')
+    if (key) {
+      this.context.$$views.assign(key, val)
     }
   }
 
   // 模板渲染, 参数是模板名, 可不带后缀, 默认是
   render(file, noParse = false) {
-    if (this.context.$$views) {
-      this.context.$$views
-        .render(file, noParse)
-        .then(html => {
-          this.response.render(html)
-        })
-        .catch(err => {
-          this.response.error(err)
-        })
-    } else {
-      throw new Error('Views module not installed.')
-    }
+    this.context.$$views
+      .render(file, noParse)
+      .then(html => {
+        this.response.render(html)
+      })
+      .catch(err => {
+        this.response.error(err)
+      })
   }
 
   get jwt() {
     return {
       result: this.#auth,
-      sign: data => {
+      sign(data) {
+        let { ttl } = this.context.get('jwt')
         let { __mix_key__ } = this.request
-        return this.context.$$jwt.sign(data, __mix_key__)
+        return this.context.$$jwt.sign(data, __mix_key__, ttl)
       },
-      verify: () => {
+      verify() {
         this.#auth = null
         let token = this.request.header('authorization')
         let { __mix_key__ } = this.request
 
         if (token) {
           this.#auth = this.context.$$jwt.verify(token, __mix_key__)
+          return this.#auth
         }
-        return this.#auth
       }
     }
   }
 
   // cookie读写
   cookie(key, val, opt) {
-    if (arguments.length === 1) {
+    if (arguments.length < 2) {
       return this.request.cookie(key)
     }
 
@@ -80,8 +73,8 @@ export default class Controller {
 
   // 会话读写
   session(key, val) {
-    let { enabled } = this.context.get('session')
-    let { ssid } = this.request
+    var { enabled } = this.context.get('session')
+    var { ssid } = this.request
     if (enabled) {
       if (arguments.length < 2) {
         // 这里返回的是Promise对象
@@ -94,4 +87,16 @@ export default class Controller {
       throw Error('Session was disabled.')
     }
   }
+
+  //针对框架定制的debug信息输出
+  xdebug(err) {
+    var msg = err
+    if (this.context.get('debug')) {
+      msg = err.message || err
+    }
+
+    msg = encodeURIComponent(msg + '')
+
+    this.response.append('X-debug', msg)
+  }
 }

package.json

@@ -5,11 +5,7 @@
   "description": "控制器基类。",
   "main": "index.js",
   "author": "yutent <yutent.io@gmail.com>",
-  "keywords": [
-    "fivejs",
-    "controller",
-    "http"
-  ],
-  "repository": "https://git.wkit.fun/gm5/controller.git",
+  "keywords": ["fivejs", "controller", "http"],
+  "repository": "https://github.com/bytedo/gmf.controller.git",
   "license": "MIT"
 }