jj.js 0.13.0 → 0.14.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# v0.14.0 / 2024-03-07
+1. 优化类型文件生成
+2. 修复优化url生成
+3. 自动加载功能，不缓存空文件
+4. 修复优化Resquest类请求方法判断
+5. 默认开启cookie签名机制
+
 # v0.13.0 / 2024-02-27
 1. 新增request系统类库
 2. response类isAjax方法迁移到request类

package/jsconfig.json

@@ -5,5 +5,5 @@
         "resolveJsonModule": true,
         "checkJs": true
     },
-    "exclude": ["node_modules", "docs", "./lib/ctx.js"]
-  }
+    "exclude": ["node_modules", "docs"]
+}

package/lib/app.js

@@ -1,6 +1,6 @@
 const path = require('path');
 const Koa = require('koa');
-const {app: cfg_app} = require('./config');
+const {app: cfg_app, cookie: cfg_cookie} = require('./config');
 const Logger = require('./logger');
 const Response = require('./response');
 const router = require('./router');
@@ -54,6 +54,9 @@ class App extends Koa
         // router
         this.use(router.routes()).use(router.allowedMethods());
 
+        // cookie
+        cfg_cookie.keys && (this.keys = cfg_app.app_debug ? ['jj.js'] : cfg_cookie.keys);
+
         // types
         if(cfg_app.app_debug) {
             const {isFileSync} = require('./utils/fs');

package/lib/config.js

@@ -49,6 +49,11 @@ const cache = {
     clear_time: undefined // (undefined: 清理一次, 0: 关闭自动清理, >0: 为自动清理周期)
 }
 
+const cookie = {
+    keys: [Math.random().toString(36).slice(-8)], // cookie密钥
+    signed: true // 默认开启签名
+}
+
 const page = {
     page_key    : 'page', // 默认分页标识
     key_origin    : 'query', // query 或 params
@@ -94,6 +99,6 @@ module.exports = {
     cache: {...cache, ...base_config.cache},
     page: {...page, ...base_config.page},
     routes: base_config.routes,
-    cookie: base_config.cookie,
+    cookie: {...cookie, ...base_config.cookie},
     tpl: {...tpl, ...base_config.tpl}
 };

package/lib/cookie.js

@@ -30,20 +30,21 @@ class Cookie extends Context
         if(key === undefined) {
             return this.all();
         }
-        return this.ctx.cookies.get(key, options);
+        return this.ctx.cookies.get(key, {signed: cfg_cookie.signed, ...options});
     }
 
     /**
      * 删除或清理cookie
      * @public
      * @param {*} [key] - 为空则清理所有cookie
+     * @param {import('cookies').GetOption} [options]
      * @returns {this}
      */
-    delete(key) {
+    delete(key, options) {
         if(key === undefined) {
             this.clear();
         } else {
-            this.ctx.cookies.set(key, '', {maxAge: 0});
+            this.ctx.cookies.set(key, '', {...cfg_cookie, ...options, maxAge: 0});
         }
         return this;
     }

package/lib/loader.js

@@ -43,8 +43,8 @@ function loader(dir='./', ...args) {
                         nodeType[_nodePath] = 'file';
                     } else if(isDirSync(_nodePath)) {
                         nodeType[_nodePath] = 'dir';
-                    } else{
-                        nodeType[_nodePath] = 'none';
+                    } else {
+                        // nodeType[_nodePath] = 'none';
                     }
                 }
                 if(nodeType[_nodePath] == 'file') {

package/lib/request.js

@@ -151,7 +151,7 @@ class Request extends Context
      * @returns {string}
      */
     method() {
-        return this.ctx.method;
+        return this.ctx.method.toLowerCase();
     }
 
     /**
@@ -159,7 +159,7 @@ class Request extends Context
      * @returns {boolean}
      */
     isGet() {
-        return this.ctx.method == 'get';
+        return this.method() == 'get';
     }
 
     /**
@@ -167,7 +167,7 @@ class Request extends Context
      * @returns {boolean}
      */
     isPost() {
-        return this.ctx.method == 'post';
+        return this.method() == 'post';
     }
 
     /**
@@ -178,8 +178,7 @@ class Request extends Context
     isAjax() {
         return this.ctx.headers['x-requested-with'] && String(this.ctx.headers['x-requested-with']).toLowerCase() == 'xmlhttprequest'
             || this.ctx.request.type.toLowerCase() == 'application/json'
-            || this.ctx.query.is_ajax
-            || this.ctx.request.body && this.ctx.request.body.is_ajax
+            || this.query('is_ajax')
             ? true : false;
     }
 

package/lib/types.js

@@ -57,15 +57,16 @@ function start() {
  */
 async function createFile(f) {
     if(f) {
+        require.cache[f] && delete(require.cache[f])
         if(f == this._f) {
-            return require.cache[f] && delete(require.cache[f]);
+            return;
         }
         
         this._f && require.cache[this._f] && delete(require.cache[this._f]);
         this._f = f;
     
         const f_info = f.replace(cfg_app.base_dir + path.sep, '').split(path.sep);
-        if(f_info[0] && f_info[1] && f_info[0] != cfg_app.common_app && !~f_info[0].indexOf('.')) {
+        if(cfg_app.app_multi && f_info[0] && f_info[1] && f_info[0] != cfg_app.common_app && f_info[0] != 'config' && !~f_info[0].indexOf('.')) {
             this._APP = f_info[0];
         }
     } else {

package/lib/url.js

@@ -18,19 +18,28 @@ class Url extends Context
      * 编译生成url
      * @public
      * @param {string} [url] - 网址，支持智能解析
-     * @param {object} [vars] - 网址参数
-     * @param {string} [ext] - 网址后缀
-     * @param {string} [domain] - 网址域名
+     * @param {object|string|boolean} [vars] - 网址参数
+     * @param {string|boolean} [ext] - 网址后缀
+     * @param {string|boolean} [domain] - 网址域名
      * @returns {string}
+     * @example - build(url, vars, ext, domain|true)
+     * @example - build(url, ext, domain|true)
+     * @example - build(url, domain|true)
      */
-    build(url='', vars, ext='', domain='') {
-        if(vars && typeof vars != 'object') {
+    build(url='', vars={}, ext='', domain='') {
+        if(typeof vars != 'object') {
             [vars, ext, domain] = [{}, vars, ext];
         }
+        if(ext === true || ext.slice(0, 4) == 'http') {
+            [ext, domain] = ['', ext];
+        }
+        if(domain === true) {
+            domain = this.ctx.protocol + '://' + this.ctx.host;
+        }
         const query = {...vars};
         let urls;
         if(url.slice(0, 1) == ':') {
-            url = this.ruleUrl(url.substr(1), query);
+            url = this.ruleUrl(url.slice(0, 1), query);
         } else if(url.slice(0, 1) != '/' && url.slice(0, 4) != 'http') {
             urls = url.split('/').reverse().map(u => toLine(u));
             if(urls.length < 3) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jj.js",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "A super simple lightweight NodeJS MVC framework（一个超级简单轻量的NodeJS MVC框架）",
   "main": "jj.js",
   "scripts": {},

package/types.js

@@ -171,6 +171,7 @@
 
 /**
  * @typedef {import('cookies').SetOption} CookieConfig - Cookie配置，一般不用设置
+ * @typedef {typeof import('koa').prototype.keys} Keygrip
  */
 
 /**
@@ -188,7 +189,7 @@
  * @property {CacheConfig} [cache]
  * @property {PageConfig} [page]
  * @property {RouteConfig} [routes]
- * @property {CookieConfig} [cookie]
+ * @property {CookieConfig & {keys?: String[] | Keygrip | undefined}} [cookie]
  * @property {TplConfig} [tpl]
  */